From 7f3cd697e84c9b0683ca86659565f10a168c0c5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Fri, 24 Jan 2025 14:47:14 +0100
Subject: [PATCH 01/13] feat(editor): Updating copy around execute workflow
 nodes (no-changelog)

---
 packages/editor-ui/src/constants.workflows.ts                 | 4 ++--
 .../ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.json | 2 +-
 .../ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts   | 4 ++--
 .../ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/editor-ui/src/constants.workflows.ts b/packages/editor-ui/src/constants.workflows.ts
index 3816ea80a8771..05884c3c85f17 100644
--- a/packages/editor-ui/src/constants.workflows.ts
+++ b/packages/editor-ui/src/constants.workflows.ts
@@ -10,7 +10,7 @@ export const SAMPLE_SUBWORKFLOW_WORKFLOW: WorkflowDataWithTemplateId = {
 		{
 			id: 'c055762a-8fe7-4141-a639-df2372f30060',
 			typeVersion: 1.1,
-			name: 'Workflow Input Trigger',
+			name: 'When Called by Another Workflow',
 			type: 'n8n-nodes-base.executeWorkflowTrigger',
 			position: [260, 340],
 			parameters: {},
@@ -24,7 +24,7 @@ export const SAMPLE_SUBWORKFLOW_WORKFLOW: WorkflowDataWithTemplateId = {
 		},
 	] as INodeUi[],
 	connections: {
-		'Workflow Input Trigger': {
+		'When Called by Another Workflow': {
 			main: [
 				[
 					{
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.json b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.json
index 9fc522970319a..9212ce8a62862 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.json
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.json
@@ -11,7 +11,7 @@
 			}
 		]
 	},
-	"alias": ["n8n"],
+	"alias": ["n8n", "call", "sub", "workflow", "sub-workflow", "subworkflow"],
 	"subcategories": {
 		"Core Nodes": ["Helpers", "Flow"]
 	}
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts
index a04ef4375c538..6b5f4bd1873ae 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts
@@ -15,7 +15,7 @@ import {
 } from '../../../utils/workflowInputsResourceMapping/GenericFunctions';
 export class ExecuteWorkflow implements INodeType {
 	description: INodeTypeDescription = {
-		displayName: 'Execute Workflow',
+		displayName: 'Execute Sub-workflow',
 		name: 'executeWorkflow',
 		icon: 'fa:sign-in-alt',
 		iconColor: 'orange-red',
@@ -38,7 +38,7 @@ export class ExecuteWorkflow implements INodeType {
 				default: 'call_workflow',
 				options: [
 					{
-						name: 'Call Another Workflow',
+						name: 'Execute a Sub-Workflow',
 						value: 'call_workflow',
 					},
 				],
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
index a15780a80ea7a..4e38f80aa3567 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
@@ -30,7 +30,7 @@ export class ExecuteWorkflowTrigger implements INodeType {
 		eventTriggerDescription: '',
 		maxNodes: 1,
 		defaults: {
-			name: 'Workflow Input Trigger',
+			name: 'When Called by Another Workflow',
 			color: '#ff6d5a',
 		},
 		inputs: [],

From bd440de9f9fb46c18af28ee5a175716fec9fd6fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Fri, 24 Jan 2025 15:08:58 +0100
Subject: [PATCH 02/13] =?UTF-8?q?=F0=9F=92=84=20Updating=20copy=20in=20the?=
 =?UTF-8?q?=20`Execute=20Workflow=20Trigger`=20node?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExecuteWorkflowTrigger.node.ts                    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
index 4e38f80aa3567..254f16fc6c497 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
@@ -37,7 +37,8 @@ export class ExecuteWorkflowTrigger implements INodeType {
 		outputs: [NodeConnectionType.Main],
 		hints: [
 			{
-				message: 'Please make sure to define your input fields.',
+				message:
+					"This workflow isn't set to accept any input data. Fill out the workflow input schema or change the workflow to accept any data passed to it.",
 				// This condition checks if we have no input fields, which gets a bit awkward:
 				// For WORKFLOW_INPUTS: keys() only contains `VALUES` if at least one value is provided
 				// For JSON_EXAMPLE: We remove all whitespace and check if we're left with an empty object. Note that we already error if the example is not valid JSON
@@ -142,7 +143,7 @@ export class ExecuteWorkflowTrigger implements INodeType {
 				},
 			},
 			{
-				displayName: 'Workflow Inputs',
+				displayName: 'Workflow Input Schema',
 				name: WORKFLOW_INPUTS,
 				placeholder: 'Add field',
 				type: 'fixedCollection',
@@ -168,7 +169,8 @@ export class ExecuteWorkflowTrigger implements INodeType {
 								type: 'string',
 								default: '',
 								placeholder: 'e.g. fieldName',
-								description: 'Name of the field',
+								description:
+									'A unique name for this workflow input, used to reference it from another workflows',
 								required: true,
 								noDataExpression: true,
 							},
@@ -176,7 +178,8 @@ export class ExecuteWorkflowTrigger implements INodeType {
 								displayName: 'Type',
 								name: 'type',
 								type: 'options',
-								description: 'The field value type',
+								description:
+									"Expected data type for this input value. Determines how this field's values are stored, validated, and displayed.",
 								options: TYPE_OPTIONS,
 								required: true,
 								default: 'string',

From 34908d89fa16130a5dcfe2076e3ef0a134c3a9b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Fri, 24 Jan 2025 16:31:17 +0100
Subject: [PATCH 03/13] =?UTF-8?q?=E2=9C=A8=20Initial=20implementation=20of?=
 =?UTF-8?q?=20custom=20empty=20state=20notice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ResourceMapper/ResourceMapper.vue         | 11 ++++++--
 .../ExecuteWorkflowTrigger.node.ts            |  4 +--
 .../GenericFunctions.ts                       | 28 ++++++++++++++++---
 packages/workflow/src/Interfaces.ts           |  2 ++
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
index c4ef8d816135e..2292de977e186 100644
--- a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
@@ -28,7 +28,7 @@ import { i18n as locale } from '@/plugins/i18n';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useDocumentVisibility } from '@/composables/useDocumentVisibility';
-import { N8nButton, N8nCallout } from 'n8n-design-system';
+import { N8nButton, N8nCallout, N8nNotice } from 'n8n-design-system';
 
 type Props = {
 	parameter: INodeProperties;
@@ -74,6 +74,7 @@ const state = reactive({
 	refreshInProgress: false, // Shows inline loader when refreshing fields
 	loadingError: false,
 	hasStaleFields: false,
+	emptyFieldsNotice: '',
 });
 
 // Reload fields to map when dependent parameters change
@@ -315,7 +316,7 @@ async function fetchFields(): Promise<ResourceMapperFields | null> {
 	const { resourceMapperMethod, localResourceMapperMethod } =
 		props.parameter.typeOptions?.resourceMapper ?? {};
 
-	let fetchedFields = null;
+	let fetchedFields: ResourceMapperFields | null = null;
 
 	if (typeof resourceMapperMethod === 'string') {
 		const requestParams = createRequestParams(
@@ -329,6 +330,9 @@ async function fetchFields(): Promise<ResourceMapperFields | null> {
 
 		fetchedFields = await nodeTypesStore.getLocalResourceMapperFields(requestParams);
 	}
+	if (fetchedFields?.emptyFieldsNotice) {
+		state.emptyFieldsNotice = fetchedFields.emptyFieldsNotice;
+	}
 	return fetchedFields;
 }
 
@@ -619,6 +623,9 @@ defineExpose({
 			@add-field="addField"
 			@refresh-field-list="initFetching(true)"
 		/>
+		<N8nNotice v-else-if="state.emptyFieldsNotice && !state.hasStaleFields" type="info">
+			{{ state.emptyFieldsNotice }}
+		</N8nNotice>
 		<N8nCallout v-else-if="state.hasStaleFields" theme="info" :iconless="true">
 			{{ locale.baseText('resourceMapper.staleDataWarning.notice') }}
 			<template #trailingContent>
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
index 254f16fc6c497..4ebb8db19b941 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
@@ -211,10 +211,10 @@ export class ExecuteWorkflowTrigger implements INodeType {
 			return [inputData];
 		} else {
 			const newParams = getFieldEntries(this);
-			const newKeys = new Set(newParams.map((x) => x.name));
+			const newKeys = new Set(newParams.fields.map((x) => x.name));
 			const itemsInSchema: INodeExecutionData[] = inputData.map((row, index) => ({
 				json: {
-					...Object.fromEntries(newParams.map((x) => [x.name, FALLBACK_DEFAULT_VALUE])),
+					...Object.fromEntries(newParams.fields.map((x) => [x.name, FALLBACK_DEFAULT_VALUE])),
 					// Need to trim to the expected schema to support legacy Execute Workflow callers passing through all their data
 					// which we do not want to expose past this node.
 					..._.pickBy(row.json, (_value, key) => newKeys.has(key)),
diff --git a/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts b/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
index cd12e3be3dc39..9da231fed8339 100644
--- a/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
+++ b/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
@@ -65,7 +65,11 @@ function parseJsonExample(context: IWorkflowNodeContext): JSONSchema7 {
 	return generateSchemaFromExample(json) as JSONSchema7;
 }
 
-export function getFieldEntries(context: IWorkflowNodeContext): FieldValueOption[] {
+// TODO: Find better name for `mode`
+export function getFieldEntries(context: IWorkflowNodeContext): {
+	mode: string;
+	fields: FieldValueOption[];
+} {
 	const inputSource = context.getNodeParameter(INPUT_SOURCE, 0, PASSTHROUGH);
 	let result: FieldValueOption[] | string = 'Internal Error: Invalid input source';
 	try {
@@ -89,7 +93,7 @@ export function getFieldEntries(context: IWorkflowNodeContext): FieldValueOption
 	}
 
 	if (Array.isArray(result)) {
-		return result;
+		return { mode: String(inputSource), fields: result };
 	}
 	throw new NodeOperationError(context.getNode(), result);
 }
@@ -143,11 +147,27 @@ export async function loadWorkflowInputMappings(
 ): Promise<ResourceMapperFields> {
 	const nodeLoadContext = await this.getWorkflowNodeContext(EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE);
 	let fields: ResourceMapperField[] = [];
+	let mode = undefined;
+	let emptyFieldsNotice = undefined;
 
 	if (nodeLoadContext) {
 		const fieldValues = getFieldEntries(nodeLoadContext);
+		mode = fieldValues.mode;
+
+		if (fieldValues.fields.length === 0) {
+			switch (mode) {
+				case WORKFLOW_INPUTS:
+					emptyFieldsNotice =
+						"The sub-workflow isn't set up to accept any inputs. Change this in the sub-workflow's trigger.";
+					break;
+				case PASSTHROUGH:
+					emptyFieldsNotice =
+						"All input data to this node will be passed to the sub-workflow. You can change this in the sub-workflow's trigger.";
+					break;
+			}
+		}
 
-		fields = fieldValues.map((currentWorkflowInput) => {
+		fields = fieldValues.fields.map((currentWorkflowInput) => {
 			const field: ResourceMapperField = {
 				id: currentWorkflowInput.name,
 				displayName: currentWorkflowInput.name,
@@ -164,5 +184,5 @@ export async function loadWorkflowInputMappings(
 			return field;
 		});
 	}
-	return { fields };
+	return { fields, mode, emptyFieldsNotice };
 }
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index dd6c0ef1cef24..048a713be152c 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -2660,6 +2660,8 @@ export interface IExecutionSummaryNodeExecutionResult {
 
 export interface ResourceMapperFields {
 	fields: ResourceMapperField[];
+	mode?: string;
+	emptyFieldsNotice?: string;
 }
 
 export interface ResourceMapperField {

From 12c32e0d2afa839c2060429bd385047dc6fcc0e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Fri, 24 Jan 2025 16:48:13 +0100
Subject: [PATCH 04/13] =?UTF-8?q?=E2=9C=A8=20Trying=20to=20get=20workflow?=
 =?UTF-8?q?=20link=20in=20the=20empty=20state=20notice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/ResourceMapper/ResourceMapper.vue          | 2 +-
 .../utils/workflowInputsResourceMapping/GenericFunctions.ts   | 4 ++--
 packages/workflow/src/Interfaces.ts                           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
index 2292de977e186..fc7d263611aa1 100644
--- a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
@@ -624,7 +624,7 @@ defineExpose({
 			@refresh-field-list="initFetching(true)"
 		/>
 		<N8nNotice v-else-if="state.emptyFieldsNotice && !state.hasStaleFields" type="info">
-			{{ state.emptyFieldsNotice }}
+			<span v-n8n-html="state.emptyFieldsNotice"></span>
 		</N8nNotice>
 		<N8nCallout v-else-if="state.hasStaleFields" theme="info" :iconless="true">
 			{{ locale.baseText('resourceMapper.staleDataWarning.notice') }}
diff --git a/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts b/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
index 9da231fed8339..73f61e6c33069 100644
--- a/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
+++ b/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
@@ -155,10 +155,10 @@ export async function loadWorkflowInputMappings(
 		mode = fieldValues.mode;
 
 		if (fieldValues.fields.length === 0) {
+			const id = nodeLoadContext.getWorkflow().id as string;
 			switch (mode) {
 				case WORKFLOW_INPUTS:
-					emptyFieldsNotice =
-						"The sub-workflow isn't set up to accept any inputs. Change this in the sub-workflow's trigger.";
+					emptyFieldsNotice = `The sub-workflow isn't set up to accept any inputs. Change this in the <a href="/workflow/${id}" target="_blank">sub-workflow's trigger</a>.`;
 					break;
 				case PASSTHROUGH:
 					emptyFieldsNotice =
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 048a713be152c..705448aab27c6 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1030,7 +1030,7 @@ export interface ILoadOptionsFunctions extends FunctionsBase {
 export type FieldValueOption = { name: string; type: FieldType | 'any' };
 
 export type IWorkflowNodeContext = ExecuteFunctions.GetNodeParameterFn &
-	Pick<FunctionsBase, 'getNode'>;
+	Pick<FunctionsBase, 'getNode' | 'getWorkflow'>;
 
 export interface ILocalLoadOptionsFunctions {
 	getWorkflowNodeContext(nodeType: string): Promise<IWorkflowNodeContext | null>;

From bdb44e3ed787f540ee09f385d2b37e04ef5c24b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Mon, 27 Jan 2025 12:23:41 +0100
Subject: [PATCH 05/13] =?UTF-8?q?=E2=9C=A8=20Adding=20missing=20workflow?=
 =?UTF-8?q?=20details?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../node-execution-context/local-load-options-context.ts        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/core/src/execution-engine/node-execution-context/local-load-options-context.ts b/packages/core/src/execution-engine/node-execution-context/local-load-options-context.ts
index 39456ff966808..dd96ab5f74174 100644
--- a/packages/core/src/execution-engine/node-execution-context/local-load-options-context.ts
+++ b/packages/core/src/execution-engine/node-execution-context/local-load-options-context.ts
@@ -35,6 +35,8 @@ export class LocalLoadOptionsContext implements ILocalLoadOptionsFunctions {
 
 		if (selectedWorkflowNode) {
 			const selectedSingleNodeWorkflow = new Workflow({
+				id: dbWorkflow.id,
+				name: dbWorkflow.name,
 				nodes: [selectedWorkflowNode],
 				connections: {},
 				active: false,

From 2831166bbce782dbb24694e6be5813ca9e81a463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Mon, 27 Jan 2025 12:36:51 +0100
Subject: [PATCH 06/13] =?UTF-8?q?=F0=9F=94=A8=20Moving=20empty=20message?=
 =?UTF-8?q?=20logic=20to=20the=20`getFieldEntries`=20method?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GenericFunctions.ts                       | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts b/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
index 73f61e6c33069..f7c92e8ecfc2b 100644
--- a/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
+++ b/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
@@ -65,9 +65,8 @@ function parseJsonExample(context: IWorkflowNodeContext): JSONSchema7 {
 	return generateSchemaFromExample(json) as JSONSchema7;
 }
 
-// TODO: Find better name for `mode`
 export function getFieldEntries(context: IWorkflowNodeContext): {
-	mode: string;
+	noFieldsMessage: string | undefined;
 	fields: FieldValueOption[];
 } {
 	const inputSource = context.getNodeParameter(INPUT_SOURCE, 0, PASSTHROUGH);
@@ -93,7 +92,20 @@ export function getFieldEntries(context: IWorkflowNodeContext): {
 	}
 
 	if (Array.isArray(result)) {
-		return { mode: String(inputSource), fields: result };
+		let noFieldsMessage: string | undefined;
+		const dataMode = String(inputSource);
+		if (result.length === 0) {
+			const id = context.getWorkflow().id;
+			switch (dataMode) {
+				case PASSTHROUGH:
+					noFieldsMessage = `All input data to this node will be passed to the sub-workflow. You can change this in the <a href="/workflow/${id}" target="_blank">sub-workflow's trigger</a>..`;
+					break;
+				default:
+					noFieldsMessage = `The sub-workflow isn't set up to accept any inputs. Change this in the <a href="/workflow/${id}" target="_blank">sub-workflow's trigger</a>.`;
+					break;
+			}
+		}
+		return { fields: result, noFieldsMessage };
 	}
 	throw new NodeOperationError(context.getNode(), result);
 }
@@ -147,25 +159,11 @@ export async function loadWorkflowInputMappings(
 ): Promise<ResourceMapperFields> {
 	const nodeLoadContext = await this.getWorkflowNodeContext(EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE);
 	let fields: ResourceMapperField[] = [];
-	let mode = undefined;
-	let emptyFieldsNotice = undefined;
+	let emptyFieldsNotice: string | undefined;
 
 	if (nodeLoadContext) {
 		const fieldValues = getFieldEntries(nodeLoadContext);
-		mode = fieldValues.mode;
-
-		if (fieldValues.fields.length === 0) {
-			const id = nodeLoadContext.getWorkflow().id as string;
-			switch (mode) {
-				case WORKFLOW_INPUTS:
-					emptyFieldsNotice = `The sub-workflow isn't set up to accept any inputs. Change this in the <a href="/workflow/${id}" target="_blank">sub-workflow's trigger</a>.`;
-					break;
-				case PASSTHROUGH:
-					emptyFieldsNotice =
-						"All input data to this node will be passed to the sub-workflow. You can change this in the sub-workflow's trigger.";
-					break;
-			}
-		}
+		emptyFieldsNotice = fieldValues.noFieldsMessage;
 
 		fields = fieldValues.fields.map((currentWorkflowInput) => {
 			const field: ResourceMapperField = {
@@ -184,5 +182,5 @@ export async function loadWorkflowInputMappings(
 			return field;
 		});
 	}
-	return { fields, mode, emptyFieldsNotice };
+	return { fields, emptyFieldsNotice };
 }

From 7df1cf9524e2c84686edb00057c24c4790750572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Mon, 27 Jan 2025 12:42:25 +0100
Subject: [PATCH 07/13] =?UTF-8?q?=F0=9F=92=84=20Using=20title=20case=20for?=
 =?UTF-8?q?=20labels?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor-ui/src/plugins/i18n/locales/en.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 25eebc86ae4fc..0e1848009e7de 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -1598,7 +1598,7 @@
 	"resourceMapper.refreshFieldList": "Refresh {fieldWord} List",
 	"resourceMapper.staleDataWarning.tooltip": "{fieldWord} are outdated. Refresh to see the changes.",
 	"resourceMapper.staleDataWarning.notice": "Refresh to see the updated fields",
-	"resourceMapper.attemptToConvertTypes.displayName": "Attempt to convert types",
+	"resourceMapper.attemptToConvertTypes.displayName": "Attempt To Convert Types",
 	"resourceMapper.attemptToConvertTypes.description": "Attempt to convert types when mapping fields",
 	"runData.openSubExecutionSingle": "View sub-execution",
 	"runData.openSubExecutionWithId": "View sub-execution {id}",
@@ -2771,8 +2771,8 @@
 	"communityPlusModal.input.email.label": "Enter email to receive your license key",
 	"communityPlusModal.button.skip": "Skip",
 	"communityPlusModal.button.confirm": "Send me a free license key",
-	"executeWorkflowTrigger.createNewSubworkflow": "Create a sub-workflow in {projectName}",
-	"executeWorkflowTrigger.createNewSubworkflow.noProject": "Create a new sub-workflow",
+	"executeWorkflowTrigger.createNewSubworkflow": "Create a Sub-Workflow in {projectName}",
+	"executeWorkflowTrigger.createNewSubworkflow.noProject": "Create a New Sub-Workflow",
 	"testDefinition.edit.descriptionPlaceholder": "Enter test description",
 	"testDefinition.edit.showConfig": "Show config",
 	"testDefinition.edit.hideConfig": "Hide config",

From d5620a5b2e256d6524f65a61952622d1c8bfcdd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Mon, 27 Jan 2025 12:44:27 +0100
Subject: [PATCH 08/13] =?UTF-8?q?=F0=9F=94=A5=20Deleting=20leftover=20peri?=
 =?UTF-8?q?od?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../utils/workflowInputsResourceMapping/GenericFunctions.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts b/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
index f7c92e8ecfc2b..f641d00c7e43f 100644
--- a/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
+++ b/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
@@ -98,7 +98,7 @@ export function getFieldEntries(context: IWorkflowNodeContext): {
 			const id = context.getWorkflow().id;
 			switch (dataMode) {
 				case PASSTHROUGH:
-					noFieldsMessage = `All input data to this node will be passed to the sub-workflow. You can change this in the <a href="/workflow/${id}" target="_blank">sub-workflow's trigger</a>..`;
+					noFieldsMessage = `All input data to this node will be passed to the sub-workflow. You can change this in the <a href="/workflow/${id}" target="_blank">sub-workflow's trigger</a>.`;
 					break;
 				default:
 					noFieldsMessage = `The sub-workflow isn't set up to accept any inputs. Change this in the <a href="/workflow/${id}" target="_blank">sub-workflow's trigger</a>.`;

From aa0f5b0f1eab18183c799b5801797d23738c06c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Mon, 27 Jan 2025 14:18:09 +0100
Subject: [PATCH 09/13] =?UTF-8?q?=E2=9C=85=20Added=20initial=20resource=20?=
 =?UTF-8?q?mapper=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ResourceMapper.test.constants.ts          | 322 ++++++++++++++++++
 .../ResourceMapper/ResourceMapper.test.ts     |  95 ++++++
 2 files changed, 417 insertions(+)
 create mode 100644 packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.constants.ts
 create mode 100644 packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.ts

diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.constants.ts b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.constants.ts
new file mode 100644
index 0000000000000..d2d9b0a6db2c9
--- /dev/null
+++ b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.constants.ts
@@ -0,0 +1,322 @@
+import {
+	NodeConnectionType,
+	type INode,
+	type INodeProperties,
+	type INodeTypeDescription,
+} from 'n8n-workflow';
+
+export const WORKFLOW_INPUTS_TEST_PARAMETER_PATH = 'parameters.workflowInputs';
+
+export const WORKFLOW_INPUTS_TEST_PARAMETER: INodeProperties = {
+	displayName: 'Workflow Inputs',
+	name: 'workflowInputs',
+	type: 'resourceMapper',
+	noDataExpression: true,
+	default: { mappingMode: 'defineBelow', value: null },
+	required: true,
+	typeOptions: {
+		loadOptionsDependsOn: ['workflowId.value'],
+		resourceMapper: {
+			localResourceMapperMethod: 'loadWorkflowInputMappings',
+			valuesLabel: 'Workflow Inputs',
+			mode: 'map',
+			fieldWords: { singular: 'input', plural: 'inputs' },
+			addAllFields: true,
+			multiKeyMatch: false,
+			supportAutoMap: false,
+			showTypeConversionOptions: false,
+		},
+	},
+	displayOptions: {
+		show: { source: ['database'], '@version': [{ _cnd: { gte: 1.2 } }] },
+		hide: { workflowId: [''] },
+	},
+};
+
+export const WORKFLOW_INPUTS_TEST_NODE: INode = {
+	parameters: {
+		operation: 'call_workflow',
+		source: 'database',
+		workflowId: {
+			__rl: true,
+			value: 'yjNDOVueewSXi3tY',
+			mode: 'list',
+			cachedResultName: 'Workflow inputs — child-test',
+		},
+		workflowInputs: {
+			_custom: {
+				type: 'reactive',
+				stateTypeName: 'Reactive',
+				value: {
+					mappingMode: 'defineBelow',
+					value: {},
+					matchingColumns: [],
+					schema: [
+						{
+							_custom: {
+								type: 'reactive',
+								stateTypeName: 'Reactive',
+								value: {
+									id: 'aField',
+									displayName: 'aField',
+									required: false,
+									defaultMatch: false,
+									display: true,
+									canBeUsedToMatch: true,
+									type: 'string',
+								},
+							},
+						},
+						{
+							_custom: {
+								type: 'reactive',
+								stateTypeName: 'Reactive',
+								value: {
+									id: 'aNumber',
+									displayName: 'aNumber',
+									required: false,
+									defaultMatch: false,
+									display: true,
+									canBeUsedToMatch: true,
+									type: 'number',
+								},
+							},
+						},
+						{
+							_custom: {
+								type: 'reactive',
+								stateTypeName: 'Reactive',
+								value: {
+									id: 'hello',
+									displayName: 'hello',
+									required: false,
+									defaultMatch: false,
+									display: true,
+									canBeUsedToMatch: true,
+									type: 'string',
+								},
+							},
+						},
+					],
+					attemptToConvertTypes: false,
+					convertFieldsToString: true,
+				},
+			},
+		},
+		mode: 'once',
+		options: {},
+	},
+	type: 'n8n-nodes-base.executeWorkflow',
+	typeVersion: 1.2,
+	position: [220, 0],
+	id: '571e6db4-404f-40d2-8bf1-5c04d3101be4',
+	name: 'Execute Workflow',
+};
+
+export const EXECUTE_WORKFLOW_NODE_TYPE_TEST: INodeTypeDescription = {
+	displayName: 'Execute Sub-workflow',
+	icon: 'fa:sign-in-alt',
+	iconColor: 'orange-red',
+	group: ['transform'],
+	version: [1, 1.1, 1.2],
+	subtitle: '={{"Workflow: " + $parameter["workflowId"]}}',
+	description: 'Execute another workflow',
+	defaults: { name: 'Execute Workflow', color: '#ff6d5a' },
+	inputs: [NodeConnectionType.Main],
+	outputs: [NodeConnectionType.Main],
+	properties: [
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'hidden',
+			noDataExpression: true,
+			default: 'call_workflow',
+			options: [{ name: 'Execute a Sub-Workflow', value: 'call_workflow' }],
+		},
+		{
+			displayName: 'This node is out of date. Please upgrade by removing it and adding a new one',
+			name: 'outdatedVersionWarning',
+			type: 'notice',
+			displayOptions: { show: { '@version': [{ _cnd: { lte: 1.1 } }] } },
+			default: '',
+		},
+		{
+			displayName: 'Source',
+			name: 'source',
+			type: 'options',
+			options: [
+				{
+					name: 'Database',
+					value: 'database',
+					description: 'Load the workflow from the database by ID',
+				},
+				{
+					name: 'Local File',
+					value: 'localFile',
+					description: 'Load the workflow from a locally saved file',
+				},
+				{
+					name: 'Parameter',
+					value: 'parameter',
+					description: 'Load the workflow from a parameter',
+				},
+				{ name: 'URL', value: 'url', description: 'Load the workflow from an URL' },
+			],
+			default: 'database',
+			description: 'Where to get the workflow to execute from',
+			displayOptions: { show: { '@version': [{ _cnd: { lte: 1.1 } }] } },
+		},
+		{
+			displayName: 'Source',
+			name: 'source',
+			type: 'options',
+			options: [
+				{
+					name: 'Database',
+					value: 'database',
+					description: 'Load the workflow from the database by ID',
+				},
+				{
+					name: 'Define Below',
+					value: 'parameter',
+					description: 'Pass the JSON code of a workflow',
+				},
+			],
+			default: 'database',
+			description: 'Where to get the workflow to execute from',
+			displayOptions: { show: { '@version': [{ _cnd: { gte: 1.2 } }] } },
+		},
+		{
+			displayName: 'Workflow ID',
+			name: 'workflowId',
+			type: 'string',
+			displayOptions: { show: { source: ['database'], '@version': [1] } },
+			default: '',
+			required: true,
+			hint: 'Can be found in the URL of the workflow',
+			description:
+				"Note on using an expression here: if this node is set to run once with all items, they will all be sent to the <em>same</em> workflow. That workflow's ID will be calculated by evaluating the expression for the <strong>first input item</strong>.",
+		},
+		{
+			displayName: 'Workflow',
+			name: 'workflowId',
+			type: 'workflowSelector',
+			displayOptions: { show: { source: ['database'], '@version': [{ _cnd: { gte: 1.1 } }] } },
+			default: '',
+			required: true,
+			hint: "Note on using an expression here: if this node is set to run once with all items, they will all be sent to the <em>same</em> workflow. That workflow's ID will be calculated by evaluating the expression for the <strong>first input item</strong>.",
+		},
+		{
+			displayName: 'Workflow Path',
+			name: 'workflowPath',
+			type: 'string',
+			displayOptions: { show: { source: ['localFile'] } },
+			default: '',
+			placeholder: '/data/workflow.json',
+			required: true,
+			description: 'The path to local JSON workflow file to execute',
+		},
+		{
+			displayName: 'Workflow JSON',
+			name: 'workflowJson',
+			type: 'json',
+			typeOptions: { rows: 10 },
+			displayOptions: { show: { source: ['parameter'] } },
+			default: '\n\n\n',
+			required: true,
+			description: 'The workflow JSON code to execute',
+		},
+		{
+			displayName: 'Workflow URL',
+			name: 'workflowUrl',
+			type: 'string',
+			displayOptions: { show: { source: ['url'] } },
+			default: '',
+			placeholder: 'https://example.com/workflow.json',
+			required: true,
+			description: 'The URL from which to load the workflow from',
+		},
+		{
+			displayName:
+				'Any data you pass into this node will be output by the Execute Workflow Trigger. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.executeworkflow/" target="_blank">More info</a>',
+			name: 'executeWorkflowNotice',
+			type: 'notice',
+			default: '',
+			displayOptions: { show: { '@version': [{ _cnd: { lte: 1.1 } }] } },
+		},
+		{
+			displayName: 'Workflow Inputs',
+			name: 'workflowInputs',
+			type: 'resourceMapper',
+			noDataExpression: true,
+			default: { mappingMode: 'defineBelow', value: null },
+			required: true,
+			typeOptions: {
+				loadOptionsDependsOn: ['workflowId.value'],
+				resourceMapper: {
+					localResourceMapperMethod: 'loadWorkflowInputMappings',
+					valuesLabel: 'Workflow Inputs',
+					mode: 'map',
+					fieldWords: { singular: 'input', plural: 'inputs' },
+					addAllFields: true,
+					multiKeyMatch: false,
+					supportAutoMap: false,
+					showTypeConversionOptions: true,
+				},
+			},
+			displayOptions: {
+				show: { source: ['database'], '@version': [{ _cnd: { gte: 1.2 } }] },
+				hide: { workflowId: [''] },
+			},
+		},
+		{
+			displayName: 'Mode',
+			name: 'mode',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{
+					name: 'Run once with all items',
+					value: 'once',
+					description: 'Pass all items into a single execution of the sub-workflow',
+				},
+				{
+					name: 'Run once for each item',
+					value: 'each',
+					description: 'Call the sub-workflow individually for each item',
+				},
+			],
+			default: 'once',
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			default: {},
+			placeholder: 'Add option',
+			options: [
+				{
+					displayName: 'Wait For Sub-Workflow Completion',
+					name: 'waitForSubWorkflow',
+					type: 'boolean',
+					default: true,
+					description:
+						'Whether the main workflow should wait for the sub-workflow to complete its execution before proceeding',
+				},
+			],
+		},
+	],
+	codex: {
+		categories: ['Core Nodes'],
+		subcategories: { 'Core Nodes': ['Helpers', 'Flow'] },
+		alias: ['n8n', 'call', 'sub', 'workflow', 'sub-workflow', 'subworkflow'],
+		resources: {
+			primaryDocumentation: [
+				{
+					url: 'https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.executeworkflow/',
+				},
+			],
+		},
+	},
+	name: 'n8n-nodes-base.executeWorkflow',
+};
diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.ts b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.ts
new file mode 100644
index 0000000000000..b2419d939139b
--- /dev/null
+++ b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.ts
@@ -0,0 +1,95 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import ResourceMapper from './ResourceMapper.vue';
+import { createTestingPinia } from '@pinia/testing';
+import {
+	WORKFLOW_INPUTS_TEST_PARAMETER,
+	WORKFLOW_INPUTS_TEST_NODE,
+	WORKFLOW_INPUTS_TEST_PARAMETER_PATH,
+	EXECUTE_WORKFLOW_NODE_TYPE_TEST,
+} from './ResourceMapper.test.constants';
+import { mockedStore, waitAllPromises } from '@/__tests__/utils';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+
+vi.mock('vue-router', async () => {
+	const actual = await vi.importActual('vue-router');
+	const params = {};
+	const location = {};
+	return {
+		...actual,
+		useRouter: () => ({
+			push: vi.fn(),
+		}),
+		useRoute: () => ({
+			params,
+			location,
+		}),
+	};
+});
+
+let nodeTypesStore: ReturnType<typeof mockedStore<typeof useNodeTypesStore>>;
+
+const renderComponent = createComponentRenderer(ResourceMapper, {
+	props: {
+		inputSize: 'small',
+		labelSize: 'small',
+		dependentParametersValues: '-1',
+		isReadonly: false,
+		teleported: false,
+	},
+	global: {
+		stubs: {
+			ParameterInputFull: { template: '<div data-test-id="field-input"></div>' },
+		},
+	},
+});
+
+describe('ResourceMapper::Workflow Inputs', () => {
+	beforeEach(() => {
+		createTestingPinia();
+		nodeTypesStore = mockedStore(useNodeTypesStore);
+		nodeTypesStore.nodeTypes = {
+			'n8n-nodes-base.executeWorkflow': {
+				1.2: EXECUTE_WORKFLOW_NODE_TYPE_TEST,
+			},
+		};
+	});
+
+	it('renders', async () => {
+		expect(() =>
+			renderComponent({
+				props: {
+					parameter: WORKFLOW_INPUTS_TEST_PARAMETER,
+					node: WORKFLOW_INPUTS_TEST_NODE,
+					path: WORKFLOW_INPUTS_TEST_PARAMETER_PATH,
+				},
+			}),
+		).not.toThrow();
+	});
+
+	it.only('renders workflow inputs list correctly', async () => {
+		nodeTypesStore.getLocalResourceMapperFields.mockResolvedValue({
+			fields: [
+				{
+					id: 'name',
+					displayName: 'name',
+					required: false,
+					defaultMatch: false,
+					display: true,
+					canBeUsedToMatch: true,
+					type: 'string',
+					removed: false,
+				},
+			],
+		});
+		const { getByTestId, getAllByTestId } = renderComponent({
+			props: {
+				parameter: WORKFLOW_INPUTS_TEST_PARAMETER,
+				node: WORKFLOW_INPUTS_TEST_NODE,
+				path: WORKFLOW_INPUTS_TEST_PARAMETER_PATH,
+			},
+		});
+		await waitAllPromises();
+		expect(getByTestId('mapping-fields-container')).toBeInTheDocument();
+		expect(getAllByTestId('field-input')).toHaveLength(1);
+	});
+});

From b0203ae1bf4b9e4d9c0f5ab022c300c02ca2bf2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Mon, 27 Jan 2025 14:43:05 +0100
Subject: [PATCH 10/13] =?UTF-8?q?=E2=9C=85=20Adding=20empty=20fields=20tes?=
 =?UTF-8?q?t,=20refactoring=20test=20data?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ResourceMapper.test.constants.ts          | 65 +++++--------------
 .../ResourceMapper/ResourceMapper.test.ts     | 36 ++++++++--
 .../ResourceMapper/ResourceMapper.vue         |  6 +-
 3 files changed, 52 insertions(+), 55 deletions(-)

diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.constants.ts b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.constants.ts
index d2d9b0a6db2c9..6136da25a474f 100644
--- a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.constants.ts
+++ b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.constants.ts
@@ -27,10 +27,6 @@ export const WORKFLOW_INPUTS_TEST_PARAMETER: INodeProperties = {
 			showTypeConversionOptions: false,
 		},
 	},
-	displayOptions: {
-		show: { source: ['database'], '@version': [{ _cnd: { gte: 1.2 } }] },
-		hide: { workflowId: [''] },
-	},
 };
 
 export const WORKFLOW_INPUTS_TEST_NODE: INode = {
@@ -39,9 +35,9 @@ export const WORKFLOW_INPUTS_TEST_NODE: INode = {
 		source: 'database',
 		workflowId: {
 			__rl: true,
-			value: 'yjNDOVueewSXi3tY',
+			value: 'test123',
 			mode: 'list',
-			cachedResultName: 'Workflow inputs — child-test',
+			cachedResultName: 'Workflow inputs—test',
 		},
 		workflowInputs: {
 			_custom: {
@@ -53,49 +49,22 @@ export const WORKFLOW_INPUTS_TEST_NODE: INode = {
 					matchingColumns: [],
 					schema: [
 						{
-							_custom: {
-								type: 'reactive',
-								stateTypeName: 'Reactive',
-								value: {
-									id: 'aField',
-									displayName: 'aField',
-									required: false,
-									defaultMatch: false,
-									display: true,
-									canBeUsedToMatch: true,
-									type: 'string',
-								},
-							},
-						},
-						{
-							_custom: {
-								type: 'reactive',
-								stateTypeName: 'Reactive',
-								value: {
-									id: 'aNumber',
-									displayName: 'aNumber',
-									required: false,
-									defaultMatch: false,
-									display: true,
-									canBeUsedToMatch: true,
-									type: 'number',
-								},
-							},
+							id: 'firstName',
+							displayName: 'First Name',
+							required: false,
+							defaultMatch: false,
+							display: true,
+							canBeUsedToMatch: true,
+							type: 'string',
 						},
 						{
-							_custom: {
-								type: 'reactive',
-								stateTypeName: 'Reactive',
-								value: {
-									id: 'hello',
-									displayName: 'hello',
-									required: false,
-									defaultMatch: false,
-									display: true,
-									canBeUsedToMatch: true,
-									type: 'string',
-								},
-							},
+							id: 'lastName',
+							displayName: 'Last Name',
+							required: false,
+							defaultMatch: false,
+							display: true,
+							canBeUsedToMatch: true,
+							type: 'string',
 						},
 					],
 					attemptToConvertTypes: false,
@@ -109,7 +78,7 @@ export const WORKFLOW_INPUTS_TEST_NODE: INode = {
 	type: 'n8n-nodes-base.executeWorkflow',
 	typeVersion: 1.2,
 	position: [220, 0],
-	id: '571e6db4-404f-40d2-8bf1-5c04d3101be4',
+	id: 'test-123',
 	name: 'Execute Workflow',
 };
 
diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.ts b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.ts
index b2419d939139b..1f111eab2cc2f 100644
--- a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.ts
+++ b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.ts
@@ -66,18 +66,24 @@ describe('ResourceMapper::Workflow Inputs', () => {
 		).not.toThrow();
 	});
 
-	it.only('renders workflow inputs list correctly', async () => {
+	it('renders workflow inputs list correctly', async () => {
 		nodeTypesStore.getLocalResourceMapperFields.mockResolvedValue({
 			fields: [
 				{
-					id: 'name',
-					displayName: 'name',
+					id: 'firstName',
+					displayName: 'First Name',
+					type: 'string',
 					required: false,
 					defaultMatch: false,
 					display: true,
-					canBeUsedToMatch: true,
+				},
+				{
+					id: 'lastName',
+					displayName: 'Last Name',
 					type: 'string',
-					removed: false,
+					required: false,
+					defaultMatch: false,
+					display: true,
 				},
 			],
 		});
@@ -90,6 +96,24 @@ describe('ResourceMapper::Workflow Inputs', () => {
 		});
 		await waitAllPromises();
 		expect(getByTestId('mapping-fields-container')).toBeInTheDocument();
-		expect(getAllByTestId('field-input')).toHaveLength(1);
+		expect(getAllByTestId('field-input')).toHaveLength(2);
+	});
+
+	it('renders provided empty fields message', async () => {
+		nodeTypesStore.getLocalResourceMapperFields.mockResolvedValue({
+			fields: [],
+			emptyFieldsNotice: 'Nothing <b>here</b>',
+		});
+		const { queryByTestId, queryAllByTestId, getByTestId } = renderComponent({
+			props: {
+				parameter: WORKFLOW_INPUTS_TEST_PARAMETER,
+				node: WORKFLOW_INPUTS_TEST_NODE,
+				path: WORKFLOW_INPUTS_TEST_PARAMETER_PATH,
+			},
+		});
+		await waitAllPromises();
+		expect(queryByTestId('mapping-fields-container')).not.toBeInTheDocument();
+		expect(queryAllByTestId('field-input')).toHaveLength(0);
+		expect(getByTestId('empty-fields-notice')).toHaveTextContent('Nothing here');
 	});
 });
diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
index fc7d263611aa1..f385842683fbf 100644
--- a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
@@ -623,7 +623,11 @@ defineExpose({
 			@add-field="addField"
 			@refresh-field-list="initFetching(true)"
 		/>
-		<N8nNotice v-else-if="state.emptyFieldsNotice && !state.hasStaleFields" type="info">
+		<N8nNotice
+			v-else-if="state.emptyFieldsNotice && !state.hasStaleFields"
+			type="info"
+			data-test-id="empty-fields-notice"
+		>
 			<span v-n8n-html="state.emptyFieldsNotice"></span>
 		</N8nNotice>
 		<N8nCallout v-else-if="state.hasStaleFields" theme="info" :iconless="true">

From 615669c391d160cc44bc08e226558d92cc4eedb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Mon, 27 Jan 2025 15:33:13 +0100
Subject: [PATCH 11/13] =?UTF-8?q?=E2=9C=94=EF=B8=8F=20Updating=20test=20no?=
 =?UTF-8?q?de=20parameters=20format?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExecuteWorkflowTrigger.node.test.ts           | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.test.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.test.ts
index b479538c3a727..ecc763b418376 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.test.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.test.ts
@@ -32,11 +32,16 @@ describe('ExecuteWorkflowTrigger', () => {
 
 	it('should filter out parent input in `Using Fields below` mode', async () => {
 		executeFns.getNodeParameter.mockReturnValueOnce(WORKFLOW_INPUTS);
-		const mockNewParams = [
-			{ name: 'value1', type: 'string' },
-			{ name: 'value2', type: 'number' },
-			{ name: 'foo', type: 'string' },
-		] as FieldValueOption[];
+		const mockNewParams: {
+			fields: FieldValueOption[];
+			noFieldsMessage?: string;
+		} = {
+			fields: [
+				{ name: 'value1', type: 'string' },
+				{ name: 'value2', type: 'number' },
+				{ name: 'foo', type: 'string' },
+			],
+		};
 		const getFieldEntriesMock = (getFieldEntries as jest.Mock).mockReturnValue(mockNewParams);
 
 		const result = await new ExecuteWorkflowTrigger().execute.call(executeFns);

From 117dc1413542c20589b1c6f345678039155ab88e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Tue, 28 Jan 2025 09:38:41 +0100
Subject: [PATCH 12/13] =?UTF-8?q?=F0=9F=91=8C=20Updating=20workflow=20trig?=
 =?UTF-8?q?ger=20name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor-ui/src/constants.workflows.ts               | 4 ++--
 packages/editor-ui/src/plugins/i18n/locales/en.json         | 4 ++--
 .../ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/editor-ui/src/constants.workflows.ts b/packages/editor-ui/src/constants.workflows.ts
index 05884c3c85f17..f7f0afd973003 100644
--- a/packages/editor-ui/src/constants.workflows.ts
+++ b/packages/editor-ui/src/constants.workflows.ts
@@ -10,7 +10,7 @@ export const SAMPLE_SUBWORKFLOW_WORKFLOW: WorkflowDataWithTemplateId = {
 		{
 			id: 'c055762a-8fe7-4141-a639-df2372f30060',
 			typeVersion: 1.1,
-			name: 'When Called by Another Workflow',
+			name: 'When Executed by Another Workflow',
 			type: 'n8n-nodes-base.executeWorkflowTrigger',
 			position: [260, 340],
 			parameters: {},
@@ -24,7 +24,7 @@ export const SAMPLE_SUBWORKFLOW_WORKFLOW: WorkflowDataWithTemplateId = {
 		},
 	] as INodeUi[],
 	connections: {
-		'When Called by Another Workflow': {
+		'When Executed by Another Workflow': {
 			main: [
 				[
 					{
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 0e1848009e7de..6760dbcff5875 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -1163,7 +1163,7 @@
 	"nodeCreator.triggerHelperPanel.whatHappensNext": "What happens next?",
 	"nodeCreator.triggerHelperPanel.selectATrigger": "What triggers this workflow?",
 	"nodeCreator.triggerHelperPanel.selectATriggerDescription": "A trigger is a step that starts your workflow",
-	"nodeCreator.triggerHelperPanel.workflowTriggerDisplayName": "When called by another workflow",
+	"nodeCreator.triggerHelperPanel.workflowTriggerDisplayName": "When Executed by Another Workflow",
 	"nodeCreator.triggerHelperPanel.workflowTriggerDescription": "Runs the flow when called by the Execute Workflow node from a different workflow",
 	"nodeCreator.aiPanel.aiNodes": "AI Nodes",
 	"nodeCreator.aiPanel.aiOtherNodes": "Other AI Nodes",
@@ -1184,7 +1184,7 @@
 	"nodeCreator.aiPanel.whatHappensNext": "What happens next?",
 	"nodeCreator.aiPanel.selectATrigger": "Select an AI Component",
 	"nodeCreator.aiPanel.selectATriggerDescription": "A trigger is a step that starts your workflow",
-	"nodeCreator.aiPanel.workflowTriggerDisplayName": "When called by another workflow",
+	"nodeCreator.aiPanel.workflowTriggerDisplayName": "When Executed by Another Workflow",
 	"nodeCreator.aiPanel.workflowTriggerDescription": "Runs the flow when called by the Execute Workflow node from a different workflow",
 	"nodeCreator.nodeItem.triggerIconTitle": "Trigger Node",
 	"nodeCreator.nodeItem.aiIconTitle": "LangChain AI Node",
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
index 4ebb8db19b941..99d8c60ad6d43 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
@@ -30,7 +30,7 @@ export class ExecuteWorkflowTrigger implements INodeType {
 		eventTriggerDescription: '',
 		maxNodes: 1,
 		defaults: {
-			name: 'When Called by Another Workflow',
+			name: 'When Executed by Another Workflow',
 			color: '#ff6d5a',
 		},
 		inputs: [],
@@ -59,8 +59,8 @@ export class ExecuteWorkflowTrigger implements INodeType {
 					{
 						name: 'Workflow Call',
 						value: 'worklfow_call',
-						description: 'When called by another workflow using Execute Workflow Trigger',
-						action: 'When Called by Another Workflow',
+						description: 'When executed by another workflow using Execute Workflow Trigger',
+						action: 'When executed by Another Workflow',
 					},
 				],
 				default: 'worklfow_call',

From 7e98b986a7a9bb7b56135ec6a1041bcbd0797af6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Tue, 28 Jan 2025 11:02:46 +0100
Subject: [PATCH 13/13] =?UTF-8?q?=F0=9F=91=8C=20Allowing=20custom=20'empty?=
 =?UTF-8?q?=20fields'=20message=20for=20each=20node?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ToolWorkflow/v2/ToolWorkflowV2.node.ts    |  6 ++--
 .../tools/ToolWorkflow/v2/methods/index.ts    |  1 +
 .../v2/methods/localResourceMapping.ts        | 24 +++++++++++++++
 .../ToolWorkflow/v2/versionDescription.ts     |  2 +-
 .../ExecuteWorkflow/ExecuteWorkflow.node.ts   | 12 +++-----
 .../ExecuteWorkflow/methods/index.ts          |  1 +
 .../methods/localResourceMapping.ts           | 25 ++++++++++++++++
 .../GenericFunctions.ts                       | 30 +++++++------------
 packages/workflow/src/Interfaces.ts           |  7 ++++-
 9 files changed, 75 insertions(+), 33 deletions(-)
 create mode 100644 packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/methods/index.ts
 create mode 100644 packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/methods/localResourceMapping.ts
 create mode 100644 packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/methods/index.ts
 create mode 100644 packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/methods/localResourceMapping.ts

diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.node.ts
index 22ca31e4da2b1..98ca94cb1fa71 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.node.ts
@@ -1,4 +1,3 @@
-import { loadWorkflowInputMappings } from 'n8n-nodes-base/dist/utils/workflowInputsResourceMapping/GenericFunctions';
 import type {
 	INodeTypeBaseDescription,
 	ISupplyDataFunctions,
@@ -7,6 +6,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import { localResourceMapping } from './methods';
 import { WorkflowToolService } from './utils/WorkflowToolService';
 import { versionDescription } from './versionDescription';
 
@@ -21,9 +21,7 @@ export class ToolWorkflowV2 implements INodeType {
 	}
 
 	methods = {
-		localResourceMapping: {
-			loadWorkflowInputMappings,
-		},
+		localResourceMapping,
 	};
 
 	async supplyData(this: ISupplyDataFunctions, itemIndex: number): Promise<SupplyData> {
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/methods/index.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/methods/index.ts
new file mode 100644
index 0000000000000..f43c9557eab52
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/methods/index.ts
@@ -0,0 +1 @@
+export * as localResourceMapping from './localResourceMapping';
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/methods/localResourceMapping.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/methods/localResourceMapping.ts
new file mode 100644
index 0000000000000..598b3250ea8bd
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/methods/localResourceMapping.ts
@@ -0,0 +1,24 @@
+import { loadWorkflowInputMappings } from 'n8n-nodes-base/dist/utils/workflowInputsResourceMapping/GenericFunctions';
+import type { ILocalLoadOptionsFunctions, ResourceMapperFields } from 'n8n-workflow';
+
+export async function loadSubWorkflowInputs(
+	this: ILocalLoadOptionsFunctions,
+): Promise<ResourceMapperFields> {
+	const { fields, dataMode, subworkflowInfo } = await loadWorkflowInputMappings.bind(this)();
+	let emptyFieldsNotice: string | undefined;
+	if (fields.length === 0) {
+		const subworkflowLink = subworkflowInfo?.id
+			? `<a href="/workflow/${subworkflowInfo?.id}" target="_blank">sub-workflow’s trigger</a>`
+			: 'sub-workflow’s trigger';
+
+		switch (dataMode) {
+			case 'passthrough':
+				emptyFieldsNotice = `This sub-workflow will consume all input data passed to it. Define specific expected input in the ${subworkflowLink}.`;
+				break;
+			default:
+				emptyFieldsNotice = `This sub-workflow will not receive any input when called by your AI node. Define your expected input in the ${subworkflowLink}.`;
+				break;
+		}
+	}
+	return { fields, emptyFieldsNotice };
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/versionDescription.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/versionDescription.ts
index 469a7d6d4cb34..6d4275b4497f7 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/versionDescription.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/versionDescription.ts
@@ -107,7 +107,7 @@ export const versionDescription: INodeTypeDescription = {
 			typeOptions: {
 				loadOptionsDependsOn: ['workflowId.value'],
 				resourceMapper: {
-					localResourceMapperMethod: 'loadWorkflowInputMappings',
+					localResourceMapperMethod: 'loadSubWorkflowInputs',
 					valuesLabel: 'Workflow Inputs',
 					mode: 'map',
 					fieldWords: {
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts
index 6b5f4bd1873ae..a0ab059ab4c79 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts
@@ -8,11 +8,9 @@ import type {
 } from 'n8n-workflow';
 
 import { getWorkflowInfo } from './GenericFunctions';
+import { localResourceMapping } from './methods';
 import { generatePairedItemData } from '../../../utils/utilities';
-import {
-	getCurrentWorkflowInputData,
-	loadWorkflowInputMappings,
-} from '../../../utils/workflowInputsResourceMapping/GenericFunctions';
+import { getCurrentWorkflowInputData } from '../../../utils/workflowInputsResourceMapping/GenericFunctions';
 export class ExecuteWorkflow implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Execute Sub-workflow',
@@ -210,7 +208,7 @@ export class ExecuteWorkflow implements INodeType {
 				typeOptions: {
 					loadOptionsDependsOn: ['workflowId.value'],
 					resourceMapper: {
-						localResourceMapperMethod: 'loadWorkflowInputMappings',
+						localResourceMapperMethod: 'loadSubWorkflowInputs',
 						valuesLabel: 'Workflow Inputs',
 						mode: 'map',
 						fieldWords: {
@@ -275,9 +273,7 @@ export class ExecuteWorkflow implements INodeType {
 	};
 
 	methods = {
-		localResourceMapping: {
-			loadWorkflowInputMappings,
-		},
+		localResourceMapping,
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/methods/index.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/methods/index.ts
new file mode 100644
index 0000000000000..f43c9557eab52
--- /dev/null
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/methods/index.ts
@@ -0,0 +1 @@
+export * as localResourceMapping from './localResourceMapping';
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/methods/localResourceMapping.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/methods/localResourceMapping.ts
new file mode 100644
index 0000000000000..e6770dde6f83f
--- /dev/null
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/methods/localResourceMapping.ts
@@ -0,0 +1,25 @@
+import type { ILocalLoadOptionsFunctions, ResourceMapperFields } from 'n8n-workflow';
+
+import { loadWorkflowInputMappings } from '@utils/workflowInputsResourceMapping/GenericFunctions';
+
+export async function loadSubWorkflowInputs(
+	this: ILocalLoadOptionsFunctions,
+): Promise<ResourceMapperFields> {
+	const { fields, dataMode, subworkflowInfo } = await loadWorkflowInputMappings.bind(this)();
+	let emptyFieldsNotice: string | undefined;
+	if (fields.length === 0) {
+		const subworkflowLink = subworkflowInfo?.id
+			? `<a href="/workflow/${subworkflowInfo?.id}" target="_blank">sub-workflow’s trigger</a>`
+			: 'sub-workflow’s trigger';
+
+		switch (dataMode) {
+			case 'passthrough':
+				emptyFieldsNotice = `This sub-workflow will consume all input data passed to it. You can define specific expected input in the ${subworkflowLink}.`;
+				break;
+			default:
+				emptyFieldsNotice = `The sub-workflow isn't set up to accept any inputs. Change this in the ${subworkflowLink}.`;
+				break;
+		}
+	}
+	return { fields, emptyFieldsNotice };
+}
diff --git a/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts b/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
index f641d00c7e43f..006d1bb0914c9 100644
--- a/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
+++ b/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
@@ -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';
 
@@ -66,8 +66,9 @@ function parseJsonExample(context: IWorkflowNodeContext): JSONSchema7 {
 }
 
 export function getFieldEntries(context: IWorkflowNodeContext): {
-	noFieldsMessage: string | undefined;
+	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';
@@ -92,20 +93,9 @@ export function getFieldEntries(context: IWorkflowNodeContext): {
 	}
 
 	if (Array.isArray(result)) {
-		let noFieldsMessage: string | undefined;
 		const dataMode = String(inputSource);
-		if (result.length === 0) {
-			const id = context.getWorkflow().id;
-			switch (dataMode) {
-				case PASSTHROUGH:
-					noFieldsMessage = `All input data to this node will be passed to the sub-workflow. You can change this in the <a href="/workflow/${id}" target="_blank">sub-workflow's trigger</a>.`;
-					break;
-				default:
-					noFieldsMessage = `The sub-workflow isn't set up to accept any inputs. Change this in the <a href="/workflow/${id}" target="_blank">sub-workflow's trigger</a>.`;
-					break;
-			}
-		}
-		return { fields: result, noFieldsMessage };
+		const workflow = context.getWorkflow();
+		return { fields: result, dataMode, subworkflowInfo: { id: workflow.id } };
 	}
 	throw new NodeOperationError(context.getNode(), result);
 }
@@ -156,14 +146,16 @@ 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 emptyFieldsNotice: string | undefined;
+	let dataMode: string = PASSTHROUGH;
+	let subworkflowInfo: { id?: string } | undefined;
 
 	if (nodeLoadContext) {
 		const fieldValues = getFieldEntries(nodeLoadContext);
-		emptyFieldsNotice = fieldValues.noFieldsMessage;
+		dataMode = fieldValues.dataMode;
+		subworkflowInfo = fieldValues.subworkflowInfo;
 
 		fields = fieldValues.fields.map((currentWorkflowInput) => {
 			const field: ResourceMapperField = {
@@ -182,5 +174,5 @@ export async function loadWorkflowInputMappings(
 			return field;
 		});
 	}
-	return { fields, emptyFieldsNotice };
+	return { fields, dataMode, subworkflowInfo };
 }
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 705448aab27c6..ff0b1ad973061 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -2660,10 +2660,15 @@ export interface IExecutionSummaryNodeExecutionResult {
 
 export interface ResourceMapperFields {
 	fields: ResourceMapperField[];
-	mode?: string;
 	emptyFieldsNotice?: string;
 }
 
+export interface WorkflowInputsData {
+	fields: ResourceMapperField[];
+	dataMode: string;
+	subworkflowInfo?: { id?: string };
+}
+
 export interface ResourceMapperField {
 	id: string;
 	displayName: string;