adjust filtering and query key

Author: selfcontained

components/dashboard/src/data/git-providers/provider-repositories-query.ts

@@ -25,8 +25,15 @@ export const useProviderRepositoriesForUser = ({
     const { data: authProviders } = useAuthProviders();
     const selectedProvider = authProviders?.find((p) => p.host === providerHost);
 
+    const queryKey: any[] = ["provider-repositories", { userId: user?.id }, { providerHost, installationId }];
+
+    const isBitbucketServer = selectedProvider?.authProviderType === "BitbucketServer";
+    if (isBitbucketServer) {
+        queryKey.push({ search });
+    }
+
     return useQuery(
-        ["provider-repositories", { userId: user?.id }, { providerHost, installationId }],
+        queryKey,
         async ({ signal }) => {
             // jsonrpc cancellation token that we subscribe to the abort signal provided by react-query
             const cancelToken = new CancellationTokenSource();
@@ -41,7 +48,7 @@ export const useProviderRepositoriesForUser = ({
             };
 
             // TODO: Have this be the default for all providers
-            if (selectedProvider?.authProviderType === "BitbucketServer") {
+            if (isBitbucketServer) {
                 params.searchString = search;
                 params.limit = 50;
                 params.maxPages = 1;

components/dashboard/src/hooks/use-state-with-debounce.ts

@@ -7,7 +7,7 @@
 import { useEffect, useMemo, useState } from "react";
 import debounce from "lodash.debounce";
 
-export const useStateWithDebounce = <T>(initialValue: T, delay = 300): [T, (value: T) => void, T] => {
+export const useStateWithDebounce = <T>(initialValue: T, delay = 500): [T, (value: T) => void, T] => {
     const [value, setValue] = useState<T>(initialValue);
     const [debouncedValue, setDebouncedValue] = useState<T>(initialValue);
 

components/dashboard/src/projects/new-project/NewProjectRepoSelection.tsx

@@ -57,7 +57,7 @@ export const NewProjectRepoSelection: FC<Props> = ({ selectedProvider, onProject
     const noReposAvailable = !!(reposInAccounts?.length === 0 || areGitHubWebhooksUnauthorized);
     // TODO: check type instead of host?
     const isGitHub = selectedProvider?.host === "github.com";
-    const isBitbucketServer = selectedProvider?.authProviderType !== "BitbucketServer";
+    const isBitbucketServer = selectedProvider?.authProviderType === "BitbucketServer";
 
     const accounts = useMemo(() => {
         const accounts = new Map<string, { avatarUrl: string }>();
@@ -76,12 +76,15 @@ export const NewProjectRepoSelection: FC<Props> = ({ selectedProvider, onProject
     const filteredRepos = useMemo(() => {
         return areGitHubWebhooksUnauthorized
             ? []
+            : // filtering is done on server for Bitbucket Server
+            isBitbucketServer
+            ? Array.from(reposInAccounts || [])
             : Array.from(reposInAccounts || []).filter(
                   (r) =>
-                      r.account === selectedAccount &&
+                      (!selectedAccount || r.account === selectedAccount) &&
                       `${r.name}`.toLowerCase().includes(repoSearchFilter.toLowerCase().trim()),
               );
-    }, [areGitHubWebhooksUnauthorized, repoSearchFilter, reposInAccounts, selectedAccount]);
+    }, [areGitHubWebhooksUnauthorized, isBitbucketServer, repoSearchFilter, reposInAccounts, selectedAccount]);
 
     const reconfigure = useCallback(() => {
         openReconfigureWindow({