mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-02-02 07:01:30 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup

Browse source
This commit is contained in:
Michael Kret 2024-09-18 10:39:01 +03:00
parent c126b3b829
commit 178c8f12e1
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
packages/editor-ui/src/composables/useRunWorkflow.ts
View file

@ -339,13 +339,13 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
if (!executionId) executionId = await waitForWebhook();
const shownForms: string[] = [];
let isFormShown = workflowsStore.allNodes.some((node) => node.type === FORM_TRIGGER_NODE_TYPE);
const resolveWaitingNodesData = async (): Promise<void> => {
return await new Promise<void>((resolve) => {
const interval = setInterval(async () => {
const execution = await workflowsStore.getExecution((executionId as string) || '');
localStorage.removeItem(FORM_RELOAD);
if (!execution || workflowsStore.workflowExecutionData === null) {
@ -356,21 +356,23 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
if (execution.finished || ['error', 'canceled', 'crashed'].includes(execution.status)) {
workflowsStore.setWorkflowExecutionData(execution);
nodeHelpers.updateNodesExecutionIssues();
uiStore.removeActiveAction('workflowRunning');
clearInterval(interval);
resolve();
return;
}
if (execution.data?.waitTill) {
if (execution.status === 'waiting' && execution.data?.waitTill) {
workflowsStore.setWorkflowExecutionRunData(execution.data);
} else {
console.log(execution);
}
if (execution.status === 'waiting') {
const { lastNodeExecuted } = execution.data?.resultData || {};
const waitingNode = workflowsStore.getNodeByName(lastNodeExecuted || '');
const waitingNode = execution.workflowData.nodes.find((node) => {
return node.name === lastNodeExecuted;
});
if (
waitingNode &&
waitingNode.type === WAIT_NODE_TYPE &&
@ -381,11 +383,8 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
if (isFormShown) {
localStorage.setItem(FORM_RELOAD, testUrl);
} else {
if (!shownForms.includes(waitingNode.name)) {
isFormShown = true;
openPopUpWindow(testUrl);
shownForms.push(waitingNode.name);
}
isFormShown = true;
openPopUpWindow(testUrl);
}
}
}