mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-09-19 22:37:31 -07:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(editor): Properly handle mapping of dragged expression if it contains hyphen (#5703)

Browse source
This commit is contained in:
OlegIvaniv 2023-03-16 14:10:30 +01:00 committed by GitHub
parent 02e35819ab
commit 7025efe865
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
packages/editor-ui/src/utils/__tests__/mappingUtils.test.ts
View file

@ -1,5 +1,5 @@
import { INodeProperties } from 'n8n-workflow';
import { getMappedResult } from '../mappingUtils';
import { getMappedResult, getMappedExpression } from '../mappingUtils';
const RLC_PARAM: INodeProperties = {
displayName: 'Base',
@ -199,4 +199,59 @@ describe('Mapping Utils', () => {
expect(getMappedResult(RLC_PARAM, '{{ test }}', '=test')).toEqual('=test {{ test }}');
});
});
describe('getMappedExpression', () => {
it('should generate a mapped expression with simple array path', () => {
const input = {
nodeName: 'nodeName',
distanceFromActive: 2,
path: ['sample', 'path'],
};
const result = getMappedExpression(input);
expect(result).toBe('{{ $node.nodeName.json.sample.path }}');
});
it('should generate a mapped expression with mixed array path', () => {
const input = {
nodeName: 'nodeName',
distanceFromActive: 2,
path: ['sample', 0, 'path'],
};
const result = getMappedExpression(input);
expect(result).toBe('{{ $node.nodeName.json.sample[0].path }}');
});
it('should generate a mapped expression with special characters in array path', () => {
const input = {
nodeName: 'nodeName',
distanceFromActive: 2,
path: ['sample', 'path with-space', 'path-with-hyphen'],
};
const result = getMappedExpression(input);
expect(result).toBe(
'{{ $node.nodeName.json.sample["path with-space"]["path-with-hyphen"] }}',
);
});
it('should generate a mapped expression with various path elements', () => {
const input = {
nodeName: 'nodeName',
distanceFromActive: 1,
path: ['propertyName', 'capitalizedName', 'hyphen-prop'],
};
const result = getMappedExpression(input);
expect(result).toBe('{{ $json.propertyName.capitalizedName["hyphen-prop"] }}');
});
it('should generate a mapped expression with a complex path', () => {
const input = {
nodeName: 'nodeName',
distanceFromActive: 1,
path: ['propertyName', 'capitalizedName', 'stringVal', 'some-value', 'capitalizedProp'],
};
const result = getMappedExpression(input);
expect(result).toBe(
'{{ $json.propertyName.capitalizedName.stringVal["some-value"].capitalizedProp }}',
);
});
});
});

2
packages/editor-ui/src/utils/mappingUtils.ts
View file

@ -6,7 +6,7 @@ export function generatePath(root: string, path: Array<string | number>): string
return `${accu}[${part}]`;
}
if (part.includes(' ') || part.includes('.')) {
if (part.includes('-') || part.includes(' ') || part.includes('.')) {
return `${accu}["${part}"]`;
}