Let the view know about the review status of the PR (#1833)

Author: RishabhKothaari

src/github/pullRequestOverview.ts

@@ -139,6 +139,17 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 		});
 	}
 
+	/**
+	 * Find currently configured user's review status for the current PR
+	 * @param reviewers All the reviewers who have been requested to review the current PR
+	 * @param pullRequestModel Model of the PR
+	 */
+	private getCurrentUserReviewState(reviewers: ReviewState[], currentUser: IAccount): string | undefined {
+		const review = reviewers.find(r => r.reviewer.login === currentUser.login);
+		// There will always be a review. If not then the PR shouldn't have been or fetched/shown for the current user
+		return review?.state;
+	}
+
 	public async updatePullRequest(pullRequestModel: PullRequestModel): Promise<void> {
 		return Promise.all([
 			this._folderRepositoryManager.resolvePullRequest(
@@ -190,7 +201,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 					!pullRequest.base.repositoryCloneUrl.equals(pullRequest.head.repositoryCloneUrl);
 
 				const continueOnGitHub = isCrossRepository && isInCodespaces();
-
+				const reviewState = this.getCurrentUserReviewState(this._existingReviewers, currentUser);
 				Logger.debug('pr.initialize', PullRequestOverviewPanel.ID);
 				this._postMessage({
 					command: 'pr.initialize',
@@ -230,6 +241,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 						assignees: pullRequest.assignees,
 						continueOnGitHub,
 						isAuthor: currentUser.login === pullRequest.author.login,
+						currentUserReviewState: reviewState
 					},
 				});
 			})

webviews/common/cache.ts

@@ -63,9 +63,9 @@ export interface PullRequest {
 	reviewers: ReviewState[];
 	isDraft?: boolean;
 	isIssue: boolean;
-
 	isAuthor?: boolean;
 	continueOnGitHub: boolean;
+	currentUserReviewState: string;
 }
 
 export function getState(): PullRequest {

webviews/common/context.tsx

@@ -6,7 +6,7 @@
 import { createContext } from 'react';
 import { IComment } from '../../src/common/comment';
 import { EventType, isReviewEvent, ReviewEvent } from '../../src/common/timelineEvent';
-import { MergeMethod } from '../../src/github/interface';
+import { MergeMethod, ReviewState } from '../../src/github/interface';
 import { getState, PullRequest, setState, updateState } from './cache';
 import { getMessageHandler, MessageHandler } from './message';
 
@@ -148,7 +148,7 @@ export class PRContext {
 		this.postMessage({ command: 'pr.apply-patch', args: { comment } });
 	};
 
-	private appendReview({ review, reviewers }: any) {
+	private appendReview({ review, reviewers }: {review: ReviewEvent, reviewers: ReviewState[]}) {
 		const state = this.pr;
 		const events = state.events.filter(e => !isReviewEvent(e) || e.state.toLowerCase() !== 'pending');
 		events.forEach(event => {
@@ -158,6 +158,7 @@ export class PRContext {
 		});
 		state.reviewers = reviewers;
 		state.events = [...state.events.filter(e => (isReviewEvent(e) ? e.state !== 'PENDING' : e)), review];
+		state.currentUserReviewState = review.state;
 		this.updatePR(state);
 	}
 

webviews/components/comment.tsx

@@ -238,6 +238,7 @@ export function AddComment({
 	isIssue,
 	isAuthor,
 	continueOnGitHub,
+	currentUserReviewState
 }: PullRequest) {
 	const { updatePR, comment, requestChanges, approve, close, openOnGitHub } = useContext(PullRequestContext);
 	const [isBusy, setBusy] = useState(false);
@@ -332,7 +333,7 @@ export function AddComment({
 					<button
 						id="approve"
 						className="secondary"
-						disabled={isBusy}
+						disabled={isBusy || currentUserReviewState === 'APPROVED'}
 						onClick={onClick}
 						data-command="approve"
 					>

webviews/editorWebview/test/builder/pullRequest.ts

@@ -38,4 +38,5 @@ export const PullRequestBuilder = createBuilderClass<PullRequest>()({
 	assignees: { default: [] },
 	milestone: { default: undefined },
 	continueOnGitHub: { default: false },
+	currentUserReviewState: { default: 'REQUESTED' }
 });