Display sample data in PR conversation page.

github · StanleyGoldman · Feb 21, 2019 · Oct 26, 2018 · Oct 26, 2018 · Oct 26, 2018
commit 02bc4ee88509e125bbe3a2b83f4c242ead321d93
diff --git a/src/GitHub.App/Properties/AssemblyInfo.cs b/src/GitHub.App/Properties/AssemblyInfo.cs
@@ -6,4 +6,5 @@
 [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.ViewModels")]
 [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.ViewModels.Dialog")]
 [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.ViewModels.Dialog.Clone")]
+[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.ViewModels.Documents")]
 [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.ViewModels.GitHubPane")]
diff --git a/src/GitHub.App/SampleData/CommentViewModelDesigner.cs b/src/GitHub.App/SampleData/CommentViewModelDesigner.cs
@@ -33,7 +33,7 @@ public CommentViewModelDesigner()
         public ReactiveCommand<Unit, Unit> BeginEdit { get; }
         public ReactiveCommand<Unit, Unit> CancelEdit { get; }
         public ReactiveCommand<Unit, Unit> CommitEdit { get; }
-        public ReactiveCommand<Unit, Unit> OpenOnGitHub { get; }
+        public ReactiveCommand<Unit, Unit> OpenOnGitHub { get; } = ReactiveCommand.Create(() => { });
         public ReactiveCommand<Unit, Unit> Delete { get; }
 
         public Task InitializeAsync(ICommentThreadViewModel thread, ActorModel currentUser, CommentModel comment, CommentEditState state)

diff --git a/src/GitHub.App/SampleData/Documents/PullRequestPageViewModelDesigner.cs b/src/GitHub.App/SampleData/Documents/PullRequestPageViewModelDesigner.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Reactive;
 using System.Threading.Tasks;
 using GitHub.Models;
@@ -53,10 +54,38 @@ public PullRequestPageViewModelDesigner()
 
 Depends on #1993 
 Fixes #1905";
+            Timeline = new IViewModel[]
+            {
+                new CommitSummariesViewModel(
+                    new CommitSummaryViewModel(new CommitModel
+                    {
+                        Author = new ActorModel { Login = "grokys" },
+                        AbbreviatedOid = "c7c7d25",
+                        MessageHeadline = "Refactor comment view models."
+                    }),
+                    new CommitSummaryViewModel(new CommitModel
+                    {
+                        Author = new ActorModel { Login = "grokys" },
+                        AbbreviatedOid = "04e6a90",
+                        MessageHeadline = "Refactor comment view models.",
+                    })),
+                new CommentViewModelDesigner
+                {
+                    Author = new ActorViewModelDesigner("meaghanlewis"),
+                    Body = @"This is looking great! Really enjoying using this feature so far.
+
+When leaving an inline comment, the comment posts successfully and then a new comment is drafted with the same text.",
+                },
+                new CommentViewModelDesigner
+                {
+                    Author = new ActorViewModelDesigner("grokys"),
+                    Body = @"Oops, sorry about that @meaghanlewis - I was sure I tested those things, but must have got messed up again at some point. Should be fixed now.",
+                },
+            };
         }
 
         public PullRequestState State { get; set; } = PullRequestState.Open;
-        public IIssueishCommentThreadViewModel Thread { get; set; }
+        public IReadOnlyList<IViewModel> Timeline { get; }
         public string SourceBranchDisplayName { get; set; } = "feature/save-drafts";
         public string TargetBranchDisplayName { get; set; } = "master";
         public IActorViewModel Author { get; set; } = new ActorViewModelDesigner("grokys");

diff --git a/src/GitHub.App/ViewModels/Documents/CommitSummariesViewModel.cs b/src/GitHub.App/ViewModels/Documents/CommitSummariesViewModel.cs
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+
+namespace GitHub.ViewModels.Documents
+{
+    public class CommitSummariesViewModel : ViewModelBase
+    {
+        public CommitSummariesViewModel(params CommitSummaryViewModel[] commits)
+        {
+            Commits = commits;
+        }
+
+        public IReadOnlyList<CommitSummaryViewModel> Commits { get; }
+    }
+}
diff --git a/src/GitHub.App/ViewModels/Documents/CommitSummaryViewModel.cs b/src/GitHub.App/ViewModels/Documents/CommitSummaryViewModel.cs
@@ -2,7 +2,7 @@
 using GitHub.Models;
 using GitHub.ViewModels;
 
-namespace GitHub.App.ViewModels.Documents
+namespace GitHub.ViewModels.Documents
 {
     public class CommitSummaryViewModel : ViewModelBase
     {

diff --git a/src/GitHub.App/ViewModels/Documents/PullRequestPageViewModel.cs b/src/GitHub.App/ViewModels/Documents/PullRequestPageViewModel.cs
@@ -1,10 +1,13 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Threading.Tasks;
 using GitHub.Extensions;
 using GitHub.Factories;
 using GitHub.Models;
+using GitHub.SampleData;
 using GitHub.Services;
+using ReactiveUI;
 
 namespace GitHub.ViewModels.Documents
 {
@@ -35,7 +38,7 @@ public PullRequestPageViewModel(
         }
 
         /// <inheritdoc/>
-        public IIssueishCommentThreadViewModel Thread { get; private set; }
+        public IReadOnlyList<IViewModel> Timeline { get; private set; }
 
         /// <inheritdoc/>
         public async Task InitializeAsync(
@@ -44,12 +47,34 @@ public async Task InitializeAsync(
         {
             await base.InitializeAsync(model).ConfigureAwait(true);
 
-            var thread = factory.CreateViewModel<IIssueishCommentThreadViewModel>();
-            await thread.InitializeAsync(
-                currentUser,
-                model,
-                true).ConfigureAwait(true);
-            Thread = thread;
+            Timeline = new IViewModel[]
+            {
+                new CommitSummariesViewModel(
+                    new CommitSummaryViewModel(new CommitModel
+                    {
+                        Author = new ActorModel { Login = "grokys" },
+                        AbbreviatedOid = "c7c7d25",
+                        MessageHeadline = "Refactor comment view models."
+                    }),
+                    new CommitSummaryViewModel(new CommitModel
+                    {
+                        Author = new ActorModel { Login = "grokys" },
+                        AbbreviatedOid = "04e6a90",
+                        MessageHeadline = "Refactor comment view models.",
+                    })),
+                new CommentViewModelDesigner
+                {
+                    Author = new ActorViewModelDesigner("meaghanlewis"),
+                    Body = @"This is looking great! Really enjoying using this feature so far.
+
+When leaving an inline comment, the comment posts successfully and then a new comment is drafted with the same text.",
+                },
+                new CommentViewModelDesigner
+                {
+                    Author = new ActorViewModelDesigner("grokys"),
+                    Body = @"Oops, sorry about that @meaghanlewis - I was sure I tested those things, but must have got messed up again at some point. Should be fixed now.",
+                },
+            };
         }
     }
 }
diff --git a/src/GitHub.App/ViewModels/Documents/PullRequestTimelineViewModel.cs b/src/GitHub.App/ViewModels/Documents/PullRequestTimelineViewModel.cs
diff --git a/src/GitHub.Exports.Reactive/ViewModels/Documents/IPullRequestPageViewModel.cs b/src/GitHub.Exports.Reactive/ViewModels/Documents/IPullRequestPageViewModel.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using GitHub.Models;
 
 namespace GitHub.ViewModels.Documents
@@ -9,9 +10,9 @@ namespace GitHub.ViewModels.Documents
     public interface IPullRequestPageViewModel : IPullRequestViewModelBase
     {
         /// <summary>
-        /// Gets the pull request's comment thread.
+        /// Gets the pull request's timeline.
         /// </summary>
-        IIssueishCommentThreadViewModel Thread { get; }
+        IReadOnlyList<IViewModel> Timeline { get; }
 
         /// <summary>
         /// Initializes the view model with data.

diff --git a/src/GitHub.Exports/Models/CommitModel.cs b/src/GitHub.Exports/Models/CommitModel.cs
@@ -7,6 +7,11 @@ namespace GitHub.Models
     /// </summary>
     public class CommitModel
     {
+        /// <summary>
+        /// Gets or sets the author of the commit.
+        /// </summary>
+        public ActorModel Author { get; set; }
+
         /// <summary>
         /// Gets the abbreviated git object ID for the commit.
         /// </summary>

diff --git a/src/GitHub.VisualStudio.UI/Views/CommentView.xaml b/src/GitHub.VisualStudio.UI/Views/CommentView.xaml
@@ -51,9 +51,9 @@

             <DockPanel>
               <StackPanel Orientation="Horizontal" DockPanel.Dock="Left" >
-                <controls:AccountAvatar Width="16" 
-                                        Height="16" 
-                                        Account="{Binding Author}"/>
+                <views:ActorAvatarView Width="16" 
+                                       Height="16" 
+                                       ViewModel="{Binding Author}"/>
 
                 <TextBlock Foreground="{DynamicResource GitHubVsToolWindowText}" FontWeight="Bold" Text="{Binding Author.Login}" Margin="4 0"/>
                 <ui:GitHubActionLink Content="{Binding UpdatedAt, Converter={ui:DurationToStringConverter}}"

diff --git a/src/GitHub.VisualStudio.UI/Views/Documents/PullRequestPageView.xaml b/src/GitHub.VisualStudio.UI/Views/Documents/PullRequestPageView.xaml
@@ -7,7 +7,7 @@
              xmlns:markdig="clr-namespace:Markdig.Wpf;assembly=Markdig.Wpf"
              xmlns:vsui="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.14.0"
              xmlns:v="clr-namespace:GitHub.VisualStudio.Views"
-             mc:Ignorable="d"  d:DesignHeight="1024" d:DesignWidth="800"
+             mc:Ignorable="d"  d:DesignHeight="2048" d:DesignWidth="800"
              MaxWidth="800">
     <d:DesignData.DataContext>
         <ghfvs:PullRequestPageViewModelDesigner/>
@@ -84,8 +84,45 @@
 
         <markdig:MarkdownViewer Name="bodyMarkdown" Markdown="{Binding Body}"/>
 
-        <Rectangle DockPanel.Dock="Top" Style="{StaticResource Separator}" Height="2" Margin="0,16"/>
+        <ItemsControl ItemsSource="{Binding Timeline}">
+            <ItemsControl.Resources>
+                <DataTemplate DataType="{x:Type ghfvs:CommitSummariesViewModel}">
+                    <ItemsControl ItemsSource="{Binding Commits}"/>
+                </DataTemplate>
 
-        <v:CommentThreadView DataContext="{Binding Thread}"/>
+                <DataTemplate DataType="{x:Type ghfvs:CommitSummaryViewModel}">
+                    <DockPanel>
+                        <ghfvs:OcticonImage DockPanel.Dock="Left"
+                                            Margin="0,0,2,0"
+                                            Icon="git_commit"/>
+                        <v:ActorAvatarView DockPanel.Dock="Left"
+                                           Width="16"
+                                           Height="16"
+                                           Margin="2"
+                                           ViewModel="{Binding Author}"/>
+                        <TextBlock DockPanel.Dock="Right">
+                            <Hyperlink>
+                                <Run Text="{Binding AbbreviatedOid, Mode=OneWay}"/>
+                            </Hyperlink>
+                        </TextBlock>
+                        <TextBlock Text="{Binding Header}"/>
+                    </DockPanel>
+                </DataTemplate>
+
+                <DataTemplate DataType="{x:Type ghfvs:CommentViewModelDesigner}">
+                    <v:CommentView/>
+                </DataTemplate>
+            </ItemsControl.Resources>
+            <ItemsControl.ItemTemplate>
+                <DataTemplate>
+                    <Border BorderThickness="0,1,0,0"
+                            BorderBrush="{DynamicResource GitHubHeaderSeparatorBrush}"
+                            Margin="0,16,0,0"
+                            Padding="0,16,0,0">
+                        <ContentControl Content="{Binding}"/>
+                    </Border>
+                </DataTemplate>
+            </ItemsControl.ItemTemplate>
+        </ItemsControl>
     </StackPanel>
 </UserControl>