Combine functionality to use BeginEdit

Author: StanleyGoldman

src/GitHub.InlineReviews/SampleData/CommentViewModelDesigner.cs

@@ -24,14 +24,11 @@ public CommentViewModelDesigner()
         public CommentEditState EditState { get; set; }
         public bool IsReadOnly { get; set; }
         public bool IsSubmitting { get; set; }
-        public bool CanEditOrDelete { get; } = true;
+        public bool CanDelete { get; } = true;
         public ICommentThreadViewModel Thread { get; }
         public DateTimeOffset UpdatedAt => DateTime.Now.Subtract(TimeSpan.FromDays(3));
         public IAccount User { get; set; }
 
-        public ReactiveCommand<object> BeginCreate { get; }
-        public ReactiveCommand<object> CancelCreate { get; }
-        public ReactiveCommand<Unit> CommitCreate { get; }
         public ReactiveCommand<object> BeginEdit { get; }
         public ReactiveCommand<object> CancelEdit { get; }
         public ReactiveCommand<Unit> CommitEdit { get; }

src/GitHub.InlineReviews/Services/InlineCommentPeekService.cs

@@ -111,7 +111,7 @@ public ITrackingPoint Show(ITextView textView, AddInlineCommentTag tag)
             if (item != null)
             {
                 var placeholder = item.ViewModel.Thread.Comments.Last();
-                placeholder.CancelCreate.Take(1).Subscribe(_ => session.Dismiss());
+                placeholder.CancelEdit.Take(1).Subscribe(_ => session.Dismiss());
             }
 
             return trackingPoint;

src/GitHub.InlineReviews/ViewModels/CommentViewModel.cs

@@ -24,7 +24,7 @@ public class CommentViewModel : ReactiveObject, ICommentViewModel
         CommentEditState state;
         DateTimeOffset updatedAt;
         string undoBody;
-        private bool canEditOrDelete;
+        private bool canDelete;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="CommentViewModel"/> class.
@@ -61,49 +61,31 @@ protected CommentViewModel(
             User = user;
             UpdatedAt = updatedAt;
 
-            var canEditOrDeleteObservable = this.WhenAnyValue(
+            var canDelete = this.WhenAnyValue(
                 x => x.EditState,
                 x => x == CommentEditState.None && user.Login.Equals(currentUser.Login));
 
-            canEditOrDeleteObservable.Subscribe(b => CanEditOrDelete = b);
+            canDelete.Subscribe(b => CanDelete = b);
 
-            Delete = ReactiveCommand.CreateAsyncTask(canEditOrDeleteObservable, DoDelete);
+            Delete = ReactiveCommand.CreateAsyncTask(canDelete, DoDelete);
 
-            BeginEdit = ReactiveCommand.Create(canEditOrDeleteObservable);
-            BeginEdit.Subscribe(DoBeginEdit);
-            AddErrorHandler(BeginEdit);
-
-            var canCreate = this.WhenAnyValue(
+            var canEdit = this.WhenAnyValue(
                 x => x.EditState,
-                x => x == CommentEditState.Placeholder ||
-                     (x == CommentEditState.None && user.Login.Equals(currentUser.Login)));
-
-            BeginCreate = ReactiveCommand.Create(canCreate);
-            BeginCreate.Subscribe(DoBeginCreate);
-            AddErrorHandler(BeginCreate);
+                x => x == CommentEditState.Placeholder || (x == CommentEditState.None && user.Equals(currentUser)));
 
-            CommitCreate = ReactiveCommand.CreateAsyncTask(
-                Observable.CombineLatest(
-                    this.WhenAnyValue(x => x.IsReadOnly),
-                    this.WhenAnyValue(x => x.Body, x => !string.IsNullOrWhiteSpace(x)),
-                    this.WhenAnyObservable(x => x.Thread.PostComment.CanExecuteObservable),
-                    (readOnly, hasBody, canPost) => !readOnly && hasBody && canPost),
-                DoCommitCreate);
-            AddErrorHandler(CommitCreate);
+            BeginEdit = ReactiveCommand.Create(canEdit);
+            BeginEdit.Subscribe(DoBeginEdit);
+            AddErrorHandler(BeginEdit);
 
             CommitEdit = ReactiveCommand.CreateAsyncTask(
                 Observable.CombineLatest(
                     this.WhenAnyValue(x => x.IsReadOnly),
                     this.WhenAnyValue(x => x.Body, x => !string.IsNullOrWhiteSpace(x)),
-                    this.WhenAnyObservable(x => x.Thread.EditComment.CanExecuteObservable),
+                    this.WhenAnyObservable(x => x.Thread.PostComment.CanExecuteObservable),
                     (readOnly, hasBody, canPost) => !readOnly && hasBody && canPost),
                 DoCommitEdit);
             AddErrorHandler(CommitEdit);
 
-            CancelCreate = ReactiveCommand.Create(CommitCreate.IsExecuting.Select(x => !x));
-            CancelCreate.Subscribe(DoCancelCreate);
-            AddErrorHandler(CancelCreate);
-
             CancelEdit = ReactiveCommand.Create(CommitEdit.IsExecuting.Select(x => !x));
             CancelEdit.Subscribe(DoCancelEdit);
             AddErrorHandler(CancelEdit);
@@ -160,15 +142,6 @@ void DoBeginEdit(object unused)
             }
         }
 
-        void DoBeginCreate(object unused)
-        {
-            if (state != CommentEditState.Creating)
-            {
-                undoBody = Body;
-                EditState = CommentEditState.Creating;
-            }
-        }
-
         void DoCancelEdit(object unused)
         {
             if (EditState == CommentEditState.Editing)
@@ -180,50 +153,24 @@ void DoCancelEdit(object unused)
             }
         }
 
-        void DoCancelCreate(object unused)
-        {
-            if (EditState == CommentEditState.Creating)
-            {
-                EditState = string.IsNullOrWhiteSpace(undoBody) ? CommentEditState.Placeholder : CommentEditState.None;
-                Body = undoBody;
-                ErrorMessage = null;
-                undoBody = null;
-            }
-        }
-
-        async Task DoCommitCreate(object unused)
+        async Task DoCommitEdit(object unused)
         {
             try
             {
                 ErrorMessage = null;
                 IsSubmitting = true;
 
-                var model = await Thread.PostComment.ExecuteAsyncTask(Body);
-                Id = model.Id;
-                NodeId = model.NodeId;
-                EditState = CommentEditState.None;
-                UpdatedAt = DateTimeOffset.Now;
-            }
-            catch (Exception e)
-            {
-                var message = e.Message;
-                ErrorMessage = message;
-                log.Error(e, "Error posting comment");
-            }
-            finally
-            {
-                IsSubmitting = false;
-            }
-        }
+                ICommentModel model;
 
-        async Task DoCommitEdit(object unused)
-        {
-            try
-            {
-                ErrorMessage = null;
-                IsSubmitting = true;
+                if (Id == 0)
+                {
+                    model = await Thread.PostComment.ExecuteAsyncTask(Body);
+                }
+                else
+                {
+                    model = await Thread.EditComment.ExecuteAsyncTask(new Tuple<int, string>(Id, Body));
+                }
 
-                var model = await Thread.EditComment.ExecuteAsyncTask(new Tuple<int, string>(Id, Body));
                 Id = model.Id;
                 NodeId = model.NodeId;
                 EditState = CommentEditState.None;
@@ -233,7 +180,7 @@ async Task DoCommitEdit(object unused)
             {
                 var message = e.Message;
                 ErrorMessage = message;
-                log.Error(e, "Error editing comment");
+                log.Error(e, "Error posting comment");
             }
             finally
             {
@@ -282,10 +229,10 @@ public bool IsSubmitting
             protected set { this.RaiseAndSetIfChanged(ref isSubmitting, value); }
         }
 
-        public bool CanEditOrDelete
+        public bool CanDelete
         {
-            get { return canEditOrDelete; }
-            private set { this.RaiseAndSetIfChanged(ref canEditOrDelete, value); }
+            get { return canDelete; }
+            private set { this.RaiseAndSetIfChanged(ref canDelete, value); }
         }
 
         /// <inheritdoc/>
@@ -304,15 +251,6 @@ public DateTimeOffset UpdatedAt
         /// <inheritdoc/>
         public IAccount User { get; }
 
-        /// <inheritdoc/>
-        public ReactiveCommand<object> BeginCreate { get; }
-
-        /// <inheritdoc/>
-        public ReactiveCommand<object> CancelCreate { get; }
-
-        /// <inheritdoc/>
-        public ReactiveCommand<Unit> CommitCreate { get; }
-
         /// <inheritdoc/>
         public ReactiveCommand<object> BeginEdit { get; }
 

src/GitHub.InlineReviews/ViewModels/ICommentViewModel.cs

@@ -9,7 +9,6 @@ namespace GitHub.InlineReviews.ViewModels
     public enum CommentEditState
     {
         None,
-        Creating,
         Editing,
         Placeholder,
     }
@@ -58,7 +57,7 @@ public interface ICommentViewModel : IViewModel
         /// <summary>
         /// Gets a value indicating whether the comment can be edited or deleted by the current user
         /// </summary>
-        bool CanEditOrDelete { get; }
+        bool CanDelete { get; }
 
         /// <summary>
         /// Gets the modified date of the comment.
@@ -75,21 +74,6 @@ public interface ICommentViewModel : IViewModel
         /// </summary>
         ICommentThreadViewModel Thread { get; }
 
-        /// <summary>
-        /// Gets a command which will begin the creation of the comment.
-        /// </summary>
-        ReactiveCommand<object> BeginCreate { get; }
-
-        /// <summary>
-        /// Gets a command which will cancel the creation of the comment.
-        /// </summary>
-        ReactiveCommand<object> CancelCreate { get; }
-
-        /// <summary>
-        /// Gets a command which will commit the creation of the comment.
-        /// </summary>
-        ReactiveCommand<Unit> CommitCreate { get; }
-
         /// <summary>
         /// Gets a command which will begin editing of the comment.
         /// </summary>

src/GitHub.InlineReviews/ViewModels/InlineCommentPeekViewModel.cs

@@ -184,7 +184,7 @@ async Task UpdateThread()
 
                 if (placeholder?.EditState == CommentEditState.Placeholder)
                 {
-                    await placeholder.BeginCreate.ExecuteAsync(null);
+                    await placeholder.BeginEdit.ExecuteAsync(null);
                     placeholder.Body = placeholderBody;
                 }
             }
@@ -211,7 +211,7 @@ string GetPlaceholderBodyToPreserve()
         {
             var lastComment = Thread?.Comments.LastOrDefault();
 
-            if (lastComment?.EditState == CommentEditState.Creating)
+            if (lastComment?.EditState == CommentEditState.Editing)
             {
                 if (!lastComment.IsSubmitting) return lastComment.Body;
             }

src/GitHub.InlineReviews/ViewModels/NewInlineCommentThreadViewModel.cs

@@ -54,7 +54,7 @@ public NewInlineCommentThreadViewModel(
                 o => null);
 
             var placeholder = PullRequestReviewCommentViewModel.CreatePlaceholder(session, this, CurrentUser);
-            placeholder.BeginCreate.Execute(null);
+            placeholder.BeginEdit.Execute(null);
             this.WhenAnyValue(x => x.NeedsPush).Subscribe(x => placeholder.IsReadOnly = x);
             Comments.Add(placeholder);
 

src/GitHub.InlineReviews/ViewModels/PullRequestReviewCommentViewModel.cs

@@ -61,7 +61,7 @@ public PullRequestReviewCommentViewModel(
                 .ToProperty(this, x => x.CommitCaption);
 
             StartReview = ReactiveCommand.CreateAsyncTask(
-                CommitCreate.CanExecuteObservable,
+                CommitEdit.CanExecuteObservable,
                 DoStartReview);
             AddErrorHandler(StartReview);
         }
@@ -125,7 +125,7 @@ async Task DoStartReview(object unused)
             try
             {
                 await session.StartReview();
-                await CommitCreate.ExecuteAsync(null);
+                await CommitEdit.ExecuteAsync(null);
             }
             finally
             {