Merge pull request #2023 from github/fixes/2022-inline-comment-bugs

Fixing inline comment bugs

Author: grokys

src/GitHub.App/ViewModels/PullRequestReviewCommentThreadViewModel.cs

@@ -78,7 +78,6 @@ public bool IsNewThread
         public async Task InitializeAsync(
             IPullRequestSession session,
             IPullRequestSessionFile file,
-            PullRequestReviewModel review,
             IInlineCommentThreadModel thread,
             bool addPlaceholder)
         {
@@ -97,7 +96,7 @@ public async Task InitializeAsync(
                 await vm.InitializeAsync(
                     session,
                     this,
-                    review,
+                    comment.Review,
                     comment.Comment,
                     CommentEditState.None).ConfigureAwait(false);
                 Comments.Add(vm);
@@ -110,7 +109,7 @@ await vm.InitializeAsync(
                 await vm.InitializeAsPlaceholderAsync(
                     session,
                     this,
-                    review.State == PullRequestReviewState.Pending,
+                    session.HasPendingReview,
                     false).ConfigureAwait(true);
 
                 var (key, secondaryKey) = GetDraftKeys(vm);

src/GitHub.Exports.Reactive/ViewModels/IPullRequestReviewCommentThreadViewModel.cs

@@ -46,15 +46,13 @@ public interface IPullRequestReviewCommentThreadViewModel : ICommentThreadViewMo
         /// </summary>
         /// <param name="session">The pull request session.</param>
         /// <param name="file">The file that the comment is on.</param>
-        /// <param name="review">The associated review.</param>
         /// <param name="thread">The thread.</param>
         /// <param name="addPlaceholder">
         /// Whether to add a placeholder comment at the end of the thread.
         /// </param>
         Task InitializeAsync(
             IPullRequestSession session,
             IPullRequestSessionFile file,
-            PullRequestReviewModel review,
             IInlineCommentThreadModel thread,
             bool addPlaceholder);
 

src/GitHub.InlineReviews/Services/PullRequestSessionService.cs

@@ -845,7 +845,7 @@ static void BuildPullRequestThreads(PullRequestDetailModel model)
             }
 
             // Get the comments that are replies and place them into the relevant list.
-            foreach (CommentAdapter comment in model.Reviews.SelectMany(x => x.Comments))
+            foreach (CommentAdapter comment in model.Reviews.SelectMany(x => x.Comments).OrderBy(x => x.CreatedAt))
             {
                 if (comment.ReplyTo != null)
                 {

src/GitHub.InlineReviews/ViewModels/InlineCommentPeekViewModel.cs

@@ -181,7 +181,7 @@ async Task UpdateThread()
 
             if (thread?.Comments.Count > 0)
             {
-                await vm.InitializeAsync(session, file, thread.Comments[0].Review, thread, true);
+                await vm.InitializeAsync(session, file, thread, true);
             }
             else
             {

test/GitHub.App.UnitTests/ViewModels/PullRequestReviewCommentThreadViewModelTests.cs

@@ -111,15 +111,13 @@ async Task<PullRequestReviewCommentThreadViewModel> CreateTarget(
             IViewViewModelFactory factory = null,
             IPullRequestSession session = null,
             IPullRequestSessionFile file = null,
-            PullRequestReviewModel review = null,
             IEnumerable<InlineCommentModel> comments = null,
             bool newThread = false)
         {
             draftStore = draftStore ?? Substitute.For<IMessageDraftStore>();
             factory = factory ?? CreateFactory();
             session = session ?? CreateSession();
             file = file ?? CreateFile();
-            review = review ?? new PullRequestReviewModel();
             comments = comments ?? CreateComments();
 
             var result = new PullRequestReviewCommentThreadViewModel(draftStore, factory);
@@ -134,7 +132,7 @@ async Task<PullRequestReviewCommentThreadViewModel> CreateTarget(
                 thread.Comments.Returns(comments.ToList());
                 thread.LineNumber.Returns(10);
 
-                await result.InitializeAsync(session, file, review, thread, true);
+                await result.InitializeAsync(session, file, thread, true);
             }
 
             return result;