fix(editor): Add missing node parameter values to AI Assistant request

packages/editor-ui/src/composables/__tests__/useWorkflowHelpers.spec.ts

@@ -7,6 +7,7 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useWorkflowsEEStore } from '@/stores/workflows.ee.store';
 import { useTagsStore } from '@/stores/tags.store';
 import { createTestWorkflow } from '@/__tests__/mocks';
+import type { AssignmentCollectionValue } from 'n8n-workflow';
 
 const getDuplicateTestWorkflow = (): IWorkflowDataUpdate => ({
 	name: 'Duplicate webhook test',
@@ -70,7 +71,7 @@ describe('useWorkflowHelpers', () => {
 		vi.clearAllMocks();
 	});
 
-	describe('resolveNodeExpressions', () => {
+	describe('getNodeParametersWithResolvedExpressions', () => {
 		it('should correctly detect and resolve expressions in a regular node ', () => {
 			const nodeParameters = {
 				curlImport: '',
@@ -85,8 +86,9 @@ describe('useWorkflowHelpers', () => {
 				infoMessage: '',
 			};
 			const workflowHelpers = useWorkflowHelpers({ router });
-			workflowHelpers.resolveNodeExpressions(nodeParameters);
-			expect(nodeParameters.url).toHaveProperty('resolvedExpressionValue');
+			const resolvedParameters =
+				workflowHelpers.getNodeParametersWithResolvedExpressions(nodeParameters);
+			expect(resolvedParameters.url).toHaveProperty('resolvedExpressionValue');
 		});
 
 		it('should correctly detect and resolve expressions in a node with assignments (set node) ', () => {
@@ -108,10 +110,12 @@ describe('useWorkflowHelpers', () => {
 				options: {},
 			};
 			const workflowHelpers = useWorkflowHelpers({ router });
-			workflowHelpers.resolveNodeExpressions(nodeParameters);
-			expect(nodeParameters.assignments.assignments[0].value).toHaveProperty(
-				'resolvedExpressionValue',
-			);
+			const resolvedParameters =
+				workflowHelpers.getNodeParametersWithResolvedExpressions(nodeParameters);
+			expect(resolvedParameters).toHaveProperty('assignments');
+			const assignments = resolvedParameters.assignments as AssignmentCollectionValue;
+			expect(assignments).toHaveProperty('assignments');
+			expect(assignments.assignments[0].value).toHaveProperty('resolvedExpressionValue');
 		});
 
 		it('should correctly detect and resolve expressions in a node with filter component', () => {
@@ -147,8 +151,12 @@ describe('useWorkflowHelpers', () => {
 				options: {},
 			};
 			const workflowHelpers = useWorkflowHelpers({ router });
-			workflowHelpers.resolveNodeExpressions(nodeParameters);
-			expect(nodeParameters.rules.values[0].conditions.conditions[0].leftValue).toHaveProperty(
+			const resolvedParameters = workflowHelpers.getNodeParametersWithResolvedExpressions(
+				nodeParameters,
+			) as typeof nodeParameters;
+			expect(resolvedParameters).toHaveProperty('rules');
+			expect(resolvedParameters.rules).toHaveProperty('values');
+			expect(resolvedParameters.rules.values[0].conditions.conditions[0].leftValue).toHaveProperty(
 				'resolvedExpressionValue',
 			);
 		});
@@ -172,9 +180,11 @@ describe('useWorkflowHelpers', () => {
 				options: {},
 			};
 			const workflowHelpers = useWorkflowHelpers({ router });
-			workflowHelpers.resolveNodeExpressions(nodeParameters);
-			expect(nodeParameters.documentId.value).toHaveProperty('resolvedExpressionValue');
-			expect(nodeParameters.sheetName.value).toHaveProperty('resolvedExpressionValue');
+			const resolvedParameters = workflowHelpers.getNodeParametersWithResolvedExpressions(
+				nodeParameters,
+			) as typeof nodeParameters;
+			expect(resolvedParameters.documentId.value).toHaveProperty('resolvedExpressionValue');
+			expect(resolvedParameters.sheetName.value).toHaveProperty('resolvedExpressionValue');
 		});
 		it('should correctly detect and resolve expressions in a node with resource mapper component', () => {
 			const nodeParameters = {
@@ -209,8 +219,10 @@ describe('useWorkflowHelpers', () => {
 				options: {},
 			};
 			const workflowHelpers = useWorkflowHelpers({ router });
-			workflowHelpers.resolveNodeExpressions(nodeParameters);
-			expect(nodeParameters.filtersUI.values[0].lookupValue).toHaveProperty(
+			const resolvedParameters = workflowHelpers.getNodeParametersWithResolvedExpressions(
+				nodeParameters,
+			) as typeof nodeParameters;
+			expect(resolvedParameters.filtersUI.values[0].lookupValue).toHaveProperty(
 				'resolvedExpressionValue',
 			);
 		});

packages/editor-ui/src/composables/useWorkflowHelpers.ts

@@ -693,30 +693,40 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 		return NodeHelpers.getNodeWebhookUrl(baseUrl, workflowId, node, path, isFullPath);
 	}
 
-	function resolveNodeExpressions(nodeParameters: INodeParameters): void {
-		function recurse(currentObj: { [key: string]: unknown }, currentPath: string) {
+	/**
+	 * Returns a copy of provided node parameters with added resolvedExpressionValue
+	 * @param nodeParameters
+	 * @returns
+	 */
+	function getNodeParametersWithResolvedExpressions(
+		nodeParameters: INodeParameters,
+	): INodeParameters {
+		function recurse(currentObj: INodeParameters, currentPath: string): INodeParameters {
+			const newObj: INodeParameters = {};
 			for (const key in currentObj) {
 				const value = currentObj[key as keyof typeof currentObj];
 				const path = currentPath ? `${currentPath}.${key}` : key;
 				if (typeof value === 'object' && value !== null) {
-					recurse(value as { [key: string]: unknown }, path);
-				} else if (typeof value === 'string' && String(value).startsWith('={{')) {
+					newObj[key] = recurse(value as INodeParameters, path);
+				} else if (typeof value === 'string' && String(value).startsWith('=')) {
 					// Resolve the expression if it is one
 					let resolved;
 					try {
 						resolved = resolveExpression(value, nodeParameters);
 					} catch (error) {
 						resolved = `Error in expression: "${error.message}"`;
 					}
-					// Updating the original object with the resolved value
-					currentObj[key] = {
+					newObj[key] = {
 						value,
-						resolvedExpressionValue: resolved,
+						resolvedExpressionValue: String(resolved),
 					};
+				} else {
+					newObj[key] = value;
 				}
 			}
+			return newObj;
 		}
-		recurse(nodeParameters, '');
+		return recurse(nodeParameters, '');
 	}
 
 	function resolveExpression(
@@ -1185,6 +1195,6 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 		getWorkflowProjectRole,
 		promptSaveUnsavedWorkflowChanges,
 		initState,
-		resolveNodeExpressions,
+		getNodeParametersWithResolvedExpressions,
 	};
 }