Refresh whole tree view when PR is added (#7313)

Author: alexr00

src/github/folderRepositoryManager.ts

@@ -216,6 +216,8 @@ export class FolderRepositoryManager extends Disposable {
 	private _onDidChangePullRequestsEvents: vscode.Disposable[] = [];
 	private readonly _onDidChangeAnyPullRequests = this._register(new vscode.EventEmitter<IssueModel[]>());
 	readonly onDidChangeAnyPullRequests: vscode.Event<IssueModel[]> = this._onDidChangeAnyPullRequests.event;
+	private readonly _onDidAddPullRequest = this._register(new vscode.EventEmitter<IssueModel>());
+	readonly onDidAddPullRequest: vscode.Event<IssueModel> = this._onDidAddPullRequest.event;
 
 	private _onDidDispose = this._register(new vscode.EventEmitter<void>());
 	readonly onDidDispose: vscode.Event<void> = this._onDidDispose.event;
@@ -533,6 +535,7 @@ export class FolderRepositoryManager extends Disposable {
 			this._githubRepositories = repositories;
 			for (const repo of this._githubRepositories) {
 				this._onDidChangePullRequestsEvents.push(repo.onDidChangePullRequests(e => this._onDidChangeAnyPullRequests.fire(e)));
+				this._onDidChangePullRequestsEvents.push(repo.onDidAddPullRequest(e => this._onDidAddPullRequest.fire(e)));
 			}
 			oldRepositories.filter(old => this._githubRepositories.indexOf(old) < 0).forEach(repo => repo.dispose());
 

src/github/issueModel.ts

@@ -8,8 +8,8 @@ import { COPILOT_ACCOUNTS, IComment } from '../common/comment';
 import { Disposable } from '../common/lifecycle';
 import Logger from '../common/logger';
 import { Remote } from '../common/remote';
-import { ClosedEvent, EventType, TimelineEvent } from '../common/timelineEvent';
-import { formatError } from '../common/utils';
+import { ClosedEvent, CrossReferencedEvent, EventType, TimelineEvent } from '../common/timelineEvent';
+import { compareIgnoreCase, formatError } from '../common/utils';
 import { OctokitCommon } from './common';
 import { CopilotWorkingStatus, GitHubRepository } from './githubRepository';
 import {
@@ -470,8 +470,23 @@ export class IssueModel<TItem extends Issue = Issue> extends Disposable {
 				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, true), this.githubRepository);
+
+			const crossRefs = events.filter((event): event is CrossReferencedEvent => {
+				if ((event.event === EventType.CrossReferenced) && !event.source.isIssue) {
+					return !this.githubRepository.getExistingPullRequestModel(event.source.number) && (compareIgnoreCase(event.source.owner, issueModel.remote.owner) === 0 && compareIgnoreCase(event.source.repo, issueModel.remote.repositoryName) === 0);
+				}
+				return false;
+
+			});
+
+			for (const unseenPrs of crossRefs) {
+				// Kick off getting the new PRs so that the system knows about them (and refreshes the tree when they're found)
+				this.githubRepository.getPullRequest(unseenPrs.source.number);
+			}
+
 			issueModel.timelineEvents = events;
 			return events;
 		} catch (e) {

src/github/repositoriesManager.ts

@@ -48,6 +48,9 @@ export class RepositoriesManager extends Disposable {
 	private _onDidChangeAnyPullRequests = new vscode.EventEmitter<IssueModel[]>();
 	readonly onDidChangeAnyPullRequests = this._onDidChangeAnyPullRequests.event;
 
+	private _onDidAddPullRequest = new vscode.EventEmitter<IssueModel>();
+	readonly onDidAddPullRequest = this._onDidAddPullRequest.event;
+
 	private _onDidAddAnyGitHubRepository = new vscode.EventEmitter<FolderRepositoryManager>();
 	readonly onDidChangeAnyGitHubRepository = this._onDidAddAnyGitHubRepository.event;
 
@@ -85,6 +88,7 @@ export class RepositoriesManager extends Disposable {
 			folderManager.onDidChangeActivePullRequest(() => this.updateActiveReviewCount()),
 			folderManager.onDidDispose(() => this.removeRepo(folderManager.repository)),
 			folderManager.onDidChangeAnyPullRequests(e => this._onDidChangeAnyPullRequests.fire(e)),
+			folderManager.onDidAddPullRequest(e => this._onDidAddPullRequest.fire(e)),
 			folderManager.onDidChangeGithubRepositories(() => this._onDidAddAnyGitHubRepository.fire(folderManager)),
 		];
 		this._subs.set(folderManager, disposables);

src/view/prsTreeDataProvider.ts

@@ -63,7 +63,7 @@ export class PullRequestsTreeDataProvider extends Disposable implements vscode.T
 			} else if (Array.isArray(e) && e[0] instanceof IssueModel) {
 				this.refreshPullRequests(e);
 			} else {
-				this.refresh();
+				this.refresh(undefined, true);
 			}
 		}));
 		this._register(new PRStatusDecorationProvider(this.prsTreeModel, this._copilotManager));

src/view/prsTreeModel.ts

@@ -84,6 +84,12 @@ export class PrsTreeModel extends Disposable {
 			this._onDidChangeData.fire(prs);
 		}));
 
+		this._register(this._reposManager.onDidAddPullRequest(() => {
+			if (this._hasLoaded) {
+				this._onDidChangeData.fire();
+			}
+		}));
+
 		this._register(this._reposManager.onDidChangeFolderRepositories((changed) => {
 			if (changed.added) {
 				repoEvents(changed.added);
@@ -132,6 +138,9 @@ export class PrsTreeModel extends Disposable {
 	}
 
 	public clearCache(silent: boolean = false) {
+		if (this._cachedPRs.size === 0) {
+			return;
+		}
 		this._cachedPRs.clear();
 		if (!silent) {
 			this._onDidChangeData.fire();