Initial implementation of PR conversation view.

Author: grokys

src/GitHub.App/Models/PullRequestModel.cs

@@ -110,8 +110,8 @@ public string Title
             }
         }
 
-        PullRequestStateEnum status;
-        public PullRequestStateEnum State
+        PullRequestState status;
+        public PullRequestState State
         {
             get { return status; }
             set
@@ -126,8 +126,8 @@ public PullRequestStateEnum State
         }
 
         // TODO: Remove these property once maintainer workflow has been merged to master.
-        public bool IsOpen => State == PullRequestStateEnum.Open;
-        public bool Merged => State == PullRequestStateEnum.Merged;
+        public bool IsOpen => State == PullRequestState.Open;
+        public bool Merged => State == PullRequestState.Merged;
 
         int commentCount;
         public int CommentCount

src/GitHub.App/Properties/AssemblyInfo.cs

@@ -2,6 +2,7 @@
 
 [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.SampleData")]
 [assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.SampleData.Dialog.Clone")]
+[assembly: XmlnsDefinition("https://github.com/github/VisualStudio", "GitHub.SampleData.Documents")]
 [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")]

src/GitHub.App/SampleData/CommentViewModelDesigner.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Reactive;
+using System.Threading.Tasks;
+using GitHub.Models;
 using GitHub.ViewModels;
 using ReactiveUI;
 
@@ -33,5 +35,10 @@ public CommentViewModelDesigner()
         public ReactiveCommand<Unit, Unit> CommitEdit { get; }
         public ReactiveCommand<Unit, Unit> OpenOnGitHub { get; }
         public ReactiveCommand<Unit, Unit> Delete { get; }
+
+        public Task InitializeAsync(ICommentThreadViewModel thread, ActorModel currentUser, CommentModel comment, CommentEditState state)
+        {
+            return Task.CompletedTask;
+        }
     }
 }

src/GitHub.App/SampleData/Documents/IssueishCommentThreadViewModelDesigner.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Threading.Tasks;
+using GitHub.Models;
+using GitHub.ViewModels;
+using GitHub.ViewModels.Documents;
+using ReactiveUI;
+
+namespace GitHub.SampleData.Documents
+{
+    public class IssueishCommentThreadViewModelDesigner : ViewModelBase, IIssueishCommentThreadViewModel
+    {
+        public IReadOnlyReactiveList<ICommentViewModel> Comments { get; set; }
+        public IActorViewModel CurrentUser { get; } = new ActorViewModelDesigner("grokys");
+        public Task DeleteComment(int pullRequestId, int commentId) => Task.CompletedTask;
+        public Task EditComment(string id, string body) => Task.CompletedTask;
+        public Task InitializeAsync(ActorModel currentUser, IssueishDetailModel model, bool addPlaceholder) => Task.CompletedTask;
+        public Task PostComment(string body) => Task.CompletedTask;
+    }
+}

src/GitHub.App/SampleData/Documents/PullRequestPageViewModelDesigner.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Reactive;
+using System.Threading.Tasks;
+using GitHub.Models;
+using GitHub.ViewModels;
+using GitHub.ViewModels.Documents;
+using ReactiveUI;
+
+namespace GitHub.SampleData.Documents
+{
+    public class PullRequestPageViewModelDesigner : ViewModelBase, IPullRequestPageViewModel
+    {
+        public PullRequestPageViewModelDesigner()
+        {
+            Body = @"Save drafts of inline comments, PR reviews and PRs.
+
+> Note: This feature required a refactoring of the comment view models because they now need async initialization and to be available from GitHub.App. This part of the PR has been submitted separately as #1993 to ease review. The two PRs can alternatively be reviewed as one if that's more convenient.
+
+As described in #1905, it is easy to lose a comment that you're working on if you close the diff view accidentally. This PR saves drafts of comments as they are being written to an SQLite database.
+
+In addition to saving drafts of inline comments, it also saves comments to PR reviews and PRs themselves.
+
+The comments are written to an SQLite database directly instead of going through Akavache because in the case of inline reviews, there can be many drafts in progress on a separate file. When a diff is opened we need to look for any comments present on that file and show the most recent. That use-case didn't fit well with Akavache (being a pure key/value store).
+
+## Testing
+
+### Inline Comments
+
+- Open a PR
+- Open the diff of a file
+- Start adding a comment
+- Close the comment by closing the peek view, or the document tab
+- Reopen the diff
+- You should see the comment displayed in edit mode with the draft of the comment you were previously writing
+
+### PR reviews
+
+- Open a PR
+- Click ""Add your review""
+- Start adding a review
+- Click the ""Back"" button and navigate to a different PR
+- Click the ""Back"" button and navigate to the original PR
+- Click ""Add your review""
+- You should see the the draft of the review you were previously writing
+
+### PRs
+
+-Click ""Create new"" at the top of the PR list
+- Start adding a PR title/ description
+- Close VS
+- Restart VS and click ""Create new"" again
+- You should see the the draft of the PR you were previously writing
+
+Depends on #1993 
+Fixes #1905";
+        }
+
+        public PullRequestState State { get; set; } = PullRequestState.Open;
+        public IIssueishCommentThreadViewModel Thread { get; set; }
+        public string SourceBranchDisplayName { get; set; } = "feature/save-drafts";
+        public string TargetBranchDisplayName { get; set; } = "master";
+        public IActorViewModel Author { get; set; } = new ActorViewModelDesigner("grokys");
+        public string Body { get; set; }
+        public int Number { get; set; } = 1994;
+        public IRepositoryModel Repository { get; set; }
+        public string Title { get; set; } = "Save drafts of comments";
+        public Uri WebUrl { get; set; }
+        public ReactiveCommand<Unit, Unit> OpenOnGitHub { get; }
+
+        public Task InitializeAsync(ActorModel currentUser, PullRequestDetailModel model) => Task.CompletedTask;
+    }
+}

src/GitHub.App/Services/FromGraphQlExtensions.cs

@@ -33,16 +33,16 @@ public static class FromGraphQlExtensions
             }
         }
 
-        public static PullRequestStateEnum FromGraphQl(this PullRequestState value)
+        public static Models.PullRequestState FromGraphQl(this Octokit.GraphQL.Model.PullRequestState value)
         {
             switch (value)
             {
-                case PullRequestState.Open:
-                    return PullRequestStateEnum.Open;
-                case PullRequestState.Closed:
-                    return PullRequestStateEnum.Closed;
-                case PullRequestState.Merged:
-                    return PullRequestStateEnum.Merged;
+                case Octokit.GraphQL.Model.PullRequestState.Open:
+                    return Models.PullRequestState.Open;
+                case Octokit.GraphQL.Model.PullRequestState.Closed:
+                    return Models.PullRequestState.Closed;
+                case Octokit.GraphQL.Model.PullRequestState.Merged:
+                    return Models.PullRequestState.Merged;
                 default:
                     throw new ArgumentOutOfRangeException(nameof(value), value, null);
             }

src/GitHub.App/Services/ModelService.cs

@@ -442,7 +442,7 @@ IPullRequestModel Create(PullRequestCacheItem prCacheItem)
                 Head = Create(prCacheItem.Head),
                 State = prCacheItem.State.HasValue ?
                     prCacheItem.State.Value :
-                    prCacheItem.IsOpen.Value ? PullRequestStateEnum.Open : PullRequestStateEnum.Closed,
+                    prCacheItem.IsOpen.Value ? PullRequestState.Open : PullRequestState.Closed,
             };
         }
 
@@ -576,25 +576,25 @@ public PullRequestCacheItem(PullRequest pr)
             public string Body { get; set; }
 
             // Nullable for compatibility with old caches.
-            public PullRequestStateEnum? State { get; set; }
+            public PullRequestState? State { get; set; }
 
             // This fields exists only for compatibility with old caches. The State property should be used.
             public bool? IsOpen { get; set; }
             public bool? Merged { get; set; }
 
-            static PullRequestStateEnum GetState(PullRequest pullRequest)
+            static PullRequestState GetState(PullRequest pullRequest)
             {
                 if (pullRequest.State == ItemState.Open)
                 {
-                    return PullRequestStateEnum.Open;
+                    return PullRequestState.Open;
                 }
                 else if (pullRequest.Merged)
                 {
-                    return PullRequestStateEnum.Merged;
+                    return PullRequestState.Merged;
                 }
                 else
                 {
-                    return PullRequestStateEnum.Closed;
+                    return PullRequestState.Closed;
                 }
             }
         }

src/GitHub.App/Services/PullRequestService.cs

@@ -80,7 +80,7 @@ public async Task<Page<PullRequestListItemModel>> ReadPullRequests(
             string owner,
             string name,
             string after,
-            PullRequestStateEnum[] states)
+            Models.PullRequestState[] states)
         {
 
             ICompiledQuery<Page<PullRequestListItemModel>> query;
@@ -204,7 +204,7 @@ public async Task<Page<PullRequestListItemModel>> ReadPullRequests(
                 { nameof(owner), owner },
                 { nameof(name), name },
                 { nameof(after), after },
-                { nameof(states), states.Select(x => (PullRequestState)x).ToList() },
+                { nameof(states), states.Select(x => (Octokit.GraphQL.Model.PullRequestState)x).ToList() },
             };
 
             var result = await graphql.Run(query, vars);

src/GitHub.App/ViewModels/CommentViewModel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel.Composition;
 using System.Linq;
 using System.Reactive;
 using System.Reactive.Linq;
@@ -13,9 +14,11 @@
 namespace GitHub.ViewModels
 {
     /// <summary>
-    /// Base view model for an issue or pull request comment.
+    /// An issue or pull request comment.
     /// </summary>
-    public abstract class CommentViewModel : ReactiveObject, ICommentViewModel
+    [Export(typeof(ICommentViewModel))]
+    [PartCreationPolicy(CreationPolicy.NonShared)]
+    public class CommentViewModel : ReactiveObject, ICommentViewModel
     {
         static readonly ILogger log = LogManager.ForContext<CommentViewModel>();
         readonly ICommentService commentService;
@@ -36,6 +39,7 @@ public abstract class CommentViewModel : ReactiveObject, ICommentViewModel
         /// Initializes a new instance of the <see cref="CommentViewModel"/> class.
         /// </summary>
         /// <param name="commentService">The comment service.</param>
+        [ImportingConstructor]
         public CommentViewModel(ICommentService commentService)
         {
             Guard.ArgumentNotNull(commentService, nameof(commentService));
@@ -175,14 +179,8 @@ public ICommentThreadViewModel Thread
         /// <inheritdoc/>
         public ReactiveCommand<Unit, Unit> Delete { get; }
 
-        /// <summary>
-        /// Initializes the view model with data.
-        /// </summary>
-        /// <param name="thread">The thread that the comment is a part of.</param>
-        /// <param name="currentUser">The current user.</param>
-        /// <param name="comment">The comment model. May be null.</param>
-        /// <param name="state">The comment edit state.</param>
-        protected Task InitializeAsync(
+        /// <inheritdoc/>
+        public Task InitializeAsync(
             ICommentThreadViewModel thread,
             ActorModel currentUser,
             CommentModel comment,

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

@@ -0,0 +1,18 @@
+using System;
+using GitHub.Models;
+using GitHub.ViewModels;
+
+namespace GitHub.App.ViewModels.Documents
+{
+    public class CommitSummaryViewModel : ViewModelBase
+    {
+        public CommitSummaryViewModel(CommitModel model)
+        {
+            AbbreviatedOid = model.AbbreviatedOid;
+            Header = model.MessageHeadline;
+        }
+
+        public string AbbreviatedOid { get; }
+        public string Header { get; }
+    }
+}