From 0ceaed9b49e3074f58d8a7412fb1bbee418fea4d Mon Sep 17 00:00:00 2001 From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com> Date: Fri, 31 Oct 2025 16:47:32 +0530 Subject: [PATCH] inline timeout lookup in getEffectiveBuildStatus and update call sites --- src/lib/helpers/buildTimeout.ts | 7 +++---- .../(components)/deploymentCard.svelte | 8 ++------ .../deployment-[deployment]/+page.svelte | 4 ++-- .../functions/function-[function]/table.svelte | 4 ++-- .../sites/(components)/deploymentActionMenu.svelte | 4 ++-- .../sites/(components)/logs.svelte | 8 ++------ .../sites/(components)/logsTimer.svelte | 6 ++---- .../sites/(components)/siteCard.svelte | 8 ++------ .../deployments/deployment-[deployment]/+page.svelte | 8 ++------ .../sites/site-[site]/deployments/table.svelte | 4 ++-- .../sites/site-[site]/deploymentsOverview.svelte | 4 ++-- 11 files changed, 23 insertions(+), 42 deletions(-) diff --git a/src/lib/helpers/buildTimeout.ts b/src/lib/helpers/buildTimeout.ts index e9b191556..8b9bd2b64 100644 --- a/src/lib/helpers/buildTimeout.ts +++ b/src/lib/helpers/buildTimeout.ts @@ -28,8 +28,9 @@ export function isBuildTimedOut( export function getEffectiveBuildStatus( originalStatus: string, createdAt: string, - timeoutSeconds: number + consoleVariables: Models.ConsoleVariables | undefined ): string { + const timeoutSeconds = getBuildTimeoutSeconds(consoleVariables); if (isBuildTimedOut(createdAt, originalStatus, timeoutSeconds)) { return 'failed'; } @@ -39,9 +40,7 @@ export function getEffectiveBuildStatus( /** * Helper to get timeout value from console variables */ -export function getBuildTimeoutSeconds( - consoleVariables: Models.ConsoleVariables | undefined -): number { +function getBuildTimeoutSeconds(consoleVariables: Models.ConsoleVariables | undefined): number { if (!consoleVariables?._APP_COMPUTE_BUILD_TIMEOUT) { return 0; } 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 d428f8c18..237610720 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,7 +15,7 @@ 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 { getEffectiveBuildStatus } 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'; @@ -39,11 +39,7 @@ } = $props(); let effectiveStatus = $derived( - getEffectiveBuildStatus( - deployment.status, - deployment.$createdAt, - getBuildTimeoutSeconds($regionalConsoleVariables) - ) + getEffectiveBuildStatus(deployment.status, deployment.$createdAt, $regionalConsoleVariables) ); let totalSize = $derived(humanFileSize(deployment?.totalSize ?? 0)); 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 8d215db1e..4c2729da3 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 @@ -24,7 +24,7 @@ } from '@appwrite.io/pink-svelte'; import { capitalize } from '$lib/helpers/string'; import { formatTimeDetailed } from '$lib/helpers/timeConversion'; - import { getEffectiveBuildStatus, getBuildTimeoutSeconds } from '$lib/helpers/buildTimeout'; + import { getEffectiveBuildStatus } from '$lib/helpers/buildTimeout'; import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; import { timer } from '$lib/actions/timer'; import { app } from '$lib/stores/app'; @@ -44,7 +44,7 @@ getEffectiveBuildStatus( data.deployment.status, data.deployment.$createdAt, - getBuildTimeoutSeconds($regionalConsoleVariables) + $regionalConsoleVariables ) ); let showDelete = $state(false); 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 7c1a3cb07..90912af03 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 @@ -36,7 +36,7 @@ import Delete from './(modals)/deleteModal.svelte'; import { capitalize } from '$lib/helpers/string'; import { deploymentStatusConverter } from '$lib/stores/git'; - import { getEffectiveBuildStatus, getBuildTimeoutSeconds } from '$lib/helpers/buildTimeout'; + import { getEffectiveBuildStatus } from '$lib/helpers/buildTimeout'; import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; import DownloadActionMenuItem from './(components)/downloadActionMenuItem.svelte'; import { Menu } from '$lib/components/menu'; @@ -107,7 +107,7 @@ {@const effectiveStatus = getEffectiveBuildStatus( deployment.status, deployment.$createdAt, - getBuildTimeoutSeconds($regionalConsoleVariables) + $regionalConsoleVariables )}