Load PR timeline from GraphQL.

grokys · grokys · commit 102e3378da5f · 2018-10-30T16:03:37.000+01:00
And display its commits and comments in the conversation view.
diff --git a/lib/Octokit.GraphQL.0.1.1-beta.nupkg b/lib/Octokit.GraphQL.0.1.1-beta.nupkg
diff --git a/lib/Octokit.GraphQL.0.2.0-beta.nupkg b/lib/Octokit.GraphQL.0.2.0-beta.nupkg
diff --git a/src/GitHub.Api/GitHub.Api.csproj b/src/GitHub.Api/GitHub.Api.csproj
@@ -30,6 +30,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
-    <PackageReference Include="Octokit.GraphQL" Version="0.1.1-beta" />
+    <PackageReference Include="Octokit.GraphQL" Version="0.2.0-beta" />
   </ItemGroup>
 </Project>
diff --git a/src/GitHub.App/GitHub.App.csproj b/src/GitHub.App/GitHub.App.csproj
@@ -49,7 +49,7 @@
     <PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.17" />
     <PackageReference Include="Microsoft.VisualStudio.Shell.14.0" Version="14.3.25407" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
-    <PackageReference Include="Octokit.GraphQL" Version="0.1.1-beta" />
+    <PackageReference Include="Octokit.GraphQL" Version="0.2.0-beta" />
     <PackageReference Include="Rothko" Version="0.0.3-ghfvs" />
     <PackageReference Include="Serilog" Version="2.5.0" />
     <PackageReference Include="SerilogAnalyzer" Version="0.12.0.0" />
diff --git a/src/GitHub.App/Services/PullRequestService.cs b/src/GitHub.App/Services/PullRequestService.cs
@@ -90,7 +90,7 @@ public async Task<Page<PullRequestListItemModel>> ReadPullRequests(
                 if (readPullRequests == null)
                 {
                     readPullRequests = new Query()
-                          .Repository(Var(nameof(owner)), Var(nameof(name)))
+                          .Repository(owner: Var(nameof(owner)), name: Var(nameof(name)))
                           .PullRequests(
                               first: 100,
                               after: Var(nameof(after)),
@@ -151,7 +151,7 @@ public async Task<Page<PullRequestListItemModel>> ReadPullRequests(
                 if (readPullRequestsEnterprise == null)
                 {
                     readPullRequestsEnterprise = new Query()
-                          .Repository(Var(nameof(owner)), Var(nameof(name)))
+                          .Repository(owner: Var(nameof(owner)), name: Var(nameof(name)))
                           .PullRequests(
                               first: 100,
                               after: Var(nameof(after)),
@@ -290,7 +290,7 @@ public async Task<Page<ActorModel>> ReadAssignableUsers(
             if (readAssignableUsers == null)
             {
                 readAssignableUsers = new Query()
-                    .Repository(Var(nameof(owner)), Var(nameof(name)))
+                    .Repository(owner: Var(nameof(owner)), name: Var(nameof(name)))
                     .AssignableUsers(first: 100, after: Var(nameof(after)))
                     .Select(connection => new Page<ActorModel>
                     {
diff --git a/src/GitHub.App/Services/RepositoryCloneService.cs b/src/GitHub.App/Services/RepositoryCloneService.cs
@@ -88,13 +88,13 @@ public async Task<ViewerRepositoriesModel> ReadViewerRepositories(HostAddress ad
                     .Select(viewer => new ViewerRepositoriesModel
                     {
                         Owner = viewer.Login,
-                        Repositories = viewer.Repositories(null, null, null, null, null, order, affiliation, null, null)
+                        Repositories = viewer.Repositories(null, null, null, null, affiliation, null, null, order, null, null)
                             .AllPages()
                             .Select(repositorySelection).ToList(),
                         OrganizationRepositories = viewer.Organizations(null, null, null, null).AllPages().Select(org => new
                         {
                             org.Login,
-                            Repositories = org.Repositories(null, null, null, null, null, order, null, null, null)
+                            Repositories = org.Repositories(null, null, null, null, null, null, null, order, null, null)
                                 .AllPages()
                                 .Select(repositorySelection).ToList()
                         }).ToDictionary(x => x.Login, x => (IReadOnlyList<RepositoryListItemModel>)x.Repositories),
diff --git a/src/GitHub.App/Services/RepositoryService.cs b/src/GitHub.App/Services/RepositoryService.cs
@@ -34,7 +34,7 @@ public RepositoryService(IGraphQLClientFactory graphqlFactory)
             if (readParentOwnerLogin == null)
             {
                 readParentOwnerLogin = new Query()
-                    .Repository(Var(nameof(owner)), Var(nameof(name)))
+                    .Repository(owner: Var(nameof(owner)), name: Var(nameof(name)))
                     .Select(r => r.Parent != null ? Tuple.Create(r.Parent.Owner.Login, r.Parent.Name) : null)
                     .Compile();
             }
diff --git a/src/GitHub.App/ViewModels/Documents/CommitSummariesViewModel.cs b/src/GitHub.App/ViewModels/Documents/CommitSummariesViewModel.cs
@@ -1,4 +1,5 @@
 ﻿using System.Collections.Generic;
+using System.Linq;
 
 namespace GitHub.ViewModels.Documents
 {
@@ -9,6 +10,11 @@ public CommitSummariesViewModel(params CommitSummaryViewModel[] commits)
             Commits = commits;
         }
 
+        public CommitSummariesViewModel(IEnumerable<CommitSummaryViewModel> commits)
+        {
+            Commits = commits.ToList();
+        }
+
         public IReadOnlyList<CommitSummaryViewModel> Commits { get; }
     }
 }
diff --git a/src/GitHub.App/ViewModels/Documents/CommitSummaryViewModel.cs b/src/GitHub.App/ViewModels/Documents/CommitSummaryViewModel.cs
@@ -9,10 +9,12 @@ public class CommitSummaryViewModel : ViewModelBase
         public CommitSummaryViewModel(CommitModel model)
         {
             AbbreviatedOid = model.AbbreviatedOid;
+            Author = new ActorViewModel(model.Author);
             Header = model.MessageHeadline;
         }
 
         public string AbbreviatedOid { get; }
+        public IActorViewModel Author { get; }
         public string Header { get; }
     }
 }
diff --git a/src/GitHub.App/ViewModels/Documents/PullRequestPageViewModel.cs b/src/GitHub.App/ViewModels/Documents/PullRequestPageViewModel.cs
@@ -16,7 +16,7 @@ namespace GitHub.ViewModels.Documents
     /// </summary>
     [Export(typeof(IPullRequestPageViewModel))]
     [PartCreationPolicy(CreationPolicy.NonShared)]
-    public class PullRequestPageViewModel : PullRequestViewModelBase, IPullRequestPageViewModel
+    public class PullRequestPageViewModel : PullRequestViewModelBase, IPullRequestPageViewModel, ICommentThreadViewModel
     {
         readonly IViewViewModelFactory factory;
         readonly IPullRequestSessionManager sessionManager;
@@ -37,44 +37,69 @@ public PullRequestPageViewModel(
             this.sessionManager = sessionManager;
         }
 
+        /// <inheritdoc/>
+        public IActorViewModel CurrentUser { get; private set; }
+
         /// <inheritdoc/>
         public IReadOnlyList<IViewModel> Timeline { get; private set; }
 
+        /// <inheritdoc/>
+        IReadOnlyReactiveList<ICommentViewModel> ICommentThreadViewModel.Comments => throw new NotImplementedException();
+
         /// <inheritdoc/>
         public async Task InitializeAsync(
             ActorModel currentUser,
             PullRequestDetailModel model)
         {
             await base.InitializeAsync(model).ConfigureAwait(true);
 
-            Timeline = new IViewModel[]
+            CurrentUser = new ActorViewModel(currentUser);
+
+            var timeline = new ReactiveList<IViewModel>();
+            var commits = new List<CommitSummaryViewModel>();
+
+            foreach (var i in model.Timeline)
             {
-                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
+                if (!(i is CommitModel) && commits.Count > 0)
                 {
-                    Author = new ActorViewModelDesigner("meaghanlewis"),
-                    Body = @"This is looking great! Really enjoying using this feature so far.
+                    timeline.Add(new CommitSummariesViewModel(commits));
+                    commits.Clear();
+                }
 
-When leaving an inline comment, the comment posts successfully and then a new comment is drafted with the same text.",
-                },
-                new CommentViewModelDesigner
+                switch (i)
                 {
-                    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.",
-                },
-            };
+                    case CommitModel commit:
+                        commits.Add(new CommitSummaryViewModel(commit));
+                        break;
+                    case CommentModel comment:
+                        var vm = factory.CreateViewModel<ICommentViewModel>();
+                        await vm.InitializeAsync(this, currentUser, comment, CommentEditState.None).ConfigureAwait(true);
+                        timeline.Add(vm);
+                        break;
+                }
+            }
+
+            if (commits.Count > 0)
+            {
+                timeline.Add(new CommitSummariesViewModel(commits));
+            }
+
+            Timeline = timeline;
+        }
+
+        Task ICommentThreadViewModel.DeleteComment(int pullRequestId, int commentId)
+        {
+            throw new NotImplementedException();
+        }
+
+        Task ICommentThreadViewModel.EditComment(string id, string body)
+        {
+            throw new NotImplementedException();
+        }
+
+        Task ICommentThreadViewModel.PostComment(string body)
+        {
+            throw new NotImplementedException();
         }
     }
 }
diff --git a/src/GitHub.Exports/Models/PullRequestDetailModel.cs b/src/GitHub.Exports/Models/PullRequestDetailModel.cs
@@ -76,5 +76,10 @@ public class PullRequestDetailModel : IssueishDetailModel
         /// into threads, as such each pull request review comment will appear in both collections.
         /// </remarks>
         public IReadOnlyList<PullRequestReviewThreadModel> Threads { get; set; }
+
+        /// <summary>
+        /// Gets or sets the pull request timeline entries.
+        /// </summary>
+        public IReadOnlyList<object> Timeline { get; set; }
     }
 }
diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj
@@ -356,11 +356,11 @@
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Octokit.GraphQL, Version=0.1.1.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>
+    <Reference Include="Octokit.GraphQL, Version=0.2.0.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Octokit.GraphQL.0.2.0-beta\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>
     </Reference>
-    <Reference Include="Octokit.GraphQL.Core, Version=0.1.1.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.Core.dll</HintPath>
+    <Reference Include="Octokit.GraphQL.Core, Version=0.2.0.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Octokit.GraphQL.0.2.0-beta\lib\netstandard1.1\Octokit.GraphQL.Core.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
diff --git a/src/GitHub.InlineReviews/Services/PullRequestSessionService.cs b/src/GitHub.InlineReviews/Services/PullRequestSessionService.cs
@@ -283,8 +283,8 @@ public virtual async Task<PullRequestDetailModel> ReadPullRequestDetail(HostAddr
             if (readPullRequest == null)
             {
                 readPullRequest = new Query()
-                    .Repository(Var(nameof(owner)), Var(nameof(name)))
-                    .PullRequest(Var(nameof(number)))
+                    .Repository(owner: Var(nameof(owner)), name: Var(nameof(name)))
+                    .PullRequest(number: Var(nameof(number)))
                     .Select(pr => new PullRequestDetailModel
                     {
                         Id = pr.Id.Value,
@@ -356,6 +356,30 @@ public virtual async Task<PullRequestDetailModel> ReadPullRequestDetail(HostAddr
                                 Url = comment.Url,
                             }).ToList(),
                         }).ToList(),
+                        Timeline = pr.Timeline(null, null, null, null, null).AllPages().Select(item => item.Switch<object>(when =>
+                            when.Commit(commit => new CommitModel
+                            {
+                                AbbreviatedOid = commit.AbbreviatedOid,
+                                // TODO: commit.Author.User can be null
+                                Author = new ActorModel
+                                {
+                                    Login = commit.Author.User.Login,
+                                    AvatarUrl = commit.Author.User.AvatarUrl(null),
+                                },
+                                MessageHeadline = commit.MessageHeadline,
+                            }).IssueComment(comment => new CommentModel
+                            {
+                                Author = new ActorModel
+                                {
+                                    Login = comment.Author.Login,
+                                    AvatarUrl = comment.Author.AvatarUrl(null),
+                                },
+                                Body = comment.Body,
+                                CreatedAt = comment.CreatedAt,
+                                DatabaseId = comment.DatabaseId.Value,
+                                Id = comment.Id.Value,
+                                Url = comment.Url,
+                            }))).ToList()
                     }).Compile();
             }
 
@@ -778,8 +802,8 @@ async Task<LastCommitAdapter> GetPullRequestLastCommitAdapter(HostAddress addres
                 if (readCommitStatuses == null)
                 {
                     readCommitStatuses = new Query()
-                          .Repository(Var(nameof(owner)), Var(nameof(name)))
-                          .PullRequest(Var(nameof(number))).Commits(last: 1).Nodes.Select(
+                          .Repository(owner: Var(nameof(owner)), name: Var(nameof(name)))
+                          .PullRequest(number: Var(nameof(number))).Commits(last: 1).Nodes.Select(
                               commit => new LastCommitAdapter
                               {
                                   CheckSuites = commit.Commit.CheckSuites(null, null, null, null, null).AllPages(10)
@@ -816,8 +840,8 @@ async Task<LastCommitAdapter> GetPullRequestLastCommitAdapter(HostAddress addres
                 if (readCommitStatusesEnterprise == null)
                 {
                     readCommitStatusesEnterprise = new Query()
-                     .Repository(Var(nameof(owner)), Var(nameof(name)))
-                     .PullRequest(Var(nameof(number))).Commits(last: 1).Nodes.Select(
+                     .Repository(owner: Var(nameof(owner)), name: Var(nameof(name)))
+                     .PullRequest(number: Var(nameof(number))).Commits(last: 1).Nodes.Select(
                          commit => new LastCommitAdapter
                          {
                              Statuses = commit.Commit.Status
diff --git a/src/GitHub.InlineReviews/packages.config b/src/GitHub.InlineReviews/packages.config
@@ -36,7 +36,7 @@
   <package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net452" />
   <package id="Microsoft.VSSDK.BuildTools" version="15.8.3252" targetFramework="net461" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
-  <package id="Octokit.GraphQL" version="0.1.1-beta" targetFramework="net461" />
+  <package id="Octokit.GraphQL" version="0.2.0-beta" targetFramework="net461" />
   <package id="Serilog" version="2.5.0" targetFramework="net461" />
   <package id="SerilogAnalyzer" version="0.12.0.0" targetFramework="net461" />
   <package id="System.Reactive" version="4.0.0" targetFramework="net461" />
diff --git a/src/GitHub.VisualStudio.UI/Views/CommentView.xaml b/src/GitHub.VisualStudio.UI/Views/CommentView.xaml
@@ -89,7 +89,8 @@
               </StackPanel>
             </DockPanel>
 
-            <markdig:MarkdownViewer Grid.Column="1" Grid.Row="1" 
+            <markdig:MarkdownViewer Grid.Column="1" Grid.Row="1"
+                                    Name="bodyMarkdown"
                                     Margin="0 2 0 0"
                                     Foreground="{DynamicResource VsBrush.WindowText}"
                                     Markdown="{Binding Body}"/>
diff --git a/src/GitHub.VisualStudio.UI/Views/CommentView.xaml.cs b/src/GitHub.VisualStudio.UI/Views/CommentView.xaml.cs
@@ -1,21 +1,27 @@
 ﻿using System;
+using System.ComponentModel.Composition;
 using System.Windows.Input;
+using GitHub.Exports;
 using GitHub.Services;
 using GitHub.UI;
 using GitHub.ViewModels;
+using GitHub.VisualStudio.UI.Helpers;
 using Microsoft.VisualStudio.Shell;
 using ReactiveUI;
 
 namespace GitHub.VisualStudio.Views
 {
     public class GenericCommentView : ViewBase<ICommentViewModel, GenericCommentView> { }
 
+    [ExportViewFor(typeof(ICommentViewModel))]
+    [PartCreationPolicy(CreationPolicy.NonShared)]
     public partial class CommentView : GenericCommentView
     {
         public CommentView()
         {
             InitializeComponent();
             this.Loaded += CommentView_Loaded;
+            bodyMarkdown.PreviewMouseWheel += ScrollViewerUtilities.FixMouseWheelScroll;
 
             this.WhenActivated(d =>
             {
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="2048" d:DesignWidth="800"
+             mc:Ignorable="d"  d:DesignHeight="1200" d:DesignWidth="800"
              MaxWidth="800">
     <d:DesignData.DataContext>
         <ghfvs:PullRequestPageViewModelDesigner/>
@@ -100,15 +100,24 @@
                                            Height="16"
                                            Margin="2"
                                            ViewModel="{Binding Author}"/>
-                        <TextBlock DockPanel.Dock="Right">
+                        <TextBlock DockPanel.Dock="Right"
+                                   FontFamily="Consolas"
+                                   Margin="0,0,0,2"
+                                   VerticalAlignment="Center">
                             <Hyperlink>
                                 <Run Text="{Binding AbbreviatedOid, Mode=OneWay}"/>
                             </Hyperlink>
                         </TextBlock>
-                        <TextBlock Text="{Binding Header}"/>
+                        <TextBlock Margin="0,0,0,2"
+                                   Text="{Binding Header}" 
+                                   VerticalAlignment="Center"/>
                     </DockPanel>
                 </DataTemplate>
-                
+
+                <DataTemplate DataType="{x:Type ghfvs:CommentViewModel}">
+                    <v:CommentView/>
+                </DataTemplate>
+
                 <DataTemplate DataType="{x:Type ghfvs:CommentViewModelDesigner}">
                     <v:CommentView/>
                 </DataTemplate>
diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
diff --git a/src/GitHub.VisualStudio/packages.config b/src/GitHub.VisualStudio/packages.config

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public RepositoryService(IGraphQLClientFactory graphqlFactory)`
`34`	`34`	`if (readParentOwnerLogin == null)`
`35`	`35`	`{`
`36`	`36`	`readParentOwnerLogin = new Query()`
`37`		`- .Repository(Var(nameof(owner)), Var(nameof(name)))`
	`37`	`+ .Repository(owner: Var(nameof(owner)), name: Var(nameof(name)))`
`38`	`38`	`.Select(r => r.Parent != null ? Tuple.Create(r.Parent.Owner.Login, r.Parent.Name) : null)`
`39`	`39`	`.Compile();`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System.Collections.Generic;`
	`2`	`+using System.Linq;`
`2`	`3`
`3`	`4`	`namespace GitHub.ViewModels.Documents`
`4`	`5`	`{`
`@@ -9,6 +10,11 @@ public CommitSummariesViewModel(params CommitSummaryViewModel[] commits)`
`9`	`10`	`Commits = commits;`
`10`	`11`	`}`
`11`	`12`
	`13`	`+ public CommitSummariesViewModel(IEnumerable<CommitSummaryViewModel> commits)`
	`14`	`+ {`
	`15`	`+ Commits = commits.ToList();`
	`16`	`+ }`
	`17`	`+`
`12`	`18`	`public IReadOnlyList<CommitSummaryViewModel> Commits { get; }`
`13`	`19`	`}`
`14`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,12 @@ public class CommitSummaryViewModel : ViewModelBase`
`9`	`9`	`public CommitSummaryViewModel(CommitModel model)`
`10`	`10`	`{`
`11`	`11`	`AbbreviatedOid = model.AbbreviatedOid;`
	`12`	`+ Author = new ActorViewModel(model.Author);`
`12`	`13`	`Header = model.MessageHeadline;`
`13`	`14`	`}`
`14`	`15`
`15`	`16`	`public string AbbreviatedOid { get; }`
	`17`	`+ public IActorViewModel Author { get; }`
`16`	`18`	`public string Header { get; }`
`17`	`19`	`}`
`18`	`20`	`}`