Support global PR queries (#6584)

* Support global PR queries
Fixes #6448

* Fix test

Author: alexr00

package.json

@@ -184,15 +184,15 @@
 					"default": [
 						{
 							"label": "%githubPullRequests.queries.waitingForMyReview%",
-							"query": "is:open review-requested:${user}"
+							"query": "repo:${owner}/${repository} is:open review-requested:${user}"
 						},
 						{
 							"label": "%githubPullRequests.queries.assignedToMe%",
-							"query": "is:open assignee:${user}"
+							"query": "repo:${owner}/${repository} is:open assignee:${user}"
 						},
 						{
 							"label": "%githubPullRequests.queries.createdByMe%",
-							"query": "is:open author:${user}"
+							"query": "repo:${owner}/${repository} is:open author:${user}"
 						}
 					]
 				},

src/commands.ts

@@ -10,6 +10,7 @@ import { Repository } from './api/api';
 import { GitErrorCodes } from './api/api1';
 import { CommentReply, findActiveHandler, resolveCommentHandler } from './commentHandlerResolver';
 import { IComment } from './common/comment';
+import { commands } from './common/executeCommands';
 import Logger from './common/logger';
 import { FILE_LIST_LAYOUT, PR_SETTINGS_NAMESPACE } from './common/settingKeys';
 import { ITelemetry } from './common/telemetry';
@@ -44,7 +45,6 @@ import {
 } from './view/treeNodes/fileChangeNode';
 import { PRNode } from './view/treeNodes/pullRequestNode';
 import { RepositoryChangesNode } from './view/treeNodes/repositoryChangesNode';
-import { commands } from './common/executeCommands';
 
 const _onDidUpdatePR = new vscode.EventEmitter<PullRequest | void>();
 export const onDidUpdatePR: vscode.Event<PullRequest | void> = _onDidUpdatePR.event;

src/extension.ts

@@ -29,6 +29,7 @@ import { GitLensIntegration } from './integrations/gitlens/gitlensImpl';
 import { IssueFeatureRegistrar } from './issues/issueFeatureRegistrar';
 import { ChatParticipant, ChatParticipantState } from './lm/participants';
 import { registerTools } from './lm/tools/tools';
+import { migrate } from './migrations';
 import { NotificationsFeatureRegister } from './notifications/notificationsFeatureRegistar';
 import { CommentDecorationProvider } from './view/commentDecorationProvider';
 import { CompareChanges } from './view/compareChangesTreeDataProvider';
@@ -47,9 +48,6 @@ const ingestionKey = '0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-f
 
 let telemetry: ExperimentationTelemetry;
 
-const PROMPTS_SCOPE = 'prompts';
-const PROMPT_TO_CREATE_PR_ON_PUBLISH_KEY = 'createPROnPublish';
-
 async function init(
 	context: vscode.ExtensionContext,
 	git: GitApiImpl,
@@ -385,11 +383,7 @@ async function deferredActivateRegisterBuiltInGitProvider(context: vscode.Extens
 async function deferredActivate(context: vscode.ExtensionContext, apiImpl: GitApiImpl, showPRController: ShowPullRequest) {
 	Logger.debug('Initializing state.', 'Activation');
 	PersistentState.init(context);
-	// Migrate from state to setting
-	if (PersistentState.fetch(PROMPTS_SCOPE, PROMPT_TO_CREATE_PR_ON_PUBLISH_KEY) === false) {
-		await vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).update(BRANCH_PUBLISH, 'never', vscode.ConfigurationTarget.Global);
-		PersistentState.store(PROMPTS_SCOPE, PROMPT_TO_CREATE_PR_ON_PUBLISH_KEY, true);
-	}
+	await migrate(context);
 	TemporaryState.init(context);
 	Logger.debug('Creating credential store.', 'Activation');
 	const credentialStore = new CredentialStore(telemetry, context);

src/github/folderRepositoryManager.ts

@@ -41,8 +41,8 @@ import { ConflictModel } from './conflictGuide';
 import { ConflictResolutionCoordinator } from './conflictResolutionCoordinator';
 import { Conflict, ConflictResolutionModel } from './conflictResolutionModel';
 import { CredentialStore } from './credentials';
-import { GitHubRepository, GraphQLError, GraphQLErrorType, ItemsData, PullRequestData, TeamReviewerRefreshKind, ViewerPermission } from './githubRepository';
-import { MergeMethod as GraphQLMergeMethod, MergePullRequestInput, MergePullRequestResponse, PullRequestState, UserResponse } from './graphql';
+import { GitHubRepository, GraphQLError, GraphQLErrorType, IMetadata, ItemsData, PULL_REQUEST_PAGE_SIZE, PullRequestData, TeamReviewerRefreshKind, ViewerPermission } from './githubRepository';
+import { MergeMethod as GraphQLMergeMethod, MergePullRequestInput, MergePullRequestResponse, PullRequestResponse, PullRequestState, UserResponse } from './graphql';
 import { IAccount, ILabel, IMilestone, IProject, IPullRequestsPagingOptions, Issue, ITeam, MergeMethod, PRType, PullRequestMergeability, RepoAccessAndMergeMethods, User } from './interface';
 import { IssueModel } from './issueModel';
 import { PullRequestGitHelper, PullRequestMetadata } from './pullRequestGitHelper';
@@ -51,7 +51,9 @@ import {
 	convertRESTIssueToRawPullRequest,
 	convertRESTPullRequestToRawPullRequest,
 	getOverrideBranch,
+	getPRFetchQuery,
 	loginComparator,
+	parseGraphQLPullRequest,
 	parseGraphQLTimelineEvents,
 	parseGraphQLUser,
 	teamComparator,
@@ -1085,7 +1087,7 @@ export class FolderRepositoryManager extends Disposable {
 						if (type === PRType.All) {
 							return githubRepository.getAllPullRequests(pageNumber);
 						} else {
-							return githubRepository.getPullRequestsForCategory(resolvedQuery || '', pageNumber);
+							return this.getPullRequestsForCategory(githubRepository, resolvedQuery || '', pageNumber);
 						}
 					}
 					case PagedDataType.IssueSearch: {
@@ -1146,6 +1148,85 @@ export class FolderRepositoryManager extends Disposable {
 		};
 	}
 
+	async getPullRequestsForCategory(githubRepository: GitHubRepository, categoryQuery: string, page?: number): Promise<PullRequestData | undefined> {
+		let repo: IMetadata | undefined;
+		try {
+			Logger.debug(`Fetch pull request category ${categoryQuery} - enter`, this.id);
+			const { octokit, query, schema } = await githubRepository.ensure();
+
+			const user = await githubRepository.getAuthenticatedUser();
+			// Search api will not try to resolve repo that redirects, so get full name first
+			repo = await githubRepository.getMetadata();
+			const { data, headers } = await octokit.call(octokit.api.search.issuesAndPullRequests, {
+				q: getPRFetchQuery(user, categoryQuery),
+				per_page: PULL_REQUEST_PAGE_SIZE,
+				page: page || 1,
+			});
+
+			const promises: Promise<{ data: PullRequestResponse, repo: GitHubRepository } | undefined>[] = data.items.map(async (item) => {
+				const protocol = new Protocol(item.repository_url);
+
+				const prRepo = await this.createGitHubRepositoryFromOwnerName(protocol.owner, protocol.repositoryName);
+				const { data } = await query<PullRequestResponse>({
+					query: schema.PullRequest,
+					variables: {
+						owner: prRepo.remote.owner,
+						name: prRepo.remote.repositoryName,
+						number: item.number
+					}
+				});
+				return { data, repo: prRepo };
+			});
+
+			const hasMorePages = !!headers.link && headers.link.indexOf('rel="next"') > -1;
+			const pullRequestResponses = await Promise.all(promises);
+
+			const pullRequests = pullRequestResponses
+				.map(response => {
+					if (!response?.data.repository) {
+						Logger.appendLine('Pull request doesn\'t appear to exist.', this.id);
+						return null;
+					}
+
+					// Pull requests fetched with a query can be from any repo.
+					// We need to use the correct GitHubRepository for this PR.
+					return response.repo.createOrUpdatePullRequestModel(
+						parseGraphQLPullRequest(response.data.repository.pullRequest, response.repo),
+					);
+				})
+				.filter(item => item !== null) as PullRequestModel[];
+
+			Logger.debug(`Fetch pull request category ${categoryQuery} - done`, this.id);
+
+			return {
+				items: pullRequests,
+				hasMorePages,
+				totalCount: data.total_count
+			};
+		} catch (e) {
+			Logger.error(`Fetching pull request with query failed: ${e}`, this.id);
+			if (e.code === 404) {
+				// not found
+				vscode.window.showWarningMessage(
+					`Fetching pull requests for remote ${githubRepository.remote.remoteName} with query failed, please check if the repo ${repo?.full_name} is valid.`,
+				);
+			} else {
+				throw e;
+			}
+		}
+		return undefined;
+	}
+
+	isPullRequestAssociatedWithOpenRepository(pullRequest: PullRequestModel): boolean {
+		const remote = pullRequest.githubRepository.remote;
+		const repository = this.repository.state.remotes.find(repo => repo.name === remote.remoteName);
+		if (repository) {
+			return true;
+		}
+
+		return false;
+	}
+
 	async getPullRequests(
 		type: PRType,
 		options: IPullRequestsPagingOptions = { fetchNextPage: false },

src/github/githubRepository.ts

@@ -9,7 +9,6 @@ import * as vscode from 'vscode';
 import { AuthenticationError, AuthProvider, GitHubServerType, isSamlError } from '../common/authentication';
 import { Disposable } from '../common/lifecycle';
 import Logger from '../common/logger';
-import { Protocol } from '../common/protocol';
 import { GitHubRemote, parseRemote } from '../common/remote';
 import { ITelemetry } from '../common/telemetry';
 import { PRCommentControllerRegistry } from '../view/pullRequestCommentControllerRegistry';
@@ -64,7 +63,6 @@ import {
 	convertRESTPullRequestToRawPullRequest,
 	getAvatarWithEnterpriseFallback,
 	getOverrideBranch,
-	getPRFetchQuery,
 	isInCodespaces,
 	parseGraphQLIssue,
 	parseGraphQLPullRequest,
@@ -882,71 +880,6 @@ export class GitHubRepository extends Disposable {
 		}
 	}
 
-	async getPullRequestsForCategory(categoryQuery: string, page?: number): Promise<PullRequestData | undefined> {
-		let repo: IMetadata | undefined;
-		try {
-			Logger.debug(`Fetch pull request category ${categoryQuery} - enter`, this.id);
-			const { octokit, query, schema } = await this.ensure();
-
-			const user = await this.getAuthenticatedUser();
-			// Search api will not try to resolve repo that redirects, so get full name first
-			repo = await this.getMetadata();
-			const { data, headers } = await octokit.call(octokit.api.search.issuesAndPullRequests, {
-				q: getPRFetchQuery(repo.full_name, user, categoryQuery),
-				per_page: PULL_REQUEST_PAGE_SIZE,
-				page: page || 1,
-			});
-
-			const promises: Promise<PullRequestResponse>[] = data.items.map(async (item) => {
-				const prRepo = new Protocol(item.repository_url);
-				const { data } = await query<PullRequestResponse>({
-					query: schema.PullRequest,
-					variables: {
-						owner: prRepo.owner,
-						name: prRepo.repositoryName,
-						number: item.number
-					}
-				});
-				return data;
-			});
-
-			const hasMorePages = !!headers.link && headers.link.indexOf('rel="next"') > -1;
-			const pullRequestResponses = await Promise.all(promises);
-
-			const pullRequests = pullRequestResponses
-				.map(response => {
-					if (!response.repository) {
-						Logger.appendLine('Pull request doesn\'t appear to exist.', this.id);
-						return null;
-					}
-
-					return this.createOrUpdatePullRequestModel(
-						parseGraphQLPullRequest(response.repository.pullRequest, this),
-					);
-				})
-				.filter(item => item !== null) as PullRequestModel[];
-
-			Logger.debug(`Fetch pull request category ${categoryQuery} - done`, this.id);
-
-			return {
-				items: pullRequests,
-				hasMorePages,
-				totalCount: data.total_count
-			};
-		} catch (e) {
-			Logger.error(`Fetching pull request with query failed: ${e}`, this.id);
-			if (e.code === 404) {
-				// not found
-				vscode.window.showWarningMessage(
-					`Fetching pull requests for remote ${this.remote.remoteName} with query failed, please check if the repo ${repo?.full_name} is valid.`,
-				);
-			} else {
-				throw e;
-			}
-		}
-		return undefined;
-	}
-
 	createOrUpdatePullRequestModel(pullRequest: PullRequest): PullRequestModel {
 		let model = this._pullRequestModels.get(pullRequest.number);
 		if (model) {

src/github/utils.ts

@@ -1360,9 +1360,9 @@ export function insertNewCommitsSinceReview(
 	}
 }
 
-export function getPRFetchQuery(repo: string, user: string, query: string): string {
+export function getPRFetchQuery(user: string, query: string): string {
 	const filter = query.replace(/\$\{user\}/g, user);
-	return `is:pull-request ${filter} type:pr repo:${repo}`;
+	return `is:pull-request ${filter} type:pr`;
 }
 
 export function isInCodespaces(): boolean {

src/migrations.ts

@@ -0,0 +1,61 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import * as PersistentState from './common/persistentState';
+import { BRANCH_PUBLISH, PR_SETTINGS_NAMESPACE, QUERIES } from './common/settingKeys';
+
+const PROMPTS_SCOPE = 'prompts';
+const PROMPT_TO_CREATE_PR_ON_PUBLISH_KEY = 'createPROnPublish';
+
+export async function migrate(context: vscode.ExtensionContext) {
+	await createOnPublish();
+	await makeQueriesScopedToRepo(context);
+}
+
+async function createOnPublish() {
+	// Migrate from state to setting
+	if (PersistentState.fetch(PROMPTS_SCOPE, PROMPT_TO_CREATE_PR_ON_PUBLISH_KEY) === false) {
+		await vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).update(BRANCH_PUBLISH, 'never', vscode.ConfigurationTarget.Global);
+		PersistentState.store(PROMPTS_SCOPE, PROMPT_TO_CREATE_PR_ON_PUBLISH_KEY, true);
+	}
+}
+
+const HAS_MIGRATED_QUERIES = 'hasMigratedQueries';
+async function makeQueriesScopedToRepo(context: vscode.ExtensionContext) {
+	const hasMigratedUserQueries = context.globalState.get<boolean>(HAS_MIGRATED_QUERIES, false);
+	const hasMigratedWorkspaceQueries = context.workspaceState.get<boolean>(HAS_MIGRATED_QUERIES, false);
+	if (hasMigratedUserQueries && hasMigratedWorkspaceQueries) {
+		return;
+	}
+
+	const configuration = vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE);
+	const settingValue = configuration.inspect(QUERIES);
+
+	type Query = {
+		label: string,
+		query: string,
+	};
+	const addRepoScope = (queries: Query[]) => {
+		return queries.map(query => {
+			return {
+				label: query.label,
+				query: query.query.includes('repo:') ? query.query : `repo:\${owner}/\${repository} ${query.query}`,
+			};
+		});
+	};
+
+	// User setting
+	if (!hasMigratedUserQueries && settingValue?.globalValue) {
+		await configuration.update(QUERIES, addRepoScope(settingValue.globalValue as Query[]), vscode.ConfigurationTarget.Global);
+		context.globalState.update(HAS_MIGRATED_QUERIES, true);
+	}
+
+	// Workspace setting
+	if (!hasMigratedWorkspaceQueries && settingValue?.workspaceValue) {
+		await configuration.update(QUERIES, addRepoScope(settingValue.workspaceValue as Query[]), vscode.ConfigurationTarget.Workspace);
+		context.workspaceState.update(HAS_MIGRATED_QUERIES, true);
+	}
+}

src/test/github/utils.test.ts

@@ -10,11 +10,10 @@ describe('utils', () => {
 
 	describe('getPRFetchQuery', () => {
 		it('replaces all instances of ${user}', () => {
-			const repo = 'microsoft/vscode-pull-request-github';
 			const user = 'rmacfarlane';
 			const query = 'reviewed-by:${user} -author:${user}';
-			const result = getPRFetchQuery(repo, user, query)
-			assert.strictEqual(result, 'is:pull-request reviewed-by:rmacfarlane -author:rmacfarlane type:pr repo:microsoft/vscode-pull-request-github');
+			const result = getPRFetchQuery(user, query)
+			assert.strictEqual(result, 'is:pull-request reviewed-by:rmacfarlane -author:rmacfarlane type:pr');
 		});
 	});
 

src/view/treeNodes/descriptionNode.ts

@@ -46,6 +46,6 @@ export class DescriptionNode extends TreeNode implements vscode.TreeItem {
 			(currentBranchIsForThisPR ? ':active' : ':nonactive') +
 			(this.pullRequestModel.hasChangesSinceLastReview ? ':hasChangesSinceReview' : '') +
 			(this.pullRequestModel.showChangesSinceReview ? ':showingChangesSinceReview' : ':showingAllChanges') +
-			(this.pullRequestModel.item.isRemoteHeadDeleted ? '' : ':hasHeadRef');
+			((this.pullRequestModel.item.isRemoteHeadDeleted || !this.folderRepositoryManager.isPullRequestAssociatedWithOpenRepository(this.pullRequestModel)) ? '' : ':hasHeadRef');
 	}
 }

src/view/treeNodes/pullRequestNode.ts

@@ -305,7 +305,7 @@ export class PRNode extends TreeNode implements vscode.CommentingRangeProvider2
 				(this._isLocal ? ':local' : '') +
 				(currentBranchIsForThisPR ? ':active' : ':nonactive') +
 				(hasNotification ? ':notification' : '') +
-				(this.pullRequestModel.item.isRemoteHeadDeleted ? '' : ':hasHeadRef'),
+				((this.pullRequestModel.item.isRemoteHeadDeleted || !this._folderReposManager.isPullRequestAssociatedWithOpenRepository(this.pullRequestModel)) ? '' : ':hasHeadRef'),
 			iconPath: (await DataUri.avatarCirclesAsImageDataUris(this._folderReposManager.context, [this.pullRequestModel.author], 16, 16))[0]
 				?? new vscode.ThemeIcon('github'),
 			accessibilityInformation: {