Skip to content

Commit 0ceaed9

Browse files
committed
inline timeout lookup in getEffectiveBuildStatus and update call sites
1 parent f0cae0b commit 0ceaed9

11 files changed

Lines changed: 23 additions & 42 deletions

File tree

src/lib/helpers/buildTimeout.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ export function isBuildTimedOut(
2828
export function getEffectiveBuildStatus(
2929
originalStatus: string,
3030
createdAt: string,
31-
timeoutSeconds: number
31+
consoleVariables: Models.ConsoleVariables | undefined
3232
): string {
33+
const timeoutSeconds = getBuildTimeoutSeconds(consoleVariables);
3334
if (isBuildTimedOut(createdAt, originalStatus, timeoutSeconds)) {
3435
return 'failed';
3536
}
@@ -39,9 +40,7 @@ export function getEffectiveBuildStatus(
3940
/**
4041
* Helper to get timeout value from console variables
4142
*/
42-
export function getBuildTimeoutSeconds(
43-
consoleVariables: Models.ConsoleVariables | undefined
44-
): number {
43+
function getBuildTimeoutSeconds(consoleVariables: Models.ConsoleVariables | undefined): number {
4544
if (!consoleVariables?._APP_COMPUTE_BUILD_TIMEOUT) {
4645
return 0;
4746
}

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import { DeploymentSource, DeploymentCreatedBy, DeploymentDomains } from '$lib/components/git';
1616
import { func } from '../store';
1717
import { capitalize } from '$lib/helpers/string';
18-
import { getEffectiveBuildStatus, getBuildTimeoutSeconds } from '$lib/helpers/buildTimeout';
18+
import { getEffectiveBuildStatus } from '$lib/helpers/buildTimeout';
1919
import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store';
2020
import { isCloud } from '$lib/system';
2121
import { IconInfo } from '@appwrite.io/pink-icons-svelte';
@@ -39,11 +39,7 @@
3939
} = $props();
4040
4141
let effectiveStatus = $derived(
42-
getEffectiveBuildStatus(
43-
deployment.status,
44-
deployment.$createdAt,
45-
getBuildTimeoutSeconds($regionalConsoleVariables)
46-
)
42+
getEffectiveBuildStatus(deployment.status, deployment.$createdAt, $regionalConsoleVariables)
4743
);
4844
let totalSize = $derived(humanFileSize(deployment?.totalSize ?? 0));
4945
</script>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
} from '@appwrite.io/pink-svelte';
2525
import { capitalize } from '$lib/helpers/string';
2626
import { formatTimeDetailed } from '$lib/helpers/timeConversion';
27-
import { getEffectiveBuildStatus, getBuildTimeoutSeconds } from '$lib/helpers/buildTimeout';
27+
import { getEffectiveBuildStatus } from '$lib/helpers/buildTimeout';
2828
import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store';
2929
import { timer } from '$lib/actions/timer';
3030
import { app } from '$lib/stores/app';
@@ -44,7 +44,7 @@
4444
getEffectiveBuildStatus(
4545
data.deployment.status,
4646
data.deployment.$createdAt,
47-
getBuildTimeoutSeconds($regionalConsoleVariables)
47+
$regionalConsoleVariables
4848
)
4949
);
5050
let showDelete = $state(false);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import Delete from './(modals)/deleteModal.svelte';
3737
import { capitalize } from '$lib/helpers/string';
3838
import { deploymentStatusConverter } from '$lib/stores/git';
39-
import { getEffectiveBuildStatus, getBuildTimeoutSeconds } from '$lib/helpers/buildTimeout';
39+
import { getEffectiveBuildStatus } from '$lib/helpers/buildTimeout';
4040
import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store';
4141
import DownloadActionMenuItem from './(components)/downloadActionMenuItem.svelte';
4242
import { Menu } from '$lib/components/menu';
@@ -107,7 +107,7 @@
107107
{@const effectiveStatus = getEffectiveBuildStatus(
108108
deployment.status,
109109
deployment.$createdAt,
110-
getBuildTimeoutSeconds($regionalConsoleVariables)
110+
$regionalConsoleVariables
111111
)}
112112
<Table.Row.Link
113113
{root}

src/routes/(console)/project-[region]-[project]/sites/(components)/deploymentActionMenu.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
IconXCircle
1616
} from '@appwrite.io/pink-icons-svelte';
1717
import { ActionMenu, Icon, Tooltip } from '@appwrite.io/pink-svelte';
18-
import { getEffectiveBuildStatus, getBuildTimeoutSeconds } from '$lib/helpers/buildTimeout';
18+
import { getEffectiveBuildStatus } from '$lib/helpers/buildTimeout';
1919
import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store';
2020
2121
export let selectedDeployment: Models.Deployment;
@@ -56,7 +56,7 @@
5656
{@const effectiveStatus = getEffectiveBuildStatus(
5757
deployment.status,
5858
deployment.$createdAt,
59-
getBuildTimeoutSeconds($regionalConsoleVariables)
59+
$regionalConsoleVariables
6060
)}
6161
{#if !inCard}
6262
<Tooltip disabled={selectedDeployment?.sourceSize !== 0} placement={'bottom'}>

src/routes/(console)/project-[region]-[project]/sites/(components)/logs.svelte

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<script lang="ts">
1919
import { capitalize } from '$lib/helpers/string';
2020
import { app } from '$lib/stores/app';
21-
import { getEffectiveBuildStatus, getBuildTimeoutSeconds } from '$lib/helpers/buildTimeout';
21+
import { getEffectiveBuildStatus } from '$lib/helpers/buildTimeout';
2222
import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store';
2323
import type { Models } from '@appwrite.io/console';
2424
import { Badge, Card, Layout, Logs, Spinner, Typography } from '@appwrite.io/pink-svelte';
@@ -41,11 +41,7 @@
4141
} = $props();
4242
4343
let effectiveStatus = $derived(
44-
getEffectiveBuildStatus(
45-
deployment.status,
46-
deployment.$createdAt,
47-
getBuildTimeoutSeconds($regionalConsoleVariables)
48-
)
44+
getEffectiveBuildStatus(deployment.status, deployment.$createdAt, $regionalConsoleVariables)
4945
);
5046
5147
function setCopy() {

src/routes/(console)/project-[region]-[project]/sites/(components)/logsTimer.svelte

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
<script lang="ts">
22
import { timer } from '$lib/actions/timer';
33
import { formatTimeDetailed } from '$lib/helpers/timeConversion';
4-
import { getEffectiveBuildStatus, getBuildTimeoutSeconds } from '$lib/helpers/buildTimeout';
4+
import { getEffectiveBuildStatus } from '$lib/helpers/buildTimeout';
55
import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store';
66
import type { Models } from '@appwrite.io/console';
77
88
import { Layout, Spinner, Typography } from '@appwrite.io/pink-svelte';
99
1010
let { status, deployment }: { status: string; deployment: Models.Deployment } = $props();
1111
12-
// memoize timeout value to avoid recalculating on every render
13-
let timeoutSeconds = $derived(getBuildTimeoutSeconds($regionalConsoleVariables));
1412
let effectiveStatus = $derived(
15-
getEffectiveBuildStatus(status, deployment.$createdAt, timeoutSeconds)
13+
getEffectiveBuildStatus(status, deployment.$createdAt, $regionalConsoleVariables)
1614
);
1715
</script>
1816

src/routes/(console)/project-[region]-[project]/sites/(components)/siteCard.svelte

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import { isCloud } from '$lib/system';
2424
import { sdk } from '$lib/stores/sdk';
2525
import { capitalize } from '$lib/helpers/string';
26-
import { getEffectiveBuildStatus, getBuildTimeoutSeconds } from '$lib/helpers/buildTimeout';
26+
import { getEffectiveBuildStatus } from '$lib/helpers/buildTimeout';
2727
import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store';
2828
import { regionalProtocol } from '$routes/(console)/project-[region]-[project]/store';
2929
import type { Snippet } from 'svelte';
@@ -43,11 +43,7 @@
4343
} = $props();
4444
4545
let effectiveStatus = $derived(
46-
getEffectiveBuildStatus(
47-
deployment.status,
48-
deployment.$createdAt,
49-
getBuildTimeoutSeconds($regionalConsoleVariables)
50-
)
46+
getEffectiveBuildStatus(deployment.status, deployment.$createdAt, $regionalConsoleVariables)
5147
);
5248
let show = $state(false);
5349

src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import ActivateDeploymentModal from '../../../activateDeploymentModal.svelte';
1414
import { Accordion, Tooltip } from '@appwrite.io/pink-svelte';
1515
import { capitalize } from '$lib/helpers/string';
16-
import { getEffectiveBuildStatus, getBuildTimeoutSeconds } from '$lib/helpers/buildTimeout';
16+
import { getEffectiveBuildStatus } from '$lib/helpers/buildTimeout';
1717
import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store';
1818
import LogsTimer from '../../../(components)/logsTimer.svelte';
1919
import { invalidate } from '$app/navigation';
@@ -27,11 +27,7 @@
2727
2828
let deployment = $derived(data.deployment);
2929
let effectiveStatus = $derived(
30-
getEffectiveBuildStatus(
31-
deployment.status,
32-
deployment.$createdAt,
33-
getBuildTimeoutSeconds($regionalConsoleVariables)
34-
)
30+
getEffectiveBuildStatus(deployment.status, deployment.$createdAt, $regionalConsoleVariables)
3531
);
3632
3733
let showRedeploy = $state(false);

src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/table.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import { capitalize } from '$lib/helpers/string';
1818
import DeploymentActionMenu from '../../(components)/deploymentActionMenu.svelte';
1919
import { deploymentStatusConverter } from '$lib/stores/git';
20-
import { getEffectiveBuildStatus, getBuildTimeoutSeconds } from '$lib/helpers/buildTimeout';
20+
import { getEffectiveBuildStatus } from '$lib/helpers/buildTimeout';
2121
import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store';
2222
import { sdk } from '$lib/stores/sdk';
2323
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
@@ -87,7 +87,7 @@
8787
{@const effectiveStatus = getEffectiveBuildStatus(
8888
deployment.status,
8989
deployment.$createdAt,
90-
getBuildTimeoutSeconds($regionalConsoleVariables)
90+
$regionalConsoleVariables
9191
)}
9292
<Table.Row.Link
9393
{root}

0 commit comments

Comments
 (0)