From bbc32c4cd0efe91cc36e18f7dfd73f9f78c8fae9 Mon Sep 17 00:00:00 2001 From: ralphwetzel Date: Tue, 3 May 2022 22:17:00 +0200 Subject: [PATCH 1/9] Update 21-debug.html Tidy up a leftover development debug message ... with a smile! --- packages/node_modules/@node-red/nodes/core/common/21-debug.html | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/node_modules/@node-red/nodes/core/common/21-debug.html b/packages/node_modules/@node-red/nodes/core/common/21-debug.html index 40680b16f..51e47e2f2 100644 --- a/packages/node_modules/@node-red/nodes/core/common/21-debug.html +++ b/packages/node_modules/@node-red/nodes/core/common/21-debug.html @@ -530,7 +530,6 @@ if (type !== 'full') { comp = $("#node-input-typed-complete").typedInput('value'); } - console.log('hihi') that.statusType = "auto"; that.statusVal = comp; } From 1141f9de8601d6e8f9178a5f361888f7e8eb71fe Mon Sep 17 00:00:00 2001 From: Steve-Mcl Date: Wed, 4 May 2022 14:42:47 +0100 Subject: [PATCH 2/9] Add ability to search in current flow fixes #3419 --- .../editor-client/locales/en-US/editor.json | 3 ++- .../editor-client/src/js/ui/search.js | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json index b834c8808..ef1f5805e 100755 --- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json @@ -907,7 +907,8 @@ "uknownNodes": "Unknown nodes", "unusedSubflows": "Unused subflows", "hiddenFlows": "Hidden flows", - "modifiedNodes": "Modified nodes and flows" + "modifiedNodes": "Modified nodes and flows", + "thisFlow": "This flow" } }, "expressionEditor": { diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/search.js b/packages/node_modules/@node-red/editor-client/src/js/ui/search.js index e477fbc22..e960e415f 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/search.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/search.js @@ -122,12 +122,15 @@ RED.search = (function() { val = extractFlag(val,"subflow",flags); val = extractFlag(val,"hidden",flags); val = extractFlag(val,"modified",flags); - // uses: - val = extractValue(val,"uses",flags); - - var hasFlags = Object.keys(flags).length > 0; - + val = extractFlag(val,"thisflow",flags); + if (flags.thisflow === true) { + flags.thisflow = RED.workspaces.active(); + } else { + delete flags.thisflow; + } + val = extractValue(val,"uses",flags);// uses: val = val.trim(); + var hasFlags = Object.keys(flags).length > 0; if (val.length > 0 || typeFilter || hasFlags) { val = val.toLowerCase(); @@ -188,6 +191,11 @@ RED.search = (function() { continue; } } + if (flags.hasOwnProperty("thisflow")) { + if (flags.thisflow !== node.node.z) { + continue; + } + } if (!typeFilter || node.node.type === typeFilter) { nodes[node.node.id] = nodes[node.node.id] = { node: node.node, @@ -592,6 +600,7 @@ RED.search = (function() { {label:RED._("search.options.uknownNodes"), value: "type:unknown"}, {label:RED._("search.options.unusedSubflows"), value:"is:subflow is:unused"}, {label:RED._("search.options.hiddenFlows"), value:"is:hidden"}, + {label:RED._("search.options.thisFlow"), value:"is:thisflow"}, ] } From a4603a4396babb3a50c0282bee74cf9bb03da064 Mon Sep 17 00:00:00 2001 From: ralphwetzel Date: Wed, 4 May 2022 20:15:24 +0200 Subject: [PATCH 3/9] Update 60-link.html Remove development debug message. Fixes #3574 ... courtesy of @Steve-Mcl --- packages/node_modules/@node-red/nodes/core/common/60-link.html | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/node_modules/@node-red/nodes/core/common/60-link.html b/packages/node_modules/@node-red/nodes/core/common/60-link.html index e70f59ab6..f592bcd3d 100644 --- a/packages/node_modules/@node-red/nodes/core/common/60-link.html +++ b/packages/node_modules/@node-red/nodes/core/common/60-link.html @@ -302,7 +302,6 @@ return this.name?"node_label_italic":""; }, oneditprepare: function() { - console.log("link call oneditprepare") const updateVisibility = function() { const static = $('#node-input-linkType').val() !== "dynamic"; if(static) { From d1b74675d987b98ebebfc1b86cb56514f1e8f803 Mon Sep 17 00:00:00 2001 From: Steve-Mcl Date: Sun, 8 May 2022 14:23:47 +0100 Subject: [PATCH 4/9] change search term `is:thisflow` to `flow:active` this also permits flow: --- .../editor-client/src/js/ui/search.js | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/search.js b/packages/node_modules/@node-red/editor-client/src/js/ui/search.js index e960e415f..67363c412 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/search.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/search.js @@ -108,7 +108,6 @@ RED.search = (function() { function search(val) { var results = []; - var keys = []; var typeFilter; var m = /(?:^| )type:([^ ]+)/.exec(val); if (m) { @@ -122,22 +121,24 @@ RED.search = (function() { val = extractFlag(val,"subflow",flags); val = extractFlag(val,"hidden",flags); val = extractFlag(val,"modified",flags); - val = extractFlag(val,"thisflow",flags); - if (flags.thisflow === true) { - flags.thisflow = RED.workspaces.active(); - } else { - delete flags.thisflow; - } + val = extractValue(val,"flow",flags);// flow:active or flow: val = extractValue(val,"uses",flags);// uses: val = val.trim(); var hasFlags = Object.keys(flags).length > 0; - + if (flags.flow && flags.flow.indexOf("active") >= 0) { + let idx = flags.flow.indexOf("active"); + flags.flow[idx] = RED.workspaces.active();//convert active to flow ID + } + if (flags.flow && flags.flow.length) { + flags.flow = [ ...new Set(flags.flow) ]; //deduplicate + } if (val.length > 0 || typeFilter || hasFlags) { val = val.toLowerCase(); var i; var j; var list = []; var nodes = {}; + let keys = []; if (flags.uses) { keys = flags.uses; } else { @@ -191,8 +192,8 @@ RED.search = (function() { continue; } } - if (flags.hasOwnProperty("thisflow")) { - if (flags.thisflow !== node.node.z) { + if (flags.hasOwnProperty("flow")) { + if (flags.flow.indexOf(node.node.z || node.node.id) < 0) { continue; } } @@ -600,9 +601,8 @@ RED.search = (function() { {label:RED._("search.options.uknownNodes"), value: "type:unknown"}, {label:RED._("search.options.unusedSubflows"), value:"is:subflow is:unused"}, {label:RED._("search.options.hiddenFlows"), value:"is:hidden"}, - {label:RED._("search.options.thisFlow"), value:"is:thisflow"}, + {label:RED._("search.options.thisFlow"), value:"flow:active"}, ] - } function init() { From 0f2420576adceef53261c1465d6efd01a25e4e0a Mon Sep 17 00:00:00 2001 From: Steve-Mcl Date: Sun, 8 May 2022 14:24:30 +0100 Subject: [PATCH 5/9] improve flashing of node sometimes node highlight get stuck --- .../@node-red/editor-client/src/js/ui/view.js | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js index b2d2b11b1..86c744a7e 100755 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js @@ -5853,27 +5853,26 @@ RED.view = (function() { if(typeof node === "string") { node = RED.nodes.node(n); } if(!node) { return; } - const flashingNode = flashingNodeTimer && flashingNodeId && RED.nodes.node(flashingNodeId); + const flashingNode = flashingNodeId && RED.nodes.node(flashingNodeId); if(flashingNode) { //cancel current flashing node before flashing new node - clearInterval(flashingNodeTimer); - flashingNodeTimer = null; + clearInterval(flashingNode.__flashTimer); + delete flashingNode.__flashTimer; flashingNode.dirty = true; flashingNode.highlighted = false; } - - flashingNodeTimer = setInterval(function(flashEndTime) { - node.dirty = true; + node.__flashTimer = setInterval(function(flashEndTime, n) { + n.dirty = true; if (flashEndTime >= Date.now()) { - node.highlighted = !node.highlighted; + n.highlighted = !n.highlighted; } else { - clearInterval(flashingNodeTimer); - flashingNodeTimer = null; - node.highlighted = false; + clearInterval(__flashTimer); + delete n.__flashTimer; flashingNodeId = null; + n.highlighted = false; } RED.view.redraw(); - }, 100, Date.now() + 2200) + }, 100, Date.now() + 2200, node) flashingNodeId = node.id; node.highlighted = true; RED.view.redraw(); From 5561e89201611ee086f98221f1de1aa5c4802398 Mon Sep 17 00:00:00 2001 From: Steve-Mcl Date: Sun, 8 May 2022 14:48:57 +0100 Subject: [PATCH 6/9] remove unused var --- .../node_modules/@node-red/editor-client/src/js/ui/view.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js index 86c744a7e..a95bc91e4 100755 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js @@ -93,7 +93,6 @@ RED.view = (function() { var selectNodesOptions; let flashingNodeId; - let flashingNodeTimer; var clipboard = ""; @@ -5866,7 +5865,7 @@ RED.view = (function() { if (flashEndTime >= Date.now()) { n.highlighted = !n.highlighted; } else { - clearInterval(__flashTimer); + clearInterval(n.__flashTimer); delete n.__flashTimer; flashingNodeId = null; n.highlighted = false; From f0293b8f5247302618eaefa2aa8814b49717d608 Mon Sep 17 00:00:00 2001 From: Stephen McLaughlin <44235289+Steve-Mcl@users.noreply.github.com> Date: Mon, 9 May 2022 17:41:24 +0100 Subject: [PATCH 7/9] Update packages/node_modules/@node-red/editor-client/locales/en-US/editor.json Co-authored-by: Nick O'Leary --- .../@node-red/editor-client/locales/en-US/editor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json index ef1f5805e..4f3a3b104 100755 --- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json @@ -908,7 +908,7 @@ "unusedSubflows": "Unused subflows", "hiddenFlows": "Hidden flows", "modifiedNodes": "Modified nodes and flows", - "thisFlow": "This flow" + "thisFlow": "Current flow" } }, "expressionEditor": { From dd3174c40f6dc233700a72428921bc421a17de83 Mon Sep 17 00:00:00 2001 From: Stephen McLaughlin <44235289+Steve-Mcl@users.noreply.github.com> Date: Mon, 9 May 2022 17:41:33 +0100 Subject: [PATCH 8/9] Update packages/node_modules/@node-red/editor-client/src/js/ui/search.js Co-authored-by: Nick O'Leary --- .../node_modules/@node-red/editor-client/src/js/ui/search.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/search.js b/packages/node_modules/@node-red/editor-client/src/js/ui/search.js index 67363c412..f9eef3005 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/search.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/search.js @@ -125,8 +125,8 @@ RED.search = (function() { val = extractValue(val,"uses",flags);// uses: val = val.trim(); var hasFlags = Object.keys(flags).length > 0; - if (flags.flow && flags.flow.indexOf("active") >= 0) { - let idx = flags.flow.indexOf("active"); + if (flags.flow && flags.flow.indexOf("current") >= 0) { + let idx = flags.flow.indexOf("current"); flags.flow[idx] = RED.workspaces.active();//convert active to flow ID } if (flags.flow && flags.flow.length) { From 09973ba8cf0cd63941edc0f31012abcb34176237 Mon Sep 17 00:00:00 2001 From: Stephen McLaughlin <44235289+Steve-Mcl@users.noreply.github.com> Date: Mon, 9 May 2022 17:41:41 +0100 Subject: [PATCH 9/9] Update packages/node_modules/@node-red/editor-client/src/js/ui/search.js Co-authored-by: Nick O'Leary --- .../node_modules/@node-red/editor-client/src/js/ui/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/search.js b/packages/node_modules/@node-red/editor-client/src/js/ui/search.js index f9eef3005..102c72ded 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/search.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/search.js @@ -601,7 +601,7 @@ RED.search = (function() { {label:RED._("search.options.uknownNodes"), value: "type:unknown"}, {label:RED._("search.options.unusedSubflows"), value:"is:subflow is:unused"}, {label:RED._("search.options.hiddenFlows"), value:"is:hidden"}, - {label:RED._("search.options.thisFlow"), value:"flow:active"}, + {label:RED._("search.options.thisFlow"), value:"flow:current"}, ] }