Merge branch 'master' into fixes/1683-pr-authoring-wrong-fork

Author: StanleyGoldman

src/GitHub.App/ViewModels/GitHubPane/IssueListViewModelBase.cs

@@ -7,6 +7,7 @@
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
+using System.Windows.Threading;
 using GitHub.Collections;
 using GitHub.Extensions;
 using GitHub.Extensions.Reactive;
@@ -209,6 +210,7 @@ public override Task Refresh()
                     this.WhenAnyValue(x => x.SelectedState),
                     this.WhenAnyValue(x => x.AuthorFilter.Selected),
                     (loading, count, _, __, ___) => Tuple.Create(loading, count))
+                .ObserveOn(RxApp.MainThreadScheduler)
                 .Subscribe(x => UpdateState(x.Item1, x.Item2)));
             dispose.Add(
                 Observable.FromEventPattern<ErrorEventArgs>(

src/GitHub.App/ViewModels/GitHubPane/PullRequestFilesViewModel.cs

@@ -7,7 +7,9 @@
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
+using System.Reactive.Threading.Tasks;
 using System.Threading.Tasks;
+using System.Windows.Input;
 using GitHub.Extensions;
 using GitHub.Models;
 using GitHub.Services;
@@ -50,7 +52,7 @@ public PullRequestFilesViewModel(
             DiffFileWithWorkingDirectory = ReactiveCommand.CreateAsyncTask(
                 isBranchCheckedOut,
                 x => (Task)editorService.OpenDiff(pullRequestSession, ((IPullRequestFileNode)x).RelativePath));
-            OpenFileInWorkingDirectory = ReactiveCommand.CreateAsyncTask(
+            OpenFileInWorkingDirectory = new NonDeletedFileCommand(
                 isBranchCheckedOut,
                 x => (Task)editorService.OpenFile(pullRequestSession, ((IPullRequestFileNode)x).RelativePath, true));
 
@@ -198,5 +200,37 @@ async Task<IInlineCommentThreadModel> GetFirstCommentThread(IPullRequestFileNode
 
             return threads.FirstOrDefault();
         }
+
+        /// <summary>
+        /// Implements the <see cref="OpenFileInWorkingDirectory"/> command.
+        /// </summary>
+        /// <remarks>
+        /// We need to "Open File in Solution" when the parameter passed to the command parameter
+        /// represents a deleted file. ReactiveCommand doesn't allow us to change the CanExecute
+        /// state depending on the parameter, so we override 
+        /// <see cref="ICommand.CanExecute(object)"/> to do this ourselves.
+        /// </remarks>
+        class NonDeletedFileCommand : ReactiveCommand<Unit>, ICommand
+        {
+            public NonDeletedFileCommand(
+                IObservable<bool> canExecute,
+                Func<object, Task> executeAsync)
+                : base(canExecute, x => executeAsync(x).ToObservable())
+            {
+            }
+
+            bool ICommand.CanExecute(object parameter)
+            {
+                if (parameter is IPullRequestFileNode node)
+                {
+                    if (node.Status == PullRequestFileStatus.Removed)
+                    {
+                        return false;
+                    }
+                }
+
+                return CanExecute(parameter);
+            }
+        }
     }
 }

src/GitHub.App/ViewModels/GitHubPane/PullRequestReviewSummaryViewModel.cs

@@ -90,6 +90,7 @@ static int ToPriority(PullRequestReviewState state)
             {
                 case PullRequestReviewState.Approved:
                 case PullRequestReviewState.ChangesRequested:
+                case PullRequestReviewState.Dismissed:
                     return 1;
                 case PullRequestReviewState.Pending:
                     return 2;

src/GitHub.VisualStudio/Views/GitHubPane/PullRequestFilesView.xaml.cs

@@ -61,13 +61,15 @@ void ApplyContextMenuBinding<TItem>(object sender, ContextMenuEventArgs e) where
 
                 if (fileNode != null)
                 {
-                    container.ContextMenu.DataContext = this.DataContext;
-
                     foreach (var menuItem in container.ContextMenu.Items.OfType<MenuItem>())
                     {
                         menuItem.CommandParameter = fileNode;
                     }
 
+                    // HACK: MenuItem doesn't re-query ICommand.CanExecute when CommandParameter changes. Force
+                    // this to happen by resetting its DataContext to null and then to the correct value.
+                    container.ContextMenu.DataContext = null;
+                    container.ContextMenu.DataContext = this.DataContext;
                     e.Handled = false;
                 }
             }

test/GitHub.App.UnitTests/ViewModels/GitHubPane/PullRequestDetailViewModelTests.cs

@@ -137,6 +137,24 @@ public async Task ShouldNotShowPendingReviewForOtherUserAsync()
                 Assert.That(target.Reviews[0].Id, Is.Null);
             }
 
+            [Test]
+            public async Task ShouldNotShowChangesRequestedAfterDismissed()
+            {
+                var dateTimeOffset = DateTimeOffset.Now;
+
+                var target = CreateTarget();
+                var model = CreatePullRequestModel(
+                    CreatePullRequestReviewModel("1", "shana", PullRequestReviewState.ChangesRequested, dateTimeOffset.AddMinutes(1)),
+                    CreatePullRequestReviewModel("2", "shana", PullRequestReviewState.Dismissed, dateTimeOffset.AddMinutes(2)));
+
+                await target.Load(model);
+
+                Assert.That(target.Reviews, Has.Count.EqualTo(2));
+                Assert.That(target.Reviews[0].User.Login, Is.EqualTo("shana"));
+                Assert.That(target.Reviews[0].State, Is.EqualTo(PullRequestReviewState.Dismissed));
+                Assert.That(target.Reviews[1].User.Login, Is.EqualTo("grokys"));
+            }
+
             static PullRequestDetailModel CreatePullRequestModel(
                 params PullRequestReviewModel[] reviews)
             {