diff --git a/src/lib/components/git/repositoryCard.svelte b/src/lib/components/git/repositoryCard.svelte index cfcc28df9..0c64432c5 100644 --- a/src/lib/components/git/repositoryCard.svelte +++ b/src/lib/components/git/repositoryCard.svelte @@ -13,34 +13,50 @@ - - + + - + - {repository.name} + {repository.name} - + - Last updated: {toLocaleDateTime(repository.pushedAt)} + + Last updated: {toLocaleDateTime(repository.pushedAt)} + + + + • - - - {repository.organization} + href={`https://github.com/${repository.organization}`}> + {repository.organization} + + + diff --git a/src/routes/(console)/project-[region]-[project]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/+layout.svelte index 4f358189d..0f49a7a36 100644 --- a/src/routes/(console)/project-[region]-[project]/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/+layout.svelte @@ -1,5 +1,6 @@ @@ -138,10 +255,10 @@

- (tab = 'env')} active={tab === 'env'}> + changeTab('env')} active={tab === 'env'}> ENV - (tab = 'json')} active={tab === 'json'}> + changeTab('json')} active={tab === 'json'}> JSON @@ -151,23 +268,53 @@ {:else if tab === 'json'} {/if} + {#if totalEntries > EDITOR_PAGE_LIMIT} + +

+ Variables {pageOffset + 1}-{Math.min( + pageOffset + EDITOR_PAGE_LIMIT, + totalEntries + )} of {totalEntries} +

+ + + + +
+ {/if} - + - + +
diff --git a/src/routes/(console)/project-[region]-[project]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/+page.svelte index 2738caf61..bed3bb541 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/+page.svelte @@ -97,6 +97,9 @@ {sdkDeleteVariable} isGlobal variableList={data.variables} + backendPagination + variablesOffset={data.variablesOffset} + variablesLimit={data.limit} project={data.project} analyticsSource="project_settings" /> diff --git a/src/routes/(console)/project-[region]-[project]/settings/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/+page.ts index 33685ac28..321f06ada 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/settings/+page.ts @@ -8,10 +8,13 @@ export const load: PageLoad = async ({ depends, url, params }) => { depends(Dependencies.PROJECT_INSTALLATIONS); const limit = PAGE_LIMIT; const offset = Number(url.searchParams.get('offset') ?? 0); - + const variablesOffset = Number(url.searchParams.get('variablesOffset') ?? 0); + const projectSdk = sdk.forProject(params.region, params.project); const [variables, installations] = await Promise.all([ - sdk.forProject(params.region, params.project).projectApi.listVariables(), - sdk.forProject(params.region, params.project).vcs.listInstallations({ + projectSdk.projectApi.listVariables({ + queries: [Query.limit(limit), Query.offset(variablesOffset)] + }), + projectSdk.vcs.listInstallations({ queries: [Query.limit(limit), Query.offset(offset)] }) ]); @@ -19,6 +22,7 @@ export const load: PageLoad = async ({ depends, url, params }) => { return { limit, offset, + variablesOffset, variables, installations }; diff --git a/src/routes/(console)/project-[region]-[project]/updateVariables.svelte b/src/routes/(console)/project-[region]-[project]/updateVariables.svelte index a2052f86a..6ef2bc04c 100644 --- a/src/routes/(console)/project-[region]-[project]/updateVariables.svelte +++ b/src/routes/(console)/project-[region]-[project]/updateVariables.svelte @@ -1,9 +1,10 @@ @@ -305,7 +402,8 @@ - + + diff --git a/src/routes/(console)/project-[region]-[project]/variablesImportBox.svelte b/src/routes/(console)/project-[region]-[project]/variablesImportBox.svelte new file mode 100644 index 000000000..8314b7fa4 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/variablesImportBox.svelte @@ -0,0 +1,193 @@ + + +{#if currentItem} + +
+
+

+ + {currentItem.mode === 'delete' + ? 'Deleting variables' + : 'Importing variables'} + +

+ + +
+ +
+
+
    +
  • +
    +
    + {text(currentItem)} +
    +
    +
    + {#if currentItem.status === 'failed'} + + + + There was an issue + {currentItem.mode === 'delete' + ? ' deleting' + : ' importing'} + variables. + {#if currentItem.error} + (showDetails = true)}> + View details + + {/if} + + + {/if} +
    +
  • +
+ {#if $variablesOperation.length > 1} + + + {offset + 1} of {$variablesOperation.length} + + + + {/if} +
+
+
+
+{/if} + + + + + + + + diff --git a/src/routes/(console)/project-[region]-[project]/variablesOperation.ts b/src/routes/(console)/project-[region]-[project]/variablesOperation.ts new file mode 100644 index 000000000..2f45df2a5 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/variablesOperation.ts @@ -0,0 +1,40 @@ +import { writable } from 'svelte/store'; + +export type VariablesOperationItem = { + id: string; + count: number; + mode: 'import' | 'delete'; + status: 'uploading' | 'deleting' | 'completed' | 'failed'; + error?: string; +}; + +function createVariablesOperation() { + const { subscribe, update, set } = writable([]); + + return { + subscribe, + set: (item: VariablesOperationItem) => + update((items) => { + const index = items.findIndex((current) => current.id === item.id); + + if (index !== -1) { + const next = [...items]; + next[index] = item; + return next; + } + + return [item, ...items]; + }), + clear: (id?: string) => + update((items) => { + if (!id) { + return []; + } + + return items.filter((item) => item.id !== id); + }), + reset: () => set([]) + }; +} + +export const variablesOperation = createVariablesOperation();