Merge branch 'donokuda/pr-pane' into feature/pr-conversation

Author: grokys

src/GitHub.App/SampleData/PullRequestDetailViewModelDesigner.cs

@@ -124,6 +124,7 @@ public PullRequestDetailViewModelDesigner()
         public ReactiveCommand<Unit, Unit> Pull { get; }
         public ReactiveCommand<Unit, Unit> Push { get; }
         public ReactiveCommand<Unit, Unit> SyncSubmodules { get; }
+        public ReactiveCommand<Unit, Unit> OpenConversation { get; }
         public ReactiveCommand<Unit, Unit> OpenOnGitHub { get; }
         public ReactiveCommand<IPullRequestReviewSummaryViewModel, Unit> ShowReview { get; }
         public ReactiveCommand<IPullRequestCheckViewModel, Unit> ShowAnnotations { get; }

src/GitHub.App/ViewModels/GitHubPane/PullRequestDetailViewModel.cs

@@ -24,6 +24,7 @@
 using Serilog;
 using static System.FormattableString;
 using ReactiveCommand = ReactiveUI.ReactiveCommand;
+using GitHub.Primitives;
 
 namespace GitHub.ViewModels.GitHubPane
 {
@@ -42,6 +43,7 @@ public sealed class PullRequestDetailViewModel : PanePageViewModelBase, IPullReq
         readonly ISyncSubmodulesCommand syncSubmodulesCommand;
         readonly IViewViewModelFactory viewViewModelFactory;
         readonly IGitService gitService;
+        readonly IOpenIssueishDocumentCommand openDocumentCommand;
 
         IModelService modelService;
         PullRequestDetailModel model;
@@ -82,7 +84,8 @@ public PullRequestDetailViewModel(
             IPullRequestFilesViewModel files,
             ISyncSubmodulesCommand syncSubmodulesCommand,
             IViewViewModelFactory viewViewModelFactory,
-            IGitService gitService)
+            IGitService gitService,
+            IOpenIssueishDocumentCommand openDocumentCommand)
         {
             Guard.ArgumentNotNull(pullRequestsService, nameof(pullRequestsService));
             Guard.ArgumentNotNull(sessionManager, nameof(sessionManager));
@@ -92,6 +95,7 @@ public PullRequestDetailViewModel(
             Guard.ArgumentNotNull(syncSubmodulesCommand, nameof(syncSubmodulesCommand));
             Guard.ArgumentNotNull(viewViewModelFactory, nameof(viewViewModelFactory));
             Guard.ArgumentNotNull(gitService, nameof(gitService));
+            Guard.ArgumentNotNull(openDocumentCommand, nameof(openDocumentCommand));
 
             this.pullRequestsService = pullRequestsService;
             this.sessionManager = sessionManager;
@@ -101,6 +105,7 @@ public PullRequestDetailViewModel(
             this.syncSubmodulesCommand = syncSubmodulesCommand;
             this.viewViewModelFactory = viewViewModelFactory;
             this.gitService = gitService;
+            this.openDocumentCommand = openDocumentCommand;
 
             Files = files;
 
@@ -134,6 +139,8 @@ public PullRequestDetailViewModel(
             SyncSubmodules.Subscribe(_ => Refresh().ToObservable());
             SubscribeOperationError(SyncSubmodules);
 
+            OpenConversation = ReactiveCommand.Create(DoOpenConversation);
+
             OpenOnGitHub = ReactiveCommand.Create(DoOpenDetailsUrl);
 
             ShowReview = ReactiveCommand.Create<IPullRequestReviewSummaryViewModel>(DoShowReview);
@@ -144,11 +151,6 @@ public PullRequestDetailViewModel(
         [Import(AllowDefault = true)]
         private IStaticReviewFileMapManager StaticReviewFileMapManager { get; set; }
 
-        private void DoOpenDetailsUrl()
-        {
-            usageTracker.IncrementCounter(measuresModel => measuresModel.NumberOfPRDetailsOpenInGitHub).Forget();
-        }
-
         /// <inheritdoc/>
         public PullRequestDetailModel Model
         {
@@ -273,6 +275,9 @@ public Uri WebUrl
         /// <inheritdoc/>
         public ReactiveCommand<Unit, Unit> SyncSubmodules { get; }
 
+        /// <inheritdoc/>
+        public ReactiveCommand<Unit, Unit> OpenConversation { get; }
+
         /// <inheritdoc/>
         public ReactiveCommand<Unit, Unit> OpenOnGitHub { get; }
 
@@ -650,6 +655,21 @@ async Task DoSyncSubmodules()
             }
         }
 
+        void DoOpenConversation()
+        {
+            var p = new OpenIssueishParams(
+                HostAddress.Create(LocalRepository.CloneUrl),
+                RemoteRepositoryOwner,
+                LocalRepository.Name,
+                Number);
+            openDocumentCommand.Execute(p);
+        }
+
+        void DoOpenDetailsUrl()
+        {
+            usageTracker.IncrementCounter(measuresModel => measuresModel.NumberOfPRDetailsOpenInGitHub).Forget();
+        }
+
         void DoShowReview(IPullRequestReviewSummaryViewModel review)
         {
             if (review.State == PullRequestReviewState.Pending)

src/GitHub.App/ViewModels/GitHubPane/PullRequestListViewModel.cs

@@ -27,7 +27,6 @@ public class PullRequestListViewModel : IssueListViewModelBase, IPullRequestList
         readonly IPullRequestSessionManager sessionManager;
         readonly IPullRequestService service;
         readonly IDisposable subscription;
-        readonly IOpenIssueishDocumentCommand openDocumentCommand;
         ObservableAsPropertyHelper<Uri> webUrl;
 
         /// <summary>
@@ -40,24 +39,20 @@ public class PullRequestListViewModel : IssueListViewModelBase, IPullRequestList
         public PullRequestListViewModel(
             IPullRequestSessionManager sessionManager,
             IRepositoryService repositoryService,
-            IPullRequestService service,
-            IOpenIssueishDocumentCommand openDocumentCommand)
+            IPullRequestService service)
             : base(repositoryService)
         {
             Guard.ArgumentNotNull(sessionManager, nameof(sessionManager));
             Guard.ArgumentNotNull(service, nameof(service));
-            Guard.ArgumentNotNull(openDocumentCommand, nameof(openDocumentCommand));
 
             this.sessionManager = sessionManager;
             this.service = service;
-            this.openDocumentCommand = openDocumentCommand;
 
             subscription = sessionManager.WhenAnyValue(x => x.CurrentSession.PullRequest.Number).Subscribe(UpdateCurrent);
             webUrl = this.WhenAnyValue(x => x.RemoteRepository)
                 .Select(x => x?.CloneUrl?.ToRepositoryUrl().Append("pulls"))
                 .ToProperty(this, x => x.WebUrl);
             CreatePullRequest = ReactiveCommand.Create(() => NavigateTo("pull/new"));
-            OpenConversation = ReactiveCommand.Create<IPullRequestListItemViewModel>(DoOpenConversation);
             OpenItemInBrowser = ReactiveCommand.Create<IPullRequestListItemViewModel, IPullRequestListItemViewModel>(x => x);
         }
 
@@ -70,9 +65,6 @@ public PullRequestListViewModel(
         /// <inheritdoc/>
         public ReactiveCommand<Unit, Unit> CreatePullRequest { get; }
 
-        /// <inheritdoc/>
-        public ReactiveCommand<IPullRequestListItemViewModel, Unit> OpenConversation { get; }
-
         /// <inheritdoc/>
         public ReactiveCommand<IPullRequestListItemViewModel, IPullRequestListItemViewModel> OpenItemInBrowser { get; }
 
@@ -100,16 +92,6 @@ protected override Task<Page<ActorModel>> LoadAuthors(string after)
                 after);
         }
 
-        void DoOpenConversation(IIssueListItemViewModelBase item)
-        {
-            var p = new OpenIssueishParams(
-                HostAddress.Create(LocalRepository.CloneUrl),
-                RemoteRepository.Owner,
-                RemoteRepository.Name,
-                item.Number);
-            openDocumentCommand.Execute(p);
-        }
-
         void UpdateCurrent(int number)
         {
             if (Items != null)

src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestDetailViewModel.cs

@@ -171,6 +171,11 @@ public interface IPullRequestDetailViewModel : IPanePageViewModel, IOpenInBrowse
         /// </summary>
         ReactiveCommand<Unit, Unit> SyncSubmodules { get; }
 
+        /// <summary>
+        /// Gets a command that opens the pull request conversation in a document pane.
+        /// </summary>
+        ReactiveCommand<Unit, Unit> OpenConversation { get; }
+
         /// <summary>
         /// Gets a command that opens the pull request on GitHub.
         /// </summary>

src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestListViewModel.cs

@@ -14,11 +14,6 @@ public interface IPullRequestListViewModel : IIssueListViewModelBase, IOpenInBro
         /// </summary>
         ReactiveCommand<Unit, Unit> CreatePullRequest { get; }
 
-        /// <summary>
-        /// Gets a command that opens the pull request conversation in a document pane.
-        /// </summary>
-        ReactiveCommand<IPullRequestListItemViewModel, Unit> OpenConversation { get; }
-
         /// <summary>
         /// Gets a command that opens the pull request item on GitHub.
         /// </summary>