From d1b74675d987b98ebebfc1b86cb56514f1e8f803 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Sun, 8 May 2022 14:23:47 +0100
Subject: [PATCH] change search term `is:thisflow` to `flow:active` this also
 permits flow:<flow-id>

---
 .../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:<flow-id>
         val = extractValue(val,"uses",flags);// uses:<node-id>
         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() {