Enable assigning to Copilot (#6804)

* Enable assigning to Copilot
Part of #6793
Part of #6742

* Fix wrong copilot string in PR body

Author: alexr00

src/github/createPRViewProvider.ts

@@ -278,6 +278,7 @@ export abstract class BaseCreatePullRequestViewProvider<T extends BasePullReques
 			return;
 		}
 		try {
+			// TODO: We need to resolve the user and then use the replace function.
 			await pr.addAssignees([resolved]);
 		} catch (e) {
 			Logger.error(`Unable to assign pull request to user ${resolved}.`, BaseCreatePullRequestViewProvider.ID);
@@ -298,7 +299,7 @@ export abstract class BaseCreatePullRequestViewProvider<T extends BasePullReques
 
 	private async setAssignees(pr: PullRequestModel, assignees: IAccount[]): Promise<void> {
 		if (assignees.length) {
-			await pr.addAssignees(assignees.map(assignee => assignee.login));
+			await pr.replaceAssignees(assignees);
 		} else {
 			await this.autoAssign(pr);
 		}

src/github/githubRepository.ts

@@ -38,6 +38,7 @@ import {
 	PullRequestTemplatesResponse,
 	RepoProjectsResponse,
 	RevertPullRequestResponse,
+	SuggestedActorsResponse,
 	ViewerPermissionResponse,
 } from './graphql';
 import {
@@ -1207,29 +1208,46 @@ export class GitHubRepository extends Disposable {
 
 		do {
 			try {
-				const result: { data: AssignableUsersResponse } = await query<AssignableUsersResponse>({
-					query: schema.GetAssignableUsers,
-					variables: {
-						owner: remote.owner,
-						name: remote.repositoryName,
-						first: 100,
-						after: after,
-					},
-				}, true); // we ignore SAML errors here because this query can happen at startup
+				let result: { data: AssignableUsersResponse | SuggestedActorsResponse } | undefined;
+				if (schema.GetSuggestedActors) {
+					result = await query<SuggestedActorsResponse>({
+						query: schema.GetSuggestedActors,
+						variables: {
+							owner: remote.owner,
+							name: remote.repositoryName,
+							capabilities: ['CAN_BE_ASSIGNED'],
+							first: 100,
+							after: after,
+						},
+					});
+
+				} else {
+					result = await query<AssignableUsersResponse>({
+						query: schema.GetAssignableUsers,
+						variables: {
+							owner: remote.owner,
+							name: remote.repositoryName,
+							first: 100,
+							after: after,
+						},
+					}, true); // we ignore SAML errors here because this query can happen at startup
+				}
 
 				if (result.data.repository === null) {
 					Logger.error('Unexpected null repository when getting assignable users', this.id);
 					return [];
 				}
 
+				const users = (result.data as AssignableUsersResponse).repository?.assignableUsers ?? (result.data as SuggestedActorsResponse).repository?.suggestedActors;
+
 				ret.push(
-					...result.data.repository.assignableUsers.nodes.map(node => {
+					...users?.nodes.map(node => {
 						return parseAccount(node, this);
 					}),
 				);
 
-				hasNextPage = result.data.repository.assignableUsers.pageInfo.hasNextPage;
-				after = result.data.repository.assignableUsers.pageInfo.endCursor;
+				hasNextPage = users?.pageInfo.hasNextPage;
+				after = users?.pageInfo.endCursor;
 			} catch (e) {
 				Logger.debug(`Unable to fetch assignable users: ${e}`, this.id);
 				if (

src/github/graphql.ts

@@ -300,6 +300,16 @@ export interface AssignableUsersResponse {
 	rateLimit: RateLimit;
 }
 
+export interface SuggestedActorsResponse {
+	repository: {
+		suggestedActors: {
+			nodes: Actor[];
+			pageInfo: PageInfo;
+		};
+	} | null;
+	rateLimit: RateLimit;
+}
+
 export interface OrganizationTeamsCountResponse {
 	organization: {
 		teams: {

src/github/interface.ts

@@ -103,7 +103,8 @@ export interface MergeQueueEntry {
 }
 
 export function reviewerId(reviewer: ITeam | IAccount): string {
-	return isTeam(reviewer) ? reviewer.id : reviewer.login;
+	// We can literally get different login values for copilot depending on where it's coming from (already assignee vs suggested assingee)
+	return isTeam(reviewer) ? reviewer.id : (reviewer.specialDisplayName ?? reviewer.login);
 }
 
 export function reviewerLabel(reviewer: ITeam | IAccount | IActor | any): string {

src/github/issueModel.ts

@@ -370,17 +370,46 @@ export class IssueModel<TItem extends Issue = Issue> {
 		}
 	}
 
-	async addAssignees(assignees: string[]): Promise<void> {
+	async replaceAssignees(allAssignees: IAccount[]): Promise<void> {
+		Logger.debug(`Replace assignees of issue #${this.number} - enter`, IssueModel.ID);
+		const { mutate, schema } = await this.githubRepository.ensure();
+
+		try {
+			if (schema.ReplaceActorsForAssignable) {
+				const assigneeIds = allAssignees.map(assignee => assignee.id);
+				await mutate({
+					mutation: schema.ReplaceActorsForAssignable,
+					variables: {
+						input: {
+							actorIds: assigneeIds,
+							assignableId: this.graphNodeId
+						}
+					}
+				});
+			} else {
+				const addAssignees = allAssignees.map(assignee => assignee.login);
+				const removeAssignees = (this.assignees?.filter(currentAssignee => !allAssignees.find(newAssignee => newAssignee.login === currentAssignee.login)) ?? []).map(assignee => assignee.login);
+				await this.addAssignees(addAssignees);
+				await this.deleteAssignees(removeAssignees);
+			}
+			this.assignees = allAssignees;
+		} catch (e) {
+			Logger.error(e, IssueModel.ID);
+		}
+		Logger.debug(`Replace assignees of issue #${this.number} - done`, IssueModel.ID);
+	}
+
+	async addAssignees(assigneesToAdd: string[]): Promise<void> {
 		const { octokit, remote } = await this.githubRepository.ensure();
 		await octokit.call(octokit.api.issues.addAssignees, {
 			owner: remote.owner,
 			repo: remote.repositoryName,
 			issue_number: this.number,
-			assignees,
+			assignees: assigneesToAdd,
 		});
 	}
 
-	async deleteAssignees(assignees: string[]): Promise<void> {
+	private async deleteAssignees(assignees: string[]): Promise<void> {
 		const { octokit, remote } = await this.githubRepository.ensure();
 		await octokit.call(octokit.api.issues.removeAssignees, {
 			owner: remote.owner,

src/github/issueOverview.ts

@@ -153,14 +153,7 @@ export class IssueOverviewPanel<TItem extends IssueModel = IssueModel> extends W
 			body: issue.body,
 			bodyHTML: issue.bodyHTML,
 			labels: issue.item.labels,
-			author: {
-				login: issue.author.login,
-				name: issue.author.name,
-				avatarUrl: issue.userAvatar,
-				url: issue.author.url,
-				id: issue.author.id,
-				accountType: issue.author.accountType,
-			},
+			author: issue.author,
 			state: issue.state,
 			events: timelineEvents,
 			continueOnGitHub: this.continueOnGitHub(),
@@ -383,11 +376,7 @@ export class IssueOverviewPanel<TItem extends IssueModel = IssueModel> extends W
 
 			if (allAssignees) {
 				const newAssignees: IAccount[] = allAssignees.map(item => item.user);
-				const removeAssignees: IAccount[] = this._item.assignees?.filter(currentAssignee => !newAssignees.find(newAssignee => newAssignee.login === currentAssignee.login)) ?? [];
-				this._item.assignees = newAssignees;
-
-				await this._item.addAssignees(newAssignees.map(assignee => assignee.login));
-				await this._item.deleteAssignees(removeAssignees.map(assignee => assignee.login));
+				await this._item.replaceAssignees(newAssignees);
 				await this._replyMessage(message, {
 					assignees: newAssignees,
 				});
@@ -449,8 +438,8 @@ export class IssueOverviewPanel<TItem extends IssueModel = IssueModel> extends W
 			const currentUser = await this._folderRepositoryManager.getCurrentUser();
 			const alreadyAssigned = this._item.assignees?.find(user => user.login === currentUser.login);
 			if (!alreadyAssigned) {
-				this._item.assignees = this._item.assignees?.concat(currentUser);
-				await this._item.addAssignees([currentUser.login]);
+				const newAssigness = (this._item.assignees ?? []).concat(currentUser);
+				await this._item.replaceAssignees(newAssigness);
 			}
 			this._replyMessage(message, {
 				assignees: this._item.assignees,

src/github/queries.gql

@@ -7,7 +7,6 @@
 
 # Queries that are also in the limit file, but are not limited (by scope or API availability) here
 
-
 fragment Node on Node {
 	id
 }
@@ -52,6 +51,7 @@ fragment IssueBase on Issue {
 	title
 	titleHTML
 	author {
+		...Node
 		...Actor
 		...User
 		...Organization
@@ -67,6 +67,7 @@ fragment IssueBase on Issue {
 	}
 	assignees(first: 10) {
 		nodes {
+			...Node
 			...Actor
 			...User
 		}
@@ -127,6 +128,7 @@ fragment PullRequestFragment on PullRequest {
 	title
 	titleHTML
 	author {
+		...Node
 		...Actor
 		...User
 		...Organization
@@ -142,6 +144,7 @@ fragment PullRequestFragment on PullRequest {
 	}
 	assignees(first: 10) {
 		nodes {
+			...Node
 			...Actor
 			...User
 		}
@@ -334,6 +337,25 @@ mutation RevertPullRequest($input: RevertPullRequestInput!) {
 
 # Queries that only exist in this file and in extra
 
+query GetSuggestedActors($owner: String!, $name: String!, $capabilities: [RepositorySuggestedActorFilter!]!, $first: Int!, $after: String) {
+	repository(owner: $owner, name: $name) {
+		suggestedActors(first: $first, after: $after, capabilities: $capabilities) {
+			nodes {
+				...Node
+				...Actor
+				...User
+			}
+			pageInfo {
+				hasNextPage
+				endCursor
+			}
+		}
+	}
+	rateLimit {
+		...RateLimit
+	}
+}
+
 mutation DequeuePullRequest($input: DequeuePullRequestInput!) {
 	dequeuePullRequest(input: $input) {
 		mergeQueueEntry {
@@ -348,4 +370,22 @@ mutation EnqueuePullRequest($input: EnqueuePullRequestInput!) {
 			...MergeQueueEntryFragment
 		}
 	}
+}
+
+mutation ReplaceActorsForAssignable($input: ReplaceActorsForAssignableInput!) {
+	replaceActorsForAssignable(input: $input) {
+		assignable {
+			assignees(first: 100) {
+				nodes {
+					...Node
+					...Actor
+					...User
+				}
+				pageInfo {
+					hasNextPage
+					endCursor
+				}
+			}
+		}
+	}
 }

src/github/queriesExtra.gql

@@ -52,6 +52,7 @@ fragment IssueBase on Issue {
 	title
 	titleHTML
 	author {
+		...Node
 		...Actor
 		...User
 		...Organization
@@ -67,6 +68,7 @@ fragment IssueBase on Issue {
 	}
 	assignees(first: 10) {
 		nodes {
+			...Node
 			...Actor
 			...User
 		}
@@ -136,6 +138,7 @@ fragment PullRequestFragment on PullRequest {
 	title
 	titleHTML
 	author {
+		...Node
 		...Actor
 		...User
 		...Organization
@@ -151,6 +154,7 @@ fragment PullRequestFragment on PullRequest {
 	}
 	assignees(first: 10) {
 		nodes {
+			...Node
 			...Actor
 			...User
 		}
@@ -334,6 +338,25 @@ query PullRequestMergeabilityMergeRequirements($owner: String!, $name: String!,
 	}
 }
 
+query GetSuggestedActors($owner: String!, $name: String!, $capabilities: [RepositorySuggestedActorFilter!]!, $first: Int!, $after: String) {
+	repository(owner: $owner, name: $name) {
+		suggestedActors(first: $first, after: $after, capabilities: $capabilities) {
+			nodes {
+				...Node
+				...Actor
+				...User
+			}
+			pageInfo {
+				hasNextPage
+				endCursor
+			}
+		}
+	}
+	rateLimit {
+		...RateLimit
+	}
+}
+
 mutation CreatePullRequest($input: CreatePullRequestInput!) {
 	createPullRequest(input: $input) {
 		pullRequest {
@@ -342,6 +365,24 @@ mutation CreatePullRequest($input: CreatePullRequestInput!) {
 	}
 }
 
+mutation ReplaceActorsForAssignable($input: ReplaceActorsForAssignableInput!) {
+	replaceActorsForAssignable(input: $input) {
+		assignable {
+			assignees(first: 100) {
+				nodes {
+					...Node
+					...Actor
+					...User
+				}
+				pageInfo {
+					hasNextPage
+					endCursor
+				}
+			}
+		}
+	}
+}
+
 # Queries that only exist in this file
 
 query GetRepoProjects($owner: String!, $name: String!) {