From 6f7a10e381d5e3dcabe71029043782b0450c4d4a Mon Sep 17 00:00:00 2001 From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com> Date: Mon, 7 Jul 2025 12:01:27 +0530 Subject: [PATCH 1/3] fix:Minimalize requests to listRepositories with debounce --- src/lib/components/git/repositories.svelte | 65 ++++++++++++++-------- 1 file changed, 42 insertions(+), 23 deletions(-) diff --git a/src/lib/components/git/repositories.svelte b/src/lib/components/git/repositories.svelte index 39f260a99..f1697b378 100644 --- a/src/lib/components/git/repositories.svelte +++ b/src/lib/components/git/repositories.svelte @@ -23,7 +23,7 @@ import { page } from '$app/state'; import Card from '../card.svelte'; import SkeletonRepoList from './skeletonRepoList.svelte'; - import { onMount, untrack } from 'svelte'; + import { onMount, untrack, onDestroy } from 'svelte'; let { action = $bindable('select'), @@ -48,10 +48,46 @@ let isLoadingRepositories = $state(null); let installationsMap = $state(null); + // Debounce and race condition handling + let searchTimeout: ReturnType | null = null; + let currentRequestId = 0; + let lastResolvedRequestId = 0; + onMount(() => { loadInstallations(); }); + $effect(() => { + if (selectedInstallation && search !== undefined) { + if (searchTimeout) { + clearTimeout(searchTimeout); + } + searchTimeout = setTimeout(() => { + if (selectedInstallation) { + isLoadingRepositories = true; + const requestId = ++currentRequestId; + loadRepositories(selectedInstallation, search) + .then(() => { + if (requestId > lastResolvedRequestId) { + lastResolvedRequestId = requestId; + isLoadingRepositories = false; + } + }) + .catch(() => { + if (requestId > lastResolvedRequestId) { + lastResolvedRequestId = requestId; + isLoadingRepositories = false; + } + }); + } + }, 300); + } + }); + + onDestroy(() => { + if (searchTimeout) clearTimeout(searchTimeout); + }); + async function loadInstallations() { if (installationList) { if (installationList.installations.length) { @@ -71,7 +107,7 @@ .vcs.listInstallations(); if (installations.length) { if (!selectedInstallation) { - untrack(() => (selectedInstallation = installationList.installations[0].$id)); + untrack(() => (selectedInstallation = installations[0].$id)); } installation.set(installations.find((entry) => entry.$id === selectedInstallation)); } @@ -80,22 +116,6 @@ } async function loadRepositories(installationId: string, search: string) { - if ( - !$repositories || - $repositories.installationId !== installationId || - $repositories.search !== search - ) { - await fetchRepos(installationId, search); - } - - if ($repositories.repositories.length && action === 'select') { - selectedRepository = $repositories.repositories[0].id; - $repository = $repositories.repositories[0]; - } - return $repositories.repositories; - } - - async function fetchRepos(installationId: string, search: string) { if (product === 'functions') { $repositories.repositories = ( (await sdk @@ -117,9 +137,9 @@ )) as unknown as Models.ProviderRepositoryFrameworkList ).frameworkProviderRepositories; } - $repositories.search = search; $repositories.installationId = installationId; + return $repositories.repositories; } selectedRepository; @@ -168,10 +188,9 @@ installationsMap.find((entry) => entry.$id === selectedInstallation) ); - isLoadingRepositories = true; - loadRepositories(selectedInstallation, search).then(() => { - isLoadingRepositories = false; - }); + if (searchTimeout) { + clearTimeout(searchTimeout); + } }} bind:value={selectedInstallation} /> Date: Tue, 8 Jul 2025 14:25:07 +0530 Subject: [PATCH 2/3] added debounce compoent instead of creating fix --- src/lib/components/git/repositories.svelte | 47 ++++++++-------------- 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/src/lib/components/git/repositories.svelte b/src/lib/components/git/repositories.svelte index f1697b378..0bd4e2ac8 100644 --- a/src/lib/components/git/repositories.svelte +++ b/src/lib/components/git/repositories.svelte @@ -24,6 +24,7 @@ import Card from '../card.svelte'; import SkeletonRepoList from './skeletonRepoList.svelte'; import { onMount, untrack, onDestroy } from 'svelte'; + import { debounce } from '$lib/helpers/debounce'; let { action = $bindable('select'), @@ -48,44 +49,30 @@ let isLoadingRepositories = $state(null); let installationsMap = $state(null); - // Debounce and race condition handling - let searchTimeout: ReturnType | null = null; - let currentRequestId = 0; - let lastResolvedRequestId = 0; - onMount(() => { loadInstallations(); }); + const debouncedLoadRepositories = debounce( + async (installationId: string, searchTerm: string) => { + isLoadingRepositories = true; + try { + await loadRepositories(installationId, searchTerm); + } finally { + isLoadingRepositories = false; + } + }, + 300 + ); + $effect(() => { if (selectedInstallation && search !== undefined) { - if (searchTimeout) { - clearTimeout(searchTimeout); - } - searchTimeout = setTimeout(() => { - if (selectedInstallation) { - isLoadingRepositories = true; - const requestId = ++currentRequestId; - loadRepositories(selectedInstallation, search) - .then(() => { - if (requestId > lastResolvedRequestId) { - lastResolvedRequestId = requestId; - isLoadingRepositories = false; - } - }) - .catch(() => { - if (requestId > lastResolvedRequestId) { - lastResolvedRequestId = requestId; - isLoadingRepositories = false; - } - }); - } - }, 300); + debouncedLoadRepositories(selectedInstallation, search); } }); onDestroy(() => { - if (searchTimeout) clearTimeout(searchTimeout); + debouncedLoadRepositories.cancel?.(); }); async function loadInstallations() { @@ -188,9 +175,7 @@ installationsMap.find((entry) => entry.$id === selectedInstallation) ); - if (searchTimeout) { - clearTimeout(searchTimeout); - } + debouncedLoadRepositories.cancel?.(); }} bind:value={selectedInstallation} /> Date: Tue, 8 Jul 2025 18:48:32 +0530 Subject: [PATCH 3/3] Remove {#await} block that bypassed debouncing and clean up optional chaining --- src/lib/components/git/repositories.svelte | 222 ++++++++++----------- 1 file changed, 101 insertions(+), 121 deletions(-) diff --git a/src/lib/components/git/repositories.svelte b/src/lib/components/git/repositories.svelte index 0bd4e2ac8..1494d93c1 100644 --- a/src/lib/components/git/repositories.svelte +++ b/src/lib/components/git/repositories.svelte @@ -72,7 +72,7 @@ }); onDestroy(() => { - debouncedLoadRepositories.cancel?.(); + debouncedLoadRepositories.cancel(); }); async function loadInstallations() { @@ -175,7 +175,7 @@ installationsMap.find((entry) => entry.$id === selectedInstallation) ); - debouncedLoadRepositories.cancel?.(); + debouncedLoadRepositories.cancel(); }} bind:value={selectedInstallation} /> {#if isLoadingRepositories} - {:else} - {#await loadRepositories(selectedInstallation, search)} - - {:then response} - {#if response?.length} - - {#snippet children( - paginatedItems: Models.ProviderRepositoryRuntime[] & - Models.ProviderRepositoryFramework[] - )} - - {#each paginatedItems as repo} - - + {:else if $repositories?.repositories?.length} + + {#snippet children( + paginatedItems: Models.ProviderRepositoryRuntime[] & + Models.ProviderRepositoryFramework[] + )} + + {#each paginatedItems as repo} + + + + {#if action === 'select'} + repository.set(repo)} + value={repo.id} /> + {/if} + {#if product === 'sites'} + {#if repo?.framework && repo.framework !== 'other'} + + + + {:else} + + {/if} + {:else} + {@const iconName = repo?.runtime + ? repo.runtime.split('-')[0] + : undefined} + + + + {/if} + - {#if action === 'select'} - repository.set(repo)} - value={repo.id} /> + gap="s" + alignItems="center"> + + {repo.name} + + {#if repo.private} + {/if} - {#if product === 'sites'} - {#if repo?.framework && repo.framework !== 'other'} - - - - {:else} - - {/if} - {:else} - {@const iconName = repo?.runtime - ? repo.runtime.split('-')[0] - : undefined} - - - - {/if} - - - + - {repo.name} - - {#if repo.private} - - {/if} - {#if !$isSmallViewport} - - {/if} - - {#if action === 'button'} - connect(repo)}> - Connect - - {/if} - + color="--fgcolor-neutral-tertiary"> + {timeFromNow(repo.pushedAt)} + + + {/if} - - - {/each} - - {/snippet} - - {:else if search} - - - {#if search} - - {/if} - - - {:else} - - - - No repositories available - - - - {/if} - {/await} + {#if action === 'button'} + connect(repo)}> + Connect + + {/if} + + + + + {/each} + + {/snippet} + + {:else if search} + + + {#if search} + + {/if} + + + {:else} + + + + No repositories available + + + {/if} {/if}