Merge pull request #944 from github/fixes/843-pr-list-filters

Fix PR list filters

Author: shana

src/GitHub.App/ViewModels/PullRequestListViewModel.cs

@@ -31,6 +31,7 @@ public class PullRequestListViewModel : PanePageViewModelBase, IPullRequestListV
         readonly TrackingCollection<IAccount> trackingAssignees;
         readonly IPackageSettings settings;
         readonly PullRequestListUIState listSettings;
+        readonly bool constructing;
 
         [ImportingConstructor]
         PullRequestListViewModel(
@@ -46,6 +47,7 @@ public PullRequestListViewModel(
             ILocalRepositoryModel repository,
             IPackageSettings settings)
         {
+            constructing = true;
             this.repositoryHost = repositoryHost;
             this.repository = repository;
             this.settings = settings;
@@ -81,18 +83,20 @@ public PullRequestListViewModel(
                 .Subscribe(s => UpdateFilter(s, SelectedAssignee, SelectedAuthor));
 
             this.WhenAny(x => x.SelectedAssignee, x => x.Value)
-                .Where(x => PullRequests != null && x != EmptyUser && !IsBusy)
+                .Where(x => PullRequests != null && x != EmptyUser)
                 .Subscribe(a => UpdateFilter(SelectedState, a, SelectedAuthor));
 
             this.WhenAny(x => x.SelectedAuthor, x => x.Value)
-                .Where(x => PullRequests != null && x != EmptyUser && !IsBusy)
+                .Where(x => PullRequests != null && x != EmptyUser)
                 .Subscribe(a => UpdateFilter(SelectedState, SelectedAssignee, a));
 
             SelectedState = States.FirstOrDefault(x => x.Name == listSettings.SelectedState) ?? States[0];
             OpenPullRequest = ReactiveCommand.Create();
             OpenPullRequest.Subscribe(DoOpenPullRequest);
             CreatePullRequest = ReactiveCommand.Create();
             CreatePullRequest.Subscribe(_ => DoCreatePullRequest());
+
+            constructing = false;
         }
 
         public override void Initialize([AllowNull] ViewWithData data)
@@ -146,6 +150,7 @@ void UpdateFilter(PullRequestState state, [AllowNull]IAccount ass, [AllowNull]IA
                 (!state.IsOpen.HasValue || state.IsOpen == pr.IsOpen) &&
                      (ass == null || ass.Equals(pr.Assignee)) &&
                      (aut == null || aut.Equals(pr.Author));
+            SaveSettings();
         }
 
         bool isBusy;
@@ -240,7 +245,6 @@ protected void Dispose(bool disposing)
                 pullRequests.Dispose();
                 trackingAuthors.Dispose();
                 trackingAssignees.Dispose();
-                SaveSettings();
                 disposed = true;
             }
         }
@@ -253,10 +257,13 @@ public void Dispose()
 
         void SaveSettings()
         {
-            listSettings.SelectedState = SelectedState.Name;
-            listSettings.SelectedAssignee = SelectedAssignee?.Login;
-            listSettings.SelectedAuthor = SelectedAuthor?.Login;
-            settings.Save();
+            if (!constructing)
+            {
+                listSettings.SelectedState = SelectedState.Name;
+                listSettings.SelectedAssignee = SelectedAssignee?.Login;
+                listSettings.SelectedAuthor = SelectedAuthor?.Login;
+                settings.Save();
+            }
         }
 
         void DoOpenPullRequest(object pullRequest)

src/GitHub.VisualStudio/UI/Views/PullRequestListView.xaml

@@ -115,23 +115,20 @@
 
       <WrapPanel Grid.Column="0" HorizontalAlignment="Stretch">
 
-        <ui:LinkDropDown IsEnabled="{Binding IsBusy, Converter={ui:InverseBooleanConverter}}"
-                         ItemsSource="{Binding States}"
+        <ui:LinkDropDown ItemsSource="{Binding States}"
                          SelectedItem="{Binding SelectedState}"
                          AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.PullRequestListStatusFilterComboBox}" />
 
         <Separator Style="{StaticResource VerticalSeparator}" />
 
         <ui:LinkDropDown Header="Assignee"
-                         IsEnabled="{Binding IsBusy, Converter={ui:InverseBooleanConverter}}"
                          ItemsSource="{Binding Source={StaticResource AssigneeCollectionViewSource}}"
                          SelectedItem="{Binding SelectedAssignee}"
                          AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.PullRequestListAssigneeFilterComboBox}"/>
 
         <Separator Style="{StaticResource VerticalSeparator}" />
 
         <ui:LinkDropDown Header="Author"
-                         IsEnabled="{Binding IsBusy, Converter={ui:InverseBooleanConverter}}"
                          ItemsSource="{Binding Source={StaticResource AuthorCollectionViewSource}}"
                          SelectedItem="{Binding SelectedAuthor}"
                          AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.PullRequestListAuthorFilterComboBox}" />