From ebc45a10bd6a51148284b155558993c4b6a75e7c Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Tue, 23 Jul 2024 10:48:27 +0300
Subject: [PATCH] fix(n8n Form Trigger Node): Execution from canvas (#10132)

---
 .../src/composables/useWorkflowHelpers.ts     | 45 ++++++++++---------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/packages/editor-ui/src/composables/useWorkflowHelpers.ts b/packages/editor-ui/src/composables/useWorkflowHelpers.ts
index 257abce265c5d..b78c030180261 100644
--- a/packages/editor-ui/src/composables/useWorkflowHelpers.ts
+++ b/packages/editor-ui/src/composables/useWorkflowHelpers.ts
@@ -67,16 +67,19 @@ import { useProjectsStore } from '@/stores/projects.store';
 import { useTagsStore } from '@/stores/tags.store';
 import useWorkflowsEEStore from '@/stores/workflows.ee.store';
 
+type ResolveParameterOptions = {
+	targetItem?: TargetItem;
+	inputNodeName?: string;
+	inputRunIndex?: number;
+	inputBranchIndex?: number;
+	additionalKeys?: IWorkflowDataProxyAdditionalKeys;
+	isForCredential?: boolean;
+	contextNodeName?: string;
+};
+
 export function resolveParameter<T = IDataObject>(
 	parameter: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[],
-	opts: {
-		targetItem?: TargetItem;
-		inputNodeName?: string;
-		inputRunIndex?: number;
-		inputBranchIndex?: number;
-		additionalKeys?: IWorkflowDataProxyAdditionalKeys;
-		isForCredential?: boolean;
-	} = {},
+	opts: ResolveParameterOptions = {},
 ): T | null {
 	let itemIndex = opts?.targetItem?.itemIndex || 0;
 
@@ -117,7 +120,9 @@ export function resolveParameter<T = IDataObject>(
 	}
 
 	const inputName = NodeConnectionType.Main;
-	const activeNode = useNDVStore().activeNode;
+
+	const activeNode =
+		useNDVStore().activeNode ?? useWorkflowsStore().getNodeByName(opts.contextNodeName || '');
 	let contextNode = activeNode;
 
 	if (activeNode) {
@@ -638,6 +643,7 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 		webhookData: IWebhookDescription,
 		key: string,
 		stringify = true,
+		nodeName?: string,
 	): string {
 		if (webhookData[key] === undefined) {
 			return 'empty';
@@ -646,7 +652,7 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 			return resolveExpression(
 				webhookData[key] as string,
 				undefined,
-				undefined,
+				{ contextNodeName: nodeName },
 				stringify,
 			) as string;
 		} catch (e) {
@@ -672,9 +678,14 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 		}
 
 		const workflowId = workflowsStore.workflowId;
-		const path = getWebhookExpressionValue(webhookData, 'path');
+		const path = getWebhookExpressionValue(webhookData, 'path', true, node.name);
 		const isFullPath =
-			(getWebhookExpressionValue(webhookData, 'isFullPath') as unknown as boolean) || false;
+			(getWebhookExpressionValue(
+				webhookData,
+				'isFullPath',
+				true,
+				node.name,
+			) as unknown as boolean) || false;
 
 		return NodeHelpers.getNodeWebhookUrl(baseUrl, workflowId, node, path, isFullPath);
 	}
@@ -682,15 +693,7 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 	function resolveExpression(
 		expression: string,
 		siblingParameters: INodeParameters = {},
-		opts: {
-			targetItem?: TargetItem;
-			inputNodeName?: string;
-			inputRunIndex?: number;
-			inputBranchIndex?: number;
-			c?: number;
-			additionalKeys?: IWorkflowDataProxyAdditionalKeys;
-			isForCredential?: boolean;
-		} = {},
+		opts: ResolveParameterOptions & { c?: number } = {},
 		stringifyObject = true,
 	) {
 		const parameters = {