Add "Reviewers" section to PR details.

Author: grokys

src/GitHub.App/GitHub.App.csproj

@@ -236,6 +236,7 @@
     <Compile Include="ViewModels\GitHubPane\PullRequestCreationViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\NotAGitHubRepositoryViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\NotAGitRepositoryViewModel.cs" />
+    <Compile Include="ViewModels\GitHubPane\PullRequestReviewSummaryViewModel.cs" />
     <Compile Include="ViewModels\RepositoryFormViewModel.cs" />
     <Compile Include="ViewModels\TeamExplorer\RepositoryPublishViewModel.cs" />
     <Compile Include="Caches\CacheIndex.cs" />

src/GitHub.App/Resources.Designer.cs

@@ -294,4 +294,16 @@
 Please install Git for Windows from:
 https://git-scm.com/download/win</value>
   </data>
+  <data name="Approved" xml:space="preserve">
+    <value>Approved</value>
+  </data>
+  <data name="ChangesRequested" xml:space="preserve">
+    <value>Changes Requested</value>
+  </data>
+  <data name="Commented" xml:space="preserve">
+    <value>Commented</value>
+  </data>
+  <data name="InProgress" xml:space="preserve">
+    <value>InProgress</value>
+  </data>
 </root>

src/GitHub.App/Resources.resx

@@ -67,6 +67,34 @@ public PullRequestDetailViewModelDesigner()
             modelsDir.Files.Add(oldBranchModel);
             gitHubDir.Directories.Add(modelsDir);
 
+            Reviews = new[]
+            {
+                new PullRequestReviewSummaryViewModel
+                {
+                    Id = 2,
+                    User = new AccountDesigner { Login = "grokys", IsUser = true },
+                    State = PullRequestReviewState.Pending,
+                    FileCommentCount = 0,
+                },
+                new PullRequestReviewSummaryViewModel
+                {
+                    Id = 1,
+                    User = new AccountDesigner { Login = "jcansdale", IsUser = true },
+                    State = PullRequestReviewState.Approved,
+                    FileCommentCount = 5,
+                },
+                new PullRequestReviewSummaryViewModel
+                {
+                    Id = 2,
+                    User = new AccountDesigner { Login = "shana", IsUser = true },
+                    State = PullRequestReviewState.ChangesRequested,
+                    FileCommentCount = 5,
+                },
+                new PullRequestReviewSummaryViewModel
+                {
+                },
+            };
+
             Files = new PullRequestFilesViewModelDesigner();
         }
 
@@ -81,6 +109,7 @@ public PullRequestDetailViewModelDesigner()
         public bool IsCheckedOut { get; }
         public bool IsFromFork { get; }
         public string Body { get; }
+        public IReadOnlyList<IPullRequestReviewSummaryViewModel> Reviews { get; }
         public IPullRequestFilesViewModel Files { get; set; }
         public IPullRequestCheckoutState CheckoutState { get; set; }
         public IPullRequestUpdateState UpdateState { get; set; }
@@ -92,6 +121,7 @@ public PullRequestDetailViewModelDesigner()
         public ReactiveCommand<Unit> Pull { get; }
         public ReactiveCommand<Unit> Push { get; }
         public ReactiveCommand<object> OpenOnGitHub { get; }
+        public ReactiveCommand<object> ShowReview { get; }
 
         public Task InitializeAsync(ILocalRepositoryModel localRepository, IConnection connection, string owner, string repo, int number) => Task.CompletedTask;
 

src/GitHub.App/SampleData/PullRequestDetailViewModelDesigner.cs

@@ -42,6 +42,7 @@ public sealed class PullRequestDetailViewModel : PanePageViewModelBase, IPullReq
         string targetBranchDisplayName;
         int commentCount;
         string body;
+        IReadOnlyList<IPullRequestReviewSummaryViewModel> reviews;
         IPullRequestCheckoutState checkoutState;
         IPullRequestUpdateState updateState;
         string operationError;
@@ -117,6 +118,7 @@ public PullRequestDetailViewModel(
             SubscribeOperationError(SyncSubmodules);
 
             OpenOnGitHub = ReactiveCommand.Create();
+            ShowReview = ReactiveCommand.Create().OnExecuteCompleted(DoShowReview);
         }
 
         /// <summary>
@@ -244,6 +246,15 @@ public string OperationError
             private set { this.RaiseAndSetIfChanged(ref operationError, value); }
         }
 
+        /// <summary>
+        /// Gets the latest pull request review for each user.
+        /// </summary>
+        public IReadOnlyList<IPullRequestReviewSummaryViewModel> Reviews
+        {
+            get { return reviews; }
+            private set { this.RaiseAndSetIfChanged(ref reviews, value); }
+        }
+
         /// <summary>
         /// Gets the pull request's changed files.
         /// </summary>
@@ -283,6 +294,11 @@ public Uri WebUrl
         /// </summary>
         public ReactiveCommand<object> OpenOnGitHub { get; }
 
+        /// <summary>
+        /// Gets a command that navigates to a pull request review.
+        /// </summary>
+        public ReactiveCommand<object> ShowReview { get; }
+
         /// <summary>
         /// Initializes the view model.
         /// </summary>
@@ -353,6 +369,8 @@ public async Task Load(IPullRequestModel pullRequest)
                 TargetBranchDisplayName = GetBranchDisplayName(IsFromFork, pullRequest.Base?.Label);
                 CommentCount = pullRequest.Comments.Count + pullRequest.ReviewComments.Count;
                 Body = !string.IsNullOrWhiteSpace(pullRequest.Body) ? pullRequest.Body : Resources.NoDescriptionProvidedMarkdown;
+                Reviews = PullRequestReviewSummaryViewModel.BuildByUser(pullRequest).ToList();
+
                 await Files.InitializeAsync(Session);
 
                 var localBranches = await pullRequestsService.GetLocalBranches(LocalRepository, pullRequest).ToList();
@@ -616,6 +634,11 @@ async Task DoSyncSubmodules(object unused)
             }
         }
 
+        void DoShowReview(object item)
+        {
+            // TODO
+        }
+
         class CheckoutCommandState : IPullRequestCheckoutState
         {
             public CheckoutCommandState(string caption, string disabledMessage)

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

@@ -0,0 +1,124 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using GitHub.App;
+using GitHub.Models;
+
+namespace GitHub.ViewModels.GitHubPane
+{
+    /// <summary>
+    /// Displays a short overview of a pull request review in the <see cref="PullRequestDetailViewModel"/>.
+    /// </summary>
+    public class PullRequestReviewSummaryViewModel : IPullRequestReviewSummaryViewModel
+    {
+        private static Dictionary<PullRequestReviewState, int> StatePriorities = new Dictionary<PullRequestReviewState, int>
+        {
+            { PullRequestReviewState.Approved, 1 },
+            { PullRequestReviewState.ChangesRequested, 1 },
+            { PullRequestReviewState.Commented, 0 },
+            { PullRequestReviewState.Dismissed, 0 },
+            { PullRequestReviewState.Pending, 2 },
+        };
+
+        /// <inheritdoc/>
+        public long Id { get; set; }
+
+        /// <inheritdoc/>
+        public IAccount User { get; set; }
+
+        /// <inheritdoc/>
+        public PullRequestReviewState State { get; set; }
+
+        /// <inheritdoc/>
+        public string StateDisplay => ToString(State);
+
+        /// <inheritdoc/>
+        public int FileCommentCount { get; set; }
+
+        /// <summary>
+        /// Builds a collection of <see cref="PullRequestReviewSummaryViewModel"/>s by user.
+        /// </summary>
+        /// <param name="pullRequest">The pull request model.</param>
+        /// <remarks>
+        /// This method builds a list similar to that found in the "Reviewers" section at the top-
+        /// right of the Pull Request page on GitHub.
+        /// </remarks>
+        public static IEnumerable<PullRequestReviewSummaryViewModel> BuildByUser(IPullRequestModel pullRequest)
+        {
+            var existing = new Dictionary<string, PullRequestReviewSummaryViewModel>();
+
+            foreach (var review in pullRequest.Reviews.OrderBy(x => x.Id))
+            {
+                PullRequestReviewSummaryViewModel previous;
+                existing.TryGetValue(review.User.Login, out previous);
+
+                var previousPriority = ToPriority(previous);
+                var reviewPriority = ToPriority(review.State);
+
+                if (reviewPriority >= previousPriority)
+                {
+                    var count = pullRequest.ReviewComments
+                        .Where(x => x.PullRequestReviewId == review.Id)
+                        .Count();
+                    existing[review.User.Login] = new PullRequestReviewSummaryViewModel
+                    {
+                        Id = review.Id,
+                        User = review.User,
+                        State = review.State,
+                        FileCommentCount = count
+                    };
+                }
+            }
+
+            var result = existing.Values.OrderBy(x => x.User).AsEnumerable();
+
+            if (!result.Any(x => x.State == PullRequestReviewState.Pending))
+            {
+                var newReview = new PullRequestReviewSummaryViewModel
+                {
+                    State = PullRequestReviewState.Pending,
+                };
+                result = result.Concat(new[] { newReview });
+            }
+
+            return result;
+        }
+
+        static int ToPriority(PullRequestReviewSummaryViewModel review)
+        {
+            return review != null ? ToPriority(review.State) : 0;
+        }
+
+        static int ToPriority(PullRequestReviewState state)
+        {
+            switch (state)
+            {
+                case PullRequestReviewState.Approved:
+                case PullRequestReviewState.ChangesRequested:
+                    return 1;
+                case PullRequestReviewState.Pending:
+                    return 2;
+                default:
+                    return 0;
+            }
+        }
+
+        static string ToString(PullRequestReviewState state)
+        {
+            switch (state)
+            {
+                case PullRequestReviewState.Approved:
+                    return Resources.Approved;
+                case PullRequestReviewState.ChangesRequested:
+                    return Resources.ChangesRequested;
+                case PullRequestReviewState.Commented:
+                case PullRequestReviewState.Dismissed:
+                    return Resources.Commented;
+                case PullRequestReviewState.Pending:
+                    return Resources.InProgress;
+                default:
+                    throw new NotSupportedException();
+            }
+        }
+    }
+}

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

@@ -197,6 +197,7 @@
     <Compile Include="ViewModels\GitHubPane\IPanePageViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\IPullRequestFilesViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\IPullRequestListViewModel.cs" />
+    <Compile Include="ViewModels\GitHubPane\IPullRequestReviewSummaryViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\ISearchablePageViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\IPullRequestCreationViewModel.cs" />
     <Compile Include="ViewModels\GitHubPane\IPullRequestDetailViewModel.cs" />

src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj

@@ -125,6 +125,11 @@ public interface IPullRequestDetailViewModel : IPanePageViewModel, IOpenInBrowse
         /// </summary>
         string Body { get; }
 
+        /// <summary>
+        /// Gets the latest pull request review for each user.
+        /// </summary>
+        IReadOnlyList<IPullRequestReviewSummaryViewModel> Reviews { get; }
+
         /// <summary>
         /// Gets the pull request's changed files.
         /// </summary>
@@ -165,6 +170,11 @@ public interface IPullRequestDetailViewModel : IPanePageViewModel, IOpenInBrowse
         /// </summary>
         ReactiveCommand<object> OpenOnGitHub { get; }
 
+        /// <summary>
+        /// Gets a command that navigates to a pull request review.
+        /// </summary>
+        ReactiveCommand<object> ShowReview { get; }
+
         /// <summary>
         /// Initializes the view model.
         /// </summary>

src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestDetailViewModel.cs

@@ -0,0 +1,35 @@
+using GitHub.Models;
+
+namespace GitHub.ViewModels.GitHubPane
+{
+    /// <summary>
+    /// Displays a short overview of a pull request review in the <see cref="IPullRequestDetailViewModel"/>.
+    /// </summary>
+    public interface IPullRequestReviewSummaryViewModel
+    {
+        /// <summary>
+        /// Gets the ID of the pull request review.
+        /// </summary>
+        long Id { get; set; }
+
+        /// <summary>
+        /// Gets the user who submitted the review.
+        /// </summary>
+        IAccount User { get; set; }
+
+        /// <summary>
+        /// Gets the state of the review.
+        /// </summary>
+        PullRequestReviewState State { get; set; }
+
+        /// <summary>
+        /// Gets a string representing the state of the review.
+        /// </summary>
+        string StateDisplay { get; }
+
+        /// <summary>
+        /// Gets the number of file comments in the review.
+        /// </summary>
+        int FileCommentCount { get; set; }
+    }
+}