Merge branch 'dev' into revert-4225-4196-fix-jsonata-env-var-async

This commit is contained in:
Nick O'Leary
2023-07-10 12:37:41 +01:00
committed by GitHub
5 changed files with 271 additions and 128 deletions

View File

@@ -527,10 +527,9 @@ class Flow {
// Delegate status to any nodes using this config node
for (let userNode in node.users) {
if (node.users.hasOwnProperty(userNode)) {
node.users[userNode]._flow.handleStatus(node,statusMessage,node.users[userNode],true);
handled = node.users[userNode]._flow.handleStatus(node,statusMessage,node.users[userNode],true) || handled;
}
}
handled = true;
} else {
const candidateNodes = [];
this.statusNodes.forEach(targetStatusNode => {
@@ -614,10 +613,9 @@ class Flow {
// Delegate status to any nodes using this config node
for (let userNode in node.users) {
if (node.users.hasOwnProperty(userNode)) {
node.users[userNode]._flow.handleError(node,logMessage,msg,node.users[userNode]);
handled = node.users[userNode]._flow.handleError(node,logMessage,msg,node.users[userNode]) || handled;
}
}
handled = true;
} else {
const candidateNodes = [];
this.catchNodes.forEach(targetCatchNode => {