Submitting Review Failed... (#6915)

Fixes #6906

Author: alexr00

src/github/issueOverview.ts

@@ -165,7 +165,7 @@ export class IssueOverviewPanel<TItem extends IssueModel = IssueModel> extends W
 		return isInCodespaces();
 	}
 
-	protected getInitializeContext(issue: IssueModel, timelineEvents: TimelineEvent[], repositoryAccess: RepoAccessAndMergeMethods, viewerCanEdit: boolean, assignableUsers: IAccount[]): Issue {
+	protected getInitializeContext(currentUser: IAccount, issue: IssueModel, coAuthors: IAccount[], timelineEvents: TimelineEvent[], repositoryAccess: RepoAccessAndMergeMethods, viewerCanEdit: boolean, assignableUsers: IAccount[]): Issue {
 		const hasWritePermission = repositoryAccess!.hasWritePermission;
 		const canEdit = hasWritePermission || viewerCanEdit;
 		const context: Issue = {
@@ -190,7 +190,8 @@ export class IssueOverviewPanel<TItem extends IssueModel = IssueModel> extends W
 			isEnterprise: issue.githubRepository.remote.isEnterprise,
 			isDarkTheme: vscode.window.activeColorTheme.kind === vscode.ColorThemeKind.Dark,
 			canAssignCopilot: assignableUsers.find(user => COPILOT_ACCOUNTS[user.login]) !== undefined,
-			reactions: issue.item.reactions
+			reactions: issue.item.reactions,
+			isAuthor: [issue.author, ...coAuthors].find(user => user.login === currentUser.login) !== undefined,
 		};
 
 		return context;
@@ -203,7 +204,8 @@ export class IssueOverviewPanel<TItem extends IssueModel = IssueModel> extends W
 				timelineEvents,
 				repositoryAccess,
 				viewerCanEdit,
-				assignableUsers
+				assignableUsers,
+				currentUser
 			] = await Promise.all([
 				this._folderRepositoryManager.resolveIssue(
 					issueModel.remote.owner,
@@ -213,7 +215,8 @@ export class IssueOverviewPanel<TItem extends IssueModel = IssueModel> extends W
 				issueModel.getIssueTimelineEvents(),
 				this._folderRepositoryManager.getPullRequestRepositoryAccessAndMergeMethods(issueModel),
 				issueModel.canEdit(),
-				this._folderRepositoryManager.getAssignableUsers()
+				this._folderRepositoryManager.getAssignableUsers(),
+				this._folderRepositoryManager.getCurrentUser(),
 			]);
 
 			if (!issue) {
@@ -228,7 +231,7 @@ export class IssueOverviewPanel<TItem extends IssueModel = IssueModel> extends W
 			Logger.debug('pr.initialize', IssueOverviewPanel.ID);
 			this._postMessage({
 				command: 'pr.initialize',
-				pullrequest: this.getInitializeContext(issue, timelineEvents, repositoryAccess, viewerCanEdit, assignableUsers[this._item.remote.remoteName] ?? []),
+				pullrequest: this.getInitializeContext(currentUser, issue, [], timelineEvents, repositoryAccess, viewerCanEdit, assignableUsers[this._item.remote.remoteName] ?? []),
 			});
 
 		} catch (e) {

src/github/pullRequestModel.ts

@@ -9,7 +9,7 @@ import equals from 'fast-deep-equal';
 import gql from 'graphql-tag';
 import * as vscode from 'vscode';
 import { Repository } from '../api/api';
-import { DiffSide, IComment, IReviewThread, SubjectType, ViewedState } from '../common/comment';
+import { COPILOT_ACCOUNTS, DiffSide, IComment, IReviewThread, SubjectType, ViewedState } from '../common/comment';
 import { getModifiedContentFromDiffHunk, parseDiff } from '../common/diffHunk';
 import { GitChangeType, InMemFileChange, SlimFileChange } from '../common/file';
 import { GitHubRef } from '../common/githubRef';
@@ -75,6 +75,7 @@ import {
 	convertRESTReviewEvent,
 	getReactionGroup,
 	insertNewCommitsSinceReview,
+	parseAccount,
 	parseGraphQLComment,
 	parseGraphQLReaction,
 	parseGraphQLReviewers,
@@ -83,6 +84,7 @@ import {
 	parseGraphQLTimelineEvents,
 	parseMergeability,
 	parseMergeQueueEntry,
+	RestAccount,
 	restPaginate,
 } from './utils';
 
@@ -1128,6 +1130,22 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 		}
 	}
 
+	async getCoAuthors(): Promise<IAccount[]> {
+		// To save time, we only do for Copilot now as that's where we need it
+		if (!COPILOT_ACCOUNTS[this.item.user.login]) {
+			return [];
+		}
+		const { octokit, remote } = await this.githubRepository.ensure();
+		const timeline = await octokit.call(octokit.api.issues.listEventsForTimeline, {
+			issue_number: this.number,
+			owner: remote.owner,
+			repo: remote.repositoryName,
+			per_page: 100
+		});
+		const workStartedInitiator = (timeline.data.find(event => event.event === 'copilot_work_started') as { actor: RestAccount } | undefined)?.actor;
+		return workStartedInitiator ? [parseAccount(workStartedInitiator, this.githubRepository)] : [];
+	}
+
 	/**
 	 * Get the timeline events of a pull request, including comments, reviews, commits, merges, deletes, and assigns.
 	 */

src/github/pullRequestOverview.ts

@@ -211,6 +211,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				isBranchUpToDateWithBase,
 				mergeability,
 				emailForCommit,
+				coAuthors
 			] = await Promise.all([
 				this._folderRepositoryManager.resolvePullRequest(
 					pullRequestModel.remote.owner,
@@ -230,6 +231,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				this._folderRepositoryManager.isHeadUpToDateWithBase(pullRequestModel),
 				pullRequestModel.getMergeability(),
 				this._folderRepositoryManager.getPreferredEmail(pullRequestModel),
+				pullRequestModel.getCoAuthors()
 			]);
 			if (!pullRequest) {
 				throw new Error(
@@ -253,7 +255,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 			const reviewState = this.getCurrentUserReviewState(this._existingReviewers, currentUser);
 
 			Logger.debug('pr.initialize', PullRequestOverviewPanel.ID);
-			const baseContext = this.getInitializeContext(pullRequest, timelineEvents, repositoryAccess, viewerCanEdit, []);
+			const baseContext = this.getInitializeContext(currentUser, pullRequest, coAuthors, timelineEvents, repositoryAccess, viewerCanEdit, []);
 
 			const context: Partial<PullRequest> = {
 				...baseContext,
@@ -281,7 +283,6 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				squashCommitMeta: pullRequest.squashCommitMeta,
 				isIssue: false,
 				emailForCommit,
-				isAuthor: currentUser.login === pullRequest.author.login,
 				currentUserReviewState: reviewState,
 				revertable: pullRequest.state === GithubItemStateEnum.Merged
 			};

src/github/utils.ts

@@ -586,8 +586,18 @@ function parseRef(refName: string, oid: string, repository?: GraphQL.RefReposito
 	};
 }
 
+export interface RestAccount {
+	login: string;
+	html_url: string;
+	avatar_url: string;
+	email?: string | null;
+	node_id: string;
+	name?: string | null;
+	type: string;
+}
+
 export function parseAccount(
-	author: { login: string; url: string; avatarUrl: string; email?: string, id: string, name?: string, __typename: string } | { login: string; html_url: string; avatar_url: string; email?: string | null, node_id: string, name?: string | null, type: string } | null,
+	author: { login: string; url: string; avatarUrl: string; email?: string, id: string, name?: string, __typename: string } | RestAccount | null,
 	githubRepository?: GitHubRepository,
 ): IAccount {
 	if (author) {

src/github/views.ts

@@ -53,7 +53,7 @@ export interface Issue {
 	pendingCommentText?: string;
 	pendingCommentDrafts?: { [key: string]: string };
 	isIssue: boolean;
-	isAuthor?: boolean;
+	isAuthor: boolean;
 	continueOnGitHub: boolean;
 	isDarkTheme: boolean;
 	isEnterprise: boolean;

webviews/editorWebview/test/builder/pullRequest.ts

@@ -28,6 +28,7 @@ export const PullRequestBuilder = createBuilderClass<PullRequest>()({
 	isLocalHeadDeleted: { default: false },
 	head: { default: 'my-fork:my-branch' },
 	labels: { default: [] },
+	isAuthor: { default: true },
 	commitsCount: { default: 10 },
 	repositoryDefaultBranch: { default: 'main' },
 	canEdit: { default: true },