Merge branch 'master' into feature/navigate-from-history-to-working-directory

Author: StanleyGoldman

docs/developer/how-viewmodels-are-turned-into-views.md

@@ -65,8 +65,8 @@ This is the basis for converting view models to views.
 
 There are currently two top-level controls for our UI:
 
-- [GitHubDialogWindow](../src/GitHub.VisualStudio/Views/Dialog/GitHubDialogWindow.xaml) for the dialog which shows the login, clone, etc views
-- [GitHubPaneView](../src/GitHub.VisualStudio/Views/GitHubPane/GitHubPaneView.xaml) for the GitHub pane
+- [GitHubDialogWindow](../../src/GitHub.VisualStudio/Views/Dialog/GitHubDialogWindow.xaml) for the dialog which shows the login, clone, etc views
+- [GitHubPaneView](../../src/GitHub.VisualStudio/Views/GitHubPane/GitHubPaneView.xaml) for the GitHub pane
 
 In the resources for each of these top-level controls we define a `DataTemplate` like so:
 
@@ -77,10 +77,10 @@ In the resources for each of these top-level controls we define a `DataTemplate`
 </DataTemplate>
 ```
 
-The `DataTemplate.DataType` here applies the template to all classes inherited from [`GitHub.ViewModels.ViewModelBase`](../src/GitHub.Exports.Reactive/ViewModels/ViewModelBase.cs) [1]. The template defines a single `ContentControl` whose contents are created by a `ViewLocator`.
+The `DataTemplate.DataType` here applies the template to all classes inherited from [`GitHub.ViewModels.ViewModelBase`](../../src/GitHub.Exports.Reactive/ViewModels/ViewModelBase.cs) [1]. The template defines a single `ContentControl` whose contents are created by a `ViewLocator`.
 
-The [`ViewLocator`](../src/GitHub.VisualStudio/Views/ViewLocator.cs) class is an `IValueConverter` which then creates an instance of the appropriate view for the view model using MEF.
+The [`ViewLocator`](../../src/GitHub.VisualStudio/Views/ViewLocator.cs) class is an `IValueConverter` which then creates an instance of the appropriate view for the view model using MEF.
 
 And thus a view model becomes a view.
 
-[1]: it would be nice to make it apply to all classes that inherit `IViewModel` but unfortunately WPF's `DataTemplate`s don't work with interfaces.
+[1]: it would be nice to make it apply to all classes that inherit `IViewModel` but unfortunately WPF's `DataTemplate`s don't work with interfaces.

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

@@ -138,9 +138,10 @@ Task PostReviewComment(
         /// <summary>
         /// Deletes a pull request comment.
         /// </summary>
-        /// <param name="number">The number of the pull request comment to delete</param>
+        /// <param name="pullRequestId">The number of the pull request id of the comment</param>
+        /// <param name="commentDatabaseId">The number of the pull request comment to delete</param>
         /// <returns>A task which completes when the session has completed updating.</returns>
-        Task DeleteComment(int number);
+        Task DeleteComment(int pullRequestId, int commentDatabaseId);
 
         /// <summary>
         /// Edit a PR review comment reply.

src/GitHub.Exports/GitHub.Exports.csproj

@@ -197,6 +197,7 @@
     <Compile Include="Services\IUsageService.cs" />
     <Compile Include="Settings\PkgCmdID.cs" />
     <Compile Include="ViewModels\GitHubPane\IGitHubPaneViewModel.cs" />
+    <Compile Include="ViewModels\GitHubPane\IGitHubToolWindowManager.cs" />
     <Compile Include="ViewModels\IConnectionInitializedViewModel.cs" />
     <Compile Include="ViewModels\IInfoPanel.cs" />
     <Compile Include="ViewModels\IViewModel.cs" />

src/GitHub.Exports/Models/CommentModel.cs

@@ -11,6 +11,19 @@ public class CommentModel
         /// Gets the ID of the comment.
         /// </summary>
         public string Id { get; set; }
+        
+        /// <summary>
+        /// Gets the DatabaseId of the comment.
+        /// </summary>
+        public int DatabaseId { get; set; }
+
+        /// <summary>
+        /// Gets the PullRequestId of the comment.
+        /// </summary>
+        public int PullRequestId { get; set; }
+        // The GraphQL Api does not allow for deleting of pull request comments.
+        // REST Api must be used, and PullRequestId is needed to reload the pull request.
+        // This field should be removed with better GraphQL support.
 
         /// <summary>
         /// Gets the author of the comment.

src/GitHub.Exports/ViewModels/GitHubPane/IGitHubToolWindowManager.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Threading.Tasks;
+using System.Runtime.InteropServices;
+
+namespace GitHub.ViewModels.GitHubPane
+{
+    /// <summary>
+    /// The Visual Studio service interface for accessing the GitHub Pane.
+    /// </summary>
+    [Guid("FC9EC5B5-C297-4548-A229-F8E16365543C")]
+    [ComVisible(true)]
+    public interface IGitHubToolWindowManager
+    {
+        /// <summary>
+        /// Ensure that the GitHub pane is created and visible.
+        /// </summary>
+        /// <returns>The view model for the GitHub Pane.</returns>
+        Task<IGitHubPaneViewModel> ShowGitHubPane();
+    }
+}

src/GitHub.InlineReviews/GitHub.InlineReviews.csproj

@@ -191,6 +191,10 @@
       <Project>{9aea02db-02b5-409c-b0ca-115d05331a6b}</Project>
       <Name>GitHub.Exports</Name>
     </ProjectReference>
+    <ProjectReference Include="..\GitHub.Extensions.Reactive\GitHub.Extensions.Reactive.csproj">
+      <Project>{6559E128-8B40-49A5-85A8-05565ED0C7E3}</Project>
+      <Name>GitHub.Extensions.Reactive</Name>
+    </ProjectReference>
     <ProjectReference Include="..\GitHub.Extensions\GitHub.Extensions.csproj">
       <Project>{6AFE2E2D-6DB0-4430-A2EA-F5F5388D2F78}</Project>
       <Name>GitHub.Extensions</Name>

src/GitHub.InlineReviews/SampleData/CommentViewModelDesigner.cs

@@ -16,6 +16,8 @@ public CommentViewModelDesigner()
         }
 
         public string Id { get; set; }
+        public int PullRequestId { get; set; }
+        public int DatabaseId { get; set; }
         public string Body { get; set; }
         public string ErrorMessage { get; set; }
         public CommentEditState EditState { get; set; }

src/GitHub.InlineReviews/Services/IPullRequestSessionService.cs

@@ -322,21 +322,20 @@ Task<PullRequestDetailModel> PostStandaloneReviewCommentReply(
         /// Delete a PR review comment.
         /// </summary>
         /// <param name="localRepository">The local repository.</param>
-        /// <param name="remoteRepositoryOwner">The owner of the repository fork to delete from.</param>
-        /// <param name="user">The user deleting the comment.</param>
-        /// <param name="number">The pull request comment number.</param>
+        /// <param name="remoteRepositoryOwner">The owner of the repository.</param>
+        /// <param name="pullRequestId">The pull request id of the comment</param>
+        /// <param name="commentDatabaseId">The pull request comment number.</param>
         /// <returns>The updated state of the pull request.</returns>
-        Task<PullRequestDetailModel> DeleteComment(
-            ILocalRepositoryModel localRepository,
+        Task<PullRequestDetailModel> DeleteComment(ILocalRepositoryModel localRepository,
             string remoteRepositoryOwner,
-            int number);
+            int pullRequestId,
+            int commentDatabaseId);
 
         /// <summary>
         /// Edit a PR review comment.
         /// </summary>
         /// <param name="localRepository">The local repository.</param>
-        /// <param name="remoteRepositoryOwner">The owner of the repository fork to delete from.</param>
-        /// <param name="user">The user deleting the comment.</param>
+        /// <param name="remoteRepositoryOwner">The owner of the repository.</param>
         /// <param name="commentNodeId">The pull request comment node id.</param>
         /// <param name="body">The replacement comment body.</param>
         /// <returns>The updated state of the pull request.</returns>

src/GitHub.InlineReviews/Services/InlineCommentPeekService.cs

@@ -107,12 +107,7 @@ public ITrackingPoint Show(ITextView textView, AddInlineCommentTag tag)
 
             var session = peekBroker.TriggerPeekSession(options);
             var item = session.PeekableItems.OfType<InlineCommentPeekableItem>().FirstOrDefault();
-
-            if (item != null)
-            {
-                var placeholder = item.ViewModel.Thread.Comments.Last();
-                placeholder.CancelEdit.Take(1).Subscribe(_ => session.Dismiss());
-            }
+            item?.ViewModel.Close.Take(1).Subscribe(_ => session.Dismiss());
 
             return trackingPoint;
         }
@@ -134,7 +129,9 @@ public ITrackingPoint Show(ITextView textView, ShowInlineCommentTag tag)
 
             ExpandCollapsedRegions(textView, line.Extent);
 
-            peekBroker.TriggerPeekSession(options);
+            var session = peekBroker.TriggerPeekSession(options);
+            var item = session.PeekableItems.OfType<InlineCommentPeekableItem>().FirstOrDefault();
+            item?.ViewModel.Close.Take(1).Subscribe(_ => session.Dismiss());
 
             return trackingPoint;
         }

src/GitHub.InlineReviews/Services/PullRequestSession.cs

@@ -159,13 +159,15 @@ public async Task PostReviewComment(
         }
 
         /// <inheritdoc/>
-        public async Task DeleteComment(
-            int number)
+        public async Task DeleteComment(int pullRequestId, int commentDatabaseId)
         {
-            await service.DeleteComment(
+            var model = await service.DeleteComment(
                 LocalRepository,
                 RepositoryOwner,
-                number);
+                pullRequestId,
+                commentDatabaseId);
+
+            await Update(model);
         }
 
         /// <inheritdoc/>