From 90fa0b45ecb2ad71bfeb8a2ea9521d8176c12757 Mon Sep 17 00:00:00 2001 From: Charlie Kolb Date: Tue, 26 Nov 2024 15:59:48 +0100 Subject: [PATCH] Implement dropdown --- .../ExecuteWorkflowTrigger.node.ts | 26 ++++++++++++++++--- .../test/ExecuteWorkflowTrigger.node.test.ts | 2 +- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts b/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts index ecb471a610a..e03680b8420 100644 --- a/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts +++ b/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts @@ -22,10 +22,9 @@ export class ExecuteWorkflowTrigger implements INodeType { eventTriggerDescription: '', maxNodes: 1, defaults: { - name: 'Execute Workflow Trigger', + name: 'Workflow Input Trigger', color: '#ff6d5a', }, - inputs: [], outputs: [NodeConnectionType.Main], properties: [ @@ -51,6 +50,26 @@ export class ExecuteWorkflowTrigger implements INodeType { ], default: 'worklfow_call', }, + { + displayName: 'Input Source', + name: 'inputSource', + type: 'options', + options: [ + { + // eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased + name: 'Using fields below', + value: 'fields', + description: 'Provide via UI', + }, + { + // eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased + name: 'Using JSON', + value: 'json', + description: 'Provide via JSON schema', + }, + ], + default: 'fields', + }, { displayName: 'Workflow Inputs', name: WORKFLOW_INPUTS, @@ -63,7 +82,7 @@ export class ExecuteWorkflowTrigger implements INodeType { sortable: true, }, displayOptions: { - show: { '@version': [{ _cnd: { gte: 1.1 } }] }, + show: { '@version': [{ _cnd: { gte: 1.1 } }], inputSource: ['fields'] }, }, default: {}, options: [ @@ -78,6 +97,7 @@ export class ExecuteWorkflowTrigger implements INodeType { default: '', placeholder: 'e.g. fieldName', description: 'Name of the field', + noDataExpression: true, }, // { // displayName: 'Type', diff --git a/packages/nodes-base/nodes/ExecuteWorkflowTrigger/test/ExecuteWorkflowTrigger.node.test.ts b/packages/nodes-base/nodes/ExecuteWorkflowTrigger/test/ExecuteWorkflowTrigger.node.test.ts index 8a4b1cc8d5b..4e050de0aae 100644 --- a/packages/nodes-base/nodes/ExecuteWorkflowTrigger/test/ExecuteWorkflowTrigger.node.test.ts +++ b/packages/nodes-base/nodes/ExecuteWorkflowTrigger/test/ExecuteWorkflowTrigger.node.test.ts @@ -4,7 +4,7 @@ import type { IExecuteFunctions, INode, INodeExecutionData } from 'n8n-workflow' import { ExecuteWorkflowTrigger } from '../ExecuteWorkflowTrigger.node'; describe('ExecuteWorkflowTrigger', () => { - it('should return its input data', async () => { + it('should return its input data on V1', async () => { const mockInputData: INodeExecutionData[] = [ { json: { item: 0, foo: 'bar' } }, { json: { item: 1, foo: 'quz' } },