Merge branch 'master' into fixes/455-source-branch-does-not-exist-remotely

Conflicts:
    src/GitHub.App/ViewModels/PullRequestCreationViewModel.cs

Author: grokys

src/GitHub.App/ViewModels/PullRequestCreationViewModel.cs

@@ -16,6 +16,7 @@
 using System.Reactive.Subjects;
 using System.Reactive;
 using System.Diagnostics.CodeAnalysis;
+using Octokit;
 
 namespace GitHub.ViewModels
 {
@@ -83,7 +84,10 @@ public PullRequestCreationViewModel(IRepositoryHost repositoryHost, ISimpleRepos
             {
                 if (!ex.IsCriticalException())
                 {
-                    notifications.ShowError(ex.Message);
+                    //TODO:Will need a uniform solution to HTTP exception message handling
+                    var apiException = ex as ApiValidationException;
+                    var error = apiException?.ApiError?.Errors?.FirstOrDefault();
+                    notifications.ShowError(error?.Message ?? ex.Message);
                 }
             });
         }

src/GitHub.App/ViewModels/PullRequestListViewModel.cs

@@ -29,7 +29,6 @@ public class PullRequestListViewModel : BaseViewModel, IPullRequestListViewModel
         readonly TrackingCollection<IAccount> trackingAssignees;
         readonly IPackageSettings settings;
         readonly PullRequestListUIState listSettings;
-        bool pullRequestsLoaded;
 
         [ImportingConstructor]
         PullRequestListViewModel(
@@ -84,11 +83,11 @@ public PullRequestListViewModel(
                 .Subscribe(s => UpdateFilter(s, SelectedAssignee, SelectedAuthor));
 
             this.WhenAny(x => x.SelectedAssignee, x => x.Value)
-                .Where(x => PullRequests != null && x != EmptyUser && pullRequestsLoaded)
+                .Where(x => PullRequests != null && x != EmptyUser && IsLoaded)
                 .Subscribe(a => UpdateFilter(SelectedState, a, SelectedAuthor));
 
             this.WhenAny(x => x.SelectedAuthor, x => x.Value)
-                .Where(x => PullRequests != null && x != EmptyUser && pullRequestsLoaded)
+                .Where(x => PullRequests != null && x != EmptyUser && IsLoaded)
                 .Subscribe(a => UpdateFilter(SelectedState, SelectedAssignee, a));
 
             SelectedState = States.FirstOrDefault(x => x.Name == listSettings.SelectedState) ?? States[0];
@@ -98,7 +97,7 @@ public override void Initialize([AllowNull] ViewWithData data)
         {
             base.Initialize(data);
 
-            pullRequestsLoaded = false;
+            IsLoaded = false;
 
             PullRequests = repositoryHost.ModelService.GetPullRequests(repository, pullRequests);
             pullRequests.Subscribe(pr =>
@@ -121,7 +120,7 @@ public override void Initialize([AllowNull] ViewWithData data)
                         SelectedAssignee = Assignees.FirstOrDefault(x => x.Login == listSettings.SelectedAssignee);
                     }
 
-                    pullRequestsLoaded = true;
+                    IsLoaded = true;
                     UpdateFilter(SelectedState, SelectedAssignee, SelectedAuthor);
                 });
         }
@@ -136,6 +135,13 @@ void UpdateFilter(PullRequestState state, [AllowNull]IAccount ass, [AllowNull]IA
                      (aut == null || aut.Equals(pr.Author));
         }
 
+        bool isLoaded;
+        public bool IsLoaded
+        {
+            get { return isLoaded; }
+            private set { this.RaiseAndSetIfChanged(ref isLoaded, value); }
+        }
+
         ITrackingCollection<IPullRequestModel> pullRequests;
         public ITrackingCollection<IPullRequestModel> PullRequests
         {

src/GitHub.VisualStudio.UI/Styles/LinkDropDown.xaml

@@ -26,6 +26,9 @@
                                             <Setter Property="FrameworkElement.Cursor" Value="Hand"/>
                                         </MultiDataTrigger.Setters>
                                     </MultiDataTrigger>
+                                    <Trigger Property="IsEnabled" Value="False">
+                                        <Setter Property="Foreground" Value="{StaticResource GHBlueLinkButtonDisabledBrush}"/>
+                                    </Trigger>
                                     <DataTrigger Binding="{Binding Path=IsPressed, RelativeSource={RelativeSource TemplatedParent}}" Value="true">
                                         <Setter Property="TextDecorations" Value="Underline"/>
                                         <Setter Property="FrameworkElement.Cursor" Value="Hand"/>

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

@@ -100,18 +100,21 @@
 
       <WrapPanel Grid.Column="0" HorizontalAlignment="Stretch">
 
-        <ui:LinkDropDown ItemsSource="{Binding States}"
+        <ui:LinkDropDown IsEnabled="{Binding IsLoaded}"
+                         ItemsSource="{Binding States}"
                          SelectedItem="{Binding SelectedState}"/>
 
         <Separator Style="{StaticResource VerticalSeparator}" />
 
         <ui:LinkDropDown Header="Assignee"
+                         IsEnabled="{Binding IsLoaded}"
                          ItemsSource="{Binding Assignees}"
                          SelectedItem="{Binding SelectedAssignee}"/>
 
         <Separator Style="{StaticResource VerticalSeparator}" />
 
         <ui:LinkDropDown Header="Author"
+                         IsEnabled="{Binding IsLoaded}"
                          ItemsSource="{Binding Authors}"
                          SelectedItem="{Binding SelectedAuthor}"/>          
       </WrapPanel>