Simplify method signature

This commit is contained in:
Matej Bačo
2026-01-09 13:42:46 +01:00
parent df347f742d
commit bb6df5e074
12 changed files with 17 additions and 73 deletions
+5 -5
View File
@@ -22,13 +22,13 @@ function isBuildTimedOut(createdAt: string, status: string, timeoutSeconds: numb
* Gets the effective status for a build, considering timeout
*/
export function getEffectiveBuildStatus(
originalStatus: string,
createdAt: string,
screenshots: Array<
Models.Deployment['screenshotLight'] | Models.Deployment['screenshotDark'] | undefined
>,
deployment: Models.Deployment,
consoleVariables: Models.ConsoleVariables | undefined
): string {
const originalStatus = deployment.status;
const createdAt = deployment.$createdAt;
const screenshots = [deployment.screenshotLight, deployment.screenshotDark];
const timeoutSeconds = getBuildTimeoutSeconds(consoleVariables);
if (isBuildTimedOut(createdAt, originalStatus, timeoutSeconds)) {
return 'failed';
@@ -38,14 +38,7 @@
footer?: Snippet;
} = $props();
let effectiveStatus = $derived(
getEffectiveBuildStatus(
deployment.status,
deployment.$createdAt,
[deployment.screenshotLight, deployment.screenshotDark],
$regionalConsoleVariables
)
);
let effectiveStatus = $derived(getEffectiveBuildStatus(deployment, $regionalConsoleVariables));
let totalSize = $derived(humanFileSize(deployment?.totalSize ?? 0));
</script>
@@ -41,12 +41,7 @@
let { data } = $props();
let effectiveStatus = $derived(
getEffectiveBuildStatus(
data.deployment.status,
data.deployment.$createdAt,
[data.deployment.screenshotLight, data.deployment.screenshotDark],
$regionalConsoleVariables
)
getEffectiveBuildStatus(data.deployment, $regionalConsoleVariables)
);
let showDelete = $state(false);
let showCancel = $state(false);
@@ -95,9 +95,7 @@
{#snippet children(root)}
{#each data.deploymentList.deployments as deployment (deployment.$id)}
{@const effectiveStatus = getEffectiveBuildStatus(
deployment.status,
deployment.$createdAt,
[deployment.screenshotLight, deployment.screenshotDark],
deployment,
$regionalConsoleVariables
)}
<Table.Row.Link
@@ -54,9 +54,7 @@
<svelte:fragment slot="menu" let:toggle>
<ActionMenu.Root>
{@const effectiveStatus = getEffectiveBuildStatus(
deployment.status,
deployment.$createdAt,
[deployment.screenshotLight, deployment.screenshotDark],
deployment,
$regionalConsoleVariables
)}
{#if !inCard}
@@ -41,14 +41,7 @@
emptyCopy?: string;
} = $props();
let effectiveStatus = $derived(
getEffectiveBuildStatus(
deployment.status,
deployment.$createdAt,
[deployment.screenshotLight, deployment.screenshotDark],
$regionalConsoleVariables
)
);
let effectiveStatus = $derived(getEffectiveBuildStatus(deployment, $regionalConsoleVariables));
function setCopy() {
if (effectiveStatus === 'failed') {
@@ -7,16 +7,9 @@
import { Layout, Spinner, Typography } from '@appwrite.io/pink-svelte';
let { status, deployment }: { status: string; deployment: Models.Deployment } = $props();
let { deployment }: { status: string; deployment: Models.Deployment } = $props();
let effectiveStatus = $derived(
getEffectiveBuildStatus(
status,
deployment.$createdAt,
[deployment.screenshotLight, deployment.screenshotDark],
$regionalConsoleVariables
)
);
let effectiveStatus = $derived(getEffectiveBuildStatus(deployment, $regionalConsoleVariables));
</script>
<Layout.Stack direction="row" alignItems="center" inline>
@@ -42,14 +42,7 @@
footer?: Snippet;
} = $props();
let effectiveStatus = $derived(
getEffectiveBuildStatus(
deployment.status,
deployment.$createdAt,
[deployment.screenshotLight, deployment.screenshotDark],
$regionalConsoleVariables
)
);
let effectiveStatus = $derived(getEffectiveBuildStatus(deployment, $regionalConsoleVariables));
let show = $state(false);
const totalSize = $derived(humanFileSize(deployment?.totalSize ?? 0));
@@ -20,14 +20,7 @@
let deployment = $state(data.deployment);
let skipScreenshotInterval: ReturnType<typeof setInterval> | null = $state(null);
let effectiveStatus = $derived(
getEffectiveBuildStatus(
deployment.status,
deployment.$createdAt,
[deployment.screenshotLight, deployment.screenshotDark],
$regionalConsoleVariables
)
);
let effectiveStatus = $derived(getEffectiveBuildStatus(deployment, $regionalConsoleVariables));
onMount(() => {
const intervalCleanup = () => {
@@ -26,14 +26,7 @@
let { data }: PageProps = $props();
let deployment = $derived(data.deployment);
let effectiveStatus = $derived(
getEffectiveBuildStatus(
deployment.status,
deployment.$createdAt,
[deployment.screenshotLight, deployment.screenshotDark],
$regionalConsoleVariables
)
);
let effectiveStatus = $derived(getEffectiveBuildStatus(deployment, $regionalConsoleVariables));
let showRedeploy = $state(false);
let showActivate = $state(false);
@@ -82,9 +82,7 @@
{#snippet children(root)}
{#each data.deploymentList.deployments as deployment (deployment.$id)}
{@const effectiveStatus = getEffectiveBuildStatus(
deployment.status,
deployment.$createdAt,
[deployment.screenshotLight, deployment.screenshotDark],
deployment,
$regionalConsoleVariables
)}
<Table.Row.Link
@@ -73,11 +73,8 @@
<Id value={deployment.$id}>{deployment.$id}</Id>
</Table.Cell>
<Table.Cell {root}>
{@const status = deployment.status}
{@const effectiveStatus = getEffectiveBuildStatus(
status,
deployment.$createdAt,
[deployment.screenshotLight, deployment.screenshotDark],
deployment,
$regionalConsoleVariables
)}
{#if activeDeployment?.$id === deployment?.$id}