From 4ec02988785fb8ff7eabeb74ca549643a40f92e9 Mon Sep 17 00:00:00 2001 From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com> Date: Mon, 27 Oct 2025 18:38:30 +0530 Subject: [PATCH] added for overview page --- .../(components)/deploymentCard.svelte | 13 +++++++++++-- .../functions/function-[function]/table.svelte | 18 +++++++++++++++--- .../(components)/deploymentActionMenu.svelte | 6 +++++- .../sites/(components)/logsTimer.svelte | 6 +++++- .../sites/site-[site]/deployments/table.svelte | 12 ++++++++++-- .../site-[site]/deploymentsOverview.svelte | 11 +++++++++-- 6 files changed, 55 insertions(+), 11 deletions(-) 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 1add28d37..d428f8c18 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 @@ -15,6 +15,8 @@ import { DeploymentSource, DeploymentCreatedBy, DeploymentDomains } from '$lib/components/git'; import { func } from '../store'; import { capitalize } from '$lib/helpers/string'; + import { getEffectiveBuildStatus, getBuildTimeoutSeconds } from '$lib/helpers/buildTimeout'; + import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; import { isCloud } from '$lib/system'; import { IconInfo } from '@appwrite.io/pink-icons-svelte'; import Link from '$lib/elements/link.svelte'; @@ -36,6 +38,13 @@ footer?: Snippet; } = $props(); + let effectiveStatus = $derived( + getEffectiveBuildStatus( + deployment.status, + deployment.$createdAt, + getBuildTimeoutSeconds($regionalConsoleVariables) + ) + ); let totalSize = $derived(humanFileSize(deployment?.totalSize ?? 0)); @@ -122,11 +131,11 @@ - {#if deployment.status === 'failed'} + {#if effectiveStatus === 'failed'} {@render titleSnippet('Status')} - + {:else} 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 0894b8785..81d12e8f4 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 @@ -116,7 +116,11 @@ {/key} {:else if column.id === 'status'} {@const status = deployment.status} - {@const effectiveStatus = getEffectiveBuildStatus(status, deployment.$createdAt, getBuildTimeoutSeconds($regionalConsoleVariables))} + {@const effectiveStatus = getEffectiveBuildStatus( + status, + deployment.$createdAt, + getBuildTimeoutSeconds($regionalConsoleVariables) + )} {#if data?.activeDeployment?.$id === deployment?.$id} @@ -130,7 +134,11 @@ {:else if column.id === '$updatedAt'} {:else if column.id === 'buildDuration'} - {@const effectiveStatus = getEffectiveBuildStatus(deployment.status, deployment.$createdAt, getBuildTimeoutSeconds($regionalConsoleVariables))} + {@const effectiveStatus = getEffectiveBuildStatus( + deployment.status, + deployment.$createdAt, + getBuildTimeoutSeconds($regionalConsoleVariables) + )} {#if ['waiting'].includes(effectiveStatus)} - {:else if ['processing', 'building'].includes(effectiveStatus)} @@ -186,7 +194,11 @@ - {@const effectiveStatus = getEffectiveBuildStatus(deployment.status, deployment.$createdAt, getBuildTimeoutSeconds($regionalConsoleVariables))} + {@const effectiveStatus = getEffectiveBuildStatus( + deployment.status, + deployment.$createdAt, + getBuildTimeoutSeconds($regionalConsoleVariables) + )} {#if effectiveStatus === 'processing' || effectiveStatus === 'building' || effectiveStatus === 'waiting'} {/if} - {@const effectiveStatus = getEffectiveBuildStatus(deployment.status, deployment.$createdAt, getBuildTimeoutSeconds($regionalConsoleVariables))} + {@const effectiveStatus = getEffectiveBuildStatus( + deployment.status, + deployment.$createdAt, + getBuildTimeoutSeconds($regionalConsoleVariables) + )} {#if effectiveStatus === 'processing' || effectiveStatus === 'building' || effectiveStatus === 'waiting'} diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/table.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/table.svelte index 2ab8cdf25..7ffbd4255 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/table.svelte @@ -96,7 +96,11 @@ {/key} {:else if column.id === 'status'} {@const status = deployment.status} - {@const effectiveStatus = getEffectiveBuildStatus(status, deployment.$createdAt, getBuildTimeoutSeconds($regionalConsoleVariables))} + {@const effectiveStatus = getEffectiveBuildStatus( + status, + deployment.$createdAt, + getBuildTimeoutSeconds($regionalConsoleVariables) + )} {#if data?.activeDeployment?.$id === deployment?.$id} {:else} @@ -109,7 +113,11 @@ {:else if column.id === '$updatedAt'} {:else if column.id === 'buildDuration'} - {@const effectiveStatus = getEffectiveBuildStatus(deployment.status, deployment.$createdAt, getBuildTimeoutSeconds($regionalConsoleVariables))} + {@const effectiveStatus = getEffectiveBuildStatus( + deployment.status, + deployment.$createdAt, + getBuildTimeoutSeconds($regionalConsoleVariables) + )} {#if ['waiting'].includes(effectiveStatus)} - {:else if ['processing', 'building'].includes(effectiveStatus)} diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deploymentsOverview.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deploymentsOverview.svelte index aef59781f..9bcc014a4 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deploymentsOverview.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deploymentsOverview.svelte @@ -11,6 +11,8 @@ import ActivateDeploymentModal from '../activateDeploymentModal.svelte'; import CancelDeploymentModal from './deployments/cancelDeploymentModal.svelte'; import { capitalize } from '$lib/helpers/string'; + import { getEffectiveBuildStatus, getBuildTimeoutSeconds } from '$lib/helpers/buildTimeout'; + import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; import DeleteDeploymentModal from './deployments/deleteDeploymentModal.svelte'; import DeploymentActionMenu from '../(components)/deploymentActionMenu.svelte'; import { deploymentStatusConverter } from '$lib/stores/git'; @@ -72,12 +74,17 @@ {@const status = deployment.status} + {@const effectiveStatus = getEffectiveBuildStatus( + status, + deployment.$createdAt, + getBuildTimeoutSeconds($regionalConsoleVariables) + )} {#if activeDeployment?.$id === deployment?.$id} {:else} + status={deploymentStatusConverter(effectiveStatus)} + label={capitalize(effectiveStatus)} /> {/if}