diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/deploymentCard.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/deploymentCard.svelte index bb2f3fda1e..2a983cedf3 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/deploymentCard.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/deploymentCard.svelte @@ -16,6 +16,7 @@ import { func } from '../store'; import { capitalize } from '$lib/helpers/string'; import { getEffectiveBuildStatus } from '$lib/helpers/buildTimeout'; + import { deploymentStatusConverter } from '$lib/stores/git'; import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; import { isCloud } from '$lib/system'; import { IconInfo } from '@appwrite.io/pink-icons-svelte'; @@ -38,8 +39,11 @@ footer?: Snippet; } = $props(); - let effectiveStatus = $derived(getEffectiveBuildStatus(deployment, $regionalConsoleVariables)); - let totalSize = $derived(humanFileSize(deployment?.totalSize ?? 0)); + const effectiveStatus = $derived( + getEffectiveBuildStatus(deployment, $regionalConsoleVariables) + ); + const displayStatus = $derived(effectiveStatus === 'finalizing' ? 'ready' : effectiveStatus); + const totalSize = $derived(humanFileSize(deployment?.totalSize ?? 0)); {#snippet titleSnippet(title: string)} @@ -129,7 +133,9 @@ {@render titleSnippet('Status')} - + {:else} diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte index 1405243545..c4151683da 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte @@ -40,9 +40,10 @@ let { data } = $props(); - let effectiveStatus = $derived( + const effectiveStatus = $derived( getEffectiveBuildStatus(data.deployment, $regionalConsoleVariables) ); + const displayStatus = $derived(effectiveStatus === 'finalizing' ? 'ready' : effectiveStatus); let showDelete = $state(false); let showCancel = $state(false); let showActivate = $state(false); @@ -157,9 +158,9 @@ {#key data.deployment.buildLogs} diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte index a70bf52d5c..4d891199c6 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte @@ -98,6 +98,7 @@ deployment, $regionalConsoleVariables )} + {@const displayStatus = effectiveStatus === 'finalizing' ? 'ready' : effectiveStatus} {:else} + status={deploymentStatusConverter(displayStatus)} + label={capitalize(displayStatus)} /> {/if} {:else if column.id === 'type'}