diff --git a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte index 1e2490be3..4e5652c90 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte @@ -25,15 +25,13 @@ TableRow, TableScroll } from '$lib/elements/table'; - import { execute, func, proxyRuleList } from './store'; + import { deploymentList, execute, func, proxyRuleList } from './store'; import { Container } from '$lib/layout'; import { app } from '$lib/stores/app'; import { calculateSize, humanFileSize } from '$lib/helpers/sizeConvertion'; import { Query, type Models } from '@appwrite.io/console'; - import type { PageData } from './$types'; import Delete from './delete.svelte'; import Create from './create.svelte'; - import { onMount } from 'svelte'; import { sdk } from '$lib/stores/sdk'; import Activate from './activate.svelte'; import { calculateTime } from '$lib/helpers/timeConversion'; @@ -43,7 +41,7 @@ import DeploymentCreatedBy from './deploymentCreatedBy.svelte'; import DeploymentDomains from './deploymentDomains.svelte'; - export let data: PageData; + export let data; let showDropdown = []; let showDelete = false; @@ -53,10 +51,6 @@ let selectedDeployment: Models.Deployment = null; let activeDeployment: Models.Deployment = null; - onMount(async () => { - activeDeployment = await getActiveDeployment(); - }); - async function getActiveDeployment() { const list = await sdk.forProject.functions.listDeployments($page.params.function, [ Query.equal('$id', $func?.deployment) @@ -67,6 +61,19 @@ function handleActivate() { invalidate(Dependencies.DEPLOYMENTS); } + + deploymentList.subscribe((list: Models.DeploymentList | null) => { + if (list?.deployments) { + let active = list.deployments.find((deployment) => deployment.$id === $func.deployment); + if (!active) { + getActiveDeployment().then((deployment) => { + activeDeployment = deployment; + }); + } else { + activeDeployment = active; + } + } + }); @@ -74,7 +81,7 @@ Deployments - {#if data.deployments.total} + {#if $deploymentList.total}
Active
@@ -131,10 +138,11 @@ danger={status === 'failed'} warning={status === 'building'} success={status === 'ready'}> - {activeDeployment.status === 'ready' + + {activeDeployment.status === 'ready' ? 'active' - : activeDeployment.status} + : activeDeployment.status} + @@ -186,12 +194,12 @@
All
- {#if data.deployments.total > 0} + {#if $deploymentList.total}
Deployment ID - Status + Status Source Updated Build Time @@ -199,7 +207,7 @@ - {#each data.deployments.deployments as deployment, index} + {#each $deploymentList.deployments as deployment, index (deployment.$id)} {@const status = deployment.status} @@ -336,7 +344,7 @@ name="Deployments" limit={data.limit} offset={data.offset} - total={data.deployments.total} /> + total={$deploymentList.total} /> {#if selectedDeployment} diff --git a/src/routes/console/project-[project]/functions/function-[function]/+page.ts b/src/routes/console/project-[project]/functions/function-[function]/+page.ts index 1da9b2ebc..d09a6161f 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/+page.ts +++ b/src/routes/console/project-[project]/functions/function-[function]/+page.ts @@ -14,7 +14,7 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) => return { offset, limit, - deployments: await sdk.forProject.functions.listDeployments(params.function, [ + deploymentList: await sdk.forProject.functions.listDeployments(params.function, [ Query.limit(limit), Query.offset(offset), Query.orderDesc('') diff --git a/src/routes/console/project-[project]/functions/function-[function]/activate.svelte b/src/routes/console/project-[project]/functions/function-[function]/activate.svelte index 69aefb446..4da5196f3 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/activate.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/activate.svelte @@ -35,7 +35,11 @@ }; - +

Are you sure you want to activate this deployment?

diff --git a/src/routes/console/project-[project]/functions/function-[function]/redeployModal.svelte b/src/routes/console/project-[project]/functions/function-[function]/redeployModal.svelte index 6d68e2ec3..6f04929c0 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/redeployModal.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/redeployModal.svelte @@ -25,8 +25,8 @@ }); trackEvent(Submit.FunctionRedeploy); - invalidate(Dependencies.DEPLOYMENTS); invalidate(Dependencies.FUNCTION); + invalidate(Dependencies.DEPLOYMENTS); show = false; } catch (error) { addNotification({ diff --git a/src/routes/console/project-[project]/functions/function-[function]/store.ts b/src/routes/console/project-[project]/functions/function-[function]/store.ts index 21af90eb4..c08ec380a 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/store.ts +++ b/src/routes/console/project-[project]/functions/function-[function]/store.ts @@ -3,6 +3,10 @@ import { derived, writable, type Writable } from 'svelte/store'; import type { Models } from '@appwrite.io/console'; export const func = derived(page, ($page) => $page.data.function as Models.Function); +export const deploymentList = derived( + page, + ($page) => $page.data.deploymentList as Models.DeploymentList +); export const proxyRuleList = derived( page, ($page) => $page.data.proxyRuleList as Models.ProxyRuleList