From 2b66723d4260431bb96a479747c893c7fd7f1840 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 9 Jul 2019 20:26:26 +0100
Subject: [PATCH] Another pass of categorisation

---
 .../editor-client/src/js/ui/palette.js        | 21 ++++++++++++-------
 .../@node-red/nodes/core/core/20-inject.html  |  2 +-
 .../@node-red/nodes/core/core/21-debug.html   |  2 +-
 .../@node-red/nodes/core/core/25-catch.html   |  2 +-
 .../@node-red/nodes/core/core/25-status.html  |  2 +-
 .../@node-red/nodes/core/core/60-link.html    |  4 ++--
 .../@node-red/nodes/core/core/75-exec.html    |  2 +-
 .../@node-red/nodes/core/core/90-comment.html |  2 +-
 .../@node-red/nodes/core/io/10-mqtt.html      |  4 ++--
 .../@node-red/nodes/core/io/21-httpin.html    |  4 ++--
 .../nodes/core/io/21-httprequest.html         |  2 +-
 .../@node-red/nodes/core/io/22-websocket.html |  4 ++--
 .../@node-red/nodes/core/io/23-watch.html     |  2 +-
 .../@node-red/nodes/core/io/31-tcpin.html     |  6 +++---
 .../@node-red/nodes/core/io/32-udp.html       |  4 ++--
 .../@node-red/nodes/core/logic/17-split.html  |  4 ++--
 .../@node-red/nodes/core/logic/18-sort.html   |  2 +-
 .../@node-red/nodes/core/logic/19-batch.html  |  2 +-
 .../@node-red/nodes/core/storage/50-file.html |  4 ++--
 19 files changed, 40 insertions(+), 35 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 65cc2d850..22ee08558 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
@@ -19,15 +19,15 @@ RED.palette = (function() {
     var exclusion = ['config','unknown','deprecated'];
     var coreCategories = [
         'subflows',
-        'flow',
-        'input',
-        'output',
+        'common',
         'function',
+        'input/output',
+        'sequence',
         'parser',
-        'social',
-        'mobile',
         'storage',
         'analysis',
+        'social',
+        'mobile',
         'advanced'
     ];
 
@@ -35,6 +35,7 @@ RED.palette = (function() {
     var sidebarControls;
 
     function createCategory(originalCategory,rootCategory,category,ns) {
+        console.log("createCategory",originalCategory,rootCategory,category,ns);
         if ($("#red-ui-palette-base-category-"+rootCategory).length === 0) {
             createCategoryContainer(originalCategory,rootCategory, ns+":palette.label."+rootCategory);
         }
@@ -44,6 +45,7 @@ RED.palette = (function() {
         }
     }
     function createCategoryContainer(originalCategory,category, labelId) {
+        console.log("createCategoryContainer",originalCategory,category,labelId);
         var label = RED._(labelId, {defaultValue:category});
         label = (label || category).replace(/_/g, " ");
         var catDiv = $('<div id="red-ui-palette-container-'+category+'" class="red-ui-palette-category hide">'+
@@ -165,6 +167,9 @@ RED.palette = (function() {
         return $(".red-ui-palette-node[data-palette-type='"+type+"']");
     }
 
+    function escapeCategory(category) {
+        return category.replace(/[ /.]/g,"_");
+    }
     function addNodeType(nt,def) {
         if (getPaletteNode(nt).length) {
             return;
@@ -172,7 +177,7 @@ RED.palette = (function() {
         if (exclusion.indexOf(def.category)===-1) {
 
             var originalCategory = def.category;
-            var category = def.category.replace(/ /g,"_");
+            var category = escapeCategory(def.category);
             var rootCategory = category.split("-")[0];
 
             var d = $('<div>',{class:"red-ui-palette-node"}).attr("data-palette-type",nt).data('category',rootCategory);
@@ -423,7 +428,7 @@ RED.palette = (function() {
             var currentCategory = paletteNode.data('category');
             var newCategory = (sf.category||"subflows");
             if (currentCategory !== newCategory) {
-                var category = newCategory.replace(/ /g,"_");
+                var category = escapeCategory(newCategory);
                 createCategory(newCategory,category,category,"node-red");
 
                 var currentCategoryNode = paletteNode.closest(".red-ui-palette-category");
@@ -556,7 +561,7 @@ RED.palette = (function() {
             categoryList = coreCategories
         }
         categoryList.forEach(function(category){
-            createCategoryContainer(category, category, "palette.label."+category);
+            createCategoryContainer(category, escapeCategory(category), "palette.label."+escapeCategory(category));
         });
 
 
diff --git a/packages/node_modules/@node-red/nodes/core/core/20-inject.html b/packages/node_modules/@node-red/nodes/core/core/20-inject.html
index f0f8d2393..4953505eb 100644
--- a/packages/node_modules/@node-red/nodes/core/core/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/core/core/20-inject.html
@@ -156,7 +156,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('inject',{
-        category: 'flow',
+        category: 'common',
         color:"#a6bbcf",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/core/21-debug.html b/packages/node_modules/@node-red/nodes/core/core/21-debug.html
index f051d6f2a..ebfb8532b 100644
--- a/packages/node_modules/@node-red/nodes/core/core/21-debug.html
+++ b/packages/node_modules/@node-red/nodes/core/core/21-debug.html
@@ -37,7 +37,7 @@
 (function() {
     var subWindow = null;
     RED.nodes.registerType('debug',{
-        category: 'flow',
+        category: 'common',
         defaults: {
             name: {value:""},
             active: {value:true},
diff --git a/packages/node_modules/@node-red/nodes/core/core/25-catch.html b/packages/node_modules/@node-red/nodes/core/core/25-catch.html
index 983bae39f..7cc170b89 100644
--- a/packages/node_modules/@node-red/nodes/core/core/25-catch.html
+++ b/packages/node_modules/@node-red/nodes/core/core/25-catch.html
@@ -25,7 +25,7 @@
 </script>
 <script type="text/javascript">
     RED.nodes.registerType('catch',{
-        category: 'flow',
+        category: 'common',
         color:"#e49191",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/core/25-status.html b/packages/node_modules/@node-red/nodes/core/core/25-status.html
index fff3de618..f3aa7bd98 100644
--- a/packages/node_modules/@node-red/nodes/core/core/25-status.html
+++ b/packages/node_modules/@node-red/nodes/core/core/25-status.html
@@ -21,7 +21,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('status',{
-        category: 'flow',
+        category: 'common',
         color:"#d9f4fd",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/core/60-link.html b/packages/node_modules/@node-red/nodes/core/core/60-link.html
index 31412ab1a..9c70b4eda 100644
--- a/packages/node_modules/@node-red/nodes/core/core/60-link.html
+++ b/packages/node_modules/@node-red/nodes/core/core/60-link.html
@@ -162,7 +162,7 @@
     }
 
     RED.nodes.registerType('link in',{
-        category: 'flow',
+        category: 'common',
         color:"#ddd",//"#87D8CF",
         defaults: {
             name: {value:""},
@@ -191,7 +191,7 @@
     });
 
     RED.nodes.registerType('link out',{
-        category: 'flow',
+        category: 'common',
         color:"#ddd",//"#87D8CF",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/core/75-exec.html b/packages/node_modules/@node-red/nodes/core/core/75-exec.html
index 5225044be..264b60ba8 100644
--- a/packages/node_modules/@node-red/nodes/core/core/75-exec.html
+++ b/packages/node_modules/@node-red/nodes/core/core/75-exec.html
@@ -53,7 +53,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('exec',{
-        category: 'advanced-function',
+        category: 'function',
         color:"darksalmon",
         defaults: {
             command: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/core/90-comment.html b/packages/node_modules/@node-red/nodes/core/core/90-comment.html
index 6d0e69439..1631c6314 100644
--- a/packages/node_modules/@node-red/nodes/core/core/90-comment.html
+++ b/packages/node_modules/@node-red/nodes/core/core/90-comment.html
@@ -12,7 +12,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('comment',{
-        category: 'flow',
+        category: 'common',
         color:"#ffffff",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/io/10-mqtt.html b/packages/node_modules/@node-red/nodes/core/io/10-mqtt.html
index ed6964101..fa9f89e29 100644
--- a/packages/node_modules/@node-red/nodes/core/io/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/io/10-mqtt.html
@@ -46,7 +46,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('mqtt in',{
-        category: 'input',
+        category: 'input/output',
         defaults: {
             name: {value:""},
             topic: {value:"",required:true,validate: RED.validators.regex(/^(#$|(\+|[^+#]*)(\/(\+|[^+#]*))*(\/(\+|#|[^+#]*))?$)/)},
@@ -107,7 +107,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('mqtt out',{
-        category: 'output',
+        category: 'input/output',
         defaults: {
             name: {value:""},
             topic: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/io/21-httpin.html b/packages/node_modules/@node-red/nodes/core/io/21-httpin.html
index 6786e0ea4..b4c237589 100644
--- a/packages/node_modules/@node-red/nodes/core/io/21-httpin.html
+++ b/packages/node_modules/@node-red/nodes/core/io/21-httpin.html
@@ -66,7 +66,7 @@
 <script type="text/javascript">
 (function() {
     RED.nodes.registerType('http in',{
-        category: 'input',
+        category: 'input/output',
         color:"rgb(231, 231, 174)",
         defaults: {
             name: {value:""},
@@ -142,7 +142,7 @@
     ];
 
     RED.nodes.registerType('http response',{
-        category: 'output',
+        category: 'input/output',
         color:"rgb(231, 231, 174)",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
index 9275560cd..1ed183d12 100644
--- a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.html
@@ -98,7 +98,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('http request',{
-        category: 'function',
+        category: 'input/output',
         color:"rgb(231, 231, 174)",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/io/22-websocket.html b/packages/node_modules/@node-red/nodes/core/io/22-websocket.html
index 403c1e5c8..576fafc67 100644
--- a/packages/node_modules/@node-red/nodes/core/io/22-websocket.html
+++ b/packages/node_modules/@node-red/nodes/core/io/22-websocket.html
@@ -97,7 +97,7 @@
     }
 
     RED.nodes.registerType('websocket in',{
-        category: 'input',
+        category: 'input/output',
         defaults: {
             name: {value:""},
             server: {type:"websocket-listener", validate: ws_validateserver},
@@ -116,7 +116,7 @@
     });
 
     RED.nodes.registerType('websocket out',{
-        category: 'output',
+        category: 'input/output',
         defaults: {
             name: {value:""},
             server: {type:"websocket-listener", validate: ws_validateserver},
diff --git a/packages/node_modules/@node-red/nodes/core/io/23-watch.html b/packages/node_modules/@node-red/nodes/core/io/23-watch.html
index e53842e2e..587eee756 100644
--- a/packages/node_modules/@node-red/nodes/core/io/23-watch.html
+++ b/packages/node_modules/@node-red/nodes/core/io/23-watch.html
@@ -33,7 +33,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('watch',{
-        category: 'advanced-input',
+        category: 'storage',
         defaults: {
             name: {value:""},
             files: {value:"",required:true},
diff --git a/packages/node_modules/@node-red/nodes/core/io/31-tcpin.html b/packages/node_modules/@node-red/nodes/core/io/31-tcpin.html
index 27629f569..3955105e7 100644
--- a/packages/node_modules/@node-red/nodes/core/io/31-tcpin.html
+++ b/packages/node_modules/@node-red/nodes/core/io/31-tcpin.html
@@ -57,7 +57,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('tcp in',{
-        category: 'input',
+        category: 'input/output',
         color:"Silver",
         defaults: {
             name: {value:""},
@@ -143,7 +143,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('tcp out',{
-        category: 'output',
+        category: 'input/output',
         color:"Silver",
         defaults: {
             host: {value:"",validate:function(v) { return (this.beserver != "client")||v.length > 0;} },
@@ -215,7 +215,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('tcp request',{
-        category: 'function',
+        category: 'input/output',
         color:"Silver",
         defaults: {
             server: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/io/32-udp.html b/packages/node_modules/@node-red/nodes/core/io/32-udp.html
index 89e9ded70..6784e8d15 100644
--- a/packages/node_modules/@node-red/nodes/core/io/32-udp.html
+++ b/packages/node_modules/@node-red/nodes/core/io/32-udp.html
@@ -57,7 +57,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('udp in',{
-        category: 'input',
+        category: 'input/output',
         color:"Silver",
         defaults: {
             name: {value:""},
@@ -159,7 +159,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('udp out',{
-        category: 'output',
+        category: 'input/output',
         color:"Silver",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/logic/17-split.html b/packages/node_modules/@node-red/nodes/core/logic/17-split.html
index fbdb7f8b6..7751a1c55 100644
--- a/packages/node_modules/@node-red/nodes/core/logic/17-split.html
+++ b/packages/node_modules/@node-red/nodes/core/logic/17-split.html
@@ -48,7 +48,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('split',{
-        category: 'function',
+        category: 'sequence',
         color:"#E2D96E",
         defaults: {
             name: {value:""},
@@ -196,7 +196,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('join',{
-        category: 'function',
+        category: 'sequence',
         color:"#E2D96E",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/logic/18-sort.html b/packages/node_modules/@node-red/nodes/core/logic/18-sort.html
index 0093ee65d..8ca2e5be2 100644
--- a/packages/node_modules/@node-red/nodes/core/logic/18-sort.html
+++ b/packages/node_modules/@node-red/nodes/core/logic/18-sort.html
@@ -60,7 +60,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('sort',{
-        category: 'function',
+        category: 'sequence',
         color:"#E2D96E",
         defaults: {
             name: { value:"" },
diff --git a/packages/node_modules/@node-red/nodes/core/logic/19-batch.html b/packages/node_modules/@node-red/nodes/core/logic/19-batch.html
index 52bb84132..5781ffbe5 100644
--- a/packages/node_modules/@node-red/nodes/core/logic/19-batch.html
+++ b/packages/node_modules/@node-red/nodes/core/logic/19-batch.html
@@ -68,7 +68,7 @@
 
 <script type="text/javascript">
     RED.nodes.registerType("batch",{
-        category: "function",
+        category: "sequence",
         color:"#E2D96E",
         defaults: {
             name: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/storage/50-file.html b/packages/node_modules/@node-red/nodes/core/storage/50-file.html
index e48039269..3561d491a 100755
--- a/packages/node_modules/@node-red/nodes/core/storage/50-file.html
+++ b/packages/node_modules/@node-red/nodes/core/storage/50-file.html
@@ -193,7 +193,7 @@
     ];
 
     RED.nodes.registerType('file',{
-        category: 'storage-output',
+        category: 'storage',
         defaults: {
             name: {value:""},
             filename: {value:""},
@@ -258,7 +258,7 @@
     });
 
     RED.nodes.registerType('file in',{
-        category: 'storage-input',
+        category: 'storage',
         defaults: {
             name: {value:""},
             filename: {value:""},