Merge pull request #2253 from github/fixes/2245-comment-thread-resolved-status

Hide resolved comments from changes tree and indicate resolved comments on margin

Author: StanleyGoldman

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

@@ -364,7 +364,8 @@ public async Task Load(PullRequestDetailModel pullRequest)
 
                 Checks = (IReadOnlyList<IPullRequestCheckViewModel>)PullRequestCheckViewModel.Build(viewViewModelFactory, pullRequest)?.ToList() ?? Array.Empty<IPullRequestCheckViewModel>();
 
-                await Files.InitializeAsync(Session);
+                // Only show unresolved comments
+                await Files.InitializeAsync(Session, c => !c.IsResolved);
 
                 var localBranches = await pullRequestsService.GetLocalBranches(LocalRepository, pullRequest).ToList();
 

src/GitHub.App/ViewModels/PullRequestReviewCommentThreadViewModel.cs

@@ -70,6 +70,9 @@ public IPullRequestSessionFile File
         /// <inheritdoc/>
         public DiffSide Side { get; private set; }
 
+        /// <inheritdoc/>
+        public bool IsResolved { get; private set; }
+
         public bool IsNewThread
         {
             get => isNewThread;
@@ -97,6 +100,7 @@ public async Task InitializeAsync(
             File = file;
             LineNumber = thread.LineNumber;
             Side = thread.DiffLineType == DiffChangeType.Delete ? DiffSide.Left : DiffSide.Right;
+            IsResolved = thread.IsResolved;
 
             foreach (var comment in thread.Comments)
             {

src/GitHub.Exports.Reactive/Models/IInlineCommentThreadModel.cs

@@ -49,5 +49,10 @@ public interface IInlineCommentThreadModel
         /// Gets the relative path to the file that the thread is on.
         /// </summary>
         string RelativePath { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether comment thread has been marked as resolved by a user.
+        /// </summary>
+        bool IsResolved { get; }
     }
 }

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

@@ -36,6 +36,11 @@ public interface IPullRequestReviewCommentThreadViewModel : ICommentThreadViewMo
         /// </summary>
         DiffSide Side { get; }
 
+        /// <summary>
+        /// Gets a value indicating whether comment thread has been marked as resolved by a user.
+        /// </summary>
+        bool IsResolved { get; }
+
         /// <summary>
         /// Gets a value indicating whether the thread is a new thread being authored, that is not
         /// yet present on the server.

src/GitHub.Exports/Models/PullRequestReviewThreadModel.cs

@@ -33,6 +33,11 @@ public class PullRequestReviewThreadModel
         /// </summary>
         public bool IsOutdated { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether the thread is resolved.
+        /// </summary>
+        public bool IsResolved { get; set; }
+
         /// <summary>
         /// Gets or sets the line position in the diff that the thread starts on.
         /// </summary>

src/GitHub.InlineReviews/Models/InlineCommentThreadModel.cs

@@ -28,7 +28,8 @@ public InlineCommentThreadModel(
             string relativePath,
             string commitSha,
             IList<DiffLine> diffMatch,
-            IEnumerable<InlineCommentModel> comments)
+            IEnumerable<InlineCommentModel> comments,
+            bool isResolved)
         {
             Guard.ArgumentNotNull(relativePath, nameof(relativePath));
             Guard.ArgumentNotNull(commitSha, nameof(commitSha));
@@ -39,6 +40,7 @@ public InlineCommentThreadModel(
             DiffLineType = diffMatch[0].Type;
             CommitSha = commitSha;
             RelativePath = relativePath;
+            IsResolved = isResolved;
 
             foreach (var comment in comments)
             {
@@ -74,5 +76,8 @@ public int LineNumber
 
         /// <inheritdoc/>
         public string RelativePath { get; }
+
+        /// <inheritdoc/>
+        public bool IsResolved { get; }
     }
 }