frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

allow filtering of debug node output within subflow

Browse Source
This commit is contained in:
Hiroyasu Nishiyama 2021-02-10 17:32:27 +09:00
parent f5da2eb633
commit 5a6568e7c2
1 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
packages/node_modules/@node-red/nodes/core/common/lib/debug/debug-utils.js vendored
View File

@ -120,7 +120,7 @@ RED.debug = (function() {
filteredNodes[node.id] = !$(this).prop('checked'); filteredNodes[node.id] = !$(this).prop('checked');
$(".red-ui-debug-msg-node-"+node.id.replace(/\./g,"_")).toggleClass('hide',filteredNodes[node.id]); $(".red-ui-debug-msg-node-"+node.id.replace(/\./g,"_")).toggleClass('hide',filteredNodes[node.id]);
}); });
if (!node.active || RED.nodes.workspace(node.z).disabled) { if ((node.hasOwnProperty("active") && !node.active) || RED.nodes.workspace(node.z).disabled) {
container.addClass('disabled'); container.addClass('disabled');
muteControl.checkboxSet('disable'); muteControl.checkboxSet('disable');
} }
@ -233,6 +233,35 @@ RED.debug = (function() {
} }
function containsDebug(sid, map) {
if (sid in map) {
return true;
}
var nodes = RED.nodes.filterNodes({z: sid});
var contain = false;
nodes.forEach(function (n) {
if (contain) {
return;
}
var nt = n.type;
if (nt === "debug") {
contain = true;
return;
}
if (nt.substring(0, 8) === "subflow:") {
var id = nt.substring(8);
if (containsDebug(id, map)) {
contain = true;
return;
}
}
});
if (contain) {
map[sid] = true;
}
return contain;
}
function refreshDebugNodeList() { function refreshDebugNodeList() {
debugNodeList.editableList('empty'); debugNodeList.editableList('empty');
var candidateNodes = RED.nodes.filterNodes({type:'debug'}); var candidateNodes = RED.nodes.filterNodes({type:'debug'});
@ -243,7 +272,18 @@ RED.debug = (function() {
}); });
candidateNodes = candidateNodes.filter(function(node) { candidateNodes = candidateNodes.filter(function(node) {
return workspaceOrderMap.hasOwnProperty(node.z); return workspaceOrderMap.hasOwnProperty(node.z);
}) });
var map = {};
RED.nodes.eachNode(function (n) {
var nt = n.type;
if ((n.z in workspaceOrderMap) &&
(nt.substring(0, 8) === "subflow:")) {
var sid = nt.substring(8);
if (containsDebug(sid, map)) {
candidateNodes.push(n);
}
}
});
candidateNodes.sort(function(A,B) { candidateNodes.sort(function(A,B) {
var wsA = workspaceOrderMap[A.z]; var wsA = workspaceOrderMap[A.z];
var wsB = workspaceOrderMap[B.z]; var wsB = workspaceOrderMap[B.z];
@ -253,7 +293,7 @@ RED.debug = (function() {
var labelA = RED.utils.getNodeLabel(A,A.id); var labelA = RED.utils.getNodeLabel(A,A.id);
var labelB = RED.utils.getNodeLabel(B,B.id); var labelB = RED.utils.getNodeLabel(B,B.id);
return labelA.localeCompare(labelB); return labelA.localeCompare(labelB);
}) });
var currentWs = null; var currentWs = null;
var nodeList = []; var nodeList = [];
candidateNodes.forEach(function(node) { candidateNodes.forEach(function(node) {
@ -262,10 +302,8 @@ RED.debug = (function() {
nodeList.push(RED.nodes.workspace(node.z)); nodeList.push(RED.nodes.workspace(node.z));
} }
nodeList.push(node); nodeList.push(node);
}) });
debugNodeList.editableList('addItems',nodeList);
debugNodeList.editableList('addItems',nodeList)
} }
function getTimestamp() { function getTimestamp() {