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
6 changes: 3 additions & 3 deletions src/lib/components/deployments/version-table-row.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<script lang="ts">
import { invalidate } from '$app/navigation';

import CapabilityGuard from '$lib/components/capability-guard.svelte';
import Timestamp from '$lib/components/timestamp.svelte';
import Copyable from '$lib/holocene/copyable/index.svelte';
Expand Down Expand Up @@ -43,13 +41,15 @@
namespace: string;
deploymentName: string;
conflictToken?: string;
onVersionDeleted?: () => void;
}
let {
routingConfig,
version,
namespace,
deploymentName,
conflictToken,
onVersionDeleted,
}: Props = $props();

const currentDeploymentName = $derived(
Expand Down Expand Up @@ -191,7 +191,7 @@
);
if (deleteVersionError) return;
showDeleteVersionModal = false;
await invalidate('data:deployment');
onVersionDeleted?.();
}
</script>

Expand Down
19 changes: 0 additions & 19 deletions src/lib/pages/deployment-page.ts

This file was deleted.

21 changes: 15 additions & 6 deletions src/lib/pages/deployment.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,30 @@
deleteWorkerDeployment,
fetchDeployment,
} from '$lib/services/deployments-service';
import type { WorkerDeploymentResponse } from '$lib/types/deployments';
import { decodeURIForSvelte } from '$lib/utilities/encode-uri';
import { routeForWorkerDeployments } from '$lib/utilities/route-for';

interface Props {
deploymentPromise?: Promise<WorkerDeploymentResponse>;
showInstancesLink?: boolean;
}

let { deploymentPromise, showInstancesLink = true }: Props = $props();
let { showInstancesLink = true }: Props = $props();

const { namespace } = $derived(page.params);
const deploymentName = $derived(decodeURIForSvelte(page.params.deployment));
const effectiveDeploymentPromise = $derived(
deploymentPromise ?? fetchDeployment({ namespace, deploymentName }),
);

// fetchDeployment lives here rather than in +page.ts because it requires a
// server-relative base URL that isn't available at import time for package
// consumers.
let lastInvalidatedAt = $state(Date.now());
const effectiveDeploymentPromise = $derived.by(() => {
lastInvalidatedAt; // tracked so updating it re-fetches
return fetchDeployment({ namespace, deploymentName });
});

function reload() {
lastInvalidatedAt = Date.now();
}

let showDeleteModal = $state(false);
let deleteError = $state<string | undefined>();
Expand Down Expand Up @@ -91,6 +99,7 @@
{namespace}
{deploymentName}
conflictToken={deployment.conflictToken}
onVersionDeleted={reload}
/>
{/each}
</PaginatedTable>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@
<script lang="ts">
import { page } from '$app/state';

import type { PageData } from './$types';

import PageTitle from '$lib/components/page-title.svelte';
import { translate } from '$lib/i18n/translate';
import Deployment from '$lib/pages/deployment.svelte';

interface Props {
data: PageData;
}

let { data }: Props = $props();

const deployment = $derived(page.params.deployment);
</script>

<PageTitle
title="{translate('deployments.deployment')} | {deployment}"
url={page.url.href}
/>
<Deployment deploymentPromise={data.deploymentPromise} />
<Deployment />

This file was deleted.

Loading