From bee09613b59ff67d4ad0f4d7e262ce61889d1758 Mon Sep 17 00:00:00 2001
From: Diego Imbert <diego@windmill.dev>
Date: Tue, 12 May 2026 14:58:27 +0200
Subject: [PATCH] Revert "fix(frontend): don't UserDraft.remove flows while
 route is still mounted"

This reverts commit 079ebef72b3b8cad799e54fb88fc4f8fa1863d0d.
---
 frontend/src/routes/(root)/(logged)/flows/add/+page.svelte  | 2 ++
 .../(root)/(logged)/flows/edit/[...path]/+page.svelte       | 6 +-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte
index 8ab3393924..cca44fef67 100644
--- a/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte
@@ -174,9 +174,11 @@
 
 <FlowBuilder
 	onSaveInitial={(e) => {
+		UserDraft.remove('flow', '')
 		goto(`/flows/edit/${e.path}?selected=${e.id}`)
 	}}
 	onDeploy={(e) => {
+		UserDraft.remove('flow', '')
 		goto(`/flows/get/${e.path}?workspace=${$workspaceStore}`)
 	}}
 	onDetails={(e) => {
diff --git a/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte
index 788f957ed3..bcae4935e6 100644
--- a/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte
@@ -270,11 +270,7 @@
 {:else}
 	<FlowBuilder
 		onDeploy={(e) => {
-			// Don't UserDraft.remove here — the route's flowStore reads the
-			// handle's draft directly, so clearing it before goto would blank
-			// the flow value and trip UnsavedConfirmationModal. The entry's
-			// ref count drops on unmount and the next visit's load-time diff
-			// will silently overwrite localStorage with the deployed value.
+			UserDraft.remove('flow', flowDraftPath)
 			goto(`/flows/get/${e.path}?workspace=${$workspaceStore}`)
 		}}
 		onDetails={(e) => {