Skip to content

Commit bd33c04

Browse files
authored
Merge pull request #2818 from appwrite/fix-functions-finalizing-status
Fix deployments stuck in ‘Finalizing’ status for Functions
2 parents decd580 + 1812d27 commit bd33c04

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/deploymentCard.svelte

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import { func } from '../store';
1717
import { capitalize } from '$lib/helpers/string';
1818
import { getEffectiveBuildStatus } from '$lib/helpers/buildTimeout';
19+
import { deploymentStatusConverter } from '$lib/stores/git';
1920
import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store';
2021
import { isCloud } from '$lib/system';
2122
import { IconInfo } from '@appwrite.io/pink-icons-svelte';
@@ -38,8 +39,11 @@
3839
footer?: Snippet;
3940
} = $props();
4041
41-
let effectiveStatus = $derived(getEffectiveBuildStatus(deployment, $regionalConsoleVariables));
42-
let totalSize = $derived(humanFileSize(deployment?.totalSize ?? 0));
42+
const effectiveStatus = $derived(
43+
getEffectiveBuildStatus(deployment, $regionalConsoleVariables)
44+
);
45+
const displayStatus = $derived(effectiveStatus === 'finalizing' ? 'ready' : effectiveStatus);
46+
const totalSize = $derived(humanFileSize(deployment?.totalSize ?? 0));
4347
</script>
4448

4549
{#snippet titleSnippet(title: string)}
@@ -129,7 +133,9 @@
129133
<Layout.Stack gap="xxs" inline>
130134
{@render titleSnippet('Status')}
131135
<Typography.Text variant="m-400" color="--fgcolor-neutral-primary">
132-
<Status status={effectiveStatus} label={effectiveStatus} />
136+
<Status
137+
status={deploymentStatusConverter(displayStatus)}
138+
label={displayStatus} />
133139
</Typography.Text>
134140
</Layout.Stack>
135141
{:else}

src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@
4040
4141
let { data } = $props();
4242
43-
let effectiveStatus = $derived(
43+
const effectiveStatus = $derived(
4444
getEffectiveBuildStatus(data.deployment, $regionalConsoleVariables)
4545
);
46+
const displayStatus = $derived(effectiveStatus === 'finalizing' ? 'ready' : effectiveStatus);
4647
let showDelete = $state(false);
4748
let showCancel = $state(false);
4849
let showActivate = $state(false);
@@ -157,9 +158,9 @@
157158
<Card.Base padding="s">
158159
<Accordion
159160
title="Deployment logs"
160-
badge={capitalize(effectiveStatus)}
161+
badge={capitalize(displayStatus)}
161162
open
162-
badgeType={badgeTypeDeployment(effectiveStatus)}
163+
badgeType={badgeTypeDeployment(displayStatus)}
163164
hideDivider>
164165
<Layout.Stack gap="xl">
165166
{#key data.deployment.buildLogs}

src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
deployment,
9999
$regionalConsoleVariables
100100
)}
101+
{@const displayStatus = effectiveStatus === 'finalizing' ? 'ready' : effectiveStatus}
101102
<Table.Row.Link
102103
{root}
103104
id={deployment.$id}
@@ -113,8 +114,8 @@
113114
<Status status="complete" label="Active" />
114115
{:else}
115116
<Status
116-
status={deploymentStatusConverter(effectiveStatus)}
117-
label={capitalize(effectiveStatus)} />
117+
status={deploymentStatusConverter(displayStatus)}
118+
label={capitalize(displayStatus)} />
118119
{/if}
119120
{:else if column.id === 'type'}
120121
<DeploymentSource {deployment} />

0 commit comments

Comments
 (0)