From d8662f43966a3b0c5a598d5466becbea50d7592e Mon Sep 17 00:00:00 2001 From: Alex Ross Date: Wed, 18 Dec 2024 11:11:09 +0100 Subject: [PATCH] Non GitHub remotes for submodules causes authentication to fail Fixes #6140 --- src/view/prsTreeDataProvider.ts | 9 +++++---- src/view/treeNodes/repositoryChangesNode.ts | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/view/prsTreeDataProvider.ts b/src/view/prsTreeDataProvider.ts index 20af7de7b4..c01a83dc87 100644 --- a/src/view/prsTreeDataProvider.ts +++ b/src/view/prsTreeDataProvider.ts @@ -235,15 +235,16 @@ export class PullRequestsTreeDataProvider extends Disposable implements vscode.T return this.needsRemotes(); } + const gitHubFolderManagers = this._reposManager.folderManagers.filter(manager => manager.gitHubRepositories.length > 0); if (!element) { if (this._children && this._children.length) { this._children.forEach(dispose => dispose.dispose()); } let result: WorkspaceFolderNode[] | CategoryTreeNode[]; - if (this._reposManager.folderManagers.length === 1) { + if (gitHubFolderManagers.length === 1) { result = WorkspaceFolderNode.getCategoryTreeNodes( - this._reposManager.folderManagers[0], + gitHubFolderManagers[0], this._telemetry, this, this.notificationProvider, @@ -251,7 +252,7 @@ export class PullRequestsTreeDataProvider extends Disposable implements vscode.T this.prsTreeModel ); } else { - result = this._reposManager.folderManagers.map( + result = gitHubFolderManagers.map( folderManager => new WorkspaceFolderNode( this, @@ -270,7 +271,7 @@ export class PullRequestsTreeDataProvider extends Disposable implements vscode.T } if ( - this._reposManager.folderManagers.filter(manager => manager.repository.state.remotes.length > 0).length === 0 + gitHubFolderManagers.filter(manager => manager.repository.state.remotes.length > 0).length === 0 ) { return Promise.resolve([new PRCategoryActionNode(this, PRCategoryActionType.Empty)]); } diff --git a/src/view/treeNodes/repositoryChangesNode.ts b/src/view/treeNodes/repositoryChangesNode.ts index 5fe6451415..aca752e797 100644 --- a/src/view/treeNodes/repositoryChangesNode.ts +++ b/src/view/treeNodes/repositoryChangesNode.ts @@ -22,7 +22,6 @@ export class RepositoryChangesNode extends DescriptionNode implements vscode.Tre public description?: string; readonly collapsibleState = vscode.TreeItemCollapsibleState.Expanded; - constructor( public override parent: BaseTreeNode, pullRequest: PullRequestModel,