From 55a3b070880c57b7b9fefc58720905cd09cfbc2a Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 31 Mar 2025 17:50:15 +0200 Subject: [PATCH] fix: realtime for deployment, add empty state --- .../sites/(components)/logs.svelte | 27 ++++++--- .../sites/create-site/deploying/+page.svelte | 34 +++++++---- .../sites/create-site/deploying/+page.ts | 10 +--- .../deployment-[deployment]/+page.svelte | 56 +++++++++---------- .../breadcrumbs.svelte | 12 ++-- 5 files changed, 74 insertions(+), 65 deletions(-) diff --git a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte index 3a1fa1543..6cafa59c5 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte @@ -19,7 +19,7 @@ import { capitalize } from '$lib/helpers/string'; import { app } from '$lib/stores/app'; import type { Models } from '@appwrite.io/console'; - import { Badge, Layout, Logs, Typography } from '@appwrite.io/pink-svelte'; + import { Badge, Card, Layout, Logs, Spinner, Typography } from '@appwrite.io/pink-svelte'; import LogsTimer from './logsTimer.svelte'; export let deployment: Models.Deployment; @@ -61,12 +61,21 @@ {/if} - {#key deployment.buildLogs} - - {/key} + + {#if ['waiting', 'processing'].includes(deployment.status)} + + + Waiting for build to start... + + + {:else} + {#key deployment.buildLogs} + + {/key} + {/if} diff --git a/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte index 52b415294..fccfbba15 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte @@ -8,23 +8,33 @@ import Logs from '../../(components)/logs.svelte'; import { Copy, SvgIcon } from '$lib/components'; import { sdk } from '$lib/stores/sdk'; - import { invalidate } from '$app/navigation'; + import { goto, invalidate } from '$app/navigation'; import { onMount } from 'svelte'; - import { Dependencies } from '$lib/constants'; import { getFrameworkIcon } from '$lib/stores/sites'; + import type { Models, RealtimeResponseEvent } from '@appwrite.io/console'; - export let data; + let { data } = $props(); + + let deployment = $state(data.deployment); onMount(async () => { - sdk.forConsole.client.subscribe('console', async (response) => { - if ( - response.events.includes( - `sites.${data.deployment.resourceId}.deployments.${data.deployment.$id}.update` - ) - ) { - invalidate(Dependencies.DEPLOYMENT); + sdk.forConsole.client.subscribe( + 'console', + async (response: RealtimeResponseEvent) => { + if ( + response.events.includes( + `sites.${data.deployment.resourceId}.deployments.${data.deployment.$id}.update` + ) + ) { + deployment = response.payload; + if (response.payload.status === 'ready') { + goto( + `${base}/project-${$page.params.project}/sites/create-site/finish?site=${data.site.$id}` + ); + } + } } - }); + ); }); @@ -50,7 +60,7 @@
diff --git a/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.ts b/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.ts index 5f9911572..6b57c817a 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.ts +++ b/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.ts @@ -1,9 +1,8 @@ import { DeploymentResourceType, RuleTrigger, RuleType, sdk } from '$lib/stores/sdk'; -import { error, redirect } from '@sveltejs/kit'; +import { error } from '@sveltejs/kit'; import type { PageLoad } from './$types'; import { Query } from '@appwrite.io/console'; import { Dependencies } from '$lib/constants'; -import { base } from '$app/paths'; export const load: PageLoad = async ({ url, depends, params }) => { depends(Dependencies.DEPLOYMENT); @@ -24,13 +23,6 @@ export const load: PageLoad = async ({ url, depends, params }) => { ]) ]); - if (deployment?.status === 'ready' && site?.deploymentId === deploymentId) { - redirect( - 303, - `${base}/project-${params.project}/sites/create-site/finish?site=${site.$id}` - ); - } - return { site, deployment, diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte index 1ab947a79..ce5d9ec59 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte @@ -2,11 +2,7 @@ import { Container } from '$lib/layout'; import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; - import type { Models } from '@appwrite.io/console'; - import { page } from '$app/stores'; - import { invalidate } from '$app/navigation'; - import { Dependencies } from '$lib/constants'; - import { deployment } from './store'; + import type { Models, RealtimeResponseEvent } from '@appwrite.io/console'; import SiteCard from '../../../(components)/siteCard.svelte'; import Logs, { badgeTypeDeployment } from '../../../(components)/logs.svelte'; import Card from '$lib/components/card.svelte'; @@ -21,29 +17,31 @@ import { capitalize } from '$lib/helpers/string'; import LogsTimer from '../../../(components)/logsTimer.svelte'; - export let data; + let { data } = $props(); - onMount(() => { - if ($deployment.status === 'ready') { + let deployment = $state(data.deployment); + let showRedeploy = $state(false); + let showActivate = $state(false); + let showDelete = $state(false); + let showCancel = $state(false); + + onMount(async () => { + if (data.deployment.status === 'ready') { return; } - return sdk.forConsole.client.subscribe('console', (message) => { - if ( - message.events.includes( - `sites.${$page.params.site}.deployments.${$page.params.deployment}.update` - ) - ) { - if (message.payload.status === 'ready') { - invalidate(Dependencies.DEPLOYMENT); + sdk.forConsole.client.subscribe( + 'console', + async (response: RealtimeResponseEvent) => { + if ( + response.events.includes( + `sites.${data.deployment.resourceId}.deployments.${data.deployment.$id}.update` + ) + ) { + deployment = response.payload; } } - }); + ); }); - - let showRedeploy = false; - let showActivate = false; - let showDelete = false; - let showCancel = false; @@ -70,13 +68,13 @@ - + - + @@ -84,20 +82,20 @@ {#if showDelete} {/if} - + {#if showActivate} {/if} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/breadcrumbs.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/breadcrumbs.svelte index 2cde0b9a8..be4301090 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/breadcrumbs.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/breadcrumbs.svelte @@ -1,6 +1,6 @@