Refresh the PRs tree when newly linked PRs are seen (#7101)

Author: alexr00

src/common/timelineEvent.ts

@@ -133,6 +133,8 @@ export interface CrossReferencedEvent {
 		extensionUrl: string;
 		title: string;
 		isIssue: boolean;
+		owner: string;
+		repo: string;
 	};
 	willCloseTarget: boolean;
 }

src/github/copilotPrWatcher.ts

@@ -145,7 +145,7 @@ export class CopilotPRWatcher extends Disposable {
 			const prs = await folderManager.getPullRequestsForCategory(githubRepository, await variableSubstitution(query, undefined, await folderManager.getPullRequestDefaults(), await this._getCurrentUser(folderManager)));
 			for (const pr of prs?.items ?? []) {
 				unseenKeys.delete(this._model.makeKey(pr.remote.owner, pr.remote.repositoryName, pr.number));
-				const copilotEvents = await pr.getCopilotTimelineEvents();
+				const copilotEvents = await pr.githubRepository.getCopilotTimelineEvents(pr);
 				if (copilotEvents.length === 0) {
 					continue;
 				}

src/github/folderRepositoryManager.ts

@@ -13,7 +13,7 @@ import { AuthProvider, GitHubServerType } from '../common/authentication';
 import { commands, contexts } from '../common/executeCommands';
 import { InMemFileChange, SlimFileChange } from '../common/file';
 import { findLocalRepoRemoteFromGitHubRef } from '../common/githubRef';
-import { Disposable } from '../common/lifecycle';
+import { Disposable, disposeAll } from '../common/lifecycle';
 import Logger from '../common/logger';
 import { Protocol, ProtocolType } from '../common/protocol';
 import { GitHubRemote, parseRemote, parseRepositoryRemotes, Remote } from '../common/remote';
@@ -213,6 +213,10 @@ export class FolderRepositoryManager extends Disposable {
 	private _onDidChangeGithubRepositories = this._register(new vscode.EventEmitter<GitHubRepository[]>());
 	readonly onDidChangeGithubRepositories: vscode.Event<GitHubRepository[]> = this._onDidChangeGithubRepositories.event;
 
+	private _onDidChangePullRequestsEvents: vscode.Disposable[] = [];
+	private readonly _onDidChangeAnyPullRequests = this._register(new vscode.EventEmitter<void>());
+	readonly onDidChangeAnyPullRequests: vscode.Event<void> = this._onDidChangeAnyPullRequests.event;
+
 	private _onDidDispose = this._register(new vscode.EventEmitter<void>());
 	readonly onDidDispose: vscode.Event<void> = this._onDidDispose.event;
 
@@ -240,6 +244,7 @@ export class FolderRepositoryManager extends Disposable {
 		);
 
 		this._register(_credentialStore.onDidInitialize(() => this.updateRepositories()));
+		this._register({ dispose: () => disposeAll(this._onDidChangePullRequestsEvents) });
 
 		this.cleanStoredRepoState();
 	}
@@ -524,7 +529,11 @@ export class FolderRepositoryManager extends Disposable {
 				}
 			}
 
+			disposeAll(this._onDidChangePullRequestsEvents);
 			this._githubRepositories = repositories;
+			for (const repo of this._githubRepositories) {
+				this._onDidChangePullRequestsEvents.push(repo.onDidChangePullRequests(() => this._onDidChangeAnyPullRequests.fire()));
+			}
 			oldRepositories.filter(old => this._githubRepositories.indexOf(old) < 0).forEach(repo => repo.dispose());
 
 			const repositoriesAdded =
@@ -1728,7 +1737,7 @@ export class FolderRepositoryManager extends Disposable {
 				*/
 				this.telemetry.sendTelemetryEvent('pr.merge.success');
 				this._onDidMergePullRequest.fire();
-				return { merged: true, message: '', timeline: await parseCombinedTimelineEvents(result.data?.mergePullRequest.pullRequest.timelineItems.nodes ?? [], await pullRequest.getCopilotTimelineEvents(), pullRequest.githubRepository) };
+				return { merged: true, message: '', timeline: await parseCombinedTimelineEvents(result.data?.mergePullRequest.pullRequest.timelineItems.nodes ?? [], await pullRequest.githubRepository.getCopilotTimelineEvents(pullRequest), pullRequest.githubRepository) };
 			})
 			.catch(e => {
 				/* __GDPR__

src/github/githubRepository.ts

@@ -7,10 +7,13 @@ import * as buffer from 'buffer';
 import { ApolloQueryResult, DocumentNode, FetchResult, MutationOptions, NetworkStatus, QueryOptions } from 'apollo-boost';
 import * as vscode from 'vscode';
 import { AuthenticationError, AuthProvider, GitHubServerType, isSamlError } from '../common/authentication';
+import { COPILOT_ACCOUNTS } from '../common/comment';
 import { Disposable } from '../common/lifecycle';
 import Logger from '../common/logger';
 import { GitHubRemote, parseRemote } from '../common/remote';
 import { ITelemetry } from '../common/telemetry';
+import * as Common from '../common/timelineEvent';
+import { compareIgnoreCase, formatError } from '../common/utils';
 import { PRCommentControllerRegistry } from '../view/pullRequestCommentControllerRegistry';
 import { mergeQuerySchemaWithShared, OctokitCommon, Schema } from './common';
 import { CredentialStore, GitHub } from './credentials';
@@ -39,6 +42,7 @@ import {
 	RepoProjectsResponse,
 	RevertPullRequestResponse,
 	SuggestedActorsResponse,
+	TimelineEventsResponse,
 	ViewerPermissionResponse,
 } from './graphql';
 import {
@@ -67,11 +71,14 @@ import {
 	getOverrideBranch,
 	isInCodespaces,
 	parseAccount,
+	parseCombinedTimelineEvents,
 	parseGraphQLIssue,
 	parseGraphQLPullRequest,
 	parseGraphQLViewerPermission,
 	parseMergeMethod,
 	parseMilestone,
+	parseSelectRestTimelineEvents,
+	restPaginate,
 } from './utils';
 
 export const PULL_REQUEST_PAGE_SIZE = 20;
@@ -152,6 +159,8 @@ export class GitHubRepository extends Disposable {
 
 	private _onDidAddPullRequest: vscode.EventEmitter<PullRequestModel> = this._register(new vscode.EventEmitter());
 	public readonly onDidAddPullRequest: vscode.Event<PullRequestModel> = this._onDidAddPullRequest.event;
+	private _onDidChangePullRequests: vscode.EventEmitter<void> = this._register(new vscode.EventEmitter());
+	public readonly onDidChangePullRequests: vscode.Event<void> = this._onDidChangePullRequests.event;
 
 	public get hub(): GitHub {
 		if (!this._hub) {
@@ -1443,6 +1452,81 @@ export class GitHubRepository extends Disposable {
 		return this._credentialStore.isCurrentUser(login);
 	}
 
+
+	/**
+	 * TODO: @alexr00 we should delete this https://github.com/microsoft/vscode-pull-request-github/issues/6965
+	 */
+	async getCopilotTimelineEvents(issueModel: IssueModel): Promise<Common.TimelineEvent[]> {
+		if (!COPILOT_ACCOUNTS[issueModel.author.login]) {
+			return [];
+		}
+
+		Logger.debug(`Fetch Copilot timeline events of issue #${issueModel.number} - enter`, GitHubRepository.ID);
+
+		const { octokit, remote } = await this.ensure();
+		try {
+			const timeline = await restPaginate<typeof octokit.api.issues.listEventsForTimeline, OctokitCommon.ListEventsForTimelineResponse>(octokit.api.issues.listEventsForTimeline, {
+				issue_number: issueModel.number,
+				owner: remote.owner,
+				repo: remote.repositoryName,
+				per_page: 100
+			});
+
+			return parseSelectRestTimelineEvents(issueModel, timeline);
+		} catch (e) {
+			Logger.error(`Error fetching Copilot timeline events of issue #${issueModel.number} - ${formatError(e)}`, GitHubRepository.ID);
+			return [];
+		}
+	}
+
+	async getIssueTimelineEvents(issueModel: IssueModel): Promise<Common.TimelineEvent[]> {
+		Logger.debug(`Fetch timeline events of issue #${issueModel.number} - enter`, GitHubRepository.ID);
+		const { query, remote, schema } = await this.ensure();
+
+		try {
+			const { data } = await query<TimelineEventsResponse>({
+				query: schema.IssueTimelineEvents,
+				variables: {
+					owner: remote.owner,
+					name: remote.repositoryName,
+					number: issueModel.number,
+				},
+			});
+
+			if (data.repository === null) {
+				Logger.error('Unexpected null repository when getting issue timeline events', GitHubRepository.ID);
+				return [];
+			}
+			const ret = data.repository.pullRequest.timelineItems.nodes;
+			const events = await parseCombinedTimelineEvents(ret, await this.getCopilotTimelineEvents(issueModel), this);
+
+			const crossRefs = new Map(events
+				.filter((event): event is Common.CrossReferencedEvent => {
+					if ((event.event === Common.EventType.CrossReferenced) && !event.source.isIssue) {
+						return (compareIgnoreCase(event.source.owner, issueModel.remote.owner) === 0 && compareIgnoreCase(event.source.repo, issueModel.remote.repositoryName) === 0);
+					}
+					return false;
+
+				}).map((event: Common.CrossReferencedEvent) => {
+					return [event.source.url, event];
+				}));
+
+			for (const model of this._pullRequestModels.values()) {
+				if (crossRefs.has(model.html_url)) {
+					crossRefs.delete(model.html_url);
+				}
+			}
+			if (crossRefs.size > 0) {
+				this._onDidChangePullRequests.fire();
+			}
+
+			return events;
+		} catch (e) {
+			console.log(e);
+			return [];
+		}
+	}
+
 	/**
 	 * Get the status checks of the pull request, those for the last commit.
 	 *

src/github/issueModel.ts

@@ -4,12 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { COPILOT_ACCOUNTS, IComment } from '../common/comment';
+import { IComment } from '../common/comment';
 import Logger from '../common/logger';
 import { Remote } from '../common/remote';
-import { ClosedEvent, EventType, TimelineEvent } from '../common/timelineEvent';
+import { ClosedEvent, EventType } from '../common/timelineEvent';
 import { formatError } from '../common/utils';
-import { OctokitCommon } from './common';
 import { GitHubRepository } from './githubRepository';
 import {
 	AddIssueCommentResponse,
@@ -18,11 +17,10 @@ import {
 	LatestCommit,
 	LatestReviewThread,
 	LatestUpdatesResponse,
-	TimelineEventsResponse,
 	UpdateIssueResponse,
 } from './graphql';
 import { GithubItemStateEnum, IAccount, IIssueEditData, IMilestone, IProject, IProjectItem, Issue } from './interface';
-import { convertRESTIssueToRawPullRequest, parseCombinedTimelineEvents, parseGraphQlIssueComment, parseSelectRestTimelineEvents, restPaginate } from './utils';
+import { convertRESTIssueToRawPullRequest, parseGraphQlIssueComment } from './utils';
 
 export class IssueModel<TItem extends Issue = Issue> {
 	static ID = 'IssueModel';
@@ -326,61 +324,6 @@ export class IssueModel<TItem extends Issue = Issue> {
 		return this.item.projectItems;
 	}
 
-	/**
-	 * TODO: @alexr00 we should delete this https://github.com/microsoft/vscode-pull-request-github/issues/6965
-	 */
-	async getCopilotTimelineEvents(): Promise<TimelineEvent[]> {
-		if (!COPILOT_ACCOUNTS[this.author.login]) {
-			return [];
-		}
-
-		Logger.debug(`Fetch Copilot timeline events of issue #${this.number} - enter`, IssueModel.ID);
-
-		const { octokit, remote } = await this.githubRepository.ensure();
-		try {
-			const timeline = await restPaginate<typeof octokit.api.issues.listEventsForTimeline, OctokitCommon.ListEventsForTimelineResponse>(octokit.api.issues.listEventsForTimeline, {
-				issue_number: this.number,
-				owner: remote.owner,
-				repo: remote.repositoryName,
-				per_page: 100
-			});
-
-			return parseSelectRestTimelineEvents(this, timeline);
-		} catch (e) {
-			Logger.error(`Error fetching Copilot timeline events of issue #${this.number} - ${formatError(e)}`, IssueModel.ID);
-			return [];
-		}
-	}
-
-	async getIssueTimelineEvents(): Promise<TimelineEvent[]> {
-		Logger.debug(`Fetch timeline events of issue #${this.number} - enter`, IssueModel.ID);
-		const githubRepository = this.githubRepository;
-		const { query, remote, schema } = await githubRepository.ensure();
-
-		try {
-			const { data } = await query<TimelineEventsResponse>({
-				query: schema.IssueTimelineEvents,
-				variables: {
-					owner: remote.owner,
-					name: remote.repositoryName,
-					number: this.number,
-				},
-			});
-
-			if (data.repository === null) {
-				Logger.error('Unexpected null repository when getting issue timeline events', IssueModel.ID);
-				return [];
-			}
-			const ret = data.repository.pullRequest.timelineItems.nodes;
-			const events = await parseCombinedTimelineEvents(ret, await this.getCopilotTimelineEvents(), githubRepository);
-
-			return events;
-		} catch (e) {
-			console.log(e);
-			return [];
-		}
-	}
-
 	protected getUpdatesQuery(schema: any): any {
 		return schema.LatestIssueUpdates;
 	}

src/github/issueOverview.ts

@@ -237,7 +237,7 @@ export class IssueOverviewPanel<TItem extends IssueModel = IssueModel> extends W
 					issueModel.remote.repositoryName,
 					issueModel.number,
 				),
-				issueModel.getIssueTimelineEvents(),
+				issueModel.githubRepository.getIssueTimelineEvents(issueModel),
 				this._folderRepositoryManager.getPullRequestRepositoryAccessAndMergeMethods(issueModel),
 				issueModel.canEdit(),
 				this._folderRepositoryManager.getAssignableUsers(),
@@ -440,7 +440,7 @@ export class IssueOverviewPanel<TItem extends IssueModel = IssueModel> extends W
 			if (allAssignees) {
 				const newAssignees: IAccount[] = allAssignees.map(item => item.user);
 				await this._item.replaceAssignees(newAssignees);
-				const events = await this._item.getIssueTimelineEvents();
+				const events = await this._item.githubRepository.getIssueTimelineEvents(this._item);
 				const reply: ChangeAssigneesReply = {
 					assignees: newAssignees,
 					events
@@ -507,7 +507,7 @@ export class IssueOverviewPanel<TItem extends IssueModel = IssueModel> extends W
 				const newAssignees = (this._item.assignees ?? []).concat(currentUser);
 				await this._item.replaceAssignees(newAssignees);
 			}
-			const events = await this._item.getIssueTimelineEvents();
+			const events = await this._item.githubRepository.getIssueTimelineEvents(this._item);
 			const reply: ChangeAssigneesReply = {
 				assignees: this._item.assignees ?? [],
 				events
@@ -525,7 +525,7 @@ export class IssueOverviewPanel<TItem extends IssueModel = IssueModel> extends W
 				const newAssignees = (this._item.assignees ?? []).concat(copilotUser);
 				await this._item.replaceAssignees(newAssignees);
 			}
-			const events = await this._item.getIssueTimelineEvents();
+			const events = await this._item.githubRepository.getIssueTimelineEvents(this._item);
 			const reply: ChangeAssigneesReply = {
 				assignees: this._item.assignees ?? [],
 				events

src/github/pullRequestModel.ts

@@ -1195,7 +1195,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 
 
 		const ret = data?.repository?.pullRequest.timelineItems.nodes ?? [];
-		const events = await parseCombinedTimelineEvents(ret, await this.getCopilotTimelineEvents(), this.githubRepository);
+		const events = await parseCombinedTimelineEvents(ret, await this.githubRepository.getCopilotTimelineEvents(this), this.githubRepository);
 
 		this.addReviewTimelineEventComments(events, reviewThreads);
 		insertNewCommitsSinceReview(events, latestReviewCommitInfo?.sha, currentUser, this.head);

src/github/utils.ts

@@ -1216,7 +1216,9 @@ export async function parseCombinedTimelineEvents(
 						extensionUrl: extensionUrl.toString(),
 						number: crossRefEv.source.number,
 						title: crossRefEv.source.title,
-						isIssue
+						isIssue,
+						owner: crossRefEv.source.repository.owner.login,
+						repo: crossRefEv.source.repository.name,
 					},
 					willCloseTarget: crossRefEv.willCloseTarget
 				});

src/view/prsTreeDataProvider.ts

@@ -212,8 +212,8 @@ export class PullRequestsTreeDataProvider extends Disposable implements vscode.T
 	}
 
 	private refreshRepo(manager: FolderRepositoryManager): void {
-		if (this._children.length === 0) {
-			return this.refresh();
+		if ((this._children.length === 0) || (this._children[0] instanceof CategoryTreeNode && this._children[0].folderRepoManager === manager)) {
+			return this.refresh(undefined, true);
 		}
 		if (this._children[0] instanceof WorkspaceFolderNode) {
 			const children: WorkspaceFolderNode[] = this._children as WorkspaceFolderNode[];

src/view/prsTreeModel.ts

@@ -38,11 +38,18 @@ export class PrsTreeModel extends Disposable {
 	private readonly _queriedPullRequests: Map<string, PRStatusChange> = new Map();
 
 	private _cachedPRs: Map<FolderRepositoryManager, Map<string | PRType.LocalPullRequest | PRType.All, ItemsResponseResult<PullRequestModel>>> = new Map();
+	private readonly _repoEvents: Map<FolderRepositoryManager, vscode.Disposable[]> = new Map();
 
 	constructor(private _telemetry: ITelemetry, private readonly _reposManager: RepositoriesManager, private readonly _context: vscode.ExtensionContext) {
 		super();
 		const repoEvents = (manager: FolderRepositoryManager) => {
-			this._register(manager.onDidChangeActivePullRequest(() => {
+			if (this._repoEvents.has(manager)) {
+				disposeAll(this._repoEvents.get(manager)!);
+			} else {
+				this._repoEvents.set(manager, []);
+			}
+
+			this._repoEvents.get(manager)!.push(manager.onDidChangeActivePullRequest(() => {
 				this.clearRepo(manager);
 				if (this._activePRDisposables.has(manager)) {
 					disposeAll(this._activePRDisposables.get(manager)!);
@@ -55,8 +62,11 @@ export class PrsTreeModel extends Disposable {
 						})]);
 				}
 			}));
+			this._repoEvents.get(manager)!.push(manager.onDidChangeAnyPullRequests(() => {
+				this._onDidChangeData.fire(manager);
+			}));
 		};
-
+		this._register({ dispose: () => this._repoEvents.forEach((disposables) => disposeAll(disposables)) });
 
 		for (const manager of this._reposManager.folderManagers) {
 			repoEvents(manager);