mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-01-11 12:57:29 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

addressing comments

Browse source
This commit is contained in:
Ivan Atanasov 2024-12-04 10:01:03 +01:00
parent 2dd4096800
commit 46b662fa03
No known key found for this signature in database
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/core/src/node-execution-context/workflow-inputs-context.ts
View file

@ -14,7 +14,6 @@ import type {
import { extractValue } from '@/ExtractValue';
import { NodeExecutionContext } from './node-execution-context';
// eslint-disable-next-line import/no-cycle
export class WorkflowInputsContext
extends NodeExecutionContext
@ -53,7 +52,7 @@ export class WorkflowInputsContext
): NodeParameterValueType | object | undefined {
const nodeParameters = this.additionalData.currentNodeParameters;
if (parameterPath.charAt(0) === '&') {
if (parameterPath.startsWith('&')) {
parameterPath = `${this.path.split('.').slice(1, -1).join('.')}.${parameterPath.slice(1)}`;
}

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

@ -10,6 +10,7 @@ import {
validateFieldType,
type FieldType,
jsonParse,
FieldValueOption,
} from 'n8n-workflow';
const INPUT_SOURCE = 'inputSource';
@ -48,9 +49,7 @@ const SUPPORTED_TYPES = TYPE_OPTIONS.map((x) => x.value);
const DEFAULT_PLACEHOLDER = null;
type ValueOptions = { name: string; type: FieldType | 'any' };
function parseJsonSchema(schema: JSONSchema7): ValueOptions[] | string {
function parseJsonSchema(schema: JSONSchema7): FieldValueOption[] | string {
if (!schema?.properties) {
return 'Invalid JSON schema. Missing key `properties` in schema';
}
@ -59,7 +58,7 @@ function parseJsonSchema(schema: JSONSchema7): ValueOptions[] | string {
return 'Invalid JSON schema. Key `properties` is not an object';
}
const result: ValueOptions[] = [];
const result: FieldValueOption[] = [];
for (const [name, v] of Object.entries(schema.properties)) {
if (typeof v !== 'object') {
return `Invalid JSON schema. Value for property '${name}' is not an object`;
@ -90,12 +89,16 @@ function parseJsonExample(context: IExecuteFunctions): JSONSchema7 {
return generateSchemaFromExample(json) as JSONSchema7;
}
function getFieldEntries(context: IExecuteFunctions): ValueOptions[] {
function getFieldEntries(context: IExecuteFunctions): FieldValueOption[] {
const inputSource = context.getNodeParameter(INPUT_SOURCE, 0) as string;
let result: ValueOptions[] | string = 'Internal Error: Invalid input source';
let result: FieldValueOption[] | string = 'Internal Error: Invalid input source';
try {
if (inputSource === WORKFLOW_INPUTS) {
result = context.getNodeParameter(`${WORKFLOW_INPUTS}.${VALUES}`, 0, []) as ValueOptions[];
result = context.getNodeParameter(
`${WORKFLOW_INPUTS}.${VALUES}`,
0,
[],
) as FieldValueOption[];
} else if (inputSource === JSON_EXAMPLE) {
const schema = parseJsonExample(context);
result = parseJsonSchema(schema);

4
packages/workflow/src/Interfaces.ts
View file

@ -1070,8 +1070,10 @@ export interface ILoadOptionsFunctions extends FunctionsBase {
helpers: RequestHelperFunctions & SSHTunnelFunctions;
}
export type FieldValueOption = { name: string; type: FieldType | 'any' };
export interface IWorkflowInputsLoadOptionsFunctions {
getWorkflowInputValues(): Array<{ name: string; type: FieldType }>;
getWorkflowInputValues(): FieldValueOption[];
}
export interface IPollFunctions