Fix load more and duplicate issues (#8066)

Author: alexr00

src/github/folderRepositoryManager.ts

@@ -1082,7 +1082,13 @@ export class FolderRepositoryManager extends Disposable {
 			}
 		};
 
+		const activeGitHubRemotes = await this.getActiveGitHubRemotes(this._allGitHubRemotes);
+
 		const githubRepositories = this._githubRepositories.filter(repo => {
+			if (!activeGitHubRemotes.find(r => r.equals(repo.remote))) {
+				return false;
+			}
+
 			const info = this._repositoryPageInformation.get(repo.remote.url.toString() + queryId);
 			// If we are in case 1 or 3, don't filter out repos that are out of pages, as we will be querying from the start.
 			return info && (options.fetchNextPage === false || info.hasMorePages !== false);

src/view/prsTreeModel.ts

@@ -355,9 +355,9 @@ export class PrsTreeModel extends Disposable {
 		try {
 			let maxKnownPR: number | undefined;
 			const cache = this.getFolderCache(folderRepoManager);
+			const cachedPRs = cache.get(query)!;
 			if (!fetchNextPage && cache.has(query)) {
 				const shouldRefresh = await this._testIfRefreshNeeded(cache.get(query)!, query, folderRepoManager);
-				const cachedPRs = cache.get(query)!;
 				maxKnownPR = cachedPRs.maxKnownPR;
 				if (!shouldRefresh) {
 					cachedPRs.clearRequested = false;
@@ -377,6 +377,9 @@ export class PrsTreeModel extends Disposable {
 				{ fetchNextPage, fetchOnePagePerRepo },
 				query,
 			);
+			if (fetchNextPage) {
+				prs.items = cachedPRs?.items.items.concat(prs.items) ?? prs.items;
+			}
 			cache.set(query, { clearRequested: false, items: prs, maxKnownPR });
 			prs.items.forEach(pr => this._allCachedPRs.add(pr));
 
@@ -404,6 +407,9 @@ export class PrsTreeModel extends Disposable {
 			PRType.All,
 			{ fetchNextPage }
 		);
+		if (fetchNextPage) {
+			prs.items = allCache?.items.items.concat(prs.items) ?? prs.items;
+		}
 		cache.set(PRType.All, { clearRequested: false, items: prs, maxKnownPR: undefined });
 		prs.items.forEach(pr => this._allCachedPRs.add(pr));