frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix error reporting of invalid jsonata in Join/reduce

Browse Source
This commit is contained in:
Nick O'Leary
2018-07-27 09:43:22 +01:00
parent 2000cadb17
commit 450f4d9a5a
2 changed files with 83 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
nodes/core/logic/17-split.js
View File

@@ -312,7 +312,7 @@ module.exports = function(RED) {
}
});
}).catch(err => {
throw new Error(RED._("join.errors.invalid-expr",{error:e.message}));
throw new Error(RED._("join.errors.invalid-expr",{error:err.message}));
});
}
@@ -371,15 +371,15 @@ module.exports = function(RED) {
function getInitialReduceValue(node, exp, exp_type) {
return new Promise((resolve, reject) => {
RED.util.evaluateNodeProperty(exp, exp_type, node, {},
(err, result) => {
if(err) {
return reject(err);
}
else {
return resolve(result);
}
});
});
(err, result) => {
if(err) {
return reject(err);
}
else {
return resolve(result);
}
});
});
}
function JoinNode(n) {
@@ -408,6 +408,7 @@ module.exports = function(RED) {
this.reduce_fixup = (exp_fixup !== undefined) ? RED.util.prepareJSONataExpression(exp_fixup, this) : undefined;
} catch(e) {
this.error(RED._("join.errors.invalid-expr",{error:e.message}));
return;
}
}