diff --git a/package.json b/package.json index 6378c113d..227442430 100644 --- a/package.json +++ b/package.json @@ -23,9 +23,9 @@ "dependencies": { "@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@9c6551f", "@appwrite.io/pink-icons": "0.25.0", - "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@87d91a9", + "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@207628e", "@appwrite.io/pink-legacy": "^1.0.3", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@87d91a9", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@207628e", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", "@stripe/stripe-js": "^3.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a8dd14857..ea9cc1732 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,14 +15,14 @@ importers: specifier: 0.25.0 version: 0.25.0 '@appwrite.io/pink-icons-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@87d91a9 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@87d91a9(svelte@5.25.3) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@207628e + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@207628e(svelte@5.25.3) '@appwrite.io/pink-legacy': specifier: ^1.0.3 version: 1.0.3 '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@87d91a9 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@87d91a9(react-dom@18.3.1(react@18.3.1))(svelte@5.25.3) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@207628e + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@207628e(react-dom@18.3.1(react@18.3.1))(svelte@5.25.3) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -218,14 +218,14 @@ packages: resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@9c6551f} version: 1.2.1 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@87d91a9': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@87d91a9} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@207628e': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@207628e} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@87d91a9438584aab965d33db7f991b84cc4a2556': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@87d91a9438584aab965d33db7f991b84cc4a2556} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@207628e41f5ce1df4b7880030c2865452408d8ed': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@207628e41f5ce1df4b7880030c2865452408d8ed} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -239,8 +239,8 @@ packages: '@appwrite.io/pink-legacy@1.0.3': resolution: {integrity: sha512-GGde5fmPhs+s6/3aFeMPc/kKADG/gTFkYQSy6oBN8pK0y0XNCLrZZgBv+EBbdhwdtqVEWXa0X85Mv9w7jcIlwQ==} - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@87d91a9': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@87d91a9} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@207628e': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@207628e} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -3475,11 +3475,11 @@ snapshots: '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@9c6551f': {} - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@87d91a9(svelte@5.25.3)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@207628e(svelte@5.25.3)': dependencies: svelte: 5.25.3 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@87d91a9438584aab965d33db7f991b84cc4a2556(svelte@5.25.3)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@207628e41f5ce1df4b7880030c2865452408d8ed(svelte@5.25.3)': dependencies: svelte: 5.25.3 @@ -3492,9 +3492,9 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@87d91a9(react-dom@18.3.1(react@18.3.1))(svelte@5.25.3)': + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@207628e(react-dom@18.3.1(react@18.3.1))(svelte@5.25.3)': dependencies: - '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@87d91a9438584aab965d33db7f991b84cc4a2556(svelte@5.25.3) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@207628e41f5ce1df4b7880030c2865452408d8ed(svelte@5.25.3) '@floating-ui/dom': 1.6.13 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.5(svelte@5.25.3))(svelte@5.25.3) '@melt-ui/svelte': 0.86.5(svelte@5.25.3) 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 fb6de754f..d27486499 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/store.ts +++ b/src/routes/(console)/project-[project]/functions/function-[function]/store.ts @@ -59,12 +59,32 @@ export const columns = writable([ ], filter: false }, + { + id: 'totalSize', + title: 'Total size', + type: 'integer', + width: { min: 140, max: 160 }, + elements: [ + { + value: 2 * 1000 * 1000, + label: 'more than 2MB' + }, + { + value: 10 * 1000 * 1000, + label: 'more than 10MB' + }, + { + value: 50 * 1000 * 1000, + label: 'more than 50MB' + } + ] + }, { id: 'sourceSize', title: 'Source size', type: 'integer', + hide: true, width: { min: 140, max: 160 }, - elements: [ { value: 2 * 1000 * 1000, @@ -85,8 +105,21 @@ export const columns = writable([ title: 'Build size', type: 'integer', hide: true, - filter: false, - width: { min: 110, max: 130 } + width: { min: 110, max: 130 }, + elements: [ + { + value: 2 * 1000 * 1000, + label: 'more than 2MB' + }, + { + value: 10 * 1000 * 1000, + label: 'more than 10MB' + }, + { + value: 50 * 1000 * 1000, + label: 'more than 50MB' + } + ] }, { id: 'type', diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/table.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/table.svelte index 3dc21e6a1..47ea17373 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/table.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/table.svelte @@ -87,6 +87,8 @@ {:else} {formatTimeDetailed(deployment.buildDuration)} {/if} + {:else if column.id === 'totalSize'} + {calculateSize(deployment.totalSize)} {:else if column.id === 'sourceSize'} {calculateSize(deployment.sourceSize)} {:else if column.id === 'buildSize'} diff --git a/src/routes/(console)/project-[project]/sites/redeployModal.svelte b/src/routes/(console)/project-[project]/sites/redeployModal.svelte index 4a9438466..9f43a1e67 100644 --- a/src/routes/(console)/project-[project]/sites/redeployModal.svelte +++ b/src/routes/(console)/project-[project]/sites/redeployModal.svelte @@ -28,14 +28,14 @@ }); trackEvent(Submit.SiteRedeploy); + await invalidate(Dependencies.SITE); + await invalidate(Dependencies.DEPLOYMENTS); + show = false; if (redirect) { await goto( `${base}/project-${page.params.project}/sites/site-${site.$id}/deployments/deployment-${deployment.$id}` ); } - await invalidate(Dependencies.SITE); - await invalidate(Dependencies.DEPLOYMENTS); - show = false; } catch (e) { error = e.message; trackError(e, Submit.SiteRedeploy); 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 ce5d9ec59..dc50e9d1f 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 @@ -16,28 +16,29 @@ import { Accordion } from '@appwrite.io/pink-svelte'; import { capitalize } from '$lib/helpers/string'; import LogsTimer from '../../../(components)/logsTimer.svelte'; + import { invalidate } from '$app/navigation'; + import { Dependencies } from '$lib/constants'; + import { page } from '$app/state'; let { data } = $props(); - let deployment = $state(data.deployment); + let deployment = $derived(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; - } sdk.forConsole.client.subscribe( 'console', async (response: RealtimeResponseEvent) => { if ( response.events.includes( - `sites.${data.deployment.resourceId}.deployments.${data.deployment.$id}.update` + `sites.${page.params.site}.deployments.${page.params.deployment}.update` ) ) { - deployment = response.payload; + invalidate(Dependencies.DEPLOYMENTS); } } ); @@ -45,9 +46,9 @@ - + - {#if data.deployment?.status === 'ready' && data.proxyRuleList?.total} + {#if deployment?.status === 'ready' && data.proxyRuleList?.total} @@ -56,8 +57,8 @@