mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-02-21 02:56:40 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🔀 Merge branch 'airmoi-139-null-returnValues'

Browse source
This commit is contained in:
Jan Oberhauser 2020-02-07 17:07:42 -08:00
parent 79f863b670 b41d40cc95
commit bb487c9d96
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/editor-ui/src/components/ParameterInput.vue
View file

@ -276,7 +276,7 @@ export default mixins(
returnValue = this.expressionValueComputed; returnValue = this.expressionValueComputed;
} }
if (returnValue !== undefined && this.parameter.type === 'string') { if (returnValue !== undefined && returnValue !== null && this.parameter.type === 'string') {
const rows = this.getArgument('rows'); const rows = this.getArgument('rows');
if (rows === undefined || rows === 1) { if (rows === undefined || rows === 1) {
returnValue = returnValue.toString().replace(/\n/, '|'); returnValue = returnValue.toString().replace(/\n/, '|');

18
packages/workflow/src/Workflow.ts
View file

@ -890,16 +890,16 @@ export class Workflow {
// Execute the expression // Execute the expression
try { try {
const returnValue = tmpl.tmpl(parameterValue, dataProxy.getDataProxy()); const returnValue = tmpl.tmpl(parameterValue, dataProxy.getDataProxy());
if (typeof returnValue === 'object' && Object.keys(returnValue).length === 0) { if (returnValue !== null && typeof returnValue === 'object') {
// When expression is incomplete it returns a Proxy which causes problems. if (Object.keys(returnValue).length === 0) {
// Catch it with this code and return a proper error. // When expression is incomplete it returns a Proxy which causes problems.
throw new Error('Expression is not valid.'); // Catch it with this code and return a proper error.
throw new Error('Expression is not valid.');
}
if (returnObjectAsString === true) {
return this.convertObjectValueToString(returnValue);
}
} }
if (returnObjectAsString === true && typeof returnValue === 'object') {
return this.convertObjectValueToString(returnValue);
}
return returnValue; return returnValue;
} catch (e) { } catch (e) {
throw new Error('Expression is not valid.'); throw new Error('Expression is not valid.');