Master PR for Pull Request Reviews #1491

grokys · 2018-02-15T14:14:20Z

This is the master PR for the Pull Request Reviews feature (spiked out over at #1415).

As GitHub won't let us create empty PRs.

There was code left over from the now punted "conversation" view. Remove this code because by the time we get back to it, it will be out of date anyway.

And removed missing files.

…iews-code Removed unused InlineReviews code.

Ported from #1415. Moves the PR details changed files tree into its own view so that it can be shared by the PR reviews view.

Enable navigation from diff view to editor

And associated factory/keychain classes.

This is integrated a bit hackily into `ModelService`; `ModelService` doesn't really mesh well with GraphQL but without a lot of refactoring this was the best way to get things up and running.

As it's ignored by default.

The cursor was not being used for the first page, or ever in fact because the capitalization was wrong.

...in UnitTests. Akavache uses Newtonsoft.Json 6.0.8 while we use 10.0.3. The earlier version needs to be redirected to the later version for tests to work.

This is integrated a bit hackily into `ModelService`; `ModelService` doesn't really mesh well with GraphQL but without a lot of refactoring this was the best way to get things up and running.

Ported from #1415. Moves the PR details changed files tree into its own view so that it can be shared by the PR reviews view.

Enable navigation from diff view to editor

This is integrated a bit hackily into `ModelService`; `ModelService` doesn't really mesh well with GraphQL but without a lot of refactoring this was the best way to get things up and running.

Let the user know they need to check out PR branch before navigating to editor.

Factor out `EnableNavigateStatusBarMessage` method.

jcansdale · 2018-04-10T14:56:50Z

src/GitHub.App/GitHub.App.csproj

+      <HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">


We have a duplicate Microsoft.VisualStudio.Utilities reference.

jcansdale · 2018-04-10T15:28:49Z

Should I be able to click on the 💬 on the reviewers section? I thought that was one of the PRs that got merged. 😕 I don't seem to be able to in this version.

Conflicts: src/GitHub.Exports/Models/UsageModel.cs

jcansdale

I haven't scrutinized every line, but I've been dogfooding it quite a bit and it has been working well!

jcansdale · 2018-04-13T13:46:49Z

Should I be able to click on the 💬 on the reviewers section? I thought that was one of the PRs that got merged. 😕 I don't seem to be able to in this version.

No, I misremembered. There was one about making the avatar clickable not the 💬 on the reviewers section.

drguthals · 2018-04-13T14:43:19Z

This might just be because I re-sized my VM and then re-sized the experimental version of VS, but I just notice that now things are being cut off on the left side within our pane, but I can scroll over to be able to see everything:

drguthals · 2018-04-13T14:50:12Z

Looks like the horizontal scroll is stuck at the bottom:

meaghanlewis · 2018-04-13T15:02:39Z

This PR LGTM ✨ tested on VS2015 and 2017.

I ran through these test scenarios and did some exploratory testing as well.

drguthals · 2018-04-13T16:08:29Z

I double clicked on a folder instead of a file and it caused an exception:

drguthals

LGTM! Left some comments/questions, but they aren't blockers. Reviewed this in experimental version!

drguthals · 2018-04-13T14:35:31Z

src/GitHub.App/Models/IssueCommentModel.cs

        public int Id { get; set; }
+        public string NodeId { get; set; }


What is the difference between Id and NodeId?

As you noticed later, NodeId is the GraphQL ID which is different from the "database" Id. I didn't add doc comments to these fields because this will all change as we move move stuff to GraphQL, but I probably should have.

drguthals · 2018-04-13T14:36:55Z

src/GitHub.App/Models/PullRequestModel.cs

-        public IReadOnlyCollection<IPullRequestFileModel> ChangedFiles { get; set; } = new IPullRequestFileModel[0];
-        public IReadOnlyCollection<ICommentModel> Comments { get; set; } = new ICommentModel[0];
+        public IReadOnlyList<IPullRequestFileModel> ChangedFiles { get; set; } = new IPullRequestFileModel[0];
+        public IReadOnlyList<ICommentModel> Comments { get; set; } = new ICommentModel[0];


Why switch from IReadOnlyColletion to IReadOnlyList?

IReadOnlyCollection doesn't allow indexers (e.g. collection[0]) which is useful in unit tests. There was no reason to use collection over list so I moved over to that.

drguthals · 2018-04-13T14:39:32Z

src/GitHub.App/SampleData/PullRequestDetailViewModelDesigner.cs

@@ -69,8 +67,35 @@ public PullRequestDetailViewModelDesigner()
            modelsDir.Files.Add(oldBranchModel);
            gitHubDir.Directories.Add(modelsDir);

-            changedFilesTree = new List<IPullRequestChangeNode>();
-            changedFilesTree.Add(gitHubDir);
+            Reviews = new[]


So this is just a model of the type of data that would be included in a real PR Review that you model here?

Since this is all in sample data. I get it now.

Yep, sample data for the designer.

drguthals · 2018-04-13T14:41:14Z

src/GitHub.App/SampleData/PullRequestReviewFileCommentViewModelDesigner.cs

+
+namespace GitHub.SampleData
+{
+    public class PullRequestReviewFileCommentViewModelDesigner : IPullRequestReviewFileCommentViewModel


Why dont' we have sample data here?

Because this class isn't used directly by the designer, it's used by other sample data view models, so they set the sample data. See https://github.com/github/VisualStudio/pull/1491/files/692beca0cb8b2139246cfa8ce4b71e9e88ba037e#diff-b62ccfc33b879b821bb668fd4cdbee75R37 for example.

drguthals · 2018-04-13T15:18:36Z

src/GitHub.App/Services/PullRequestEditorService.cs

+
+            // HACK: We need to wait here for the diff view to set itself up and move its cursor
+            // to the first changed line. There must be a better way of doing this.
+            await Task.Delay(1500);


Should we make a new issue to address this later?

Yes, probably, we've had this hack in there since inline comments was first introduced.

drguthals · 2018-04-13T15:22:04Z

src/GitHub.App/Services/PullRequestEditorService.cs

+            statusBar.ShowMessage(message + ": " + e.Message);
+        }
+
+        void AddBufferTag(


What is the buffer tag? Is it the "PR 1491" that is to the right of the file name on the right diff?

It's a way of attaching our own data to a text buffer describing what PR/commit/file a diff view represents. It adds an instance of PullRequestTextBufferInfo as a property of the text buffer. That class is documented (though probably not well enough) instead of this method to avoid duplicating documentation. Might be worth documenting both though if it's confusing.

Maybe worth just putting:

It adds an instance of PullRequestTextBufferInfo as a property of the text buffer.

drguthals · 2018-04-13T15:56:23Z

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

+            }
+            catch (Exception)
+            {
+                // TODO: Show error.


Does this need to be added before the merge?

Ah, yes, I will address this together with the double-click exceptions in a separate PR.

drguthals · 2018-04-13T16:20:20Z

src/GitHub.Exports/Models/IPullRequestReviewModel.cs

+        /// <summary>
+        /// Gets the GraphQL ID for the review.
+        /// </summary>
+        string NodeId { get; set; }


Aha! So Node Id is for GraphQL. Why is that different from the Id of the review though still?

Well... That's probably quite a long explanation ;) The short answer is that the REST API exposed database IDs whereas GraphQL uses global relay IDs. At the moment we're using both APIs so for certain models we need both IDs in order to interoperate. This will change hopefully very soon as we move more stuff to GraphQL.

Oh got it - that makes sense for sure :) Thanks!

…or-discoverable Make Navigate to Editor more discoverable

Whitespace change.

9738c2f

As GitHub won't let us create empty PRs.

grokys added the WIP label Feb 15, 2018

This was referenced Feb 15, 2018

Moved changed files tree into its own view. #1492

Merged

Removed unused InlineReviews code. #1500

Merged

Use GraphQL in ModelService to read PR reviews/comments. #1501

Merged

This was referenced Mar 6, 2018

Update octokit to 0.29.0 #1521

Merged

Add "Reviewers" section to PR details. #1523

Merged

grokys and others added 22 commits March 16, 2018 10:54

Merge branch 'master' into feature/pr-reviews-master

ddbe030

Removed unused InlineReviews code.

69a6126

There was code left over from the now punted "conversation" view. Remove this code because by the time we get back to it, it will be out of date anyway.

Removed unused IInlineCommentModel.

9dd5976

And removed missing files.

Merge pull request #1500 from github/refactor/remove-unused-inlinerev…

7300754

…iews-code Removed unused InlineReviews code.

Moved changed files tree into its own view.

f72df0c

Ported from #1415. Moves the PR details changed files tree into its own view so that it can be shared by the PR reviews view.

Use the ghfvs: xmlns where possible.

6123b02

Port changes from #1407.

b203545

Enable navigation from diff view to editor

Added GraphQL to GitHub.Api.

d51f5f5

And associated factory/keychain classes.

Use GraphQL to read PR reviews/comments.

7799ed5

This is integrated a bit hackily into `ModelService`; `ModelService` doesn't really mesh well with GraphQL but without a lot of refactoring this was the best way to get things up and running.

Need to force-add the .nupkg.

cd366cf

As it's ignored by default.

Fix PR review comments cursor bug.

d246220

The cursor was not being used for the first page, or ever in fact because the capitalization was wrong.

Add binding redirect for Newtonsoft.Json...

0a20262

...in UnitTests. Akavache uses Newtonsoft.Json 6.0.8 while we use 10.0.3. The earlier version needs to be redirected to the later version for tests to work.

Unindent #region.

fc38e0b

Try to explain GraphQL paging.

1fcd815

Use GraphQL to read PR reviews/comments.

cb0d491

This is integrated a bit hackily into `ModelService`; `ModelService` doesn't really mesh well with GraphQL but without a lot of refactoring this was the best way to get things up and running.

Update octokit.net to 0.29.0

9353f41

Unindent #region.

5af3529

Moved changed files tree into its own view.

68e3e4c

Ported from #1415. Moves the PR details changed files tree into its own view so that it can be shared by the PR reviews view.

Port changes from #1407.

38ac072

Enable navigation from diff view to editor

Use GraphQL to read PR reviews/comments.

e8cb2a9

This is integrated a bit hackily into `ModelService`; `ModelService` doesn't really mesh well with GraphQL but without a lot of refactoring this was the best way to get things up and running.

Fix dark theme foreground color.

be15e94

Removed unused commands.

98e8241

jcansdale added 6 commits April 10, 2018 13:14

Show different message when PR not checked out

39e911e

Let the user know they need to check out PR branch before navigating to editor.

Add NavigateToEditorNotCheckedOutInfoMessage resource

39fb3be

Fix compile errors after rebase

2b46a6c

Update wording when PR branch not checked out

1c7bd8d

Show status bar hint when using View File

70c283e

Factor out `EnableNavigateStatusBarMessage` method.

Merge branch 'master' into feature/pr-reviews-master

be6c2b8

jcansdale reviewed Apr 10, 2018

View reviewed changes

meaghanlewis mentioned this pull request Apr 11, 2018

"This document is opened by another project" - when navigating to PR file #1583

Closed

jcansdale and others added 3 commits April 11, 2018 14:46

Merge branch 'master' into feature/pr-reviews-master

6d64a43

Fix merge error.

a3bd375

Merge branch 'master' into feature/pr-reviews-master

692beca

Conflicts: src/GitHub.Exports/Models/UsageModel.cs

jcansdale previously approved these changes Apr 13, 2018

View reviewed changes

meaghanlewis added the verified label Apr 13, 2018

Merge branch 'master' into feature/pr-reviews-master

4174562

drguthals previously approved these changes Apr 13, 2018

View reviewed changes

jcansdale added the dogfood 🐕 label Apr 16, 2018

Merge pull request #1552 from github/fixes/1546-make-navigate-to-edit…

c2b105e

…or-discoverable Make Navigate to Editor more discoverable

jcansdale dismissed stale reviews from drguthals and themself via c2b105e April 16, 2018 09:12

jcansdale mentioned this pull request Apr 16, 2018

Make Navigate to Editor more discoverable #1552

Merged

jcansdale approved these changes Apr 16, 2018

View reviewed changes

grokys merged commit c0dc9cb into master Apr 16, 2018

grokys deleted the feature/pr-reviews-master branch April 16, 2018 11:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Master PR for Pull Request Reviews #1491

Master PR for Pull Request Reviews #1491

grokys commented Feb 15, 2018 •

edited by jcansdale

Loading

jcansdale Apr 10, 2018

jcansdale commented Apr 10, 2018

jcansdale left a comment

jcansdale commented Apr 13, 2018

drguthals commented Apr 13, 2018

drguthals commented Apr 13, 2018

meaghanlewis commented Apr 13, 2018 •

edited

Loading

drguthals commented Apr 13, 2018

drguthals left a comment

drguthals Apr 13, 2018

grokys Apr 16, 2018

drguthals Apr 13, 2018

grokys Apr 16, 2018

drguthals Apr 13, 2018

drguthals Apr 13, 2018

grokys Apr 16, 2018

drguthals Apr 13, 2018

grokys Apr 16, 2018

drguthals Apr 13, 2018

grokys Apr 16, 2018

drguthals Apr 13, 2018

grokys Apr 16, 2018

drguthals Apr 16, 2018

drguthals Apr 13, 2018

grokys Apr 16, 2018

drguthals Apr 13, 2018

grokys Apr 16, 2018

drguthals Apr 16, 2018

		public int Id { get; set; }
		public string NodeId { get; set; }

Master PR for Pull Request Reviews #1491

Master PR for Pull Request Reviews #1491

Conversation

grokys commented Feb 15, 2018 • edited by jcansdale Loading

Choose a reason for hiding this comment

jcansdale commented Apr 10, 2018

jcansdale left a comment

Choose a reason for hiding this comment

jcansdale commented Apr 13, 2018

drguthals commented Apr 13, 2018

drguthals commented Apr 13, 2018

meaghanlewis commented Apr 13, 2018 • edited Loading

drguthals commented Apr 13, 2018

drguthals left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

grokys commented Feb 15, 2018 •

edited by jcansdale

Loading

meaghanlewis commented Apr 13, 2018 •

edited

Loading