From 30b962e2b84007643a51596e021b40f90d0b8385 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Sun, 14 Apr 2024 23:17:06 +0200
Subject: [PATCH] fix: improve unsaved confirmation modal on flow draft

---
 frontend/package.json                                      | 4 ++--
 .../confirmationModal/UnsavedConfirmationModal.svelte      | 7 +++++--
 frontend/src/routes/(root)/(logged)/flows/add/+page.svelte | 5 +----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 9ff587c926..4f2170c5bf 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -40,10 +40,8 @@
 		"eslint": "^8.47.0",
 		"eslint-config-prettier": "^8.6.0",
 		"eslint-plugin-svelte": "^2.33.1",
-		"ol": "^7.4.0",
 		"openapi-typescript-codegen": "^0.25.0",
 		"path-browserify": "^1.0.1",
-		"pdfjs-dist": "^3.8.162",
 		"postcss": "^8.4.24",
 		"postcss-load-config": "^4.0.1",
 		"prettier": "^2.8.8",
@@ -116,6 +114,8 @@
 		"highlight.js": "^11.8.0",
 		"lodash": "^4.17.21",
 		"lucide-svelte": "^0.293.0",
+		"ol": "^7.4.0",
+		"pdfjs-dist": "^3.8.162",
 		"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
 		"monaco-graphql": "^1.5.1",
 		"monaco-languageclient": "~7.0.1",
diff --git a/frontend/src/lib/components/common/confirmationModal/UnsavedConfirmationModal.svelte b/frontend/src/lib/components/common/confirmationModal/UnsavedConfirmationModal.svelte
index 56dd3e694b..8443eba47e 100644
--- a/frontend/src/lib/components/common/confirmationModal/UnsavedConfirmationModal.svelte
+++ b/frontend/src/lib/components/common/confirmationModal/UnsavedConfirmationModal.svelte
@@ -24,8 +24,11 @@
 			newNavigationState.cancel()
 			await tick() // make sure saved value is updated when clicking on save draft or deploy
 			if (savedValue && modifiedValue) {
-				const draftOrDeployed = cleanValueProperties(savedValue.draft || savedValue)
-				const current = cleanValueProperties(modifiedValue)
+				const draftOrDeployed = cleanValueProperties({
+					...((savedValue.draft || savedValue) ?? {}),
+					path: undefined
+				})
+				const current = cleanValueProperties({ ...(modifiedValue ?? {}), path: undefined })
 				if (orderedJsonStringify(draftOrDeployed) === orderedJsonStringify(current)) {
 					bypassBeforeNavigate = true
 					goto(goingTo)
diff --git a/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte
index 083e678513..6c4de625b2 100644
--- a/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte
@@ -153,8 +153,5 @@
 	{selectedId}
 	{loading}
 >
-	<UnsavedConfirmationModal
-		savedValue={{ ...savedFlow, path: undefined }}
-		modifiedValue={$flowStore}
-	/></FlowBuilder
+	<UnsavedConfirmationModal savedValue={savedFlow} modifiedValue={$flowStore} /></FlowBuilder
 >