From a6da6da0d2d5e370080f08eceb4a3225c9cb0400 Mon Sep 17 00:00:00 2001
From: Marcus Markiewicz <me@supermem613.dev>
Date: Mon, 8 May 2023 12:49:14 -0400
Subject: [PATCH 01/11] PR: Customizable project for Pull Request Queries

This change implements the basic logic to allow PR queries to be configured for any project.

The PR query editor dialog now has a project textbox, and the query is saved with the project context.
---
 .../TeamFoundation.WebApi/HyperlinkFactory.cs |  4 +-
 .../TeamMate/Controls/GlobalCommandBar.xaml   |  2 +-
 .../Model/ProjectContextSerializer.cs         |  3 ++
 Source/TeamMate/Model/PullRequestQueryInfo.cs |  2 +
 .../TeamMate/ViewModels/PageViewModelBase.cs  |  2 +-
 .../ViewModels/PullRequestPageViewModel.cs    |  2 +-
 .../ViewModels/PullRequestPickerViewModel.cs  | 38 ++++++++++++++++++-
 .../ViewModels/PullRequestQueryViewModel.cs   | 16 ++++++--
 .../ViewModels/TileCollectionViewModel.cs     |  2 +-
 .../Windows/PullRequestQueryEditorDialog.xaml | 21 +++++++---
 10 files changed, 76 insertions(+), 16 deletions(-)

diff --git a/Source/TeamFoundation.WebApi/HyperlinkFactory.cs b/Source/TeamFoundation.WebApi/HyperlinkFactory.cs
index a321418..d17598e 100644
--- a/Source/TeamFoundation.WebApi/HyperlinkFactory.cs
+++ b/Source/TeamFoundation.WebApi/HyperlinkFactory.cs
@@ -67,10 +67,10 @@ public Uri GetWorkItemUrl(int id, bool fullScreen = true)
             return builder.Uri;
         }
 
-        public Uri GetPullRequestUrl(int id, string repositoryName)
+        public Uri GetPullRequestUrl(int id, string projectName, string repositoryName)
         {
             UriBuilder builder = new UriBuilder(this.BaseUrl);
-            builder.Path = CombinePath(builder.Path, ProjectName, "_git", repositoryName, "pullrequest", id.ToString());
+            builder.Path = CombinePath(builder.Path, projectName, "_git", repositoryName, "pullrequest", id.ToString());
             return builder.Uri;
         }
 
diff --git a/Source/TeamMate/Controls/GlobalCommandBar.xaml b/Source/TeamMate/Controls/GlobalCommandBar.xaml
index eff9301..7937abf 100644
--- a/Source/TeamMate/Controls/GlobalCommandBar.xaml
+++ b/Source/TeamMate/Controls/GlobalCommandBar.xaml
@@ -38,7 +38,7 @@
                     Visibility="{Binding ElementName=self,
                                          Path=Type,
                                          Converter={x:Static fw:Converters.Visibility},
-                                         ConverterParameter={x:Static vm:CommandBarType.CodeReviews}}">
+                                         ConverterParameter={x:Static vm:CommandBarType.PullRequests}}">
             <Button Command="{x:Static tmr:TeamMateCommands.Refresh}" Style="{StaticResource CommandAppBarButtonStyle}" />
             <Button Command="{x:Static tmr:TeamMateCommands.MarkAllAsRead}" Style="{StaticResource CommandAppBarButtonStyle}" />
         </StackPanel>
diff --git a/Source/TeamMate/Model/ProjectContextSerializer.cs b/Source/TeamMate/Model/ProjectContextSerializer.cs
index a5d5717..5fb6e7e 100644
--- a/Source/TeamMate/Model/ProjectContextSerializer.cs
+++ b/Source/TeamMate/Model/ProjectContextSerializer.cs
@@ -77,6 +77,7 @@ private PullRequestQueryInfo ReadPullRequestQueryTileInfo(XElement e)
             query.ReviewStatus = e.GetAttribute<PullRequestQueryReviewStatus>(Schema.ReviewStatus);
             query.AssignedTo = e.GetAttribute<string>(Schema.AssignedTo);
             query.CreatedBy = e.GetAttribute<string>(Schema.CreatedBy);
+            query.Project = e.GetAttribute<string>(Schema.PullRequestProject);
 
             return query;
         }
@@ -145,6 +146,7 @@ private XElement WritePullRequestQueryTileInfo(PullRequestQueryInfo query)
             e.SetAttribute<PullRequestQueryReviewStatus>(Schema.ReviewStatus, query.ReviewStatus);
             e.SetAttribute<string>(Schema.CreatedBy, query.CreatedBy);
             e.SetAttribute<string>(Schema.AssignedTo, query.AssignedTo);
+            e.SetAttribute<string>(Schema.PullRequestProject, query.Project);
 
             return e;
         }
@@ -421,6 +423,7 @@ private static class Schema
             public static readonly XName PullRequest = "PullRequest";
             public const string PullRequestId = "PullRequestId";
             public const string PullRequestProjectId = "PullRequestProjectId";
+            public const string PullRequestProject = "PullRequestProject";
 
             // ProjectSettings Stuff
             public static readonly XName ProjectSettings = "ProjectSettings";
diff --git a/Source/TeamMate/Model/PullRequestQueryInfo.cs b/Source/TeamMate/Model/PullRequestQueryInfo.cs
index 7995b32..26b2c0c 100644
--- a/Source/TeamMate/Model/PullRequestQueryInfo.cs
+++ b/Source/TeamMate/Model/PullRequestQueryInfo.cs
@@ -19,6 +19,8 @@ public class PullRequestQueryInfo
         public string CreatedBy { get; set; }
 
         public string AssignedTo { get; set; }
+
+        public string Project { get; set; }
     }
     public enum PullRequestQueryReviewStatus
     {
diff --git a/Source/TeamMate/ViewModels/PageViewModelBase.cs b/Source/TeamMate/ViewModels/PageViewModelBase.cs
index feeb1c5..b7c2611 100644
--- a/Source/TeamMate/ViewModels/PageViewModelBase.cs
+++ b/Source/TeamMate/ViewModels/PageViewModelBase.cs
@@ -35,7 +35,7 @@ public enum CommandBarType
         None,
         Home,
         WorkItems,
-        CodeReviews,
+        PullRequests,
         Projects
     }
 }
diff --git a/Source/TeamMate/ViewModels/PullRequestPageViewModel.cs b/Source/TeamMate/ViewModels/PullRequestPageViewModel.cs
index 0427fb7..0a4fe51 100644
--- a/Source/TeamMate/ViewModels/PullRequestPageViewModel.cs
+++ b/Source/TeamMate/ViewModels/PullRequestPageViewModel.cs
@@ -27,7 +27,7 @@ public class PullRequestPageViewModel : PageViewModelBase, ICommandProvider, IFi
 
         public PullRequestPageViewModel()
         {
-            this.CommandBarType = CommandBarType.CodeReviews;
+            this.CommandBarType = CommandBarType.PullRequests;
             this.modelList = new List<PullRequestRowViewModel>();
             this.collectionView = new ListCollectionView(this.modelList);
 
diff --git a/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs b/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
index e498d72..d437ec4 100644
--- a/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
+++ b/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
@@ -15,6 +15,11 @@ public class PullRequestPickerViewModel : ValidatableViewModelBase
         private PullRequestQueryInfo queryInfo;
         private PullRequestQueryReviewStatus reviewStatus;
 
+        private string _selectedProject;
+        private ObservableCollection<string> _project = new ObservableCollection<string>()
+        {
+        };
+
         private string _selectedAssignedTo;
         private ObservableCollection<string> _assignedTo = new ObservableCollection<string>()
         {
@@ -71,7 +76,7 @@ public string SelectedAssignedTo
                 OnPropertyChanged("SelectedAssignedTo");
             }
         }
-
+       
         public string NewAssignedTo
         {
             set
@@ -88,6 +93,35 @@ public string NewAssignedTo
                 }
             }
         }
+        public IEnumerable Project
+        {
+            get { return this._project; }
+        }
+        public string SelectedProject
+        {
+            get { return this._selectedProject; }
+            set
+            {
+                this._selectedProject = value;
+                OnPropertyChanged("SelectedProject");
+            }
+        }
+        public string NewProject
+        {
+            set
+            {
+                if (SelectedProject != null)
+                {
+                    return;
+                }
+
+                if (!string.IsNullOrEmpty(value))
+                {
+                    this._project.Add(value);
+                    SelectedProject = value;
+                }
+            }
+        }
 
         public IEnumerable CreatedBy
         {
@@ -127,6 +161,7 @@ private void Invalidate()
                 this.ReviewStatus = this.queryInfo.ReviewStatus;
                 this.SelectedAssignedTo = this.queryInfo.AssignedTo;
                 this.SelectedCreatedBy = this.queryInfo.CreatedBy;
+                this.SelectedProject = this.queryInfo.Project;
             }
         }
 
@@ -138,6 +173,7 @@ public void Flush()
                 this.queryInfo.ReviewStatus = this.ReviewStatus;
                 this.queryInfo.AssignedTo = this.SelectedAssignedTo;
                 this.queryInfo.CreatedBy = this.SelectedCreatedBy;
+                this.queryInfo.Project = this.SelectedProject;
             }
         }
 
diff --git a/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs b/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs
index be2bea9..b5180cf 100644
--- a/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs
+++ b/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs
@@ -94,7 +94,7 @@ private async Task DoRefreshAsync(NotificationScope notificationScope)
                         List<Task> tasks = new List<Task>();
 
                         var queryAsyncTask = projectContext.GitHttpClient.GetPullRequestsByProjectAsync(
-                            projectContext.ProjectInfo.ProjectName,
+                            query.ProjectName,
                             query.GitPullRequestSearchCriteria);
 
                         tasks.Add(queryAsyncTask);
@@ -115,6 +115,7 @@ private async Task DoRefreshAsync(NotificationScope notificationScope)
 
                             pullRequest.Url = projectContext.HyperlinkFactory.GetPullRequestUrl(
                                 pullRequest.Reference.PullRequestId,
+                                query.ProjectName,
                                 pullRequest.Reference.Repository.Name);
                         }
 
@@ -156,7 +157,16 @@ private PullRequestQuery CreateBuiltInQuery()
             var pc = this.SessionService.Session.ProjectContext;
           
             var query = new PullRequestQuery();
-            query.ProjectName = pc.ProjectName;
+
+            if (this.queryInfo.Project != null)
+            {
+                query.ProjectName = this.queryInfo.Project;
+            }
+            else
+            {
+                query.ProjectName = pc.ProjectName;
+            }
+
             query.GitPullRequestSearchCriteria = new GitPullRequestSearchCriteria
             {
                 Status = PullRequestQueryInfo.ReviewStatusesMap[this.queryInfo.ReviewStatus],
@@ -225,7 +235,7 @@ private PullRequestRowViewModel CreateViewModel(GitPullRequest gitPullRequest, P
             PullRequestRowViewModel viewModel = ViewModelFactory.Create<PullRequestRowViewModel>();
             viewModel.IdentityRef = projectContext.Identity.Id.ToString();
             viewModel.Reference = gitPullRequest;
-            viewModel.ProjectName = projectContext.ProjectName;
+            viewModel.ProjectName = gitPullRequest.Repository.Name;
             return viewModel;
         }
     }
diff --git a/Source/TeamMate/ViewModels/TileCollectionViewModel.cs b/Source/TeamMate/ViewModels/TileCollectionViewModel.cs
index 1f18544..e7adbf9 100644
--- a/Source/TeamMate/ViewModels/TileCollectionViewModel.cs
+++ b/Source/TeamMate/ViewModels/TileCollectionViewModel.cs
@@ -184,7 +184,7 @@ private static void UpdateCounter(Counter counter, ICollection<WorkItemRowViewMo
 
         private IList<WorkItemRowViewModel> GetItemsTowardsCount()
         {
-            // TODO: Get CodeReviews too? How do these surface in the UI?
+            // TODO: Get PullRequests too? How do these surface in the UI?
             var allWorkItems = Tiles.OfType<WorkItemQueryTileViewModel>().Where(wiq => wiq.IncludeInItemCountSummary)
                 .Select(q => q.WorkItemQuery.WorkItems).Where(items => items != null).SelectMany(w => w).Distinct().ToArray();
 
diff --git a/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml b/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml
index 6cca54d..5a0d2f8 100644
--- a/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml
+++ b/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml
@@ -57,26 +57,35 @@
                              Text="{Binding Name, ValidatesOnNotifyDataErrors=True}" />
                     <Label Grid.Row="1"
                            Grid.Column="0"
-                           Margin="0,0,6,6" Content="Assigned To:"/>
+                           Margin="0,0,6,6" Content="Project:"/>
                     <Label Grid.Row="2"
+                           Grid.Column="0"
+                           Margin="0,0,6,6" Content="Assigned To:"/>
+                    <Label Grid.Row="3"
                         Grid.Column="0"
                         Margin="0,0,6,-26" Content="Created By:"/>
-                    <Label Grid.Row="3"
+                    <Label Grid.Row="4"
                            Grid.Column="0"
                            Margin="0,31,6,-57" Content="Status:"/>
                     <ComboBox Grid.Row="1"
+                              Margin="82,0,0,6"
+                              ItemsSource="{Binding Project}"
+                              SelectedItem="{Binding SelectedProject}"
+                              Text="{Binding NewProject, UpdateSourceTrigger=LostFocus}"
+                              Grid.ColumnSpan="2" IsEditable="True" />
+                    <ComboBox Grid.Row="2"
                               Margin="82,0,0,6"
                               ItemsSource="{Binding AssignedTo}"
                               SelectedItem="{Binding SelectedAssignedTo}"
                               Text="{Binding NewAssignedTo, UpdateSourceTrigger=LostFocus}"
-                              Grid.ColumnSpan="2" />
-                    <ComboBox Grid.Row="2"
+                              Grid.ColumnSpan="2" IsEditable="True" />
+                    <ComboBox Grid.Row="3"
                               Margin="82,0,0,-26"
                               ItemsSource="{Binding CreatedBy}"
                               SelectedItem="{Binding SelectedCreatedBy}"
                               Text="{Binding NewCreatedBy, UpdateSourceTrigger=LostFocus}"
-                              Grid.ColumnSpan="2" />
-                    <ComboBox Grid.Row="3"
+                              Grid.ColumnSpan="2" IsEditable="True" />
+                    <ComboBox Grid.Row="4"
                               Margin="82,31,0,-57"
                               ItemTemplate="{StaticResource EnumTemplate}"
                               ItemsSource="{Binding AllReviewStatuses}"

From 37bddc268b7f2b4efd0fa996e732929d80471675 Mon Sep 17 00:00:00 2001
From: Marcus Markiewicz <me@supermem613.dev>
Date: Mon, 8 May 2023 13:03:39 -0400
Subject: [PATCH 02/11] PR: Make the project picker show a list of projects

---
 Source/TeamMate/Services/WindowService.cs                | 9 ++++++++-
 Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs | 7 +++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Source/TeamMate/Services/WindowService.cs b/Source/TeamMate/Services/WindowService.cs
index d18ae81..2bae4d5 100644
--- a/Source/TeamMate/Services/WindowService.cs
+++ b/Source/TeamMate/Services/WindowService.cs
@@ -1,4 +1,5 @@
-using Microsoft.Tools.TeamMate.Foundation.Shell;
+using Microsoft.TeamFoundation.WorkItemTracking.Client;
+using Microsoft.Tools.TeamMate.Foundation.Shell;
 using Microsoft.Tools.TeamMate.Foundation.Threading;
 using Microsoft.Tools.TeamMate.Foundation.Windows;
 using Microsoft.Tools.TeamMate.Foundation.Windows.Controls;
@@ -299,6 +300,12 @@ public PullRequestQueryInfo ShowPullRequestQueryEditorDialog(ViewModelBase owner
             dialog.DataContext = viewModel;
             dialog.Owner = View.GetWindow(ownerViewModel);
 
+            var projects = this.SettingsService.Settings.Projects;
+            foreach (var project in projects)
+            {
+                viewModel.AddProject(project.ProjectName);
+            }
+
             return (dialog.ShowDialog() == true) ? viewModel.QueryInfo : null;
         }
 
diff --git a/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs b/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
index d437ec4..a9d509b 100644
--- a/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
+++ b/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
@@ -2,10 +2,13 @@
 using Microsoft.Tools.TeamMate.Foundation.Validation;
 using Microsoft.Tools.TeamMate.Foundation.Windows.MVVM;
 using Microsoft.Tools.TeamMate.Model;
+using Microsoft.Tools.TeamMate.Services;
 using System;
 using System.Collections;
 using System.Collections.ObjectModel;
+using System.ComponentModel.Composition;
 using System.Linq;
+using static Microsoft.TeamFoundation.Client.CommandLine.Options;
 
 namespace Microsoft.Tools.TeamMate.ViewModels
 {
@@ -97,6 +100,10 @@ public IEnumerable Project
         {
             get { return this._project; }
         }
+        public void AddProject(string projectName)
+        {
+            this._project.Add(projectName);
+        }
         public string SelectedProject
         {
             get { return this._selectedProject; }

From 409c730c5dccf387512f4f2f1a347a8e9b551030 Mon Sep 17 00:00:00 2001
From: Marcus Markiewicz <me@supermem613.dev>
Date: Tue, 9 May 2023 13:12:40 -0400
Subject: [PATCH 03/11] Add resolution for Created By and Assigned To for PRs

---
 Source/TeamMate/Model/ProjectContext.cs       |   9 +
 Source/TeamMate/Services/ResolverService.cs   | 165 ++++++++++++++++++
 .../Services/VstsConnectionService.cs         |  15 +-
 Source/TeamMate/Services/WindowService.cs     |   1 -
 Source/TeamMate/TeamMate.csproj               |   4 +
 .../ViewModels/PullRequestPickerViewModel.cs  |  28 ++-
 .../ViewModels/PullRequestQueryViewModel.cs   |  52 ++++--
 .../Windows/PullRequestQueryEditorDialog.xaml |   2 +-
 8 files changed, 253 insertions(+), 23 deletions(-)
 create mode 100644 Source/TeamMate/Services/ResolverService.cs

diff --git a/Source/TeamMate/Model/ProjectContext.cs b/Source/TeamMate/Model/ProjectContext.cs
index e84e02a..c0d9c58 100644
--- a/Source/TeamMate/Model/ProjectContext.cs
+++ b/Source/TeamMate/Model/ProjectContext.cs
@@ -8,6 +8,9 @@
 using Microsoft.TeamFoundation.WorkItemTracking.WebApi.Models;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.Services.Graph.Client;
+using Microsoft.VisualStudio.Services.MemberEntitlementManagement.WebApi;
 
 namespace Microsoft.Tools.TeamMate.Model
 {
@@ -36,6 +39,12 @@ public ProjectContext(ProjectReference reference)
 
         public WorkItemTrackingBatchHttpClient WorkItemTrackingBatchClient { get; set; }
 
+        public GraphHttpClient GraphClient { get; set; }
+
+        public MemberEntitlementManagementHttpClient MemberEntitlementManagementClient { get; set; }
+
+        public Task<List<GraphUser>> UsersAsync { get; set; }
+
         public string ProjectName { get; set; }
 
         public ICollection<WorkItemTypeInfo> WorkItemTypes { get; set; }
diff --git a/Source/TeamMate/Services/ResolverService.cs b/Source/TeamMate/Services/ResolverService.cs
new file mode 100644
index 0000000..7716f8e
--- /dev/null
+++ b/Source/TeamMate/Services/ResolverService.cs
@@ -0,0 +1,165 @@
+using Microsoft.Tools.TeamMate.Model;
+using Microsoft.VisualStudio.Services.Graph.Client;
+using Microsoft.VisualStudio.Services.MemberEntitlementManagement.WebApi;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Microsoft.Tools.TeamMate.Services
+{
+    public class ResolverService
+    {
+        private List<GraphUser> GraphUserCache { get; set; }
+
+        private List<GraphGroup> GraphGroupCache { get; set; }
+
+        private List<GroupEntitlement> GroupEntitlements { get; set; }
+
+        private List<Task> Tasks = new List<Task>();
+
+        private async Task<List<GraphUser>> FetchUsersAsync(
+            GraphHttpClient graphClient,
+            MemberEntitlementManagementHttpClient memberEntitlementManagementClient)
+        {
+            if (GraphUserCache != null)
+            {
+                return GraphUserCache;
+            }
+
+            List<GraphUser> users = new List<GraphUser>();
+
+            string continuationToken = null;
+            do
+            {
+                var data = await graphClient.ListUsersAsync(null, continuationToken);
+                continuationToken = data.ContinuationToken != null ? data.ContinuationToken.First() : null;
+                foreach (var user in data.GraphUsers)
+                {
+                    users.Add(user);
+                }
+            }
+            while (continuationToken != null);
+
+            GraphUserCache = users;
+
+            return users;
+        }
+
+        private async Task<List<GraphGroup>> FetchGroupsAsync(
+            GraphHttpClient graphClient)
+        {
+            if (GraphGroupCache != null)
+            {
+                return GraphGroupCache;
+            }
+
+            List<GraphGroup> groups = new List<GraphGroup>();
+
+            string continuationToken = null;
+            do
+            {
+                // ListGroupsAsync
+                var data = await graphClient.ListGroupsAsync(null, null, continuationToken);
+                continuationToken = data.ContinuationToken != null ? data.ContinuationToken.First() : null;
+                foreach (var group in data.GraphGroups)
+                {
+                    groups.Add(group);
+                }
+            }
+            while (continuationToken != null);
+
+            GraphGroupCache = groups;
+
+            return groups;
+        }
+
+        private async Task<List<GroupEntitlement>> FetchGroupsEntitlementsAsync(
+          MemberEntitlementManagementHttpClient memberEntitlementManagementClient)
+        {
+            if (GroupEntitlements != null)
+            {
+                return GroupEntitlements;
+            }
+
+            GroupEntitlements = await memberEntitlementManagementClient.GetGroupEntitlementsAsync();
+           
+            return GroupEntitlements;
+        }
+
+        public async void FetchDataSync(
+            GraphHttpClient client,
+            MemberEntitlementManagementHttpClient memberEntitlementManagementClient)
+        {
+            Tasks.Add(FetchUsersAsync(client, memberEntitlementManagementClient));
+            Tasks.Add(FetchGroupsAsync(client));
+
+            // TODO(MEM)
+          // Tasks.Add(FetchGroupsEntitlementsAsync(memberEntitlementManagementClient));
+        }
+
+        public ObservableCollection<string> GetDisplayNames()
+        {
+            foreach (var task in Tasks)
+            {
+                task.Wait();
+            }
+
+            ObservableCollection<string> strings = new ObservableCollection<string>();
+
+            foreach (var user in GraphUserCache)
+            {
+                strings.Add(user.DisplayName);
+            }
+
+            foreach (var user in GraphGroupCache)
+            {
+                strings.Add(user.DisplayName);
+            }
+
+            return strings;
+        }
+
+        public async Task<string> Resolve(
+            GraphHttpClient client,
+            MemberEntitlementManagementHttpClient memberEntitlementManagementClient,
+            string value)
+        {
+            if (value == null)
+            {
+                return null;
+            }
+
+            foreach (var task in Tasks)
+            {
+                task.Wait();
+            }
+
+            foreach (var user in GraphUserCache)
+            {
+                if (user.MailAddress != null &&
+                    (user.MailAddress.StartsWith(value)))
+                {
+                    var storageKey = client.GetStorageKeyAsync(user.Descriptor).Result;
+
+                    // TODO(MEM)
+                    return "{" + storageKey.Value.ToString() + "}";
+                }
+            }
+
+            foreach (var group in GraphGroupCache)
+            {
+                if (group.MailAddress != null &&
+                    (group.MailAddress.Contains(value)))
+                {
+                    var storageKey = client.GetStorageKeyAsync(group.Descriptor).Result;
+
+                    // TODO(MEM)
+                    return "{" + storageKey.Value.ToString() + "}";
+                }
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/Source/TeamMate/Services/VstsConnectionService.cs b/Source/TeamMate/Services/VstsConnectionService.cs
index 8f76725..4a24b7f 100644
--- a/Source/TeamMate/Services/VstsConnectionService.cs
+++ b/Source/TeamMate/Services/VstsConnectionService.cs
@@ -19,6 +19,8 @@
 using ProjectHttpClient = Microsoft.TeamFoundation.Core.WebApi.ProjectHttpClient;
 using WorkItemField = Microsoft.TeamFoundation.WorkItemTracking.WebApi.Models.WorkItemField;
 using WorkItemType = Microsoft.TeamFoundation.WorkItemTracking.WebApi.Models.WorkItemType;
+using Microsoft.VisualStudio.Services.Graph.Client;
+using Microsoft.VisualStudio.Services.MemberEntitlementManagement.WebApi;
 
 namespace Microsoft.Tools.TeamMate.Services
 {
@@ -35,6 +37,10 @@ public class VstsConnectionService
 
         [Import]
         public WindowService WindowService { get; set; }
+    
+        [Import]
+        public ResolverService ResolverService { get; set; }
+
 
         private async Task<VssConnection> ConnectAsync(Uri projectCollectionUri, CancellationToken cancellationToken = default(CancellationToken))
         {
@@ -137,6 +143,8 @@ private async Task<ProjectContext> DoConnectAsync(ProjectInfo projectInfo, Cance
                 WorkItemTrackingBatchHttpClient batchWitClient = connection.GetClient<WorkItemTrackingBatchHttpClient>();
                 ProjectHttpClient projectClient = connection.GetClient<ProjectHttpClient>();
                 GitHttpClient gitClient = connection.GetClient<GitHttpClient>();
+                GraphHttpClient graphClient = connection.GetClient<GraphHttpClient>();
+                MemberEntitlementManagementHttpClient memberEntitlementManagementClient = connection.GetClient<MemberEntitlementManagementHttpClient>();
 
                 var projectId = projectInfo.Reference.ProjectId;
 
@@ -174,6 +182,7 @@ private async Task<ProjectContext> DoConnectAsync(ProjectInfo projectInfo, Cance
                 projectContext.WorkItemTrackingClient = witClient;
                 projectContext.WorkItemTrackingBatchClient = batchWitClient;
                 projectContext.GitHttpClient = gitClient;
+                projectContext.GraphClient = graphClient;
                 projectContext.WorkItemTypes = workItemTypeInfos;
                 projectContext.ProjectInfo = projectInfo;
                 projectContext.Identity = identity;
@@ -182,6 +191,11 @@ private async Task<ProjectContext> DoConnectAsync(ProjectInfo projectInfo, Cance
                 projectContext.WorkItemFields = fields;
                 projectContext.WorkItemFieldsByName = fields.ToDictionary(f => f.ReferenceName, StringComparer.OrdinalIgnoreCase);
                 projectContext.RequiredWorkItemFieldNames = GetWorkItemFieldsToPrefetch(projectContext.WorkItemFieldsByName);
+                projectContext.MemberEntitlementManagementClient = memberEntitlementManagementClient;
+
+                this.ResolverService.FetchDataSync(
+                   graphClient,
+                   memberEntitlementManagementClient);
 
                 return projectContext;
             }
@@ -207,7 +221,6 @@ private async Task<ProjectContext> DoConnectAsync(ProjectInfo projectInfo, Cance
 
             return null;
         }
-
         public ICollection<string> GetWorkItemFieldsToPrefetch(IDictionary<string, WorkItemField> availableFields)
         {
             // Prefetch the fields that are interesting to our services or object model...
diff --git a/Source/TeamMate/Services/WindowService.cs b/Source/TeamMate/Services/WindowService.cs
index 2bae4d5..b4b7919 100644
--- a/Source/TeamMate/Services/WindowService.cs
+++ b/Source/TeamMate/Services/WindowService.cs
@@ -388,7 +388,6 @@ private void HandleQuickSearchTriggered(object sender, QuickSearchTriggeredEvent
             this.MainWindowViewModel.Search(e.SearchText, true, true);
         }
 
-
         public bool RequestShutdown()
         {
             bool shouldCancel = this.PromptSaveOnDirtyWindows();
diff --git a/Source/TeamMate/TeamMate.csproj b/Source/TeamMate/TeamMate.csproj
index 38e75ef..ce559ea 100644
--- a/Source/TeamMate/TeamMate.csproj
+++ b/Source/TeamMate/TeamMate.csproj
@@ -198,6 +198,7 @@
     <Compile Include="Services\AsyncWriterService.cs" />
     <Compile Include="Services\ExternalWebBrowserService.cs" />
     <Compile Include="Services\GlobalCommandService.cs" />
+    <Compile Include="Services\ResolverService.cs" />
     <Compile Include="Services\HistoryService.cs" />
     <Compile Include="Services\SearchService.cs" />
     <Compile Include="Services\SessionService.cs" />
@@ -999,6 +1000,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.Services.MemberEntitlementManagement.WebApi">
+      <Version>16.205.1</Version>
+    </PackageReference>
     <PackageReference Include="SimpleInjector">
       <Version>5.3.3</Version>
     </PackageReference>
diff --git a/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs b/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
index a9d509b..5972331 100644
--- a/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
+++ b/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
@@ -1,5 +1,4 @@
-using Microsoft.Tools.TeamMate.Foundation;
-using Microsoft.Tools.TeamMate.Foundation.Validation;
+using Microsoft.Tools.TeamMate.Foundation.Validation;
 using Microsoft.Tools.TeamMate.Foundation.Windows.MVVM;
 using Microsoft.Tools.TeamMate.Model;
 using Microsoft.Tools.TeamMate.Services;
@@ -7,8 +6,6 @@
 using System.Collections;
 using System.Collections.ObjectModel;
 using System.ComponentModel.Composition;
-using System.Linq;
-using static Microsoft.TeamFoundation.Client.CommandLine.Options;
 
 namespace Microsoft.Tools.TeamMate.ViewModels
 {
@@ -37,6 +34,12 @@ public class PullRequestPickerViewModel : ValidatableViewModelBase
             "",
         };
 
+        [Import]
+        public ResolverService ResolverService { get; set; }
+
+        [Import]
+        public SessionService SessionService { get; set; }
+
         public PullRequestPickerViewModel()
         {
             Validator.RuleForProperty(() => Name)
@@ -172,15 +175,24 @@ private void Invalidate()
             }
         }
 
-        public void Flush()
+        public async void Flush()
         {
             if (this.queryInfo != null)
             {
                 this.queryInfo.Name = this.Name.Trim();
                 this.queryInfo.ReviewStatus = this.ReviewStatus;
-                this.queryInfo.AssignedTo = this.SelectedAssignedTo;
-                this.queryInfo.CreatedBy = this.SelectedCreatedBy;
-                this.queryInfo.Project = this.SelectedProject;
+                this.queryInfo.AssignedTo = this.SelectedAssignedTo != null ? this.SelectedAssignedTo.Trim() : this.SelectedAssignedTo;
+                this.queryInfo.CreatedBy = this.SelectedCreatedBy != null ? this.SelectedCreatedBy.Trim() : this.SelectedCreatedBy;
+                this.queryInfo.Project = this.SelectedProject.Trim();
+
+                this.queryInfo.AssignedTo = await this.ResolverService.Resolve(
+                    this.SessionService.Session.ProjectContext.GraphClient,
+                    this.SessionService.Session.ProjectContext.MemberEntitlementManagementClient,
+                    this.queryInfo.AssignedTo);
+                this.queryInfo.CreatedBy = await this.ResolverService.Resolve(
+                    this.SessionService.Session.ProjectContext.GraphClient,
+                    this.SessionService.Session.ProjectContext.MemberEntitlementManagementClient,
+                    this.queryInfo.CreatedBy);
             }
         }
 
diff --git a/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs b/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs
index b5180cf..a163030 100644
--- a/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs
+++ b/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs
@@ -10,6 +10,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.TeamFoundation.SourceControl.WebApi;
+using Microsoft.TeamFoundation.Build.WebApi;
 
 namespace Microsoft.Tools.TeamMate.ViewModels
 {
@@ -105,29 +106,46 @@ private async Task DoRefreshAsync(NotificationScope notificationScope)
 
                         var pullRequests = queryAsyncTask.Result.Select(r => CreateViewModel(r, projectContext)).ToArray();
 
+                        List<PullRequestRowViewModel> actualPullRequests = new List<PullRequestRowViewModel>();
+
                         foreach (var pullRequest in pullRequests)
                         {
-                            var asyncTask = projectContext.GitHttpClient.GetPullRequestIterationsAsync(
-                                pullRequest.Reference.Repository.Id,
-                                pullRequest.Reference.PullRequestId);
-
-                            iterationTasks.Add(asyncTask);
-
-                            pullRequest.Url = projectContext.HyperlinkFactory.GetPullRequestUrl(
-                                pullRequest.Reference.PullRequestId,
-                                query.ProjectName,
-                                pullRequest.Reference.Repository.Name);
+                            bool hasDeclined = false;
+                            foreach (var reviewer in pullRequest.Reference.Reviewers)
+                            {
+                                if (reviewer.Id == this.SessionService.Session.ProjectContext.Identity.Id.ToString())
+                                {
+                                    hasDeclined = reviewer.HasDeclined.GetValueOrDefault(false);
+                                    break;
+                                }
+                            }
+
+                            if (!hasDeclined)
+                            {
+                                var asyncTask = projectContext.GitHttpClient.GetPullRequestIterationsAsync(
+                                    pullRequest.Reference.Repository.Id,
+                                    pullRequest.Reference.PullRequestId);
+
+                                iterationTasks.Add(asyncTask);
+
+                                pullRequest.Url = projectContext.HyperlinkFactory.GetPullRequestUrl(
+                                    pullRequest.Reference.PullRequestId,
+                                    query.ProjectName,
+                                    pullRequest.Reference.Repository.Name);
+
+                                actualPullRequests.Add(pullRequest);
+                            }
                         }
 
                         await Task.WhenAll(iterationTasks.ToArray());
 
                         int i = 0;
-                        foreach (var pullRequest in pullRequests)
+                        foreach (var pullRequest in actualPullRequests)
                         {
                             pullRequest.Iterations = iterationTasks[i++].Result;
                         }
 
-                        OnQueryCompleted(projectContext, pullRequests, notificationScope);
+                        OnQueryCompleted(projectContext, actualPullRequests.ToArray(), notificationScope);
                     }
                     else
                     {
@@ -172,15 +190,25 @@ private PullRequestQuery CreateBuiltInQuery()
                 Status = PullRequestQueryInfo.ReviewStatusesMap[this.queryInfo.ReviewStatus],
             };
 
+            // TODO(MEM): Mapping
+
             if (this.queryInfo.AssignedTo == "@me")
             {
                 query.GitPullRequestSearchCriteria.ReviewerId = pc.Identity.Id;
             }
+            else if (this.queryInfo.AssignedTo != null)
+            {
+                query.GitPullRequestSearchCriteria.ReviewerId = new Guid(this.queryInfo.AssignedTo);
+            }
 
             if (this.queryInfo.CreatedBy == "@me")
             {
                 query.GitPullRequestSearchCriteria.CreatorId = pc.Identity.Id;
             }
+            else if (this.queryInfo.CreatedBy != null)
+            {
+                query.GitPullRequestSearchCriteria.CreatorId = new Guid(this.queryInfo.CreatedBy);
+            }
 
             return query;
         }
diff --git a/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml b/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml
index 5a0d2f8..9bf31a5 100644
--- a/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml
+++ b/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml
@@ -6,7 +6,7 @@
         xmlns:tmc="clr-namespace:Microsoft.Tools.TeamMate.Controls"
         xmlns:av="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="av" x:Class="Microsoft.Tools.TeamMate.Windows.PullRequestQueryEditorDialog"
         FocusManager.FocusedElement="{Binding ElementName=nameTextBox}"
-        SizeToContent="WidthAndHeight" Height="294"
+        SizeToContent="WidthAndHeight" Height="306"
         >
     <Window.Resources>
         <Style TargetType="{x:Type TextBox}">

From 8cf9a8851d975287930abb60fa38b0d5e6fe792b Mon Sep 17 00:00:00 2001
From: Marcus Markiewicz <me@supermem613.dev>
Date: Tue, 9 May 2023 14:50:06 -0400
Subject: [PATCH 04/11] Improve resolution

---
 Source/TeamMate/Model/ProjectContext.cs       |   3 -
 .../Model/ProjectContextSerializer.cs         |   8 +-
 Source/TeamMate/Model/PullRequestQueryInfo.cs |   4 +-
 Source/TeamMate/Services/ResolverService.cs   |  58 ++++------
 .../Services/VstsConnectionService.cs         |   6 +-
 Source/TeamMate/Services/WindowService.cs     |   1 +
 .../ProjectPickerDialogViewModel.cs           |   1 -
 .../ViewModels/PullRequestPickerViewModel.cs  | 104 +++++-------------
 .../ViewModels/PullRequestQueryViewModel.cs   |  16 +--
 .../Windows/PullRequestQueryEditorDialog.xaml |  55 +++++----
 .../PullRequestQueryEditorDialog.xaml.cs      |   9 +-
 11 files changed, 95 insertions(+), 170 deletions(-)

diff --git a/Source/TeamMate/Model/ProjectContext.cs b/Source/TeamMate/Model/ProjectContext.cs
index c0d9c58..872d1d3 100644
--- a/Source/TeamMate/Model/ProjectContext.cs
+++ b/Source/TeamMate/Model/ProjectContext.cs
@@ -10,7 +10,6 @@
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.Services.Graph.Client;
-using Microsoft.VisualStudio.Services.MemberEntitlementManagement.WebApi;
 
 namespace Microsoft.Tools.TeamMate.Model
 {
@@ -41,8 +40,6 @@ public ProjectContext(ProjectReference reference)
 
         public GraphHttpClient GraphClient { get; set; }
 
-        public MemberEntitlementManagementHttpClient MemberEntitlementManagementClient { get; set; }
-
         public Task<List<GraphUser>> UsersAsync { get; set; }
 
         public string ProjectName { get; set; }
diff --git a/Source/TeamMate/Model/ProjectContextSerializer.cs b/Source/TeamMate/Model/ProjectContextSerializer.cs
index 5fb6e7e..5fdff40 100644
--- a/Source/TeamMate/Model/ProjectContextSerializer.cs
+++ b/Source/TeamMate/Model/ProjectContextSerializer.cs
@@ -75,8 +75,8 @@ private PullRequestQueryInfo ReadPullRequestQueryTileInfo(XElement e)
 
             query.Name = e.GetAttribute<string>(Schema.Name);
             query.ReviewStatus = e.GetAttribute<PullRequestQueryReviewStatus>(Schema.ReviewStatus);
-            query.AssignedTo = e.GetAttribute<string>(Schema.AssignedTo);
-            query.CreatedBy = e.GetAttribute<string>(Schema.CreatedBy);
+            query.AssignedTo = e.GetAttribute<Guid?>(Schema.AssignedTo);
+            query.CreatedBy = e.GetAttribute<Guid?>(Schema.CreatedBy);
             query.Project = e.GetAttribute<string>(Schema.PullRequestProject);
 
             return query;
@@ -144,8 +144,8 @@ private XElement WritePullRequestQueryTileInfo(PullRequestQueryInfo query)
             XElement e = new XElement(Schema.PullRequestQueryInfo);
             e.SetAttribute<string>(Schema.Name, query.Name);
             e.SetAttribute<PullRequestQueryReviewStatus>(Schema.ReviewStatus, query.ReviewStatus);
-            e.SetAttribute<string>(Schema.CreatedBy, query.CreatedBy);
-            e.SetAttribute<string>(Schema.AssignedTo, query.AssignedTo);
+            e.SetAttribute<Guid?>(Schema.CreatedBy, query.CreatedBy);
+            e.SetAttribute<Guid?>(Schema.AssignedTo, query.AssignedTo);
             e.SetAttribute<string>(Schema.PullRequestProject, query.Project);
 
             return e;
diff --git a/Source/TeamMate/Model/PullRequestQueryInfo.cs b/Source/TeamMate/Model/PullRequestQueryInfo.cs
index 26b2c0c..763cd9e 100644
--- a/Source/TeamMate/Model/PullRequestQueryInfo.cs
+++ b/Source/TeamMate/Model/PullRequestQueryInfo.cs
@@ -16,9 +16,9 @@ public class PullRequestQueryInfo
 
         public string Name { get; set; }
         public PullRequestQueryReviewStatus ReviewStatus { get; set; }
-        public string CreatedBy { get; set; }
+        public Guid? CreatedBy { get; set; }
 
-        public string AssignedTo { get; set; }
+        public Guid? AssignedTo { get; set; }
 
         public string Project { get; set; }
     }
diff --git a/Source/TeamMate/Services/ResolverService.cs b/Source/TeamMate/Services/ResolverService.cs
index 7716f8e..d23da6e 100644
--- a/Source/TeamMate/Services/ResolverService.cs
+++ b/Source/TeamMate/Services/ResolverService.cs
@@ -1,6 +1,5 @@
-using Microsoft.Tools.TeamMate.Model;
-using Microsoft.VisualStudio.Services.Graph.Client;
-using Microsoft.VisualStudio.Services.MemberEntitlementManagement.WebApi;
+using Microsoft.VisualStudio.Services.Graph.Client;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -13,14 +12,11 @@ public class ResolverService
         private List<GraphUser> GraphUserCache { get; set; }
 
         private List<GraphGroup> GraphGroupCache { get; set; }
-
-        private List<GroupEntitlement> GroupEntitlements { get; set; }
-
+        
         private List<Task> Tasks = new List<Task>();
 
         private async Task<List<GraphUser>> FetchUsersAsync(
-            GraphHttpClient graphClient,
-            MemberEntitlementManagementHttpClient memberEntitlementManagementClient)
+            GraphHttpClient graphClient)
         {
             if (GraphUserCache != null)
             {
@@ -74,28 +70,19 @@ private async Task<List<GraphGroup>> FetchGroupsAsync(
             return groups;
         }
 
-        private async Task<List<GroupEntitlement>> FetchGroupsEntitlementsAsync(
-          MemberEntitlementManagementHttpClient memberEntitlementManagementClient)
-        {
-            if (GroupEntitlements != null)
-            {
-                return GroupEntitlements;
-            }
-
-            GroupEntitlements = await memberEntitlementManagementClient.GetGroupEntitlementsAsync();
-           
-            return GroupEntitlements;
-        }
-
         public async void FetchDataSync(
-            GraphHttpClient client,
-            MemberEntitlementManagementHttpClient memberEntitlementManagementClient)
+            GraphHttpClient client)
         {
-            Tasks.Add(FetchUsersAsync(client, memberEntitlementManagementClient));
+            Tasks.Add(FetchUsersAsync(client));
             Tasks.Add(FetchGroupsAsync(client));
+        }
 
-            // TODO(MEM)
-          // Tasks.Add(FetchGroupsEntitlementsAsync(memberEntitlementManagementClient));
+        public void WaitToComplete()
+        {
+            foreach (var task in Tasks)
+            {
+                task.Wait();
+            }
         }
 
         public ObservableCollection<string> GetDisplayNames()
@@ -120,9 +107,8 @@ public ObservableCollection<string> GetDisplayNames()
             return strings;
         }
 
-        public async Task<string> Resolve(
+        public async Task<Guid?> Resolve(
             GraphHttpClient client,
-            MemberEntitlementManagementHttpClient memberEntitlementManagementClient,
             string value)
         {
             if (value == null)
@@ -130,20 +116,14 @@ public async Task<string> Resolve(
                 return null;
             }
 
-            foreach (var task in Tasks)
-            {
-                task.Wait();
-            }
-
             foreach (var user in GraphUserCache)
             {
                 if (user.MailAddress != null &&
-                    (user.MailAddress.StartsWith(value)))
+                    (user.MailAddress.Contains(value)))
                 {
                     var storageKey = client.GetStorageKeyAsync(user.Descriptor).Result;
 
-                    // TODO(MEM)
-                    return "{" + storageKey.Value.ToString() + "}";
+                    return storageKey.Value;
                 }
             }
 
@@ -154,12 +134,12 @@ public async Task<string> Resolve(
                 {
                     var storageKey = client.GetStorageKeyAsync(group.Descriptor).Result;
 
-                    // TODO(MEM)
-                    return "{" + storageKey.Value.ToString() + "}";
+                    return storageKey.Value;
                 }
             }
 
-            return null;
+            throw new ArgumentException("Could not resolve '" + value + "'. Try the full email for the person and/or group.");
+
         }
     }
 }
diff --git a/Source/TeamMate/Services/VstsConnectionService.cs b/Source/TeamMate/Services/VstsConnectionService.cs
index 4a24b7f..cd90b7c 100644
--- a/Source/TeamMate/Services/VstsConnectionService.cs
+++ b/Source/TeamMate/Services/VstsConnectionService.cs
@@ -20,7 +20,6 @@
 using WorkItemField = Microsoft.TeamFoundation.WorkItemTracking.WebApi.Models.WorkItemField;
 using WorkItemType = Microsoft.TeamFoundation.WorkItemTracking.WebApi.Models.WorkItemType;
 using Microsoft.VisualStudio.Services.Graph.Client;
-using Microsoft.VisualStudio.Services.MemberEntitlementManagement.WebApi;
 
 namespace Microsoft.Tools.TeamMate.Services
 {
@@ -144,7 +143,6 @@ private async Task<ProjectContext> DoConnectAsync(ProjectInfo projectInfo, Cance
                 ProjectHttpClient projectClient = connection.GetClient<ProjectHttpClient>();
                 GitHttpClient gitClient = connection.GetClient<GitHttpClient>();
                 GraphHttpClient graphClient = connection.GetClient<GraphHttpClient>();
-                MemberEntitlementManagementHttpClient memberEntitlementManagementClient = connection.GetClient<MemberEntitlementManagementHttpClient>();
 
                 var projectId = projectInfo.Reference.ProjectId;
 
@@ -191,11 +189,9 @@ private async Task<ProjectContext> DoConnectAsync(ProjectInfo projectInfo, Cance
                 projectContext.WorkItemFields = fields;
                 projectContext.WorkItemFieldsByName = fields.ToDictionary(f => f.ReferenceName, StringComparer.OrdinalIgnoreCase);
                 projectContext.RequiredWorkItemFieldNames = GetWorkItemFieldsToPrefetch(projectContext.WorkItemFieldsByName);
-                projectContext.MemberEntitlementManagementClient = memberEntitlementManagementClient;
 
                 this.ResolverService.FetchDataSync(
-                   graphClient,
-                   memberEntitlementManagementClient);
+                   graphClient);
 
                 return projectContext;
             }
diff --git a/Source/TeamMate/Services/WindowService.cs b/Source/TeamMate/Services/WindowService.cs
index b4b7919..3bf0887 100644
--- a/Source/TeamMate/Services/WindowService.cs
+++ b/Source/TeamMate/Services/WindowService.cs
@@ -300,6 +300,7 @@ public PullRequestQueryInfo ShowPullRequestQueryEditorDialog(ViewModelBase owner
             dialog.DataContext = viewModel;
             dialog.Owner = View.GetWindow(ownerViewModel);
 
+            // TODO(MEM)
             var projects = this.SettingsService.Settings.Projects;
             foreach (var project in projects)
             {
diff --git a/Source/TeamMate/ViewModels/ProjectPickerDialogViewModel.cs b/Source/TeamMate/ViewModels/ProjectPickerDialogViewModel.cs
index 131bd35..1da5d91 100644
--- a/Source/TeamMate/ViewModels/ProjectPickerDialogViewModel.cs
+++ b/Source/TeamMate/ViewModels/ProjectPickerDialogViewModel.cs
@@ -103,7 +103,6 @@ public ICollection<TeamProjectReference> SelectedProjects
             get { return this.selectedProjects; }
             set { this.SetProperty(ref this.selectedProjects, value); }
         }
-
         public void CancelConnect()
         {
             this.previousCancellationTokenSource.Cancel();
diff --git a/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs b/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
index 5972331..93deb5a 100644
--- a/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
+++ b/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
@@ -1,4 +1,5 @@
-using Microsoft.Tools.TeamMate.Foundation.Validation;
+using Microsoft.Tools.TeamMate.Foundation.Threading;
+using Microsoft.Tools.TeamMate.Foundation.Validation;
 using Microsoft.Tools.TeamMate.Foundation.Windows.MVVM;
 using Microsoft.Tools.TeamMate.Model;
 using Microsoft.Tools.TeamMate.Services;
@@ -20,19 +21,9 @@ public class PullRequestPickerViewModel : ValidatableViewModelBase
         {
         };
 
-        private string _selectedAssignedTo;
-        private ObservableCollection<string> _assignedTo = new ObservableCollection<string>()
-        {
-            "@me",
-            "",
-        };
+        private string assignedTo;
 
-        private string _selectedCreatedBy;
-        private ObservableCollection<string> _createdBy = new ObservableCollection<string>()
-        {
-            "@me",
-            "",
-        };
+        private string createdBy;
 
         [Import]
         public ResolverService ResolverService { get; set; }
@@ -42,8 +33,9 @@ public class PullRequestPickerViewModel : ValidatableViewModelBase
 
         public PullRequestPickerViewModel()
         {
-            Validator.RuleForProperty(() => Name)
-                .IsNotEmpty();
+            Validator
+                .RuleForProperty(() => Name)
+                    .IsNotEmpty();
         }
 
         public PullRequestQueryInfo QueryInfo
@@ -69,36 +61,18 @@ public PullRequestQueryReviewStatus ReviewStatus
             get { return this.reviewStatus; }
             set { SetProperty(ref this.reviewStatus, value); }
         }
-        public IEnumerable AssignedTo
+        public string AssignedTo
         {
-            get { return this._assignedTo; }
+            get { return this.assignedTo; }
+            set { SetProperty(ref this.assignedTo, value); }
         }
-        public string SelectedAssignedTo
+
+        public string CreatedBy
         {
-            get { return this._selectedAssignedTo; }
-            set
-            {
-                this._selectedAssignedTo = value;
-                OnPropertyChanged("SelectedAssignedTo");
-            }
+            get { return this.createdBy; }
+            set { SetProperty(ref this.createdBy, value); }
         }
-       
-        public string NewAssignedTo
-        {
-            set
-            {
-                if (SelectedAssignedTo != null)
-                {
-                    return;
-                }
 
-                if (!string.IsNullOrEmpty(value))
-                {
-                    this._assignedTo.Add(value);
-                    SelectedAssignedTo = value;
-                }
-            }
-        }
         public IEnumerable Project
         {
             get { return this._project; }
@@ -133,45 +107,22 @@ public string NewProject
             }
         }
 
-        public IEnumerable CreatedBy
-        {
-            get { return this._createdBy; }
-        }
-        public string SelectedCreatedBy
-        {
-            get { return this._selectedCreatedBy; }
-            set
-            {
-                this._selectedCreatedBy = value;
-                OnPropertyChanged("SelectedCreatedBy");
-            }
-        }
+        private TaskContext progress = TaskContext.None;
 
-        public string NewCreatedBy
+        public TaskContext Progress
         {
-            set
-            {
-                if (SelectedCreatedBy != null)
-                {
-                    return;
-                }
-
-                if (!string.IsNullOrEmpty(value))
-                {
-                    this._createdBy.Add(value);
-                    SelectedCreatedBy = value;
-                }
-            }
+            get { return this.progress; }
+            set { this.SetProperty(ref this.progress, value); }
         }
+
         private void Invalidate()
         {
             if (this.queryInfo != null)
             {
                 this.Name = this.queryInfo.Name;
                 this.ReviewStatus = this.queryInfo.ReviewStatus;
-                this.SelectedAssignedTo = this.queryInfo.AssignedTo;
-                this.SelectedCreatedBy = this.queryInfo.CreatedBy;
-                this.SelectedProject = this.queryInfo.Project;
+                this.AssignedTo = null;
+                this.CreatedBy = null;
             }
         }
 
@@ -181,18 +132,15 @@ public async void Flush()
             {
                 this.queryInfo.Name = this.Name.Trim();
                 this.queryInfo.ReviewStatus = this.ReviewStatus;
-                this.queryInfo.AssignedTo = this.SelectedAssignedTo != null ? this.SelectedAssignedTo.Trim() : this.SelectedAssignedTo;
-                this.queryInfo.CreatedBy = this.SelectedCreatedBy != null ? this.SelectedCreatedBy.Trim() : this.SelectedCreatedBy;
                 this.queryInfo.Project = this.SelectedProject.Trim();
 
-                this.queryInfo.AssignedTo = await this.ResolverService.Resolve(
+                this.ResolverService.Resolve(
                     this.SessionService.Session.ProjectContext.GraphClient,
-                    this.SessionService.Session.ProjectContext.MemberEntitlementManagementClient,
-                    this.queryInfo.AssignedTo);
-                this.queryInfo.CreatedBy = await this.ResolverService.Resolve(
+                    this.AssignedTo).ContinueWith(assignedTo => this.queryInfo.AssignedTo);
+
+                this.ResolverService.Resolve(
                     this.SessionService.Session.ProjectContext.GraphClient,
-                    this.SessionService.Session.ProjectContext.MemberEntitlementManagementClient,
-                    this.queryInfo.CreatedBy);
+                    this.CreatedBy).ContinueWith(createdBy => this.queryInfo.CreatedBy);
             }
         }
 
diff --git a/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs b/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs
index a163030..5034902 100644
--- a/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs
+++ b/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs
@@ -192,22 +192,14 @@ private PullRequestQuery CreateBuiltInQuery()
 
             // TODO(MEM): Mapping
 
-            if (this.queryInfo.AssignedTo == "@me")
+            if (this.queryInfo.AssignedTo.HasValue)
             {
-                query.GitPullRequestSearchCriteria.ReviewerId = pc.Identity.Id;
-            }
-            else if (this.queryInfo.AssignedTo != null)
-            {
-                query.GitPullRequestSearchCriteria.ReviewerId = new Guid(this.queryInfo.AssignedTo);
+                query.GitPullRequestSearchCriteria.ReviewerId = this.queryInfo.AssignedTo.Value;
             }
 
-            if (this.queryInfo.CreatedBy == "@me")
-            {
-                query.GitPullRequestSearchCriteria.CreatorId = pc.Identity.Id;
-            }
-            else if (this.queryInfo.CreatedBy != null)
+            if (this.queryInfo.CreatedBy.HasValue)
             {
-                query.GitPullRequestSearchCriteria.CreatorId = new Guid(this.queryInfo.CreatedBy);
+                query.GitPullRequestSearchCriteria.CreatorId = this.queryInfo.CreatedBy.Value;
             }
 
             return query;
diff --git a/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml b/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml
index 9bf31a5..3ba6422 100644
--- a/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml
+++ b/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml
@@ -6,7 +6,7 @@
         xmlns:tmc="clr-namespace:Microsoft.Tools.TeamMate.Controls"
         xmlns:av="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="av" x:Class="Microsoft.Tools.TeamMate.Windows.PullRequestQueryEditorDialog"
         FocusManager.FocusedElement="{Binding ElementName=nameTextBox}"
-        SizeToContent="WidthAndHeight" Height="306"
+        SizeToContent="WidthAndHeight"
         >
     <Window.Resources>
         <Style TargetType="{x:Type TextBox}">
@@ -20,10 +20,18 @@
     <Window.Style>
         <StaticResource ResourceKey="LyncDialogStyle"/>
     </Window.Style>
-    <AdornerDecorator>
-        <fwc:DialogPanel Margin="12,0,24,12">
+    <AdornerDecorator RenderTransformOrigin="0.5,0.5" Margin="0,0,0,0">
+        <AdornerDecorator.RenderTransform>
+            <TransformGroup>
+                <ScaleTransform/>
+                <SkewTransform AngleX="0.254"/>
+                <RotateTransform/>
+                <TranslateTransform X="0.679"/>
+            </TransformGroup>
+        </AdornerDecorator.RenderTransform>
+        <fwc:DialogPanel Margin="12,-3,24,10" Width="400">
             <fwc:DialogPanel.ButtonPanel>
-                <fwc:ButtonPanel>
+                <fwc:ButtonPanel Margin="0,4,0,4">
                     <Button x:Name="okButton"
                             Content="OK"
                             IsDefault="True"
@@ -31,7 +39,11 @@
                     <Button Style="{StaticResource LyncButtonStyle}" fw:UI.ButtonType="Cancel" />
                 </fwc:ButtonPanel>
             </fwc:DialogPanel.ButtonPanel>
-            <StackPanel Width="400" Height="230">
+            <StackPanel Margin="0,5,0,59    ">
+                <fwc:ProgressIndicator
+                    Foreground="{StaticResource ApplicationColorBrush}"
+                    Visibility="{Binding Progress.IsRunning,
+                    Converter={x:Static fw:Converters.VisibilityHidden}}" />
                 <TextBlock Style="{StaticResource LyncDialogTitleStyle}" Text="Pull Request Query"/>
                 <tmc:ValidationErrorView />
                 <Grid Margin="0,12,0,0">
@@ -51,41 +63,36 @@
                            Margin="0,0,6,6" Content="Name:"/>
                     <TextBox x:Name="nameTextBox"
                              Grid.Row="0"
-                             Grid.Column="1"
-                             Margin="0,0,0,6"
+                             Margin="82,0,0,6"
                              VerticalContentAlignment="Center"
-                             Text="{Binding Name, ValidatesOnNotifyDataErrors=True}" />
-                    <Label Grid.Row="1"
+                             Text="{Binding Name, ValidatesOnNotifyDataErrors=True}" Grid.ColumnSpan="2" />
+                    <Label
                            Grid.Column="0"
-                           Margin="0,0,6,6" Content="Project:"/>
+                           Margin="0,0,6,6" Content="Project:" Grid.Row="1"/>
                     <Label Grid.Row="2"
                            Grid.Column="0"
                            Margin="0,0,6,6" Content="Assigned To:"/>
                     <Label Grid.Row="3"
                         Grid.Column="0"
                         Margin="0,0,6,-26" Content="Created By:"/>
-                    <Label Grid.Row="4"
+                    <Label Grid.Row="3"
                            Grid.Column="0"
                            Margin="0,31,6,-57" Content="Status:"/>
-                    <ComboBox Grid.Row="1"
+                    <ComboBox
                               Margin="82,0,0,6"
                               ItemsSource="{Binding Project}"
                               SelectedItem="{Binding SelectedProject}"
                               Text="{Binding NewProject, UpdateSourceTrigger=LostFocus}"
-                              Grid.ColumnSpan="2" IsEditable="True" />
-                    <ComboBox Grid.Row="2"
+                              Grid.ColumnSpan="2" IsEditable="True" Grid.Row="1" />
+                    <TextBox Grid.Row="2"
                               Margin="82,0,0,6"
-                              ItemsSource="{Binding AssignedTo}"
-                              SelectedItem="{Binding SelectedAssignedTo}"
-                              Text="{Binding NewAssignedTo, UpdateSourceTrigger=LostFocus}"
-                              Grid.ColumnSpan="2" IsEditable="True" />
-                    <ComboBox Grid.Row="3"
+                              Text="{Binding AssignedTo, UpdateSourceTrigger=LostFocus}"
+                              Grid.ColumnSpan="2"/>
+                    <TextBox Grid.Row="3"
                               Margin="82,0,0,-26"
-                              ItemsSource="{Binding CreatedBy}"
-                              SelectedItem="{Binding SelectedCreatedBy}"
-                              Text="{Binding NewCreatedBy, UpdateSourceTrigger=LostFocus}"
-                              Grid.ColumnSpan="2" IsEditable="True" />
-                    <ComboBox Grid.Row="4"
+                              Text="{Binding CreatedBy, UpdateSourceTrigger=LostFocus}"
+                              Grid.ColumnSpan="2"/>
+                    <ComboBox Grid.Row="3"
                               Margin="82,31,0,-57"
                               ItemTemplate="{StaticResource EnumTemplate}"
                               ItemsSource="{Binding AllReviewStatuses}"
diff --git a/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml.cs b/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml.cs
index 61aadd0..3610cfe 100644
--- a/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml.cs
+++ b/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml.cs
@@ -1,4 +1,5 @@
-using Microsoft.Tools.TeamMate.Foundation.Windows.MVVM;
+using Microsoft.Tools.TeamMate.Foundation.Threading;
+using Microsoft.Tools.TeamMate.Foundation.Windows.MVVM;
 using Microsoft.Tools.TeamMate.ViewModels;
 using System.Windows;
 
@@ -23,7 +24,11 @@ private void HandleOkButtonClick(object sender, RoutedEventArgs e)
             if (isValid)
             {
                 PullRequestPickerViewModel viewModel = (PullRequestPickerViewModel)this.DataContext;
-                viewModel.Flush();
+
+                using (viewModel.Progress = new TaskContext())
+                {
+                    viewModel.Flush();
+                }
 
                 this.DialogResult = true;
             }

From 4197771fbca255e14d0e0aca29fce6a1071fcaf6 Mon Sep 17 00:00:00 2001
From: Marcus Markiewicz <me@supermem613.dev>
Date: Tue, 9 May 2023 15:31:54 -0400
Subject: [PATCH 05/11] Make resolution async

---
 Source/TeamMate/Model/PullRequestQueryInfo.cs |  4 +++
 Source/TeamMate/Services/ResolverService.cs   | 33 ++-----------------
 .../ViewModels/PullRequestPickerViewModel.cs  | 15 +++------
 .../ViewModels/PullRequestQueryViewModel.cs   | 23 ++++++++++---
 .../PullRequestQueryEditorDialog.xaml.cs      |  7 +---
 5 files changed, 31 insertions(+), 51 deletions(-)

diff --git a/Source/TeamMate/Model/PullRequestQueryInfo.cs b/Source/TeamMate/Model/PullRequestQueryInfo.cs
index 763cd9e..f6f535d 100644
--- a/Source/TeamMate/Model/PullRequestQueryInfo.cs
+++ b/Source/TeamMate/Model/PullRequestQueryInfo.cs
@@ -20,6 +20,10 @@ public class PullRequestQueryInfo
 
         public Guid? AssignedTo { get; set; }
 
+        public string SelectedCreatedBy { get; set; }
+
+        public string SelectedAssignedTo { get; set; }
+
         public string Project { get; set; }
     }
     public enum PullRequestQueryReviewStatus
diff --git a/Source/TeamMate/Services/ResolverService.cs b/Source/TeamMate/Services/ResolverService.cs
index d23da6e..511f915 100644
--- a/Source/TeamMate/Services/ResolverService.cs
+++ b/Source/TeamMate/Services/ResolverService.cs
@@ -4,6 +4,7 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Windows.Controls;
 
 namespace Microsoft.Tools.TeamMate.Services
 {
@@ -77,36 +78,6 @@ public async void FetchDataSync(
             Tasks.Add(FetchGroupsAsync(client));
         }
 
-        public void WaitToComplete()
-        {
-            foreach (var task in Tasks)
-            {
-                task.Wait();
-            }
-        }
-
-        public ObservableCollection<string> GetDisplayNames()
-        {
-            foreach (var task in Tasks)
-            {
-                task.Wait();
-            }
-
-            ObservableCollection<string> strings = new ObservableCollection<string>();
-
-            foreach (var user in GraphUserCache)
-            {
-                strings.Add(user.DisplayName);
-            }
-
-            foreach (var user in GraphGroupCache)
-            {
-                strings.Add(user.DisplayName);
-            }
-
-            return strings;
-        }
-
         public async Task<Guid?> Resolve(
             GraphHttpClient client,
             string value)
@@ -116,6 +87,8 @@ public ObservableCollection<string> GetDisplayNames()
                 return null;
             }
 
+            await Task.Run(() => { foreach (var task in this.Tasks) { task.Wait(); } });
+
             foreach (var user in GraphUserCache)
             {
                 if (user.MailAddress != null &&
diff --git a/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs b/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
index 93deb5a..ba8bb3d 100644
--- a/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
+++ b/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
@@ -7,6 +7,7 @@
 using System.Collections;
 using System.Collections.ObjectModel;
 using System.ComponentModel.Composition;
+using System.Threading.Tasks;
 
 namespace Microsoft.Tools.TeamMate.ViewModels
 {
@@ -121,8 +122,8 @@ private void Invalidate()
             {
                 this.Name = this.queryInfo.Name;
                 this.ReviewStatus = this.queryInfo.ReviewStatus;
-                this.AssignedTo = null;
-                this.CreatedBy = null;
+                this.AssignedTo = this.queryInfo.SelectedAssignedTo;
+                this.CreatedBy = this.queryInfo.SelectedAssignedTo;
             }
         }
 
@@ -133,14 +134,8 @@ public async void Flush()
                 this.queryInfo.Name = this.Name.Trim();
                 this.queryInfo.ReviewStatus = this.ReviewStatus;
                 this.queryInfo.Project = this.SelectedProject.Trim();
-
-                this.ResolverService.Resolve(
-                    this.SessionService.Session.ProjectContext.GraphClient,
-                    this.AssignedTo).ContinueWith(assignedTo => this.queryInfo.AssignedTo);
-
-                this.ResolverService.Resolve(
-                    this.SessionService.Session.ProjectContext.GraphClient,
-                    this.CreatedBy).ContinueWith(createdBy => this.queryInfo.CreatedBy);
+                this.queryInfo.SelectedAssignedTo = this.AssignedTo;
+                this.queryInfo.SelectedCreatedBy = this.CreatedBy;
             }
         }
 
diff --git a/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs b/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs
index 5034902..d457afa 100644
--- a/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs
+++ b/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs
@@ -70,7 +70,10 @@ public override Task RefreshAsync(NotificationScope notificationScope = null)
 
         [Import]
         public SessionService SessionService { get; set; }
- 
+
+        [Import]
+        public ResolverService ResolverService { get; set; }
+
         public ProjectInfo ProjectInfo { get; private set; }
 
         private async Task DoRefreshAsync(NotificationScope notificationScope)
@@ -86,7 +89,7 @@ private async Task DoRefreshAsync(NotificationScope notificationScope)
                 {
                     FireQueryExecuting();
 
-                    PullRequestQuery query = CreateBuiltInQuery();
+                    PullRequestQuery query = await CreateBuiltInQuery();
 
                     if (query != null)
                     {
@@ -170,7 +173,7 @@ private async Task DoRefreshAsync(NotificationScope notificationScope)
             }
         }
 
-        private PullRequestQuery CreateBuiltInQuery()
+        private async Task<PullRequestQuery> CreateBuiltInQuery()
         {
             var pc = this.SessionService.Session.ProjectContext;
           
@@ -190,17 +193,27 @@ private PullRequestQuery CreateBuiltInQuery()
                 Status = PullRequestQueryInfo.ReviewStatusesMap[this.queryInfo.ReviewStatus],
             };
 
-            // TODO(MEM): Mapping
-
             if (this.queryInfo.AssignedTo.HasValue)
             {
                 query.GitPullRequestSearchCriteria.ReviewerId = this.queryInfo.AssignedTo.Value;
             }
+            else if (this.queryInfo.SelectedAssignedTo != null)
+            {
+                query.GitPullRequestSearchCriteria.ReviewerId = await this.ResolverService.Resolve(
+                    this.SessionService.Session.ProjectContext.GraphClient,
+                    this.queryInfo.SelectedAssignedTo);
+            }
 
             if (this.queryInfo.CreatedBy.HasValue)
             {
                 query.GitPullRequestSearchCriteria.CreatorId = this.queryInfo.CreatedBy.Value;
             }
+            else if (this.queryInfo.CreatedBy != null)
+            {
+                query.GitPullRequestSearchCriteria.CreatorId = await this.ResolverService.Resolve(
+                    this.SessionService.Session.ProjectContext.GraphClient,
+                    this.queryInfo.SelectedCreatedBy);
+            }
 
             return query;
         }
diff --git a/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml.cs b/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml.cs
index 3610cfe..b6eba65 100644
--- a/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml.cs
+++ b/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml.cs
@@ -24,12 +24,7 @@ private void HandleOkButtonClick(object sender, RoutedEventArgs e)
             if (isValid)
             {
                 PullRequestPickerViewModel viewModel = (PullRequestPickerViewModel)this.DataContext;
-
-                using (viewModel.Progress = new TaskContext())
-                {
-                    viewModel.Flush();
-                }
-
+                viewModel.Flush();
                 this.DialogResult = true;
             }
         }

From f366004877eae6d2fee5222bd70fae7e2f1349d0 Mon Sep 17 00:00:00 2001
From: Marcus Markiewicz <me@supermem613.dev>
Date: Tue, 9 May 2023 15:35:31 -0400
Subject: [PATCH 06/11] Move project initialization to the right spot

---
 Source/TeamMate/Services/WindowService.cs              |  7 -------
 .../TeamMate/ViewModels/PullRequestPickerViewModel.cs  | 10 ++++++++++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Source/TeamMate/Services/WindowService.cs b/Source/TeamMate/Services/WindowService.cs
index 3bf0887..a17d201 100644
--- a/Source/TeamMate/Services/WindowService.cs
+++ b/Source/TeamMate/Services/WindowService.cs
@@ -300,13 +300,6 @@ public PullRequestQueryInfo ShowPullRequestQueryEditorDialog(ViewModelBase owner
             dialog.DataContext = viewModel;
             dialog.Owner = View.GetWindow(ownerViewModel);
 
-            // TODO(MEM)
-            var projects = this.SettingsService.Settings.Projects;
-            foreach (var project in projects)
-            {
-                viewModel.AddProject(project.ProjectName);
-            }
-
             return (dialog.ShowDialog() == true) ? viewModel.QueryInfo : null;
         }
 
diff --git a/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs b/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
index ba8bb3d..7c06f55 100644
--- a/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
+++ b/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
@@ -8,6 +8,7 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel.Composition;
 using System.Threading.Tasks;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.Window;
 
 namespace Microsoft.Tools.TeamMate.ViewModels
 {
@@ -32,6 +33,9 @@ public class PullRequestPickerViewModel : ValidatableViewModelBase
         [Import]
         public SessionService SessionService { get; set; }
 
+        [Import]
+        public SettingsService SettingsService { get; set; }
+
         public PullRequestPickerViewModel()
         {
             Validator
@@ -125,6 +129,12 @@ private void Invalidate()
                 this.AssignedTo = this.queryInfo.SelectedAssignedTo;
                 this.CreatedBy = this.queryInfo.SelectedAssignedTo;
             }
+
+            var projects = this.SettingsService.Settings.Projects;
+            foreach (var project in projects)
+            {
+                AddProject(project.ProjectName);
+            }
         }
 
         public async void Flush()

From 818e7a4d751c56a6c72d8496c57afd9999b71c0a Mon Sep 17 00:00:00 2001
From: Marcus Markiewicz <me@supermem613.dev>
Date: Tue, 9 May 2023 15:55:49 -0400
Subject: [PATCH 07/11] Add validation for the project field

---
 .../ViewModels/PullRequestPickerViewModel.cs  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs b/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
index 7c06f55..f45da7f 100644
--- a/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
+++ b/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
@@ -7,6 +7,7 @@
 using System.Collections;
 using System.Collections.ObjectModel;
 using System.ComponentModel.Composition;
+using System.Linq;
 using System.Threading.Tasks;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement.Window;
 
@@ -41,6 +42,10 @@ public PullRequestPickerViewModel()
             Validator
                 .RuleForProperty(() => Name)
                     .IsNotEmpty();
+
+            Validator
+                .RuleForProperty(() => SelectedProject)
+                    .IsNotEmpty();
         }
 
         public PullRequestQueryInfo QueryInfo
@@ -112,14 +117,6 @@ public string NewProject
             }
         }
 
-        private TaskContext progress = TaskContext.None;
-
-        public TaskContext Progress
-        {
-            get { return this.progress; }
-            set { this.SetProperty(ref this.progress, value); }
-        }
-
         private void Invalidate()
         {
             if (this.queryInfo != null)
@@ -131,13 +128,16 @@ private void Invalidate()
             }
 
             var projects = this.SettingsService.Settings.Projects;
-            foreach (var project in projects)
+            if (projects.Count > 0)
             {
-                AddProject(project.ProjectName);
+                foreach (var project in projects)
+                {
+                    AddProject(project.ProjectName);
+                }
             }
         }
 
-        public async void Flush()
+        public void Flush()
         {
             if (this.queryInfo != null)
             {

From 5ff0215ea84e9d1ad362d718dad4006603608cd0 Mon Sep 17 00:00:00 2001
From: Marcus Markiewicz <me@supermem613.dev>
Date: Tue, 9 May 2023 16:19:38 -0400
Subject: [PATCH 08/11] Fix persistence for PR queries

---
 Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs   | 4 ++++
 Source/TeamMate/ViewModels/PullRequestRowViewModel.cs     | 2 +-
 Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs b/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs
index d457afa..765d84b 100644
--- a/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs
+++ b/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs
@@ -202,6 +202,8 @@ private async Task<PullRequestQuery> CreateBuiltInQuery()
                 query.GitPullRequestSearchCriteria.ReviewerId = await this.ResolverService.Resolve(
                     this.SessionService.Session.ProjectContext.GraphClient,
                     this.queryInfo.SelectedAssignedTo);
+
+                this.queryInfo.AssignedTo = query.GitPullRequestSearchCriteria.ReviewerId;
             }
 
             if (this.queryInfo.CreatedBy.HasValue)
@@ -213,6 +215,8 @@ private async Task<PullRequestQuery> CreateBuiltInQuery()
                 query.GitPullRequestSearchCriteria.CreatorId = await this.ResolverService.Resolve(
                     this.SessionService.Session.ProjectContext.GraphClient,
                     this.queryInfo.SelectedCreatedBy);
+
+                this.queryInfo.CreatedBy = query.GitPullRequestSearchCriteria.CreatorId;
             }
 
             return query;
diff --git a/Source/TeamMate/ViewModels/PullRequestRowViewModel.cs b/Source/TeamMate/ViewModels/PullRequestRowViewModel.cs
index 95c46b3..fd42d00 100644
--- a/Source/TeamMate/ViewModels/PullRequestRowViewModel.cs
+++ b/Source/TeamMate/ViewModels/PullRequestRowViewModel.cs
@@ -73,7 +73,7 @@ private void Invalidate()
 
             if (this.IsSignedOff)
             {
-                this.IsSignedOffByMe = this.Reference.Reviewers.Count(x => x.Id == this.IdentityRef && (x.Vote == 10 || x.Vote == 5)) == 1;
+                this.IsSignedOffByMe = this.Reference.Reviewers.Count(x => x.Id == this.IdentityRef && (x.Vote == 10 || x.Vote == 5)) != 0;
             }
 
             this.BottomLeftText = this.CreatedBy;
diff --git a/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml b/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml
index 3ba6422..6e8774c 100644
--- a/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml
+++ b/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml
@@ -78,7 +78,7 @@
                     <Label Grid.Row="3"
                            Grid.Column="0"
                            Margin="0,31,6,-57" Content="Status:"/>
-                    <ComboBox
+                    <ComboBox x:Name="projectTextBox"
                               Margin="82,0,0,6"
                               ItemsSource="{Binding Project}"
                               SelectedItem="{Binding SelectedProject}"

From 37e94a3d8f8496de9b7fb6a4b016c12261491521 Mon Sep 17 00:00:00 2001
From: Marcus Markiewicz <me@supermem613.dev>
Date: Tue, 9 May 2023 16:21:36 -0400
Subject: [PATCH 09/11] Fix IsSignedOffByMe

---
 Source/TeamMate/ViewModels/PullRequestRowViewModel.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Source/TeamMate/ViewModels/PullRequestRowViewModel.cs b/Source/TeamMate/ViewModels/PullRequestRowViewModel.cs
index fd42d00..0c7f278 100644
--- a/Source/TeamMate/ViewModels/PullRequestRowViewModel.cs
+++ b/Source/TeamMate/ViewModels/PullRequestRowViewModel.cs
@@ -70,12 +70,7 @@ private void Invalidate()
             this.IsPending = this.IsActive && !this.IsSignedOff;
             this.IsCompleted = (this.Reference.Status == PullRequestStatus.Completed);
             this.IsAssignedToMe = this.IsActive && this.Reference.Reviewers.Count(x => x.Id == this.IdentityRef) == 1;
-
-            if (this.IsSignedOff)
-            {
-                this.IsSignedOffByMe = this.Reference.Reviewers.Count(x => x.Id == this.IdentityRef && (x.Vote == 10 || x.Vote == 5)) != 0;
-            }
-
+            this.IsSignedOffByMe = this.Reference.Reviewers.Count(x => x.Id == this.IdentityRef && (x.Vote == 10 || x.Vote == 5)) != 0;
             this.BottomLeftText = this.CreatedBy;
 
             if (this.IterationCount > 1)

From ccb9d438cfe1e6b413ef228e530295809ec2bc5a Mon Sep 17 00:00:00 2001
From: Marcus Markiewicz <me@supermem613.dev>
Date: Tue, 9 May 2023 16:33:12 -0400
Subject: [PATCH 10/11] Make IsSignedOffByMe into IsSignedOffOrDeclinedByMe

---
 .../ViewModels/PullRequestPageViewModel.cs    |  2 +-
 .../ViewModels/PullRequestQueryViewModel.cs   | 41 ++++++-------------
 .../ViewModels/PullRequestRowViewModel.cs     |  4 +-
 3 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/Source/TeamMate/ViewModels/PullRequestPageViewModel.cs b/Source/TeamMate/ViewModels/PullRequestPageViewModel.cs
index 0a4fe51..aab91d3 100644
--- a/Source/TeamMate/ViewModels/PullRequestPageViewModel.cs
+++ b/Source/TeamMate/ViewModels/PullRequestPageViewModel.cs
@@ -63,7 +63,7 @@ private ListViewModel CreateListViewModel(ICollectionView collectionView)
             model.Filters.Add(new ListViewFilter("Pending", (o) => ((PullRequestRowViewModel)o).IsPending));
             model.Filters.Add(new ListViewFilter("Waiting", (o) => ((PullRequestRowViewModel)o).IsWaiting));
             model.Filters.Add(new ListViewFilter("Signed Off", (o) => ((PullRequestRowViewModel)o).IsSignedOff));
-            model.Filters.Add(new ListViewFilter("Not Signed Off By Me", (o) => !((PullRequestRowViewModel)o).IsSignedOffByMe));
+            model.Filters.Add(new ListViewFilter("Not Signed Off / Declined By Me", (o) => !((PullRequestRowViewModel)o).IsSignedOffOrDeclinedByMe));
             model.Filters.Add(new ListViewFilter("Completed", (o) => ((PullRequestRowViewModel)o).IsCompleted));
 
             model.Fields.Add(ListFieldInfo.Create<string>("CreatedBy", "Created By"));
diff --git a/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs b/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs
index 765d84b..90284f9 100644
--- a/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs
+++ b/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs
@@ -109,46 +109,29 @@ private async Task DoRefreshAsync(NotificationScope notificationScope)
 
                         var pullRequests = queryAsyncTask.Result.Select(r => CreateViewModel(r, projectContext)).ToArray();
 
-                        List<PullRequestRowViewModel> actualPullRequests = new List<PullRequestRowViewModel>();
-
                         foreach (var pullRequest in pullRequests)
                         {
-                            bool hasDeclined = false;
-                            foreach (var reviewer in pullRequest.Reference.Reviewers)
-                            {
-                                if (reviewer.Id == this.SessionService.Session.ProjectContext.Identity.Id.ToString())
-                                {
-                                    hasDeclined = reviewer.HasDeclined.GetValueOrDefault(false);
-                                    break;
-                                }
-                            }
-
-                            if (!hasDeclined)
-                            {
-                                var asyncTask = projectContext.GitHttpClient.GetPullRequestIterationsAsync(
-                                    pullRequest.Reference.Repository.Id,
-                                    pullRequest.Reference.PullRequestId);
-
-                                iterationTasks.Add(asyncTask);
-
-                                pullRequest.Url = projectContext.HyperlinkFactory.GetPullRequestUrl(
-                                    pullRequest.Reference.PullRequestId,
-                                    query.ProjectName,
-                                    pullRequest.Reference.Repository.Name);
-
-                                actualPullRequests.Add(pullRequest);
-                            }
+                            var asyncTask = projectContext.GitHttpClient.GetPullRequestIterationsAsync(
+                                pullRequest.Reference.Repository.Id,
+                                pullRequest.Reference.PullRequestId);
+
+                            iterationTasks.Add(asyncTask);
+
+                            pullRequest.Url = projectContext.HyperlinkFactory.GetPullRequestUrl(
+                                pullRequest.Reference.PullRequestId,
+                                query.ProjectName,
+                                pullRequest.Reference.Repository.Name);
                         }
 
                         await Task.WhenAll(iterationTasks.ToArray());
 
                         int i = 0;
-                        foreach (var pullRequest in actualPullRequests)
+                        foreach (var pullRequest in pullRequests)
                         {
                             pullRequest.Iterations = iterationTasks[i++].Result;
                         }
 
-                        OnQueryCompleted(projectContext, actualPullRequests.ToArray(), notificationScope);
+                        OnQueryCompleted(projectContext, pullRequests, notificationScope);
                     }
                     else
                     {
diff --git a/Source/TeamMate/ViewModels/PullRequestRowViewModel.cs b/Source/TeamMate/ViewModels/PullRequestRowViewModel.cs
index 0c7f278..9044528 100644
--- a/Source/TeamMate/ViewModels/PullRequestRowViewModel.cs
+++ b/Source/TeamMate/ViewModels/PullRequestRowViewModel.cs
@@ -70,7 +70,7 @@ private void Invalidate()
             this.IsPending = this.IsActive && !this.IsSignedOff;
             this.IsCompleted = (this.Reference.Status == PullRequestStatus.Completed);
             this.IsAssignedToMe = this.IsActive && this.Reference.Reviewers.Count(x => x.Id == this.IdentityRef) == 1;
-            this.IsSignedOffByMe = this.Reference.Reviewers.Count(x => x.Id == this.IdentityRef && (x.Vote == 10 || x.Vote == 5)) != 0;
+            this.IsSignedOffOrDeclinedByMe = this.Reference.Reviewers.Count(x => x.Id == this.IdentityRef && (x.Vote == 10 || x.Vote == 5 || x.HasDeclined.GetValueOrDefault(false))) != 0;
             this.BottomLeftText = this.CreatedBy;
 
             if (this.IterationCount > 1)
@@ -87,7 +87,7 @@ private void Invalidate()
         public bool IsActive { get; set; }
         public bool IsPending { get; set; }
         public bool IsSignedOff { get; set; }
-        public bool IsSignedOffByMe { get; set; }
+        public bool IsSignedOffOrDeclinedByMe { get; set; }
         public bool IsCompleted { get; set; }
         public bool IsWaiting { get; set; }
 

From b9ab229a1a29c947e09ee714772c30e398149684 Mon Sep 17 00:00:00 2001
From: Marcus Markiewicz <me@supermem613.dev>
Date: Wed, 10 May 2023 10:00:29 -0400
Subject: [PATCH 11/11] Persist AssignedTo / CreatedBy for PR Queries

---
 Source/TeamMate/Model/ProjectContextSerializer.cs    |  6 ++++++
 Source/TeamMate/Model/PullRequestQueryInfo.cs        |  4 ++--
 Source/TeamMate/Services/ResolverService.cs          |  2 +-
 Source/TeamMate/TeamMate.csproj                      |  3 ---
 .../ViewModels/PullRequestPickerViewModel.cs         | 12 ++++++------
 .../TeamMate/ViewModels/PullRequestQueryViewModel.cs |  8 ++++----
 .../Windows/PullRequestQueryEditorDialog.xaml        |  4 ++--
 7 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/Source/TeamMate/Model/ProjectContextSerializer.cs b/Source/TeamMate/Model/ProjectContextSerializer.cs
index 5fdff40..e041fa4 100644
--- a/Source/TeamMate/Model/ProjectContextSerializer.cs
+++ b/Source/TeamMate/Model/ProjectContextSerializer.cs
@@ -78,6 +78,8 @@ private PullRequestQueryInfo ReadPullRequestQueryTileInfo(XElement e)
             query.AssignedTo = e.GetAttribute<Guid?>(Schema.AssignedTo);
             query.CreatedBy = e.GetAttribute<Guid?>(Schema.CreatedBy);
             query.Project = e.GetAttribute<string>(Schema.PullRequestProject);
+            query.UIAssignedTo = e.GetAttribute<string>(Schema.UIAssignedTo);
+            query.UICreatedBy = e.GetAttribute<string>(Schema.UICreatedBy);
 
             return query;
         }
@@ -146,6 +148,8 @@ private XElement WritePullRequestQueryTileInfo(PullRequestQueryInfo query)
             e.SetAttribute<PullRequestQueryReviewStatus>(Schema.ReviewStatus, query.ReviewStatus);
             e.SetAttribute<Guid?>(Schema.CreatedBy, query.CreatedBy);
             e.SetAttribute<Guid?>(Schema.AssignedTo, query.AssignedTo);
+            e.SetAttribute<string>(Schema.UICreatedBy, query.UICreatedBy);
+            e.SetAttribute<string>(Schema.UIAssignedTo, query.UIAssignedTo);
             e.SetAttribute<string>(Schema.PullRequestProject, query.Project);
 
             return e;
@@ -387,6 +391,8 @@ private static class Schema
             public const string State = "State";
             public const string Title = "Title";
             public const string Revision = "Revision";
+            public const string UIAssignedTo = "UIAssignedTo";
+            public const string UICreatedBy = "UICreatedBy";
 
             public static XName RecentItems = "RecentItems";
             public static XName RecentlyViewedWorkItems = "RecentlyViewedWorkItems";
diff --git a/Source/TeamMate/Model/PullRequestQueryInfo.cs b/Source/TeamMate/Model/PullRequestQueryInfo.cs
index f6f535d..dcc6efe 100644
--- a/Source/TeamMate/Model/PullRequestQueryInfo.cs
+++ b/Source/TeamMate/Model/PullRequestQueryInfo.cs
@@ -20,9 +20,9 @@ public class PullRequestQueryInfo
 
         public Guid? AssignedTo { get; set; }
 
-        public string SelectedCreatedBy { get; set; }
+        public string UICreatedBy { get; set; }
 
-        public string SelectedAssignedTo { get; set; }
+        public string UIAssignedTo { get; set; }
 
         public string Project { get; set; }
     }
diff --git a/Source/TeamMate/Services/ResolverService.cs b/Source/TeamMate/Services/ResolverService.cs
index 511f915..7de0138 100644
--- a/Source/TeamMate/Services/ResolverService.cs
+++ b/Source/TeamMate/Services/ResolverService.cs
@@ -71,7 +71,7 @@ private async Task<List<GraphGroup>> FetchGroupsAsync(
             return groups;
         }
 
-        public async void FetchDataSync(
+        public void FetchDataSync(
             GraphHttpClient client)
         {
             Tasks.Add(FetchUsersAsync(client));
diff --git a/Source/TeamMate/TeamMate.csproj b/Source/TeamMate/TeamMate.csproj
index ce559ea..81891c6 100644
--- a/Source/TeamMate/TeamMate.csproj
+++ b/Source/TeamMate/TeamMate.csproj
@@ -1000,9 +1000,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Services.MemberEntitlementManagement.WebApi">
-      <Version>16.205.1</Version>
-    </PackageReference>
     <PackageReference Include="SimpleInjector">
       <Version>5.3.3</Version>
     </PackageReference>
diff --git a/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs b/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
index f45da7f..a33f049 100644
--- a/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
+++ b/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs
@@ -71,13 +71,13 @@ public PullRequestQueryReviewStatus ReviewStatus
             get { return this.reviewStatus; }
             set { SetProperty(ref this.reviewStatus, value); }
         }
-        public string AssignedTo
+        public string UIAssignedTo
         {
             get { return this.assignedTo; }
             set { SetProperty(ref this.assignedTo, value); }
         }
 
-        public string CreatedBy
+        public string UICreatedBy
         {
             get { return this.createdBy; }
             set { SetProperty(ref this.createdBy, value); }
@@ -123,8 +123,8 @@ private void Invalidate()
             {
                 this.Name = this.queryInfo.Name;
                 this.ReviewStatus = this.queryInfo.ReviewStatus;
-                this.AssignedTo = this.queryInfo.SelectedAssignedTo;
-                this.CreatedBy = this.queryInfo.SelectedAssignedTo;
+                this.UIAssignedTo = this.queryInfo.UIAssignedTo;
+                this.UICreatedBy = this.queryInfo.UICreatedBy;
             }
 
             var projects = this.SettingsService.Settings.Projects;
@@ -144,8 +144,8 @@ public void Flush()
                 this.queryInfo.Name = this.Name.Trim();
                 this.queryInfo.ReviewStatus = this.ReviewStatus;
                 this.queryInfo.Project = this.SelectedProject.Trim();
-                this.queryInfo.SelectedAssignedTo = this.AssignedTo;
-                this.queryInfo.SelectedCreatedBy = this.CreatedBy;
+                this.queryInfo.UIAssignedTo = this.UIAssignedTo;
+                this.queryInfo.UICreatedBy = this.UICreatedBy;
             }
         }
 
diff --git a/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs b/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs
index 90284f9..dd92144 100644
--- a/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs
+++ b/Source/TeamMate/ViewModels/PullRequestQueryViewModel.cs
@@ -180,11 +180,11 @@ private async Task<PullRequestQuery> CreateBuiltInQuery()
             {
                 query.GitPullRequestSearchCriteria.ReviewerId = this.queryInfo.AssignedTo.Value;
             }
-            else if (this.queryInfo.SelectedAssignedTo != null)
+            else if (this.queryInfo.UIAssignedTo != null)
             {
                 query.GitPullRequestSearchCriteria.ReviewerId = await this.ResolverService.Resolve(
                     this.SessionService.Session.ProjectContext.GraphClient,
-                    this.queryInfo.SelectedAssignedTo);
+                    this.queryInfo.UIAssignedTo);
 
                 this.queryInfo.AssignedTo = query.GitPullRequestSearchCriteria.ReviewerId;
             }
@@ -193,11 +193,11 @@ private async Task<PullRequestQuery> CreateBuiltInQuery()
             {
                 query.GitPullRequestSearchCriteria.CreatorId = this.queryInfo.CreatedBy.Value;
             }
-            else if (this.queryInfo.CreatedBy != null)
+            else if (this.queryInfo.UICreatedBy != null)
             {
                 query.GitPullRequestSearchCriteria.CreatorId = await this.ResolverService.Resolve(
                     this.SessionService.Session.ProjectContext.GraphClient,
-                    this.queryInfo.SelectedCreatedBy);
+                    this.queryInfo.UICreatedBy);
 
                 this.queryInfo.CreatedBy = query.GitPullRequestSearchCriteria.CreatorId;
             }
diff --git a/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml b/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml
index 6e8774c..7efd4c3 100644
--- a/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml
+++ b/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml
@@ -86,11 +86,11 @@
                               Grid.ColumnSpan="2" IsEditable="True" Grid.Row="1" />
                     <TextBox Grid.Row="2"
                               Margin="82,0,0,6"
-                              Text="{Binding AssignedTo, UpdateSourceTrigger=LostFocus}"
+                              Text="{Binding UIAssignedTo, UpdateSourceTrigger=LostFocus}"
                               Grid.ColumnSpan="2"/>
                     <TextBox Grid.Row="3"
                               Margin="82,0,0,-26"
-                              Text="{Binding CreatedBy, UpdateSourceTrigger=LostFocus}"
+                              Text="{Binding UICreatedBy, UpdateSourceTrigger=LostFocus}"
                               Grid.ColumnSpan="2"/>
                     <ComboBox Grid.Row="3"
                               Margin="82,31,0,-57"