admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 18:12:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: PairedItems various fixes (no-changelog) (#9357)

Browse Source
This commit is contained in:
Michael Kret
2024-05-16 12:35:36 +03:00
committed by GitHub
parent c9855e3dce
commit 5a3122f279
5 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts
View File

@@ -368,7 +368,7 @@ export class MergeV2 implements INodeType {
let input1 = this.getInputData(0);
let input2 = this.getInputData(1);
if (input1.length === 0 || input2.length === 0) {
if (input1?.length === 0 || input2?.length === 0) {
// If data of any input is missing, return the data of
// the input that contains data
return [[...input1, ...input2]];
@@ -474,19 +474,19 @@ export class MergeV2 implements INodeType {
if (!input1) return [returnData];
}
if (input1.length === 0 || input2.length === 0) {
if (!input1.length && joinMode === 'keepNonMatches' && outputDataFrom === 'input1')
if (input1?.length === 0 || input2?.length === 0) {
if (!input1?.length && joinMode === 'keepNonMatches' && outputDataFrom === 'input1')
return [returnData];
if (!input2.length && joinMode === 'keepNonMatches' && outputDataFrom === 'input2')
if (!input2?.length && joinMode === 'keepNonMatches' && outputDataFrom === 'input2')
return [returnData];
if (joinMode === 'keepMatches') {
// Stop the execution
return [[]];
} else if (joinMode === 'enrichInput1' && input1.length === 0) {
} else if (joinMode === 'enrichInput1' && input1?.length === 0) {
// No data to enrich so stop
return [[]];
} else if (joinMode === 'enrichInput2' && input2.length === 0) {
} else if (joinMode === 'enrichInput2' && input2?.length === 0) {
// No data to enrich so stop
return [[]];
} else {