Display drafts for replies.

Author: grokys

src/GitHub.App/ViewModels/PullRequestReviewCommentThreadViewModel.cs

@@ -2,6 +2,7 @@
 using System.ComponentModel.Composition;
 using System.Globalization;
 using System.Linq;
+using System.Reactive.Linq;
 using System.Threading.Tasks;
 using GitHub.Extensions;
 using GitHub.Factories;
@@ -107,6 +108,15 @@ await vm.InitializeAsync(
                 var vm = factory.CreateViewModel<IPullRequestReviewCommentViewModel>();
                 await vm.InitializeAsPlaceholderAsync(session, this, false).ConfigureAwait(true);
                 Comments.Add(vm);
+
+                var (key, secondaryKey) = GetDraftKeys(vm);
+                var draft = await DraftStore.GetDraft<PullRequestReviewCommentDraft>(key, secondaryKey).ConfigureAwait(true);
+
+                if (draft?.Side == Side)
+                {
+                    await vm.BeginEdit.Execute();
+                    vm.Body = draft.Body;
+                }
             }
         }
 

test/GitHub.App.UnitTests/ViewModels/CommentThreadViewModelTests.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Reactive.Concurrency;
+using System.Reactive.Linq;
 using System.Threading.Tasks;
 using GitHub.Models;
 using GitHub.Models.Drafts;
@@ -54,6 +55,21 @@ public async Task DoesntSaveDraftForNonEditingComment()
             }
         }
 
+        [Test]
+        public async Task CancelEditDeletesDraft()
+        {
+            using (TestUtils.WithScheduler(Scheduler.CurrentThread))
+            {
+                var drafts = Substitute.For<IMessageDraftStore>();
+                var target = CreateTarget(drafts: drafts);
+
+                await target.AddPlaceholder(false);
+                await target.Comments[0].CancelEdit.Execute();
+
+                await drafts.Received().DeleteDraft("file.cs", "10");
+            }
+        }
+
         static Target CreateTarget(
             IMessageDraftStore drafts = null,
             IScheduler scheduler = null)