mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 Fix issue with default value for multipleValues string with none

Browse source 
stanard default value
This commit is contained in:
Jan Oberhauser 2021-05-19 18:44:27 -05:00
parent b9b6e8b5df
commit e18370cb10
2 changed files with 88 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/workflow/src/NodeHelpers.ts
View file

@ -612,9 +612,8 @@ export function getNodeParameters(nodePropertiesArray: INodeProperties[], nodeVa
if (nodeValues[nodeProperties.name] !== undefined) { if (nodeValues[nodeProperties.name] !== undefined) {
nodeParameters[nodeProperties.name] = nodeValues[nodeProperties.name]; nodeParameters[nodeProperties.name] = nodeValues[nodeProperties.name];
} else if (returnDefaults === true) { } else if (returnDefaults === true) {
// Does not have values defined but defaults should be returned which is in the // Does not have values defined but defaults should be returned
// case of a collection with multipleValues always an empty array nodeParameters[nodeProperties.name] = JSON.parse(JSON.stringify(nodeProperties.default));
nodeParameters[nodeProperties.name] = [];
} }
nodeParametersFull[nodeProperties.name] = nodeParameters[nodeProperties.name]; nodeParametersFull[nodeProperties.name] = nodeParameters[nodeProperties.name];
} else { } else {

94
packages/workflow/test/NodeHelpers.test.ts
View file

@ -2174,7 +2174,7 @@ describe('Workflow', () => {
typeOptions: { typeOptions: {
multipleValues: true, multipleValues: true,
}, },
default: {}, default: [],
options: [ options: [
{ {
displayName: 'string1', displayName: 'string1',
@ -2195,17 +2195,13 @@ describe('Workflow', () => {
}, },
output: { output: {
noneDisplayedFalse: { noneDisplayedFalse: {
defaultsFalse: { defaultsFalse: {},
// collection1: [],
},
defaultsTrue: { defaultsTrue: {
collection1: [], collection1: [],
}, },
}, },
noneDisplayedTrue: { noneDisplayedTrue: {
defaultsFalse: { defaultsFalse: {},
// collection1: [],
},
defaultsTrue: { defaultsTrue: {
collection1: [], collection1: [],
}, },
@ -2940,7 +2936,7 @@ describe('Workflow', () => {
}, },
}, },
{ {
description: 'complex type "fixedCollection" with "multipleValues: true". Which contains parameter of type multiOptions and has so an array default value.', description: 'complex type "fixedCollection" with "multipleValues: true". Which contains parameter of type "multiOptions" and has so an array default value',
input: { input: {
nodePropertiesArray: [ nodePropertiesArray: [
{ {
@ -3028,6 +3024,88 @@ describe('Workflow', () => {
}, },
}, },
}, },
{
description: 'complex type "fixedCollection" with "multipleValues: true". Which contains parameter of type "string" with "multipleValues: true" and a custom default value',
input: {
nodePropertiesArray: [
{
name: 'values',
displayName: 'Values',
type: 'fixedCollection',
typeOptions: {
multipleValues: true,
},
default: {},
options: [
{
name: 'propertyValues',
displayName: 'Property',
values: [
{
displayName: 'MultiString',
name: 'multiString',
type: 'string',
typeOptions: {
multipleValues: true,
},
default: ['value1'],
},
],
},
],
},
],
nodeValues: {
values: {
propertyValues: [
{
multiString: ['value1'],
}
]
},
},
},
output: {
noneDisplayedFalse: {
defaultsFalse: {
values: {
propertyValues: [
{
}
],
},
},
defaultsTrue: {
values: {
propertyValues: [
{
multiString: ['value1'],
}
],
},
},
},
noneDisplayedTrue: {
defaultsFalse: {
values: {
propertyValues: [
{
}
],
},
},
defaultsTrue: {
values: {
propertyValues: [
{
multiString: ['value1'],
}
],
},
},
},
},
},
]; ];