diff --git a/src/lib/components/git/repositories.svelte b/src/lib/components/git/repositories.svelte index 39f260a99..1494d93c1 100644 --- a/src/lib/components/git/repositories.svelte +++ b/src/lib/components/git/repositories.svelte @@ -23,7 +23,8 @@ 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'; + import { debounce } from '$lib/helpers/debounce'; let { action = $bindable('select'), @@ -52,6 +53,28 @@ 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) { + debouncedLoadRepositories(selectedInstallation, search); + } + }); + + onDestroy(() => { + debouncedLoadRepositories.cancel(); + }); + async function loadInstallations() { if (installationList) { if (installationList.installations.length) { @@ -71,7 +94,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 +103,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 +124,9 @@ )) as unknown as Models.ProviderRepositoryFrameworkList ).frameworkProviderRepositories; } - $repositories.search = search; $repositories.installationId = installationId; + return $repositories.repositories; } selectedRepository; @@ -168,10 +175,7 @@ installationsMap.find((entry) => entry.$id === selectedInstallation) ); - isLoadingRepositories = true; - loadRepositories(selectedInstallation, search).then(() => { - isLoadingRepositories = false; - }); + 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}