admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 10:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(editor): Ensure no running node when execution finished (#15299)

Browse Source
This commit is contained in:
Suguru Inoue
2025-05-12 10:39:51 +02:00
committed by GitHub
parent ab27f91944
commit d12c7ee87f
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cypress/e2e/24-ndv-paired-item.cy.ts
View File

@@ -290,6 +290,13 @@ describe('NDV', () => {
workflowPage.actions.openNode('Switch1'); workflowPage.actions.openNode('Switch1');
ndv.actions.execute(); ndv.actions.execute();
ndv.getters.parameterExpressionPreview('output').should('include.text', '1'); ndv.getters.parameterExpressionPreview('output').should('have.text', '1');
ndv.getters.inlineExpressionEditorInput().click();
ndv.getters.inlineExpressionEditorOutput().should('have.text', '1');
ndv.actions.expressionSelectNextItem();
ndv.getters.inlineExpressionEditorOutput().should('have.text', '3');
ndv.actions.expressionSelectNextItem();
ndv.getters.inlineExpressionEditorOutput().should('have.text', '1');
ndv.getters.inlineExpressionEditorItemNextButton().should('be.disabled');
}); });
}); });

11
packages/frontend/editor-ui/src/composables/usePushConnection/handlers/executionFinished.ts
View File

@@ -21,6 +21,7 @@ import type {
ExpressionError, ExpressionError,
IDataObject, IDataObject,
IRunExecutionData, IRunExecutionData,
IRunData,
} from 'n8n-workflow'; } from 'n8n-workflow';
import { codeNodeEditorEventBus, globalLinkActionsEventBus } from '@/event-bus'; import { codeNodeEditorEventBus, globalLinkActionsEventBus } from '@/event-bus';
import { h } from 'vue'; import { h } from 'vue';
@@ -466,6 +467,8 @@ export function setRunExecutionData(
runExecutionData.resultData.runData = workflowsStore.getWorkflowRunData; runExecutionData.resultData.runData = workflowsStore.getWorkflowRunData;
} }
removeRunningTaskData(runExecutionData.resultData.runData);
workflowsStore.executingNode.length = 0; workflowsStore.executingNode.length = 0;
workflowsStore.setWorkflowExecutionData({ workflowsStore.setWorkflowExecutionData({
@@ -505,3 +508,11 @@ export function setRunExecutionData(
const lineNumber = runExecutionData.resultData?.error?.lineNumber; const lineNumber = runExecutionData.resultData?.error?.lineNumber;
codeNodeEditorEventBus.emit('highlightLine', lineNumber ?? 'last'); codeNodeEditorEventBus.emit('highlightLine', lineNumber ?? 'last');
} }
function removeRunningTaskData(runData: IRunData): void {
for (const [nodeName, taskItems] of Object.entries(runData)) {
if (taskItems.some((item) => item.executionStatus === 'running')) {
runData[nodeName] = taskItems.filter((item) => item.executionStatus !== 'running');
}
}
}