diff --git a/src/lib/components/expirationInput.svelte b/src/lib/components/expirationInput.svelte index f7caa38fb..554574913 100644 --- a/src/lib/components/expirationInput.svelte +++ b/src/lib/components/expirationInput.svelte @@ -1,3 +1,10 @@ + + {#if expirationSelect === 'custom'} - + {/if} diff --git a/src/lib/components/git/repositories.svelte b/src/lib/components/git/repositories.svelte index 112a5d350..c22057fff 100644 --- a/src/lib/components/git/repositories.svelte +++ b/src/lib/components/git/repositories.svelte @@ -22,6 +22,7 @@ import { connectGitHub } from '$lib/stores/git'; import { page } from '$app/state'; import Card from '../card.svelte'; + import SkeletonRepoList from './skeletonRepoList.svelte'; let { action = $bindable('select'), @@ -43,6 +44,7 @@ let search = $state(''); let selectedInstallation = null; + let isLoadingRepositories = $state(null); async function loadInstallations() { if (installationList) { @@ -153,6 +155,11 @@ installation.set( installations.find((entry) => entry.$id === selectedInstallation) ); + + isLoadingRepositories = true; + loadRepositories(selectedInstallation, search).then(() => { + isLoadingRepositories = false; + }); }} bind:value={selectedInstallation} /> {#if selectedInstallation} - {#await loadRepositories(selectedInstallation, search)} - - {#each Array(4) as _} - - - - - - - - - - - - - {/each} - - {:then response} - {#if response?.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'} - + + {#if isLoadingRepositories} + + {:else} + {#await loadRepositories(selectedInstallation, search)} + + {:then response} + {#if response?.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} + - {:else} - {/if} - {:else} - {@const iconName = repo?.runtime - ? repo.runtime.split('-')[0] - : undefined} - - - - {/if} - - - {repo.name} - - {#if repo.private} - - {/if} - - - {#if action === 'button'} - connect(repo)}> - Connect - + alignItems="center"> + + {repo.name} + + {#if repo.private} + + {/if} + - {/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} + {/await} + {/if} {/if} {:else} diff --git a/src/lib/components/git/skeletonRepoList.svelte b/src/lib/components/git/skeletonRepoList.svelte new file mode 100644 index 000000000..b052bb4a8 --- /dev/null +++ b/src/lib/components/git/skeletonRepoList.svelte @@ -0,0 +1,20 @@ + + + + {#each Array(4) as _} + + + + + + + + + + + + + {/each} + diff --git a/src/routes/(console)/project-[region]-[project]/overview/(components)/create.svelte b/src/routes/(console)/project-[region]-[project]/overview/(components)/create.svelte index 3bbe0afa3..0cfda2130 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/(components)/create.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/(components)/create.svelte @@ -75,7 +75,7 @@ required bind:value={name} /> - + diff --git a/src/routes/(console)/project-[region]-[project]/overview/(components)/updateExpirationDate.svelte b/src/routes/(console)/project-[region]-[project]/overview/(components)/updateExpirationDate.svelte index 044490282..0f66b3735 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/(components)/updateExpirationDate.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/(components)/updateExpirationDate.svelte @@ -19,6 +19,7 @@ const isApiKey = keyType === 'api'; const label = isApiKey ? 'API' : 'Dev'; + const expiryOptions = isApiKey ? 'default' : 'limited'; const dependency = isApiKey ? Dependencies.KEY : Dependencies.DEV_KEY; const event = isApiKey ? Submit.KeyUpdateExpire : Submit.DevKeyUpdateExpire; @@ -90,7 +91,7 @@ Update the expiration date to keep the key active {/if} - + diff --git a/src/routes/(console)/project-[region]-[project]/overview/dev-keys/action.svelte b/src/routes/(console)/project-[region]-[project]/overview/dev-keys/action.svelte index bb21e6bc2..7dbffd59f 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/dev-keys/action.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/dev-keys/action.svelte @@ -69,7 +69,7 @@ required bind:value={name} /> - + diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/manageFileToken.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/manageFileToken.svelte index c8c66ffd0..9f13c1f71 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/manageFileToken.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/manageFileToken.svelte @@ -30,6 +30,7 @@ expire = null; isDelete = false; fileToken = null; + isUpdatePermissions = false; } function handleFileToken() {