From 7ab98b6cba285eebb72e193970376a6877835b2b Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 3 Jan 2025 12:40:30 +0530 Subject: [PATCH 1/5] add: confirm checkbox on deletion. --- .../settings/deleteModal.svelte | 28 ++++++++++++++----- .../site-[site]/settings/deleteModal.svelte | 28 ++++++++++++++----- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte index 589f01e394..a178284d16 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte @@ -2,15 +2,18 @@ import { goto } from '$app/navigation'; import { base } from '$app/paths'; import { page } from '$app/stores'; - import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; + import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { Modal } from '$lib/components'; - import { Button } from '$lib/elements/forms'; + import { Button, InputCheckbox } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; + import { FormList } from '$lib/elements/forms/index.js'; export let showDelete = false; const functionId = $page.params.function; + let confirmedDeletion = false; + const handleSubmit = async () => { try { await sdk.forProject.functions.delete(functionId); @@ -38,12 +41,23 @@ icon="exclamation" state="warning" headerDivider={false}> -

- Are you sure you want to delete this function and all associated deployments from your - project? -

+ +

+ Are you sure you want to delete this function and all associated deployments from your + project? +

+ +
+ +
+ - + diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte index 76dd3046be..021c067a1c 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte @@ -2,15 +2,18 @@ import { goto } from '$app/navigation'; import { base } from '$app/paths'; import { page } from '$app/stores'; - import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; + import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { Modal } from '$lib/components'; - import { Button } from '$lib/elements/forms'; + import { Button, InputCheckbox } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; + import { FormList } from '$lib/elements/forms/index.js'; export let showDelete = false; const siteId = $page.params.site; + let confirmedDeletion = false; + const handleSubmit = async () => { try { await sdk.forProject.sites.delete(siteId); @@ -37,12 +40,23 @@ onSubmit={handleSubmit} icon="exclamation" state="warning"> -

- Are you sure you want to delete this site and all associated deployments from your - project? -

+ +

+ Are you sure you want to delete this site and all associated deployments from your + project? +

+ +
+ +
+ - + From dda9b01e0be71b09b43e950034a9234e21175008 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 3 Jan 2025 12:47:43 +0530 Subject: [PATCH 2/5] update: copy. --- .../function-[function]/settings/deleteModal.svelte | 6 ++++-- .../sites/site-[site]/settings/dangerZone.svelte | 2 +- .../sites/site-[site]/settings/deleteModal.svelte | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte index a178284d16..622b8c896d 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte @@ -8,6 +8,7 @@ import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; import { FormList } from '$lib/elements/forms/index.js'; + import { func } from '$routes/(console)/project-[project]/functions/function-[function]/store'; export let showDelete = false; const functionId = $page.params.function; @@ -42,9 +43,10 @@ state="warning" headerDivider={false}> +

Are you sure you want to delete {$func.name}?

- Are you sure you want to delete this function and all associated deployments from your - project? + The function and all associated deployments will be permanently deleted. This action is + irreversible.

diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/dangerZone.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/dangerZone.svelte index 47ab695ae1..32daf0b8c0 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/dangerZone.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/dangerZone.svelte @@ -30,4 +30,4 @@ - + diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte index 021c067a1c..60ac0fcebd 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte @@ -9,6 +9,7 @@ import { sdk } from '$lib/stores/sdk'; import { FormList } from '$lib/elements/forms/index.js'; + export let siteName = ''; export let showDelete = false; const siteId = $page.params.site; @@ -41,9 +42,10 @@ icon="exclamation" state="warning"> +

Are you sure you want to delete {siteName}?

- Are you sure you want to delete this site and all associated deployments from your - project? + The site and all associated deployments will be permanently deleted. This action is + irreversible.

From fc70857e4c8ff1f0b5a819a8253e5930e5d18748 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 3 Jan 2025 12:47:54 +0530 Subject: [PATCH 3/5] ran: formatter. --- .../project-[project]/sites/(components)/logs.svelte | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte index 86d9a930ec..ca5c6bf94a 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte @@ -93,10 +93,7 @@ async function cancelDeployment() { try { - await sdk.forProject.sites.updateDeploymentBuild( - deployment.resourceId, - deployment.$id - ); + await sdk.forProject.sites.updateDeploymentBuild(deployment.resourceId, deployment.$id); await invalidate(Dependencies.DEPLOYMENTS); addNotification({ type: 'success', From 488527df85df882cc7ea3725f4b338cc58fe5663 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 3 Jan 2025 12:51:25 +0530 Subject: [PATCH 4/5] clean import. --- .../functions/function-[function]/settings/deleteModal.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte index 622b8c896d..859dbbcab8 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte @@ -8,7 +8,7 @@ import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; import { FormList } from '$lib/elements/forms/index.js'; - import { func } from '$routes/(console)/project-[project]/functions/function-[function]/store'; + import { func } from '../store'; export let showDelete = false; const functionId = $page.params.function; From 8f93ca82b2ca1aa2824c09baeddf967abd59a551 Mon Sep 17 00:00:00 2001 From: Darshan Date: Wed, 8 Jan 2025 10:27:12 +0530 Subject: [PATCH 5/5] fix: misc. --- .../settings/deleteModal.svelte | 14 ++++++-------- .../sites/site-[site]/settings/deleteModal.svelte | 14 ++++++-------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte index 859dbbcab8..2ec204ef21 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte @@ -49,14 +49,12 @@ irreversible.

-
- -
+ diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte index 60ac0fcebd..f9e369977b 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte @@ -48,14 +48,12 @@ irreversible.

-
- -
+