From 979a5c0509acbc0029ab7a43a32dc81618b956f9 Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Mon, 4 Aug 2025 12:09:27 +0530
Subject: [PATCH 1/3] fix:added a delete modal for env variables

---
 .../deleteVariableModal.svelte                | 23 +++++++++++++++++++
 .../updateVariables.svelte                    | 12 +++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 src/routes/(console)/project-[region]-[project]/deleteVariableModal.svelte

diff --git a/src/routes/(console)/project-[region]-[project]/deleteVariableModal.svelte b/src/routes/(console)/project-[region]-[project]/deleteVariableModal.svelte
new file mode 100644
index 000000000..6242ec8cd
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/deleteVariableModal.svelte
@@ -0,0 +1,23 @@
+<script lang="ts">
+    import Confirm from '$lib/components/confirm.svelte';
+    import type { Models } from '@appwrite.io/console';
+
+    export let show = false;
+    export let selectedVar: Models.Variable;
+    export let onDelete: (variable: Models.Variable) => Promise<void>;
+
+    let error: string;
+
+    async function handleDelete() {
+        try {
+            await onDelete(selectedVar);
+            show = false;
+        } catch (e) {
+            error = e.message;
+        }
+    }
+</script>
+
+<Confirm title="Delete variable" bind:open={show} bind:error onSubmit={handleDelete}>
+    <p>Are you sure you want to delete this variable? This action is irreversible.</p>
+</Confirm>
diff --git a/src/routes/(console)/project-[region]-[project]/updateVariables.svelte b/src/routes/(console)/project-[region]-[project]/updateVariables.svelte
index edbf38d87..13ceac8b1 100644
--- a/src/routes/(console)/project-[region]-[project]/updateVariables.svelte
+++ b/src/routes/(console)/project-[region]-[project]/updateVariables.svelte
@@ -38,6 +38,7 @@
     import { page } from '$app/state';
     import UpdateVariablesModal from './updateVariablesModal.svelte';
     import SecretVariableModal from './secretVariableModal.svelte';
+    import DeleteVariableModal from './deleteVariableModal.svelte';
 
     export let variableList: Models.VariableList;
     export let globalVariableList: Models.VariableList | undefined = undefined;
@@ -64,6 +65,7 @@
     let showEditorModal = false;
     let showUpdate = false;
     let showSecretModal = false;
+    let showDeleteModal = false;
     let offset = 0;
     const limit = 10;
 
@@ -402,7 +404,8 @@
                                                 status="danger"
                                                 trailingIcon={IconTrash}
                                                 on:click={async (e) => {
-                                                    handleVariableDeleted(variable);
+                                                    selectedVar = variable;
+                                                    showDeleteModal = true;
                                                     toggle(e);
                                                 }}>
                                                 Delete
@@ -480,3 +483,10 @@
         {variableList}
         bind:show={showVariablesUpload} />
 {/if}
+
+{#if showDeleteModal}
+    <DeleteVariableModal
+        bind:show={showDeleteModal}
+        {selectedVar}
+        onDelete={handleVariableDeleted} />
+{/if}

From 0c1422273de8f8ae216e811de987585634603024 Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Mon, 4 Aug 2025 12:35:03 +0530
Subject: [PATCH 2/3] fix: removed new modal added confirm modal directly
 inside

---
 .../deleteVariableModal.svelte                | 23 -----------------
 .../updateVariables.svelte                    | 25 +++++++++++--------
 2 files changed, 14 insertions(+), 34 deletions(-)
 delete mode 100644 src/routes/(console)/project-[region]-[project]/deleteVariableModal.svelte

diff --git a/src/routes/(console)/project-[region]-[project]/deleteVariableModal.svelte b/src/routes/(console)/project-[region]-[project]/deleteVariableModal.svelte
deleted file mode 100644
index 6242ec8cd..000000000
--- a/src/routes/(console)/project-[region]-[project]/deleteVariableModal.svelte
+++ /dev/null
@@ -1,23 +0,0 @@
-<script lang="ts">
-    import Confirm from '$lib/components/confirm.svelte';
-    import type { Models } from '@appwrite.io/console';
-
-    export let show = false;
-    export let selectedVar: Models.Variable;
-    export let onDelete: (variable: Models.Variable) => Promise<void>;
-
-    let error: string;
-
-    async function handleDelete() {
-        try {
-            await onDelete(selectedVar);
-            show = false;
-        } catch (e) {
-            error = e.message;
-        }
-    }
-</script>
-
-<Confirm title="Delete variable" bind:open={show} bind:error onSubmit={handleDelete}>
-    <p>Are you sure you want to delete this variable? This action is irreversible.</p>
-</Confirm>
diff --git a/src/routes/(console)/project-[region]-[project]/updateVariables.svelte b/src/routes/(console)/project-[region]-[project]/updateVariables.svelte
index 13ceac8b1..a49382088 100644
--- a/src/routes/(console)/project-[region]-[project]/updateVariables.svelte
+++ b/src/routes/(console)/project-[region]-[project]/updateVariables.svelte
@@ -38,7 +38,7 @@
     import { page } from '$app/state';
     import UpdateVariablesModal from './updateVariablesModal.svelte';
     import SecretVariableModal from './secretVariableModal.svelte';
-    import DeleteVariableModal from './deleteVariableModal.svelte';
+    import Confirm from '$lib/components/confirm.svelte';
 
     export let variableList: Models.VariableList;
     export let globalVariableList: Models.VariableList | undefined = undefined;
@@ -66,6 +66,7 @@
     let showUpdate = false;
     let showSecretModal = false;
     let showDeleteModal = false;
+    let deleteError: string;
     let offset = 0;
     const limit = 10;
 
@@ -136,9 +137,11 @@
         }
     }
 
-    async function handleVariableDeleted(variable: Models.Variable) {
+    async function handleVariableDeleted() {
         try {
-            await sdkDeleteVariable(variable.$id);
+            await sdkDeleteVariable(selectedVar.$id);
+            showDeleteModal = false;
+            selectedVar = null;
             addNotification({
                 type: 'success',
                 message: `${$project.name} ${
@@ -147,10 +150,7 @@
             });
             trackEvent(Submit.VariableDelete);
         } catch (error) {
-            addNotification({
-                type: 'error',
-                message: error.message
-            });
+            deleteError = error.message;
             trackError(error, Submit.VariableDelete);
         }
     }
@@ -485,8 +485,11 @@
 {/if}
 
 {#if showDeleteModal}
-    <DeleteVariableModal
-        bind:show={showDeleteModal}
-        {selectedVar}
-        onDelete={handleVariableDeleted} />
+    <Confirm
+        title="Delete variable"
+        bind:open={showDeleteModal}
+        bind:error={deleteError}
+        onSubmit={handleVariableDeleted}>
+        <p>Are you sure you want to delete this variable? This action is irreversible.</p>
+    </Confirm>
 {/if}

From 50d6285ec3cea801ffee7e26034217875d57a424 Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Mon, 4 Aug 2025 15:27:26 +0530
Subject: [PATCH 3/3] Update
 src/routes/(console)/project-[region]-[project]/updateVariables.svelte

Co-authored-by: Darshan <itznotabug@gmail.com>
---
 .../(console)/project-[region]-[project]/updateVariables.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/(console)/project-[region]-[project]/updateVariables.svelte b/src/routes/(console)/project-[region]-[project]/updateVariables.svelte
index a49382088..eaf2da3cb 100644
--- a/src/routes/(console)/project-[region]-[project]/updateVariables.svelte
+++ b/src/routes/(console)/project-[region]-[project]/updateVariables.svelte
@@ -38,7 +38,7 @@
     import { page } from '$app/state';
     import UpdateVariablesModal from './updateVariablesModal.svelte';
     import SecretVariableModal from './secretVariableModal.svelte';
-    import Confirm from '$lib/components/confirm.svelte';
+    import { Confirm } from '$lib/components';
 
     export let variableList: Models.VariableList;
     export let globalVariableList: Models.VariableList | undefined = undefined;