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

🐛 Fix issue that expressions did not resolve for displayOptions

Browse Source
This commit is contained in:
Jan Oberhauser
2021-05-15 00:28:51 -05:00
parent 05dc0c327e
commit cb2887a8ab
3 changed files with 51 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/editor-ui/src/components/mixins/workflowHelpers.ts
View File

@@ -2,9 +2,11 @@ import { PLACEHOLDER_EMPTY_WORKFLOW_ID } from '@/constants';
import {
IConnections,
IDataObject,
INode,
INodeExecutionData,
INodeIssues,
INodeParameters,
INodeType,
INodeTypes,
INodeTypeData,
@@ -336,7 +338,7 @@ export const workflowHelpers = mixins(
},
// Executes the given expression and returns its value
resolveExpression (expression: string) {
resolveExpression (expression: string, siblingParameters: INodeParameters) {
const inputIndex = 0;
const itemIndex = 0;
const runIndex = 0;
@@ -362,7 +364,16 @@ export const workflowHelpers = mixins(
connectionInputData = [];
}
return workflow.expression.getParameterValue(expression, runExecutionData, runIndex, itemIndex, activeNode.name, connectionInputData, 'manual', true);
const parameters = {
'__xxxxxxx__': expression,
...siblingParameters,
};
const returnData = workflow.expression.getParameterValue(parameters, runExecutionData, runIndex, itemIndex, activeNode.name, connectionInputData, 'manual', false) as IDataObject;
if (typeof returnData['__xxxxxxx__'] === 'object') {
return workflow.expression.convertObjectValueToString(returnData['__xxxxxxx__'] as object);
}
return returnData['__xxxxxxx__'];
},
// Saves the currently loaded workflow to the database.