From d87f9a320fb57b4bd2ebc74113f603b90aa4b5c1 Mon Sep 17 00:00:00 2001 From: Alex Grozav Date: Tue, 13 Aug 2024 16:44:24 +0300 Subject: [PATCH 1/3] fix: fix bug causing workflow debugging to not work in new canvas --- packages/editor-ui/src/views/NodeView.v2.vue | 22 ++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/packages/editor-ui/src/views/NodeView.v2.vue b/packages/editor-ui/src/views/NodeView.v2.vue index c25bca7e35bdf..a9b63c7f781ef 100644 --- a/packages/editor-ui/src/views/NodeView.v2.vue +++ b/packages/editor-ui/src/views/NodeView.v2.vue @@ -8,8 +8,9 @@ import { onMounted, ref, useCssModule, + watch, } from 'vue'; -import { useRoute, useRouter } from 'vue-router'; +import { type RouteLocation, useRoute, useRouter } from 'vue-router'; import WorkflowCanvas from '@/components/canvas/WorkflowCanvas.vue'; import { useNodeTypesStore } from '@/stores/nodeTypes.store'; import { useUIStore } from '@/stores/ui.store'; @@ -44,6 +45,7 @@ import { MANUAL_CHAT_TRIGGER_NODE_TYPE, MODAL_CONFIRM, NODE_CREATOR_OPEN_SOURCES, + PLACEHOLDER_EMPTY_WORKFLOW_ID, START_NODE_TYPE, STICKY_NODE_TYPE, VALID_WORKFLOW_IMPORT_URL_REGEX, @@ -288,6 +290,7 @@ async function initializeRoute() { nodeHelpers.updateNodesParameterIssues(); await loadCredentials(); + await initializeDebugMode(); } async function initializeWorkspaceForNewWorkflow() { @@ -306,7 +309,6 @@ async function initializeWorkspaceForExistingWorkflow(id: string) { const workflowData = await workflowsStore.fetchWorkflow(id); await openWorkflow(workflowData); - await initializeDebugMode(); if (workflowData.meta?.onboardingId) { trackOpenWorkflowFromOnboardingTemplate(); @@ -748,6 +750,7 @@ async function importWorkflowExact({ workflow: workflowData }: { workflow: IWork resetWorkspace(); + await initializeData(); await initializeWorkspace({ ...workflowData, nodes: NodeViewUtils.getFixedNodesList(workflowData.nodes), @@ -1370,6 +1373,21 @@ function registerCustomActions() { // }); } +/** + * Routing + */ + +watch( + () => route.name, + async () => { + if (!checkIfEditingIsAllowed()) { + return; + } + + await initializeRoute(); + }, +); + /** * Lifecycle */ From 3015ac828db36151b870720a240b74da8050fbae Mon Sep 17 00:00:00 2001 From: Alex Grozav Date: Tue, 13 Aug 2024 16:46:49 +0300 Subject: [PATCH 2/3] chore: remove unused type --- packages/editor-ui/src/views/NodeView.v2.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/editor-ui/src/views/NodeView.v2.vue b/packages/editor-ui/src/views/NodeView.v2.vue index a9b63c7f781ef..5fe0a4d712ed1 100644 --- a/packages/editor-ui/src/views/NodeView.v2.vue +++ b/packages/editor-ui/src/views/NodeView.v2.vue @@ -10,7 +10,7 @@ import { useCssModule, watch, } from 'vue'; -import { type RouteLocation, useRoute, useRouter } from 'vue-router'; +import { useRoute, useRouter } from 'vue-router'; import WorkflowCanvas from '@/components/canvas/WorkflowCanvas.vue'; import { useNodeTypesStore } from '@/stores/nodeTypes.store'; import { useUIStore } from '@/stores/ui.store'; From 4b4495299477d976e894c26cf73d751131f6d74e Mon Sep 17 00:00:00 2001 From: Alex Grozav Date: Tue, 13 Aug 2024 16:53:07 +0300 Subject: [PATCH 3/3] chore: remove unused constant --- packages/editor-ui/src/views/NodeView.v2.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/editor-ui/src/views/NodeView.v2.vue b/packages/editor-ui/src/views/NodeView.v2.vue index 5fe0a4d712ed1..465505cc438d3 100644 --- a/packages/editor-ui/src/views/NodeView.v2.vue +++ b/packages/editor-ui/src/views/NodeView.v2.vue @@ -45,7 +45,6 @@ import { MANUAL_CHAT_TRIGGER_NODE_TYPE, MODAL_CONFIRM, NODE_CREATOR_OPEN_SOURCES, - PLACEHOLDER_EMPTY_WORKFLOW_ID, START_NODE_TYPE, STICKY_NODE_TYPE, VALID_WORKFLOW_IMPORT_URL_REGEX,