⚡ Updating expression resolving logic

n8n-io · Sep 17, 2024 · 8aa94fc · 8aa94fc
1 parent 29db847
commit 8aa94fc
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/packages/editor-ui/src/composables/useWorkflowHelpers.ts b/packages/editor-ui/src/composables/useWorkflowHelpers.ts
@@ -712,7 +712,20 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 					// Resolve the expression if it is one
 					let resolved;
 					try {
-						resolved = resolveExpression(value, nodeParameters);
+						let opts: Parameters<typeof resolveExpression>[2] = {
+							isForCredential: false,
+						};
+						const ndvStore = useNDVStore();
+						if (ndvStore.isInputParentOfActiveNode) {
+							opts = {
+								...opts,
+								targetItem: ndvStore.expressionTargetItem ?? undefined,
+								inputNodeName: ndvStore.ndvInputNodeName,
+								inputRunIndex: ndvStore.ndvInputRunIndex,
+								inputBranchIndex: ndvStore.ndvInputBranchIndex,
+							};
+						}
+						resolved = resolveExpression(value, undefined, opts);
 					} catch (error) {
 						resolved = `Error in expression: "${error.message}"`;
 					}