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

⚡ Fix overwrite option on Merge-Node

Browse source
This commit is contained in:
Jan Oberhauser 2020-01-19 14:01:10 -06:00
parent 642f857997
commit c5d4c6a1d3
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
packages/nodes-base/nodes/Merge.node.ts
View file

@ -179,14 +179,17 @@ export class Merge implements INodeType {
{
name: 'Always',
value: 'always',
description: 'Always overwrites everything.',
},
{
name: 'If Blank',
value: 'blank',
description: 'Overwrites only values of "null", "undefined" or empty string.',
},
{
name: 'If Missing',
value: 'undefined',
},
{
name: 'If Blank',
value: 'blank'
description: 'Only adds values which do not exist yet.',
},
],
default: 'always',
@ -404,11 +407,18 @@ export class Merge implements INodeType {
entry = JSON.parse(JSON.stringify(entry));
for (key of Object.keys(copyData[referenceValue as string].json)) {
// TODO: Currently only copies json data and no binary one
let value = copyData[referenceValue as string].json[key];
if (key === propertyName2) {
continue;
}
if (overwrite === 'always' || (overwrite === 'undefined' && ['null', 'undefined'].includes(typeof value)) || (overwrite === 'blank' && !value)) {
entry.json[key] = value
// TODO: Currently only copies json data and no binary one
const value = copyData[referenceValue as string].json[key];
if (
overwrite === 'always' ||
(overwrite === 'undefined' && !entry.json.hasOwnProperty(key)) ||
(overwrite === 'blank' && [null, undefined, ''].includes(entry.json[key] as string))
) {
entry.json[key] = value;
}
}
} else {