fix: realtime for deployment, add empty state

This commit is contained in:
Arman committed 2025-03-31 17:50:15 +02:00
1 parent 7259811356
commit 55a3b07088
5 files changed
+74 -65

No files matched your search

@@ -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 @@
<LogsTimer status={deployment.status} {deployment} />
</Layout.Stack>
{/if}
{#key deployment.buildLogs}
<Logs
{fullHeight}
{height}
showScrollButton={!hideScrollButtons}
logs={deployment.buildLogs || setCopy()}
bind:theme={$app.themeInUse} />
{/key}
{#if ['waiting', 'processing'].includes(deployment.status)}
<Card.Base variant="secondary">
<Layout.Stack direction="row" justifyContent="center" gap="s">
<Spinner /> Waiting for build to start...
</Layout.Stack>
</Card.Base>
{:else}
{#key deployment.buildLogs}
<Logs
{fullHeight}
{height}
showScrollButton={!hideScrollButtons}
logs={deployment.buildLogs || setCopy()}
bind:theme={$app.themeInUse} />
{/key}
{/if}
</Layout.Stack>
@@ -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<Models.Deployment>) => {
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}`
);
}
}
}
});
);
});
</script>
@@ -50,7 +60,7 @@
</Card.Base>
<Fieldset legend="Deploy">
<Logs
bind:deployment={data.deployment}
bind:deployment
hideScrollButtons
height="calc(100dvh - 430px)"
emptyCopy="No logs available yet..." />
@@ -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,
@@ -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<Models.Deployment>('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<Models.Deployment>) => {
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;
</script>
<Container>
@@ -70,13 +68,13 @@
<Card padding="s">
<Accordion
title="Deployment logs"
badge={capitalize(data.deployment.status)}
badge={capitalize(deployment.status)}
open
badgeType={badgeTypeDeployment(data.deployment.status)}
hideDivider>
<Logs deployment={data.deployment} hideTitle hideScrollButtons fullHeight />
<Logs {deployment} hideTitle hideScrollButtons fullHeight />
<svelte:fragment slot="end">
<LogsTimer status={data.deployment.status} deployment={data.deployment} />
<LogsTimer status={deployment.status} {deployment} />
</svelte:fragment>
</Accordion>
</Card>
@@ -84,20 +82,20 @@
{#if showDelete}
<DeleteDeploymentModal
selectedDeployment={data.deployment}
selectedDeployment={deployment}
bind:showDelete
activeDeployment={data.site?.deploymentId} />
{/if}
<CancelDeploymentModal selectedDeployment={data.deployment} bind:showCancel />
<CancelDeploymentModal selectedDeployment={deployment} bind:showCancel />
<RedeployModal
selectedDeploymentId={data.deployment.$id}
selectedDeploymentId={deployment.$id}
bind:show={showRedeploy}
redirect
site={data.site} />
{#if showActivate}
<ActivateDeploymentModal
siteId={data.site.$id}
selectedDeploymentId={data.deployment.$id}
selectedDeploymentId={deployment.$id}
bind:show={showActivate} />
{/if}
@@ -1,6 +1,6 @@
<script lang="ts">
import { base } from '$app/paths';
import { page } from '$app/stores';
import { page } from '$app/state';
import { Breadcrumbs } from '$lib/layout';
import { organization } from '$lib/stores/organization';
import { project } from '../../../../store';
@@ -19,16 +19,16 @@
title: 'Sites'
},
{
href: `${base}/project-${$project?.$id}/sites/site-${$page.params.site}`,
title: $page.params.site
href: `${base}/project-${$project?.$id}/sites/site-${page.params.site}`,
title: page.params.site
},
{
href: `${base}/project-${$project?.$id}/sites/site-${$page.params.site}/deployments`,
href: `${base}/project-${$project?.$id}/sites/site-${page.params.site}/deployments`,
title: 'Deployments'
},
{
href: `${base}/project-${$project?.$id}/sites/site-${$page.params.site}/deployments/deployment-${$page.params.deployment}`,
title: $page.params.deployment
href: `${base}/project-${$project?.$id}/sites/site-${page.params.site}/deployments/deployment-${page.params.deployment}`,
title: page.params.deployment
}
];
</script>