Fix "load more" when there's a new PR (#6816)

* Fix "load more" when there's a new PR
Fixes #6615

* Fix test

Author: alexr00

src/github/notifications.ts

@@ -175,15 +175,15 @@ export class NotificationProvider extends Disposable {
 
 			for (const catNode of catNodes) {
 				if (catNode.id === 'All Open') {
-					if (catNode.prs.length === 0) {
+					if (catNode.prs.size === 0) {
 						for (const prNode of await catNode.cachedChildren()) {
 							if (prNode instanceof PRNode) {
 								allPrs.push(prNode.pullRequestModel);
 							}
 						}
 					}
 					else {
-						allPrs = catNode.prs;
+						allPrs = Array.from(catNode.prs.values());
 					}
 
 				}

src/test/view/prsTree.test.ts

@@ -141,6 +141,7 @@ describe('GitHub Pull Requests view', function () {
 				builder.pullRequest(pr => {
 					pr.repository(r =>
 						r.pullRequest(p => {
+							p.databaseId(1111);
 							p.number(1111);
 							p.title('zero');
 							p.author(a => a.login('me').avatarUrl('https://avatars.com/me.jpg').url('https://github.com/me'));
@@ -157,6 +158,7 @@ describe('GitHub Pull Requests view', function () {
 				builder.pullRequest(pr => {
 					pr.repository(r =>
 						r.pullRequest(p => {
+							p.databaseId(2222);
 							p.number(2222);
 							p.title('one');
 							p.author(a => a.login('you').avatarUrl('https://avatars.com/you.jpg'));

src/view/treeNodes/categoryNode.ts

@@ -117,7 +117,7 @@ interface PageInformation {
 
 export class CategoryTreeNode extends TreeNode implements vscode.TreeItem {
 	public collapsibleState: vscode.TreeItemCollapsibleState;
-	public prs: PullRequestModel[];
+	public prs: Map<number, PullRequestModel>;
 	public fetchNextPage: boolean = false;
 	public repositoryPageInformation: Map<string, PageInformation> = new Map<string, PageInformation>();
 	public contextValue: string;
@@ -134,7 +134,7 @@ export class CategoryTreeNode extends TreeNode implements vscode.TreeItem {
 	) {
 		super(parent);
 
-		this.prs = [];
+		this.prs = new Map();
 
 		switch (this.type) {
 			case PRType.All:
@@ -322,7 +322,8 @@ export class CategoryTreeNode extends TreeNode implements vscode.TreeItem {
 		this.fetchNextPage = false;
 		if (this.type === PRType.LocalPullRequest) {
 			try {
-				this.prs = (await this._prsTreeModel.getLocalPullRequests(this._folderRepoManager)).items;
+				this.prs.clear();
+				(await this._prsTreeModel.getLocalPullRequests(this._folderRepoManager)).items.forEach(item => this.prs.set(item.id, item));
 			} catch (e) {
 				vscode.window.showErrorMessage(vscode.l10n.t('Fetching local pull requests failed: {0}', formatError(e)));
 				needLogin = e instanceof AuthenticationError;
@@ -339,10 +340,9 @@ export class CategoryTreeNode extends TreeNode implements vscode.TreeItem {
 						break;
 				}
 				if (!fetchNextPage) {
-					this.prs = response.items;
-				} else {
-					this.prs = this.prs.concat(response.items);
+					this.prs.clear();
 				}
+				response.items.forEach(item => this.prs.set(item.id, item));
 				hasMorePages = response.hasMorePages;
 				hasUnsearchedRepositories = response.hasUnsearchedRepositories;
 			} catch (e) {
@@ -360,8 +360,8 @@ export class CategoryTreeNode extends TreeNode implements vscode.TreeItem {
 			}
 		}
 
-		if (this.prs && this.prs.length) {
-			const nodes: (PRNode | PRCategoryActionNode)[] = this.prs.map(
+		if (this.prs.size > 0) {
+			const nodes: (PRNode | PRCategoryActionNode)[] = Array.from(this.prs.values()).map(
 				prItem => new PRNode(this, this._folderRepoManager, prItem, this.type === PRType.LocalPullRequest, this._notificationProvider),
 			);
 			if (hasMorePages) {