Implement closing/reopening a PR.

This state is not synced with the PR details pane or the PR list currently though.

Author: grokys

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

@@ -14,6 +14,6 @@ public class IssueishCommentThreadViewModelDesigner : ViewModelBase, IIssueishCo
         public Task DeleteComment(ICommentViewModel comment) => Task.CompletedTask;
         public Task EditComment(ICommentViewModel comment) => Task.CompletedTask;
         public Task PostComment(ICommentViewModel comment) => Task.CompletedTask;
-        public Task CloseIssueish(ICommentViewModel comment) => Task.CompletedTask;
+        public Task CloseOrReopen(ICommentViewModel comment) => Task.CompletedTask;
     }
 }

src/GitHub.App/Services/IssueishService.cs

@@ -2,24 +2,55 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using GitHub.Api;
+using GitHub.Factories;
 using GitHub.Models;
 using GitHub.Primitives;
+using Octokit;
 using Octokit.GraphQL;
 using Octokit.GraphQL.Model;
 using static Octokit.GraphQL.Variable;
 
 namespace GitHub.Services
 {
+    /// <summary>
+    /// Base class for issue and pull request services.
+    /// </summary>
     public abstract class IssueishService : IIssueishService
     {
         static ICompiledQuery<CommentModel> postComment;
+        readonly IApiClientFactory apiClientFactory;
         readonly IGraphQLClientFactory graphqlFactory;
 
-        public IssueishService(IGraphQLClientFactory graphqlFactory)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IssueishService"/> class.
+        /// </summary>
+        /// <param name="apiClientFactory">The API client factory.</param>
+        /// <param name="graphqlFactory">The GraphQL client factory.</param>
+        public IssueishService(
+            IApiClientFactory apiClientFactory,
+            IGraphQLClientFactory graphqlFactory)
         {
+            this.apiClientFactory = apiClientFactory;
             this.graphqlFactory = graphqlFactory;
         }
 
+        /// <inheritdoc/>
+        public async Task CloseIssueish(HostAddress address, string owner, string repository, int number)
+        {
+            var client = await apiClientFactory.CreateGitHubClient(address).ConfigureAwait(false);
+            var update = new IssueUpdate { State = ItemState.Closed };
+            await client.Issue.Update(owner, repository, number, update).ConfigureAwait(false);
+        }
+
+        /// <inheritdoc/>
+        public async Task ReopenIssueish(HostAddress address, string owner, string repository, int number)
+        {
+            var client = await apiClientFactory.CreateGitHubClient(address).ConfigureAwait(false);
+            var update = new IssueUpdate { State = ItemState.Open };
+            await client.Issue.Update(owner, repository, number, update).ConfigureAwait(false);
+        }
+
+        /// <inheritdoc/>
         public async Task<CommentModel> PostComment(HostAddress address, string issueishId, string body)
         {
             var input = new AddCommentInput

src/GitHub.App/Services/PullRequestService.cs

@@ -15,6 +15,7 @@
 using GitHub.Api;
 using GitHub.App.Services;
 using GitHub.Extensions;
+using GitHub.Factories;
 using GitHub.Logging;
 using GitHub.Models;
 using GitHub.Primitives;
@@ -63,10 +64,11 @@ public PullRequestService(
             IGitClient gitClient,
             IGitService gitService,
             IVSGitExt gitExt,
+            IApiClientFactory apiClientFactory,
             IGraphQLClientFactory graphqlFactory,
             IOperatingSystem os,
             IUsageTracker usageTracker)
-            : base(graphqlFactory)
+            : base(apiClientFactory, graphqlFactory)
         {
             this.gitClient = gitClient;
             this.gitService = gitService;

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

@@ -1,4 +1,5 @@
-using System.Reactive;
+using System;
+using System.Reactive;
 using System.Threading.Tasks;
 using GitHub.Models;
 using ReactiveUI;
@@ -8,7 +9,7 @@ namespace GitHub.ViewModels.Documents
     /// <summary>
     /// View model for comments on an issue or pull request.
     /// </summary>
-    public interface IIssueishCommentViewModel : ICommentViewModel
+    public interface IIssueishCommentViewModel : ICommentViewModel, IDisposable
     {
         /// <summary>
         /// Gets a value indicating whether the comment will show a button for
@@ -36,16 +37,19 @@ public interface IIssueishCommentViewModel : ICommentViewModel
         /// <param name="isPullRequest">
         /// true if the comment is on a pull request, false if the comment is on an issue.
         /// </param>
-        /// <param name="isOpen">Whether the issue or pull request is open.</param>
         /// <param name="canCloseOrReopen">
         /// Whether the user can close or reopen the pull request from this comment.
         /// </param>
+        /// <param name="isOpen">
+        /// An observable tracking whether the issue or pull request is open. Can be null if
+        /// <paramref name="canCloseOrReopen"/> is false.
+        /// </param>
         Task InitializeAsync(
             IIssueishCommentThreadViewModel thread,
             ActorModel currentUser,
             CommentModel comment,
             bool isPullRequest,
-            bool isOpen,
-            bool canCloseOrReopen);
+            bool canCloseOrReopen,
+            IObservable<bool> isOpen = null);
     }
 }

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

@@ -14,8 +14,9 @@ namespace GitHub.ViewModels.Documents
     /// </summary>
     [Export(typeof(IIssueishCommentViewModel))]
     [PartCreationPolicy(CreationPolicy.NonShared)]
-    public class IssueishCommentViewModel : CommentViewModel, IIssueishCommentViewModel
+    public sealed class IssueishCommentViewModel : CommentViewModel, IIssueishCommentViewModel
     {
+        bool canCloseOrReopen;
         ObservableAsPropertyHelper<string> closeOrReopenCaption;
 
         /// <summary>
@@ -29,10 +30,15 @@ public IssueishCommentViewModel(ICommentService commentService)
             CloseOrReopen = ReactiveCommand.CreateFromTask(
                 DoCloseOrReopen,
                 this.WhenAnyValue(x => x.CanCloseOrReopen));
+            AddErrorHandler(CloseOrReopen);
         }
 
         /// <inheritdoc/>
-        public bool CanCloseOrReopen { get; private set; }
+        public bool CanCloseOrReopen
+        {
+            get => canCloseOrReopen;
+            private set => this.RaiseAndSetIfChanged(ref canCloseOrReopen, value);
+        }
 
         /// <inheritdoc/>
         public string CloseOrReopenCaption => closeOrReopenCaption?.Value;
@@ -46,8 +52,8 @@ public async Task InitializeAsync(
             ActorModel currentUser,
             CommentModel comment,
             bool isPullRequest,
-            bool isOpen,
-            bool canCloseOrReopen)
+            bool canCloseOrReopen,
+            IObservable<bool> isOpen = null)
         {
             await base.InitializeAsync(
                 thread,
@@ -59,25 +65,39 @@ await base.InitializeAsync(
             CanCloseOrReopen = canCloseOrReopen;
             closeOrReopenCaption?.Dispose();
 
-            if (canCloseOrReopen)
+            if (canCloseOrReopen && isOpen != null)
             {
-                var caption = isPullRequest ?
-                    isOpen ?
-                        (Resources.ClosePullRequest, Resources.CloseAndComment) :
-                        (Resources.ReopenPullRequest, Resources.ReopenAndComment) :
-                    isOpen ?
-                        (Resources.CloseIssue, Resources.CloseAndComment) :
-                        (Resources.ReopenIssue, Resources.ReopenAndComment);
-
-                closeOrReopenCaption = this.WhenAnyValue(x => x.Body)
-                    .Select(x => string.IsNullOrWhiteSpace(x) ? caption.Item1 : caption.Item2)
+                closeOrReopenCaption =
+                    this.WhenAnyValue(x => x.Body)
+                    .CombineLatest(isOpen, (body, open) => GetCloseOrReopenCaption(isPullRequest, open, body))
                     .ToProperty(this, x => x.CloseOrReopenCaption);
             }
         }
 
-        Task DoCloseOrReopen()
+        public void Dispose() => closeOrReopenCaption.Dispose();
+
+        async Task DoCloseOrReopen()
         {
-            return Task.CompletedTask;
+            await ((IIssueishCommentThreadViewModel)Thread).CloseOrReopen(this).ConfigureAwait(true);
+        }
+
+        static string GetCloseOrReopenCaption(bool isPullRequest, bool isOpen, string body)
+        {
+            if (string.IsNullOrEmpty(body))
+            {
+                if (isPullRequest)
+                {
+                    return isOpen ? Resources.ClosePullRequest : Resources.ReopenPullRequest;
+                }
+                else
+                {
+                    return isOpen ? Resources.CloseIssue: Resources.ReopenIssue;
+                }
+            }
+            else
+            {
+                return isOpen ? Resources.CloseAndComment : Resources.ReopenAndComment;
+            }
         }
     }
 }

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

@@ -24,7 +24,7 @@ public class PullRequestPageViewModel : PullRequestViewModelBase, IPullRequestPa
         readonly IPullRequestSessionManager sessionManager;
         readonly ITeamExplorerServices teServices;
         ActorModel currentUserModel;
-        ReactiveList<IViewModel> timeline;
+        ReactiveList<IViewModel> timeline = new ReactiveList<IViewModel>();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PullRequestPageViewModel"/> class.
@@ -47,6 +47,8 @@ public PullRequestPageViewModel(
             this.sessionManager = sessionManager;
             this.teServices = teServices;
 
+            timeline.ItemsRemoved.Subscribe(TimelineItemRemoved);
+
             ShowCommit = ReactiveCommand.CreateFromTask<string>(DoShowCommit);
         }
 
@@ -71,10 +73,10 @@ public async Task InitializeAsync(
         {
             await base.InitializeAsync(repository, localRepository, model).ConfigureAwait(true);
 
+            timeline.Clear();
             CommitCount = 0;
             currentUserModel = currentUser;
             CurrentUser = new ActorViewModel(currentUser);
-            timeline = new ReactiveList<IViewModel>();
 
             var commits = new List<CommitSummaryViewModel>();
 
@@ -106,6 +108,31 @@ public async Task InitializeAsync(
             await AddPlaceholder().ConfigureAwait(true);
         }
 
+        /// <inheritdoc/>
+        public async Task CloseOrReopen(ICommentViewModel comment)
+        {
+            var address = HostAddress.Create(Repository.CloneUrl);
+
+            if (State == PullRequestState.Open)
+            {
+                await service.CloseIssueish(
+                    address,
+                    Repository.Owner,
+                    Repository.Name,
+                    Number).ConfigureAwait(true);
+                State = PullRequestState.Closed;
+            }
+            else
+            {
+                await service.ReopenIssueish(
+                    address,
+                    Repository.Owner,
+                    Repository.Name,
+                    Number).ConfigureAwait(true);
+                State = PullRequestState.Open;
+            }
+        }
+
         /// <inheritdoc/>
         public async Task PostComment(ICommentViewModel comment)
         {
@@ -126,11 +153,6 @@ Task ICommentThreadViewModel.EditComment(ICommentViewModel comment)
             throw new NotImplementedException();
         }
 
-        Task IIssueishCommentThreadViewModel.CloseIssueish(ICommentViewModel comment)
-        {
-            throw new NotImplementedException();
-        }
-
         async Task AddComment(CommentModel comment)
         {
             var vm = factory.CreateViewModel<IIssueishCommentViewModel>();
@@ -139,7 +161,6 @@ await vm.InitializeAsync(
                 currentUserModel,
                 comment,
                 true,
-                State == PullRequestState.Open,
                 false).ConfigureAwait(true);
             timeline.Add(vm);
         }
@@ -152,8 +173,8 @@ await placeholder.InitializeAsync(
                 currentUserModel,
                 null,
                 true,
-                State == PullRequestState.Open,
-                true).ConfigureAwait(true);
+                true,
+                this.WhenAnyValue(x => x.State, x => x == PullRequestState.Open)).ConfigureAwait(true);
             timeline.Add(placeholder);
         }
 
@@ -162,5 +183,10 @@ async Task DoShowCommit(string oid)
             await service.FetchCommit(LocalRepository, Repository, oid).ConfigureAwait(true);
             teServices.ShowCommitDetails(oid);
         }
+
+        void TimelineItemRemoved(IViewModel item)
+        {
+            (item as IDisposable)?.Dispose();
+        }
     }
 }

src/GitHub.App/ViewModels/PullRequestViewModelBase.cs

@@ -32,7 +32,7 @@ public PullRequestViewModelBase()
         public PullRequestState State
         {
             get => state;
-            private set => this.RaiseAndSetIfChanged(ref state, value);
+            protected set => this.RaiseAndSetIfChanged(ref state, value);
         }
 
         public string SourceBranchDisplayName

src/GitHub.Exports.Reactive/Services/IIssueishService.cs

@@ -10,6 +10,24 @@ namespace GitHub.Services
     /// </summary>
     public interface IIssueishService
     {
+        /// <summary>
+        /// Closes an issue or pull request.
+        /// </summary>
+        /// <param name="address">The address of the server.</param>
+        /// <param name="owner">The repository owner.</param>
+        /// <param name="repository">The repository name.</param>
+        /// <param name="number">The issue or pull request number.</param>
+        Task CloseIssueish(HostAddress address, string owner, string repository, int number);
+
+        /// <summary>
+        /// Reopens an issue or pull request.
+        /// </summary>
+        /// <param name="address">The address of the server.</param>
+        /// <param name="owner">The repository owner.</param>
+        /// <param name="repository">The repository name.</param>
+        /// <param name="number">The issue or pull request number.</param>
+        Task ReopenIssueish(HostAddress address, string owner, string repository, int number);
+
         /// <summary>
         /// Posts an issue or pull request comment.
         /// </summary>

src/GitHub.Exports.Reactive/ViewModels/Documents/IIssueishCommentThreadViewModel.cs

@@ -12,6 +12,6 @@ public interface IIssueishCommentThreadViewModel : ICommentThreadViewModel
         /// Called by a comment in the thread to close the issue or pull request.
         /// </summary>
         /// <param name="body">The comment requesting the close.</param>
-        Task CloseIssueish(ICommentViewModel comment);
+        Task CloseOrReopen(ICommentViewModel comment);
     }
 }