Remove pending badge from comment when review submitted.

Author: grokys

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

@@ -209,10 +209,10 @@ async Task UpdateFileComments()
         {
             var result = new List<PullRequestReviewFileCommentViewModel>();
 
-            //if (Model.Id == 0 && session.PendingReviewId != 0)
-            //{
-            //    ((PullRequestReviewModel)Model).Id = session.PendingReviewId;
-            //}
+            if (Model.Id == 0 && session.PendingReviewId != 0)
+            {
+                ((PullRequestReviewModel)Model).Id = session.PendingReviewId;
+            }
 
             foreach (var file in await session.GetAllFiles())
             {

src/GitHub.Exports/Models/IPullRequestReviewCommentModel.cs

@@ -47,6 +47,6 @@ public interface IPullRequestReviewCommentModel : ICommentModel
         /// <summary>
         /// Gets a value indicating whether the comment is part of a pending review.
         /// </summary>
-        bool IsPending { get; }
+        bool IsPending { get; set; }
     }
 }

src/GitHub.InlineReviews/Services/PullRequestSession.cs

@@ -272,6 +272,18 @@ async Task AddReview(IPullRequestReviewModel review)
                 .Where(x => x.NodeId != review.NodeId)
                 .Concat(new[] { review })
                 .ToList();
+
+            if (review.State != PullRequestReviewState.Pending)
+            {
+                foreach (var comment in PullRequest.ReviewComments)
+                {
+                    if (comment.PullRequestReviewId == review.Id)
+                    {
+                        comment.IsPending = false;
+                    }
+                }
+            }
+
             await Update(PullRequest);
         }
 

test/GitHub.InlineReviews.UnitTests/Services/PullRequestSessionTests.cs

@@ -343,22 +343,39 @@ public async Task ReplacesPendingReviewWithModel()
 
                 var target = CreateTarget(service, "fork", "owner", true);
 
+                Assert.That(
+                    target.PullRequest.Reviews.Where(x => x.State == PullRequestReviewState.Pending).Count(),
+                    Is.EqualTo(1));
+
                 var submittedReview = CreatePullRequestReview(target.User, PullRequestReviewState.Approved);
                 submittedReview.NodeId.Returns("pendingReviewId");
                 service.SubmitPendingReview(null, null, null, null, Octokit.PullRequestReviewEvent.Approve)
                     .ReturnsForAnyArgs(submittedReview);
 
-                Assert.That(
-                    target.PullRequest.Reviews.Where(x => x.State == PullRequestReviewState.Pending).Count(),
-                    Is.EqualTo(1));
-
                 var model = await target.PostReview("New Review", Octokit.PullRequestReviewEvent.Approve);
 
                 Assert.That(
                     target.PullRequest.Reviews.Where(x => x.State == PullRequestReviewState.Pending).Count(),
                     Is.Zero);
             }
 
+            [Test]
+            public async Task MarksAssociatedCommentsAsNonPending()
+            {
+                var service = Substitute.For<IPullRequestSessionService>();
+                var target = CreateTarget(service, "fork", "owner", true);
+
+                Assert.That(target.PullRequest.ReviewComments[0].IsPending, Is.True);
+
+                var submittedReview = CreatePullRequestReview(target.User, PullRequestReviewState.Approved);
+                submittedReview.NodeId.Returns("pendingReviewId");
+                service.SubmitPendingReview(null, null, null, null, Octokit.PullRequestReviewEvent.Approve)
+                    .ReturnsForAnyArgs(submittedReview);
+                var model = await target.PostReview("New Review", Octokit.PullRequestReviewEvent.RequestChanges);
+
+                target.PullRequest.ReviewComments[0].Received(1).IsPending = false;
+            }
+
             PullRequestSession CreateTarget(
                 IPullRequestSessionService service,
                 string localRepositoryOwner,
@@ -376,6 +393,10 @@ PullRequestSession CreateTarget(
 
                 if (hasPendingReview)
                 {
+                    var reviewComment = Substitute.For<IPullRequestReviewCommentModel>();
+                    reviewComment.IsPending.Returns(true);
+                    pr.ReviewComments.Returns(new[] { reviewComment });
+
                     var review = CreatePullRequestReview(user, PullRequestReviewState.Pending);
                     review.NodeId.Returns("pendingReviewId");
                     pr.Reviews.Returns(new[] { review });

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

@@ -183,6 +183,67 @@ public async Task Updates_FileComments_When_Session_PullRequestChanged()
             Assert.That(target.FileComments, Has.Count.EqualTo(1));
         }
 
+        [Test]
+        public async Task Updates_Model_Id_From_PendingReviewId_When_Session_PullRequestChanged()
+        {
+            var model = CreatePullRequest();
+            var session = CreateSession(
+                "grokys",
+                CreateSessionFile(
+                    CreateInlineCommentThread(
+                        CreateReviewComment(11)),
+                    CreateInlineCommentThread(
+                        CreateReviewComment(12),
+                        CreateReviewComment(12))));
+
+            var target = CreateTarget(model, session);
+
+            await Initialize(target);
+
+            Assert.That(target.Model.Id, Is.EqualTo(0));
+
+            session.PendingReviewId.Returns(123);
+            RaisePullRequestChanged(session, model);
+
+            Assert.That(target.Model.Id, Is.EqualTo(123));
+        }
+
+        [Test]
+        public async Task Submit_Calls_Session_PostReview()
+        {
+            var review = CreateReview(12, "grokys", state: PullRequestReviewState.Pending);
+            var model = CreatePullRequest("shana", review);
+            var session = CreateSession();
+
+            var target = CreateTarget(model, session);
+
+            await Initialize(target);
+
+            target.Body = "Post review";
+            target.Submit.Execute(Octokit.PullRequestReviewEvent.Approve);
+
+            await session.Received(1).PostReview("Post review", Octokit.PullRequestReviewEvent.Approve);
+        }
+
+        [Test]
+        public async Task Submit_Closes_Page()
+        {
+            var review = CreateReview(12, "grokys", state: PullRequestReviewState.Pending);
+            var model = CreatePullRequest("shana", review);
+            var session = CreateSession();
+            var closed = false;
+
+            var target = CreateTarget(model, session);
+
+            await Initialize(target);
+            target.Body = "Post review";
+
+            target.CloseRequested.Subscribe(_ => closed = true);
+            target.Submit.Execute(Octokit.PullRequestReviewEvent.Approve);
+
+            Assert.True(closed);
+        }
+
         static PullRequestReviewAuthoringViewModel CreateTarget(
             IPullRequestModel model,
             IPullRequestSession session = null)