Skip to content

Commit 0c14222

Browse files
committed
fix: removed new modal added confirm modal directly inside
1 parent 979a5c0 commit 0c14222

File tree

2 files changed

+14
-34
lines changed

2 files changed

+14
-34
lines changed

src/routes/(console)/project-[region]-[project]/deleteVariableModal.svelte

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/routes/(console)/project-[region]-[project]/updateVariables.svelte

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import { page } from '$app/state';
3939
import UpdateVariablesModal from './updateVariablesModal.svelte';
4040
import SecretVariableModal from './secretVariableModal.svelte';
41-
import DeleteVariableModal from './deleteVariableModal.svelte';
41+
import Confirm from '$lib/components/confirm.svelte';
4242
4343
export let variableList: Models.VariableList;
4444
export let globalVariableList: Models.VariableList | undefined = undefined;
@@ -66,6 +66,7 @@
6666
let showUpdate = false;
6767
let showSecretModal = false;
6868
let showDeleteModal = false;
69+
let deleteError: string;
6970
let offset = 0;
7071
const limit = 10;
7172
@@ -136,9 +137,11 @@
136137
}
137138
}
138139
139-
async function handleVariableDeleted(variable: Models.Variable) {
140+
async function handleVariableDeleted() {
140141
try {
141-
await sdkDeleteVariable(variable.$id);
142+
await sdkDeleteVariable(selectedVar.$id);
143+
showDeleteModal = false;
144+
selectedVar = null;
142145
addNotification({
143146
type: 'success',
144147
message: `${$project.name} ${
@@ -147,10 +150,7 @@
147150
});
148151
trackEvent(Submit.VariableDelete);
149152
} catch (error) {
150-
addNotification({
151-
type: 'error',
152-
message: error.message
153-
});
153+
deleteError = error.message;
154154
trackError(error, Submit.VariableDelete);
155155
}
156156
}
@@ -485,8 +485,11 @@
485485
{/if}
486486

487487
{#if showDeleteModal}
488-
<DeleteVariableModal
489-
bind:show={showDeleteModal}
490-
{selectedVar}
491-
onDelete={handleVariableDeleted} />
488+
<Confirm
489+
title="Delete variable"
490+
bind:open={showDeleteModal}
491+
bind:error={deleteError}
492+
onSubmit={handleVariableDeleted}>
493+
<p>Are you sure you want to delete this variable? This action is irreversible.</p>
494+
</Confirm>
492495
{/if}

0 commit comments

Comments
 (0)