Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

const should be fine for all $deriveds 👍 .

Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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));
</script>

{#snippet titleSnippet(title: string)}
Expand Down Expand Up @@ -129,7 +133,9 @@
<Layout.Stack gap="xxs" inline>
{@render titleSnippet('Status')}
<Typography.Text variant="m-400" color="--fgcolor-neutral-primary">
<Status status={effectiveStatus} label={effectiveStatus} />
<Status
status={deploymentStatusConverter(displayStatus)}
label={displayStatus} />
</Typography.Text>
</Layout.Stack>
{:else}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -157,9 +158,9 @@
<Card.Base padding="s">
<Accordion
title="Deployment logs"
badge={capitalize(effectiveStatus)}
badge={capitalize(displayStatus)}
open
badgeType={badgeTypeDeployment(effectiveStatus)}
badgeType={badgeTypeDeployment(displayStatus)}
hideDivider>
<Layout.Stack gap="xl">
{#key data.deployment.buildLogs}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
deployment,
$regionalConsoleVariables
)}
{@const displayStatus = effectiveStatus === 'finalizing' ? 'ready' : effectiveStatus}
<Table.Row.Link
{root}
id={deployment.$id}
Expand All @@ -113,8 +114,8 @@
<Status status="complete" label="Active" />
{:else}
<Status
status={deploymentStatusConverter(effectiveStatus)}
label={capitalize(effectiveStatus)} />
status={deploymentStatusConverter(displayStatus)}
label={capitalize(displayStatus)} />
{/if}
{:else if column.id === 'type'}
<DeploymentSource {deployment} />
Expand Down