Skip to content

Commit 70bb6c9

Browse files
authored
no great way to review changes following comment (#7215)
Fixes #7182
1 parent f0efa3c commit 70bb6c9

File tree

3 files changed

+20
-4
lines changed

3 files changed

+20
-4
lines changed

src/github/pullRequestOverview.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
377377
case 'pr.update-branch':
378378
return this.updateBranch(message);
379379
case 'pr.gotoChangesSinceReview':
380-
return this.gotoChangesSinceReview();
380+
return this.gotoChangesSinceReview(message);
381381
case 'pr.re-request-review':
382382
return this.reRequestReview(message);
383383
case 'pr.revert':
@@ -389,8 +389,9 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
389389
}
390390
}
391391

392-
private gotoChangesSinceReview() {
392+
private gotoChangesSinceReview(message: IRequestMessage<void>): Promise<void> {
393393
this._item.showChangesSinceReview = true;
394+
return this._replyMessage(message, {});
394395
}
395396

396397
private async changeReviewers(message: IRequestMessage<void>): Promise<void> {

src/view/reviewManager.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,9 @@ export class ReviewManager extends Disposable {
534534
this.changesInPrDataProvider.refresh();
535535
await this.updateComments();
536536
await this.reopenNewReviewDiffs();
537+
if (pr) {
538+
PullRequestModel.openChanges(this._folderRepoManager, pr);
539+
}
537540
this._changesSinceLastReviewProgress.endProgress();
538541
})
539542
);

webviews/components/timeline.tsx

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,18 @@ const CommitEventView = (event: CommitEvent) => (
129129
);
130130

131131
const NewCommitsSinceReviewEventView = () => {
132-
const { gotoChangesSinceReview } = useContext(PullRequestContext);
132+
const { gotoChangesSinceReview, pr } = useContext(PullRequestContext);
133+
if (!pr.isCurrentlyCheckedOut) {
134+
return null;
135+
}
136+
137+
const [busy, setBusy] = useState(false);
138+
const viewChanges = async () => {
139+
setBusy(true);
140+
await gotoChangesSinceReview();
141+
setBusy(false);
142+
};
143+
133144
return (
134145
<div className="comment-container commit">
135146
<div className="commit-message">
@@ -140,7 +151,8 @@ const NewCommitsSinceReviewEventView = () => {
140151
<button
141152
aria-live="polite"
142153
title="View the changes since your last review"
143-
onClick={() => gotoChangesSinceReview()}
154+
onClick={viewChanges}
155+
disabled={busy}
144156
>
145157
View Changes
146158
</button>

0 commit comments

Comments
 (0)