frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

change search term `is:thisflow` to `flow:active` 

this also permits flow:<flow-id>
This commit is contained in:
Steve-Mcl 2022-05-08 14:23:47 +01:00
parent 1141f9de86
commit d1b74675d9
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/node_modules/@node-red/editor-client/src/js/ui/search.js vendored
View File

@ -108,7 +108,6 @@ RED.search = (function() {
function search(val) { function search(val) {
var results = []; var results = [];
var keys = [];
var typeFilter; var typeFilter;
var m = /(?:^| )type:([^ ]+)/.exec(val); var m = /(?:^| )type:([^ ]+)/.exec(val);
if (m) { if (m) {
@ -122,22 +121,24 @@ RED.search = (function() {
val = extractFlag(val,"subflow",flags); val = extractFlag(val,"subflow",flags);
val = extractFlag(val,"hidden",flags); val = extractFlag(val,"hidden",flags);
val = extractFlag(val,"modified",flags); val = extractFlag(val,"modified",flags);
val = extractFlag(val,"thisflow",flags); val = extractValue(val,"flow",flags);// flow:active or flow:<flow-id>
if (flags.thisflow === true) {
flags.thisflow = RED.workspaces.active();
} else {
delete flags.thisflow;
}
val = extractValue(val,"uses",flags);// uses:<node-id> val = extractValue(val,"uses",flags);// uses:<node-id>
val = val.trim(); val = val.trim();
var hasFlags = Object.keys(flags).length > 0; 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) { if (val.length > 0 || typeFilter || hasFlags) {
val = val.toLowerCase(); val = val.toLowerCase();
var i; var i;
var j; var j;
var list = []; var list = [];
var nodes = {}; var nodes = {};
let keys = [];
if (flags.uses) { if (flags.uses) {
keys = flags.uses; keys = flags.uses;
} else { } else {
@ -191,8 +192,8 @@ RED.search = (function() {
continue; continue;
} }
} }
if (flags.hasOwnProperty("thisflow")) { if (flags.hasOwnProperty("flow")) {
if (flags.thisflow !== node.node.z) { if (flags.flow.indexOf(node.node.z || node.node.id) < 0) {
continue; continue;
} }
} }
@ -600,9 +601,8 @@ RED.search = (function() {
{label:RED._("search.options.uknownNodes"), value: "type:unknown"}, {label:RED._("search.options.uknownNodes"), value: "type:unknown"},
{label:RED._("search.options.unusedSubflows"), value:"is:subflow is:unused"}, {label:RED._("search.options.unusedSubflows"), value:"is:subflow is:unused"},
{label:RED._("search.options.hiddenFlows"), value:"is:hidden"}, {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() { function init() {