From 598bcf675fe9635164e8b6c8abcb2dd1da1fb472 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Fri, 12 Aug 2022 15:45:12 +0100
Subject: [PATCH 1/5] fix searching by type when type name has a space

---
 .../editor-client/src/js/ui/palette.js        | 14 +++++-
 .../editor-client/src/js/ui/search.js         | 46 +++++++++++++------
 2 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index 9f20cc674..322283fcb 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -175,9 +175,19 @@ RED.palette = (function() {
                     $('<button type="button" onclick="RED.workspaces.show(\''+type.substring(8).replace(/'/g,"\\'")+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-pencil"></i></button>').appendTo(popOverContent)
                 }
 
-                var safeType = type.replace(/'/g,"\\'");
+                const safeType = type.replace(/'/g,"\\'");
+                function wrapStr(str) {
+                    if(str.indexOf(' ') >= 0) {
+                        return '"' + str + '"'
+                    }
+                    return str
+                }
 
-                $('<button type="button" onclick="RED.search.show(\'type:'+safeType+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-search"></i></button>').appendTo(popOverContent)
+                $('<button type="button"; return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-search"></i></button>')
+                    .appendTo(popOverContent)
+                    .on('click', function() {
+                        RED.search.show('type:' + wrapStr(safeType))
+                    })
                 $('<button type="button" onclick="RED.sidebar.help.show(\''+safeType+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-book"></i></button>').appendTo(popOverContent)
 
                 $('<p>',{style:"font-size: 0.8em"}).text(metaData).appendTo(popOverContent);
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 f9cc79f08..d8035908a 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
@@ -106,14 +106,26 @@ RED.search = (function() {
         return val;
     }
 
+    function extractType(val, flags) {
+        // extracts:  type:XYZ  &  type:"X Y Z"
+        console.log(`extractType(val, flags): val:${val}`)
+        const regEx = /(?:type):\s*(?:"([^"]+)"|([^" ]+))/;
+        let m
+        while ((m = regEx.exec(val)) !== null) {
+            // avoid infinite loops with zero-width matches
+            if (m.index === regEx.lastIndex) {
+                regEx.lastIndex++;
+            }
+            val = val.replace(m[0]," ").trim()
+            const flag = m[2] || m[1] // quoted entries in capture group 1, unquoted in capture group 2
+            flags.type = flags.type || [];
+            flags.type.push(flag);
+        }
+        return val;
+    }
+
     function search(val) {
         var results = [];
-        var typeFilter;
-        var m = /(?:^| )type:([^ ]+)/.exec(val);
-        if (m) {
-            val = val.replace(/(?:^| )type:[^ ]+/,"");
-            typeFilter = m[1];
-        }
         var flags = {};
         val = extractFlag(val,"invalid",flags);
         val = extractFlag(val,"unused",flags);
@@ -121,18 +133,20 @@ RED.search = (function() {
         val = extractFlag(val,"subflow",flags);
         val = extractFlag(val,"hidden",flags);
         val = extractFlag(val,"modified",flags);
-        val = extractValue(val,"flow",flags);// flow:active or flow:<flow-id>
+        val = extractValue(val,"flow",flags);// flow:current or flow:<flow-id>
         val = extractValue(val,"uses",flags);// uses:<node-id>
+        val = extractType(val,flags);// uses:<node-id>
         val = val.trim();
         var hasFlags = Object.keys(flags).length > 0;
         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
+            flags.flow[idx] = RED.workspaces.active();//convert 'current' to active flow ID
         }
         if (flags.flow && flags.flow.length) {
             flags.flow = [ ...new Set(flags.flow) ]; //deduplicate
         }
-        if (val.length > 0 || typeFilter || hasFlags) {
+        const hasTypeFilter = flags.type && flags.type.length > 0
+        if (val.length > 0 || hasFlags) {
             val = val.toLowerCase();
             var i;
             var j;
@@ -146,8 +160,8 @@ RED.search = (function() {
             }
             for (i=0;i<keys.length;i++) {
                 var key = keys[i];
-                var kpos = keys[i].indexOf(val);
-                if (kpos > -1) {
+                var kpos = val ? keys[i].indexOf(val) : -1;
+                if (kpos > -1 || (val === "" && hasTypeFilter)) {
                     var ids = Object.keys(index[key]||{});
                     for (j=0;j<ids.length;j++) {
                         var node = index[key][ids[j]];
@@ -197,12 +211,16 @@ RED.search = (function() {
                                 continue;
                             }
                         }
-                        if (!typeFilter || node.node.type === typeFilter) {
-                            nodes[node.node.id] = nodes[node.node.id] = {
+                        let typeIndex = -1
+                        if(hasTypeFilter) {
+                            typeIndex = flags.type.indexOf(node.node.type)
+                        }
+                        if (!hasTypeFilter || typeIndex > -1) {
+                            nodes[node.node.id] = nodes[node.node.id] || {
                                 node: node.node,
                                 label: node.label
                             };
-                            nodes[node.node.id].index = Math.min(nodes[node.node.id].index||Infinity,kpos);
+                            nodes[node.node.id].index = Math.min(nodes[node.node.id].index || Infinity, typeIndex > -1 ? typeIndex : kpos);
                         }
                     }
                 }

From 9540cfe74931720aa34f1b0e8dbbef566cb91c8b Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Sat, 13 Aug 2022 18:09:11 +0100
Subject: [PATCH 2/5] fix flags search without val

---
 .../editor-client/src/js/ui/search.js         | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 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 d8035908a..7d147bde9 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() {
     }
 
     function search(val) {
-        var results = [];
-        var flags = {};
+        const results = [];
+        const flags = {};
         val = extractFlag(val,"invalid",flags);
         val = extractFlag(val,"unused",flags);
         val = extractFlag(val,"config",flags);
@@ -137,7 +137,8 @@ RED.search = (function() {
         val = extractValue(val,"uses",flags);// uses:<node-id>
         val = extractType(val,flags);// uses:<node-id>
         val = val.trim();
-        var hasFlags = Object.keys(flags).length > 0;
+        const hasFlags = Object.keys(flags).length > 0;
+        const hasTypeFilter = flags.type && flags.type.length > 0
         if (flags.flow && flags.flow.indexOf("current") >= 0) {
             let idx = flags.flow.indexOf("current");
             flags.flow[idx] = RED.workspaces.active();//convert 'current' to active flow ID
@@ -145,13 +146,12 @@ RED.search = (function() {
         if (flags.flow && flags.flow.length) {
             flags.flow = [ ...new Set(flags.flow) ]; //deduplicate
         }
-        const hasTypeFilter = flags.type && flags.type.length > 0
         if (val.length > 0 || hasFlags) {
             val = val.toLowerCase();
-            var i;
-            var j;
-            var list = [];
-            var nodes = {};
+            let i;
+            let j;
+            let list = [];
+            const nodes = {};
             let keys = [];
             if (flags.uses) {
                 keys = flags.uses;
@@ -159,10 +159,10 @@ RED.search = (function() {
                 keys = Object.keys(index);
             }
             for (i=0;i<keys.length;i++) {
-                var key = keys[i];
-                var kpos = val ? keys[i].indexOf(val) : -1;
-                if (kpos > -1 || (val === "" && hasTypeFilter)) {
-                    var ids = Object.keys(index[key]||{});
+                const key = keys[i];
+                const kpos = val ? keys[i].indexOf(val) : -1;
+                if (kpos > -1 || (val === "" && hasFlags)) {
+                    const ids = Object.keys(index[key]||{});
                     for (j=0;j<ids.length;j++) {
                         var node = index[key][ids[j]];
                         var isConfigNode = node.node._def.category === "config" && node.node.type !== 'group';
@@ -170,7 +170,7 @@ RED.search = (function() {
                             continue;
                         }
                         if (flags.hasOwnProperty("invalid")) {
-                            var nodeIsValid = !node.node.hasOwnProperty("valid") || node.node.valid;
+                            const nodeIsValid = !node.node.hasOwnProperty("valid") || node.node.valid;
                             if (flags.invalid === nodeIsValid) {
                                 continue;
                             }
@@ -200,7 +200,7 @@ RED.search = (function() {
                             }
                         }
                         if (flags.hasOwnProperty("unused")) {
-                            var isUnused = (node.node.type === 'subflow' && node.node.instances.length === 0) ||
+                            const isUnused = (node.node.type === 'subflow' && node.node.instances.length === 0) ||
                                            (isConfigNode && node.node.users.length === 0 && node.node._def.hasUsers !== false)
                             if (flags.unused !== isUnused) {
                                 continue;

From 5f159c1fbd4e78373292472263f8caa0d720721d Mon Sep 17 00:00:00 2001
From: Stephen McLaughlin <44235289+Steve-Mcl@users.noreply.github.com>
Date: Sat, 3 Sep 2022 21:54:21 +0100
Subject: [PATCH 3/5] Update
 packages/node_modules/@node-red/editor-client/src/js/ui/search.js

Co-authored-by: Nick O'Leary <nick.oleary@gmail.com>
---
 .../node_modules/@node-red/editor-client/src/js/ui/search.js     | 1 -
 1 file changed, 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 7d147bde9..6dcd44b88 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 extractType(val, flags) {
         // extracts:  type:XYZ  &  type:"X Y Z"
-        console.log(`extractType(val, flags): val:${val}`)
         const regEx = /(?:type):\s*(?:"([^"]+)"|([^" ]+))/;
         let m
         while ((m = regEx.exec(val)) !== null) {

From c038c99f9dbc54f15c88f6ec8a2b5f379d4e8253 Mon Sep 17 00:00:00 2001
From: Stephen McLaughlin <44235289+Steve-Mcl@users.noreply.github.com>
Date: Sat, 3 Sep 2022 21:54:41 +0100
Subject: [PATCH 4/5] Update
 packages/node_modules/@node-red/editor-client/src/js/ui/search.js

Co-authored-by: Nick O'Leary <nick.oleary@gmail.com>
---
 .../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 6dcd44b88..3903a4a0a 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
@@ -134,7 +134,7 @@ RED.search = (function() {
         val = extractFlag(val,"modified",flags);
         val = extractValue(val,"flow",flags);// flow:current or flow:<flow-id>
         val = extractValue(val,"uses",flags);// uses:<node-id>
-        val = extractType(val,flags);// uses:<node-id>
+        val = extractType(val,flags);// type:<node-type>
         val = val.trim();
         const hasFlags = Object.keys(flags).length > 0;
         const hasTypeFilter = flags.type && flags.type.length > 0

From e11f17672c0b208d7560c249ca617ef989b11ee9 Mon Sep 17 00:00:00 2001
From: Stephen McLaughlin <44235289+Steve-Mcl@users.noreply.github.com>
Date: Sat, 3 Sep 2022 22:01:54 +0100
Subject: [PATCH 5/5] Update
 packages/node_modules/@node-red/editor-client/src/js/ui/palette.js

---
 .../node_modules/@node-red/editor-client/src/js/ui/palette.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index 322283fcb..928793610 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -176,7 +176,7 @@ RED.palette = (function() {
                 }
 
                 const safeType = type.replace(/'/g,"\\'");
-                function wrapStr(str) {
+                const wrapStr = function (str) {
                     if(str.indexOf(' ') >= 0) {
                         return '"' + str + '"'
                     }