Show warning on comment thread resolved

jcansdale · jcansdale · commit c75b3217d4b8 · 2019-03-04T16:06:23.000Z
Show, "This conversation was marked as resolved" on peek view when conversation has been marked as resolved.
diff --git a/src/GitHub.App/ViewModels/PullRequestReviewCommentThreadViewModel.cs b/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)
             {
diff --git a/src/GitHub.Exports.Reactive/ViewModels/IPullRequestReviewCommentThreadViewModel.cs b/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.
diff --git a/src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml b/src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml
@@ -63,6 +63,25 @@
             </DockPanel>
         </Border>
 
+        <Border DockPanel.Dock="Top"
+                Background="{DynamicResource {x:Static SystemColors.InfoBrushKey}}"
+                Padding="8">
+            <Border.Style>
+                <Style TargetType="Border">
+                    <Setter Property="Visibility" Value="Collapsed"/>
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding Thread.IsResolved}" Value="True">
+                            <Setter Property="Visibility" Value="Visible"/>
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </Border.Style>
+            <DockPanel>
+                <ui:OcticonImage DockPanel.Dock="Left" Icon="info" Margin="0 0 8 0"/>
+                <TextBlock TextWrapping="Wrap" Text="{x:Static ghfvs:Resources.ThisConversationWasMarkedAsResolved}"/>
+            </DockPanel>
+        </Border>
+
         <Border DockPanel.Dock="Top"
                 BorderThickness="0 0 0 1"
                 Background="{DynamicResource VsBrush.CommandBarOptionsBackground}"
diff --git a/src/GitHub.Resources/Resources.Designer.cs b/src/GitHub.Resources/Resources.Designer.cs
diff --git a/src/GitHub.Resources/Resources.resx b/src/GitHub.Resources/Resources.resx
@@ -881,4 +881,7 @@ https://git-scm.com/download/win</value>
   <data name="AndOthers" xml:space="preserve">
     <value>and others</value>
   </data>
+  <data name="ThisConversationWasMarkedAsResolved" xml:space="preserve">
+    <value>This conversation was marked as resolved</value>
+  </data>
 </root>
