mirror of
https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git
synced 2025-12-17 10:02:05 +00:00
fix(core): Make node execution order configurable, and backward-compatible (#6507)
* fix(core): Make node execution order configurable, and backward-compatible * ⚡ Also add new Merge-Node behaviour * ⚡ Fix typo * Fix lint issue * update labels * rename legacy to v0 * remove the unnecessary log * default all new workflows to use v1 execution-order * remove the controller changes * clone default settings to avoid it getting modified --------- Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
This commit is contained in:
committed by
GitHub
parent
f0dfc3cf4e
commit
d97edbcffa
@@ -2366,7 +2366,9 @@
|
||||
}
|
||||
},
|
||||
"active": false,
|
||||
"settings": {},
|
||||
"settings": {
|
||||
"executionOrder": "v1"
|
||||
},
|
||||
"versionId": "6b37555c-fd78-4135-9c59-4912a71e18db",
|
||||
"id": "1107",
|
||||
"meta": {
|
||||
|
||||
@@ -30,7 +30,6 @@ const versionDescription: INodeTypeDescription = {
|
||||
inputs: ['main', 'main'],
|
||||
outputs: ['main'],
|
||||
inputNames: ['Input 1', 'Input 2'],
|
||||
forceInputNodeExecution: true,
|
||||
properties: [
|
||||
oldVersionNotice,
|
||||
{
|
||||
|
||||
@@ -48,9 +48,7 @@ const versionDescription: INodeTypeDescription = {
|
||||
inputNames: ['Input 1', 'Input 2'],
|
||||
// If the node is of version 2.2 or if mode is chooseBranch data from both branches is required
|
||||
// to continue, else data from any input suffices
|
||||
requiredInputs:
|
||||
'={{ $version < 2.2 ? undefined : ($parameter["mode"] === "chooseBranch" ? [0, 1] : 1) }}',
|
||||
forceInputNodeExecution: '={{ $version < 2.2 }}',
|
||||
requiredInputs: '={{ $parameter["mode"] === "chooseBranch" ? [0, 1] : 1 }}',
|
||||
properties: [
|
||||
{
|
||||
displayName: 'Mode',
|
||||
|
||||
Reference in New Issue
Block a user