Remove need for CommentTooltip(View/Model/Designer)

Use CommentThreadViewModel
 as the base for TooltipCommentThreadViewModel.
Use ICommentThreadViewModel as the VM interface for TooltipCommentThreadView.
Allows null to be passed when `currentUser` isn't required.

Author: jcansdale

src/GitHub.InlineReviews/GitHub.InlineReviews.csproj

@@ -97,7 +97,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="SampleData\CommentTooltipViewModelDesigner.cs" />
     <Compile Include="SampleData\CommentThreadViewModelDesigner.cs" />
     <Compile Include="SampleData\DiffCommentThreadViewModelDesigner.cs" />
     <Compile Include="SampleData\PullRequestCommentsViewModelDesigner.cs" />
@@ -108,10 +107,8 @@
     <Compile Include="Services\PullRequestSessionManager.cs" />
     <Compile Include="InlineCommentMarginProvider.cs" />
     <Compile Include="Services\PullRequestSessionService.cs" />
-    <Compile Include="ViewModels\CommentTooltipViewModel.cs" />
     <Compile Include="ViewModels\CommentViewModel.cs" />
     <Compile Include="ViewModels\DiffCommentThreadViewModel.cs" />
-    <Compile Include="ViewModels\ICommentTooltipViewModel.cs" />
     <Compile Include="ViewModels\ICommentThreadViewModel.cs" />
     <Compile Include="ViewModels\CommentThreadViewModel.cs" />
     <Compile Include="ViewModels\IDiffCommentThreadViewModel.cs" />
@@ -122,9 +119,9 @@
     <Compile Include="ViewModels\IPullRequestCommentsViewModel.cs" />
     <Compile Include="ViewModels\IssueCommentThreadViewModel.cs" />
     <Compile Include="ViewModels\PullRequestCommentsViewModel.cs" />
-    <Compile Include="ViewModels\TooltipCommentViewModel.cs" />
-    <Compile Include="Views\CommentTooltipView.xaml.cs">
-      <DependentUpon>CommentTooltipView.xaml</DependentUpon>
+    <Compile Include="ViewModels\TooltipCommentThreadViewModel.cs" />
+    <Compile Include="Views\TooltipCommentThreadView.xaml.cs">
+      <DependentUpon>TooltipCommentThreadView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\DiffCommentThreadView.xaml.cs">
       <DependentUpon>DiffCommentThreadView.xaml</DependentUpon>
@@ -402,7 +399,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Page Include="Views\CommentTooltipView.xaml">
+    <Page Include="Views\TooltipCommentThreadView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

src/GitHub.InlineReviews/SampleData/CommentTooltipViewModelDesigner.cs

@@ -2,6 +2,8 @@
 using System.Windows.Controls;
 using GitHub.InlineReviews.Views;
 using GitHub.InlineReviews.ViewModels;
+using System.Linq;
+using GitHub.Models;
 
 namespace GitHub.InlineReviews.Tags
 {
@@ -15,15 +17,15 @@ public ShowInlineCommentGlyph()
         protected override void OnToolTipOpening(ToolTipEventArgs e)
         {
             var tag = Tag as ShowInlineCommentTag;
-
-            var viewModel = new CommentTooltipViewModel();
-            foreach (var comment in tag.Thread.Comments)
+            var comments = tag.Thread.Comments.Select(comment => new PullRequestReviewCommentModel
             {
-                var commentViewModel = new TooltipCommentViewModel(comment.User, comment.Body, comment.CreatedAt);
-                viewModel.Comments.Add(commentViewModel);
-            }
+                User = comment.User,
+                Body = comment.Body,
+                CreatedAt = comment.CreatedAt
+            });
 
-            var view = new CommentTooltipView();
+            var viewModel = new TooltipCommentThreadViewModel(comments);
+            var view = new TooltipCommentThreadView();
             view.DataContext = viewModel;
 
             CommentToolTip.Content = view;

src/GitHub.InlineReviews/Tags/ShowInlineCommentGlyph.xaml.cs

@@ -17,12 +17,10 @@ public abstract class CommentThreadViewModel : ReactiveObject, ICommentThreadVie
         /// <summary>
         /// Intializes a new instance of the <see cref="CommentThreadViewModel"/> class.
         /// </summary>
-        /// <param name="currentUser">The current user.</param>
+        /// <param name="currentUser">The current user on null if not required.</param>
         /// <param name="commentModels">The thread comments.</param>
-        public CommentThreadViewModel(IAccount currentUser)
+        public CommentThreadViewModel(IAccount currentUser = null)
         {
-            Guard.ArgumentNotNull(currentUser, nameof(currentUser));
-
             Comments = new ObservableCollection<ICommentViewModel>();
             CurrentUser = currentUser;
         }

src/GitHub.InlineReviews/ViewModels/CommentThreadViewModel.cs

@@ -25,7 +25,7 @@ public class CommentViewModel : ReactiveObject, ICommentViewModel
         /// Initializes a new instance of the <see cref="CommentViewModel"/> class.
         /// </summary>
         /// <param name="thread">The thread that the comment is a part of.</param>
-        /// <param name="currentUser">The current user.</param>
+        /// <param name="currentUser">The current user or null if not used.</param>
         /// <param name="commentId">The ID of the comment.</param>
         /// <param name="body">The comment body.</param>
         /// <param name="state">The comment edit state.</param>
@@ -41,7 +41,6 @@ public CommentViewModel(
             DateTimeOffset updatedAt)
         {
             Guard.ArgumentNotNull(thread, nameof(thread));
-            Guard.ArgumentNotNull(currentUser, nameof(currentUser));
             Guard.ArgumentNotNull(body, nameof(body));
             Guard.ArgumentNotNull(user, nameof(user));
 

src/GitHub.InlineReviews/ViewModels/CommentTooltipViewModel.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using GitHub.Models;
+
+namespace GitHub.InlineReviews.ViewModels
+{
+    public class TooltipCommentThreadViewModel : CommentThreadViewModel
+    {
+        public TooltipCommentThreadViewModel(IEnumerable<IPullRequestReviewCommentModel> comments)
+        {
+            foreach (var comment in comments)
+            {
+                Comments.Add(new CommentViewModel(this, CurrentUser, comment));
+            }
+        }
+    }
+}

src/GitHub.InlineReviews/ViewModels/CommentViewModel.cs

@@ -1,4 +1,4 @@
-<local:GenericCommentTooltipView x:Class="GitHub.InlineReviews.Views.CommentTooltipView"
+<UserControl x:Class="GitHub.InlineReviews.Views.TooltipCommentThreadView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -9,8 +9,8 @@
              xmlns:sample="clr-namespace:GitHub.InlineReviews.SampleData"
              mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300">
     <d:DesignProperties.DataContext>
-        <sample:CommentTooltipViewModelDesigner>
-            <sample:CommentTooltipViewModelDesigner.Comments>
+        <sample:CommentThreadViewModelDesigner>
+            <sample:CommentThreadViewModelDesigner.Comments>
                 <sample:CommentViewModelDesigner EditState="None">
                     <sample:CommentViewModelDesigner.Body>
                         I assume this doesn't do anything if our message isn't showing?
@@ -21,8 +21,8 @@
                         Nope, does nothing! Also checked the logs.
                     </sample:CommentViewModelDesigner.Body>
                 </sample:CommentViewModelDesigner>
-            </sample:CommentTooltipViewModelDesigner.Comments>
-        </sample:CommentTooltipViewModelDesigner>
+            </sample:CommentThreadViewModelDesigner.Comments>
+        </sample:CommentThreadViewModelDesigner>
     </d:DesignProperties.DataContext>
 
     <DockPanel>
@@ -40,4 +40,4 @@
             </ItemsControl>
         </ScrollViewer>
     </DockPanel>
-</local:GenericCommentTooltipView>
+</UserControl>