admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 10:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(editor): Execute sub-workflow UX and copy updates (no-changelog) (#12834)

Browse Source
This commit is contained in:
Milorad FIlipović
2025-01-28 11:33:23 +01:00
committed by GitHub
parent 13652c5ee2
commit de49c23971
18 changed files with 539 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
View File

@@ -9,8 +9,8 @@ import type {
IDataObject,
ResourceMapperField,
ILocalLoadOptionsFunctions,
ResourceMapperFields,
ISupplyDataFunctions,
WorkflowInputsData,
} from 'n8n-workflow';
import { jsonParse, NodeOperationError, EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE } from 'n8n-workflow';
@@ -65,7 +65,11 @@ function parseJsonExample(context: IWorkflowNodeContext): JSONSchema7 {
return generateSchemaFromExample(json) as JSONSchema7;
}
export function getFieldEntries(context: IWorkflowNodeContext): FieldValueOption[] {
export function getFieldEntries(context: IWorkflowNodeContext): {
dataMode: WorkflowInputsData['dataMode'];
fields: FieldValueOption[];
subworkflowInfo?: WorkflowInputsData['subworkflowInfo'];
} {
const inputSource = context.getNodeParameter(INPUT_SOURCE, 0, PASSTHROUGH);
let result: FieldValueOption[] | string = 'Internal Error: Invalid input source';
try {
@@ -89,7 +93,9 @@ export function getFieldEntries(context: IWorkflowNodeContext): FieldValueOption
}
if (Array.isArray(result)) {
return result;
const dataMode = String(inputSource);
const workflow = context.getWorkflow();
return { fields: result, dataMode, subworkflowInfo: { id: workflow.id } };
}
throw new NodeOperationError(context.getNode(), result);
}
@@ -140,14 +146,18 @@ export function getCurrentWorkflowInputData(this: ISupplyDataFunctions) {
export async function loadWorkflowInputMappings(
this: ILocalLoadOptionsFunctions,
): Promise<ResourceMapperFields> {
): Promise<WorkflowInputsData> {
const nodeLoadContext = await this.getWorkflowNodeContext(EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE);
let fields: ResourceMapperField[] = [];
let dataMode: string = PASSTHROUGH;
let subworkflowInfo: { id?: string } | undefined;
if (nodeLoadContext) {
const fieldValues = getFieldEntries(nodeLoadContext);
dataMode = fieldValues.dataMode;
subworkflowInfo = fieldValues.subworkflowInfo;
fields = fieldValues.map((currentWorkflowInput) => {
fields = fieldValues.fields.map((currentWorkflowInput) => {
const field: ResourceMapperField = {
id: currentWorkflowInput.name,
displayName: currentWorkflowInput.name,
@@ -164,5 +174,5 @@ export async function loadWorkflowInputMappings(
return field;
});
}
return { fields };
return { fields, dataMode, subworkflowInfo };
}