From 2adf2a7c52accac3d0bfec4f762a25ee79fe3b22 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 7 May 2025 10:57:49 +0200 Subject: [PATCH 1/7] fix: repo screens --- src/lib/components/git/repositories.svelte | 18 +++++++++++++++--- .../create-site/repositories/+page.svelte | 5 +++-- .../sites/site-[site]/deployments/+page.svelte | 2 +- .../deployments/cancelDeploymentModal.svelte | 2 +- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/lib/components/git/repositories.svelte b/src/lib/components/git/repositories.svelte index 28091632c..b22307664 100644 --- a/src/lib/components/git/repositories.svelte +++ b/src/lib/components/git/repositories.svelte @@ -1,5 +1,5 @@
- + {filter.title} diff --git a/src/lib/components/git/deploymentDomains.svelte b/src/lib/components/git/deploymentDomains.svelte index bb6ed3942..f588cc57c 100644 --- a/src/lib/components/git/deploymentDomains.svelte +++ b/src/lib/components/git/deploymentDomains.svelte @@ -42,12 +42,12 @@ {#if sortedDomains.length > 1} - + +{sortedDomains.length - 1} - + {#each sortedDomains as rule, i} {#if i !== 0} - + +

{@html variable.description}

@@ -134,7 +134,7 @@ bind:value={variable.value} /> - + diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte index 1416f679f..150851a95 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte @@ -15,6 +15,7 @@ Accordion, ActionMenu, Card, + Icon, Layout, Logs, Popover, @@ -25,13 +26,23 @@ import { formatTimeDetailed } from '$lib/helpers/timeConversion'; import { timer } from '$lib/actions/timer'; import { app } from '$lib/stores/app'; - import { getOutputDownload, getSourceDownload } from '../store'; + import { getOutputDownload, getSourceDownload, showCreateDeployment } from '../store'; + import { IconDotsHorizontal, IconRefresh, IconTerminal } from '@appwrite.io/pink-icons-svelte'; + import { Menu } from '$lib/components/menu'; + import { canWriteFunctions } from '$lib/stores/roles'; + import { Click, trackEvent } from '$lib/actions/analytics'; + import DownloadActionMenuItem from '../(components)/downloadActionMenuItem.svelte'; + import { base } from '$app/paths'; + import { isCloud } from '$lib/system'; + import { readOnly } from '$lib/stores/billing'; + import RedeployModal from '../(modals)/redeployModal.svelte'; export let data; let showDelete = false; let showCancel = false; let showActivate = false; + let showRedeploy = false; onMount(() => { const unsubscribe = sdk.forConsole.client.subscribe( @@ -73,7 +84,7 @@ {#snippet footer()} - + {#if data.deployment.status === 'processing' || data.deployment.status === 'building' || data.deployment.status === 'waiting'} {/if} - {#if !!data.deployment?.sourceSize || !!data.deployment?.sourceSize} - - - - - - Download source - - - - Download output - - - - + + + + + {#if $canWriteFunctions} + { + showRedeploy = true; + trackEvent(Click.FunctionsRedeployClick); + toggle(); + }}> + Redeploy + + {/if} + {#if !!data.deployment?.sourceSize || !!data.deployment?.sourceSize} + + {/if} + + + + {#if data.func.deploymentId === data.deployment.$id && data.deployment.status === 'ready'} + {/if} {#if data.func.deploymentId !== data.deployment.$id && data.deployment.status === 'ready'} @@ -165,3 +177,7 @@ selectedDeployment={data.deployment} bind:showActivate on:activated={() => invalidate(Dependencies.DEPLOYMENTS)} /> + +{#if showRedeploy} + +{/if} From bbd8c1c6bf0c542bd3cd1aad62eba9ecadcdb939 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 7 May 2025 11:43:15 +0200 Subject: [PATCH 4/7] chore: bump version --- package.json | 2 +- pnpm-lock.yaml | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index e9ac3b98c..fd155d1e6 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f", "@appwrite.io/pink-legacy": "^1.0.3", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@cbf05a1", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3e91920", "@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 b39b94c6f..7746ad117 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -27,8 +27,8 @@ importers: specifier: ^1.0.3 version: 1.0.3 '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@cbf05a1 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@cbf05a1(react-dom@18.3.1(react@18.3.1))(svelte@5.25.3) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3e91920 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3e91920(react-dom@18.3.1(react@18.3.1))(svelte@5.25.3) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -258,14 +258,14 @@ packages: resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@f76aff1} version: 1.2.1 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3e919207fc3d85d493e494e72205f7488858358f': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3e919207fc3d85d493e494e72205f7488858358f} 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@cbf05a106412315e451530f8384924da515b10c8': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@cbf05a106412315e451530f8384924da515b10c8} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -279,8 +279,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@cbf05a1': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@cbf05a1} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3e91920': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3e91920} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -3627,11 +3627,11 @@ snapshots: '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@f76aff1': {} - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f(svelte@5.25.3)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3e919207fc3d85d493e494e72205f7488858358f(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@cbf05a106412315e451530f8384924da515b10c8(svelte@5.25.3)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f(svelte@5.25.3)': dependencies: svelte: 5.25.3 @@ -3644,9 +3644,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@cbf05a1(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@3e91920(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@cbf05a106412315e451530f8384924da515b10c8(svelte@5.25.3) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3e919207fc3d85d493e494e72205f7488858358f(svelte@5.25.3) '@floating-ui/dom': 1.6.13 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.6(svelte@5.25.3))(svelte@5.25.3) '@melt-ui/svelte': 0.86.6(svelte@5.25.3) From 2b4df0bd5f314562f0c3383e7800451b7f25425c Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 7 May 2025 11:46:41 +0200 Subject: [PATCH 5/7] fix: template screen --- .../template-[template]/configuration.svelte | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/routes/(console)/project-[project]/functions/create-function/template-[template]/configuration.svelte b/src/routes/(console)/project-[project]/functions/create-function/template-[template]/configuration.svelte index eb3898442..2c8c0d5f3 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/template-[template]/configuration.svelte +++ b/src/routes/(console)/project-[project]/functions/create-function/template-[template]/configuration.svelte @@ -9,12 +9,20 @@ InputURL } from '$lib/elements/forms'; import type { Models } from '@appwrite.io/console'; - import { Fieldset, Layout, Popover, Icon, Accordion } from '@appwrite.io/pink-svelte'; + import { + Fieldset, + Layout, + Popover, + Icon, + Accordion, + ActionMenu + } from '@appwrite.io/pink-svelte'; import { IconInfo } from '@appwrite.io/pink-icons-svelte'; import type { Component } from 'svelte'; import { getApiEndpoint } from '$lib/stores/sdk'; import { page } from '$app/state'; import { project } from '$routes/(console)/project-[project]/store'; + import Root from '$lib/commandCenter/panels/root.svelte'; export let variables: Partial[] = []; export let templateVariables: Models.TemplateVariable[] = []; @@ -102,7 +110,9 @@ toggle(e); }}> -

{@html variable.description}

+ +

{@html variable.description}

+
@@ -144,7 +154,9 @@ }}> -

{@html variable.description}

+ +

{@html variable.description}

+
From 3c5b72f0e9c50e75c1b3da08de4043a0057c0242 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 7 May 2025 11:47:42 +0200 Subject: [PATCH 6/7] fix: template screen --- .../template-[template]/configuration.svelte | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/configuration.svelte b/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/configuration.svelte index 9687ff888..12e252dc7 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/configuration.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/configuration.svelte @@ -9,7 +9,14 @@ InputURL } from '$lib/elements/forms'; import type { Models } from '@appwrite.io/console'; - import { Fieldset, Layout, Popover, Icon, Accordion } from '@appwrite.io/pink-svelte'; + import { + Fieldset, + Layout, + Popover, + Icon, + Accordion, + ActionMenu + } from '@appwrite.io/pink-svelte'; import { IconInfo } from '@appwrite.io/pink-icons-svelte'; import { type Component } from 'svelte'; import { getApiEndpoint } from '$lib/stores/sdk'; @@ -101,7 +108,9 @@ toggle(e); }}> -

{variable.description}

+ +

{variable.description}

+
@@ -141,7 +150,9 @@ toggle(e); }}> -

{variable.description}

+ +

{variable.description}

+
From 5797a3889999480a87e7eef5bfe3b8871d414799 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 7 May 2025 11:47:57 +0200 Subject: [PATCH 7/7] fix: template screen --- .../templates/template-[template]/configuration.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/configuration.svelte b/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/configuration.svelte index 12e252dc7..1d50a71e3 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/configuration.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/configuration.svelte @@ -107,7 +107,7 @@ e.preventDefault(); toggle(e); }}> - +

{variable.description}

@@ -149,7 +149,7 @@ e.preventDefault(); toggle(e); }}> - +

{variable.description}