From 290daec0fa53f77f6ad02e746d82aa30997d8cb0 Mon Sep 17 00:00:00 2001
From: Guilhem <guilhemlemouel@gmail.com>
Date: Wed, 16 Jul 2025 18:44:06 +0200
Subject: [PATCH] fix(frontend): enable delete triggers on detail page (#6206)

* Allways show trigger update button

* allow delete deployed trigger
---
 .../triggers/DeleteTriggerButton.svelte       |  2 +-
 .../triggers/TriggerEditorToolbar.svelte      |  6 +--
 .../components/triggers/TriggersEditor.svelte | 52 +++++++++++++++++--
 3 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/frontend/src/lib/components/triggers/DeleteTriggerButton.svelte b/frontend/src/lib/components/triggers/DeleteTriggerButton.svelte
index d65c26a01d..b06392bb7e 100644
--- a/frontend/src/lib/components/triggers/DeleteTriggerButton.svelte
+++ b/frontend/src/lib/components/triggers/DeleteTriggerButton.svelte
@@ -18,7 +18,7 @@
 </script>
 
 <ConfirmationModal
-	title="Are you sure you want to delete this draft trigger ?"
+	title={`Are you sure you want to delete this ${trigger?.isDraft ? 'draft' : 'deployed'} trigger ?`}
 	confirmationText="Delete"
 	open={confirmationModalOpen}
 	on:canceled={() => {
diff --git a/frontend/src/lib/components/triggers/TriggerEditorToolbar.svelte b/frontend/src/lib/components/triggers/TriggerEditorToolbar.svelte
index b54c80e931..ac3032afc1 100644
--- a/frontend/src/lib/components/triggers/TriggerEditorToolbar.svelte
+++ b/frontend/src/lib/components/triggers/TriggerEditorToolbar.svelte
@@ -85,7 +85,7 @@
 				/>
 			</div>
 		{/if}
-		{#if trigger?.isDraft}
+		{#if trigger?.isDraft || permissions === 'create'}
 			<DeleteTriggerButton {onDelete} {trigger} />
 		{:else if !trigger?.isDraft && trigger?.draftConfig}
 			<Button
@@ -99,12 +99,12 @@
 				Reset changes
 			</Button>
 		{/if}
-		{#if canSave && trigger?.draftConfig}
+		{#if canSave}
 			<Tooltip placement="bottom-end" disablePopup={!saveDisabled && !cloudDisabled && isDeployed}>
 				<Button
 					size="xs"
 					startIcon={{ icon: Save }}
-					disabled={saveDisabled || cloudDisabled || !isDeployed}
+					disabled={saveDisabled || cloudDisabled || !isDeployed || !trigger?.draftConfig}
 					on:click={() => {
 						onUpdate?.()
 					}}
diff --git a/frontend/src/lib/components/triggers/TriggersEditor.svelte b/frontend/src/lib/components/triggers/TriggersEditor.svelte
index 5eeed48bec..e0b0109d7d 100644
--- a/frontend/src/lib/components/triggers/TriggersEditor.svelte
+++ b/frontend/src/lib/components/triggers/TriggersEditor.svelte
@@ -20,6 +20,17 @@
 		type Trigger
 	} from './utils'
 	import { isCloudHosted } from '$lib/cloud'
+	import {
+		ScheduleService,
+		WebsocketTriggerService,
+		PostgresTriggerService,
+		KafkaTriggerService,
+		NatsTriggerService,
+		MqttTriggerService,
+		HttpTriggerService,
+		GcpTriggerService,
+		SqsTriggerService
+	} from '$lib/gen'
 
 	interface Props {
 		noEditor: boolean
@@ -77,10 +88,45 @@
 		triggersState.selectedTriggerIndex = triggerIndex
 	}
 
-	function deleteDraftTrigger(triggerIndex: number | undefined) {
+	async function deleteDeployedTrigger(triggerIndex: number) {
+		const { type: triggerType, path: triggerPath } = triggersState.triggers[triggerIndex]
+		if (!triggerPath) {
+			return
+		}
+
+		const deleteHandlers = {
+			schedule: () => ScheduleService.deleteSchedule,
+			websocket: () => WebsocketTriggerService.deleteWebsocketTrigger,
+			postgres: () => PostgresTriggerService.deletePostgresTrigger,
+			kafka: () => KafkaTriggerService.deleteKafkaTrigger,
+			nats: () => NatsTriggerService.deleteNatsTrigger,
+			gcp: () => GcpTriggerService.deleteGcpTrigger,
+			sqs: () => SqsTriggerService.deleteSqsTrigger,
+			mqtt: () => MqttTriggerService.deleteMqttTrigger,
+			http: () => HttpTriggerService.deleteHttpTrigger
+		}
+
+		const deleteHandler = deleteHandlers[triggerType as keyof typeof deleteHandlers]
+		if (deleteHandler) {
+			await deleteHandler()({
+				workspace: $workspaceStore ?? '',
+				path: triggerPath ?? ''
+			})
+		}
+	}
+
+	async function deleteTrigger(triggerIndex: number | undefined) {
 		if (triggerIndex === undefined) {
 			return
 		}
+		// If the trigger is deployed, delete the trigger from the db
+		if (
+			!triggersState.triggers[triggerIndex].isDraft &&
+			triggersState.triggers[triggerIndex].path
+		) {
+			await deleteDeployedTrigger(triggerIndex)
+		}
+
 		triggersState.deleteTrigger(triggersCount, triggerIndex)
 		triggersState.selectedTriggerIndex = triggersState.triggers.length - 1
 	}
@@ -226,7 +272,7 @@
 								triggers={triggersState.triggers}
 								{isEditor}
 								onAddDraftTrigger={handleAddTrigger}
-								onDeleteDraft={deleteDraftTrigger}
+								onDeleteDraft={deleteTrigger}
 								onReset={handleResetDraft}
 								webhookToken={$triggersCount?.webhook_count}
 								emailToken={$triggersCount?.email_count}
@@ -286,7 +332,7 @@
 										{schema}
 										{isEditor}
 										onDelete={() => {
-											deleteDraftTrigger(triggersState.selectedTriggerIndex)
+											deleteTrigger(triggersState.selectedTriggerIndex)
 										}}
 										onUpdate={(path) => {
 											handleUpdate(triggersState.selectedTriggerIndex, path)