mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle drop down properly

Browse source
This commit is contained in:
Charlie Kolb 2024-11-27 14:26:06 +01:00
parent 90fa0b45ec
commit fc007145b4
No known key found for this signature in database
1 changed files with 46 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
View file

@ -7,9 +7,49 @@ import {
type INodeTypeDescription, type INodeTypeDescription,
} from 'n8n-workflow'; } from 'n8n-workflow';
const INPUT_SOURCE = 'inputSource';
const FIELDS = 'fields';
const WORKFLOW_INPUTS = 'workflowInputs'; const WORKFLOW_INPUTS = 'workflowInputs';
const VALUES = 'values'; const VALUES = 'values';
function hasFields(context: IExecuteFunctions, index: number): boolean {
const inputSource = context.getNodeParameter(INPUT_SOURCE, index) as string;
if (inputSource === FIELDS) {
const fields = context.getNodeParameter(`${WORKFLOW_INPUTS}.${VALUES}`, index, []) as Array<{
name: string;
}>;
return fields.length > 0;
} else {
return false;
}
}
function parseJson(
context: IExecuteFunctions,
index: number,
): Array<{
name: string;
}> {
return [{ name: 'dummy' }];
}
function getSchema(
context: IExecuteFunctions,
index: number,
): Array<{
name: string;
}> {
const inputSource = context.getNodeParameter(INPUT_SOURCE, index) as string;
if (inputSource === FIELDS) {
const fields = context.getNodeParameter(`${WORKFLOW_INPUTS}.${VALUES}`, index, []) as Array<{
name: string;
}>;
return fields;
} else {
return parseJson(context, index);
}
}
export class ExecuteWorkflowTrigger implements INodeType { export class ExecuteWorkflowTrigger implements INodeType {
description: INodeTypeDescription = { description: INodeTypeDescription = {
displayName: 'Execute Workflow Trigger', displayName: 'Execute Workflow Trigger',
@ -58,7 +98,7 @@ export class ExecuteWorkflowTrigger implements INodeType {
{ {
// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased // eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
name: 'Using fields below', name: 'Using fields below',
value: 'fields', value: FIELDS,
description: 'Provide via UI', description: 'Provide via UI',
}, },
{ {
@ -68,7 +108,7 @@ export class ExecuteWorkflowTrigger implements INodeType {
description: 'Provide via JSON schema', description: 'Provide via JSON schema',
}, },
], ],
default: 'fields', default: FIELDS,
}, },
{ {
displayName: 'Workflow Inputs', displayName: 'Workflow Inputs',
@ -82,7 +122,7 @@ export class ExecuteWorkflowTrigger implements INodeType {
sortable: true, sortable: true,
}, },
displayOptions: { displayOptions: {
show: { '@version': [{ _cnd: { gte: 1.1 } }], inputSource: ['fields'] }, show: { '@version': [{ _cnd: { gte: 1.1 } }], inputSource: [FIELDS] },
}, },
default: {}, default: {},
options: [ options: [
@ -142,15 +182,7 @@ export class ExecuteWorkflowTrigger implements INodeType {
if (this.getNode().typeVersion < 1.1) { if (this.getNode().typeVersion < 1.1) {
return [inputData]; return [inputData];
} else { } else {
// Need to mask type due to bad `getNodeParameter` typing if (!hasFields(this, 0)) {
const marker = Symbol() as unknown as object;
const hasFields =
inputData.length >= 0 &&
inputData.some(
(_x, i) => this.getNodeParameter(`${WORKFLOW_INPUTS}.${VALUES}`, i, marker) !== marker,
);
if (!hasFields) {
return [inputData]; return [inputData];
} }
@ -170,13 +202,8 @@ export class ExecuteWorkflowTrigger implements INodeType {
pairedItem: { item: itemIndex }, pairedItem: { item: itemIndex },
}; };
try { try {
const newParams = this.getNodeParameter( const newParams = getSchema(this, itemIndex);
`${WORKFLOW_INPUTS}.${VALUES}`,
itemIndex,
[],
) as Array<{
name: string;
}>;
for (const { name } of newParams) { for (const { name } of newParams) {
/** TODO type check goes here */ /** TODO type check goes here */
newItem.json[name] = name in item.json ? item.json[name] : /* TODO default */ null; newItem.json[name] = name in item.json ? item.json[name] : /* TODO default */ null;