From 064654d92708ed0326907059da2e1cfa2e3b522b Mon Sep 17 00:00:00 2001
From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
Date: Fri, 19 Jan 2024 11:24:32 +0100
Subject: [PATCH 1/4] key the editor to reload it

---
 client/src/entry/analysis/modules/WorkflowEditor.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/client/src/entry/analysis/modules/WorkflowEditor.vue b/client/src/entry/analysis/modules/WorkflowEditor.vue
index 3ef6913db658..37f46db6f151 100644
--- a/client/src/entry/analysis/modules/WorkflowEditor.vue
+++ b/client/src/entry/analysis/modules/WorkflowEditor.vue
@@ -1,6 +1,7 @@
 <template>
     <Editor
         v-if="editorConfig"
+        :key="editorReloadKey"
         :workflow-id="editorConfig.id"
         :data-managers="editorConfig.dataManagers"
         :initial-version="editorConfig.initialVersion"
@@ -23,6 +24,7 @@ export default {
             storedWorkflowId: null,
             workflowId: null,
             editorConfig: null,
+            editorReloadKey: 0,
         };
     },
     watch: {
@@ -43,7 +45,13 @@ export default {
             } else if (storedWorkflowId) {
                 params.id = storedWorkflowId;
             }
+
+            const previousId = this.editorConfig?.id;
             this.editorConfig = await urlData({ url: "/workflow/editor", params });
+
+            if (previousId !== undefined && previousId !== this.editorConfig?.id) {
+                this.editorReloadKey += 1;
+            }
         },
     },
 };

From 8506769a3065bc4bf5ff441d6561819603048623 Mon Sep 17 00:00:00 2001
From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
Date: Fri, 19 Jan 2024 11:35:18 +0100
Subject: [PATCH 2/4] look for changes in both id and stored id for better
 reload control

---
 .../entry/analysis/modules/WorkflowEditor.vue | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/client/src/entry/analysis/modules/WorkflowEditor.vue b/client/src/entry/analysis/modules/WorkflowEditor.vue
index 37f46db6f151..9ed4b55b3b9c 100644
--- a/client/src/entry/analysis/modules/WorkflowEditor.vue
+++ b/client/src/entry/analysis/modules/WorkflowEditor.vue
@@ -37,19 +37,27 @@ export default {
     },
     methods: {
         async getEditorConfig() {
-            const storedWorkflowId = Query.get("id");
-            const workflowId = Query.get("workflow_id");
+            let reloadEditor = true;
+
+            // this will only be the case the first time the route updates from a new workflow
+            if (!this.storedWorkflowId && !this.workflowId) {
+                reloadEditor = false;
+            }
+
+            this.storedWorkflowId = Query.get("id");
+            this.workflowId = Query.get("workflow_id");
+
             const params = {};
-            if (workflowId) {
-                params.workflow_id = workflowId;
-            } else if (storedWorkflowId) {
-                params.id = storedWorkflowId;
+
+            if (this.workflowId) {
+                params.workflow_id = this.workflowId;
+            } else if (this.storedWorkflowId) {
+                params.id = this.storedWorkflowId;
             }
 
-            const previousId = this.editorConfig?.id;
             this.editorConfig = await urlData({ url: "/workflow/editor", params });
 
-            if (previousId !== undefined && previousId !== this.editorConfig?.id) {
+            if (reloadEditor) {
                 this.editorReloadKey += 1;
             }
         },

From 1fa3328a7eb132854874131ecd63aa0326fe7fc4 Mon Sep 17 00:00:00 2001
From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
Date: Fri, 19 Jan 2024 11:39:48 +0100
Subject: [PATCH 3/4] fix on navigate for new workflows

---
 client/src/components/Workflow/Editor/Index.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/client/src/components/Workflow/Editor/Index.vue b/client/src/components/Workflow/Editor/Index.vue
index 73494320a0fa..c02300e411de 100644
--- a/client/src/components/Workflow/Editor/Index.vue
+++ b/client/src/components/Workflow/Editor/Index.vue
@@ -688,11 +688,14 @@ export default {
             const runUrl = `/workflows/run?id=${this.id}`;
             this.onNavigate(runUrl);
         },
-        onNavigate(url) {
-            this.onSave(true).then(() => {
-                this.hasChanges = false;
-                this.$router.push(url);
-            });
+        async onNavigate(url) {
+            if (this.isNewTempWorkflow) {
+                await this.onCreate();
+            }
+
+            await this.onSave(true);
+            this.hasChanges = false;
+            this.$router.push(url);
         },
         onSave(hideProgress = false) {
             if (!this.nameValidate()) {

From 3dc6315b4107086973815b2794afff5bf3481c65 Mon Sep 17 00:00:00 2001
From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
Date: Fri, 19 Jan 2024 11:44:38 +0100
Subject: [PATCH 4/4] fix don't save new workflows twice

---
 client/src/components/Workflow/Editor/Index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/components/Workflow/Editor/Index.vue b/client/src/components/Workflow/Editor/Index.vue
index c02300e411de..122285db6b0a 100644
--- a/client/src/components/Workflow/Editor/Index.vue
+++ b/client/src/components/Workflow/Editor/Index.vue
@@ -691,9 +691,10 @@ export default {
         async onNavigate(url) {
             if (this.isNewTempWorkflow) {
                 await this.onCreate();
+            } else {
+                await this.onSave(true);
             }
 
-            await this.onSave(true);
             this.hasChanges = false;
             this.$router.push(url);
         },