Display PR details in document pane.

Next need to refactor out a common base class and create 2 different PR detail view models.

Author: grokys

src/GitHub.App/ViewModels/CommentViewModel.cs

@@ -195,7 +195,7 @@ protected Task InitializeAsync(
             CurrentUser = new ActorViewModel(currentUser);
             Id = comment?.Id;
             DatabaseId = comment?.DatabaseId ?? 0;
-            PullRequestId = comment?.PullRequestId ?? 0;
+            PullRequestId = (comment as PullRequestReviewCommentModel)?.PullRequestId ?? 0;
             Body = comment?.Body;
             EditState = state;
             Author = comment != null ? new ActorViewModel(comment.Author) : CurrentUser;

src/GitHub.App/ViewModels/Documents/IssueishPaneViewModel.cs

@@ -1,22 +1,67 @@
 using System;
 using System.ComponentModel.Composition;
 using System.Threading.Tasks;
+using GitHub.Extensions;
+using GitHub.Factories;
 using GitHub.Models;
+using GitHub.Services;
+using GitHub.ViewModels.GitHubPane;
+using ReactiveUI;
 
 namespace GitHub.ViewModels.Documents
 {
     [Export(typeof(IIssueishPaneViewModel))]
     [PartCreationPolicy(CreationPolicy.NonShared)]
     public class IssueishPaneViewModel : ViewModelBase, IIssueishPaneViewModel
     {
+        readonly IViewViewModelFactory factory;
+        readonly IPullRequestSessionManager sessionManager;
+        IViewModel content;
+
+        [ImportingConstructor]
+        public IssueishPaneViewModel(
+            IViewViewModelFactory factory,
+            IPullRequestSessionManager sessionManager)
+        {
+            Guard.ArgumentNotNull(factory, nameof(factory));
+            Guard.ArgumentNotNull(sessionManager, nameof(sessionManager));
+
+            this.factory = factory;
+            this.sessionManager = sessionManager;
+        }
+
+        public IViewModel Content
+        {
+            get => content;
+            private set => this.RaiseAndSetIfChanged(ref content, value);
+        }
+
         public Task InitializeAsync(IServiceProvider paneServiceProvider)
         {
             return Task.CompletedTask;
         }
 
-        public Task Load(IConnection connection, string owner, string name, int number)
+        public async Task Load(IConnection connection, string owner, string name, int number)
         {
-            return Task.CompletedTask;
+            Content = new SpinnerViewModel();
+
+            // TODO: We will eventually support loading issues here as well.
+            try
+            {
+                var session = await sessionManager.GetSession(owner, name, number).ConfigureAwait(true);
+                var vm = factory.CreateViewModel<IPullRequestDetailViewModel>();
+                await vm.InitializeAsync(
+                    session.LocalRepository,
+                    connection,
+                    owner,
+                    name,
+                    number).ConfigureAwait(true);
+                Content = vm;
+            }
+            catch (Exception ex)
+            {
+                // TODO: Show exception.
+            }
         }
     }
 }

src/GitHub.App/ViewModels/SpinnerViewModel.cs

@@ -0,0 +1,14 @@
+using System;
+using System.ComponentModel.Composition;
+
+namespace GitHub.ViewModels
+{
+    /// <summary>
+    /// View model which displays a spinner.
+    /// </summary>
+    [Export(typeof(ISpinnerViewModel))]
+    [PartCreationPolicy(CreationPolicy.NonShared)]
+    public class SpinnerViewModel : ViewModelBase, ISpinnerViewModel
+    {
+    }
+}

src/GitHub.Exports/Models/CommentModel.cs

@@ -17,14 +17,6 @@ public class CommentModel
         /// </summary>
         public int DatabaseId { get; set; }
 
-        /// <summary>
-        /// Gets the PullRequestId of the comment.
-        /// </summary>
-        public int PullRequestId { get; set; }
-        // The GraphQL Api does not allow for deleting of pull request comments.
-        // REST Api must be used, and PullRequestId is needed to reload the pull request.
-        // This field should be removed with better GraphQL support.
-
         /// <summary>
         /// Gets the author of the comment.
         /// </summary>

src/GitHub.Exports/Models/PullRequestDetailModel.cs

@@ -78,6 +78,11 @@ public class PullRequestDetailModel
         /// </summary>
         public IReadOnlyList<PullRequestFileModel> ChangedFiles { get; set; }
 
+        /// <summary>
+        /// Gets or sets a collection of comments on the pull request.
+        /// </summary>
+        public IReadOnlyList<CommentModel> Comments { get; set; }
+
         /// <summary>
         /// Gets or sets a collection of pull request reviews.
         /// </summary>

src/GitHub.Exports/Models/PullRequestReviewCommentModel.cs

@@ -7,6 +7,16 @@ namespace GitHub.Models
     /// </summary>
     public class PullRequestReviewCommentModel : CommentModel
     {
+        /// <summary>
+        /// Gets the PullRequestId of the comment.
+        /// </summary>
+        /// <remarks>
+        /// The GraphQL Api does not allow for deleting of pull request comments.
+        /// REST Api must be used, and PullRequestId is needed to reload the pull request.
+        /// This field should be removed with better GraphQL support.
+        /// </remarks>
+        public int PullRequestId { get; set; }
+
         /// <summary>
         /// Gets or sets the associated thread that contains the comment.
         /// </summary>

src/GitHub.Exports/ViewModels/Documents/IIssueishPaneViewModel.cs

@@ -9,6 +9,11 @@ namespace GitHub.ViewModels.Documents
     /// </summary>
     public interface IIssueishPaneViewModel : IPaneViewModel
     {
+        /// <summary>
+        /// Gets the content to display in the document pane.
+        /// </summary>
+        IViewModel Content { get; }
+
         /// <summary>
         /// Loads an issue or pull request into the view model.
         /// </summary>

src/GitHub.Exports/ViewModels/ISpinnerViewModel.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace GitHub.ViewModels
+{
+    /// <summary>
+    /// View model which displays a spinner.
+    /// </summary>
+    public interface ISpinnerViewModel : IViewModel
+    {
+    }
+}

src/GitHub.InlineReviews/Services/PullRequestSessionService.cs

@@ -304,6 +304,19 @@ public virtual async Task<PullRequestDetailModel> ReadPullRequestDetail(HostAddr
                         HeadRepositoryOwner = pr.HeadRepositoryOwner != null ? pr.HeadRepositoryOwner.Login : null,
                         State = pr.State.FromGraphQl(),
                         UpdatedAt = pr.UpdatedAt,
+                        Comments = pr.Comments(null, null, null, null).AllPages().Select(comment => new CommentModel
+                        {
+                            Id = comment.Id.Value,
+                            Author = new ActorModel
+                            {
+                                Login = comment.Author.Login,
+                                AvatarUrl = comment.Author.AvatarUrl(null),
+                            },
+                            Body = comment.Body,
+                            CreatedAt = comment.CreatedAt,
+                            DatabaseId = comment.DatabaseId.Value,
+                            Url = comment.Url,
+                        }).ToList(),
                         Reviews = pr.Reviews(null, null, null, null, null, null).AllPages().Select(review => new PullRequestReviewModel
                         {
                             Id = review.Id.Value,

src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj

@@ -29,4 +29,8 @@
     <PackageReference Include="Microsoft.VisualStudio.ImageCatalog" version="14.3.25407" />
     <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime" version="14.3.25407" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Views\Documents\" />
+  </ItemGroup>
 </Project>