Merge branch 'main' into alexr00/particular-bug

Author: alexr00

common/views.ts

@@ -3,7 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAccount, ILabel, IMilestone, IProject, ITeam, MergeMethod, MergeMethodsAvailability } from '../src/github/interface';
+import { ClosedEvent, CommentEvent } from '../src/common/timelineEvent';
+import { GithubItemStateEnum, IAccount, ILabel, IMilestone, IProject, ITeam, MergeMethod, MergeMethodsAvailability } from '../src/github/interface';
 import { PreReviewState } from '../src/github/views';
 
 export interface RemoteInfo {
@@ -168,4 +169,10 @@ export interface TitleAndDescriptionResult {
 	description: string | undefined;
 }
 
+export interface CloseResult {
+	state: GithubItemStateEnum;
+	commentEvent?: CommentEvent;
+	closeEvent: ClosedEvent;
+}
+
 // #endregion

package.json

@@ -828,11 +828,6 @@
 				"title": "%command.pr.readyForReview.title%",
 				"category": "%command.pull.request.category%"
 			},
-			{
-				"command": "pr.close",
-				"title": "%command.pr.close.title%",
-				"category": "%command.pull.request.category%"
-			},
 			{
 				"command": "pr.openPullRequestOnGitHub",
 				"title": "%command.pr.openPullRequestOnGitHub.title%",
@@ -1593,13 +1588,13 @@
 				"command": "notifications.markPullRequestsAsRead",
 				"title": "%command.notifications.markPullRequestsAsRead.title%",
 				"category": "%command.notifications.category%",
-				"icon": "$(git-pull-request)"
+				"icon": "$(git-pull-request-done)"
 			},
 			{
 				"command": "notifications.markPullRequestsAsDone",
 				"title": "%command.notifications.markPullRequestsAsDone.title%",
 				"category": "%command.notifications.category%",
-				"icon": "$(git-pull-request)"
+				"icon": "$(git-pull-request-done)"
 			},
 			{
 				"command": "notifications.configureNotificationsViewlet",
@@ -1776,10 +1771,6 @@
 					"command": "review.openLocalFile",
 					"when": "false"
 				},
-				{
-					"command": "pr.close",
-					"when": "gitHubOpenRepositoryCount != 0 && github:inReviewMode"
-				},
 				{
 					"command": "pr.create",
 					"when": "gitHubOpenRepositoryCount != 0 && github:authenticated"

package.nls.json

@@ -173,7 +173,6 @@
 	"command.pr.dismissNotification.title": "Dismiss Notification",
 	"command.pr.merge.title": "Merge Pull Request",
 	"command.pr.readyForReview.title": "Mark Pull Request Ready For Review",
-	"command.pr.close.title": "Close Pull Request",
 	"command.pr.openPullRequestOnGitHub.title": "Open Pull Request on GitHub",
 	"command.pr.openAllDiffs.title": "Open All Diffs",
 	"command.pr.refreshPullRequest.title": "Refresh Pull Request",

src/commands.ts

@@ -9,7 +9,6 @@ import * as vscode from 'vscode';
 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';
@@ -20,7 +19,7 @@ import { formatError } from './common/utils';
 import { EXTENSION_ID } from './constants';
 import { FolderRepositoryManager } from './github/folderRepositoryManager';
 import { GitHubRepository } from './github/githubRepository';
-import { Issue, PullRequest } from './github/interface';
+import { Issue } from './github/interface';
 import { IssueModel } from './github/issueModel';
 import { IssueOverviewPanel } from './github/issueOverview';
 import { NotificationProvider } from './github/notifications';
@@ -46,9 +45,6 @@ import {
 import { PRNode } from './view/treeNodes/pullRequestNode';
 import { RepositoryChangesNode } from './view/treeNodes/repositoryChangesNode';
 
-const _onDidUpdatePR = new vscode.EventEmitter<PullRequest | void>();
-export const onDidUpdatePR: vscode.Event<PullRequest | void> = _onDidUpdatePR.event;
-
 function ensurePR(folderRepoManager: FolderRepositoryManager, pr?: PRNode): PullRequestModel;
 function ensurePR<TIssue extends Issue, TIssueModel extends IssueModel<TIssue>>(folderRepoManager: FolderRepositoryManager, pr?: TIssueModel): TIssueModel;
 function ensurePR<TIssue extends Issue, TIssueModel extends IssueModel<TIssue>>(folderRepoManager: FolderRepositoryManager, pr?: PRNode | TIssueModel): TIssueModel {
@@ -749,56 +745,6 @@ export function registerCommands(
 		}),
 	);
 
-	context.subscriptions.push(
-		vscode.commands.registerCommand('pr.close', async (pr?: PRNode | PullRequestModel, message?: string) => {
-			let pullRequestModel: PullRequestModel | undefined;
-			if (pr) {
-				pullRequestModel = pr instanceof PullRequestModel ? pr : pr.pullRequestModel;
-			} else {
-				const activePullRequests: PullRequestModel[] = reposManager.folderManagers
-					.map(folderManager => folderManager.activePullRequest!)
-					.filter(activePR => !!activePR);
-				pullRequestModel = await chooseItem<PullRequestModel>(
-					activePullRequests,
-					itemValue => `${itemValue.number}: ${itemValue.title}`,
-					{ placeHolder: vscode.l10n.t('Pull request to close') },
-				);
-			}
-			if (!pullRequestModel) {
-				return;
-			}
-			const pullRequest: PullRequestModel = pullRequestModel;
-			const yes = vscode.l10n.t('Yes');
-			return vscode.window
-				.showWarningMessage(
-					vscode.l10n.t('Are you sure you want to close this pull request on GitHub? This will close the pull request without merging.'),
-					{ modal: true },
-					yes,
-					vscode.l10n.t('No'),
-				)
-				.then(async value => {
-					if (value === yes) {
-						try {
-							let newComment: IComment | undefined = undefined;
-							if (message) {
-								newComment = await pullRequest.createIssueComment(message);
-							}
-
-							const newPR = await pullRequest.close();
-							vscode.commands.executeCommand('pr.refreshList');
-							_onDidUpdatePR.fire(newPR);
-							return newComment;
-						} catch (e) {
-							vscode.window.showErrorMessage(`Unable to close pull request. ${formatError(e)}`);
-							_onDidUpdatePR.fire();
-						}
-					}
-
-					_onDidUpdatePR.fire();
-				});
-		}),
-	);
-
 	context.subscriptions.push(
 		vscode.commands.registerCommand('pr.dismissNotification', node => {
 			if (node instanceof PRNode) {

src/common/timelineEvent.ts

@@ -19,6 +19,8 @@ export enum EventType {
 	HeadRefDeleted,
 	Merged,
 	CrossReferenced,
+	Closed,
+	Reopened,
 	Other,
 }
 
@@ -121,4 +123,18 @@ export interface CrossReferencedEvent {
 	willCloseTarget: boolean;
 }
 
-export type TimelineEvent = CommitEvent | ReviewEvent | CommentEvent | NewCommitsSinceReviewEvent | MergedEvent | AssignEvent | HeadRefDeleteEvent | CrossReferencedEvent;
+export interface ClosedEvent {
+	id: string
+	event: EventType.Closed;
+	actor: IActor;
+	createdAt: string;
+}
+
+export interface ReopenedEvent {
+	id: string;
+	event: EventType.Reopened;
+	actor: IActor;
+	createdAt: string;
+}
+
+export type TimelineEvent = CommitEvent | ReviewEvent | CommentEvent | NewCommitsSinceReviewEvent | MergedEvent | AssignEvent | HeadRefDeleteEvent | CrossReferencedEvent | ClosedEvent | ReopenedEvent;

src/github/activityBarViewProvider.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { onDidUpdatePR, openPullRequestOnGitHub } from '../commands';
+import { openPullRequestOnGitHub } from '../commands';
 import { IComment } from '../common/comment';
 import { disposeAll } from '../common/lifecycle';
 import { ReviewEvent as CommonReviewEvent } from '../common/timelineEvent';
@@ -31,18 +31,6 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 	) {
 		super(extensionUri);
 
-		this._register(onDidUpdatePR(
-			pr => {
-				if (pr) {
-					this._item.update(pr);
-				}
-
-				this._postMessage({
-					command: 'update-state',
-					state: this._item.state,
-				});
-			}));
-
 		this._register(this._folderRepositoryManager.onDidMergePullRequest(_ => {
 			this._postMessage({
 				command: 'update-state',

src/github/common.ts

@@ -39,6 +39,7 @@ export namespace OctokitCommon {
 	export type PullsCreateReviewResponseData = Endpoints['POST /repos/{owner}/{repo}/pulls/{pull_number}/reviews']['response']['data'];
 	export type PullsCreateReviewCommentResponseData = Endpoints['POST /repos/{owner}/{repo}/pulls/{pull_number}/comments']['response']['data'];
 	export type PullsGetResponseData = OctokitRest.RestEndpointMethodTypes['pulls']['get']['response']['data'];
+	export type IssuesGetResponseData = OctokitRest.RestEndpointMethodTypes['issues']['get']['response']['data'];
 	export type PullsGetResponseUser = Exclude<PullsGetResponseData['user'], null>;
 	export type PullsListCommitsResponseData = Endpoints['GET /repos/{owner}/{repo}/pulls/{pull_number}/commits']['response']['data'];
 	export type PullsListRequestedReviewersResponseData = Endpoints['GET /repos/{owner}/{repo}/pulls/{pull_number}/requested_reviewers']['response']['data'];

src/github/folderRepositoryManager.ts

@@ -1154,7 +1154,7 @@ export class FolderRepositoryManager extends Disposable {
 			Logger.debug(`Fetch pull request category ${categoryQuery} - enter`, this.id);
 			const { octokit, query, schema } = await githubRepository.ensure();
 
-			const user = await githubRepository.getAuthenticatedUser();
+			const user = (await githubRepository.getAuthenticatedUser()).login;
 			// 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, {
@@ -1749,8 +1749,12 @@ export class FolderRepositoryManager extends Disposable {
 	}
 
 	private async getBranchDeletionItems() {
+		interface BranchDeletionMetadata extends PullRequestMetadata {
+			isOpen?: boolean;
+		}
+
 		const allConfigs = await this.repository.getConfigs();
-		const branchInfos: Map<string, { remote?: string; metadata?: PullRequestMetadata }> = new Map();
+		const branchInfos: Map<string, { remote?: string; metadata?: BranchDeletionMetadata[] }> = new Map();
 
 		allConfigs.forEach(config => {
 			const key = config.key;
@@ -1763,14 +1767,23 @@ export class FolderRepositoryManager extends Disposable {
 					branchInfos.set(branchName, {});
 				}
 
-				const value = branchInfos.get(branchName);
+				const value = branchInfos.get(branchName)!;
 				if (matches[2] === 'remote') {
-					value!['remote'] = config.value;
+					value['remote'] = config.value;
 				}
 
 				if (matches[2] === 'github-pr-owner-number') {
 					const metadata = PullRequestGitHelper.parsePullRequestMetadata(config.value);
-					value!['metadata'] = metadata;
+					if (!value?.metadata) {
+						value['metadata'] = [];
+					}
+					if (metadata) {
+						// Check if the metadata already exists in the array
+						const existingMetadata = value.metadata.find(m => m.owner === metadata.owner && m.repositoryName === metadata.repositoryName && m.prNumber === metadata.prNumber);
+						if (!existingMetadata) {
+							value['metadata'].push(metadata);
+						}
+					}
 				}
 
 				branchInfos.set(branchName, value!);
@@ -1779,67 +1792,73 @@ export class FolderRepositoryManager extends Disposable {
 		Logger.debug(`Found ${branchInfos.size} possible branches to delete`, this.id);
 		Logger.trace(`Branches to delete: ${JSON.stringify(Array.from(branchInfos.keys()))}`, this.id);
 
-		const actions: (vscode.QuickPickItem & { metadata: PullRequestMetadata; legacy?: boolean })[] = [];
+		const actions: (vscode.QuickPickItem & { metadata: BranchDeletionMetadata[]; legacy?: boolean })[] = [];
 		branchInfos.forEach((value, key) => {
 			if (value.metadata) {
 				const activePRUrl = this.activePullRequest && this.activePullRequest.base.repositoryCloneUrl;
-				const matchesActiveBranch = activePRUrl
-					? (activePRUrl.owner === value.metadata.owner &&
-						activePRUrl.repositoryName === value.metadata.repositoryName &&
-						this.activePullRequest?.number === value.metadata.prNumber)
-					: false;
+				const activeMetadata = value.metadata.find(metadata =>
+					metadata.owner === activePRUrl?.owner &&
+					metadata.repositoryName === activePRUrl?.repositoryName &&
+					metadata.prNumber === this.activePullRequest?.number
+				);
 
-				if (!matchesActiveBranch) {
+				if (!activeMetadata) {
 					actions.push({
 						label: `${key}`,
-						description: `${value.metadata!.repositoryName}/${value.metadata!.owner} #${value.metadata.prNumber
-							}`,
 						picked: false,
-						metadata: value.metadata!,
+						metadata: value.metadata,
 					});
 				} else {
-					Logger.debug(`Skipping ${value.metadata.prNumber}, active PR is #${this.activePullRequest?.number}`, this.id);
+					Logger.debug(`Skipping ${activeMetadata.prNumber}, active PR is #${this.activePullRequest?.number}`, this.id);
 					Logger.trace(`Skipping active branch ${key}`, this.id);
 				}
 			}
 		});
 
 		const results = await Promise.all(
 			actions.map(async action => {
-				const metadata = action.metadata;
-				const githubRepo = this._githubRepositories.find(
-					repo =>
-						repo.remote.owner.toLowerCase() === metadata!.owner.toLowerCase() &&
-						repo.remote.repositoryName.toLowerCase() === metadata!.repositoryName.toLowerCase(),
-				);
+				const allOld = (await Promise.all(
+					action.metadata.map(async metadata => {
+						const githubRepo = this._githubRepositories.find(
+							repo =>
+								repo.remote.owner.toLowerCase() === metadata!.owner.toLowerCase() &&
+								repo.remote.repositoryName.toLowerCase() === metadata!.repositoryName.toLowerCase(),
+						);
+
+						if (!githubRepo) {
+							return action;
+						}
 
-				if (!githubRepo) {
-					return action;
+						const { remote, query, schema } = await githubRepo.ensure();
+						try {
+							const { data } = await query<PullRequestState>({
+								query: schema.PullRequestState,
+								variables: {
+									owner: remote.owner,
+									name: remote.repositoryName,
+									number: metadata!.prNumber,
+								},
+							});
+							metadata.isOpen = data.repository?.pullRequest.state === 'OPEN';
+							return data.repository?.pullRequest.state !== 'OPEN';
+						} catch { }
+						return false;
+					}))).every(result => result);
+				if (allOld) {
+					action.legacy = true;
 				}
 
-				const { remote, query, schema } = await githubRepo.ensure();
-				try {
-					const { data } = await query<PullRequestState>({
-						query: schema.PullRequestState,
-						variables: {
-							owner: remote.owner,
-							name: remote.repositoryName,
-							number: metadata!.prNumber,
-						},
-					});
-
-					action.legacy = data.repository?.pullRequest.state !== 'OPEN';
-				} catch { }
-
 				return action;
 			}),
 		);
 
 		results.forEach(result => {
+			result.description = `${result.metadata[0].repositoryName}/${result.metadata[0].owner} ${result.metadata.map(metadata => {
+				const prString = `#${metadata.prNumber}`;
+				return metadata.isOpen ? vscode.l10n.t('{0} is open', prString) : prString;
+			}).join(', ')}`;
 			if (result.legacy) {
 				result.picked = true;
-			} else {
-				result.description = vscode.l10n.t('{0} is still Open', result.description!);
 			}
 		});
 
@@ -2011,7 +2030,7 @@ export class FolderRepositoryManager extends Disposable {
 			quickPick.items = results;
 			quickPick.selectedItems = results.filter(result => {
 				// Do not pick the default branch for the repo.
-				return result.picked && !((result.label === defaults.base) && (result.metadata.owner === defaults.owner) && (result.metadata.repositoryName === defaults.repo));
+				return result.picked && !((result.label === defaults.base) && (result.metadata.find(metadata => metadata.owner === defaults.owner && metadata.repositoryName === defaults.repo)));
 			});
 			quickPick.busy = false;
 			if (results.length === 0) {

src/github/githubRepository.ts

@@ -886,8 +886,8 @@ export class GitHubRepository extends Disposable {
 		}
 	}
 
-	async getAuthenticatedUser(): Promise<string> {
-		return (await this._credentialStore.getCurrentUser(this.remote.authProviderId)).login;
+	async getAuthenticatedUser(): Promise<IAccount> {
+		return await this._credentialStore.getCurrentUser(this.remote.authProviderId);
 	}
 
 	async getAuthenticatedUserEmails(): Promise<string[]> {