Merge branch 'dev' into pr_2439

.github/ISSUE_TEMPLATE.md

@@ -32,3 +32,4 @@ To help us understand the issue, please fill-in as much of the following informa
 - [ ] npm version:
 - [ ] Platform/OS:
 - [ ] Browser:
+- [ ] running in Docker:

.github/ISSUE_TEMPLATE/--bug_report.md

@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Reproducable software issues in the core of Node-RED
+about: Reproducible software issues in the core of Node-RED
 title: ''
 labels: ''
 assignees: ''

.github/PULL_REQUEST_TEMPLATE.md

@@ -29,6 +29,6 @@ the [forum](https://discourse.nodered.org) or
 <!-- Put an `x` in the boxes that apply -->
 
 - [ ] I have read the [contribution guidelines](https://github.com/node-red/node-red/blob/master/CONTRIBUTING.md)
-- [ ] For non-bugfix PRs, I have discussed this change on the mailing list/slack team.
+- [ ] For non-bugfix PRs, I have discussed this change on the forum/slack team.
 - [ ] I have run `grunt` to verify the unit tests pass
 - [ ] I have added suitable unit tests to cover the new/changed functionality

.gitignore

@@ -22,3 +22,4 @@ packages/node_modules/@node-red/editor-client/public
 !test/**/node_modules
 docs
 !packages/node_modules/**/docs
+.vscode

.travis.yml

@@ -2,6 +2,7 @@ sudo: false
 language: node_js
 matrix:
   include:
+    - node_js: "14"
     - node_js: "12"
     - node_js: "10"
       script:

Gruntfile.js

@@ -26,6 +26,10 @@ module.exports = function(grunt) {
         nodemonArgs.push(flowFile);
     }
 
+    var browserstack = grunt.option('browserstack');
+    if (browserstack) {
+        process.env.BROWSERSTACK = true;
+    }
     var nonHeadless = grunt.option('non-headless');
     if (nonHeadless) {
         process.env.NODE_RED_NON_HEADLESS = true;
@@ -121,6 +125,7 @@ module.exports = function(grunt) {
                 src: [
                     // Ensure editor source files are concatenated in
                     // the right order
+                    "packages/node_modules/@node-red/editor-client/src/js/polyfills.js",
                     "packages/node_modules/@node-red/editor-client/src/js/jquery-addons.js",
                     "packages/node_modules/@node-red/editor-client/src/js/red.js",
                     "packages/node_modules/@node-red/editor-client/src/js/events.js",
@@ -147,6 +152,7 @@ module.exports = function(grunt) {
                     "packages/node_modules/@node-red/editor-client/src/js/ui/common/stack.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/common/toggleButton.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/colorPicker.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/actions.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/diff.js",
@@ -159,6 +165,8 @@ module.exports = function(grunt) {
                     "packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/palette.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js",
@@ -173,6 +181,7 @@ module.exports = function(grunt) {
                     "packages/node_modules/@node-red/editor-client/src/js/ui/actionList.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/group.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js",
@@ -185,11 +194,12 @@ module.exports = function(grunt) {
             vendor: {
                 files: {
                     "packages/node_modules/@node-red/editor-client/public/vendor/vendor.js": [
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-3.4.1.min.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-3.5.1.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-migrate-3.0.1.min.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-migrate-3.3.0.min.js",
                         "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-ui.min.js",
                         "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery.ui.touch-punch.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/marked/marked.min.js",
+                        "node_modules/marked/marked.min.js",
+                        "node_modules/dompurify/dist/purify.min.js",
                         "packages/node_modules/@node-red/editor-client/src/vendor/d3/d3.v3.min.js",
                         "packages/node_modules/@node-red/editor-client/src/vendor/i18next/i18next.min.js",
                         "node_modules/jsonata/jsonata-es5.min.js",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "1.0.3",
+    "version": "1.1.0",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -24,7 +24,7 @@
         }
     ],
     "dependencies": {
-        "ajv": "6.10.2",
+        "ajv": "6.12.0",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "body-parser": "1.19.0",
@@ -32,7 +32,7 @@
         "clone": "2.1.2",
         "content-type": "1.0.4",
         "cookie": "0.4.0",
-        "cookie-parser": "1.4.4",
+        "cookie-parser": "1.4.5",
         "cors": "2.8.5",
         "cron": "1.7.2",
         "denque": "1.4.1",
@@ -41,40 +41,44 @@
         "fs-extra": "8.1.0",
         "fs.notify": "0.0.4",
         "hash-sum": "2.0.0",
-        "https-proxy-agent": "2.2.4",
+        "https-proxy-agent": "5.0.0",
         "i18next": "15.1.2",
-        "iconv-lite": "0.5.0",
+        "iconv-lite": "0.5.1",
         "is-utf8": "0.2.1",
         "js-yaml": "3.13.1",
         "json-stringify-safe": "5.0.1",
-        "jsonata": "1.7.0",
+        "jsonata": "1.8.3",
+        "lodash.clonedeep": "^4.5.0",
         "media-typer": "1.1.0",
-        "memorystore": "1.6.1",
+        "memorystore": "1.6.2",
         "mime": "2.4.4",
+        "moment-timezone": "^0.5.31",
         "mqtt": "2.18.8",
         "multer": "1.4.2",
-        "mustache": "3.0.2",
+        "mustache": "4.0.1",
         "node-red-node-rbe": "^0.2.6",
         "node-red-node-sentiment": "^0.1.6",
         "node-red-node-tail": "^0.1.0",
-        "nopt": "4.0.1",
+        "nopt": "4.0.3",
         "oauth2orize": "1.11.0",
         "on-headers": "1.0.2",
-        "passport": "0.4.0",
+        "passport": "0.4.1",
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
         "raw-body": "2.4.1",
         "request": "2.88.0",
         "semver": "6.3.0",
-        "uglify-js": "3.6.9",
+        "uglify-js": "3.8.1",
         "when": "3.7.8",
         "ws": "6.2.1",
-        "xml2js": "0.4.22"
+        "xml2js": "0.4.23"
     },
     "optionalDependencies": {
-        "bcrypt": "3.0.6"
+        "bcrypt": "3.0.8"
     },
     "devDependencies": {
+        "marked": "0.8.2",
+        "dompurify": "2.0.8",
         "grunt": "~1.0.4",
         "grunt-chmod": "~1.1.1",
         "grunt-cli": "~1.3.2",
@@ -101,8 +105,8 @@
         "minami": "1.2.3",
         "mocha": "^5.2.0",
         "mosca": "^2.8.3",
-        "node-red-node-test-helper": "^0.2.3",
+        "node-red-node-test-helper": "^0.2.5",
-        "node-sass": "^4.13.0",
+        "node-sass": "^4.13.1",
         "should": "^8.4.0",
         "sinon": "1.17.7",
         "stoppable": "^1.1.0",

packages/node_modules/@node-red/editor-api/lib/admin/nodes.js

@@ -44,6 +44,7 @@ module.exports = {
             user: req.user,
             module: req.body.module,
             version: req.body.version,
+            url: req.body.url,
             req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.addModule(opts).then(function(info) {

packages/node_modules/@node-red/editor-api/lib/auth/index.js

@@ -36,6 +36,7 @@ var log = require("@node-red/util").log; // TODO: separate module
 passport.use(strategies.bearerStrategy.BearerStrategy);
 passport.use(strategies.clientPasswordStrategy.ClientPasswordStrategy);
 passport.use(strategies.anonymousStrategy);
+passport.use(strategies.tokensStrategy);
 
 var server = oauth2orize.createServer();
 
@@ -60,7 +61,7 @@ function init(_settings,storage) {
 function needsPermission(permission) {
     return function(req,res,next) {
         if (settings && settings.adminAuth) {
-            return passport.authenticate(['bearer','anon'],{ session: false })(req,res,function() {
+            return passport.authenticate(['bearer','tokens','anon'],{ session: false })(req,res,function() {
                 if (!req.user) {
                     return next();
                 }
@@ -100,7 +101,10 @@ function login(req,res) {
             }
         } else if (mergedAdminAuth.type === "strategy") {
 
-            var urlPrefix = (settings.httpAdminRoot==='/')?"":settings.httpAdminRoot;
+            var urlPrefix = (settings.httpAdminRoot||"").replace(/\/$/,"");
+            if (urlPrefix.length > 0) {
+                urlPrefix += "/";
+            }
             response = {
                 "type":"strategy",
                 "prompts":[{type:"button",label:mergedAdminAuth.strategy.label, url: urlPrefix + "auth/strategy"}]

packages/node_modules/@node-red/editor-api/lib/auth/strategies.js

@@ -123,9 +123,38 @@ AnonymousStrategy.prototype.authenticate = function(req) {
     });
 }
 
+function TokensStrategy() {
+  passport.Strategy.call(this);
+  this.name = 'tokens';
+}
+util.inherits(TokensStrategy, passport.Strategy);
+TokensStrategy.prototype.authenticate = function(req) {
+    var self = this;
+    var token = null;
+    if (Users.tokenHeader() === 'authorization') {  
+        if (req.headers.authorization && req.headers.authorization.split(' ')[0] === 'Bearer') {
+            token = req.headers.authorization.split(' ')[1];
+        }
+    } else {
+        token = req.headers[Users.tokenHeader()];
+    }
+    if (token) {
+        Users.tokens(token).then(function(admin) {
+            if (admin) {
+                self.success(admin,{scope:admin.permissions});
+            } else {
+                self.fail(401);
+            }
+        });
+    } else {
+        self.fail(401);
+    }
+}
+
 module.exports = {
     bearerStrategy: bearerStrategy,
     clientPasswordStrategy: clientPasswordStrategy,
     passwordTokenExchange: passwordTokenExchange,
-    anonymousStrategy: new AnonymousStrategy()
+    anonymousStrategy: new AnonymousStrategy(),
+    tokensStrategy: new TokensStrategy()
 }

packages/node_modules/@node-red/editor-api/lib/auth/users.js

@@ -59,7 +59,9 @@ function getDefaultUser() {
 var api = {
     get: get,
     authenticate: authenticate,
-    default: getDefaultUser
+    default: getDefaultUser,
+    tokens: getDefaultUser,
+    tokenHeader: "authorization"
 }
 
 function init(config) {
@@ -105,6 +107,12 @@ function init(config) {
     } else {
         api.default = getDefaultUser;
     }
+    if (config.tokens && typeof config.tokens === "function") {
+        api.tokens = config.tokens;
+        if (config.tokenHeader && typeof config.tokenHeader === "string") {
+            api.tokenHeader = config.tokenHeader.toLowerCase();
+        }
+    }
 }
 function cleanUser(user) {
     if (user && user.hasOwnProperty('password')) {
@@ -118,5 +126,7 @@ module.exports = {
     init: init,
     get: function(username) { return api.get(username).then(cleanUser)},
     authenticate: function() { return api.authenticate.apply(null, arguments) },
-    default: function() { return api.default(); }
+    default: function() { return api.default(); },
+    tokens: function(token) { return api.tokens(token); },
+    tokenHeader: function() { return api.tokenHeader }
 };

packages/node_modules/@node-red/editor-api/lib/index.js

@@ -59,6 +59,12 @@ function init(settings,_server,storage,runtimeAPI) {
         });
         adminApp.use(corsHandler);
 
+        if (settings.httpAdminMiddleware) {
+            if (typeof settings.httpAdminMiddleware === "function") {
+                adminApp.use(settings.httpAdminMiddleware)
+            }
+        }
+
         auth.init(settings,storage);
 
         var maxApiRequestSize = settings.apiMaxLength || '5mb';

packages/node_modules/@node-red/editor-api/lib/util.js

@@ -43,10 +43,16 @@ module.exports = {
     rejectHandler: function(req,res,err) {
         //TODO: why this when errorHandler also?!
         log.audit({event: "api.error",error:err.code||"unexpected_error",message:err.message||err.toString()},req);
-        res.status(err.status||400).json({
+        var response = {
             code: err.code||"unexpected_error",
             message: err.message||err.toString()
-        });
+        };
+        // Handle auth failures on a specific remote
+        // TODO: don't hardcode this here - allow users of rejectHandler to identify extra props to send
+        if (err.remote) {
+            response.remote = err.remote;
+        }
+        res.status(err.status||400).json(response);
     },
     getRequestLogObject: function(req) {
         return {

packages/node_modules/@node-red/editor-api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "1.0.3",
+    "version": "1.1.0",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,21 +16,21 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "1.0.3",
+        "@node-red/util": "1.1.0",
-        "@node-red/editor-client": "1.0.3",
+        "@node-red/editor-client": "1.1.0",
         "bcryptjs": "2.4.3",
         "body-parser": "1.19.0",
         "clone": "2.1.2",
         "cors": "2.8.5",
         "express-session": "1.17.0",
         "express": "4.17.1",
-        "memorystore": "1.6.1",
+        "memorystore": "1.6.2",
         "mime": "2.4.4",
-        "mustache": "3.0.2",
+        "mustache": "4.0.1",
         "oauth2orize": "1.11.0",
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
-        "passport": "0.4.0",
+        "passport": "0.4.1",
         "when": "3.7.8",
         "ws": "6.2.1"
     },

packages/node_modules/@node-red/editor-client/locales/de/editor.json

@@ -34,11 +34,11 @@
         "view" : "Ansicht",
         "grid" : "Gitter",
         "showGrid" : "Raster anzeigen",
-        "snapGrid" : "Einrasten am Raster",
+        "snapGrid" : "Am Raster ausrichten",
         "gridSize" : "Rastergröße",
         "textDir" : "Textrichtung",
         "defaultDir" : "Standard",
-        "ltr" : "Links-nach-rechts",
+        "ltr" : "Von links nach rechts",
         "rtl" : "Von rechts nach links",
         "auto" : "Kontextuell"
       },
@@ -53,15 +53,15 @@
       "import" : "Import",
       "export" : "Exportieren",
       "search" : "Flows durchsuchen",
-      "searchInput" : "durchsuchen Sie Ihre Flows",
+      "searchInput" : "Flows durchsuchen",
       "subflows" : "Subflow",
       "createSubflow" : "Subflow erstellen",
-      "selectionToSubflow" : "Auswahl für Subflow",
+      "selectionToSubflow" : "Auswahl zu Subflow",
       "flows" : "Flows",
       "add" : "Hinzufügen",
       "rename" : "Umbenennen",
       "delete" : "Löschen",
-      "keyboardShortcuts" : "Tastaturkurzbefehle",
+      "keyboardShortcuts" : "Tastenkürzel",
       "login" : "Anmelden",
       "logout" : "Abmelden",
       "editPalette" : "Palette verwalten",
@@ -217,7 +217,7 @@
     "remote" : "Ferne Änderungen",
     "reviewChanges" : "Änderungen prüfen",
     "noBinaryFileShowed" : "Der Inhalt der Binärdatei kann nicht angezeigt",
-    "viewCommitDiff" : "Änderungen festschreiben",
+    "viewCommitDiff" : "Änderungen committen",
     "compareChanges" : "Änderungen vergleichen",
     "saveConflict" : "Konfliktlösung speichern",
     "conflictHeader" : "<span> __resolved__ </span>  von  <span> __unresolved__ </span>  -Konflikten behoben",
@@ -226,8 +226,8 @@
     "newVersionError" : "Neue Version enthält keine gültige JSON-Datei:"
   },
   "subflow" : {
-    "editSubflow" : "Flowschablone bearbeiten: __name__",
+    "editSubflow" : "Subflow bearbeiten: __name__",
-    "edit" : "Flowsschablone bearbeiten",
+    "edit" : "Subflow bearbeiten",
     "subflowInstances" : "Es ist __count__ Instanz dieser Subflow-Vorlage vorhanden.",
     "subflowInstances_plural" : "Es gibt __count__ Instanzen dieser Subflow-Vorlage.",
     "editSubflowProperties" : "Eigenschaften bearbeiten",
@@ -266,7 +266,7 @@
     }
   },
   "keyboard" : {
-    "title" : "Tastaturkurzbefehle",
+    "title" : "Tastenkürzel",
     "keyboard" : "Tastatur",
     "filterActions" : "Filteraktionen",
     "shortcut" : "Direktaufruf",
@@ -283,7 +283,7 @@
     "exportNode" : "Node exportieren",
     "nudgeNode" : "Ausgewählte Nodes verschieben (1px)",
     "moveNode" : "Ausgewählte Nodes verschieben (20px)",
-    "toggleSidebar" : "Seitenleiste ein-/ausschalten",
+    "toggleSidebar" : "Seitenleiste ein-/ausblenden",
     "copyNode" : "Ausgewählte Nodes kopieren",
     "cutNode" : "Ausgewählte Nodes ausschneiden",
     "pasteNode" : "Node einfügen",
@@ -308,7 +308,7 @@
   },
   "palette" : {
     "noInfo" : "Keine Informationen verfügbar",
-    "filter" : "Filter Nodes",
+    "filter" : "Nodes filtern",
     "search" : "Suchmodule",
     "addCategory" : "Neu hinzufügen ...",
     "label" : {
@@ -366,11 +366,11 @@
       "remove" : "entfernen",
       "update" : "Update auf __version__",
       "updated" : "aktualisiert",
-      "install" : "installieren",
+      "install" : "Installieren",
-      "installed" : "installiert",
+      "installed" : "Installiert",
       "loading" : "Kataloge werden geladen ...",
       "tab-nodes" : "Nodes",
-      "tab-install" : "installieren",
+      "tab-install" : "Installieren",
       "sort" : "Sortierung:",
       "sortAZ" : "a-z",
       "sortRecent" : "kürzlich",
@@ -452,7 +452,7 @@
       "name" : "Kontextdaten",
       "label" : "Kontext",
       "none" : "keine ausgewählt",
-      "refresh" : "Aktualisierung zum Laden",
+      "refresh" : "Zum Aktualisieren neu laden",
       "empty" : "leer",
       "node" : "Node",
       "flow" : "Flow",
@@ -477,7 +477,7 @@
         "none" : "Keine",
         "install" : "installieren",
         "removeFromProject" : "Aus Projekt entfernen",
-        "addToProject" : "zu Projekt hinzufügen",
+        "addToProject" : "Zu Projekt hinzufügen",
         "files" : "Dateien",
         "flow" : "Flow",
         "credentials" : "Berechtigungsnachweis",
@@ -510,7 +510,7 @@
       },
       "userSettings" : {
         "committerDetail" : "Committer-Details",
-        "committerTip" : "Leer Wert für Systemstandardwert belassen",
+        "committerTip" : "Leer lassen für Systemstandard",
         "userName" : "Benutzername",
         "email" : "E-Mail",
         "sshKeys" : "SSH-Schlüssel",
@@ -544,7 +544,7 @@
         "revertChanges" : "Änderungen zurücksetzen",
         "localChanges" : "Lokale Änderungen",
         "none" : "Keine",
-        "conflictResolve" : "Alle Konflikte wurden aufgelöst. Festschreiben der Änderungen, um den Mischvorgang abzuschließen.",
+        "conflictResolve" : "Alle Konflikte wurden aufgelöst. Committe die Änderungen, um den Merge Request abzuschließen.",
         "localFiles" : "Lokale Dateien",
         "all" : "alle",
         "unmergedChanges" : "Nicht zusammengeführte Änderungen",

packages/node_modules/@node-red/editor-client/locales/en-US/editor.json

@@ -14,7 +14,13 @@
             "back": "Back",
             "next": "Next",
             "clone": "Clone project",
-            "cont": "Continue"
+            "cont": "Continue",
+            "style": "Style",
+            "line": "Outline",
+            "fill": "Fill",
+            "label": "Label",
+            "color": "Color",
+            "position": "Position"
         },
         "type": {
             "string": "string",
@@ -28,6 +34,13 @@
             "null": "null"
         }
     },
+    "event": {
+        "loadPalette": "Loading Palette",
+        "loadNodeCatalogs": "Loading Node catalogs",
+        "loadNodes": "Loading Nodes __count__",
+        "loadFlows": "Loading Flows",
+        "importFlows": "Adding Flows to workspace"
+    },
     "workspace": {
         "defaultName": "Flow __number__",
         "editFlow": "Edit flow: __name__",
@@ -91,7 +104,12 @@
             "projects-new": "New",
             "projects-open": "Open",
             "projects-settings": "Project Settings",
-            "showNodeLabelDefault": "Show label of newly added nodes"
+            "showNodeLabelDefault": "Show label of newly added nodes",
+            "groups": "Groups",
+            "groupSelection": "Group selection",
+            "ungroupSelection": "Ungroup selection",
+            "groupMergeSelection": "Merge selection",
+            "groupRemoveSelection": "Remove from group"
         }
     },
     "actions": {
@@ -171,6 +189,8 @@
         "node_plural": "__count__ nodes",
         "configNode": "__count__ configuration node",
         "configNode_plural": "__count__ configuration nodes",
+        "group": "__count__ group",
+        "group_plural": "__count__ groups",
         "flow": "__count__ flow",
         "flow_plural": "__count__ flows",
         "subflow": "__count__ subflow",
@@ -186,6 +206,9 @@
         "nodesImported": "Imported:",
         "nodeCopied": "__count__ node copied",
         "nodeCopied_plural": "__count__ nodes copied",
+        "groupCopied": "__count__ group copied",
+        "groupCopied_plural": "__count__ groups copied",
+        "groupStyleCopied": "Group style copied",
         "invalidFlow": "Invalid flow: __message__",
         "export": {
             "selected":"selected nodes",
@@ -308,6 +331,13 @@
             "multipleInputsToSelection": "<strong>Cannot create subflow</strong>: multiple inputs to selection"
         }
     },
+    "group": {
+        "editGroup": "Edit group: __name__",
+        "errors": {
+            "cannotCreateDiffGroups": "Cannot create group using nodes from different groups",
+            "cannotAddSubflowPorts": "Cannot add subflow ports to a group"
+        }
+    },
     "editor": {
         "configEdit": "Edit",
         "configAdd": "Add",
@@ -351,7 +381,8 @@
             "bool": "bool",
             "json": "JSON",
             "bin": "buffer",
-            "env": "env variable"
+            "env": "env variable",
+            "cred": "credential"
         },
         "menu": {
             "input": "input",
@@ -538,6 +569,7 @@
             "label": "info",
             "node": "Node",
             "type": "Type",
+            "group": "Group",
             "module": "Module",
             "id": "ID",
             "status": "Status",
@@ -560,7 +592,20 @@
             "nodeHelp": "Node Help",
             "none":"None",
             "arrayItems": "__count__ items",
-            "showTips":"You can open the tips from the settings panel"
+            "showTips":"You can open the tips from the settings panel",
+            "outline": "Outline",
+            "empty": "empty",
+            "globalConfig": "Global Configuration Nodes"
+        },
+        "help": {
+            "name": "Help",
+            "label": "help",
+            "search": "Search help",
+            "nodeHelp": "Node Help",
+            "showHelp": "Show help",
+            "showInOutline": "Show in outline",
+            "showTopics": "Show topics",
+            "noHelp": "No help topic selected"
         },
         "config": {
             "name": "Configuration nodes",
@@ -613,7 +658,6 @@
                 "removeFromProject": "remove from project",
                 "addToProject": "add to project",
                 "files": "Files",
-                "package": "Package",
                 "flow": "Flow",
                 "credentials": "Credentials",
                 "package":"Package",
@@ -757,7 +801,8 @@
             "bin": "buffer",
             "date": "timestamp",
             "jsonata": "expression",
-            "env": "env variable"
+            "env": "env variable",
+            "cred": "credential"
         }
     },
     "editableList": {
@@ -804,9 +849,9 @@
         "expandItems": "Expand items",
         "collapseItems": "Collapse items",
         "duplicate": "Duplicate",
-	"error": {
+        "error": {
-	    "invalidJSON": "Invalid JSON: "
+            "invalidJSON": "Invalid JSON: "
-	}
+        }
     },
     "markdownEditor": {
         "title": "Markdown editor",
@@ -977,7 +1022,8 @@
             "passphrase": "Passphrase",
             "retry": "Retry",
             "update-failed": "Failed to update auth",
-            "unhandled": "Unhandled error response"
+            "unhandled": "Unhandled error response",
+            "host-key-verify-failed": "<p>Host key verification failed.</p><p>The repository host key could not be verified. Please update your <code>known_hosts</code> file and try again.</p>"
         },
         "create-branch-list": {
             "invalid": "Invalid branch",
@@ -1008,6 +1054,7 @@
         "en-US": "English",
         "ja": "Japanese",
         "ko": "Korean",
-        "zh-CN": "Chinese(Simplified)"
+        "zh-CN": "Chinese(Simplified)",
+        "zh-TW": "Chinese(Traditional)"
     }
 }

packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json

@@ -262,5 +262,9 @@
     "$distinct": {
         "args": "array",
         "desc": "Returns an array with duplicate values removed from `array`"
+    },
+    "$type": {
+        "args": "value",
+        "desc": "Returns the type of `value` as a string. If `value` is undefined, this will return `undefined`"
     }
 }

packages/node_modules/@node-red/editor-client/locales/ja/editor.json

@@ -14,7 +14,13 @@
             "back": "戻る",
             "next": "進む",
             "clone": "プロジェクトをクローン",
-            "cont": "続ける"
+            "cont": "続ける",
+            "style": "形式",
+            "line": "線",
+            "fill": "塗りつぶし",
+            "label": "ラベル",
+            "color": "色",
+            "position": "配置"
         },
         "type": {
             "string": "文字列",
@@ -28,6 +34,13 @@
             "null": "null"
         }
     },
+    "event": {
+        "loadPalette": "パレットを読み込み中",
+        "loadNodeCatalogs": "ノードカタログを読み込み中",
+        "loadNodes": "ノードを読み込み中 __count__",
+        "loadFlows": "フローを読み込み中",
+        "importFlows": "ワークスペースにフローを追加中"
+    },
     "workspace": {
         "defaultName": "フロー __number__",
         "editFlow": "フローを編集: __name__",
@@ -67,7 +80,7 @@
             "settings": "設定",
             "userSettings": "ユーザ設定",
             "nodes": "ノード",
-            "displayStatus": "ノードの状態を表示",
+            "displayStatus": "ノードのステータスを表示",
             "displayConfig": "ノードの設定",
             "import": "読み込み",
             "export": "書き出し",
@@ -91,7 +104,12 @@
             "projects-new": "新規",
             "projects-open": "開く",
             "projects-settings": "設定",
-            "showNodeLabelDefault": "追加したノードのラベルを表示"
+            "showNodeLabelDefault": "追加したノードのラベルを表示",
+            "groups": "グループ",
+            "groupSelection": "選択部分をグループ化",
+            "ungroupSelection": "選択部分をグループ解除",
+            "groupMergeSelection": "選択部分をマージ",
+            "groupRemoveSelection": "グループから削除"
         }
     },
     "actions": {
@@ -171,6 +189,8 @@
         "node_plural": "__count__ 個のノード",
         "configNode": "__count__ 個の設定ノード",
         "configNode_plural": "__count__ 個の設定ノード",
+        "group": "__count__ 個のグループ",
+        "group_plural": "__count__ 個のグループ",
         "flow": "__count__ 個のフロー",
         "flow_plural": "__count__ 個のフロー",
         "subflow": "__count__ 個のサブフロー",
@@ -186,6 +206,9 @@
         "nodesImported": "読み込みました:",
         "nodeCopied": "__count__ 個のノードをコピーしました",
         "nodeCopied_plural": "__count__ 個のノードをコピーしました",
+        "groupCopied": "__count__ 個のグループをコピーしました",
+        "groupCopied_plural": "__count__ 個のグループをコピーしました",
+        "groupStyleCopied": "グループの形式をコピーしました",
         "invalidFlow": "不正なフロー: __message__",
         "export": {
             "selected": "選択したフロー",
@@ -308,6 +331,13 @@
             "multipleInputsToSelection": "<strong>サブフローを作成できません</strong>: 複数の入力が選択されています"
         }
     },
+    "group": {
+        "editGroup": "__name__ グループを編集",
+        "errors": {
+            "cannotCreateDiffGroups": "異なるグループのノードを使用してグループを作成することはできません",
+            "cannotAddSubflowPorts": "グループにサブフローの端子を追加できません"
+        }
+    },
     "editor": {
         "configEdit": "編集",
         "configAdd": "追加",
@@ -351,7 +381,8 @@
             "bool": "真偽",
             "json": "JSON",
             "bin": "バッファ",
-            "env": "環境変数"
+            "env": "環境変数",
+            "cred": "認証情報"
         },
         "menu": {
             "input": "入力",
@@ -538,6 +569,7 @@
             "label": "情報",
             "node": "ノード",
             "type": "型",
+            "group": "グループ",
             "module": "モジュール",
             "id": "ID",
             "status": "状態",
@@ -560,7 +592,20 @@
             "nodeHelp": "ノードのヘルプ",
             "none": "なし",
             "arrayItems": "__count__ 要素",
-            "showTips": "設定からヒントを表示できます"
+            "showTips": "設定からヒントを表示できます",
+            "outline": "アウトライン",
+            "empty": "空",
+            "globalConfig": "グローバル設定ノード"
+        },
+        "help": {
+            "name": "ヘルプ",
+            "label": "ヘルプ",
+            "search": "ヘルプを検索",
+            "nodeHelp": "ノードヘルプ",
+            "showHelp": "ヘルプを表示",
+            "showInOutline": "アウトラインに表示",
+            "showTopics": "トピックを表示",
+            "noHelp": "ヘルプのトピックが未選択"
         },
         "config": {
             "name": "ノードの設定を表示",
@@ -613,9 +658,9 @@
                 "removeFromProject": "プロジェクトから削除",
                 "addToProject": "プロジェクトへ追加",
                 "files": "ファイル",
-                "package": "パッケージ",
                 "flow": "フロー",
                 "credentials": "認証情報",
+                "package": "パッケージ",
                 "packageCreate": "変更が保存された時にファイルが作成されます",
                 "fileNotExist": "ファイルが存在しません",
                 "selectFile": "ファイルを選択",
@@ -756,7 +801,8 @@
             "bin": "バッファ",
             "date": "日時",
             "jsonata": "JSONata式",
-            "env": "環境変数"
+            "env": "環境変数",
+            "cred": "認証情報"
         }
     },
     "editableList": {
@@ -803,9 +849,9 @@
         "expandItems": "要素を展開",
         "collapseItems": "要素を折り畳む",
         "duplicate": "複製",
-	"error": {
+        "error": {
-	    "invalidJSON": "不正なJSON: "
+            "invalidJSON": "不正なJSON: "
-	}
+        }
     },
     "markdownEditor": {
         "title": "マークダウンエディタ",
@@ -976,7 +1022,8 @@
             "passphrase": "パスフレーズ",
             "retry": "リトライ",
             "update-failed": "認証の更新に失敗しました",
-            "unhandled": "エラー応答が処理されませんでした"
+            "unhandled": "エラー応答が処理されませんでした",
+            "host-key-verify-failed": "<p>ホストキーの検証に失敗</p><p>リポジトリのホストキーを検証できませんでした。<code>known_hosts</code>ファイルを更新して、もう一度試してください。</p>"
         },
         "create-branch-list": {
             "invalid": "不正なブランチ",
@@ -1007,6 +1054,7 @@
         "en-US": "英語",
         "ja": "日本語",
         "ko": "韓国語",
-        "zh-CN": "中国語(簡体)"
+        "zh-CN": "中国語(簡体)",
+        "zh-TW": "中国語(繁体)"
     }
 }

packages/node_modules/@node-red/editor-client/locales/ja/jsonata.json

@@ -245,11 +245,11 @@
     },
     "$encodeUrl": {
         "args": "str",
-        "desc": "Uniform Resource Locator (URL)を構成する文字を1、２、3、もしくは、4文字エスケープシーケンスのUTF-8文字エンコーディングで置換します。\n\n例: `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
+        "desc": "Uniform Resource Locator (URL)を構成する文字を1、2、3、もしくは、4文字エスケープシーケンスのUTF-8文字エンコーディングで置換します。\n\n例: `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
     },
     "$encodeUrlComponent": {
         "args": "str",
-        "desc": "Uniform Resource Locator (URL)要素を構成する文字を1、２、３、もしくは、4文字エスケープシーケンスのUTF-8文字エンコーディングで置換します。\n\n例: `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
+        "desc": "Uniform Resource Locator (URL)要素を構成する文字を1、2、3、もしくは、4文字エスケープシーケンスのUTF-8文字エンコーディングで置換します。\n\n例: `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
     },
     "$decodeUrl": {
         "args": "str",
@@ -262,5 +262,9 @@
     "$distinct": {
         "args": "array",
         "desc": "配列`array`から重複要素を削除した配列を返します。"
+    },
+    "$type": {
+        "args": "value",
+        "desc": "`value` の型を文字列として返します。もし `value` が未定義の場合、 `undefined` が返されます。"
     }
 }

packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json

@@ -10,7 +10,22 @@
             "load": "读取",
             "save": "保存",
             "import": "导入",
-            "export": "导出"
+            "export": "导出",
+            "back": "后退",
+            "next": "下一个",
+            "clone": "克隆项目",
+            "cont": "继续"
+        },
+        "type": {
+            "string": "字符串",
+            "number": "数字",
+            "boolean": "布尔值",
+            "array": "数组",
+            "buffer": "buffer",
+            "object": "对象",
+            "jsonString": "JSON字符串",
+            "undefined": "未定义",
+            "null": "空"
         }
     },
     "workspace": {
@@ -19,10 +34,13 @@
         "confirmDelete": "确认删除",
         "delete": "你确定想删除 '__label__'?",
         "dropFlowHere": "把流程放到这里",
+        "addFlow": "添加流程",
+        "listFlows": "流程一览",
         "status": "状态",
         "enabled": "有效",
         "disabled": "无效",
-        "info": "详细描述"
+        "info": "详细描述",
+        "selectNodes": "点击节点来选择"
     },
     "menu": {
         "label": {
@@ -36,11 +54,16 @@
                 "defaultDir": "默认方向",
                 "ltr": "从左到右",
                 "rtl": "从右到左",
-                "auto": "上下文"
+                "auto": "上下文",
+                "language": "语言",
+                "browserDefault": "浏览器默认"
             },
             "sidebar": {
                 "show": "显示侧边栏"
             },
+            "palette": {
+                "show": "显示控制板"
+            },
             "settings": "设置",
             "userSettings": "用户设置",
             "nodes": "节点",
@@ -60,11 +83,23 @@
             "keyboardShortcuts": "键盘快捷方式",
             "login": "登陆",
             "logout": "退出",
-            "editPalette":"节点管理",
+            "editPalette": "节点管理",
             "other": "其他",
-            "showTips": "显示小提示"
+            "showTips": "显示小提示",
+            "help": "Node-RED网页",
+            "projects": "项目",
+            "projects-new": "新建",
+            "projects-open": "打开",
+            "projects-settings": "项目设定",
+            "showNodeLabelDefault": "显示新添加的节点的标签"
         }
     },
+    "actions": {
+        "toggle-navigator": "切换导航器",
+        "zoom-out": "缩小",
+        "zoom-reset": "重设缩放",
+        "zoom-in": "放大"
+    },
     "user": {
         "loggedInAs": "作为__name__登陆",
         "username": "账号",
@@ -82,29 +117,73 @@
         "warning": "<strong>警告</strong>: __message__",
         "warnings": {
             "undeployedChanges": "节点中存在未部署的更改",
+            "nodeActionDisabled": "节点操作已禁用",
             "nodeActionDisabledSubflow": "节点动作在子流程中被禁用",
             "missing-types": "流程由于缺少节点类型而停止。请检查日志的详细信息",
-            "restartRequired": "Node-RED必须重新启动，以启用升级的模块"
+            "safe-mode": "<p>流程以安全模式停止。</p><p>您可以修改流程并部署更改以重新启动。</p>",
+            "restartRequired": "Node-RED必须重新启动，以启用升级的模块",
+            "credentials_load_failed": "<p>由于无法解密凭据，因此流程停止。</p><p>流程凭据文件已加密，但是项目的加密密钥丢失或无效。</p>",
+            "credentials_load_failed_reset": "<p>凭据无法解密</p><p>流凭据文件已加密，但是项目的加密密钥丢失或无效。</p><p>流凭据文件将在下一次部署时重置。任何现有的流凭证将被清除。</p>",
+            "missing_flow_file": "<p>找不到项目流程文件。</p><p>该项目未配置流程文件。</p>",
+            "missing_package_file": "<p>找不到项目包文件。</p><p>项目缺少package.json文件。</p>",
+            "project_empty": "<p>该项目为空。</p><p>是否要创建一组默认的项目文件？<br/>否则，您将必须在编辑器外部手动将文件添加到项目中。</p>",
+            "project_not_found": "<p>未找到项目'__project__'。</p>",
+            "git_merge_conflict": "<p>自动合并更改失败。</p><p>修复未合并的冲突，然后提交结果。</p>"
         },
-        "error": "<strong>Error</strong>: __message__",
+        "error": "<strong>错误</strong>: __message__",
         "errors": {
             "lostConnection": "丢失与服务器的连接，重新连接...",
             "lostConnectionReconnect": "丢失与服务器的连接，__time__秒后重新连接",
             "lostConnectionTry": "现在尝试",
             "cannotAddSubflowToItself": "无法向其自身添加子流程",
             "cannotAddCircularReference": "无法添加子流程 - 循环引用",
-            "unsupportedVersion": "您正在使用不受支持的Node.js版本<br/>请升级到最新版本的Node.js LTS"
+            "unsupportedVersion": "您正在使用不受支持的Node.js版本<br/>请升级到最新版本的Node.js LTS",
+            "failedToAppendNode": "<p>'__module__'加载失败</p><p>__error__</p>"
+        },
+        "project": {
+            "change-branch": "转到本地分支'__project__'",
+            "merge-abort": "Git合并中止",
+            "loaded": "项目'__project__'已加载",
+            "updated": "项目'__project__'已更新",
+            "pull": "项目'__project__'已重新加载",
+            "revert": "项目 '__project__'已还原",
+            "merge-complete": "Git合并完成",
+            "setupCredentials": "设定证书",
+            "setupProjectFiles": "设置项目文件",
+            "no": "不了，谢谢",
+            "createDefault": "创建默认项目文件",
+            "mergeConflict": "显示合并冲突"
+        },
+        "label": {
+            "manage-project-dep": "管理项目依赖性",
+            "setup-cred": "设定证书",
+            "setup-project": "设置项目文件",
+            "create-default-package": "创建默认的包文件",
+            "no-thanks": "不了，谢谢",
+            "create-default-project": "创建默认项目文件",
+            "show-merge-conflicts": "显示合并冲突"
         }
     },
     "clipboard": {
         "clipboard": "剪贴板",
         "nodes": "节点",
+        "node": "__count__节点",
+        "node_plural": "__count__节点",
+        "configNode": "__count__配置节点",
+        "configNode_plural": "__count__配置节点",
+        "flow": "__count__流程",
+        "flow_plural": "__count__流程",
+        "subflow": "__count__子流程",
+        "subflow_plural": "__count__子流程",
         "pasteNodes": "在这里粘贴节点",
+        "selectFile": "选择要导入的文件",
         "importNodes": "导入节点",
         "exportNodes": "导出节点至剪贴板",
+        "download": "下载",
         "importUnrecognised": "导入了无法识别的类型:",
         "importUnrecognised_plural": "导入了无法识别的类型:",
         "nodesExported": "节点导出到了剪贴板",
+        "nodesImported": "导入：",
         "nodeCopied": "已复制__count__个节点",
         "nodeCopied_plural": "已复制__count__个节点",
         "invalidFlow": "无效的流程: __message__",
@@ -114,11 +193,21 @@
             "all": "所有流程",
             "compact": "紧凑",
             "formatted": "已格式化",
-            "copy": "导出到剪贴板"
+            "copy": "导出到剪贴板",
+            "export": "到处到库",
+            "exportAs": "导出为",
+            "overwrite": "替换",
+            "exists": "<p><b>\"__file__\"</b>已存在</p><p>是否要替换它？</p>"
         },
         "import": {
             "import": "导入到",
-            "newFlow": "新流程"
+            "newFlow": "新流程",
+            "errors": {
+                "notArray": "输入的不是JSON数组",
+                "itemNotObject": "输入的流无效 - 项目__index__不是节点对象",
+                "missingId": "输入的流无效-项 __index__ 缺少'id'属性",
+                "missingType": "输入的流程无效-项__index__缺少'类型'属性"
+            }
         },
         "copyMessagePath": "已复制路径",
         "copyMessageValue": "已复制数值",
@@ -132,7 +221,10 @@
         "modifiedFlowsDesc": "只部署包含已更改节点的流",
         "modifiedNodes": "已更改的节点",
         "modifiedNodesDesc": "只部署已经更改的节点",
+        "restartFlows": "重启流程",
+        "restartFlowsDesc": "重新启动当前部署的流程",
         "successfulDeploy": "部署成功",
+        "successfulRestart": "成功重启流程",
         "deployFailed": "部署失败: __message__",
         "unusedConfigNodes": "您有一些未使用的配置节点",
         "unusedConfigNodesLink": "点击此处查看它们",
@@ -152,16 +244,24 @@
             "improperlyConfigured": "工作区包含一些未正确配置的节点:",
             "unknown": "工作区包含一些未知的节点类型:",
             "confirm": "你确定要部署吗?",
+            "doNotWarn": "不要再对此发出警告",
             "conflict": "服务器正在运行较新的一组流程。",
             "backgroundUpdate": "服务器上的流程已更新。",
             "conflictChecking": "检查是否可以自动合并更改",
             "conflictAutoMerge": "此更改不包括冲突，可以自动合并",
-            "conflictManualMerge": "这些更改包括了在部署之前必须解决的冲突。"
+            "conflictManualMerge": "这些更改包括了在部署之前必须解决的冲突。",
+            "plusNMore": "+ __count__更多"
         }
     },
+    "eventLog": {
+        "title": "事件记录日志",
+        "view": "查看日志"
+    },
     "diff": {
         "unresolvedCount": "__count__个未解决的冲突",
         "unresolvedCount_plural": "__count__个未解决的冲突",
+        "globalNodes": "全局节点",
+        "flowProperties": "流程属性",
         "type": {
             "added": "已添加",
             "changed": "已更改",
@@ -175,9 +275,19 @@
         "nodeCount": "__count__个节点",
         "nodeCount_plural": "__count__个节点",
         "local": "本地",
-        "remote": "远程"
+        "remote": "远程",
+        "reviewChanges": "查看变更",
+        "noBinaryFileShowed": "无法显示二进制文件内容",
+        "viewCommitDiff": "查看提交更改",
+        "compareChanges": "比较变更",
+        "saveConflict": "保存冲突解决",
+        "conflictHeader": "已解决<span>__unresolved__</span>中的<span>__resolved__</span>个冲突",
+        "commonVersionError": "通用版本不包含有效的JSON：",
+        "oldVersionError": "旧版本不包含有效的JSON：",
+        "newVersionError": "新版本不包含有效的JSON："
     },
     "subflow": {
+        "editSubflowInstance": "编辑子流实例：__name__",
         "editSubflow": "编辑流程模板: __name__",
         "edit": "编辑流程模板",
         "subflowInstances": "这个子流程模板有__count__个实例",
@@ -185,8 +295,14 @@
         "editSubflowProperties": "编辑属性",
         "input": "输入:",
         "output": "输出:",
+        "status": "状态节点",
         "deleteSubflow": "删除子流程",
         "info": "详细描述",
+        "category": "类别",
+        "env": {
+            "restore": "恢复为默认子流",
+            "remove": "删除环境变量"
+        },
         "errors": {
             "noNodesSelected": "<strong>无法创建子流程</strong>: 未选择节点",
             "multipleInputsToSelection": "<strong>无法创建子流程</strong>: 多个输入到了选择"
@@ -204,18 +320,68 @@
         "editConfig": "编辑__type__配置",
         "addNewType": "添加新的__type__节点",
         "nodeProperties": "节点属性",
+        "label": "标签",
+        "color": "颜色",
         "portLabels": "端口标签",
         "labelInputs": "输入",
         "labelOutputs": "输出",
+        "settingIcon": "图标",
+        "default": "默认",
         "noDefaultLabel": "无",
         "defaultLabel": "使用默认标签",
+        "searchIcons": "搜索图标",
+        "useDefault": "使用默认",
+        "description": "描述",
+        "show": "显示",
+        "hide": "隐藏",
+        "locale": "选择界面语言",
+        "icon": "图标",
+        "inputType": "输入类型",
+        "inputs": {
+            "input": "输入",
+            "select": "选择",
+            "checkbox": "复选框",
+            "spinner": "微调器",
+            "none": "空",
+            "hidden": "隐藏属性"
+        },
+        "types": {
+            "str": "字符串",
+            "num": "数字",
+            "bool": "布尔",
+            "json": "JSON",
+            "bin": "buffer",
+            "env": "环境变量"
+        },
+        "menu": {
+            "input": "输入",
+            "select": "选择",
+            "checkbox": "复选框",
+            "spinner": "微调器",
+            "hidden": "仅标签"
+        },
+        "select": {
+            "label": "标签",
+            "value": "值"
+        },
+        "spinner": {
+            "min": "最小值",
+            "max": "最大值"
+        },
         "errors": {
-            "scopeChange": "更改范围将使其他流中的节点无法使用"
+            "scopeChange": "更改范围将使其他流中的节点无法使用",
+            "invalidProperties": "无效的属性："
         }
     },
     "keyboard": {
         "title": "键盘快捷键",
+        "keyboard": "键盘",
+        "filterActions": "筛选动作",
+        "shortcut": "快捷键",
+        "scope": "范围",
         "unassigned": "未分配",
+        "global": "全局",
+        "workspace": "工作组",
         "selectAll": "选择所有节点",
         "selectAllConnected": "选择所有连接的节点",
         "addRemoveNode": "从选择中添加/删除节点",
@@ -226,12 +392,14 @@
         "nudgeNode": "移动所选节点(1px)",
         "moveNode": "移动所选节点(20px)",
         "toggleSidebar": "切换侧边栏",
+        "togglePalette": "切换控制板",
         "copyNode": "复制所选节点",
         "cutNode": "剪切所选节点",
         "pasteNode": "粘贴节点",
         "undoChange": "撤消上次执行的更改",
         "searchBox": "打开搜索框",
-        "managePalette": "管理面板"
+        "managePalette": "管理面板",
+        "actionList": "动作列表"
     },
     "library": {
         "library": "库",
@@ -239,30 +407,42 @@
         "saveToLibrary": "保存到库...",
         "typeLibrary": "__type__类型库",
         "unnamedType": "无名__type__",
-        "exportToLibrary": "将节点导出到库",
+        "exportedToLibrary": "节点导出到库",
         "dialogSaveOverwrite": "一个叫做__libraryName__的__libraryType__已经存在，您需要覆盖么？",
         "invalidFilename": "无效的文件名",
         "savedNodes": "保存的节点",
         "savedType": "已保存__type__",
         "saveFailed": "保存失败: __message__",
+        "newFolder": "新文件夹",
         "types": {
+            "local": "本地的",
             "examples": "例子"
-        }
+        },
+        "exportToLibrary": "将节点导出到库"
     },
     "palette": {
         "noInfo": "无可用信息",
         "filter": "过滤节点",
         "search": "搜索模块",
+        "addCategory": "添加新的...",
         "label": {
             "subflows": "子流程",
+            "network": "网络",
+            "common": "共通",
             "input": "输入",
             "output": "输出",
             "function": "功能",
+            "sequence": "序列",
+            "parser": "解析",
             "social": "社交",
             "storage": "存储",
             "analysis": "分析",
             "advanced": "高级"
         },
+        "actions": {
+            "collapse-all": "收起所有类别",
+            "expand-all": "展开所有类别"
+        },
         "event": {
             "nodeAdded": "添加到面板中的节点:",
             "nodeAdded_plural": "添加到面板中的多个节点",
@@ -276,6 +456,7 @@
         },
         "editor": {
             "title": "面板管理",
+            "palette": "控制板",
             "times": {
                 "seconds": "秒前",
                 "minutes": "分前",
@@ -309,6 +490,8 @@
             "updated": "已更新",
             "install": "安装",
             "installed": "已安装",
+            "conflict": "冲突",
+            "conflictTip": "<p>无法安装此模块，因为它包含已安装的<br/>节点类型</p><p>与<code>__module__</code>冲突</p>",
             "loading": "加载目录...",
             "tab-nodes": "节点",
             "tab-install": "安装",
@@ -356,6 +539,7 @@
             "label": "信息",
             "node": "节点",
             "type": "类型",
+            "module": "模组",
             "id": "ID",
             "status": "状态",
             "enabled": "启用",
@@ -364,17 +548,18 @@
             "instances": "实例",
             "properties": "属性",
             "info": "信息",
+            "desc": "描述",
             "blank": "空白",
             "null": "空",
             "showMore": "展开",
             "showLess": "收起",
             "flow": "流程",
-            "selection":"选择",
+            "selection": "选择",
-            "nodes":"__count__ 个节点",
+            "nodes": "__count__ 个节点",
             "flowDesc": "流程描述",
             "subflowDesc": "子流程描述",
             "nodeHelp": "节点帮助",
-            "none":"无",
+            "none": "无",
             "arrayItems": "__count__个项目",
             "showTips": "您可以从设置面板启用提示信息"
         },
@@ -386,9 +571,25 @@
             "subflows": "子流程",
             "flows": "流程",
             "filterAll": "所有",
+            "showAllConfigNodes": "显示所有配置节点",
             "filterUnused": "未使用",
+            "showAllUnusedConfigNodes": "显示所有未使用的配置节点",
             "filtered": "__count__ 个隐藏"
         },
+        "context": {
+            "name": "上下文数据",
+            "label": "上下午",
+            "none": "未选择",
+            "refresh": "刷新以加载",
+            "empty": "空",
+            "node": "节点",
+            "flow": "流程",
+            "global": "全局",
+            "deleteConfirm": "你确定要删除这个项目吗？",
+            "autoRefresh": "刷新选择更改",
+            "refrsh": "刷新",
+            "delete": "删除"
+        },
         "palette": {
             "name": "节点管理",
             "label": "节点"
@@ -399,8 +600,151 @@
             "description": "描述",
             "dependencies": "依赖",
             "settings": "设置",
+            "noSummaryAvailable": "无可用摘要",
             "editDescription": "编辑项目描述",
-            "editDependencies": "编辑项目依赖"
+            "editDependencies": "编辑项目依赖",
+            "noDescriptionAvailable": "没有可用的描述",
+            "editReadme": "编辑README.md",
+            "showProjectSettings": "显示项目设置",
+            "projectSettings": {
+                "title": "项目设置",
+                "edit": "编辑",
+                "none": "空",
+                "install": "安装",
+                "removeFromProject": "从项目中删除",
+                "addToProject": "添加到项目",
+                "files": "文件",
+                "package": "包",
+                "flow": "流程",
+                "credentials": "证书",
+                "packageCreate": "保存更改后将创建文件",
+                "fileNotExist": "文件不存在",
+                "selectFile": "选择文件",
+                "invalidEncryptionKey": "无效的加密密钥",
+                "encryptionEnabled": "启用加密",
+                "encryptionDisabled": "加密已禁用",
+                "setTheEncryptionKey": "设置加密密钥",
+                "resetTheEncryptionKey": "重置加密密钥",
+                "changeTheEncryptionKey": "更改加密密钥",
+                "currentKey": "当前密钥",
+                "newKey": "新密钥",
+                "credentialsAlert": "这将删除所有现有凭证",
+                "versionControl": "版本控制",
+                "branches": "分支",
+                "noBranches": "没有分支",
+                "deleteConfirm": "您确定要删除本地分支'__name__'吗？ 这不能被撤消。",
+                "unmergedConfirm": "本地分支'__name__'具有未合并的更改，这些更改将丢失。你确定要删除吗？",
+                "deleteUnmergedBranch": "删除未合并的分支",
+                "gitRemotes": "Git远程仓库",
+                "addRemote": "添加远程仓库",
+                "addRemote2": "添加远程仓库",
+                "remoteName": "远程仓库名",
+                "nameRule": "只能包含A-Z 0-9 _ -",
+                "url": "URL",
+                "urlRule": "https://, ssh:// or file://",
+                "urlRule2": "网址中不能包含用户名/密码",
+                "noRemotes": "没有远程仓库",
+                "deleteRemoteConfrim": "您确定要删除远程仓库'__name__'吗？",
+                "deleteRemote": "删除远程仓库"
+            },
+            "userSettings": {
+                "committerDetail": "提交者详细信息",
+                "committerTip": "保留空白以使用系统默认值",
+                "userName": "用户名",
+                "email": "电子邮件",
+                "sshKeys": "SSH密钥",
+                "sshKeysTip": "允许您创建到远程git存储库的安全连接。",
+                "add": "添加密钥",
+                "addSshKey": "添加SSH密钥",
+                "addSshKeyTip": "生成新的公钥/私钥对",
+                "name": "名字",
+                "nameRule": "只能包含A-Z 0-9 _ -",
+                "passphrase": "密码短语",
+                "passphraseShort": "密码短语过短",
+                "optional": "可选的",
+                "cancel": "取消",
+                "generate": "生成密钥",
+                "noSshKeys": "没有SSH密钥",
+                "copyPublicKey": "将公钥复制到剪贴板",
+                "delete": "删除密钥",
+                "gitConfig": "Git配置",
+                "deleteConfirm": "您确定要删除SSH密钥__name__吗？这不能被撤消。"
+            },
+            "versionControl": {
+                "unstagedChanges": "未暂存的变更",
+                "stagedChanges": "暂存的变更",
+                "unstageChange": "取消变更的暂存",
+                "stageChange": "暂存变更",
+                "unstageAllChange": "取消所有变更的暂存",
+                "stageAllChange": "暂存所有变更",
+                "commitChanges": "提交变更",
+                "resolveConflicts": "解决冲突",
+                "head": "HEAD",
+                "staged": "暂存的",
+                "unstaged": "未暂存的",
+                "local": "本地的",
+                "remote": "远程的",
+                "revert": "您确定要将更改恢复为'__file__'吗？这不能被撤消。",
+                "revertChanges": "还原变更",
+                "localChanges": "本地变更",
+                "none": "None",
+                "conflictResolve": "解决所有冲突。提交更改以完成合并。",
+                "localFiles": "本地文件",
+                "all": "所有的",
+                "unmergedChanges": "未合并的更改",
+                "abortMerge": "中止合并",
+                "commit": "提交",
+                "changeToCommit": "提交变更",
+                "commitPlaceholder": "输入您的提交信息",
+                "cancelCapital": "取消",
+                "commitCapital": "提交",
+                "commitHistory": "提交历史",
+                "branch": "分支:",
+                "moreCommits": "更多提交",
+                "changeLocalBranch": "变更本地分支",
+                "createBranchPlaceholder": "查找或创建分支",
+                "upstream": "上游",
+                "localOverwrite": "切换分支会覆盖您现有的本地更改。您必须先提交或撤消那些更改。",
+                "manageRemoteBranch": "管理远程分支",
+                "unableToAccess": "无法访问远程存储库",
+                "retry": "重试",
+                "setUpstreamBranch": "设置为上游分支",
+                "createRemoteBranchPlaceholder": "查找或创建远程分支",
+                "trackedUpstreamBranch": "创建的分支将被设置为跟踪的上游分支。",
+                "selectUpstreamBranch": "分支将被创建。 在下面选择以将其设置为被跟踪的上游分支。",
+                "pushFailed": "推送失败，因为远程具有更多的最新提交。请先拉取并合并，然后再尝试推送。",
+                "push": "推送",
+                "pull": "拉取",
+                "unablePull": "<p>无法提取远程更改；您未暂存的本地更改将被覆盖。</p><p>请先提交更改，然后重试。</p>",
+                "showUnstagedChanges": "显示未暂存的更改",
+                "connectionFailed": "无法连接到远程存储库：",
+                "pullUnrelatedHistory": "<p>远程有无关的提交历史</p><p>您确定要将这些更改拉入本地仓库吗？</p>",
+                "pullChanges": "拉取更改",
+                "history": "历史",
+                "projectHistory": "项目历史",
+                "daysAgo": "__count__天前",
+                "daysAgo_plural": "__count__天前",
+                "hoursAgo": "__count__小时前",
+                "hoursAgo_plural": "__count__小时前",
+                "minsAgo": "__count__分钟前",
+                "minsAgo_plural": "__count__分钟前",
+                "secondsAgo": "秒前",
+                "notTracking": "您的本地分支当前未跟踪一个远程分支。",
+                "statusUnmergedChanged": "您的仓库中有未合并的更改。您需要解决冲突并提交结果。",
+                "repositoryUpToDate": "您的仓库是最新的。",
+                "commitsAhead": "您的存储库领先远程仓库__count__次提交。您现在可以推送这些提交。",
+                "commitsAhead_plural": "您的存储库领先远程仓库__count__次提交。您现在可以推送这些提交。",
+                "commitsBehind": "您的存储库落后远程仓库__count__次提交。您现在可以拉取这些提交。",
+                "commitsBehind_plural": "您的存储库落后远程仓库__count__次提交。您现在可以拉取这些提交。",
+                "commitsAheadAndBehind1": "您的存储库落后远程仓库__count__次提交",
+                "commitsAheadAndBehind1_plural": "您的存储库落后远程仓库__count__次提交",
+                "commitsAheadAndBehind2": "领先远程仓库__count__次提交。",
+                "commitsAheadAndBehind2_plural": "领先远程仓库__count__次提交。",
+                "commitsAheadAndBehind3": "您必须先拉取远程提交，然后才能进行推送。",
+                "commitsAheadAndBehind3_plural": "您必须先拉取远程提交，然后才能进行推送。",
+                "refreshCommitHistory": "刷新提交历史",
+                "refreshChanges": "刷新更改"
+            }
         }
     },
     "typedInput": {
@@ -408,10 +752,12 @@
             "str": "文字列",
             "num": "数字",
             "re": "正则表达式",
-            "bool": "布尔",
+            "bool": "布尔值",
             "json": "JSON",
             "bin": "二进制流",
-            "date": "时间戳"
+            "date": "时间戳",
+            "jsonata": "表达式",
+            "env": "环境变量"
         }
     },
     "editableList": {
@@ -423,8 +769,10 @@
     },
     "expressionEditor": {
         "functions": "功能",
+        "functionReference": "功能reference",
         "insert": "插入",
         "title": "JSONata表达式编辑器",
+        "test": "测试",
         "data": "示例消息",
         "result": "结果",
         "format": "格式表达方法",
@@ -438,14 +786,229 @@
             "eval": "评估表达式错误:\n  __message__"
         }
     },
+    "jsEditor": {
+        "title": "JavaScript编辑器"
+    },
+    "textEditor": {
+        "title": "文本编辑器"
+    },
     "jsonEditor": {
         "title": "JSON编辑器",
-        "format": "格式化JSON"
+        "format": "格式化JSON",
+        "rawMode": "编辑 JSON",
+        "uiMode": "Visual编辑器",
+        "insertAbove": "在上方插入",
+        "insertBelow": "在下方插入",
+        "addItem": "添加项目",
+        "copyPath": "复制路径到项目",
+        "expandItems": "展开项目",
+        "collapseItems": "收合项目",
+        "duplicate": "重复",
+        "error": {
+            "invalidJSON": "无效的JSON: "
+        }
+    },
+    "markdownEditor": {
+        "title": "Markdown编辑器",
+        "expand": "展开",
+        "format": "格式化为markdown",
+        "heading1": "标题 1",
+        "heading2": "标题 2",
+        "heading3": "标题 3",
+        "bold": "粗体",
+        "italic": "斜体",
+        "code": "代码",
+        "ordered-list": "排序的列表",
+        "unordered-list": "非排序的列表",
+        "quote": "引用",
+        "link": "链接",
+        "horizontal-rule": "水平线",
+        "toggle-preview": "切换预览"
     },
     "bufferEditor": {
         "title": "缓冲区编辑器",
         "modeString": "作为UTF-8字符串处理",
         "modeArray": "作为JSON数组处理",
         "modeDesc": "<h3>缓冲区编辑器</h3><p>缓冲区类型被存储为字节值的JSON数组。编辑器将尝试将输入的数值解析为JSON数组。如果它不是有效的JSON，它将被视为UTF-8字符串，并被转换为单个字符代码点的数组。</p><p>例如，<code>Hello World</code>的值会被转换为JSON数组：<pre>[72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100]</pre></p>"
+    },
+    "projects": {
+        "config-git": "配置Git客户端",
+        "welcome": {
+            "hello": "你好！ 我们已经将“项目”引入了Node-RED。",
+            "desc0": "这是一种用于管理流程文件的新方法，并且包括对流程的版本控制。",
+            "desc1": "首先，您可以创建您的第一个项目或从git存储库克隆现有项目。",
+            "desc2": "如果不确定，可以暂时跳过此步骤。您仍然可以随时通过“项目”菜单创建第一个项目。",
+            "create": "建立专案",
+            "clone": "克隆仓库",
+            "openExistingProject": "打开现有项目",
+            "not-right-now": "不是现在"
+        },
+        "git-config": {
+            "setup": "设置您的版本控制客户端",
+            "desc0": "Node-RED使用开源工具Git进行版本控制。它跟踪对项目文件的更改，并允许您将其推送到远程存储库。",
+            "desc1": "提交一组更改时，Git会使用用户名和电子邮件地址记录谁进行了更改。用户名可以是您想要的任何名称-不必是您的真实姓名。",
+            "desc2": "您的Git客户端已经配置了以下详细信息。",
+            "desc3": "您可以稍后在设置对话框的'Git config'标签下更改这些设置。",
+            "username": "用户名",
+            "email": "电子邮件"
+        },
+        "project-details": {
+            "create": "创建你的项目",
+            "desc0": "项目被维护为Git仓库。与他人一起共享您的流程",
+            "desc1": "您可以创建多个项目，并通过编辑器在它们之间快速切换。",
+            "desc2": "首先，您的项目需要一个名称和一个可选的描述。",
+            "already-exists": "项目已存在",
+            "must-contain": "只能包含A-Z 0-9 _ -",
+            "project-name": "项目名",
+            "desc": "描述",
+            "opt": "可选的"
+        },
+        "clone-project": {
+            "clone": "克隆一个项目",
+            "desc0": "如果您已经有一个包含项目的git仓库，则可以对其进行克隆以开始使用。",
+            "already-exists": "项目已存在",
+            "must-contain": "只能包含A-Z 0-9 _ -",
+            "project-name": "项目名",
+            "no-info-in-url": "网址中不要包含用户名/密码",
+            "git-url": "Git仓库的url",
+            "protocols": "https://, ssh:// or file://",
+            "auth-failed": "认证失败",
+            "username": "用户名",
+            "passwd": "秘密啊",
+            "ssh-key": "SSH密钥",
+            "passphrase": "密码短语",
+            "ssh-key-desc": "在通过ssh克隆仓库之前，必须添加SSH密钥才能访问它。",
+            "ssh-key-add": "添加一个ssh密钥",
+            "credential-key": "证书加密密钥",
+            "cant-get-ssh-key": "错误！ 无法获取所选的SSH密钥路径。",
+            "already-exists2": "已存在",
+            "git-error": "git错误",
+            "connection-failed": "连接失败",
+            "not-git-repo": "不是一个git仓库",
+            "repo-not-found": "未发现仓库"
+        },
+        "default-files": {
+            "create": "创建您的项目文件",
+            "desc0": "一个包含您的流程文件，Readme文件和package.json文件的项目。",
+            "desc1": "它可以包含您要在Git仓库中维护的任何其他文件。",
+            "desc2": "您现有的流程和凭证文件将被复制到项目中。",
+            "flow-file": "流程文件",
+            "credentials-file": "证书文件"
+        },
+        "encryption-config": {
+            "setup": "设置证书文件的加密",
+            "desc0": "您的流程证书文件可以被加密以确保其内容安全。",
+            "desc1": "如果要将这些证书存储在公共Git存储库中，则必须通过提供密钥短语来对它们进行加密。",
+            "desc2": "您的流程证书文件当前未加密。",
+            "desc3": "这意味着任何有权访问该文件的人都可以读取其内容，例如密码和访问令牌。",
+            "desc4": "如果要将这些证书存储在公共Git仓库中，则必须通过提供密钥短语来对它们进行加密。",
+            "desc5": "当前，使用设置文件中的credentialSecret属性作为密钥来加密流程证书文件。",
+            "desc6": "您的流程证书文件当前使用系统生成的密钥加密。您应该为此项目提供一个新的密钥。",
+            "desc7": "密钥将与项目文件分开存储。您将需要提供在另一个Node-RED实例中使用该项目的密钥。",
+            "credentials": "证书",
+            "enable": "启用加密",
+            "disable": "禁用加密",
+            "disabled": "禁用的",
+            "copy": "复制现有密钥",
+            "use-custom": "使用自定义密钥",
+            "desc8": "证书文件不会被加密，其内容很容易阅读",
+            "create-project-files": "创建项目文件",
+            "create-project": "创建项目",
+            "already-exists": "已存在",
+            "git-error": "git错误",
+            "git-auth-error": "git认证错误"
+        },
+        "create-success": {
+            "success": "您已经成功创建了第一个项目！",
+            "desc0": "现在，您可以像往常一样继续使用Node-RED。",
+            "desc1": "侧栏中的“信息”标签显示了您当前的活动项目。名称旁边的按钮可用于访问项目设置视图。",
+            "desc2": "侧栏中的“历史记录”标签可用于查看项目中已更改的文件并提交。它向您显示了提交的完整历史记录，并允许您将更改推送到远程存储库。"
+        },
+        "create": {
+            "projects": "项目",
+            "already-exists": "项目已存在",
+            "must-contain": "只能包含A-Z 0-9 _ -",
+            "no-info-in-url": "网址中不要包含用户名/密码",
+            "open": "打开项目",
+            "create": "创建项目",
+            "clone": "克隆仓库",
+            "project-name": "项目名",
+            "desc": "描述",
+            "opt": "可选的",
+            "flow-file": "流程文件",
+            "credentials": "证书",
+            "enable-encryption": "启用加密",
+            "disable-encryption": "禁用加密",
+            "encryption-key": "加密密钥",
+            "desc0": "用来保护您的凭证的短语",
+            "desc1": "凭证文件不会被加密，其内容很容易阅读",
+            "git-url": "Git存储库URL",
+            "protocols": "https://, ssh:// or file://",
+            "auth-failed": "验证失败",
+            "username": "用户名",
+            "password": "密码",
+            "ssh-key": "SSH密钥",
+            "passphrase": "密码短语",
+            "desc2": "在通过ssh克隆存储库之前，必须添加SSH密钥才能访问它。",
+            "add-ssh-key": "添加一个ssh密钥",
+            "credentials-encryption-key": "证书加密密钥",
+            "already-exists-2": "已存在",
+            "git-error": "git错误",
+            "con-failed": "连接失败",
+            "not-git": "不是git仓库",
+            "no-resource": "找不到存储库",
+            "cant-get-ssh-key-path": "错误！无法获取所选的SSH密钥路径。",
+            "unexpected_error": "意外的错误"
+        },
+        "delete": {
+            "confirm": "您确定要删除此项目吗？"
+        },
+        "create-project-list": {
+            "search": "搜索您的项目",
+            "current": "当前的"
+        },
+        "require-clean": {
+            "confirm": "<p>您有未部署的更改，这些更改将丢失。</p><p>您要继续吗？</p>"
+        },
+        "send-req": {
+            "auth-req": "存储库需要认证",
+            "username": "用户名",
+            "password": "秘密",
+            "passphrase": "密码短语",
+            "retry": "重试",
+            "update-failed": "无法更新身份验证",
+            "unhandled": "未处理的错误响应"
+        },
+        "create-branch-list": {
+            "invalid": "无效的分支",
+            "create": "创建分支",
+            "current": "当前的"
+        },
+        "create-default-file-set": {
+            "no-active": "没有活动项目就无法创建默认文件集",
+            "no-empty": "无法在非空项目上创建默认文件集",
+            "git-error": "git错误"
+        },
+        "errors": {
+            "no-username-email": "您的Git客户端未配置用户名/电子邮件。",
+            "unexpected": "发生了一个意料之外的问题",
+            "code": "代码"
+        }
+    },
+    "editor-tab": {
+        "properties": "属性",
+        "envProperties": "环境变量",
+        "description": "描述",
+        "appearance": "外观",
+        "preview": "UI预览",
+        "defaultValue": "默认值"
+    },
+    "languages": {
+        "de": "德语",
+        "en-US": "英文",
+        "ja": "日语",
+        "ko": "韩文",
+        "zh-CN": "简体中文",
+        "zh-TW": "繁体中文"
     }
 }

packages/node_modules/@node-red/editor-client/locales/zh-CN/jsonata.json

@@ -214,5 +214,57 @@
     "$toMillis": {
         "args": "timestamp",
         "desc": "将ISO 8601格式的字符串`timestamp`转换为从UNIX时间 (1970年1月1日 UTC/GMT的午夜）开始到现在的毫秒数。如果该字符串的格式不正确，则抛出错误。"
+    },
+    "$env": {
+        "args": "arg",
+        "desc": "返回环境变量的值。\n\n这是Node-RED定义的函数。"
+    },
+    "$eval": {
+        "args": "expr [, context]",
+        "desc": "使用当前上下文来作为评估依据，分析并评估字符串`expr`，其中包含文字JSON或JSONata表达式。"
+    },
+    "$formatInteger": {
+        "args": "number, picture",
+        "desc": "将“数字”转换为字符串，并将其格式化为“图片”字符串指定的整数表示形式。图片字符串参数定义了数字的格式，并具有与XPath F&O 3.1 规范中的fn：format-integer相同的语法。"
+    },
+    "$parseInteger": {
+        "args": "string, picture",
+        "desc": "使用“图片”字符串指定的格式将“字符串”参数的内容解析为整数（作为JSON数字）。图片字符串参数与$formatInteger格式相同。."
+    },
+    "$error": {
+        "args": "[str]",
+        "desc": "引发错误并显示一条消息。 可选的`str`将替代$error()函数评估的默认消息。"
+    },
+    "$assert": {
+        "args": "arg, str",
+        "desc": "如果`arg`为真，则该函数返回。 如果arg为假，则抛出带有str的异常作为异常消息。"
+    },
+    "$single": {
+        "args": "array, function",
+        "desc": "返回满足参数function谓语的array参数中的唯一值 (比如：传递值时，函数返回布尔值“true”)。如果匹配值的数量不唯一时，则抛出异常。\n\n应在以下签名中提供函数：`function（value [，index [，array []]]）`其中value是数组的每个输入，index是该值的位置，整个数组作为第三个参数传递。"
+    },
+    "$encodeUrl": {
+        "args": "str",
+        "desc": "通过用表示字符的UTF-8编码的一个，两个，三个或四个转义序列替换某些字符的每个实例，对统一资源定位符（URL）组件进行编码。\n\n示例：`$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
+    },
+    "$encodeUrlComponent": {
+        "args": "str",
+        "desc": "通过用表示字符的UTF-8编码的一个，两个，三个或四个转义序列替换某些字符的每个实例，对统一资源定位符（URL）进行编码。\n\n示例： `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
+    },
+    "$decodeUrl": {
+        "args": "str",
+        "desc": "解码以前由encodeUrlComponent创建的统一资源定位器（URL）组件。 \n\n示例： `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
+    },
+    "$decodeUrlComponent": {
+        "args": "str",
+        "desc": "解码先前由encodeUrl创建的统一资源定位符（URL）。 \n\n示例： `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
+    },
+    "$distinct": {
+        "args": "array",
+        "desc": "返回一个数组，其中重复的值已从`数组`中删除"
+    },
+    "$type": {
+        "args": "value",
+        "desc": "以字符串形式返回`值`的类型。 如果该`值`未定义，则将返回`未定义`"
     }
 }

packages/node_modules/@node-red/editor-client/locales/zh-TW/infotips.json

@@ -0,0 +1,23 @@
+{
+    "info": {
+        "tip0" : "您可以用 {{core:delete-selection}} 刪除選擇的節點或連結。",
+        "tip1" : "{{core:search}} 可以在流程內搜索節點。",
+        "tip2": "{{core:toggle-sidebar}} 可以顯示或隱藏邊側欄。",
+        "tip3": "您可以在 {{core:manage-palette}} 中管理節點的控制台。",
+        "tip4": "側邊欄中會列出流程中所有的配置節點。您可以通過功能表或者 {{core:show-config-tab}} 來訪問這些節點。",
+        "tip5": "您可以在設定中選擇顯示或隱藏這些提示。",
+        "tip6": "您可以用[left] [up] [down] [right]鍵來移動被選中的節點。按住[shift]可以更快地移動節點。",
+        "tip7": "把節點拖到連接上可以向連接中插入節點。",
+        "tip8": "您可以用 {{core:show-export-dialog}} 來匯出被選中的節點或標籤頁中的流程。",
+        "tip9": "您可以將流程的json文字檔拖入編輯方塊或 {{core:show-import-dialog}} 來導入流程。",
+        "tip10": "按住[shift]後按一下並拖動節點可以將該節點的多個連接一併移動到其他節點的埠。",
+        "tip11": "{{core:show-info-tab}} 可以顯示「資訊」標籤頁。 {{core:show-debug-tab}} 可以顯示「調試」標籤頁。",
+        "tip12": "按住[ctrl]的同時點擊工作介面可以在節點的對話欄中快速添加節點。",
+        "tip13": "按住[ctrl]的同時點擊節點的埠或後續節點可以快速連接多個節點。",
+        "tip14": "按住[shift]的同時點擊節點會選中所有被連接的節點。",
+        "tip15": "按住[ctrl]的同時點擊節點可以在選中或取消選中節點。",
+        "tip16": "{{core:show-previous-tab}} 和 {{core:show-next-tab}} 可以切換標籤頁。",
+        "tip17": "您可以在節點的屬性配置畫面中通過 {{core:confirm-edit-tray}} 來更改設置，或者用 {{core:cancel-edit-tray}} 來取消更改。",
+        "tip18": "您可以通過點擊 {{core:edit-selected-node}} 來顯示被選中節點的屬性設置畫面。"
+    }
+}

packages/node_modules/@node-red/editor-client/locales/zh-TW/jsonata.json

@@ -0,0 +1,270 @@
+{
+    "$string": {
+        "args": "arg",
+        "desc": "通過以下的類型轉換規則將參數*arg*轉換成字串:\n\n - 字串不轉換。\n -函數轉換成空的字串。\n - JSON的值無法用數字表示所以用無限大或者NaN（非數）表示。\n - 用’JSON.stringify’函數將其他值轉換成JSON字串。"
+    },
+    "$length": {
+        "args": "str",
+        "desc": "輸出字串’str’的字數。如果’str’不是字串，拋出錯誤。"
+    },
+    "$substring": {
+        "args": "str, start[, length]",
+        "desc": "輸出`start`位置後的的首次出現的包括`str`的子字串。 如果`length`被指定，那麼的字串中將只包括前`length`個文字。如果`start`是負數則輸出從`str`末尾開始的`length`個文字"
+    },
+    "$substringBefore": {
+        "args": "str, chars",
+        "desc": "輸出’str’中首次出現的’chars’之前的子字串，如果’str’中不包括’chars’則輸出’str’。"
+    },
+    "$substringAfter": {
+        "args": "str, chars",
+        "desc": "輸出’str’中首次出現的’chars’之後的子字串，如果’str’中不包括’chars’則輸出’str’。"
+    },
+    "$uppercase": {
+        "args": "str",
+        "desc": "`將’str’中的所有字母變為大寫後輸出。"
+    },
+    "$lowercase": {
+        "args": "str",
+        "desc": "將’str’中的所有字母變為小寫後輸出。"
+    },
+    "$trim": {
+        "args": "str",
+        "desc": "將以下步驟應用於`str`來去除所有空白文字並實現標準化。\n\n – 將全部tab定位字元、Enter鍵、換行字元用空白代替。\n- 將連續的空白文字變成一個空白文字。\n- 消除開頭和末尾的空白文字。\n\n如果`str`沒有被指定(即在無輸入參數的情況下調用本函數)，將上下文的值作為`str`來使用。 如果`str` 不是字串則拋出錯誤。"
+    },
+    "$contains": {
+        "args": "str, pattern",
+        "desc": "字串`str` 和 `pattern`匹配的話輸出`true`，不匹配的情況下輸出 `false`。 不指定`str`的情況下(比如用一個參數調用本函數時)、將上下文的值作為`str`來使用。參數 `pattern`可以為字串或正則表達。"
+    },
+    "$split": {
+        "args": "str[, separator][, limit]",
+        "desc": "將參數`str`分解成由子字串組成的陣列。 如果`str`不是字串拋出錯誤。可以省略的參數 `separator`中指定字串`str`的分隔符號。分隔符號可以是文字或規則運算式。在不指定`separator`的情況下、將分隔符號看作空的字串並把`str`拆分成由單個字母組成的陣列。如果`separator`不是字串則拋出錯誤。在可省略的參數`limit`中指定分割後的子字串的最大個數。超出個數的子字串將被捨棄。如果`limit`沒有被指定，`str` 將不考慮子字串的個數而將字串完全分隔。如果`limit`是負數則拋出錯誤。"
+    },
+    "$join": {
+        "args": "array[, separator]",
+        "desc": "用可以省略的參數 `separator`來把多個字元串連接。如果`array`不是字串則拋出錯誤。 如果沒有指定`separator`，則用空字串來連接字元(即字串之間沒有`separator`)。 如果`separator`不是字元則拋出錯誤。"
+    },
+    "$match": {
+        "args": "str, pattern [, limit]",
+        "desc": "對字串`str`使用規則運算式`pattern`並輸出與`str`相匹配的部分資訊。"
+    },
+    "$replace": {
+        "args": "str, pattern, replacement [, limit]",
+        "desc": "在字串`str`中搜索`pattern`並用`replacement`來替換。\n\n可選參數`limit`用來指定替換次數的上限。"
+    },
+    "$now": {
+        "args": "",
+        "desc": "生成ISO 8601互換格式的時刻，並作為字串輸出。"
+    },
+    "$base64encode": {
+        "args": "string",
+        "desc": "將ASCII格式的字串轉換為Base 64格式。將字串中的文字視作二進位形式的資料處理。包含URI編碼在內的字串文字必須在0x00到0xFF的範圍內，否則不會被支持。"
+    },
+    "$base64decode": {
+        "args": "string",
+        "desc": "用UTF-8內碼表將Base 64形式二進位值轉換為字串。"
+    },
+    "$number": {
+        "args": "arg",
+        "desc": "用下述的規則將參數 `arg`轉換為數值。:\n\n – 數值不做轉換。\n – 將字串中合法的JSON數値表示轉換成數値。\n – 其他形式的值則拋出錯誤。"
+    },
+    "$abs": {
+        "args": "number",
+        "desc": "輸出參數`number`的絕對值。"
+    },
+    "$floor": {
+        "args": "number",
+        "desc": "輸出比`number`的值小的最大整數。"
+    },
+    "$ceil": {
+        "args": "number",
+        "desc": "輸出比`number`的值大的最小整數。"
+    },
+    "$round": {
+        "args": "number [, precision]",
+        "desc": "輸出四捨五入後的參數`number`。可省略的參數 `precision`指定四捨五入後小數點下的位數。"
+    },
+    "$power": {
+        "args": "base, exponent",
+        "desc": "輸出底數`base`的`exponent`次冪。"
+    },
+    "$sqrt": {
+        "args": "number",
+        "desc": "輸出參數 `number`的平方根。"
+    },
+    "$random": {
+        "args": "",
+        "desc": "輸出比0大，比1小的偽亂數。"
+    },
+    "$millis": {
+        "args": "",
+        "desc": "返回從UNIX時間 (1970年1月1日 UTC/GMT的午夜）開始到現在的毫秒數。在同一個運算式的測試中所有對`$millis()`的調用將會返回相同的值。"
+    },
+    "$sum": {
+        "args": "array",
+        "desc": "輸出陣列`array`的總和。如果`array`不是數值則拋出錯誤。"
+    },
+    "$max": {
+        "args": "array",
+        "desc": "輸出陣列`array`的最大值。如果`array`不是數值則拋出錯誤。"
+    },
+    "$min": {
+        "args": "array",
+        "desc": "輸出陣列`array`的最小值。如果`array`不是數值則拋出錯誤。。"
+    },
+    "$average": {
+        "args": "array",
+        "desc": "輸出陣列`array`的平均數。如果`array`不是數值則拋出錯誤。。"
+    },
+    "$boolean": {
+        "args": "arg",
+        "desc": "用下述規則將資料轉換成布林值。:\n\n - 不轉換布林值`Boolean`。\n – 將空的字串`string`轉換為`false`\n – 將不為空的字串`string`轉換為`true`\n – 將為0的數位`number`轉換成`false`\n –將不為0的數位`number`轉換成`true`\n –將`null`轉換成`false`\n –將空的陣列`array`轉換成`false`\n –如果陣列`array`中含有可以轉換成`true`的要素則轉換成`true`\n –如果`array`中沒有可轉換成`true`的要素則轉換成`false`\n – 空的物件`object`轉換成`false`\n – 非空的物件`object`轉換成`true`\n –將函數`function`轉換成`false`"
+    },
+    "$not": {
+        "args": "arg",
+        "desc": "輸出做反轉運算後的布林值。首先將`arg`轉換為布林值。"
+    },
+    "$exists": {
+        "args": "arg",
+        "desc": "如果算式`arg`的值存在則輸出`true`。如果算式的值不存在(比如指向不存在區域的引用)則輸出`false`。"
+    },
+    "$count": {
+        "args": "array",
+        "desc": "輸出陣列中的元素數。"
+    },
+    "$append": {
+        "args": "array, array",
+        "desc": "將兩個陣列連接。"
+    },
+    "$sort": {
+        "args": "array [, function]",
+        "desc": "輸出排序後的陣列`array`。\n\n如果使用了比較函數`function`，則下述兩個參數需要被指定。\n\n`function(left, right)`\n\n該比較函數是為了比較left和right兩個值而被排序演算法調用的。如果使用者希望left的值被置於right的值之後，那麼該函數必須輸出布林值`true`來表示位置交換。而在不需要位置交換時函數必須輸出`false`。"
+    },
+    "$reverse": {
+        "args": "array",
+        "desc": "輸出倒序後的陣列`array`。"
+    },
+    "$shuffle": {
+        "args": "array",
+        "desc": "輸出隨機排序後的陣列 `array`。"
+    },
+    "$zip": {
+        "args": "array, ...",
+        "desc": "將陣列中的值按索引順序打包後輸出。"
+    },
+    "$keys": {
+        "args": "object",
+        "desc": "輸出由物件內的鍵組成的陣列。如果參數是物件的陣列則輸出由所有物件中的鍵去重後組成的佇列。"
+    },
+    "$lookup": {
+        "args": "object, key",
+        "desc": "輸出對象中與參數`key`對應的值。如果第一個參數`object`是陣列，那麼陣列中所有的物件都將被搜索並輸出這些物件中與參數`key`對應的值。"
+    },
+    "$spread": {
+        "args": "object",
+        "desc": "將物件中的鍵值對分隔成每個要素中只含有一個鍵值對的陣列。如果參數`object`是陣列，那麼返回值的陣列中包含所有物件中的鍵值對。"
+    },
+    "$merge": {
+        "args": "array<object>",
+        "desc": "將輸入陣列`objects`中所有的鍵值對合併到一個`object`中並返回。如果輸入陣列的要素中含有重複的鍵，則返回的`object`中將只包含陣列中最後出現要素的值。如果輸入陣列中包括物件以外的元素，則拋出錯誤。"
+    },
+    "$sift": {
+        "args": "object, function",
+        "desc": "輸出參數`object`中符合`function`的鍵值對。\n\n`function`必須含有下述參數。\n\n`function(value [, key [, object]])`"
+    },
+    "$each": {
+        "args": "object, function",
+        "desc": "將函數`function`應用於`object`中的所有鍵值對並輸出由所有返回值組成的陣列。"
+    },
+    "$map": {
+        "args": "array, function",
+        "desc": "將函數`function`應用於陣列`array`中所有的值並輸出由返回值組成的陣列。\n\n`function`中必須含有下述參數。\n\n`function(value [, index [, array]])`"
+    },
+    "$filter": {
+        "args": "array, function",
+        "desc": "輸出陣列`array`中符合函數`function`條件的值組成的陣列。\n\n`function`必須包括下述參數。\n\n`function(value [, index [, array]])`"
+    },
+    "$reduce": {
+        "args": "array, function [, init]",
+        "desc": "將`function`依次應用於陣列中的各要素值。 其中，前一個要素值的計算結果將參與到下一次的函數運算中。。\n\n函數`function`接受兩個參數並作為中綴標記法中的操作符。\n\n可省略的參數`init`將作為運算的初始值。"
+    },
+    "$flowContext": {
+        "args": "string",
+        "desc": "獲取流上下文(流等級的上下文，可以讓所有節點共用)的屬性。"
+    },
+    "$globalContext": {
+        "args": "string",
+        "desc": "獲取全域上下文的屬性。"
+    },
+    "$pad": {
+        "args": "string, width [, char]",
+        "desc": "根據需要，向字串`string`的副本中填充文字使該字串的字數達到`width`的絕對值並返回填充文字後的字串。\n\n如果`width`的值為正，則向字串`string`的右側填充文字，如果`width`為負，則向字串`string`的左側填充文字。\n\n可選參數`char`用來指定填充的文字。如果未指定該參數，則填充空白文字。"
+    },
+    "$fromMillis": {
+        "args": "number",
+        "desc": "將表示從UNIX時間 (1970年1月1日 UTC/GMT的午夜）開始到現在的毫秒數的數值轉換成ISO 8601形式時間戳記的字串。"
+    },
+    "$formatNumber": {
+        "args": "number, picture [, options]",
+        "desc": "將`number`轉換成具有`picture`所指定的數值格式的字串。\n\n此函數的功能與XPath F&O 3.1規格中定義的XPath/XQuery函數的fn:format-number功能相一致。參數`picture`用於指定數值的轉換格式，其語法與fn:format-number中的定義一致。\n\n可選的第三參數`options`用來覆蓋預設的局部環境格式，如小數點分隔符號。如果指定該參數，那麼該參數必須是包含name/value對的物件，並且name/value對必須符合XPath F&O 3.1規格中記述的數值格式。"
+    },
+    "$formatBase": {
+        "args": "number [, radix]",
+        "desc": "將`number`變換為以參數`radix`的值為基數形式的字串。如果不指定`radix`的值，則默認基數為10。指定的`radix`值必須在2～36之間，否則拋出錯誤。"
+    },
+    "$toMillis": {
+        "args": "timestamp",
+        "desc": "將ISO 8601格式的字串`timestamp`轉換為從UNIX時間 (1970年1月1日 UTC/GMT的午夜）開始到現在的毫秒數。如果該字串的格式不正確，則拋出錯誤。"
+    },
+    "$env": {
+        "args": "arg",
+        "desc": "返回環境變量的值。\n\n這是Node-RED定義的函數。"
+    },
+    "$eval": {
+        "args": "expr [, context]",
+        "desc": "使用當前上下文來作為評估依據，分析並評估字符串`expr`，其中包含文字JSON或JSONata表達式。"
+    },
+    "$formatInteger": {
+        "args": "number, picture",
+        "desc": "將“數字”轉換為字符串，並將其格式化為“圖片”字符串指定的整數表示形式。圖片字符串參數定義了數字的格式，並具有與XPath F&O 3.1 規範中的fn：format-integer相同的語法。"
+    },
+    "$parseInteger": {
+        "args": "string, picture",
+        "desc": "使用“圖片”字符串指定的格式將“字符串”參數的內容解析為整數（作為JSON數字）。圖片字符串參數與$formatInteger格式相同。."
+    },
+    "$error": {
+        "args": "[str]",
+        "desc": "引發錯誤並顯示一條消息。 可選的`str`將替代$error()函數評估的默認消息。"
+    },
+    "$assert": {
+        "args": "arg, str",
+        "desc": "如果`arg`為真，則該函數返回。 如果arg為假，則拋出帶有str的異常作為異常消息。"
+    },
+    "$single": {
+        "args": "array, function",
+        "desc": "返回滿足參數function謂語的array參數中的唯一值 (比如：傳遞值時，函數返回布林值“true”)。如果匹配值的數量不唯一時，則拋出異常。\n\n應在以下簽名中提供函數：`function（value [，index [，array []]]）`其中value是數組的每個輸入，index是該值的位置，整個數組作為第三個參數傳遞。"
+    },
+    "$encodeUrl": {
+        "args": "str",
+        "desc": "通過用表示字符的UTF-8編碼的一個，兩個，三個或四個轉義序列替換某些字符的每個實例，對統一資源定位符（URL）組件進行編碼。\n\n示例：`$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
+    },
+    "$encodeUrlComponent": {
+        "args": "str",
+        "desc": "通過用表示字符的UTF-8編碼的一個，兩個，三個或四個轉義序列替換某些字符的每個實例，對統一資源定位符（URL）進行編碼。\n\n示例： `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
+    },
+    "$decodeUrl": {
+        "args": "str",
+        "desc": "解碼以前由encodeUrlComponent創建的統一資源定位器（URL）組件。 \n\n示例： `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
+    },
+    "$decodeUrlComponent": {
+        "args": "str",
+        "desc": "解碼先前由encodeUrl創建的統一資源定位符（URL）。 \n\n示例： `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
+    },
+    "$distinct": {
+        "args": "array",
+        "desc": "返回一個數組，其中重復的值已從`數組`中刪除"
+    },
+    "$type": {
+        "args": "value",
+        "desc": "以字符串形式返回`值`的類型。 如果該`值`未定義，則將返回`未定義`"
+    }
+}

packages/node_modules/@node-red/editor-client/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-client",
-    "version": "1.0.3",
+    "version": "1.1.0",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",

packages/node_modules/@node-red/editor-client/src/ace/bin/snippets/nrjavascript.js

@@ -1,4 +1,4 @@
-ace.define("ace/snippets/nrjavascript",[],function(e,t,n){"use strict";t.snippetText=undefined,t.scope="nrjavascript"});
+ace.define("ace/snippets/nrjavascript",[],function(e,t,n){"use strict";t.snippetText='# Prototype\nsnippet proto\n	${1:class_name}.prototype.${2:method_name} = function(${3:first_argument}) {\n		${4:// body...}\n	};\n# Function\nsnippet fun\n	function ${1?:function_name}(${2:argument}) {\n		${3:// body...}\n	}\n# Anonymous Function\nregex /((=)\\s*|(:)\\s*|(\\()|\\b)/f/(\\))?/\nsnippet f\n	function${M1?: ${1:functionName}}($2) {\n		${0:$TM_SELECTED_TEXT}\n	}${M2?;}${M3?,}${M4?)}\n# Immediate function\ntrigger \\(?f\\(\nendTrigger \\)?\nsnippet f(\n	(function(${1}) {\n		${0:${TM_SELECTED_TEXT:/* code */}}\n	}(${1}));\n# if\nsnippet if\n	if (${1:true}) {\n		${0}\n	}\n# if ... else\nsnippet ife\n	if (${1:true}) {\n		${2}\n	} else {\n		${0}\n	}\n# tertiary conditional\nsnippet ter\n	${1:/* condition */} ? ${2:a} : ${3:b}\n# switch\nsnippet switch\n	switch (${1:expression}) {\n		case \'${3:case}\':\n			${4:// code}\n			break;\n		${5}\n		default:\n			${2:// code}\n	}\n# case\nsnippet case\n	case \'${1:case}\':\n		${2:// code}\n		break;\n	${3}\n\n# while (...) {...}\nsnippet wh\n	while (${1:/* condition */}) {\n		${0:/* code */}\n	}\n# try\nsnippet try\n	try {\n		${0:/* code */}\n	} catch (e) {}\n# do...while\nsnippet do\n	do {\n		${2:/* code */}\n	} while (${1:/* condition */});\n# Object Method\nsnippet :f\nregex /([,{[])|^\\s*/:f/\n	${1:method_name}: function(${2:attribute}) {\n		${0}\n	}${3:,}\n# setTimeout function\nsnippet setTimeout\nregex /\\b/st|timeout|setTimeo?u?t?/\n	setTimeout(function() {${3:$TM_SELECTED_TEXT}}, ${1:10});\n# console.log (Firebug)\nsnippet cl\n	console.log(${1});\n# return\nsnippet ret\n	return ${1:result}\n# for (property in object ) { ... }\nsnippet fori\n	for (var ${1:prop} in ${2:Things}) {\n		${0:$2[$1]}\n	}\n# hasOwnProperty\nsnippet has\n	hasOwnProperty(${1})\n# docstring\nsnippet /**\n	/**\n	 * ${1:description}\n	 *\n	 */\nsnippet @par\nregex /^\\s*\\*\\s*/@(para?m?)?/\n	@param {${1:type}} ${2:name} ${3:description}\nsnippet @ret\n	@return {${1:type}} ${2:description}\n# JSON.parse\nsnippet jsonp\n	JSON.parse(${1:jstr});\n# JSON.stringify\nsnippet jsons\n	JSON.stringify(${1:object});\n# self-defining function\nsnippet sdf\n	var ${1:function_name} = function(${2:argument}) {\n		${3:// initial code ...}\n\n		$1 = function($2) {\n			${4:// main code}\n		};\n	}\n# \nsnippet for-\n	for (var ${1:i} = ${2:Things}.length; ${1:i}--; ) {\n		${0:${2:Things}[${1:i}];}\n	}\n# for (...) {...}\nsnippet for\n	for (var ${1:i} = 0; $1 < ${2:Things}.length; $1++) {\n		${3:$2[$1]}$0\n	}\n# for (...) {...} (Improved Native For-Loop)\nsnippet forr\n	for (var ${1:i} = ${2:Things}.length - 1; $1 >= 0; $1--) {\n		${3:$2[$1]}$0\n	}\n# Node-RED Specific Funcs\nsnippet nodes\n	node.send(${1:msg})\nsnippet clone\n	RED.util.cloneMessage(${1:msg})\nsnippet nodel\n	node.log($1)\nsnippet nodew\n	node.warn($1)\nsnippet nodee\n	node.error($1)\nsnippet noded\n	node.debug($1)\nsnippet done\n	node.done($1)\nsnippet flowg\n	flow.get($1)\nsnippet flows\n	flow.set($1, $2)\nsnippet globalg\n	global.get($1)\nsnippet globals\n	global.set($1, $2)\n',t.scope="nrjavascript"});
                 (function() {
                     ace.require(["ace/snippets/nrjavascript"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
@@ -6,4 +6,3 @@ ace.define("ace/snippets/nrjavascript",[],function(e,t,n){"use strict";t.snippet
                         }
                     });
                 })();
-            

packages/node_modules/@node-red/editor-client/src/js/events.js

@@ -32,11 +32,16 @@
              }
          }
      }
-     function emit(evt,arg) {
+     function emit() {
+         var evt = arguments[0]
+         var args = Array.prototype.slice.call(arguments,1);
+         if (RED.events.DEBUG) {
+             console.log(evt,args);
+         }
          if (handlers[evt]) {
              for (var i=0;i<handlers[evt].length;i++) {
                  try {
-                     handlers[evt][i](arg);
+                     handlers[evt][i].apply(null, args);
                  } catch(err) {
                      console.log("RED.events.emit error: ["+evt+"] "+(err.toString()));
                      console.log(err);

packages/node_modules/@node-red/editor-client/src/js/history.js

@@ -21,6 +21,7 @@ RED.history = (function() {
         var i;
         var len;
         var node;
+        var group;
         var subflow;
         var modifiedTabs = {};
         var inverseEv;
@@ -74,6 +75,15 @@ RED.history = (function() {
                         RED.nodes.removeLink(ev.links[i]);
                     }
                 }
+                if (ev.groups) {
+                    inverseEv.groups = [];
+                    for (i=0;i<ev.groups.length;i++) {
+                        group = ev.groups[i];
+                        modifiedTabs[group.z] = true;
+                        inverseEv.groups.push(group);
+                        RED.nodes.removeGroup(group);
+                    }
+                }
                 if (ev.workspaces) {
                     inverseEv.workspaces = [];
                     for (i=0;i<ev.workspaces.length;i++) {
@@ -193,12 +203,35 @@ RED.history = (function() {
                         n.dirty = true;
                     });
                 }
+                if (ev.groups) {
+                    inverseEv.groups = [];
+                    var groupsToAdd = new Set(ev.groups.map(function(g) { return g.id }));
+                    for (i=0;i<ev.groups.length;i++) {
+                        RED.nodes.addGroup(ev.groups[i])
+                        modifiedTabs[ev.groups[i].z] = true;
+                        inverseEv.groups.push(ev.groups[i]);
+                        if (ev.groups[i].g && !groupsToAdd.has(ev.groups[i].g)) {
+                            group = RED.nodes.group(ev.groups[i].g);
+                            if (group.nodes.indexOf(ev.groups[i]) === -1) {
+                                group.nodes.push(ev.groups[i]);
+                            }
+                            RED.group.markDirty(ev.groups[i])
+                        }
+                    }
+                }
                 if (ev.nodes) {
                     inverseEv.nodes = [];
                     for (i=0;i<ev.nodes.length;i++) {
                         RED.nodes.add(ev.nodes[i]);
                         modifiedTabs[ev.nodes[i].z] = true;
                         inverseEv.nodes.push(ev.nodes[i].id);
+                        if (ev.nodes[i].g) {
+                            group = RED.nodes.group(ev.nodes[i].g);
+                            if (group.nodes.indexOf(ev.nodes[i]) === -1) {
+                                group.nodes.push(ev.nodes[i]);
+                            }
+                            RED.group.markDirty(group)
+                        }
                     }
                 }
                 if (ev.links) {
@@ -227,9 +260,12 @@ RED.history = (function() {
                                 }
                                 node.dirty = true;
                             }
+                            RED.events.emit("nodes:change",node);
                         }
                     }
-
+                }
+                if (subflow) {
+                    RED.events.emit("subflows:change", subflow);
                 }
             } else if (ev.t == "move") {
                 inverseEv = {
@@ -260,6 +296,13 @@ RED.history = (function() {
                         RED.nodes.addLink(ev.removedLinks[i]);
                     }
                 }
+                if (ev.addToGroup) {
+                    RED.group.removeFromGroup(ev.addToGroup,ev.nodes.map(function(n) { return n.n }),true);
+                    inverseEv.removeFromGroup = ev.addToGroup;
+                } else if (ev.removeFromGroup) {
+                    RED.group.addToGroup(ev.removeFromGroup,ev.nodes.map(function(n) { return n.n }));
+                    inverseEv.addToGroup = ev.removeFromGroup;
+                }
             } else if (ev.t == "edit") {
                 inverseEv = {
                     t: "edit",
@@ -283,6 +326,17 @@ RED.history = (function() {
                         ev.node[i] = ev.changes[i];
                     }
                 }
+                var eventType;
+                switch(ev.node.type) {
+                    case 'tab': eventType = "flows"; break;
+                    case 'group': eventType = "groups"; break;
+                    case 'subflow': eventType = "subflows"; break;
+                    default: eventType = "nodes"; break;
+                }
+                eventType += ":change";
+                RED.events.emit(eventType,ev.node);
+
+
                 if (ev.node.type === 'tab' && ev.changes.hasOwnProperty('disabled')) {
                     $("#red-ui-tab-"+(ev.node.id.replace(".","-"))).toggleClass('red-ui-workspace-disabled',!!ev.node.disabled);
                     $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!ev.node.disabled);
@@ -370,7 +424,9 @@ RED.history = (function() {
                 if (ev.nodes) {
                     inverseEv.movedNodes = [];
                     var z = ev.activeWorkspace;
-                    RED.nodes.filterNodes({z:ev.subflow.subflow.id}).forEach(function(n) {
+                    var fullNodeList = RED.nodes.filterNodes({z:ev.subflow.subflow.id});
+                    fullNodeList = fullNodeList.concat(RED.nodes.groups(ev.subflow.subflow.id))
+                    fullNodeList.forEach(function(n) {
                         n.x += ev.subflow.offsetX;
                         n.y += ev.subflow.offsetY;
                         n.dirty = true;
@@ -411,6 +467,9 @@ RED.history = (function() {
                 if (ev.subflow) {
                     RED.nodes.addSubflow(ev.subflow.subflow);
                     inverseEv.subflow = ev.subflow;
+                    if (ev.subflow.subflow.g) {
+                        RED.group.addToGroup(RED.nodes.group(ev.subflow.subflow.g),ev.subflow.subflow);
+                    }
                 }
                 if (ev.subflows) {
                     inverseEv.nodes = [];
@@ -422,6 +481,9 @@ RED.history = (function() {
                 if (ev.movedNodes) {
                     ev.movedNodes.forEach(function(nid) {
                         nn = RED.nodes.node(nid);
+                        if (!nn) {
+                            nn = RED.nodes.group(nid);
+                        }
                         nn.x -= ev.subflow.offsetX;
                         nn.y -= ev.subflow.offsetY;
                         nn.dirty = true;
@@ -435,7 +497,7 @@ RED.history = (function() {
                         RED.nodes.addLink(ev.links[i]);
                     }
                 }
-                if  (ev.createdLinks) {
+                if (ev.createdLinks) {
                     inverseEv.removedLinks = [];
                     for (i=0;i<ev.createdLinks.length;i++) {
                         inverseEv.removedLinks.push(ev.createdLinks[i]);
@@ -450,6 +512,60 @@ RED.history = (function() {
                 if (ev.order) {
                     RED.workspaces.order(ev.order);
                 }
+            } else if (ev.t == "createGroup") {
+                inverseEv = {
+                    t: "ungroup",
+                    dirty: RED.nodes.dirty(),
+                    groups: []
+                }
+                if (ev.groups) {
+                    for (i=0;i<ev.groups.length;i++) {
+                        inverseEv.groups.push(ev.groups[i]);
+                        RED.group.ungroup(ev.groups[i]);
+                    }
+                }
+            } else if (ev.t == "ungroup") {
+                inverseEv = {
+                    t: "createGroup",
+                    dirty: RED.nodes.dirty(),
+                    groups: []
+                }
+                if (ev.groups) {
+                    for (i=0;i<ev.groups.length;i++) {
+                        inverseEv.groups.push(ev.groups[i]);
+                        var nodes = ev.groups[i].nodes.slice();
+                        ev.groups[i].nodes = [];
+                        RED.nodes.addGroup(ev.groups[i]);
+                        RED.group.addToGroup(ev.groups[i],nodes);
+                    }
+                }
+            } else if (ev.t == "addToGroup") {
+                inverseEv = {
+                    t: "removeFromGroup",
+                    dirty: RED.nodes.dirty(),
+                    group: ev.group,
+                    nodes: ev.nodes,
+                    reparent: ev.reparent
+                }
+                if (ev.nodes) {
+                    RED.group.removeFromGroup(ev.group,ev.nodes,(ev.hasOwnProperty('reparent')&&ev.hasOwnProperty('reparent')!==undefined)?ev.reparent:true);
+                }
+            } else if (ev.t == "removeFromGroup") {
+                inverseEv = {
+                    t: "addToGroup",
+                    dirty: RED.nodes.dirty(),
+                    group: ev.group,
+                    nodes: ev.nodes,
+                    reparent: ev.reparent
+                }
+                if (ev.nodes) {
+                    RED.group.addToGroup(ev.group,ev.nodes);
+                }
+            }
+
+            if(ev.callback && typeof ev.callback === 'function') {
+                inverseEv.callback = ev.callback;
+                ev.callback(ev);
             }
 
             Object.keys(modifiedTabs).forEach(function(id) {
@@ -460,9 +576,8 @@ RED.history = (function() {
             });
 
             RED.nodes.dirty(ev.dirty);
+            RED.view.updateActive();
             RED.view.select(null);
-            RED.view.redraw(true);
-            RED.palette.refresh();
             RED.workspaces.refresh();
             RED.sidebar.config.refresh();
             RED.subflow.refresh();
@@ -482,6 +597,9 @@ RED.history = (function() {
         list: function() {
             return undoHistory;
         },
+        listRedo: function() {
+            return redoHistory;
+        },
         depth: function() {
             return undoHistory.length;
         },

packages/node_modules/@node-red/editor-client/src/js/keymap.json

@@ -44,6 +44,14 @@
         "ctrl-y": "core:redo",
         "ctrl-a": "core:select-all-nodes",
         "shift-?": "core:show-help",
+        "w": "core:scroll-view-up",
+        "d": "core:scroll-view-right",
+        "s": "core:scroll-view-down",
+        "a": "core:scroll-view-left",
+        "shift-w": "core:step-view-up",
+        "shift-d": "core:step-view-right",
+        "shift-s": "core:step-view-down",
+        "shift-a": "core:step-view-left",
         "up": "core:move-selection-up",
         "right": "core:move-selection-right",
         "down": "core:move-selection-down",
@@ -53,6 +61,10 @@
         "shift-down": "core:step-selection-down",
         "shift-left": "core:step-selection-left",
         "ctrl-shift-j": "core:show-previous-tab",
-        "ctrl-shift-k": "core:show-next-tab"
+        "ctrl-shift-k": "core:show-next-tab",
+        "ctrl-shift-g": "core:group-selection",
+        "ctrl-shift-u": "core:ungroup-selection",
+        "ctrl-shift-c": "core:copy-group-style",
+        "ctrl-shift-v": "core:paste-group-style"
      }
 }

packages/node_modules/@node-red/editor-client/src/js/nodes.js

@@ -27,13 +27,16 @@ RED.nodes = (function() {
     var subflows = {};
     var loadedFlowVersion = null;
 
+    var groups = {};
+    var groupsByZ = {};
+
     var initialLoad;
 
     var dirty = false;
 
     function setDirty(d) {
         dirty = d;
-        RED.events.emit("nodes:change",{dirty:dirty});
+        RED.events.emit("workspace:dirty",{dirty:dirty});
     }
 
     var registry = (function() {
@@ -225,6 +228,7 @@ RED.nodes = (function() {
     }
     function addLink(l) {
         links.push(l);
+        RED.events.emit("links:add",l);
     }
 
     function getNode(id) {
@@ -257,7 +261,7 @@ RED.nodes = (function() {
                     delete nodeTabMap[node.z][node.id];
                 }
                 removedLinks = links.filter(function(l) { return (l.source === node) || (l.target === node); });
-                removedLinks.forEach(function(l) {links.splice(links.indexOf(l), 1); });
+                removedLinks.forEach(removeLink);
                 var updatedConfigNode = false;
                 for (var d in node._def.defaults) {
                     if (node._def.defaults.hasOwnProperty(d)) {
@@ -302,6 +306,10 @@ RED.nodes = (function() {
     }
 
     function moveNodeToTab(node, z) {
+        if (node.type === "group") {
+            moveGroupToTab(node,z);
+            return;
+        }
         if (nodeTabMap[node.z]) {
             delete nodeTabMap[node.z][node.id];
         }
@@ -310,6 +318,15 @@ RED.nodes = (function() {
         }
         nodeTabMap[z][node.id] = node;
         node.z = z;
+        RED.events.emit("nodes:change",node);
+    }
+    function moveGroupToTab(group, z) {
+        var index = groupsByZ[group.z].indexOf(group);
+        groupsByZ[group.z].splice(index,1);
+        groupsByZ[z] = groupsByZ[z] || [];
+        groupsByZ[z].push(group);
+        group.z = z;
+        RED.events.emit("groups:change",group);
     }
 
     function removeLink(l) {
@@ -317,6 +334,7 @@ RED.nodes = (function() {
         if (index != -1) {
             links.splice(index,1);
         }
+        RED.events.emit("links:remove",l);
     }
 
     function addWorkspace(ws,targetIndex) {
@@ -329,38 +347,53 @@ RED.nodes = (function() {
         } else {
             workspacesOrder.splice(targetIndex,0,ws.id);
         }
+        RED.events.emit('flows:add',ws);
+        if (targetIndex !== undefined) {
+            RED.events.emit('flows:reorder',workspacesOrder)
+        }
     }
     function getWorkspace(id) {
         return workspaces[id];
     }
     function removeWorkspace(id) {
-        delete workspaces[id];
+        var ws = workspaces[id];
-        delete nodeTabMap[id];
-        workspacesOrder.splice(workspacesOrder.indexOf(id),1);
-
         var removedNodes = [];
         var removedLinks = [];
-        var n;
+        var removedGroups = [];
-        var node;
+        if (ws) {
-        for (n=0;n<nodes.length;n++) {
+            delete workspaces[id];
-            node = nodes[n];
+            delete nodeTabMap[id];
-            if (node.z == id) {
+            workspacesOrder.splice(workspacesOrder.indexOf(id),1);
-                removedNodes.push(node);
+            var n;
-            }
+            var node;
-        }
+            for (n=0;n<nodes.length;n++) {
-        for(n in configNodes) {
+                node = nodes[n];
-            if (configNodes.hasOwnProperty(n)) {
-                node = configNodes[n];
                 if (node.z == id) {
                     removedNodes.push(node);
                 }
             }
+            for(n in configNodes) {
+                if (configNodes.hasOwnProperty(n)) {
+                    node = configNodes[n];
+                    if (node.z == id) {
+                        removedNodes.push(node);
+                    }
+                }
+            }
+            removedGroups = groupsByZ[id] || [];
+            removedGroups.forEach(function(g) {
+                delete groups[g.id]
+            })
+            delete groupsByZ[id];
+
+            for (n=0;n<removedNodes.length;n++) {
+                var result = removeNode(removedNodes[n].id);
+                removedLinks = removedLinks.concat(result.links);
+            }
+            RED.events.emit('flows:remove',ws);
         }
-        for (n=0;n<removedNodes.length;n++) {
+
-            var result = removeNode(removedNodes[n].id);
+        return {nodes:removedNodes,links:removedLinks, groups: removedGroups};
-            removedLinks = removedLinks.concat(result.links);
-        }
-        return {nodes:removedNodes,links:removedLinks};
     }
 
     function addSubflow(sf, createNewIds) {
@@ -398,6 +431,10 @@ RED.nodes = (function() {
             paletteLabel: function() { return RED.nodes.subflow(sf.id).name },
             inputLabels: function(i) { return sf.inputLabels?sf.inputLabels[i]:null },
             outputLabels: function(i) { return sf.outputLabels?sf.outputLabels[i]:null },
+            oneditprepare: function() {
+                RED.subflow.buildEditForm("subflow",this);
+                RED.subflow.buildPropertiesForm(this);
+            },
             oneditresize: function(size) {
                 // var rows = $(".dialog-form>div:not(.node-input-env-container-row)");
                 var height = size.height;
@@ -413,14 +450,18 @@ RED.nodes = (function() {
             }
         });
         sf._def = RED.nodes.getType("subflow:"+sf.id);
+        RED.events.emit("subflows:add",sf);
     }
     function getSubflow(id) {
         return subflows[id];
     }
     function removeSubflow(sf) {
-        delete subflows[sf.id];
+        if (subflows[sf.id]) {
-        delete nodeTabMap[sf.id];
+            delete subflows[sf.id];
-        registry.removeNodeType("subflow:"+sf.id);
+            delete nodeTabMap[sf.id];
+            registry.removeNodeType("subflow:"+sf.id);
+            RED.events.emit("subflows:remove",sf);
+        }
     }
 
     function subflowContains(sfid,nodeid) {
@@ -493,6 +534,9 @@ RED.nodes = (function() {
         if (n.d === true) {
             node.d = true;
         }
+        if (n.g) {
+            node.g = n.g;
+        }
         if (node.type == "unknown") {
             for (var p in n._orig) {
                 if (n._orig.hasOwnProperty(p)) {
@@ -505,19 +549,33 @@ RED.nodes = (function() {
                     node[d] = n[d];
                 }
             }
-            if(exportCreds && n.credentials) {
+            if (exportCreds) {
                 var credentialSet = {};
-                node.credentials = {};
+                if (/^subflow:/.test(node.type) && n.credentials) {
-                for (var cred in n._def.credentials) {
+                    // A subflow instance node can have arbitrary creds
-                    if (n._def.credentials.hasOwnProperty(cred)) {
+                    for (var sfCred in n.credentials) {
-                        if (n._def.credentials[cred].type == 'password') {
+                        if (n.credentials.hasOwnProperty(sfCred)) {
                             if (!n.credentials._ ||
-                                n.credentials["has_"+cred] != n.credentials._["has_"+cred] ||
+                                n.credentials["has_"+sfCred] != n.credentials._["has_"+sfCred] ||
-                                (n.credentials["has_"+cred] && n.credentials[cred])) {
+                                (n.credentials["has_"+sfCred] && n.credentials[sfCred])) {
+                                credentialSet[sfCred] = n.credentials[sfCred];
+                            }
+                        }
+                    }
+                } else if (n.credentials) {
+                    node.credentials = {};
+                    // All other nodes have a well-defined list of possible credentials
+                    for (var cred in n._def.credentials) {
+                        if (n._def.credentials.hasOwnProperty(cred)) {
+                            if (n._def.credentials[cred].type == 'password') {
+                                if (!n.credentials._ ||
+                                    n.credentials["has_"+cred] != n.credentials._["has_"+cred] ||
+                                    (n.credentials["has_"+cred] && n.credentials[cred])) {
+                                    credentialSet[cred] = n.credentials[cred];
+                                }
+                            } else if (n.credentials[cred] != null && (!n.credentials._ || n.credentials[cred] != n.credentials._[cred])) {
                                 credentialSet[cred] = n.credentials[cred];
                             }
-                        } else if (n.credentials[cred] != null && (!n.credentials._ || n.credentials[cred] != n.credentials._[cred])) {
-                            credentialSet[cred] = n.credentials[cred];
                         }
                     }
                 }
@@ -526,6 +584,13 @@ RED.nodes = (function() {
                 }
             }
         }
+        if (n.type === "group") {
+            node.x = n.x;
+            node.y = n.y;
+            node.w = n.w;
+            node.h = n.h;
+            node.nodes = node.nodes.map(function(n) { return n.id });
+        }
         if (n._def.category != "config") {
             node.x = n.x;
             node.y = n.y;
@@ -568,7 +633,7 @@ RED.nodes = (function() {
         return node;
     }
 
-    function convertSubflow(n) {
+    function convertSubflow(n, exportCreds) {
         var node = {};
         node.id = n.id;
         node.type = n.type;
@@ -578,6 +643,24 @@ RED.nodes = (function() {
         node.in = [];
         node.out = [];
         node.env = n.env;
+
+        if (exportCreds) {
+            var credentialSet = {};
+            // A subflow node can have arbitrary creds
+            for (var sfCred in n.credentials) {
+                if (n.credentials.hasOwnProperty(sfCred)) {
+                    if (!n.credentials._ ||
+                        n.credentials["has_"+sfCred] != n.credentials._["has_"+sfCred] ||
+                        (n.credentials["has_"+sfCred] && n.credentials[sfCred])) {
+                        credentialSet[sfCred] = n.credentials[sfCred];
+                    }
+                }
+            }
+            if (Object.keys(credentialSet).length > 0) {
+                node.credentials = credentialSet;
+            }
+        }
+
         node.color = n.color;
 
         n.in.forEach(function(p) {
@@ -633,8 +716,18 @@ RED.nodes = (function() {
     /**
      * Converts the current node selection to an exportable JSON Object
      **/
-    function createExportableNodeSet(set, exportedSubflows, exportedConfigNodes) {
+    function createExportableNodeSet(set, exportedIds, exportedSubflows, exportedConfigNodes) {
         var nns = [];
+
+        exportedIds = exportedIds || {};
+        set = set.filter(function(n) {
+            if (exportedIds[n.id]) {
+                return false;
+            }
+            exportedIds[n.id] = true;
+            return true;
+        })
+
         exportedConfigNodes = exportedConfigNodes || {};
         exportedSubflows = exportedSubflows || {};
         for (var n=0;n<set.length;n++) {
@@ -650,11 +743,11 @@ RED.nodes = (function() {
                             subflowSet.push(n);
                         }
                     });
-                    var exportableSubflow = createExportableNodeSet(subflowSet, exportedSubflows, exportedConfigNodes);
+                    var exportableSubflow = createExportableNodeSet(subflowSet, exportedIds, exportedSubflows, exportedConfigNodes);
                     nns = exportableSubflow.concat(nns);
                 }
             }
-            if (node.type != "subflow") {
+            if (node.type !== "subflow") {
                 var convertedNode = RED.nodes.convertNode(node);
                 for (var d in node._def.defaults) {
                     if (node._def.defaults[d].type && node[d] in configNodes) {
@@ -671,6 +764,9 @@ RED.nodes = (function() {
                     }
                 }
                 nns.push(convertedNode);
+                if (node.type === "group") {
+                    nns = nns.concat(createExportableNodeSet(node.nodes, exportedIds, exportedSubflows, exportedConfigNodes));
+                }
             } else {
                 var convertedSubflow = convertSubflow(node);
                 nns.push(convertedSubflow);
@@ -693,7 +789,12 @@ RED.nodes = (function() {
         }
         for (i in subflows) {
             if (subflows.hasOwnProperty(i)) {
-                nns.push(convertSubflow(subflows[i]));
+                nns.push(convertSubflow(subflows[i], exportCredentials));
+            }
+        }
+        for (i in groups) {
+            if (groups.hasOwnProperty(i)) {
+                nns.push(convertNode(groups[i]));
             }
         }
         for (i in configNodes) {
@@ -822,6 +923,7 @@ RED.nodes = (function() {
             if (n.type != "workspace" &&
                 n.type != "tab" &&
                 n.type != "subflow" &&
+                n.type != "group" &&
                 !registry.getNodeType(n.type) &&
                 n.type.substring(0,8) != "subflow:" &&
                 unknownTypes.indexOf(n.type)==-1) {
@@ -871,6 +973,7 @@ RED.nodes = (function() {
         var node_map = {};
         var new_nodes = [];
         var new_links = [];
+        var new_groups = [];
         var nid;
         var def;
         var configNode;
@@ -1021,7 +1124,6 @@ RED.nodes = (function() {
                     }
                     node_map[n.id] = configNode;
                     new_nodes.push(configNode);
-                    RED.nodes.add(configNode);
                 }
             }
         }
@@ -1038,20 +1140,25 @@ RED.nodes = (function() {
                         y:parseFloat(n.y || 0),
                         z:n.z,
                         type:0,
-                        wires:n.wires||[],
-                        inputLabels: n.inputLabels,
-                        outputLabels: n.outputLabels,
-                        icon: n.icon,
                         info: n.info,
                         changed:false,
                         _config:{}
-                    };
+                    }
+                    if (n.type !== "group") {
+                        node.wires = n.wires||[];
+                        node.inputLabels = n.inputLabels;
+                        node.outputLabels = n.outputLabels;
+                        node.icon = n.icon;
+                    }
                     if (n.hasOwnProperty('l')) {
                         node.l = n.l;
                     }
                     if (n.hasOwnProperty('d')) {
                         node.d = n.d;
                     }
+                    if (n.hasOwnProperty('g')) {
+                        node.g = n.g;
+                    }
                     if (createNewIds) {
                         if (subflow_blacklist[n.z]) {
                             continue;
@@ -1088,7 +1195,17 @@ RED.nodes = (function() {
                     }
                     node.type = n.type;
                     node._def = def;
-                    if (n.type.substring(0,7) === "subflow") {
+                    if (node.type === "group") {
+                        node._def = RED.group.def;
+                        for (d in node._def.defaults) {
+                            if (node._def.defaults.hasOwnProperty(d) && d !== 'inputs' && d !== 'outputs') {
+                                node[d] = n[d];
+                                node._config[d] = JSON.stringify(n[d]);
+                            }
+                        }
+                        node._config.x = node.x;
+                        node._config.y = node.y;
+                    } else if (n.type.substring(0,7) === "subflow") {
                         var parentId = n.type.split(":")[1];
                         var subflow = subflow_blacklist[parentId]||subflow_map[parentId]||getSubflow(parentId);
                         if (createNewIds) {
@@ -1109,7 +1226,7 @@ RED.nodes = (function() {
                                     defaults: {},
                                     label: "unknown: "+n.type,
                                     labelStyle: "red-ui-flow-node-label-italic",
-                                    outputs: n.outputs||n.wires.length,
+                                    outputs: n.outputs|| (n.wires && n.wires.length) || 0,
                                     set: registry.getNodeSet("node-red/unknown")
                                 }
                             } else {
@@ -1178,13 +1295,13 @@ RED.nodes = (function() {
                             }
                         }
                     }
-                    addNode(node);
-                    RED.editor.validateNode(node);
                     node_map[n.id] = node;
                     // If an 'unknown' config node, it will not have been caught by the
                     // proper config node handling, so needs adding to new_nodes here
                     if (node.type === "unknown" || node._def.category !== "config") {
                         new_nodes.push(node);
+                    } else if (node.type === "group") {
+                        new_groups.push(node);
                     }
                 }
             }
@@ -1219,6 +1336,11 @@ RED.nodes = (function() {
                 }
                 delete n.wires;
             }
+            if (n.g && node_map[n.g]) {
+                n.g = node_map[n.g].id;
+            } else {
+                delete n.g
+            }
             for (var d3 in n._def.defaults) {
                 if (n._def.defaults.hasOwnProperty(d3)) {
                     if (n._def.defaults[d3].type && node_map[n[d3]]) {
@@ -1287,9 +1409,27 @@ RED.nodes = (function() {
                 delete n.status.wires;
             }
         }
+        for (i=0;i<new_groups.length;i++) {
+            n = new_groups[i];
+            if (n.g && node_map[n.g]) {
+                n.g = node_map[n.g].id;
+            } else {
+                delete n.g;
+            }
+            n.nodes = n.nodes.map(function(id) {
+                return node_map[id];
+            })
+            addGroup(n);
+        }
+        // Now the nodes have been fully updated, add them.
+        for (i=0;i<new_nodes.length;i++) {
+            var node = new_nodes[i];
+            addNode(node);
+            RED.editor.validateNode(node);
+        }
 
         RED.workspaces.refresh();
-        return [new_nodes,new_links,new_workspaces,new_subflows,missingWorkspace];
+        return [new_nodes,new_links,new_groups,new_workspaces,new_subflows,missingWorkspace];
     }
 
     // TODO: supports filter.z|type
@@ -1380,6 +1520,9 @@ RED.nodes = (function() {
         nodeTabMap = {};
         configNodes = {};
         workspacesOrder = [];
+        groups = {};
+        groupsByZ = {};
+
         var subflowIds = Object.keys(subflows);
         subflowIds.forEach(function(id) {
             RED.subflow.removeSubflow(id)
@@ -1397,6 +1540,8 @@ RED.nodes = (function() {
         RED.sidebar.config.refresh();
         RED.sidebar.info.refresh();
 
+        RED.events.emit("workspace:clear");
+
         // var node_defs = {};
         // var nodes = [];
         // var configNodes = {};
@@ -1408,6 +1553,29 @@ RED.nodes = (function() {
         // var loadedFlowVersion = null;
     }
 
+    function addGroup(group) {
+        groupsByZ[group.z] = groupsByZ[group.z] || [];
+        groupsByZ[group.z].push(group);
+        groups[group.id] = group;
+        RED.events.emit("groups:add",group);
+    }
+    function removeGroup(group) {
+        var i = groupsByZ[group.z].indexOf(group);
+        groupsByZ[group.z].splice(i,1);
+
+        if (group.g) {
+            if (groups[group.g]) {
+                var index = groups[group.g].nodes.indexOf(group);
+                groups[group.g].nodes.splice(index,1);
+            }
+        }
+        RED.group.markDirty(group);
+
+        delete groups[group.id];
+        RED.events.emit("groups:remove",group);
+    }
+
+
     return {
         init: function() {
             RED.events.on("registry:node-type-added",function(type) {
@@ -1434,6 +1602,9 @@ RED.nodes = (function() {
                             delete configNodes[n.id];
                         } else {
                             nodes.splice(nodes.indexOf(n),1);
+                            if (nodeTabMap[n.z]) {
+                                delete nodeTabMap[n.z][n.id];
+                            }
                         }
                         reimportList.push(convertNode(n));
                     });
@@ -1448,8 +1619,9 @@ RED.nodes = (function() {
                     });
                     removeLinks.forEach(removeLink);
 
-
+                    // Force the redraw to be synchronous so the view updates
-                    RED.view.redraw(true);
+                    // *now* and removes the unknown node
+                    RED.view.redraw(true, true);
                     var result = importNodes(reimportList,false);
                     var newNodeMap = {};
                     result[0].forEach(function(n) {
@@ -1503,6 +1675,11 @@ RED.nodes = (function() {
         subflow: getSubflow,
         subflowContains: subflowContains,
 
+        addGroup: addGroup,
+        removeGroup: removeGroup,
+        group: function(id) { return groups[id] },
+        groups: function(z) { return groupsByZ[z]||[] },
+
         eachNode: function(cb) {
             for (var n=0;n<nodes.length;n++) {
                 if (cb(nodes[n]) === false) {

packages/node_modules/@node-red/editor-client/src/js/polyfills.js

@@ -0,0 +1,33 @@
+(function() {
+    var isIE11 = !!window.MSInputMethodContext && !!document.documentMode;
+
+    if (isIE11) {
+        // IE11 does not provide classList on SVGElements
+        if (! ("classList" in SVGElement.prototype)) {
+            Object.defineProperty(SVGElement.prototype, 'classList', Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'classList'));
+        }
+
+        // IE11 does not provide children on SVGElements
+        if (! ("children" in SVGElement.prototype)) {
+            Object.defineProperty(SVGElement.prototype, 'children', Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'children'));
+        }
+
+        Array.from = function() {
+            if (arguments.length > 1) {
+                throw new Error("Node-RED's IE11 Array.from polyfill doesn't support multiple arguments");
+            }
+            var arrayLike = arguments[0]
+            var result = [];
+            if (arrayLike.forEach) {
+                arrayLike.forEach(function(i) {
+                    result.push(i);
+                })
+            } else {
+                for (var i=0;i<arrayLike.length;i++) {
+                    result.push(arrayList[i]);
+                }
+            }
+            return result;
+        }
+    }
+})();

packages/node_modules/@node-red/editor-client/src/js/red.js

@@ -75,6 +75,7 @@ var RED = (function() {
     }
 
     function loadNodeList() {
+        loader.reportProgress(RED._("event.loadPalette"), 20)
         $.ajax({
             headers: {
                 "Accept":"application/json"
@@ -83,6 +84,7 @@ var RED = (function() {
             url: 'nodes',
             success: function(data) {
                 RED.nodes.setNodeList(data);
+                loader.reportProgress(RED._("event.loadNodeCatalogs"), 25)
                 RED.i18n.loadNodeCatalogs(function() {
                     loadIconList(loadNodes);
                 });
@@ -107,6 +109,7 @@ var RED = (function() {
     }
 
     function loadNodes() {
+        loader.reportProgress(RED._("event.loadNodes",{count:""}), 30)
         var lang = localStorage.getItem("editor-language")||i18n.detectLanguage();
 
         $.ajax({
@@ -118,15 +121,19 @@ var RED = (function() {
             url: 'nodes',
             success: function(data) {
                 var configs = data.trim().split(/(?=<!-- --- \[red-module:\S+\] --- -->)/);
+                var totalCount = configs.length;
+
                 var stepConfig = function() {
+                    loader.reportProgress(RED._("event.loadNodes",{count:(totalCount-configs.length)+"/"+totalCount}), 30 + ((totalCount-configs.length)/totalCount)*40 )
+
                     if (configs.length === 0) {
                         $("#red-ui-editor").i18n();
                         $("#red-ui-palette > .red-ui-palette-spinner").hide();
                         $(".red-ui-palette-scroll").removeClass("hide");
                         $("#red-ui-palette-search").removeClass("hide");
-                        loadFlows(function() {
+                        if (RED.settings.theme("projects.enabled",false)) {
-                            if (RED.settings.theme("projects.enabled",false)) {
+                            RED.projects.refresh(function(activeProject) {
-                                RED.projects.refresh(function(activeProject) {
+                                loadFlows(function() {
                                     RED.sidebar.info.refresh()
                                     if (!activeProject) {
                                         // Projects enabled but no active project
@@ -140,12 +147,14 @@ var RED = (function() {
                                     }
                                     completeLoad();
                                 });
-                            } else {
+                            });
+                        } else {
+                            loadFlows(function() {
                                 // Projects disabled by the user
                                 RED.sidebar.info.refresh()
                                 completeLoad();
-                            }
+                            });
-                        });
+                        }
                     } else {
                         var config = configs.shift();
                         appendNodeConfig(config,stepConfig);
@@ -157,6 +166,7 @@ var RED = (function() {
     }
 
     function loadFlows(done) {
+        loader.reportProgress(RED._("event.loadFlows"),80 )
         $.ajax({
             headers: {
                 "Accept":"application/json",
@@ -167,6 +177,7 @@ var RED = (function() {
                 if (nodes) {
                     var currentHash = window.location.hash;
                     RED.nodes.version(nodes.rev);
+                    loader.reportProgress(RED._("event.importFlows"),90 )
                     RED.nodes.import(nodes.flows);
                     RED.nodes.dirty(false);
                     RED.view.redraw(true);
@@ -193,6 +204,7 @@ var RED = (function() {
                 return;
             }
             if (notificationId === "project-update") {
+                loader.start("Loading project",0)
                 RED.nodes.clear();
                 RED.history.clear();
                 RED.view.redraw(true);
@@ -208,6 +220,7 @@ var RED = (function() {
                             "revert": RED._("notification.project.revert", {project: msg.project}),
                             "merge-complete": RED._("notification.project.merge-complete")
                         }[msg.action];
+                        loader.end()
                         RED.notify("<p>"+message+"</p>");
                         RED.sidebar.info.refresh()
                     });
@@ -423,6 +436,12 @@ var RED = (function() {
             var id = topic.substring(9);
             RED.eventLog.log(id,payload);
         });
+
+        $(".red-ui-header-toolbar").show();
+
+        setTimeout(function() {
+            loader.end();
+        },100);
     }
 
     function showAbout() {
@@ -431,8 +450,7 @@ var RED = (function() {
             '<img width="50px" src="red/images/node-red-icon.svg" />'+
             '</div>';
 
-            RED.sidebar.info.set(aboutHeader+marked(data));
+            RED.sidebar.help.set(aboutHeader+RED.utils.renderMarkdown(data));
-            RED.sidebar.info.show();
         });
     }
 
@@ -472,6 +490,14 @@ var RED = (function() {
             {id:"menu-item-subflow-create",label:RED._("menu.label.createSubflow"),onselect:"core:create-subflow"},
             {id:"menu-item-subflow-convert",label:RED._("menu.label.selectionToSubflow"),disabled:true,onselect:"core:convert-to-subflow"},
         ]});
+        menuOptions.push({id:"menu-item-group",label:RED._("menu.label.groups"), options: [
+            {id:"menu-item-group-group",label:RED._("menu.label.groupSelection"),disabled:true,onselect:"core:group-selection"},
+            {id:"menu-item-group-ungroup",label:RED._("menu.label.ungroupSelection"),disabled:true,onselect:"core:ungroup-selection"},
+            null,
+            {id:"menu-item-group-merge",label:RED._("menu.label.groupMergeSelection"),disabled:true,onselect:"core:merge-selection-to-group"},
+            {id:"menu-item-group-remove",label:RED._("menu.label.groupRemoveSelection"),disabled:true,onselect:"core:remove-selection-from-group"}
+        ]});
+
         menuOptions.push(null);
         if (RED.settings.theme('palette.editable') !== false) {
             menuOptions.push({id:"menu-item-edit-palette",label:RED._("menu.label.editPalette"),onselect:"core:manage-palette"});
@@ -497,7 +523,6 @@ var RED = (function() {
     }
 
     function loadEditor() {
-
         RED.workspaces.init();
         RED.statusBar.init();
         RED.view.init();
@@ -524,6 +549,7 @@ var RED = (function() {
         }
 
         RED.subflow.init();
+        RED.group.init();
         RED.clipboard.init();
         RED.search.init();
         RED.actionList.init();
@@ -539,13 +565,14 @@ var RED = (function() {
         RED.comms.connect();
 
         $("#red-ui-main-container").show();
-        $(".red-ui-header-toolbar").show();
+
 
         RED.actions.add("core:show-about", showAbout);
 
         loadNodeList();
     }
 
+
     function buildEditor(options) {
         var header = $('<div id="red-ui-header"></div>').appendTo(options.target);
         var logo = $('<span class="red-ui-header-logo"></span>').appendTo(header);
@@ -560,6 +587,10 @@ var RED = (function() {
         '</div>').appendTo(options.target);
         $('<div id="red-ui-editor-node-configs"></div>').appendTo(options.target);
         $('<div id="red-ui-full-shade" class="hide"></div>').appendTo(options.target);
+
+        loader.init().appendTo("#red-ui-main-container");
+        loader.start("...",0);
+
         $.getJSON(options.apiRootUrl+"theme", function(theme) {
             if (theme.header) {
                 if (theme.header.url) {
@@ -592,12 +623,39 @@ var RED = (function() {
         options.target.addClass("red-ui-editor");
 
         buildEditor(options);
+
         RED.i18n.init(options, function() {
             RED.settings.init(options, loadEditor);
         })
     }
 
+    var loader = {
+        init: function() {
+            var wrapper = $('<div id="red-ui-loading-progress"></div>').hide();
+            var container = $('<div>').appendTo(wrapper);
+            var label = $('<div>',{class:"red-ui-loading-bar-label"}).appendTo(container);
+            var bar = $('<div>',{class:"red-ui-loading-bar"}).appendTo(container);
+            var fill =$('<span>').appendTo(bar);
+            return wrapper;
+        },
+        start: function(text, prcnt) {
+            if (text) {
+                loader.reportProgress(text,prcnt)
+            }
+            $("#red-ui-loading-progress").show();
+        },
+        reportProgress: function(text, prcnt) {
+            $(".red-ui-loading-bar-label").text(text);
+            $(".red-ui-loading-bar span").width(prcnt+"%")
+        },
+        end: function() {
+            $("#red-ui-loading-progress").hide();
+            loader.reportProgress("",0);
+        }
+    }
+
     return {
-        init: init
+        init: init,
+        loader: loader
     }
 })();

packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js

@@ -184,7 +184,7 @@ RED.clipboard = (function() {
                 '</div>'+
                 '<div id="red-ui-clipboard-dialog-export-tabs-content" class="red-ui-clipboard-dialog-tabs-content">'+
                     '<div id="red-ui-clipboard-dialog-export-tab-clipboard" class="red-ui-clipboard-dialog-tab-clipboard">'+
-                        '<div class="form-row">'+
+                        '<div class="form-row" style="height:calc(100% - 30px)">'+
                             '<textarea readonly id="red-ui-clipboard-dialog-export-text"></textarea>'+
                         '</div>'+
                         '<div class="form-row" style="text-align: right;">'+
@@ -216,7 +216,7 @@ RED.clipboard = (function() {
                             ' <a class="red-ui-button" id="red-ui-clipboard-dialog-import-file-upload-btn"><i class="fa fa-upload"></i> <span data-i18n="clipboard.selectFile"></span></a>'+
                             '<input type="file" id="red-ui-clipboard-dialog-import-file-upload" accept=".json" style="display:none">'+
                         '</div>'+
-                        '<div class="form-row">'+
+                        '<div class="form-row" style="height:calc(100% - 47px)">'+
                             '<textarea id="red-ui-clipboard-dialog-import-text"></textarea>'+
                         '</div>'+
                     '</div>'+
@@ -474,6 +474,12 @@ RED.clipboard = (function() {
             },100)
         }
 
+        var dialogHeight = 400;
+        var winHeight = $(window).height();
+        if (winHeight < 600) {
+            dialogHeight = 400 - (600 - winHeight);
+        }
+        $(".red-ui-clipboard-dialog-box").height(dialogHeight);
 
         dialog.dialog("option","title",RED._("clipboard.importNodes")).dialog("open");
         popover = RED.popover.create({
@@ -583,6 +589,7 @@ RED.clipboard = (function() {
                     nodes = [];
                     selection.forEach(function(n) {
                         nodes.push(n);
+                        nodes = nodes.concat(RED.nodes.groups(n.id));
                         nodes = nodes.concat(RED.nodes.filterNodes({z:n.id}));
                     });
                 } else {
@@ -592,7 +599,8 @@ RED.clipboard = (function() {
                 nodes = RED.nodes.createExportableNodeSet(nodes.filter(function(n) { return n.type !== 'subflow'}));
             } else if (type === 'red-ui-clipboard-dialog-export-rng-flow') {
                 var activeWorkspace = RED.workspaces.active();
-                nodes = RED.nodes.filterNodes({z:activeWorkspace});
+                nodes = RED.nodes.groups(activeWorkspace);
+                nodes = nodes.concat(RED.nodes.filterNodes({z:activeWorkspace}));
                 var parentNode = RED.nodes.workspace(activeWorkspace)||RED.nodes.subflow(activeWorkspace);
                 nodes.unshift(parentNode);
                 nodes = RED.nodes.createExportableNodeSet(nodes);
@@ -637,6 +645,14 @@ RED.clipboard = (function() {
             $("#red-ui-clipboard-dialog-export-fmt-mini").trigger("click");
         }
         tabs.activateTab("red-ui-clipboard-dialog-export-tab-"+mode);
+
+        var dialogHeight = 400;
+        var winHeight = $(window).height();
+        if (winHeight < 600) {
+            dialogHeight = 400 - (600 - winHeight);
+        }
+        $(".red-ui-clipboard-dialog-box").height(dialogHeight);
+
         dialog.dialog("option","title",RED._("clipboard.exportNodes")).dialog( "open" );
 
         $("#red-ui-clipboard-dialog-export-text").trigger("focus");
@@ -738,6 +754,8 @@ RED.clipboard = (function() {
             RED.actions.add("core:show-library-export-dialog",function() { exportNodes('library') });
             RED.actions.add("core:show-library-import-dialog",function() { importNodes('library') });
 
+            RED.actions.add("core:show-examples-import-dialog",function() { importNodes('examples') });
+
             RED.events.on("editor:open",function() { disabled = true; });
             RED.events.on("editor:close",function() { disabled = false; });
             RED.events.on("search:open",function() { disabled = true; });

packages/node_modules/@node-red/editor-client/src/js/ui/common/colorPicker.js

@@ -0,0 +1,203 @@
+RED.colorPicker = (function() {
+
+    function create(options) {
+        var color = options.value;
+        var id = options.id;
+        var colorPalette = options.palette || [];
+        var width = options.cellWidth || 30;
+        var height = options.cellHeight || 30;
+        var margin = options.cellMargin || 2;
+        var perRow = options.cellPerRow || 6;
+
+        var container = $("<div>",{style:"display:inline-block"});
+        var colorHiddenInput = $("<input/>", { id: id, type: "hidden", value: color }).appendTo(container);
+        var opacityHiddenInput = $("<input/>", { id: id+"-opacity", type: "hidden", value: options.hasOwnProperty('opacity')?options.opacity:"1" }).appendTo(container);
+
+        var colorButton = $('<button type="button" class="red-ui-button red-ui-editor-node-appearance-button">').appendTo(container);
+        $('<i class="fa fa-caret-down"></i>').appendTo(colorButton);
+
+        var colorDispContainer = $('<div>',{class:"red-ui-search-result-node"}).appendTo(colorButton);
+        $('<div>',{class:"red-ui-color-picker-cell-none"}).appendTo(colorDispContainer);
+        var colorDisp = $('<div>',{class:"red-ui-color-picker-swatch"}).appendTo(colorDispContainer);
+
+
+        var refreshDisplay = function(color) {
+            if (color === "none") {
+                colorDisp.addClass('red-ui-color-picker-cell-none').css({
+                    "background-color": "",
+                    opacity: 1
+                });
+                colorDispContainer.css({
+                    "border-color":""
+                })
+            } else {
+                var opacity = parseFloat(opacityHiddenInput.val())
+                colorDisp.removeClass('red-ui-color-picker-cell-none').css({
+                    "background-color": color,
+                    "opacity": opacity
+                });
+                var border = RED.utils.getDarkerColor(color);
+                if (border[0] === '#') {
+                    border += Math.round(255*Math.floor(opacity*100)/100).toString(16);
+                } else {
+                    border = "";
+                }
+
+                colorDispContainer.css({
+                    "border-color": border
+                })
+            }
+            if (options.hasOwnProperty('opacity')) {
+                $(".red-ui-color-picker-opacity-slider-overlay").css({
+                    "background-image": "linear-gradient(90deg, transparent 0%, "+color+" 100%)"
+                })
+            }
+
+
+        }
+
+        colorButton.on("click", function (e) {
+            var numColors = colorPalette.length;
+
+            var picker = $("<div/>", {
+                class: "red-ui-color-picker"
+            }).css({
+                width: ((width+margin+margin)*perRow)+"px",
+                height: Math.ceil(numColors/perRow)*(height+margin+margin)+"+px"
+            });
+            var count = 0;
+            var row = null;
+            row = $("<div/>").appendTo(picker);
+
+            var colorInput = $('<input>',{
+                type:"text",
+                value:colorHiddenInput.val()
+            }).appendTo(row);
+
+            colorInput.on("change", function (e) {
+                var color = colorInput.val();
+                colorHiddenInput.val(color).trigger('change');
+                refreshDisplay(color);
+            });
+            // if (options.hasOwnProperty('opacity')) {
+            //     var sliderContainer = $("<div>",{class:"red-ui-color-picker-opacity-slider"
+            // }
+
+            if (options.none) {
+                row = $("<div/>").appendTo(picker);
+                var button = $("<button/>", {
+                    class:"red-ui-color-picker-cell red-ui-color-picker-cell-none"
+                }).css({
+                    width: width+"px",
+                    height: height+"px",
+                    margin: margin+"px"
+                }).appendTo(row);
+                button.on("click",  function (e) {
+                    e.preventDefault();
+                    colorInput.val("none");
+                    colorInput.trigger("change");
+                });
+            }
+
+
+            colorPalette.forEach(function (col) {
+                if ((count % perRow) == 0) {
+                    row = $("<div/>").appendTo(picker);
+                }
+                var button = $("<button/>", {
+                    class:"red-ui-color-picker-cell"
+                }).css({
+                    width: width+"px",
+                    height: height+"px",
+                    margin: margin+"px",
+                    backgroundColor: col,
+                    "border-color": RED.utils.getDarkerColor(col)
+                }).appendTo(row);
+                button.on("click",  function (e) {
+                    e.preventDefault();
+                    // colorPanel.hide();
+                    colorInput.val(col);
+                    colorInput.trigger("change");
+                });
+                count++;
+            });
+            if (options.none || options.hasOwnProperty('opacity')) {
+                row = $("<div/>").appendTo(picker);
+                // if (options.none) {
+                //     var button = $("<button/>", {
+                //         class:"red-ui-color-picker-cell red-ui-color-picker-cell-none"
+                //     }).css({
+                //         width: width+"px",
+                //         height: height+"px",
+                //         margin: margin+"px"
+                //     }).appendTo(row);
+                //     button.on("click",  function (e) {
+                //         e.preventDefault();
+                //         colorPanel.hide();
+                //         selector.val("none");
+                //         selector.trigger("change");
+                //     });
+                // }
+                if (options.hasOwnProperty('opacity')) {
+                    var sliderContainer = $("<div>",{class:"red-ui-color-picker-opacity-slider"}).appendTo(row);
+                    sliderContainer.on("mousedown", function(evt) {
+                        if (evt.target === sliderHandle[0]) {
+                            return;
+                        }
+                        var v = evt.offsetX/sliderContainer.width();
+                        sliderHandle.css({
+                            left: ( v*(sliderContainer.width() - sliderHandle.outerWidth()))+"px"
+                        });
+                        v = Math.floor(100*v)
+                        opacityHiddenInput.val(v/100)
+                        opacityLabel.text(v+"%");
+                        refreshDisplay(colorHiddenInput.val());
+                    })
+                     $("<div>",{class:"red-ui-color-picker-opacity-slider-overlay"}).appendTo(sliderContainer);
+                    var sliderHandle = $("<div>",{class:"red-ui-color-picker-opacity-slider-handle red-ui-button red-ui-button-small"}).appendTo(sliderContainer).draggable({
+                        containment: "parent",
+                        axis: "x",
+                        drag: function( event, ui ) {
+                            var v = Math.max(0,ui.position.left/($(this).parent().width()-$(this).outerWidth()));
+                            // Odd bug that if it is loaded with a non-0 value, the first time
+                            // it is dragged it ranges -1 to 99. But every other time, its 0 to 100.
+                            // The Math.max above makes the -1 disappear. The follow hack ensures
+                            // it always maxes out at a 100, at the cost of not allowing 99% exactly.
+                            v = Math.floor(100*v)
+                            if ( v === 99 ) {
+                                v = 100;
+                            }
+                            // console.log("uip",ui.position.left);
+                            opacityHiddenInput.val(v/100)
+                            opacityLabel.text(v+"%");
+                            refreshDisplay(colorHiddenInput.val());
+                        }
+                    });
+                    var opacityLabel = $('<small></small>').appendTo(row);
+                    setTimeout(function() {
+                        sliderHandle.css({
+                            left: (parseFloat(opacityHiddenInput.val())*(sliderContainer.width() - sliderHandle.outerWidth()))+"px"
+                        })
+                        opacityLabel.text(Math.floor(opacityHiddenInput.val()*100)+"%");
+                    },50);
+                }
+            }
+
+            var colorPanel = RED.popover.panel(picker);
+            setTimeout(function() {
+                refreshDisplay(colorHiddenInput.val())
+            },50);
+            colorPanel.show({
+                target: colorButton
+            })
+        });
+        setTimeout(function() {
+            refreshDisplay(colorHiddenInput.val())
+        },50);
+        return container;
+    }
+
+    return {
+        create: create
+    }
+})();

packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js

@@ -183,7 +183,7 @@
             if (this.options.resizeItem) {
                 var that = this;
                 this.element.children().each(function(i) {
-                    that.options.resizeItem($(this).find(".red-ui-editableList-item-content"),i);
+                    that.options.resizeItem($(this).children(".red-ui-editableList-item-content"),i);
                 });
             }
         },
@@ -223,7 +223,7 @@
                 var items = this.element.children();
                 var that = this;
                 items.sort(function(A,B) {
-                    return that.activeSort($(A).find(".red-ui-editableList-item-content").data('data'),$(B).find(".red-ui-editableList-item-content").data('data'));
+                    return that.activeSort($(A).children(".red-ui-editableList-item-content").data('data'),$(B).children(".red-ui-editableList-item-content").data('data'));
                 });
                 $.each(items,function(idx,li) {
                     that.element.append(li);
@@ -305,7 +305,7 @@
             }
             if (this.options.addItem) {
                 var index = that.element.children().length-1;
-                setTimeout(function() {
+                // setTimeout(function() {
                     that.options.addItem(row,index,data);
                     if (that.activeFilter) {
                         try {
@@ -321,7 +321,7 @@
                             that.uiContainer.scrollTop(that.element.height());
                         },0);
                     }
-                },0);
+                // },0);
             }
         },
         addItem: function(data) {
@@ -334,7 +334,7 @@
         },
         removeItem: function(data) {
             var items = this.element.children().filter(function(f) {
-                return data === $(this).find(".red-ui-editableList-item-content").data('data');
+                return data === $(this).children(".red-ui-editableList-item-content").data('data');
             });
             items.remove();
             if (this.options.removeItem) {
@@ -342,7 +342,7 @@
             }
         },
         items: function() {
-            return this.element.children().map(function(i) { return $(this).find(".red-ui-editableList-item-content"); });
+            return this.element.children().map(function(i) { return $(this).children(".red-ui-editableList-item-content"); });
         },
         empty: function() {
             this.element.empty();
@@ -365,14 +365,14 @@
         },
         show: function(item) {
             var items = this.element.children().filter(function(f) {
-                return item === $(this).find(".red-ui-editableList-item-content").data('data');
+                return item === $(this).children(".red-ui-editableList-item-content").data('data');
             });
             if (items.length > 0) {
                 this.uiContainer.scrollTop(this.uiContainer.scrollTop()+items.position().top)
             }
         },
         getItem: function(li) {
-            var el = li.find(".red-ui-editableList-item-content");
+            var el = li.children(".red-ui-editableList-item-content");
             if (el.length) {
                 return el.data('data');
             } else {

packages/node_modules/@node-red/editor-client/src/js/ui/common/panels.js

@@ -29,6 +29,10 @@ RED.panels = (function() {
         if (!vertical) {
             container.addClass("red-ui-panels-horizontal");
         }
+
+        $(children[0]).addClass("red-ui-panel");
+        $(children[1]).addClass("red-ui-panel");
+
         var separator = $('<div class="red-ui-panels-separator"></div>').insertAfter(children[0]);
         var startPosition;
         var panelSizes = [];
@@ -52,11 +56,11 @@ RED.panels = (function() {
                     var newSizes = [panelSizes[0]+delta,panelSizes[1]-delta];
                     if (vertical) {
                         $(children[0]).height(newSizes[0]);
-                        $(children[1]).height(newSizes[1]);
+                        // $(children[1]).height(newSizes[1]);
                         ui.position.top -= delta;
                     } else {
                         $(children[0]).width(newSizes[0]);
-                        $(children[1]).width(newSizes[1]);
+                        // $(children[1]).width(newSizes[1]);
                         ui.position.left -= delta;
                     }
                     if (options.resize) {
@@ -71,6 +75,9 @@ RED.panels = (function() {
 
         var panel = {
             ratio: function(ratio) {
+                if (ratio === undefined) {
+                    return panelRatio;
+                }
                 panelRatio = ratio;
                 modifiedSizes = true;
                 if (ratio === 0 || ratio === 1) {
@@ -99,10 +106,10 @@ RED.panels = (function() {
                     panelSizes = [topPanelSize,bottomPanelSize];
                     if (vertical) {
                         $(children[0]).outerHeight(panelSizes[0]);
-                        $(children[1]).outerHeight(panelSizes[1]);
+                        // $(children[1]).outerHeight(panelSizes[1]);
                     } else {
                         $(children[0]).outerWidth(panelSizes[0]);
-                        $(children[1]).outerWidth(panelSizes[1]);
+                        // $(children[1]).outerWidth(panelSizes[1]);
                     }
                 }
                 if (options.resize) {

packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js

@@ -136,6 +136,23 @@ RED.popover = (function() {
                         closePopup(true);
                     });
                 }
+                if (trigger === 'hover' && options.interactive) {
+                    div.on('mouseenter', function(e) {
+                        clearTimeout(timer);
+                        active = true;
+                    })
+                    div.on('mouseleave', function(e) {
+                        if (timer) {
+                            clearTimeout(timer);
+                        }
+                        if (active) {
+                            timer = setTimeout(function() {
+                                active = false;
+                                closePopup();
+                            },delay.hide);
+                        }
+                    })
+                }
                 if (instant) {
                     div.show();
                 } else {
@@ -163,8 +180,10 @@ RED.popover = (function() {
         if (trigger === 'hover') {
             target.on('mouseenter',function(e) {
                 clearTimeout(timer);
-                active = true;
+                if (!active) {
-                timer = setTimeout(openPopup,delay.show);
+                    active = true;
+                    timer = setTimeout(openPopup,delay.show);
+                }
             });
             target.on('mouseleave disabled', function(e) {
                 if (timer) {
@@ -278,6 +297,7 @@ RED.popover = (function() {
                 var closeCallback = options.onclose;
                 var target = options.target;
                 var align = options.align || "left";
+                var offset = options.offset || [0,0];
 
                 var pos = target.offset();
                 var targetWidth = target.width();
@@ -285,7 +305,7 @@ RED.popover = (function() {
                 var panelHeight = panel.height();
                 var panelWidth = panel.width();
 
-                var top = (targetHeight+pos.top);
+                var top = (targetHeight+pos.top) + offset[1];
                 if (top+panelHeight > $(window).height()) {
                     top -= (top+panelHeight)-$(window).height() + 5;
                 }
@@ -296,12 +316,12 @@ RED.popover = (function() {
                 if (align === "left") {
                     panel.css({
                         top: top+"px",
-                        left: (pos.left)+"px",
+                        left: (pos.left+offset[0])+"px",
                     });
                 } else if(align === "right") {
                     panel.css({
                         top: top+"px",
-                        left: (pos.left-panelWidth)+"px",
+                        left: (pos.left-panelWidth+offset[0])+"px",
                     });
                 }
                 panel.slideDown(100);

packages/node_modules/@node-red/editor-client/src/js/ui/common/searchBox.js

@@ -38,7 +38,10 @@
             this.element.addClass("red-ui-searchBox-input");
             this.uiContainer = this.element.wrap("<div>").parent();
             this.uiContainer.addClass("red-ui-searchBox-container");
-
+            if (this.element.parents("form").length === 0) {
+                var form = this.element.wrap("<form>").parent();
+                form.addClass("red-ui-searchBox-form");
+            }
             $('<i class="fa fa-search"></i>').prependTo(this.uiContainer);
             this.clearButton = $('<a href="#"><i class="fa fa-times"></i></a>').appendTo(this.uiContainer);
             this.clearButton.on("click",function(e) {

packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js

@@ -27,7 +27,8 @@
  *
  * methods:
  *   - data(items) - clears existing items and replaces with new data
- *
+ *   - clearSelection - clears the selected items
+ *   - filter(filterFunc) - filters the tree using the provided function
  * events:
  *   - treelistselect : function(event, item) {}
  *   - treelistconfirm : function(event,item) {}
@@ -39,7 +40,8 @@
  *         label: 'Local', // label for the item
  *         sublabel: 'Local', // a sub-label for the item
  *         icon: 'fa fa-rocket', // (optional) icon for the item
- *         selected: true/false, // (optional) if present, display checkbox accordingly
+ *         checkbox: true/false, // (optional) if present, display checkbox accordingly
+ *         selected: true/false, // (optional) whether the item is selected or not
  *         children: [] | function(done,item) // (optional) an array of child items, or a function
  *                                       // that will call the `done` callback with an array
  *                                       // of child items
@@ -59,9 +61,9 @@
  * properties and functions:
  *
  *   item.parent - set to the parent item
+ *   item.depth - the depth in the tree (0 == root)
  *   item.treeList.container
  *   item.treeList.label - the label element for the item
- *   item.treeList.depth - the depth in the tree (0 == root)
  *   item.treeList.parentList  - the editableList instance this item is in
  *   item.treeList.remove() - removes the item from the tree
  *   item.treeList.makeLeaf(detachChildElements) - turns an element with children into a leaf node,
@@ -78,8 +80,8 @@
  *                                            Optionally selects the item after adding.
  *   item.treeList.expand(done) - expands the parent item to show children. Optional 'done' callback.
  *   item.treeList.collapse() - collapse the parent item to hide children.
- *
+ *   item.treeList.sortChildren(sortFunction) - does a one-time sort of the children using sortFunction
- *
+ *   item.treeList.replaceElement(element) - replace the custom element for the item
  *
  *
  */
@@ -100,6 +102,8 @@
                 var target;
                 switch(evt.keyCode) {
                     case 13: // ENTER
+                        evt.preventDefault();
+                        evt.stopPropagation();
                         if (selected.children) {
                             if (selected.treeList.container.hasClass("expanded")) {
                                 selected.treeList.collapse()
@@ -112,6 +116,8 @@
 
                     break;
                     case 37: // LEFT
+                        evt.preventDefault();
+                        evt.stopPropagation();
                         if (selected.children&& selected.treeList.container.hasClass("expanded")) {
                             selected.treeList.collapse()
                         } else if (selected.parent) {
@@ -119,6 +125,8 @@
                         }
                     break;
                     case 38: // UP
+                        evt.preventDefault();
+                        evt.stopPropagation();
                         target = that._getPreviousSibling(selected);
                         if (target) {
                             target = that._getLastDescendant(target);
@@ -128,6 +136,8 @@
                         }
                     break;
                     case 39: // RIGHT
+                        evt.preventDefault();
+                        evt.stopPropagation();
                         if (selected.children) {
                             if (!selected.treeList.container.hasClass("expanded")) {
                                 selected.treeList.expand()
@@ -135,6 +145,8 @@
                         }
                     break
                     case 40: //DOWN
+                        evt.preventDefault();
+                        evt.stopPropagation();
                         if (selected.children && Array.isArray(selected.children) && selected.children.length > 0 && selected.treeList.container.hasClass("expanded")) {
                             target = selected.children[0];
                         } else {
@@ -151,7 +163,8 @@
                 }
             });
             this._data = [];
-
+            this._items = {};
+            this._selected = new Set();
             this._topList = $('<ol class="red-ui-treeList-list">').css({
                 position:'absolute',
                 top: 0,
@@ -244,7 +257,8 @@
                         that._trigger("changeparent",null,evt);
                     });
                     that._trigger("sort",null,parent);
-                }
+                },
+                filter: parent.treeList.childFilter
             });
             if (!!that.options.sortable) {
                 subtree.addClass('red-ui-treeList-sortable');
@@ -289,21 +303,171 @@
             }
             return reparentedEvent;
         },
-        _addSubtree: function(parentList, container, item, depth) {
+        _initItem: function(item,depth) {
+            if (item.treeList) {
+                return;
+            }
             var that = this;
+            this._items[item.id] = item;
             item.treeList = {};
-            item.treeList.depth = depth;
+            item.depth = depth;
-            item.treeList.container = container;
-
-            item.treeList.parentList = parentList;
             item.treeList.remove = function() {
-                parentList.editableList('removeItem',item);
+                if (item.treeList.parentList) {
+                    item.treeList.parentList.editableList('removeItem',item);
+                }
                 if (item.parent) {
                     var index = item.parent.children.indexOf(item);
                     item.parent.children.splice(index,1)
                     that._trigger("sort",null,item.parent);
                 }
+                that._selected.delete(item);
+                delete item.treeList;
+                delete(that._items[item.id]);
             }
+            item.treeList.insertChildAt = function(newItem,position,select) {
+                newItem.parent = item;
+                item.children.splice(position,0,newItem);
+                var processChildren = function(parent,i) {
+                    that._initItem(i,parent.depth+1)
+                    i.parent = parent;
+                    if (i.children && typeof i.children !== 'function') {
+                        i.children.forEach(function(item) {
+                            processChildren(i, item, parent.depth+2)
+                        });
+                    }
+                }
+                processChildren(item,newItem);
+
+                if (!item.deferBuild) {
+                    item.treeList.childList.editableList('insertItemAt',newItem,position)
+                    if (select) {
+                        setTimeout(function() {
+                            that.select(newItem)
+                        },100);
+                    }
+                    that._trigger("sort",null,item);
+                }
+            }
+            item.treeList.addChild = function(newItem,select) {
+                item.treeList.insertChildAt(newItem,item.children.length,select);
+            }
+            item.treeList.expand = function(done) {
+                if (!item.children) {
+                    if (done) { done(false) }
+                    return;
+                }
+                if (!item.treeList.container) {
+                    item.expanded = true;
+                    if (done) { done(false) }
+                    return;
+                }
+                var container = item.treeList.container;
+                if (container.hasClass("expanded")) {
+                    if (done) { done(false) }
+                    return;
+                }
+
+                if (!container.hasClass("built") && (item.deferBuild || typeof item.children === 'function')) {
+                    container.addClass('built');
+                    var childrenAdded = false;
+                    var spinner;
+                    var startTime = 0;
+                    var completeBuild = function(children) {
+                        childrenAdded = true;
+                        item.treeList.childList = that._addChildren(container,item,children,depth).hide();
+                        var delta = Date.now() - startTime;
+                        if (delta < 400) {
+                            setTimeout(function() {
+                                item.treeList.childList.slideDown('fast');
+                                if (spinner) {
+                                    spinner.remove();
+                                }
+                            },400-delta);
+                        } else {
+                            item.treeList.childList.slideDown('fast');
+                            if (spinner) {
+                                spinner.remove();
+                            }
+                        }
+                        item.expanded = true;
+                        if (done) { done(true) }
+                        that._trigger("childrenloaded",null,item)
+                    }
+                    if (typeof item.children === 'function') {
+                        item.children(completeBuild,item);
+                    } else {
+                        delete item.deferBuild;
+                        completeBuild(item.children);
+                    }
+                    if (!childrenAdded) {
+                        startTime = Date.now();
+                        spinner = $('<div class="red-ui-treeList-spinner">').css({
+                            "background-position": (35+depth*20)+'px 50%'
+                        }).appendTo(container);
+                    }
+
+                } else {
+                    if (that._loadingData) {
+                        item.treeList.childList.show();
+                    } else {
+                        item.treeList.childList.slideDown('fast');
+                    }
+                    item.expanded = true;
+                    if (done) { done(!that._loadingData) }
+                }
+                container.addClass("expanded");
+            }
+            item.treeList.collapse = function() {
+                if (!item.children) {
+                    return;
+                }
+                item.expanded = false;
+                if (item.treeList.container) {
+                    item.treeList.childList.slideUp('fast');
+                    item.treeList.container.removeClass("expanded");
+                }
+            }
+            item.treeList.sortChildren = function(sortFunc) {
+                if (!item.children) {
+                    return;
+                }
+                item.children.sort(sortFunc);
+                if (item.treeList.childList) {
+                    // Do a one-off sort of the list, which means calling sort twice:
+                    // 1. first with the desired sort function
+                    item.treeList.childList.editableList('sort',sortFunc);
+                    // 2. and then with null to remove it
+                    item.treeList.childList.editableList('sort',null);
+                }
+            }
+            item.treeList.replaceElement = function (element) {
+                if (item.element) {
+                    if (item.treeList.container) {
+                        $(item.element).remove();
+                        $(element).appendTo(item.treeList.label);
+                        var labelPaddingWidth = (item.gutter?item.gutter.width()+2:0)+(item.depth*20);
+                        $(element).css({
+                            width: "calc(100% - "+(labelPaddingWidth+20+(item.icon?20:0))+"px)"
+                        })
+                    }
+                    item.element = element;
+                }
+            }
+
+            if (item.children && typeof item.children !== "function") {
+                item.children.forEach(function(i) {
+                    that._initItem(i,depth+1);
+                })
+            }
+        },
+        _addSubtree: function(parentList, container, item, depth) {
+            var that = this;
+            this._initItem(item,depth);
+            // item.treeList = {};
+            // item.treeList.depth = depth;
+            item.treeList.container = container;
+
+            item.treeList.parentList = parentList;
 
             var label = $("<div>",{class:"red-ui-treeList-label"}).appendTo(container);
             item.treeList.label = label;
@@ -357,6 +521,7 @@
                 treeListIcon.off("click.red-ui-treeList-expand");
                 delete item.children;
                 container.removeClass("expanded");
+                delete item.expanded;
             }
             item.treeList.makeParent = function(children) {
                 if (treeListIcon.children().length) {
@@ -388,101 +553,25 @@
                     item.treeList.childList = that._addChildren(container,item,item.children,depth).hide();
                 }
             }
-            item.treeList.insertChildAt = function(newItem,position,select) {
-                newItem.parent = item;
-                item.children.splice(position,0,newItem);
-
-                if (!item.deferBuild) {
-                    item.treeList.childList.editableList('insertItemAt',newItem,position)
-                    if (select) {
-                        setTimeout(function() {
-                            that.select(newItem)
-                        },100);
-                    }
-                    that._trigger("sort",null,item);
-                }
-            }
-            item.treeList.addChild = function(newItem,select) {
-                item.treeList.insertChildAt(newItem,item.children.length,select);
-            }
-            item.treeList.expand = function(done) {
-                if (!item.children) {
-                    return;
-                }
-                if (container.hasClass("expanded")) {
-                    if (done) { done() }
-                    return;
-                }
-                if (!container.hasClass("built") && (item.deferBuild || typeof item.children === 'function')) {
-                    container.addClass('built');
-                    var childrenAdded = false;
-                    var spinner;
-                    var startTime = 0;
-                    var completeBuild = function(children) {
-                        childrenAdded = true;
-                        item.treeList.childList = that._addChildren(container,item,children,depth).hide();
-                        var delta = Date.now() - startTime;
-                        if (delta < 400) {
-                            setTimeout(function() {
-                                item.treeList.childList.slideDown('fast');
-                                if (spinner) {
-                                    spinner.remove();
-                                }
-                            },400-delta);
-                        } else {
-                            item.treeList.childList.slideDown('fast');
-                            if (spinner) {
-                                spinner.remove();
-                            }
-                        }
-                        if (done) { done() }
-                        that._trigger("childrenloaded",null,item)
-                    }
-                    if (typeof item.children === 'function') {
-                        item.children(completeBuild,item);
-                    } else {
-                        delete item.deferBuild;
-                        completeBuild(item.children);
-                    }
-                    if (!childrenAdded) {
-                        startTime = Date.now();
-                        spinner = $('<div class="red-ui-treeList-spinner">').css({
-                            "background-position": (35+depth*20)+'px 50%'
-                        }).appendTo(container);
-                    }
-
-                } else {
-                    if (that._loadingData) {
-                        item.treeList.childList.show();
-                    } else {
-                        item.treeList.childList.slideDown('fast');
-                    }
-                    if (done) { done() }
-                }
-                container.addClass("expanded");
-            }
-            item.treeList.collapse = function() {
-                if (!item.children) {
-                    return;
-                }
-                item.treeList.childList.slideUp('fast');
-                container.removeClass("expanded");
-            }
 
             var treeListIcon = $('<span class="red-ui-treeList-icon"></span>').appendTo(label);
             if (item.children) {
                 item.treeList.makeParent();
             }
 
-            if (item.hasOwnProperty('selected')) {
+            if (item.checkbox) {
                 var selectWrapper = $('<span class="red-ui-treeList-icon"></span>').appendTo(label);
                 var cb = $('<input class="red-ui-treeList-checkbox" type="checkbox">').prop('checked',item.selected).appendTo(selectWrapper);
-                label.toggleClass("selected",item.selected);
                 cb.on('click', function(e) {
                     e.stopPropagation();
                 });
                 cb.on('change', function(e) {
                     item.selected = this.checked;
+                    if (item.selected) {
+                        that._selected.add(item);
+                    } else {
+                        that._selected.delete(item);
+                    }
                     label.toggleClass("selected",this.checked);
                     that._trigger("select",e,item);
                 })
@@ -499,8 +588,12 @@
                 }
             } else {
                 label.on("click", function(e) {
-                    that._topList.find(".selected").removeClass("selected");
+                    if (!that.options.multi) {
+                        that.clearSelection();
+                    }
                     label.addClass("selected");
+                    that._selected.add(item);
+
                     that._trigger("select",e,item)
                 })
                 label.on("dblclick", function(e) {
@@ -508,9 +601,30 @@
                         that._trigger("confirm",e,item);
                     }
                 })
+                item.treeList.select = function(v) {
+                    if (!that.options.multi) {
+                        that.clearSelection();
+                    }
+                    label.toggleClass("selected",v);
+                    if (v) {
+                        that._selected.add(item);
+                        that._trigger("select",null,item)
+                    } else {
+                        that._selected.delete(item);
+                    }
+                    that.reveal(item);
+                }
+            }
+            label.toggleClass("selected",!!item.selected);
+            if (item.selected) {
+                that._selected.add(item);
             }
             if (item.icon) {
-                $('<span class="red-ui-treeList-icon"><i class="'+item.icon+'" /></span>').appendTo(label);
+                if (typeof item.icon === "string") {
+                    $('<span class="red-ui-treeList-icon"><i class="'+item.icon+'" /></span>').appendTo(label);
+                } else {
+                    $('<span class="red-ui-treeList-icon">').appendTo(label).append(item.icon);
+                }
             }
             if (item.hasOwnProperty('label') || item.hasOwnProperty('sublabel')) {
                 if (item.hasOwnProperty('label')) {
@@ -542,6 +656,7 @@
             var that = this;
             if (items !== undefined) {
                 this._data = items;
+                this._items = {};
                 this._topList.editableList('empty');
                 this._loadingData = true;
                 for (var i=0; i<items.length;i++) {
@@ -556,33 +671,142 @@
                 return this._data;
             }
         },
-        show: function(id) {
+        show: function(item, done) {
-            for (var i=0;i<this._data.length;i++) {
+            if (typeof item === "string") {
-                if (this._data[i].id === id) {
+                item = this._items[item]
-                    this._topList.editableList('show',this._data[i]);
+            }
+            if (!item) {
+                return;
+            }
+            var that = this;
+            var stack = [];
+            var i = item;
+            while(i) {
+                stack.unshift(i);
+                i = i.parent;
+            }
+            var isOpening = false;
+            var handleStack = function(opening) {
+                isOpening = isOpening ||opening
+                var item = stack.shift();
+                if (stack.length === 0) {
+                    setTimeout(function() {
+                        that.reveal(item);
+                        if (done) { done(); }
+                    },isOpening?200:0);
+                } else {
+                    item.treeList.expand(handleStack)
                 }
             }
+            handleStack();
         },
-        select: function(item) {
+        reveal: function(item) {
-            this._topList.find(".selected").removeClass("selected");
+            if (typeof item === "string") {
-            item.treeList.label.addClass("selected");
+                item = this._items[item]
-            this._trigger("select",null,item)
+            }
+            if (!item) {
+                return;
+            }
+            var listOffset = this._topList.offset().top;
+            var itemOffset = item.treeList.label.offset().top;
+            var scrollTop = this._topList.parent().scrollTop();
+            itemOffset -= listOffset+scrollTop;
+            var treeHeight = this._topList.parent().height();
+            var itemHeight = item.treeList.label.outerHeight();
+            if (itemOffset < itemHeight/2) {
+                this._topList.parent().scrollTop(scrollTop+itemOffset-itemHeight/2-itemHeight)
+            } else if (itemOffset+itemHeight > treeHeight) {
+                this._topList.parent().scrollTop(scrollTop+((itemOffset+2.5*itemHeight)-treeHeight));
+            }
+        },
+        select: function(item, triggerEvent, deselectExisting) {
+            var that = this;
+            if (!this.options.multi && deselectExisting !== false) {
+                this.clearSelection();
+            }
+            if (Array.isArray(item)) {
+                item.forEach(function(i) {
+                    that.select(i,triggerEvent,false);
+                })
+                return;
+            }
+            if (typeof item === "string") {
+                item = this._items[item]
+            }
+            if (!item) {
+                return;
+            }
+            // this.show(item.id);
+            item.selected = true;
+            this._selected.add(item);
 
+            if (item.treeList.label) {
+                item.treeList.label.addClass("selected");
+            }
+            if (triggerEvent !== false) {
+                this._trigger("select",null,item)
+            }
+        },
+        clearSelection: function() {
+            this._selected.forEach(function(item) {
+                item.selected = false;
+                if (item.treeList.label) {
+                    item.treeList.label.removeClass("selected")
+                }
+            });
+            this._selected.clear();
         },
         selected: function() {
-            var s = this._topList.find(".selected");
+            var selected = [];
+            this._selected.forEach(function(item) {
+                selected.push(item);
+            })
             if (this.options.multi) {
-                var res = [];
+                return selected;
-                s.each(function() {
-                    res.push($(this).parent().data('data'));
-                })
-                return res;
             }
-            if (s.length) {
+            if (selected.length) {
-                return s.parent().data('data');
+                return selected[0]
             } else {
+                // TODO: This may be a bug.. it causes the call to return itself
+                // not undefined.
                 return undefined;
             }
+        },
+        filter: function(filterFunc,expandResults) {
+            var filter = function(item) {
+                var matchCount = 0;
+                if (filterFunc && filterFunc(item)) {
+                    matchCount++;
+                }
+                var childCount = 0;
+                if (item.children && typeof item.children !== "function") {
+                    if (item.treeList.childList) {
+                        childCount = item.treeList.childList.editableList('filter', filter);
+                    } else {
+                        item.treeList.childFilter = filter;
+                        if (filterFunc) {
+                            item.children.forEach(function(i) {
+                                if (filter(i)) {
+                                    childCount++;
+                                }
+                            })
+
+                        }
+                    }
+                    matchCount += childCount;
+                    if (childCount > 0) {
+                        item.treeList.expand();
+                    }
+                }
+                if (!filterFunc) {
+                    return true
+                }
+                return matchCount > 0
+            }
+            return this._topList.editableList('filter', filter);
+        },
+        get: function(id) {
+            return this._items[id] || null;
         }
     });
 

packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js

@@ -164,6 +164,84 @@
                     }
                 })
             }
+        },
+        cred:{
+            value:"cred",
+            label:"credential",
+            icon:"fa fa-lock",
+            inputType: "password",
+            valueLabel: function(container,value) {
+                var that = this;
+                container.css("pointer-events","none");
+                this.elementDiv.hide();
+                var buttons = $('<div>').css({
+                    position: "absolute",
+                    right:"6px",
+                    top: "6px",
+                    "pointer-events":"all"
+                }).appendTo(container);
+                var eyeButton = $('<button type="button" class="red-ui-button red-ui-button-small"></button>').css({
+                    width:"20px"
+                }).appendTo(buttons).on("click", function(evt) {
+                    evt.preventDefault();
+                    var currentType = that.input.attr("type");
+                    if (currentType === "text") {
+                        that.input.attr("type","password");
+                        eyeCon.removeClass("fa-eye-slash").addClass("fa-eye");
+                        setTimeout(function() {
+                            that.input.focus();
+                        },50);
+                    } else {
+                        that.input.attr("type","text");
+                        eyeCon.removeClass("fa-eye").addClass("fa-eye-slash");
+                        setTimeout(function() {
+                            that.input.focus();
+                        },50);
+                    }
+                }).hide();
+                var eyeCon = $('<i class="fa fa-eye"></i>').css("margin-left","-1px").appendTo(eyeButton);
+
+                if (value === "__PWRD__") {
+                    var innerContainer = $('<div><i class="fa fa-asterisk"></i><i class="fa fa-asterisk"></i><i class="fa fa-asterisk"></i><i class="fa fa-asterisk"></i><i class="fa fa-asterisk"></i></div>').css({
+                        padding:"6px 6px",
+                        borderRadius:"4px"
+                    }).addClass("red-ui-typedInput-value-label-inactive").appendTo(container);
+                    var editButton = $('<button type="button" class="red-ui-button red-ui-button-small"><i class="fa fa-pencil"></i></button>').appendTo(buttons).on("click", function(evt) {
+                        evt.preventDefault();
+                        innerContainer.hide();
+                        container.css("background","none");
+                        container.css("pointer-events","none");
+                        that.input.val("");
+                        that.element.val("");
+                        that.elementDiv.show();
+                        editButton.hide();
+                        cancelButton.show();
+                        eyeButton.show();
+                        setTimeout(function() {
+                            that.input.focus();
+                        },50);
+                    });
+                    var cancelButton = $('<button type="button" class="red-ui-button red-ui-button-small"><i class="fa fa-times"></i></button>').css("margin-left","3px").appendTo(buttons).on("click", function(evt) {
+                        evt.preventDefault();
+                        innerContainer.show();
+                        container.css("background","");
+                        that.input.val("__PWRD__");
+                        that.element.val("__PWRD__");
+                        that.elementDiv.hide();
+                        editButton.show();
+                        cancelButton.hide();
+                        eyeButton.hide();
+                        that.input.attr("type","password");
+                        eyeCon.removeClass("fa-eye-slash").addClass("fa-eye");
+
+                    }).hide();
+                } else {
+                    container.css("background","none");
+                    container.css("pointer-events","none");
+                    this.elementDiv.show();
+                    eyeButton.show();
+                }
+            }
         }
     };
     var nlsd = false;
@@ -220,6 +298,8 @@
                 that.input.attr(d,m);
             });
 
+            this.defaultInputType = this.input.attr('type');
+
             this.uiSelect.addClass("red-ui-typedInput-container");
 
             this.element.attr('type','hidden');
@@ -488,56 +568,6 @@
                 done(labelWidth);
             }
         },
-        _resize: function() {
-            var that = this;
-            if (this.uiWidth !== null) {
-                this.uiSelect.width(this.uiWidth);
-            }
-            var type = this.typeMap[this.propertyType];
-            if (type && type.hasValue === false) {
-                this.selectTrigger.addClass("red-ui-typedInput-full-width");
-            } else {
-                this.selectTrigger.removeClass("red-ui-typedInput-full-width");
-                this._getLabelWidth(this.selectTrigger, function(labelWidth) {
-                    that.elementDiv.css('left',labelWidth+"px");
-                    that.valueLabelContainer.css('left',labelWidth+"px");
-                    if (that.optionExpandButton.shown) {
-                        that.elementDiv.css('right',"22px");
-                        that.valueLabelContainer.css('right',"22px");
-                    } else {
-                        that.elementDiv.css('right','0');
-                        that.valueLabelContainer.css('right','0');
-                        that.input.css({
-                            'border-top-right-radius': '4px',
-                            'border-bottom-right-radius': '4px'
-                        });
-                    }
-                    if (that.optionSelectTrigger) {
-                        if (type && type.options && type.hasValue === true) {
-                            that.optionSelectLabel.css({'left':'auto'})
-                            that._getLabelWidth(that.optionSelectLabel, function(lw) {
-                                that.optionSelectTrigger.css({'width':(23+lw)+"px"});
-                                that.elementDiv.css('right',(23+lw)+"px");
-                                that.input.css({
-                                    'border-top-right-radius': 0,
-                                    'border-bottom-right-radius': 0
-                                });
-                            });
-                        } else {
-                            that.optionSelectLabel.css({'left':'0'})
-                            that.optionSelectTrigger.css({'width':'calc( 100% - '+labelWidth+'px )'});
-                            if (!that.optionExpandButton.shown) {
-                                that.elementDiv.css({'right':0});
-                                that.input.css({
-                                    'border-top-right-radius': '4px',
-                                    'border-bottom-right-radius': '4px'
-                                });
-                            }
-                        }
-                    }
-                });
-            }
-        },
         _updateOptionSelectLabel: function(o) {
             var opt = this.typeMap[this.propertyType];
             this.optionSelectLabel.empty();
@@ -565,7 +595,6 @@
                 }
                 if (opt.hasValue) {
                     this.optionValue = o.value;
-                    this._resize();
                     this.input.trigger('change',this.propertyType,this.value());
                 }
             } else {
@@ -605,11 +634,12 @@
                 this.propertyType = null;
                 this.type(currentType);
             }
-            setTimeout(function() {that._resize();},0);
         },
         width: function(desiredWidth) {
             this.uiWidth = desiredWidth;
-            this._resize();
+            if (this.uiWidth !== null) {
+                this.uiSelect.width(this.uiWidth);
+            }
         },
         value: function(value) {
             var that = this;
@@ -680,19 +710,23 @@
                         }
                         else if (opt.icon.indexOf("/") !== -1) {
                             image = new Image();
-                            image.onload = function() { that._resize(); }
-                            image.onerror = function() { that._resize(); }
                             image.name = opt.icon;
                             image.src = mapDeprecatedIcon(opt.icon);
                             $('<img>',{src:mapDeprecatedIcon(opt.icon),style:"margin-right: 4px;height: 18px;"}).prependTo(this.selectLabel);
                         }
                         else {
-                            $('<i>',{class:"red-ui-typedInput-icon "+opt.icon}).prependTo(this.selectLabel);
+                            $('<i>',{class:"red-ui-typedInput-icon "+opt.icon,style:"min-width: 13px; margin-right: 4px;"}).prependTo(this.selectLabel);
                         }
                     }
                     if (opt.hasValue === false || (opt.showLabel !== false && !opt.icon)) {
                         this.selectLabel.text(opt.label);
                     }
+                    if (opt.hasValue === false) {
+                        this.selectTrigger.addClass("red-ui-typedInput-full-width");
+                    } else {
+                        this.selectTrigger.removeClass("red-ui-typedInput-full-width");
+                    }
+
                     if (this.optionMenu) {
                         this.optionMenu.remove();
                         this.optionMenu = null;
@@ -703,11 +737,13 @@
                             this.optionExpandButton.shown = false;
                         }
                         if (this.optionSelectTrigger) {
-                            this.optionSelectTrigger.show();
+                            this.optionSelectTrigger.css({"display":"inline-flex"});
                             if (!opt.hasValue) {
+                                this.optionSelectTrigger.css({"flex-grow":1})
                                 this.elementDiv.hide();
                                 this.valueLabelContainer.hide();
                             } else {
+                                this.optionSelectTrigger.css({"flex-grow":0})
                                 this.elementDiv.show();
                                 this.valueLabelContainer.hide();
                             }
@@ -822,6 +858,11 @@
                         if (this.optionSelectTrigger) {
                             this.optionSelectTrigger.hide();
                         }
+                        if (opt.inputType) {
+                            this.input.attr('type',opt.inputType)
+                        } else {
+                            this.input.attr('type',this.defaultInputType)
+                        }
                         if (opt.hasValue === false) {
                             this.oldValue = this.input.val();
                             this.input.val("");
@@ -830,8 +871,8 @@
                         } else if (opt.valueLabel) {
                             this.valueLabelContainer.show();
                             this.valueLabelContainer.empty();
-                            opt.valueLabel.call(this,this.valueLabelContainer,this.input.val());
                             this.elementDiv.hide();
+                            opt.valueLabel.call(this,this.valueLabelContainer,this.input.val());
                         } else {
                             if (this.oldValue !== undefined) {
                                 this.input.val(this.oldValue);
@@ -881,9 +922,6 @@
                         this._trigger("typechange",null,this.propertyType);
                         this.input.trigger('change',this.propertyType,this.value());
                     }
-                    if (!image) {
-                        this._resize();
-                    }
                 }
             }
         },
@@ -910,7 +948,6 @@
         },
         show: function() {
             this.uiSelect.show();
-            this._resize();
         },
         hide: function() {
             this.uiSelect.hide();

packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js

@@ -108,7 +108,7 @@ RED.deploy = (function() {
 
 
 
-        RED.events.on('nodes:change',function(state) {
+        RED.events.on('workspace:dirty',function(state) {
             if (state.dirty) {
                 window.onbeforeunload = function() {
                     return RED._("deploy.confirm.undeployedChanges");
@@ -334,8 +334,7 @@ RED.deploy = (function() {
                 var invalidNodes = [];
 
                 RED.nodes.eachNode(function(node) {
-                    hasInvalid = hasInvalid || !node.valid;
+                    if (!node.valid && !node.d) {
-                    if (!node.valid) {
                         invalidNodes.push(getNodeInfo(node));
                     }
                     if (node.type === "unknown") {
@@ -345,6 +344,7 @@ RED.deploy = (function() {
                     }
                 });
                 hasUnknown = unknownNodes.length > 0;
+                hasInvalid = invalidNodes.length > 0;
 
                 var unusedConfigNodes = [];
                 RED.nodes.eachConfig(function(node) {

packages/node_modules/@node-red/editor-client/src/js/ui/editor.js

@@ -490,8 +490,7 @@ RED.editor = (function() {
                 done();
             }
         }
-
+        if (definition.credentials || /^subflow:/.test(definition.type)) {
-        if (definition.credentials) {
             if (node.credentials) {
                 populateCredentialsInputs(node, definition.credentials, node.credentials, prefix);
                 completePrepare();
@@ -499,7 +498,9 @@ RED.editor = (function() {
                 $.getJSON(getCredentialsURL(node.type, node.id), function (data) {
                     node.credentials = data;
                     node.credentials._ = $.extend(true,{},data);
-                    populateCredentialsInputs(node, definition.credentials, node.credentials, prefix);
+                    if (!/^subflow:/.test(definition.type)) {
+                        populateCredentialsInputs(node, definition.credentials, node.credentials, prefix);
+                    }
                     completePrepare();
                 });
             }
@@ -513,7 +514,9 @@ RED.editor = (function() {
         for (var i=editStack.length-1;i<editStack.length;i++) {
             var node = editStack[i];
             label = node.type;
-            if (node.type === '_expression') {
+            if (node.type === 'group') {
+                label = RED._("group.editGroup",{name:RED.utils.sanitize(node.name||node.id)});
+            } else if (node.type === '_expression') {
                 label = RED._("expressionEditor.title");
             } else if (node.type === '_js') {
                 label = RED._("jsEditor.title");
@@ -576,17 +579,22 @@ RED.editor = (function() {
             $(this).attr("data-i18n",keys.join(";"));
         });
 
-        if (type === "subflow-template" || type === "subflow") {
+        if (type === "subflow-template") {
-            RED.subflow.buildEditForm(dialogForm,type,node);
+            // This is the 'edit properties' dialog for a subflow template
+            // TODO: this needs to happen later in the dialog open sequence
+            //       so that credentials can be loaded prior to building the form
+            RED.subflow.buildEditForm(type,node);
         }
 
         // Add dummy fields to prevent 'Enter' submitting the form in some
         // cases, and also prevent browser auto-fill of password
-        // Add in reverse order as they are prepended...
+        //  - the elements cannot be hidden otherwise Chrome will ignore them.
-        $('<input type="password" style="display: none;" />').prependTo(dialogForm);
+        //  - the elements need to have id's that imply password/username
-        $('<input type="text" style="display: none;" />').prependTo(dialogForm);
+        $('<span style="position: absolute; top: -2000px;"><input id="red-ui-trap-password" type="password"/></span>').prependTo(dialogForm);
+        $('<span style="position: absolute; top: -2000px;"><input id="red-ui-trap-username"  type="text"/></span>').prependTo(dialogForm);
+        $('<span style="position: absolute; top: -2000px;"><input id="red-ui-trap-user"  type="text"/></span>').prependTo(dialogForm);
         dialogForm.on("submit", function(e) { e.preventDefault();});
-        dialogForm.find('input').attr("autocomplete","disable");
+        dialogForm.find('input').attr("autocomplete","off");
         return dialogForm;
     }
 
@@ -783,6 +791,11 @@ RED.editor = (function() {
                             nodeDiv.css({
                                 'backgroundColor': backgroundColor
                             });
+                            var borderColor = RED.utils.getDarkerColor(backgroundColor);
+                            if (borderColor !== backgroundColor) {
+                                nodeDiv.css('border-color',borderColor)
+                            }
+
                         }
                         var iconContainer = $('<div/>',{class:"red-ui-palette-icon-container"}).appendTo(nodeDiv);
                         RED.utils.createIconElement(icon_url, iconContainer, true);
@@ -818,99 +831,6 @@ RED.editor = (function() {
         searchInput.trigger("focus");
     }
 
-    function createColorPicker(colorRow, color) {
-
-        var colorButton = $('<button type="button" class="red-ui-button red-ui-editor-node-appearance-button">').appendTo(colorRow);
-        $('<i class="fa fa-caret-down"></i>').appendTo(colorButton);
-
-        var colorDisp = $('<div>',{class:"red-ui-search-result-node"}).appendTo(colorButton);
-
-        var selector = $("<input/>", {
-            id: "red-ui-editor-node-color",
-            type: "text",
-            value: color
-        }).css({
-            marginLeft: "10px",
-            width: "150px",
-        }).appendTo(colorRow);
-
-        selector.on("change", function (e) {
-            var color = selector.val();
-            $(".red-ui-editor-node-appearance-button .red-ui-search-result-node").css({
-                "background-color": color
-            });
-        });
-        selector.trigger("change");
-        colorButton.on("click", function (e) {
-            var recommendedColors = [
-                "#DDAA99",
-                "#3FADB5", "#87A980", "#A6BBCF",
-                "#AAAA66", "#C0C0C0", "#C0DEED",
-                "#C7E9C0", "#D7D7A0", "#D8BFD8",
-                "#DAC4B4", "#DEB887", "#DEBD5C",
-                "#E2D96E", "#E6E0F8", "#E7E7AE",
-                "#E9967A", "#F3B567", "#FDD0A2",
-                "#FDF0C2", "#FFAAAA", "#FFCC66",
-                "#FFF0F0", "#FFFFFF"
-            ].map(function(c) {
-                var r = parseInt(c.substring(1, 3), 16) / 255;
-                var g = parseInt(c.substring(3, 5), 16) / 255;
-                var b = parseInt(c.substring(5, 7), 16) / 255;
-                return {
-                    hex: c,
-                    r: r,
-                    g: g,
-                    b: b,
-                    l: 0.3 * r + 0.59 * g + 0.11 * b
-                }
-            });
-            // Sort by luminosity.
-            recommendedColors.sort(function (a, b) {
-                return a.l - b.l;
-            });
-
-            var numColors = recommendedColors.length;
-            var width = 30;
-            var height = 30;
-            var margin = 2;
-            var perRow = 6;
-            var picker = $("<div/>", {
-                class: "red-ui-color-picker"
-            }).css({
-                width: ((width+margin+margin)*perRow)+"px",
-                height: Math.ceil(numColors/perRow)*(height+margin+margin)+"+px"
-            });
-            var count = 0;
-            var row = null;
-            recommendedColors.forEach(function (col) {
-                if ((count % perRow) == 0) {
-                    row = $("<div/>").appendTo(picker);
-                }
-                var button = $("<button/>", {
-                }).css({
-                    width: width+"px",
-                    height: height+"px",
-                    margin: margin+"px",
-                    backgroundColor: col.hex,
-                    "border-style": "solid",
-                    "border-width": "1px",
-                    "border-color": col.luma<0.92?col.hex:'#ccc'
-                }).appendTo(row);
-                button.on("click",  function (e) {
-                    e.preventDefault();
-                    colorPanel.hide();
-                    selector.val(col.hex);
-                    selector.trigger("change");
-                });
-                count++;
-            });
-            var colorPanel = RED.popover.panel(picker);
-            colorPanel.show({
-                target: colorButton
-            })
-        });
-    }
-
     function buildAppearanceForm(container,node) {
         var dialogForm = $('<form class="dialog-form form-horizontal" autocomplete="off"></form>').appendTo(container);
 
@@ -996,7 +916,35 @@ RED.editor = (function() {
                 class: "form-row"
             }).appendTo(dialogForm);
             $("<label/>").text(RED._("editor.color")).appendTo(colorRow);
-            createColorPicker(colorRow, color);
+
+            var recommendedColors = [
+                "#DDAA99",
+                "#3FADB5", "#87A980", "#A6BBCF",
+                "#AAAA66", "#C0C0C0", "#C0DEED",
+                "#C7E9C0", "#D7D7A0", "#D8BFD8",
+                "#DAC4B4", "#DEB887", "#DEBD5C",
+                "#E2D96E", "#E6E0F8", "#E7E7AE",
+                "#E9967A", "#F3B567", "#FDD0A2",
+                "#FDF0C2", "#FFAAAA", "#FFCC66",
+                "#FFF0F0", "#FFFFFF"
+            ]
+
+            RED.colorPicker.create({
+                id: "red-ui-editor-node-color",
+                value: color,
+                palette: recommendedColors,
+                sortPalette: function (a, b) {return a.l - b.l;}
+            }).appendTo(colorRow);
+
+            $("#red-ui-editor-node-color").on('change', function(ev) {
+                // Horribly out of scope...
+                var colour = $(this).val();
+                nodeDiv.css('backgroundColor',colour);
+                var borderColor = RED.utils.getDarkerColor(colour);
+                if (borderColor !== colour) {
+                    nodeDiv.css('border-color',borderColor)
+                }
+            })
         }
 
 
@@ -1011,6 +959,11 @@ RED.editor = (function() {
             var colour = RED.utils.getNodeColor(node.type, node._def);
             var icon_url = RED.utils.getNodeIcon(node._def,node);
             nodeDiv.css('backgroundColor',colour);
+            var borderColor = RED.utils.getDarkerColor(colour);
+            if (borderColor !== colour) {
+                nodeDiv.css('border-color',borderColor)
+            }
+
             var iconContainer = $('<div/>',{class:"red-ui-palette-icon-container"}).appendTo(nodeDiv);
             RED.utils.createIconElement(icon_url, iconContainer, true);
 
@@ -1131,15 +1084,17 @@ RED.editor = (function() {
         if (node.info) {
             nodeInfoEditor.getSession().setValue(node.info, -1);
         }
+        node.infoEditor = nodeInfoEditor;
         return nodeInfoEditor;
     }
 
-    function showEditDialog(node) {
+    function showEditDialog(node, defaultTab) {
         var editing_node = node;
         var isDefaultIcon;
         var defaultIcon;
         var nodeInfoEditor;
         var finishedBuilding = false;
+        var skipInfoRefreshOnClose = false;
 
         editStack.push(node);
         RED.view.state(RED.state.EDITING);
@@ -1470,6 +1425,19 @@ RED.editor = (function() {
                         if (type === "subflow") {
                             var old_env = editing_node.env;
                             var new_env = RED.subflow.exportSubflowInstanceEnv(editing_node);
+                            if (new_env && new_env.length > 0) {
+                                new_env.forEach(function(prop) {
+                                    if (prop.type === "cred") {
+                                        editing_node.credentials = editing_node.credentials || {_:{}};
+                                        editing_node.credentials[prop.name] = prop.value;
+                                        editing_node.credentials['has_'+prop.name] = (prop.value !== "");
+                                        if (prop.value !== '__PWRD__') {
+                                            changed = true;
+                                        }
+                                        delete prop.value;
+                                    }
+                                });
+                            }
                             if (!isSameObj(old_env, new_env)) {
                                 editing_node.env = new_env;
                                 changes.env = editing_node.env;
@@ -1519,6 +1487,7 @@ RED.editor = (function() {
                         editing_node.dirty = true;
                         validateNode(editing_node);
                         RED.events.emit("editor:save",editing_node);
+                        RED.events.emit("nodes:change",editing_node);
                         RED.tray.close();
                     }
                 }
@@ -1566,9 +1535,6 @@ RED.editor = (function() {
                     collapsible: true,
                     menu: false
                 });
-                if (editing_node) {
-                    RED.sidebar.info.refresh(editing_node);
-                }
                 var ns;
                 if (node._def.set.module === "node-red") {
                     ns = "node-red";
@@ -1598,12 +1564,13 @@ RED.editor = (function() {
                         id: "editor-subflow-envProperties",
                         label: RED._("editor-tab.envProperties"),
                         name: RED._("editor-tab.envProperties"),
-                        content: $('<div>', {class:"red-ui-tray-content"}).appendTo(editorContent).hide(),
+                        content: $('<div>', {id:"editor-subflow-envProperties-content",class:"red-ui-tray-content"}).appendTo(editorContent).hide(),
                         iconClass: "fa fa-list"
                     };
-
-                    RED.subflow.buildPropertiesForm(subflowPropertiesTab.content,node);
                     editorTabs.addTab(subflowPropertiesTab);
+                    // This tab is populated by the oneditprepare function of this
+                    // subflow. That ensures it is done *after* any credentials
+                    // have been loaded for the instance.
                 }
 
                 if (!node._def.defaults || !node._def.defaults.hasOwnProperty('info'))  {
@@ -1637,6 +1604,9 @@ RED.editor = (function() {
                 prepareEditDialog(node,node._def,"node-input", function() {
                     trayBody.i18n();
                     finishedBuilding = true;
+                    if (defaultTab) {
+                        editorTabs.activateTab(defaultTab);
+                    }
                     done();
                 });
             },
@@ -1644,7 +1614,7 @@ RED.editor = (function() {
                 if (RED.view.state() != RED.state.IMPORT_DRAGGING) {
                     RED.view.state(RED.state.DEFAULT);
                 }
-                if (editing_node) {
+                if (editing_node && !skipInfoRefreshOnClose) {
                     RED.sidebar.info.refresh(editing_node);
                 }
                 RED.workspaces.refresh();
@@ -1672,6 +1642,7 @@ RED.editor = (function() {
                 text: RED._("subflow.edit"),
                 click: function() {
                     RED.workspaces.show(id);
+                    skipInfoRefreshOnClose = true;
                     $("#node-dialog-ok").trigger("click");
                 }
             });
@@ -2038,6 +2009,7 @@ RED.editor = (function() {
                     RED.view.redraw(true);
                     if (!configAdding) {
                         RED.events.emit("editor:save",editing_config_node);
+                        RED.events.emit("nodes:change",editing_config_node);
                     }
                     RED.tray.close(function() {
                         updateConfigNodeSelect(configProperty,configType,editing_config_node.id,prefix);
@@ -2251,12 +2223,26 @@ RED.editor = (function() {
 
                         var old_env = editing_node.env;
                         var new_env = RED.subflow.exportSubflowTemplateEnv($("#node-input-env-container").editableList("items"));
+
+                        if (new_env && new_env.length > 0) {
+                            new_env.forEach(function(prop) {
+                                if (prop.type === "cred") {
+                                    editing_node.credentials = editing_node.credentials || {_:{}};
+                                    editing_node.credentials[prop.name] = prop.value;
+                                    editing_node.credentials['has_'+prop.name] = (prop.value !== "");
+                                    if (prop.value !== '__PWRD__') {
+                                        changed = true;
+                                    }
+                                    delete prop.value;
+                                }
+                            });
+                        }
+
                         if (!isSameObj(old_env, new_env)) {
                             editing_node.env = new_env;
                             changes.env = editing_node.env;
                             changed = true;
                         }
-                        RED.palette.refresh();
 
                         if (changed) {
                             var wasChanged = editing_node.changed;
@@ -2276,6 +2262,7 @@ RED.editor = (function() {
                                     validateNode(n);
                                 }
                             });
+                            RED.events.emit("subflows:change",editing_node);
                             RED.nodes.dirty(true);
                             var historyEvent = {
                                 t:'edit',
@@ -2310,7 +2297,7 @@ RED.editor = (function() {
                     $("#node-input-env-container").editableList('height',height-95);
                 }
             },
-            open: function(tray) {
+            open: function(tray, done) {
                 var trayFooter = tray.find(".red-ui-tray-footer");
                 var trayFooterLeft = $("<div/>", {
                     class: "red-ui-tray-footer-left"
@@ -2361,7 +2348,6 @@ RED.editor = (function() {
                     content: $('<div>', {class:"red-ui-tray-content"}).appendTo(editorContent).hide(),
                     iconClass: "fa fa-cog"
                 };
-                buildEditForm(nodePropertiesTab.content,"dialog-form","subflow-template", undefined, editing_node);
                 editorTabs.addTab(nodePropertiesTab);
 
                 var descriptionTab = {
@@ -2390,11 +2376,19 @@ RED.editor = (function() {
                 buildAppearanceForm(appearanceTab.content,editing_node);
                 editorTabs.addTab(appearanceTab);
 
-                $("#subflow-input-name").val(subflow.name);
+                buildEditForm(nodePropertiesTab.content,"dialog-form","subflow-template", undefined, editing_node);
-                RED.text.bidi.prepareInput($("#subflow-input-name"));
-
                 trayBody.i18n();
-                finishedBuilding = true;
+
+                $.getJSON(getCredentialsURL("subflow", subflow.id), function (data) {
+                    subflow.credentials = data;
+                    subflow.credentials._ = $.extend(true,{},data);
+
+                    $("#subflow-input-name").val(subflow.name);
+                    RED.text.bidi.prepareInput($("#subflow-input-name"));
+
+                    finishedBuilding = true;
+                    done();
+                });
             },
             close: function() {
                 if (RED.view.state() != RED.state.IMPORT_DRAGGING) {
@@ -2413,6 +2407,251 @@ RED.editor = (function() {
         RED.tray.show(trayOptions);
     }
 
+    function showEditGroupDialog(group) {
+        var editing_node = group;
+        editStack.push(group);
+        RED.view.state(RED.state.EDITING);
+        var nodeInfoEditor;
+        var finishedBuilding = false;
+        var trayOptions = {
+            title: getEditStackTitle(),
+            buttons: [
+                {
+                    id: "node-dialog-cancel",
+                    text: RED._("common.label.cancel"),
+                    click: function() {
+                        RED.tray.close();
+                    }
+                },
+                {
+                    id: "node-dialog-ok",
+                    class: "primary",
+                    text: RED._("common.label.done"),
+                    click: function() {
+                        var changes = {};
+                        var changed = false;
+                        var wasDirty = RED.nodes.dirty();
+                        var d;
+                        var outputMap;
+
+                        if (editing_node._def.oneditsave) {
+                            var oldValues = {};
+                            for (d in editing_node._def.defaults) {
+                                if (editing_node._def.defaults.hasOwnProperty(d)) {
+                                    if (typeof editing_node[d] === "string" || typeof editing_node[d] === "number") {
+                                        oldValues[d] = editing_node[d];
+                                    } else {
+                                        oldValues[d] = $.extend(true,{},{v:editing_node[d]}).v;
+                                    }
+                                }
+                            }
+                            try {
+                                var rc = editing_node._def.oneditsave.call(editing_node);
+                                if (rc === true) {
+                                    changed = true;
+                                }
+                            } catch(err) {
+                                console.log("oneditsave",editing_node.id,editing_node.type,err.toString());
+                            }
+
+                            for (d in editing_node._def.defaults) {
+                                if (editing_node._def.defaults.hasOwnProperty(d)) {
+                                    if (oldValues[d] === null || typeof oldValues[d] === "string" || typeof oldValues[d] === "number") {
+                                        if (oldValues[d] !== editing_node[d]) {
+                                            changes[d] = oldValues[d];
+                                            changed = true;
+                                        }
+                                    } else {
+                                        if (JSON.stringify(oldValues[d]) !== JSON.stringify(editing_node[d])) {
+                                            changes[d] = oldValues[d];
+                                            changed = true;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        var newValue;
+                        if (editing_node._def.defaults) {
+                            for (d in editing_node._def.defaults) {
+                                if (editing_node._def.defaults.hasOwnProperty(d)) {
+                                    var input = $("#node-input-"+d);
+                                    if (input.attr('type') === "checkbox") {
+                                        newValue = input.prop('checked');
+                                    } else if (input.prop("nodeName") === "select" && input.attr("multiple") === "multiple") {
+                                        // An empty select-multiple box returns null.
+                                        // Need to treat that as an empty array.
+                                        newValue = input.val();
+                                        if (newValue == null) {
+                                            newValue = [];
+                                        }
+                                    } else if ("format" in editing_node._def.defaults[d] && editing_node._def.defaults[d].format !== "" && input[0].nodeName === "DIV") {
+                                        newValue = input.text();
+                                    } else {
+                                        newValue = input.val();
+                                    }
+                                    if (newValue != null) {
+                                        if (editing_node._def.defaults[d].type) {
+                                            if (newValue == "_ADD_") {
+                                                newValue = "";
+                                            }
+                                        }
+                                        if (editing_node[d] != newValue) {
+                                            if (editing_node._def.defaults[d].type) {
+                                                // Change to a related config node
+                                                var configNode = RED.nodes.node(editing_node[d]);
+                                                if (configNode) {
+                                                    var users = configNode.users;
+                                                    users.splice(users.indexOf(editing_node),1);
+                                                }
+                                                configNode = RED.nodes.node(newValue);
+                                                if (configNode) {
+                                                    configNode.users.push(editing_node);
+                                                }
+                                            }
+                                            changes[d] = editing_node[d];
+                                            editing_node[d] = newValue;
+                                            changed = true;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        var oldInfo = editing_node.info;
+                        if (nodeInfoEditor) {
+                            var newInfo = nodeInfoEditor.getValue();
+                            if (!!oldInfo) {
+                                // Has existing info property
+                                if (newInfo.trim() === "") {
+                                    // New value is blank - remove the property
+                                    changed = true;
+                                    changes.info = oldInfo;
+                                    delete editing_node.info;
+                                } else if (newInfo !== oldInfo) {
+                                    // New value is different
+                                    changed = true;
+                                    changes.info = oldInfo;
+                                    editing_node.info = newInfo;
+                                }
+                            } else {
+                                // No existing info
+                                if (newInfo.trim() !== "") {
+                                    // New value is not blank
+                                    changed = true;
+                                    changes.info = undefined;
+                                    editing_node.info = newInfo;
+                                }
+                            }
+                        }
+                        if (changed) {
+                            var wasChanged = editing_node.changed;
+                            editing_node.changed = true;
+                            RED.nodes.dirty(true);
+                            var historyEvent = {
+                                t:'edit',
+                                node:editing_node,
+                                changes:changes,
+                                dirty:wasDirty,
+                                changed:wasChanged
+                            };
+                            RED.history.push(historyEvent);
+                            RED.events.emit("groups:change",editing_node);
+                        }
+                        editing_node.dirty = true;
+                        RED.tray.close();
+                        RED.view.redraw(true);
+                    }
+                }
+            ],
+            resize: function(size) {
+                editTrayWidthCache['group'] = size.width;
+                $(".red-ui-tray-content").height(size.height - 50);
+                // var form = $(".red-ui-tray-content form").height(dimensions.height - 50 - 40);
+                // if (editing_node && editing_node._def.oneditresize) {
+                //     try {
+                //         editing_node._def.oneditresize.call(editing_node,{width:form.width(),height:form.height()});
+                //     } catch(err) {
+                //         console.log("oneditresize",editing_node.id,editing_node.type,err.toString());
+                //     }
+                // }
+            },
+            open: function(tray, done) {
+                var trayFooter = tray.find(".red-ui-tray-footer");
+                var trayFooterLeft = $("<div/>", {
+                    class: "red-ui-tray-footer-left"
+                }).appendTo(trayFooter)
+                var trayBody = tray.find('.red-ui-tray-body');
+                trayBody.parent().css('overflow','hidden');
+
+                var editorTabEl = $('<ul></ul>').appendTo(trayBody);
+                var editorContent = $('<div></div>').appendTo(trayBody);
+
+                var editorTabs = RED.tabs.create({
+                    element:editorTabEl,
+                    onchange:function(tab) {
+                        editorContent.children().hide();
+                        if (tab.onchange) {
+                            tab.onchange.call(tab);
+                        }
+                        tab.content.show();
+                        if (finishedBuilding) {
+                            RED.tray.resize();
+                        }
+                    },
+                    collapsible: true,
+                    menu: false
+                });
+
+                var nodePropertiesTab = {
+                    id: "editor-tab-properties",
+                    label: RED._("editor-tab.properties"),
+                    name: RED._("editor-tab.properties"),
+                    content: $('<div>', {class:"red-ui-tray-content"}).appendTo(editorContent).hide(),
+                    iconClass: "fa fa-cog"
+                };
+                buildEditForm(nodePropertiesTab.content,"dialog-form","group","node-red",group);
+
+                editorTabs.addTab(nodePropertiesTab);
+
+                var descriptionTab = {
+                    id: "editor-tab-description",
+                    label: RED._("editor-tab.description"),
+                    name: RED._("editor-tab.description"),
+                    content: $('<div>', {class:"red-ui-tray-content"}).appendTo(editorContent).hide(),
+                    iconClass: "fa fa-file-text-o",
+                    onchange: function() {
+                        nodeInfoEditor.focus();
+                    }
+                };
+                editorTabs.addTab(descriptionTab);
+                nodeInfoEditor = buildDescriptionForm(descriptionTab.content,editing_node);
+                prepareEditDialog(group,group._def,"node-input", function() {
+                    trayBody.i18n();
+                    finishedBuilding = true;
+                    done();
+                });
+            },
+            close: function() {
+                if (RED.view.state() != RED.state.IMPORT_DRAGGING) {
+                    RED.view.state(RED.state.DEFAULT);
+                }
+                RED.sidebar.info.refresh(editing_node);
+                nodeInfoEditor.destroy();
+                nodeInfoEditor = null;
+                editStack.pop();
+                editing_node = null;
+            },
+            show: function() {
+            }
+        }
+
+        if (editTrayWidthCache.hasOwnProperty('group')) {
+            trayOptions.width = editTrayWidthCache['group'];
+        }
+        RED.tray.show(trayOptions);
+    }
+
     function showTypeEditor(type, options) {
         if (customEditTypes.hasOwnProperty(type)) {
             if (editStack.length > 0) {
@@ -2536,6 +2775,7 @@ RED.editor = (function() {
         edit: showEditDialog,
         editConfig: showEditConfigNodeDialog,
         editSubflow: showEditSubflowDialog,
+        editGroup: showEditGroupDialog,
         editJavaScript: function(options) { showTypeEditor("_js",options) },
         editExpression: function(options) { showTypeEditor("_expression", options) },
         editJSON: function(options) { showTypeEditor("_json", options) },

packages/node_modules/@node-red/editor-client/src/js/ui/editors/buffer.js

@@ -15,7 +15,7 @@
  **/
 (function() {
 
-    var template = '<script type="text/x-red" data-template-name="_buffer"><div id="red-ui-editor-type-buffer-panels"><div id="red-ui-editor-type-buffer-panel-str" class="red-ui-panel"><div class="form-row" style="margin-bottom: 3px; text-align: right;"><button class="red-ui-editor-type-buffer-type red-ui-button red-ui-button-small"><i class="fa fa-exclamation-circle"></i> <span id="red-ui-editor-type-buffer-type-string" data-i18n="bufferEditor.modeString"></span><span id="red-ui-editor-type-buffer-type-array" data-i18n="bufferEditor.modeArray"></span></button></div><div class="form-row node-text-editor-row"><div class="node-text-editor" id="red-ui-editor-type-buffer-str"></div></div></div><div id="red-ui-editor-type-buffer-panel-bin" class="red-ui-panel"><div class="form-row node-text-editor-row" style="margin-top: 10px"><div class="node-text-editor" id="red-ui-editor-type-buffer-bin"></div></div></div></div></script>';
+    var template = '<script type="text/x-red" data-template-name="_buffer"><div id="red-ui-editor-type-buffer-panels"><div id="red-ui-editor-type-buffer-panel-str" class="red-ui-panel"><div class="form-row" style="margin-bottom: 3px; text-align: right;"><button class="red-ui-editor-type-buffer-type red-ui-button red-ui-button-small"><i class="fa fa-exclamation-circle"></i> <span id="red-ui-editor-type-buffer-type-string" data-i18n="bufferEditor.modeString"></span><span id="red-ui-editor-type-buffer-type-array" data-i18n="bufferEditor.modeArray"></span></button></div><div class="form-row node-text-editor-row"><div class="node-text-editor" id="red-ui-editor-type-buffer-str"></div></div></div><div id="red-ui-editor-type-buffer-panel-bin" class="red-ui-panel"><div class="form-row node-text-editor-row" style="margin-top: 10px; margin-bottom:0;"><div class="node-text-editor" id="red-ui-editor-type-buffer-bin"></div></div></div></div></script>';
 
     function stringToUTF8Array(str) {
         var data = [];
@@ -187,8 +187,7 @@
 
                     $(".red-ui-editor-type-buffer-type").on("click", function(e) {
                         e.preventDefault();
-                        RED.sidebar.info.set(RED._("bufferEditor.modeDesc"));
+                        RED.sidebar.help.set(RED._("bufferEditor.modeDesc"));
-                        RED.sidebar.info.show();
                     })
 
 

packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js

@@ -102,7 +102,7 @@
                         var f = $(this).val();
                         var args = RED._('jsonata:'+f+".args",{defaultValue:''});
                         var title = "<h5>"+f+"("+args+")</h5>";
-                        var body = marked(RED._('jsonata:'+f+'.desc',{defaultValue:''}));
+                        var body = RED.utils.renderMarkdown(RED._('jsonata:'+f+'.desc',{defaultValue:''}));
                         $("#red-ui-editor-type-expression-help").html(title+"<p>"+body+"</p>");
 
                     })
@@ -237,8 +237,7 @@
                     var changeTimer;
                     $(".red-ui-editor-type-expression-legacy").on("click", function(e) {
                         e.preventDefault();
-                        RED.sidebar.info.set(RED._("expressionEditor.compatModeDesc"));
+                        RED.sidebar.help.set(RED._("expressionEditor.compatModeDesc"));
-                        RED.sidebar.info.show();
                     })
                     var testExpression = function() {
                         var value = testDataEditor.getValue();
@@ -318,9 +317,9 @@
                             var p2 = $("#red-ui-editor-type-expression-panel-info > .form-row > div:first-child");
                             p2Height -= p2.outerHeight(true) + 20;
                             $(".red-ui-editor-type-expression-tab-content").height(p2Height);
-                            $("#red-ui-editor-type-expression-test-data").css("height",(p2Height-5)+"px");
+                            $("#red-ui-editor-type-expression-test-data").css("height",(p2Height-25)+"px");
                             testDataEditor.resize();
-                            $("#red-ui-editor-type-expression-test-result").css("height",(p2Height-5)+"px");
+                            $("#red-ui-editor-type-expression-test-result").css("height",(p2Height-25)+"px");
                             testResultEditor.resize();
                         }
                     });

packages/node_modules/@node-red/editor-client/src/js/ui/editors/js.js

@@ -87,6 +87,9 @@
                         expressionEditor.gotoLine(options.cursor.row+1,options.cursor.column,false);
                     }
                     dialogForm.i18n();
+                    setTimeout(function() {
+                        expressionEditor.focus();
+                    },300);
                 },
                 close: function() {
                     expressionEditor.destroy();

packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js

@@ -106,7 +106,7 @@
             options.push({id:"red-ui-editor-type-json-menu-duplicate", icon:"fa fa-copy", label:RED._("jsonEditor.duplicate"),onselect:function(){
                 var newKey = item.key;
                 if (item.parent.type === 'array') {
-                    newKey = parent.children.length;
+                    newKey = item.parent.children.length;
                 } else {
                     var m = /^(.*?)(-(\d+))?$/.exec(newKey);
                     var usedKeys = {};

packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js

@@ -107,7 +107,7 @@
                         clearTimeout(changeTimer);
                         changeTimer = setTimeout(function() {
                             var currentScrollTop = $(".red-ui-editor-type-markdown-panel-preview").scrollTop();
-                            $(".red-ui-editor-type-markdown-panel-preview").html(marked(expressionEditor.getValue()));
+                            $(".red-ui-editor-type-markdown-panel-preview").html(RED.utils.renderMarkdown(expressionEditor.getValue()));
                             $(".red-ui-editor-type-markdown-panel-preview").scrollTop(currentScrollTop);
                         },200);
                     })
@@ -116,7 +116,7 @@
                     }
 
                     if (value) {
-                        $(".red-ui-editor-type-markdown-panel-preview").html(marked(expressionEditor.getValue()));
+                        $(".red-ui-editor-type-markdown-panel-preview").html(RED.utils.renderMarkdown(expressionEditor.getValue()));
                     }
                     panels = RED.panels.create({
                         id:"red-ui-editor-type-markdown-panels",

packages/node_modules/@node-red/editor-client/src/js/ui/group.js

@@ -0,0 +1,653 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+RED.group = (function() {
+
+    var _groupEditTemplate = '<script type="text/x-red" data-template-name="group">'+
+        '<div class="form-row">'+
+            '<label for="node-input-name" data-i18n="[append]editor:common.label.name"><i class="fa fa-tag"></i> </label>'+
+            '<input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">'+
+        '</div>'+
+
+        // '<div class="node-input-group-style-tools"><span class="button-group"><button class="red-ui-button red-ui-button-small">Use default style</button><button class="red-ui-button red-ui-button-small">Set as default style</button></span></div>'+
+
+        '<div class="form-row" id="node-input-row-style-stroke">'+
+            '<label data-i18n="editor:common.label.style"></label>'+
+            '<label style="width: 70px;margin-right:10px" for="node-input-style-stroke" data-i18n="editor:common.label.line"></label>'+
+        '</div>'+
+        '<div class="form-row" style="padding-left: 100px;" id="node-input-row-style-fill">'+
+            '<label style="width: 70px;margin-right: 10px "  for="node-input-style-fill" data-i18n="editor:common.label.fill"></label>'+
+        '</div>'+
+        '<div class="form-row">'+
+            '<label for="node-input-style-label" data-i18n="editor:common.label.label"></label>'+
+            '<input type="checkbox" id="node-input-style-label"/>'+
+        '</div>'+
+        '<div class="form-row" id="node-input-row-style-label-options">'+
+            '<div style="margin-left: 100px; display: inline-block">'+
+                '<div class="form-row">'+
+                    '<span style="display: inline-block; min-width: 140px"  id="node-input-row-style-label-color">'+
+                        '<label style="width: 70px;margin-right: 10px" for="node-input-style-fill" data-i18n="editor:common.label.color"></label>'+
+                    '</span>'+
+                '</div>'+
+                '<div class="form-row">'+
+                    '<span style="display: inline-block; min-width: 140px;" id="node-input-row-style-label-position">'+
+                        '<label style="width: 70px;margin-right: 10px " for="node-input-style-label-position" data-i18n="editor:common.label.position"></label>'+
+                    '</span>'+
+                '</div>'+
+            '</div>'+
+        '</div>'+
+
+        '</script>';
+
+    var colorPalette = [
+        "#ff0000",
+        "#ffC000",
+        "#ffff00",
+        "#92d04f",
+        "#0070c0",
+        "#001f60",
+        "#6f2fa0",
+        "#000000",
+        "#777777"
+    ]
+    var colorSteps = 3;
+    var colorCount = colorPalette.length;
+    for (var i=0,len=colorPalette.length*colorSteps;i<len;i++) {
+        var ci = i%colorCount;
+        var j = Math.floor(i/colorCount)+1;
+        var c = colorPalette[ci];
+        var r = parseInt(c.substring(1, 3), 16);
+        var g = parseInt(c.substring(3, 5), 16);
+        var b = parseInt(c.substring(5, 7), 16);
+        var dr = (255-r)/(colorSteps+((ci===colorCount-1) ?0:1));
+        var dg = (255-g)/(colorSteps+((ci===colorCount-1) ?0:1));
+        var db = (255-b)/(colorSteps+((ci===colorCount-1) ?0:1));
+        r = Math.min(255,Math.floor(r+j*dr));
+        g = Math.min(255,Math.floor(g+j*dg));
+        b = Math.min(255,Math.floor(b+j*db));
+        var s = ((r<<16) + (g<<8) + b).toString(16);
+        colorPalette.push('#'+'000000'.slice(0, 6-s.length)+s);
+    }
+
+    var defaultGroupStyle = {};
+
+    var groupDef = {
+        defaults:{
+            name:{value:""},
+            style:{value:{}},
+            nodes:{value:[]}
+        },
+        category: "config",
+        oneditprepare: function() {
+            var style = this.style || {};
+            RED.colorPicker.create({
+                id:"node-input-style-stroke",
+                value: style.stroke || "#a4a4a4",
+                palette: colorPalette,
+                cellPerRow: colorCount,
+                cellWidth: 16,
+                cellHeight: 16,
+                cellMargin: 3,
+                none: true,
+                opacity: style['stroke-opacity'] || 1.0
+            }).appendTo("#node-input-row-style-stroke");
+            RED.colorPicker.create({
+                id:"node-input-style-fill",
+                value: style.fill || "none",
+                palette: colorPalette,
+                cellPerRow: colorCount,
+                cellWidth: 16,
+                cellHeight: 16,
+                cellMargin: 3,
+                none: true,
+                opacity: style['fill-opacity'] || 1.0
+            }).appendTo("#node-input-row-style-fill");
+
+            createLayoutPicker({
+                id:"node-input-style-label-position",
+                value:style["label-position"] || "nw"
+            }).appendTo("#node-input-row-style-label-position");
+
+            RED.colorPicker.create({
+                id:"node-input-style-color",
+                value: style.color || "#a4a4a4",
+                palette: colorPalette,
+                cellPerRow: colorCount,
+                cellWidth: 16,
+                cellHeight: 16,
+                cellMargin: 3
+            }).appendTo("#node-input-row-style-label-color");
+
+            $("#node-input-style-label").toggleButton({
+                enabledLabel: RED._("editor.show"),
+                disabledLabel: RED._("editor.hide")
+            })
+
+
+            $("#node-input-style-label").on("change", function(evt) {
+                $("#node-input-row-style-label-options").toggle($(this).prop("checked"));
+            })
+            $("#node-input-style-label").prop("checked", this.style.label)
+            $("#node-input-style-label").trigger("change");
+
+        },
+        oneditresize: function(size) {
+        },
+        oneditsave: function() {
+            this.style.stroke = $("#node-input-style-stroke").val();
+            this.style.fill = $("#node-input-style-fill").val();
+            this.style["stroke-opacity"] = $("#node-input-style-stroke-opacity").val();
+            this.style["fill-opacity"] = $("#node-input-style-fill-opacity").val();
+            this.style.label = $("#node-input-style-label").prop("checked");
+            if (this.style.label) {
+                this.style["label-position"] = $("#node-input-style-label-position").val();
+                this.style.color = $("#node-input-style-color").val();
+            } else {
+                delete this.style["label-position"];
+                delete this.style.color;
+            }
+
+            if (this.style["stroke-opacity"] === "1") {
+                delete this.style["stroke-opacity"]
+            }
+            if (this.style["fill-opacity"] === "1") {
+                delete this.style["fill-opacity"]
+            }
+            this.resize = true;
+        },
+        set:{
+            module: "node-red"
+        }
+    }
+
+    function init() {
+
+        RED.events.on("view:selection-changed",function(selection) {
+            RED.menu.setDisabled("menu-item-group-group",!!!selection.nodes);
+            RED.menu.setDisabled("menu-item-group-ungroup",!!!selection.nodes || selection.nodes.filter(function(n) { return n.type==='group'}).length === 0);
+            RED.menu.setDisabled("menu-item-group-merge",!!!selection.nodes);
+            RED.menu.setDisabled("menu-item-group-remove",!!!selection.nodes || selection.nodes.filter(function(n) { return !!n.g }).length === 0);
+        });
+
+        RED.actions.add("core:group-selection", function() { groupSelection() })
+        RED.actions.add("core:ungroup-selection", function() { ungroupSelection() })
+        RED.actions.add("core:merge-selection-to-group", function() { mergeSelection() })
+        RED.actions.add("core:remove-selection-from-group", function() { removeSelection() })
+        RED.actions.add("core:copy-group-style", function() { copyGroupStyle() });
+        RED.actions.add("core:paste-group-style", function() { pasteGroupStyle() });
+
+        $(_groupEditTemplate).appendTo("#red-ui-editor-node-configs");
+
+        var groupStyleDiv = $("<div>",{
+            class:"red-ui-flow-group-body",
+            style: "position: absolute; top: -1000px;"
+        }).appendTo(document.body);
+        var groupStyle = getComputedStyle(groupStyleDiv[0]);
+        defaultGroupStyle = {
+            stroke: convertColorToHex(groupStyle.stroke),
+            "stroke-opacity": groupStyle.strokeOpacity,
+            fill: convertColorToHex(groupStyle.fill),
+            "fill-opacity": groupStyle.fillOpacity
+        }
+        groupStyleDiv.remove();
+    }
+
+    function convertColorToHex(c) {
+        var m = /^rgb\((\d+), (\d+), (\d+)\)$/.exec(c);
+        if (m) {
+            var s = ((parseInt(m[1])<<16) + (parseInt(m[2])<<8) + parseInt(m[3])).toString(16)
+            return '#'+'000000'.slice(0, 6-s.length)+s;
+        }
+        return c;
+    }
+
+
+    var groupStyleClipboard;
+
+    function copyGroupStyle() {
+        var selection = RED.view.selection();
+        if (selection.nodes && selection.nodes.length === 1 && selection.nodes[0].type === 'group') {
+            groupStyleClipboard = JSON.parse(JSON.stringify(selection.nodes[0].style));
+            RED.notify(RED._("clipboard.groupStyleCopied"),{id:"clipboard"})
+        }
+    }
+    function pasteGroupStyle() {
+        if (groupStyleClipboard) {
+            var selection = RED.view.selection();
+            if (selection.nodes) {
+                var historyEvent = {
+                    t:'multi',
+                    events:[],
+                    dirty: RED.nodes.dirty()
+                }
+                selection.nodes.forEach(function(n) {
+                    if (n.type === 'group') {
+                        historyEvent.events.push({
+                            t: "edit",
+                            node: n,
+                            changes: {
+                                style: JSON.parse(JSON.stringify(n.style))
+                            },
+                            dirty: RED.nodes.dirty()
+                        });
+                        n.style = JSON.parse(JSON.stringify(groupStyleClipboard));
+                        n.dirty = true;
+
+                    }
+                })
+                if (historyEvent.events.length > 0) {
+                    RED.history.push(historyEvent);
+                    RED.nodes.dirty(true);
+                    RED.view.redraw();
+                }
+            }
+        }
+    }
+
+    function groupSelection() {
+        var selection = RED.view.selection();
+        if (selection.nodes) {
+            var group = createGroup(selection.nodes);
+            if (group) {
+                var historyEvent = {
+                    t:"createGroup",
+                    groups: [ group ],
+                    dirty: RED.nodes.dirty()
+                }
+                RED.history.push(historyEvent);
+                RED.view.select({nodes:[group]});
+                RED.nodes.dirty(true);
+            }
+        }
+    }
+    function ungroupSelection() {
+        var selection = RED.view.selection();
+        if (selection.nodes) {
+            var newSelection = [];
+            groups = selection.nodes.filter(function(n) { return n.type === "group" });
+
+            var historyEvent = {
+                t:"ungroup",
+                groups: [ ],
+                dirty: RED.nodes.dirty()
+            }
+            RED.history.push(historyEvent);
+
+
+            groups.forEach(function(g) {
+                newSelection = newSelection.concat(ungroup(g))
+                historyEvent.groups.push(g);
+            })
+            RED.history.push(historyEvent);
+            RED.view.select({nodes:newSelection})
+            RED.nodes.dirty(true);
+        }
+    }
+
+    function ungroup(g) {
+        var nodes = [];
+        var parentGroup = RED.nodes.group(g.g);
+        g.nodes.forEach(function(n) {
+            nodes.push(n);
+            if (parentGroup) {
+                // Move nodes to parent group
+                n.g = parentGroup.id;
+                parentGroup.nodes.push(n);
+                parentGroup.dirty = true;
+                n.dirty = true;
+            } else {
+                delete n.g;
+            }
+            if (n.type === 'group') {
+                RED.events.emit("groups:change",n)
+            } else {
+                RED.events.emit("nodes:change",n)
+            }
+        })
+        RED.nodes.removeGroup(g);
+        return nodes;
+    }
+
+    function mergeSelection() {
+        // TODO: this currently creates an entirely new group. Need to merge properties
+        //       of any existing group
+        var selection = RED.view.selection();
+        if (selection.nodes) {
+            var nodes = [];
+
+            var historyEvent = {
+                t: "multi",
+                events: []
+            }
+            var ungroupHistoryEvent = {
+                t: "ungroup",
+                groups: []
+            }
+
+
+            var n;
+            var parentGroup;
+            // First pass, check they are all in the same parent
+            // TODO: DRY mergeSelection,removeSelection,...
+            for (var i=0; i<selection.nodes.length; i++) {
+                n = selection.nodes[i];
+                if (i === 0) {
+                    parentGroup = n.g;
+                } else if (n.g !== parentGroup) {
+                    RED.notify(RED._("group.errors.cannotCreateDiffGroups"),"error");
+                    return;
+                }
+            }
+            // Second pass, ungroup any groups in the selection and add their contents
+            // to the selection
+            for (var i=0; i<selection.nodes.length; i++) {
+                n = selection.nodes[i];
+                if (n.type === "group") {
+                    ungroupHistoryEvent.groups.push(n);
+                    nodes = nodes.concat(ungroup(n));
+                } else {
+                    nodes.push(n);
+                }
+                n.dirty = true;
+            }
+            if (ungroupHistoryEvent.groups.length > 0) {
+                historyEvent.events.push(ungroupHistoryEvent);
+            }
+            // Finally, create the new group
+            var group = createGroup(nodes);
+            if (group) {
+                RED.view.select({nodes:[group]})
+            }
+            historyEvent.events.push({
+                t:"createGroup",
+                groups: [ group ],
+                dirty: RED.nodes.dirty()
+            });
+            RED.history.push(historyEvent);
+            RED.nodes.dirty(true);
+        }
+    }
+
+    function removeSelection() {
+        var selection = RED.view.selection();
+        if (selection.nodes) {
+            var nodes = [];
+            var n;
+            var parentGroup = RED.nodes.group(selection.nodes[0].g);
+            if (parentGroup) {
+                try {
+                    removeFromGroup(parentGroup,selection.nodes,true);
+                    var historyEvent = {
+                        t: "removeFromGroup",
+                        dirty: RED.nodes.dirty(),
+                        group: parentGroup,
+                        nodes: selection.nodes
+                    }
+                    RED.history.push(historyEvent);
+                    RED.nodes.dirty(true);
+                } catch(err) {
+                    RED.notify(err,"error");
+                    return;
+                }
+            }
+            RED.view.select({nodes:selection.nodes})
+        }
+    }
+    function createGroup(nodes) {
+        if (nodes.length === 0) {
+            return;
+        }
+        if (nodes.filter(function(n) { return n.type === "subflow" }).length > 0) {
+            RED.notify(RED._("group.errors.cannotAddSubflowPorts"),"error");
+            return;
+        }
+        // nodes is an array
+        // each node must be on the same tab (z)
+        var group = {
+            id: RED.nodes.id(),
+            type: 'group',
+            nodes: [],
+            style: JSON.parse(JSON.stringify(defaultGroupStyle)),
+            x: Number.POSITIVE_INFINITY,
+            y: Number.POSITIVE_INFINITY,
+            w: 0,
+            h: 0,
+            _def: RED.group.def
+        }
+
+        group.z = nodes[0].z;
+        RED.nodes.addGroup(group);
+
+        try {
+            addToGroup(group,nodes);
+        } catch(err) {
+            RED.notify(err,"error");
+            return;
+        }
+        return group;
+    }
+    function addToGroup(group,nodes) {
+        if (!Array.isArray(nodes)) {
+            nodes = [nodes];
+        }
+        var i,n,z;
+        var g;
+        // First pass - validate we can safely add these nodes to the group
+        for (i=0;i<nodes.length;i++) {
+            n = nodes[i]
+            if (!n.z) {
+                throw new Error("Cannot add node without a z property to a group")
+            }
+            if (!z) {
+                z = n.z;
+            } else if (z !== n.z) {
+                throw new Error("Cannot add nooes with different z properties")
+            }
+            if (n.g) {
+                // This is already in a group.
+                //  - check they are all in the same group
+                if (!g) {
+                    if (i!==0) {
+                        // TODO: this might be ok when merging groups
+                        throw new Error(RED._("group.errors.cannotCreateDiffGroups"))
+                    }
+                    g = n.g
+                }
+            }
+            if (g !== n.g) {
+                throw new Error(RED._("group.errors.cannotCreateDiffGroups"))
+            }
+        }
+        // The nodes are already in a group. The assumption is they should be
+        // wrapped in the newly provided group, and that group added to in their
+        // place to the existing containing group.
+        if (g) {
+            g = RED.nodes.group(g);
+            g.nodes.push(group);
+            g.dirty = true;
+            group.g = g.id;
+        }
+        // Second pass - add them to the group
+        for (i=0;i<nodes.length;i++) {
+            n = nodes[i];
+            if (n.type !== "subflow") {
+                if (g && n.g === g.id) {
+                    var ni = g.nodes.indexOf(n);
+                    if (ni > -1) {
+                        g.nodes.splice(ni,1)
+                    }
+                }
+                n.g = group.id;
+                n.dirty = true;
+                group.nodes.push(n);
+                group.x = Math.min(group.x,n.x-n.w/2-25-((n._def.button && n._def.align!=="right")?20:0));
+                group.y = Math.min(group.y,n.y-n.h/2-25);
+                group.w = Math.max(group.w,n.x+n.w/2+25+((n._def.button && n._def.align=="right")?20:0) - group.x);
+                group.h = Math.max(group.h,n.y+n.h/2+25-group.y);
+                if (n.type === 'group') {
+                    RED.events.emit("groups:change",n)
+                } else {
+                    RED.events.emit("nodes:change",n)
+                }
+            }
+        }
+        if (g) {
+            RED.events.emit("groups:change",group)
+        }
+        markDirty(group);
+    }
+    function removeFromGroup(group, nodes, reparent) {
+        if (!Array.isArray(nodes)) {
+            nodes = [nodes];
+        }
+        var n;
+        // First pass, check they are all in the same parent
+        // TODO: DRY mergeSelection,removeSelection,...
+        for (var i=0; i<nodes.length; i++) {
+            if (nodes[i].g !== group.id) {
+                return;
+            }
+        }
+        var parentGroup = RED.nodes.group(group.g);
+        for (var i=0; i<nodes.length; i++) {
+            n = nodes[i];
+            n.dirty = true;
+            var index = group.nodes.indexOf(n);
+            group.nodes.splice(index,1);
+            if (reparent && group.g) {
+                n.g = group.g
+                parentGroup.nodes.push(n);
+            } else {
+                delete n.g;
+            }
+            if (n.type === 'group') {
+                RED.events.emit("groups:change",n)
+            } else {
+                RED.events.emit("nodes:change",n)
+            }
+        }
+        markDirty(group);
+    }
+
+    function getNodes(group,recursive) {
+        var nodes = [];
+        group.nodes.forEach(function(n) {
+            nodes.push(n);
+            if (recursive && n.type === 'group') {
+                nodes = nodes.concat(getNodes(n,recursive))
+            }
+        })
+        return nodes;
+    }
+
+    function groupContains(group,item) {
+        if (item.g === group.id) {
+            return true;
+        }
+        for (var i=0;i<group.nodes.length;i++) {
+            if (group.nodes[i].type === "group") {
+                if (groupContains(group.nodes[i],item)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    function getRootGroup(group) {
+        if (!group.g) {
+            return group;
+        }
+        return getRootGroup(RED.nodes.group(group.g))
+    }
+
+    function createLayoutPicker(options) {
+
+        var container = $("<div>",{style:"display:inline-block"});
+        var layoutHiddenInput = $("<input/>", { id: options.id, type: "hidden", value: options.value }).appendTo(container);
+
+        var layoutButton = $('<button type="button" class="red-ui-button red-ui-editor-node-appearance-button">').appendTo(container);
+        $('<i class="fa fa-caret-down"></i>').appendTo(layoutButton);
+
+        var layoutDispContainer = $('<div>',{class:"red-ui-search-result-node"}).appendTo(layoutButton);
+        var layoutDisp = $('<div>',{class:"red-ui-group-layout-picker-cell-text red-ui-group-layout-text-pos-"}).appendTo(layoutDispContainer);
+
+        var refreshDisplay = function() {
+            var val = layoutHiddenInput.val();
+            layoutDisp.removeClass().addClass("red-ui-group-layout-picker-cell-text red-ui-group-layout-text-pos-"+val)
+        }
+        layoutButton.on("click", function(e) {
+            var picker = $("<div/>", {
+                class: "red-ui-group-layout-picker"
+            }).css({
+                width: "126px"
+            });
+
+            var row = null;
+
+            row = $("<div/>").appendTo(picker);
+
+            for (var y=0;y<2;y++) { //red-ui-group-layout-text-pos
+                var yComponent= "ns"[y];
+                row = $("<div/>").appendTo(picker);
+                for (var x=0;x<3;x++) {
+                    var xComponent = ["w","","e"][x];
+                    var val = yComponent+xComponent;
+                    var button = $("<button/>", { class:"red-ui-search-result-node","data-pos":val }).appendTo(row);
+                    button.on("click",  function (e) {
+                        e.preventDefault();
+                        layoutHiddenInput.val($(this).data("pos"));
+                        layoutPanel.hide()
+                        refreshDisplay();
+                    });
+                    $('<div>',{class:"red-ui-group-layout-picker-cell-text red-ui-group-layout-text-pos-"+val}).appendTo(button);
+
+
+                }
+            }
+            refreshDisplay();
+            var layoutPanel = RED.popover.panel(picker);
+            layoutPanel.show({
+                target: layoutButton
+            })
+        })
+
+        refreshDisplay();
+
+        return container;
+
+    }
+
+    function markDirty(group) {
+        group.dirty = true;
+        while(group) {
+            group.dirty = true;
+            group = RED.nodes.group(group.g);
+        }
+    }
+
+
+    return {
+        def: groupDef,
+        init: init,
+        createGroup: createGroup,
+        ungroup: ungroup,
+        addToGroup: addToGroup,
+        removeFromGroup: removeFromGroup,
+        getNodes: getNodes,
+        contains: groupContains,
+        markDirty: markDirty
+    }
+})();

packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js

@@ -524,12 +524,12 @@ RED.keyboard = (function() {
         var pane = $('<div id="red-ui-settings-tab-keyboard"></div>');
 
         $('<div class="keyboard-shortcut-entry keyboard-shortcut-list-header">'+
-        '<div class="keyboard-shortcut-entry-key keyboard-shortcut-entry-text"><input id="red-ui-settings-tab-keyboard-filter" type="text" data-i18n="[placeholder]keyboard.filterActions"></div>'+
+        '<div class="keyboard-shortcut-entry-key keyboard-shortcut-entry-text"><input autocomplete="off" name="keyboard-filter" id="red-ui-settings-tab-keyboard-filter" type="text" data-i18n="[placeholder]keyboard.filterActions"></div>'+
         '<div class="keyboard-shortcut-entry-key" data-i18n="keyboard.shortcut"></div>'+
         '<div class="keyboard-shortcut-entry-scope" data-i18n="keyboard.scope"></div>'+
         '</div>').appendTo(pane);
 
-        pane.find("input").searchBox({
+        pane.find("#red-ui-settings-tab-keyboard-filter").searchBox({
             delay: 100,
             change: function() {
                 var filterValue = $(this).val().trim();

packages/node_modules/@node-red/editor-client/src/js/ui/library.js

@@ -22,7 +22,7 @@ RED.library = (function() {
 
     var _libraryLookup = '<div id="red-ui-library-dialog-load" class="hide">'+
         '<form class="form-horizontal">'+
-            '<div style="height: 400px; position:relative; ">'+
+            '<div class="red-ui-library-dialog-box" style="height: 400px; position:relative; ">'+
                 '<div id="red-ui-library-dialog-load-panes">'+
                     '<div class="red-ui-panel" id="red-ui-library-dialog-load-browser"></div>'+
                     '<div class="red-ui-panel">'+
@@ -41,7 +41,7 @@ RED.library = (function() {
 
     var _librarySave = '<div id="red-ui-library-dialog-save" class="hide">'+
         '<form class="form-horizontal">'+
-        '<div style="height: 400px; position:relative; ">'+
+        '<div class="red-ui-library-dialog-box" style="height: 400px; position:relative; ">'+
             '<div id="red-ui-library-dialog-save-browser"></div>'+
             '<div class="form-row">'+
                 '<label data-i18n="clipboard.export.exportAs"></label><input id="red-ui-library-dialog-save-filename" type="text">'+
@@ -64,12 +64,14 @@ RED.library = (function() {
 
         var queryArgs = [];
         var data = {};
-        for (var i=0; i<activeLibrary.fields.length; i++) {
+        for (var i=0; i < activeLibrary.fields.length; i++) {
             var field = activeLibrary.fields[i];
-            if (field == "name") {
+            if (field === "name") {
                 data.name = name;
+            } else if (typeof(field) === 'object') {
+                data[field.name] = field.get();
             } else {
-                data[field] = $("#"+elementPrefix+field).val();
+                data[field] = $("#" + elementPrefix + field).val();
             }
         }
         data.text = activeLibrary.editor.getValue();
@@ -254,6 +256,13 @@ RED.library = (function() {
                     libraryEditor.renderer.$cursorLayer.element.style.opacity=0;
                     libraryEditor.$blockScrolling = Infinity;
 
+                    var dialogHeight = 400;
+                    var winHeight = $(window).height();
+                    if (winHeight < 570) {
+                        dialogHeight = 400 - (570 - winHeight);
+                    }
+                    $("#red-ui-library-dialog-load .red-ui-library-dialog-box").height(dialogHeight);
+
                     $( "#red-ui-library-dialog-load" ).dialog("option","title",RED._("library.typeLibrary", {type:options.type})).dialog( "open" );
                 }
             },
@@ -293,6 +302,15 @@ RED.library = (function() {
                             saveLibraryBrowser.select(listing[0].children[0]);
                         },200);
                     });
+
+                    var dialogHeight = 400;
+                    var winHeight = $(window).height();
+                    if (winHeight < 570) {
+                        dialogHeight = 400 - (570 - winHeight);
+                    }
+                    $("#red-ui-library-dialog-save .red-ui-library-dialog-box").height(dialogHeight);
+
+
                     $( "#red-ui-library-dialog-save" ).dialog( "open" );
                 }
             }
@@ -518,14 +536,20 @@ RED.library = (function() {
                     {
                         text: RED._("common.label.load"),
                         class: "primary",
-                        click: function() {
+                        click: function () {
                             if (selectedLibraryItem) {
                                 var elementPrefix = activeLibrary.elementPrefix || "node-input-";
-                                for (var i=0; i<activeLibrary.fields.length; i++) {
+                                for (var i = 0; i < activeLibrary.fields.length; i++) {
                                     var field = activeLibrary.fields[i];
-                                    $("#"+elementPrefix+field).val(selectedLibraryItem[field]);
+                                    if (typeof(field) === 'object') {
+                                        var val = selectedLibraryItem[field.name];
+                                        field.set(val);
+                                    }
+                                    else {
+                                        $("#"+elementPrefix+field).val(selectedLibraryItem[field]);
+                                    }
                                 }
-                                activeLibrary.editor.setValue(libraryEditor.getValue(),-1);
+                                activeLibrary.editor.setValue(libraryEditor.getValue(), -1);
                             }
                             $( this ).dialog( "close" );
                         }

packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js

@@ -75,13 +75,16 @@ RED.palette.editor = (function() {
             });
         })
     }
-    function installNodeModule(id,version,callback) {
+    function installNodeModule(id,version,url,callback) {
         var requestBody = {
             module: id
         };
         if (version) {
             requestBody.version = version;
         }
+        if (url) {
+            requestBody.url = url;
+        }
         $.ajax({
             url:"nodes",
             type: "POST",
@@ -220,7 +223,11 @@ RED.palette.editor = (function() {
                         var setElements = nodeEntry.sets[setName];
                         if (set.err) {
                             errorCount++;
-                            $("<li>").text(set.err).appendTo(nodeEntry.errorList);
+                            var errMessage = set.err;
+                            if (set.err.message) {
+                                errMessage = set.err.message;
+                            }
+                            $("<li>").text(errMessage).appendTo(nodeEntry.errorList);
                         }
                         if (set.enabled) {
                             activeTypeCount += set.types.length;
@@ -381,6 +388,7 @@ RED.palette.editor = (function() {
                     handleCatalogResponse(null,catalog,index,v);
                     refreshNodeModuleList();
                 }).fail(function(jqxhr, textStatus, error) {
+                    console.warn("Error loading catalog",catalog,":",error);
                     handleCatalogResponse(jqxhr,catalog,index);
                 }).always(function() {
                     handled++;
@@ -622,7 +630,7 @@ RED.palette.editor = (function() {
                         if ($(this).hasClass('disabled')) {
                             return;
                         }
-                        update(entry,loadedIndex[entry.name].version,container,function(err){});
+                        update(entry,loadedIndex[entry.name].version,loadedIndex[entry.name].pkg_url,container,function(err){});
                     })
 
 
@@ -872,7 +880,7 @@ RED.palette.editor = (function() {
 
         $('<div id="red-ui-palette-module-install-shade" class="red-ui-palette-module-shade hide"><div class="red-ui-palette-module-shade-status"></div><img src="red/images/spin.svg" class="red-ui-palette-spinner"/></div>').appendTo(installTab);
     }
-    function update(entry,version,container,done) {
+    function update(entry,version,url,container,done) {
         if (RED.settings.theme('palette.editable') === false) {
             done(new Error('Palette not editable'));
             return;
@@ -898,7 +906,7 @@ RED.palette.editor = (function() {
                             RED.actions.invoke("core:show-event-log");
                         });
                         RED.eventLog.startEvent(RED._("palette.editor.confirm.button.install")+" : "+entry.name+" "+version);
-                        installNodeModule(entry.name,version,function(xhr) {
+                        installNodeModule(entry.name,version,url,function(xhr) {
                             spinner.remove();
                             if (xhr) {
                                 if (xhr.responseJSON) {
@@ -1023,7 +1031,7 @@ RED.palette.editor = (function() {
                     RED.actions.invoke("core:show-event-log");
                 });
                 RED.eventLog.startEvent(RED._("palette.editor.confirm.button.install")+" : "+entry.id+" "+entry.version);
-                installNodeModule(entry.id,entry.version,function(xhr) {
+                installNodeModule(entry.id,entry.version,entry.pkg_url,function(xhr) {
                     spinner.remove();
                      if (xhr) {
                          if (xhr.responseJSON) {

packages/node_modules/@node-red/editor-client/src/js/ui/palette.js

@@ -92,8 +92,11 @@ RED.palette = (function() {
         var lineHeight = 20;
         var portHeight = 10;
 
+        el.attr("data-palette-label",label);
+
         label = RED.utils.sanitize(label);
 
+
         var words = label.split(/[ -]/);
 
         var displayLines = [];
@@ -162,6 +165,7 @@ RED.palette = (function() {
                     metaData = typeInfo.set.module+" : ";
                 }
                 metaData += type;
+                $('<button type="button" onclick="RED.sidebar.help.show(\''+type+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right"><i class="fa fa-book"></i></button>').appendTo(popOverContent)
                 $('<p>',{style:"font-size: 0.8em"}).text(metaData).appendTo(popOverContent);
             }
         } catch(err) {
@@ -178,7 +182,11 @@ RED.palette = (function() {
     function setIcon(element,sf) {
         var icon_url = RED.utils.getNodeIcon(sf._def);
         var iconContainer = element.find(".red-ui-palette-icon-container");
-        RED.utils.createIconElement(icon_url, iconContainer, true);
+        var currentIcon = iconContainer.attr("data-palette-icon");
+        if (currentIcon !== icon_url) {
+            iconContainer.attr("data-palette-icon", icon_url);
+            RED.utils.createIconElement(icon_url, iconContainer, true);
+        }
     }
 
     function getPaletteNode(type) {
@@ -221,6 +229,7 @@ RED.palette = (function() {
                 var iconContainer = $('<div/>', {
                     class: "red-ui-palette-icon-container"+(((!def.align && def.inputs !== 0 && def.outputs === 0) || "right" === def.align) ? " red-ui-palette-icon-container-right" : "")
                 }).appendTo(d);
+                iconContainer.attr("data-palette-icon", icon_url);
                 RED.utils.createIconElement(icon_url, iconContainer, true);
             }
 
@@ -247,6 +256,7 @@ RED.palette = (function() {
             var popover = RED.popover.create({
                 target:d,
                 trigger: "hover",
+                interactive: true,
                 width: "300px",
                 content: "hi",
                 delay: { show: 750, hide: 50 }
@@ -262,25 +272,28 @@ RED.palette = (function() {
             //     html: true,
             //     container:'body'
             // });
-            d.on("click", function() {
+            // d.on("click", function() {
-                RED.view.focus();
+            //     RED.view.focus();
-                var helpText;
+            //     var helpText;
-                if (nt.indexOf("subflow:") === 0) {
+            //     if (nt.indexOf("subflow:") === 0) {
-                    helpText = marked(RED.nodes.subflow(nt.substring(8)).info||"")||('<span class="red-ui-help-info-none">'+RED._("sidebar.info.none")+'</span>');
+            //         helpText = RED.utils.renderMarkdown(RED.nodes.subflow(nt.substring(8)).info||"")||('<span class="red-ui-help-info-none">'+RED._("sidebar.info.none")+'</span>');
-                } else {
+            //     } else {
-                    helpText = $("script[data-help-name='"+d.attr("data-palette-type")+"']").html()||('<span class="red-ui-help-info-none">'+RED._("sidebar.info.none")+'</span>');
+            //         helpText = $("script[data-help-name='"+d.attr("data-palette-type")+"']").html()||('<span class="red-ui-help-info-none">'+RED._("sidebar.info.none")+'</span>');
-                }
+            //     }
-                // Don't look too closely. RED.sidebar.info.set will set the 'Description'
+            //     // Don't look too closely. RED.sidebar.info.set will set the 'Description'
-                // section of the sidebar. Pass in the title of the Help section so it looks
+            //     // section of the sidebar. Pass in the title of the Help section so it looks
-                // right.
+            //     // right.
-                RED.sidebar.info.set(helpText,RED._("sidebar.info.nodeHelp"));
+            //     RED.sidebar.type.show(helpText,RED._("sidebar.info.nodeHelp"));
-            });
+            // });
             var chart = $("#red-ui-workspace-chart");
             var chartSVG = $("#red-ui-workspace-chart>svg").get(0);
             var activeSpliceLink;
             var mouseX;
             var mouseY;
             var spliceTimer;
+            var groupTimer;
+            var activeGroup;
+            var hoverGroup;
             var paletteWidth;
             var paletteTop;
             $(d).draggable({
@@ -292,16 +305,53 @@ RED.palette = (function() {
                 start: function() {
                     paletteWidth = $("#red-ui-palette").width();
                     paletteTop = $("#red-ui-palette").parent().position().top + $("#red-ui-palette-container").position().top;
+                    hoverGroup = null;
+                    activeGroup = RED.view.getActiveGroup();
+                    if (activeGroup) {
+                        document.getElementById("group_select_"+activeGroup.id).classList.add("red-ui-flow-group-active-hovered");
+                    }
                     RED.view.focus();
                 },
-                stop: function() { d3.select('.red-ui-flow-link-splice').classed('red-ui-flow-link-splice',false); if (spliceTimer) { clearTimeout(spliceTimer); spliceTimer = null;}},
+                stop: function() {
+                    d3.select('.red-ui-flow-link-splice').classed('red-ui-flow-link-splice',false);
+                    if (hoverGroup) {
+                        document.getElementById("group_select_"+hoverGroup.id).classList.remove("red-ui-flow-group-hovered");
+                    }
+                    if (activeGroup) {
+                        document.getElementById("group_select_"+activeGroup.id).classList.remove("red-ui-flow-group-active-hovered");
+                    }
+                    if (spliceTimer) { clearTimeout(spliceTimer); spliceTimer = null; }
+                    if (groupTimer) { clearTimeout(groupTimer); groupTimer = null; }
+                },
                 drag: function(e,ui) {
                     var paletteNode = getPaletteNode(nt);
                     ui.originalPosition.left = paletteNode.offset().left;
+                    mouseX = ui.position.left - paletteWidth + (ui.helper.width()/2) + chart.scrollLeft();
+                    mouseY = ui.position.top - paletteTop + (ui.helper.height()/2) + chart.scrollTop();
+                    if (!groupTimer) {
+                        groupTimer = setTimeout(function() {
+                            mouseX /= RED.view.scale();
+                            mouseY /= RED.view.scale();
+                            var group = RED.view.getGroupAtPoint(mouseX,mouseY);
+                            if (group !== hoverGroup) {
+                                if (hoverGroup) {
+                                    document.getElementById("group_select_"+hoverGroup.id).classList.remove("red-ui-flow-group-hovered");
+                                }
+                                if (group) {
+                                    document.getElementById("group_select_"+group.id).classList.add("red-ui-flow-group-hovered");
+                                }
+                                hoverGroup = group;
+                                if (hoverGroup) {
+                                    $(ui.helper).data('group',hoverGroup);
+                                } else {
+                                    $(ui.helper).removeData('group');
+                                }
+                            }
+                            groupTimer = null;
 
+                        },200)
+                    }
                     if (def.inputs > 0 && def.outputs > 0) {
-                        mouseX = ui.position.left - paletteWidth + (ui.helper.width()/2) + chart.scrollLeft();
-                        mouseY = ui.position.top - paletteTop + (ui.helper.height()/2) + chart.scrollTop();
                         if (!spliceTimer) {
                             spliceTimer = setTimeout(function() {
                                 var nodes = [];
@@ -367,7 +417,7 @@ RED.palette = (function() {
                     RED.workspaces.show(nt.substring(8));
                     e.preventDefault();
                 });
-                nodeInfo = marked(def.info||"");
+                nodeInfo = RED.utils.renderMarkdown(def.info||"");
             }
             setLabel(nt,d,label,nodeInfo);
 
@@ -409,67 +459,73 @@ RED.palette = (function() {
         categoryNode.show();
         paletteNode.show();
     }
-
     function refreshNodeTypes() {
-        RED.nodes.eachSubflow(function(sf) {
+        RED.nodes.eachSubflow(refreshSubflow)
-            var paletteNode = getPaletteNode('subflow:'+sf.id);
+    }
-            var portInput = paletteNode.find(".red-ui-palette-port-input");
+    function refreshSubflow(sf) {
-            var portOutput = paletteNode.find(".red-ui-palette-port-output");
+        var paletteNode = getPaletteNode('subflow:'+sf.id);
+        var portInput = paletteNode.find(".red-ui-palette-port-input");
+        var portOutput = paletteNode.find(".red-ui-palette-port-output");
 
-            var paletteLabel = paletteNode.find(".red-ui-palette-label");
+        var paletteLabel = paletteNode.find(".red-ui-palette-label");
-            paletteLabel.attr("class","red-ui-palette-label" + (((!sf._def.align && sf.in.length !== 0 && sf.out.length === 0) || "right" === sf._def.align) ? " red-ui-palette-label-right" : ""));
+        paletteLabel.attr("class","red-ui-palette-label" + (((!sf._def.align && sf.in.length !== 0 && sf.out.length === 0) || "right" === sf._def.align) ? " red-ui-palette-label-right" : ""));
 
-            var paletteIconContainer = paletteNode.find(".red-ui-palette-icon-container");
+        var paletteIconContainer = paletteNode.find(".red-ui-palette-icon-container");
-            paletteIconContainer.attr("class","red-ui-palette-icon-container" + (((!sf._def.align && sf.in.length !== 0 && sf.out.length === 0) || "right" === sf._def.align) ? " red-ui-palette-icon-container-right" : ""));
+        paletteIconContainer.attr("class","red-ui-palette-icon-container" + (((!sf._def.align && sf.in.length !== 0 && sf.out.length === 0) || "right" === sf._def.align) ? " red-ui-palette-icon-container-right" : ""));
 
-            if (portInput.length === 0 && sf.in.length > 0) {
+        if (portInput.length === 0 && sf.in.length > 0) {
-                var portIn = document.createElement("div");
+            var portIn = document.createElement("div");
-                portIn.className = "red-ui-palette-port red-ui-palette-port-input";
+            portIn.className = "red-ui-palette-port red-ui-palette-port-input";
-                paletteNode.append(portIn);
+            paletteNode.append(portIn);
-            } else if (portInput.length !== 0 && sf.in.length === 0) {
+        } else if (portInput.length !== 0 && sf.in.length === 0) {
-                portInput.remove();
+            portInput.remove();
+        }
+
+        if (portOutput.length === 0 && sf.out.length > 0) {
+            var portOut = document.createElement("div");
+            portOut.className = "red-ui-palette-port red-ui-palette-port-output";
+            paletteNode.append(portOut);
+        } else if (portOutput.length !== 0 && sf.out.length === 0) {
+            portOutput.remove();
+        }
+        var currentLabel = paletteNode.attr("data-palette-label");
+        var currentInfo = paletteNode.attr("data-palette-info");
+
+        if (currentLabel !== sf.name || currentInfo !== sf.info) {
+            paletteNode.attr("data-palette-info",sf.info);
+            setLabel(sf.type+":"+sf.id,paletteNode,sf.name,RED.utils.renderMarkdown(sf.info||""));
+        }
+        setIcon(paletteNode,sf);
+
+        var currentCategory = paletteNode.data('category');
+        var newCategory = (sf.category||"subflows");
+        if (currentCategory !== newCategory) {
+            var category = escapeCategory(newCategory);
+            createCategory(newCategory,category,category,"node-red");
+
+            var currentCategoryNode = paletteNode.closest(".red-ui-palette-category");
+            var newCategoryNode = $("#red-ui-palette-"+category);
+            newCategoryNode.append(paletteNode);
+            if (newCategoryNode.find(".red-ui-palette-node").length === 1) {
+                categoryContainers[category].open();
             }
 
-            if (portOutput.length === 0 && sf.out.length > 0) {
+            paletteNode.data('category',newCategory);
-                var portOut = document.createElement("div");
+            if (currentCategoryNode.find(".red-ui-palette-node").length === 0) {
-                portOut.className = "red-ui-palette-port red-ui-palette-port-output";
+                if (currentCategoryNode.find("i").hasClass("expanded")) {
-                paletteNode.append(portOut);
+                    currentCategoryNode.find(".red-ui-palette-content").slideToggle();
-            } else if (portOutput.length !== 0 && sf.out.length === 0) {
+                    currentCategoryNode.find("i").toggleClass("expanded");
-                portOutput.remove();
-            }
-            setLabel(sf.type+":"+sf.id,paletteNode,sf.name,marked(sf.info||""));
-            setIcon(paletteNode,sf);
-
-            var currentCategory = paletteNode.data('category');
-            var newCategory = (sf.category||"subflows");
-            if (currentCategory !== newCategory) {
-                var category = escapeCategory(newCategory);
-                createCategory(newCategory,category,category,"node-red");
-
-                var currentCategoryNode = paletteNode.closest(".red-ui-palette-category");
-                var newCategoryNode = $("#red-ui-palette-"+category);
-                newCategoryNode.append(paletteNode);
-                if (newCategoryNode.find(".red-ui-palette-node").length === 1) {
-                    categoryContainers[category].open();
-                }
-
-                paletteNode.data('category',newCategory);
-                if (currentCategoryNode.find(".red-ui-palette-node").length === 0) {
-                    if (currentCategoryNode.find("i").hasClass("expanded")) {
-                        currentCategoryNode.find(".red-ui-palette-content").slideToggle();
-                        currentCategoryNode.find("i").toggleClass("expanded");
-                    }
                 }
             }
+        }
 
-            paletteNode.css("backgroundColor", sf.color);
+        paletteNode.css("backgroundColor", sf.color);
-        });
     }
 
     function filterChange(val) {
         var re = new RegExp(val.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'),'i');
         $("#red-ui-palette-container .red-ui-palette-node").each(function(i,el) {
-            var currentLabel = $(el).find(".red-ui-palette-label").text();
+            var currentLabel = $(el).attr("data-palette-label");
             var type = $(el).attr("data-palette-type");
             if (val === "" || re.test(type) || re.test(currentLabel)) {
                 $(this).show();
@@ -501,6 +557,8 @@ RED.palette = (function() {
         $('<div class="red-ui-component-footer"></div>').appendTo("#red-ui-palette");
         $('<div id="red-ui-palette-shade" class="hide"></div>').appendTo("#red-ui-palette");
 
+        $("#red-ui-palette > .red-ui-palette-spinner").show();
+
 
         RED.events.on('registry:node-type-added', function(nodeType) {
             var def = RED.nodes.getType(nodeType);
@@ -542,7 +600,8 @@ RED.palette = (function() {
             }
         });
 
-        $("#red-ui-palette > .red-ui-palette-spinner").show();
+        RED.events.on("subflows:change",refreshSubflow);
+
 
 
         $("#red-ui-palette-search input").searchBox({

packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js

@@ -158,7 +158,7 @@ RED.projects.settings = (function() {
         container.empty();
         var desc;
         if (activeProject.description) {
-            desc = marked(activeProject.description);
+            desc = RED.utils.renderMarkdown(activeProject.description);
         } else {
             desc = '<span class="red-ui-help-info-none">' + RED._("sidebar.project.noDescriptionAvailable") + '</span>';
         }

packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectUserSettings.js

@@ -30,13 +30,13 @@ RED.projects.userSettings = (function() {
         $('<div class="red-ui-settings-section-description"></div>').appendTo(gitconfigContainer).text(RED._("editor:sidebar.project.userSettings.committerTip"));
 
         var row = $('<div class="red-ui-settings-row"></div>').appendTo(gitconfigContainer);
-        $('<label for=""></label>').text(RED._("editor:sidebar.project.userSettings.userName")).appendTo(row);
+        $('<label for="user-settings-gitconfig-username"></label>').text(RED._("editor:sidebar.project.userSettings.userName")).appendTo(row);
-        gitUsernameInput = $('<input type="text">').appendTo(row);
+        gitUsernameInput = $('<input type="text" id="user-settings-gitconfig-username">').appendTo(row);
         gitUsernameInput.val(currentGitSettings.user.name||"");
 
         row = $('<div class="red-ui-settings-row"></div>').appendTo(gitconfigContainer);
-        $('<label for=""></label>').text(RED._("editor:sidebar.project.userSettings.email")).appendTo(row);
+        $('<label for="user-settings-gitconfig-email"></label>').text(RED._("editor:sidebar.project.userSettings.email")).appendTo(row);
-        gitEmailInput = $('<input type="text">').appendTo(row);
+        gitEmailInput = $('<input type="text" id="user-settings-gitconfig-email">').appendTo(row);
         gitEmailInput.val(currentGitSettings.user.email||"");
     }
 

packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js

@@ -685,6 +685,8 @@ RED.projects = (function() {
                                             }
                                         }
                                     },projectData).then(function() {
+                                        RED.menu.setDisabled('menu-item-projects-open',false);
+                                        RED.menu.setDisabled('menu-item-projects-settings',false);
                                         RED.events.emit("project:change", {name:name});
                                     }).always(function() {
                                         setTimeout(function() {
@@ -1495,7 +1497,6 @@ RED.projects = (function() {
                                         }
                                     } else if (projectType === 'open') {
                                         return switchProject(selectedProject.name,function(err,data) {
-                                            dialog.dialog( "close" );
                                             if (err) {
                                                 if (err.code !== 'credentials_load_failed') {
                                                     console.log(RED._("projects.create.unexpected_error"),err)
@@ -1604,6 +1605,7 @@ RED.projects = (function() {
                 },
             }
         },{active:true}).then(function() {
+            dialog.dialog( "close" );
             RED.events.emit("project:change", {name:name});
         }).always(function() {
             setTimeout(function() {
@@ -1671,16 +1673,27 @@ RED.projects = (function() {
         if (typeof buttons === 'function') {
             buttons = buttons(options||{});
         }
+
+
+
         dialog.dialog('option','buttons',buttons);
         dialogBody.append(container);
+
+
+        var dialogHeight = 590;
+        var winHeight = $(window).height();
+        if (winHeight < 750) {
+            dialogHeight = 590 - (750 - winHeight);
+        }
+        $(".red-ui-projects-dialog-box").height(dialogHeight);
+        $(".red-ui-projects-dialog-project-list-inner-container").height(Math.max(500,dialogHeight) - 180);
         dialog.dialog('option','title',screen.title||"");
         dialog.dialog("open");
-        dialog.dialog({position: { 'my': 'center top', 'at': 'center top+20', 'of': window }});
     }
 
     function createProjectList(options) {
         options = options||{};
-        var height = options.height || "300px";
+        var height = options.height || "200px";
         var container = $('<div></div>',{class:"red-ui-projects-dialog-project-list-container" });
         var filterTerm = "";
 
@@ -1939,100 +1952,121 @@ RED.projects = (function() {
             }
         }).fail(function(xhr,textStatus,err) {
             var responses;
+
             if (options.responses && options.responses[xhr.status]) {
                 responses = options.responses[xhr.status];
                 if (typeof responses === 'function') {
                     resultCallback = responses;
                     resultCallbackArgs = {error:responses.statusText};
                     return;
-                } else if (options.handleAuthFail !== false && xhr.responseJSON.code === 'git_auth_failed') {
+                } else if (options.handleAuthFail !== false && (xhr.responseJSON.code === 'git_auth_failed' || xhr.responseJSON.code === 'git_host_key_verification_failed')) {
-                    var url = activeProject.git.remotes[xhr.responseJSON.remote||options.remote||'origin'].fetch;
+                    if (xhr.responseJSON.code === 'git_auth_failed') {
+                        var url = activeProject.git.remotes[xhr.responseJSON.remote||options.remote||'origin'].fetch;
 
-                    var message = $('<div>'+
+                        var message = $('<div>'+
                         '<div class="form-row">'+RED._("projects.send-req.auth-req")+':</div>'+
                         '<div class="form-row"><div style="margin-left: 20px;">'+url+'</div></div>'+
                         '</div>');
 
-                    var isSSH = false;
+                        var isSSH = false;
-                    if (/^https?:\/\//.test(url)) {
+                        if (/^https?:\/\//.test(url)) {
-                        $('<div class="form-row"><label for="projects-user-auth-username">'+RED._("projects.send-req.username")+'</label><input id="projects-user-auth-username" type="text"></input></div>'+
+                            $('<div class="form-row"><label for="projects-user-auth-username">'+RED._("projects.send-req.username")+'</label><input id="projects-user-auth-username" type="text"></input></div>'+
-                          '<div class="form-row"><label for=projects-user-auth-password">'+RED._("projects.send-req.password")+'</label><input id="projects-user-auth-password" type="password"></input></div>').appendTo(message);
+                            '<div class="form-row"><label for=projects-user-auth-password">'+RED._("projects.send-req.password")+'</label><input id="projects-user-auth-password" type="password"></input></div>').appendTo(message);
-                    } else if (/^(?:ssh|[\d\w\.\-_]+@[\w\.]+):(?:\/\/)?/.test(url)) {
+                        } else if (/^(?:ssh|[\d\w\.\-_]+@[\w\.]+):(?:\/\/)?/.test(url)) {
-                        isSSH = true;
+                            isSSH = true;
-                        var row = $('<div class="form-row"></div>').appendTo(message);
+                            var row = $('<div class="form-row"></div>').appendTo(message);
-                        $('<label for="projects-user-auth-key">SSH Key</label>').appendTo(row);
+                            $('<label for="projects-user-auth-key">SSH Key</label>').appendTo(row);
-                        var projectRepoSSHKeySelect = $('<select id="projects-user-auth-key">').width('70%').appendTo(row);
+                            var projectRepoSSHKeySelect = $('<select id="projects-user-auth-key">').width('70%').appendTo(row);
-                        $.getJSON("settings/user/keys", function(data) {
+                            $.getJSON("settings/user/keys", function(data) {
-                            var count = 0;
+                                var count = 0;
-                            data.keys.forEach(function(key) {
+                                data.keys.forEach(function(key) {
-                                projectRepoSSHKeySelect.append($("<option></option>").val(key.name).text(key.name));
+                                    projectRepoSSHKeySelect.append($("<option></option>").val(key.name).text(key.name));
-                                count++;
+                                    count++;
+                                });
+                                if (count === 0) {
+                                    //TODO: handle no keys yet setup
+                                }
                             });
-                            if (count === 0) {
+                            row = $('<div class="form-row"></div>').appendTo(message);
-                                //TODO: handle no keys yet setup
+                            $('<label for="projects-user-auth-passphrase">'+RED._("projects.send-req.passphrase")+'</label>').appendTo(row);
-                            }
+                            $('<input id="projects-user-auth-passphrase" type="password"></input>').appendTo(row);
-                        });
+                        }
-                        row = $('<div class="form-row"></div>').appendTo(message);
-                        $('<label for="projects-user-auth-passphrase">'+RED._("projects.send-req.passphrase")+'</label>').appendTo(row);
-                        $('<input id="projects-user-auth-passphrase" type="password"></input>').appendTo(row);
-                    }
 
-                    var notification = RED.notify(message,{
+                        var notification = RED.notify(message,{
-                        type:"error",
+                            type:"error",
-                        fixed: true,
+                            fixed: true,
-                        modal: true,
+                            modal: true,
-                        buttons: [
+                            buttons: [
-                            {
+                                {
-                                //id: "node-dialog-delete",
+                                    //id: "node-dialog-delete",
-                                //class: 'leftButton',
+                                    //class: 'leftButton',
-                                text: RED._("common.label.cancel"),
+                                    text: RED._("common.label.cancel"),
-                                click: function() {
+                                    click: function() {
-                                    notification.close();
+                                        notification.close();
-                                }
-                            },{
-                                text: '<span><i class="fa fa-refresh"></i> ' +RED._("projects.send-req.retry") +'</span>',
-                                click: function() {
-                                    body = body || {};
-                                    var authBody = {};
-                                    if (isSSH) {
-                                        authBody.keyFile = $('#projects-user-auth-key').val();
-                                        authBody.passphrase = $('#projects-user-auth-passphrase').val();
-                                    } else {
-                                        authBody.username = $('#projects-user-auth-username').val();
-                                        authBody.password = $('#projects-user-auth-password').val();
                                     }
-                                    var done = function(err) {
+                                },{
-                                        if (err) {
+                                    text: '<span><i class="fa fa-refresh"></i> ' +RED._("projects.send-req.retry") +'</span>',
-                                            console.log(RED._("projects.send-req.update-failed"));
+                                    click: function() {
-                                            console.log(err);
+                                        body = body || {};
+                                        var authBody = {};
+                                        if (isSSH) {
+                                            authBody.keyFile = $('#projects-user-auth-key').val();
+                                            authBody.passphrase = $('#projects-user-auth-passphrase').val();
                                         } else {
-                                            sendRequest(options,body);
+                                            authBody.username = $('#projects-user-auth-username').val();
-                                            notification.close();
+                                            authBody.password = $('#projects-user-auth-password').val();
                                         }
+                                        var done = function(err) {
+                                            if (err) {
+                                                console.log(RED._("projects.send-req.update-failed"));
+                                                console.log(err);
+                                            } else {
+                                                sendRequest(options,body);
+                                                notification.close();
+                                            }
 
-                                    }
-                                    sendRequest({
-                                        url: "projects/"+activeProject.name+"/remotes/"+(xhr.responseJSON.remote||options.remote||'origin'),
-                                        type: "PUT",
-                                        responses: {
-                                            0: function(error) {
-                                                done(error,null);
-                                            },
-                                            200: function(data) {
-                                                done(null,data);
-                                            },
-                                            400: {
-                                                'unexpected_error': function(error) {
-                                                    done(error,null);
-                                                }
-                                            },
                                         }
-                                    },{auth:authBody});
+                                        sendRequest({
+                                            url: "projects/"+activeProject.name+"/remotes/"+(xhr.responseJSON.remote||options.remote||'origin'),
+                                            type: "PUT",
+                                            responses: {
+                                                0: function(error) {
+                                                    done(error,null);
+                                                },
+                                                200: function(data) {
+                                                    done(null,data);
+                                                },
+                                                400: {
+                                                    'unexpected_error': function(error) {
+                                                        done(error,null);
+                                                    }
+                                                },
+                                            }
+                                        },{auth:authBody});
+                                    }
                                 }
-                            }
+                            ]
-                        ]
+                        });
-                    });
+                        return;
-                    return;
+                    } else if (xhr.responseJSON.code === 'git_host_key_verification_failed') {
+                        var message = $('<div>'+
+                            '<div class="form-row">'+RED._("projects.send-req.host-key-verify-failed")+'</div>'+
+                            '</div>');
+                        var notification = RED.notify(message,{
+                            type:"error",
+                            fixed: true,
+                            modal: true,
+                            buttons: [
+                                {
+                                    text: RED._("common.label.close"),
+                                    click: function() {
+                                        notification.close();
+                                    }
+                                }
+                            ]
+                        });
+                        return;
+                    }
                 } else if (responses[xhr.responseJSON.code]) {
                     resultCallback = responses[xhr.responseJSON.code];
                     resultCallbackArgs = xhr.responseJSON;
@@ -2066,6 +2100,8 @@ RED.projects = (function() {
         var branchFilterTerm = "";
         var branchFilterCreateItem;
         var branches = [];
+        var branchNames = new Set();
+        var remotes = [];
         var branchPrefix = "";
         var container = $('<div class="red-ui-projects-branch-list">').appendTo(options.container);
 
@@ -2073,18 +2109,30 @@ RED.projects = (function() {
             delay: 200,
             change: function() {
                 branchFilterTerm = $(this).val();
-                if (/(\.\.|\/\.|[?*[~^: \\]|\/\/|\/.$|\/$)/.test(branchFilterTerm)) {
+                // if there is a / then
+                //  - check what preceeds it is a known remote
+
+                var valid = false;
+                var hasRemote = false;
+                var m = /^([^/]+)\/[^/.~*?\[]/.exec(branchFilterTerm);
+                if (m && remotes.indexOf(m[1]) > -1) {
+                    valid = true;
+                    hasRemote = true;
+                }
+
+                if (!valid && /(\.\.|\/\.|[?*[~^: \\]|\/\/|\/.$|\/$)/.test(branchFilterTerm)) {
                     if (!branchFilterCreateItem.hasClass("input-error")) {
                         branchFilterCreateItem.addClass("input-error");
                         branchFilterCreateItem.find("i").addClass("fa-warning").removeClass("fa-code-fork");
                     }
-                    branchFilterCreateItem.find("span").text(RED._("projects.create-branch-list.invalid")+": "+branchPrefix+branchFilterTerm);
+                    branchFilterCreateItem.find("span").text(RED._("projects.create-branch-list.invalid")+": "+(hasRemote?"":branchPrefix)+branchFilterTerm);
                 } else {
                     if (branchFilterCreateItem.hasClass("input-error")) {
                         branchFilterCreateItem.removeClass("input-error");
                         branchFilterCreateItem.find("i").removeClass("fa-warning").addClass("fa-code-fork");
                     }
-                    branchFilterCreateItem.find(".red-ui-sidebar-vc-branch-list-entry-create-name").text(branchPrefix+branchFilterTerm);
+                    branchFilterCreateItem.find("span").text(RED._("projects.create-branch-list.create")+":");
+                    branchFilterCreateItem.find(".red-ui-sidebar-vc-branch-list-entry-create-name").text((hasRemote?"":branchPrefix)+branchFilterTerm);
                 }
                 branchList.editableList("filter");
             }
@@ -2117,8 +2165,12 @@ RED.projects = (function() {
                     if (!entry.hasOwnProperty('commit')) {
                         body.name = branchFilter.val();
                         body.create = true;
-                        if (options.remote) {
+
-                            body.name = options.remote()+"/"+body.name;
+                        if (options.remotes) {
+                            var m = /^([^/]+)\/[^/.~*?\[]/.exec(body.name);
+                            if (!m || remotes.indexOf(m[1]) === -1) {
+                                body.name = remotes[0]+"/"+body.name;
+                            }
                         }
                     } else {
                         if ($(this).hasClass('selected')) {
@@ -2133,11 +2185,17 @@ RED.projects = (function() {
             },
             filter: function(data) {
                 var isCreateEntry = (!data.hasOwnProperty('commit'));
+                var filterTerm = branchFilterTerm;
+                if (remotes.length > 0) {
+                    var m = /^([^/]+)\/[^/.~*?\[]/.exec(filterTerm);
+                    if (filterTerm !== "" && (!m || remotes.indexOf(m[1]) == -1)) {
+                        filterTerm = remotes[0]+"/"+filterTerm;
+                    }
+                }
                 return (
                             isCreateEntry &&
                             (
-                                branchFilterTerm !== "" &&
+                                filterTerm !== "" && !branchNames.has(filterTerm)
-                                branches.indexOf(branchPrefix+branchFilterTerm) === -1
                             )
                      ) ||
                      (
@@ -2152,12 +2210,14 @@ RED.projects = (function() {
                 branchList.editableList('empty');
                 var start = Date.now();
                 var spinner = addSpinnerOverlay(container).addClass("red-ui-component-spinner-contain");
-                if (options.remote) {
+                if (options.remotes) {
-                    branchPrefix = options.remote()+"/";
+                    remotes = options.remotes();
+                    branchPrefix = remotes[0]+"/";
                 } else {
                     branchPrefix = "";
+                    remotes = [];
                 }
-
+                branchNames = new Set();
                 sendRequest({
                     url: url,
                     type: "GET",
@@ -2169,6 +2229,7 @@ RED.projects = (function() {
                             branches = result.branches;
                             result.branches.forEach(function(b) {
                                 branchList.editableList('addItem',b);
+                                branchNames.add(b.name);
                             });
                             branchList.editableList('addItem',{});
                             setTimeout(function() {
@@ -2204,7 +2265,7 @@ RED.projects = (function() {
     }
 
     function init() {
-        dialog = $('<div id="red-ui-projects-dialog" class="hide red-ui-projects-edit-form"><form class="form-horizontal"></form><div class="red-ui-component-spinner hide"><img src="red/images/spin.svg"/></div></div>')
+        dialog = $('<div id="red-ui-projects-dialog" class="hide red-ui-projects-edit-form"><div class="red-ui-projects-dialog-box"><form class="form-horizontal"></form><div class="red-ui-component-spinner hide"><img src="red/images/spin.svg"/></div></div></div>')
             .appendTo("#red-ui-editor")
             .dialog({
                 modal: true,
@@ -2291,6 +2352,7 @@ RED.projects = (function() {
             if (data.active) {
                 $.getJSON("projects/"+data.active, function(project) {
                     activeProject = project;
+                    RED.events.emit("projects:load",activeProject);
                     RED.sidebar.versionControl.refresh(true);
                     if (done) {
                         done(activeProject);

packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js

@@ -336,7 +336,7 @@ RED.sidebar.versionControl = (function() {
 
         var unstagedContent = $('<div class="red-ui-sidebar-vc-change-container"></div>').appendTo(localChanges.content);
         var header = $('<div class="red-ui-sidebar-vc-change-header">'+RED._("sidebar.project.versionControl.localFiles")+'</div>').appendTo(unstagedContent);
-        stageAllButton = $('<button class="red-ui-button red-ui-button-small" style="float: right"><i class="fa fa-plus"></i> '+RED._("sidebar.project.versionControl.all")+'</button>')
+        stageAllButton = $('<button class="red-ui-button red-ui-button-small" style="position: absolute; right: 5px; top: 5px;"><i class="fa fa-plus"></i> '+RED._("sidebar.project.versionControl.all")+'</button>')
             .appendTo(header)
             .on("click", function(evt) {
                 evt.preventDefault();
@@ -368,7 +368,7 @@ RED.sidebar.versionControl = (function() {
         unmergedContent = $('<div class="red-ui-sidebar-vc-change-container"></div>').appendTo(localChanges.content);
 
         header = $('<div class="red-ui-sidebar-vc-change-header">'+RED._("sidebar.project.versionControl.unmergedChanges")+'</div>').appendTo(unmergedContent);
-        bg = $('<div style="float: right"></div>').appendTo(header);
+        bg = $('<div style="position: absolute; right: 5px; top: 5px;"></div>').appendTo(header);
         var abortMergeButton = $('<button class="red-ui-button red-ui-button-small" style="margin-right: 5px;">'+RED._("sidebar.project.versionControl.abortMerge")+'</button>')
             .appendTo(bg)
             .on("click", function(evt) {
@@ -433,7 +433,7 @@ RED.sidebar.versionControl = (function() {
 
         header = $('<div class="red-ui-sidebar-vc-change-header">'+RED._("sidebar.project.versionControl.changeToCommit")+'</div>').appendTo(stagedContent);
 
-        bg = $('<div style="float: right"></div>').appendTo(header);
+        bg = $('<div style="position: absolute; right: 5px; top: 5px;"></div>').appendTo(header);
         var showCommitBox = function() {
             commitMessage.val("");
             submitCommitButton.prop("disabled",true);
@@ -830,10 +830,9 @@ RED.sidebar.versionControl = (function() {
         var remoteBranchList = utils.createBranchList({
             placeholder: RED._("sidebar.project.versionControl.createRemoteBranchPlaceholder"),
             currentLabel: RED._("sidebar.project.versionControl.upstream"),
-            remote: function() {
+            remotes: function() {
                 var project = RED.projects.getActiveProject();
-                var remotes = Object.keys(project.git.remotes);
+                return Object.keys(project.git.remotes);
-                return remotes[0];
             },
             container: remoteBranchSubRow,
             onselect: function(body) {

packages/node_modules/@node-red/editor-client/src/js/ui/search.js

@@ -23,8 +23,7 @@ RED.search = (function() {
     var visible = false;
 
     var index = {};
-    var keys = [];
+    var currentResults = [];
-    var results = [];
     var previousActiveElement;
 
 
@@ -66,23 +65,9 @@ RED.search = (function() {
         }
     }
 
-    function indexWorkspace() {
-        index = {};
-        RED.nodes.eachWorkspace(indexNode);
-        RED.nodes.eachSubflow(indexNode);
-        RED.nodes.eachConfig(indexNode);
-        RED.nodes.eachNode(indexNode);
-        keys = Object.keys(index);
-        keys.sort();
-        keys.forEach(function(key) {
-            index[key] = Object.keys(index[key]).map(function(id) {
-                return index[key][id];
-            })
-        })
-    }
-
     function search(val) {
-        searchResults.editableList('empty');
+        var results = [];
+        var keys = Object.keys(index);
         var typeFilter;
         var m = /(?:^| )type:([^ ]+)/.exec(val);
         if (m) {
@@ -92,8 +77,7 @@ RED.search = (function() {
 
         val = val.trim();
 
-        selected = -1;
+
-        results = [];
         if (val.length > 0 || typeFilter) {
             val = val.toLowerCase();
             var i;
@@ -104,10 +88,14 @@ RED.search = (function() {
                 var key = keys[i];
                 var kpos = keys[i].indexOf(val);
                 if (kpos > -1) {
-                    for (j=0;j<index[key].length;j++) {
+                    var ids = Object.keys(index[key]);
-                        var node = index[key][j];
+                    for (j=0;j<ids.length;j++) {
+                        var node = index[key][ids[j]];
                         if (!typeFilter || node.node.type === typeFilter) {
-                            nodes[node.node.id] = nodes[node.node.id] = node;
+                            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);
                         }
                     }
@@ -121,22 +109,8 @@ RED.search = (function() {
             for (i=0;i<list.length;i++) {
                 results.push(nodes[list[i]]);
             }
-            if (results.length > 0) {
-                for (i=0;i<Math.min(results.length,25);i++) {
-                    searchResults.editableList('addItem',results[i])
-                }
-                if (results.length > 25) {
-                    searchResults.editableList('addItem', {
-                        more: {
-                            results: results,
-                            start: 25
-                        }
-                    })
-                }
-            } else {
-                searchResults.editableList('addItem',{});
-            }
         }
+        return results;
     }
 
     function ensureSelectedIsVisible() {
@@ -161,13 +135,37 @@ RED.search = (function() {
         searchInput = $('<input type="text" data-i18n="[placeholder]menu.label.searchInput">').appendTo(searchDiv).searchBox({
             delay: 200,
             change: function() {
-                search($(this).val());
+                searchResults.editableList('empty');
+                selected = -1;
+                currentResults = search($(this).val());
+                if (currentResults.length > 0) {
+                    for (i=0;i<Math.min(currentResults.length,25);i++) {
+                        searchResults.editableList('addItem',currentResults[i])
+                    }
+                    if (currentResults.length > 25) {
+                        searchResults.editableList('addItem', {
+                            more: {
+                                results: currentResults,
+                                start: 25
+                            }
+                        })
+                    }
+                } else {
+                    searchResults.editableList('addItem',{});
+                }
+
+
             }
         });
+        var copySearchContainer = $('<button type="button" class="red-ui-button red-ui-button-small"><i class="fa fa-caret-right"></button>').appendTo(searchDiv).on('click', function(evt) {
+            evt.preventDefault();
+            RED.sidebar.info.outliner.search(searchInput.val())
+            hide();
+        });
 
         searchInput.on('keydown',function(evt) {
             var children;
-            if (results.length > 0) {
+            if (currentResults.length > 0) {
                 if (evt.keyCode === 40) {
                     // Down
                     children = searchResults.children();
@@ -199,21 +197,21 @@ RED.search = (function() {
                         var object = $(children[selected]).find(".red-ui-editableList-item-content").data('data');
                         if (object) {
                             searchResults.editableList('removeItem',object);
-                            for (i=object.more.start;i<Math.min(results.length,object.more.start+25);i++) {
+                            for (i=object.more.start;i<Math.min(currentResults.length,object.more.start+25);i++) {
-                                searchResults.editableList('addItem',results[i])
+                                searchResults.editableList('addItem',currentResults[i])
                             }
-                            if (results.length > object.more.start+25) {
+                            if (currentResults.length > object.more.start+25) {
                                 searchResults.editableList('addItem', {
                                     more: {
-                                        results: results,
+                                        results: currentResults,
                                         start: object.more.start+25
                                     }
                                 })
                             }
                         }
                     } else {
-                        if (results.length > 0) {
+                        if (currentResults.length > 0) {
-                            reveal(results[Math.max(0,selected)].node);
+                            reveal(currentResults[Math.max(0,selected)].node);
                         }
                     }
                 }
@@ -234,13 +232,13 @@ RED.search = (function() {
                     div.on("click", function(evt) {
                         evt.preventDefault();
                         searchResults.editableList('removeItem',object);
-                        for (i=object.more.start;i<Math.min(results.length,object.more.start+25);i++) {
+                        for (i=object.more.start;i<Math.min(currentResults.length,object.more.start+25);i++) {
-                            searchResults.editableList('addItem',results[i])
+                            searchResults.editableList('addItem',currentResults[i])
                         }
-                        if (results.length > object.more.start+25) {
+                        if (currentResults.length > object.more.start+25) {
                             searchResults.editableList('addItem', {
                                 more: {
-                                    results: results,
+                                    results: currentResults,
                                     start: object.more.start+25
                                 }
                             })
@@ -253,17 +251,7 @@ RED.search = (function() {
                     var def = node._def;
                     div = $('<a>',{href:'#',class:"red-ui-search-result"}).appendTo(container);
 
-                    var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).appendTo(div);
+                    RED.utils.createNodeIcon(node).appendTo(div);
-                    var colour = RED.utils.getNodeColor(node.type,def);
-                    var icon_url = RED.utils.getNodeIcon(def,node);
-                    if (node.type === 'tab') {
-                        colour = "#C0DEED";
-                    }
-                    nodeDiv.css('backgroundColor',colour);
-
-                    var iconContainer = $('<div/>',{class:"red-ui-palette-icon-container"}).appendTo(nodeDiv);
-                    RED.utils.createIconElement(icon_url, iconContainer, true);
-
                     var contentDiv = $('<div>',{class:"red-ui-search-result-node-description"}).appendTo(div);
                     if (node.z) {
                         var workspace = RED.nodes.workspace(node.z);
@@ -308,7 +296,7 @@ RED.search = (function() {
             $("#red-ui-palette-shade").show();
             $("#red-ui-sidebar-shade").show();
             $("#red-ui-sidebar-separator").hide();
-            indexWorkspace();
+
             if (dialog === null) {
                 createDialog();
             }
@@ -342,6 +330,28 @@ RED.search = (function() {
         }
     }
 
+    function clearIndex() {
+        index = {};
+    }
+
+    function addItemToIndex(item) {
+        indexNode(item);
+    }
+    function removeItemFromIndex(item) {
+        var keys = Object.keys(index);
+        for (var i=0,l=keys.length;i<l;i++) {
+            delete index[keys[i]][item.id];
+            if (Object.keys(index[keys[i]]).length === 0) {
+                delete index[keys[i]];
+            }
+        }
+    }
+    function updateItemOnIndex(item) {
+        removeItemFromIndex(item);
+        addItemToIndex(item);
+    }
+
+
     function init() {
         RED.actions.add("core:search",show);
 
@@ -358,12 +368,33 @@ RED.search = (function() {
         $("#red-ui-editor-shade").on('mousedown',hide);
         $("#red-ui-palette-shade").on('mousedown',hide);
         $("#red-ui-sidebar-shade").on('mousedown',hide);
+
+
+        RED.events.on("workspace:clear", clearIndex)
+
+        RED.events.on("flows:add", addItemToIndex)
+        RED.events.on("flows:remove", removeItemFromIndex)
+        RED.events.on("flows:change", updateItemOnIndex)
+
+        RED.events.on("subflows:add", addItemToIndex)
+        RED.events.on("subflows:remove", removeItemFromIndex)
+        RED.events.on("subflows:change", updateItemOnIndex)
+
+        RED.events.on("nodes:add",addItemToIndex);
+        RED.events.on("nodes:remove",removeItemFromIndex);
+        RED.events.on("nodes:change",updateItemOnIndex);
+
+        RED.events.on("groups:add",addItemToIndex);
+        RED.events.on("groups:remove",removeItemFromIndex);
+        RED.events.on("groups:change",updateItemOnIndex);
+
     }
 
     return {
         init: init,
         show: show,
-        hide: hide
+        hide: hide,
+        search: search
     };
 
 })();

packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js

@@ -250,6 +250,7 @@ RED.sidebar = (function() {
         RED.popover.tooltip($("#red-ui-sidebar-separator").find(".red-ui-sidebar-control-right"),RED._("keyboard.toggleSidebar"),"core:toggle-sidebar");
         showSidebar();
         RED.sidebar.info.init();
+        RED.sidebar.help.init();
         RED.sidebar.config.init();
         RED.sidebar.context.init();
         // hide info bar at start if screen rather narrow...

packages/node_modules/@node-red/editor-client/src/js/ui/state.js

@@ -25,5 +25,7 @@ RED.state = {
     IMPORT_DRAGGING: 8,
     QUICK_JOINING: 9,
     PANNING: 10,
-    SELECTING_NODE: 11
+    SELECTING_NODE: 11,
+    GROUP_DRAGGING: 12,
+    GROUP_RESIZE: 13
 }

packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js

@@ -231,7 +231,8 @@ RED.sidebar.context = (function() {
                                 RED.utils.createObjectElement(RED.utils.decodeObject(payload,format), {
                                     typeHint: data.format,
                                     sourceId: id+"."+k,
-                                    tools: tools
+                                    tools: tools,
+                                    path: ""
                                 }).appendTo(propRow.children()[1]);
                             }
                         })
@@ -275,7 +276,8 @@ RED.sidebar.context = (function() {
                                                 RED.utils.createObjectElement(RED.utils.decodeObject(payload,format), {
                                                     typeHint: data.format,
                                                     sourceId: id+"."+k,
-                                                    tools: tools
+                                                    tools: tools,
+                                                    path: ""
                                                 }).appendTo(propRow.children()[1]);
                                             }
                                         });
@@ -295,7 +297,8 @@ RED.sidebar.context = (function() {
                     RED.utils.createObjectElement(RED.utils.decodeObject(payload,format), {
                         typeHint: v.format,
                         sourceId: id+"."+k,
-                        tools: tools
+                        tools: tools,
+                        path: ""
                     }).appendTo(propRow.children()[1]);
                     if (contextStores.length > 1) {
                         $("<span>",{class:"red-ui-sidebar-context-property-storename"}).text(v.store).appendTo($(propRow.children()[0]))

packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js

@@ -0,0 +1,332 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+RED.sidebar.help = (function() {
+
+    var content;
+    var toolbar;
+    var helpSection;
+    var panels;
+    var panelRatio;
+    var helpTopics = [];
+    var treeList;
+    var tocPanel;
+    var helpIndex = {};
+
+
+    function resizeStack() {
+        var h = $(content).parent().height() - toolbar.outerHeight();
+        panels.resize(h)
+    }
+
+    function init() {
+
+        content = document.createElement("div");
+        content.className = "red-ui-sidebar-info"
+
+        toolbar = $("<div>", {class:"red-ui-sidebar-header red-ui-info-toolbar"}).appendTo(content);
+        $('<span class="button-group"><a id="red-ui-sidebar-help-show-toc" class="red-ui-button red-ui-button-small selected" href="#"><i class="fa fa-list-ul"></i></a></span>').appendTo(toolbar)
+        var showTOCButton = toolbar.find('#red-ui-sidebar-help-show-toc')
+        RED.popover.tooltip(showTOCButton,RED._("sidebar.help.showTopics"));
+        showTOCButton.on("click",function(e) {
+            e.preventDefault();
+            if ($(this).hasClass('selected')) {
+                hideTOC();
+            } else {
+                showTOC();
+            }
+        });
+
+        var stackContainer = $("<div>",{class:"red-ui-sidebar-help-stack"}).appendTo(content);
+
+        tocPanel = $("<div>", {class: "red-ui-sidebar-help-toc"}).appendTo(stackContainer);
+        var helpPanel = $("<div>").css({
+            "overflow-y": "scroll"
+        }).appendTo(stackContainer);
+
+        panels = RED.panels.create({
+            container: stackContainer
+        })
+        panels.ratio(0.3);
+
+        helpSearch = $('<input type="text" data-i18n="[placeholder]sidebar.help.search">').appendTo(toolbar).searchBox({
+            delay: 100,
+            change: function() {
+                var val = $(this).val().toLowerCase();
+                if (val) {
+                    showTOC();
+                    var c = treeList.treeList('filter',function(item) {
+                        if (item.depth === 0) {
+                            return true;
+                        }
+                        return (item.nodeType &&  item.nodeType.indexOf(val) > -1) ||
+                               (item.subflowLabel && item.subflowLabel.indexOf(val) > -1)
+                    },true)
+                } else {
+                    treeList.treeList('filter',null);
+                    var selected = treeList.treeList('selected');
+                    if (selected.id) {
+                        treeList.treeList('show',selected.id);
+                    }
+
+                }
+            }
+        })
+
+        helpSection = $("<div>",{class:"red-ui-help"}).css({
+            "padding":"6px",
+        }).appendTo(helpPanel)
+
+        $('<span class="red-ui-help-info-none">'+RED._("sidebar.help.noHelp")+'</span>').appendTo(helpSection);
+
+        treeList = $("<div>").css({width: "100%"}).appendTo(tocPanel).treeList({data: []})
+        treeList.on('treelistselect', function(e,item) {
+            if (item.nodeType) {
+                showHelp(item.nodeType);
+            }
+        })
+
+        RED.sidebar.addTab({
+            id: "help",
+            label: RED._("sidebar.help.label"),
+            name: RED._("sidebar.help.name"),
+            iconClass: "fa fa-book",
+            action:"core:show-help-tab",
+            content: content,
+            pinned: true,
+            enableOnEdit: true,
+            onchange: function() {
+                resizeStack()
+            }
+        });
+
+        $(window).on("resize", resizeStack);
+        $(window).on("focus", resizeStack);
+
+        RED.events.on('registry:node-type-added', queueRefresh);
+        RED.events.on('registry:node-type-removed', queueRefresh);
+        RED.events.on('subflows:change', refreshSubflow);
+
+        RED.actions.add("core:show-help-tab",show);
+
+    }
+
+    var refreshTimer;
+    function queueRefresh() {
+        if (!refreshTimer) {
+            refreshTimer = setTimeout(function() {
+                refreshTimer = null;
+                refreshHelpIndex();
+            },500);
+        }
+    }
+
+    function refreshSubflow(sf) {
+        var item = treeList.treeList('get',"node-type:subflow:"+sf.id);
+        item.subflowLabel = sf._def.label().toLowerCase();
+        item.treeList.replaceElement(getNodeLabel({_def:sf._def,type:sf._def.label()}));
+    }
+
+    function hideTOC() {
+        var tocButton = $('#red-ui-sidebar-help-show-toc')
+        if (tocButton.hasClass('selected')) {
+            tocButton.removeClass('selected');
+            panelRatio = panels.ratio();
+            tocPanel.css({"transition":"height 0.2s"})
+            panels.ratio(0)
+            setTimeout(function() {
+                tocPanel.css({"transition":""})
+            },250);
+        }
+    }
+    function showTOC() {
+        var tocButton = $('#red-ui-sidebar-help-show-toc')
+        if (!tocButton.hasClass('selected')) {
+            tocButton.addClass('selected');
+            tocPanel.css({"transition":"height 0.2s"})
+            panels.ratio(Math.max(0.3,Math.min(panelRatio,0.7)));
+            setTimeout(function() {
+                tocPanel.css({"transition":""})
+                var selected = treeList.treeList('selected');
+                if (selected.id) {
+                    treeList.treeList('show',selected);
+                }
+            },250);
+        }
+    }
+
+    function refreshHelpIndex() {
+        helpTopics = [];
+        var modules = RED.nodes.registry.getModuleList();
+        var moduleNames = Object.keys(modules);
+        moduleNames.sort();
+
+        var helpData = [{
+            label: RED._("sidebar.help.nodeHelp"),
+            children: [],
+            expanded: true
+        }]
+
+        var subflows = RED.nodes.registry.getNodeTypes().filter(function(t) {return /subflow/.test(t)});
+        if (subflows.length > 0) {
+            helpData[0].children.push({
+                label: RED._("menu.label.subflows"),
+                children: []
+            })
+            subflows.forEach(function(nodeType) {
+                var sf = RED.nodes.getType(nodeType);
+                helpData[0].children[0].children.push({
+                    id:"node-type:"+nodeType,
+                    nodeType: nodeType,
+                    subflowLabel: sf.label().toLowerCase(),
+                    element: getNodeLabel({_def:sf,type:sf.label()})
+                })
+            })
+        }
+
+
+        moduleNames.forEach(function(moduleName) {
+            var module = modules[moduleName];
+            var nodeTypes = [];
+
+            var setNames = Object.keys(module.sets);
+            setNames.forEach(function(setName) {
+                module.sets[setName].types.forEach(function(nodeType) {
+                    if ($("script[data-help-name='"+nodeType+"']").length) {
+                        nodeTypes.push({
+                            id: "node-type:"+nodeType,
+                            nodeType: nodeType,
+                            element:getNodeLabel({_def:RED.nodes.getType(nodeType),type:nodeType})
+                        })
+                    }
+                })
+            })
+            if (nodeTypes.length > 0) {
+                nodeTypes.sort(function(A,B) {
+                    return A.nodeType.localeCompare(B.nodeType)
+                })
+                helpData[0].children.push({
+                    id: moduleName,
+                    icon: "fa fa-cube",
+                    label: moduleName,
+                    children: nodeTypes
+                })
+            }
+        });
+        treeList.treeList("data",helpData);
+    }
+
+    function getNodeLabel(n) {
+        var div = $('<div>',{class:"red-ui-info-outline-item"});
+        RED.utils.createNodeIcon(n).appendTo(div);
+        var contentDiv = $('<div>',{class:"red-ui-search-result-description"}).appendTo(div);
+        $('<div>',{class:"red-ui-search-result-node-label red-ui-info-outline-item-label"}).text(n.name||n.type).appendTo(contentDiv);
+        return div;
+    }
+
+    function showHelp(nodeType) {
+        helpSection.empty();
+        var helpText;
+        var title;
+        var m = /^subflow(:(.+))?$/.exec(nodeType);
+        if (m && m[2]) {
+            var subflowNode = RED.nodes.subflow(m[2]);
+            helpText = (RED.utils.renderMarkdown(subflowNode.info||"")||('<span class="red-ui-help-info-none">'+RED._("sidebar.info.none")+'</span>'));
+            title = subflowNode.name || nodeType;
+        } else {
+            helpText = $("script[data-help-name='"+nodeType+"']").html()||('<span class="red-ui-help-info-none">'+RED._("sidebar.info.none")+'</span>');
+            title = nodeType;
+        }
+        setInfoText(title, helpText, helpSection);
+
+        var ratio = panels.ratio();
+        if (ratio > 0.7) {
+            panels.ratio(0.7)
+        }
+        treeList.treeList("show","node-type:"+nodeType)
+        treeList.treeList("select","node-type:"+nodeType, false);
+
+    }
+
+    function show(type) {
+        RED.sidebar.show("help");
+        if (type) {
+            hideTOC();
+            showHelp(type);
+        }
+    }
+
+    // TODO: DRY - projects.js
+    function addTargetToExternalLinks(el) {
+        $(el).find("a").each(function(el) {
+            var href = $(this).attr('href');
+            if (/^https?:/.test(href)) {
+                $(this).attr('target','_blank');
+            }
+        });
+        return el;
+    }
+
+    function setInfoText(title, infoText,target) {
+        if (title) {
+            $("<h1>",{class:"red-ui-help-title"}).text(title).appendTo(target);
+        }
+        var info = addTargetToExternalLinks($('<div class="red-ui-help"><span class="red-ui-text-bidi-aware" dir=\"'+RED.text.bidi.resolveBaseTextDir(infoText)+'">'+infoText+'</span></div>')).appendTo(target);
+        info.find(".red-ui-text-bidi-aware").contents().filter(function() { return this.nodeType === 3 && this.textContent.trim() !== "" }).wrap( "<span></span>" );
+        var foldingHeader = "H3";
+        info.find(foldingHeader).wrapInner('<a class="red-ui-help-info-header expanded" href="#"></a>')
+            .find("a").prepend('<i class="fa fa-angle-right">').on("click", function(e) {
+                e.preventDefault();
+                var isExpanded = $(this).hasClass('expanded');
+                var el = $(this).parent().next();
+                while(el.length === 1 && el[0].nodeName !== foldingHeader) {
+                    el.toggle(!isExpanded);
+                    el = el.next();
+                }
+                $(this).toggleClass('expanded',!isExpanded);
+            })
+        target.parent().scrollTop(0);
+    }
+
+    function set(html,title) {
+        $(helpSection).empty();
+        setInfoText(title,html,helpSection);
+        hideTOC();
+        show();
+    }
+
+    function refreshSelection(selection) {
+        if (selection === undefined) {
+            selection = RED.view.selection();
+        }
+        if (selection.nodes) {
+            if (selection.nodes.length == 1) {
+                var node = selection.nodes[0];
+                if (node.type === "subflow" && node.direction) {
+                    // ignore subflow virtual ports
+                } else if (node.type !== 'group'){
+                    showHelp(node.type);
+                }
+            }
+        }
+    }
+    RED.events.on("view:selection-changed",refreshSelection);
+
+    return {
+        init: init,
+        show: show,
+        set: set
+    }
+})();

packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js

@@ -0,0 +1,475 @@
+RED.sidebar.info.outliner = (function() {
+
+    var treeList;
+    var searchInput;
+    var projectInfo;
+    var projectInfoLabel;
+    var flowList;
+    var subflowList;
+    var globalConfigNodes;
+
+    var objects = {};
+    var missingParents = {};
+
+    function getFlowData() {
+        var flowData = [
+            {
+                label: RED._("menu.label.flows"),
+                expanded: true,
+                children: []
+            },
+            {
+                label: RED._("menu.label.subflows"),
+                children: []
+            },
+            {
+                id: "__global__",
+                label: RED._("sidebar.info.globalConfig"),
+                children: []
+            }
+        ]
+        flowList = flowData[0];
+        subflowList = flowData[1];
+        globalConfigNodes = flowData[2];
+
+        return flowData;
+    }
+
+    function getProjectLabel(p) {
+        var div = $('<div>',{class:"red-ui-info-outline-item red-ui-info-outline-item-flow"});
+        div.css("width", "calc(100% - 40px)");
+        var contentDiv = $('<div>',{class:"red-ui-search-result-description red-ui-info-outline-item-label"}).appendTo(div);
+        contentDiv.text(p.name);
+        var controls = $('<div>',{class:"red-ui-info-outline-item-controls"}).appendTo(div);
+        var editProjectButton = $('<button class="red-ui-button red-ui-button-small" style="position:absolute;right:5px;top: 3px;"><i class="fa fa-ellipsis-h"></i></button>')
+            .appendTo(controls)
+            .on("click", function(evt) {
+                evt.preventDefault();
+                RED.projects.editProject();
+            });
+        RED.popover.tooltip(editProjectButton,RED._('sidebar.project.showProjectSettings'));
+        return div;
+    }
+
+    var empties = {};
+    function getEmptyItem(id) {
+        var item = {
+            empty: true,
+            element: $('<div class="red-ui-info-outline-item red-ui-info-outline-item-empty">').text(RED._("sidebar.info.empty")),
+        }
+        empties[id] = item;
+        return item;
+    }
+
+    function getNodeLabelText(n) {
+        var label = n.name || n.type+": "+n.id;
+        if (n._def.label) {
+            try {
+                label = (typeof n._def.label === "function" ? n._def.label.call(n) : n._def.label)||"";
+            } catch(err) {
+                console.log("Definition error: "+type+".label",err);
+            }
+        }
+        var newlineIndex = label.indexOf("\\n");
+        if (newlineIndex > -1) {
+            label = label.substring(0,newlineIndex)+"...";
+        }
+        return label;
+    }
+
+    function getNodeLabel(n) {
+        var div = $('<div>',{class:"red-ui-info-outline-item"});
+        RED.utils.createNodeIcon(n).appendTo(div);
+        var contentDiv = $('<div>',{class:"red-ui-search-result-description"}).appendTo(div);
+        var labelText = getNodeLabelText(n);
+        var label = $('<div>',{class:"red-ui-search-result-node-label red-ui-info-outline-item-label"}).appendTo(contentDiv);
+        if (labelText) {
+            label.text(labelText)
+        } else {
+            label.html("&nbsp;")
+        }
+
+        addControls(n, div);
+
+        return div;
+    }
+
+    function getFlowLabel(n) {
+        var div = $('<div>',{class:"red-ui-info-outline-item red-ui-info-outline-item-flow"});
+        var contentDiv = $('<div>',{class:"red-ui-search-result-description red-ui-info-outline-item-label"}).appendTo(div);
+        var label = (typeof n === "string")? n : n.label;
+        var newlineIndex = label.indexOf("\\n");
+        if (newlineIndex > -1) {
+            label = label.substring(0,newlineIndex)+"...";
+        }
+        contentDiv.text(label);
+        addControls(n, div);
+        return div;
+    }
+
+    function getSubflowLabel(n) {
+
+        var div = $('<div>',{class:"red-ui-info-outline-item"});
+        RED.utils.createNodeIcon(n).appendTo(div);
+        var contentDiv = $('<div>',{class:"red-ui-search-result-description"}).appendTo(div);
+        var labelText = getNodeLabelText(n);
+        var label = $('<div>',{class:"red-ui-search-result-node-label red-ui-info-outline-item-label"}).appendTo(contentDiv);
+        if (labelText) {
+            label.text(labelText)
+        } else {
+            label.html("&nbsp;")
+        }
+
+        addControls(n, div);
+
+        return div;
+
+
+        // var div = $('<div>',{class:"red-ui-info-outline-item red-ui-info-outline-item-flow"});
+        // var contentDiv = $('<div>',{class:"red-ui-search-result-description red-ui-info-outline-item-label"}).appendTo(div);
+        // contentDiv.text(n.name || n.id);
+        // addControls(n, div);
+        // return div;
+    }
+
+    function addControls(n,div) {
+        var controls = $('<div>',{class:"red-ui-info-outline-item-controls red-ui-info-outline-item-hover-controls"}).appendTo(div);
+        if (n._def.button) {
+            $('<button type="button" class="red-ui-info-outline-item-control-action red-ui-button red-ui-button-small"><i class="fa fa-toggle-right"></i></button>').appendTo(controls).on("click",function(evt) {
+                evt.preventDefault();
+                evt.stopPropagation();
+                RED.view.clickNodeButton(n);
+            })
+        }
+        // $('<button type="button" class="red-ui-info-outline-item-control-reveal red-ui-button red-ui-button-small"><i class="fa fa-eye"></i></button>').appendTo(controls).on("click",function(evt) {
+        //     evt.preventDefault();
+        //     evt.stopPropagation();
+        //     RED.view.reveal(n.id);
+        // })
+        if (n.type !== 'group' && n.type !== 'subflow') {
+            $('<button type="button" class="red-ui-info-outline-item-control-disable red-ui-button red-ui-button-small"><i class="fa fa-circle-thin"></i><i class="fa fa-ban"></i></button>').appendTo(controls).on("click",function(evt) {
+                evt.preventDefault();
+                evt.stopPropagation();
+                if (n.type === 'tab') {
+                    if (n.disabled) {
+                        RED.workspaces.enable(n.id)
+                    } else {
+                        RED.workspaces.disable(n.id)
+                    }
+                } else {
+                    // TODO: this ought to be a utility function in RED.nodes
+                    var historyEvent = {
+                        t: "edit",
+                        node: n,
+                        changed: n.changed,
+                        changes: {
+                            d: n.d
+                        },
+                        dirty:RED.nodes.dirty()
+                    }
+                    if (n.d) {
+                        delete n.d;
+                    } else {
+                        n.d = true;
+                    }
+                    n.dirty = true;
+                    n.changed = true;
+                    RED.events.emit("nodes:change",n);
+                    RED.nodes.dirty(true)
+                    RED.view.redraw();
+                }
+            });
+        } else {
+            $('<div class="red-ui-info-outline-item-control-spacer">').appendTo(controls)
+        }
+        controls.find("button").on("dblclick", function(evt) {
+            evt.preventDefault();
+            evt.stopPropagation();
+        })
+    }
+
+    function onProjectLoad(activeProject) {
+        objects = {};
+        var newFlowData = getFlowData();
+        projectInfoLabel.empty();
+        getProjectLabel(activeProject).appendTo(projectInfoLabel);
+        projectInfo.show();
+        treeList.treeList('data',newFlowData);
+    }
+
+    function build() {
+        var container = $("<div>", {class:"red-ui-info-outline"}).css({'height': '100%'});
+        var toolbar = $("<div>", {class:"red-ui-sidebar-header red-ui-info-toolbar"}).appendTo(container);
+
+        searchInput = $('<input type="text" data-i18n="[placeholder]menu.label.search">').appendTo(toolbar).searchBox({
+            delay: 300,
+            change: function() {
+                var val = $(this).val();
+                var searchResults = RED.search.search(val);
+                if (val) {
+                    var resultMap = {};
+                    for (var i=0,l=searchResults.length;i<l;i++) {
+                        resultMap[searchResults[i].node.id] = true;
+                    }
+                    var c = treeList.treeList('filter',function(item) {
+                        if (item.depth === 0) {
+                            return true;
+                        }
+                        return item.id &&  objects[item.id] && resultMap[item.id]
+                    },true)
+                } else {
+                    treeList.treeList('filter',null);
+                    var selected = treeList.treeList('selected');
+                    if (selected.id) {
+                        treeList.treeList('show',selected.id);
+                    }
+
+                }
+            }
+        });
+
+        projectInfo = $('<div class="red-ui-treeList-label red-ui-info-outline-project"><span class="red-ui-treeList-icon"><i class="fa fa-archive"></i></span></div>').hide().appendTo(container)
+        projectInfoLabel = $('<span>').appendTo(projectInfo);
+
+        // <div class="red-ui-info-outline-item red-ui-info-outline-item-flow" style=";"><div class="red-ui-search-result-description red-ui-info-outline-item-label">Space Monkey</div><div class="red-ui-info-outline-item-controls"><button class="red-ui-button red-ui-button-small" style="position:absolute;right:5px;"><i class="fa fa-ellipsis-h"></i></button></div></div></div>').appendTo(container)
+
+        treeList = $("<div>").css({width: "100%"}).appendTo(container).treeList({
+            data:getFlowData()
+        })
+        treeList.on('treelistselect', function(e,item) {
+            var node = RED.nodes.node(item.id) || RED.nodes.group(item.id);
+            if (node) {
+                if (node.type === 'group' || node._def.category !== "config") {
+                    RED.view.select({nodes:[node]})
+                } else {
+                    RED.view.select({nodes:[]})
+                }
+            }
+        })
+        treeList.on('treelistconfirm', function(e,item) {
+            var node = RED.nodes.node(item.id);
+            if (node) {
+                if (node._def.category === "config") {
+                    RED.editor.editConfig("", node.type, node.id);
+                } else {
+                    RED.editor.edit(node);
+                }
+            }
+        })
+
+        RED.events.on("projects:load", onProjectLoad)
+
+        RED.events.on("flows:add", onFlowAdd)
+        RED.events.on("flows:remove", onObjectRemove)
+        RED.events.on("flows:change", onFlowChange)
+        RED.events.on("flows:reorder", onFlowsReorder)
+
+        RED.events.on("subflows:add", onSubflowAdd)
+        RED.events.on("subflows:remove", onObjectRemove)
+        RED.events.on("subflows:change", onSubflowChange)
+
+        RED.events.on("nodes:add",onNodeAdd);
+        RED.events.on("nodes:remove",onObjectRemove);
+        RED.events.on("nodes:change",onNodeChange);
+
+        RED.events.on("groups:add",onNodeAdd);
+        RED.events.on("groups:remove",onObjectRemove);
+        RED.events.on("groups:change",onNodeChange);
+
+        RED.events.on("view:selection-changed", onSelectionChanged);
+
+        RED.events.on("workspace:clear", onWorkspaceClear)
+
+        return container;
+    }
+    function onWorkspaceClear() {
+        treeList.treeList('data',getFlowData());
+    }
+    function onFlowAdd(ws) {
+        objects[ws.id] = {
+            id: ws.id,
+            element: getFlowLabel(ws),
+            children:[],
+            deferBuild: true,
+            icon: "red-ui-icons red-ui-icons-flow",
+            gutter: getGutter(ws)
+        }
+        if (missingParents[ws.id]) {
+            objects[ws.id].children = missingParents[ws.id];
+            delete missingParents[ws.id]
+        } else {
+            objects[ws.id].children.push(getEmptyItem(ws.id));
+        }
+        flowList.treeList.addChild(objects[ws.id])
+        objects[ws.id].element.toggleClass("red-ui-info-outline-item-disabled", !!ws.disabled)
+        objects[ws.id].treeList.container.toggleClass("red-ui-info-outline-item-disabled", !!ws.disabled)
+
+
+    }
+    function onFlowChange(n) {
+        var existingObject = objects[n.id];
+
+        var label = n.label || n.id;
+        var newlineIndex = label.indexOf("\\n");
+        if (newlineIndex > -1) {
+            label = label.substring(0,newlineIndex)+"...";
+        }
+        existingObject.element.find(".red-ui-info-outline-item-label").text(label);
+        existingObject.element.toggleClass("red-ui-info-outline-item-disabled", !!n.disabled)
+        existingObject.treeList.container.toggleClass("red-ui-info-outline-item-disabled", !!n.disabled)
+    }
+    function onFlowsReorder(order) {
+        var indexMap = {};
+        order.forEach(function(id,index) {
+            indexMap[id] = index;
+        })
+
+        flowList.treeList.sortChildren(function(A,B) {
+            if (A.id === "__global__") { return -1 }
+            if (B.id === "__global__") { return 1 }
+            return indexMap[A.id] - indexMap[B.id]
+        })
+    }
+    function onSubflowAdd(sf) {
+        objects[sf.id] = {
+            id: sf.id,
+            element: getNodeLabel(sf),
+            children:[],
+            deferBuild: true,
+            gutter: getGutter(sf)
+        }
+        if (missingParents[sf.id]) {
+            objects[sf.id].children = missingParents[sf.id];
+            delete missingParents[sf.id]
+        } else {
+            objects[sf.id].children.push(getEmptyItem(sf.id));
+        }
+        subflowList.treeList.addChild(objects[sf.id])
+    }
+    function onSubflowChange(sf) {
+        var existingObject = objects[sf.id];
+        existingObject.treeList.replaceElement(getNodeLabel(sf));
+        // existingObject.element.find(".red-ui-info-outline-item-label").text(n.name || n.id);
+        RED.nodes.eachNode(function(n) {
+            if (n.type == "subflow:"+sf.id) {
+                var sfInstance = objects[n.id];
+                sfInstance.treeList.replaceElement(getNodeLabel(n));
+            }
+        });
+    }
+
+    function onNodeChange(n) {
+        var existingObject = objects[n.id];
+        var parent = n.g||n.z;
+
+        var nodeLabelText = getNodeLabelText(n);
+        if (nodeLabelText) {
+            existingObject.element.find(".red-ui-info-outline-item-label").text(nodeLabelText);
+        } else {
+            existingObject.element.find(".red-ui-info-outline-item-label").html("&nbsp;");
+        }
+
+        if (parent !== existingObject.parent.id) {
+            existingObject.treeList.remove();
+            if (!parent) {
+                globalConfigNodes.treeList.addChild(existingObject);
+            } else {
+                if (empties[parent]) {
+                    empties[parent].treeList.remove();
+                    delete empties[parent];
+                }
+                objects[parent].treeList.addChild(existingObject)
+            }
+        }
+        existingObject.element.toggleClass("red-ui-info-outline-item-disabled", !!n.d)
+    }
+    function onObjectRemove(n) {
+        var existingObject = objects[n.id];
+        existingObject.treeList.remove();
+        delete objects[n.id]
+        var parent = existingObject.parent;
+        if (parent.children.length === 0) {
+            parent.treeList.addChild(getEmptyItem(parent.id));
+        }
+        if (existingObject.children && (existingObject.children.length > 0)) {
+            existingObject.children.forEach(function (nc) {
+                if (!nc.empty) {
+                    var childObject = objects[nc.id];
+                    nc.parent = parent;
+                    objects[parent.id].treeList.addChild(childObject);
+                }
+            });
+        }
+    }
+    function getGutter(n) {
+        var span = $("<span>",{class:"red-ui-info-outline-gutter"});
+        $('<button type="button" class="red-ui-info-outline-item-control-reveal red-ui-button red-ui-button-small"><i class="fa fa-search"></i></button>').appendTo(span).on("click",function(evt) {
+            evt.preventDefault();
+            evt.stopPropagation();
+            RED.view.reveal(n.id);
+        })
+        return span;
+    }
+    function onNodeAdd(n) {
+        objects[n.id] = {
+            id: n.id,
+            element: getNodeLabel(n),
+            gutter: getGutter(n)
+        }
+        if (n.type === "group") {
+            objects[n.id].children = [];
+            objects[n.id].deferBuild = true;
+            if (missingParents[n.id]) {
+                objects[n.id].children = missingParents[n.id];
+                delete missingParents[n.id]
+            }
+        }
+        var parent = n.g||n.z;
+        if (parent) {
+            if (objects[parent]) {
+                if (empties[parent]) {
+                    empties[parent].treeList.remove();
+                    delete empties[parent];
+                }
+                if (objects[parent].treeList) {
+                    objects[parent].treeList.addChild(objects[n.id]);
+                } else {
+                    objects[parent].children.push(objects[n.id])
+                }
+            } else {
+                missingParents[parent] = missingParents[parent]||[];
+                missingParents[parent].push(objects[n.id])
+            }
+        } else {
+            // No parent - add to Global flow list
+            globalConfigNodes.treeList.addChild(objects[n.id])
+        }
+        objects[n.id].element.toggleClass("red-ui-info-outline-item-disabled", !!n.d)
+    }
+
+    function onSelectionChanged(selection) {
+        // treeList.treeList('clearSelection');
+    }
+
+    return {
+        build: build,
+        search: function(val) {
+            searchInput.searchBox('value',val)
+        },
+        select: function(node) {
+            if (node) {
+                if (Array.isArray(node)) {
+                    treeList.treeList('select', node.map(function(n) { return objects[n.id] }), false)
+                } else {
+                    treeList.treeList('select', objects[node.id], false)
+
+                }
+            } else {
+                treeList.treeList('clearSelection')
+            }
+        },
+        reveal: function(node) {
+            treeList.treeList('show', objects[node.id])
+        }
+    }
+})();

packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js

@@ -15,28 +15,33 @@
  **/
 RED.sidebar.info = (function() {
 
-    marked.setOptions({
-        renderer: new marked.Renderer(),
-        gfm: true,
-        tables: true,
-        breaks: false,
-        pedantic: false,
-        sanitize: true,
-        smartLists: true,
-        smartypants: false
-    });
-
     var content;
-    var sections;
+    var panels;
-    var propertiesSection;
     var infoSection;
-    var helpSection;
+
+    var propertiesPanelContent;
+    var propertiesPanelHeader;
+    var propertiesPanelHeaderIcon;
+    var propertiesPanelHeaderLabel;
+    var propertiesPanelHeaderReveal;
+    var propertiesPanelHeaderHelp;
+
+    var selectedObject;
+
+    var tipContainer;
     var tipBox;
 
+    // TODO: remove this
     var expandedSections = {
         "property": false
     };
 
+    function resizeStack() {
+        if (panels) {
+            var h = $(content).parent().height() - tipContainer.outerHeight();
+            panels.resize(h)
+        }
+    }
     function init() {
 
         content = document.createElement("div");
@@ -46,31 +51,79 @@ RED.sidebar.info = (function() {
 
         var stackContainer = $("<div>",{class:"red-ui-sidebar-info-stack"}).appendTo(content);
 
-        sections = RED.stack.create({
+        var outlinerPanel = $("<div>").css({
-            container: stackContainer
+            "overflow": "hidden",
-        }).hide();
+            "height": "calc(70%)"
+        }).appendTo(stackContainer);
+        var propertiesPanel = $("<div>").css({
+            "overflow":"hidden",
+            "height":"100%",
+            "display": "flex",
+            "flex-direction": "column"
+        }).appendTo(stackContainer);
+        propertiesPanelHeader = $("<div>", {class:"red-ui-palette-header red-ui-info-header"}).css({
+            "flex":"0 0 auto"
+        }).appendTo(propertiesPanel);
 
-        propertiesSection = sections.add({
+        propertiesPanelHeaderIcon = $("<span>").appendTo(propertiesPanelHeader);
-            title: RED._("sidebar.info.info"),
+        propertiesPanelHeaderLabel = $("<span>").appendTo(propertiesPanelHeader);
-            collapsible: true
+        propertiesPanelHeaderHelp = $('<button class="red-ui-button red-ui-button-small"><i class="fa fa-book"></button>').css({
+            position: 'absolute',
+            top: '12px',
+            right: '32px'
+        }).on("click", function(evt) {
+            evt.preventDefault();
+            evt.stopPropagation();
+            if (selectedObject) {
+                RED.sidebar.help.show(selectedObject.type);
+            }
+        }).appendTo(propertiesPanelHeader);
+        RED.popover.tooltip(propertiesPanelHeaderHelp,RED._("sidebar.help.showHelp"));
+
+
+        propertiesPanelHeaderReveal = $('<button class="red-ui-button red-ui-button-small"><i class="fa fa-search"></button>').css({
+            position: 'absolute',
+            top: '12px',
+            right: '8px'
+        }).on("click", function(evt) {
+            evt.preventDefault();
+            evt.stopPropagation();
+            if (selectedObject) {
+                RED.sidebar.info.outliner.reveal(selectedObject);
+                RED.view.reveal(selectedObject.id);
+            }
+        }).appendTo(propertiesPanelHeader);
+        RED.popover.tooltip(propertiesPanelHeaderReveal,RED._("sidebar.help.showInOutline"));
+
+
+        propertiesPanelContent = $("<div>").css({
+            "flex":"1 1 auto",
+            "overflow-y":"scroll",
+        }).appendTo(propertiesPanel);
+
+
+        panels = RED.panels.create({container: stackContainer})
+        panels.ratio(0.6);
+        RED.sidebar.info.outliner.build().appendTo(outlinerPanel);
+
+
+        RED.sidebar.addTab({
+            id: "info",
+            label: RED._("sidebar.info.label"),
+            name: RED._("sidebar.info.name"),
+            iconClass: "fa fa-info",
+            action:"core:show-info-tab",
+            content: content,
+            pinned: true,
+            enableOnEdit: true
         });
-        propertiesSection.expand();
 
-        infoSection = sections.add({
+        $(window).on("resize", resizeStack);
-            title: RED._("sidebar.info.desc"),
+        $(window).on("focus", resizeStack);
-            collapsible: true
-        });
-        infoSection.expand();
-        infoSection.content.css("padding","6px");
 
-        helpSection = sections.add({
-            title: RED._("sidebar.info.nodeHelp"),
-            collapsible: true
-        });
-        helpSection.expand();
-        helpSection.content.css("padding","6px");
 
-        var tipContainer = $('<div class="red-ui-help-tips"></div>').appendTo(content);
+        // Tip Box
+        tipContainer = $('<div class="red-ui-help-tips"></div>').appendTo(content);
         tipBox = $('<div class="red-ui-help-tip"></div>').appendTo(tipContainer);
         var tipButtons = $('<div class="red-ui-help-tips-buttons"></div>').appendTo(tipContainer);
 
@@ -86,17 +139,6 @@ RED.sidebar.info = (function() {
             RED.actions.invoke("core:toggle-show-tips");
             RED.notify(RED._("sidebar.info.showTips"));
         });
-
-        RED.sidebar.addTab({
-            id: "info",
-            label: RED._("sidebar.info.label"),
-            name: RED._("sidebar.info.name"),
-            iconClass: "fa fa-info",
-            action:"core:show-info-tab",
-            content: content,
-            pinned: true,
-            enableOnEdit: true
-        });
         if (tips.enabled()) {
             tips.start();
         } else {
@@ -124,46 +166,36 @@ RED.sidebar.info = (function() {
             refreshSelection();
             return;
         }
-        sections.show();
+        $(propertiesPanelContent).empty();
-        $(propertiesSection.content).empty();
-        $(infoSection.content).empty();
-        $(helpSection.content).empty();
-        infoSection.title.text(RED._("sidebar.info.desc"));
 
         var propRow;
 
-        var table = $('<table class="red-ui-info-table"></table>').appendTo(propertiesSection.content);
+        var table = $('<table class="red-ui-info-table"></table>').appendTo(propertiesPanelContent);
         var tableBody = $('<tbody>').appendTo(table);
 
         var subflowNode;
         var subflowUserCount;
 
-        var activeProject = RED.projects.getActiveProject();
-        if (activeProject) {
-            propRow = $('<tr class="red-ui-help-info-row"><td>'+ RED._("sidebar.project.name") + '</td><td></td></tr>').appendTo(tableBody);
-            $(propRow.children()[1]).text(activeProject.name||"");
-            $('<tr class="red-ui-help-property-expand blank"><td colspan="2"></td></tr>').appendTo(tableBody);
-            var editProjectButton = $('<button class="red-ui-button red-ui-button-small" style="position:absolute;right:2px;"><i class="fa fa-ellipsis-h"></i></button>')
-                .appendTo(propRow.children()[1])
-                .on("click", function(evt) {
-                    evt.preventDefault();
-                    RED.projects.editProject();
-                });
-            RED.popover.tooltip(editProjectButton,RED._('sidebar.project.showProjectSettings'));
-        }
-        propertiesSection.container.show();
-        infoSection.container.show();
-        helpSection.container.show();
         if (node === null) {
+            RED.sidebar.info.outliner.select(null);
             return;
         } else if (Array.isArray(node)) {
             // Multiple things selected
             // - hide help and info sections
+            RED.sidebar.info.outliner.select(node);
+
+            propertiesPanelHeaderIcon.empty();
+            RED.utils.createNodeIcon({type:"_selection_"}).appendTo(propertiesPanelHeaderIcon);
+            propertiesPanelHeaderLabel.text("Selection");
+            propertiesPanelHeaderReveal.hide();
+            propertiesPanelHeaderHelp.hide();
+            selectedObject = null;
 
             var types = {
                 nodes:0,
                 flows:0,
-                subflows:0
+                subflows:0,
+                groups: 0
             }
             node.forEach(function(n) {
                 if (n.type === 'tab') {
@@ -171,12 +203,13 @@ RED.sidebar.info = (function() {
                     types.nodes += RED.nodes.filterNodes({z:n.id}).length;
                 } else if (n.type === 'subflow') {
                     types.subflows++;
+                } else if (n.type === 'group') {
+                    types.groups++;
                 } else {
                     types.nodes++;
                 }
             });
-            helpSection.container.hide();
+            // infoSection.container.hide();
-            infoSection.container.hide();
             // - show the count of selected nodes
             propRow = $('<tr class="red-ui-help-info-row"><td>'+RED._("sidebar.info.selection")+"</td><td></td></tr>").appendTo(tableBody);
 
@@ -190,14 +223,19 @@ RED.sidebar.info = (function() {
             if (types.nodes > 0) {
                 $('<div>').text(RED._("clipboard.node",{count:types.nodes})).appendTo(counts);
             }
+            if (types.groups > 0) {
+                $('<div>').text(RED._("clipboard.group",{count:types.groups})).appendTo(counts);
+            }
         } else {
             // A single 'thing' selected.
 
+            RED.sidebar.info.outliner.select(node);
+
             // Check to see if this is a subflow or subflow instance
-            var m = /^subflow(:(.+))?$/.exec(node.type);
+            var subflowRegex = /^subflow(:(.+))?$/.exec(node.type);
-            if (m) {
+            if (subflowRegex) {
-                if (m[2]) {
+                if (subflowRegex[2]) {
-                    subflowNode = RED.nodes.subflow(m[2]);
+                    subflowNode = RED.nodes.subflow(subflowRegex[2]);
                 } else {
                     subflowNode = node;
                 }
@@ -210,33 +248,76 @@ RED.sidebar.info = (function() {
                     }
                 });
             }
+
+            propertiesPanelHeaderIcon.empty();
+            RED.utils.createNodeIcon(node).appendTo(propertiesPanelHeaderIcon);
+            var objectLabel = RED.utils.getNodeLabel(node, node.type+": "+node.id)
+            var newlineIndex = objectLabel.indexOf("\\n");
+            if (newlineIndex > -1) {
+                objectLabel = objectLabel.substring(0,newlineIndex)+"...";
+            }
+            propertiesPanelHeaderLabel.text(objectLabel);
+            propertiesPanelHeaderReveal.show();
+            selectedObject = node;
+
+            propRow = $('<tr class="red-ui-help-info-row"><td></td><td></td></tr>').appendTo(tableBody);
+            var objectType = "node";
+            if (node.type === "subflow" || subflowRegex) {
+                objectType = "subflow";
+            } else if (node.type === "tab") {
+                objectType = "flow";
+            }else if (node.type === "group") {
+                objectType = "group";
+            }
+            $(propRow.children()[0]).text(RED._("sidebar.info."+objectType))
+            RED.utils.createObjectElement(node.id).appendTo(propRow.children()[1]);
+
             if (node.type === "tab" || node.type === "subflow") {
                 // If nothing is selected, but we're on a flow or subflow tab.
-                propRow = $('<tr class="red-ui-help-info-row"><td>'+RED._("sidebar.info."+(node.type==='tab'?'flow':'subflow'))+'</td><td></td></tr>').appendTo(tableBody);
+                propertiesPanelHeaderHelp.hide();
-                RED.utils.createObjectElement(node.id).appendTo(propRow.children()[1]);
+
-                propRow = $('<tr class="red-ui-help-info-row"><td>'+RED._("sidebar.info.tabName")+"</td><td></td></tr>").appendTo(tableBody);
+            } else if (node.type === "group") {
-                $(propRow.children()[1]).text(node.label||node.name||"");
+                propertiesPanelHeaderHelp.hide();
-                if (node.type === "tab") {
+
-                    propRow = $('<tr class="red-ui-help-info-row"><td>'+RED._("sidebar.info.status")+'</td><td></td></tr>').appendTo(tableBody);
+                propRow = $('<tr class="red-ui-help-info-row"><td>&nbsp;</td><td></td></tr>').appendTo(tableBody);
-                    $(propRow.children()[1]).text((!!!node.disabled)?RED._("sidebar.info.enabled"):RED._("sidebar.info.disabled"))
+
+                var typeCounts = {
+                    nodes:0,
+                    groups: 0
                 }
+                var allNodes = RED.group.getNodes(node,true);
+                allNodes.forEach(function(n) {
+                    if (n.type === "group") {
+                        typeCounts.groups++;
+                    } else {
+                        typeCounts.nodes++
+                    }
+                });
+                var counts = $('<div>').appendTo($(propRow.children()[1]));
+                if (typeCounts.nodes > 0) {
+                    $('<div>').text(RED._("clipboard.node",{count:typeCounts.nodes})).appendTo(counts);
+                }
+                if (typeCounts.groups > 0) {
+                    $('<div>').text(RED._("clipboard.group",{count:typeCounts.groups})).appendTo(counts);
+                }
+
+
             } else {
-                // An actual node is selected in the editor - build up its properties table
+                propertiesPanelHeaderHelp.show();
-                propRow = $('<tr class="red-ui-help-info-row"><td>'+RED._("sidebar.info.node")+"</td><td></td></tr>").appendTo(tableBody);
+
-                RED.utils.createObjectElement(node.id).appendTo(propRow.children()[1]);
+                if (!subflowRegex) {
-                if (node.type !== "subflow" && node.type !== "unknown" && node.name) {
+                    propRow = $('<tr class="red-ui-help-info-row"><td>'+RED._("sidebar.info.type")+'</td><td></td></tr>').appendTo(tableBody);
-                    propRow = $('<tr class="red-ui-help-info-row"><td>'+RED._("common.label.name")+'</td><td></td></tr>').appendTo(tableBody);
-                    $('<span class="red-ui-text-bidi-aware" dir="'+RED.text.bidi.resolveBaseTextDir(node.name)+'"></span>').text(node.name).appendTo(propRow.children()[1]);
-                }
-                if (!m) {
-                    propRow = $('<tr class="red-ui-help-info-row"><td>'+RED._("sidebar.info.type")+"</td><td></td></tr>").appendTo(tableBody);
                     $(propRow.children()[1]).text((node.type === "unknown")?node._orig.type:node.type);
                     if (node.type === "unknown") {
                         $('<span style="float: right; font-size: 0.8em"><i class="fa fa-warning"></i></span>').prependTo($(propRow.children()[1]))
                     }
                 }
+
                 var count = 0;
-                if (!m && node.type != "subflow") {
+                if (!subflowRegex && node.type != "subflow" && node.type != "group") {
+
+                    var blankRow = $('<tr class="red-ui-help-property-expand blank"><td colspan="2"></td></tr>').appendTo(tableBody);
+
                     var defaults;
                     if (node.type === 'unknown') {
                         defaults = {};
@@ -251,7 +332,6 @@ RED.sidebar.info = (function() {
                         $(propRow.children()[1]).text(RED.nodes.getType(node.type).set.module);
                         count++;
                     }
-                    $('<tr class="red-ui-help-property-expand red-ui-help-info-property-row blank'+(expandedSections.property?"":" hide")+'"><td colspan="2"></td></tr>').appendTo(tableBody);
 
                     if (defaults) {
                         for (var n in defaults) {
@@ -259,7 +339,8 @@ RED.sidebar.info = (function() {
                                 var val = node[n];
                                 var type = typeof val;
                                 count++;
-                                propRow = $('<tr class="red-ui-help-info-property-row'+(expandedSections.property?"":" hide")+'"><td>'+n+"</td><td></td></tr>").appendTo(tableBody);
+                                propRow = $('<tr class="red-ui-help-info-property-row'+(expandedSections.property?"":" hide")+'"><td></td><td></td></tr>').appendTo(tableBody);
+                                $(propRow.children()[0]).text(n);
                                 if (defaults[n].type) {
                                     var configNode = RED.nodes.node(val);
                                     if (!configNode) {
@@ -289,49 +370,66 @@ RED.sidebar.info = (function() {
                         }
                     }
                     if (count > 0) {
-                        $('<tr class="red-ui-help-property-expand blank"><td colspan="2"><a href="#" class="node-info-property-header'+(expandedSections.property?" expanded":"")+'"><span class="red-ui-help-property-more">'+RED._("sidebar.info.showMore")+'</span><span class="red-ui-help-property-less">'+RED._("sidebar.info.showLess")+'</span> <i class="fa fa-caret-down"></i></a></td></tr>').appendTo(tableBody);
+                        $('<a href="#" class="node-info-property-header'+(expandedSections.property?" expanded":"")+'"><span class="red-ui-help-property-more">'+RED._("sidebar.info.showMore")+'</span><span class="red-ui-help-property-less">'+RED._("sidebar.info.showLess")+'</span> <i class="fa fa-caret-down"></i></a>').appendTo(blankRow.children()[0]);
                     }
                 }
                 if (node.type !== 'tab') {
-                    if (m) {
+                    if (subflowRegex) {
                         $('<tr class="blank"><th colspan="2">'+RED._("sidebar.info.subflow")+'</th></tr>').appendTo(tableBody);
                         $('<tr class="node-info-subflow-row"><td>'+RED._("common.label.name")+'</td><td><span class="red-ui-text-bidi-aware" dir=\"'+RED.text.bidi.resolveBaseTextDir(subflowNode.name)+'">'+RED.utils.sanitize(subflowNode.name)+'</span></td></tr>').appendTo(tableBody);
                     }
                 }
             }
-            if (m) {
+            if (subflowRegex) {
                 propRow = $('<tr class="red-ui-help-info-row"><td>'+RED._("subflow.category")+'</td><td></td></tr>').appendTo(tableBody);
                 var category = subflowNode.category||"subflows";
                 $(propRow.children()[1]).text(RED._("palette.label."+category,{defaultValue:category}))
                 $('<tr class="node-info-subflow-row"><td>'+RED._("sidebar.info.instances")+"</td><td>"+subflowUserCount+'</td></tr>').appendTo(tableBody);
             }
 
-            var helpText = "";
+            // var helpText = "";
-            if (node.type === "tab" || node.type === "subflow") {
+            // if (node.type === "tab" || node.type === "subflow") {
-                $(helpSection.container).hide();
+            // } else {
-            } else {
+            //     if (subflowNode && node.type !== "subflow") {
-                $(helpSection.container).show();
+            //         // Selected a subflow instance node.
-                if (subflowNode && node.type !== "subflow") {
+            //         // - The subflow template info goes into help
-                    // Selected a subflow instance node.
+            //         helpText = (RED.utils.renderMarkdown(subflowNode.info||"")||('<span class="red-ui-help-info-none">'+RED._("sidebar.info.none")+'</span>'));
-                    // - The subflow template info goes into help
+            //     } else {
-                    helpText = (marked(subflowNode.info||"")||('<span class="red-ui-help-info-none">'+RED._("sidebar.info.none")+'</span>'));
+            //         helpText = $("script[data-help-name='"+node.type+"']").html()||('<span class="red-ui-help-info-none">'+RED._("sidebar.info.none")+'</span>');
-                } else {
+            //     }
-                    helpText = $("script[data-help-name='"+node.type+"']").html()||('<span class="red-ui-help-info-none">'+RED._("sidebar.info.none")+'</span>');
+            //     setInfoText(helpText, helpSection.content);
-                }
+            // }
-                setInfoText(helpText, helpSection.content);
-            }
 
             var infoText = "";
 
             if (node._def && node._def.info) {
                 var info = node._def.info;
                 var textInfo = (typeof info === "function" ? info.call(node) : info);
-                infoText = infoText + marked(textInfo);
+                infoText = infoText + RED.utils.renderMarkdown(textInfo);
             }
             if (node.info) {
-                infoText = infoText + marked(node.info || "")
+                infoText = infoText + RED.utils.renderMarkdown(node.info || "")
             }
-            setInfoText(infoText, infoSection.content);
+            var infoSectionContainer = $("<div>").css("padding","0 6px 6px").appendTo(propertiesPanelContent)
+
+            // var editInfo = $('<button class="red-ui-button red-ui-button-small" style="float: right"><i class="fa fa-file-text-o"></button>').appendTo(infoSectionContainer).on("click", function(evt) {
+            //     //.text(RED._("sidebar.info.editDescription"))
+            //     evt.preventDefault();
+            //     evt.stopPropagation();
+            //     if (node.type === 'tab') {
+            //
+            //     } else if (node.type === 'subflow') {
+            //
+            //     } else if (node.type === 'group') {
+            //
+            //     } else if (node._def.category !== 'config') {
+            //         RED.editor.edit(node,"editor-tab-description");
+            //     } else {
+            //
+            //     }
+            // })
+
+            setInfoText(infoText, infoSectionContainer);
 
             $(".red-ui-sidebar-info-stack").scrollTop(0);
             $(".node-info-property-header").on("click", function(e) {
@@ -347,7 +445,7 @@ RED.sidebar.info = (function() {
         // propRow = $('<tr class="red-ui-help-info-row"><td>Actions</td><td></td></tr>').appendTo(tableBody);
         // var actionBar = $(propRow.children()[1]);
         //
-        // // var actionBar = $('<div>',{style:"background: #fefefe; padding: 3px;"}).appendTo(propertiesSection.content);
+        // // var actionBar = $('<div>',{style:"background: #fefefe; padding: 3px;"}).appendTo(propertiesPanel);
         // $('<button type="button" class="red-ui-button"><i class="fa fa-code"></i></button>').appendTo(actionBar);
         // $('<button type="button" class="red-ui-button"><i class="fa fa-code"></i></button>').appendTo(actionBar);
         // $('<button type="button" class="red-ui-button"><i class="fa fa-code"></i></button>').appendTo(actionBar);
@@ -422,6 +520,7 @@ RED.sidebar.info = (function() {
         }
         function startTips() {
             $(".red-ui-sidebar-info").addClass('show-tips');
+            resizeStack();
             if (enabled) {
                 if (!startTimeout && !refreshTimeout) {
                     if (tipCount === -1) {
@@ -435,6 +534,7 @@ RED.sidebar.info = (function() {
         }
         function stopTips() {
             $(".red-ui-sidebar-info").removeClass('show-tips');
+            resizeStack();
             clearInterval(refreshTimeout);
             clearTimeout(startTimeout);
             refreshTimeout = null;
@@ -459,15 +559,8 @@ RED.sidebar.info = (function() {
     }
 
     function set(html,title) {
-        // tips.stop();
+        console.warn("Deprecated use of RED.sidebar.info.set - use RED.sidebar.help.set instead")
-        // sections.show();
+        RED.sidebar.help.set(html,title);
-        refresh(null);
-        propertiesSection.container.hide();
-        helpSection.container.hide();
-        infoSection.container.show();
-        infoSection.title.text(title||RED._("sidebar.info.desc"));
-        setInfoText(html,infoSection.content);
-        $(".red-ui-sidebar-info-stack").scrollTop(0);
     }
 
     function refreshSelection(selection) {

packages/node_modules/@node-red/editor-client/src/js/ui/utils.js

@@ -16,6 +16,28 @@
 
 RED.utils = (function() {
 
+    window._marked = window.marked;
+    window.marked = function(txt) {
+        console.warn("Use of 'marked()' is deprecated. Use RED.utils.renderMarkdown() instead");
+        return renderMarkdown(txt);
+    }
+
+    _marked.setOptions({
+        renderer: new _marked.Renderer(),
+        gfm: true,
+        tables: true,
+        breaks: false,
+        pedantic: false,
+        smartLists: true,
+        smartypants: false
+    });
+
+    function renderMarkdown(txt) {
+        var rendered = _marked(txt);
+        var cleaned = DOMPurify.sanitize(rendered, {SAFE_FOR_JQUERY: true})
+        return cleaned;
+    }
+
     function formatString(str) {
         return str.replace(/\r?\n/g,"↵").replace(/\t/g,"→");
     }
@@ -784,9 +806,9 @@ RED.utils = (function() {
     function separateIconPath(icon) {
         var result = {module: "", file: ""};
         if (icon) {
-            var index = icon.indexOf('icons/');
+            var index = icon.indexOf(RED.settings.apiRootUrl+'icons/');
-            if (index !== -1) {
+            if (index === 0) {
-                icon = icon.substring(index+6);
+                icon = icon.substring((RED.settings.apiRootUrl+'icons/').length);
             }
             index = icon.indexOf('/');
             if (index !== -1) {
@@ -837,10 +859,15 @@ RED.utils = (function() {
     }
 
     function getNodeIcon(def,node) {
-        if (def.category === 'config') {
+        if (node && node.type === '_selection_') {
+            return "font-awesome/fa-object-ungroup";
+        } else if (node && node.type === 'group') {
+            return "font-awesome/fa-object-group"
+        } else if (def.category === 'config') {
             return RED.settings.apiRootUrl+"icons/node-red/cog.svg"
         } else if (node && node.type === 'tab') {
-            return RED.settings.apiRootUrl+"icons/node-red/subflow.svg"
+            return "red-ui-icons/red-ui-icons-flow"
+            // return RED.settings.apiRootUrl+"images/subflow_tab.svg"
         } else if (node && node.type === 'unknown') {
             return RED.settings.apiRootUrl+"icons/node-red/alert.svg"
         } else if (node && node.icon) {
@@ -899,6 +926,8 @@ RED.utils = (function() {
         var l;
         if (node.type === 'tab') {
             l = node.label || defaultLabel
+        } else if (node.type === 'group') {
+            l = node.name || defaultLabel
         } else {
             l = node._def.label;
             try {
@@ -1032,11 +1061,63 @@ RED.utils = (function() {
             }
             // If the specified name is not defined in font-awesome, show arrow-in icon.
             iconUrl = RED.settings.apiRootUrl+"icons/node-red/arrow-in.svg"
+        } else if (iconPath.module === "red-ui-icons") {
+            var redIconElement = $('<i/>').appendTo(iconContainer);
+            redIconElement.addClass("red-ui-palette-icon red-ui-icons " + iconPath.file);
+            return;
         }
         var imageIconElement = $('<div/>',{class:"red-ui-palette-icon"}).appendTo(iconContainer);
         imageIconElement.css("backgroundImage", "url("+iconUrl+")");
     }
 
+    function createNodeIcon(node) {
+        var def = node._def;
+        var nodeDiv = $('<div>',{class:"red-ui-search-result-node"})
+        if (node.type === "_selection_") {
+            nodeDiv.addClass("red-ui-palette-icon-selection");
+        } else if (node.type === "group") {
+            nodeDiv.addClass("red-ui-palette-icon-group");
+        } else if (node.type === 'tab') {
+            nodeDiv.addClass("red-ui-palette-icon-flow");
+        } else {
+            var colour = RED.utils.getNodeColor(node.type,def);
+            // if (node.type === 'tab') {
+            //     colour = "#C0DEED";
+            // }
+            nodeDiv.css('backgroundColor',colour);
+            var borderColor = getDarkerColor(colour);
+            if (borderColor !== colour) {
+                nodeDiv.css('border-color',borderColor)
+            }
+        }
+
+        var icon_url = RED.utils.getNodeIcon(def,node);
+        var iconContainer = $('<div/>',{class:"red-ui-palette-icon-container"}).appendTo(nodeDiv);
+        RED.utils.createIconElement(icon_url, iconContainer, true);
+        return nodeDiv;
+    }
+
+    function getDarkerColor(c) {
+        var r,g,b;
+        if (/^#[a-f0-9]{6}$/i.test(c)) {
+            r = parseInt(c.substring(1, 3), 16);
+            g = parseInt(c.substring(3, 5), 16);
+            b = parseInt(c.substring(5, 7), 16);
+        } else if (/^#[a-f0-9]{3}$/i.test(c)) {
+            r = parseInt(c.substring(1, 2)+c.substring(1, 2), 16);
+            g = parseInt(c.substring(2, 3)+c.substring(2, 3), 16);
+            b = parseInt(c.substring(3, 4)+c.substring(3, 4), 16);
+        } else {
+            return c;
+        }
+        var l = 0.3 * r/255 + 0.59 * g/255 + 0.11 * b/255 ;
+        r = Math.max(0,r-50);
+        g = Math.max(0,g-50);
+        b = Math.max(0,b-50);
+        var s = ((r<<16) + (g<<8) + b).toString(16);
+        return '#'+'000000'.slice(0, 6-s.length)+s;
+    }
+
     return {
         createObjectElement: buildMessageElement,
         getMessageProperty: getMessageProperty,
@@ -1053,6 +1134,9 @@ RED.utils = (function() {
         decodeObject: decodeObject,
         parseContextKey: parseContextKey,
         createIconElement: createIconElement,
-        sanitize: sanitize
+        sanitize: sanitize,
+        renderMarkdown: renderMarkdown,
+        createNodeIcon: createNodeIcon,
+        getDarkerColor: getDarkerColor
     }
 })();

packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js

@@ -67,9 +67,16 @@ RED.view.tools = (function() {
 
     function moveSelection(dx,dy) {
         if (moving_set === null) {
+            moving_set = [];
             var selection = RED.view.selection();
             if (selection.nodes) {
-                moving_set = selection.nodes.map(function(n) { return {n:n}});
+                while (selection.nodes.length > 0) {
+                    var n = selection.nodes.shift();
+                    moving_set.push({n:n});
+                    if (n.type === "group") {
+                        selection.nodes = selection.nodes.concat(n.nodes);
+                    }
+                }
             }
         }
         if (moving_set && moving_set.length > 0) {
@@ -93,6 +100,9 @@ RED.view.tools = (function() {
                 node.n.x += dx;
                 node.n.y += dy;
                 node.n.dirty = true;
+                if (node.n.type === "group") {
+                    RED.group.markDirty(node.n);
+                }
                 minX = Math.min(node.n.x-node.n.w/2-5,minX);
                 minY = Math.min(node.n.y-node.n.h/2-5,minY);
             }
@@ -105,13 +115,86 @@ RED.view.tools = (function() {
                 }
             }
             RED.view.redraw();
+        } else {
+            RED.view.scroll(dx*10,dy*10);
         }
     }
 
+    function setSelectedNodeLabelState(labelShown) {
+        var selection = RED.view.selection();
+        var historyEvents = [];
+        var nodes = [];
+        if (selection.nodes) {
+            selection.nodes.forEach(function(n) {
+                if (n.type !== 'subflow' && n.type !== 'group') {
+                    nodes.push(n);
+                } else if (n.type === 'group') {
+                    nodes = nodes.concat( RED.group.getNodes(n,true));
+                }
+            });
+        }
+        nodes.forEach(function(n) {
+            var modified = false;
+            var oldValue = n.l === undefined?true:n.l;
+            var isLink = /^link (in|out)$/.test(n._def.type);
+
+            if (labelShown) {
+                if (n.l === false || (isLink && !n.hasOwnProperty('l'))) {
+                    n.l = true;
+                    modified = true;
+                }
+            } else {
+                if ((!isLink && (!n.hasOwnProperty('l') || n.l === true)) || (isLink && n.l === true) ) {
+                    n.l = false;
+                    modified = true;
+                }
+            }
+            if (modified) {
+                historyEvents.push({
+                    t: "edit",
+                    node: n,
+                    changed: n.changed,
+                    changes: {
+                        l: oldValue
+                    }
+                })
+                n.changed = true;
+                n.dirty = true;
+                n.resize = true;
+            }
+        })
+
+        if (historyEvents.length > 0) {
+            RED.history.push({
+                t: "multi",
+                events: historyEvents,
+                dirty: RED.nodes.dirty()
+            })
+            RED.nodes.dirty(true);
+        }
+
+        RED.view.redraw();
+
+
+    }
+
     return {
         init: function() {
+            RED.actions.add("core:show-selected-node-labels", function() { setSelectedNodeLabelState(true); })
+            RED.actions.add("core:hide-selected-node-labels", function() { setSelectedNodeLabelState(false); })
+
             RED.actions.add("core:align-selection-to-grid", alignToGrid);
 
+            RED.actions.add("core:scroll-view-up", function() { RED.view.scroll(0,-RED.view.gridSize());});
+            RED.actions.add("core:scroll-view-right", function() { RED.view.scroll(RED.view.gridSize(),0);});
+            RED.actions.add("core:scroll-view-down", function() { RED.view.scroll(0,RED.view.gridSize());});
+            RED.actions.add("core:scroll-view-left", function() { RED.view.scroll(-RED.view.gridSize(),0);});
+
+            RED.actions.add("core:step-view-up", function() { RED.view.scroll(0,-5*RED.view.gridSize());});
+            RED.actions.add("core:step-view-right", function() { RED.view.scroll(5*RED.view.gridSize(),0);});
+            RED.actions.add("core:step-view-down", function() { RED.view.scroll(0,5*RED.view.gridSize());});
+            RED.actions.add("core:step-view-left", function() { RED.view.scroll(-5*RED.view.gridSize(),0);});
+
             RED.actions.add("core:move-selection-up", function() { moveSelection(0,-1);});
             RED.actions.add("core:move-selection-right", function() { moveSelection(1,0);});
             RED.actions.add("core:move-selection-down", function() { moveSelection(0,1);});

packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js

@@ -128,10 +128,6 @@ RED.workspaces = (function() {
                             RED.history.push(historyEvent);
                             RED.nodes.dirty(true);
                             RED.sidebar.config.refresh();
-                            var selection = RED.view.selection();
-                            if (!selection.nodes && !selection.links) {
-                                RED.sidebar.info.refresh(workspace);
-                            }
                             if (changes.hasOwnProperty('disabled')) {
                                 RED.nodes.eachNode(function(n) {
                                     if (n.z === workspace.id) {
@@ -140,6 +136,7 @@ RED.workspaces = (function() {
                                 });
                                 RED.view.redraw();
                             }
+                            RED.events.emit("flows:change",workspace);
                         }
                         RED.tray.close();
                     }
@@ -219,7 +216,10 @@ RED.workspaces = (function() {
                 if (RED.view.state() != RED.state.IMPORT_DRAGGING) {
                     RED.view.state(RED.state.DEFAULT);
                 }
-                RED.sidebar.info.refresh(workspace);
+                var selection = RED.view.selection();
+                if (!selection.nodes && !selection.links && workspace.id === activeWorkspace) {
+                    RED.sidebar.info.refresh(workspace);
+                }
                 tabflowEditor.destroy();
             }
         }
@@ -371,7 +371,9 @@ RED.workspaces = (function() {
             var changes = { disabled: workspace.disabled };
             workspace.disabled = disabled;
             $("#red-ui-tab-"+(workspace.id.replace(".","-"))).toggleClass('red-ui-workspace-disabled',!!workspace.disabled);
-            $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!workspace.disabled);
+            if (id === activeWorkspace) {
+                $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!workspace.disabled);
+            }
             var historyEvent = {
                 t: "edit",
                 changes:changes,
@@ -380,10 +382,11 @@ RED.workspaces = (function() {
             }
             workspace.changed = true;
             RED.history.push(historyEvent);
+            RED.events.emit("flows:change",workspace);
             RED.nodes.dirty(true);
             RED.sidebar.config.refresh();
             var selection = RED.view.selection();
-            if (!selection.nodes && !selection.links) {
+            if (!selection.nodes && !selection.links && workspace.id === activeWorkspace) {
                 RED.sidebar.info.refresh(workspace);
             }
             if (changes.hasOwnProperty('disabled')) {
@@ -412,9 +415,14 @@ RED.workspaces = (function() {
     }
 
     function setWorkspaceOrder(order) {
-        RED.nodes.setWorkspaceOrder(order.filter(function(id) {
+        var newOrder = order.filter(function(id) {
             return RED.nodes.workspace(id) !== undefined;
-        }));
+        })
+        var currentOrder = RED.nodes.getWorkspaceOrder();
+        if (JSON.stringify(newOrder) !== JSON.stringify(currentOrder)) {
+            RED.nodes.setWorkspaceOrder(newOrder);
+            RED.events.emit("flows:reorder",newOrder);
+        }
         workspace_tabs.order(order);
     }
 

packages/node_modules/@node-red/editor-client/src/sass/ace.scss

@@ -9,19 +9,15 @@
            color: transparent !important;
         }
     }
-
-
     .ace_gutter {
+        background: $text-editor-gutter-background;
         border-top-left-radius: 4px;
         border-bottom-left-radius: 4px;
     }
     .ace_scroller {
+        background: $text-editor-background;
         border-top-right-radius: 4px;
         border-bottom-right-radius: 4px;
-    }
-
-    .ace_scroller {
-        background: $text-editor-background;
         color: $text-editor-color;
     }
     .ace_marker-layer .ace_active-line {
@@ -37,9 +33,6 @@
     .ace_gutter-active-line {
         background: $text-editor-gutter-active-line-background;
     }
-    .ace_gutter {
-        background: $text-editor-gutter-background;
-    }
     .ace_tooltip {
         font-family: $primary-font;
         line-height: 1.4em;
@@ -52,6 +45,9 @@
         @include component-shadow;
         border-color: $popover-background;
     }
+    .ace_content {
+        line-height: 1;
+    }
     textarea.ace_text-input {
         overflow: hidden;
         padding: 0px 1px !important;

packages/node_modules/@node-red/editor-client/src/sass/colors.scss

@@ -23,7 +23,7 @@ $primary-background: #f3f3f3;//#0ff;
 $secondary-background: #fff;//#ff0;
 $secondary-background-selected: #efefef;//#e9e900;
 $secondary-background-inactive: #f0f0f0;//#f0f000;
-$secondary-background-hover: #ddd;//#dd0;
+$secondary-background-hover: #e6e6e6;//#dd0;
 $secondary-background-disabled: #f9f9f9;//#fafa0;
 
 $tertiary-background:  #f7f7f7;//#f0f;
@@ -94,7 +94,7 @@ $list-item-secondary-color: $secondary-text-color;
 $list-item-background: $secondary-background;
 $list-item-background-disabled: $secondary-background-inactive;
 $list-item-background-hover: $secondary-background-hover;
-$list-item-background-selected: $secondary-background-selected;
+$list-item-background-selected: #ffebc7; // #fff1e5;
 $list-item-border-selected: $secondary-text-color-selected;
 
 $tab-text-color-active: $header-text-color;
@@ -284,3 +284,8 @@ $debug-message-border: #eee;
 $debug-message-border-hover: #999;
 $debug-message-border-warning: #ffdf9d;
 $debug-message-border-error: #f99;
+
+$group-default-fill: none;
+$group-default-fill-opacity: 1;
+$group-default-stroke: #999;
+$group-default-stroke-opacity: 1;

packages/node_modules/@node-red/editor-client/src/sass/debug.scss

@@ -160,6 +160,7 @@
 .red-ui-debug-msg-element {
     color: $debug-message-text-color;
     line-height: 1.3em;
+    overflow-wrap: break-word;
 }
 .red-ui-debug-msg-object-key {
     color: $debug-message-text-color-object-key;
@@ -216,6 +217,10 @@
 .red-ui-debug-msg-type-number { color: $debug-message-text-color-msg-type-number; };
 .red-ui-debug-msg-type-number-toggle { cursor: pointer;}
 
+.red-ui-debug-msg-type-string {
+    white-space: pre-wrap;
+}
+
 .red-ui-debug-msg-row {
     display: block;
     padding: 4px 2px 2px;

packages/node_modules/@node-red/editor-client/src/sass/editor.scss

@@ -304,9 +304,6 @@ button.red-ui-button-small
         &:first-child {
             padding: 20px 20px 0;
         }
-        &:last-child {
-            padding-bottom: 20px;
-        }
     }
 }
 .red-ui-editor-type-expression-tab-content {
@@ -411,6 +408,133 @@ button.red-ui-button.red-ui-editor-node-appearance-button {
     }
 }
 
+.red-ui-group-layout-picker {
+    padding: 5px;
+    background: $primary-background;
+}
+.red-ui-group-layout-picker-cell-text {
+    position: absolute;
+    width: 14px;
+    height: 2px;
+    border-top: 2px solid $secondary-text-color;
+    border-bottom: 2px solid $secondary-text-color;
+    margin: 2px;
+
+    &.red-ui-group-layout-text-pos-nw { top: 0; left: 0; }
+    &.red-ui-group-layout-text-pos-n  { top: 0; left: calc(50% - 9px); }
+    &.red-ui-group-layout-text-pos-ne { top: 0; right: 0; }
+    &.red-ui-group-layout-text-pos-sw { bottom: 0; left: 0; }
+    &.red-ui-group-layout-text-pos-s { bottom: 0; left: calc(50% - 9px); }
+    &.red-ui-group-layout-text-pos-se { bottom: 0; right: 0; }
+    &.red-ui-group-layout-text-pos- {
+        width: 100%;
+        height: 100%;
+        border-radius: 5px;
+        margin: 0;
+        background-color: #FFF;
+        background-size: 100% 100%;
+        background-position: 0 0, 50% 50%;
+        background-image: linear-gradient(45deg, transparent 45%, $secondary-border-color 45%, $secondary-border-color 55%,  transparent 55%, transparent),linear-gradient(-45deg, transparent 45%, $secondary-border-color 45%, $secondary-border-color 55%,  transparent 55%, transparent);
+        border: none;
+    }
+}
+
+.red-ui-group-layout-picker button.red-ui-search-result-node {
+    float: none;
+    position: relative;
+    padding: 0;
+    margin: 5px;
+    width: 32px;
+    height: 27px;
+}
+
+button.red-ui-group-layout-picker-none {
+    width: 100%;
+}
+
+.red-ui-color-picker {
+    input[type="text"] {
+        border-radius:0;
+        width: 100%;
+        margin-bottom: 0;
+        border: none;
+        border-bottom: 1px solid $form-input-border-color;
+    }
+    small {
+        color: $secondary-text-color;
+        margin-left: 5px;
+        margin-right: 4px;
+        display: inline-block;
+        min-width: 35px;
+        text-align: right;
+    }
+    background: $primary-background;
+}
+.red-ui-editor-node-appearance-button {
+    .red-ui-search-result-node {
+        overflow: hidden
+    }
+}
+.red-ui-color-picker-cell {
+    padding: 0;
+    border-style: solid;
+    border-width: 1px;
+    border-color: $secondary-border-color;
+}
+.red-ui-color-picker-swatch {
+    position: absolute;
+    top:-1px;right:-1px;left:-1px;bottom:-1px;
+    border-radius: 4px;
+}
+
+.red-ui-color-picker-cell-none {
+    height: 100%;
+    background-color: #FFF;
+    background-size: 100% 100%;
+    background-position: 0 0, 50% 50%;
+    background-image: linear-gradient(45deg, transparent 45%, $secondary-border-color 45%, $secondary-border-color 55%,  transparent 55%, transparent),linear-gradient(-45deg, transparent 45%, $secondary-border-color 45%, $secondary-border-color 55%,  transparent 55%, transparent)
+}
+.red-ui-search-result-node .red-ui-color-picker-cell-none {
+    border-radius: 4px;
+    background-size: 50% 50%;
+    background-image: linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee), linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee);
+}
+
+.red-ui-color-picker-opacity-slider {
+    position:relative;
+    vertical-align: middle;
+    display: inline-block;
+    width: calc(100% - 50px);
+    height: 14px;
+    margin: 6px 3px 8px;
+    box-sizing: border-box;
+    background-color: white;
+    background-image:
+        linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 25%),
+        linear-gradient(-45deg, #eee 25%, transparent 25%, transparent 75%, #eee 25%);
+    background-size: 6px 6px;
+}
+.red-ui-color-picker-opacity-slider-overlay {
+    position: absolute;
+    top:0;right:0;left:0;bottom:0;
+    background-image:linear-gradient(90deg, transparent 0%, #f00 100%);
+    background-size: 100% 100%;
+    border: 1px solid $primary-border-color;
+}
+
+div.red-ui-button-small.red-ui-color-picker-opacity-slider-handle {
+    z-Index: 10;
+    top: -4px;
+    cursor: pointer;
+    min-width: 0;
+    width: 10px;
+    height: 22px;
+    padding: 0;
+    border: 1px solid $primary-border-color;
+    border-radius: 1px;
+    background: $secondary-background;
+    box-sizing: border-box;
+}
 .red-ui-icon-picker {
     select {
         box-sizing: border-box;
@@ -633,7 +757,7 @@ button.red-ui-toggleButton.toggle {
             .red-ui-typedInput-value-label,.red-ui-typedInput-option-label {
                 select,.placeholder-input  {
                     margin: 3px;
-                    height: 26px;
+                    height: 24px;
                     width: calc(100% - 10px);
                     padding-left: 3px;
                 }

packages/node_modules/@node-red/editor-client/src/sass/flow.scss

@@ -71,6 +71,48 @@
     }
 }
 
+.red-ui-flow-group {
+    &.red-ui-flow-group-hovered {
+        .red-ui-flow-group-outline-select {
+            stroke-opacity: 0.8 !important;
+            stroke-dasharray: 10 4 !important;
+        }
+    }
+    &.red-ui-flow-group-active-hovered:not(.red-ui-flow-group-hovered) {
+        .red-ui-flow-group-outline-select {
+            stroke: $link-link-color;
+        }
+    }
+}
+
+.red-ui-flow-group-outline {
+    fill: none;
+    stroke: $node-selected-color;
+    stroke-opacity: 0;
+    stroke-width: 12;
+    pointer-events: stroke;
+}
+.red-ui-flow-group-outline-select {
+    fill: none;
+    stroke: $node-selected-color;
+    pointer-events: stroke;
+    stroke-opacity: 0;
+    stroke-width: 3;
+}
+.red-ui-flow-group-body {
+    pointer-events: none;
+    fill: $group-default-fill;
+    fill-opacity: $group-default-fill-opacity;
+    stroke-width: 2;
+    stroke: $group-default-stroke;
+    stroke-opacity: $group-default-stroke-opacity;
+}
+.red-ui-flow-group-label {
+    @include disable-selection;
+}
+
+
+
 .red-ui-flow-node-unknown {
     stroke-dasharray:10,4;
     stroke: $node-border-unknown;
@@ -166,6 +208,9 @@ g.red-ui-flow-node-selected {
         fill-opacity: 1;
         stroke-dasharray: none;
     }
+    .red-ui-flow-group, .red-ui-flow-group-body {
+        stroke-dasharray: 8, 3;
+    }
 }
 .red-ui-flow-node-disabled {
     &.red-ui-flow-node, .red-ui-flow-node {
@@ -248,6 +293,7 @@ g.red-ui-flow-node-selected {
 
 .red-ui-flow-link-outline {
     stroke: $view-background;
+    stroke-opacity: 0.4;
     stroke-width: 5;
     cursor: crosshair;
     fill: none;

packages/node_modules/@node-red/editor-client/src/sass/library.scss

@@ -37,7 +37,7 @@
          border-radius: 4px;
          font-family: $monospace-font !important;
          font-size: 13px !important;
-         height: 300px;
+         height: 100%;
          line-height: 1.3em;
          padding: 6px 10px;
          background: $clipboard-textarea-background;
@@ -62,6 +62,7 @@
     background: $form-input-background;
     &>div {
         height: 100%;
+        box-sizing: border-box;
     }
 }
 .red-ui-clipboard-dialog-box {

packages/node_modules/@node-red/editor-client/src/sass/palette.scss

@@ -186,6 +186,21 @@
     background-size: contain;
     background-repeat: no-repeat;
 }
+.red-ui-search-result-node {
+    &.red-ui-palette-icon-flow,
+    &.red-ui-palette-icon-group,
+    &.red-ui-palette-icon-selection {
+        background: none;
+        border-color: transparent;
+        .red-ui-palette-icon-container {
+            background: none;
+        }
+        .red-ui-palette-icon-fa {
+            color: $secondary-text-color;
+            font-size: 18px;
+        }
+    }
+}
 .red-ui-palette-icon-fa {
     color: white;
     position: absolute;

packages/node_modules/@node-red/editor-client/src/sass/panels.scss

@@ -22,9 +22,19 @@
         // border: 1px solid red;
         box-sizing: border-box;
     }
+    display: flex;
+    flex-direction: column;
+
+    >.red-ui-panel:first-child {
+        flex: 0 0 auto;
+    }
+    >.red-ui-panel:last-child {
+        flex: 1 1 auto;
+    }
 }
 
 .red-ui-panels-separator {
+    flex: 0 0 auto;
     border-top: 1px solid $secondary-border-color;
     border-bottom: 1px solid $secondary-border-color;
     height: 7px;
@@ -37,10 +47,13 @@
 .red-ui-panel {
     overflow: auto;
     height: calc(50% - 4px);
+    position: relative;
 }
 
 .red-ui-panels.red-ui-panels-horizontal {
     height: 100%;
+    flex-direction: row;
+
     &>.red-ui-panel {
         vertical-align: top;
         display: inline-block;

packages/node_modules/@node-red/editor-client/src/sass/popover.scss

@@ -150,6 +150,16 @@
 
 .red-ui-popover a.red-ui-button,
 .red-ui-popover button.red-ui-button {
+    &:not(.primary) {
+        border-color: $popover-button-border-color;
+        background: $popover-background;
+        color: $popover-color !important;
+    }
+    &:not(.primary):not(.disabled):not(.ui-button-disabled):hover {
+        border-color: $popover-button-border-color-hover;
+    }
+
+
     &.primary {
         border-color: $popover-button-border-color;
     }

packages/node_modules/@node-red/editor-client/src/sass/projects.scss

@@ -18,7 +18,12 @@
     .red-ui-editableList-container {
         padding: 0px;
     }
-
+    padding: 0;
+    .red-ui-projects-dialog-box {
+        box-sizing: border-box;
+        overflow-y: auto;
+        padding: 25px 25px 10px 25px;
+    }
 }
 #red-ui-project-settings-tab-settings {
     overflow-y: scroll;
@@ -99,6 +104,7 @@
 .red-ui-projects-dialog-screen-create {
     min-height: 500px;
     button.red-ui-projects-dialog-screen-create-type {
+        position: relative;
         height: auto;
         padding: 10px;
     }
@@ -169,9 +175,14 @@
 .red-ui-projects-dialog-project-list-container {
     border: 1px solid $secondary-border-color;
     border-radius: 2px;
+    display: flex;
+    flex-direction: column;
+    .red-ui-search-container {
+        flex-grow: 0;
+    }
 }
 .red-ui-projects-dialog-project-list-inner-container {
-    height: 300px;
+    flex-grow: 1 ;
     overflow-y: scroll;
     position:relative;
     .red-ui-editableList-border {
@@ -254,6 +265,9 @@
         }
     }
 }
+.red-ui-projects-dialog-screen-create-type {
+    position: relative;
+}
 .red-ui-projects-dialog-screen-create-type.red-ui-button.toggle.selected:not(.disabled):not(:disabled) {
     color: $secondary-text-color-active !important;
 }

packages/node_modules/@node-red/editor-client/src/sass/search.scss

@@ -24,6 +24,13 @@
     top: 0px;
     border: 1px solid $primary-border-color;
     box-shadow: 0 0 10px $shadow;
+    background: $secondary-background;
+
+    .red-ui-searchBox-container {
+        display: inline-block;
+        margin-right: 6px;
+        width: calc(100% - 30px);
+    }
 }
 
 .red-ui-type-search {
@@ -87,6 +94,8 @@
     }
     .red-ui-palette-icon {
         width: 15px;
+        position:relative;
+        left: -1px;
     }
     .red-ui-search-result-description {
         margin-left:28px;
@@ -153,7 +162,7 @@
     width: 30px;
     float:left;
     height: 25px;
-    border-radius: 5px;
+    border-radius: 3px;
     border: 1px solid $node-border;
     background-position: 5% 50%;
     background-repeat: no-repeat;

packages/node_modules/@node-red/editor-client/src/sass/style.scss

@@ -42,6 +42,7 @@
 @import "tab-config";
 @import "tab-context";
 @import "tab-info";
+@import "tab-help";
 @import "popover";
 @import "flow";
 @import "palette-editor";

packages/node_modules/@node-red/editor-client/src/sass/tab-context.scss

@@ -27,9 +27,22 @@
             display: none;
         }
     }
+
+    .red-ui-info-table {
+        table-layout: fixed;
+    }
+
+    table.red-ui-info-table tr:not(.blank) td:first-child {
+        width: 30%;
+    }
+    table.red-ui-info-table tr:not(.blank) td:last-child {
+        vertical-align: top;
+    }
+
 }
 
 .red-ui-sidebar-context-property {
+    overflow-wrap: break-word;
     position: relative;
     .red-ui-debug-msg-tools {
         right: 0px;

packages/node_modules/@node-red/editor-client/src/sass/tab-help.scss

@@ -0,0 +1,27 @@
+.red-ui-sidebar-help-stack {
+    // height: calc(100% - 39px);
+}
+.red-ui-help-search {
+    border-bottom: 1px solid $secondary-border-color;
+}
+
+.red-ui-sidebar-help-toc {
+    .red-ui-treeList-label {
+        font-size: 13px;
+        padding: 2px 0;
+        overflow: hidden;
+        white-space: nowrap;
+    }
+
+}
+#red-ui-sidebar-help-show-toc {
+    i.fa-angle-right {
+        transition: all 0.2s ease-in-out;
+    }
+    &.selected {
+        i.fa-angle-right {
+            transform: rotate(90deg);
+        }
+    }
+
+}

packages/node_modules/@node-red/editor-client/src/sass/tab-info.scss

@@ -14,9 +14,25 @@
  * limitations under the License.
  **/
 
+.red-ui-sidebar-info {
+    height: 100%;
+}
 .red-ui-sidebar-info  hr {
     margin: 10px 0;
 }
+.red-ui-info-header {
+    padding-left: 9px;
+    line-height: 21px;
+    cursor: default;
+    > * {
+        vertical-align: middle
+    }
+    > span {
+        display: inline-block;
+        margin-left: 5px;
+    }
+    border-bottom: 1px solid $secondary-border-color;
+}
 table.red-ui-info-table {
     font-size: 14px;
     margin: 0 0 10px;
@@ -125,6 +141,9 @@ div.red-ui-info-table {
         font-size: 1.296em;
         line-height: 1.3em;
         margin: 8px auto;
+        &.red-ui-help-title {
+            border-bottom: 1px solid $tertiary-border-color;
+        }
     }
     h2 {
         font-weight: 500;
@@ -214,12 +233,13 @@ div.red-ui-info-table {
 
 }
 .red-ui-sidebar-info-stack {
-    position: absolute;
+    height: 100%;
-    top: 0;
+    // position: absolute;
-    bottom: 0;
+    // top: 0;
-    left: 0;
+    // bottom: 0;
-    right: 0;
+    // left: 0;
-    overflow-y: scroll;
+    // right: 0;
+    // overflow-y: scroll;
 }
 .red-ui-help-tips {
     display: none;
@@ -227,20 +247,23 @@ div.red-ui-info-table {
     left:0;
     right:0;
     bottom: 0;
-    height: 150px;
+    height: 0;
+    transition: height 0.2s, padding 0.2s;
     box-sizing: border-box;
     border-top: 1px solid $secondary-border-color;
     background-color: $secondary-background;
-    padding: 20px;
+    padding: 0;
     box-shadow: 0 5px 20px 0px $shadow;
     overflow-y: auto;
 }
 .red-ui-sidebar-info.show-tips {
     .red-ui-sidebar-info-stack {
-        bottom: 150px;
+        height: calc(100% - 150px);
     }
     .red-ui-help-tips {
         display: block;
+        height: 150px;
+        padding: 20px;
     }
 }
 
@@ -279,3 +302,220 @@ div.red-ui-info-table {
     border-radius: 4px;
     padding: 2px 4px 2px;
 }
+
+.red-ui-info-outline,.red-ui-sidebar-help-toc {
+    display: flex;
+    flex-direction: column;
+
+    .red-ui-treeList {
+        flex-grow: 1;
+        position: relative;
+    }
+    .red-ui-treeList-container {
+        position: absolute;
+        top: 0;
+        bottom: 0;
+    }
+
+    .red-ui-treeList-container,.red-ui-editableList-border {
+        border: none;
+        border-radius: 0;
+    }
+    .red-ui-treeList-label {
+        font-size: 13px;
+        padding: 2px 0;
+        overflow: hidden;
+    }
+    .red-ui-info-outline-project {
+        border-bottom: 1px solid $secondary-border-color;
+    }
+
+    .red-ui-info-outline-item {
+        display: inline-block;
+        padding: 0;
+        font-size: 13px;
+        border: none;
+        .red-ui-palette-icon-fa {
+            position: relative;
+            top: 1px;
+            left: 0px;
+        }
+        &:hover {
+            background: inherit
+        }
+
+        &.red-ui-info-outline-item-flow {
+            .red-ui-search-result-description {
+                margin-left: 4px;
+            }
+        }
+        &.red-ui-info-outline-item-group .red-ui-search-result-node {
+            background: none;
+            border-color: transparent;
+            .red-ui-palette-icon-container {
+                background: none;
+            }
+            .red-ui-palette-icon-fa {
+                color: $secondary-text-color;
+                font-size: 18px;
+            }
+        }
+        &.red-ui-info-outline-item-empty {
+            font-style: italic;
+            color: $form-placeholder-color;
+        }
+    }
+
+    .red-ui-search-result-node {
+        width: 24px;
+        height: 20px;
+        margin-top: 1px;
+    }
+
+    .red-ui-palette-icon-container {
+        width: 24px;
+    }
+    .red-ui-palette-icon {
+        width: 20px;
+    }
+    .red-ui-search-result-description {
+        margin-left: 32px;
+        line-height: 22px;
+        white-space: nowrap;
+    }
+    .red-ui-search-result-node-label {
+        color: $secondary-text-color;
+    }
+}
+.red-ui-info-outline-item-control-spacer {
+    display: inline-block;
+    width: 23px;
+}
+.red-ui-info-outline-gutter {
+    display:none;
+    button {
+        position: absolute;
+        top: 1px;
+        left: 2px;
+    }
+    .red-ui-treeList-label:hover & {
+        display: inline;
+    }
+}
+.red-ui-info-outline-item-controls {
+    position: absolute;
+    top:0;
+    bottom: 0;
+    right: 0px;
+    padding: 2px 3px 0 1px;
+    text-align: right;
+    background: $list-item-background;
+
+    .red-ui-treeList-label:hover & {
+        background: $list-item-background-hover;
+    }
+    .red-ui-treeList-label.selected & {
+        background: $list-item-background-selected;
+    }
+
+
+    &.red-ui-info-outline-item-hover-controls button {
+        min-width: 23px;
+    }
+
+    .red-ui-treeList-label:not(:hover) &.red-ui-info-outline-item-hover-controls {
+        button {
+            border: none;
+            background: none;
+        }
+    }
+    .red-ui-info-outline-item-control-reveal,
+    .red-ui-info-outline-item-control-action {
+        display: none;
+    }
+    .red-ui-treeList-label:hover & {
+        .red-ui-info-outline-item-control-reveal,
+        .red-ui-info-outline-item-control-action {
+            display: inline-block;
+        }
+    }
+
+    .fa-ban {
+        display: none;
+    }
+    .red-ui-info-outline-item.red-ui-info-outline-item-disabled & {
+        .fa-ban {
+            display: inline-block;
+        }
+        .fa-circle-thin {
+            display: none;
+        }
+    }
+    button {
+        margin-right: 3px
+    }
+}
+.red-ui-info-outline-item-disabled {
+    .red-ui-search-result-node {
+        opacity: 0.4;
+    }
+    .red-ui-info-outline-item-label {
+        font-style: italic;
+        color: $secondary-text-color-disabled;
+    }
+    .red-ui-icons-flow {
+        opacity: 0.4;
+    }
+}
+
+
+
+.red-ui-icons {
+    display: inline-block;
+    width: 18px;
+    &:before {
+        white-space: pre;
+        content: ' '
+    }
+
+}
+
+.red-ui-icons-flow {
+    background-image: url('images/subflow_tab.svg');
+    background-repeat: no-repeat;
+    background-size: contain;
+    filter: brightness(2.5);
+}
+
+.red-ui-info-toolbar {
+    min-height: 39px;
+    height: 39px;
+    box-sizing: border-box;
+    text-align: left;
+    // padding-left: 9px;
+    // box-sizing: border-box;
+    // background: $palette-header-background;
+    // border-bottom: 1px solid $secondary-border-color;
+
+    .red-ui-searchBox-container {
+        position: absolute;
+        top: 6px;
+        right: 8px;
+        width: calc(100% - 150px);
+        max-width: 250px;
+        background: $palette-header-background;
+        input.red-ui-searchBox-input {
+            border: 1px solid $secondary-border-color;
+            border-radius: 3px;
+            font-size: 12px;
+            height: 26px;
+        }
+        input:focus.red-ui-searchBox-input {
+            border: 1px solid $secondary-border-color;
+        }
+        i.fa-search, i.fa-times {
+            top: 7px;
+        }
+    }
+
+}

packages/node_modules/@node-red/editor-client/src/sass/ui/common/searchBox.scss

@@ -32,6 +32,9 @@
         right: 5px;
         top: 9px;
     }
+    form.red-ui-searchBox-form {
+        margin: 0;
+    }
     input.red-ui-searchBox-input {
         border-radius: 0;
         border: none;

packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss

@@ -18,7 +18,7 @@
     border: 1px solid $form-input-border-color;
     border-radius: 4px;
     height: 34px;
-    display: inline-block;
+    display: inline-flex;
     padding: 0;
     margin: 0;
     vertical-align: middle;
@@ -26,12 +26,7 @@
     overflow:visible;
     position: relative;
     .red-ui-typedInput-input-wrap {
-        position: absolute;
+        flex-grow: 1;
-        left:0;
-        right:0;
-        top:0;
-        bottom:0;
-        outline: red;
     }
     input.red-ui-typedInput-input {
         width: 100%;
@@ -49,14 +44,17 @@
         border-color: $form-input-focus-color !important;
     }
     .red-ui-typedInput-value-label {
-        position: absolute;
+        flex-grow: 1;
         display: inline-block;
         height: 32px;
         box-sizing: border-box;
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
-
+        .red-ui-typedInput-value-label-inactive {
+            background: $secondary-background-disabled;
+            color: $secondary-text-color-disabled;
+        }
     }
 }
 .red-ui-typedInput-options {
@@ -104,18 +102,17 @@ button.red-ui-typedInput-option-trigger
  {
     text-align: left;
     border: none;
-    position: absolute;
+    flex-basis: auto;
     box-sizing: border-box;
     border-top-left-radius: 4px;
     border-bottom-left-radius: 4px;
     padding: 0 1px 0 5px;
-    display:inline-block;
     background: $form-button-background;
     height: 32px;
     line-height: 30px;
-    min-width: 23px;
     vertical-align: middle;
     color: $form-text-color;
+    white-space: nowrap;
     i.red-ui-typedInput-icon {
         margin-left: 1px;
         margin-right: 2px;
@@ -123,7 +120,7 @@ button.red-ui-typedInput-option-trigger
     }
     &.disabled {
         cursor: default;
-        i.red-ui-typedInput-icon {
+        > i.red-ui-typedInput-icon {
             color: $secondary-text-color-disabled;
         }
     }
@@ -151,7 +148,7 @@ button.red-ui-typedInput-option-trigger
         text-decoration: none;
     }
     &.red-ui-typedInput-full-width {
-        width: 100%;
+        flex-grow: 1;
         border-top-right-radius: 4px;
         border-bottom-right-radius: 4px;
     }
@@ -167,7 +164,6 @@ button.red-ui-typedInput-option-expand {
     border-bottom-right-radius: 4px;
     border-top-left-radius: 0;
     border-bottom-left-radius: 0;
-    right: 0;
 }
 
 button.red-ui-typedInput-option-trigger {
@@ -176,27 +172,23 @@ button.red-ui-typedInput-option-trigger {
     border-top-right-radius: 4px;
     border-bottom-right-radius: 4px;
     padding: 0 0 0 0;
-    position:absolute;
+    position:relative;
-    right: 0;
+    flex-grow: 1;
+    line-height: 32px;
+    display: inline-flex;
     .red-ui-typedInput-option-label {
         background:$form-button-background;
         color: $form-text-color;
-        position:absolute;
+        flex-grow: 1;
-        left:0;
+        padding: 0 0 0 8px;
-        right:23px;
+        display:inline-block;
-        top: 0;
-        padding: 0 5px 0 8px;
-        i.red-ui-typedInput-icon {
-            margin-right: 4px;
-        }
     }
     .red-ui-typedInput-option-caret {
-        top: 0;
+        flex-grow: 0;
-        position: absolute;
+        display:inline-block;
-        right: 0;
+        width: 23px;
-        bottom: 0;
+        text-align: center;
-        width: 17px;
+        height: 100%;
-        padding-left: 5px;
         &:before {
             content:'';
             display: inline-block;

packages/node_modules/@node-red/editor-client/src/sass/workspace.scss

@@ -112,7 +112,7 @@
     position: absolute;
     bottom: 0;
     right:0;
-    zIndex: 101;
+    z-index: 101;
     border-left: 1px solid $primary-border-color;
     border-top: 1px solid $primary-border-color;
     background: $view-navigator-background;
@@ -122,7 +122,7 @@
     stroke-dasharray: 5,5;
     pointer-events: none;
     stroke: $secondary-border-color;
-    strokeWidth: 1;
+    stroke-width: 1;
     fill: $view-background;
 }
 
@@ -172,3 +172,44 @@ button.red-ui-footer-button-toggle {
         margin-right: 0;
     }
 }
+
+
+#red-ui-loading-progress {
+    position: absolute;
+    background: $primary-background;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    left: 0;
+    z-index: 200;
+    & > div {
+        position: absolute;
+        top: 30%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        width: 300px;
+        height:80px;
+        text-align: center;
+        color: $secondary-text-color;
+
+    }
+}
+.red-ui-loading-bar {
+    box-sizing: border-box;
+    width: 300px;
+    height: 30px;
+    border: 2px solid $primary-border-color;
+    border-radius: 4px;
+
+    > span {
+        display: block;
+        height: 100%;
+        background: $secondary-border-color;
+        transition: width 0.2s;
+        width: 10%;
+    }
+}
+.red-ui-loading-bar-label {
+    font-size: 13px;
+    margin-bottom: 2px;
+}

packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-migrate-3.0.1.js

@@ -1,626 +0,0 @@
-/*!
- * jQuery Migrate - v3.0.1 - 2017-09-26
- * Copyright jQuery Foundation and other contributors
- */
-;( function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define( [ "jquery" ], window, factory );
-	} else if ( typeof module === "object" && module.exports ) {
-
-		// Node/CommonJS
-		// eslint-disable-next-line no-undef
-		module.exports = factory( require( "jquery" ), window );
-	} else {
-
-		// Browser globals
-		factory( jQuery, window );
-	}
-} )( function( jQuery, window ) {
-"use strict";
-
-
-jQuery.migrateVersion = "3.0.1";
-
-/* exported migrateWarn, migrateWarnFunc, migrateWarnProp */
-
-( function() {
-
-	var rbadVersions = /^[12]\./;
-
-	// Support: IE9 only
-	// IE9 only creates console object when dev tools are first opened
-	// IE9 console is a host object, callable but doesn't have .apply()
-	if ( !window.console || !window.console.log ) {
-		return;
-	}
-
-	// Need jQuery 3.0.0+ and no older Migrate loaded
-	if ( !jQuery || rbadVersions.test( jQuery.fn.jquery ) ) {
-		window.console.log( "JQMIGRATE: jQuery 3.0.0+ REQUIRED" );
-	}
-	if ( jQuery.migrateWarnings ) {
-		window.console.log( "JQMIGRATE: Migrate plugin loaded multiple times" );
-	}
-
-	// Show a message on the console so devs know we're active
-	window.console.log( "JQMIGRATE: Migrate is installed" +
-		( jQuery.migrateMute ? "" : " with logging active" ) +
-		", version " + jQuery.migrateVersion );
-
-} )();
-
-var warnedAbout = {};
-
-// List of warnings already given; public read only
-jQuery.migrateWarnings = [];
-
-// Set to false to disable traces that appear with warnings
-if ( jQuery.migrateTrace === undefined ) {
-	jQuery.migrateTrace = true;
-}
-
-// Forget any warnings we've already given; public
-jQuery.migrateReset = function() {
-	warnedAbout = {};
-	jQuery.migrateWarnings.length = 0;
-};
-
-function migrateWarn( msg ) {
-	var console = window.console;
-	if ( !warnedAbout[ msg ] ) {
-		warnedAbout[ msg ] = true;
-		jQuery.migrateWarnings.push( msg );
-		if ( console && console.warn && !jQuery.migrateMute ) {
-			console.warn( "JQMIGRATE: " + msg );
-			if ( jQuery.migrateTrace && console.trace ) {
-				console.trace();
-			}
-		}
-	}
-}
-
-function migrateWarnProp( obj, prop, value, msg ) {
-	Object.defineProperty( obj, prop, {
-		configurable: true,
-		enumerable: true,
-		get: function() {
-			migrateWarn( msg );
-			return value;
-		},
-		set: function( newValue ) {
-			migrateWarn( msg );
-			value = newValue;
-		}
-	} );
-}
-
-function migrateWarnFunc( obj, prop, newFunc, msg ) {
-	obj[ prop ] = function() {
-		migrateWarn( msg );
-		return newFunc.apply( this, arguments );
-	};
-}
-
-if ( window.document.compatMode === "BackCompat" ) {
-
-	// JQuery has never supported or tested Quirks Mode
-	migrateWarn( "jQuery is not compatible with Quirks Mode" );
-}
-
-
-var oldInit = jQuery.fn.init,
-	oldIsNumeric = jQuery.isNumeric,
-	oldFind = jQuery.find,
-	rattrHashTest = /\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/,
-	rattrHashGlob = /\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/g;
-
-jQuery.fn.init = function( arg1 ) {
-	var args = Array.prototype.slice.call( arguments );
-
-	if ( typeof arg1 === "string" && arg1 === "#" ) {
-
-		// JQuery( "#" ) is a bogus ID selector, but it returned an empty set before jQuery 3.0
-		migrateWarn( "jQuery( '#' ) is not a valid selector" );
-		args[ 0 ] = [];
-	}
-
-	return oldInit.apply( this, args );
-};
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.find = function( selector ) {
-	var args = Array.prototype.slice.call( arguments );
-
-	// Support: PhantomJS 1.x
-	// String#match fails to match when used with a //g RegExp, only on some strings
-	if ( typeof selector === "string" && rattrHashTest.test( selector ) ) {
-
-		// The nonstandard and undocumented unquoted-hash was removed in jQuery 1.12.0
-		// First see if qS thinks it's a valid selector, if so avoid a false positive
-		try {
-			window.document.querySelector( selector );
-		} catch ( err1 ) {
-
-			// Didn't *look* valid to qSA, warn and try quoting what we think is the value
-			selector = selector.replace( rattrHashGlob, function( _, attr, op, value ) {
-				return "[" + attr + op + "\"" + value + "\"]";
-			} );
-
-			// If the regexp *may* have created an invalid selector, don't update it
-			// Note that there may be false alarms if selector uses jQuery extensions
-			try {
-				window.document.querySelector( selector );
-				migrateWarn( "Attribute selector with '#' must be quoted: " + args[ 0 ] );
-				args[ 0 ] = selector;
-			} catch ( err2 ) {
-				migrateWarn( "Attribute selector with '#' was not fixed: " + args[ 0 ] );
-			}
-		}
-	}
-
-	return oldFind.apply( this, args );
-};
-
-// Copy properties attached to original jQuery.find method (e.g. .attr, .isXML)
-var findProp;
-for ( findProp in oldFind ) {
-	if ( Object.prototype.hasOwnProperty.call( oldFind, findProp ) ) {
-		jQuery.find[ findProp ] = oldFind[ findProp ];
-	}
-}
-
-// The number of elements contained in the matched element set
-jQuery.fn.size = function() {
-	migrateWarn( "jQuery.fn.size() is deprecated and removed; use the .length property" );
-	return this.length;
-};
-
-jQuery.parseJSON = function() {
-	migrateWarn( "jQuery.parseJSON is deprecated; use JSON.parse" );
-	return JSON.parse.apply( null, arguments );
-};
-
-jQuery.isNumeric = function( val ) {
-
-	// The jQuery 2.2.3 implementation of isNumeric
-	function isNumeric2( obj ) {
-		var realStringObj = obj && obj.toString();
-		return !jQuery.isArray( obj ) && ( realStringObj - parseFloat( realStringObj ) + 1 ) >= 0;
-	}
-
-	var newValue = oldIsNumeric( val ),
-		oldValue = isNumeric2( val );
-
-	if ( newValue !== oldValue ) {
-		migrateWarn( "jQuery.isNumeric() should not be called on constructed objects" );
-	}
-
-	return oldValue;
-};
-
-migrateWarnFunc( jQuery, "holdReady", jQuery.holdReady,
-	"jQuery.holdReady is deprecated" );
-
-migrateWarnFunc( jQuery, "unique", jQuery.uniqueSort,
-	"jQuery.unique is deprecated; use jQuery.uniqueSort" );
-
-// Now jQuery.expr.pseudos is the standard incantation
-migrateWarnProp( jQuery.expr, "filters", jQuery.expr.pseudos,
-	"jQuery.expr.filters is deprecated; use jQuery.expr.pseudos" );
-migrateWarnProp( jQuery.expr, ":", jQuery.expr.pseudos,
-	"jQuery.expr[':'] is deprecated; use jQuery.expr.pseudos" );
-
-
-var oldAjax = jQuery.ajax;
-
-jQuery.ajax = function( ) {
-	var jQXHR = oldAjax.apply( this, arguments );
-
-	// Be sure we got a jQXHR (e.g., not sync)
-	if ( jQXHR.promise ) {
-		migrateWarnFunc( jQXHR, "success", jQXHR.done,
-			"jQXHR.success is deprecated and removed" );
-		migrateWarnFunc( jQXHR, "error", jQXHR.fail,
-			"jQXHR.error is deprecated and removed" );
-		migrateWarnFunc( jQXHR, "complete", jQXHR.always,
-			"jQXHR.complete is deprecated and removed" );
-	}
-
-	return jQXHR;
-};
-
-
-var oldRemoveAttr = jQuery.fn.removeAttr,
-	oldToggleClass = jQuery.fn.toggleClass,
-	rmatchNonSpace = /\S+/g;
-
-jQuery.fn.removeAttr = function( name ) {
-	var self = this;
-
-	jQuery.each( name.match( rmatchNonSpace ), function( i, attr ) {
-		if ( jQuery.expr.match.bool.test( attr ) ) {
-			migrateWarn( "jQuery.fn.removeAttr no longer sets boolean properties: " + attr );
-			self.prop( attr, false );
-		}
-	} );
-
-	return oldRemoveAttr.apply( this, arguments );
-};
-
-jQuery.fn.toggleClass = function( state ) {
-
-	// Only deprecating no-args or single boolean arg
-	if ( state !== undefined && typeof state !== "boolean" ) {
-		return oldToggleClass.apply( this, arguments );
-	}
-
-	migrateWarn( "jQuery.fn.toggleClass( boolean ) is deprecated" );
-
-	// Toggle entire class name of each element
-	return this.each( function() {
-		var className = this.getAttribute && this.getAttribute( "class" ) || "";
-
-		if ( className ) {
-			jQuery.data( this, "__className__", className );
-		}
-
-		// If the element has a class name or if we're passed `false`,
-		// then remove the whole classname (if there was one, the above saved it).
-		// Otherwise bring back whatever was previously saved (if anything),
-		// falling back to the empty string if nothing was stored.
-		if ( this.setAttribute ) {
-			this.setAttribute( "class",
-				className || state === false ?
-				"" :
-				jQuery.data( this, "__className__" ) || ""
-			);
-		}
-	} );
-};
-
-
-var internalSwapCall = false;
-
-// If this version of jQuery has .swap(), don't false-alarm on internal uses
-if ( jQuery.swap ) {
-	jQuery.each( [ "height", "width", "reliableMarginRight" ], function( _, name ) {
-		var oldHook = jQuery.cssHooks[ name ] && jQuery.cssHooks[ name ].get;
-
-		if ( oldHook ) {
-			jQuery.cssHooks[ name ].get = function() {
-				var ret;
-
-				internalSwapCall = true;
-				ret = oldHook.apply( this, arguments );
-				internalSwapCall = false;
-				return ret;
-			};
-		}
-	} );
-}
-
-jQuery.swap = function( elem, options, callback, args ) {
-	var ret, name,
-		old = {};
-
-	if ( !internalSwapCall ) {
-		migrateWarn( "jQuery.swap() is undocumented and deprecated" );
-	}
-
-	// Remember the old values, and insert the new ones
-	for ( name in options ) {
-		old[ name ] = elem.style[ name ];
-		elem.style[ name ] = options[ name ];
-	}
-
-	ret = callback.apply( elem, args || [] );
-
-	// Revert the old values
-	for ( name in options ) {
-		elem.style[ name ] = old[ name ];
-	}
-
-	return ret;
-};
-
-var oldData = jQuery.data;
-
-jQuery.data = function( elem, name, value ) {
-	var curData;
-
-	// Name can be an object, and each entry in the object is meant to be set as data
-	if ( name && typeof name === "object" && arguments.length === 2 ) {
-		curData = jQuery.hasData( elem ) && oldData.call( this, elem );
-		var sameKeys = {};
-		for ( var key in name ) {
-			if ( key !== jQuery.camelCase( key ) ) {
-				migrateWarn( "jQuery.data() always sets/gets camelCased names: " + key );
-				curData[ key ] = name[ key ];
-			} else {
-				sameKeys[ key ] = name[ key ];
-			}
-		}
-
-		oldData.call( this, elem, sameKeys );
-
-		return name;
-	}
-
-	// If the name is transformed, look for the un-transformed name in the data object
-	if ( name && typeof name === "string" && name !== jQuery.camelCase( name ) ) {
-		curData = jQuery.hasData( elem ) && oldData.call( this, elem );
-		if ( curData && name in curData ) {
-			migrateWarn( "jQuery.data() always sets/gets camelCased names: " + name );
-			if ( arguments.length > 2 ) {
-				curData[ name ] = value;
-			}
-			return curData[ name ];
-		}
-	}
-
-	return oldData.apply( this, arguments );
-};
-
-var oldTweenRun = jQuery.Tween.prototype.run;
-var linearEasing = function( pct ) {
-		return pct;
-	};
-
-jQuery.Tween.prototype.run = function( ) {
-	if ( jQuery.easing[ this.easing ].length > 1 ) {
-		migrateWarn(
-			"'jQuery.easing." + this.easing.toString() + "' should use only one argument"
-		);
-
-		jQuery.easing[ this.easing ] = linearEasing;
-	}
-
-	oldTweenRun.apply( this, arguments );
-};
-
-jQuery.fx.interval = jQuery.fx.interval || 13;
-
-// Support: IE9, Android <=4.4
-// Avoid false positives on browsers that lack rAF
-if ( window.requestAnimationFrame ) {
-	migrateWarnProp( jQuery.fx, "interval", jQuery.fx.interval,
-		"jQuery.fx.interval is deprecated" );
-}
-
-var oldLoad = jQuery.fn.load,
-	oldEventAdd = jQuery.event.add,
-	originalFix = jQuery.event.fix;
-
-jQuery.event.props = [];
-jQuery.event.fixHooks = {};
-
-migrateWarnProp( jQuery.event.props, "concat", jQuery.event.props.concat,
-	"jQuery.event.props.concat() is deprecated and removed" );
-
-jQuery.event.fix = function( originalEvent ) {
-	var event,
-		type = originalEvent.type,
-		fixHook = this.fixHooks[ type ],
-		props = jQuery.event.props;
-
-	if ( props.length ) {
-		migrateWarn( "jQuery.event.props are deprecated and removed: " + props.join() );
-		while ( props.length ) {
-			jQuery.event.addProp( props.pop() );
-		}
-	}
-
-	if ( fixHook && !fixHook._migrated_ ) {
-		fixHook._migrated_ = true;
-		migrateWarn( "jQuery.event.fixHooks are deprecated and removed: " + type );
-		if ( ( props = fixHook.props ) && props.length ) {
-			while ( props.length ) {
-				jQuery.event.addProp( props.pop() );
-			}
-		}
-	}
-
-	event = originalFix.call( this, originalEvent );
-
-	return fixHook && fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
-};
-
-jQuery.event.add = function( elem, types ) {
-
-	// This misses the multiple-types case but that seems awfully rare
-	if ( elem === window && types === "load" && window.document.readyState === "complete" ) {
-		migrateWarn( "jQuery(window).on('load'...) called after load event occurred" );
-	}
-	return oldEventAdd.apply( this, arguments );
-};
-
-jQuery.each( [ "load", "unload", "error" ], function( _, name ) {
-
-	jQuery.fn[ name ] = function() {
-		var args = Array.prototype.slice.call( arguments, 0 );
-
-		// If this is an ajax load() the first arg should be the string URL;
-		// technically this could also be the "Anything" arg of the event .load()
-		// which just goes to show why this dumb signature has been deprecated!
-		// jQuery custom builds that exclude the Ajax module justifiably die here.
-		if ( name === "load" && typeof args[ 0 ] === "string" ) {
-			return oldLoad.apply( this, args );
-		}
-
-		migrateWarn( "jQuery.fn." + name + "() is deprecated" );
-
-		args.splice( 0, 0, name );
-		if ( arguments.length ) {
-			return this.on.apply( this, args );
-		}
-
-		// Use .triggerHandler here because:
-		// - load and unload events don't need to bubble, only applied to window or image
-		// - error event should not bubble to window, although it does pre-1.7
-		// See http://bugs.jquery.com/ticket/11820
-		this.triggerHandler.apply( this, args );
-		return this;
-	};
-
-} );
-
-jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup contextmenu" ).split( " " ),
-	function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		migrateWarn( "jQuery.fn." + name + "() event shorthand is deprecated" );
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
-	};
-} );
-
-// Trigger "ready" event only once, on document ready
-jQuery( function() {
-	jQuery( window.document ).triggerHandler( "ready" );
-} );
-
-jQuery.event.special.ready = {
-	setup: function() {
-		if ( this === window.document ) {
-			migrateWarn( "'ready' event is deprecated" );
-		}
-	}
-};
-
-jQuery.fn.extend( {
-
-	bind: function( types, data, fn ) {
-		migrateWarn( "jQuery.fn.bind() is deprecated" );
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		migrateWarn( "jQuery.fn.unbind() is deprecated" );
-		return this.off( types, null, fn );
-	},
-	delegate: function( selector, types, data, fn ) {
-		migrateWarn( "jQuery.fn.delegate() is deprecated" );
-		return this.on( types, selector, data, fn );
-	},
-	undelegate: function( selector, types, fn ) {
-		migrateWarn( "jQuery.fn.undelegate() is deprecated" );
-		return arguments.length === 1 ?
-			this.off( selector, "**" ) :
-			this.off( types, selector || "**", fn );
-	},
-	hover: function( fnOver, fnOut ) {
-		migrateWarn( "jQuery.fn.hover() is deprecated" );
-		return this.on( "mouseenter", fnOver ).on( "mouseleave", fnOut || fnOver );
-	}
-} );
-
-
-var oldOffset = jQuery.fn.offset;
-
-jQuery.fn.offset = function() {
-	var docElem,
-		elem = this[ 0 ],
-		origin = { top: 0, left: 0 };
-
-	if ( !elem || !elem.nodeType ) {
-		migrateWarn( "jQuery.fn.offset() requires a valid DOM element" );
-		return origin;
-	}
-
-	docElem = ( elem.ownerDocument || window.document ).documentElement;
-	if ( !jQuery.contains( docElem, elem ) ) {
-		migrateWarn( "jQuery.fn.offset() requires an element connected to a document" );
-		return origin;
-	}
-
-	return oldOffset.apply( this, arguments );
-};
-
-
-var oldParam = jQuery.param;
-
-jQuery.param = function( data, traditional ) {
-	var ajaxTraditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
-
-	if ( traditional === undefined && ajaxTraditional ) {
-
-		migrateWarn( "jQuery.param() no longer uses jQuery.ajaxSettings.traditional" );
-		traditional = ajaxTraditional;
-	}
-
-	return oldParam.call( this, data, traditional );
-};
-
-var oldSelf = jQuery.fn.andSelf || jQuery.fn.addBack;
-
-jQuery.fn.andSelf = function() {
-	migrateWarn( "jQuery.fn.andSelf() is deprecated and removed, use jQuery.fn.addBack()" );
-	return oldSelf.apply( this, arguments );
-};
-
-
-var oldDeferred = jQuery.Deferred,
-	tuples = [
-
-		// Action, add listener, callbacks, .then handlers, final state
-		[ "resolve", "done", jQuery.Callbacks( "once memory" ),
-			jQuery.Callbacks( "once memory" ), "resolved" ],
-		[ "reject", "fail", jQuery.Callbacks( "once memory" ),
-			jQuery.Callbacks( "once memory" ), "rejected" ],
-		[ "notify", "progress", jQuery.Callbacks( "memory" ),
-			jQuery.Callbacks( "memory" ) ]
-	];
-
-jQuery.Deferred = function( func ) {
-	var deferred = oldDeferred(),
-		promise = deferred.promise();
-
-	deferred.pipe = promise.pipe = function( /* fnDone, fnFail, fnProgress */ ) {
-		var fns = arguments;
-
-		migrateWarn( "deferred.pipe() is deprecated" );
-
-		return jQuery.Deferred( function( newDefer ) {
-			jQuery.each( tuples, function( i, tuple ) {
-				var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
-
-				// Deferred.done(function() { bind to newDefer or newDefer.resolve })
-				// deferred.fail(function() { bind to newDefer or newDefer.reject })
-				// deferred.progress(function() { bind to newDefer or newDefer.notify })
-				deferred[ tuple[ 1 ] ]( function() {
-					var returned = fn && fn.apply( this, arguments );
-					if ( returned && jQuery.isFunction( returned.promise ) ) {
-						returned.promise()
-							.done( newDefer.resolve )
-							.fail( newDefer.reject )
-							.progress( newDefer.notify );
-					} else {
-						newDefer[ tuple[ 0 ] + "With" ](
-							this === promise ? newDefer.promise() : this,
-							fn ? [ returned ] : arguments
-						);
-					}
-				} );
-			} );
-			fns = null;
-		} ).promise();
-
-	};
-
-	if ( func ) {
-		func.call( deferred, deferred );
-	}
-
-	return deferred;
-};
-
-// Preserve handler of uncaught exceptions in promise chains
-jQuery.Deferred.exceptionHook = oldDeferred.exceptionHook;
-
-return jQuery;
-} );

packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-migrate-3.0.1.min.js

@@ -1,215 +0,0 @@
-/*! jQuery Migrate v3.0.1 | (c) jQuery Foundation and other contributors | jquery.org/license */
-
-void 0 === jQuery.migrateMute && (jQuery.migrateMute = !0), function(e) {
-    "function" == typeof define && define.amd ? define([ "jquery" ], window, e) : "object" == typeof module && module.exports ? module.exports = e(require("jquery"), window) : e(jQuery, window);
-}(function(e, t) {
-    "use strict";
-    function r(r) {
-        var n = t.console;
-        o[r] || (o[r] = !0, e.migrateWarnings.push(r), n && n.warn && !e.migrateMute && (n.warn("JQMIGRATE: " + r), 
-        e.migrateTrace && n.trace && n.trace()));
-    }
-    function n(e, t, n, a) {
-        Object.defineProperty(e, t, {
-            configurable: !0,
-            enumerable: !0,
-            get: function() {
-                return r(a), n;
-            },
-            set: function(e) {
-                r(a), n = e;
-            }
-        });
-    }
-    function a(e, t, n, a) {
-        e[t] = function() {
-            return r(a), n.apply(this, arguments);
-        };
-    }
-    e.migrateVersion = "3.0.1", function() {
-        var r = /^[12]\./;
-        t.console && t.console.log && (e && !r.test(e.fn.jquery) || t.console.log("JQMIGRATE: jQuery 3.0.0+ REQUIRED"), 
-        e.migrateWarnings && t.console.log("JQMIGRATE: Migrate plugin loaded multiple times"), 
-        t.console.log("JQMIGRATE: Migrate is installed" + (e.migrateMute ? "" : " with logging active") + ", version " + e.migrateVersion));
-    }();
-    var o = {};
-    e.migrateWarnings = [], void 0 === e.migrateTrace && (e.migrateTrace = !0), e.migrateReset = function() {
-        o = {}, e.migrateWarnings.length = 0;
-    }, "BackCompat" === t.document.compatMode && r("jQuery is not compatible with Quirks Mode");
-    var i = e.fn.init, s = e.isNumeric, u = e.find, c = /\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/, l = /\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/g;
-    e.fn.init = function(e) {
-        var t = Array.prototype.slice.call(arguments);
-        return "string" == typeof e && "#" === e && (r("jQuery( '#' ) is not a valid selector"), 
-        t[0] = []), i.apply(this, t);
-    }, e.fn.init.prototype = e.fn, e.find = function(e) {
-        var n = Array.prototype.slice.call(arguments);
-        if ("string" == typeof e && c.test(e)) try {
-            t.document.querySelector(e);
-        } catch (a) {
-            e = e.replace(l, function(e, t, r, n) {
-                return "[" + t + r + '"' + n + '"]';
-            });
-            try {
-                t.document.querySelector(e), r("Attribute selector with '#' must be quoted: " + n[0]), 
-                n[0] = e;
-            } catch (e) {
-                r("Attribute selector with '#' was not fixed: " + n[0]);
-            }
-        }
-        return u.apply(this, n);
-    };
-    var d;
-    for (d in u) Object.prototype.hasOwnProperty.call(u, d) && (e.find[d] = u[d]);
-    e.fn.size = function() {
-        return r("jQuery.fn.size() is deprecated and removed; use the .length property"), 
-        this.length;
-    }, e.parseJSON = function() {
-        return r("jQuery.parseJSON is deprecated; use JSON.parse"), JSON.parse.apply(null, arguments);
-    }, e.isNumeric = function(t) {
-        var n = s(t), a = function(t) {
-            var r = t && t.toString();
-            return !e.isArray(t) && r - parseFloat(r) + 1 >= 0;
-        }(t);
-        return n !== a && r("jQuery.isNumeric() should not be called on constructed objects"), 
-        a;
-    }, a(e, "holdReady", e.holdReady, "jQuery.holdReady is deprecated"), a(e, "unique", e.uniqueSort, "jQuery.unique is deprecated; use jQuery.uniqueSort"), 
-    n(e.expr, "filters", e.expr.pseudos, "jQuery.expr.filters is deprecated; use jQuery.expr.pseudos"), 
-    n(e.expr, ":", e.expr.pseudos, "jQuery.expr[':'] is deprecated; use jQuery.expr.pseudos");
-    var p = e.ajax;
-    e.ajax = function() {
-        var e = p.apply(this, arguments);
-        return e.promise && (a(e, "success", e.done, "jQXHR.success is deprecated and removed"), 
-        a(e, "error", e.fail, "jQXHR.error is deprecated and removed"), a(e, "complete", e.always, "jQXHR.complete is deprecated and removed")), 
-        e;
-    };
-    var f = e.fn.removeAttr, y = e.fn.toggleClass, m = /\S+/g;
-    e.fn.removeAttr = function(t) {
-        var n = this;
-        return e.each(t.match(m), function(t, a) {
-            e.expr.match.bool.test(a) && (r("jQuery.fn.removeAttr no longer sets boolean properties: " + a), 
-            n.prop(a, !1));
-        }), f.apply(this, arguments);
-    }, e.fn.toggleClass = function(t) {
-        return void 0 !== t && "boolean" != typeof t ? y.apply(this, arguments) : (r("jQuery.fn.toggleClass( boolean ) is deprecated"), 
-        this.each(function() {
-            var r = this.getAttribute && this.getAttribute("class") || "";
-            r && e.data(this, "__className__", r), this.setAttribute && this.setAttribute("class", r || !1 === t ? "" : e.data(this, "__className__") || "");
-        }));
-    };
-    var h = !1;
-    e.swap && e.each([ "height", "width", "reliableMarginRight" ], function(t, r) {
-        var n = e.cssHooks[r] && e.cssHooks[r].get;
-        n && (e.cssHooks[r].get = function() {
-            var e;
-            return h = !0, e = n.apply(this, arguments), h = !1, e;
-        });
-    }), e.swap = function(e, t, n, a) {
-        var o, i, s = {};
-        h || r("jQuery.swap() is undocumented and deprecated");
-        for (i in t) s[i] = e.style[i], e.style[i] = t[i];
-        o = n.apply(e, a || []);
-        for (i in t) e.style[i] = s[i];
-        return o;
-    };
-    var g = e.data;
-    e.data = function(t, n, a) {
-        var o;
-        if (n && "object" == typeof n && 2 === arguments.length) {
-            o = e.hasData(t) && g.call(this, t);
-            var i = {};
-            for (var s in n) s !== e.camelCase(s) ? (r("jQuery.data() always sets/gets camelCased names: " + s), 
-            o[s] = n[s]) : i[s] = n[s];
-            return g.call(this, t, i), n;
-        }
-        return n && "string" == typeof n && n !== e.camelCase(n) && (o = e.hasData(t) && g.call(this, t)) && n in o ? (r("jQuery.data() always sets/gets camelCased names: " + n), 
-        arguments.length > 2 && (o[n] = a), o[n]) : g.apply(this, arguments);
-    };
-    var v = e.Tween.prototype.run, j = function(e) {
-        return e;
-    };
-    e.Tween.prototype.run = function() {
-        e.easing[this.easing].length > 1 && (r("'jQuery.easing." + this.easing.toString() + "' should use only one argument"), 
-        e.easing[this.easing] = j), v.apply(this, arguments);
-    }, e.fx.interval = e.fx.interval || 13, t.requestAnimationFrame && n(e.fx, "interval", e.fx.interval, "jQuery.fx.interval is deprecated");
-    var Q = e.fn.load, b = e.event.add, w = e.event.fix;
-    e.event.props = [], e.event.fixHooks = {}, n(e.event.props, "concat", e.event.props.concat, "jQuery.event.props.concat() is deprecated and removed"), 
-    e.event.fix = function(t) {
-        var n, a = t.type, o = this.fixHooks[a], i = e.event.props;
-        if (i.length) for (r("jQuery.event.props are deprecated and removed: " + i.join()); i.length; ) e.event.addProp(i.pop());
-        if (o && !o._migrated_ && (o._migrated_ = !0, r("jQuery.event.fixHooks are deprecated and removed: " + a), 
-        (i = o.props) && i.length)) for (;i.length; ) e.event.addProp(i.pop());
-        return n = w.call(this, t), o && o.filter ? o.filter(n, t) : n;
-    }, e.event.add = function(e, n) {
-        return e === t && "load" === n && "complete" === t.document.readyState && r("jQuery(window).on('load'...) called after load event occurred"), 
-        b.apply(this, arguments);
-    }, e.each([ "load", "unload", "error" ], function(t, n) {
-        e.fn[n] = function() {
-            var e = Array.prototype.slice.call(arguments, 0);
-            return "load" === n && "string" == typeof e[0] ? Q.apply(this, e) : (r("jQuery.fn." + n + "() is deprecated"), 
-            e.splice(0, 0, n), arguments.length ? this.on.apply(this, e) : (this.triggerHandler.apply(this, e), 
-            this));
-        };
-    }), e.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "), function(t, n) {
-        e.fn[n] = function(e, t) {
-            return r("jQuery.fn." + n + "() event shorthand is deprecated"), arguments.length > 0 ? this.on(n, null, e, t) : this.trigger(n);
-        };
-    }), e(function() {
-        e(t.document).triggerHandler("ready");
-    }), e.event.special.ready = {
-        setup: function() {
-            this === t.document && r("'ready' event is deprecated");
-        }
-    }, e.fn.extend({
-        bind: function(e, t, n) {
-            return r("jQuery.fn.bind() is deprecated"), this.on(e, null, t, n);
-        },
-        unbind: function(e, t) {
-            return r("jQuery.fn.unbind() is deprecated"), this.off(e, null, t);
-        },
-        delegate: function(e, t, n, a) {
-            return r("jQuery.fn.delegate() is deprecated"), this.on(t, e, n, a);
-        },
-        undelegate: function(e, t, n) {
-            return r("jQuery.fn.undelegate() is deprecated"), 1 === arguments.length ? this.off(e, "**") : this.off(t, e || "**", n);
-        },
-        hover: function(e, t) {
-            return r("jQuery.fn.hover() is deprecated"), this.on("mouseenter", e).on("mouseleave", t || e);
-        }
-    });
-    var x = e.fn.offset;
-    e.fn.offset = function() {
-        var n, a = this[0], o = {
-            top: 0,
-            left: 0
-        };
-        return a && a.nodeType ? (n = (a.ownerDocument || t.document).documentElement, e.contains(n, a) ? x.apply(this, arguments) : (r("jQuery.fn.offset() requires an element connected to a document"), 
-        o)) : (r("jQuery.fn.offset() requires a valid DOM element"), o);
-    };
-    var k = e.param;
-    e.param = function(t, n) {
-        var a = e.ajaxSettings && e.ajaxSettings.traditional;
-        return void 0 === n && a && (r("jQuery.param() no longer uses jQuery.ajaxSettings.traditional"), 
-        n = a), k.call(this, t, n);
-    };
-    var A = e.fn.andSelf || e.fn.addBack;
-    e.fn.andSelf = function() {
-        return r("jQuery.fn.andSelf() is deprecated and removed, use jQuery.fn.addBack()"), 
-        A.apply(this, arguments);
-    };
-    var S = e.Deferred, q = [ [ "resolve", "done", e.Callbacks("once memory"), e.Callbacks("once memory"), "resolved" ], [ "reject", "fail", e.Callbacks("once memory"), e.Callbacks("once memory"), "rejected" ], [ "notify", "progress", e.Callbacks("memory"), e.Callbacks("memory") ] ];
-    return e.Deferred = function(t) {
-        var n = S(), a = n.promise();
-        return n.pipe = a.pipe = function() {
-            var t = arguments;
-            return r("deferred.pipe() is deprecated"), e.Deferred(function(r) {
-                e.each(q, function(o, i) {
-                    var s = e.isFunction(t[o]) && t[o];
-                    n[i[1]](function() {
-                        var t = s && s.apply(this, arguments);
-                        t && e.isFunction(t.promise) ? t.promise().done(r.resolve).fail(r.reject).progress(r.notify) : r[i[0] + "With"](this === a ? r.promise() : this, s ? [ t ] : arguments);
-                    });
-                }), t = null;
-            }).promise();
-        }, t && t.call(n, n), n;
-    }, e.Deferred.exceptionHook = S.exceptionHook, e;
-});

packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js

@@ -11,6 +11,7 @@
         var length = str.length;
         var start = 0;
         var inString = false;
+        var inRegex = false;
         var inBox = false;
         var quoteChar;
         var list = [];
@@ -24,8 +25,13 @@
         }
         for (var i=0;i<length;i++) {
             var c = str[i];
-            if (!inString) {
+            if (!inString && !inRegex) {
-                if (c === "'" || c === '"') {
+                if (c === "/") {
+                    inRegex = true;
+                    frame = {type:"regex",pos:i};
+                    list.push(frame);
+                    stack.push(frame);
+                } else if (c === "'" || c === '"') {
                     inString = true;
                     quoteChar = c;
                     frame = {type:"string",pos:i};
@@ -37,6 +43,9 @@
                 } else if (c === ",") {
                     frame = {type:",",pos:i};
                     list.push(frame);
+                } else if (c === "&") {
+                    frame = {type:"&",pos:i};
+                    list.push(frame);
                 } else if (/[\(\[\{]/.test(c)) {
                     frame = {type:"open-block",char:c,pos:i};
                     list.push(frame);
@@ -44,7 +53,8 @@
                 } else if (/[\}\)\]]/.test(c)) {
                     var oldFrame = stack.pop();
                     if (matchingBrackets[oldFrame.char] !== c) {
-                        //console.log("Stack frame mismatch",c,"at",i,"expected",matchingBrackets[oldFrame.char],"from",oldFrame.pos);
+                        // console.log("Stack frame mismatch",c,"at",i,"expected",matchingBrackets[oldFrame.char],"from",oldFrame.pos);
+                        // console.log(list);
                         return str;
                     }
                     //console.log("Closing",c,"at",i,"compare",oldFrame.type,oldFrame.pos);
@@ -53,19 +63,32 @@
                     list.push(frame);
                 }
             } else {
-                if (c === quoteChar) {
+                if (c === "\\") {
-                    // Next char must be a ]
+                    // an escaped char - stay in current mode and skip the next char
-                    inString = false;
+                    i++;
-                    stack.pop();
+                }
+                if (inString) {
+                    if (c === quoteChar) {
+                        // Next char must be a ]
+                        inString = false;
+                        var f = stack.pop();
+                        f.end = i;
+                    }
+                } else if (inRegex) {
+                    if (c === "/") {
+                        inRegex = false;
+                        var f = stack.pop();
+                        f.end = i;
+                    }
                 }
             }
-
         }
-        // console.log(stack);
+        // console.log("list",list);
+
         var result = str;
         var indent = 0;
         var offset = 0;
-        var pre,post,indented;
+        var pre,post,indented,hasNewline;
         var longStack = [];
         list.forEach(function(f) {
             if (f.type === ";" || f.type === ",") {
@@ -73,29 +96,51 @@
                     pre = result.substring(0,offset+f.pos+1);
                     post = result.substring(offset+f.pos+1);
                     indented = indentLine(post,indent);
-                    result = pre+"\n"+indented;
+                    hasNewline = /\n$/.test(pre);
-                    offset += indented.length-post.length+1;
+                    // console.log("A§"+pre+"§\n§"+indented+"§",hasNewline);
+                    result = pre+(hasNewline?"":"\n")+indented;
+                    offset += indented.length-post.length+(hasNewline?0:1);
                 }
+            } else if (f.type === "&") {
+                pre = result.substring(0,offset+f.pos+1);
+                var lastLineBreak = pre.lastIndexOf("\n");
+                var lineLength = pre.length - lastLineBreak;
+                if (lineLength > 70) {
+                    post = result.substring(offset+f.pos+1);
+                    if (!/^\n/.test(post)) {
+                        indented = indentLine(post,indent);
+                        hasNewline = /\n$/.test(pre);
+                        result = pre+(hasNewline?"":"\n")+indented;
+                        offset += indented.length-post.length+(hasNewline?0:1);
+                    }
+                }
+
             } else if (f.type === "open-block") {
-                if (f.width > 30) {
+                if (f.width > 40) {
                     longStack.push(true);
                     indent += 4;
                     pre = result.substring(0,offset+f.pos+1);
                     post = result.substring(offset+f.pos+1);
+                    hasNewline = /\n$/.test(pre);
                     indented = indentLine(post,indent);
-                    result = pre+"\n"+indented;
+                    result = pre+(hasNewline?"":"\n")+indented;
-                    offset += indented.length-post.length+1;
+                    offset += indented.length-post.length+(hasNewline?0:1);
                 } else {
                     longStack.push(false);
                 }
             } else if (f.type === "close-block") {
-                if (f.width > 30) {
+                if (f.width > 40) {
                     indent -= 4;
                     pre = result.substring(0,offset+f.pos);
                     post = result.substring(offset+f.pos);
                     indented = indentLine(post,indent);
-                    result = pre+"\n"+indented;
+                    hasNewline = /\n *$/.test(pre);
-                    offset += indented.length-post.length+1;
+                    if (hasNewline) {
+                        result = pre + post;
+                    } else {
+                        result = pre+"\n"+indented;
+                        offset += indented.length-post.length+1;
+                    }
                 }
                 longStack.pop();
             }
@@ -171,6 +216,7 @@
         '$sum':{ args:[ 'array' ]},
         '$toMillis':{args:['timestamp']}, // <-------------
         '$trim':{ args:[ 'str' ]},
+        '$type':{ args:['value']},
         '$uppercase':{ args:[ 'str' ]},
         '$zip':{ args:[ 'array1' ]}
     }

packages/node_modules/@node-red/editor-client/src/vendor/jsonata/mode-jsonata.js

@@ -28,6 +28,11 @@ ace.define("ace/mode/jsonata",["require","exports","module","ace/lib/oop","ace/m
         }, "identifier");
         this.$rules = {
             "start" : [
+                {
+                    token: "string.regexp",
+                    regex: "\\/",
+                    next: "regex"
+                },
                 {
                     token : "string",
                     regex : "'(?=.)",
@@ -46,34 +51,35 @@ ace.define("ace/mode/jsonata",["require","exports","module","ace/lib/oop","ace/m
                     token : "constant.numeric", // float
                     regex : /[+-]?\d[\d_]*(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/
                 },
-                {   token: "keyword",
+                {
-                regex: /λ/
+                    token: "keyword",
-            },
+                    regex: /λ/
-            {
+                },
-                token: "keyword",
+                {
-                regex: jsonataFunctions
+                    token: "keyword",
-            },
+                    regex: jsonataFunctions
-            {
+                },
-                token : keywordMapper,
+                {
-                regex : "[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*"
+                    token : keywordMapper,
-            },
+                    regex : "[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*"
-            {
+                },
-                token : "punctuation.operator",
+                {
-                regex : /[.](?![.])/
+                    token : "punctuation.operator",
-            },
+                    regex : /[.](?![.])/
-            {
+                },
-                token : "keyword.operator",
+                {
-                regex : /\|\||<=|>=|\.\.|\*\*|!=|:=|[=<>`!$%&*+\-~\/^]/,
+                    token : "keyword.operator",
-                next  : "start"
+                    regex : /\|\||<=|>=|\.\.|\*\*|!=|:=|[=<>`!$%&*+\-~\/^]/,
-            },
+                    next  : "start"
-            {
+                },
-                token : "punctuation.operator",
+                {
-                regex : /[?:,;.]/,
+                    token : "punctuation.operator",
-                next  : "start"
+                    regex : /[?:,;.]/,
-            },
+                    next  : "start"
-            {
+                },
-                token : "paren.lparen",
+                {
-                regex : /[\[({]/,
+                    token : "paren.lparen",
+                    regex : /[\[({]/,
                     next  : "start"
                 },
                 {
@@ -86,7 +92,8 @@ ace.define("ace/mode/jsonata",["require","exports","module","ace/lib/oop","ace/m
                     token : "string",
                     regex : '"|$',
                     next  : "start"
-                }, {
+                },
+                {
                     defaultToken: "string"
                 }
             ],
@@ -95,9 +102,24 @@ ace.define("ace/mode/jsonata",["require","exports","module","ace/lib/oop","ace/m
                     token : "string",
                     regex : "'|$",
                     next  : "start"
-                }, {
+                },
+                {
                     defaultToken: "string"
                 }
+            ],
+            "regex" : [
+                {
+                    token: "string.regexp",
+                    regex: "\\\\/"
+                },
+                {
+                    token: "string.regexp",
+                    regex: "/[sxngimy]*",
+                    next: "start"
+                },
+                {
+                    defaultToken: "string.regexp"
+                }
             ]
         };
     };

packages/node_modules/@node-red/nodes/core/common/20-inject.html

@@ -14,16 +14,14 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="inject">
+<script type="text/html" data-template-name="inject">
     <div class="form-row">
-        <label for="node-input-payload"><i class="fa fa-envelope"></i> <span data-i18n="common.label.payload"></span></label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
-        <input type="text" id="node-input-payload" style="width:70%">
+        <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
-        <input type="hidden" id="node-input-payloadType">
     </div>
 
-    <div class="form-row">
+    <div class="form-row node-input-property-container-row">
-        <label for="node-input-topic"><i class="fa fa-tasks"></i> <span data-i18n="common.label.topic"></span></label>
+        <ol id="node-input-property-container"></ol>
-        <input type="text" id="node-input-topic">
     </div>
 
     <div class="form-row" id="node-once">
@@ -114,12 +112,7 @@
             </div>
         </div>
     </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
-    </div>
 
-    <div class="form-tips" data-i18n="[html]inject.tip"></div>
 </script>
 <style>
     .inject-time-row {
@@ -155,37 +148,76 @@
 </style>
 
 <script type="text/javascript">
+(function() {
+
+    function resizeDialog(size) {
+        size = size || { height: $(".red-ui-tray-content form").height() }
+        var rows = $("#dialog-form>div:not(.node-input-property-container-row):visible");
+        var height = size.height;
+        for (var i=0; i<rows.length; i++) {
+            height -= $(rows[i]).outerHeight(true);
+        }
+        var editorRow = $("#dialog-form>div.node-input-property-container-row");
+        height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
+        height += 16;
+        $("#node-input-property-container").editableList('height',height);
+    }
+
     RED.nodes.registerType('inject',{
         category: 'common',
         color:"#a6bbcf",
         defaults: {
             name: {value:""},
-            topic: {value:""},
+            props:{value:[{p:"payload"},{p:"topic",vt:"str"}]},
-            payload: {value:"", validate: RED.validators.typedInput("payloadType")},
-            payloadType: {value:"date"},
             repeat: {value:"", validate:function(v) { return ((v === "") || (RED.validators.number(v) && (v >= 0) && (v <= 2147483))) }},
             crontab: {value:""},
             once: {value:false},
-            onceDelay: {value:0.1}
+            onceDelay: {value:0.1},
+            topic: {value:""},
+            payload: {value:"", validate: RED.validators.typedInput("payloadType")},
+            payloadType: {value:"date"},
         },
         icon: "inject.svg",
         inputs:0,
         outputs:1,
         outputLabels: function(index) {
-            var lab = this.payloadType;
+            var lab = '';
-            if (lab === "json") {
+
-                try {
+            // if only payload and topic - display payload type
-                    lab = typeof JSON.parse(this.payload);
+            // if only one property - show it's type
-                    if (lab === "object") {
+            // if more than one property (other than payload and topic) - show "x properties" where x is the number of properties.
-                        if (Array.isArray(JSON.parse(this.payload))) { lab = "Array"; }
+            // this.props will not be an array for legacy inject nodes until they are re-deployed
-                    }
+            //
-                } catch(e) {
+            var props = this.props;
-                    return this._("inject.label.invalid"); }
+            if (!Array.isArray(props)) {
+                props = [
+                    { p:"payload", v: this.payload, vt: this.payloadType },
+                    { p:"topic", v: this.topic, vt: "str" }
+                ]
             }
-            var name = "inject.label."+lab;
+            if (props) {
-            var label = this._(name);
+                for (var i=0,l=props.length; i<l; i++) {
-            if (name !== label) {
+                    if (i > 0) lab += "\n";
-                return label;
+                    if (i === 5) {
+                        lab += " + "+(props.length-4);
+                        break;
+                    }
+                    lab += props[i].p+": ";
+
+                    var propType = props[i].p === "payload"? this.payloadType : props[i].vt;
+                    if (propType === "json") {
+                        try {
+                            var parsedProp = JSON.parse(props[i].p === "payload"? this.payload : props[i].v);
+                            propType = typeof parsedProp;
+                            if (propType === "object" && Array.isArray(parsedProp)) {
+                                propType = "Array";
+                            }
+                        } catch(e) {
+                            propType = "invalid";
+                        }
+                    }
+                    lab += this._("inject.label."+propType);
+                }
             }
             return lab;
         },
@@ -201,27 +233,33 @@
             }
             if (this.name) {
                 return this.name+suffix;
-            } else if (this.payloadType === "string" ||
+            }
-                    this.payloadType === "str" ||
+
-                    this.payloadType === "num" ||
+            var payload = this.payload || "";
-                    this.payloadType === "bool" ||
+            var payloadType = this.payloadType || "str";
-                    this.payloadType === "json") {
+            var topic = this.topic || "";
-                if ((this.topic !== "") && ((this.topic.length + this.payload.length) <= 32)) {
+
-                    return this.topic + ":" + this.payload+suffix;
+            if (payloadType === "string" ||
-                } else if (this.payload.length > 0 && this.payload.length < 24) {
+                    payloadType === "str" ||
-                    return this.payload+suffix;
+                    payloadType === "num" ||
+                    payloadType === "bool" ||
+                    payloadType === "json") {
+                if ((topic !== "") && ((topic.length + payload.length) <= 32)) {
+                    return topic + ":" + payload+suffix;
+                } else if (payload.length > 0 && payload.length < 24) {
+                    return payload+suffix;
                 } else {
                     return this._("inject.inject")+suffix;
                 }
-            } else if (this.payloadType === 'date') {
+            } else if (payloadType === 'date' || payloadType === 'bin' || payloadType === 'env') {
-                if ((this.topic !== "") && (this.topic.length <= 16)) {
+                if ((topic !== "") && (topic.length <= 16)) {
-                    return this.topic + ":" + this._("inject.timestamp")+suffix;
+                    return topic + ":" + this._('inject.label.'+payloadType)+suffix;
                 } else {
-                    return this._("inject.timestamp")+suffix;
+                    return this._('inject.label.'+payloadType)+suffix;
                 }
-            } else if (this.payloadType === 'flow' || this.payloadType === 'global') {
+            } else if (payloadType === 'flow' || payloadType === 'global') {
-                var key = RED.utils.parseContextKey(this.payload);
+                var key = RED.utils.parseContextKey(payload);
-                return this.payloadType+"."+key.key+suffix;
+                return payloadType+"."+key.key+suffix;
             } else {
                 return this._("inject.inject")+suffix;
             }
@@ -239,13 +277,6 @@
             } else if (this.payloadType === 'string' || this.payloadType === 'none') {
                 this.payloadType = "str";
             }
-            $("#node-input-payloadType").val(this.payloadType);
-
-            $("#node-input-payload").typedInput({
-                default: 'str',
-                typeField: $("#node-input-payloadType"),
-                types:['flow','global','str','num','bool','json','bin','date','env']
-            });
 
             $("#inject-time-type-select").on("change", function() {
                 $("#node-input-crontab").val('');
@@ -259,6 +290,11 @@
                     $("#node-once").hide();
                     $("#node-input-once").prop('checked', false);
                 }
+
+                // Scroll down
+                var scrollDiv = $("#dialog-form").parent();
+                scrollDiv.scrollTop(scrollDiv.prop('scrollHeight'));
+                resizeDialog();
             });
 
             $("#node-input-once").on("change", function() {
@@ -378,7 +414,70 @@
             $("#inject-time-type-select").val(repeattype);
             $("#inject-time-row-"+repeattype).show();
 
-            $("#node-input-payload").typedInput('type',this.payloadType);
+            /* */
+
+            $('#node-input-property-container').css('min-height','120px').css('min-width','450px').editableList({
+                addItem: function(container,i,opt) {
+                    var prop = opt;
+                    if (!prop.hasOwnProperty('p')) {
+                        prop = {p:"",v:"",vt:"str"};
+                    }
+                    container.css({
+                        overflow: 'hidden',
+                        whiteSpace: 'nowrap'
+                    });
+                    var row = $('<div/>').appendTo(container);
+
+                    var propertyName = $('<input/>',{class:"node-input-prop-property-name",type:"text"})
+                        .css("width","30%")
+                        .appendTo(row)
+                        .typedInput({types:['msg']});
+
+                    $('<div/>',{style: 'display:inline-block; padding:0px 6px;'})
+                        .text('=')
+                        .appendTo(row);
+
+                    var propertyValue = $('<input/>',{class:"node-input-prop-property-value",type:"text"})
+                        .css("width","calc(70% - 30px)")
+                        .appendTo(row)
+                        .typedInput({default:'str',types:['msg','flow','global','str','num','bool','json','bin','date','jsonata','env']});
+
+                    propertyName.typedInput('value',prop.p);
+
+                    propertyValue.typedInput('value',prop.v);
+                    propertyValue.typedInput('type',prop.vt);
+                },
+                removable: true,
+                sortable: true
+            });
+
+            if (!this.props) {
+                var payload = {
+                    p:'payload',
+                    v: this.payload ? this.payload : '',
+                    vt:this.payloadType ? this.payloadType : 'date'
+                };
+                var topic = {
+                    p:'topic',
+                    v: this.topic ? this.topic : '',
+                    vt:'string'
+                }
+                this.props = [payload,topic];
+            }
+
+            for (var i=0; i<this.props.length; i++) {
+                var prop = this.props[i];
+                var newProp = { p: prop.p, v: prop.v, vt: prop.vt };
+                if (newProp.v === undefined) {
+                    if (prop.p === 'payload') {
+                        newProp.v = this.payload ? this.payload : '';
+                        newProp.vt = this.payloadType ? this.payloadType : 'date';
+                    } else if (prop.p === 'topic' && prop.vt === "str") {
+                        newProp.v =  this.topic ? this.topic : '';
+                    }
+                }
+                $("#node-input-property-container").editableList('addItem',newProp);
+            }
 
             $("#inject-time-type-select").trigger("change");
             $("#inject-time-interval-time-start").trigger("change");
@@ -474,6 +573,34 @@
 
             $("#node-input-repeat").val(repeat);
             $("#node-input-crontab").val(crontab);
+
+            /* Gather the injected properties of the msg object */
+            var props = $("#node-input-property-container").editableList('items');
+            var node = this;
+            node.props= [];
+            delete node.payloadType;
+            delete node.payload;
+            delete node.topic;
+            props.each(function(i) {
+                var prop = $(this);
+                var p = {
+                    p:prop.find(".node-input-prop-property-name").typedInput('value')
+                };
+                if (p.p) {
+                    p.v = prop.find(".node-input-prop-property-value").typedInput('value');
+                    p.vt = prop.find(".node-input-prop-property-value").typedInput('type');
+                    if (p.p === "payload") { // save payload to old "legacy" property
+                        node.payloadType = p.vt;
+                        node.payload = p.v;
+                        delete p.v;
+                        delete p.vt;
+                    } else if (p.p === "topic" && p.vt === "str") {
+                        node.topic = p.v;
+                        delete p.v;
+                    }
+                    node.props.push(p);
+                }
+            });
         },
         button: {
             enabled: function() {
@@ -483,12 +610,7 @@
                 if (this.changed) {
                     return RED.notify(RED._("notification.warning", {message:RED._("notification.warnings.undeployedChanges")}),"warning");
                 }
-                var payload = this.payload;
+
-                if ((this.payloadType === 'flow') ||
-                    (this.payloadType === 'global')) {
-                    var key = RED.utils.parseContextKey(payload);
-                    payload = this.payloadType+"."+key.key;
-                }
                 var label = this._def.label.call(this);
                 if (label.length > 30) {
                     label = label.substring(0,50)+"...";
@@ -514,7 +636,8 @@
                     }
                 });
             }
-        }
+        },
+        oneditresize: resizeDialog
     });
-
+})();
 </script>

packages/node_modules/@node-red/nodes/core/common/20-inject.js

@@ -20,9 +20,32 @@ module.exports = function(RED) {
 
     function InjectNode(n) {
         RED.nodes.createNode(this,n);
-        this.topic = n.topic;
+
-        this.payload = n.payload;
+        /* Handle legacy */
-        this.payloadType = n.payloadType;
+        if(!Array.isArray(n.props)){
+            n.props = [];
+            n.props.push({
+                p:'payload',
+                v:n.payload,
+                vt:n.payloadType
+            });
+            n.props.push({
+                p:'topic',
+                v:n.topic,
+                vt:'str'
+            });
+        } else {
+            for (var i=0,l=n.props.length; i<l; i++) {
+                if (n.props[i].p === 'payload' && !n.props[i].hasOwnProperty('v')) {
+                    n.props[i].v = n.payload;
+                    n.props[i].vt = n.payloadType;
+                } else if (n.props[i].p === 'topic' && n.props[i].vt === 'str' && !n.props[i].hasOwnProperty('v')) {
+                    n.props[i].v = n.topic;
+                }
+            }
+        }
+
+        this.props = n.props;
         this.repeat = n.repeat;
         this.crontab = n.crontab;
         this.once = n.once;
@@ -31,65 +54,83 @@ module.exports = function(RED) {
         this.cronjob = null;
         var node = this;
 
+        node.props.forEach(function (prop) {
+            if (prop.vt === "jsonata") {
+                try {
+                    var val = prop.v ? prop.v : "";
+                    prop.exp = RED.util.prepareJSONataExpression(val, node);
+                }
+                catch (err) {
+                    node.error(RED._("inject.errors.invalid-expr", {error:err.message}));
+                    prop.exp = null;
+                }
+            }
+        });
+
         if (node.repeat > 2147483) {
             node.error(RED._("inject.errors.toolong", this));
             delete node.repeat;
         }
 
         node.repeaterSetup = function () {
-          if (this.repeat && !isNaN(this.repeat) && this.repeat > 0) {
+            if (this.repeat && !isNaN(this.repeat) && this.repeat > 0) {
-            this.repeat = this.repeat * 1000;
+                this.repeat = this.repeat * 1000;
-            if (RED.settings.verbose) {
+                if (RED.settings.verbose) {
-              this.log(RED._("inject.repeat", this));
+                    this.log(RED._("inject.repeat", this));
+                }
+                this.interval_id = setInterval(function() {
+                    node.emit("input", {});
+                }, this.repeat);
+            } else if (this.crontab) {
+                if (RED.settings.verbose) {
+                    this.log(RED._("inject.crontab", this));
+                }
+                this.cronjob = new cron.CronJob(this.crontab, function() { node.emit("input", {}); }, null, true);
             }
-            this.interval_id = setInterval(function() {
-              node.emit("input", {});
-            }, this.repeat);
-          } else if (this.crontab) {
-            if (RED.settings.verbose) {
-              this.log(RED._("inject.crontab", this));
-            }
-            this.cronjob = new cron.CronJob(this.crontab, function() { node.emit("input", {}); }, null, true);
-          }
         };
 
         if (this.once) {
             this.onceTimeout = setTimeout( function() {
-              node.emit("input",{});
+                node.emit("input",{});
-              node.repeaterSetup();
+                node.repeaterSetup();
             }, this.onceDelay);
         } else {
-          node.repeaterSetup();
+            node.repeaterSetup();
         }
 
-        this.on("input",function(msg) {
+        this.on("input", function(msg) {
-            msg.topic = this.topic;
+            var errors = [];
-            if (this.payloadType !== 'flow' && this.payloadType !== 'global') {
-                try {
-                    if ( (this.payloadType == null && this.payload === "") || this.payloadType === "date") {
-                        msg.payload = Date.now();
-                    } else if (this.payloadType == null) {
-                        msg.payload = this.payload;
-                    } else if (this.payloadType === 'none') {
-                        msg.payload = "";
-                    } else {
-                        msg.payload = RED.util.evaluateNodeProperty(this.payload,this.payloadType,this,msg);
-                    }
-                    this.send(msg);
-                    msg = null;
-                } catch(err) {
-                    this.error(err,msg);
-                }
-            } else {
-                RED.util.evaluateNodeProperty(this.payload,this.payloadType,this,msg, function(err,res) {
-                    if (err) {
-                        node.error(err,msg);
-                    } else {
-                        msg.payload = res;
-                        node.send(msg);
-                    }
 
-                });
+            this.props.forEach(p => {
+                var property = p.p;
+                var value = p.v ? p.v : '';
+                var valueType = p.vt ? p.vt : 'str';
+
+                if (!property) return;
+
+                if (valueType === "jsonata") {
+                    if (p.exp) {
+                        try {
+                            var val = RED.util.evaluateJSONataExpression(p.exp, msg);
+                            RED.util.setMessageProperty(msg, property, val, true);
+                        }
+                        catch  (err) {
+                            errors.push(err.message);
+                        }
+                    }
+                    return;
+                }
+                try {
+                    RED.util.setMessageProperty(msg,property,RED.util.evaluateNodeProperty(value, valueType, this, msg),true);
+                } catch (err) {
+                    errors.push(err.toString());
+                }
+            });
+
+            if (errors.length) {
+                node.error(errors.join('; '), msg);
+            } else {
+                node.send(msg);
             }
         });
     }

packages/node_modules/@node-red/nodes/core/common/21-debug.html

@@ -1,30 +1,35 @@
 
-<script type="text/x-red" data-template-name="debug">
+<script type="text/html" data-template-name="debug">
     <div class="form-row">
         <label for="node-input-typed-complete"><i class="fa fa-list"></i> <span data-i18n="debug.output"></span></label>
         <input id="node-input-typed-complete" type="text" style="width: 70%">
         <input id="node-input-complete" type="hidden">
         <input id="node-input-targetType" type="hidden">
     </div>
-
     <div class="form-row">
         <label for="node-input-tosidebar"><i class="fa fa-random"></i> <span data-i18n="debug.to"></span></label>
         <label for="node-input-tosidebar" style="width:70%">
-        <input type="checkbox" id="node-input-tosidebar" style="display:inline-block; width:22px; vertical-align:baseline;"><span data-i18n="debug.toSidebar"></span>
+        <input type="checkbox" id="node-input-tosidebar" style="display:inline-block; width:22px; vertical-align:top;"><span data-i18n="debug.toSidebar"></span>
         </label>
     </div>
     <div class="form-row">
         <label for="node-input-console"> </label>
         <label for="node-input-console" style="width:70%">
-        <input type="checkbox" id="node-input-console" style="display:inline-block; width:22px; vertical-align:baseline;"><span data-i18n="debug.toConsole"></span>
+        <input type="checkbox" id="node-input-console" style="display:inline-block; width:22px; vertical-align:top;"><span data-i18n="debug.toConsole"></span>
         </label>
     </div>
-    <div class="form-row" id="node-tostatus-line">
+    <div class="form-row">
     <label for="node-input-tostatus"> </label>
     <label for="node-input-tostatus" style="width:70%">
-        <input type="checkbox" id="node-input-tostatus" style="display:inline-block; width:22px; vertical-align:baseline;"><span data-i18n="debug.toStatus"></span>
+        <input type="checkbox" id="node-input-tostatus" style="display:inline-block; width:22px; vertical-align:top;"><span data-i18n="debug.toStatus"></span>
     </label>
     </div>
+    <div class="form-row" id="node-tostatus-line">
+        <label for="node-input-typed-status"><i class="fa fa-ellipsis-h"></i> <span data-i18n="debug.status"></span></label>
+        <input id="node-input-typed-status" type="text" style="width: 70%">
+        <input id="node-input-statusVal" type="hidden">
+        <input id="node-input-statusType" type="hidden">
+    </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
@@ -36,6 +41,36 @@
 <script type="text/javascript">
 (function() {
     var subWindow = null;
+
+    function activateAjaxCall(node, active, successCallback) {
+        var url;
+        var body;
+
+        if (Array.isArray(node)) {
+            url = "debug/"+(active?"enable":"disable");
+            body = {nodes: node.map(function(n) { return n.id})}
+            node = node[0];
+        } else {
+            url = "debug/"+node.id+"/"+(active?"enable":"disable");
+        }
+        $.ajax({
+            url: url,
+            type: "POST",
+            data: body,
+            success: successCallback,
+            error: function(jqXHR,textStatus,errorThrown) {
+                if (jqXHR.status == 404) {
+                    RED.notify(node._("common.notification.error", {message: node._("common.notification.errors.not-deployed")}),"error");
+                } else if (jqXHR.status === 0) {
+                    RED.notify(node._("common.notification.error", {message: node._("common.notification.errors.no-response")}),"error");
+                } else {
+                    // TODO where is the err.status comming from?
+                    RED.notify(node._("common.notification.error",{message:node._("common.notification.errors.unexpected",{status:err.status,message:err.response})}),"error");
+                }
+            }
+        });
+    }
+
     RED.nodes.registerType('debug',{
         category: 'common',
         defaults: {
@@ -45,7 +80,9 @@
             console: {value:false},
             tostatus: {value:false},
             complete: {value:"false", required:true},
-            targetType: {value:undefined}
+            targetType: {value:undefined},
+            statusVal: {value:""},
+            statusType: {value:"auto"}
         },
         label: function() {
             var suffix = "";
@@ -73,38 +110,28 @@
             onclick: function() {
                 var label = this.name||"debug";
                 var node = this;
-                $.ajax({
+                activateAjaxCall(node, node.active, function(resp, textStatus, xhr) {
-                    url: "debug/"+this.id+"/"+(this.active?"enable":"disable"),
+                    var historyEvent = {
-                    type: "POST",
+                        t:'edit',
-                    success: function(resp, textStatus, xhr) {
+                        node:node,
-                        var historyEvent = {
+                        changes:{
-                            t:'edit',
+                            active:!node.active
-                            node:node,
+                        },
-                            changes:{
+                        dirty:node.dirty,
-                                active:!node.active
+                        changed:node.changed,
-                            },
+                        callback: function(ev) {
-                            dirty:node.dirty,
+                            activateAjaxCall(ev.node, ev.node.active);
-                            changed:node.changed
-                        };
-                        node.changed = true;
-                        node.dirty = true;
-                        RED.nodes.dirty(true);
-                        RED.history.push(historyEvent);
-                        RED.view.redraw();
-                        if (xhr.status == 200) {
-                            RED.notify(node._("debug.notification.activated",{label:label}),"success");
-                        } else if (xhr.status == 201) {
-                            RED.notify(node._("debug.notification.deactivated",{label:label}),"success");
-                        }
-                    },
-                    error: function(jqXHR,textStatus,errorThrown) {
-                        if (jqXHR.status == 404) {
-                            RED.notify(node._("common.notification.error", {message: node._("common.notification.errors.not-deployed")}),"error");
-                        } else if (jqXHR.status === 0) {
-                            RED.notify(node._("common.notification.error", {message: node._("common.notification.errors.no-response")}),"error");
-                        } else {
-                            RED.notify(node._("common.notification.error",{message:node._("common.notification.errors.unexpected",{status:err.status,message:err.response})}),"error");
                         }
+                    };
+                    node.changed = true;
+                    node.dirty = true;
+                    RED.nodes.dirty(true);
+                    RED.history.push(historyEvent);
+                    RED.view.redraw();
+                    if (xhr.status == 200) {
+                        RED.notify(node._("debug.notification.activated",{label:label}),"success");
+                    } else if (xhr.status == 201) {
+                        RED.notify(node._("debug.notification.deactivated",{label:label}),"success");
                     }
                 });
             }
@@ -266,6 +293,78 @@
             RED.events.on("project:change", this.clearMessageList);
             RED.actions.add("core:clear-debug-messages", function() { RED.debug.clearMessageList(true) });
 
+            RED.actions.add("core:activate-selected-debug-nodes", function() { setDebugNodeState(getSelectedDebugNodes(true), true); });
+            RED.actions.add("core:activate-all-debug-nodes", function() { setDebugNodeState(getMatchingDebugNodes(true, true),true); });
+            RED.actions.add("core:activate-all-flow-debug-nodes", function() { setDebugNodeState(getMatchingDebugNodes(true, false),true); });
+
+            RED.actions.add("core:deactivate-selected-debug-nodes", function() { setDebugNodeState(getSelectedDebugNodes(false), false); });
+            RED.actions.add("core:deactivate-all-debug-nodes", function() { setDebugNodeState(getMatchingDebugNodes(false, true),false); });
+            RED.actions.add("core:deactivate-all-flow-debug-nodes", function() { setDebugNodeState(getMatchingDebugNodes(false, false),false); });
+
+            function getSelectedDebugNodes(state) {
+                var nodes = [];
+                var selection = RED.view.selection();
+                if (selection.nodes) {
+                    selection.nodes.forEach(function(n) {
+                        if (RED.nodes.subflow(n.z)) {
+                            return;
+                        }
+                        if (n.type === 'debug' && n.active !== state) {
+                            nodes.push(n);
+                        } else if (n.type === 'group') {
+                            nodes = nodes.concat( RED.group.getNodes(n,true).filter(function(n) {
+                                return n.type === 'debug' && n.active !== state
+                            }));
+                        }
+                    });
+                }
+                return nodes;
+
+            }
+            function getMatchingDebugNodes(state,globally) {
+                var nodes = [];
+                var filter = {type:"debug"};
+                if (!globally) {
+                    filter.z = RED.workspaces.active();
+                }
+                var candidateNodes = RED.nodes.filterNodes(filter);
+                nodes = candidateNodes.filter(function(n) {
+                    return n.active !== state && !RED.nodes.subflow(n.z)
+                })
+                return nodes;
+            }
+
+            function setDebugNodeState(nodes,state) {
+                var historyEvents = [];
+                if (nodes.length > 0) {
+                    activateAjaxCall(nodes,false, function(resp, textStatus, xhr) {
+                        nodes.forEach(function(n) {
+                            historyEvents.push({
+                                t: "edit",
+                                node: n,
+                                changed: n.changed,
+                                changes: {
+                                    active: n.active
+                                }
+                            });
+                            n.active = state;
+                            n.changed = true;
+                            n.dirty = true;
+                        })
+                        RED.history.push({
+                            t: "multi",
+                            events: historyEvents,
+                            dirty: RED.nodes.dirty(),
+                            callback: function() {
+                                activateAjaxCall(nodes,nodes[0].active);
+                            }
+                        });
+                        RED.nodes.dirty(true);
+                        RED.view.redraw();
+                    });
+                }
+            }
+
             $("#red-ui-sidebar-debug-open").on("click", function(e) {
                 e.preventDefault();
                 subWindow = window.open(document.location.toString().replace(/[?#].*$/,"")+"debug/view/view.html"+document.location.search,"nodeREDDebugView","menubar=no,location=no,toolbar=no,chrome,height=500,width=600");
@@ -308,10 +407,20 @@
             window.removeEventListener("message",this.handleWindowMessage);
             RED.actions.remove("core:show-debug-tab");
             RED.actions.remove("core:clear-debug-messages");
-
             delete RED._debug;
         },
         oneditprepare: function() {
+            var autoType = {
+                value: "auto",
+                label: RED._("node-red:debug.autostatus"),
+                hasValue: false
+            };
+            $("#node-input-typed-status").typedInput({
+                default: "auto",
+                types:[autoType, "msg", "jsonata"],
+                typeField: $("#node-input-statusType")
+            });
+            var that = this;
             var none = {
                 value: "none",
                 label: RED._("node-red:debug.none"),
@@ -321,6 +430,14 @@
                 this.tosidebar = true;
                 $("#node-input-tosidebar").prop('checked', true);
             }
+            if (this.statusVal === undefined) {
+                this.statusVal = (this.complete === "false") ? "payload" : ((this.complete === "true") ? "payload" : this.complete+"");
+                $("#node-input-typed-status").typedInput('value',this.statusVal || "");
+            }
+            if (this.statusType === undefined) {
+                this.statusType = this.targetType;
+                $("#node-input-typed-status").typedInput('type',this.statusType || "auto");
+            }
             if (typeof this.console === "string") {
                 this.console = (this.console == 'true');
                 $("#node-input-console").prop('checked', this.console);
@@ -331,6 +448,7 @@
                 label: RED._("node-red:debug.msgobj"),
                 hasValue: false
             };
+
             $("#node-input-typed-complete").typedInput({
                 default: "msg",
                 types:['msg', fullType, "jsonata"],
@@ -354,17 +472,29 @@
                 ) {
                     $("#node-input-typed-complete").typedInput('value','payload');
                 }
-                if ($("#node-input-typed-complete").typedInput('type') === 'full') {
+            });
-                    $("#node-tostatus-line").hide();
+
-                } else {
+            $("#node-input-tostatus").on('change',function() {
+                if ($(this).is(":checked")) {
+                    if (!that.hasOwnProperty("statusVal") || that.statusVal === "") {
+                        var type = $("#node-input-typed-complete").typedInput('type');
+                        var comp = "payload";
+                        if (type !== 'full') {
+                            comp = $("#node-input-typed-complete").typedInput('value');
+                        }
+                        that.statusType = "auto";
+                        that.statusVal = comp;
+                    }
+                    $("#node-input-typed-status").typedInput('type',that.statusType);
+                    $("#node-input-typed-status").typedInput('value',that.statusVal);
                     $("#node-tostatus-line").show();
                 }
-            });
+                else {
-            $("#node-input-complete").on('change',function() {
-                if ($("#node-input-typed-complete").typedInput('type') === 'full') {
                     $("#node-tostatus-line").hide();
-                } else {
+                    that.statusType = "auto";
-                    $("#node-tostatus-line").show();
+                    that.statusVal = "";
+                    $("#node-input-typed-status").typedInput('type',that.statusType);
+                    $("#node-input-typed-status").typedInput('value',that.statusVal);
                 }
             });
         },
@@ -375,6 +505,7 @@
             } else {
                 $("#node-input-complete").val($("#node-input-typed-complete").typedInput('value'));
             }
+            $("#node-input-statusVal").val($("#node-input-typed-status").typedInput('value'));
         }
     });
 })();

packages/node_modules/@node-red/nodes/core/common/21-debug.js

@@ -2,7 +2,7 @@ module.exports = function(RED) {
     "use strict";
     var util = require("util");
     var events = require("events");
-    var path = require("path");
+    //var path = require("path");
     var debuglength = RED.settings.debugMaxLength || 1000;
     var useColors = RED.settings.debugUseColors || false;
     util.inspect.styles.boolean = "red";
@@ -15,36 +15,20 @@ module.exports = function(RED) {
         this.complete = hasEditExpression ? null : (n.complete||"payload").toString();
         if (this.complete === "false") { this.complete = "payload"; }
         this.console = ""+(n.console || false);
-        this.tostatus = (this.complete !== "true") && (n.tostatus || false);
+        this.tostatus = n.tostatus || false;
+        this.statusType = n.statusType || "msg";
+        this.statusVal = n.statusVal || this.complete;
         this.tosidebar = n.tosidebar;
         if (this.tosidebar === undefined) { this.tosidebar = true; }
-        this.severity = n.severity || 40;
         this.active = (n.active === null || typeof n.active === "undefined") || n.active;
         if (this.tostatus) { this.status({fill:"grey", shape:"ring"}); }
         else { this.status({}); }
+        var hasStatExpression = (n.statusType === "jsonata");
+        var statExpression = hasStatExpression ? n.statusVal : null;
 
         var node = this;
-        var levels = {
-            off: 1,
-            fatal: 10,
-            error: 20,
-            warn: 30,
-            info: 40,
-            debug: 50,
-            trace: 60,
-            audit: 98,
-            metric: 99
-        };
-        var colors = {
-            "0": "grey",
-            "10": "grey",
-            "20": "red",
-            "30": "yellow",
-            "40": "grey",
-            "50": "green",
-            "60": "blue"
-        };
         var preparedEditExpression = null;
+        var preparedStatExpression = null;
         if (editExpression) {
             try {
                 preparedEditExpression = RED.util.prepareJSONataExpression(editExpression, this);
@@ -54,16 +38,22 @@ module.exports = function(RED) {
                 return;
             }
         }
+        if (statExpression) {
+            try {
+                preparedStatExpression = RED.util.prepareJSONataExpression(statExpression, this);
+            }
+            catch (e) {
+                node.error(RED._("debug.invalid-exp", {error: editExpression}));
+                return;
+            }
+        }
 
         function prepareValue(msg, done) {
             // Either apply the jsonata expression or...
             if (preparedEditExpression) {
                 RED.util.evaluateJSONataExpression(preparedEditExpression, msg, (err, value) => {
-                    if (err) {
+                    if (err) { done(RED._("debug.invalid-exp", {error: editExpression})); }
-                        done(RED._("debug.invalid-exp", {error: editExpression}));
+                    else { done(null,{id:node.id, z:node.z, _alias: node._alias, path:node._flow.path, name:node.name, topic:msg.topic, msg:value}); }
-                    } else {
-                        done(null,{id:node.id, z:node.z, _alias: node._alias, path:node._flow.path, name:node.name, topic:msg.topic, msg:value});
-                    }
                 });
             } else {
                 // Extract the required message property
@@ -71,17 +61,67 @@ module.exports = function(RED) {
                 var output = msg[property];
                 if (node.complete !== "false" && typeof node.complete !== "undefined") {
                     property = node.complete;
-                    try {
+                    try { output = RED.util.getMessageProperty(msg,node.complete); }
-                        output = RED.util.getMessageProperty(msg,node.complete);
+                    catch(err) { output = undefined; }
-                    } catch(err) {
-                        output = undefined;
-                    }
                 }
                 done(null,{id:node.id, z:node.z, _alias: node._alias,  path:node._flow.path, name:node.name, topic:msg.topic, property:property, msg:output});
             }
         }
 
+        function prepareStatus(msg, done) {
+            if (node.statusType === "auto") {
+                if (node.complete === "true") {
+                    done(null,{msg:msg.payload});
+                }
+                else {
+                    prepareValue(msg,function(err,debugMsg) {
+                        if (err) { node.error(err); return; }
+                        done(null,{msg:debugMsg.msg});
+                    });
+                }
+            }
+            else {
+                // Either apply the jsonata expression or...
+                if (preparedStatExpression) {
+                    RED.util.evaluateJSONataExpression(preparedStatExpression, msg, (err, value) => {
+                        if (err) { done(RED._("debug.invalid-exp", {error:editExpression})); }
+                        else { done(null,{msg:value}); }
+                    });
+                }
+                else {
+                    // Extract the required message property
+                    var output;
+                    try { output = RED.util.getMessageProperty(msg,node.statusVal); }
+                    catch(err) { output = undefined; }
+                    done(null,{msg:output});
+                }
+            }
+        }
+
         this.on("input", function(msg, send, done) {
+            if (node.tostatus === true) {
+                prepareStatus(msg, function(err,debugMsg) {
+                    if (err) { node.error(err); return; }
+                    var output = debugMsg.msg;
+                    var st = (typeof output === 'string') ? output : util.inspect(output);
+                    var fill = "grey";
+                    var shape = "dot";
+                    if (node.statusType === "auto") {
+                        if (msg.hasOwnProperty("error")) {
+                            fill = "red";
+                            st = msg.error.message;
+                        }
+                        if (msg.hasOwnProperty("status")) {
+                            if (msg.status.hasOwnProperty("fill")) { fill = msg.status.fill; }
+                            if (msg.status.hasOwnProperty("shape")) { shape = msg.status.shape; }
+                            if (msg.status.hasOwnProperty("text")) { st = msg.status.text; }
+                        }
+                    }
+                    if (st.length > 32) { st = st.substr(0,32) + "..."; }
+                    node.status({fill:fill, shape:shape, text:st});
+                });
+            }
+
             if (this.complete === "true") {
                 // debug complete msg object
                 if (this.console === "true") {
@@ -91,7 +131,8 @@ module.exports = function(RED) {
                     sendDebug({id:node.id, z:node.z, _alias: node._alias,  path:node._flow.path, name:node.name, topic:msg.topic, msg:msg});
                 }
                 done();
-            } else {
+            }
+            else {
                 prepareValue(msg,function(err,debugMsg) {
                     if (err) {
                         node.error(err);
@@ -107,12 +148,6 @@ module.exports = function(RED) {
                             node.log(util.inspect(output, {colors:useColors}));
                         }
                     }
-                    if (node.tostatus === true) {
-                        var st = (typeof output === 'string')?output:util.inspect(output);
-                        var severity = node.severity;
-                        if (st.length > 32) { st = st.substr(0,32) + "..."; }
-                        node.status({fill:colors[severity], shape:"dot", text:st});
-                    }
                     if (node.active) {
                         if (node.tosidebar == true) {
                             sendDebug(debugMsg);
@@ -150,24 +185,49 @@ module.exports = function(RED) {
     });
     RED.log.addHandler(DebugNode.logHandler);
 
-    RED.httpAdmin.post("/debug/:id/:state", RED.auth.needsPermission("debug.write"), function(req,res) {
+    function setNodeState(node,state) {
-        var node = RED.nodes.getNode(req.params.id);
+        if (state) {
-        var state = req.params.state;
+            node.active = true;
-        if (node !== null && typeof node !== "undefined" ) {
+            if (node.tostatus) { node.status({fill:"grey", shape:"dot"}); }
-            if (state === "enable") {
+        } else {
-                node.active = true;
+            node.active = false;
-                res.sendStatus(200);
+            if (node.tostatus && node.hasOwnProperty("oldStatus")) {
-                if (node.tostatus) { node.status({fill:"grey", shape:"dot"}); }
+                node.oldStatus.shape = "dot";
-            } else if (state === "disable") {
+                node.status(node.oldStatus);
-                node.active = false;
-                res.sendStatus(201);
-                if (node.tostatus && node.hasOwnProperty("oldStatus")) {
-                    node.oldStatus.shape = "dot";
-                    node.status(node.oldStatus);
-                }
-            } else {
-                res.sendStatus(404);
             }
+        }
+    }
+
+    RED.httpAdmin.post("/debug/:state", RED.auth.needsPermission("debug.write"), function(req,res) {
+        var state = req.params.state;
+        if (state !== 'enable' && state !== 'disable') {
+            res.sendStatus(404);
+            return;
+        }
+        var nodes = req.body && req.body.nodes;
+        if (Array.isArray(nodes)) {
+            nodes.forEach(function(id) {
+                var node = RED.nodes.getNode(id);
+                if (node !== null && typeof node !== "undefined" ) {
+                    setNodeState(node, state === "enable");
+                }
+            })
+            res.sendStatus(state === "enable" ? 200 : 201);
+        } else {
+            res.sendStatus(400);
+        }
+    })
+
+    RED.httpAdmin.post("/debug/:id/:state", RED.auth.needsPermission("debug.write"), function(req,res) {
+        var state = req.params.state;
+        if (state !== 'enable' && state !== 'disable') {
+            res.sendStatus(404);
+            return;
+        }
+        var node = RED.nodes.getNode(req.params.id);
+        if (node !== null && typeof node !== "undefined" ) {
+            setNodeState(node,state === "enable");
+            res.sendStatus(state === "enable" ? 200 : 201);
         } else {
             res.sendStatus(404);
         }

packages/node_modules/@node-red/nodes/core/common/24-complete.html

@@ -1,4 +1,4 @@
-<script type="text/x-red" data-template-name="complete">
+<script type="text/html" data-template-name="complete">
     <div class="form-row node-input-target-row">
         <button id="node-input-complete-target-select" class="red-ui-button" data-i18n="common.label.selectNodes"></button>
     </div>
@@ -89,7 +89,8 @@
                     node: n,
                     label: label,
                     sublabel: sublabel,
-                    selected: isChecked
+                    selected: isChecked,
+                    checkbox: true
                 };
                 items.push(nodeItemMap[n.id]);
             });