mirror of
https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git
synced 2025-12-16 09:36:44 +00:00
fix(core): Remove default for manual trigger in manual executions (#16829)
This commit is contained in:
@@ -72,26 +72,29 @@ describe('ManualExecutionService', () => {
|
||||
expect(executionStartNode?.name).toEqual('node3');
|
||||
});
|
||||
|
||||
it('should default to The manual trigger', () => {
|
||||
const data = mock<IWorkflowExecutionDataProcess>();
|
||||
it('should return undefined, even if manual trigger node is available', () => {
|
||||
const scheduleTrigger = mock<INode>({
|
||||
type: 'n8n-nodes-base.scheduleTrigger',
|
||||
name: 'Wed 12:00',
|
||||
});
|
||||
|
||||
const manualTrigger = mock<INode>({
|
||||
type: 'n8n-nodes-base.manualTrigger',
|
||||
name: 'When clicking ‘Execute workflow’',
|
||||
});
|
||||
|
||||
const data = mock<IWorkflowExecutionDataProcess>({
|
||||
startNodes: [scheduleTrigger],
|
||||
triggerToStartFrom: undefined,
|
||||
});
|
||||
|
||||
const workflow = mock<Workflow>({
|
||||
getTriggerNodes() {
|
||||
return [
|
||||
mock<INode>({
|
||||
type: 'n8n-nodes-base.scheduleTrigger',
|
||||
name: 'Wed 12:00',
|
||||
}),
|
||||
manualTrigger,
|
||||
];
|
||||
return [scheduleTrigger, manualTrigger];
|
||||
},
|
||||
});
|
||||
const executionStartNode = manualExecutionService.getExecutionStartNode(data, workflow);
|
||||
expect(executionStartNode?.name).toBe(manualTrigger.name);
|
||||
expect(executionStartNode?.name).toBeUndefined();
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ import {
|
||||
WorkflowExecute,
|
||||
rewireGraph,
|
||||
} from 'n8n-core';
|
||||
import { MANUAL_TRIGGER_NODE_TYPE, NodeHelpers } from 'n8n-workflow';
|
||||
import { NodeHelpers } from 'n8n-workflow';
|
||||
import type {
|
||||
IExecuteData,
|
||||
IPinData,
|
||||
@@ -43,15 +43,7 @@ export class ManualExecutionService {
|
||||
startNode = workflow.getNode(data.startNodes[0].name) ?? undefined;
|
||||
}
|
||||
|
||||
if (startNode) {
|
||||
return startNode;
|
||||
}
|
||||
|
||||
const manualTrigger = workflow
|
||||
.getTriggerNodes()
|
||||
.find((node) => node.type === MANUAL_TRIGGER_NODE_TYPE);
|
||||
|
||||
return manualTrigger;
|
||||
return startNode;
|
||||
}
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/promise-function-async
|
||||
|
||||
Reference in New Issue
Block a user