From 726cd8637896e690980159ed989c7430e5dd5c5c Mon Sep 17 00:00:00 2001
From: Michael Kret <michael.k@radency.com>
Date: Sat, 14 Sep 2024 08:58:45 +0300
Subject: [PATCH] fix, WIP

---
 packages/editor-ui/src/components/Node.vue    |  2 +-
 .../src/composables/useRunWorkflow.ts         | 36 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/src/components/Node.vue b/packages/editor-ui/src/components/Node.vue
index 83efe3b0a7..fe343acf46 100644
--- a/packages/editor-ui/src/components/Node.vue
+++ b/packages/editor-ui/src/components/Node.vue
@@ -320,7 +320,7 @@ const nodeTitle = computed(() => {
 const waiting = computed(() => {
 	const workflowExecution = workflowsStore.getWorkflowExecution as ExecutionSummary;
 
-	if (workflowExecution?.waitTill) {
+	if (workflowExecution?.waitTill && !workflowExecution?.finished) {
 		const lastNodeExecuted = get(workflowExecution, 'data.resultData.lastNodeExecuted');
 		if (props.name === lastNodeExecuted) {
 			const waitDate = new Date(workflowExecution.waitTill);
diff --git a/packages/editor-ui/src/composables/useRunWorkflow.ts b/packages/editor-ui/src/composables/useRunWorkflow.ts
index 2698d6015f..eb3afa3003 100644
--- a/packages/editor-ui/src/composables/useRunWorkflow.ts
+++ b/packages/editor-ui/src/composables/useRunWorkflow.ts
@@ -15,7 +15,7 @@ import type {
 	IRun,
 	INode,
 } from 'n8n-workflow';
-import { NodeConnectionType } from 'n8n-workflow';
+import { NodeConnectionType, sleep } from 'n8n-workflow';
 
 import { useToast } from '@/composables/useToast';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
@@ -295,6 +295,40 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 				shouldShowForm,
 			});
 
+			while (true) {
+				if (runWorkflowApiResponse.executionId) {
+					const execution = await workflowsStore.getExecution(runWorkflowApiResponse.executionId);
+					if (!execution) break;
+					console.log(execution.startedAt, execution.stoppedAt);
+
+					if (execution.finished) {
+						workflowsStore.setWorkflowExecutionData(execution);
+						nodeHelpers.updateNodesExecutionIssues();
+
+						return runWorkflowApiResponse;
+					} else {
+						await sleep(2000);
+
+						if (execution.data) {
+							workflowsStore.setWorkflowExecutionRunData(execution.data);
+						}
+
+						displayForm({
+							nodes: workflowData.nodes,
+							runData: workflowsStore.getWorkflowExecution?.data?.resultData?.runData,
+							destinationNode: options.destinationNode,
+							pinData,
+							directParentNodes,
+							formWaitingUrl: rootStore.formWaitingUrl,
+							executionId: runWorkflowApiResponse.executionId,
+							source: options.source,
+							getTestUrl,
+							shouldShowForm,
+						});
+					}
+				} else break;
+			}
+
 			await useExternalHooks().run('workflowRun.runWorkflow', {
 				nodeName: options.destinationNode,
 				source: options.source,