fixing bug with multiple projects per repo in selector when searching

gitpod-io · Oct 4, 2023 · 696e1c2 · 696e1c2
1 parent 07597d5
commit 696e1c2
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/components/dashboard/src/data/git-providers/unified-repositories-search-query.ts b/components/dashboard/src/data/git-providers/unified-repositories-search-query.ts
@@ -15,12 +15,16 @@ export const useUnifiedRepositorySearch = ({ searchString }: { searchString: str
     const searchQuery = useSearchRepositories({ searchString });
 
     const filteredRepos = useMemo(() => {
-        const repoMap = new Map<string, SuggestedRepository>((suggestedQuery.data || []).map((r) => [r.url, r]));
+        const repoMap = new Map<string, SuggestedRepository>(
+            (suggestedQuery.data || []).map((r) => [`${r.url}:${r.projectId || ""}`, r]),
+        );
 
         // Merge the search results into the suggested results
         for (const repo of searchQuery.data || []) {
-            if (!repoMap.has(repo.url)) {
-                repoMap.set(repo.url, repo);
+            const key = `${repo.url}:${repo.projectId || ""}`;
+
+            if (!repoMap.has(key)) {
+                repoMap.set(key, repo);
             }
         }