Initial update to FontAwesome 6

Allow node name to be auto-generated when added

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: PublishDockerImage
+name: Publish Release
 env:
   ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 on:

.github/workflows/tests.yml

@@ -0,0 +1,30 @@
+name: Run tests
+
+on:
+  push:
+    branches: [ master, dev ]
+  pull_request:
+    branches: [ master, dev ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [12, 14, 16]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
+    - name: Install Dependencies
+      run: npm install
+    - name: Run tests
+      run: |
+        npm run test
+    - name: Publish to coveralls.io
+      if: ${{ matrix.node-version == 14 }}
+      uses: coverallsapp/github-action@v1.1.2
+      with:
+        github-token: ${{ github.token }}

.travis.yml

@@ -1,24 +0,0 @@
-sudo: false
-addons:
-  chrome: stable
-language: node_js
-matrix:
-  include:
-    - node_js: "16"
-      script:
-        - ./node_modules/.bin/grunt no-coverage
-    - node_js: "14"
-      script:
-        - ./node_modules/.bin/grunt && ( cat coverage/lcov.info | $(npm get prefix)/bin/coveralls || true ) && rm -rf coverage
-        #    - scripts/install-ui-test-dependencies.sh && grunt test-ui
-      before_script:
-        - npm install -g coveralls
-    - node_js: "12"
-      script:
-        - ./node_modules/.bin/grunt no-coverage
-    - node_js: "10"
-      script:
-        - ./node_modules/.bin/grunt no-coverage
-    #- node_js: "8"
-    #  script:
-    #    - ./node_modules/.bin/grunt no-coverage

API.md

@@ -1,8 +1,12 @@
-Node-RED Modules
----
+Node-RED consists of 6 node modules under the `@node-red` scope, which are pulled together
+by the top-level `node-red` module. The typical scenario is where you are embedding Node-RED into your
+own application, in which case you would use the `node-red` module rather than any of the
+internal modules directly.
+
+```javascript
+let RED = require("node-red");
+```
 
-Node-RED provides a set of node modules that implement different parts of the
-application.
 
 Module | Description
 -------|-------
@@ -11,5 +15,5 @@ Module | Description
 [@node-red/runtime](@node-red_runtime.html) | the core runtime of Node-RED
 [@node-red/util](@node-red_util.html) | common utilities for the Node-RED runtime and editor modules
 [@node-red/registry](@node-red_registry.html) | the internal node registry
-@node-red/nodes | the default set of core nodes
+@node-red/nodes | the default set of core nodes. This module only contains the Node-RED nodes - it does not expose any APIs.
 @node-red/editor-client | the client-side resources of the Node-RED editor application

CONTRIBUTING.md

@@ -38,12 +38,9 @@ If you want to raise a pull-request with a new feature, or a refactoring
 of existing code, it may well get rejected if you haven't discussed it on
 the [forum](https://discourse.nodered.org) first.
 
-All contributors need to sign the JS Foundation's Contributor License Agreement.
-It is an online process and quick to do. You can read the details of the agreement
-here: https://cla.js.foundation/node-red/node-red.
-
-If you raise a pull-request without having signed the CLA, you will be prompted
-to do so automatically.
+All contributors need to sign the OpenJS Foundation's Contributor License Agreement.
+It is an online process and quick to do. If you raise a pull-request without
+having signed the CLA, you will be prompted to do so automatically.
 
 
 ### Code Branches

Gruntfile.js

@@ -40,11 +40,10 @@ module.exports = function(grunt) {
     if (nonHeadless) {
         process.env.NODE_RED_NON_HEADLESS = true;
     }
-    let packageFile = grunt.file.readJSON('package.json')
-    process.env.NODE_RED_PACKAGE_VERSION = packageFile.version;
-
+    const pkg = grunt.file.readJSON('package.json');
+    process.env.NODE_RED_PACKAGE_VERSION = pkg.version;
     grunt.initConfig({
-        pkg: packageFile,
+        pkg: pkg,
         paths: {
             dist: ".dist"
         },
@@ -138,6 +137,7 @@ module.exports = function(grunt) {
                     "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",
+                    "packages/node_modules/@node-red/editor-client/src/js/hooks.js",
                     "packages/node_modules/@node-red/editor-client/src/js/i18n.js",
                     "packages/node_modules/@node-red/editor-client/src/js/settings.js",
                     "packages/node_modules/@node-red/editor-client/src/js/user.js",
@@ -162,7 +162,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/common/autoComplete.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",
@@ -170,6 +170,7 @@ module.exports = function(grunt) {
                     "packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/statusBar.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/view.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/view-annotations.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/view-navigator.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js",
@@ -181,7 +182,9 @@ module.exports = function(grunt) {
                     "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",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/editor.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/*.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/editors/*.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/*.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/event-log.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/tray.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js",
@@ -197,7 +200,8 @@ module.exports = function(grunt) {
                     "packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectUserSettings.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/touch/radialMenu.js"
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/touch/radialMenu.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/tour/*.js"
                 ],
                 dest: "packages/node_modules/@node-red/editor-client/public/red/red.js"
             },
@@ -211,7 +215,9 @@ module.exports = function(grunt) {
                         "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/i18next/i18next.min.js",
+                        "node_modules/i18next-http-backend/i18nextHttpBackend.min.js",
+                        "node_modules/jquery-i18next/jquery-i18next.min.js",
                         "node_modules/jsonata/jsonata-es5.min.js",
                         "packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js",
                         "packages/node_modules/@node-red/editor-client/src/vendor/ace/ace.js",
@@ -284,7 +290,9 @@ module.exports = function(grunt) {
                     "packages/node_modules/@node-red/editor-client/public/index.html",
                     "packages/node_modules/@node-red/editor-client/public/favicon.ico",
                     "packages/node_modules/@node-red/editor-client/public/icons",
-                    "packages/node_modules/@node-red/editor-client/public/vendor"
+                    "packages/node_modules/@node-red/editor-client/public/vendor",
+                    "packages/node_modules/@node-red/editor-client/public/types/node",
+                    "packages/node_modules/@node-red/editor-client/public/types/node-red",
                 ]
             },
             release: {
@@ -320,6 +328,12 @@ module.exports = function(grunt) {
                 ],
                 tasks: ['jsonlint:keymaps','copy:build']
             },
+            tours: {
+                files: [
+                    'packages/node_modules/@node-red/editor-client/src/tours/**/*.js'
+                ],
+                tasks: ['copy:build']
+            },
             misc: {
                 files: [
                     'CHANGELOG.md'
@@ -374,11 +388,24 @@ module.exports = function(grunt) {
                         src: [
                             'ace/**',
                             'jquery/css/base/**',
-                            'font-awesome/**'
+                            'font-awesome/**',
+                            'monaco/dist/**',
+                            'monaco/types/extraLibs.js',
+                            'monaco/style.css',
+                            'monaco/monaco-bootstrap.js'
                         ],
                         expand: true,
                         dest: 'packages/node_modules/@node-red/editor-client/public/vendor/'
                     },
+                    {
+                        cwd: 'packages/node_modules/@node-red/editor-client/src',
+                        src: [
+                            'types/node/*.ts',
+                            'types/node-red/*.ts',
+                        ],
+                        expand: true,
+                        dest: 'packages/node_modules/@node-red/editor-client/public/'
+                    },
                     {
                         cwd: 'packages/node_modules/@node-red/editor-client/src/icons',
                         src: '**',
@@ -404,6 +431,12 @@ module.exports = function(grunt) {
                         src: '**',
                         expand: true,
                         dest: 'packages/node_modules/@node-red/editor-client/public/vendor/ace/'
+                    },
+                    {
+                        cwd: 'packages/node_modules/@node-red/editor-client/src/tours',
+                        src: '**',
+                        expand: true,
+                        dest: 'packages/node_modules/@node-red/editor-client/public/red/tours/'
                     }
                 ]
             }
@@ -550,7 +583,7 @@ module.exports = function(grunt) {
     grunt.registerMultiTask('attachCopyright', function() {
         var files = this.data.src;
         var copyright = "/**\n"+
-            " * Copyright JS Foundation and other contributors, http://js.foundation\n"+
+            " * Copyright OpenJS Foundation and other contributors, https://openjsf.org/\n"+
             " *\n"+
             " * Licensed under the Apache License, Version 2.0 (the \"License\");\n"+
             " * you may not use this file except in compliance with the License.\n"+

README.md

@@ -56,13 +56,13 @@ This project adheres to the [Contributor Covenant 1.4](http://contributor-covena
 
 ## Authors
 
-Node-RED is a project of the [OpenJS Foundation](https://openjsf.org).
+Node-RED is a project of the [OpenJS Foundation](http://openjsf.org).
 
-It was created by [IBM Emerging Technology](https://www.ibm.com/blogs/emerging-technology/).
-
-* Nick O'Leary [@knolleary](http://twitter.com/knolleary)
-* Dave Conway-Jones [@ceejay](http://twitter.com/ceejay)
+It is maintained by:
 
+ * Nick O'Leary [@knolleary](http://twitter.com/knolleary)
+ * Dave Conway-Jones [@ceejay](http://twitter.com/ceejay)
+ * And many others...
 
 
 ## Copyright and license

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "1.3.7",
+    "version": "2.2.2",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -26,97 +26,100 @@
         }
     ],
     "dependencies": {
-        "acorn": "8.3.0",
-        "acorn-walk": "8.1.0",
-        "ajv": "6.12.6",
-        "async-mutex": "0.3.1",
+        "acorn": "8.7.0",
+        "acorn-walk": "8.2.0",
+        "ajv": "8.10.0",
+        "async-mutex": "0.3.2",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
-        "body-parser": "1.19.0",
-        "cheerio": "0.22.0",
+        "body-parser": "1.19.1",
+        "cheerio": "1.0.0-rc.10",
         "clone": "2.1.2",
         "content-type": "1.0.4",
-        "cookie": "0.4.1",
-        "cookie-parser": "1.4.5",
+        "cookie": "0.4.2",
+        "cookie-parser": "1.4.6",
         "cors": "2.8.5",
-        "cron": "1.7.2",
-        "denque": "1.5.0",
-        "express": "4.17.1",
-        "express-session": "1.17.1",
-        "fs-extra": "8.1.0",
+        "cronosjs": "1.7.1",
+        "denque": "2.0.1",
+        "express": "4.17.2",
+        "express-session": "1.17.2",
+        "form-data": "4.0.0",
+        "fs-extra": "10.0.0",
         "fs.notify": "0.0.4",
+        "got": "11.8.3",
         "hash-sum": "2.0.0",
+        "hpagent": "0.1.2",
         "https-proxy-agent": "5.0.0",
-        "i18next": "15.1.2",
-        "iconv-lite": "0.6.2",
+        "i18next": "21.6.11",
+        "iconv-lite": "0.6.3",
         "is-utf8": "0.2.1",
-        "js-yaml": "3.14.0",
+        "js-yaml": "3.14.1",
         "json-stringify-safe": "5.0.1",
-        "jsonata": "1.8.4",
+        "jsonata": "1.8.6",
         "lodash.clonedeep": "^4.5.0",
         "media-typer": "1.1.0",
-        "memorystore": "1.6.6",
-        "mime": "2.5.2",
-        "moment-timezone": "0.5.33",
-        "mqtt": "4.2.6",
-        "multer": "1.4.2",
+        "memorystore": "1.6.7",
+        "mime": "3.0.0",
+        "moment-timezone": "0.5.34",
+        "mqtt": "4.3.5",
+        "multer": "1.4.4",
         "mustache": "4.2.0",
-        "node-red-admin": "0.2.7",
-        "node-red-node-rbe": "^0.5.0",
-        "node-red-node-sentiment": "^0.1.6",
-        "node-red-node-tail": "^0.3.0",
+        "node-red-admin": "^2.2.3",
         "nopt": "5.0.0",
-        "oauth2orize": "1.11.0",
+        "oauth2orize": "1.11.1",
         "on-headers": "1.0.2",
-        "passport": "0.4.1",
+        "passport": "0.5.2",
         "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",
+        "raw-body": "2.4.3",
+        "semver": "7.3.5",
         "tar": "6.1.11",
-        "uglify-js": "3.13.3",
-        "ws": "6.2.2",
+        "tough-cookie": "4.0.0",
+        "uglify-js": "3.15.1",
+        "uuid": "8.3.2",
+        "ws": "7.5.6",
         "xml2js": "0.4.23"
     },
     "optionalDependencies": {
-        "bcrypt": "3.0.8"
+        "bcrypt": "5.0.1"
     },
     "devDependencies": {
-        "dompurify": "2.2.7",
-        "grunt": "1.3.0",
+        "dompurify": "2.3.5",
+        "grunt": "1.4.1",
         "grunt-chmod": "~1.1.1",
-        "grunt-cli": "~1.4.2",
+        "grunt-cli": "~1.4.3",
         "grunt-concurrent": "3.0.0",
         "grunt-contrib-clean": "~2.0.0",
-        "grunt-contrib-compress": "1.6.0",
+        "grunt-contrib-compress": "2.0.0",
         "grunt-contrib-concat": "~1.0.1",
         "grunt-contrib-copy": "~1.0.0",
-        "grunt-contrib-jshint": "~2.1.0",
-        "grunt-contrib-uglify": "~4.0.1",
+        "grunt-contrib-jshint": "3.1.1",
+        "grunt-contrib-uglify": "5.0.1",
         "grunt-contrib-watch": "~1.1.0",
         "grunt-jsdoc": "2.4.1",
-        "grunt-jsdoc-to-markdown": "5.0.0",
+        "grunt-jsdoc-to-markdown": "6.0.0",
         "grunt-jsonlint": "2.1.3",
         "grunt-mkdir": "~1.1.0",
         "grunt-npm-command": "~0.1.2",
         "grunt-sass": "~3.1.0",
         "grunt-simple-mocha": "~0.4.1",
         "grunt-simple-nyc": "^3.0.1",
-        "http-proxy": "1.18.1",
+        "i18next-http-backend": "1.3.2",
+        "jquery-i18next": "1.2.1",
         "jsdoc-nr-template": "github:node-red/jsdoc-nr-template",
-        "marked": "2.0.1",
+        "marked": "4.0.12",
         "minami": "1.2.3",
-        "mocha": "^5.2.0",
+        "mocha": "9.2.0",
         "node-red-node-test-helper": "^0.2.7",
-        "nodemon": "2.0.7",
-        "sass": "1.32.12",
+        "nodemon": "2.0.15",
+        "proxy": "^1.0.2",
+        "sass": "1.49.7",
         "should": "13.2.3",
-        "sinon": "1.17.7",
+        "sinon": "11.1.2",
         "stoppable": "^1.1.0",
-        "supertest": "5.0.0"
+        "supertest": "6.2.2"
     },
     "engines": {
-        "node": ">=8"
+        "node": ">=12"
     }
 }

packages/node_modules/@node-red/editor-api/LICENSE

@@ -1,4 +1,4 @@
-Copyright JS Foundation and other contributors, http://js.foundation
+Copyright OpenJS Foundation and other contributors, https://openjsf.org/
 
                                  Apache License
                            Version 2.0, January 2004

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

@@ -39,6 +39,15 @@ module.exports = {
 
         var adminApp = express();
 
+        var defaultServerSettings = {
+            "x-powered-by": false
+        }
+        var serverSettings = Object.assign({},defaultServerSettings,settings.httpServerOptions||{});
+        for (var eOption in serverSettings) {
+            adminApp.set(eOption, serverSettings[eOption]);
+        }
+
+
         // Flows
         adminApp.get("/flows",needsPermission("flows.read"),flows.get,apiUtil.errorHandler);
         adminApp.post("/flows",needsPermission("flows.write"),flows.post,apiUtil.errorHandler);

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

@@ -141,7 +141,7 @@ function completeVerify(profile,done) {
     Users.authenticate(profile).then(function(user) {
         if (user) {
             Tokens.create(user.username,"node-red-editor",user.permissions).then(function(tokens) {
-                log.audit({event: "auth.login",username:user.username,scope:user.permissions});
+                log.audit({event: "auth.login",user,username:user.username,scope:user.permissions});
                 user.tokens = tokens;
                 done(null,user);
             });
@@ -173,31 +173,38 @@ function genericStrategy(adminApp,strategy) {
     adminApp.use(passport.session());
 
     var options = strategy.options;
+    var verify = function() {
+        var originalDone = arguments[arguments.length-1];
+        if (options.verify) {
+            var args = Array.from(arguments);
+            args[args.length-1] = function(err,profile) {
+                if (err) {
+                    return originalDone(err);
+                } else {
+                    return completeVerify(profile,originalDone);
+                }
+            };
 
-    passport.use(new strategy.strategy(options,
-        function() {
-            var originalDone = arguments[arguments.length-1];
-            if (options.verify) {
-                var args = Array.from(arguments);
-                args[args.length-1] = function(err,profile) {
-                    if (err) {
-                        return originalDone(err);
-                    } else {
-                        return completeVerify(profile,originalDone);
-                    }
-                };
-                options.verify.apply(null,args);
-            } else {
-                var profile = arguments[arguments.length - 2];
-                return completeVerify(profile,originalDone);
-            }
-
+            options.verify.apply(null,args);
+        } else {
+            var profile = arguments[arguments.length - 2];
+            return completeVerify(profile,originalDone);
         }
-    ));
+    };
+    // Give our callback the same arity as the original one from options
+    if (options.verify) {
+        Object.defineProperty(verify, "length", { value: options.verify.length })
+    }
+
+    passport.use(new strategy.strategy(options, verify));
 
     adminApp.get('/auth/strategy',
-        passport.authenticate(strategy.name, {session:false, failureRedirect: settings.httpAdminRoot }),
-        completeGenerateStrategyAuth
+        passport.authenticate(strategy.name, {session:false,
+            failureMessage: true,
+            failureRedirect: settings.httpAdminRoot
+        }),
+        completeGenerateStrategyAuth,
+        handleStrategyError
     );
 
     var callbackMethodFunc = adminApp.get;
@@ -205,8 +212,13 @@ function genericStrategy(adminApp,strategy) {
         callbackMethodFunc = adminApp.post;
     }
     callbackMethodFunc.call(adminApp,'/auth/strategy/callback',
-        passport.authenticate(strategy.name, {session:false, failureRedirect: settings.httpAdminRoot }),
-        completeGenerateStrategyAuth
+        passport.authenticate(strategy.name, {
+            session:false,
+            failureMessage: true,
+            failureRedirect: settings.httpAdminRoot
+        }),
+        completeGenerateStrategyAuth,
+        handleStrategyError
     );
 
 }
@@ -216,6 +228,13 @@ function completeGenerateStrategyAuth(req,res) {
     // Successful authentication, redirect home.
     res.redirect(settings.httpAdminRoot + '?access_token='+tokens.accessToken);
 }
+function handleStrategyError(err, req, res, next) {
+    if (res.headersSent) {
+        return next(err)
+    }
+    log.audit({event: "auth.login.fail.oauth",error:err.toString()});
+    res.redirect(settings.httpAdminRoot + '?session_message='+err.toString());
+}
 
 module.exports = {
     init: init,

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

@@ -93,7 +93,7 @@ var passwordTokenExchange = function(client, username, password, scope, done) {
                     return logEntry.user !== username;
                 });
                 Tokens.create(username,client.id,scope).then(function(tokens) {
-                    log.audit({event: "auth.login",username:username,client:client.id,scope:scope});
+                    log.audit({event: "auth.login",user,username:username,client:client.id,scope:scope});
                     done(null,tokens.accessToken,null,{expires_in:tokens.expires_in});
                 });
             } else {
@@ -146,7 +146,7 @@ function authenticateUserToken(req) {
                 } else {
                     reject();
                 }
-            });
+            }).catch(reject);
         } else {
             reject();
         }
@@ -163,6 +163,9 @@ TokensStrategy.prototype.authenticate = function(req) {
     authenticateUserToken(req).then(user => {
         this.success(user,{scope:user.permissions});
     }).catch(err => {
+        if (err) {
+            log.trace("token authentication failure: "+err.stack?err.stack:err)
+        }
         this.fail(401);
     });
 }

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

@@ -158,25 +158,31 @@ function CommsConnection(ws, user) {
 }
 
 CommsConnection.prototype.send = function(topic,data) {
-    var self = this;
     if (topic && data) {
         this.stack.push({topic:topic,data:data});
     }
+    this._queueSend();
+}
+CommsConnection.prototype._queueSend = function() {
+    var self = this;
     if (!this._xmitTimer) {
         this._xmitTimer = setTimeout(function() {
             try {
-                self.ws.send(JSON.stringify(self.stack));
+                self.ws.send(JSON.stringify(self.stack.splice(0,50)));
                 self.lastSentTime = Date.now();
             } catch(err) {
                 removeActiveConnection(self);
                 log.warn(log._("comms.error-send",{message:err.toString()}));
             }
             delete self._xmitTimer;
-            self.stack = [];
+            if (self.stack.length > 0) {
+                self._queueSend();
+            }
         },50);
     }
 }
 
+
 CommsConnection.prototype.subscribe = function(topic) {
     runtimeAPI.comms.subscribe({
         user: this.user,

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

@@ -64,10 +64,12 @@ module.exports = {
                     }
                 });
             }
-            if (settings.httpServerOptions) {
-                for (var eOption in settings.httpServerOptions) {
-                    editorApp.set(eOption, settings.httpServerOptions[eOption]);
-                }
+            var defaultServerSettings = {
+                "x-powered-by": false
+            }
+            var serverSettings = Object.assign({},defaultServerSettings,settings.httpServerOptions||{});
+            for (var eOption in serverSettings) {
+                editorApp.set(eOption, serverSettings[eOption]);
             }
             editorApp.get("/",ensureRuntimeStarted,ui.ensureSlash,ui.editor);
 

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

@@ -48,9 +48,10 @@ module.exports = {
         var prevLang = i18n.i.language;
         // Trigger a load from disk of the language if it is not the default
         i18n.i.changeLanguage(lang, function(){
-            var catalog = loadResource(lang, namespace);
-            res.json(catalog||{});
+            i18n.i.changeLanguage(prevLang, function() {
+                var catalog = loadResource(lang, namespace);
+                res.json(catalog||{});
+            });
         });
-        i18n.i.changeLanguage(prevLang);
     }
 }

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

@@ -122,6 +122,7 @@ module.exports = {
             }
 
             if (req.body.active) {
+                opts.clearContext = req.body.hasOwnProperty('clearContext')?req.body.clearContext:true
                 runtimeAPI.projects.setActiveProject(opts).then(function() {
                     listProjects(req,res);
                 }).catch(function(err) {

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

@@ -18,14 +18,6 @@ var apiUtils = require("../util");
 var express = require("express");
 var runtimeAPI;
 
-function getUsername(userObj) {
-    var username = '__default';
-    if ( userObj && userObj.name ) {
-        username = userObj.name;
-    }
-    return username;
-}
-
 module.exports = {
     init: function(_runtimeAPI) {
         runtimeAPI = _runtimeAPI;

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

@@ -24,16 +24,20 @@ var defaultContext = {
     page: {
         title: "Node-RED",
         favicon: "favicon.ico",
-        tabicon: "red/images/node-red-icon-black.svg"
+        tabicon: {
+            icon: "red/images/node-red-icon-black.svg",
+            colour: "#8f0000"
+        },
+        version: require(path.join(__dirname,"../../package.json")).version
     },
     header: {
         title: "Node-RED",
         image: "red/images/node-red.svg"
     },
     asset: {
-        red: (process.env.NODE_ENV == "development")? "red/red.js":"red/red.min.js",
-        main: (process.env.NODE_ENV == "development")? "red/main.js":"red/main.min.js",
-
+        red: "red/red.min.js",
+        main: "red/main.min.js",
+        vendorMonaco: ""
     }
 };
 
@@ -74,7 +78,7 @@ function serveFilesFromTheme(themeValue, themeApp, directory, baseDirectory) {
             let fullPath = array[i];
             if (baseDirectory) {
                 fullPath = path.resolve(baseDirectory,array[i]);
-                if (fullPath.indexOf(baseDirectory) !== 0) {
+                if (fullPath.indexOf(path.resolve(baseDirectory)) !== 0) {
                     continue;
                 }
             }
@@ -91,8 +95,13 @@ module.exports = {
     init: function(settings, _runtimeAPI) {
         runtimeAPI = _runtimeAPI;
         themeContext = clone(defaultContext);
+        if (process.env.NODE_ENV == "development") {
+            themeContext.asset.red = "red/red.js";
+            themeContext.asset.main = "red/main.js";
+        }
         themeSettings = null;
         theme = settings.editorTheme || {};
+        themeContext.asset.vendorMonaco = ((theme.codeEditor || {}).lib === "monaco") ? "vendor/monaco/monaco-bootstrap.js" : "";
         activeTheme = theme.theme;
     },
 
@@ -122,9 +131,13 @@ module.exports = {
             }
 
             if (theme.page.tabicon) {
-                url = serveFile(themeApp,"/tabicon/",theme.page.tabicon)
+                let icon = theme.page.tabicon.icon || theme.page.tabicon
+                url = serveFile(themeApp,"/tabicon/", icon)
                 if (url) {
-                    themeContext.page.tabicon = url;
+                    themeContext.page.tabicon.icon = url;
+                }
+                if (theme.page.tabicon.colour) {
+                    themeContext.page.tabicon.colour = theme.page.tabicon.colour
                 }
             }
 
@@ -215,6 +228,11 @@ module.exports = {
         if (theme.theme) {
             themeSettings.theme = theme.theme;
         }
+
+        if (theme.hasOwnProperty("tours")) {
+            themeSettings.tours = theme.tours;
+        }
+
         return themeApp;
     },
     context: async function() {
@@ -245,6 +263,9 @@ module.exports = {
                     theme.page = theme.page || {_:{}}
                     theme.page._.scripts = scriptFiles.concat(theme.page._.scripts || [])
                 }
+                if(theme.codeEditor) {
+                    theme.codeEditor.options = Object.assign({}, themePlugin.monacoOptions, theme.codeEditor.options);
+                }
             }
             activeThemeInitialised = true;
         }

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

@@ -91,7 +91,16 @@ module.exports = {
     },
 
     editor: async function(req,res) {
-        res.send(Mustache.render(editorTemplate,await theme.context()));
+
+        let sessionMessages;
+        if (req.session && req.session.messages) {
+            sessionMessages = JSON.stringify(req.session.messages);
+            delete req.session.messages
+        }
+        res.send(Mustache.render(editorTemplate,{
+            sessionMessages,
+            ...await theme.context()
+        }));
     },
     editorResources: express.static(path.join(editorClientDir,'public'))
 };

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

@@ -64,6 +64,14 @@ function init(settings,_server,storage,runtimeAPI) {
             }
         }
 
+        var defaultServerSettings = {
+            "x-powered-by": false
+        }
+        var serverSettings = Object.assign({},defaultServerSettings,settings.httpServerOptions||{});
+        for (var eOption in serverSettings) {
+            adminApp.set(eOption, serverSettings[eOption]);
+        }
+
         auth.init(settings,storage);
 
         var maxApiRequestSize = settings.apiMaxLength || '5mb';
@@ -82,6 +90,8 @@ function init(settings,_server,storage,runtimeAPI) {
                     auth.getToken,
                     auth.errorHandler
                 );
+            } else if (settings.adminAuth.tokens) {
+                adminApp.use(passport.initialize());
             }
             adminApp.post("/auth/revoke",auth.needsPermission(""),auth.revoke,apiUtil.errorHandler);
         }

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "1.3.7",
+    "version": "2.2.2",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,25 +16,25 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "1.3.7",
-        "@node-red/editor-client": "1.3.7",
+        "@node-red/util": "2.2.2",
+        "@node-red/editor-client": "2.2.2",
         "bcryptjs": "2.4.3",
-        "body-parser": "1.19.0",
+        "body-parser": "1.19.1",
         "clone": "2.1.2",
         "cors": "2.8.5",
-        "express-session": "1.17.1",
-        "express": "4.17.1",
-        "memorystore": "1.6.6",
-        "mime": "2.5.2",
-        "multer": "1.4.2",
+        "express-session": "1.17.2",
+        "express": "4.17.2",
+        "memorystore": "1.6.7",
+        "mime": "3.0.0",
+        "multer": "1.4.4",
         "mustache": "4.2.0",
-        "oauth2orize": "1.11.0",
+        "oauth2orize": "1.11.1",
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
-        "passport": "0.4.1",
-        "ws": "6.2.2"
+        "passport": "0.5.2",
+        "ws": "7.5.6"
     },
     "optionalDependencies": {
-        "bcrypt": "3.0.6"
+        "bcrypt": "5.0.1"
     }
 }

packages/node_modules/@node-red/editor-client/LICENSE

@@ -1,4 +1,4 @@
-Copyright JS Foundation and other contributors, http://js.foundation
+Copyright OpenJS Foundation and other contributors, https://openjsf.org/
 
                                  Apache License
                            Version 2.0, January 2004

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

@@ -634,14 +634,7 @@
             "empty": "leer",
             "globalConfig": "Globale Konfigurations-Nodes",
             "triggerAction": "Auslösen",
-            "find": "Suche im Arbeitsbereich",
-            "search": {
-                "configNodes": "Konfigurations-Nodes",
-                "unusedConfigNodes": "Unbenutzte Konfigurations-Nodes",
-                "invalidNodes": "Ungültige Nodes",
-                "uknownNodes": "Unbekannte Nodes",
-                "unusedSubflows": "Unbenutzte Subflows"
-            }
+            "find": "Suche im Arbeitsbereich"
         },
         "help": {
             "name": "Hilfe",
@@ -863,7 +856,14 @@
     },
     "search": {
         "empty": "Keine Übereinstimmungen gefunden",
-        "addNode": "Node hinzufügen ..."
+        "addNode": "Node hinzufügen ...",
+        "options": {
+            "configNodes": "Konfigurations-Nodes",
+            "unusedConfigNodes": "Unbenutzte Konfigurations-Nodes",
+            "invalidNodes": "Ungültige Nodes",
+            "uknownNodes": "Unbekannte Nodes",
+            "unusedSubflows": "Unbenutzte Subflows"
+        }
     },
     "expressionEditor": {
         "functions": "Funktionen",

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

@@ -53,8 +53,17 @@
         "confirmDelete": "Confirm delete",
         "delete": "Are you sure you want to delete '__label__'?",
         "dropFlowHere": "Drop the flow here",
-        "addFlow": "Add Flow",
-        "listFlows": "List Flows",
+        "addFlow": "Add flow",
+        "addFlowToRight": "Add flow to the right",
+        "hideFlow": "Hide flow",
+        "hideOtherFlows": "Hide other flows",
+        "showAllFlows": "Show all flows",
+        "hideAllFlows": "Hide all flows",
+        "hiddenFlows": "List __count__ hidden flow",
+        "hiddenFlows_plural": "List __count__ hidden flows",
+        "showLastHiddenFlow": "Show last hidden flow",
+        "listFlows": "List flows",
+        "listSubflows": "List subflows",
         "status": "Status",
         "enabled": "Enabled",
         "disabled":"Disabled",
@@ -66,6 +75,8 @@
             "view": {
                 "view": "View",
                 "grid": "Grid",
+                "storeZoom": "Restore zoom level on load",
+                "storePosition": "Restore scroll position on load",
                 "showGrid": "Show grid",
                 "snapGrid": "Snap to grid",
                 "gridSize": "Grid size",
@@ -83,6 +94,7 @@
             "palette": {
                 "show": "Show palette"
             },
+            "edit": "Edit",
             "settings": "Settings",
             "userSettings": "User Settings",
             "nodes": "Nodes",
@@ -105,24 +117,43 @@
             "editPalette":"Manage palette",
             "other": "Other",
             "showTips": "Show tips",
+            "showWelcomeTours": "Show guided tours for new versions",
             "help": "Node-RED website",
             "projects": "Projects",
             "projects-new": "New",
             "projects-open": "Open",
             "projects-settings": "Project Settings",
             "showNodeLabelDefault": "Show label of newly added nodes",
+            "codeEditor": "Code Editor",
             "groups": "Groups",
             "groupSelection": "Group selection",
             "ungroupSelection": "Ungroup selection",
             "groupMergeSelection": "Merge selection",
-            "groupRemoveSelection": "Remove from group"
+            "groupRemoveSelection": "Remove from group",
+            "arrange":"Arrange",
+            "alignLeft":"Align to left",
+            "alignCenter":"Align to center",
+            "alignRight":"Align to right",
+            "alignTop":"Align to top",
+            "alignMiddle":"Align to middle",
+            "alignBottom":"Align to bottom",
+            "distributeHorizontally":"Distribute horizontally",
+            "distributeVertically":"Distribute vertically",
+            "moveToBack":"Move to back",
+            "moveToFront":"Move to front",
+            "moveBackwards":"Move backwards",
+            "moveForwards":"Move forwards"
         }
     },
     "actions": {
         "toggle-navigator": "Toggle navigator",
         "zoom-out": "Zoom out",
         "zoom-reset": "Reset zoom",
-        "zoom-in": "Zoom in"
+        "zoom-in": "Zoom in",
+        "search-flows": "Search flows",
+        "search-prev": "Previous",
+        "search-next": "Next",
+        "search-counter": "\"__term__\" __result__ of __count__"
     },
     "user": {
         "loggedInAs": "Logged in as __name__",
@@ -449,8 +480,9 @@
         "unassigned": "Unassigned",
         "global": "global",
         "workspace": "workspace",
-        "selectAll": "Select all nodes",
-        "selectAllConnected": "Select all connected nodes",
+        "selectAll": "Select all",
+        "selectNone": "Select none",
+        "selectAllConnected": "Select connected",
         "addRemoveNode": "Add/remove node from selection",
         "editSelected": "Edit selected node",
         "deleteSelected": "Delete selected nodes or link",
@@ -463,10 +495,14 @@
         "copyNode": "Copy selected nodes",
         "cutNode": "Cut selected nodes",
         "pasteNode": "Paste nodes",
-        "undoChange": "Undo the last change performed",
+        "copyGroupStyle": "Copy group style",
+        "pasteGroupStyle": "Paste group style",
+        "undoChange": "Undo",
+        "redoChange": "Redo",
         "searchBox": "Open search box",
         "managePalette": "Manage palette",
-        "actionList":"Action list"
+        "actionList": "Action list",
+        "splitWiresWithLinks": "Split selection with Link nodes"
     },
     "library": {
         "library": "Library",
@@ -518,7 +554,8 @@
             "nodeEnabled_plural": "Nodes enabled:",
             "nodeDisabled": "Node disabled:",
             "nodeDisabled_plural": "Nodes disabled:",
-            "nodeUpgraded": "Node module __module__ upgraded to version __version__"
+            "nodeUpgraded": "Node module __module__ upgraded to version __version__",
+            "unknownNodeRegistered": "Error loading node: <ul><li>__type__<br>__error__</li></ul>"
         },
         "editor": {
             "title": "Manage palette",
@@ -635,14 +672,7 @@
             "empty": "empty",
             "globalConfig": "Global Configuration Nodes",
             "triggerAction": "Trigger action",
-            "find": "Find in workspace",
-            "search": {
-                "configNodes": "Configuration nodes",
-                "unusedConfigNodes": "Unused configuration nodes",
-                "invalidNodes": "Invalid nodes",
-                "uknownNodes": "Unknown nodes",
-                "unusedSubflows": "Unused subflows"
-            }
+            "find": "Find in workspace"
         },
         "help": {
             "name": "Help",
@@ -863,8 +893,19 @@
         "addTitle": "add an item"
     },
     "search": {
+        "history": "Search history",
+        "clear": "clear all",
         "empty": "No matches found",
-        "addNode": "add a node..."
+        "addNode": "add a node...",
+        "options": {
+            "configNodes": "Configuration nodes",
+            "unusedConfigNodes": "Unused configuration nodes",
+            "invalidNodes": "Invalid nodes",
+            "uknownNodes": "Unknown nodes",
+            "unusedSubflows": "Unused subflows",
+            "hiddenFlows": "Hidden flows",
+            "modifiedNodes": "Modified nodes and flows"
+        }
     },
     "expressionEditor": {
         "functions": "Functions",
@@ -885,6 +926,9 @@
             "eval": "Error evaluating expression:\n  __message__"
         }
     },
+    "monaco": {
+        "setTheme": "Set theme"
+    },
     "jsEditor": {
         "title": "JavaScript editor"
     },
@@ -1057,7 +1101,8 @@
             "not-git": "Not a git repository",
             "no-resource": "Repository not found",
             "cant-get-ssh-key-path": "Error! Can't get selected SSH key path.",
-            "unexpected_error": "unexpected_error"
+            "unexpected_error": "unexpected_error",
+            "clearContext": "Clear context when switching projects"
         },
         "delete": {
             "confirm": "Are you sure you want to delete this project?"
@@ -1104,6 +1149,11 @@
         "preview": "UI Preview",
         "defaultValue": "Default value"
     },
+    "tourGuide": {
+        "takeATour": "Take a tour",
+        "start": "Start",
+        "next": "Next"
+    },
     "languages" : {
         "de": "German",
         "en-US": "English",

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

@@ -52,8 +52,8 @@
         "desc": "Finds occurrences of `pattern` within `str` and replaces them with `replacement`.\n\nThe optional `limit` parameter is the maximum number of replacements."
     },
     "$now": {
-        "args":"",
-        "desc":"Generates a timestamp in ISO 8601 compatible format and returns it as a string."
+        "args":"$[picture [, timezone]]",
+        "desc":"Generates a timestamp in ISO 8601 compatible format and returns it as a string. If the optional picture and timezone parameters are supplied, then the current timestamp is formatted as described by the `$fromMillis()` function"
     },
     "$base64encode": {
         "args":"string",
@@ -200,8 +200,8 @@
         "desc": "Returns a copy of the `string` with extra padding, if necessary, so that its total number of characters is at least the absolute value of the `width` parameter.\n\nIf `width` is a positive number, then the string is padded to the right; if negative, it is padded to the left.\n\nThe optional `char` argument specifies the padding character(s) to use. If not specified, it defaults to the space character."
     },
     "$fromMillis": {
-        "args": "number",
-        "desc": "Convert a number representing milliseconds since the Unix Epoch (1 January, 1970 UTC) to a timestamp string in the ISO 8601 format."
+        "args": "number, [, picture [, timezone]]",
+        "desc": "Convert the `number` representing milliseconds since the Unix Epoch (1 January, 1970 UTC) to a formatted string representation of the timestamp as specified by the picture string.\n\nIf the optional `picture` parameter is omitted, then the timestamp is formatted in the ISO 8601 format.\n\nIf the optional `picture` string is supplied, then the timestamp is formatted occording to the representation specified in that string. The behaviour of this function is consistent with the two-argument version of the XPath/XQuery function `format-dateTime` as defined in the XPath F&O 3.1 specification. The picture string parameter defines how the timestamp is formatted and has the same syntax as `format-dateTime`.\n\nIf the optional `timezone` string is supplied, then the formatted timestamp will be in that timezone. The `timezone` string should be in the format '±HHMM', where ± is either the plus or minus sign and HHMM is the offset in hours and minutes from UTC. Positive offset for timezones east of UTC, negative offset for timezones west of UTC."
     },
     "$formatNumber": {
         "args": "number, picture [, options]",

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

@@ -54,7 +54,16 @@
         "delete": "本当に '__label__' を削除しますか？",
         "dropFlowHere": "ここにフローをドロップしてください",
         "addFlow": "フローの追加",
+        "addFlowToRight": "右側にフローを追加",
+        "hideFlow": "フローを非表示",
+        "hideOtherFlows": "他のフローを非表示",
+        "showAllFlows": "全てのフローを表示",
+        "hideAllFlows": "全てのフローを非表示",
+        "hiddenFlows": "__count__ 個の非表示のフロー一覧",
+        "hiddenFlows_plural": "__count__ 個の非表示のフロー一覧",
+        "showLastHiddenFlow": "最後に非表示にしたフローを表示",
         "listFlows": "フロー一覧",
+        "listSubflows": "サブフロー一覧",
         "status": "状態",
         "enabled": "有効",
         "disabled": "無効",
@@ -66,6 +75,8 @@
             "view": {
                 "view": "表示",
                 "grid": "グリッド",
+                "storeZoom": "読み込み時に拡大/縮小のレベルを復元",
+                "storePosition": "読み込み時にスクロール位置を復元",
                 "showGrid": "グリッドを表示",
                 "snapGrid": "ノードの配置を補助",
                 "gridSize": "グリッドの大きさ",
@@ -83,6 +94,7 @@
             "palette": {
                 "show": "パレットを表示"
             },
+            "edit": "編集",
             "settings": "設定",
             "userSettings": "ユーザ設定",
             "nodes": "ノード",
@@ -105,17 +117,32 @@
             "editPalette": "パレットの管理",
             "other": "その他",
             "showTips": "ヒントを表示",
+            "showWelcomeTours": "新バージョンのガイドツアーを表示",
             "help": "Node-REDウェブサイト",
             "projects": "プロジェクト",
             "projects-new": "新規",
             "projects-open": "開く",
             "projects-settings": "設定",
             "showNodeLabelDefault": "追加したノードのラベルを表示",
+            "codeEditor": "コードエディタ",
             "groups": "グループ",
             "groupSelection": "選択部分をグループ化",
             "ungroupSelection": "選択部分をグループ解除",
             "groupMergeSelection": "選択部分をマージ",
-            "groupRemoveSelection": "グループから削除"
+            "groupRemoveSelection": "グループから削除",
+            "arrange": "配置",
+            "alignLeft": "左揃え",
+            "alignCenter": "左右中央揃え",
+            "alignRight": "右揃え",
+            "alignTop": "上揃え",
+            "alignMiddle": "上下中央揃え",
+            "alignBottom": "下揃え",
+            "distributeHorizontally": "左右に整列",
+            "distributeVertically": "上下に整列",
+            "moveToBack": "最背面へ移動",
+            "moveToFront": "最前面へ移動",
+            "moveBackwards": "背面へ移動",
+            "moveForwards": "前面へ移動"
         }
     },
     "actions": {
@@ -450,7 +477,8 @@
         "global": "グローバル",
         "workspace": "ワークスペース",
         "selectAll": "全てのノードを選択",
-        "selectAllConnected": "接続された全てのノードを選択",
+        "selectNone": "選択を外す",
+        "selectAllConnected": "接続されたノードを選択",
         "addRemoveNode": "ノードの選択、選択解除",
         "editSelected": "選択したノードを編集",
         "deleteSelected": "選択したノードや接続を削除",
@@ -460,10 +488,13 @@
         "moveNode": "選択したノードを移動(移動量大)",
         "toggleSidebar": "サイドバーの表示/非表示",
         "togglePalette": "パレットの表示/非表示",
-        "copyNode": "選択したノードをコピー",
-        "cutNode": "選択したノードを切り取り",
+        "copyNode": "ノードをコピー",
+        "cutNode": "ノードを切り取り",
         "pasteNode": "ノードを貼り付け",
+        "copyGroupStyle": "グループ様式をコピー",
+        "pasteGroupStyle": "グループ様式を貼り付け",
         "undoChange": "変更操作を戻す",
+        "redoChange": "変更操作をやり直し",
         "searchBox": "ノードを検索",
         "managePalette": "パレットの管理",
         "actionList": "動作一覧"
@@ -518,7 +549,8 @@
             "nodeEnabled_plural": "ノードを有効化しました:",
             "nodeDisabled": "ノードを無効化しました:",
             "nodeDisabled_plural": "ノードを無効化しました:",
-            "nodeUpgraded": "ノードモジュール __module__ をバージョン __version__ へ更新しました"
+            "nodeUpgraded": "ノードモジュール __module__ をバージョン __version__ へ更新しました",
+            "unknownNodeRegistered": "ノードの読み込みエラー: <ul><li>__type__<br>__error__</li></ul>"
         },
         "editor": {
             "title": "パレットの管理",
@@ -635,14 +667,7 @@
             "empty": "空",
             "globalConfig": "グローバル設定ノード",
             "triggerAction": "アクションを実行",
-            "find": "ワークスペース内を検索",
-            "search": {
-                "configNodes": "設定ノード",
-                "unusedConfigNodes": "未使用の設定ノード",
-                "invalidNodes": "不正なノード",
-                "uknownNodes": "未知のノード",
-                "unusedSubflows": "未使用のサブフロー"
-            }
+            "find": "ワークスペース内を検索"
         },
         "help": {
             "name": "ヘルプ",
@@ -863,8 +888,18 @@
         "addTitle": "要素を追加"
     },
     "search": {
+        "history": "検索履歴",
+        "clear": "全て削除",
         "empty": "一致したものが見つかりませんでした",
-        "addNode": "ノードを追加..."
+        "addNode": "ノードを追加...",
+        "options": {
+            "configNodes": "設定ノード",
+            "unusedConfigNodes": "未使用の設定ノード",
+            "invalidNodes": "不正なノード",
+            "uknownNodes": "未知のノード",
+            "unusedSubflows": "未使用のサブフロー",
+            "hiddenFlows": "非表示のフロー"
+        }
     },
     "expressionEditor": {
         "functions": "関数",
@@ -885,6 +920,9 @@
             "eval": "表現評価エラー:\n  __message__"
         }
     },
+    "monaco": {
+        "setTheme": "テーマを設定:"
+    },
     "jsEditor": {
         "title": "JavaScriptエディタ"
     },
@@ -1057,7 +1095,8 @@
             "not-git": "Gitリポジトリではありません",
             "no-resource": "リポジトリが見つかりません",
             "cant-get-ssh-key-path": "エラー! 選択したSSHキーのパスを取得できません。",
-            "unexpected_error": "予期しないエラー"
+            "unexpected_error": "予期しないエラー",
+            "clearContext": "プロジェクトを切り替る際にコンテキストを初期化"
         },
         "delete": {
             "confirm": "プロジェクトを削除しても良いですか?"
@@ -1104,6 +1143,11 @@
         "preview": "UIプレビュー",
         "defaultValue": "デフォルト値"
     },
+    "tourGuide": {
+        "takeATour": "ツアーを開始",
+        "start": "開始",
+        "next": "次へ"
+    },
     "languages": {
         "de": "ドイツ語",
         "en-US": "英語",
@@ -1112,5 +1156,137 @@
         "ru": "ロシア語",
         "zh-CN": "中国語(簡体)",
         "zh-TW": "中国語(繁体)"
+    },
+    "action-list": {
+        "toggle-show-tips": "ヒント表示切替",
+        "show-about": "Node-REDの説明を表示",
+        "show-welcome-tour": "ウェルカムツアー表示",
+        "show-next-tab": "次のタブを表示",
+        "show-previous-tab": "前のタブを表示",
+        "add-flow": "フローを追加",
+        "add-flow-to-right": "フローを右に追加",
+        "edit-flow": "フローを編集",
+        "remove-flow": "フローを削除",
+        "enable-flow": "フローを有効化",
+        "disable-flow": "フローを無効化",
+        "hide-flow": "フローを隠す",
+        "hide-other-flows": "他のフローを非表示",
+        "hide-all-flows": "全てのフローを非表示",
+        "show-all-flows": "全てのフローを表示",
+        "show-last-hidden-flow": "最後に非表示にしたフローを表示",
+        "list-hidden-flows": "非表示フローを表示",
+        "list-flows": "フロー一覧",
+        "list-subflows": "サブフロー一覧",
+        "go-to-previous-location": "前の位置に移動",
+        "go-to-next-location": "次の位置に移動",
+        "copy-selection-to-internal-clipboard": "選択をクリップボードにコピー",
+        "cut-selection-to-internal-clipboard": "選択をクリップボードに切り取り",
+        "paste-from-internal-clipboard": "クリップボードから貼り付け",
+        "detach-selected-nodes": "選択ノードを接続から外す",
+        "delete-selection": "選択を削除",
+        "delete-selection-and-reconnect": "選択を削除し再接続",
+        "edit-selected-node": "選択したノードを編集",
+        "go-to-selection": "選択に移動",
+        "undo": "変更操作を戻す",
+        "redo": "変更操作をやり直し",
+        "select-all-nodes": "全てのノードを選択",
+        "select-none": "ノードを選択",
+        "enable-selected-nodes": "選択ノードを有効化",
+        "disable-selected-nodes": "選択ノードを無効化",
+        "toggle-show-grid": "グリッド表示切替",
+        "toggle-snap-grid": "ノードの配置補助切替",
+        "toggle-status": "ステータス表示切替",
+        "show-selected-node-labels": "選択したノードのラベルを表示",
+        "hide-selected-node-labels": "選択したノードのラベルを非表示",
+        "scroll-view-up": "上スクロール",
+        "scroll-view-right": "右スクロール",
+        "scroll-view-down": "下スクロール",
+        "scroll-view-left": "左スクロール",
+        "step-view-up": "一単位上スクロール",
+        "step-view-right": "一単位右スクロール",
+        "step-view-down": "一単位下スクロール",
+        "step-view-left": "一単位左スクロール",
+        "move-selection-up": "選択を上移動",
+        "move-selection-right": "選択を右移動",
+        "move-selection-down": "選択を下移動",
+        "move-selection-left": "選択を左移動",
+        "move-selection-forwards": "選択を前面に移動",
+        "move-selection-backwards": "選択を背面に移動",
+        "move-selection-to-front": "選択を最前面に移動",
+        "move-selection-to-back": "選択を最背面に移動",
+        "step-selection-up": "選択を一単位上移動",
+        "step-selection-right": "選択を一単位右移動",
+        "step-selection-down": "選択を一単位下移動",
+        "step-selection-left": "選択を一単位左移動",
+        "select-connected-nodes": "接続されたノードを選択",
+        "select-downstream-nodes": "後方に接続されたノードを選択",
+        "select-upstream-nodes": "前方に接続されたノードを選択",
+        "go-to-next-node": "次のノードに移動",
+        "go-to-previous-node": "前のノードに移動",
+        "go-to-next-sibling": "次の兄弟ノードに移動",
+        "go-to-previous-sibling": "前の兄弟ノードに移動",
+        "go-to-nearest-node-on-left": "最も近い左側ノードに移動",
+        "go-to-nearest-node-on-right": "最も近い右側ノードに移動",
+        "go-to-nearest-node-above": "最も近い上側ノードに移動",
+        "go-to-nearest-node-below": "最も近い下側ノードに移動",
+        "align-selection-to-grid": "選択を整列",
+        "align-selection-to-left": "選択を左揃え",
+        "align-selection-to-right": "選択を右揃え",
+        "align-selection-to-top": "選択を上揃え",
+        "align-selection-to-bottom": "選択を下揃え",
+        "align-selection-to-middle": "選択を上下中央揃え",
+        "align-selection-to-center": "選択を左右中央揃え",
+        "distribute-selection-horizontally": "選択を左右に整列",
+        "distribute-selection-vertically": "選択を上下に整列",
+        "wire-series-of-nodes": "ノードを一続きに接続",
+        "wire-node-to-multiple": "ノードを複数に接続",
+        "show-user-settings": "ユーザ設定を表示",
+        "show-help": "ヘルプを表示",
+        "toggle-palette": "パレットの表示切替",
+        "show-event-log": "イベントログを表示",
+        "manage-palette": "パレットの管理",
+        "toggle-sidebar": "サイドバーの表示切替",
+        "show-info-tab": "ノード情報タブの表示",
+        "show-help-tab": "ノードヘルプタブの表示",
+        "show-config-tab": "設定ノードタブの表示",
+        "select-all-config-nodes": "全ての設定ノードを選択",
+        "delete-config-selection": "選択した設定ノードを削除",
+        "show-context-tab": "コンテキストデータタブを表示",
+        "create-subflow": "サブフローを作成",
+        "convert-to-subflow": "選択をサブフローに変換",
+        "group-selection": "選択をグループ化",
+        "ungroup-selection": "選択をグループ解除",
+        "merge-selection-to-group": "選択をグループにマージ",
+        "remove-selection-from-group": "選択をグループから削除",
+        "copy-group-style": "グループのスタイルをコピー",
+        "paste-group-style": "グループのスタイルを貼り付け",
+        "show-export-dialog": "書き出しダイアログを表示",
+        "show-import-dialog": "読み込みダイアログを表示",
+        "show-library-export-dialog": "ライブラリ書き出しダイアログを表示",
+        "show-library-import-dialog": "ライブラリ読み込みダイアログを表示",
+        "show-examples-import-dialog": "サンプル読み込みダイアログを表示",
+        "search": "検索",
+        "show-action-list": "アクション一覧を表示",
+        "confirm-edit-tray": "編集を完了",
+        "cancel-edit-tray": "編集をキャンセル",
+        "show-remote-diff": "リモートとの変更差分を表示",
+        "deploy-flows": "フローをデプロイ",
+        "restart-flows": "フローを再起動",
+        "set-deploy-type-to-full": "デプロイを「全て」に設定",
+        "set-deploy-type-to-modified-flows": "デプロイを「変更したフロー」に設定",
+        "set-deploy-type-to-modified-nodes": "デプロイを「変更したノード」に設定",
+        "show-debug-tab": "デバッグタブを表示",
+        "clear-debug-messages": "デバッグメッセージをクリア",
+        "clear-filtered-debug-messages": "フィルタしたデバッグメッセージをクリア",
+        "activate-selected-debug-nodes": "選択したデバッグノードを有効化",
+        "activate-all-debug-nodes": "全てのデバッグノードを有効化",
+        "activate-all-flow-debug-nodes": "フロー内の全デバッグノードを有効化",
+        "deactivate-selected-debug-nodes": "選択したデバッグノードを無効化",
+        "deactivate-all-debug-nodes": "全てのデバッグノードを無効化",
+        "deactivate-all-flow-debug-nodes": "フロー内の全デバッグノードを無効化",
+        "zoom-in": "ズームイン",
+        "zoom-out": "ズームアウト",
+        "zoom-reset": "ズームリセット",
+        "toggle-navigator": "ナビゲータ表示切替"
     }
 }

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

@@ -52,8 +52,8 @@
         "desc": "文字列 `str` からパターン `pattern` を検索し、置換文字列 `replacement` に置き換えます。\n\n任意の引数 `limit` には、置換回数の上限値を指定します。"
     },
     "$now": {
-        "args": "",
-        "desc": "ISO 8601互換形式の時刻を生成し、文字列として返します。"
+        "args": "$[picture [, timezone]]",
+        "desc": "ISO 8601互換形式の時刻を生成し、文字列として返します。pictureおよびtimezoneパラメータが指定されている場合、現在時刻を`$fromMillis()`関数の説明に従ってフォーマットします。"
     },
     "$base64encode": {
         "args": "string",
@@ -200,8 +200,8 @@
         "desc": "文字数が引数 `width` の絶対値以上となるよう、必要に応じて追加文字を付け足した `string` のコピーを返します。\n\n`width` が正の値の場合、文字列の右側に追加文字を付け足します。もし負の値の場合、文字列の左側に追加文字を付け足します。\n\n任意の引数 `char` には、本関数で用いる追加文字を指定します。もし追加文字を指定しない場合は、既定値として空白文字を使用します。"
     },
     "$fromMillis": {
-        "args": "number",
-        "desc": "Unixエポック(1 January, 1970 UTC)からの経過ミリ秒を表す数値を、ISO 8601形式のタイムスタンプの文字列に変換します。"
+        "args": "number, [, picture [, timezone]]",
+        "desc": "Unixエポック(1 January, 1970 UTC)からの経過ミリ秒を表す数値を、`picture`の指定に従ってタイムスタンプの文字列に変換します。\n\n`picture`パラメータが指定されない場合、ISO 8601形式に変換します。\n\n`picture`を指定すると、指定した文字列に従って変換を行います。この変換はXPath F&O 3.1仕様におけるXPath/XQueryの2引数形式`format-dateTime`と同様です。`picture`パラメータはタイムスタンプの変換形式を定義し、その書式は`format-dateTime`と同じです。\n\n`timezone`を指定すると、指定タイムゾーンで変換します。`timezone`は'±HHMM'という形式で指定します。ここで、±は+もしくは-記号を表し、HHMMはUTCからの差分時間と分を表します。正の差分はUTCの東、負の差分は西のタイムゾーンとなります。"
     },
     "$formatNumber": {
         "args": "number, picture [, options]",

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

@@ -56,7 +56,7 @@
       "displayConfig": "설정노드 보기",
       "import": "가져오기",
       "export": "내보내기",
-      "search": "플로우 겅색",
+      "search": "플로우 검색",
       "searchInput": "플로우 검색",
       "subflows": "보조 플로우",
       "createSubflow": "보조 플로우 생성",

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

@@ -650,14 +650,7 @@
             "empty": "пусто",
             "globalConfig": "Глобальные конфиг узлы",
             "triggerAction": "Вызвать действие",
-            "find": "Найти в рабочей области",
-            "search": {
-                "configNodes": "Узлы конфигурации",
-                "unusedConfigNodes": "Неиспользуемые узлы конфигурации",
-                "invalidNodes": "Недействительные узлы",
-                "uknownNodes": "Неизвестные узлы",
-                "unusedSubflows": "Неиспользуемые подпотоки"
-            }
+            "find": "Найти в рабочей области"
         },
         "help": {
             "name": "Справка",
@@ -888,7 +881,14 @@
     },
     "search": {
         "empty": "Ничего не найдено",
-        "addNode": "добавить узел..."
+        "addNode": "добавить узел...",
+        "options": {
+            "configNodes": "Узлы конфигурации",
+            "unusedConfigNodes": "Неиспользуемые узлы конфигурации",
+            "invalidNodes": "Недействительные узлы",
+            "uknownNodes": "Неизвестные узлы",
+            "unusedSubflows": "Неиспользуемые подпотоки"
+        }
     },
     "expressionEditor": {
         "functions": "Функции",

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

@@ -225,7 +225,7 @@
             "compact": "紧凑",
             "formatted": "已格式化",
             "copy": "导出到剪贴板",
-            "export": "到处到库",
+            "export": "导出到库",
             "exportAs": "导出为",
             "overwrite": "替换",
             "exists": "<p><b>\"__file__\"</b>已存在</p><p>是否要替换它？</p>"
@@ -614,14 +614,7 @@
             "empty": "空的",
             "globalConfig": "全局配置节点",
             "triggerAction": "触发动作",
-            "find": "在工作区中查找",
-            "search": {
-                "configNodes": "配置节点",
-                "unusedConfigNodes": "未使用的配置节点",
-                "invalidNodes": "无效的节点",
-                "uknownNodes": "未知的节点",
-                "unusedSubflows": "未使用的子流程"
-            }
+            "find": "在工作区中查找"
         },
         "help": {
             "name": "帮助",
@@ -842,7 +835,14 @@
     },
     "search": {
         "empty": "找不到匹配",
-        "addNode": "添加一个节点..."
+        "addNode": "添加一个节点...",
+        "options": {
+            "configNodes": "配置节点",
+            "unusedConfigNodes": "未使用的配置节点",
+            "invalidNodes": "无效的节点",
+            "uknownNodes": "未知的节点",
+            "unusedSubflows": "未使用的子流程"
+        }
     },
     "expressionEditor": {
         "functions": "功能",

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

@@ -614,14 +614,7 @@
             "empty": "空的",
             "globalConfig": "全局配置節點",
             "triggerAction": "觸發動作",
-            "find": "在工作區中查找",
-            "search": {
-                "configNodes": "配置節點",
-                "unusedConfigNodes": "未使用的配置節點",
-                "invalidNodes": "無效的節點",
-                "uknownNodes": "未知的節點",
-                "unusedSubflows": "未使用的子流程"
-            }
+            "find": "在工作區中查找"
         },
         "help": {
             "name": "幫助",
@@ -842,7 +835,14 @@
     },
     "search": {
         "empty": "找不到匹配",
-        "addNode": "添加一個節點..."
+        "addNode": "添加一個節點...",
+        "options": {
+            "configNodes": "配置節點",
+            "unusedConfigNodes": "未使用的配置節點",
+            "invalidNodes": "無效的節點",
+            "uknownNodes": "未知的節點",
+            "unusedSubflows": "未使用的子流程"
+        }
     },
     "expressionEditor": {
         "functions": "功能",

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-client",
-    "version": "1.3.7",
+    "version": "2.2.2",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -14,5 +14,5 @@
             "name": "Dave Conway-Jones"
         }
     ],
-    "main": "./lib/index.js"
+    "main": "./index.js"
 }

packages/node_modules/@node-red/editor-client/src/images/node-red-256.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" height="512" width="512"><g transform="translate(0 -540.36)"><path fill="#8f0000" color="#000" d="M0 540.36h512v392H0z"/><rect ry="0" height="108.23" width="500.23" stroke="#fff" y="938.25" x="5.89" stroke-width="11.77" fill="#fff"/><path style="text-decoration-color:#000;isolation:auto;mix-blend-mode:normal;solid-color:#000;block-progression:tb;text-decoration-line:none;white-space:normal;text-indent:0;text-transform:none;text-decoration-style:solid" d="M122.88 305.82a4.46 4.46 0 0 0-4.38 4.42v.78c-2.23.1-4.04.54-5.33 1.43a10.5 10.5 0 0 0-3.18 3.87c-.71 1.3-1.3 2.41-2.15 3.2-.72.66-1.8 1.12-3.45 1.32a4.37 4.37 0 0 0-4.3-3.95H82.91a4.43 4.43 0 0 0-4.42 4.35v4.24a4.43 4.43 0 0 0 4.42 4.36h17.16a4.4 4.4 0 0 0 4.4-4.36v-1.6c9.72.14 12.46 2.6 15.59 5.33 3 2.62 6.66 5.38 15.43 5.5v.73a4.49 4.49 0 0 0 4.46 4.38h17.09c2.38 0 4.45-2 4.45-4.38v-4.24a4.49 4.49 0 0 0-4.45-4.38h-17.1c-2.38 0-4.45 2-4.45 4.38v.58c-8.1-.06-10.48-2.15-13.5-4.79-2.5-2.19-5.64-4.58-11.94-5.58 1.17-1.18 1.88-2.52 2.51-3.66.68-1.23 1.29-2.2 2.27-2.88.76-.52 1.98-.84 3.66-.94v.55c0 2.39 2 4.34 4.38 4.34h17.24a4.39 4.39 0 0 0 4.38-4.34v-4.24c0-2.38-2-4.42-4.38-4.42zm0 3h17.24c.8 0 1.38.62 1.38 1.42v4.24c0 .81-.57 1.34-1.38 1.34h-17.24c-.8 0-1.38-.53-1.38-1.34v-4.24c0-.8.57-1.42 1.38-1.42zm-39.96 11.02h17.16c.81 0 1.42.6 1.42 1.4v4.24c0 .81-.61 1.41-1.42 1.41H82.92c-.8 0-1.42-.6-1.42-1.4v-4.25c0-.8.61-1.4 1.42-1.4zm57.04 9.98h17.09c.8 0 1.45.57 1.45 1.38v4.17c0 .8-.65 1.45-1.45 1.45h-17.1c-.8 0-1.45-.65-1.45-1.45v-4.17c0-.8.65-1.38 1.46-1.38z" fill="#fff" color="#000" transform="matrix(4 0 0 4 -162 -450.91)"/><g fill="#8f0000"><path d="M91 954.34v8.45l-8 1.45v60.07H69.03l-28.53-47.1-.5.05v37.2l8 1.44v8.41H19v-8.4l7.45-1.45v-50.22L19 962.79v-8.46h21.48l28.37 47.1.15-.04v-37.15l-7-1.45v-8.45h29zM95 997.83q0-11.63 6.49-19.03 6.53-7.45 18.02-7.45 11.53 0 18.02 7.4 6.54 7.4 6.54 19.08v1q0 11.74-6.54 19.14-6.49 7.35-17.93 7.35-11.58 0-18.11-7.35-6.5-7.4-6.5-19.13v-1.01zm14.03 1q0 7.12 2.5 11.45 2.5 4.28 8.08 4.28 5.43 0 7.93-4.33 2.54-4.33 2.54-11.4v-1q0-6.92-2.54-11.3-2.55-4.37-8.03-4.37t-7.98 4.37-2.5 11.3v1zM184.48 1017.96a17.15 17.15 0 0 1-5.82 5.48 15.17 15.17 0 0 1-7.59 1.88c-6.4 0-11.4-2.35-14.95-7.03-3.52-4.67-5.13-10.86-5.13-18.55v-1c0-8.21 1.62-14.83 5.18-19.86 3.56-5.03 8.56-7.54 15-7.54 2.6 0 4.93.57 7.01 1.73a17.94 17.94 0 0 1 5.81 4.8v-18.64l-8-1.45v-8.46h22v65.13l6 1.44v8.43h-18.45l-1.06-6.36zm-19.49-18.22c0 4.55.63 8.14 2.14 10.77 1.54 2.6 4.04 3.9 7.5 3.9 2.05 0 3.83-.43 5.33-1.26 1.5-.83 3.07-2.03 4.03-3.6v-22.06a11.27 11.27 0 0 0-4.03-3.85 9.62 9.62 0 0 0-5.24-1.4c-3.43 0-5.92 1.53-7.5 4.57s-2.23 7.02-2.23 11.92v1.01zM233.7 1025.28c-7.5 0-13.5-2.4-17.98-7.21-4.48-4.81-6.73-10.91-6.73-18.32v-1.92c0-7.72 2.12-14.08 6.35-19.08 4.26-5 9.96-7.46 17.1-7.43 7.03 0 12.47 2.1 16.35 6.33a23.46 23.46 0 0 1 6.2 17.15v7.52h-31.43l-.1.41c.26 3.43 1.4 6.25 3.41 8.46 2.05 2.21 4.83 3.32 8.32 3.32 3.1 0 5.69-.3 7.74-.91 2.05-.64 4.29-1.64 6.73-2.98l3.8 8.65a27.59 27.59 0 0 1-8.37 4.28 35.28 35.28 0 0 1-11.4 1.73zm-1.25-43.16c-2.6 0-4.65.99-6.15 2.98s-2.44 4.6-2.8 7.83l.15.4H241v-1.41c0-2.98-.84-5.35-2.25-7.11-1.37-1.8-3.47-2.7-6.3-2.7zM291.99 1000.32h-27v-11h27zM331.88 954.34c7.95 0 14.18 1.82 18.7 5.47 4.52 3.63 6.4 8.64 6.4 15.05 0 3.52-.57 6.58-2.46 9.18-1.89 2.6-4.66 4.7-8.31 6.3 4.13 1.21 7.1 3.25 8.89 6.1a19.02 19.02 0 0 1 2.89 10.52v3.56c0 1.54.15 2.74.76 3.6.6.84 1.62 1.34 3.03 1.5l1.2.24v8.46h-6.73c-4.58 0-7.8-1.24-9.66-3.7s-2.6-5.66-2.6-9.57v-3.99c0-3.4-1.1-6.05-2.93-7.98-1.8-1.95-4.34-2.98-7.64-3.07H322v18.45l7 1.44v8.42h-29v-8.42l8-1.44v-50.22l-8-1.44v-8.46h31.89zm-9.95 30.85h9.71c3.91 0 6.84-.83 8.8-2.5s2.93-4.07 2.93-7.2c0-3.15-.98-5.65-2.93-7.5-1.92-1.9-4.78-2.84-8.56-2.84h-9.9v20.04zM412.99 993.32h-23v20h22.21l.63-8h10.2v18.99H368v-8.42l8-1.44v-50.22l-8-1.44v-8.47h54.95v19h-10.3l-.63-8H390v17h23v11zM462.48 954.36c8.55 0 15.6 2.71 21.14 8.19 5.55 5.45 8.36 12.42 8.36 20.98v11.58c0 8.59-2.81 15.63-8.36 21.08-5.54 5.41-12.59 8.12-21.14 8.12h-31.5v-8.41l7-1.52v-50.22l-7-1.37v-8.43l7.46-.08 24.04.08zm-10.5 10.76v48.4l9.77.02c5.03.02 8.98-1.7 11.83-5.1 2.85-3.39 4.4-7.8 4.4-13.28v-11.68c0-5.42-1.55-9.84-4.4-13.24-2.85-3.4-6.8-5.1-11.83-5.1l-9.77-.02z"/></g></g></svg>

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

@@ -13,6 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+
+/** 
+ * An API for undo / redo history buffer
+ * @namespace RED.history
+*/
 RED.history = (function() {
     var undoHistory = [];
     var redoHistory = [];
@@ -101,6 +106,23 @@ RED.history = (function() {
                         RED.nodes.removeLink(ev.links[i]);
                     }
                 }
+                if (ev.junctions) {
+                    inverseEv.junctions = [];
+                    for (i=0;i<ev.junctions.length;i++) {
+                        inverseEv.junctions.push(ev.junctions[i]);
+                        RED.nodes.removeJunction(ev.junctions[i]);
+                        if (ev.junctions[i].g) {
+                            var group = RED.nodes.group(ev.junctions[i].g);
+                            var index = group.nodes.indexOf(ev.junctions[i]);
+                            if (index !== -1) {
+                                group.nodes.splice(index,1);
+                                RED.group.markDirty(group);
+                            }
+                        }
+
+
+                    }
+                }
                 if (ev.groups) {
                     inverseEv.groups = [];
                     for (i = ev.groups.length - 1;i>=0;i--) {
@@ -267,6 +289,21 @@ RED.history = (function() {
                         }
                     }
                 }
+                if (ev.junctions) {
+                    inverseEv.junctions = [];
+                    for (i=0;i<ev.junctions.length;i++) {
+                        inverseEv.junctions.push(ev.junctions[i]);
+                        RED.nodes.addJunction(ev.junctions[i]);
+                        if (ev.junctions[i].g) {
+                            group = RED.nodes.group(ev.junctions[i].g);
+                            if (group.nodes.indexOf(ev.junctions[i]) === -1) {
+                                group.nodes.push(ev.junctions[i]);
+                            }
+                            RED.group.markDirty(group)
+                        }
+
+                    }
+                }
                 if (ev.links) {
                     inverseEv.links = [];
                     for (i=0;i<ev.links.length;i++) {
@@ -558,11 +595,22 @@ RED.history = (function() {
             } else if (ev.t == "reorder") {
                 inverseEv = {
                     t: 'reorder',
-                    order: RED.nodes.getWorkspaceOrder(),
                     dirty: RED.nodes.dirty()
                 };
-                if (ev.order) {
-                    RED.workspaces.order(ev.order);
+                if (ev.workspaces) {
+                    inverseEv.workspaces = {
+                        from: ev.workspaces.to,
+                        to: ev.workspaces.from
+                    }
+                    RED.workspaces.order(ev.workspaces.from);
+                }
+                if (ev.nodes) {
+                    inverseEv.nodes = {
+                        z: ev.nodes.z,
+                        from: ev.nodes.to,
+                        to: ev.nodes.from
+                    }
+                    RED.nodes.setNodeOrder(ev.nodes.z,ev.nodes.from);
                 }
             } else if (ev.t == "createGroup") {
                 inverseEv = {
@@ -658,6 +706,8 @@ RED.history = (function() {
         push: function(ev) {
             undoHistory.push(ev);
             redoHistory = [];
+            RED.menu.setDisabled("menu-item-edit-undo", false);
+            RED.menu.setDisabled("menu-item-edit-redo", true);
         },
         pop: function() {
             var ev = undoHistory.pop();
@@ -665,13 +715,24 @@ RED.history = (function() {
             if (rev) {
                 redoHistory.push(rev);
             }
+            RED.menu.setDisabled("menu-item-edit-undo", undoHistory.length === 0);
+            RED.menu.setDisabled("menu-item-edit-redo", redoHistory.length === 0);
         },
         peek: function() {
             return undoHistory[undoHistory.length-1];
         },
+        replace: function(ev) {
+            if (undoHistory.length === 0) {
+                RED.history.push(ev);
+            } else {
+                undoHistory[undoHistory.length-1] = ev;
+            }
+        },
         clear: function() {
             undoHistory = [];
             redoHistory = [];
+            RED.menu.setDisabled("menu-item-edit-undo", true);
+            RED.menu.setDisabled("menu-item-edit-redo", true);
         },
         redo: function() {
             var ev = redoHistory.pop();
@@ -681,6 +742,8 @@ RED.history = (function() {
                     undoHistory.push(uev);
                 }
             }
+            RED.menu.setDisabled("menu-item-edit-undo", undoHistory.length === 0);
+            RED.menu.setDisabled("menu-item-edit-redo", redoHistory.length === 0);
         }
     }
 

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

@@ -0,0 +1,156 @@
+RED.hooks = (function() {
+
+    var VALID_HOOKS = [
+
+    ]
+
+    var hooks = { }
+    var labelledHooks = { }
+
+    function add(hookId, callback) {
+        var parts = hookId.split(".");
+        var id = parts[0], label = parts[1];
+
+        // if (VALID_HOOKS.indexOf(id) === -1) {
+        //     throw new Error("Invalid hook '"+id+"'");
+        // }
+        if (label && labelledHooks[label] && labelledHooks[label][id]) {
+            throw new Error("Hook "+hookId+" already registered")
+        }
+        var hookItem = {cb:callback, previousHook: null, nextHook: null }
+
+        var tailItem = hooks[id];
+        if (tailItem === undefined) {
+            hooks[id] = hookItem;
+        } else {
+            while(tailItem.nextHook !== null) {
+                tailItem = tailItem.nextHook
+            }
+            tailItem.nextHook = hookItem;
+            hookItem.previousHook = tailItem;
+        }
+
+        if (label) {
+            labelledHooks[label] = labelledHooks[label]||{};
+            labelledHooks[label][id] = hookItem;
+        }
+    }
+    function remove(hookId) {
+        var parts = hookId.split(".");
+        var id = parts[0], label = parts[1];
+        if ( !label) {
+            throw new Error("Cannot remove hook without label: "+hookId)
+        }
+        if (labelledHooks[label]) {
+            if (id === "*") {
+                // Remove all hooks for this label
+                var hookList = Object.keys(labelledHooks[label]);
+                for (var i=0;i<hookList.length;i++) {
+                    removeHook(hookList[i],labelledHooks[label][hookList[i]])
+                }
+                delete labelledHooks[label];
+            } else if (labelledHooks[label][id]) {
+                removeHook(id,labelledHooks[label][id])
+                delete labelledHooks[label][id];
+                if (Object.keys(labelledHooks[label]).length === 0){
+                    delete labelledHooks[label];
+                }
+            }
+        }
+    }
+
+    function removeHook(id,hookItem) {
+        var previousHook = hookItem.previousHook;
+        var nextHook = hookItem.nextHook;
+
+        if (previousHook) {
+            previousHook.nextHook = nextHook;
+        } else {
+            hooks[id] = nextHook;
+        }
+        if (nextHook) {
+            nextHook.previousHook = previousHook;
+        }
+        hookItem.removed = true;
+        if (!previousHook && !nextHook) {
+            delete hooks[id];
+        }
+    }
+
+    function trigger(hookId, payload, done) {
+        var hookItem = hooks[hookId];
+        if (!hookItem) {
+            if (done) {
+                done();
+            }
+            return;
+        }
+        function callNextHook(err) {
+            if (!hookItem || err) {
+                if (done) { done(err) }
+                return err;
+            }
+            if (hookItem.removed) {
+                hookItem = hookItem.nextHook;
+                return callNextHook();
+            }
+            var callback = hookItem.cb;
+            if (callback.length === 1) {
+                try {
+                    let result = callback(payload);
+                    if (result === false) {
+                        // Halting the flow
+                        if (done) { done(false) }
+                        return result;
+                    }
+                    hookItem = hookItem.nextHook;
+                    return callNextHook();
+                } catch(e) {
+                    console.warn(e);
+                    if (done) { done(e);}
+                    return e;
+                }
+            } else {
+                // There is a done callback
+                try {
+                    callback(payload,function(result) {
+                        if (result === undefined) {
+                            hookItem = hookItem.nextHook;
+                            callNextHook();
+                        } else {
+                            if (done) { done(result)}
+                        }
+                    })
+                } catch(e) {
+                    console.warn(e);
+                    if (done) { done(e) }
+                    return e;
+                }
+            }
+        }
+
+        return callNextHook();
+    }
+
+    function clear() {
+        hooks = {}
+        labelledHooks = {}
+    }
+
+    function has(hookId) {
+        var parts = hookId.split(".");
+        var id = parts[0], label = parts[1];
+        if (label) {
+            return !!(labelledHooks[label] && labelledHooks[label][id])
+        }
+        return !!hooks[id]
+    }
+
+    return {
+        has: has,
+        clear: clear,
+        add: add,
+        remove: remove,
+        trigger: trigger
+    }
+})();

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

@@ -18,53 +18,69 @@ RED.i18n = (function() {
 
     var apiRootUrl;
 
+    function detectLanguage() {
+        return navigator.language
+    }
+
     return {
         init: function(options, done) {
             apiRootUrl = options.apiRootUrl||"";
-            var preferredLanguage = localStorage.getItem("editor-language");
+            var preferredLanguage = localStorage.getItem("editor-language") || detectLanguage();
             var opts = {
-                resGetPath: apiRootUrl+'locales/__ns__?lng=__lng__',
-                dynamicLoad: false,
-                load:'current',
-                ns: {
-                    namespaces: ["editor","node-red","jsonata","infotips"],
-                    defaultNs: "editor"
+                compatibilityJSON: 'v3',
+                backend: {
+                    loadPath: apiRootUrl+'locales/__ns__?lng=__lng__',
                 },
+                lng: 'en-US',
+                // debug: true,
+                preload:['en-US'],
+                ns: ["editor","node-red","jsonata","infotips"],
+                defaultNS: "editor",
                 fallbackLng: ['en-US'],
-                useCookie: false,
-                returnObjectTrees: true
+                returnObjects: true,
+                keySeparator: ".",
+                nsSeparator: ":",
+                interpolation: {
+                    unescapeSuffix: 'HTML',
+                    escapeValue: false,
+                    prefix: '__',
+                    suffix: '__'
+                }
             };
             if (preferredLanguage) {
                 opts.lng = preferredLanguage;
             }
-            i18n.init(opts,function() {
+
+            i18next.use(i18nextHttpBackend).init(opts,function() {
                 done();
             });
+            jqueryI18next.init(i18next, $, { handleName: 'i18n' });
+
+
             RED["_"] = function() {
-                var v = i18n.t.apply(null,arguments);
+                var v = i18next.t.apply(i18next,arguments);
                 if (typeof v === 'string') {
                     return v;
                 } else {
                     return arguments[0];
                 }
             }
-
         },
         lang: function() {
             // Gets the active message catalog language. This is based on what
             // locale the editor is using and what languages are available.
             //
-            var preferredLangs = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
+            var preferredLangs = [localStorage.getItem("editor-language")|| detectLanguage()].concat(i18next.languages);
             var knownLangs = RED.settings.theme("languages")||["en-US"];
             for (var i=0;i<preferredLangs.length;i++) {
                 if (knownLangs.indexOf(preferredLangs[i]) > -1) {
                     return preferredLangs[i]
                 }
             }
-            return 'end-US'
+            return 'en-US'
         },
         loadNodeCatalog: function(namespace,done) {
-            var languageList = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
+            var languageList = [localStorage.getItem("editor-language")|| detectLanguage()].concat(i18next.languages);
             var toLoad = languageList.length;
             languageList.forEach(function(lang) {
                 $.ajax({
@@ -74,7 +90,7 @@ RED.i18n = (function() {
                     cache: false,
                     url: apiRootUrl+'nodes/'+namespace+'/messages?lng='+lang,
                     success: function(data) {
-                        i18n.addResourceBundle(lang,namespace,data);
+                        i18next.addResourceBundle(lang,namespace,data);
                         toLoad--;
                         if (toLoad === 0) {
                             done();
@@ -86,7 +102,7 @@ RED.i18n = (function() {
         },
 
         loadNodeCatalogs: function(done) {
-            var languageList = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
+            var languageList = [localStorage.getItem("editor-language")|| detectLanguage()].concat(i18next.languages);
             var toLoad = languageList.length;
 
             languageList.forEach(function(lang) {
@@ -99,7 +115,7 @@ RED.i18n = (function() {
                     success: function(data) {
                         var namespaces = Object.keys(data);
                         namespaces.forEach(function(ns) {
-                            i18n.addResourceBundle(lang,ns,data[ns]);
+                            i18next.addResourceBundle(lang,ns,data[ns]);
                         });
                         toLoad--;
                         if (toLoad === 0) {
@@ -111,7 +127,7 @@ RED.i18n = (function() {
         },
 
         loadPluginCatalogs: function(done) {
-            var languageList = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
+            var languageList = [localStorage.getItem("editor-language")|| detectLanguage()].concat(i18next.languages);
             var toLoad = languageList.length;
 
             languageList.forEach(function(lang) {
@@ -124,7 +140,7 @@ RED.i18n = (function() {
                     success: function(data) {
                         var namespaces = Object.keys(data);
                         namespaces.forEach(function(ns) {
-                            i18n.addResourceBundle(lang,ns,data[ns]);
+                            i18next.addResourceBundle(lang,ns,data[ns]);
                         });
                         toLoad--;
                         if (toLoad === 0) {
@@ -133,6 +149,7 @@ RED.i18n = (function() {
                     }
                 });
             })
-        }
+        },
+        detectLanguage: detectLanguage
     }
 })();

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

@@ -25,7 +25,9 @@
         "ctrl-alt-o": "core:open-project",
         "ctrl-g v": "core:show-version-control-tab",
         "ctrl-shift-l": "core:show-event-log",
-        "ctrl-shift-p":"core:show-action-list"
+        "ctrl-shift-p":"core:show-action-list",
+        "alt-w": "core:hide-flow",
+        "alt-shift-w": "core:show-last-hidden-flow"
     },
     "red-ui-sidebar-node-config": {
         "backspace": "core:delete-config-selection",
@@ -36,7 +38,9 @@
     },
     "red-ui-workspace": {
         "backspace": "core:delete-selection",
+        "ctrl-backspace": "core:delete-selection-and-reconnect",
         "delete": "core:delete-selection",
+        "ctrl-delete": "core:delete-selection-and-reconnect",
         "enter": "core:edit-selected-node",
         "ctrl-enter": "core:go-to-selection",
         "ctrl-c": "core:copy-selection-to-internal-clipboard",
@@ -77,6 +81,19 @@
         "right": "core:go-to-nearest-node-on-right",
         "left": "core:go-to-nearest-node-on-left",
         "up": "core:go-to-nearest-node-above",
-        "down": "core:go-to-nearest-node-below"
+        "down": "core:go-to-nearest-node-below",
+        "alt-a g": "core:align-selection-to-grid",
+        "alt-a l": "core:align-selection-to-left",
+        "alt-a r": "core:align-selection-to-right",
+        "alt-a t": "core:align-selection-to-top",
+        "alt-a b": "core:align-selection-to-bottom",
+        "alt-a m": "core:align-selection-to-middle",
+        "alt-a c": "core:align-selection-to-center",
+        "alt-a h": "core:distribute-selection-horizontally",
+        "alt-a v": "core:distribute-selection-vertically",
+        "shift-f": "core:search-previous",
+        "f": "core:search-next",
+        "alt-l l": "core:split-wire-with-link-nodes"
+
      }
 }

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

@@ -36,7 +36,7 @@ var RED = (function() {
     }
     function loadPlugins(done) {
         loader.reportProgress(RED._("event.loadPlugins",{count:""}), 17)
-        var lang = localStorage.getItem("editor-language")||i18n.detectLanguage();
+        var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage();
 
         $.ajax({
             headers: {
@@ -176,7 +176,7 @@ var RED = (function() {
 
     function loadNodes() {
         loader.reportProgress(RED._("event.loadNodes",{count:""}), 30)
-        var lang = localStorage.getItem("editor-language")||i18n.detectLanguage();
+        var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage();
 
         $.ajax({
             headers: {
@@ -201,6 +201,7 @@ var RED = (function() {
                             RED.projects.refresh(function(activeProject) {
                                 loadFlows(function() {
                                     RED.sidebar.info.refresh()
+                                    var showProjectWelcome = false;
                                     if (!activeProject) {
                                         // Projects enabled but no active project
                                         RED.menu.setDisabled('menu-item-projects-open',true);
@@ -208,10 +209,10 @@ var RED = (function() {
                                         if (activeProject === false) {
                                             // User previously decline the migration to projects.
                                         } else { // null/undefined
-                                            RED.projects.showStartup();
+                                            showProjectWelcome = true;
                                         }
                                     }
-                                    completeLoad();
+                                    completeLoad(showProjectWelcome);
                                 });
                             });
                         } else {
@@ -251,6 +252,9 @@ var RED = (function() {
                         if (/^#flow\/.+$/.test(currentHash)) {
                             RED.workspaces.show(currentHash.substring(6),true);
                         }
+                        if (RED.workspaces.active() === 0 && RED.workspaces.count() > 0) {
+                            RED.workspaces.show(RED.nodes.getWorkspaceOrder()[0])
+                        }
                     } catch(err) {
                         console.warn(err);
                         RED.notify(
@@ -267,7 +271,7 @@ var RED = (function() {
         });
     }
 
-    function completeLoad() {
+    function completeLoad(showProjectWelcome) {
         var persistentNotifications = {};
         RED.comms.subscribe("notification/#",function(topic,msg) {
             var parts = topic.split("/");
@@ -471,22 +475,33 @@ var RED = (function() {
             var typeList;
             var info;
             if (topic == "notification/node/added") {
-                var addedTypes = [];
-                msg.forEach(function(m) {
-                    var id = m.id;
-                    RED.nodes.addNodeSet(m);
-                    addedTypes = addedTypes.concat(m.types);
-                    RED.i18n.loadNodeCatalog(id, function() {
-                        $.get('nodes/'+id, function(data) {
-                            appendNodeConfig(data);
+                RED.settings.refreshSettings(function(err, data) {
+                    var addedTypes = [];
+                    msg.forEach(function(m) {
+                        var id = m.id;
+                        RED.nodes.addNodeSet(m);
+                        addedTypes = addedTypes.concat(m.types);
+                        RED.i18n.loadNodeCatalog(id, function() {
+                            var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage();
+                            $.ajax({
+                                headers: {
+                                    "Accept":"text/html",
+                                    "Accept-Language": lang
+                                },
+                                cache: false,
+                                url: 'nodes/'+id,
+                                success: function(data) {
+                                    appendNodeConfig(data);
+                                }
+                            });
                         });
                     });
-                });
-                if (addedTypes.length) {
-                    typeList = "<ul><li>"+addedTypes.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
-                    RED.notify(RED._("palette.event.nodeAdded", {count:addedTypes.length})+typeList,"success");
-                }
-                loadIconList();
+                    if (addedTypes.length) {
+                        typeList = "<ul><li>"+addedTypes.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
+                        RED.notify(RED._("palette.event.nodeAdded", {count:addedTypes.length})+typeList,"success");
+                    }
+                    loadIconList();
+                })
             } else if (topic == "notification/node/removed") {
                 for (i=0;i<msg.length;i++) {
                     m = msg[i];
@@ -499,18 +514,29 @@ var RED = (function() {
                 loadIconList();
             } else if (topic == "notification/node/enabled") {
                 if (msg.types) {
-                    info = RED.nodes.getNodeSet(msg.id);
-                    if (info.added) {
-                        RED.nodes.enableNodeSet(msg.id);
-                        typeList = "<ul><li>"+msg.types.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
-                        RED.notify(RED._("palette.event.nodeEnabled", {count:msg.types.length})+typeList,"success");
-                    } else {
-                        $.get('nodes/'+msg.id, function(data) {
-                            appendNodeConfig(data);
+                    RED.settings.refreshSettings(function(err, data) {
+                        info = RED.nodes.getNodeSet(msg.id);
+                        if (info.added) {
+                            RED.nodes.enableNodeSet(msg.id);
                             typeList = "<ul><li>"+msg.types.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
-                            RED.notify(RED._("palette.event.nodeAdded", {count:msg.types.length})+typeList,"success");
-                        });
-                    }
+                            RED.notify(RED._("palette.event.nodeEnabled", {count:msg.types.length})+typeList,"success");
+                        } else {
+                            var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage();
+                            $.ajax({
+                                headers: {
+                                    "Accept":"text/html",
+                                    "Accept-Language": lang
+                                },
+                                cache: false,
+                                url: 'nodes/'+msg.id,
+                                success: function(data) {
+                                    appendNodeConfig(data);
+                                    typeList = "<ul><li>"+msg.types.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
+                                    RED.notify(RED._("palette.event.nodeAdded", {count:msg.types.length})+typeList,"success");
+                                }
+                            });
+                        }
+                    });
                 }
             } else if (topic == "notification/node/disabled") {
                 if (msg.types) {
@@ -530,22 +556,28 @@ var RED = (function() {
 
         $(".red-ui-header-toolbar").show();
 
-
-        RED.sidebar.show(":first");
+        RED.sidebar.show(":first", true);
 
         setTimeout(function() {
             loader.end();
+            checkFirstRun(function() {
+                if (showProjectWelcome) {
+                    RED.projects.showStartup();
+                }
+            });
         },100);
     }
 
-    function showAbout() {
-        $.get('red/about', function(data) {
-            var aboutHeader = '<div style="text-align:center;">'+
-            '<img width="50px" src="red/images/node-red-icon.svg" />'+
-            '</div>';
-
-            RED.sidebar.help.set(aboutHeader+RED.utils.renderMarkdown(data));
-        });
+    function checkFirstRun(done) {
+        if (RED.settings.theme("tours") === false) {
+            done();
+            return;
+        }
+        if (!RED.settings.get("editor.view.view-show-welcome-tours", true)) {
+            done();
+            return;
+        }
+        RED.actions.invoke("core:show-welcome-tour", RED.settings.get("editor.tours.welcome"), done);
     }
 
     function buildMainMenu() {
@@ -557,6 +589,25 @@ var RED = (function() {
                 {id:"menu-item-projects-settings",label:RED._("menu.label.projects-settings"),disabled:false,onselect:"core:show-project-settings"}
             ]});
         }
+        menuOptions.push({id:"menu-item-edit-menu", label:RED._("menu.label.edit"), options: [
+            {id: "menu-item-edit-undo", label:RED._("keyboard.undoChange"), disabled: true, onselect: "core:undo"},
+            {id: "menu-item-edit-redo", label:RED._("keyboard.redoChange"), disabled: true, onselect: "core:redo"},
+            null,
+            {id: "menu-item-edit-cut", label:RED._("keyboard.cutNode"), onselect: "core:cut-selection-to-internal-clipboard"},
+            {id: "menu-item-edit-copy", label:RED._("keyboard.copyNode"), onselect: "core:copy-selection-to-internal-clipboard"},
+            {id: "menu-item-edit-paste", label:RED._("keyboard.pasteNode"), disabled: true, onselect: "core:paste-from-internal-clipboard"},
+            null,
+            {id: "menu-item-edit-copy-group-style", label:RED._("keyboard.copyGroupStyle"), onselect: "core:copy-group-style"},
+            {id: "menu-item-edit-paste-group-style", label:RED._("keyboard.pasteGroupStyle"), disabled: true, onselect: "core:paste-group-style"},
+            null,
+            {id: "menu-item-edit-select-all", label:RED._("keyboard.selectAll"), onselect: "core:select-all-nodes"},
+            {id: "menu-item-edit-select-connected", label:RED._("keyboard.selectAllConnected"), onselect: "core:select-connected-nodes"},
+            {id: "menu-item-edit-select-none", label:RED._("keyboard.selectNone"), onselect: "core:select-none"},
+            null,
+            {id: "menu-item-edit-split-wire-with-links", label:RED._("keyboard.splitWireWithLinks"), onselect: "core:split-wire-with-link-nodes"},
+
+        ]});
+
         menuOptions.push({id:"menu-item-view-menu",label:RED._("menu.label.view.view"),options:[
             {id:"menu-item-palette",label:RED._("menu.label.palette.show"),toggle:true,onselect:"core:toggle-palette", selected: true},
             {id:"menu-item-sidebar",label:RED._("menu.label.sidebar.show"),toggle:true,onselect:"core:toggle-sidebar", selected: true},
@@ -564,6 +615,25 @@ var RED = (function() {
             {id:"menu-item-action-list",label:RED._("keyboard.actionList"),onselect:"core:show-action-list"},
             null
         ]});
+
+        menuOptions.push({id:"menu-item-arrange-menu", label:RED._("menu.label.arrange"), options: [
+            {id: "menu-item-view-tools-move-to-back", label:RED._("menu.label.moveToBack"), disabled: true, onselect: "core:move-selection-to-back"},
+            {id: "menu-item-view-tools-move-to-front", label:RED._("menu.label.moveToFront"), disabled: true, onselect: "core:move-selection-to-front"},
+            {id: "menu-item-view-tools-move-backwards", label:RED._("menu.label.moveBackwards"), disabled: true, onselect: "core:move-selection-backwards"},
+            {id: "menu-item-view-tools-move-forwards", label:RED._("menu.label.moveForwards"), disabled: true, onselect: "core:move-selection-forwards"},
+            null,
+            {id: "menu-item-view-tools-align-left", label:RED._("menu.label.alignLeft"), disabled: true, onselect: "core:align-selection-to-left"},
+            {id: "menu-item-view-tools-align-center", label:RED._("menu.label.alignCenter"), disabled: true, onselect: "core:align-selection-to-center"},
+            {id: "menu-item-view-tools-align-right", label:RED._("menu.label.alignRight"), disabled: true, onselect: "core:align-selection-to-right"},
+            null,
+            {id: "menu-item-view-tools-align-top", label:RED._("menu.label.alignTop"), disabled: true, onselect: "core:align-selection-to-top"},
+            {id: "menu-item-view-tools-align-middle", label:RED._("menu.label.alignMiddle"), disabled: true, onselect: "core:align-selection-to-middle"},
+            {id: "menu-item-view-tools-align-bottom", label:RED._("menu.label.alignBottom"), disabled: true, onselect: "core:align-selection-to-bottom"},
+            null,
+            {id: "menu-item-view-tools-distribute-horizontally", label:RED._("menu.label.distributeHorizontally"), disabled: true, onselect: "core:distribute-selection-horizontally"},
+            {id: "menu-item-view-tools-distribute-veritcally", label:RED._("menu.label.distributeVertically"), disabled: true, onselect: "core:distribute-selection-vertically"}
+        ]});
+
         menuOptions.push(null);
         if (RED.settings.theme("menu.menu-item-import-library", true)) {
             menuOptions.push({id: "menu-item-import", label: RED._("menu.label.import"), onselect: "core:show-import-dialog"});
@@ -624,7 +694,6 @@ var RED = (function() {
         RED.user.init();
         RED.notifications.init();
         RED.library.init();
-        RED.keyboard.init();
         RED.palette.init();
         RED.eventLog.init();
 
@@ -653,16 +722,13 @@ var RED = (function() {
 
         RED.deploy.init(RED.settings.theme("deployButton",null));
 
-        buildMainMenu();
+        RED.keyboard.init(buildMainMenu);
 
         RED.nodes.init();
         RED.comms.connect();
 
         $("#red-ui-main-container").show();
 
-
-        RED.actions.add("core:show-about", showAbout);
-
         loadPluginList();
     }
 
@@ -711,7 +777,7 @@ var RED = (function() {
             throw new Error("RED already initialised");
         }
         initialised = true;
-        ace.require("ace/ext/language_tools");
+        if(window.ace) { window.ace.require("ace/ext/language_tools"); }
         options = options || {};
         options.apiRootUrl = options.apiRootUrl || "";
         if (options.apiRootUrl && !/\/$/.test(options.apiRootUrl)) {

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

@@ -19,7 +19,6 @@ RED.settings = (function () {
 
     var loadedSettings = {};
     var userSettings = {};
-    var settingsDirty = false;
     var pendingSave;
 
     var hasLocalStorage = function () {
@@ -126,7 +125,7 @@ RED.settings = (function () {
         load(done);
     }
 
-    var load = function(done) {
+    var refreshSettings = function(done) {
         $.ajax({
             headers: {
                 "Accept": "application/json"
@@ -136,6 +135,23 @@ RED.settings = (function () {
             url: 'settings',
             success: function (data) {
                 setProperties(data);
+                done(null, data);
+            },
+            error: function(jqXHR,textStatus,errorThrown) {
+                if (jqXHR.status === 401) {
+                    if (/[?&]access_token=(.*?)(?:$|&)/.test(window.location.search)) {
+                        window.location.search = "";
+                    }
+                    RED.user.login(function() { refreshSettings(done); });
+                } else {
+                    console.log("Unexpected error loading settings:",jqXHR.status,textStatus);
+                }
+            }
+        });
+    }
+    var load = function(done) {
+        refreshSettings(function(err, data) {
+            if (!err) {
                 if (!RED.settings.user || RED.settings.user.anonymous) {
                     RED.settings.remove("auth-tokens");
                 }
@@ -143,22 +159,13 @@ RED.settings = (function () {
                 console.groupCollapsed("Versions");
                 console.log("jQuery",$().jquery)
                 console.log("jQuery UI",$.ui.version);
-                console.log("ACE",ace.version);
+                if(window.ace) { console.log("ACE",ace.version); }
+                if(window.monaco) { console.log("MONACO",monaco.version || "unknown"); }
                 console.log("D3",d3.version);
                 console.groupEnd();
                 loadUserSettings(done);
-            },
-            error: function(jqXHR,textStatus,errorThrown) {
-                if (jqXHR.status === 401) {
-                    if (/[?&]access_token=(.*?)(?:$|&)/.test(window.location.search)) {
-                        window.location.search = "";
-                    }
-                    RED.user.login(function() { load(done); });
-                } else {
-                    console.log("Unexpected error loading settings:",jqXHR.status,textStatus);
-                }
             }
-        });
+        })
     };
 
     function loadUserSettings(done) {
@@ -219,14 +226,28 @@ RED.settings = (function () {
             return defaultValue;
         }
     }
+    function getLocal(key) {
+        return localStorage.getItem(key)
+    }
+    function setLocal(key, value) {
+        localStorage.setItem(key, value);
+    }
+    function removeLocal(key) {
+        localStorage.removeItem(key)
+    }
+
 
     return {
         init: init,
         load: load,
         loadUserSettings: loadUserSettings,
+        refreshSettings: refreshSettings,
         set: set,
         get: get,
         remove: remove,
-        theme: theme
+        theme: theme,
+        setLocal: setLocal,
+        getLocal: getLocal,
+        removeLocal: removeLocal
     }
 })();

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

@@ -160,18 +160,19 @@ RED.actionList = (function() {
                 createDialog();
             }
             dialog.slideDown(300);
-            searchInput.searchBox('value',v)
+            searchInput.searchBox('value',v);
             searchResults.editableList('empty');
             results = [];
             var actions = RED.actions.list();
             actions.sort(function(A,B) {
-                return A.id.localeCompare(B.id);
+                var Akey = A.label;
+                var Bkey = B.label;
+                return Akey.localeCompare(Bkey);
             });
             actions.forEach(function(action) {
-                action.label = action.id.replace(/:/,": ").replace(/-/g," ").replace(/(^| )./g,function() { return arguments[0].toUpperCase()});
                 action._label = action.label.toLowerCase();
-                searchResults.editableList('addItem',action)
-            })
+                searchResults.editableList('addItem',action);
+            });
             RED.events.emit("actionList:open");
             visible = true;
         }

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

@@ -1,25 +1,39 @@
 RED.actions = (function() {
     var actions = {
 
-    }
+    };
 
-    function addAction(name,handler) {
-        actions[name] = handler;
+    function addAction(name,handler,options) {
+        if (typeof handler !== 'function') {
+            throw new Error("Action handler not a function");
+        }
+        if (actions[name]) {
+            throw new Error("Cannot override existing action");
+        }
+        actions[name] = {
+            handler: handler,
+            options: options,
+        };
     }
     function removeAction(name) {
         delete actions[name];
     }
     function getAction(name) {
-        return actions[name];
+        return actions[name].handler;
     }
-    function invokeAction(name,args) {
+    function invokeAction() {
+        var args = Array.prototype.slice.call(arguments);
+        var name = args.shift();
         if (actions.hasOwnProperty(name)) {
-            actions[name](args);
+            var handler = actions[name].handler;
+            handler.apply(null, args);
         }
     }
     function listActions() {
         var result = [];
+        var missing = [];
         Object.keys(actions).forEach(function(action) {
+            var def = actions[action];
             var shortcut = RED.keyboard.getShortcut(action);
             var isUser = false;
             if (shortcut) {
@@ -27,13 +41,38 @@ RED.actions = (function() {
             } else {
                 isUser = !!RED.keyboard.getUserShortcut(action);
             }
+            if (!def.label) {
+                var name = action;
+                var options = def.options;
+                var key = options ? options.label : undefined;
+                if (!key) {
+                    key = "action-list." +name.replace(/^.*:/,"");
+                }
+                var label = RED._(key);
+                if (label === key) {
+                    // no translation. convert `name` to description 
+                    label = name.replace(/(^.+:([a-z]))|(-([a-z]))/g, function() {
+                        if (arguments[5] === 0) {
+                            return arguments[2].toUpperCase();
+                        } else {
+                            return " "+arguments[4].toUpperCase();
+                        }
+                    });
+                    missing.push(key);
+                }
+                def.label = label;
+            }
+            //console.log("; missing:", missing);
+
             result.push({
                 id:action,
                 scope:shortcut?shortcut.scope:undefined,
                 key:shortcut?shortcut.key:undefined,
-                user:isUser
-            })
-        })
+                user:isUser,
+                label: def.label,
+                options: def.options,
+            });
+        });
         return result;
     }
     return {

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

@@ -71,6 +71,7 @@ RED.clipboard = (function() {
                         text: RED._("common.label.cancel"),
                         click: function() {
                             $( this ).dialog( "close" );
+                            RED.view.focus();
                         }
                     },
                     { // red-ui-clipboard-dialog-download
@@ -81,6 +82,7 @@ RED.clipboard = (function() {
                             var data = $("#red-ui-clipboard-dialog-export-text").val();
                             downloadData("flows.json", data);
                             $( this ).dialog( "close" );
+                            RED.view.focus();
                         }
                     },
                     { // red-ui-clipboard-dialog-export
@@ -95,6 +97,7 @@ RED.clipboard = (function() {
                                 $( this ).dialog( "close" );
                                 copyText(flowData);
                                 RED.notify(RED._("clipboard.nodesExported"),{id:"clipboard"});
+                                RED.view.focus();
                             } else {
                                 var flowToExport = $("#red-ui-clipboard-dialog-export-text").val();
                                 var selectedPath = activeLibraries[activeTab].getSelected();
@@ -110,6 +113,7 @@ RED.clipboard = (function() {
                                         contentType: "application/json; charset=utf-8"
                                     }).done(function() {
                                         $(dialog).dialog( "close" );
+                                        RED.view.focus();
                                         RED.notify(RED._("library.exportedToLibrary"),"success");
                                     }).fail(function(xhr,textStatus,err) {
                                         if (xhr.status === 401) {
@@ -171,6 +175,7 @@ RED.clipboard = (function() {
                                 }
                             }
                             $( this ).dialog( "close" );
+                            RED.view.focus();
                         }
                     },
                     { // red-ui-clipboard-dialog-import-conflict
@@ -203,6 +208,7 @@ RED.clipboard = (function() {
                             // console.table(pendingImportConfig.importNodes.map(function(n) { return {id:n.id,type:n.type,result:importMap[n.id]}}))
                             RED.view.importNodes(newNodes, pendingImportConfig.importOptions);
                             $( this ).dialog( "close" );
+                            RED.view.focus();
                         }
                     }
                 ],
@@ -498,6 +504,13 @@ RED.clipboard = (function() {
         $("#red-ui-clipboard-dialog-import-text").on("keyup", validateImport);
         $("#red-ui-clipboard-dialog-import-text").on('paste',function() { setTimeout(validateImport,10)});
 
+        if (RED.workspaces.active() === 0) {
+            $("#red-ui-clipboard-dialog-import-opt-current").addClass('disabled').removeClass("selected");
+            $("#red-ui-clipboard-dialog-import-opt-new").addClass("selected");
+        } else {
+            $("#red-ui-clipboard-dialog-import-opt-current").removeClass('disabled').addClass("selected");
+            $("#red-ui-clipboard-dialog-import-opt-new").removeClass("selected");
+        }
         $("#red-ui-clipboard-dialog-import-opt > a").on("click", function(evt) {
             evt.preventDefault();
             if ($(this).hasClass('disabled') || $(this).hasClass('selected')) {
@@ -611,9 +624,6 @@ RED.clipboard = (function() {
             activeLibraries[tabId] = browser;
         })
 
-
-
-
         $("#red-ui-clipboard-dialog-tab-library-name").on("keyup", validateExportFilename);
         $("#red-ui-clipboard-dialog-tab-library-name").on('paste',function() { setTimeout(validateExportFilename,10)});
         $("#red-ui-clipboard-dialog-export").button("enable");
@@ -636,7 +646,6 @@ RED.clipboard = (function() {
             label: RED._("editor.types.json")
         });
 
-
         var previewList = $("#red-ui-clipboard-dialog-export-tab-clipboard-preview-list").css({position:"absolute",top:0,right:0,bottom:0,left:0}).treeList({
             data: []
         })
@@ -701,6 +710,13 @@ RED.clipboard = (function() {
                 var activeWorkspace = RED.workspaces.active();
                 nodes = RED.nodes.groups(activeWorkspace);
                 nodes = nodes.concat(RED.nodes.filterNodes({z:activeWorkspace}));
+                RED.nodes.eachConfig(function(n) {
+                    if (n.z === RED.workspaces.active() && n._def.hasUsers === false) {
+                        // Grab any config nodes scoped to this flow that don't
+                        // require any flow-nodes to use them
+                        nodes.push(n);
+                    }
+                });
                 var parentNode = RED.nodes.workspace(activeWorkspace)||RED.nodes.subflow(activeWorkspace);
                 nodes.unshift(parentNode);
                 nodes = RED.nodes.createExportableNodeSet(nodes);
@@ -731,16 +747,22 @@ RED.clipboard = (function() {
         $("#red-ui-clipboard-dialog-export").hide();
         $("#red-ui-clipboard-dialog-import-conflict").hide();
 
-        var selection = RED.workspaces.selection();
-        if (selection.length > 0) {
-            $("#red-ui-clipboard-dialog-export-rng-selected").trigger("click");
+        if (RED.workspaces.active() === 0) {
+            $("#red-ui-clipboard-dialog-export-rng-selected").addClass('disabled').removeClass('selected');
+            $("#red-ui-clipboard-dialog-export-rng-flow").addClass('disabled').removeClass('selected');
+            $("#red-ui-clipboard-dialog-export-rng-full").trigger("click");
         } else {
-            selection = RED.view.selection();
-            if (selection.nodes) {
+            var selection = RED.workspaces.selection();
+            if (selection.length > 0) {
                 $("#red-ui-clipboard-dialog-export-rng-selected").trigger("click");
             } else {
-                $("#red-ui-clipboard-dialog-export-rng-selected").addClass('disabled').removeClass('selected');
-                $("#red-ui-clipboard-dialog-export-rng-flow").trigger("click");
+                selection = RED.view.selection();
+                if (selection.nodes) {
+                    $("#red-ui-clipboard-dialog-export-rng-selected").trigger("click");
+                } else {
+                    $("#red-ui-clipboard-dialog-export-rng-selected").addClass('disabled').removeClass('selected');
+                    $("#red-ui-clipboard-dialog-export-rng-flow").trigger("click");
+                }
             }
         }
         if (format === "red-ui-clipboard-dialog-export-fmt-full") {
@@ -924,7 +946,8 @@ RED.clipboard = (function() {
         if (truncated) {
             msg += "_truncated";
         }
-        $("#red-ui-clipboard-hidden").val(value).focus().select();
+        var clipboardHidden = $('<textarea type="text" id="red-ui-clipboard-hidden" tabIndex="-1">').appendTo(document.body);
+        clipboardHidden.val(value).focus().select();
         var result =  document.execCommand("copy");
         if (result && element) {
             var popover = RED.popover.create({
@@ -938,14 +961,13 @@ RED.clipboard = (function() {
             },1000);
             popover.open();
         }
-        $("#red-ui-clipboard-hidden").val("");
+        clipboardHidden.remove();
         if (currentFocus) {
             $(currentFocus).focus();
         }
         return result;
     }
 
-
     function importNodes(nodesStr,addFlow) {
         var newNodes = nodesStr;
         if (typeof nodesStr === 'string') {
@@ -965,6 +987,7 @@ RED.clipboard = (function() {
         try {
             RED.view.importNodes(newNodes, importOptions);
         } catch(error) {
+            console.log(error.importConfig)
             // Thrown for import_conflict
             confirmImport(error.importConfig, newNodes, importOptions);
         }
@@ -1220,8 +1243,6 @@ RED.clipboard = (function() {
         init: function() {
             setupDialogs();
 
-            $('<textarea type="text" id="red-ui-clipboard-hidden" tabIndex="-1">').appendTo("#red-ui-editor");
-
             RED.actions.add("core:show-export-dialog",showExportNodes);
             RED.actions.add("core:show-import-dialog",showImportNodes);
 

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

@@ -0,0 +1,115 @@
+(function($) {
+
+/**
+ * Attach to an <input type="text"> to provide auto-complete
+ *
+ * $("#node-red-text").autoComplete({
+ *     search: function(value) { return ['a','b','c'] }
+ * })
+ *
+ * options:
+ *
+ *  search : function(value, [done])
+ *           A function that is passed the current contents of the input whenever
+ *           it changes.
+ *           The function must either return auto-complete options, or pass them
+ *           to the optional 'done' parameter.
+ *           If the function signature includes 'done', it must be used
+ *
+ * The auto-complete options should be an array of objects in the form:
+ *  {
+ *      value: String : the value to insert if selected
+ *      label: String|DOM Element : the label to display in the dropdown.
+ *  }
+ *
+ */
+
+    $.widget( "nodered.autoComplete", {
+        _create: function() {
+            var that = this;
+            this.completionMenuShown = false;
+            this.options.search = this.options.search || function() { return [] }
+            this.element.addClass("red-ui-autoComplete")
+            this.element.on("keydown.red-ui-autoComplete", function(evt) {
+                if ((evt.keyCode === 13 || evt.keyCode === 9) && that.completionMenuShown) {
+                    var opts = that.menu.options();
+                    that.element.val(opts[0].value);
+                    that.menu.hide();
+                    evt.preventDefault();
+                }
+            })
+            this.element.on("keyup.red-ui-autoComplete", function(evt) {
+                if (evt.keyCode === 13 || evt.keyCode === 9 || evt.keyCode === 27) {
+                    // ENTER / TAB / ESCAPE
+                    return
+                }
+                if (evt.keyCode === 8 || evt.keyCode === 46) {
+                    // Delete/Backspace
+                    if (!that.completionMenuShown) {
+                        return;
+                    }
+                }
+                that._updateCompletions(this.value);
+            });
+        },
+        _showCompletionMenu: function(completions) {
+            if (this.completionMenuShown) {
+                return;
+            }
+            this.menu = RED.popover.menu({
+                tabSelect: true,
+                width: 300,
+                maxHeight: 200,
+                class: "red-ui-autoComplete-container",
+                options: completions,
+                onselect: (opt) => { this.element.val(opt.value); this.element.focus(); this.element.trigger("change") },
+                onclose: () => { this.completionMenuShown = false; delete this.menu; this.element.focus()}
+            });
+            this.menu.show({
+                target: this.element
+            })
+            this.completionMenuShown = true;
+        },
+        _updateCompletions: function(val) {
+            var that = this;
+            if (val.trim() === "") {
+                if (this.completionMenuShown) {
+                    this.menu.hide();
+                }
+                return;
+            }
+            function displayResults(completions,requestId) {
+                if (requestId && requestId !== that.pendingRequest) {
+                    // This request has been superseded
+                    return
+                }
+                if (!completions || completions.length === 0) {
+                    if (that.completionMenuShown) {
+                        that.menu.hide();
+                    }
+                    return
+                }
+                if (that.completionMenuShown) {
+                    that.menu.options(completions);
+                } else {
+                    that._showCompletionMenu(completions);
+                }
+            }
+            if (this.options.search.length === 2) {
+                var requestId = 1+Math.floor(Math.random()*10000);
+                this.pendingRequest = requestId;
+                this.options.search(val,function(completions) { displayResults(completions,requestId);})
+            } else {
+                displayResults(this.options.search(val))
+            }
+        },
+        _destroy: function() {
+            this.element.removeClass("red-ui-autoComplete")
+            this.element.off("keydown.red-ui-autoComplete")
+            this.element.off("keyup.red-ui-autoComplete")
+            if (this.completionMenuShown) {
+                this.menu.hide();
+            }
+        }
+    });
+})(jQuery);

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

@@ -18,7 +18,7 @@
 /**
  * options:
  *   - addButton : boolean|string - text for add label, default 'add'
- *   - buttons : array - list of custom buttons (objects with fields 'label', 'icon', 'title', 'click')
+ *   - buttons : array - list of custom buttons (objects with fields 'id', 'label', 'icon', 'title', 'click')
  *   - height : number|'auto'
  *   - resize : function - called when list as a whole is resized
  *   - resizeItem : function(item) - called to resize individual item
@@ -94,7 +94,7 @@
             }
 
             buttons.forEach(function(button) {
-                var element = $('<a href="#" class="red-ui-button red-ui-button-small red-ui-editableList-addButton" style="margin-top: 4px; margin-right: 5px;"></a>')
+                var element = $('<button type="button" class="red-ui-button red-ui-button-small red-ui-editableList-addButton" style="margin-top: 4px; margin-right: 5px;"></button>')
                     .appendTo(that.topContainer)
                     .on("click", function(evt) {
                         evt.preventDefault();
@@ -103,6 +103,9 @@
                         }
                     });
 
+                if (button.id) {
+                    element.attr("id", button.id);
+                }
                 if (button.title) {
                     element.attr("title", button.title);
                 }

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

@@ -82,12 +82,19 @@ RED.menu = (function() {
                 linkContent += '<span class="red-ui-menu-label-container"><span class="red-ui-menu-label">'+opt.label+'</span>'+
                                '<span class="red-ui-menu-sublabel">'+opt.sublabel+'</span></span>'
             } else {
-                linkContent += '<span class="red-ui-menu-label">'+opt.label+'</span>'
+                linkContent += '<span class="red-ui-menu-label"><span>'+opt.label+'</span></span>'
             }
 
             linkContent += '</a>';
 
             var link = $(linkContent).appendTo(item);
+            opt.link = link;
+            if (typeof opt.onselect === 'string') {
+                var shortcut = RED.keyboard.getShortcut(opt.onselect);
+                if (shortcut && shortcut.key) {
+                    opt.shortcutSpan = $('<span class="red-ui-popover-key">'+RED.keyboard.formatKey(shortcut.key, true)+'</span>').appendTo(link.find(".red-ui-menu-label"));
+                }
+            }
 
             menuItems[opt.id] = opt;
 
@@ -276,6 +283,22 @@ RED.menu = (function() {
         }
     }
 
+    function refreshShortcuts() {
+        for (var id in menuItems) {
+            if (menuItems.hasOwnProperty(id)) {
+                var opt = menuItems[id];
+                if (typeof opt.onselect === "string" && opt.shortcutSpan) {
+                    opt.shortcutSpan.remove();
+                    delete opt.shortcutSpan;
+                    var shortcut = RED.keyboard.getShortcut(opt.onselect);
+                    if (shortcut && shortcut.key) {
+                        opt.shortcutSpan = $('<span class="red-ui-popover-key">'+RED.keyboard.formatKey(shortcut.key, true)+'</span>').appendTo(opt.link.find(".red-ui-menu-label"));
+                    }
+                }
+            }
+        }
+    }
+
     return {
         init: createMenu,
         setSelected: setSelected,
@@ -284,6 +307,7 @@ RED.menu = (function() {
         setDisabled: setDisabled,
         addItem: addItem,
         removeItem: removeItem,
-        setAction: setAction
+        setAction: setAction,
+        refreshShortcuts: refreshShortcuts
     }
 })();

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

@@ -13,24 +13,138 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+/*
+ * RED.popover.create(options) - create a popover callout box
+ * RED.popover.tooltip(target,content, action) - add a tooltip to an element
+ * RED.popover.menu(options) - create a dropdown menu
+ * RED.popover.panel(content) - create a dropdown container element
+ */
+
+
+/*
+ * RED.popover.create(options)
+ *
+ *  options
+ *    - target : DOM element - the element to target with the popover
+ *    - direction : string - position of the popover relative to target
+ *                  'top', 'right'(default), 'bottom', 'left', 'inset-[top,right,bottom,left]'
+ *    - trigger : string - what triggers the popover to be displayed
+ *                  'hover' - display when hovering the target
+ *                  'click' - display when target is clicked
+ *                  'modal' - hmm not sure, need to find where we use that mode
+ *    - content : string|function - contents of the popover. If a string, handled
+ *                                  as raw HTML, so take care.
+ *                                  If a function, can return a String to be added
+ *                                  as text (not HTML), or a DOM element to append
+ *    - delay : object - sets show/hide delays after mouseover/out events
+ *                  { show: 750, hide: 50 }
+ *    - autoClose : number - delay before closing the popover in some cases
+ *                     if trigger is click - delay after mouseout
+ *                     else if trigger not hover/modal - delay after showing
+ *    - width : number - width of popover, default 'auto'
+ *    - maxWidth : number - max width of popover, default 'auto'
+ *    - size : string - scale of popover. 'default', 'small'
+ *    - offset : number - px offset from target
+ *    - tooltip : boolean - if true, clicking on popover closes it
+ *    - class : string - optional css class to apply to popover
+ *    - interactive : if trigger is 'hover' and this is set to true, allow the mouse
+ *                    to move over the popover without hiding it.
+ *
+ * Returns the popover object with the following properties/functions:
+ *   properties:
+ *    - element : DOM element - the popover dom element
+ *   functions:
+ *    - setContent(content) - change the popover content. This only works if the
+ *                            popover is not currently displayed. It does not
+ *                            change the content of a visible popover.
+ *    - open(instant) - show the popover. If 'instant' is true, don't fade in
+ *    - close(instant) - hide the popover. If 'instant' is true, don't fade out
+ *    - move(options) - move the popover. The options parameter can take many
+ *                      of the options detailed above including:
+ *                       target,direction,content,width,offset
+ *                      Other settings probably won't work because we haven't needed to change them
+ */
+
+/*
+ * RED.popover.tooltip(target,content, action)
+ *
+ *  - target : DOM element - the element to apply the tooltip to
+ *  - content : string - the text of the tooltip
+ *  - action : string - *optional* the name of an Action this tooltip is tied to
+ *                      For example, it 'target' is a button that triggers a particular action.
+ *                      The tooltip will include the keyboard shortcut for the action
+ *                      if one is defined
+ *
+ */
+
+/*
+ * RED.popover.menu(options)
+ *
+ *  options
+ *    - options : array - list of menu options - see below for format
+ *    - width : number - width of the menu. Default: 'auto'
+ *    - class : string - class to apply to the menu container
+ *    - maxHeight : number - maximum height of menu before scrolling items. Default: none
+ *    - onselect : function(item) - called when a menu item is selected, if that item doesn't
+ *                                  have its own onselect function
+ *    - onclose : function(cancelled) - called when the menu is closed
+ *    - disposeOnClose : boolean - by default, the menu is discarded when it closes
+ *                                 and mustbe rebuilt to redisplay. Setting this to 'false'
+ *                                 keeps the menu on the DOM so it can be shown again.
+ *
+ *  Menu Options array:
+ *  [
+ *      label : string|DOM element - the label of the item. Can be custom DOM element
+ *      onselect : function - called when the item is selected
+ *  ]
+ *
+ * Returns the menu object with the following functions:
+ *
+ *  - options([menuItems]) - if menuItems is undefined, returns the current items.
+ *                           otherwise, sets the current menu items
+ *  - show(opts) - shows the menu. `opts` is an object of options. See  RED.popover.panel.show(opts)
+ *                 for the full list of options. In most scenarios, this just needs:
+ *                  - target : DOM element - the element to display the menu below
+ *  - hide(cancelled) - hide the menu
+ */
+
+/*
+ * RED.popover.panel(content)
+ *  Create a UI panel that can be displayed relative to any target element.
+ *  Handles auto-closing when mouse clicks outside the panel
+ *
+ *  - 'content' - DOM element to display in the panel
+ *
+ * Returns the panel object with the following functions:
+ *
+ *  properties:
+ *    - container : DOM element - the panel element
+ *
+ *  functions:
+ *    - show(opts) - show the panel.
+ *       opts:
+ *          - onclose : function - called when the panel closes
+ *          - closeButton : DOM element - if the panel is closeable by a click of a button,
+ *                                        by providing a reference to it here, we can
+ *                                        handle the events properly to hide the panel
+ *          - target : DOM element - the element to display the panel relative to
+ *          - align : string - should the panel align to the left or right edge of target
+ *                             default: 'right'
+ *          - offset : Array - px offset to apply from the target. [width, height]
+ *          - dispose : boolean - whether the panel should be removed from DOM when hidden
+ *                                default: true
+ *    - hide(dispose) - hide the panel.
+ */
 
 RED.popover = (function() {
     var deltaSizes = {
         "default": {
-            top: 10,
-            topTop: 30,
-            leftRight: 17,
-            leftLeft: 25,
-            leftBottom: 8,
-            leftTop: 11
+            x: 12,
+            y: 12
         },
         "small": {
-            top: 6,
-            topTop: 20,
-            leftRight: 8,
-            leftLeft: 26,
-            leftBottom: 8,
-            leftTop: 9
+            x:8,
+            y:8
         }
     }
     function createPopover(options) {
@@ -41,7 +155,9 @@ RED.popover = (function() {
         var delay = options.delay ||  { show: 750, hide: 50 };
         var autoClose = options.autoClose;
         var width = options.width||"auto";
+        var maxWidth = options.maxWidth;
         var size = options.size||"default";
+        var popupOffset = options.offset || 0;
         if (!deltaSizes[size]) {
             throw new Error("Invalid RED.popover size value:",size);
         }
@@ -49,6 +165,8 @@ RED.popover = (function() {
         var timer = null;
         var active;
         var div;
+        var contentDiv;
+        var currentStyle;
 
         var openPopup = function(instant) {
             if (active) {
@@ -58,6 +176,10 @@ RED.popover = (function() {
                     return;
                 }
                 div = $('<div class="red-ui-popover"></div>');
+                if (options.class) {
+                    div.addClass(options.class);
+                }
+                contentDiv = $('<div class="red-ui-popover-content">').appendTo(div);
                 if (size !== "default") {
                     div.addClass("red-ui-popover-size-"+size);
                 }
@@ -67,71 +189,23 @@ RED.popover = (function() {
                         return;
                     }
                     if (typeof result === 'string') {
-                        div.text(result);
+                        contentDiv.text(result);
                     } else {
-                        div.append(result);
+                        contentDiv.append(result);
                     }
                 } else {
-                    div.html(content);
-                }
-                if (width !== "auto") {
-                    div.width(width);
+                    contentDiv.html(content);
                 }
                 div.appendTo("body");
 
-                var targetPos = target.offset();
-                var targetWidth = target.outerWidth();
-                var targetHeight = target.outerHeight();
-                var divHeight = div.height();
-                var divWidth = div.width();
-                var paddingRight = 10;
+                movePopup({target,direction,width,maxWidth});
 
-                var viewportTop = $(window).scrollTop();
-                var viewportLeft = $(window).scrollLeft();
-                var viewportBottom = viewportTop + $(window).height();
-                var viewportRight = viewportLeft + $(window).width();
-                var top = 0;
-                var left = 0;
-                var d = direction;
-                if (d === 'right') {
-                    top = targetPos.top+targetHeight/2-divHeight/2-deltaSizes[size].top;
-                    left = targetPos.left+targetWidth+deltaSizes[size].leftRight;
-                } else if (d === 'left') {
-                    top = targetPos.top+targetHeight/2-divHeight/2-deltaSizes[size].top;
-                    left = targetPos.left-deltaSizes[size].leftLeft-divWidth;
-                } else if (d === 'bottom') {
-                    top = targetPos.top+targetHeight+deltaSizes[size].top;
-                    left = targetPos.left+targetWidth/2-divWidth/2 - deltaSizes[size].leftBottom;
-                    if (left < 0) {
-                        d = "right";
-                        top = targetPos.top+targetHeight/2-divHeight/2-deltaSizes[size].top;
-                        left = targetPos.left+targetWidth+deltaSizes[size].leftRight;
-                    } else if (left+divWidth+paddingRight > viewportRight) {
-                        d = "left";
-                        top = targetPos.top+targetHeight/2-divHeight/2-deltaSizes[size].top;
-                        left = targetPos.left-deltaSizes[size].leftLeft-divWidth;
-                        if (top+divHeight+targetHeight/2 + 5 > viewportBottom) {
-                            top -= (top+divHeight+targetHeight/2 - viewportBottom + 5)
-                        }
-                    } else if (top+divHeight > viewportBottom) {
-                        d = 'top';
-                        top = targetPos.top-deltaSizes[size].topTop-divHeight;
-                        left = targetPos.left+targetWidth/2-divWidth/2 - deltaSizes[size].leftTop;
-                    }
-                } else if (d === 'top') {
-                    top = targetPos.top-deltaSizes[size].topTop-divHeight;
-                    left = targetPos.left+targetWidth/2-divWidth/2 - deltaSizes[size].leftTop;
-                    if (top < 0) {
-                        d = 'bottom';
-                        top = targetPos.top+targetHeight+deltaSizes[size].top;
-                        left = targetPos.left+targetWidth/2-divWidth/2 - deltaSizes[size].leftBottom;
-                    }
-                }
-                div.addClass('red-ui-popover-'+d).css({top: top, left: left});
                 if (existingPopover) {
                     existingPopover.close(true);
                 }
-                target.data("red-ui-popover",res)
+                if (options.trigger !== 'manual') {
+                    target.data("red-ui-popover",res)
+                }
                 if (options.tooltip) {
                     div.on("mousedown", function(evt) {
                         closePopup(true);
@@ -161,6 +235,104 @@ RED.popover = (function() {
                 }
             }
         }
+        var movePopup = function(options) {
+            target = options.target || target;
+            direction = options.direction || direction || "right";
+            popupOffset = options.offset || popupOffset;
+            var transition = options.transition;
+
+            var width = options.width||"auto";
+            div.width(width);
+            if (options.maxWidth) {
+                div.css("max-width",options.maxWidth)
+            } else {
+                div.css("max-width", 'auto');
+            }
+
+            var targetPos = target[0].getBoundingClientRect();
+            var targetHeight = targetPos.height;
+            var targetWidth = targetPos.width;
+
+            var divHeight = div.outerHeight();
+            var divWidth = div.outerWidth();
+            var paddingRight = 10;
+
+            var viewportTop = $(window).scrollTop();
+            var viewportLeft = $(window).scrollLeft();
+            var viewportBottom = viewportTop + $(window).height();
+            var viewportRight = viewportLeft + $(window).width();
+            var top = 0;
+            var left = 0;
+            if (direction === 'right') {
+                top = targetPos.top+targetHeight/2-divHeight/2;
+                left = targetPos.left+targetWidth+deltaSizes[size].x+popupOffset;
+            } else if (direction === 'left') {
+                top = targetPos.top+targetHeight/2-divHeight/2;
+                left = targetPos.left-deltaSizes[size].x-divWidth-popupOffset;
+            } else if (direction === 'bottom') {
+                top = targetPos.top+targetHeight+deltaSizes[size].y+popupOffset;
+                left = targetPos.left+targetWidth/2-divWidth/2;
+                if (left < 0) {
+                    direction = "right";
+                    top = targetPos.top+targetHeight/2-divHeight/2;
+                    left = targetPos.left+targetWidth+deltaSizes[size].x+popupOffset;
+                } else if (left+divWidth+paddingRight > viewportRight) {
+                    direction = "left";
+                    top = targetPos.top+targetHeight/2-divHeight/2;
+                    left = targetPos.left-deltaSizes[size].x-divWidth-popupOffset;
+                    if (top+divHeight+targetHeight/2 + 5 > viewportBottom) {
+                        top -= (top+divHeight+targetHeight/2 - viewportBottom + 5)
+                    }
+                } else if (top+divHeight > viewportBottom) {
+                    direction = 'top';
+                    top = targetPos.top-deltaSizes[size].y-divHeight-popupOffset;
+                    left = targetPos.left+targetWidth/2-divWidth/2;
+                }
+            } else if (direction === 'top') {
+                top = targetPos.top-deltaSizes[size].y-divHeight-popupOffset;
+                left = targetPos.left+targetWidth/2-divWidth/2;
+                if (top < 0) {
+                    direction = 'bottom';
+                    top = targetPos.top+targetHeight+deltaSizes[size].y+popupOffset;
+                    left = targetPos.left+targetWidth/2-divWidth/2;
+                }
+            } else if (/inset/.test(direction)) {
+                top = targetPos.top + targetHeight/2 - divHeight/2;
+                left = targetPos.left + targetWidth/2 - divWidth/2;
+
+                if (/bottom/.test(direction)) {
+                    top = targetPos.top + targetHeight - divHeight-popupOffset;
+                }
+                if (/top/.test(direction)) {
+                    top = targetPos.top+popupOffset;
+                }
+                if (/left/.test(direction)) {
+                    left = targetPos.left+popupOffset;
+                }
+                if (/right/.test(direction)) {
+                    left = targetPos.left + targetWidth - divWidth-popupOffset;
+                }
+            }
+            if (currentStyle) {
+                div.removeClass(currentStyle);
+            }
+            if (transition) {
+                div.css({
+                    "transition": "0.6s ease",
+                    "transition-property": "top,left,right,bottom"
+                })
+            }
+            currentStyle = 'red-ui-popover-'+direction;
+            div.addClass(currentStyle).css({top: top, left: left});
+            if (transition) {
+                setTimeout(function() {
+                    div.css({
+                        "transition": "none"
+                    });
+                },600);
+            }
+
+        }
         var closePopup = function(instant) {
             $(document).off('mousedown.red-ui-popover');
             if (!active) {
@@ -178,6 +350,15 @@ RED.popover = (function() {
             }
         }
 
+        target.on("remove", function (ev) {
+            if (timer) {
+                clearTimeout(timer);
+            }
+            if (active) {
+                active = false;
+                setTimeout(closePopup,delay.hide);
+            }
+        });
         if (trigger === 'hover') {
             target.on('mouseenter',function(e) {
                 clearTimeout(timer);
@@ -236,8 +417,10 @@ RED.popover = (function() {
             },autoClose);
         }
         var res = {
+            get element() { return div },
             setContent: function(_content) {
                 content = _content;
+
                 return res;
             },
             open: function (instant) {
@@ -249,6 +432,10 @@ RED.popover = (function() {
                 active = false;
                 closePopup(instant);
                 return res;
+            },
+            move: function(options) {
+                movePopup(options);
+                return
             }
         }
         return res;
@@ -258,18 +445,17 @@ RED.popover = (function() {
     return {
         create: createPopover,
         tooltip: function(target,content, action) {
-            var label = content;
-            if (action) {
-                label = function() {
-                    var label = content;
+            var label = function() {
+                var label = content;
+                if (action) {
                     var shortcut = RED.keyboard.getShortcut(action);
                     if (shortcut && shortcut.key) {
                         label = $('<span>'+content+' <span class="red-ui-popover-key">'+RED.keyboard.formatKey(shortcut.key, true)+'</span></span>');
                     }
-                    return label;
                 }
+                return label;
             }
-            return RED.popover.create({
+            var popover = RED.popover.create({
                 tooltip: true,
                 target:target,
                 trigger: "hover",
@@ -278,6 +464,14 @@ RED.popover = (function() {
                 content: label,
                 delay: { show: 750, hide: 50 }
             });
+            popover.setContent = function(newContent) {
+                content = newContent;
+            }
+            popover.setAction = function(newAction) {
+                action = newAction;
+            }
+            return popover;
+
         },
         menu: function(options) {
             var list = $('<ul class="red-ui-menu"></ul>');
@@ -286,20 +480,47 @@ RED.popover = (function() {
             }
             var menuOptions = options.options || [];
             var first;
-            menuOptions.forEach(function(opt) {
-                var item = $('<li>').appendTo(list);
-                var link = $('<a href="#"></a>').text(opt.label).appendTo(item);
-                link.on("click", function(evt) {
-                    evt.preventDefault();
-                    if (opt.onselect) {
-                        opt.onselect();
-                    }
-                    menu.hide();
-                })
-                if (!first) { first = link}
-            })
+
             var container = RED.popover.panel(list);
+            if (options.width) {
+                container.container.width(options.width);
+            }
+            if (options.class) {
+                container.container.addClass(options.class);
+            }
+            if (options.maxHeight) {
+                container.container.css({
+                    "max-height": options.maxHeight,
+                    "overflow-y": 'auto'
+                })
+            }
             var menu = {
+                options: function(opts) {
+                    if (opts === undefined) {
+                        return menuOptions
+                    }
+                    menuOptions = opts || [];
+                    list.empty();
+                    menuOptions.forEach(function(opt) {
+                        var item = $('<li>').appendTo(list);
+                        var link = $('<a href="#"></a>').appendTo(item);
+                        if (typeof opt.label == "string") {
+                            link.text(opt.label)
+                        } else if (opt.label){
+                            opt.label.appendTo(link);
+                        }
+                        link.on("click", function(evt) {
+                            evt.preventDefault();
+                            if (opt.onselect) {
+                                opt.onselect();
+                            } else if (options.onselect) {
+                                options.onselect(opt);
+                            }
+                            menu.hide();
+                        })
+                        if (!first) { first = link}
+                    })
+                },
                 show: function(opts) {
                     $(document).on("keydown.red-ui-menu", function(evt) {
                         var currentItem = list.find(":focus").parent();
@@ -308,11 +529,9 @@ RED.popover = (function() {
                             // DOWN
                             if (currentItem.length > 0) {
                                 if (currentItem.index() === menuOptions.length-1) {
-                                    console.log("WARP TO TOP")
                                     // Wrap to top of list
                                     list.children().first().children().first().focus();
                                 } else {
-                                    console.log("GO DOWN ONE")
                                     currentItem.next().children().first().focus();
                                 }
                             } else {
@@ -323,11 +542,9 @@ RED.popover = (function() {
                             // UP
                             if (currentItem.length > 0) {
                                 if (currentItem.index() === 0) {
-                                    console.log("WARP TO BOTTOM")
                                     // Wrap to bottom of list
                                     list.children().last().children().first().focus();
                                 } else {
-                                    console.log("GO UP ONE")
                                     currentItem.prev().children().first().focus();
                                 }
                             } else {
@@ -337,6 +554,11 @@ RED.popover = (function() {
                             // ESCAPE
                             evt.preventDefault();
                             menu.hide(true);
+                        } else if (evt.keyCode === 9 && options.tabSelect) {
+                            // TAB - with tabSelect enabled
+                            evt.preventDefault();
+                            currentItem.find("a").trigger("click");
+
                         }
                         evt.stopPropagation();
                     })
@@ -356,6 +578,7 @@ RED.popover = (function() {
                     }
                 }
             }
+            menu.options(menuOptions);
             return menu;
         },
         panel: function(content) {
@@ -363,7 +586,6 @@ RED.popover = (function() {
             panel.css({ display: "none" });
             panel.appendTo(document.body);
             content.appendTo(panel);
-            var closeCallback;
 
             function hide(dispose) {
                 $(document).off("mousedown.red-ui-popover-panel-close");
@@ -378,22 +600,23 @@ RED.popover = (function() {
             }
             function show(options) {
                 var closeCallback = options.onclose;
+                var closeButton = options.closeButton;
                 var target = options.target;
                 var align = options.align || "right";
                 var offset = options.offset || [0,0];
 
                 var pos = target.offset();
                 var targetWidth = target.width();
-                var targetHeight = target.height();
+                var targetHeight = target.outerHeight();
                 var panelHeight = panel.height();
                 var panelWidth = panel.width();
 
                 var top = (targetHeight+pos.top) + offset[1];
-                if (top+panelHeight > $(window).height()) {
+                if (top+panelHeight-$(document).scrollTop() > $(window).height()) {
                     top -= (top+panelHeight)-$(window).height() + 5;
                 }
                 if (top < 0) {
-                    panelHeight.height(panelHeight+top)
+                    panel.height(panelHeight+top)
                     top = 0;
                 }
                 if (align === "right") {
@@ -420,7 +643,8 @@ RED.popover = (function() {
                 });
 
                 $(document).on("mousedown.red-ui-popover-panel-close", function(event) {
-                    if(!$(event.target).closest(panel).length && !$(event.target).closest(".red-ui-editor-dialog").length) {
+                    var hitCloseButton = closeButton && $(event.target).closest(closeButton).length;
+                    if(!hitCloseButton && !$(event.target).closest(panel).length && !$(event.target).closest(".red-ui-editor-dialog").length) {
                         if (closeCallback) {
                             closeCallback();
                         }

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

@@ -38,6 +38,7 @@ RED.tabs = (function() {
         if (options.vertical) {
             wrapper.addClass("red-ui-tabs-vertical");
         }
+
         if (options.addButton) {
             wrapper.addClass("red-ui-tabs-add");
             var addButton = $('<div class="red-ui-tab-button red-ui-tabs-add"><a href="#"><i class="fa fa-plus"></i></a></div>').appendTo(wrapper);
@@ -75,6 +76,8 @@ RED.tabs = (function() {
             });
         }
         if (options.searchButton) {
+            // This is soft-deprecated as we don't use this in the core anymore
+            // We no use the `menu` option to provide a drop-down list of actions
             wrapper.addClass("red-ui-tabs-search");
             var searchButton = $('<div class="red-ui-tab-button red-ui-tabs-search"><a href="#"><i class="fa fa-list-ul"></i></a></div>').appendTo(wrapper);
             searchButton.find('a').on("click", function(evt) {
@@ -94,6 +97,52 @@ RED.tabs = (function() {
             }
 
         }
+        if (options.menu) {
+            wrapper.addClass("red-ui-tabs-menu");
+            var menuButton = $('<div class="red-ui-tab-button red-ui-tabs-menu"><a href="#"><i class="fa fa-caret-down"></i></a></div>').appendTo(wrapper);
+            var menuButtonLink = menuButton.find('a')
+            var menuOpen = false;
+            var menu;
+            menuButtonLink.on("click", function(evt) {
+                evt.stopPropagation();
+                evt.preventDefault();
+                if (menuOpen) {
+                    menu.remove();
+                    menuOpen = false;
+                    return;
+                }
+                menuOpen = true;
+                var menuOptions = [];
+                if (typeof options.searchButton === 'function') {
+                    menuOptions = options.menu()
+                } else if (Array.isArray(options.menu)) {
+                    menuOptions = options.menu;
+                } else if (typeof options.menu === 'function') {
+                    menuOptions = options.menu();
+                }
+                menu = RED.menu.init({options: menuOptions});
+                menu.attr("id",options.id+"-menu");
+                menu.css({
+                    position: "absolute"
+                })
+                menu.appendTo("body");
+                var elementPos = menuButton.offset();
+                menu.css({
+                    top: (elementPos.top+menuButton.height()-2)+"px",
+                    left: (elementPos.left - menu.width() + menuButton.width())+"px"
+                })
+                $(".red-ui-menu.red-ui-menu-dropdown").hide();
+                $(document).on("click.red-ui-tabmenu", function(evt) {
+                    $(document).off("click.red-ui-tabmenu");
+                    menuOpen = false;
+                    menu.remove();
+                });
+                menu.show();
+            })
+        }
+
+
+
         var scrollLeft;
         var scrollRight;
 
@@ -117,9 +166,9 @@ RED.tabs = (function() {
                 }
             })
             scrollLeft = $('<div class="red-ui-tab-button red-ui-tab-scroll red-ui-tab-scroll-left"><a href="#" style="display:none;"><i class="fa fa-caret-left"></i></a></div>').appendTo(wrapper).find("a");
-            scrollLeft.on('mousedown',function(evt) { scrollEventHandler(evt,'-=150') }).on('click',function(evt){ evt.preventDefault();});
+            scrollLeft.on('mousedown',function(evt) {scrollEventHandler(evt, evt.shiftKey?('-='+scrollContainer.scrollLeft()):'-=150') }).on('click',function(evt){ evt.preventDefault();});
             scrollRight = $('<div class="red-ui-tab-button red-ui-tab-scroll red-ui-tab-scroll-right"><a href="#" style="display:none;"><i class="fa fa-caret-right"></i></a></div>').appendTo(wrapper).find("a");
-            scrollRight.on('mousedown',function(evt) { scrollEventHandler(evt,'+=150') }).on('click',function(evt){ evt.preventDefault();});
+            scrollRight.on('mousedown',function(evt) { scrollEventHandler(evt,evt.shiftKey?('+='+(scrollContainer[0].scrollWidth - scrollContainer.width()-scrollContainer.scrollLeft())):'+=150') }).on('click',function(evt){ evt.preventDefault();});
         }
 
         if (options.collapsible) {
@@ -337,6 +386,12 @@ RED.tabs = (function() {
             if (link.length === 0) {
                 return;
             }
+            if (link.parent().hasClass("hide-tab")) {
+                link.parent().removeClass("hide-tab").removeClass("hide");
+                if (options.onshow) {
+                    options.onshow(tabs[link.attr('href').slice(1)])
+                }
+            }
             if (!link.parent().hasClass("active")) {
                 ul.children().removeClass("active");
                 ul.children().css({"transition": "width 100ms"});
@@ -362,13 +417,13 @@ RED.tabs = (function() {
             }
         }
         function activatePreviousTab() {
-            var previous = ul.find("li.active").prev();
+            var previous = findPreviousVisibleTab();
             if (previous.length > 0) {
                 activateTab(previous.find("a"));
             }
         }
         function activateNextTab() {
-            var next = ul.find("li.active").next();
+            var next = findNextVisibleTab();
             if (next.length > 0) {
                 activateTab(next.find("a"));
             }
@@ -378,7 +433,9 @@ RED.tabs = (function() {
             if (options.vertical) {
                 return;
             }
-            var tabs = ul.find("li.red-ui-tab");
+            var allTabs = ul.find("li.red-ui-tab");
+            var tabs = allTabs.filter(":not(.hide-tab)");
+            var hiddenTabs = allTabs.filter(".hide-tab");
             var width = wrapper.width();
             var tabCount = tabs.length;
             var tabWidth;
@@ -388,7 +445,7 @@ RED.tabs = (function() {
                 var visibleCount = collapsedButtonsRow.children(":visible").length;
                 tabWidth = width - collapsedButtonsRow.width()-10;
                 var maxTabWidth = 198;
-                var minTabWidth = 80;
+                var minTabWidth = 120;
                 if (tabWidth <= minTabWidth || (tabWidth < maxTabWidth && visibleCount > 5)) {
                     // The tab is too small. Hide the next button to make room
                     // Start at the end of the button row, -1 for the menu button
@@ -446,6 +503,7 @@ RED.tabs = (function() {
                 // }
 
                 tabs.css({width:currentTabWidth});
+                hiddenTabs.css({width:"0px"});
                 if (tabWidth < 50) {
                     // ul.find(".red-ui-tab-close").hide();
                     ul.find(".red-ui-tab-icon").hide();
@@ -486,12 +544,19 @@ RED.tabs = (function() {
             }
             var li = ul.find("a[href='#"+id+"']").parent();
             if (li.hasClass("active")) {
-                var tab = li.prev();
+                var tab = findPreviousVisibleTab(li);
                 if (tab.length === 0) {
-                    tab = li.next();
+                    tab = findNextVisibleTab(li);
+                }
+                if (tab.length > 0) {
+                    activateTab(tab.find("a"));
+                } else {
+                    if (options.onchange) {
+                        options.onchange(null);
+                    }
                 }
-                activateTab(tab.find("a"));
             }
+
             li.remove();
             if (tabs[id].pinned) {
                 pinnedTabsCount--;
@@ -507,6 +572,75 @@ RED.tabs = (function() {
             }
         }
 
+        function findPreviousVisibleTab(li) {
+            if (!li) {
+                li = ul.find("li.active");
+            }
+            var previous = li.prev();
+            while(previous.length > 0 && previous.hasClass("hide-tab")) {
+                previous = previous.prev();
+            }
+            return previous;
+        }
+        function findNextVisibleTab(li) {
+            if (!li) {
+                li = ul.find("li.active");
+            }
+            var next = li.next();
+            while(next.length > 0 && next.hasClass("hide-tab")) {
+                next = next.next();
+            }
+            return next;
+        }
+        function showTab(id) {
+            if (tabs[id]) {
+                var li = ul.find("a[href='#"+id+"']").parent();
+                if (li.hasClass("hide-tab")) {
+                    li.removeClass("hide-tab").removeClass("hide");
+                    if (ul.find("li.red-ui-tab:not(.hide-tab)").length === 1) {
+                        activateTab(li.find("a"))
+                    }
+                    updateTabWidths();
+                    if (options.onshow) {
+                        options.onshow(tabs[id])
+                    }
+                }
+            }
+        }
+        function hideTab(id) {
+            if (tabs[id]) {
+                var li = ul.find("a[href='#"+id+"']").parent();
+                if (!li.hasClass("hide-tab")) {
+                    if (li.hasClass("active")) {
+                        var tab = findPreviousVisibleTab(li);
+                        if (tab.length === 0) {
+                            tab = findNextVisibleTab(li);
+                        }
+                        if (tab.length > 0) {
+                            activateTab(tab.find("a"));
+                        } else {
+                            if (options.onchange) {
+                                options.onchange(null);
+                            }
+                        }
+                    }
+                    li.removeClass("active");
+                    li.one("transitionend", function(evt) {
+                        li.addClass("hide");
+                        updateTabWidths();
+                        if (options.onhide) {
+                            options.onhide(tabs[id])
+                        }
+                        setTimeout(function() {
+                            updateScroll()
+                        },200)
+                    })
+                    li.addClass("hide-tab");
+                    li.css({width:0})
+                }
+            }
+        }
+
         var tabAPI =  {
             addTab: function(tab,targetIndex) {
                 if (options.onselect) {
@@ -663,6 +797,7 @@ RED.tabs = (function() {
                 link.on("click", function(evt) { evt.preventDefault(); })
                 link.on("dblclick", function(evt) { evt.stopPropagation(); evt.preventDefault(); })
 
+                $('<span class="red-ui-tabs-fade"></span>').appendTo(li);
 
                 if (tab.closeable) {
                     li.addClass("red-ui-tabs-closeable")
@@ -672,6 +807,18 @@ RED.tabs = (function() {
                         event.preventDefault();
                         removeTab(tab.id);
                     });
+                    RED.popover.tooltip(closeLink,RED._("workspace.hideFlow"));
+                }
+                if (tab.hideable) {
+                    li.addClass("red-ui-tabs-closeable")
+                    var closeLink = $("<a/>",{href:"#",class:"red-ui-tab-close red-ui-tab-hide"}).appendTo(li);
+                    closeLink.append('<i class="fa fa-eye" />');
+                    closeLink.append('<i class="fa fa-eye-slash" />');
+                    closeLink.on("click",function(event) {
+                        event.preventDefault();
+                        hideTab(tab.id);
+                    });
+                    RED.popover.tooltip(closeLink,RED._("workspace.hideFlow"));
                 }
 
                 var badges = $('<span class="red-ui-tabs-badges"></span>').appendTo(li);
@@ -679,10 +826,13 @@ RED.tabs = (function() {
                     $('<i class="red-ui-tabs-badge-changed fa fa-circle"></i>').appendTo(badges);
                     $('<i class="red-ui-tabs-badge-selected fa fa-check-circle"></i>').appendTo(badges);
                 }
+
+                // link.attr("title",tab.label);
+                RED.popover.tooltip(link,function() { return tab.label})
+
                 if (options.onadd) {
                     options.onadd(tab);
                 }
-                link.attr("title",tab.label);
                 if (ul.find("li.red-ui-tab").length == 1) {
                     activateTab(link);
                 }
@@ -783,22 +933,37 @@ RED.tabs = (function() {
             previousTab: activatePreviousTab,
             resize: updateTabWidths,
             count: function() {
-                return ul.find("li.red-ui-tab").length;
+                return ul.find("li.red-ui-tab:not(.hide)").length;
             },
             activeIndex: function() {
-                return ul.find("li.active").index()    
+                return ul.find("li.active").index()
             },
             contains: function(id) {
                 return ul.find("a[href='#"+id+"']").length > 0;
             },
+            showTab: showTab,
+            hideTab: hideTab,
+
             renameTab: function(id,label) {
                 tabs[id].label = label;
                 var tab = ul.find("a[href='#"+id+"']");
-                tab.attr("title",label);
                 tab.find("span.red-ui-text-bidi-aware").text(label).attr('dir', RED.text.bidi.resolveBaseTextDir(label));
                 updateTabWidths();
             },
+            listTabs: function() {
+                return $.makeArray(ul.children().map(function() { return $(this).data('tabId');}));
+            },
             selection: getSelection,
+            clearSelection: function() {
+                if (options.onselect) {
+                    var selection = ul.find("li.red-ui-tab.selected");
+                    if (selection.length > 0) {
+                        selection.removeClass("selected");
+                        selectionChanged();
+                    }
+                }
+
+            },
             order: function(order) {
                 preferredOrder = order;
                 var existingTabOrder = $.makeArray(ul.children().map(function() { return $(this).data('tabId');}));

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

@@ -48,7 +48,7 @@
             });
             this.button = $('<button type="button" class="red-ui-toggleButton '+baseClass+' toggle single"></button>');
             if (enabledLabel || disabledLabel) {
-                this.buttonLabel = $("<span>").appendTo(this.button);
+                this.buttonLabel = $("<span>").appendTo(this.button).css("margin-left", "5px");
             }
 
             if (this.options.class) {

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

@@ -24,6 +24,9 @@
  *   - rootSortable: boolean - if 'sortable' is set, then setting this to
  *                             false, prevents items being sorted to the
  *                             top level of the tree
+ *   - autoSelect: boolean - default true - triggers item selection when navigating
+ *                           list by keyboard. If the list has checkboxed items
+ *                           you probably want to set this to false
  *
  * methods:
  *   - data(items) - clears existing items and replaces with new data
@@ -41,6 +44,7 @@
  *         sublabel: 'Local', // a sub-label for the item
  *         icon: 'fa fa-rocket', // (optional) icon for the item
  *         checkbox: true/false, // (optional) if present, display checkbox accordingly
+ *         radio: 'group-name',  // (optional) if present, display radio box - using group-name to set radio group
  *         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
@@ -49,6 +53,7 @@
  *         deferBuild: true/false, // don't build any ui elements for the item's children
  *                                    until it is expanded by the user.
  *         element: // custom dom element to use for the item - ignored if `label` is set
+ *         collapsible: true/false, // prevent a parent item from being collapsed. default true.
  *     }
  * ]
  *
@@ -89,77 +94,99 @@
     $.widget( "nodered.treeList", {
         _create: function() {
             var that = this;
-
+            var autoSelect = true;
+            if (that.options.autoSelect === false) {
+                autoSelect = false;
+            }
             this.element.addClass('red-ui-treeList');
             this.element.attr("tabIndex",0);
             var wrapper = $('<div>',{class:'red-ui-treeList-container'}).appendTo(this.element);
             this.element.on('keydown', function(evt) {
-                var selected = that._topList.find(".selected").parent().data('data');
-                if (!selected && (evt.keyCode === 40 || evt.keyCode === 38)) {
-                    that.select(that._data[0]);
+                var focussed = that._topList.find(".focus").parent().data('data');
+                if (!focussed && (evt.keyCode === 40 || evt.keyCode === 38)) {
+                    if (that._data[0]) {
+                        if (autoSelect) {
+                            that.select(that._data[0]);
+                        } else {
+                            that._topList.find(".focus").removeClass("focus")
+                        }
+                        that._data[0].treeList.label.addClass('focus')
+                    }
                     return;
                 }
                 var target;
                 switch(evt.keyCode) {
+                    case 32: // SPACE
                     case 13: // ENTER
+                        if (evt.altKey || evt.ctrlKey || evt.metaKey || evt.shiftKey) {
+                            return
+                        }
                         evt.preventDefault();
                         evt.stopPropagation();
-                        if (selected.children) {
-                            if (selected.treeList.container.hasClass("expanded")) {
-                                selected.treeList.collapse()
+                        if (focussed.checkbox) {
+                            focussed.treeList.checkbox.trigger("click");
+                        } else if (focussed.radio) {
+                            focussed.treeList.radio.trigger("click");
+                        } else if (focussed.children) {
+                            if (focussed.treeList.container.hasClass("expanded")) {
+                                focussed.treeList.collapse()
                             } else {
-                                selected.treeList.expand()
+                                focussed.treeList.expand()
                             }
                         } else {
-                            that._trigger("confirm",null,selected)
+                            that._trigger("confirm",null,focussed)
                         }
-
                     break;
                     case 37: // LEFT
                         evt.preventDefault();
                         evt.stopPropagation();
-                        if (selected.children&& selected.treeList.container.hasClass("expanded")) {
-                            selected.treeList.collapse()
-                        } else if (selected.parent) {
-                            target = selected.parent;
+                        if (focussed.children&& focussed.treeList.container.hasClass("expanded")) {
+                            focussed.treeList.collapse()
+                        } else if (focussed.parent) {
+                            target = focussed.parent;
                         }
                     break;
                     case 38: // UP
                         evt.preventDefault();
                         evt.stopPropagation();
-                        target = that._getPreviousSibling(selected);
+                        target = that._getPreviousSibling(focussed);
                         if (target) {
                             target = that._getLastDescendant(target);
                         }
-                        if (!target && selected.parent) {
-                            target = selected.parent;
+                        if (!target && focussed.parent) {
+                            target = focussed.parent;
                         }
                     break;
                     case 39: // RIGHT
                         evt.preventDefault();
                         evt.stopPropagation();
-                        if (selected.children) {
-                            if (!selected.treeList.container.hasClass("expanded")) {
-                                selected.treeList.expand()
+                        if (focussed.children) {
+                            if (!focussed.treeList.container.hasClass("expanded")) {
+                                focussed.treeList.expand()
                             }
                         }
                     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];
+                        if (focussed.children && Array.isArray(focussed.children) && focussed.children.length > 0 && focussed.treeList.container.hasClass("expanded")) {
+                            target = focussed.children[0];
                         } else {
-                            target = that._getNextSibling(selected);
-                            while (!target && selected.parent) {
-                                selected = selected.parent;
-                                target = that._getNextSibling(selected);
+                            target = that._getNextSibling(focussed);
+                            while (!target && focussed.parent) {
+                                focussed = focussed.parent;
+                                target = that._getNextSibling(focussed);
                             }
                         }
                     break
                 }
                 if (target) {
-                    that.select(target);
+                    if (autoSelect) {
+                        that.select(target);
+                    } else {
+                        that._topList.find(".focus").removeClass("focus")
+                    }
+                    target.treeList.label.addClass('focus')
                 }
             });
             this._data = [];
@@ -313,7 +340,7 @@
             if (child.depth !== parent.depth+1) {
                 child.depth = parent.depth+1;
                 // var labelPaddingWidth = ((child.gutter ? child.gutter[0].offsetWidth + 2 : 0) + (child.depth * 20));
-                var labelPaddingWidth = ((child.gutter?child.gutter.width()+2:0)+(child.depth*20));
+                var labelPaddingWidth = (((child.gutter&&!child.gutter.hasClass("red-ui-treeList-gutter-float"))?child.gutter.width()+2:0)+(child.depth*20));
                 child.treeList.labelPadding.width(labelPaddingWidth+'px');
                 if (child.element) {
                     $(child.element).css({
@@ -462,6 +489,9 @@
                 container.addClass("expanded");
             }
             item.treeList.collapse = function() {
+                if (item.collapsible === false) {
+                    return
+                }
                 if (!item.children) {
                     return;
                 }
@@ -532,10 +562,12 @@
                 }).appendTo(label)
 
             }
-            var labelPaddingWidth = (item.gutter?item.gutter.width()+2:0)+(depth*20);
-            // var labelPaddingWidth = (item.gutter ? item.gutter[0].offsetWidth + 2 : 0) + (depth * 20)
+
+            var labelPaddingWidth = ((item.gutter&&!item.gutter.hasClass("red-ui-treeList-gutter-float"))?item.gutter.width()+2:0)+(depth*20);
+
             item.treeList.labelPadding = $('<span>').css({
                 display: "inline-block",
+                "flex-shrink": 0,
                 width:  labelPaddingWidth+'px'
             }).appendTo(label);
 
@@ -581,7 +613,7 @@
                     // Already a parent because we've got the angle-right icon
                     return;
                 }
-                $('<i class="fa fa-angle-right" />').appendTo(treeListIcon);
+                $('<i class="fa fa-angle-right" />').toggleClass("hide",item.collapsible === false).appendTo(treeListIcon);
                 treeListIcon.on("click.red-ui-treeList-expand", function(e) {
                         e.stopPropagation();
                         e.preventDefault();
@@ -632,6 +664,46 @@
                     label.on("click", function(e) {
                         e.stopPropagation();
                         cb.trigger("click");
+                        that._topList.find(".focus").removeClass("focus")
+                        label.addClass('focus')
+                    })
+                }
+                item.treeList.select = function(v) {
+                    if (v !== item.selected) {
+                        cb.trigger("click");
+                    }
+                }
+                item.treeList.checkbox = cb;
+                selectWrapper.appendTo(label)
+            } else if (item.radio) {
+                var selectWrapper = $('<span class="red-ui-treeList-icon"></span>');
+                var cb = $('<input class="red-ui-treeList-radio" type="radio">').prop('name', item.radio).prop('checked',item.selected).appendTo(selectWrapper);
+                cb.on('click', function(e) {
+                    e.stopPropagation();
+                });
+                cb.on('change', function(e) {
+                    item.selected = this.checked;
+                    that._selected.forEach(function(selectedItem) {
+                        if (selectedItem.radio === item.radio) {
+                            selectedItem.treeList.label.removeClass("selected");
+                            selectedItem.selected = false;
+                            that._selected.delete(selectedItem);
+                        }
+                    })
+                    if (item.selected) {
+                        that._selected.add(item);
+                    } else {
+                        that._selected.delete(item);
+                    }
+                    label.toggleClass("selected",this.checked);
+                    that._trigger("select",e,item);
+                })
+                if (!item.children) {
+                    label.on("click", function(e) {
+                        e.stopPropagation();
+                        cb.trigger("click");
+                        that._topList.find(".focus").removeClass("focus")
+                        label.addClass('focus')
                     })
                 }
                 item.treeList.select = function(v) {
@@ -640,6 +712,7 @@
                     }
                 }
                 selectWrapper.appendTo(label)
+                item.treeList.radio = cb;
             } else {
                 label.on("click", function(e) {
                     if (!that.options.multi) {
@@ -647,10 +720,14 @@
                     }
                     label.addClass("selected");
                     that._selected.add(item);
+                    that._topList.find(".focus").removeClass("focus")
+                    label.addClass('focus')
 
                     that._trigger("select",e,item)
                 })
                 label.on("dblclick", function(e) {
+                    that._topList.find(".focus").removeClass("focus")
+                    label.addClass('focus')
                     if (!item.children) {
                         that._trigger("confirm",e,item);
                     }
@@ -798,6 +875,9 @@
             if (item.treeList.label) {
                 item.treeList.label.addClass("selected");
             }
+
+            that._topList.find(".focus").removeClass("focus");
+
             if (triggerEvent !== false) {
                 this._trigger("select",null,item)
             }
@@ -805,6 +885,9 @@
         clearSelection: function() {
             this._selected.forEach(function(item) {
                 item.selected = false;
+                if (item.treeList.checkbox) {
+                    item.treeList.checkbox.prop('checked',false)
+                }
                 if (item.treeList.label) {
                     item.treeList.label.removeClass("selected")
                 }

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

@@ -53,8 +53,88 @@
         }
         return icon;
     }
+
+    var autoComplete = function(options) {
+        return function(val) {
+            var matches = [];
+            options.forEach(opt => {
+                let v = opt.value;
+                var i = v.toLowerCase().indexOf(val.toLowerCase());
+                if (i > -1) {
+                    var pre = v.substring(0,i);
+                    var matchedVal = v.substring(i,i+val.length);
+                    var post = v.substring(i+val.length)
+
+                    var el = $('<div/>',{style:"white-space:nowrap; overflow: hidden; flex-grow:1"});
+                    $('<span/>').text(pre).appendTo(el);
+                    $('<span/>',{style:"font-weight: bold"}).text(matchedVal).appendTo(el);
+                    $('<span/>').text(post).appendTo(el);
+
+                    var element = $('<div>',{style: "display: flex"});
+                    el.appendTo(element);
+                    if (opt.source) {
+                        $('<div>').css({
+                            "font-size": "0.8em"
+                        }).text(opt.source.join(",")).appendTo(element);
+                    }
+
+                    matches.push({
+                        value: v,
+                        label: element,
+                        i:i
+                    })
+                }
+            })
+            matches.sort(function(A,B){return A.i-B.i})
+            return matches;
+        }
+    }
+
+    // This is a hand-generated list of completions for the core nodes (based on the node help html).
+    var msgCompletions = [
+        { value: "payload" },
+        { value: "req", source: ["http in"]},
+        { value: "req.body", source: ["http in"]},
+        { value: "req.headers", source: ["http in"]},
+        { value: "req.query", source: ["http in"]},
+        { value: "req.params", source: ["http in"]},
+        { value: "req.cookies", source: ["http in"]},
+        { value: "req.files", source: ["http in"]},
+        { value: "complete", source: ["join"] },
+        { value: "contentType", source: ["mqtt"] },
+        { value: "cookies", source: ["http in","http request"] },
+        { value: "correlationData", source: ["mqtt"] },
+        { value: "delay", source: ["delay","trigger"] },
+        { value: "encoding", source: ["file"] },
+        { value: "error", source: ["catch"] },
+        { value: "filename", source: ["file","file in"] },
+        { value: "flush", source: ["delay"] },
+        { value: "followRedirects", source: ["http request"] },
+        { value: "headers", source: ["http in"," http request"] },
+        { value: "kill", source: ["exec"] },
+        { value: "messageExpiryInterval", source: ["mqtt"] },
+        { value: "method", source: ["http-request"] },
+        { value: "options", source: ["xml"] },
+        { value: "parts", source: ["split","join"] },
+        { value: "pid", source: ["exec"] },
+        { value: "qos", source: ["mqtt"] },
+        { value: "rate", source: ["delay"] },
+        { value: "rejectUnauthorized", source: ["http request"] },
+        { value: "requestTimeout", source: ["http request"] },
+        { value: "reset", source: ["delay","trigger","join","rbe"] },
+        { value: "responseTopic", source: ["mqtt"] },
+        { value: "restartTimeout", source: ["join"] },
+        { value: "retain", source: ["mqtt"] },
+        { value: "select", source: ["html"] },
+        { value: "statusCode", source: ["http in"] },
+        { value: "template", source: ["template"] },
+        { value: "toFront", source: ["delay"] },
+        { value: "topic", source: ["inject","mqtt","rbe"] },
+        { value: "url", source: ["http request"] },
+        { value: "userProperties", source: ["mqtt"] }
+    ]
     var allOptions = {
-        msg: {value:"msg",label:"msg.",validate:RED.utils.validatePropertyExpression},
+        msg: {value:"msg",label:"msg.",validate:RED.utils.validatePropertyExpression, autoComplete: autoComplete(msgCompletions)},
         flow: {value:"flow",label:"flow.",hasValue:true,
             options:[],
             validate:RED.utils.validatePropertyExpression,
@@ -265,6 +345,47 @@
             }
         }
     };
+
+    // For a type with options, check value is a valid selection
+    // If !opt.multiple, returns the valid option object
+    // if opt.multiple, returns an array of valid option objects
+    // If not valid, returns null;
+
+    function isOptionValueValid(opt, currentVal) {
+        if (!opt.multiple) {
+            for (var i=0;i<opt.options.length;i++) {
+                op = opt.options[i];
+                if (typeof op === "string" && op === currentVal) {
+                    return {value:currentVal}
+                } else if (op.value === currentVal) {
+                    return op;
+                }
+            }
+        } else {
+            // Check to see if value is a valid csv of
+            // options.
+            var currentValues = {};
+            var selected = [];
+            currentVal.split(",").forEach(function(v) {
+                if (v) {
+                    currentValues[v] = true;
+                }
+            });
+            for (var i=0;i<opt.options.length;i++) {
+                op = opt.options[i];
+                var val = typeof op === "string" ? op : op.value;
+                if (currentValues.hasOwnProperty(val)) {
+                    delete currentValues[val];
+                    selected.push(typeof op === "string" ? {value:op} : op.value)
+                }
+            }
+            if (!$.isEmptyObject(currentValues)) {
+                return null;
+            }
+            return selected
+        }
+    }
+
     var nlsd = false;
 
     $.widget( "nodered.typedInput", {
@@ -298,7 +419,8 @@
             }
             nlsd = true;
             var that = this;
-
+            this.identifier = this.element.attr('id') || "TypedInput-"+Math.floor(Math.random()*100);
+            if (this.options.debug) { console.log(this.identifier,"Create",{defaultType:this.options.default, value:this.element.val()}) }
             this.disarmClick = false;
             this.input = $('<input class="red-ui-typedInput-input" type="text"></input>');
             this.input.insertAfter(this.element);
@@ -328,6 +450,8 @@
             });
 
             this.defaultInputType = this.input.attr('type');
+            // Used to remember selections per-type to restore them when switching between types
+            this.oldValues = {};
 
             this.uiSelect.addClass("red-ui-typedInput-container");
 
@@ -380,6 +504,9 @@
                 that.element.trigger('paste',evt);
             });
             this.input.on('keydown', function(evt) {
+                if (that.typeMap[that.propertyType].autoComplete) {
+                    return
+                }
                 if (evt.keyCode >= 37 && evt.keyCode <= 40) {
                     evt.stopPropagation();
                 }
@@ -407,9 +534,9 @@
             // explicitly set optionSelectTrigger display to inline-block otherwise jQ sets it to 'inline'
             this.optionSelectTrigger = $('<button tabindex="0" class="red-ui-typedInput-option-trigger" style="display:inline-block"><span class="red-ui-typedInput-option-caret"><i class="red-ui-typedInput-icon fa fa-caret-down"></i></span></button>').appendTo(this.uiSelect);
             this.optionSelectLabel = $('<span class="red-ui-typedInput-option-label"></span>').prependTo(this.optionSelectTrigger);
-            RED.popover.tooltip(this.optionSelectLabel,function() {
-                return that.optionValue;
-            });
+            // RED.popover.tooltip(this.optionSelectLabel,function() {
+            //     return that.optionValue;
+            // });
             this.optionSelectTrigger.on("click", function(event) {
                 event.preventDefault();
                 event.stopPropagation();
@@ -428,7 +555,9 @@
 
             this.optionExpandButton = $('<button tabindex="0" class="red-ui-typedInput-option-expand" style="display:inline-block"></button>').appendTo(this.uiSelect);
             this.optionExpandButtonIcon = $('<i class="red-ui-typedInput-icon fa fa-ellipsis-h"></i>').appendTo(this.optionExpandButton);
-            this.type(this.options.default||this.typeList[0].value);
+
+            this.type(this.typeField.val() || this.options.default||this.typeList[0].value);
+            this.typeChanged = !!this.options.default;
         }catch(err) {
             console.log(err.stack);
         }
@@ -579,7 +708,7 @@
             var height = relativeTo.height();
             var menuHeight = menu.height();
             var top = (height+pos.top);
-            if (top+menuHeight > $(window).height()) {
+            if (top+menuHeight-$(document).scrollTop() > $(window).height()) {
                 top -= (top+menuHeight)-$(window).height()+5;
             }
             if (top < 0) {
@@ -676,6 +805,7 @@
             var that = this;
             var currentType = this.type();
             this.typeMap = {};
+            var firstCall = (this.typeList === undefined);
             this.typeList = types.map(function(opt) {
                 var result;
                 if (typeof opt === 'string') {
@@ -688,8 +818,10 @@
             });
             if (this.typeList.length < 2) {
                 this.selectTrigger.attr("tabindex", -1)
+                this.selectTrigger.on("mousedown.red-ui-typedInput-focus-block", function(evt) { evt.preventDefault(); })
             } else {
                 this.selectTrigger.attr("tabindex", 0)
+                this.selectTrigger.off("mousedown.red-ui-typedInput-focus-block")
             }
             this.selectTrigger.toggleClass("disabled", this.typeList.length === 1);
             this.selectTrigger.find(".fa-caret-down").toggle(this.typeList.length > 1)
@@ -698,10 +830,19 @@
             }
             this.menu = this._createMenu(this.typeList,{},function(v) { that.type(v) });
             if (currentType && !this.typeMap.hasOwnProperty(currentType)) {
-                this.type(this.typeList[0].value);
+                if (!firstCall) {
+                    this.type(this.typeList[0].value);
+                }
             } else {
                 this.propertyType = null;
-                this.type(currentType);
+                if (!firstCall) {
+                    this.type(currentType);
+                }
+            }
+            if (this.typeList.length === 1 && !this.typeList[0].icon && (!this.typeList[0].label || this.typeList[0].showLabel === false)) {
+                this.selectTrigger.hide()
+            } else {
+                this.selectTrigger.show()
             }
         },
         width: function(desiredWidth) {
@@ -712,7 +853,10 @@
         },
         value: function(value) {
             var that = this;
-            var opt = this.typeMap[this.propertyType];
+            // If the default type has been set to an invalid type, then on first
+            // creation, the current propertyType will not exist. Default to an
+            // empty object on the assumption the corrent type will be set shortly
+            var opt = this.typeMap[this.propertyType] || {};
             if (!arguments.length) {
                 var v = this.input.val();
                 if (opt.export) {
@@ -720,27 +864,38 @@
                 }
                 return v;
             } else {
+                if (this.options.debug) { console.log(this.identifier,"----- SET VALUE ------",value) }
                 var selectedOption = [];
+                var valueToCheck = value;
                 if (opt.options) {
-                    var checkValues = [value];
+                    if (opt.hasValue && opt.parse) {
+                        var parts = opt.parse(value);
+                        if (this.options.debug) { console.log(this.identifier,"new parse",parts) }
+                        value = parts.value;
+                        valueToCheck = parts.option || parts.value;
+                    }
+
+                    var checkValues = [valueToCheck];
                     if (opt.multiple) {
                         selectedOption = [];
-                        checkValues = value.split(",");
+                        checkValues = valueToCheck.split(",");
                     }
-                    checkValues.forEach(function(value) {
+                    checkValues.forEach(function(valueToCheck) {
                         for (var i=0;i<opt.options.length;i++) {
                             var op = opt.options[i];
                             if (typeof op === "string") {
-                                if (op === value || op === ""+value) {
+                                if (op === valueToCheck || op === ""+valueToCheck) {
                                     selectedOption.push(that.activeOptions[op]);
                                     break;
                                 }
-                            } else if (op.value === value) {
+                            } else if (op.value === valueToCheck) {
                                 selectedOption.push(op);
                                 break;
                             }
                         }
                     })
+                    if (this.options.debug) { console.log(this.identifier,"set value to",value) }
+
                     this.input.val(value);
                     if (!opt.multiple) {
                         if (selectedOption.length === 0) {
@@ -765,9 +920,64 @@
                 return this.propertyType;
             } else {
                 var that = this;
+                if (this.options.debug) { console.log(this.identifier,"----- SET TYPE -----",type) }
+                var previousValue = null;
                 var opt = this.typeMap[type];
                 if (opt && this.propertyType !== type) {
+                    // If previousType is !null, then this is a change of the type, rather than the initialisation
+                    var previousType = this.typeMap[this.propertyType];
+                    previousValue = this.input.val();
+
+                    if (previousType && this.typeChanged) {
+                        if (this.options.debug) { console.log(this.identifier,"typeChanged",{previousType,previousValue}) }
+                        if (previousType.options && opt.hasValue !== true) {
+                            this.oldValues[previousType.value] = previousValue;
+                        } else if (previousType.hasValue === false) {
+                            this.oldValues[previousType.value] = previousValue;
+                        } else {
+                            this.oldValues["_"] = previousValue;
+                        }
+                        if ((opt.options && opt.hasValue !== true) || opt.hasValue === false) {
+                            if (this.oldValues.hasOwnProperty(opt.value)) {
+                                if (this.options.debug) { console.log(this.identifier,"restored previous (1)",this.oldValues[opt.value]) }
+                                this.input.val(this.oldValues[opt.value]);
+                            } else if (opt.options) {
+                                // No old value for the option type.
+                                // It is possible code has called 'value' then 'type'
+                                // to set the selected option. This is what the Inject/Switch/Change
+                                // nodes did before 2.1.
+                                // So we need to be careful to not reset the value if it is a valid option.
+                                var validOptions = isOptionValueValid(opt,previousValue);
+                                if (this.options.debug) { console.log(this.identifier,{previousValue,opt,validOptions}) }
+                                if ((previousValue || previousValue === '') && validOptions) {
+                                    if (this.options.debug) { console.log(this.identifier,"restored previous (2)") }
+                                    this.input.val(previousValue);
+                                } else {
+                                    if (typeof opt.default === "string") {
+                                        if (this.options.debug) { console.log(this.identifier,"restored previous (3)",opt.default) }
+                                        this.input.val(opt.default);
+                                    } else if (Array.isArray(opt.default)) {
+                                        if (this.options.debug) { console.log(this.identifier,"restored previous (4)",opt.default.join(",")) }
+                                        this.input.val(opt.default.join(","))
+                                    } else {
+                                        if (this.options.debug) { console.log(this.identifier,"restored previous (5)") }
+                                        this.input.val("");
+                                    }
+                                }
+                            } else {
+                                if (this.options.debug) { console.log(this.identifier,"restored default/blank",opt.default||"") }
+                                this.input.val(opt.default||"")
+                            }
+                        } else {
+                            if (this.options.debug) { console.log(this.identifier,"restored old/default/blank") }
+                            this.input.val(this.oldValues.hasOwnProperty("_")?this.oldValues["_"]:(opt.default||""))
+                        }
+                        if (previousType.autoComplete) {
+                            this.input.autoComplete("destroy");
+                        }
+                    }
                     this.propertyType = type;
+                    this.typeChanged = true;
                     if (this.typeField) {
                         this.typeField.val(type);
                     }
@@ -836,22 +1046,12 @@
 
                             var op;
                             if (!opt.hasValue) {
-                                var validValue = false;
-                                var currentVal = this.input.val();
+                                // Check the value is valid for the available options
+                                var validValues = isOptionValueValid(opt,this.input.val());
                                 if (!opt.multiple) {
-                                    for (var i=0;i<opt.options.length;i++) {
-                                        op = opt.options[i];
-                                        if (typeof op === "string" && op === currentVal) {
-                                            that._updateOptionSelectLabel({value:currentVal});
-                                            validValue = true;
-                                            break;
-                                        } else if (op.value === currentVal) {
-                                            that._updateOptionSelectLabel(op);
-                                            validValue = true;
-                                            break;
-                                        }
-                                    }
-                                    if (!validValue) {
+                                    if (validValues) {
+                                        that._updateOptionSelectLabel(validValues)
+                                    } else {
                                         op = opt.options[0];
                                         if (typeof op === "string") {
                                             this.value(op);
@@ -862,27 +1062,19 @@
                                         }
                                     }
                                 } else {
-                                    // Check to see if value is a valid csv of
-                                    // options.
-                                    var currentValues = {};
-                                    currentVal.split(",").forEach(function(v) {
-                                        if (v) {
-                                            currentValues[v] = true;
-                                        }
-                                    });
-                                    for (var i=0;i<opt.options.length;i++) {
-                                        op = opt.options[i];
-                                        delete currentValues[op.value||op];
-                                    }
-                                    if (!$.isEmptyObject(currentValues)) {
-                                        // Invalid, set to default/empty
-                                        this.value((opt.default||[]).join(","));
+                                    if (!validValues) {
+                                        validValues = (opt.default || []).map(function(v) {
+                                            return typeof v === "string"?v:v.value
+                                        });
+                                        this.value(validValues.join(","));
                                     }
+                                    that._updateOptionSelectLabel(validValues);
                                 }
                             } else {
                                 var selectedOption = this.optionValue||opt.options[0];
                                 if (opt.parse) {
-                                    var parts = opt.parse(this.input.val(),selectedOption);
+                                    var selectedOptionObj = typeof selectedOption === "string"?{value:selectedOption}:selectedOption
+                                    var parts = opt.parse(this.input.val(),selectedOptionObj);
                                     if (parts.option) {
                                         selectedOption = parts.option;
                                         if (!this.activeOptions.hasOwnProperty(selectedOption)) {
@@ -906,6 +1098,7 @@
                                         this._updateOptionSelectLabel(this.activeOptions[selectedOption]);
                                     }
                                 } else if (selectedOption) {
+                                    if (this.options.debug) { console.log(this.identifier,"HERE",{optionValue:selectedOption.value}) }
                                     this.optionValue = selectedOption.value;
                                     this._updateOptionSelectLabel(selectedOption);
                                 } else {
@@ -938,8 +1131,6 @@
                             this.input.attr('type',this.defaultInputType)
                         }
                         if (opt.hasValue === false) {
-                            this.oldValue = this.input.val();
-                            this.input.val("");
                             this.elementDiv.hide();
                             this.valueLabelContainer.hide();
                         } else if (opt.valueLabel) {
@@ -952,12 +1143,13 @@
                             this.elementDiv.hide();
                             opt.valueLabel.call(this,this.valueLabelContainer,this.input.val());
                         } else {
-                            if (this.oldValue !== undefined) {
-                                this.input.val(this.oldValue);
-                                delete this.oldValue;
-                            }
                             this.valueLabelContainer.hide();
                             this.elementDiv.show();
+                            if (opt.autoComplete) {
+                                this.input.autoComplete({
+                                    search: opt.autoComplete
+                                })
+                            }
                         }
                         if (this.optionExpandButton) {
                             if (opt.expand) {
@@ -1042,6 +1234,9 @@
         },
         disabled: function() {
             return this.uiSelect.attr("disabled") === "disabled";
+        },
+        focus: function() {
+            this.input.focus();
         }
     });
 })(jQuery);

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

@@ -333,6 +333,19 @@ RED.deploy = (function() {
                 var unknownNodes = [];
                 var invalidNodes = [];
 
+                RED.nodes.eachConfig(function(node) {
+                    if (node.valid === undefined) {
+                        RED.editor.validateNode(node);
+                    }
+                    if (!node.valid && !node.d) {
+                        invalidNodes.push(getNodeInfo(node));
+                    }
+                    if (node.type === "unknown") {
+                        if (unknownNodes.indexOf(node.name) == -1) {
+                            unknownNodes.push(node.name);
+                        }
+                    }                    
+                });
                 RED.nodes.eachNode(function(node) {
                     if (!node.valid && !node.d) {
                         invalidNodes.push(getNodeInfo(node));

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

@@ -554,6 +554,8 @@ RED.diff = (function() {
                     color: "#DDAA99",
                     defaults:{name:{value:""}}
                 }
+            } else if (node.type === "group") {
+                def = RED.group.def;
             } else {
                 def = {};
             }
@@ -763,16 +765,15 @@ RED.diff = (function() {
             }
         }
 
-
         if (node.hasOwnProperty('x')) {
             if (localNode) {
-                if (localNode.x !== node.x || localNode.y !== node.y) {
+                if (localNode.x !== node.x || localNode.y !== node.y || localNode.w !== node.w || localNode.h !== node.h ) {
                     localChanged = true;
                     localChanges++;
                 }
             }
             if (remoteNode) {
-                if (remoteNode.x !== node.x || remoteNode.y !== node.y) {
+                if (remoteNode.x !== node.x || remoteNode.y !== node.y|| remoteNode.w !== node.w || remoteNode.h !== node.h) {
                     remoteChanged = true;
                     remoteChanges++;
                 }
@@ -790,7 +791,12 @@ RED.diff = (function() {
                 localCell.addClass("red-ui-diff-status-"+(localChanged?"changed":"unchanged"));
                 $('<span class="red-ui-diff-status">'+(localChanged?'<i class="fa fa-square"></i>':'')+'</span>').appendTo(localCell);
                 element = $('<span class="red-ui-diff-list-element"></span>').appendTo(localCell);
-                propertyElements['local.position'] = RED.utils.createObjectElement({x:localNode.x,y:localNode.y},
+                var localPosition = {x:localNode.x,y:localNode.y};
+                if (localNode.hasOwnProperty('w')) {
+                    localPosition.w = localNode.w;
+                    localPosition.h = localNode.h;
+                }
+                propertyElements['local.position'] = RED.utils.createObjectElement(localPosition,
                     {
                         path: "position",
                         exposeApi: true,
@@ -811,7 +817,12 @@ RED.diff = (function() {
                 if (remoteNode) {
                     $('<span class="red-ui-diff-status">'+(remoteChanged?'<i class="fa fa-square"></i>':'')+'</span>').appendTo(remoteCell);
                     element = $('<span class="red-ui-diff-list-element"></span>').appendTo(remoteCell);
-                    propertyElements['remote.position'] = RED.utils.createObjectElement({x:remoteNode.x,y:remoteNode.y},
+                    var remotePosition = {x:remoteNode.x,y:remoteNode.y};
+                    if (remoteNode.hasOwnProperty('w')) {
+                        remotePosition.w = remoteNode.w;
+                        remotePosition.h = remoteNode.h;
+                    }
+                    propertyElements['remote.position'] = RED.utils.createObjectElement(remotePosition,
                         {
                             path: "position",
                             exposeApi: true,
@@ -883,11 +894,11 @@ RED.diff = (function() {
                 }
             }
         }
-        var properties = Object.keys(node).filter(function(p) { return p!='inputLabels'&&p!='outputLabels'&&p!='z'&&p!='wires'&&p!=='x'&&p!=='y'&&p!=='id'&&p!=='type'&&(!def.defaults||!def.defaults.hasOwnProperty(p))});
+        var properties = Object.keys(node).filter(function(p) { return p!='inputLabels'&&p!='outputLabels'&&p!='z'&&p!='wires'&&p!=='x'&&p!=='y'&&p!=='w'&&p!=='h'&&p!=='id'&&p!=='type'&&(!def.defaults||!def.defaults.hasOwnProperty(p))});
         if (def.defaults) {
             properties = properties.concat(Object.keys(def.defaults));
         }
-        if (node.type !== 'tab') {
+        if (node.type !== 'tab' && node.type !== "group") {
             properties = properties.concat(['inputLabels','outputLabels']);
         }
         if ( ((localNode && localNode.hasOwnProperty('icon')) || (remoteNode && remoteNode.hasOwnProperty('icon'))) &&
@@ -1376,6 +1387,7 @@ RED.diff = (function() {
 
     function mergeDiff(diff) {
         //console.log(diff);
+        var selectedTab = RED.workspaces.active();
         var appliedDiff = applyDiff(diff);
 
         var newConfig = appliedDiff.config;
@@ -1426,6 +1438,7 @@ RED.diff = (function() {
         RED.view.redraw(true);
         RED.palette.refresh();
         RED.workspaces.refresh();
+        RED.workspaces.show(selectedTab, true);
         RED.sidebar.config.refresh();
     }
 

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

@@ -0,0 +1,107 @@
+/**
+ * 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.
+ **/
+
+/**
+ * @namespace RED.editor.codeEditor
+ */
+ RED.editor.codeEditor = (function() {
+
+    const MONACO = "monaco";
+    const ACE = "ace";
+    const defaultEditor = ACE;
+    const DEFAULT_SETTINGS = { lib: defaultEditor, options: {} };
+    var selectedCodeEditor = null;
+    var initialised = false;
+
+    function init() {
+        var codeEditorSettings = RED.editor.codeEditor.settings;
+        var editorChoice = codeEditorSettings.lib === MONACO ? MONACO : ACE;
+        try {
+            var browser = RED.utils.getBrowserInfo();
+            selectedCodeEditor = RED.editor.codeEditor[editorChoice];
+            //fall back to default code editor if there are any issues
+            if (!selectedCodeEditor || (editorChoice === MONACO && (browser.ie || !window.monaco))) {
+                selectedCodeEditor = RED.editor.codeEditor[defaultEditor];
+            }
+            initialised = selectedCodeEditor.init();
+        } catch (error) {
+            selectedCodeEditor = null;
+            console.warn("Problem initialising '" + editorChoice + "' code editor", error);
+        }
+        if(!initialised) {
+            selectedCodeEditor = RED.editor.codeEditor[defaultEditor];
+            initialised = selectedCodeEditor.init();
+        }
+    }
+
+    function create(options) {
+        //TODO: (quandry - for consideration) 
+        // Below, I had to create a hidden element if options.id || options.element is not in the DOM
+        // I have seen 1 node calling  `this.editor = RED.editor.createEditor()` with an 
+        // invalid (non existing html element selector) (e.g. node-red-contrib-components does this)
+        // This causes monaco to throw an error when attempting to hook up its events to the dom  & the rest of the 'oneditperapre' 
+        // code is thus skipped. 
+        // In ACE mode, creating an ACE editor (with an invalid ID) allows the editor to be created (but obviously there is no UI)
+        // Because one (or more) contrib nodes have left this bad code in place, how would we handle this?
+        // For compatibility, I have decided to create a hidden element so that at least an editor is created & errors do not occur.
+        // IMO, we should warn and exit as it is a coding error by the contrib author.
+
+        if (!options) {
+            console.warn("createEditor() options are missing");
+            options = {};
+        }
+
+        if (this.editor.type === MONACO) {
+            // compatibility (see above note)
+            if (!options.element && !options.id) {
+                options.id = 'node-backwards-compatability-dummy-editor';
+            }
+            options.element = options.element || $("#" + options.id)[0];
+            if (!options.element) {
+                console.warn("createEditor() options.element or options.id is not valid", options);
+                $("#dialog-form").append('<div id="' + options.id + '" style="display: none;" />');
+            }
+            return this.editor.create(options);
+        } else {
+            return this.editor.create(options);//fallback to ACE
+        }
+    }
+ 
+    return {
+        init: init,
+        /**
+         * Get editor settings object
+         * @memberof RED.editor.codeEditor
+         */
+        get settings() {
+          return RED.settings.get('codeEditor') || DEFAULT_SETTINGS;
+        },
+        /**
+         * Get user selected code editor
+         * @return {string} Returns 
+         * @memberof RED.editor.codeEditor
+         */
+        get editor() {
+            return selectedCodeEditor;
+        },
+        /**
+         * Create a editor ui component
+         * @param {object} options - the editor options
+         * @memberof RED.editor.codeEditor
+         */
+        create: create
+    }
+})();

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

@@ -0,0 +1,153 @@
+/*
+* 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.
+**/
+
+/**
+* @namespace RED.editor.codeEditor.ace
+*/
+RED.editor.codeEditor.ace = (function() {
+
+    const type = "ace";
+    var initialised = false;
+    var initOptions = {};
+
+    function init(options) {
+        initOptions = options || {}; 
+        initialised = true;
+        return initialised;
+    }
+
+    function create(options) {
+        var editorSettings = RED.editor.codeEditor.settings || {};
+        var el = options.element || $("#"+options.id)[0];
+        var toolbarRow = $("<div>").appendTo(el);
+        el = $("<div>").appendTo(el).addClass("red-ui-editor-text-container")[0];
+        var editor = window.ace.edit(el);
+        editor.setTheme(editorSettings.theme || initOptions.theme || "ace/theme/tomorrow");
+        var session = editor.getSession();
+        session.on("changeAnnotation", function () {
+            var annotations = session.getAnnotations() || [];
+            var i = annotations.length;
+            var len = annotations.length;
+            while (i--) {
+                if (/doctype first\. Expected/.test(annotations[i].text)) { annotations.splice(i, 1); }
+                else if (/Unexpected End of file\. Expected/.test(annotations[i].text)) { annotations.splice(i, 1); }
+            }
+            if (len > annotations.length) { session.setAnnotations(annotations); }
+        });
+        if (options.mode) {
+            session.setMode(options.mode);
+        }
+        if (options.foldStyle) {
+            session.setFoldStyle(options.foldStyle);
+        } else {
+            session.setFoldStyle('markbeginend');
+        }
+        if (options.options) {
+            editor.setOptions(options.options);
+        } else {
+            editor.setOptions({
+                enableBasicAutocompletion:true,
+                enableSnippets:true,
+                tooltipFollowsMouse: false
+            });
+        }
+        if (options.readOnly) {
+            editor.setOption('readOnly',options.readOnly);
+            editor.container.classList.add("ace_read-only");
+        }
+        if (options.hasOwnProperty('lineNumbers')) {
+            editor.renderer.setOption('showGutter',options.lineNumbers);
+        }
+        editor.$blockScrolling = Infinity;
+        if (options.value) {
+            session.setValue(options.value,-1);
+        }
+        if (options.globals) {
+            setTimeout(function() {
+                if (!!session.$worker) {
+                    session.$worker.send("setOptions", [{globals: options.globals, maxerr:1000}]);
+                }
+            },100);
+        }
+        if (options.mode === 'ace/mode/markdown') {
+            $(el).addClass("red-ui-editor-text-container-toolbar");
+            editor.toolbar = RED.editor.customEditTypes['_markdown'].buildToolbar(toolbarRow,editor);
+            if (options.expandable !== false) {
+                var expandButton = $('<button type="button" class="red-ui-button" style="float: right;"><i class="fa fa-expand"></i></button>').appendTo(editor.toolbar);
+                RED.popover.tooltip(expandButton, RED._("markdownEditor.expand"));
+                expandButton.on("click", function(e) {
+                    e.preventDefault();
+                    var value = editor.getValue();
+                    RED.editor.editMarkdown({
+                        value: value,
+                        width: "Infinity",
+                        cursor: editor.getCursorPosition(),
+                        complete: function(v,cursor) {
+                            editor.setValue(v, -1);
+                            editor.gotoLine(cursor.row+1,cursor.column,false);
+                            setTimeout(function() {
+                                editor.focus();
+                            },300);
+                        }
+                    })
+                });
+            }
+            var helpButton = $('<button type="button" class="red-ui-editor-text-help red-ui-button red-ui-button-small"><i class="fa fa-question"></i></button>').appendTo($(el).parent());
+            RED.popover.create({
+                target: helpButton,
+                trigger: 'click',
+                size: "small",
+                direction: "left",
+                content: RED._("markdownEditor.format"),
+                autoClose: 50
+            });
+            session.setUseWrapMode(true);
+        }
+        editor._destroy = editor.destroy;
+        editor.destroy = function() {
+            try {
+                this._destroy();
+            } catch (e) { }
+            $(el).remove();
+            $(toolbarRow).remove();
+        }
+        editor.type = type;
+        return editor;
+    }
+
+    return {
+        /**
+         * Editor type
+         * @memberof RED.editor.codeEditor.ace
+         */
+         get type() { return type; },
+         /**
+          * Editor initialised
+         * @memberof RED.editor.codeEditor.ace
+         */
+        get initialised() { return initialised; },
+        /**
+         * Initialise code editor
+         * @param {object} options - initialisation options
+         * @memberof RED.editor.codeEditor.ace
+         */
+         init: init,
+         /**
+          * Create a code editor
+          * @param {object} options - the editor options
+          * @memberof RED.editor.codeEditor.ace
+          */
+         create: create
+    }
+})();

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

@@ -1,4 +1,4 @@
-RED.colorPicker = (function() {
+RED.editor.colorPicker = RED.colorPicker = (function() {
 
     function create(options) {
         var color = options.value;

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

@@ -0,0 +1,616 @@
+RED.editor.envVarList = (function() {
+
+    var currentLocale = 'en-US';
+    var DEFAULT_ENV_TYPE_LIST = ['str','num','bool','json','bin','env'];
+    var DEFAULT_ENV_TYPE_LIST_INC_CRED = ['str','num','bool','json','bin','env','cred'];
+
+    /**
+     * Create env var edit interface
+     * @param container - container
+     * @param node - subflow node
+     */
+    function buildPropertiesList(envContainer, node) {
+
+        var isTemplateNode = (node.type === "subflow");
+
+        envContainer
+            .css({
+                'min-height':'150px',
+                'min-width':'450px'
+            })
+            .editableList({
+                header: isTemplateNode?$('<div><div><div></div><div data-i18n="common.label.name"></div><div data-i18n="editor-tab.defaultValue"></div><div></div></div></div>'):undefined,
+                addItem: function(container, i, opt) {
+                    // If this is an instance node, these are properties unique to
+                    // this instance - ie opt.parent will not be defined.
+
+                    if (isTemplateNode) {
+                        container.addClass("red-ui-editor-subflow-env-editable")
+                    }
+
+                    var envRow = $('<div/>').appendTo(container);
+                    var nameField = null;
+                    var valueField = null;
+
+                    nameField = $('<input/>', {
+                        class: "node-input-env-name",
+                        type: "text",
+                        placeholder: RED._("common.label.name")
+                    }).attr("autocomplete","disable").appendTo(envRow).val(opt.name);
+                    valueField = $('<input/>',{
+                        style: "width:100%",
+                        class: "node-input-env-value",
+                        type: "text",
+                    }).attr("autocomplete","disable").appendTo(envRow)
+                    valueField.typedInput({default:'str',types:isTemplateNode?DEFAULT_ENV_TYPE_LIST:DEFAULT_ENV_TYPE_LIST_INC_CRED});
+                    valueField.typedInput('type', opt.type);
+                    if (opt.type === "cred") {
+                        if (opt.value) {
+                            valueField.typedInput('value', opt.value);
+                        } else if (node.credentials && node.credentials[opt.name]) {
+                            valueField.typedInput('value', node.credentials[opt.name]);
+                        } else if (node.credentials && node.credentials['has_'+opt.name]) {
+                            valueField.typedInput('value', "__PWRD__");
+                        } else {
+                            valueField.typedInput('value', "");
+                        }
+                    } else {
+                        valueField.typedInput('value', opt.value);
+                    }
+
+
+                    opt.nameField = nameField;
+                    opt.valueField = valueField;
+
+                    var actionButton = $('<a/>',{href:"#",class:"red-ui-editableList-item-remove red-ui-button red-ui-button-small"}).appendTo(envRow);
+                    $('<i/>',{class:"fa "+(opt.parent?"fa-reply":"fa-remove")}).appendTo(actionButton);
+                    var removeTip = RED.popover.tooltip(actionButton,RED._("subflow.env.remove"));
+                    actionButton.on("click", function(evt) {
+                        evt.preventDefault();
+                        removeTip.close();
+                        container.parent().addClass("red-ui-editableList-item-deleting")
+                        container.fadeOut(300, function() {
+                            envContainer.editableList('removeItem',opt);
+                        });
+                    });
+
+                    if (isTemplateNode) {
+                        // Add the UI customisation row
+                        // if `opt.ui` does not exist, then apply defaults. If these
+                        // defaults do not change then they will get stripped off
+                        // before saving.
+                        if (opt.type === 'cred') {
+                            opt.ui = opt.ui || {
+                                icon: "",
+                                type: "cred"
+                            }
+                            opt.ui.type = "cred";
+                        } else {
+                            opt.ui = opt.ui || {
+                                icon: "",
+                                type: "input",
+                                opts: {types:DEFAULT_ENV_TYPE_LIST}
+                            }
+                        }
+                        opt.ui.label = opt.ui.label || {};
+                        opt.ui.type = opt.ui.type || "input";
+
+                        var uiRow = $('<div/>').appendTo(container).hide();
+                        // save current info for reverting on cancel
+                        // var copy = $.extend(true, {}, ui);
+
+                         $('<a href="#"><i class="fa fa-angle-right"></a>').prependTo(envRow).on("click", function (evt) {
+                            evt.preventDefault();
+                            if ($(this).hasClass('expanded')) {
+                                uiRow.slideUp();
+                                $(this).removeClass('expanded');
+                            } else {
+                                uiRow.slideDown();
+                                $(this).addClass('expanded');
+                            }
+                        });
+
+                        buildEnvEditRow(uiRow, opt.ui, nameField, valueField);
+                        nameField.trigger('change');
+                    }
+                },
+                sortable: ".red-ui-editableList-item-handle",
+                removable: false
+            });
+        var parentEnv = {};
+        var envList = [];
+        if (/^subflow:/.test(node.type)) {
+            var subflowDef = RED.nodes.subflow(node.type.substring(8));
+            if (subflowDef.env) {
+                subflowDef.env.forEach(function(env) {
+                    var item = {
+                        name:env.name,
+                        parent: {
+                            type: env.type,
+                            value: env.value,
+                            ui: env.ui
+                        }
+                    }
+                    envList.push(item);
+                    parentEnv[env.name] = item;
+                })
+            }
+        }
+
+        if (node.env) {
+            for (var i = 0; i < node.env.length; i++) {
+                var env = node.env[i];
+                if (parentEnv.hasOwnProperty(env.name)) {
+                    parentEnv[env.name].type = env.type;
+                    parentEnv[env.name].value = env.value;
+                } else {
+                    envList.push({
+                        name: env.name,
+                        type: env.type,
+                        value: env.value,
+                        ui: env.ui
+                    });
+                }
+            }
+        }
+        envList.forEach(function(env) {
+            if (env.parent && env.parent.ui && env.parent.ui.type === 'hide') {
+                return;
+            }
+            if (!isTemplateNode && env.parent) {
+                return;
+            }
+            envContainer.editableList('addItem', JSON.parse(JSON.stringify(env)));
+        });
+    }
+
+
+    /**
+     * Create UI edit interface for environment variable
+     * @param container - container
+     * @param env - env var definition
+     * @param nameField - name field of env var
+     * @param valueField - value field of env var
+     */
+     function buildEnvEditRow(container, ui, nameField, valueField) {
+         container.addClass("red-ui-editor-subflow-env-ui-row")
+         var topRow = $('<div></div>').appendTo(container);
+         $('<div></div>').appendTo(topRow);
+         $('<div>').text(RED._("editor.icon")).appendTo(topRow);
+         $('<div>').text(RED._("editor.label")).appendTo(topRow);
+         $('<div>').text(RED._("editor.inputType")).appendTo(topRow);
+
+         var row = $('<div></div>').appendTo(container);
+         $('<div><i class="red-ui-editableList-item-handle fa fa-bars"></i></div>').appendTo(row);
+         var typeOptions = {
+             'input': {types:DEFAULT_ENV_TYPE_LIST},
+             'select': {opts:[]},
+             'spinner': {},
+             'cred': {}
+         };
+         if (ui.opts) {
+             typeOptions[ui.type] = ui.opts;
+         } else {
+             // Pick up the default values if not otherwise provided
+             ui.opts = typeOptions[ui.type];
+         }
+         var iconCell = $('<div></div>').appendTo(row);
+
+         var iconButton = $('<a href="#"></a>').appendTo(iconCell);
+         iconButton.on("click", function(evt) {
+             evt.preventDefault();
+             var icon = ui.icon || "";
+             var iconPath = (icon ? RED.utils.separateIconPath(icon) : {});
+             RED.editor.iconPicker.show(iconButton, null, iconPath, true, function (newIcon) {
+                 iconButton.empty();
+                 var path = newIcon || "";
+                 var newPath = RED.utils.separateIconPath(path);
+                 if (newPath) {
+                     $('<i class="fa"></i>').addClass(newPath.file).appendTo(iconButton);
+                 }
+                 ui.icon = path;
+             });
+         })
+
+         if (ui.icon) {
+             var newPath = RED.utils.separateIconPath(ui.icon);
+             $('<i class="fa '+newPath.file+'"></i>').appendTo(iconButton);
+         }
+
+         var labelCell = $('<div></div>').appendTo(row);
+
+         var label = ui.label && ui.label[currentLocale] || "";
+         var labelInput = $('<input type="text">').val(label).appendTo(labelCell);
+         ui.labelField = labelInput;
+         labelInput.on('change', function(evt) {
+             ui.label = ui.label || {};
+             var val = $(this).val().trim();
+             if (val === "") {
+                 delete ui.label[currentLocale];
+             } else {
+                 ui.label[currentLocale] = val;
+             }
+         })
+         var labelIcon = $('<span class="red-ui-editor-subflow-env-lang-icon"><i class="fa fa-language"></i></span>').appendTo(labelCell);
+         RED.popover.tooltip(labelIcon,function() {
+             var langs = Object.keys(ui.label);
+             var content = $("<div>");
+             if (langs.indexOf(currentLocale) === -1) {
+                 langs.push(currentLocale);
+                 langs.sort();
+             }
+             langs.forEach(function(l) {
+                 var row = $('<div>').appendTo(content);
+                 $('<span>').css({display:"inline-block",width:"120px"}).text(RED._("languages."+l)+(l===currentLocale?"*":"")).appendTo(row);
+                 $('<span>').text(ui.label[l]||"").appendTo(row);
+             });
+             return content;
+         })
+
+         nameField.on('change',function(evt) {
+            labelInput.attr("placeholder",$(this).val())
+        });
+
+        var inputCell = $('<div></div>').appendTo(row);
+        var inputCellInput = $('<input type="text">').css("width","100%").appendTo(inputCell);
+        if (ui.type === "input") {
+            inputCellInput.val(ui.opts.types.join(","));
+        }
+        var checkbox;
+        var selectBox;
+
+        inputCellInput.typedInput({
+            types: [
+                {
+                    value:"input",
+                    label:RED._("editor.inputs.input"), icon:"fa fa-i-cursor",showLabel:false,multiple:true,options:[
+                        {value:"str",label:RED._("editor.types.str"),icon:"red/images/typedInput/az.svg"},
+                        {value:"num",label:RED._("editor.types.num"),icon:"red/images/typedInput/09.svg"},
+                        {value:"bool",label:RED._("editor.types.bool"),icon:"red/images/typedInput/bool.svg"},
+                        {value:"json",label:RED._("editor.types.json"),icon:"red/images/typedInput/json.svg"},
+                        {value: "bin",label: RED._("editor.types.bin"),icon: "red/images/typedInput/bin.svg"},
+                        {value: "env",label: RED._("editor.types.env"),icon: "red/images/typedInput/env.svg"},
+                        {value: "cred",label: RED._("editor.types.cred"),icon: "fa fa-lock"}
+                    ],
+                    default: DEFAULT_ENV_TYPE_LIST,
+                    valueLabel: function(container,value) {
+                        container.css("padding",0);
+                        var innerContainer = $('<div class="red-ui-editor-subflow-env-input-type"></div>').appendTo(container);
+
+                        var input = $('<div class="placeholder-input">').appendTo(innerContainer);
+                        $('<span><i class="fa fa-i-cursor"></i></span>').appendTo(input);
+                        if (value.length) {
+                            value.forEach(function(v) {
+                                if (!/^fa /.test(v.icon)) {
+                                    $('<img>',{src:v.icon,style:"max-width:14px; padding: 0 3px; margin-top:-4px; margin-left: 1px"}).appendTo(input);
+                                } else {
+                                    var s = $('<span>',{style:"max-width:14px; padding: 0 3px; margin-top:-4px; margin-left: 1px"}).appendTo(input);
+                                    $("<i>",{class: v.icon}).appendTo(s);
+                                }
+                            })
+                        } else {
+                            $('<span class="red-ui-editor-subflow-env-input-type-placeholder"></span>').text(RED._("editor.selectType")).appendTo(input);
+                        }
+                    }
+                },
+                {
+                    value: "cred",
+                    label: RED._("typedInput.type.cred"), icon:"fa fa-lock", showLabel: false,
+                    valueLabel: function(container,value) {
+                        container.css("padding",0);
+                        var innerContainer = $('<div class="red-ui-editor-subflow-env-input-type">').css({
+                            "border-top-right-radius": "4px",
+                            "border-bottom-right-radius": "4px"
+                        }).appendTo(container);
+                        $('<div class="placeholder-input">').html("&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;").appendTo(innerContainer);
+                    }
+                },
+                {
+                    value:"select",
+                    label:RED._("editor.inputs.select"), icon:"fa fa-tasks",showLabel:false,
+                    valueLabel: function(container,value) {
+                        container.css("padding","0");
+
+                        selectBox = $('<select></select>').appendTo(container);
+                        if (ui.opts && Array.isArray(ui.opts.opts)) {
+                            ui.opts.opts.forEach(function(o) {
+                                var label = lookupLabel(o.l, o.l["en-US"]||o.v, currentLocale);
+                                // $('<option>').val((o.t||'str')+":"+o.v).text(label).appendTo(selectBox);
+                                $('<option>').val(o.v).text(label).appendTo(selectBox);
+                            })
+                        }
+                        selectBox.on('change', function(evt) {
+                            var v = selectBox.val();
+                            // var parts = v.split(":");
+                            // var t = parts.shift();
+                            // v = parts.join(":");
+                            //
+                            // valueField.typedInput("type",'str')
+                            valueField.typedInput("value",v)
+                        });
+                        selectBox.val(valueField.typedInput("value"));
+                        // selectBox.val(valueField.typedInput('type')+":"+valueField.typedInput("value"));
+                    },
+                    expand: {
+                        icon: "fa-caret-down",
+                        minWidth: 400,
+                        content: function(container) {
+                            var content = $('<div class="red-ui-editor-subflow-ui-edit-panel">').appendTo(container);
+                            var optList = $('<ol>').appendTo(content).editableList({
+                                header:$("<div><div>"+RED._("editor.select.label")+"</div><div>"+RED._("editor.select.value")+"</div></div>"),
+                                addItem: function(row,index,itemData) {
+                                    var labelDiv = $('<div>').appendTo(row);
+                                    var label = lookupLabel(itemData.l, "", currentLocale);
+                                    itemData.label = $('<input type="text">').val(label).appendTo(labelDiv);
+                                    itemData.label.on('keydown', function(evt) {
+                                        if (evt.keyCode === 13) {
+                                            itemData.input.focus();
+                                            evt.preventDefault();
+                                        }
+                                    });
+                                    var labelIcon = $('<span class="red-ui-editor-subflow-env-lang-icon"><i class="fa fa-language"></i></span>').appendTo(labelDiv);
+                                    RED.popover.tooltip(labelIcon,function() {
+                                        return currentLocale;
+                                    })
+                                    itemData.input = $('<input type="text">').val(itemData.v).appendTo(row);
+
+                                    // Problem using a TI here:
+                                    //  - this is in a popout panel
+                                    //  - clicking the expand button in the TI will close the parent edit tray
+                                    //    and open the type editor.
+                                    //  - but it leaves the popout panel over the top.
+                                    //  - there is no way to get back to the popout panel after closing the type editor
+                                    //.typedInput({default:itemData.t||'str', types:DEFAULT_ENV_TYPE_LIST});
+                                    itemData.input.on('keydown', function(evt) {
+                                        if (evt.keyCode === 13) {
+                                            // Enter or Tab
+                                            var index = optList.editableList('indexOf',itemData);
+                                            var length = optList.editableList('length');
+                                            if (index + 1 === length) {
+                                                var newItem = {};
+                                                optList.editableList('addItem',newItem);
+                                                setTimeout(function() {
+                                                    if (newItem.label) {
+                                                        newItem.label.focus();
+                                                    }
+                                                },100)
+                                            } else {
+                                                var nextItem = optList.editableList('getItemAt',index+1);
+                                                if (nextItem.label) {
+                                                    nextItem.label.focus()
+                                                }
+                                            }
+                                            evt.preventDefault();
+                                        }
+                                    });
+                                },
+                                sortable: true,
+                                removable: true,
+                                height: 160
+                            })
+                            if (ui.opts.opts.length > 0) {
+                                ui.opts.opts.forEach(function(o) {
+                                    optList.editableList('addItem',$.extend(true,{},o))
+                                })
+                            } else {
+                                optList.editableList('addItem',{})
+                            }
+                            return {
+                                onclose: function() {
+                                    var items = optList.editableList('items');
+                                    var vals = [];
+                                    items.each(function (i,el) {
+                                        var data = el.data('data');
+                                        var l = data.label.val().trim();
+                                        var v = data.input.val();
+                                        // var t = data.input.typedInput('type');
+                                        // var v = data.input.typedInput('value');
+                                        if (l.length > 0) {
+                                            data.l = data.l || {};
+                                            data.l[currentLocale] = l;
+                                        }
+                                        data.v = v;
+
+                                        if (l.length > 0 || v.length > 0) {
+                                            var val = {l:data.l,v:data.v};
+                                            // if (t !== 'str') {
+                                            //     val.t = t;
+                                            // }
+                                            vals.push(val);
+                                        }
+                                    });
+                                    ui.opts.opts = vals;
+                                    inputCellInput.typedInput('value',Date.now())
+                                }
+                            }
+                        }
+                    }
+                },
+                {
+                    value:"checkbox",
+                    label:RED._("editor.inputs.checkbox"), icon:"fa fa-check-square-o",showLabel:false,
+                    valueLabel: function(container,value) {
+                        container.css("padding",0);
+                        checkbox = $('<input type="checkbox">').appendTo(container);
+                        checkbox.on('change', function(evt) {
+                            valueField.typedInput('value',$(this).prop('checked')?"true":"false");
+                        })
+                        checkbox.prop('checked',valueField.typedInput('value')==="true");
+                    }
+                },
+                {
+                    value:"spinner",
+                    label:RED._("editor.inputs.spinner"), icon:"fa fa-sort-numeric-asc", showLabel:false,
+                    valueLabel: function(container,value) {
+                        container.css("padding",0);
+                        var innerContainer = $('<div class="red-ui-editor-subflow-env-input-type"></div>').appendTo(container);
+
+                        var input = $('<div class="placeholder-input">').appendTo(innerContainer);
+                        $('<span><i class="fa fa-sort-numeric-asc"></i></span>').appendTo(input);
+
+                        var min = ui.opts && ui.opts.min;
+                        var max = ui.opts && ui.opts.max;
+                        var label = "";
+                        if (min !== undefined && max !== undefined) {
+                            label = Math.min(min,max)+" - "+Math.max(min,max);
+                        } else if (min !== undefined) {
+                            label = "> "+min;
+                        } else if (max !== undefined) {
+                            label = "< "+max;
+                        }
+                        $('<span>').css("margin-left","15px").text(label).appendTo(input);
+                    },
+                    expand: {
+                        icon: "fa-caret-down",
+                        content: function(container) {
+                            var content = $('<div class="red-ui-editor-subflow-ui-edit-panel">').appendTo(container);
+                            content.css("padding","8px 5px")
+                            var min = ui.opts.min;
+                            var max = ui.opts.max;
+                            var minInput = $('<input type="number" style="margin-bottom:0; width:60px">');
+                            minInput.val(min);
+                            var maxInput = $('<input type="number" style="margin-bottom:0; width:60px">');
+                            maxInput.val(max);
+                            $('<div class="form-row" style="margin-bottom:3px"><label>'+RED._("editor.spinner.min")+'</label></div>').append(minInput).appendTo(content);
+                            $('<div class="form-row" style="margin-bottom:0"><label>'+RED._("editor.spinner.max")+'</label></div>').append(maxInput).appendTo(content);
+                            return {
+                                onclose: function() {
+                                    var min = minInput.val().trim();
+                                    var max = maxInput.val().trim();
+                                    if (min !== "") {
+                                        ui.opts.min = parseInt(min);
+                                    } else {
+                                        delete ui.opts.min;
+                                    }
+                                    if (max !== "") {
+                                        ui.opts.max = parseInt(max);
+                                    } else {
+                                        delete ui.opts.max;
+                                    }
+                                    inputCellInput.typedInput('value',Date.now())
+                                }
+                            }
+                        }
+                    }
+                },
+                {
+                    value:"none",
+                    label:RED._("editor.inputs.none"), icon:"fa fa-times",hasValue:false
+                },
+                {
+                    value:"hide",
+                    label:RED._("editor.inputs.hidden"), icon:"fa fa-ban",hasValue:false
+                }
+            ],
+            default: 'none'
+        }).on("typedinputtypechange", function(evt,type) {
+            ui.type = $(this).typedInput("type");
+            ui.opts = typeOptions[ui.type];
+            if (ui.type === 'input') {
+                // In the case of 'input' type, the typedInput uses the multiple-option
+                // mode. Its value needs to be set to a comma-separately list of the
+                // selected options.
+                inputCellInput.typedInput('value',ui.opts.types.join(","))
+            } else {
+                // No other type cares about `value`, but doing this will
+                // force a refresh of the label now that `ui.opts` has
+                // been updated.
+                inputCellInput.typedInput('value',Date.now())
+            }
+
+            switch (ui.type) {
+                case 'input':
+                    valueField.typedInput('types',ui.opts.types);
+                    break;
+                case 'select':
+                    valueField.typedInput('types',['str']);
+                    break;
+                case 'checkbox':
+                    valueField.typedInput('types',['bool']);
+                    break;
+                case 'spinner':
+                    valueField.typedInput('types',['num']);
+                    break;
+                case 'cred':
+                    valueField.typedInput('types',['cred']);
+                    break;
+                default:
+                    valueField.typedInput('types',DEFAULT_ENV_TYPE_LIST)
+            }
+            if (ui.type === 'checkbox') {
+                valueField.typedInput('type','bool');
+            } else if (ui.type === 'spinner') {
+                valueField.typedInput('type','num');
+            }
+            if (ui.type !== 'checkbox') {
+                checkbox = null;
+            }
+
+        }).on("change", function(evt,type) {
+            if (ui.type === 'input') {
+                var types = inputCellInput.typedInput('value');
+                ui.opts.types = (types === "") ? ["str"] : types.split(",");
+                valueField.typedInput('types',ui.opts.types);
+            }
+        });
+        valueField.on("change", function(evt) {
+            if (checkbox) {
+                checkbox.prop('checked',$(this).typedInput('value')==="true")
+            }
+        })
+        // Set the input to the right type. This will trigger the 'typedinputtypechange'
+        // event handler (just above ^^) to update the value if needed
+        inputCellInput.typedInput('type',ui.type)
+    }
+
+    function setLocale(l, list) {
+        currentLocale = l;
+        if (list) {
+            var items = list.editableList("items");
+            items.each(function (i, item) {
+                var entry = $(this).data('data');
+                var labelField = entry.ui.labelField;
+                labelField.val(lookupLabel(entry.ui.label, "", currentLocale));
+                if (labelField.timeout) {
+                    clearTimeout(labelField.timeout);
+                    delete labelField.timeout;
+                }
+                labelField.addClass("input-updated");
+                labelField.timeout = setTimeout(function() {
+                    delete labelField.timeout
+                    labelField.removeClass("input-updated");
+                },3000);
+            });
+        }
+    }
+
+    /**
+     * Lookup text for specific locale
+     * @param labels - dict of labels
+     * @param defaultLabel - fallback label if not found
+     * @param locale - target locale
+     * @returns {string} text for specified locale
+     */
+    function lookupLabel(labels, defaultLabel, locale) {
+        if (labels) {
+            if (labels[locale]) {
+                return labels[locale];
+            }
+            if (locale) {
+                var lang = locale.substring(0, 2);
+                if (labels[lang]) {
+                    return labels[lang];
+                }
+            }
+        }
+        return defaultLabel;
+    }
+
+    return {
+        create: buildPropertiesList,
+        setLocale: setLocale,
+        lookupLabel: lookupLabel,
+        DEFAULT_ENV_TYPE_LIST: DEFAULT_ENV_TYPE_LIST,
+        DEFAULT_ENV_TYPE_LIST_INC_CRED: DEFAULT_ENV_TYPE_LIST_INC_CRED
+    }
+})();

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

@@ -121,73 +121,75 @@
                     var currentFunctionMarker = null;
 
                     expressionEditor.getSession().setValue(value||"",-1);
-                    expressionEditor.on("changeSelection", function() {
-                        var c = expressionEditor.getCursorPosition();
-                        var token = expressionEditor.getSession().getTokenAt(c.row,c.column);
-                        if (token !== currentToken || (token && /paren/.test(token.type) && c.column !== currentTokenPos)) {
-                            currentToken = token;
-                            var r,p;
-                            var scopedFunction = null;
-                            if (token && token.type === 'keyword') {
-                                r = c.row;
-                                scopedFunction = token;
-                            } else {
-                                var depth = 0;
-                                var next = false;
-                                if (token) {
-                                    if (token.type === 'paren.rparen') {
-                                        // If this is a block of parens ')))', set
-                                        // depth to offset against the cursor position
-                                        // within the block
-                                        currentTokenPos = c.column;
-                                        depth = c.column - (token.start + token.value.length);
-                                    }
+                    //ace only (monaco has jsonata tokeniser)
+                    if(expressionEditor.type == "ace") {
+                        expressionEditor.on("changeSelection", function() {
+                            var c = expressionEditor.getCursorPosition();
+                            var token = expressionEditor.getSession().getTokenAt(c.row,c.column);
+                            if (token !== currentToken || (token && /paren/.test(token.type) && c.column !== currentTokenPos)) {
+                                currentToken = token;
+                                var r,p;
+                                var scopedFunction = null;
+                                if (token && token.type === 'keyword') {
                                     r = c.row;
-                                    p = token.index;
+                                    scopedFunction = token;
                                 } else {
-                                    r = c.row-1;
-                                    p = -1;
-                                }
-                                while ( scopedFunction === null && r > -1) {
-                                    var rowTokens = expressionEditor.getSession().getTokens(r);
-                                    if (p === -1) {
-                                        p = rowTokens.length-1;
+                                    var depth = 0;
+                                    var next = false;
+                                    if (token) {
+                                        if (token.type === 'paren.rparen') {
+                                            // If this is a block of parens ')))', set
+                                            // depth to offset against the cursor position
+                                            // within the block
+                                            currentTokenPos = c.column;
+                                            depth = c.column - (token.start + token.value.length);
+                                        }
+                                        r = c.row;
+                                        p = token.index;
+                                    } else {
+                                        r = c.row-1;
+                                        p = -1;
                                     }
-                                    while (p > -1) {
-                                        var type = rowTokens[p].type;
-                                        if (next) {
-                                            if (type === 'keyword') {
-                                                scopedFunction = rowTokens[p];
-                                                // console.log("HIT",scopedFunction);
-                                                break;
+                                    while ( scopedFunction === null && r > -1) {
+                                        var rowTokens = expressionEditor.getSession().getTokens(r);
+                                        if (p === -1) {
+                                            p = rowTokens.length-1;
+                                        }
+                                        while (p > -1) {
+                                            var type = rowTokens[p].type;
+                                            if (next) {
+                                                if (type === 'keyword') {
+                                                    scopedFunction = rowTokens[p];
+                                                    // console.log("HIT",scopedFunction);
+                                                    break;
+                                                }
+                                                next = false;
                                             }
-                                            next = false;
+                                            if (type === 'paren.lparen') {
+                                                depth-=rowTokens[p].value.length;
+                                            } else if (type === 'paren.rparen') {
+                                                depth+=rowTokens[p].value.length;
+                                            }
+                                            if (depth < 0) {
+                                                next = true;
+                                                depth = 0;
+                                            }
+                                            // console.log(r,p,depth,next,rowTokens[p]);
+                                            p--;
                                         }
-                                        if (type === 'paren.lparen') {
-                                            depth-=rowTokens[p].value.length;
-                                        } else if (type === 'paren.rparen') {
-                                            depth+=rowTokens[p].value.length;
+                                        if (!scopedFunction) {
+                                            r--;
                                         }
-                                        if (depth < 0) {
-                                            next = true;
-                                            depth = 0;
-                                        }
-                                        // console.log(r,p,depth,next,rowTokens[p]);
-                                        p--;
-                                    }
-                                    if (!scopedFunction) {
-                                        r--;
                                     }
                                 }
+                                expressionEditor.session.removeMarker(currentFunctionMarker);
+                                if (scopedFunction) {
+                                //console.log(token,.map(function(t) { return t.type}));
+                                    funcSelect.val(scopedFunction.value).trigger("change");
+                                }
                             }
-                            expressionEditor.session.removeMarker(currentFunctionMarker);
-                            if (scopedFunction) {
-                            //console.log(token,.map(function(t) { return t.type}));
-                                funcSelect.val(scopedFunction.value).trigger("change");
-                            }
-                        }
-                    });
-
+                        });
+                    }
                     dialogForm.i18n();
                     $("#red-ui-editor-type-expression-func-insert").on("click", function(e) {
                         e.preventDefault();
@@ -245,7 +247,7 @@
                         var currentExpression = expressionEditor.getValue();
                         var expr;
                         var usesContext = false;
-                        var legacyMode = /(^|[^a-zA-Z0-9_'"])msg([^a-zA-Z0-9_'"]|$)/.test(currentExpression);
+                        var legacyMode = /(^|[^a-zA-Z0-9_'".])msg([^a-zA-Z0-9_'"]|$)/.test(currentExpression);
                         $(".red-ui-editor-type-expression-legacy").toggle(legacyMode);
                         try {
                             expr = jsonata(currentExpression);
@@ -343,6 +345,7 @@
                     }
                     expressionEditor.destroy();
                     testDataEditor.destroy();
+                    testResultEditor.destroy();
                 },
                 show: function() {}
             }

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

@@ -0,0 +1,99 @@
+RED.editor.iconPicker = (function() {
+    function showIconPicker(container, backgroundColor, iconPath, faOnly, done) {
+        var picker = $('<div class="red-ui-icon-picker">');
+        var searchDiv = $("<div>",{class:"red-ui-search-container"}).appendTo(picker);
+        searchInput = $('<input type="text">').attr("placeholder",RED._("editor.searchIcons")).appendTo(searchDiv).searchBox({
+            delay: 50,
+            change: function() {
+                var searchTerm = $(this).val().trim();
+                if (searchTerm === "") {
+                    iconList.find(".red-ui-icon-list-module").show();
+                    iconList.find(".red-ui-icon-list-icon").show();
+                } else {
+                    iconList.find(".red-ui-icon-list-module").hide();
+                    iconList.find(".red-ui-icon-list-icon").each(function(i,n) {
+                        if ($(n).data('icon').indexOf(searchTerm) === -1) {
+                            $(n).hide();
+                        } else {
+                            $(n).show();
+                        }
+                    });
+                }
+            }
+        });
+
+        var row = $('<div>').appendTo(picker);
+        var iconList = $('<div class="red-ui-icon-list">').appendTo(picker);
+        var metaRow = $('<div class="red-ui-icon-meta"></div>').appendTo(picker);
+        var summary = $('<span>').appendTo(metaRow);
+        var resetButton = $('<button type="button" class="red-ui-button red-ui-button-small">'+RED._("editor.useDefault")+'</button>').appendTo(metaRow).on("click", function(e) {
+            e.preventDefault();
+            iconPanel.hide();
+            done(null);
+        });
+        if (!backgroundColor && faOnly) {
+            iconList.addClass("red-ui-icon-list-dark");
+        }
+        setTimeout(function() {
+            var iconSets = RED.nodes.getIconSets();
+            Object.keys(iconSets).forEach(function(moduleName) {
+                if (faOnly && (moduleName !== "font-awesome")) {
+                    return;
+                }
+                var icons = iconSets[moduleName];
+                if (icons.length > 0) {
+                    // selectIconModule.append($("<option></option>").val(moduleName).text(moduleName));
+                    var header = $('<div class="red-ui-icon-list-module"></div>').text(moduleName).appendTo(iconList);
+                    $('<i class="fa fa-cube"></i>').prependTo(header);
+                    icons.forEach(function(icon) {
+                        var iconDiv = $('<div>',{class:"red-ui-icon-list-icon"}).appendTo(iconList);
+                        var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).appendTo(iconDiv);
+                        var icon_url = RED.settings.apiRootUrl+"icons/"+moduleName+"/"+icon;
+                        iconDiv.data('icon',icon_url);
+                        if (backgroundColor) {
+                            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);
+
+                        if (iconPath.module === moduleName && iconPath.file === icon) {
+                            iconDiv.addClass("selected");
+                        }
+                        iconDiv.on("mouseover", function() {
+                            summary.text(icon);
+                        })
+                        iconDiv.on("mouseout", function() {
+                            summary.html("&nbsp;");
+                        })
+                        iconDiv.on("click", function() {
+                            iconPanel.hide();
+                            done(moduleName+"/"+icon);
+                        })
+                    })
+                }
+            });
+            setTimeout(function() {
+                spinner.remove();
+            },50);
+        },300);
+        var spinner = RED.utils.addSpinnerOverlay(iconList,true);
+        var iconPanel = RED.popover.panel(picker);
+        iconPanel.show({
+            target: container
+        })
+
+
+        picker.slideDown(100);
+        searchInput.trigger("focus");
+    }
+    return {
+        show: showIconPicker
+    }
+})();

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

@@ -81,7 +81,8 @@
                             clearTimeout: true,
                             setInterval: true,
                             clearInterval: true
-                        }
+                        },
+                        extraLibs: options.extraLibs
                     });
                     if (options.cursor) {
                         expressionEditor.gotoLine(options.cursor.row+1,options.cursor.column,false);

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

@@ -602,10 +602,10 @@
 
                 },
                 close: function() {
-                    // expressionEditor.destroy();
                     if (options.onclose) {
                         options.onclose();
                     }
+                    expressionEditor.destroy();
                 },
                 show: function() {}
             }

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

@@ -0,0 +1,530 @@
+;(function() {
+
+    RED.editor.registerEditPane("editor-tab-appearance", function(node) {
+        return {
+            label: RED._("editor-tab.appearance"),
+            name: RED._("editor-tab.appearance"),
+            iconClass: "fa fa-object-group",
+            create: function(container) {
+                this.content = container;
+                buildAppearanceForm(this.content,node);
+
+                if (node.type === 'subflow') {
+                    this.defaultIcon = "node-red/subflow.svg";
+                } else {
+                    var iconPath = RED.utils.getDefaultNodeIcon(node._def,node);
+                    this.defaultIcon = iconPath.module+"/"+iconPath.file;
+                    if (node.icon && node.icon !== this.defaultIcon) {
+                        this.isDefaultIcon = false;
+                    } else {
+                        this.isDefaultIcon = true;
+                    }
+                }
+            },
+            resize: function(size) {
+
+            },
+            close: function() {
+
+            },
+            show: function() {
+                refreshLabelForm(this.content, node);
+            },
+            apply: function(editState) {
+                if (updateLabels(node, editState.changes, editState.outputMap)) {
+                    editState.changed = true;
+                }
+                if (!node._def.defaults || !node._def.defaults.hasOwnProperty("icon")) {
+                    var icon = $("#red-ui-editor-node-icon").val()||"";
+                    if (!this.isDefaultIcon) {
+                        if ((icon !== node.icon) &&
+                            (icon !== "")) {
+                            editState.changes.icon = node.icon;
+                            node.icon = icon;
+                            editState.changed = true;
+                        }
+                    } else {
+                        if (icon !== "" && icon !== this.defaultIcon) {
+                            editState.changes.icon = node.icon;
+                            node.icon = icon;
+                            editState.changed = true;
+                        } else {
+                            var iconPath = RED.utils.getDefaultNodeIcon(node._def, node);
+                            var currentDefaultIcon = iconPath.module+"/"+iconPath.file;
+                            if (this.defaultIcon !== currentDefaultIcon) {
+                                editState.changes.icon = node.icon;
+                                node.icon = currentDefaultIcon;
+                                editState.changed = true;
+                            }
+                        }
+                    }
+                }
+                if (node.type === "subflow") {
+                    var newCategory = $("#subflow-appearance-input-category").val().trim();
+                    if (newCategory === "_custom_") {
+                        newCategory = $("#subflow-appearance-input-custom-category").val().trim();
+                        if (newCategory === "") {
+                            newCategory = node.category;
+                        }
+                    }
+                    if (newCategory === 'subflows') {
+                        newCategory = '';
+                    }
+                    if (newCategory != node.category) {
+                        editState.changes['category'] = node.category;
+                        node.category = newCategory;
+                        editState.changed = true;
+                    }
+
+                    var oldColor = node.color;
+                    var newColor =  $("#red-ui-editor-node-color").val();
+                    if (oldColor !== newColor) {
+                        editState.changes.color = node.color;
+                        node.color = newColor;
+                        editState.changed = true;
+                        RED.utils.clearNodeColorCache();
+                        if (node.type === "subflow") {
+                            var nodeDefinition = RED.nodes.getType(
+                                "subflow:" + node.id
+                            );
+                            nodeDefinition["color"] = newColor;
+                        }
+                    }
+
+
+
+                }
+                var showLabel = node._def.hasOwnProperty("showLabel")?node._def.showLabel:true;
+
+                if (!$("#node-input-show-label").prop('checked')) {
+                    // Not checked - hide label
+
+                    if (showLabel) {
+                        // Default to show label
+                        if (node.l !== false) {
+                            editState.changes.l = node.l;
+                            editState.changed = true;
+                        }
+                        node.l = false;
+                    } else {
+                        // Node has showLabel:false (eg link nodes)
+                        if (node.hasOwnProperty('l') && node.l) {
+                            editState.changes.l = node.l;
+                            editState.changed = true;
+                        }
+                        delete node.l;
+                    }
+                } else {
+                    // Checked - show label
+                    if (showLabel) {
+                        // Default to show label
+                        if (node.hasOwnProperty('l') && !node.l) {
+                            editState.changes.l = node.l;
+                            editState.changed = true;
+                        }
+                        delete node.l;
+                    } else {
+                        if (!node.l) {
+                            editState.changes.l = node.l;
+                            editState.changed = true;
+                        }
+                        node.l = true;
+                    }
+                }
+            }
+        };
+    });
+
+    function buildAppearanceForm(container,node) {
+        var dialogForm = $('<form class="dialog-form form-horizontal" autocomplete="off"></form>').appendTo(container);
+
+        var i,row;
+
+        if (node.type === "subflow") {
+            var categoryRow = $("<div/>", {
+                class: "form-row"
+            }).appendTo(dialogForm);
+            $("<label/>", {
+                for: "subflow-appearance-input-category",
+                "data-i18n": "editor:subflow.category"
+            }).appendTo(categoryRow);
+            var categorySelector = $("<select/>", {
+                id: "subflow-appearance-input-category"
+            }).css({
+                width: "250px"
+            }).appendTo(categoryRow);
+            $("<input/>", {
+                type: "text",
+                id: "subflow-appearance-input-custom-category"
+            }).css({
+                display: "none",
+                "margin-left": "10px",
+                width: "calc(100% - 250px)"
+            }).appendTo(categoryRow);
+
+            var categories = RED.palette.getCategories();
+            categories.sort(function(A,B) {
+                return A.label.localeCompare(B.label);
+            });
+            categories.forEach(function(cat) {
+                categorySelector.append($("<option/>").val(cat.id).text(cat.label));
+            });
+            categorySelector.append($("<option/>").attr('disabled',true).text("---"));
+            categorySelector.append($("<option/>").val("_custom_").text(RED._("palette.addCategory")));
+
+            $("#subflow-appearance-input-category").on("change", function() {
+                var val = $(this).val();
+                if (val === "_custom_") {
+                    $("#subflow-appearance-input-category").width(120);
+                    $("#subflow-appearance-input-custom-category").show();
+                } else {
+                    $("#subflow-appearance-input-category").width(250);
+                    $("#subflow-appearance-input-custom-category").hide();
+                }
+            });
+
+            $("#subflow-appearance-input-category").val(node.category||"subflows");
+            var userCount = 0;
+            var subflowType = "subflow:"+node.id;
+
+            // RED.nodes.eachNode(function(n) {
+            //     if (n.type === subflowType) {
+            //         userCount++;
+            //     }
+            // });
+            $("#red-ui-editor-subflow-user-count")
+                .text(RED._("subflow.subflowInstances", {count:node.instances.length})).show();
+        }
+
+        $('<div class="form-row">'+
+            '<label for="node-input-show-label-btn" data-i18n="editor.label"></label>'+
+            '<span style="margin-right: 2px;"/>'+
+            '<input type="checkbox" id="node-input-show-label"/>'+
+        '</div>').appendTo(dialogForm);
+
+        $("#node-input-show-label").toggleButton({
+            enabledLabel: RED._("editor.show"),
+            disabledLabel: RED._("editor.hide")
+        });
+
+        if (!node.hasOwnProperty("l")) {
+            // Show label unless def.showLabel set to false
+            node.l =  node._def.hasOwnProperty("showLabel")?node._def.showLabel:true;
+        }
+        $("#node-input-show-label").prop("checked",node.l).trigger("change");
+
+        if (node.type === "subflow") {
+            // subflow template can select its color
+            var color = node.color ? node.color : "#DDAA99";
+            var colorRow = $("<div/>", {
+                class: "form-row"
+            }).appendTo(dialogForm);
+            $("<label/>").text(RED._("editor.color")).appendTo(colorRow);
+
+            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.editor.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);
+                }
+            });
+        }
+
+
+        // If a node has icon property in defaults, the icon of the node cannot be modified. (e.g, ui_button node in dashboard)
+        if ((!node._def.defaults || !node._def.defaults.hasOwnProperty("icon"))) {
+            var iconRow = $('<div class="form-row"></div>').appendTo(dialogForm);
+            $('<label data-i18n="editor.settingIcon">').appendTo(iconRow);
+
+            var iconButton = $('<button type="button" class="red-ui-button red-ui-editor-node-appearance-button">').appendTo(iconRow);
+            $('<i class="fa fa-caret-down"></i>').appendTo(iconButton);
+            var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).appendTo(iconButton);
+            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);
+
+            iconButton.on("click", function(e) {
+                e.preventDefault();
+                var iconPath;
+                var icon = $("#red-ui-editor-node-icon").val()||"";
+                if (icon) {
+                    iconPath = RED.utils.separateIconPath(icon);
+                } else {
+                    iconPath = RED.utils.getDefaultNodeIcon(node._def, node);
+                }
+                var backgroundColor = RED.utils.getNodeColor(node.type, node._def);
+                if (node.type === "subflow") {
+                    backgroundColor = $("#red-ui-editor-node-color").val();
+                }
+                RED.editor.iconPicker.show(iconButton,backgroundColor,iconPath,false,function(newIcon) {
+                    $("#red-ui-editor-node-icon").val(newIcon||"");
+                    var icon_url = RED.utils.getNodeIcon(node._def,{type:node.type,icon:newIcon});
+                    RED.utils.createIconElement(icon_url, iconContainer, true);
+                });
+            });
+
+            RED.popover.tooltip(iconButton, function() {
+                return $("#red-ui-editor-node-icon").val() || RED._("editor.default");
+            });
+            $('<input type="hidden" id="red-ui-editor-node-icon">').val(node.icon).appendTo(iconRow);
+        }
+
+
+        $('<div class="form-row"><span data-i18n="editor.portLabels"></span></div>').appendTo(dialogForm);
+
+        var inputCount = node.inputs || node._def.inputs || 0;
+        var outputCount = node.outputs || node._def.outputs || 0;
+        if (node.type === 'subflow') {
+            inputCount = node.in.length;
+            outputCount = node.out.length;
+        }
+
+        var inputLabels = node.inputLabels || [];
+        var outputLabels = node.outputLabels || [];
+
+        var inputPlaceholder = node._def.inputLabels?RED._("editor.defaultLabel"):RED._("editor.noDefaultLabel");
+        var outputPlaceholder = node._def.outputLabels?RED._("editor.defaultLabel"):RED._("editor.noDefaultLabel");
+
+        $('<div class="form-row"><span style="margin-left: 50px;" data-i18n="editor.labelInputs"></span><div id="red-ui-editor-node-label-form-inputs"></div></div>').appendTo(dialogForm);
+        var inputsDiv = $("#red-ui-editor-node-label-form-inputs");
+        if (inputCount > 0) {
+            for (i=0;i<inputCount;i++) {
+                buildLabelRow("input",i,inputLabels[i],inputPlaceholder).appendTo(inputsDiv);
+            }
+        } else {
+            buildLabelRow().appendTo(inputsDiv);
+        }
+        $('<div class="form-row"><span style="margin-left: 50px;" data-i18n="editor.labelOutputs"></span><div id="red-ui-editor-node-label-form-outputs"></div></div>').appendTo(dialogForm);
+        var outputsDiv = $("#red-ui-editor-node-label-form-outputs");
+        if (outputCount > 0) {
+            for (i=0;i<outputCount;i++) {
+                buildLabelRow("output",i,outputLabels[i],outputPlaceholder).appendTo(outputsDiv);
+            }
+        } else {
+            buildLabelRow().appendTo(outputsDiv);
+        }
+    }
+
+    function refreshLabelForm(container,node) {
+
+        var inputPlaceholder = node._def.inputLabels?RED._("editor.defaultLabel"):RED._("editor.noDefaultLabel");
+        var outputPlaceholder = node._def.outputLabels?RED._("editor.defaultLabel"):RED._("editor.noDefaultLabel");
+
+        var inputsDiv = $("#red-ui-editor-node-label-form-inputs");
+        var outputsDiv = $("#red-ui-editor-node-label-form-outputs");
+
+        var inputCount;
+        var formInputs = $("#node-input-inputs").val();
+        if (formInputs === undefined) {
+            if (node.type === 'subflow') {
+                inputCount = node.in.length;
+            } else {
+                inputCount = node.inputs || node._def.inputs || 0;
+            }
+        } else {
+            inputCount = Math.min(1,Math.max(0,parseInt(formInputs)));
+            if (isNaN(inputCount)) {
+                inputCount = 0;
+            }
+        }
+
+        var children = inputsDiv.children();
+        var childCount = children.length;
+        if (childCount === 1 && $(children[0]).hasClass('red-ui-editor-node-label-form-none')) {
+            childCount--;
+        }
+
+        if (childCount < inputCount) {
+            if (childCount === 0) {
+                // remove the 'none' placeholder
+                $(children[0]).remove();
+            }
+            for (i = childCount;i<inputCount;i++) {
+                buildLabelRow("input",i,"",inputPlaceholder).appendTo(inputsDiv);
+            }
+        } else if (childCount > inputCount) {
+            for (i=inputCount;i<childCount;i++) {
+                $(children[i]).remove();
+            }
+            if (inputCount === 0) {
+                buildLabelRow().appendTo(inputsDiv);
+            }
+        }
+
+        var outputCount;
+        var i;
+        var formOutputs = $("#node-input-outputs").val();
+
+        if (formOutputs === undefined) {
+            if (node.type === 'subflow') {
+                outputCount = node.out.length;
+            } else {
+                inputCount = node.outputs || node._def.outputs || 0;
+            }
+        } else if (isNaN(formOutputs)) {
+            var outputMap = JSON.parse(formOutputs);
+            var keys = Object.keys(outputMap);
+            children = outputsDiv.children();
+            childCount = children.length;
+            if (childCount === 1 && $(children[0]).hasClass('red-ui-editor-node-label-form-none')) {
+                childCount--;
+            }
+
+            outputCount = 0;
+            var rows = [];
+            keys.forEach(function(p) {
+                var row = $("#red-ui-editor-node-label-form-output-"+p).parent();
+                if (row.length === 0 && outputMap[p] !== -1) {
+                    if (childCount === 0) {
+                        $(children[0]).remove();
+                        childCount = -1;
+                    }
+                    row = buildLabelRow("output",p,"",outputPlaceholder);
+                } else {
+                    row.detach();
+                }
+                if (outputMap[p] !== -1) {
+                    outputCount++;
+                    rows.push({i:parseInt(outputMap[p]),r:row});
+                }
+            });
+            rows.sort(function(A,B) {
+                return A.i-B.i;
+            });
+            rows.forEach(function(r,i) {
+                r.r.find("label").text((i+1)+".");
+                r.r.appendTo(outputsDiv);
+            });
+            if (rows.length === 0) {
+                buildLabelRow("output",i,"").appendTo(outputsDiv);
+            } else {
+
+            }
+        } else {
+            outputCount = Math.max(0,parseInt(formOutputs));
+        }
+        children = outputsDiv.children();
+        childCount = children.length;
+        if (childCount === 1 && $(children[0]).hasClass('red-ui-editor-node-label-form-none')) {
+            childCount--;
+        }
+        if (childCount < outputCount) {
+            if (childCount === 0) {
+                // remove the 'none' placeholder
+                $(children[0]).remove();
+            }
+            for (i = childCount;i<outputCount;i++) {
+                buildLabelRow("output",i,"").appendTo(outputsDiv);
+            }
+        } else if (childCount > outputCount) {
+            for (i=outputCount;i<childCount;i++) {
+                $(children[i]).remove();
+            }
+            if (outputCount === 0) {
+                buildLabelRow().appendTo(outputsDiv);
+            }
+        }
+    }
+
+    function buildLabelRow(type, index, value, placeHolder) {
+        var result = $('<div>',{class:"red-ui-editor-node-label-form-row"});
+        if (type === undefined) {
+            $('<span>').text(RED._("editor.noDefaultLabel")).appendTo(result);
+            result.addClass("red-ui-editor-node-label-form-none");
+        } else {
+            result.addClass("");
+            var id = "red-ui-editor-node-label-form-"+type+"-"+index;
+            $('<label>',{for:id}).text((index+1)+".").appendTo(result);
+            var input = $('<input>',{type:"text",id:id, placeholder: placeHolder}).val(value).appendTo(result);
+            var clear = $('<button type="button" class="red-ui-button red-ui-button-small"><i class="fa fa-times"></i></button>').appendTo(result);
+            clear.on("click", function(evt) {
+                evt.preventDefault();
+                input.val("");
+            });
+        }
+        return result;
+    }
+
+    function updateLabels(node, changes, outputMap) {
+        var inputLabels = $("#red-ui-editor-node-label-form-inputs").children().find("input");
+        var outputLabels = $("#red-ui-editor-node-label-form-outputs").children().find("input");
+
+        var hasNonBlankLabel = false;
+        var changed = false;
+        var newValue = inputLabels.map(function() {
+            var v = $(this).val();
+            hasNonBlankLabel = hasNonBlankLabel || v!== "";
+            return v;
+        }).toArray().slice(0,node.inputs);
+        if ((node.inputLabels === undefined && hasNonBlankLabel) ||
+            (node.inputLabels !== undefined && JSON.stringify(newValue) !== JSON.stringify(node.inputLabels))) {
+            changes.inputLabels = node.inputLabels;
+            node.inputLabels = newValue;
+            changed = true;
+        }
+        hasNonBlankLabel = false;
+        newValue = new Array(node.outputs);
+        outputLabels.each(function() {
+            var index = $(this).attr('id').substring("red-ui-editor-node-label-form-output-".length);
+            if (outputMap && outputMap.hasOwnProperty(index)) {
+                index = parseInt(outputMap[index]);
+                if (index === -1) {
+                    return;
+                }
+            }
+            var v = $(this).val();
+            hasNonBlankLabel = hasNonBlankLabel || v!== "";
+
+            // mark changed output port labels as dirty
+            if (node.type === "subflow" && (!node.outputLabels || node.outputLabels[index] !== v)) {
+                node.out[index].dirty = true;
+            }
+
+            newValue[index] = v;
+        });
+
+        if ((node.outputLabels === undefined && hasNonBlankLabel) ||
+            (node.outputLabels !== undefined && JSON.stringify(newValue) !== JSON.stringify(node.outputLabels))) {
+            changes.outputLabels = node.outputLabels;
+            node.outputLabels = newValue;
+            changed = true;
+
+            // trigger redraw of dirty port labels
+            if (node.type === "subflow") {
+                RED.view.redraw();
+            }
+
+        }
+        return changed;
+    }
+
+
+})();

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

@@ -0,0 +1,70 @@
+;(function() {
+
+    RED.editor.registerEditPane("editor-tab-description", function(node) {
+        return {
+            label: RED._("editor-tab.description"),
+            name: RED._("editor-tab.description"),
+            iconClass: "fa fa-file-text-o",
+
+            create: function(container) {
+                this.editor = buildDescriptionForm(container,node);
+                RED.e = this.editor;
+            },
+            resize: function(size) {
+                this.editor.resize();
+            },
+            close: function() {
+                this.editor.destroy();
+                this.editor = null;
+            },
+            show: function() {
+                this.editor.focus();
+            },
+            apply: function(editState) {
+                var oldInfo = node.info;
+                var newInfo = this.editor.getValue();
+                if (!!oldInfo) {
+                    // Has existing info property
+                    if (newInfo.trim() === "") {
+                        // New value is blank - remove the property
+                        editState.changed = true;
+                        editState.changes.info = oldInfo;
+                        delete node.info;
+                    } else if (newInfo !== oldInfo) {
+                        // New value is different
+                        editState.changed = true;
+                        editState.changes.info = oldInfo;
+                        node.info = newInfo;
+                    }
+                } else {
+                    // No existing info
+                    if (newInfo.trim() !== "") {
+                        // New value is not blank
+                        editState.changed = true;
+                        editState.changes.info = undefined;
+                        node.info = newInfo;
+                    }
+                }
+            }
+        }
+    });
+
+    function buildDescriptionForm(container,node) {
+        var dialogForm = $('<form class="dialog-form form-horizontal" autocomplete="off"></form>').appendTo(container);
+        var toolbarRow = $('<div></div>').appendTo(dialogForm);
+        var row = $('<div class="form-row node-text-editor-row" style="position:relative; padding-top: 4px; height: 100%"></div>').appendTo(dialogForm);
+        var editorId = "node-info-input-info-editor-"+Math.floor(1000*Math.random());
+        $('<div style="height: 100%" class="node-text-editor" id="'+editorId+'" ></div>').appendTo(row);
+        var nodeInfoEditor = RED.editor.createEditor({
+            id: editorId,
+            mode: 'ace/mode/markdown',
+            value: ""
+        });
+        if (node.info) {
+            nodeInfoEditor.getSession().setValue(node.info, -1);
+        }
+        node.infoEditor = nodeInfoEditor;
+        return nodeInfoEditor;
+    }
+
+})();

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

@@ -0,0 +1,75 @@
+;(function() {
+
+    RED.editor.registerEditPane("editor-tab-envProperties", function(node) {
+        return {
+            label: RED._("editor-tab.envProperties"),
+            name: RED._("editor-tab.envProperties"),
+            iconClass: "fa fa-list",
+            create: function(container) {
+                var form = $('<form class="dialog-form form-horizontal"></form>').appendTo(container);
+                var listContainer = $('<div class="form-row node-input-env-container-row"></div>').appendTo(form);
+                this.list = $('<ol></ol>').appendTo(listContainer);
+                RED.editor.envVarList.create(this.list, node);
+            },
+            resize: function(size) {
+                this.list.editableList('height',size.height);
+            },
+            close: function() {
+
+            },
+            apply: function(editState) {
+                var old_env = node.env;
+                var new_env = [];
+                if (/^subflow:/.test(node.type)) {
+                    new_env = RED.subflow.exportSubflowInstanceEnv(node);
+                }
+
+                // Get the values from the Properties table tab
+                var items = this.list.editableList('items');
+                items.each(function (i,el) {
+                    var data = el.data('data');
+                    var item;
+                    if (data.nameField && data.valueField) {
+                        item = {
+                            name: data.nameField.val(),
+                            value: data.valueField.typedInput("value"),
+                            type: data.valueField.typedInput("type")
+                        }
+                        if (item.name.trim() !== "") {
+                            new_env.push(item);
+                        }
+                    }
+                });
+
+
+                if (new_env && new_env.length > 0) {
+                    new_env.forEach(function(prop) {
+                        if (prop.type === "cred") {
+                            node.credentials = node.credentials || {_:{}};
+                            node.credentials[prop.name] = prop.value;
+                            node.credentials['has_'+prop.name] = (prop.value !== "");
+                            if (prop.value !== '__PWRD__') {
+                                editState.changed = true;
+                            }
+                            delete prop.value;
+                        }
+                    });
+                }
+                if (!old_env && new_env.length === 0) {
+                    delete node.env;
+                } else if (!isSameObj(old_env, new_env)) {
+                    editState.changes.env = node.env;
+                    if (new_env.length === 0) {
+                        delete node.env;
+                    } else {
+                        node.env = new_env;
+                    }
+                    editState.changed = true;
+                }
+            }
+        }
+    });
+    function isSameObj(env0, env1) {
+        return (JSON.stringify(env0) === JSON.stringify(env1));
+    }
+})();

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

@@ -0,0 +1,60 @@
+;(function() {
+
+    RED.editor.registerEditPane("editor-tab-flow-properties", function(node) {
+        return {
+            label: RED._("editor-tab.properties"),
+            name: RED._("editor-tab.properties"),
+            iconClass: "fa fa-cog",
+            create: function(container) {
+                var dialogForm = $('<form id="dialog-form" class="form-horizontal"></form>').appendTo(container);
+                $('<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>').appendTo(dialogForm);
+
+                var row = $('<div class="form-row node-text-editor-row">'+
+                            '<label for="node-input-info" data-i18n="editor:workspace.info" style="width:300px;"></label>'+
+                            '<div style="min-height:150px;" class="node-text-editor" id="node-input-info"></div>'+
+                            '</div>').appendTo(dialogForm);
+                this.tabflowEditor = RED.editor.createEditor({
+                    id: 'node-input-info',
+                    mode: 'ace/mode/markdown',
+                    value: ""
+                });
+
+                $('<input type="text" style="display: none;" />').prependTo(dialogForm);
+                dialogForm.on("submit", function(e) { e.preventDefault();});
+
+                $("#node-input-name").val(node.label);
+                RED.text.bidi.prepareInput($("#node-input-name"));
+                this.tabflowEditor.getSession().setValue(node.info || "", -1);
+            },
+            resize: function(size) {
+                $("#node-input-info").css("height", (size.height-70)+"px");
+                this.tabflowEditor.resize();
+            },
+            close: function() {
+                this.tabflowEditor.destroy();
+            },
+            apply: function(editState) {
+                var label = $( "#node-input-name" ).val();
+
+                if (node.label != label) {
+                    editState.changes.label = node.label;
+                    editState.changed = true;
+                    node.label = label;
+                }
+
+                var info = this.tabflowEditor.getValue();
+                if (node.info !== info) {
+                    editState.changes.info = node.info;
+                    editState.changed = true;
+                    node.info = info;
+                }
+                $("#red-ui-tab-"+(node.id.replace(".","-"))).toggleClass('red-ui-workspace-disabled',!!node.disabled);
+                $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!node.disabled);
+
+            }
+        }
+    });
+})();

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

@@ -0,0 +1,181 @@
+;(function() {
+
+    RED.editor.registerEditPane("editor-tab-properties", function(node) {
+        return {
+            label: RED._("editor-tab.properties"),
+            name: RED._("editor-tab.properties"),
+            iconClass: "fa fa-cog",
+            create: function(container) {
+
+                var nodeType = node.type;
+                if (node.type === "subflow") {
+                    nodeType = "subflow-template";
+                } else if (node.type.substring(0,8) == "subflow:") {
+                    nodeType = "subflow";
+                }
+
+                var i18nNamespace;
+                if (node._def.set.module === "node-red") {
+                    i18nNamespace = "node-red";
+                } else {
+                    i18nNamespace = node._def.set.id;
+                }
+
+                var formStyle = "dialog-form";
+                this.inputClass = "node-input";
+                if (node._def.category === "config" && nodeType !== "group") {
+                    this.inputClass = "node-config-input";
+                    formStyle = "node-config-dialog-edit-form";
+                }
+                RED.editor.buildEditForm(container,formStyle,nodeType,i18nNamespace,node);
+            },
+            resize: function(size) {
+                if (node && node._def.oneditresize) {
+                    try {
+                        node._def.oneditresize.call(node,size);
+                    } catch(err) {
+                        console.log("oneditresize",node.id,node.type,err.toString());
+                    }
+                }
+            },
+            close: function() {
+
+            },
+            apply: function(editState) {
+                var newValue;
+                var d;
+                if (node._def.defaults) {
+                    for (d in node._def.defaults) {
+                        if (node._def.defaults.hasOwnProperty(d)) {
+                            var input = $("#"+this.inputClass+"-"+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 node._def.defaults[d] && node._def.defaults[d].format !== "" && input[0].nodeName === "DIV") {
+                                newValue = input.text();
+                            } else {
+                                newValue = input.val();
+                            }
+                            if (newValue != null) {
+                                if (d === "outputs") {
+                                    if  (newValue.trim() === "") {
+                                        continue;
+                                    }
+                                    if (isNaN(newValue)) {
+                                        editState.outputMap = JSON.parse(newValue);
+                                        var outputCount = 0;
+                                        var outputsChanged = false;
+                                        var keys = Object.keys(editState.outputMap);
+                                        keys.forEach(function(p) {
+                                            if (isNaN(p)) {
+                                                // New output;
+                                                outputCount ++;
+                                                delete editState.outputMap[p];
+                                            } else {
+                                                editState.outputMap[p] = editState.outputMap[p]+"";
+                                                if (editState.outputMap[p] !== "-1") {
+                                                    outputCount++;
+                                                    if (editState.outputMap[p] !== p) {
+                                                        // Output moved
+                                                        outputsChanged = true;
+                                                    } else {
+                                                        delete editState.outputMap[p];
+                                                    }
+                                                } else {
+                                                    // Output removed
+                                                    outputsChanged = true;
+                                                }
+                                            }
+                                        });
+
+                                        newValue = outputCount;
+                                        if (outputsChanged) {
+                                            editState.changed = true;
+                                        }
+                                    } else {
+                                        newValue = parseInt(newValue);
+                                    }
+                                }
+                                if (node._def.defaults[d].type) {
+                                    if (newValue == "_ADD_") {
+                                        newValue = "";
+                                    }
+                                }
+                                if (node[d] != newValue) {
+                                    if (node._def.defaults[d].type) {
+                                        // Change to a related config node
+                                        var configNode = RED.nodes.node(node[d]);
+                                        if (configNode) {
+                                            var users = configNode.users;
+                                            users.splice(users.indexOf(node),1);
+                                            RED.events.emit("nodes:change",configNode);
+                                        }
+                                        configNode = RED.nodes.node(newValue);
+                                        if (configNode) {
+                                            configNode.users.push(node);
+                                            RED.events.emit("nodes:change",configNode);
+                                        }
+                                    }
+                                    editState.changes[d] = node[d];
+                                    node[d] = newValue;
+                                    editState.changed = true;
+                                }
+                            }
+                        }
+                    }
+                }
+                if (node._def.credentials) {
+                    var credDefinition = node._def.credentials;
+                    var credsChanged = updateNodeCredentials(node,credDefinition,this.inputClass);
+                    editState.changed = editState.changed || credsChanged;
+                }
+            }
+        }
+    });
+
+    /**
+     * Update the node credentials from the edit form
+     * @param node - the node containing the credentials
+     * @param credDefinition - definition of the credentials
+     * @param prefix - prefix of the input fields
+     * @return {boolean} whether anything has changed
+     */
+    function updateNodeCredentials(node, credDefinition, prefix) {
+        var changed = false;
+        if (!node.credentials) {
+            node.credentials = {_:{}};
+        } else if (!node.credentials._) {
+            node.credentials._ = {};
+        }
+
+        for (var cred in credDefinition) {
+            if (credDefinition.hasOwnProperty(cred)) {
+                var input = $("#" + prefix + '-' + cred);
+                if (input.length > 0) {
+                    var value = input.val();
+                    if (credDefinition[cred].type == 'password') {
+                        node.credentials['has_' + cred] = (value !== "");
+                        if (value == '__PWRD__') {
+                            continue;
+                        }
+                        changed = true;
+
+                    }
+                    node.credentials[cred] = value;
+                    if (value != node.credentials._[cred]) {
+                        changed = true;
+                    }
+                }
+            }
+        }
+        return changed;
+    }
+
+
+})();

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

@@ -0,0 +1,179 @@
+(function() {
+    var _subflowModulePaneTemplate = '<form class="dialog-form form-horizontal" autocomplete="off">'+
+        '<div class="form-row">'+
+            '<label for="subflow-input-module-module" data-i18n="[append]editor:subflow.module"><i class="fa fa-cube"></i> </label>'+
+            '<input style="width: calc(100% - 110px)" type="text" id="subflow-input-module-module" data-i18n="[placeholder]common.label.name">'+
+        '</div>'+
+        '<div class="form-row">'+
+            '<label for="subflow-input-module-type" data-i18n="[append]editor:subflow.type"> </label>'+
+            '<input style="width: calc(100% - 110px)" type="text" id="subflow-input-module-type">'+
+        '</div>'+
+        '<div class="form-row">'+
+            '<label for="subflow-input-module-version" data-i18n="[append]editor:subflow.version"></label>'+
+            '<input style="width: calc(100% - 110px)" type="text" id="subflow-input-module-version" data-i18n="[placeholder]editor:subflow.versionPlaceholder">'+
+        '</div>'+
+        '<div class="form-row">'+
+            '<label for="subflow-input-module-desc" data-i18n="[append]editor:subflow.desc"></label>'+
+            '<input style="width: calc(100% - 110px)" type="text" id="subflow-input-module-desc">'+
+        '</div>'+
+        '<div class="form-row">'+
+            '<label for="subflow-input-module-license" data-i18n="[append]editor:subflow.license"></label>'+
+            '<input style="width: calc(100% - 110px)" type="text" id="subflow-input-module-license">'+
+        '</div>'+
+        '<div class="form-row">'+
+            '<label for="subflow-input-module-author" data-i18n="[append]editor:subflow.author"></label>'+
+            '<input style="width: calc(100% - 110px)" type="text" id="subflow-input-module-author" data-i18n="[placeholder]editor:subflow.authorPlaceholder">'+
+        '</div>'+
+        '<div class="form-row">'+
+            '<label for="subflow-input-module-keywords" data-i18n="[append]editor:subflow.keys"></label>'+
+            '<input style="width: calc(100% - 110px)" type="text" id="subflow-input-module-keywords" data-i18n="[placeholder]editor:subflow.keysPlaceholder">'+
+        '</div>'+
+    '</form>';
+
+    RED.editor.registerEditPane("editor-tab-subflow-module", function(node) {
+        return {
+            label: RED._("editor-tab.module"),
+            name: RED._("editor-tab.module"),
+            iconClass: "fa fa-cube",
+            create: function(container) {
+                buildModuleForm(container, node);
+            },
+            resize: function(size) {
+            },
+            close: function() {
+
+            },
+            apply: function(editState) {
+                var newMeta = exportSubflowModuleProperties(node);
+                if (!isSameObj(node.meta,newMeta)) {
+                    editState.changes.meta = node.meta;
+                    node.meta = newMeta;
+                    editState.changed = true;
+                }
+            }
+        }
+    });
+
+    function isSameObj(env0, env1) {
+        return (JSON.stringify(env0) === JSON.stringify(env1));
+    }
+
+    function setupInputValidation(input,validator) {
+        var errorTip;
+        var validateTimeout;
+
+        var validateFunction = function() {
+            if (validateTimeout) {
+                return;
+            }
+            validateTimeout = setTimeout(function() {
+                var error = validator(input.val());
+                // if (!error && errorTip) {
+                //     errorTip.close();
+                //     errorTip = null;
+                // } else if (error && !errorTip) {
+                //     errorTip = RED.popover.create({
+                //         tooltip: true,
+                //         target:input,
+                //         size: "small",
+                //         direction: "bottom",
+                //         content: error,
+                //     }).open();
+                // }
+                input.toggleClass("input-error",!!error);
+                validateTimeout = null;
+            })
+        }
+        input.on("change keyup paste", validateFunction);
+    }
+
+    function buildModuleForm(container, node) {
+        $(_subflowModulePaneTemplate).appendTo(container);
+        var moduleProps = node.meta || {};
+        [
+            'module',
+            'type',
+            'version',
+            'author',
+            'desc',
+            'keywords',
+            'license'
+        ].forEach(function(property) {
+            $("#subflow-input-module-"+property).val(moduleProps[property]||"")
+        })
+        $("#subflow-input-module-type").attr("placeholder",node.id);
+
+        setupInputValidation($("#subflow-input-module-module"), function(newValue) {
+            newValue = newValue.trim();
+            var isValid = newValue.length < 215;
+            isValid = isValid && !/^[._]/.test(newValue);
+            isValid = isValid && !/[A-Z]/.test(newValue);
+            if (newValue !== encodeURIComponent(newValue)) {
+                var m = /^@([^\/]+)\/([^\/]+)$/.exec(newValue);
+                if (m) {
+                    isValid = isValid && (m[1] === encodeURIComponent(m[1]) && m[2] === encodeURIComponent(m[2]))
+                } else {
+                    isValid = false;
+                }
+            }
+            return isValid?"":"Invalid module name"
+        })
+        setupInputValidation($("#subflow-input-module-version"), function(newValue) {
+            newValue = newValue.trim();
+            var isValid = newValue === "" ||
+                          /^(\d|[1-9]\d*)\.(\d|[1-9]\d*)\.(\d|[1-9]\d*)(-(0|[1-9A-Za-z-][0-9A-Za-z-]*|[0-9]*[A-Za-z-][0-9A-Za-z-]*)(\.(0|[1-9A-Za-z-][0-9A-Za-z-]*|[0-9]*[A-Za-z-][0-9A-Za-z-]*))*)?(\+[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?$/.test(newValue);
+            return isValid?"":"Invalid version number"
+        })
+
+        var licenses = ["none", "Apache-2.0", "BSD-3-Clause", "BSD-2-Clause", "GPL-2.0", "GPL-3.0", "MIT", "MPL-2.0", "CDDL-1.0", "EPL-2.0"];
+        var typedLicenses = {
+            types: licenses.map(function(l) {
+                return {
+                    value: l,
+                    label: l === "none" ? RED._("editor:subflow.licenseNone") : l,
+                    hasValue: false
+                };
+            })
+        }
+        typedLicenses.types.push({
+            value:"_custom_", label:RED._("editor:subflow.licenseOther"), icon:"red/images/typedInput/az.svg"
+        })
+        if (!moduleProps.license) {
+            typedLicenses.default = "none";
+        } else if (licenses.indexOf(moduleProps.license) > -1) {
+            typedLicenses.default = moduleProps.license;
+        } else {
+            typedLicenses.default = "_custom_";
+        }
+        $("#subflow-input-module-license").typedInput(typedLicenses)
+    }
+    function exportSubflowModuleProperties(node) {
+        var value;
+        var moduleProps = {};
+        [
+            'module',
+            'type',
+            'version',
+            'author',
+            'desc',
+            'keywords'
+        ].forEach(function(property) {
+            value = $("#subflow-input-module-"+property).val().trim();
+            if (value) {
+                moduleProps[property] = value;
+            }
+        })
+        var selectedLicenseType = $("#subflow-input-module-license").typedInput("type");
+
+        if (selectedLicenseType === '_custom_') {
+            value = $("#subflow-input-module-license").val();
+            if (value) {
+                moduleProps.license = value;
+            }
+        } else if (selectedLicenseType !== "none") {
+            moduleProps.license = selectedLicenseType;
+        }
+        return moduleProps;
+    }
+
+})();

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

@@ -73,6 +73,7 @@ RED.eventLog = (function() {
                     var trayBody = tray.find('.red-ui-tray-body');
                     var dialogForm = RED.editor.buildEditForm(tray.find('.red-ui-tray-body'),'dialog-form',type,'editor');
                     eventLogEditor = RED.editor.createEditor({
+                        mode:"ace/mode/shell",
                         id: 'red-ui-event-log-editor',
                         value: backlog.join("\n"),
                         lineNumbers: false,

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

@@ -87,16 +87,18 @@ RED.group = (function() {
         "label-position": "nw"
     };
 
+
     var groupDef = {
         defaults:{
             name:{value:""},
             style:{value:{label:true}},
-            nodes:{value:[]}
+            nodes:{value:[]},
+            env: {value:[]},
         },
         category: "config",
         oneditprepare: function() {
             var style = this.style || {};
-            RED.colorPicker.create({
+            RED.editor.colorPicker.create({
                 id:"node-input-style-stroke",
                 value: style.stroke || defaultGroupStyle.stroke || "#a4a4a4",
                 palette: colorPalette,
@@ -107,7 +109,7 @@ RED.group = (function() {
                 none: true,
                 opacity: style.hasOwnProperty('stroke-opacity')?style['stroke-opacity']:(defaultGroupStyle.hasOwnProperty('stroke-opacity')?defaultGroupStyle['stroke-opacity']:1.0)
             }).appendTo("#node-input-row-style-stroke");
-            RED.colorPicker.create({
+            RED.editor.colorPicker.create({
                 id:"node-input-style-fill",
                 value: style.fill || defaultGroupStyle.fill ||"none",
                 palette: colorPalette,
@@ -124,7 +126,7 @@ RED.group = (function() {
                 value:style["label-position"] || "nw"
             }).appendTo("#node-input-row-style-label-position");
 
-            RED.colorPicker.create({
+            RED.editor.colorPicker.create({
                 id:"node-input-style-color",
                 value: style.color || defaultGroupStyle.color ||"#a4a4a4",
                 palette: colorPalette,
@@ -144,7 +146,6 @@ RED.group = (function() {
             })
             $("#node-input-style-label").prop("checked", this.style.label)
             $("#node-input-style-label").trigger("change");
-
         },
         oneditresize: function(size) {
         },
@@ -183,7 +184,9 @@ RED.group = (function() {
             var activateUngroup = false;
             var activateMerge = false;
             var activateRemove = false;
+            var singleGroupSelected = false;
             if (activateGroup) {
+                singleGroupSelected = selection.nodes.length === 1 && selection.nodes[0].type === 'group';
                 selection.nodes.forEach(function (n) {
                     if (n.type === "group") {
                         activateUngroup = true;
@@ -200,6 +203,8 @@ RED.group = (function() {
             RED.menu.setDisabled("menu-item-group-ungroup", !activateUngroup);
             RED.menu.setDisabled("menu-item-group-merge", !activateMerge);
             RED.menu.setDisabled("menu-item-group-remove", !activateRemove);
+            RED.menu.setDisabled("menu-item-edit-copy-group-style", !singleGroupSelected);
+            RED.menu.setDisabled("menu-item-edit-paste-group-style", !activateUngroup);
         });
 
         RED.actions.add("core:group-selection", function() { groupSelection() })
@@ -252,6 +257,7 @@ RED.group = (function() {
         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"})
+            RED.menu.setDisabled("menu-item-edit-paste-group-style", false)
         }
     }
     function pasteGroupStyle() {
@@ -346,8 +352,10 @@ RED.group = (function() {
             }
             if (n.type === 'group') {
                 RED.events.emit("groups:change",n)
-            } else {
+            } else if (n.type !== 'junction') {
                 RED.events.emit("nodes:change",n)
+            } else {
+                RED.events.emit("junctions:change",n)
             }
         })
         RED.nodes.removeGroup(g);
@@ -541,8 +549,10 @@ RED.group = (function() {
                 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 {
+                } else if (n.type !== 'junction') {
                     RED.events.emit("nodes:change",n)
+                } else {
+                    RED.events.emit("junctions:change",n)
                 }
             }
         }
@@ -577,19 +587,23 @@ RED.group = (function() {
             }
             if (n.type === 'group') {
                 RED.events.emit("groups:change",n)
-            } else {
+            } else if (n.type !== 'junction') {
                 RED.events.emit("nodes:change",n)
+            } else {
+                RED.events.emit("junctions:change",n)
             }
         }
         markDirty(group);
     }
 
-    function getNodes(group,recursive) {
+    function getNodes(group,recursive,excludeGroup) {
         var nodes = [];
         group.nodes.forEach(function(n) {
-            nodes.push(n);
+            if (n.type !== 'group' || !excludeGroup) {
+                nodes.push(n);
+            }
             if (recursive && n.type === 'group') {
-                nodes = nodes.concat(getNodes(n,recursive))
+                nodes = nodes.concat(getNodes(n,recursive,excludeGroup))
             }
         })
         return nodes;

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

@@ -49,15 +49,15 @@ RED.keyboard = (function() {
         "]": 221,
         "{": 219,// <- QWERTY specific
         "}": 221 // <- QWERTY specific
-    }
+    };
     var metaKeyCodes = {
         16: true,
         17: true,
         18: true,
         91: true,
         93: true
-    }
-    var actionToKeyMap = {}
+    };
+    var actionToKeyMap = {};
     var defaultKeyMap = {};
 
     // FF generates some different keycodes because reasons.
@@ -65,7 +65,7 @@ RED.keyboard = (function() {
         59:186,
         61:187,
         173:189
-    }
+    };
 
     function migrateOldKeymap() {
         // pre-0.18
@@ -80,7 +80,7 @@ RED.keyboard = (function() {
     }
 
     function getUserKey(action) {
-        return RED.settings.get('editor.keymap',{})[action]
+        return RED.settings.get('editor.keymap',{})[action];
     }
 
     function mergeKeymaps(defaultKeymap, themeKeymap) {
@@ -105,7 +105,7 @@ RED.keyboard = (function() {
                                 scope:scope,
                                 key:key,
                                 user:false
-                            })
+                            });
                         }
                     }
                 }
@@ -115,13 +115,13 @@ RED.keyboard = (function() {
             if (themeKeymap.hasOwnProperty(action)) {
                 if (!themeKeymap[action].key) {
                     // No key for this action - default is no keybinding
-                    delete mergedKeymap[action]
+                    delete mergedKeymap[action];
                 } else {
                     mergedKeymap[action] = [{
                         scope: themeKeymap[action].scope || "*",
                         key: themeKeymap[action].key,
                         user: false
-                    }]
+                    }];
                     if (mergedKeymap[action][0].scope === "workspace") {
                         mergedKeymap[action][0].scope = "red-ui-workspace";
                     }
@@ -131,7 +131,7 @@ RED.keyboard = (function() {
         return mergedKeymap;
     }
 
-    function init() {
+    function init(done) {
         // Migrate from pre-0.18
         migrateOldKeymap();
 
@@ -164,6 +164,7 @@ RED.keyboard = (function() {
                     }
                 }
             }
+            done();
         });
 
         RED.userSettings.add({
@@ -174,8 +175,11 @@ RED.keyboard = (function() {
                 setTimeout(function() {
                     $("#red-ui-settings-tab-keyboard-filter").trigger("focus");
                 },200);
+            },
+            close: function() {
+                RED.menu.refreshShortcuts();
             }
-        })
+        });
     }
 
     function revertToDefault(action) {
@@ -239,7 +243,13 @@ RED.keyboard = (function() {
 
     function resolveKeyEvent(evt) {
         var slot = partialState||handlers;
-        if (evt.ctrlKey || evt.metaKey) {
+        // We cheat with MacOS CMD key and consider it the same as Ctrl.
+        // That means we don't have to have separate keymaps for different OS.
+        // It mostly works.
+        // One exception is shortcuts that include both Cmd and Ctrl. We don't
+        // support them - but we need to make sure we don't block browser-specific
+        // shortcuts (such as Cmd-Ctrl-F for fullscreen).
+        if ((evt.ctrlKey || evt.metaKey) && (evt.ctrlKey !== evt.metaKey)) {
             slot = slot.ctrl;
         }
         if (slot && evt.shiftKey) {
@@ -317,7 +327,7 @@ RED.keyboard = (function() {
                         scope:scope,
                         key:key,
                         user:false
-                    }
+                    };
                 }
                 if (!ondown) {
                     var userAction = getUserKey(cbdown);
@@ -340,7 +350,7 @@ RED.keyboard = (function() {
                 }
             }
         } else {
-            keys.push([key,mod])
+            keys.push([key,mod]);
         }
         var slot = handlers;
         for (i=0;i<keys.length;i++) {
@@ -363,7 +373,7 @@ RED.keyboard = (function() {
             //slot[key] = {scope: scope, ondown:cbdown};
         }
         slot.handlers = slot.handlers || [];
-        slot.handlers.push({scope:scope,ondown:cbdown})
+        slot.handlers.push({scope:scope,ondown:cbdown});
         slot.scope = scope;
         slot.ondown = cbdown;
     }
@@ -380,12 +390,12 @@ RED.keyboard = (function() {
                 if (parsedKey) {
                     keys.push(parsedKey);
                 } else {
-                    console.log("Unrecognised key specifier:",key)
+                    console.log("Unrecognised key specifier:",key);
                     return;
                 }
             }
         } else {
-            keys.push([key,mod])
+            keys.push([key,mod]);
         }
         var slot = handlers;
         for (i=0;i<keys.length;i++) {
@@ -407,7 +417,7 @@ RED.keyboard = (function() {
         }
         if (typeof slot.ondown === "string") {
             if (typeof modifiers === 'boolean' && modifiers) {
-                actionToKeyMap[slot.ondown] = {user: modifiers}
+                actionToKeyMap[slot.ondown] = {user: modifiers};
             } else {
                 delete actionToKeyMap[slot.ondown];
             }
@@ -423,11 +433,11 @@ RED.keyboard = (function() {
     function formatKey(key,plain) {
         var formattedKey = isMac?key.replace(/ctrl-?/,"&#8984;"):key;
         formattedKey = isMac?formattedKey.replace(/alt-?/,"&#8997;"):key;
-        formattedKey = formattedKey.replace(/shift-?/,"&#8679;")
-        formattedKey = formattedKey.replace(/left/,"&#x2190;")
-        formattedKey = formattedKey.replace(/up/,"&#x2191;")
-        formattedKey = formattedKey.replace(/right/,"&#x2192;")
-        formattedKey = formattedKey.replace(/down/,"&#x2193;")
+        formattedKey = formattedKey.replace(/shift-?/,"&#8679;");
+        formattedKey = formattedKey.replace(/left/,"&#x2190;");
+        formattedKey = formattedKey.replace(/up/,"&#x2191;");
+        formattedKey = formattedKey.replace(/right/,"&#x2192;");
+        formattedKey = formattedKey.replace(/down/,"&#x2193;");
         if (plain) {
             return formattedKey;
         }
@@ -451,7 +461,6 @@ RED.keyboard = (function() {
         var container = $(this);
         var object = container.data('data');
 
-
         if (!container.hasClass('keyboard-shortcut-entry-expanded')) {
             endEditShortcut();
 
@@ -475,7 +484,7 @@ RED.keyboard = (function() {
                 }
                 $(this).toggleClass("input-error",!valid);
                 okButton.attr("disabled",!valid);
-            })
+            });
 
             var scopeSelect = $('<select><option value="*" data-i18n="keyboard.global"></option><option value="red-ui-workspace" data-i18n="keyboard.workspace"></option></select>').appendTo(scope);
             scopeSelect.i18n();
@@ -485,7 +494,7 @@ RED.keyboard = (function() {
             scopeSelect.val(object.scope||'*');
             scopeSelect.on("change", function() {
                 keyInput.trigger("change");
-            })
+            });
 
             var div = $('<div class="keyboard-shortcut-edit button-group-vertical"></div>').appendTo(scope);
             var okButton = $('<button class="red-ui-button red-ui-button-small"><i class="fa fa-check"></i></button>').appendTo(div);
@@ -511,10 +520,13 @@ RED.keyboard = (function() {
                     id:object.id,
                     scope:shortcut?shortcut.scope:undefined,
                     key:shortcut?shortcut.key:undefined,
-                    user:shortcut?shortcut.user:undefined
-                }
+                    user:shortcut?shortcut.user:undefined,
+
+                    label: object.label,
+                    options: object.options,
+                };
                 buildShortcutRow(container,obj);
-            })
+            });
 
             keyInput.trigger("focus");
         }
@@ -549,7 +561,7 @@ RED.keyboard = (function() {
                             delete object.scope;
                         } else {
                             keyDiv.parent().removeClass("keyboard-shortcut-entry-unassigned");
-                            keyDiv.append(RED.keyboard.formatKey(key))
+                            keyDiv.append(RED.keyboard.formatKey(key));
                             $("<span>").text(scope).appendTo(scopeDiv);
                             object.key = key;
                             object.scope = scope;
@@ -562,7 +574,7 @@ RED.keyboard = (function() {
                         userKeymap[object.id] = {
                             scope:shortcut.scope,
                             key:shortcut.key
-                        }
+                        };
                         RED.settings.set('editor.keymap',userKeymap);
                     }
                 }
@@ -578,13 +590,7 @@ RED.keyboard = (function() {
         var item = $('<div class="keyboard-shortcut-entry">').appendTo(container);
         container.data('data',object);
 
-        var text = object.id.replace(/(^.+:([a-z]))|(-([a-z]))/g,function() {
-            if (arguments[5] === 0) {
-                return arguments[2].toUpperCase();
-            } else {
-                return " "+arguments[4].toUpperCase();
-            }
-        });
+        var text = object.label;
         var label = $('<div>').addClass("keyboard-shortcut-entry-text").text(text).appendTo(item);
 
         var user = $('<i class="fa fa-user"></i>').prependTo(label);
@@ -619,14 +625,15 @@ RED.keyboard = (function() {
         pane.find("#red-ui-settings-tab-keyboard-filter").searchBox({
             delay: 100,
             change: function() {
-                var filterValue = $(this).val().trim();
+                var filterValue = $(this).val().trim().toLowerCase();
                 if (filterValue === "") {
                     shortcutList.editableList('filter', null);
                 } else {
                     filterValue = filterValue.replace(/\s/g,"");
                     shortcutList.editableList('filter', function(data) {
-                        return data.id.toLowerCase().replace(/^.*:/,"").replace("-","").indexOf(filterValue) > -1;
-                    })
+                        var label = data.label.toLowerCase();
+                        return label.indexOf(filterValue) > -1;
+                    });
                 }
             }
         });
@@ -647,9 +654,9 @@ RED.keyboard = (function() {
         });
         var shortcuts = RED.actions.list();
         shortcuts.sort(function(A,B) {
-            var Aid = A.id.replace(/^.*:/,"").replace(/[ -]/g,"").toLowerCase();
-            var Bid = B.id.replace(/^.*:/,"").replace(/[ -]/g,"").toLowerCase();
-            return Aid.localeCompare(Bid);
+            var Akey = A.label;
+            var Bkey = B.label;
+            return Akey.localeCompare(Bkey);
         });
         knownShortcuts = new Set();
         shortcuts.forEach(function(s) {

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

@@ -27,7 +27,7 @@ RED.library = (function() {
                     '<div class="red-ui-panel" id="red-ui-library-dialog-load-browser"></div>'+
                     '<div class="red-ui-panel">'+
                         '<div id="red-ui-library-dialog-load-preview">'+
-                            '<div class="red-ui-panel" id="red-ui-library-dialog-load-preview-text"></div>'+
+                            '<div class="red-ui-panel" id="red-ui-library-dialog-load-preview-text" style="position:relative; height: 50%; overflow-y: hidden;"></div>'+
                             '<div class="red-ui-panel" id="red-ui-library-dialog-load-preview-details">'+
                                 '<table id="red-ui-library-dialog-load-preview-details-table" class="red-ui-info-table"></table>'+
                             '</div>'+
@@ -216,21 +216,27 @@ RED.library = (function() {
             { id:'node-input-'+options.type+'-menu-open-library',
                 label: RED._("library.openLibrary"),
                 onselect: function() {
-
-                    libraryEditor = ace.edit('red-ui-library-dialog-load-preview-text',{
-                        useWorker: false
-                    });
-                    libraryEditor.setTheme("ace/theme/tomorrow");
-                    if (options.mode) {
-                        libraryEditor.getSession().setMode(options.mode);
-                    }
-                    libraryEditor.setOptions({
+                    var editorOpts = {
+                        id: 'red-ui-library-dialog-load-preview-text',
+                        mode: options.mode,
                         readOnly: true,
                         highlightActiveLine: false,
-                        highlightGutterLine: false
-                    });
-                    libraryEditor.renderer.$cursorLayer.element.style.opacity=0;
-                    libraryEditor.$blockScrolling = Infinity;
+                        highlightGutterLine: false,
+                        contextmenu: false
+                    }
+                    libraryEditor = RED.editor.createEditor(editorOpts); //use red.editor
+                    if(libraryEditor.isACE) {
+                        if (options.mode) {
+                            libraryEditor.getSession().setMode(options.mode);
+                        }
+                        libraryEditor.setOptions({
+                            readOnly: true,
+                            highlightActiveLine: false,
+                            highlightGutterLine: false
+                        });
+                        libraryEditor.renderer.$cursorLayer.element.style.opacity=0;
+                        libraryEditor.$blockScrolling = Infinity;
+                    }
 
                     activeLibrary = options;
                     var listing = [];
@@ -530,7 +536,7 @@ RED.library = (function() {
     //             evt.preventDefault();
     //             var icon = libraryFields['icon'].input.val() || "";
     //             var iconPath = (icon ? RED.utils.separateIconPath(icon) : {});
-    //             RED.editor.showIconPicker(iconButton, null, iconPath, true, function (newIcon) {
+    //             RED.editor.iconPicker.show(iconButton, null, iconPath, true, function (newIcon) {
     //                 iconButton.empty();
     //                 var path = newIcon || "";
     //                 var newPath = RED.utils.separateIconPath(path);
@@ -809,6 +815,7 @@ RED.library = (function() {
                 open: function(e) {
                     RED.keyboard.disable();
                     $(this).parent().find(".ui-dialog-titlebar-close").hide();
+                    libraryEditor.resize();
                 },
                 close: function(e) {
                     RED.keyboard.enable();

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

@@ -45,6 +45,22 @@ RED.notifications = (function() {
 
     var persistentNotifications = {};
 
+    var shade = (function() {
+        var shadeUsers = 0;
+        return {
+            show: function() {
+                shadeUsers++;
+                $("#red-ui-full-shade").show();
+            },
+            hide: function() {
+                shadeUsers--;
+                if (shadeUsers === 0) {
+                    $("#red-ui-full-shade").hide();
+                }
+            }
+        }
+    })();
+
     var currentNotifications = [];
     var c = 0;
     function notify(msg,type,fixed,timeout) {
@@ -54,6 +70,10 @@ RED.notifications = (function() {
             fixed = options.fixed;
             timeout = options.timeout;
             type = options.type;
+        } else {
+            options.type = type;
+            options.fixed = fixed;
+            options.timeout = options.timeout;
         }
 
         if (options.id && persistentNotifications.hasOwnProperty(options.id)) {
@@ -62,7 +82,7 @@ RED.notifications = (function() {
         }
 
         if (options.modal) {
-            $("#red-ui-full-shade").show();
+            shade.show();
         }
 
         if (currentNotifications.length > 4) {
@@ -79,6 +99,8 @@ RED.notifications = (function() {
         var n = document.createElement("div");
         n.id="red-ui-notification-"+c;
         n.className = "red-ui-notification";
+        n.options = options;
+
         n.fixed = fixed;
         if (type) {
             n.className = "red-ui-notification red-ui-notification-"+type;
@@ -115,7 +137,6 @@ RED.notifications = (function() {
             })
         }
 
-
         $("#red-ui-notifications").append(n);
         if (!RED.notifications.hide) {
             $(n).slideDown(300);
@@ -141,8 +162,8 @@ RED.notifications = (function() {
                 } else {
                     nn.parentNode.removeChild(nn);
                 }
-                if (options.modal) {
-                    $("#red-ui-full-shade").hide();
+                if (nn.options.modal) {
+                    shade.hide();
                 }
             };
         })();
@@ -173,7 +194,7 @@ RED.notifications = (function() {
 
         n.update = (function() {
             var nn = n;
-            return function(msg,options) {
+            return function(msg,newOptions) {
                 if (typeof msg === "string") {
                     if (!/<p>/i.test(msg)) {
                         msg = "<p>"+msg+"</p>";
@@ -182,16 +203,31 @@ RED.notifications = (function() {
                 } else {
                     $(nn).empty().append(msg);
                 }
-                var timeout;
-                if (typeof options === 'number') {
-                    timeout = options;
-                } else if (options !== undefined) {
-                    if (!options.fixed) {
-                        timeout = options.timeout || 5000;
+                var newTimeout;
+                if (typeof newOptions === 'number') {
+                    newTimeout = newOptions;
+                    nn.options.timeout = newTimeout;
+                } else if (newOptions !== undefined) {
+
+                    if (!options.modal && newOptions.modal) {
+                        nn.options.modal = true;
+                        shade.show();
+                    } else if (options.modal && newOptions.modal === false) {
+                        nn.options.modal = false;
+                        shade.hide();
                     }
-                    if (options.buttons) {
+
+                    var newType = newOptions.hasOwnProperty('type')?newOptions.type:type;
+                    if (newType) {
+                        n.className = "red-ui-notification red-ui-notification-"+newType;
+                    }
+
+                    if (!fixed || newOptions.fixed === false) {
+                        newTimeout = (newOptions.hasOwnProperty('timeout')?newOptions.timeout:timeout)||5000;
+                    }
+                    if (newOptions.buttons) {
                         var buttonSet = $('<div style="margin-top: 20px;" class="ui-dialog-buttonset"></div>').appendTo(nn)
-                        options.buttons.forEach(function(buttonDef) {
+                        newOptions.buttons.forEach(function(buttonDef) {
                             var b = $('<button>').text(buttonDef.text).on("click", buttonDef.click).appendTo(buttonSet);
                             if (buttonDef.id) {
                                 b.attr('id',buttonDef.id);
@@ -202,15 +238,22 @@ RED.notifications = (function() {
                         })
                     }
                 }
-                if (timeout !== undefined && timeout > 0) {
+                $(nn).off("click.red-ui-notification-close");
+                if (newTimeout !== undefined && newTimeout > 0) {
                     window.clearTimeout(nn.timeoutid);
-                    nn.timeoutid = window.setTimeout(nn.close,timeout);
+                    nn.timeoutid = window.setTimeout(nn.close,newTimeout);
+                    setTimeout(function() {
+                        $(nn).on("click.red-ui-notification-close", function() {
+                            nn.close();
+                            window.clearTimeout(nn.timeoutid);
+                        });
+                    },50);
                 } else {
                     window.clearTimeout(nn.timeoutid);
                 }
                 if (nn.hidden) {
                     nn.showNotification();
-                } else if (!options || !options.silent){
+                } else if (!newOptions || !newOptions.silent){
                     $(nn).addClass("red-ui-notification-shake-horizontal");
                     setTimeout(function() {
                         $(nn).removeClass("red-ui-notification-shake-horizontal");
@@ -221,7 +264,7 @@ RED.notifications = (function() {
         })();
 
         if (!fixed) {
-            $(n).on("click", (function() {
+            $(n).on("click.red-ui-notification-close", (function() {
                 var nn = n;
                 return function() {
                     nn.close();

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

@@ -264,6 +264,8 @@ RED.palette.editor = (function() {
                             var errMessage = set.err;
                             if (set.err.message) {
                                 errMessage = set.err.message;
+                            } else if (set.err.code) {
+                                errMessage = set.err.code;
                             }
                             $("<li>").text(errMessage).appendTo(nodeEntry.errorList);
                         }
@@ -331,7 +333,10 @@ RED.palette.editor = (function() {
                 nodeEntry.versionSpan.html(moduleInfo.version+' <i class="fa fa-long-arrow-right"></i> '+moduleInfo.pending_version).appendTo(nodeEntry.metaRow)
                 nodeEntry.updateButton.text(RED._('palette.editor.updated')).addClass('disabled').css('display', 'inline-block');
             } else if (loadedIndex.hasOwnProperty(module)) {
-                if (semVerCompare(loadedIndex[module].version,moduleInfo.version) > 0) {
+                if (updateAllowed &&
+                    semVerCompare(loadedIndex[module].version,moduleInfo.version) > 0 &&
+                    RED.utils.checkModuleAllowed(module,null,updateAllowList,updateDenyList)
+                ) {
                     nodeEntry.updateButton.show();
                     nodeEntry.updateButton.text(RED._('palette.editor.update',{version:loadedIndex[module].version}));
                 } else {
@@ -482,6 +487,9 @@ RED.palette.editor = (function() {
 
     var installAllowList = ['*'];
     var installDenyList = [];
+    var updateAllowed = true;
+    var updateAllowList = ['*'];
+    var updateDenyList = [];
 
     function init() {
         if (RED.settings.get('externalModules.palette.allowInstall', true) === false) {
@@ -496,6 +504,17 @@ RED.palette.editor = (function() {
         installAllowList = RED.utils.parseModuleList(installAllowList);
         installDenyList = RED.utils.parseModuleList(installDenyList);
 
+        var settingsUpdateAllowList = RED.settings.get("externalModules.palette.allowUpdateList")
+        var settingsUpdateDenyList = RED.settings.get("externalModules.palette.denyUpdateList")
+        if (settingsUpdateAllowList || settingsUpdateDenyList) {
+            updateAllowList = settingsUpdateAllowList;
+            updateDenyList = settingsUpdateDenyList;
+        }
+        updateAllowList = RED.utils.parseModuleList(updateAllowList);
+        updateDenyList = RED.utils.parseModuleList(updateDenyList);
+        updateAllowed = RED.settings.get("externalModules.palette.allowUpdate",true);
+
+
         createSettingsPane();
 
         RED.userSettings.add({

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

@@ -224,14 +224,7 @@ RED.palette = (function() {
 
             var d = $('<div>',{class:"red-ui-palette-node"}).attr("data-palette-type",nt).data('category',rootCategory);
 
-            var label = nt;///^(.*?)([ -]in|[ -]out)?$/.exec(nt)[1];
-            if (typeof def.paletteLabel !== "undefined") {
-                try {
-                    label = (typeof def.paletteLabel === "function" ? def.paletteLabel.call(def) : def.paletteLabel)||"";
-                } catch(err) {
-                    console.log("Definition error: "+nt+".paletteLabel",err);
-                }
-            }
+            var label = RED.utils.getPaletteLabel(nt, def);///^(.*?)([ -]in|[ -]out)?$/.exec(nt)[1];
 
             $('<div/>', {
                 class: "red-ui-palette-label"+(((!def.align && def.inputs !== 0 && def.outputs === 0) || "right" === def.align) ? " red-ui-palette-label-right" : "")

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

@@ -1212,6 +1212,9 @@ RED.projects = (function() {
                             }
                         }).appendTo(row);
 
+                        row = $('<div class="form-row red-ui-projects-dialog-screen-create-row red-ui-projects-dialog-screen-create-row-open"></div>').hide().appendTo(container);
+                        $('<span style="display: flex; align-items: center;"><input style="padding:0; margin: 0 5px 0 0" checked type="checkbox" id="red-ui-projects-dialog-screen-clear-context"> <label for="red-ui-projects-dialog-screen-clear-context" style="padding:0; margin: 0"> <span data-i18n="projects.create.clearContext"></span></label></span>').appendTo(row).i18n();
+
                         row = $('<div class="form-row red-ui-projects-dialog-screen-create-row red-ui-projects-dialog-screen-create-row-empty red-ui-projects-dialog-screen-create-row-clone"></div>').appendTo(container);
                         $('<label for="red-ui-projects-dialog-screen-create-project-name">'+RED._("projects.create.project-name")+'</label>').appendTo(row);
 
@@ -1501,7 +1504,8 @@ RED.projects = (function() {
                                             };
                                         }
                                     } else if (projectType === 'open') {
-                                        return switchProject(selectedProject.name,function(err,data) {
+                                        var clearContext = $("#red-ui-projects-dialog-screen-clear-context").prop("checked")
+                                        return switchProject(selectedProject.name, clearContext, function(err,data) {
                                             if (err) {
                                                 if (err.code !== 'credentials_load_failed') {
                                                     console.log(RED._("projects.create.unexpected_error"),err)
@@ -1595,7 +1599,7 @@ RED.projects = (function() {
         }
     }
 
-    function switchProject(name,done) {
+    function switchProject(name,clearContext,done) {
         RED.deploy.setDeployInflight(true);
         RED.projects.settings.switchProject(name);
         sendRequest({
@@ -1614,7 +1618,7 @@ RED.projects = (function() {
                     '*': done
                 },
             }
-        },{active:true}).then(function() {
+        },{active:true, clearContext:clearContext}).then(function() {
             dialog.dialog( "close" );
             RED.events.emit("project:change", {name:name});
         }).always(function() {
@@ -1687,7 +1691,7 @@ RED.projects = (function() {
             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);
+        $(".red-ui-projects-dialog-project-list-inner-container").height(Math.max(500,dialogHeight) - 210);
         dialog.dialog('option','title',screen.title||"");
         dialog.dialog("open");
     }
@@ -2387,6 +2391,7 @@ RED.projects = (function() {
     return {
         init: init,
         showStartup: function() {
+            console.warn("showStartup")
             if (!RED.user.hasPermission("projects.write")) {
                 RED.notify(RED._("user.errors.notAuthorized"),"error");
                 return;

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

@@ -22,8 +22,11 @@ RED.search = (function() {
     var selected = -1;
     var visible = false;
 
+    var searchHistory = [];
     var index = {};
     var currentResults = [];
+    var activeResults = [];
+    var currentIndex = 0;
     var previousActiveElement;
 
     function indexProperty(node,label,property) {
@@ -52,10 +55,22 @@ RED.search = (function() {
         }
         l = l||n.label||n.name||n.id||"";
 
-
         var properties = ['id','type','name','label','info'];
-        if (n._def && n._def.defaults) {
-            properties = properties.concat(Object.keys(n._def.defaults));
+        const node_def = n && n._def;
+        if (node_def) {
+            if (node_def.defaults) {
+                properties = properties.concat(Object.keys(node_def.defaults));
+            }
+            if (n.type !== "group" && node_def.paletteLabel && node_def.paletteLabel !== node_def.type) {
+                try {
+                    const label = ("" + (typeof node_def.paletteLabel === "function" ? node_def.paletteLabel.call(node_def) : node_def.paletteLabel)).toLowerCase();
+                    if(label && label !== (""+node_def.type).toLowerCase()) {
+                        indexProperty(n, l, label);
+                    }
+                } catch(err) {
+                    console.warn(`error indexing ${l}`, err);
+                }
+            }
         }
         for (var i=0;i<properties.length;i++) {
             if (n.hasOwnProperty(properties[i])) {
@@ -105,6 +120,8 @@ RED.search = (function() {
         val = extractFlag(val,"unused",flags);
         val = extractFlag(val,"config",flags);
         val = extractFlag(val,"subflow",flags);
+        val = extractFlag(val,"hidden",flags);
+        val = extractFlag(val,"modified",flags);
         // uses:<node-id>
         val = extractValue(val,"uses",flags);
 
@@ -150,7 +167,20 @@ RED.search = (function() {
                                 continue;
                             }
                         }
-
+                        if (flags.hasOwnProperty("modified")) {
+                            if (!node.node.changed && !node.node.moved) {
+                                continue;
+                            }
+                        }
+                        if (flags.hasOwnProperty("hidden")) {
+                            // Only tabs can be hidden
+                            if (node.node.type !== 'tab') {
+                                continue
+                            }
+                            if (!RED.workspaces.isHidden(node.node.id)) {
+                                continue
+                            }
+                        }
                         if (flags.hasOwnProperty("unused")) {
                             var isUnused = (node.node.type === 'subflow' && node.node.instances.length === 0) ||
                                            (isConfigNode && node.node.users.length === 0)
@@ -196,6 +226,20 @@ RED.search = (function() {
         }
     }
 
+    function populateSearchHistory() {
+        if (searchHistory.length > 0) {
+            searchResults.editableList('addItem',{
+                historyHeader: true
+            });
+            searchHistory.forEach(function(entry) {
+                searchResults.editableList('addItem',{
+                    history: true,
+                    value: entry
+                });
+            })
+        }
+
+    }
     function createDialog() {
         dialog = $("<div>",{id:"red-ui-search",class:"red-ui-search"}).appendTo("#red-ui-main-container");
         var searchDiv = $("<div>",{class:"red-ui-search-container"}).appendTo(dialog);
@@ -204,7 +248,12 @@ RED.search = (function() {
             change: function() {
                 searchResults.editableList('empty');
                 selected = -1;
-                currentResults = search($(this).val());
+                var value = $(this).val();
+                if (value === "") {
+                    populateSearchHistory();
+                    return;
+                }
+                currentResults = search(value);
                 if (currentResults.length > 0) {
                     for (i=0;i<Math.min(currentResults.length,25);i++) {
                         searchResults.editableList('addItem',currentResults[i])
@@ -220,9 +269,8 @@ RED.search = (function() {
                 } else {
                     searchResults.editableList('addItem',{});
                 }
-
-
-            }
+            },
+            options: getSearchOptions()
         });
         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();
@@ -276,9 +324,15 @@ RED.search = (function() {
                                 })
                             }
                         }
-                    } else {
+                    } if ($(children[selected]).hasClass("red-ui-search-history")) {
+                        var object = $(children[selected]).find(".red-ui-editableList-item-content").data('data');
+                        if (object) {
+                            searchInput.searchBox('value',object.value)
+                        }
+                    } else if (!$(children[selected]).hasClass("red-ui-search-historyHeader")) {
                         if (currentResults.length > 0) {
-                            reveal(currentResults[Math.max(0,selected)].node);
+                            currentIndex = Math.max(0,selected);
+                            reveal(currentResults[currentIndex].node);
                         }
                     }
                 }
@@ -292,7 +346,32 @@ RED.search = (function() {
             addItem: function(container,i,object) {
                 var node = object.node;
                 var div;
-                if (object.more) {
+                if (object.historyHeader) {
+                    container.parent().addClass("red-ui-search-historyHeader")
+                    $('<div>',{class:"red-ui-search-empty"}).text(RED._("search.history")).appendTo(container);
+                    $('<button type="button" class="red-ui-button red-ui-button-small"></button>').text(RED._("search.clear")).appendTo(container).on("click", function(evt) {
+                        evt.preventDefault();
+                        searchHistory = [];
+                        searchResults.editableList('empty');
+                    });
+                } else if (object.history) {
+                    container.parent().addClass("red-ui-search-history")
+                    div = $('<a>',{href:'#',class:"red-ui-search-result"}).appendTo(container);
+                    div.text(object.value);
+                    div.on("click", function(evt) {
+                        evt.preventDefault();
+                        searchInput.searchBox('value',object.value)
+                        searchInput.focus();
+                    })
+                    $('<button type="button" class="red-ui-button red-ui-button-small"><i class="fa fa-remove"></i></button>').appendTo(container).on("click", function(evt) {
+                        evt.preventDefault();
+                        var index = searchHistory.indexOf(object.value);
+                        searchHistory.splice(index,1);
+                        searchResults.editableList('removeItem', object);
+                    });
+
+
+                } else if (object.more) {
                     container.parent().addClass("red-ui-search-more")
                     div = $('<a>',{href:'#',class:"red-ui-search-result red-ui-search-empty"}).appendTo(container);
                     div.text(RED._("palette.editor.more",{count:object.more.results.length-object.more.start}));
@@ -337,6 +416,7 @@ RED.search = (function() {
 
                     div.on("click", function(evt) {
                         evt.preventDefault();
+                        currentIndex = i;
                         reveal(node);
                     });
                 }
@@ -347,12 +427,64 @@ RED.search = (function() {
     }
 
     function reveal(node) {
-        hide();
+        var searchVal = searchInput.val();
+        var existingIndex = searchHistory.indexOf(searchVal);
+        if (existingIndex > -1) {
+            searchHistory.splice(existingIndex,1);
+        }
+        searchHistory.unshift(searchVal);
+        $("#red-ui-view-searchtools-search").data("term", searchVal);
+        activeResults = Object.assign([], currentResults);
+        hide(null, activeResults.length > 0);
         RED.view.reveal(node.id);
     }
 
+    function revealPrev() {
+        if (disabled) {
+            updateSearchToolbar();
+            return;
+        }
+        if (!searchResults || !activeResults.length) {
+            show();
+            return;
+        }
+        if (currentIndex > 0) {
+            currentIndex--;
+        } else {
+            currentIndex = activeResults.length - 1;
+        }
+        const n = activeResults[currentIndex];
+        if (n && n.node && n.node.id) {
+            RED.view.reveal(n.node.id);
+            $("#red-ui-view-searchtools-prev").trigger("focus");
+        }
+        updateSearchToolbar();
+    }
+    function revealNext() {
+        if (disabled) {
+            updateSearchToolbar();
+            return;
+        }
+        if (!searchResults || !activeResults.length) {
+            show();
+            return;
+        }
+        if (currentIndex < activeResults.length - 1) {
+            currentIndex++
+        } else {
+            currentIndex = 0;
+        }
+        const n = activeResults[currentIndex];
+        if (n && n.node && n.node.id) {
+            RED.view.reveal(n.node.id);
+            $("#red-ui-view-searchtools-next").trigger("focus");
+        }
+        updateSearchToolbar();
+    }
+
     function show(v) {
         if (disabled) {
+            updateSearchToolbar();
             return;
         }
         if (!visible) {
@@ -365,16 +497,21 @@ RED.search = (function() {
 
             if (dialog === null) {
                 createDialog();
+            } else {
+                searchResults.editableList('empty');
             }
             dialog.slideDown(300);
             searchInput.searchBox('value',v)
+            if (!v || v === "") {
+                populateSearchHistory();
+            }
             RED.events.emit("search:open");
             visible = true;
         }
         searchInput.trigger("focus");
     }
 
-    function hide() {
+    function hide(el, keepSearchToolbar) {
         if (visible) {
             visible = false;
             $("#red-ui-header-shade").hide();
@@ -388,13 +525,37 @@ RED.search = (function() {
                 });
             }
             RED.events.emit("search:close");
-            if (previousActiveElement) {
+            if (previousActiveElement && (!keepSearchToolbar || !activeResults.length)) {
                 $(previousActiveElement).trigger("focus");
-                previousActiveElement = null;
             }
+            previousActiveElement = null;
+        } 
+        if(!keepSearchToolbar) {
+            clearActiveSearch();
+        }
+        updateSearchToolbar();
+        if(keepSearchToolbar && activeResults.length) {
+            $("#red-ui-view-searchtools-next").trigger("focus");
+        }
+    }
+    function updateSearchToolbar() {
+        if (!disabled && currentIndex >= 0 && activeResults && activeResults.length) {
+            let term = $("#red-ui-view-searchtools-search").data("term") || "";
+            if (term.length > 16) {
+                term = term.substring(0, 12) + "..."
+            }
+            const i18nSearchCounterData = {
+                term: term,
+                result: (currentIndex + 1),
+                count: activeResults.length
+            }
+            $("#red-ui-view-searchtools-counter").text(RED._('actions.search-counter', i18nSearchCounterData));
+            $("#view-search-tools > :not(:first-child)").show(); //show other tools
+        } else {
+            clearActiveSearch();
+            $("#view-search-tools > :not(:first-child)").hide(); //hide all but search button
         }
     }
-
     function clearIndex() {
         index = {};
     }
@@ -416,9 +577,29 @@ RED.search = (function() {
         addItemToIndex(item);
     }
 
+    function clearActiveSearch() {
+        activeResults = [];
+        currentIndex = 0;
+        $("#red-ui-view-searchtools-search").data("term", "");
+    }
+
+    function getSearchOptions() {
+        return [
+            {label:RED._("search.options.configNodes"), value:"is:config"},
+            {label:RED._("search.options.unusedConfigNodes"), value:"is:config is:unused"},
+            {label:RED._("search.options.modifiedNodes"), value:"is:modified"},
+            {label:RED._("search.options.invalidNodes"), value: "is:invalid"},
+            {label:RED._("search.options.uknownNodes"), value: "type:unknown"},
+            {label:RED._("search.options.unusedSubflows"), value:"is:subflow is:unused"},
+            {label:RED._("search.options.hiddenFlows"), value:"is:hidden"},
+        ]
+
+    }
 
     function init() {
         RED.actions.add("core:search",show);
+        RED.actions.add("core:search-previous",revealPrev);
+        RED.actions.add("core:search-next",revealNext);
 
         RED.events.on("editor:open",function() { disabled = true; });
         RED.events.on("editor:close",function() { disabled = false; });
@@ -429,11 +610,21 @@ RED.search = (function() {
 
         RED.keyboard.add("red-ui-search","escape",hide);
 
+        RED.keyboard.add("view-search-tools","escape",function() {
+            clearActiveSearch();
+            updateSearchToolbar();
+        });
+
         $("#red-ui-header-shade").on('mousedown',hide);
         $("#red-ui-editor-shade").on('mousedown',hide);
         $("#red-ui-palette-shade").on('mousedown',hide);
         $("#red-ui-sidebar-shade").on('mousedown',hide);
 
+        $("#red-ui-view-searchtools-close").on("click", function close() {
+            clearActiveSearch();            
+            updateSearchToolbar();
+        });
+        $("#red-ui-view-searchtools-close").trigger("click");
 
         RED.events.on("workspace:clear", clearIndex);
 
@@ -459,7 +650,8 @@ RED.search = (function() {
         init: init,
         show: show,
         hide: hide,
-        search: search
+        search: search,
+        getSearchOptions: getSearchOptions
     };
 
 })();

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

@@ -19,6 +19,15 @@ RED.sidebar = (function() {
     var sidebar_tabs;
     var knownTabs = {};
 
+    // We store the current sidebar tab id in localStorage as 'last-sidebar-tab'
+    // This is restored when the editor is reloaded.
+    // We use sidebar_tabs.onchange to update localStorage. However that will
+    // also get triggered when the first tab gets added to the tabs - typically
+    // the 'info' tab. So we use the following variable to store the retrieved
+    // value from localStorage before we start adding the actual tabs
+    var lastSessionSelectedTab = null;
+
+
     function addTab(title,content,closeable,visible) {
         var options;
         if (typeof title === "string") {
@@ -194,16 +203,16 @@ RED.sidebar = (function() {
         RED.events.emit("sidebar:resize");
     }
 
-    function showSidebar(id) {
+    function showSidebar(id, skipShowSidebar) {
         if (id === ":first") {
-            id = RED.settings.get("editor.sidebar.order",["info", "help", "version-control", "debug"])[0]
+            id = lastSessionSelectedTab || RED.settings.get("editor.sidebar.order",["info", "help", "version-control", "debug"])[0]
         }
         if (id) {
             if (!containsTab(id) && knownTabs[id]) {
                 sidebar_tabs.addTab(knownTabs[id]);
             }
             sidebar_tabs.activateTab(id);
-            if (!RED.menu.isSelected("menu-item-sidebar")) {
+            if (!skipShowSidebar && !RED.menu.isSelected("menu-item-sidebar")) {
                 RED.menu.setSelected("menu-item-sidebar",true);
             }
         }
@@ -227,6 +236,7 @@ RED.sidebar = (function() {
                 if (tab.toolbar) {
                     $(tab.toolbar).show();
                 }
+                RED.settings.setLocal("last-sidebar-tab", tab.id)
             },
             onremove: function(tab) {
                 $(tab.wrapper).hide();
@@ -255,7 +265,9 @@ RED.sidebar = (function() {
             }
         });
         RED.popover.tooltip($("#red-ui-sidebar-separator").find(".red-ui-sidebar-control-right"),RED._("keyboard.toggleSidebar"),"core:toggle-sidebar");
-        showSidebar();
+
+        lastSessionSelectedTab = RED.settings.getLocal("last-sidebar-tab")
+
         RED.sidebar.info.init();
         RED.sidebar.help.init();
         RED.sidebar.config.init();

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

@@ -27,5 +27,8 @@ RED.state = {
     PANNING: 10,
     SELECTING_NODE: 11,
     GROUP_DRAGGING: 12,
-    GROUP_RESIZE: 13
+    GROUP_RESIZE: 13,
+    DETACHED_DRAGGING: 14,
+    SLICING: 15,
+    SLICING_JUNCTION: 16
 }

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

@@ -31,6 +31,7 @@ RED.statusBar = (function() {
     function addWidget(options) {
         widgets[options.id] = options;
         var el = $('<span class="red-ui-statusbar-widget"></span>');
+        el.prop('id', options.id);
         options.element.appendTo(el);
         if (options.align === 'left') {
             leftBucket.append(el);

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

@@ -16,8 +16,6 @@
 
 RED.subflow = (function() {
 
-    var currentLocale = "en-US";
-
     var _subflowEditTemplate = '<script type="text/x-red" data-template-name="subflow">'+
         '<div class="form-row">'+
             '<label for="node-input-name" data-i18n="[append]editor:common.label.name"><i class="fa fa-tag"></i> </label>'+
@@ -37,7 +35,7 @@ RED.subflow = (function() {
         '<div id="subflow-env-tabs-content">'+
             '<div id="subflow-env-tab-edit">'+
                 '<div class="form-row node-input-env-container-row" id="subflow-input-edit-ui">'+
-                    '<ol class="red-ui-editor-subflow-env-list" id="node-input-env-container"></ol>'+
+                    '<ol id="node-input-env-container"></ol>'+
                     '<div class="node-input-env-locales-row"><i class="fa fa-language"></i> <select id="subflow-input-env-locale"></select></div>'+
                 '</div>'+
             '</div>'+
@@ -47,37 +45,6 @@ RED.subflow = (function() {
         '</div>'+
         '</script>';
 
-    var _subflowModulePaneTemplate = '<form class="dialog-form form-horizontal" autocomplete="off">'+
-        '<div class="form-row">'+
-            '<label for="subflow-input-module-module" data-i18n="[append]editor:subflow.module"><i class="fa fa-cube"></i> </label>'+
-            '<input style="width: calc(100% - 110px)" type="text" id="subflow-input-module-module" data-i18n="[placeholder]common.label.name">'+
-        '</div>'+
-        '<div class="form-row">'+
-            '<label for="subflow-input-module-type" data-i18n="[append]editor:subflow.type"> </label>'+
-            '<input style="width: calc(100% - 110px)" type="text" id="subflow-input-module-type">'+
-        '</div>'+
-        '<div class="form-row">'+
-            '<label for="subflow-input-module-version" data-i18n="[append]editor:subflow.version"></label>'+
-            '<input style="width: calc(100% - 110px)" type="text" id="subflow-input-module-version" data-i18n="[placeholder]editor:subflow.versionPlaceholder">'+
-        '</div>'+
-        '<div class="form-row">'+
-            '<label for="subflow-input-module-desc" data-i18n="[append]editor:subflow.desc"></label>'+
-            '<input style="width: calc(100% - 110px)" type="text" id="subflow-input-module-desc">'+
-        '</div>'+
-        '<div class="form-row">'+
-            '<label for="subflow-input-module-license" data-i18n="[append]editor:subflow.license"></label>'+
-            '<input style="width: calc(100% - 110px)" type="text" id="subflow-input-module-license">'+
-        '</div>'+
-        '<div class="form-row">'+
-            '<label for="subflow-input-module-author" data-i18n="[append]editor:subflow.author"></label>'+
-            '<input style="width: calc(100% - 110px)" type="text" id="subflow-input-module-author" data-i18n="[placeholder]editor:subflow.authorPlaceholder">'+
-        '</div>'+
-        '<div class="form-row">'+
-            '<label for="subflow-input-module-keywords" data-i18n="[append]editor:subflow.keys"></label>'+
-            '<input style="width: calc(100% - 110px)" type="text" id="subflow-input-module-keywords" data-i18n="[placeholder]editor:subflow.keysPlaceholder">'+
-        '</div>'+
-    '</form>';
-
     function findAvailableSubflowIOPosition(subflow,isInput) {
         var pos = {x:50,y:30};
         if (!isInput) {
@@ -909,7 +876,6 @@ RED.subflow = (function() {
      * Create interface for controlling env var UI definition
      */
     function buildEnvControl(envList,node) {
-
         var tabs = RED.tabs.create({
             id: "subflow-env-tabs",
             onchange: function(tab) {
@@ -950,588 +916,11 @@ RED.subflow = (function() {
         locales.val(locale);
 
         locales.on("change", function() {
-            currentLocale = $(this).val();
-            var items = $("#node-input-env-container").editableList("items");
-            items.each(function (i, item) {
-                var entry = $(this).data('data');
-                var labelField = entry.ui.labelField;
-                labelField.val(lookupLabel(entry.ui.label, "", currentLocale));
-                if (labelField.timeout) {
-                    clearTimeout(labelField.timeout);
-                    delete labelField.timeout;
-                }
-                labelField.addClass("input-updated");
-                labelField.timeout = setTimeout(function() {
-                    delete labelField.timeout
-                    labelField.removeClass("input-updated");
-                },3000);
-            });
+            RED.editor.envVarList.setLocale($(this).val(), $("#node-input-env-container"));
         });
+        RED.editor.envVarList.setLocale(locale);
     }
 
-    var DEFAULT_ENV_TYPE_LIST = ['str','num','bool','json','bin','env'];
-    var DEFAULT_ENV_TYPE_LIST_INC_CRED = ['str','num','bool','json','bin','env','cred'];
-
-    /**
-     * Create env var edit interface
-     * @param container - container
-     * @param node - subflow node
-     */
-    function buildPropertiesList(envContainer, node) {
-
-        var isTemplateNode = (node.type === "subflow");
-
-        if (isTemplateNode) {
-            buildEnvControl(envContainer, node);
-        }
-        envContainer
-            .css({
-                'min-height':'150px',
-                'min-width':'450px'
-            })
-            .editableList({
-                header: isTemplateNode?$('<div><div><div></div><div data-i18n="common.label.name"></div><div data-i18n="editor-tab.defaultValue"></div><div></div></div></div>'):undefined,
-                addItem: function(container, i, opt) {
-                    // If this is an instance node, these are properties unique to
-                    // this instance - ie opt.parent will not be defined.
-
-                    if (isTemplateNode) {
-                        container.addClass("red-ui-editor-subflow-env-editable")
-                    }
-
-                    var envRow = $('<div/>').appendTo(container);
-                    var nameField = null;
-                    var valueField = null;
-
-                    nameField = $('<input/>', {
-                        class: "node-input-env-name",
-                        type: "text",
-                        placeholder: RED._("common.label.name")
-                    }).attr("autocomplete","disable").appendTo(envRow).val(opt.name);
-                    valueField = $('<input/>',{
-                        style: "width:100%",
-                        class: "node-input-env-value",
-                        type: "text",
-                    }).attr("autocomplete","disable").appendTo(envRow)
-                    valueField.typedInput({default:'str',types:isTemplateNode?DEFAULT_ENV_TYPE_LIST:DEFAULT_ENV_TYPE_LIST_INC_CRED});
-                    valueField.typedInput('type', opt.type);
-                    if (opt.type === "cred") {
-                        if (opt.value) {
-                            valueField.typedInput('value', opt.value);
-                        } else if (node.credentials && node.credentials[opt.name]) {
-                            valueField.typedInput('value', node.credentials[opt.name]);
-                        } else if (node.credentials && node.credentials['has_'+opt.name]) {
-                            valueField.typedInput('value', "__PWRD__");
-                        } else {
-                            valueField.typedInput('value', "");
-                        }
-                    } else {
-                        valueField.typedInput('value', opt.value);
-                    }
-
-
-                    opt.nameField = nameField;
-                    opt.valueField = valueField;
-
-                    var actionButton = $('<a/>',{href:"#",class:"red-ui-editableList-item-remove red-ui-button red-ui-button-small"}).appendTo(envRow);
-                    $('<i/>',{class:"fa "+(opt.parent?"fa-reply":"fa-remove")}).appendTo(actionButton);
-                    var removeTip = RED.popover.tooltip(actionButton,RED._("subflow.env.remove"));
-                    actionButton.on("click", function(evt) {
-                        evt.preventDefault();
-                        removeTip.close();
-                        container.parent().addClass("red-ui-editableList-item-deleting")
-                        container.fadeOut(300, function() {
-                            envContainer.editableList('removeItem',opt);
-                        });
-                    });
-
-                    if (isTemplateNode) {
-                        // Add the UI customisation row
-                        // if `opt.ui` does not exist, then apply defaults. If these
-                        // defaults do not change then they will get stripped off
-                        // before saving.
-                        if (opt.type === 'cred') {
-                            opt.ui = opt.ui || {
-                                icon: "",
-                                type: "cred"
-                            }
-                            opt.ui.type = "cred";
-                        } else {
-                            opt.ui = opt.ui || {
-                                icon: "",
-                                type: "input",
-                                opts: {types:DEFAULT_ENV_TYPE_LIST}
-                            }
-                        }
-                        opt.ui.label = opt.ui.label || {};
-                        opt.ui.type = opt.ui.type || "input";
-
-                        var uiRow = $('<div/>').appendTo(container).hide();
-                        // save current info for reverting on cancel
-                        // var copy = $.extend(true, {}, ui);
-
-                         $('<a href="#"><i class="fa fa-angle-right"></a>').prependTo(envRow).on("click", function (evt) {
-                            evt.preventDefault();
-                            if ($(this).hasClass('expanded')) {
-                                uiRow.slideUp();
-                                $(this).removeClass('expanded');
-                            } else {
-                                uiRow.slideDown();
-                                $(this).addClass('expanded');
-                            }
-                        });
-
-                        buildEnvEditRow(uiRow, opt.ui, nameField, valueField);
-                        nameField.trigger('change');
-                    }
-                },
-                sortable: ".red-ui-editableList-item-handle",
-                removable: false
-            });
-        var parentEnv = {};
-        var envList = [];
-        if (/^subflow:/.test(node.type)) {
-            var subflowDef = RED.nodes.subflow(node.type.substring(8));
-            if (subflowDef.env) {
-                subflowDef.env.forEach(function(env) {
-                    var item = {
-                        name:env.name,
-                        parent: {
-                            type: env.type,
-                            value: env.value,
-                            ui: env.ui
-                        }
-                    }
-                    envList.push(item);
-                    parentEnv[env.name] = item;
-                })
-            }
-        }
-
-        if (node.env) {
-            for (var i = 0; i < node.env.length; i++) {
-                var env = node.env[i];
-                if (parentEnv.hasOwnProperty(env.name)) {
-                    parentEnv[env.name].type = env.type;
-                    parentEnv[env.name].value = env.value;
-                } else {
-                    envList.push({
-                        name: env.name,
-                        type: env.type,
-                        value: env.value,
-                        ui: env.ui
-                    });
-                }
-            }
-        }
-        envList.forEach(function(env) {
-            if (env.parent && env.parent.ui && env.parent.ui.type === 'hide') {
-                return;
-            }
-            if (!isTemplateNode && env.parent) {
-                return;
-            }
-            envContainer.editableList('addItem', JSON.parse(JSON.stringify(env)));
-        });
-    }
-
-    /**
-     * Create UI edit interface for environment variable
-     * @param container - container
-     * @param env - env var definition
-     * @param nameField - name field of env var
-     * @param valueField - value field of env var
-     */
-     function buildEnvEditRow(container, ui, nameField, valueField) {
-         container.addClass("red-ui-editor-subflow-env-ui-row")
-         var topRow = $('<div></div>').appendTo(container);
-         $('<div></div>').appendTo(topRow);
-         $('<div>').text(RED._("editor.icon")).appendTo(topRow);
-         $('<div>').text(RED._("editor.label")).appendTo(topRow);
-         $('<div>').text(RED._("editor.inputType")).appendTo(topRow);
-
-         var row = $('<div></div>').appendTo(container);
-         $('<div><i class="red-ui-editableList-item-handle fa fa-bars"></i></div>').appendTo(row);
-         var typeOptions = {
-             'input': {types:DEFAULT_ENV_TYPE_LIST},
-             'select': {opts:[]},
-             'spinner': {},
-             'cred': {}
-         };
-         if (ui.opts) {
-             typeOptions[ui.type] = ui.opts;
-         } else {
-             // Pick up the default values if not otherwise provided
-             ui.opts = typeOptions[ui.type];
-         }
-         var iconCell = $('<div></div>').appendTo(row);
-
-         var iconButton = $('<a href="#"></a>').appendTo(iconCell);
-         iconButton.on("click", function(evt) {
-             evt.preventDefault();
-             var icon = ui.icon || "";
-             var iconPath = (icon ? RED.utils.separateIconPath(icon) : {});
-             RED.editor.showIconPicker(iconButton, null, iconPath, true, function (newIcon) {
-                 iconButton.empty();
-                 var path = newIcon || "";
-                 var newPath = RED.utils.separateIconPath(path);
-                 if (newPath) {
-                     $('<i class="fa"></i>').addClass(newPath.file).appendTo(iconButton);
-                 }
-                 ui.icon = path;
-             });
-         })
-
-         if (ui.icon) {
-             var newPath = RED.utils.separateIconPath(ui.icon);
-             $('<i class="fa '+newPath.file+'"></i>').appendTo(iconButton);
-         }
-
-         var labelCell = $('<div></div>').appendTo(row);
-
-         var label = ui.label && ui.label[currentLocale] || "";
-         var labelInput = $('<input type="text">').val(label).appendTo(labelCell);
-         ui.labelField = labelInput;
-         labelInput.on('change', function(evt) {
-             ui.label = ui.label || {};
-             var val = $(this).val().trim();
-             if (val === "") {
-                 delete ui.label[currentLocale];
-             } else {
-                 ui.label[currentLocale] = val;
-             }
-         })
-         var labelIcon = $('<span class="red-ui-editor-subflow-env-lang-icon"><i class="fa fa-language"></i></span>').appendTo(labelCell);
-         RED.popover.tooltip(labelIcon,function() {
-             var langs = Object.keys(ui.label);
-             var content = $("<div>");
-             if (langs.indexOf(currentLocale) === -1) {
-                 langs.push(currentLocale);
-                 langs.sort();
-             }
-             langs.forEach(function(l) {
-                 var row = $('<div>').appendTo(content);
-                 $('<span>').css({display:"inline-block",width:"120px"}).text(RED._("languages."+l)+(l===currentLocale?"*":"")).appendTo(row);
-                 $('<span>').text(ui.label[l]||"").appendTo(row);
-             });
-             return content;
-         })
-
-         nameField.on('change',function(evt) {
-            labelInput.attr("placeholder",$(this).val())
-        });
-
-        var inputCell = $('<div></div>').appendTo(row);
-        var inputCellInput = $('<input type="text">').css("width","100%").appendTo(inputCell);
-        if (ui.type === "input") {
-            inputCellInput.val(ui.opts.types.join(","));
-        }
-        var checkbox;
-        var selectBox;
-
-        inputCellInput.typedInput({
-            types: [
-                {
-                    value:"input",
-                    label:RED._("editor.inputs.input"), icon:"fa fa-i-cursor",showLabel:false,multiple:true,options:[
-                        {value:"str",label:RED._("editor.types.str"),icon:"red/images/typedInput/az.svg"},
-                        {value:"num",label:RED._("editor.types.num"),icon:"red/images/typedInput/09.svg"},
-                        {value:"bool",label:RED._("editor.types.bool"),icon:"red/images/typedInput/bool.svg"},
-                        {value:"json",label:RED._("editor.types.json"),icon:"red/images/typedInput/json.svg"},
-                        {value: "bin",label: RED._("editor.types.bin"),icon: "red/images/typedInput/bin.svg"},
-                        {value: "env",label: RED._("editor.types.env"),icon: "red/images/typedInput/env.svg"},
-                        {value: "cred",label: RED._("editor.types.cred"),icon: "fa fa-lock"}
-                    ],
-                    default: DEFAULT_ENV_TYPE_LIST,
-                    valueLabel: function(container,value) {
-                        container.css("padding",0);
-                        var innerContainer = $('<div class="red-ui-editor-subflow-env-input-type"></div>').appendTo(container);
-
-                        var input = $('<div class="placeholder-input">').appendTo(innerContainer);
-                        $('<span><i class="fa fa-i-cursor"></i></span>').appendTo(input);
-                        if (value.length) {
-                            value.forEach(function(v) {
-                                if (!/^fa /.test(v.icon)) {
-                                    $('<img>',{src:v.icon,style:"max-width:14px; padding: 0 3px; margin-top:-4px; margin-left: 1px"}).appendTo(input);
-                                } else {
-                                    var s = $('<span>',{style:"max-width:14px; padding: 0 3px; margin-top:-4px; margin-left: 1px"}).appendTo(input);
-                                    $("<i>",{class: v.icon}).appendTo(s);
-                                }
-                            })
-                        } else {
-                            $('<span class="red-ui-editor-subflow-env-input-type-placeholder"></span>').text(RED._("editor.selectType")).appendTo(input);
-                        }
-                    }
-                },
-                {
-                    value: "cred",
-                    label: RED._("typedInput.type.cred"), icon:"fa fa-lock", showLabel: false,
-                    valueLabel: function(container,value) {
-                        container.css("padding",0);
-                        var innerContainer = $('<div class="red-ui-editor-subflow-env-input-type">').css({
-                            "border-top-right-radius": "4px",
-                            "border-bottom-right-radius": "4px"
-                        }).appendTo(container);
-                        $('<div class="placeholder-input">').html("&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;").appendTo(innerContainer);
-                    }
-                },
-                {
-                    value:"select",
-                    label:RED._("editor.inputs.select"), icon:"fa fa-tasks",showLabel:false,
-                    valueLabel: function(container,value) {
-                        container.css("padding","0");
-
-                        selectBox = $('<select></select>').appendTo(container);
-                        if (ui.opts && Array.isArray(ui.opts.opts)) {
-                            ui.opts.opts.forEach(function(o) {
-                                var label = lookupLabel(o.l, o.l["en-US"]||o.v, currentLocale);
-                                // $('<option>').val((o.t||'str')+":"+o.v).text(label).appendTo(selectBox);
-                                $('<option>').val(o.v).text(label).appendTo(selectBox);
-                            })
-                        }
-                        selectBox.on('change', function(evt) {
-                            var v = selectBox.val();
-                            // var parts = v.split(":");
-                            // var t = parts.shift();
-                            // v = parts.join(":");
-                            //
-                            // valueField.typedInput("type",'str')
-                            valueField.typedInput("value",v)
-                        });
-                        selectBox.val(valueField.typedInput("value"));
-                        // selectBox.val(valueField.typedInput('type')+":"+valueField.typedInput("value"));
-                    },
-                    expand: {
-                        icon: "fa-caret-down",
-                        minWidth: 400,
-                        content: function(container) {
-                            var content = $('<div class="red-ui-editor-subflow-ui-edit-panel">').appendTo(container);
-                            var optList = $('<ol>').appendTo(content).editableList({
-                                header:$("<div><div>"+RED._("editor.select.label")+"</div><div>"+RED._("editor.select.value")+"</div></div>"),
-                                addItem: function(row,index,itemData) {
-                                    var labelDiv = $('<div>').appendTo(row);
-                                    var label = lookupLabel(itemData.l, "", currentLocale);
-                                    itemData.label = $('<input type="text">').val(label).appendTo(labelDiv);
-                                    itemData.label.on('keydown', function(evt) {
-                                        if (evt.keyCode === 13) {
-                                            itemData.input.focus();
-                                            evt.preventDefault();
-                                        }
-                                    });
-                                    var labelIcon = $('<span class="red-ui-editor-subflow-env-lang-icon"><i class="fa fa-language"></i></span>').appendTo(labelDiv);
-                                    RED.popover.tooltip(labelIcon,function() {
-                                        return currentLocale;
-                                    })
-                                    itemData.input = $('<input type="text">').val(itemData.v).appendTo(row);
-
-                                    // Problem using a TI here:
-                                    //  - this is in a popout panel
-                                    //  - clicking the expand button in the TI will close the parent edit tray
-                                    //    and open the type editor.
-                                    //  - but it leaves the popout panel over the top.
-                                    //  - there is no way to get back to the popout panel after closing the type editor
-                                    //.typedInput({default:itemData.t||'str', types:DEFAULT_ENV_TYPE_LIST});
-                                    itemData.input.on('keydown', function(evt) {
-                                        if (evt.keyCode === 13) {
-                                            // Enter or Tab
-                                            var index = optList.editableList('indexOf',itemData);
-                                            var length = optList.editableList('length');
-                                            if (index + 1 === length) {
-                                                var newItem = {};
-                                                optList.editableList('addItem',newItem);
-                                                setTimeout(function() {
-                                                    if (newItem.label) {
-                                                        newItem.label.focus();
-                                                    }
-                                                },100)
-                                            } else {
-                                                var nextItem = optList.editableList('getItemAt',index+1);
-                                                if (nextItem.label) {
-                                                    nextItem.label.focus()
-                                                }
-                                            }
-                                            evt.preventDefault();
-                                        }
-                                    });
-                                },
-                                sortable: true,
-                                removable: true,
-                                height: 160
-                            })
-                            if (ui.opts.opts.length > 0) {
-                                ui.opts.opts.forEach(function(o) {
-                                    optList.editableList('addItem',$.extend(true,{},o))
-                                })
-                            } else {
-                                optList.editableList('addItem',{})
-                            }
-                            return {
-                                onclose: function() {
-                                    var items = optList.editableList('items');
-                                    var vals = [];
-                                    items.each(function (i,el) {
-                                        var data = el.data('data');
-                                        var l = data.label.val().trim();
-                                        var v = data.input.val();
-                                        // var t = data.input.typedInput('type');
-                                        // var v = data.input.typedInput('value');
-                                        if (l.length > 0) {
-                                            data.l = data.l || {};
-                                            data.l[currentLocale] = l;
-                                        }
-                                        data.v = v;
-
-                                        if (l.length > 0 || v.length > 0) {
-                                            var val = {l:data.l,v:data.v};
-                                            // if (t !== 'str') {
-                                            //     val.t = t;
-                                            // }
-                                            vals.push(val);
-                                        }
-                                    });
-                                    ui.opts.opts = vals;
-                                    inputCellInput.typedInput('value',Date.now())
-                                }
-                            }
-                        }
-                    }
-                },
-                {
-                    value:"checkbox",
-                    label:RED._("editor.inputs.checkbox"), icon:"fa fa-check-square-o",showLabel:false,
-                    valueLabel: function(container,value) {
-                        container.css("padding",0);
-                        checkbox = $('<input type="checkbox">').appendTo(container);
-                        checkbox.on('change', function(evt) {
-                            valueField.typedInput('value',$(this).prop('checked')?"true":"false");
-                        })
-                        checkbox.prop('checked',valueField.typedInput('value')==="true");
-                    }
-                },
-                {
-                    value:"spinner",
-                    label:RED._("editor.inputs.spinner"), icon:"fa fa-sort-numeric-asc", showLabel:false,
-                    valueLabel: function(container,value) {
-                        container.css("padding",0);
-                        var innerContainer = $('<div class="red-ui-editor-subflow-env-input-type"></div>').appendTo(container);
-
-                        var input = $('<div class="placeholder-input">').appendTo(innerContainer);
-                        $('<span><i class="fa fa-sort-numeric-asc"></i></span>').appendTo(input);
-
-                        var min = ui.opts && ui.opts.min;
-                        var max = ui.opts && ui.opts.max;
-                        var label = "";
-                        if (min !== undefined && max !== undefined) {
-                            label = Math.min(min,max)+" - "+Math.max(min,max);
-                        } else if (min !== undefined) {
-                            label = "> "+min;
-                        } else if (max !== undefined) {
-                            label = "< "+max;
-                        }
-                        $('<span>').css("margin-left","15px").text(label).appendTo(input);
-                    },
-                    expand: {
-                        icon: "fa-caret-down",
-                        content: function(container) {
-                            var content = $('<div class="red-ui-editor-subflow-ui-edit-panel">').appendTo(container);
-                            content.css("padding","8px 5px")
-                            var min = ui.opts.min;
-                            var max = ui.opts.max;
-                            var minInput = $('<input type="number" style="margin-bottom:0; width:60px">');
-                            minInput.val(min);
-                            var maxInput = $('<input type="number" style="margin-bottom:0; width:60px">');
-                            maxInput.val(max);
-                            $('<div class="form-row" style="margin-bottom:3px"><label>'+RED._("editor.spinner.min")+'</label></div>').append(minInput).appendTo(content);
-                            $('<div class="form-row" style="margin-bottom:0"><label>'+RED._("editor.spinner.max")+'</label></div>').append(maxInput).appendTo(content);
-                            return {
-                                onclose: function() {
-                                    var min = minInput.val().trim();
-                                    var max = maxInput.val().trim();
-                                    if (min !== "") {
-                                        ui.opts.min = parseInt(min);
-                                    } else {
-                                        delete ui.opts.min;
-                                    }
-                                    if (max !== "") {
-                                        ui.opts.max = parseInt(max);
-                                    } else {
-                                        delete ui.opts.max;
-                                    }
-                                    inputCellInput.typedInput('value',Date.now())
-                                }
-                            }
-                        }
-                    }
-                },
-                {
-                    value:"none",
-                    label:RED._("editor.inputs.none"), icon:"fa fa-times",hasValue:false
-                },
-                {
-                    value:"hide",
-                    label:RED._("editor.inputs.hidden"), icon:"fa fa-ban",hasValue:false
-                }
-            ],
-            default: 'none'
-        }).on("typedinputtypechange", function(evt,type) {
-            ui.type = $(this).typedInput("type");
-            ui.opts = typeOptions[ui.type];
-            if (ui.type === 'input') {
-                // In the case of 'input' type, the typedInput uses the multiple-option
-                // mode. Its value needs to be set to a comma-separately list of the
-                // selected options.
-                inputCellInput.typedInput('value',ui.opts.types.join(","))
-            } else {
-                // No other type cares about `value`, but doing this will
-                // force a refresh of the label now that `ui.opts` has
-                // been updated.
-                inputCellInput.typedInput('value',Date.now())
-            }
-
-            switch (ui.type) {
-                case 'input':
-                    valueField.typedInput('types',ui.opts.types);
-                    break;
-                case 'select':
-                    valueField.typedInput('types',['str']);
-                    break;
-                case 'checkbox':
-                    valueField.typedInput('types',['bool']);
-                    break;
-                case 'spinner':
-                    valueField.typedInput('types',['num']);
-                    break;
-                case 'cred':
-                    valueField.typedInput('types',['cred']);
-                    break;
-                default:
-                    valueField.typedInput('types',DEFAULT_ENV_TYPE_LIST)
-            }
-            if (ui.type === 'checkbox') {
-                valueField.typedInput('type','bool');
-            } else if (ui.type === 'spinner') {
-                valueField.typedInput('type','num');
-            }
-            if (ui.type !== 'checkbox') {
-                checkbox = null;
-            }
-
-        }).on("change", function(evt,type) {
-            if (ui.type === 'input') {
-                var types = inputCellInput.typedInput('value');
-                ui.opts.types = (types === "") ? ["str"] : types.split(",");
-                valueField.typedInput('types',ui.opts.types);
-            }
-        });
-        valueField.on("change", function(evt) {
-            if (checkbox) {
-                checkbox.prop('checked',$(this).typedInput('value')==="true")
-            }
-        })
-        // Set the input to the right type. This will trigger the 'typedinputtypechange'
-        // event handler (just above ^^) to update the value if needed
-        inputCellInput.typedInput('type',ui.type)
-    }
 
     function buildEnvUIRow(row, tenv, ui, node) {
         ui.label = ui.label||{};
@@ -1540,7 +929,7 @@ RED.subflow = (function() {
             ui.opts = {};
         } else if (!ui.type) {
             ui.type = "input";
-            ui.opts = {types:DEFAULT_ENV_TYPE_LIST}
+            ui.opts = { types: RED.editor.envVarList.DEFAULT_ENV_TYPE_LIST }
         } else {
             if (!ui.opts) {
                 ui.opts = (ui.type === "select") ? {opts:[]} : {};
@@ -1549,7 +938,7 @@ RED.subflow = (function() {
 
         var labels = ui.label || {};
         var locale = RED.i18n.lang();
-        var labelText = lookupLabel(labels, labels["en-US"]||tenv.name, locale);
+        var labelText = RED.editor.envVarList.lookupLabel(labels, labels["en-US"]||tenv.name, locale);
         var label = $('<label>').appendTo(row);
         $('<span>&nbsp;</span>').appendTo(row);
         var labelContainer = $('<span></span>').appendTo(label);
@@ -1602,7 +991,7 @@ RED.subflow = (function() {
                 input = $('<select>').css('width','70%').appendTo(row);
                 if (ui.opts.opts) {
                     ui.opts.opts.forEach(function(o) {
-                        $('<option>').val(o.v).text(lookupLabel(o.l, o.l['en-US']||o.v, locale)).appendTo(input);
+                        $('<option>').val(o.v).text(RED.editor.envVarList.lookupLabel(o.l, o.l['en-US']||o.v, locale)).appendTo(input);
                     })
                 }
                 input.val(val.value);
@@ -1668,9 +1057,8 @@ RED.subflow = (function() {
      * @param uiContainer - container for UI
      * @param envList - env var definitions of template
      */
-    function buildEnvUI(uiContainer, envList,node) {
+    function buildEnvUI(uiContainer, envList, node) {
         uiContainer.empty();
-        var elementID = 0;
         for (var i = 0; i < envList.length; i++) {
             var tenv = envList[i];
             if (tenv.ui && tenv.ui.type === 'hide') {
@@ -1678,8 +1066,6 @@ RED.subflow = (function() {
             }
             var row = $("<div/>", { class: "form-row" }).appendTo(uiContainer);
             buildEnvUIRow(row,tenv, tenv.ui || {}, node);
-
-            // console.log(ui);
         }
     }
     // buildEnvUI
@@ -1715,7 +1101,7 @@ RED.subflow = (function() {
                             //     icon: "",
                             //     label: {},
                             //     type: "input",
-                            //     opts: {types:DEFAULT_ENV_TYPE_LIST}
+                            //     opts: {types:RED.editor.envVarList.DEFAULT_ENV_TYPE_LIST}
                             // }
                             if (!ui.icon) {
                                 delete ui.icon;
@@ -1725,7 +1111,7 @@ RED.subflow = (function() {
                             }
                             switch (ui.type) {
                                 case "input":
-                                    if (JSON.stringify(ui.opts) === JSON.stringify({types:DEFAULT_ENV_TYPE_LIST})) {
+                                    if (JSON.stringify(ui.opts) === JSON.stringify({types:RED.editor.envVarList.DEFAULT_ENV_TYPE_LIST})) {
                                         // This is the default input config. Delete it as it will
                                         // be applied automatically
                                         delete ui.type;
@@ -1841,7 +1227,6 @@ RED.subflow = (function() {
 
     function exportSubflowInstanceEnv(node) {
         var env = [];
-
         // First, get the values for the SubflowTemplate defined properties
         //  - these are the ones with custom UI elements
         var parentEnv = getSubflowInstanceParentEnv(node);
@@ -1853,7 +1238,7 @@ RED.subflow = (function() {
                     ui.type = "cred";
                 } else {
                     ui.type = "input";
-                    ui.opts = {types:DEFAULT_ENV_TYPE_LIST}
+                    ui.opts = {types:RED.editor.envVarList.DEFAULT_ENV_TYPE_LIST}
                 }
             } else {
                 ui.opts = ui.opts || {};
@@ -1893,22 +1278,6 @@ RED.subflow = (function() {
                 }
             }
         })
-        // Second, get the values from the Properties table tab
-        var items = $('#red-ui-editor-subflow-env-list').editableList('items');
-        items.each(function (i,el) {
-            var data = el.data('data');
-            var item;
-            if (data.nameField && data.valueField) {
-                item = {
-                    name: data.nameField.val(),
-                    value: data.valueField.typedInput("value"),
-                    type: data.valueField.typedInput("type")
-                }
-                if (item.name.trim() !== "") {
-                    env.push(item);
-                }
-            }
-        });
         return env;
     }
 
@@ -1916,164 +1285,18 @@ RED.subflow = (function() {
         return 'node-input-subflow-env-'+name.replace(/[^a-z0-9-_]/ig,"_");
     }
 
-    /**
-     * Lookup text for specific locale
-     * @param labels - dict of labels
-     * @param defaultLabel - fallback label if not found
-     * @param locale - target locale
-     * @returns {string} text for specified locale
-     */
-    function lookupLabel(labels, defaultLabel, locale) {
-        if (labels) {
-            if (labels[locale]) {
-                return labels[locale];
-            }
-            if (locale) {
-                var lang = locale.substring(0, 2);
-                if (labels[lang]) {
-                    return labels[lang];
-                }
-            }
-        }
-        return defaultLabel;
-    }
-
+    // Called by subflow.oneditprepare for both instances and templates
     function buildEditForm(type,node) {
         if (type === "subflow-template") {
-            buildPropertiesList($('#node-input-env-container'), node);
+            // This is the tabbed UI that offers the env list - with UI options
+            // plus the preview tab
+            buildEnvControl($('#node-input-env-container'), node);
+            RED.editor.envVarList.create($('#node-input-env-container'), node);
         } else  if (type === "subflow") {
-            // This gets called by the subflow type `oneditprepare` function
-            // registered in nodes.js#addSubflow()
+            // This is the rendered version of the subflow env var list
             buildEnvUI($("#subflow-input-ui"), getSubflowInstanceParentEnv(node), node);
         }
     }
-    function buildPropertiesForm(node) {
-        var container = $('#editor-subflow-envProperties-content');
-        var form = $('<form class="dialog-form form-horizontal"></form>').appendTo(container);
-        var listContainer = $('<div class="form-row node-input-env-container-row"></div>').appendTo(form);
-        var list = $('<ol id="red-ui-editor-subflow-env-list" class="red-ui-editor-subflow-env-list"></ol>').appendTo(listContainer);
-        buildPropertiesList(list, node);
-    }
-
-    function setupInputValidation(input,validator) {
-        var errorTip;
-        var validateTimeout;
-
-        var validateFunction = function() {
-            if (validateTimeout) {
-                return;
-            }
-            validateTimeout = setTimeout(function() {
-                var error = validator(input.val());
-                // if (!error && errorTip) {
-                //     errorTip.close();
-                //     errorTip = null;
-                // } else if (error && !errorTip) {
-                //     errorTip = RED.popover.create({
-                //         tooltip: true,
-                //         target:input,
-                //         size: "small",
-                //         direction: "bottom",
-                //         content: error,
-                //     }).open();
-                // }
-                input.toggleClass("input-error",!!error);
-                validateTimeout = null;
-            })
-        }
-        input.on("change keyup paste", validateFunction);
-    }
-
-    function buildModuleForm(container, node) {
-        $(_subflowModulePaneTemplate).appendTo(container);
-        var moduleProps = node.meta || {};
-        [
-            'module',
-            'type',
-            'version',
-            'author',
-            'desc',
-            'keywords',
-            'license'
-        ].forEach(function(property) {
-            $("#subflow-input-module-"+property).val(moduleProps[property]||"")
-        })
-        $("#subflow-input-module-type").attr("placeholder",node.id);
-
-        setupInputValidation($("#subflow-input-module-module"), function(newValue) {
-            newValue = newValue.trim();
-            var isValid = newValue.length < 215;
-            isValid = isValid && !/^[._]/.test(newValue);
-            isValid = isValid && !/[A-Z]/.test(newValue);
-            if (newValue !== encodeURIComponent(newValue)) {
-                var m = /^@([^\/]+)\/([^\/]+)$/.exec(newValue);
-                if (m) {
-                    isValid = isValid && (m[1] === encodeURIComponent(m[1]) && m[2] === encodeURIComponent(m[2]))
-                } else {
-                    isValid = false;
-                }
-            }
-            return isValid?"":"Invalid module name"
-        })
-        setupInputValidation($("#subflow-input-module-version"), function(newValue) {
-            newValue = newValue.trim();
-            var isValid = newValue === "" ||
-                          /^(\d|[1-9]\d*)\.(\d|[1-9]\d*)\.(\d|[1-9]\d*)(-(0|[1-9A-Za-z-][0-9A-Za-z-]*|[0-9]*[A-Za-z-][0-9A-Za-z-]*)(\.(0|[1-9A-Za-z-][0-9A-Za-z-]*|[0-9]*[A-Za-z-][0-9A-Za-z-]*))*)?(\+[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?$/.test(newValue);
-            return isValid?"":"Invalid version number"
-        })
-
-        var licenses = ["none", "Apache-2.0", "BSD-3-Clause", "BSD-2-Clause", "GPL-2.0", "GPL-3.0", "MIT", "MPL-2.0", "CDDL-1.0", "EPL-2.0"];
-        var typedLicenses = {
-            types: licenses.map(function(l) {
-                return {
-                    value: l,
-                    label: l === "none" ? RED._("editor:subflow.licenseNone") : l,
-                    hasValue: false
-                };
-            })
-        }
-        typedLicenses.types.push({
-            value:"_custom_", label:RED._("editor:subflow.licenseOther"), icon:"red/images/typedInput/az.svg"
-        })
-        if (!moduleProps.license) {
-            typedLicenses.default = "none";
-        } else if (licenses.indexOf(moduleProps.license) > -1) {
-            typedLicenses.default = moduleProps.license;
-        } else {
-            typedLicenses.default = "_custom_";
-        }
-        $("#subflow-input-module-license").typedInput(typedLicenses)
-    }
-
-    function exportSubflowModuleProperties(node) {
-        var value;
-        var moduleProps = {};
-        [
-            'module',
-            'type',
-            'version',
-            'author',
-            'desc',
-            'keywords'
-        ].forEach(function(property) {
-            value = $("#subflow-input-module-"+property).val().trim();
-            if (value) {
-                moduleProps[property] = value;
-            }
-        })
-        var selectedLicenseType = $("#subflow-input-module-license").typedInput("type");
-
-        if (selectedLicenseType === '_custom_') {
-            value = $("#subflow-input-module-license").val();
-            if (value) {
-                moduleProps.license = value;
-            }
-        } else if (selectedLicenseType !== "none") {
-            moduleProps.license = selectedLicenseType;
-        }
-        return moduleProps;
-    }
-
 
     return {
         init: init,
@@ -2085,14 +1308,9 @@ RED.subflow = (function() {
         removeOutput: removeSubflowOutput,
         removeStatus: removeSubflowStatus,
 
-
         buildEditForm: buildEditForm,
-        buildPropertiesForm: buildPropertiesForm,
-        buildModuleForm: buildModuleForm,
 
         exportSubflowTemplateEnv: exportEnvList,
-        exportSubflowInstanceEnv: exportSubflowInstanceEnv,
-        exportSubflowModuleProperties: exportSubflowModuleProperties
-
+        exportSubflowInstanceEnv: exportSubflowInstanceEnv
     }
 })();

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

@@ -15,6 +15,8 @@
  **/
 RED.sidebar.config = (function() {
 
+    let flashingConfigNode;
+    let flashingConfigNodeTimer;
 
     var content = document.createElement("div");
     content.className = "red-ui-sidebar-node-config";
@@ -145,6 +147,7 @@ RED.sidebar.config = (function() {
                 var entry = $('<li class="red-ui-palette-node_id_'+node.id.replace(/\./g,"-")+'"></li>').appendTo(list);
                 var nodeDiv = $('<div class="red-ui-palette-node-config red-ui-palette-node"></div>').appendTo(entry);
                 entry.data('node',node.id);
+                nodeDiv.data('node',node.id);
                 var label = $('<div class="red-ui-palette-label"></div>').text(label).appendTo(nodeDiv);
                 if (node.d) {
                     nodeDiv.addClass("red-ui-palette-node-config-disabled");
@@ -229,7 +232,7 @@ RED.sidebar.config = (function() {
         var globalConfigNodes = [];
         var configList = {};
         RED.nodes.eachConfig(function(cn) {
-            if (cn.z) {//} == RED.workspaces.active()) {
+            if (cn.z) {
                 configList[cn.z.replace(/\./g,"-")] = configList[cn.z.replace(/\./g,"-")]||[];
                 configList[cn.z.replace(/\./g,"-")].push(cn);
             } else if (!cn.z) {
@@ -350,6 +353,32 @@ RED.sidebar.config = (function() {
         RED.popover.tooltip($('#red-ui-sidebar-config-filter-unused'), RED._("sidebar.config.showAllUnusedConfigNodes"));
 
     }
+
+    function flashConfigNode(el) {
+        if(flashingConfigNode && flashingConfigNode.length) {
+            //cancel current flashing node before flashing new node
+            clearInterval(flashingConfigNodeTimer);
+            flashingConfigNodeTimer = null;
+            flashingConfigNode.children("div").removeClass('highlighted');
+            flashingConfigNode = null;
+        }
+        if(!el || !el.children("div").length) { return; }
+
+        flashingConfigNodeTimer = setInterval(function(flashEndTime) {
+            if (flashEndTime >= Date.now()) {
+                const highlighted = el.children("div").hasClass("highlighted");
+                el.children("div").toggleClass('highlighted', !highlighted)
+            } else {
+                clearInterval(flashingConfigNodeTimer);
+                flashingConfigNodeTimer = null;
+                flashingConfigNode = null;
+                el.children("div").removeClass('highlighted');
+            }
+        }, 100, Date.now() + 2200);
+        flashingConfigNode = el;
+        el.children("div").addClass('highlighted');
+    }
+
     function show(id) {
         if (typeof id === 'boolean') {
             if (id) {
@@ -374,19 +403,7 @@ RED.sidebar.config = (function() {
                 } else if (y<0) {
                     scrollWindow.animate({scrollTop: '+='+(y-10)},150);
                 }
-                var flash = 21;
-                var flashFunc = function() {
-                    if ((flash%2)===0) {
-                        node.removeClass('node_highlighted');
-                    } else {
-                        node.addClass('node_highlighted');
-                    }
-                    flash--;
-                    if (flash >= 0) {
-                        setTimeout(flashFunc,100);
-                    }
-                }
-                flashFunc();
+                flashConfigNode(node, id);
             },100);
         }
         RED.sidebar.show("config");

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

@@ -25,7 +25,6 @@ RED.sidebar.help = (function() {
     var tocPanel;
     var helpIndex = {};
 
-
     function resizeStack() {
         var h = $(content).parent().height() - toolbar.outerHeight();
         panels.resize(h)
@@ -65,15 +64,17 @@ RED.sidebar.help = (function() {
             style: "compact",
             delay: 100,
             change: function() {
-                var val = $(this).val().toLowerCase();
-                if (val) {
+                const searchFor = $(this).val().toLowerCase();
+                if (searchFor) {
                     showTOC();
-                    var c = treeList.treeList('filter',function(item) {
+                    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)
+                        let found = item.nodeType && item.nodeType.toLowerCase().indexOf(searchFor) > -1;
+                        found = found || item.subflowLabel && item.subflowLabel.toLowerCase().indexOf(searchFor) > -1;
+                        found = found || item.palleteLabel && item.palleteLabel.toLowerCase().indexOf(searchFor) > -1;
+                        return found;
                     },true)
                 } else {
                     treeList.treeList('filter',null);
@@ -93,9 +94,28 @@ RED.sidebar.help = (function() {
         $('<span class="red-ui-help-info-none">'+RED._("sidebar.help.noHelp")+'</span>').appendTo(helpSection);
 
         treeList = $("<div>").css({width: "100%"}).appendTo(tocPanel).treeList({data: []})
+        var pendingContentLoad;
         treeList.on('treelistselect', function(e,item) {
+            pendingContentLoad = item;
             if (item.nodeType) {
-                showHelp(item.nodeType);
+                showNodeTypeHelp(item.nodeType);
+            } else if (item.content) {
+                helpSection.empty();
+                if (typeof item.content === "string") {
+                    setInfoText(item.label, item.content);
+                } else if (typeof item.content === "function") {
+                    if (item.content.length === 0) {
+                        setInfoText(item.label, item.content());
+                    } else {
+                        setInfoText(item.label, '<div class="red-ui-component-spinner red-ui-component-spinner-contain"><img src="red/images/spin.svg" /></div>',helpSection)
+                        item.content(function(content) {
+                            if (pendingContentLoad === item) {
+                                helpSection.empty();
+                                setInfoText(item.label, content);
+                            }
+                        })
+                    }
+                }
             }
         })
 
@@ -174,21 +194,28 @@ RED.sidebar.help = (function() {
         var moduleNames = Object.keys(modules);
         moduleNames.sort();
 
-        var helpData = [{
+        var nodeHelp = {
             label: RED._("sidebar.help.nodeHelp"),
             children: [],
             expanded: true
-        }]
-
+        }
+        var helpData = [
+            {
+                id: 'changelog',
+                label: "Node-RED v"+RED.settings.version,
+                content: getChangelog
+            },
+            nodeHelp
+        ]
         var subflows = RED.nodes.registry.getNodeTypes().filter(function(t) {return /subflow/.test(t)});
         if (subflows.length > 0) {
-            helpData[0].children.push({
+            nodeHelp.children.push({
                 label: RED._("menu.label.subflows"),
                 children: []
             })
             subflows.forEach(function(nodeType) {
                 var sf = RED.nodes.getType(nodeType);
-                helpData[0].children[0].children.push({
+                nodeHelp.children[0].children.push({
                     id:"node-type:"+nodeType,
                     nodeType: nodeType,
                     subflowLabel: sf.label().toLowerCase(),
@@ -199,17 +226,21 @@ RED.sidebar.help = (function() {
 
 
         moduleNames.forEach(function(moduleName) {
-            var module = modules[moduleName];
-            var nodeTypes = [];
-
-            var setNames = Object.keys(module.sets);
+            const module = modules[moduleName];
+            const nodeTypes = [];
+            const moduleSets = module.sets;
+            const setNames = Object.keys(moduleSets);
             setNames.forEach(function(setName) {
-                module.sets[setName].types.forEach(function(nodeType) {
+                const moduleSet = moduleSets[setName];
+                moduleSet.types.forEach(function(nodeType) {
                     if ($("script[data-help-name='"+nodeType+"']").length) {
+                        const n =  {_def:RED.nodes.getType(nodeType),type:nodeType}
+                        n.name = getNodePaletteLabel(n);
                         nodeTypes.push({
                             id: "node-type:"+nodeType,
                             nodeType: nodeType,
-                            element:getNodeLabel({_def:RED.nodes.getType(nodeType),type:nodeType})
+                            palleteLabel: n.name,
+                            element: getNodeLabel(n)
                         })
                     }
                 })
@@ -218,7 +249,7 @@ RED.sidebar.help = (function() {
                 nodeTypes.sort(function(A,B) {
                     return A.nodeType.localeCompare(B.nodeType)
                 })
-                helpData[0].children.push({
+                nodeHelp.children.push({
                     id: moduleName,
                     icon: "fa fa-cube",
                     label: moduleName,
@@ -229,14 +260,25 @@ RED.sidebar.help = (function() {
         treeList.treeList("data",helpData);
     }
 
+    function getNodePaletteLabel(n) {
+        let label = n.name;
+        if (!label && n._def && n._def.paletteLabel) {
+            try {
+                label = (typeof n._def.paletteLabel === "function" ? n._def.paletteLabel.call(n._def) : n._def.paletteLabel)||"";
+            } catch (err) {
+            }
+        }
+        return label || n.type;
+    }
+
     function getNodeLabel(n) {
-        var div = $('<div>',{class:"red-ui-node-list-item"});
-        RED.utils.createNodeIcon(n).appendTo(div);
-        $('<div>',{class:"red-ui-node-label"}).text(n.name||n.type).appendTo(div);
+        const div = $('<div>',{class:"red-ui-node-list-item"});
+        const icon = RED.utils.createNodeIcon(n).appendTo(div);
+        $('<div>',{class:"red-ui-node-label"}).text(getNodePaletteLabel(n)).appendTo(icon);
         return div;
     }
 
-    function showHelp(nodeType) {
+    function showNodeTypeHelp(nodeType) {
         helpSection.empty();
         var helpText;
         var title;
@@ -247,9 +289,17 @@ RED.sidebar.help = (function() {
             title = subflowNode.name || nodeType;
         } else {
             helpText = RED.nodes.getNodeHelp(nodeType)||('<span class="red-ui-help-info-none">'+RED._("sidebar.info.none")+'</span>');
-            title = nodeType;
+            var _def = RED.nodes.registry.getNodeType(nodeType);
+            title = (_def && _def.paletteLabel)?_def.paletteLabel:nodeType;
+            if (typeof title === "function") {
+                try {
+                    title = _def.paletteLabel.call(_def);
+                } catch(err) {
+                    title = nodeType;
+                }
+            }
         }
-        setInfoText(title, helpText, helpSection);
+        setInfoText(title, helpText);
 
         var ratio = panels.ratio();
         if (ratio > 0.7) {
@@ -266,7 +316,7 @@ RED.sidebar.help = (function() {
         }
         if (type) {
             // hideTOC();
-            showHelp(type);
+            showNodeTypeHelp(type);
         }
         resizeStack();
     }
@@ -282,11 +332,12 @@ RED.sidebar.help = (function() {
         return el;
     }
 
-    function setInfoText(title, infoText,target) {
+    function setInfoText(title, infoText) {
+        helpSection.empty();
         if (title) {
-            $("<h1>",{class:"red-ui-help-title"}).text(title).appendTo(target);
+            $("<h1>",{class:"red-ui-help-title"}).text(title).appendTo(helpSection);
         }
-        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);
+        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(helpSection);
         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>')
@@ -300,12 +351,12 @@ RED.sidebar.help = (function() {
                 }
                 $(this).toggleClass('expanded',!isExpanded);
             })
-        target.parent().scrollTop(0);
+        helpSection.parent().scrollTop(0);
     }
 
     function set(html,title) {
         $(helpSection).empty();
-        setInfoText(title,html,helpSection);
+        setInfoText(title,html);
         hideTOC();
         show();
     }
@@ -319,14 +370,92 @@ RED.sidebar.help = (function() {
                 var node = selection.nodes[0];
                 if (node.type === "subflow" && node.direction) {
                     // ignore subflow virtual ports
-                } else if (node.type !== 'group'){
-                    showHelp(node.type);
+                } else if (node.type !== 'group' && node.type !== 'junction'){
+                    showNodeTypeHelp(node.type);
                 }
             }
         }
     }
     RED.events.on("view:selection-changed",refreshSelection);
 
+    function getChangelog(done) {
+        $.get('red/about', function(data) {
+            // data will be strictly markdown. Any HTML should be escaped.
+            data = RED.utils.sanitize(data);
+            RED.tourGuide.load("./tours/welcome.js", function(err, tour) {
+                var tourHeader = '<div><img width="50px" src="red/images/node-red-icon.svg" /></div>';
+                if (tour) {
+                    var currentVersionParts = RED.settings.version.split(".");
+                    var tourVersionParts = tour.version.split(".");
+                    if (tourVersionParts[0] === currentVersionParts[0] && tourVersionParts[1] === currentVersionParts[1]) {
+                        tourHeader = '<div><button type="button" onclick="RED.actions.invoke(\'core:show-welcome-tour\')" class="red-ui-button">' + RED._("tourGuide.takeATour") + '</button></div>';
+                    }
+                }
+                var aboutHeader = '<div style="text-align:center;">'+tourHeader+'</div>'
+                done(aboutHeader+RED.utils.renderMarkdown(data))
+            });
+
+        });
+    }
+    function showAbout() {
+        treeList.treeList("show","changelog")
+        treeList.treeList("select","changelog");
+        show();
+    }
+    function showWelcomeTour(lastSeenVersion, done) {
+        done = done || function() {};
+        RED.tourGuide.load("./tours/welcome.js", function(err, tour) {
+            if (err) {
+                console.warn("Failed to load welcome tour",err);
+                done()
+                return;
+            }
+            var currentVersionParts = RED.settings.version.split(".");
+            var tourVersionParts = tour.version.split(".");
+
+            // Only display the tour if its MAJ.MIN versions the current version
+            // This means if we update MAJ/MIN without updating the tour, the old tour won't get shown
+            if (tourVersionParts[0] !== currentVersionParts[0] || tourVersionParts[1] !== currentVersionParts[1]) {
+                done()
+                return;
+            }
+
+            if (lastSeenVersion) {
+                // Previously displayed a welcome tour.
+                if (lastSeenVersion === RED.settings.version) {
+                    // Exact match - don't show the tour
+                    done()
+                    return;
+                }
+                var lastSeenParts = lastSeenVersion.split(".");
+                if (currentVersionParts[0] < lastSeenParts[0] || (currentVersionParts[0] === lastSeenParts[0] && currentVersionParts[1] < lastSeenParts[1])) {
+                    // Running an *older* version than last displayed tour.
+                    done()
+                    return;
+                }
+                if (currentVersionParts[0] === lastSeenParts[0] && currentVersionParts[1] === lastSeenParts[1]) {
+                    if (lastSeenParts.length === 3 && currentVersionParts.length === 3) {
+                        // Matching non-beta MAJ.MIN - don't repeat tour
+                        done()
+                        return;
+                    }
+                    if (currentVersionParts.length === 4 && (lastSeenParts.length === 3 || currentVersionParts[3] < lastSeenParts[3])) {
+                        // Running an *older* beta than last displayed tour.
+                        done()
+                        return
+                    }
+                }
+            }
+            RED.tourGuide.run("./tours/welcome.js", function(err) {
+                RED.settings.set("editor.tours.welcome", RED.settings.version)
+                done()
+            })
+        })
+
+    }
+    RED.actions.add("core:show-about", showAbout);
+    RED.actions.add("core:show-welcome-tour", showWelcomeTour);
+
     return {
         init: init,
         show: show,

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

@@ -122,11 +122,20 @@ RED.sidebar.info.outliner = (function() {
             })
             RED.popover.tooltip(triggerButton,RED._("sidebar.info.triggerAction"));
         }
-        // $('<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 === "tab") {
+            var toggleVisibleButton = $('<button type="button" class="red-ui-info-outline-item-control-hide red-ui-button red-ui-button-small"><i class="fa fa-eye"></i><i class="fa fa-eye-slash"></i></button>').appendTo(controls).on("click",function(evt) {
+                evt.preventDefault();
+                evt.stopPropagation();
+                var isHidden = !div.hasClass("red-ui-info-outline-item-hidden");
+                div.toggleClass("red-ui-info-outline-item-hidden",isHidden);
+                if (isHidden) {
+                    RED.workspaces.hide(n.id);
+                } else {
+                    RED.workspaces.show(n.id, null, true);
+                }
+            });
+        }
         if (n.type !== 'subflow') {
             var toggleButton = $('<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();
@@ -166,6 +175,7 @@ RED.sidebar.info.outliner = (function() {
                                     n.d = true;
                                 }
                                 n.dirty = true;
+                                n.dirtyStatus = true;
                                 n.changed = true;
                                 RED.events.emit("nodes:change",n);
                                 groupHistoryEvent.events.push(historyEvent);
@@ -194,6 +204,7 @@ RED.sidebar.info.outliner = (function() {
                         n.d = true;
                     }
                     n.dirty = true;
+                    n.dirtyStatus = true;
                     n.changed = true;
                     RED.events.emit("nodes:change",n);
                     RED.history.push(historyEvent);
@@ -257,13 +268,7 @@ RED.sidebar.info.outliner = (function() {
 
                 }
             },
-            options: [
-                {label:RED._("sidebar.info.search.configNodes"), value:"is:config"},
-                {label:RED._("sidebar.info.search.unusedConfigNodes"), value:"is:config is:unused"},
-                {label:RED._("sidebar.info.search.invalidNodes"), value: "is:invalid"},
-                {label:RED._("sidebar.info.search.uknownNodes"), value: "type:unknown"},
-                {label:RED._("sidebar.info.search.unusedSubflows"), value:"is:subflow is:unused"},
-            ]
+            options: RED.search.getSearchOptions()
         });
 
         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)
@@ -275,13 +280,18 @@ RED.sidebar.info.outliner = (function() {
             data:getFlowData()
         })
         treeList.on('treelistselect', function(e,item) {
-            var node = RED.nodes.node(item.id) || RED.nodes.group(item.id);
+            var node = RED.nodes.node(item.id) || RED.nodes.group(item.id) || RED.nodes.workspace(item.id) || RED.nodes.subflow(item.id);
             if (node) {
-                if (node.type === 'group' || node._def.category !== "config") {
-                    RED.view.select({nodes:[node]})
-                } else {
-                    RED.view.select({nodes:[]})
-                }
+                RED.sidebar.info.refresh(node);
+                // if (node.type === 'group' || node._def.category !== "config") {
+                //     // RED.view.select({nodes:[node]})
+                // } else if (node._def.category === "config") {
+                //     RED.sidebar.info.refresh(node);
+                // } else {
+                //     // RED.view.select({nodes:[]})
+                // }
+            } else {
+                RED.sidebar.info.refresh(null);
             }
         })
         treeList.on('treelistconfirm', function(e,item) {
@@ -309,18 +319,33 @@ RED.sidebar.info.outliner = (function() {
         RED.events.on("nodes:add",onNodeAdd);
         RED.events.on("nodes:remove",onObjectRemove);
         RED.events.on("nodes:change",onNodeChange);
+        // RED.events.on("nodes:reorder",onNodesReorder);
 
         RED.events.on("groups:add",onNodeAdd);
         RED.events.on("groups:remove",onObjectRemove);
         RED.events.on("groups:change",onNodeChange);
 
-        RED.events.on("workspace:clear", onWorkspaceClear)
+        RED.events.on("workspace:show", onWorkspaceShow);
+        RED.events.on("workspace:hide", onWorkspaceHide);
+        RED.events.on("workspace:clear", onWorkspaceClear);
 
         return container;
     }
     function onWorkspaceClear() {
         treeList.treeList('data',getFlowData());
     }
+    function onWorkspaceShow(event) {
+        var existingObject = objects[event.workspace];
+        if (existingObject) {
+            existingObject.element.removeClass("red-ui-info-outline-item-hidden")
+        }
+    }
+    function onWorkspaceHide(event) {
+        var existingObject = objects[event.workspace];
+        if (existingObject) {
+            existingObject.element.addClass("red-ui-info-outline-item-hidden")
+        }
+    }
     function onFlowAdd(ws) {
         objects[ws.id] = {
             id: ws.id,
@@ -367,6 +392,21 @@ RED.sidebar.info.outliner = (function() {
             return indexMap[A.id] - indexMap[B.id]
         })
     }
+    // function onNodesReorder(event) {
+    //     //
+    //     var nodes = RED.nodes.getNodeOrder(event.z);
+    //     var indexMap = {};
+    //     nodes.forEach(function(id,index) {
+    //         indexMap[id] = index;
+    //     })
+    //     var existingObject = objects[event.z];
+    //     existingObject.treeList.sortChildren(function(A,B) {
+    //         if (A.children && !B.children) { return -1 }
+    //         if (!A.children && B.children) { return 1 }
+    //         if (A.children && B.children) { return -1 }
+    //         return indexMap[A.id] - indexMap[B.id]
+    //     })
+    // }
     function onSubflowAdd(sf) {
         objects[sf.id] = {
             id: sf.id,
@@ -522,7 +562,7 @@ RED.sidebar.info.outliner = (function() {
         }
     }
     function getGutter(n) {
-        var span = $("<span>",{class:"red-ui-info-outline-gutter"});
+        var span = $("<span>",{class:"red-ui-info-outline-gutter red-ui-treeList-gutter-float"});
         var revealButton = $('<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();

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

@@ -163,6 +163,7 @@ RED.sidebar.info = (function() {
         });
         return el;
     }
+
     function refresh(node) {
         if (node === undefined) {
             refreshSelection();
@@ -180,6 +181,10 @@ RED.sidebar.info = (function() {
 
         if (node === null) {
             RED.sidebar.info.outliner.select(null);
+            propertiesPanelHeaderIcon.empty();
+            propertiesPanelHeaderLabel.text("");
+            propertiesPanelHeaderReveal.hide();
+            propertiesPanelHeaderHelp.hide();
             return;
         } else if (Array.isArray(node)) {
             // Multiple things selected
@@ -267,7 +272,7 @@ RED.sidebar.info = (function() {
                 objectType = "group";
             }
             $(propRow.children()[0]).text(RED._("sidebar.info."+objectType))
-            RED.utils.createObjectElement(node.id).appendTo(propRow.children()[1]);
+            RED.utils.createObjectElement(node.id,{sourceId: 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.
@@ -297,8 +302,8 @@ RED.sidebar.info = (function() {
                 if (typeCounts.groups > 0) {
                     $('<div>').text(RED._("clipboard.group",{count:typeCounts.groups})).appendTo(counts);
                 }
-
-
+            } else if (node.type === 'junction') {
+                propertiesPanelHeaderHelp.hide();
             } else {
                 propertiesPanelHeaderHelp.show();
 
@@ -361,7 +366,7 @@ RED.sidebar.info = (function() {
 
                                     }
                                 } else {
-                                    RED.utils.createObjectElement(val).appendTo(propRow.children()[1]);
+                                    RED.utils.createObjectElement(val,{sourceId: node.id}).appendTo(propRow.children()[1]);
                                 }
                             }
                         }
@@ -427,6 +432,7 @@ RED.sidebar.info = (function() {
 
 
     }
+
     function setInfoText(infoText,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>" );
@@ -443,6 +449,7 @@ RED.sidebar.info = (function() {
                 $(this).toggleClass('expanded',!isExpanded);
             })
     }
+
     var tips = (function() {
         var enabled = true;
         var startDelay = 1000;
@@ -499,7 +506,7 @@ RED.sidebar.info = (function() {
                     if (tipCount === -1) {
                         do {
                             tipCount++;
-                        } while(RED._("infotips:info.tip"+tipCount)!=="infotips:info.tip"+tipCount);
+                        } while(RED._("infotips:info.tip"+tipCount)!=="info.tip"+tipCount);
                     }
                     startTimeout = setTimeout(setTip,startDelay);
                 }

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

@@ -0,0 +1,445 @@
+RED.tourGuide = (function() {
+    var activeListeners = [];
+    var shade;
+    var focus;
+    var popover;
+    var stepContent;
+    var targetElement;
+    var fullscreen;
+
+    var tourCache = {};
+
+    function run(tourPath, done) {
+        done = done || function(err) {
+            if (err) {
+                console.error(err);
+            }
+        };
+        loadTour(tourPath, function(err, tour) {
+            if (err) {
+                console.warn("Error loading tour:",err);
+                return;
+            }
+            runTour(tour, done);
+        })
+
+    }
+
+    function loadTour(tourPath, done) {
+        if (tourCache[tourPath]) {
+            done(null, tourCache[tourPath]);
+        } else {
+            /* jshint ignore:start */
+            // jshint<2.13 doesn't support dynamic imports. Once grunt-contrib-jshint
+            // has been updated with the new jshint, we can stop ignoring this block
+            import(tourPath).then(function(module) {
+                tourCache[tourPath] = module.default;
+                done(null, tourCache[tourPath]);
+            }).catch(function(err) {
+                done(err);
+            })
+            /* jshint ignore:end */
+        }
+    }
+
+    function repositionFocus() {
+        if (targetElement) {
+            if (!fullscreen) {
+                var pos = targetElement[0].getBoundingClientRect();
+                var dimension = Math.max(50, Math.max(pos.width,pos.height)*1.5);
+                focus.css({
+                    left: (pos.left+pos.width/2)+"px",
+                    top: (pos.top+pos.height/2)+"px",
+                    width: (2*dimension)+"px",
+                    height: (2*dimension)+"px"
+                })
+                var flush = focus[0].offsetHeight; // Flush CSS changes
+                focus.addClass("transition");
+                focus.css({
+                    width: dimension+"px",
+                    height: dimension+"px"
+                })
+            } else {
+                focus.css({
+                    left: ($(window).width()/2)+"px",
+                    top: ($(window).height()/2)+"px",
+                    width: "0px",
+                    height: "0px"
+                })
+            }
+            if (popover) {
+                popover.move({
+                    target: targetElement,
+                })
+            }
+        }
+    }
+    function runTour(tour, done) {
+
+        shade = $('<div class="red-ui-tourGuide-shade"></div>').appendTo(document.body);
+        focus = $('<div class="red-ui-tourGuide-shade-focus"></div>').appendTo(shade);
+
+        // var resizeTimer;
+        //
+        $(window).on("resize.red-ui-tourGuide", function() {
+            repositionFocus();
+        })
+
+
+
+        var i = 0;
+        var state = {
+            index: 0,
+            count: tour.steps.length
+        };
+
+        function endTour(err) {
+            $(window).off("resize.red-ui-tourGuide");
+            $(document).off('keydown.red-ui-tourGuide');
+            if (popover) {
+                popover.close();
+            }
+            stepContent = null;
+            popover = null;
+            shade.remove();
+            shade = null;
+            done(err);
+        }
+        function runStep(carryOn) {
+            if (carryOn === false) {
+                endTour(false);
+                return;
+            }
+            if (i === tour.steps.length) {
+                endTour();
+                return
+            }
+            state.index = i;
+            // console.log("TOUR STEP",i+1,"OF",tour.steps.length)
+            try {
+                runTourStep(tour.steps[i++], state, runStep)
+            } catch(err) {
+                endTour(err);
+                return;
+            }
+        }
+        runStep();
+    }
+
+    function clearListeners() {
+        activeListeners.forEach(function(listener) {
+            if (listener.type === "dom-event") {
+                listener.target[0].removeEventListener(listener.event,listener.listener,listener.opts);
+            } else if (listener.type === "nr-event") {
+                RED.events.off(listener.event, listener.listener)
+            }
+        })
+        activeListeners = [];
+    }
+
+    function prepareStep(step, state, done) {
+        if (step.prepare) {
+            if (step.prepare.length === 0) {
+                step.prepare.call(state);
+            } else {
+                if (popover) {
+                    popover.element.hide();
+                    if (!fullscreen) {
+                        fullscreen = true;
+                        repositionFocus()
+                    }
+                }
+                step.prepare.call(state, function() {
+                    if (popover) {
+                        popover.element.show();
+                    }
+                    done();
+                })
+                return;
+            }
+        }
+        done();
+    }
+    function completeStep(step, state, done) {
+        function finish() {
+            clearListeners();
+            setTimeout(function() {
+                done();
+            },0)
+        }
+        if (step.complete) {
+            if (step.complete.length === 0) {
+                step.complete.call(state);
+            } else {
+                if (popover) {
+                    popover.element.hide();
+                    if (!fullscreen) {
+                        fullscreen = true;
+                        repositionFocus()
+                    }
+                }
+                step.complete.call(state, function() {
+                    if (popover) {
+                        popover.element.show();
+                    }
+                    finish();
+                })
+                return;
+            }
+        }
+        finish();
+
+    }
+    function getLocaleText(property) {
+        if (typeof property === 'string') {
+            return property;
+        }
+        var currentLang = RED.i18n.lang() || 'en-US';
+        var availableLangs = Object.keys(property);
+        return property[currentLang]||property['en-US']||property[availableLangs[0]]
+
+    }
+    function runTourStep(step, state, done) {
+        shade.fadeIn();
+        prepareStep(step, state, function() {
+            var zIndex;
+            var direction = step.direction || "bottom";
+            fullscreen = false;
+
+            if (typeof step.element === "string") {
+                targetElement = $(step.element)
+            } else if (typeof step.element === "function") {
+                targetElement = step.element.call(state);
+            } else if (!step.element) {
+                targetElement = $(".red-ui-editor")
+                fullscreen = true;
+                direction = "inset";
+            } else {
+                targetElement = step.element;
+            }
+
+            if (targetElement.length === 0) {
+                targetElement = null;
+                shade.hide();
+                throw new Error("Element not found")
+            }
+            if ($(window).width() < 400) {
+                targetElement = $(".red-ui-editor");
+                fullscreen = true;
+                direction = "inset";
+            }
+
+            zIndex = targetElement.css("z-index");
+            if (!fullscreen && (step.interactive || step.wait)) {
+                targetElement.css("z-index",2002);
+            }
+            repositionFocus();
+
+            if (!stepContent) {
+                stepContent = $('<div style="position:relative"></div>');
+            } else {
+                stepContent.empty();
+            }
+            $('<button type="button" class="red-ui-button red-ui-button-small" style="float: right; margin-top: -4px; margin-right: -4px;"><i class="fa fa-times"></i></button>').appendTo(stepContent).click(function(evt) {
+                evt.preventDefault();
+                completeStep(step, state, function() {
+                    done(false);
+                });
+            })
+
+            var stepDescription = $('<div class="red-ui-tourGuide-popover-description"></div>').appendTo(stepContent);
+            if (step.titleIcon) {
+                $('<h2><i class="'+step.titleIcon+'"></i></h2>').appendTo(stepDescription);
+            }
+            if (step.title) {
+                $('<h2>').text(getLocaleText(step.title)).appendTo(stepDescription);
+            }
+            $('<div>').css("text-align","left").html(getLocaleText(step.description)).appendTo(stepDescription);
+
+            if (step.image) {
+                $(`<img src="red/tours/${step.image}" />`).appendTo(stepDescription)
+            }
+
+            var stepToolbar = $('<div>',{class:"red-ui-tourGuide-toolbar"}).appendTo(stepContent);
+
+            // var breadcrumbs = $('<div>',{class:"red-ui-tourGuide-breadcrumbs"}).appendTo(stepToolbar);
+            // var bcStart = Math.max(0,state.index - 3);
+            // var bcEnd = Math.min(state.count, bcStart + 7);
+            // if (bcEnd === state.count) {
+            //     bcStart = Math.max(0,bcEnd - 7);
+            // }
+            // for (var i = bcStart; i < bcEnd; i++) {
+            //     var bullet = $('<i class="fa"></i>').addClass(i===state.index ? "fa-circle":"fa-circle-o").appendTo(breadcrumbs);
+            //     if (i === bcStart) {
+            //         if (i > 1) {
+            //             bullet.css("font-size", "3px");
+            //         } else if (i === 1) {
+            //             bullet.css("font-size", "4px");
+            //         }
+            //     } else if (i === bcStart + 1) {
+            //         if (i > 2) {
+            //             bullet.css("font-size", "4px");
+            //         }
+            //     }
+            //     if (i === bcEnd - 1) {
+            //         if (i < state.count - 2) {
+            //             bullet.css("font-size", "3px");
+            //         } else if (i === state.count - 2) {
+            //             bullet.css("font-size", "4px");
+            //         }
+            //     } else if (i === bcEnd - 2) {
+            //         if (i < state.count - 3) {
+            //             bullet.css("font-size", "4px");
+            //         }
+            //     }
+            //     // if (i === bcEnd - 1) {
+            //     //     if (i < state.count - 2) {
+            //     //         bullet.css("font-size", "3px");
+            //     //     } else if (i === state.count - 2) {
+            //     //         bullet.css("font-size", "4px");
+            //     //     }
+            //     // }
+            // }
+
+            $('<small>').text((state.index+1)+"/"+state.count).appendTo(stepToolbar)
+            var nextButton;
+            if (fullscreen || !step.wait) {
+                nextButton = $('<button type="button" class="red-ui-button" style="position: absolute; right:0;bottom:0;"></button>').appendTo(stepToolbar).one('click',function(evt) {
+                    evt.preventDefault();
+                    stepEventListener();
+                });
+                if (state.index === state.count - 1) {
+                    $('<span></span>').text(RED._("common.label.close")).appendTo(nextButton);
+                } else if (state.index === 0) {
+                    $('<span>start</span>').text(RED._("tourGuide.start")).appendTo(nextButton);
+                    $('<span style="margin-left: 6px"><i class="fa fa-chevron-right"></i></span>').appendTo(nextButton);
+                } else if (state.index < state.count-1) {
+                    $('<span></span>').text(RED._("tourGuide.next")).appendTo(nextButton);
+                    $('<span style="margin-left: 6px"><i class="fa fa-chevron-right"></i></span>').appendTo(nextButton);
+                }
+            }
+
+            var width = step.width;
+            if (fullscreen) {
+                width = 500;
+            }
+            var maxWidth = Math.min($(window).width()-10,Math.max(width || 0, 300));
+            if (!popover) {
+                popover = RED.popover.create({
+                    target: targetElement,
+                    width: width || "auto",
+                    maxWidth: maxWidth+"px",
+                    direction: direction,
+                    class: "red-ui-tourGuide-popover"+(fullscreen?" ":""),
+                    trigger: "manual",
+                    content: stepContent
+                }).open();
+            }
+            $(document).off('keydown.red-ui-tourGuide');
+            $(document).on('keydown.red-ui-tourGuide', function(evt) {
+                if (evt.key === "Escape" || evt.key === "Esc") {
+                    evt.preventDefault();
+                    evt.stopPropagation();
+                    completeStep(step, state, function() {
+                        done(false);
+                    });
+                }
+            })
+            popover.element.toggleClass("red-ui-tourGuide-popover-full",!!fullscreen);
+            popover.move({
+                target: targetElement,
+                width: width || "auto",
+                maxWidth: maxWidth+"px",
+                direction: direction,
+            })
+            setTimeout(function() {
+                var pos = popover.element.position()
+                if (pos.left < 0) {
+                    popover.element.css({left: 0});
+                }
+            },100);
+            if (nextButton) {
+                setTimeout(function() {
+                    nextButton.focus();
+                },100);
+            }
+
+            var isSVG = targetElement[0] instanceof SVGElement;
+            if (step.fallback) {
+                focus.one("mouseenter", function(evt) {
+                    setTimeout(function() {
+                        var pos = targetElement[0].getBoundingClientRect();
+                        var dimension = Math.max(50, Math.max(pos.width,pos.height)*1.5);
+                        focus.css({
+                            width: (4*dimension)+"px",
+                            height: (4*dimension)+"px"
+                        })
+                        shade.fadeOut();
+                        popover.move({
+                            target: $(".red-ui-editor"),
+                            direction: step.fallback,
+                            offset: 10,
+                            transition: true
+                        })
+                        // popover.element.addClass('red-ui-tourGuide-popover-bounce');
+                    },isSVG?0:500);
+                })
+            }
+
+            var stepEventListener = function() {
+                focus.removeClass("transition");
+                targetElement.css("z-index",zIndex);
+                completeStep(step, state, done);
+            }
+
+            if (step.wait) {
+                if (step.wait.type === "dom-event") {
+                    var eventTarget = targetElement;
+                    if (step.wait.element) {
+                        if (typeof step.wait.element === "string") {
+                            eventTarget = $(step.wait.element);
+                        } else if (typeof step.wait.element === "function") {
+                            eventTarget = step.wait.element.call(state);
+                        }
+                    }
+                    var listener = {
+                        type: step.wait.type,
+                        target: eventTarget,
+                        event: step.wait.event,
+                        listener: function() {
+                            stepEventListener();
+                        },
+                        opts: { once: true }
+                    }
+                    activeListeners.push(listener)
+                    eventTarget[0].addEventListener(listener.event,listener.listener,listener.opts)
+                } else if (step.wait.type === "nr-event") {
+                    var listener = {
+                        type: step.wait.type,
+                        event: step.wait.event,
+                        listener: function() {
+                            if (step.wait.filter) {
+                                if (!step.wait.filter.apply(state,arguments)) {
+                                    return;
+                                }
+                            }
+                            stepEventListener();
+                        }
+                    }
+                    activeListeners.push(listener);
+                    RED.events.on(listener.event,listener.listener);
+                }
+            }
+        })
+    }
+
+    return {
+        load: loadTour,
+        run: run,
+        reset: function() {
+            RED.settings.set("editor.tours.welcome",'');
+        }
+    }
+
+
+})();

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-RED.tray = (function() {
+ RED.tray = (function() {
 
     var stack = [];
     var editorStack;
@@ -166,6 +166,8 @@ RED.tray = (function() {
                     setTimeout(function() {
                         // Delay resetting the flag, so we don't close prematurely
                         openingTray = false;
+                        raiseTrayZ();
+                        handleWindowResize();//cause call to monaco layout
                     },200);
                     body.find(":focusable:first").trigger("focus");
 
@@ -206,6 +208,17 @@ RED.tray = (function() {
         }
     }
 
+    //raise tray z-index to prevent editor context menu being clipped by sidebar
+    function raiseTrayZ() {
+        setTimeout(function(){
+            $('#red-ui-editor-stack').css("zIndex","13");
+        },300);
+    }
+    //lower tray z-index back to original place for correct slide animation (related to fix for editor context menu clipped by sidebar)
+    function lowerTrayZ(){
+        $('#red-ui-editor-stack').css("zIndex","9");
+    }
+
     return {
         init: function init() {
             editorStack = $("#red-ui-editor-stack");
@@ -221,6 +234,7 @@ RED.tray = (function() {
             });
         },
         show: function show(options) {
+            lowerTrayZ();
             if (!options) {
                 if (stack.length > 0) {
                     var tray = stack[stack.length-1];
@@ -246,12 +260,16 @@ RED.tray = (function() {
                     showTray(options);
                 },250)
             } else {
+                if (stack.length > 0) {
+                    stack[stack.length-1].tray.css("z-index", 0);
+                }
                 RED.events.emit("editor:open");
                 showTray(options);
             }
 
         },
         hide: function hide() {
+            lowerTrayZ();
             if (stack.length > 0) {
                 var tray = stack[stack.length-1];
                 tray.tray.css({
@@ -266,15 +284,16 @@ RED.tray = (function() {
         },
         resize: handleWindowResize,
         close: function close(done) {
+            lowerTrayZ(); //lower tray z-index for correct animation
             if (stack.length > 0) {
                 var tray = stack.pop();
                 tray.tray.css({
                     right: -(tray.tray.width()+10)+"px"
                 });
                 setTimeout(function() {
-                    if (tray.options.close) {
-                        tray.options.close();
-                    }
+                    try {
+                        if (tray.options.close) { tray.options.close(); }
+                    } catch (ex) { }
                     tray.tray.remove();
                     if (stack.length > 0) {
                         var oldTray = stack[stack.length-1];
@@ -284,6 +303,8 @@ RED.tray = (function() {
                                 handleWindowResize();
                                 oldTray.tray.css({right:0});
                                 if (oldTray.options.show) {
+                                    raiseTrayZ();
+                                    handleWindowResize();//cause call to monaco layout
                                     oldTray.options.show();
                                 }
                             },0);
@@ -304,6 +325,8 @@ RED.tray = (function() {
                         $(".red-ui-sidebar-shade").hide();
                         RED.events.emit("editor:close");
                         RED.view.focus();
+                    } else {
+                        stack[stack.length-1].tray.css("z-index", "auto");
                     }
                 },250)
             }

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

@@ -171,17 +171,21 @@ RED.typeSearch = (function() {
                 var div = $('<div>',{class:"red-ui-search-result"}).appendTo(container);
 
                 var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).appendTo(div);
-                var colour = RED.utils.getNodeColor(object.type,def);
+                if (object.type === "junction") {
+                    nodeDiv.addClass("red-ui-palette-icon-junction");
+                } else {
+                    var colour = RED.utils.getNodeColor(object.type,def);
+                    nodeDiv.css('backgroundColor',colour);
+                }
                 var icon_url = RED.utils.getNodeIcon(def);
-                nodeDiv.css('backgroundColor',colour);
 
                 var iconContainer = $('<div/>',{class:"red-ui-palette-icon-container"}).appendTo(nodeDiv);
                 RED.utils.createIconElement(icon_url, iconContainer, false);
 
-                if (def.inputs > 0) {
+                if (object.type !== "junction" && def.inputs > 0) {
                     $('<div/>',{class:"red-ui-search-result-node-port"}).appendTo(nodeDiv);
                 }
-                if (def.outputs > 0) {
+                if (object.type !== "junction" && def.outputs > 0) {
                     $('<div/>',{class:"red-ui-search-result-node-port red-ui-search-result-node-output"}).appendTo(nodeDiv);
                 }
 
@@ -313,8 +317,8 @@ RED.typeSearch = (function() {
         return !filter ||
             (
                 (!filter.type || type === filter.type) &&
-                (!filter.input || def.inputs > 0) &&
-                (!filter.output || def.outputs > 0)
+                (!filter.input || type === 'junction' || def.inputs > 0) &&
+                (!filter.output || type === 'junction' || def.outputs > 0)
             )
     }
     function refreshTypeList(opts) {
@@ -323,7 +327,7 @@ RED.typeSearch = (function() {
         searchInput.searchBox('value','').focus();
         selected = -1;
         var common = [
-            'inject','debug','function','change','switch'
+            'inject','debug','function','change','switch','junction'
         ].filter(function(t) { return applyFilter(opts.filter,t,RED.nodes.getType(t)); });
 
         var recentlyUsed = Object.keys(typesUsed);
@@ -348,6 +352,9 @@ RED.typeSearch = (function() {
         var index = 0;
         for(i=0;i<common.length;i++) {
             var itemDef = RED.nodes.getType(common[i]);
+            if (common[i] === 'junction') {
+                itemDef = { inputs:1, outputs: 1, label: 'junction', type: 'junction'}
+            }
             if (itemDef) {
                 item = {
                     type: common[i],

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

@@ -121,6 +121,13 @@ RED.userSettings = (function() {
         //         {setting:"theme", label:"Theme",options:function(done){ done([{val:'',text:'default'}].concat(RED.settings.theme("themes"))) }},
         //     ]
         // },
+        {
+            title: "menu.label.view.view",
+            options: [
+                {setting:"view-store-zoom",label:"menu.label.view.storeZoom", default: false, toggle:true, onchange: function(val) { if (!val) { RED.settings.removeLocal("zoom-level")}}},
+                {setting:"view-store-position",label:"menu.label.view.storePosition", default: false, toggle:true, onchange: function(val) { if (!val) { RED.settings.removeLocal("scroll-positions")}}},
+            ]
+        },
         {
             title: "menu.label.view.grid",
             options: [
@@ -139,7 +146,8 @@ RED.userSettings = (function() {
         {
             title: "menu.label.other",
             options: [
-                {setting:"view-show-tips",oldSettings:"menu-menu-item-show-tips",label:"menu.label.showTips",toggle:true,default:true,onchange:"core:toggle-show-tips"}
+                {setting:"view-show-tips",oldSettings:"menu-menu-item-show-tips",label:"menu.label.showTips",toggle:true,default:true,onchange:"core:toggle-show-tips"},
+                {setting:"view-show-welcome-tours",label:"menu.label.showWelcomeTours",toggle:true,default:true}
             ]
         }
     ];

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

@@ -22,8 +22,82 @@ RED.utils = (function() {
         return renderMarkdown(txt);
     }
 
-    _marked.setOptions({
-        renderer: new _marked.Renderer(),
+    const descriptionList = {
+        name: 'descriptionList',
+        level: 'block',                                     // Is this a block-level or inline-level tokenizer?
+        start(src) {
+            if (!src) { return null; }
+            let m = src.match(/:[^:\n]/g);
+            return m && m.index; // Hint to Marked.js to stop and check for a match
+        },
+        tokenizer(src, tokens) {
+            if (!src) { return null; }
+            const rule = /^(?::[^:\n]+:[^:\n]*(?:\n|$))+/;    // Regex for the complete token
+            const match = rule.exec(src);
+            if (match) {
+                return {                                        // Token to generate
+                    type: 'descriptionList',                      // Should match "name" above
+                    raw: match[0],                                // Text to consume from the source
+                    text: match[0].trim(),                        // Additional custom properties
+                    tokens: this.lexer.inlineTokens(match[0].trim())    // inlineTokens to process **bold**, *italics*, etc.
+                };
+            }
+        },
+        renderer(token) {
+            return `<dl class="message-properties">${this.parser.parseInline(token.tokens)}\n</dl>`; // parseInline to turn child tokens into HTML
+        }
+    };
+
+    const description = {
+        name: 'description',
+        level: 'inline',           // Is this a block-level or inline-level tokenizer?
+        start(src) {
+            if (!src) { return null; }
+            let m = src.match(/:/g);
+            return m && m.index;   // Hint to Marked.js to stop and check for a match
+        },
+        tokenizer(src, tokens) {
+            if (!src) { return null; }
+            const rule = /^:([^:\n]+)\(([^:\n]+)\).*?:([^:\n]*)(?:\n|$)/;  // Regex for the complete token
+            const match = rule.exec(src);
+            if (match) {
+                return {                                       // Token to generate
+                    type: 'description',                       // Should match "name" above
+                    raw: match[0],                             // Text to consume from the source
+                    dt: this.lexer.inlineTokens(match[1].trim()),    // Additional custom properties
+                    types: this.lexer.inlineTokens(match[2].trim()),
+                    dd: this.lexer.inlineTokens(match[3].trim()),
+                };
+            }
+        },
+        renderer(token) {
+            return `\n<dt>${this.parser.parseInline(token.dt)}<span class="property-type">${this.parser.parseInline(token.types)}</span></dt><dd>${this.parser.parseInline(token.dd)}</dd>`;
+        },
+        childTokens: ['dt', 'dd'],                 // Any child tokens to be visited by walkTokens
+        walkTokens(token) {                        // Post-processing on the completed token tree
+            if (token.type === 'strong') {
+                token.text += ' walked';
+            }
+        }
+    };
+
+
+    const renderer = new window._marked.Renderer();
+
+    //override list creation - add node-ports to order lists
+    renderer.list = function (body, ordered, start) {
+        let addClass = /dl.*?class.*?message-properties.*/.test(body);
+        if (addClass && ordered) {
+            return '<ol class="node-ports">' + body + '</ol>';
+        } else if (ordered) {
+            return '<ol>' + body + '</ol>';
+        } else {
+            return '<ul>' + body + '</ul>'
+        }
+    }
+
+    window._marked.setOptions({
+        renderer: renderer,
         gfm: true,
         tables: true,
         breaks: false,
@@ -32,8 +106,10 @@ RED.utils = (function() {
         smartypants: false
     });
 
+    window._marked.use({extensions: [descriptionList, description] } );
+
     function renderMarkdown(txt) {
-        var rendered = _marked(txt);
+        var rendered = _marked.parse(txt);
         var cleaned = DOMPurify.sanitize(rendered, {SAFE_FOR_JQUERY: true})
         return cleaned;
     }
@@ -58,10 +134,16 @@ RED.utils = (function() {
                 result = $('<span class="red-ui-debug-msg-object-value red-ui-debug-msg-type-meta"></span>').text('buffer['+value.length+']');
             } else if (value.hasOwnProperty('type') && value.type === 'array' && value.hasOwnProperty('data')) {
                 result = $('<span class="red-ui-debug-msg-object-value red-ui-debug-msg-type-meta"></span>').text('array['+value.length+']');
+            } else if (value.hasOwnProperty('type') && value.type === 'set' && value.hasOwnProperty('data')) {
+                result = $('<span class="red-ui-debug-msg-object-value red-ui-debug-msg-type-meta"></span>').text('set['+value.length+']');
+            } else if (value.hasOwnProperty('type') && value.type === 'map' && value.hasOwnProperty('data')) {
+                result = $('<span class="red-ui-debug-msg-object-value red-ui-debug-msg-type-meta"></span>').text('map');
             } else if (value.hasOwnProperty('type') && value.type === 'function') {
                 result = $('<span class="red-ui-debug-msg-object-value red-ui-debug-msg-type-meta"></span>').text('function');
             } else if (value.hasOwnProperty('type') && (value.type === 'number' || value.type === 'bigint')) {
                 result = $('<span class="red-ui-debug-msg-object-value red-ui-debug-msg-type-number"></span>').text(value.data);
+            } else if (value.hasOwnProperty('type') && value.type === 'regexp') {
+                result = $('<span class="red-ui-debug-msg-object-value red-ui-debug-msg-type-string"></span>').text(value.data);
             } else {
                 result = $('<span class="red-ui-debug-msg-object-value red-ui-debug-msg-type-meta">object</span>');
             }
@@ -178,8 +260,14 @@ RED.utils = (function() {
             RED.popover.tooltip(pinPath,RED._("node-red:debug.sidebar.pinPath"));
         }
         if (extraTools) {
-            extraTools.addClass("red-ui-debug-msg-tools-other");
-            extraTools.appendTo(tools);
+            var t = extraTools;
+            if (typeof t === 'function') {
+                t = t(key,msg);
+            }
+            if (t) {
+                t.addClass("red-ui-debug-msg-tools-other");
+                t.appendTo(tools);
+            }
         }
     }
     function checkExpanded(strippedKey,expandPaths,minRange,maxRange) {
@@ -277,7 +365,16 @@ RED.utils = (function() {
         }
     }
 
-    function buildMessageElement(obj,options) {
+    /**
+     * Create a DOM element representation of obj - as used by Debug sidebar etc
+     *
+     * @params obj - the data to display
+     * @params options - a bag of options
+     *
+     * - If you want the Copy Value button, then set `sourceId`
+     * - If you want the Copy Path button, also set `path` to the value to be copied
+     */
+    function createObjectElement(obj,options) {
         options = options || {};
         var key = options.key;
         var typeHint = options.typeHint;
@@ -344,7 +441,7 @@ RED.utils = (function() {
 
         var isArray = Array.isArray(obj);
         var isArrayObject = false;
-        if (obj && typeof obj === 'object' && obj.hasOwnProperty('type') && obj.hasOwnProperty('data') && ((obj.__enc__ && obj.type === 'array') || obj.type === 'Buffer')) {
+        if (obj && typeof obj === 'object' && obj.hasOwnProperty('type') && obj.hasOwnProperty('data') && ((obj.__enc__ && obj.type === 'set') || (obj.__enc__ && obj.type === 'array') || obj.type === 'Buffer')) {
             isArray = true;
             isArrayObject = true;
         }
@@ -354,6 +451,8 @@ RED.utils = (function() {
             $('<span class="red-ui-debug-msg-type-null">undefined</span>').appendTo(entryObj);
         } else if (obj.__enc__ && (obj.type === 'number' || obj.type === 'bigint')) {
             e = $('<span class="red-ui-debug-msg-type-number red-ui-debug-msg-object-header"></span>').text(obj.data).appendTo(entryObj);
+        } else if (typeHint === "regexp" || (obj.__enc__ && obj.type === 'regexp')) {
+            e = $('<span class="red-ui-debug-msg-type-string red-ui-debug-msg-object-header"></span>').text((typeof obj === "string")?obj:obj.data).appendTo(entryObj);
         } else if (typeHint === "function" || (obj.__enc__ && obj.type === 'function')) {
             e = $('<span class="red-ui-debug-msg-type-meta red-ui-debug-msg-object-header"></span>').text("function").appendTo(entryObj);
         } else if (typeHint === "internal" || (obj.__enc__ && obj.type === 'internal')) {
@@ -411,7 +510,7 @@ RED.utils = (function() {
             }
             var fullLength = data.length;
 
-                if (originalLength > 0) {
+            if (originalLength > 0) {
                 $('<i class="fa fa-caret-right red-ui-debug-msg-object-handle"></i> ').prependTo(header);
                 var arrayRows = $('<div class="red-ui-debug-msg-array-rows"></div>').appendTo(element);
                 element.addClass('red-ui-debug-msg-buffer-raw');
@@ -465,7 +564,7 @@ RED.utils = (function() {
                     if (fullLength <= 10) {
                         for (i=0;i<fullLength;i++) {
                             row = $('<div class="red-ui-debug-msg-object-entry collapsed"></div>').appendTo(arrayRows);
-                            subElements[path+"["+i+"]"] = buildMessageElement(
+                            subElements[path+"["+i+"]"] = createObjectElement(
                                 data[i],
                                 {
                                     key: ""+i,
@@ -476,7 +575,9 @@ RED.utils = (function() {
                                     rootPath: rootPath,
                                     expandPaths: expandPaths,
                                     ontoggle: ontoggle,
-                                    exposeApi: exposeApi
+                                    exposeApi: exposeApi,
+                                    // tools: tools // Do not pass tools down as we
+                                                    // keep them attached to the top-level header
                                 }
                             ).appendTo(row);
                         }
@@ -493,7 +594,7 @@ RED.utils = (function() {
                                 return function() {
                                     for (var i=min;i<=max;i++) {
                                         var row = $('<div class="red-ui-debug-msg-object-entry collapsed"></div>').appendTo(parent);
-                                        subElements[path+"["+i+"]"] = buildMessageElement(
+                                        subElements[path+"["+i+"]"] = createObjectElement(
                                             data[i],
                                             {
                                                 key: ""+i,
@@ -504,8 +605,9 @@ RED.utils = (function() {
                                                 rootPath: rootPath,
                                                 expandPaths: expandPaths,
                                                 ontoggle: ontoggle,
-                                                exposeApi: exposeApi
-
+                                                exposeApi: exposeApi,
+                                                // tools: tools // Do not pass tools down as we
+                                                                // keep them attached to the top-level header
                                             }
                                         ).appendTo(row);
                                     }
@@ -525,12 +627,18 @@ RED.utils = (function() {
             }
         } else if (typeof obj === 'object') {
             element.addClass('collapsed');
-            var keys = Object.keys(obj);
+            var data = obj;
+            var type = "object";
+            if (data.__enc__) {
+                data = data.data;
+                type = obj.type.toLowerCase();
+            }
+            var keys = Object.keys(data);
             if (key || keys.length > 0) {
                 $('<i class="fa fa-caret-right red-ui-debug-msg-object-handle"></i> ').prependTo(header);
                 makeExpandable(header, function() {
                     if (!key) {
-                        $('<span class="red-ui-debug-msg-type-meta red-ui-debug-msg-object-type-header"></span>').text('object').appendTo(header);
+                        $('<span class="red-ui-debug-msg-type-meta red-ui-debug-msg-object-type-header"></span>').text(type).appendTo(header);
                     }
                     for (i=0;i<keys.length;i++) {
                         var row = $('<div class="red-ui-debug-msg-object-entry collapsed"></div>').appendTo(element);
@@ -542,8 +650,8 @@ RED.utils = (function() {
                                 newPath += "[\""+keys[i].replace(/"/,"\\\"")+"\"]"
                             }
                         }
-                        subElements[newPath] = buildMessageElement(
-                            obj[keys[i]],
+                        subElements[newPath] = createObjectElement(
+                            data[keys[i]],
                             {
                                 key: keys[i],
                                 typeHint: false,
@@ -553,8 +661,9 @@ RED.utils = (function() {
                                 rootPath: rootPath,
                                 expandPaths: expandPaths,
                                 ontoggle: ontoggle,
-                                exposeApi: exposeApi
-
+                                exposeApi: exposeApi,
+                                // tools: tools // Do not pass tools down as we
+                                                // keep them attached to the top-level header
                             }
                         ).appendTo(row);
                     }
@@ -566,7 +675,7 @@ RED.utils = (function() {
                 checkExpanded(strippedKey,expandPaths));
             }
             if (key) {
-                $('<span class="red-ui-debug-msg-type-meta"></span>').text('object').appendTo(entryObj);
+                $('<span class="red-ui-debug-msg-type-meta"></span>').text(type).appendTo(entryObj);
             } else {
                 headerHead = $('<span class="red-ui-debug-msg-object-header"></span>').appendTo(entryObj);
                 $('<span>{ </span>').appendTo(headerHead);
@@ -574,7 +683,7 @@ RED.utils = (function() {
                 for (i=0;i<keysLength;i++) {
                     $('<span class="red-ui-debug-msg-object-key"></span>').text(keys[i]).appendTo(headerHead);
                     $('<span>: </span>').appendTo(headerHead);
-                    buildMessageSummaryValue(obj[keys[i]]).appendTo(headerHead);
+                    buildMessageSummaryValue(data[keys[i]]).appendTo(headerHead);
                     if (i < keysLength-1) {
                         $('<span>, </span>').appendTo(headerHead);
                     }
@@ -919,6 +1028,8 @@ RED.utils = (function() {
             return "font-awesome/fa-object-ungroup";
         } else if (node && node.type === 'group') {
             return "font-awesome/fa-object-group"
+        } else if ((node && node.type === 'junction') || (def.type === "junction") ) {
+            return "font-awesome/fa-circle-o"
         } else if (def.category === 'config') {
             return RED.settings.apiRootUrl+"icons/node-red/cog.svg"
         } else if (node && node.type === 'tab') {
@@ -984,6 +1095,8 @@ RED.utils = (function() {
             l = node.label || defaultLabel
         } else if (node.type === 'group') {
             l = node.name || defaultLabel
+        } else if (node.type === 'junction') {
+            l = 'junction'
         } else {
             l = node._def.label;
             try {
@@ -996,6 +1109,18 @@ RED.utils = (function() {
         return RED.text.bidi.enforceTextDirectionWithUCC(l);
     }
 
+    function getPaletteLabel(nodeType, def) {
+        var label = nodeType;
+        if (typeof def.paletteLabel !== "undefined") {
+            try {
+                label = (typeof def.paletteLabel === "function" ? def.paletteLabel.call(def) : def.paletteLabel)||"";
+            } catch(err) {
+                console.log("Definition error: "+nodeType+".paletteLabel",err);
+            }
+        }
+        return label
+    }
+
     var nodeColorCache = {};
     function clearNodeColorCache() {
         nodeColorCache = {};
@@ -1055,7 +1180,7 @@ RED.utils = (function() {
             payload = Infinity;
         } else if ((format === 'number') && (payload === "-Infinity")) {
             payload = -Infinity;
-        } else if (format === 'Object' || /^array/.test(format) || format === 'boolean' || format === 'number' ) {
+        } else if (format === 'Object' || /^(array|set|map)/.test(format) || format === 'boolean' || format === 'number' ) {
             payload = JSON.parse(payload);
         } else if (/error/i.test(format)) {
             payload = JSON.parse(payload);
@@ -1130,12 +1255,16 @@ RED.utils = (function() {
     }
 
     function createNodeIcon(node, includeLabel) {
+        var container = $('<span class="red-ui-node-icon-container">');
+
         var def = node._def;
         var nodeDiv = $('<div>',{class:"red-ui-node-icon"})
         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 === "junction") {
+            nodeDiv.addClass("red-ui-palette-icon-junction");
         } else if (node.type === 'tab') {
             nodeDiv.addClass("red-ui-palette-icon-flow");
         } else {
@@ -1153,9 +1282,9 @@ RED.utils = (function() {
         var icon_url = RED.utils.getNodeIcon(def,node);
         RED.utils.createIconElement(icon_url, nodeDiv, true);
 
+        nodeDiv.appendTo(container);
+
         if (includeLabel) {
-            var container = $('<span>');
-            nodeDiv.appendTo(container);
             var labelText = RED.utils.getNodeLabel(node,node.name || (node.type+": "+node.id));
             var label = $('<div>',{class:"red-ui-node-label"}).appendTo(container);
             if (labelText) {
@@ -1163,9 +1292,8 @@ RED.utils = (function() {
             } else {
                 label.html("&nbsp;")
             }
-            return container;
         }
-        return nodeDiv;
+        return container;
     }
 
     function getDarkerColor(c) {
@@ -1250,8 +1378,25 @@ RED.utils = (function() {
         }
         return false;
     }
+
+    function getBrowserInfo() {
+        var r = {}
+        try {
+            var ua = navigator.userAgent;
+            r.ua = ua;
+            r.browser = /Edge\/\d+/.test(ua) ? 'ed' : /MSIE 9/.test(ua) ? 'ie9' : /MSIE 10/.test(ua) ? 'ie10' : /MSIE 11/.test(ua) ? 'ie11' : /MSIE\s\d/.test(ua) ? 'ie?' : /rv\:11/.test(ua) ? 'ie11' : /Firefox\W\d/.test(ua) ? 'ff' : /Chrom(e|ium)\W\d|CriOS\W\d/.test(ua) ? 'gc' : /\bSafari\W\d/.test(ua) ? 'sa' : /\bOpera\W\d/.test(ua) ? 'op' : /\bOPR\W\d/i.test(ua) ? 'op' : typeof MSPointerEvent !== 'undefined' ? 'ie?' : '';
+            r.os = /Windows NT 10/.test(ua) ? "win10" : /Windows NT 6\.0/.test(ua) ? "winvista" : /Windows NT 6\.1/.test(ua) ? "win7" : /Windows NT 6\.\d/.test(ua) ? "win8" : /Windows NT 5\.1/.test(ua) ? "winxp" : /Windows NT [1-5]\./.test(ua) ? "winnt" : /Mac/.test(ua) ? "mac" : /Linux/.test(ua) ? "linux" : /X11/.test(ua) ? "nix" : "";
+            r.touch = 'ontouchstart' in document.documentElement;
+            r.mobile = /IEMobile|Windows Phone|Lumia/i.test(ua) ? 'w' : /iPhone|iP[oa]d/.test(ua) ? 'i' : /Android/.test(ua) ? 'a' : /BlackBerry|PlayBook|BB10/.test(ua) ? 'b' : /Mobile Safari/.test(ua) ? 's' : /webOS|Mobile|Tablet|Opera Mini|\bCrMo\/|Opera Mobi/i.test(ua) ? 1 : 0;
+            r.tablet = /Tablet|iPad/i.test(ua);
+            r.ie = /MSIE \d|Trident.*rv:/.test(navigator.userAgent);
+            r.android = /android/i.test(navigator.userAgent);
+        } catch (error) { }
+        return r;
+    }
+
     return {
-        createObjectElement: buildMessageElement,
+        createObjectElement: createObjectElement,
         getMessageProperty: getMessageProperty,
         setMessageProperty: setMessageProperty,
         normalisePropertyExpression: normalisePropertyExpression,
@@ -1261,6 +1406,7 @@ RED.utils = (function() {
         getNodeIcon: getNodeIcon,
         getNodeLabel: getNodeLabel,
         getNodeColor: getNodeColor,
+        getPaletteLabel: getPaletteLabel,
         clearNodeColorCache: clearNodeColorCache,
         addSpinnerOverlay: addSpinnerOverlay,
         decodeObject: decodeObject,
@@ -1271,6 +1417,7 @@ RED.utils = (function() {
         createNodeIcon: createNodeIcon,
         getDarkerColor: getDarkerColor,
         parseModuleList: parseModuleList,
-        checkModuleAllowed: checkModuleAllowed
+        checkModuleAllowed: checkModuleAllowed,
+        getBrowserInfo: getBrowserInfo
     }
 })();

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

@@ -0,0 +1,151 @@
+RED.view.annotations = (function() {
+
+    var annotations = {};
+
+    function init() {
+        RED.hooks.add("viewRedrawNode.annotations", function(evt) {
+            try {
+                if (evt.node.__pendingAnnotation__) {
+                    addAnnotation(evt.node.__pendingAnnotation__,evt);
+                    delete evt.node.__pendingAnnotation__;
+                }
+                var badgeDX = 0;
+                var controlDX = 0;
+                for (var i=0,l=evt.el.__annotations__.length;i<l;i++) {
+                    var annotation = evt.el.__annotations__[i];
+                    if (annotations.hasOwnProperty(annotation.id)) {
+                        var opts = annotations[annotation.id];
+                        var showAnnotation = true;
+                        var isBadge = opts.type === 'badge';
+                        if (opts.show !== undefined) {
+                            if (typeof opts.show === "string") {
+                                showAnnotation = !!evt.node[opts.show]
+                            } else if (typeof opts.show === "function"){
+                                showAnnotation = opts.show(evt.node)
+                            } else {
+                                showAnnotation = !!opts.show;
+                            }
+                            annotation.element.classList.toggle("hide", !showAnnotation);
+                        }
+                        if (isBadge) {
+                            if (showAnnotation) {
+                                var rect = annotation.element.getBoundingClientRect();
+                                badgeDX += rect.width;
+                                annotation.element.setAttribute("transform", "translate("+(evt.node.w-3-badgeDX)+", -8)");
+                                badgeDX += 4;
+                            }
+                        } else {
+                            if (showAnnotation) {
+                                var rect = annotation.element.getBoundingClientRect();
+                                annotation.element.setAttribute("transform", "translate("+(3+controlDX)+", -12)");
+                                controlDX += rect.width + 4;
+                            }
+                        }
+                    } else {
+                        annotation.element.parentNode.removeChild(annotation.element);
+                        evt.el.__annotations__.splice(i,1);
+                        i--;
+                        l--;
+                    }
+                }
+        }catch(err) {
+            console.log(err)
+        }
+        });
+    }
+
+
+    /**
+     * Register a new node annotation
+     * @param {string} id - unique identifier
+     * @param {type} opts - annotations options
+     *
+     * opts: {
+     *   type: "badge"
+     *   class: "",
+     *   element: function(node),
+     *   show: string|function(node),
+     *   filter: function(node) -> boolean
+     * }
+     */
+    function register(id, opts) {
+        if (opts.type !== 'badge') {
+            throw new Error("Unsupported annotation type: "+opts.type);
+        }
+        annotations[id] = opts
+        RED.hooks.add("viewAddNode.annotation-"+id, function(evt) {
+            if (opts.filter && !opts.filter(evt.node)) {
+                return;
+            }
+            addAnnotation(id,evt);
+        });
+
+        var nodes = RED.view.getActiveNodes();
+        nodes.forEach(function(n) {
+            n.__pendingAnnotation__ = id;
+        })
+        RED.view.redraw();
+
+    }
+
+    function addAnnotation(id,evt) {
+        var opts = annotations[id];
+        evt.el.__annotations__ = evt.el.__annotations__ || [];
+        var annotationGroup = document.createElementNS("http://www.w3.org/2000/svg","g");
+        annotationGroup.setAttribute("class",opts.class || "");
+        evt.el.__annotations__.push({
+            id:id,
+            element: annotationGroup
+        });
+        var annotation = opts.element(evt.node);
+        if (opts.tooltip) {
+            annotation.addEventListener("mouseenter", getAnnotationMouseEnter(annotation,evt.node,opts.tooltip));
+            annotation.addEventListener("mouseleave", annotationMouseLeave);
+        }
+        annotationGroup.appendChild(annotation);
+        evt.el.appendChild(annotationGroup);
+    }
+
+
+    function unregister(id) {
+        delete annotations[id]
+        RED.hooks.remove("*.annotation-"+id);
+        RED.view.redraw();
+    }
+
+    var badgeHoverTimeout;
+    var badgeHover;
+    function getAnnotationMouseEnter(annotation,node,tooltip) {
+        return function() {
+            var text = typeof tooltip === "function"?tooltip(node):tooltip;
+            if (text) {
+                clearTimeout(badgeHoverTimeout);
+                badgeHoverTimeout = setTimeout(function() {
+                    var pos = RED.view.getElementPosition(annotation);
+                    var rect = annotation.getBoundingClientRect();
+                    badgeHoverTimeout = null;
+                    badgeHover = RED.view.showTooltip(
+                        (pos[0]+rect.width/2),
+                        (pos[1]),
+                        text,
+                        "top"
+                    );
+                },500);
+            }
+        }
+    }
+    function annotationMouseLeave() {
+        clearTimeout(badgeHoverTimeout);
+        if (badgeHover) {
+            badgeHover.remove();
+            badgeHover = null;
+        }
+    }
+
+    return {
+        init: init,
+        register:register,
+        unregister:unregister
+    }
+
+})();

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

@@ -159,15 +159,15 @@ RED.view.tools = (function() {
         nodes.forEach(function(n) {
             var modified = false;
             var oldValue = n.l === undefined?true:n.l;
-            var isLink = /^link (in|out)$/.test(n._def.type);
+            var showLabel = n._def.hasOwnProperty("showLabel")?n._def.showLabel:true;
 
             if (labelShown) {
-                if (n.l === false || (isLink && !n.hasOwnProperty('l'))) {
+                if (n.l === false || (!showLabel && !n.hasOwnProperty('l'))) {
                     n.l = true;
                     modified = true;
                 }
             } else {
-                if ((!isLink && (!n.hasOwnProperty('l') || n.l === true)) || (isLink && n.l === true) ) {
+                if ((showLabel && (!n.hasOwnProperty('l') || n.l === true)) || (!showLabel && n.l === true) ) {
                     n.l = false;
                     modified = true;
                 }
@@ -427,18 +427,618 @@ RED.view.tools = (function() {
                 }
             }
         }
-
-
     }
 
+    function alignSelectionToEdge(direction) {
+        var selection = RED.view.selection();
+
+        if (selection.nodes && selection.nodes.length > 1) {
+            var changedNodes = [];
+            var bounds = {
+                minX: Number.MAX_SAFE_INTEGER,
+                minY: Number.MAX_SAFE_INTEGER,
+                maxX: Number.MIN_SAFE_INTEGER,
+                maxY: Number.MIN_SAFE_INTEGER
+            }
+            selection.nodes.forEach(function(n) {
+                if (n.type === "group") {
+                    bounds.minX = Math.min(bounds.minX, n.x);
+                    bounds.minY = Math.min(bounds.minY, n.y);
+                    bounds.maxX = Math.max(bounds.maxX, n.x + n.w);
+                    bounds.maxY = Math.max(bounds.maxY, n.y + n.h);
+                } else {
+                    bounds.minX = Math.min(bounds.minX, n.x - n.w/2);
+                    bounds.minY = Math.min(bounds.minY, n.y - n.h/2);
+                    bounds.maxX = Math.max(bounds.maxX, n.x + n.w/2);
+                    bounds.maxY = Math.max(bounds.maxY, n.y + n.h/2);
+                }
+            });
+
+            bounds.midX = bounds.minX + (bounds.maxX - bounds.minX)/2;
+            bounds.midY = bounds.minY + (bounds.maxY - bounds.minY)/2;
+
+            selection.nodes.forEach(function(n) {
+                var targetX;
+                var targetY;
+                var isGroup = n.type==="group";
+                switch(direction) {
+                    case 'top':
+                        targetX = n.x;
+                        targetY = bounds.minY + (isGroup?0:(n.h/2));
+                        break;
+                    case 'bottom':
+                        targetX = n.x;
+                        targetY = bounds.maxY - (isGroup?n.h:(n.h/2));
+                        break;
+                    case 'left':
+                        targetX = bounds.minX + (isGroup?0:(n.w/2));
+                        targetY = n.y;
+                        break;
+                    case 'right':
+                        targetX = bounds.maxX - (isGroup?n.w:(n.w/2));
+                        targetY = n.y;
+                        break;
+                    case 'middle':
+                        targetX = n.x;
+                        targetY = bounds.midY - (isGroup?n.h/2:0)
+                        break;
+                    case 'center':
+                        targetX = bounds.midX - (isGroup?n.w/2:0)
+                        targetY = n.y;
+                        break;
+                }
+
+                if (n.x !== targetX || n.y !== targetY) {
+                    if (!isGroup) {
+                        changedNodes.push({
+                            n:n,
+                            ox: n.x,
+                            oy: n.y,
+                            moved: n.moved
+                        });
+                        n.x = targetX;
+                        n.y = targetY;
+                        n.dirty = true;
+                        n.moved = true;
+                    } else {
+                        var groupNodes = RED.group.getNodes(n, true);
+                        var deltaX = n.x - targetX;
+                        var deltaY = n.y - targetY;
+                        groupNodes.forEach(function(gn) {
+                            if (gn.type !== "group" ) {
+                                changedNodes.push({
+                                    n:gn,
+                                    ox: gn.x,
+                                    oy: gn.y,
+                                    moved: gn.moved
+                                });
+                                gn.x = gn.x - deltaX;
+                                gn.y = gn.y - deltaY;
+                                gn.dirty = true;
+                                gn.moved = true;
+                            }
+                        })
+
+                    }
+                }
+            });
+            if (changedNodes.length > 0) {
+                RED.history.push({t:"move",nodes:changedNodes,dirty:RED.nodes.dirty()});
+                RED.nodes.dirty(true);
+                RED.view.redraw(true);
+            }
+        }
+    }
+
+
+    function distributeSelection(direction) {
+        var selection = RED.view.selection();
+
+        if (selection.nodes && selection.nodes.length > 2) {
+            var changedNodes = [];
+            var bounds = {
+                minX: Number.MAX_SAFE_INTEGER,
+                minY: Number.MAX_SAFE_INTEGER,
+                maxX: Number.MIN_SAFE_INTEGER,
+                maxY: Number.MIN_SAFE_INTEGER
+            }
+            var startAnchors = [];
+            var endAnchors = [];
+
+            selection.nodes.forEach(function(n) {
+                var nx,ny;
+                if (n.type === "group") {
+                    nx = n.x + n.w/2;
+                    ny = n.y + n.h/2;
+                } else {
+                    nx = n.x;
+                    ny = n.y;
+                }
+                if (direction === "h") {
+                    if (nx < bounds.minX) {
+                        startAnchors = [];
+                        bounds.minX = nx;
+                    }
+                    if (nx === bounds.minX) {
+                        startAnchors.push(n);
+                    }
+                    if (nx > bounds.maxX) {
+                        endAnchors = [];
+                        bounds.maxX = nx;
+                    }
+                    if (nx === bounds.maxX) {
+                        endAnchors.push(n);
+                    }
+                } else {
+                    if (ny < bounds.minY) {
+                        startAnchors = [];
+                        bounds.minY = ny;
+                    }
+                    if (ny === bounds.minY) {
+                        startAnchors.push(n);
+                    }
+                    if (ny > bounds.maxY) {
+                        endAnchors = [];
+                        bounds.maxY = ny;
+                    }
+                    if (ny === bounds.maxY) {
+                        endAnchors.push(n);
+                    }
+                }
+            });
+
+            var startAnchor = startAnchors[0];
+            var endAnchor = endAnchors[0];
+
+            var nodeSpace = 0;
+            var nodesToMove = selection.nodes.filter(function(n) {
+                if (n.id !== startAnchor.id && n.id !== endAnchor.id) {
+                    nodeSpace += direction === 'h'?n.w:n.h;
+                    return true;
+                }
+                return false;
+            }).sort(function(A,B) {
+                if (direction === 'h') {
+                    return A.x - B.x
+                } else {
+                    return A.y - B.y
+                }
+            })
+
+            var saX = startAnchor.x + startAnchor.w/2;
+            var saY = startAnchor.y + startAnchor.h/2;
+            if (startAnchor.type === "group") {
+                saX = startAnchor.x + startAnchor.w;
+                saY = startAnchor.y + startAnchor.h;
+            }
+            var eaX = endAnchor.x;
+            var eaY = endAnchor.y;
+            if (endAnchor.type !== "group") {
+                eaX -= endAnchor.w/2;
+                eaY -= endAnchor.h/2;
+            }
+            var spaceToFill = direction === 'h'?(eaX - saX - nodeSpace): (eaY - saY - nodeSpace);
+            var spaceBetweenNodes = spaceToFill / (nodesToMove.length + 1);
+
+            var tx = saX;
+            var ty = saY;
+            while(nodesToMove.length > 0) {
+                if (direction === 'h') {
+                    tx += spaceBetweenNodes;
+                } else {
+                    ty += spaceBetweenNodes;
+                }
+                var nextNode = nodesToMove.shift();
+                var isGroup = nextNode.type==="group";
+
+                var nx = nextNode.x;
+                var ny = nextNode.y;
+                if (!isGroup) {
+                    tx += nextNode.w/2;
+                    ty += nextNode.h/2;
+                }
+                if ((direction === 'h' && nx !== tx) || (direction === 'v' && ny !== ty)) {
+                    if (!isGroup) {
+                        changedNodes.push({
+                            n:nextNode,
+                            ox: nextNode.x,
+                            oy: nextNode.y,
+                            moved: nextNode.moved
+                        });
+                        if (direction === 'h') {
+                            nextNode.x = tx;
+                        } else {
+                            nextNode.y = ty;
+                        }
+                        nextNode.dirty = true;
+                        nextNode.moved = true;
+                    } else {
+                        var groupNodes = RED.group.getNodes(nextNode, true);
+                        var deltaX = direction === 'h'? nx - tx : 0;
+                        var deltaY = direction === 'v'? ny - ty : 0;
+                        groupNodes.forEach(function(gn) {
+                            if (gn.type !== "group" ) {
+                                changedNodes.push({
+                                    n:gn,
+                                    ox: gn.x,
+                                    oy: gn.y,
+                                    moved: gn.moved
+                                });
+                                gn.x = gn.x - deltaX;
+                                gn.y = gn.y - deltaY;
+                                gn.dirty = true;
+                                gn.moved = true;
+                            }
+                        })
+                    }
+                }
+                if (isGroup) {
+                    tx += nextNode.w;
+                    ty += nextNode.h;
+                } else {
+                    tx += nextNode.w/2;
+                    ty += nextNode.h/2;
+                }
+            }
+
+            if (changedNodes.length > 0) {
+                RED.history.push({t:"move",nodes:changedNodes,dirty:RED.nodes.dirty()});
+                RED.nodes.dirty(true);
+                RED.view.redraw(true);
+            }
+        }
+    }
+
+    function reorderSelection(dir) {
+        var selection = RED.view.selection();
+        if (selection.nodes) {
+            var nodesToMove = [];
+            selection.nodes.forEach(function(n) {
+                if (n.type === "group") {
+                    nodesToMove = nodesToMove.concat(RED.group.getNodes(n, true).filter(function(n) {
+                        return n.type !== "group";
+                    }))
+                } else if (n.type !== "subflow"){
+                    nodesToMove.push(n);
+                }
+            })
+            if (nodesToMove.length > 0) {
+                var z = nodesToMove[0].z;
+                var existingOrder = RED.nodes.getNodeOrder(z);
+                var movedNodes;
+                if (dir === "forwards") {
+                    movedNodes = RED.nodes.moveNodesForwards(nodesToMove);
+                } else if (dir === "backwards") {
+                    movedNodes = RED.nodes.moveNodesBackwards(nodesToMove);
+                } else if (dir === "front") {
+                    movedNodes = RED.nodes.moveNodesToFront(nodesToMove);
+                } else if (dir === "back") {
+                    movedNodes = RED.nodes.moveNodesToBack(nodesToMove);
+                }
+                if (movedNodes.length > 0) {
+                    var newOrder = RED.nodes.getNodeOrder(z);
+                    RED.history.push({t:"reorder",nodes:{z:z,from:existingOrder,to:newOrder},dirty:RED.nodes.dirty()});
+                    RED.nodes.dirty(true);
+                    RED.view.redraw(true);
+                }
+            }
+        }
+    }
+
+
+    function wireSeriesOfNodes() {
+        var selection = RED.view.selection();
+        if (selection.nodes) {
+            if (selection.nodes.length > 1) {
+                var i = 0;
+                var newLinks = [];
+                while (i < selection.nodes.length - 1) {
+                    var nodeA = selection.nodes[i];
+                    var nodeB = selection.nodes[i+1];
+                    if (nodeA.outputs > 0 && nodeB.inputs > 0) {
+                        var existingLinks = RED.nodes.filterLinks({
+                            source: nodeA,
+                            target: nodeB,
+                            sourcePort: 0
+                        })
+                        if (existingLinks.length === 0) {
+                            var newLink = {
+                                source: nodeA,
+                                target: nodeB,
+                                sourcePort: 0
+                            }
+                            RED.nodes.addLink(newLink);
+                            newLinks.push(newLink);
+                        }
+                    }
+                    i++;
+                }
+                if (newLinks.length > 0) {
+                    RED.history.push({
+                        t: 'add',
+                        links: newLinks,
+                        dirty: RED.nodes.dirty()
+                    })
+                    RED.nodes.dirty(true);
+                    RED.view.redraw(true);
+                }
+            }
+        }
+    }
+
+    function wireNodeToMultiple() {
+        var selection = RED.view.selection();
+        if (selection.nodes) {
+            if (selection.nodes.length > 1) {
+                var sourceNode = selection.nodes[0];
+                if (sourceNode.outputs === 0) {
+                    return;
+                }
+                var i = 1;
+                var newLinks = [];
+                while (i < selection.nodes.length) {
+                    var targetNode = selection.nodes[i];
+                    if (targetNode.inputs > 0) {
+                        var existingLinks = RED.nodes.filterLinks({
+                            source: sourceNode,
+                            target: targetNode,
+                            sourcePort: Math.min(sourceNode.outputs-1,i-1)
+                        })
+                        if (existingLinks.length === 0) {
+                            var newLink = {
+                                source: sourceNode,
+                                target: targetNode,
+                                sourcePort: Math.min(sourceNode.outputs-1,i-1)
+                            }
+                            RED.nodes.addLink(newLink);
+                            newLinks.push(newLink);
+                        }
+                    }
+                    i++;
+                }
+                if (newLinks.length > 0) {
+                    RED.history.push({
+                        t: 'add',
+                        links: newLinks,
+                        dirty: RED.nodes.dirty()
+                    })
+                    RED.nodes.dirty(true);
+                    RED.view.redraw(true);
+                }
+            }
+        }
+    }
+
+    /**
+     * Splits selected wires and re-joins them with link-out+link-in
+     * @param {Object || Object[]} wires The wire(s) to split and replace with link-out, link-in nodes.
+     */
+    function splitWiresWithLinkNodes(wires) {
+        let wiresToSplit = wires || RED.view.selection().links;
+        if (!Array.isArray(wiresToSplit)) {
+            wiresToSplit = [wiresToSplit];
+        }
+        if (wiresToSplit.length < 1) {
+            return; //nothing selected
+        }
+
+        const history = {
+            t: 'multi',
+            events: [],
+            dirty: RED.nodes.dirty()
+        }
+        const nodeSrcMap = {};
+        const nodeTrgMap = {};
+        const _gridSize = RED.view.gridSize();
+
+        for (let wireIdx = 0; wireIdx < wiresToSplit.length; wireIdx++) {
+            const wire = wiresToSplit[wireIdx];
+
+            //get source and target nodes of this wire link
+            const nSrc = wire.source;
+            const nTrg = wire.target;
+
+            var updateNewNodePosXY = function (origNode, newNode, alignLeft, snap, yOffset) {
+                const nnSize = RED.view.calculateNodeDimensions(newNode);
+                newNode.w = nnSize[0];
+                newNode.h = nnSize[1];
+                const coords = { x: origNode.x || 0, y: origNode.y || 0, w: origNode.w || RED.view.node_width, h: origNode.h || RED.view.node_height };
+                const x = coords.x - (coords.w/2.0);
+                if (alignLeft) {
+                    coords.x = x - _gridSize - (newNode.w/2.0);
+                } else {
+                    coords.x = x + coords.w + _gridSize + (newNode.w/2.0);
+                }
+                newNode.x = coords.x;
+                newNode.y = coords.y;
+                if (snap !== false) {
+                    const offsets = RED.view.tools.calculateGridSnapOffsets(newNode);
+                    newNode.x -= offsets.x;
+                    newNode.y -= offsets.y;
+                }
+                newNode.y += (yOffset || 0);
+            }
+            const srcPort = (wire.sourcePort || 0);
+            let linkOutMapId = nSrc.id + ':' + srcPort;
+            let nnLinkOut = nodeSrcMap[linkOutMapId];
+            //Create a Link Out if one is not already present
+            if(!nnLinkOut) {
+                const nLinkOut = RED.view.createNode("link out"); //create link node
+                nnLinkOut = nLinkOut.node;
+                nodeSrcMap[linkOutMapId] = nnLinkOut;
+                let yOffset = 0;
+                if(nSrc.outputs > 1) {
+
+                    const CENTER_PORT = (((nSrc.outputs-1) / 2) + 1);
+                    const offsetCount = Math.abs(CENTER_PORT - (srcPort + 1));
+                    yOffset = (_gridSize * 2 * offsetCount);
+                    if((srcPort + 1) < CENTER_PORT) {
+                        yOffset = -yOffset;
+                    }
+                    updateNewNodePosXY(nSrc, nnLinkOut, false, false, yOffset);
+                } else {
+                    updateNewNodePosXY(nSrc, nnLinkOut, false, RED.view.snapGrid, yOffset);
+                }
+                //add created node
+                RED.nodes.add(nnLinkOut);
+                RED.editor.validateNode(nnLinkOut);
+                history.events.push(nLinkOut.historyEvent);
+                //connect node to link node
+                const link = {
+                    source: nSrc,
+                    sourcePort: wire.sourcePort || 0,
+                    target: nnLinkOut
+                };
+                RED.nodes.addLink(link);
+                history.events.push({
+                    t: 'add',
+                    links: [link],
+                });
+            }
+
+            let nnLinkIn = nodeTrgMap[nTrg.id];
+            //Create a Link In if one is not already present
+            if(!nnLinkIn) {
+                const nLinkIn = RED.view.createNode("link in"); //create link node
+                nnLinkIn = nLinkIn.node;
+                nodeTrgMap[nTrg.id] = nnLinkIn;
+                updateNewNodePosXY(nTrg, nnLinkIn, true, RED.view.snapGrid, 0);
+                //add created node
+                RED.nodes.add(nnLinkIn);
+                RED.editor.validateNode(nnLinkIn);
+                history.events.push(nLinkIn.historyEvent);
+                //connect node to link node
+                const link = {
+                    source: nnLinkIn,
+                    sourcePort: 0,
+                    target: nTrg
+                };
+                RED.nodes.addLink(link);
+                history.events.push({
+                    t: 'add',
+                    links: [link],
+                });
+            }
+
+            //connect the link out/link in virtual wires
+            if(nnLinkIn.links.indexOf(nnLinkOut.id) == -1) {
+                nnLinkIn.links.push(nnLinkOut.id);
+            }
+            if(nnLinkOut.links.indexOf(nnLinkIn.id) == -1) {
+                nnLinkOut.links.push(nnLinkIn.id);
+            }
+
+            //delete the original wire
+            RED.nodes.removeLink(wire);
+            history.events.push({
+                t: "delete",
+                links: [wire]
+            });
+        }
+        //add all history events to stack
+        RED.history.push(history);
+
+        //select all downstream of new link-in nodes so user can drag to new location
+        RED.view.clearSelection();
+        RED.view.select({nodes: Object.values(nodeTrgMap) });
+        selectConnected("down");
+
+        //update the view
+        RED.nodes.dirty(true);
+        RED.view.redraw(true);
+    }
+
+    /**
+     * Calculate the required offsets to snap a node
+     * @param {Object} node The node to calculate grid snap offsets for
+     * @param {Object} [options] Options: `align` can be "nearest", "left" or "right"
+     * @returns `{x:number, y:number}`  as the offsets to deduct from `x` and `y`
+     */
+    function calculateGridSnapOffsets(node, options) {
+        options = options || { align: "nearest" };
+        const gridOffset = { x: 0, y: 0 };
+        const gridSize = RED.view.gridSize();
+        const offsetLeft = node.x - (gridSize * Math.round((node.x - node.w / 2) / gridSize) + node.w / 2);
+        const offsetRight = node.x - (gridSize * Math.round((node.x + node.w / 2) / gridSize) - node.w / 2);
+        gridOffset.x = offsetRight;
+        if (options.align === "right") {
+            //skip - already set to right
+        } else if (options.align === "left" || Math.abs(offsetLeft) < Math.abs(offsetRight)) {
+            gridOffset.x = offsetLeft;
+        }
+        gridOffset.y = node.y - (gridSize * Math.round(node.y / gridSize));
+        return gridOffset;
+    }
+
+    /**
+     * Generate names for the select nodes.
+     *  - it only sets the name if it is currently blank
+     *  - it uses `<paletteLabel> <N>` - where N is the next available integer that
+     *    doesn't clash with any existing nodes of that type
+     * @param {Object} node The node to set the name of - if not provided, uses current selection
+     */
+    function generateNodeNames(node) {
+        const nodes = node?[node]:RED.view.selection().nodes;
+        if (nodes && nodes.length > 0) {
+            // Generate history event if using the workspace selection,
+            // or if the provided node already exists
+            const generateHistory = !node || !!RED.nodes.node(node.id)
+            const historyEvents = []
+            const typeIndex = {}
+            let changed = false;
+            nodes.forEach(n => {
+                if (n._def && n._def.defaults && n._def.defaults.name) {
+                    const paletteLabel = RED.utils.getPaletteLabel(n.type, n._def)
+                    const defaultNodeNameRE = new RegExp('^'+paletteLabel+' (\\d+)$')
+                    if (!typeIndex.hasOwnProperty(n.type)) {
+                        const existingNodes = RED.nodes.filterNodes({type: n.type})
+                        let maxNameNumber = 0;
+                        existingNodes.forEach(n => {
+                            let match = defaultNodeNameRE.exec(n.name)
+                            if (match) {
+                                let nodeNumber = parseInt(match[1])
+                                if (nodeNumber > maxNameNumber) {
+                                    maxNameNumber = nodeNumber
+                                }
+                            }
+                        })
+                        typeIndex[n.type] = maxNameNumber + 1
+                    }
+                    if (n.name === '') {
+                        if (generateHistory) {
+                            historyEvents.push({
+                                t:'edit',
+                                node: n,
+                                changes: { name: n.name },
+                                dirty: RED.nodes.dirty(),
+                                changed: n.changed
+                            })
+                        }
+                        n.name = paletteLabel+" "+typeIndex[n.type]
+                        n.dirty = true
+                        typeIndex[n.type]++
+                        changed = true
+                    }
+                }
+            })
+            if (changed) {
+                if (historyEvents.length > 0) {
+                    RED.history.push({
+                        t: 'multi',
+                        events: historyEvents
+                    })
+                }
+                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());});
@@ -454,6 +1054,12 @@ RED.view.tools = (function() {
             RED.actions.add("core:move-selection-down", function() { moveSelection(0,1);});
             RED.actions.add("core:move-selection-left", function() { moveSelection(-1,0);});
 
+            RED.actions.add("core:move-selection-forwards", function() { reorderSelection('forwards') })
+            RED.actions.add("core:move-selection-backwards", function() { reorderSelection('backwards') })
+            RED.actions.add("core:move-selection-to-front", function() { reorderSelection('front') })
+            RED.actions.add("core:move-selection-to-back", function() { reorderSelection('back') })
+
+
             RED.actions.add("core:step-selection-up", function() { moveSelection(0,-RED.view.gridSize());});
             RED.actions.add("core:step-selection-right", function() { moveSelection(RED.view.gridSize(),0);});
             RED.actions.add("core:step-selection-down", function() { moveSelection(0,RED.view.gridSize());});
@@ -474,6 +1080,25 @@ RED.view.tools = (function() {
             RED.actions.add("core:go-to-nearest-node-on-right", function() { gotoNearestNode('right')})
             RED.actions.add("core:go-to-nearest-node-above", function() { gotoNearestNode('up') })
             RED.actions.add("core:go-to-nearest-node-below", function() { gotoNearestNode('down') })
+
+            RED.actions.add("core:align-selection-to-grid", alignToGrid);
+            RED.actions.add("core:align-selection-to-left", function() { alignSelectionToEdge('left') })
+            RED.actions.add("core:align-selection-to-right", function() { alignSelectionToEdge('right') })
+            RED.actions.add("core:align-selection-to-top", function() { alignSelectionToEdge('top') })
+            RED.actions.add("core:align-selection-to-bottom", function() { alignSelectionToEdge('bottom') })
+            RED.actions.add("core:align-selection-to-middle", function() { alignSelectionToEdge('middle') })
+            RED.actions.add("core:align-selection-to-center", function() { alignSelectionToEdge('center') })
+
+            RED.actions.add("core:distribute-selection-horizontally", function() { distributeSelection('h') })
+            RED.actions.add("core:distribute-selection-vertically", function() { distributeSelection('v') })
+
+            RED.actions.add("core:wire-series-of-nodes", function() { wireSeriesOfNodes() })
+            RED.actions.add("core:wire-node-to-multiple", function() { wireNodeToMultiple() })
+
+            RED.actions.add("core:split-wire-with-link-nodes", function () { splitWiresWithLinkNodes() });
+
+            RED.actions.add("core:generate-node-names", generateNodeNames )
+
             // RED.actions.add("core:add-node", function() { addNode() })
         },
         /**
@@ -485,7 +1110,8 @@ RED.view.tools = (function() {
          * @param  {Number} dx
          * @param  {Number} dy
          */
-        moveSelection: moveSelection
+        moveSelection: moveSelection,
+        calculateGridSnapOffsets: calculateGridSnapOffsets
     }
 
 })();

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

@@ -21,8 +21,11 @@ RED.workspaces = (function() {
     var workspaceIndex = 0;
 
     var viewStack = [];
+    var hideStack = [];
     var viewStackPos = 0;
 
+    let flashingTab;
+    let flashingTabTimer;
 
     function addToViewStack(id) {
         if (viewStackPos !== viewStack.length) {
@@ -30,31 +33,68 @@ RED.workspaces = (function() {
         }
         viewStack.push(id);
         viewStackPos = viewStack.length;
-        // console.warn("addToViewStack",id,viewStack);
+    }
+
+    function removeFromHideStack(id) {
+        hideStack = hideStack.filter(function(v) {
+            if (v === id) {
+                return false;
+            } else if (Array.isArray(v)) {
+                var i = v.indexOf(id);
+                if (i > -1) {
+                    v.splice(i,1);
+                }
+                if (v.length === 0) {
+                    return false;
+                }
+                return true
+            }
+            return true;
+        })
     }
 
     function addWorkspace(ws,skipHistoryEntry,targetIndex) {
         if (ws) {
+            if (!ws.closeable) {
+                ws.hideable = true;
+            }
             workspace_tabs.addTab(ws,targetIndex);
+
+            var hiddenTabs = JSON.parse(RED.settings.getLocal("hiddenTabs")||"{}");
+            if (hiddenTabs[ws.id]) {
+                workspace_tabs.hideTab(ws.id);
+            }
             workspace_tabs.resize();
         } else {
             var tabId = RED.nodes.id();
             do {
                 workspaceIndex += 1;
-            } while ($("#red-ui-workspace-tabs a[title='"+RED._('workspace.defaultName',{number:workspaceIndex})+"']").size() !== 0);
+            } while ($("#red-ui-workspace-tabs li[flowname='"+RED._('workspace.defaultName',{number:workspaceIndex})+"']").size() !== 0);
 
-            ws = {type:"tab",id:tabId,disabled: false,info:"",label:RED._('workspace.defaultName',{number:workspaceIndex})};
+            ws = {
+                type: "tab",
+                id: tabId,
+                disabled: false,
+                info: "",
+                label: RED._('workspace.defaultName',{number:workspaceIndex}),
+                env: [],
+                hideable: true
+            };
             RED.nodes.addWorkspace(ws,targetIndex);
             workspace_tabs.addTab(ws,targetIndex);
+
             workspace_tabs.activateTab(tabId);
             if (!skipHistoryEntry) {
                 RED.history.push({t:'add',workspaces:[ws],dirty:RED.nodes.dirty()});
                 RED.nodes.dirty(true);
             }
         }
+        $("#red-ui-tab-"+(ws.id.replace(".","-"))).attr("flowname",ws.label)
+
         RED.view.focus();
         return ws;
     }
+
     function deleteWorkspace(ws) {
         if (workspaceTabCount === 1) {
             return;
@@ -78,165 +118,9 @@ RED.workspaces = (function() {
             if (subflow) {
                 RED.editor.editSubflow(subflow);
             }
-            return;
+        } else {
+            RED.editor.editFlow(workspace);
         }
-        RED.view.state(RED.state.EDITING);
-        var tabflowEditor;
-        var trayOptions = {
-            title: RED._("workspace.editFlow",{name:RED.utils.sanitize(workspace.label)}),
-            buttons: [
-                {
-                    id: "node-dialog-delete",
-                    class: 'leftButton'+((workspaceTabCount === 1)?" disabled":""),
-                    text: RED._("common.label.delete"), //'<i class="fa fa-trash"></i>',
-                    click: function() {
-                        deleteWorkspace(workspace);
-                        RED.tray.close();
-                    }
-                },
-                {
-                    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 label = $( "#node-input-name" ).val();
-                        var changed = false;
-                        var changes = {};
-                        if (workspace.label != label) {
-                            changes.label = workspace.label;
-                            changed = true;
-                            workspace.label = label;
-                            workspace_tabs.renameTab(workspace.id,label);
-                        }
-                        var disabled = $("#node-input-disabled").prop("checked");
-                        if (workspace.disabled !== disabled) {
-                            changes.disabled = workspace.disabled;
-                            changed = true;
-                            workspace.disabled = disabled;
-                        }
-                        var info = tabflowEditor.getValue();
-                        if (workspace.info !== info) {
-                            changes.info = workspace.info;
-                            changed = true;
-                            workspace.info = info;
-                        }
-                        $("#red-ui-tab-"+(workspace.id.replace(".","-"))).toggleClass('red-ui-workspace-disabled',!!workspace.disabled);
-                        $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!workspace.disabled);
-
-                        if (changed) {
-                            var historyEvent = {
-                                t: "edit",
-                                changes:changes,
-                                node: workspace,
-                                dirty: RED.nodes.dirty()
-                            }
-                            workspace.changed = true;
-                            RED.history.push(historyEvent);
-                            RED.nodes.dirty(true);
-                            RED.sidebar.config.refresh();
-                            if (changes.hasOwnProperty('disabled')) {
-                                RED.nodes.eachNode(function(n) {
-                                    if (n.z === workspace.id) {
-                                        n.dirty = true;
-                                    }
-                                });
-                                RED.view.redraw();
-                            }
-                            RED.events.emit("flows:change",workspace);
-                        }
-                        RED.tray.close();
-                    }
-                }
-            ],
-            resize: function(dimensions) {
-                var rows = $("#dialog-form>div:not(.node-text-editor-row)");
-                var editorRow = $("#dialog-form>div.node-text-editor-row");
-                var height = $("#dialog-form").height();
-                for (var i=0; i<rows.size(); i++) {
-                    height -= $(rows[i]).outerHeight(true);
-                }
-                height -= (parseInt($("#dialog-form").css("marginTop"))+parseInt($("#dialog-form").css("marginBottom")));
-                $(".node-text-editor").css("height",height+"px");
-                tabflowEditor.resize();
-            },
-            open: function(tray) {
-                var trayFooter = tray.find(".red-ui-tray-footer");
-                var trayBody = tray.find('.red-ui-tray-body');
-                var trayFooterLeft = $('<div class="red-ui-tray-footer-left"></div>').appendTo(trayFooter)
-
-                var dialogForm = $('<form id="dialog-form" class="form-horizontal"></form>').appendTo(trayBody);
-                $('<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>').appendTo(dialogForm);
-
-
-                if (!workspace.hasOwnProperty("disabled")) {
-                    workspace.disabled = false;
-                }
-
-                $('<input id="node-input-disabled" type="checkbox">').prop("checked",workspace.disabled).appendTo(trayFooterLeft).toggleButton({
-                    enabledIcon: "fa-circle-thin",
-                    disabledIcon: "fa-ban",
-                    invertState: true
-                })
-
-
-                var row = $('<div class="form-row node-text-editor-row">'+
-                    '<label for="node-input-info" data-i18n="editor:workspace.info" style="width:300px;"></label>'+
-                    '<div style="min-height:250px;" class="node-text-editor" id="node-input-info"></div>'+
-                '</div>').appendTo(dialogForm);
-                tabflowEditor = RED.editor.createEditor({
-                    id: 'node-input-info',
-                    mode: 'ace/mode/markdown',
-                    value: ""
-                });
-
-                $('#node-info-input-info-expand').on("click", function(e) {
-                    e.preventDefault();
-                    var value = tabflowEditor.getValue();
-                    RED.editor.editMarkdown({
-                        value: value,
-                        width: "Infinity",
-                        cursor: tabflowEditor.getCursorPosition(),
-                        complete: function(v,cursor) {
-                            tabflowEditor.setValue(v, -1);
-                            tabflowEditor.gotoLine(cursor.row+1,cursor.column,false);
-                            setTimeout(function() {
-                                tabflowEditor.focus();
-                            },300);
-                        }
-                    })
-                });
-
-
-
-                $('<input type="text" style="display: none;" />').prependTo(dialogForm);
-                dialogForm.on("submit", function(e) { e.preventDefault();});
-                $("#node-input-name").val(workspace.label);
-                RED.text.bidi.prepareInput($("#node-input-name"));
-                tabflowEditor.getSession().setValue(workspace.info || "", -1);
-                dialogForm.i18n();
-            },
-            close: function() {
-                if (RED.view.state() != RED.state.IMPORT_DRAGGING) {
-                    RED.view.state(RED.state.DEFAULT);
-                }
-                var selection = RED.view.selection();
-                if (!selection.nodes && !selection.links && workspace.id === activeWorkspace) {
-                    RED.sidebar.info.refresh(workspace);
-                }
-                tabflowEditor.destroy();
-            }
-        }
-        RED.tray.show(trayOptions);
     }
 
 
@@ -249,11 +133,18 @@ RED.workspaces = (function() {
                 var event = {
                     old: activeWorkspace
                 }
-                activeWorkspace = tab.id;
+                if (tab) {
+                    $("#red-ui-workspace-chart").show();
+                    activeWorkspace = tab.id;
+                    window.location.hash = 'flow/'+tab.id;
+                    $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!tab.disabled);
+                    } else {
+                    $("#red-ui-workspace-chart").hide();
+                    activeWorkspace = 0;
+                    window.location.hash = '';
+                }
                 event.workspace = activeWorkspace;
                 RED.events.emit("workspace:change",event);
-                window.location.hash = 'flow/'+tab.id;
-                $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!tab.disabled);
                 RED.sidebar.config.refresh();
                 RED.view.focus();
             },
@@ -278,7 +169,7 @@ RED.workspaces = (function() {
                 if (tab.disabled) {
                     $("#red-ui-tab-"+(tab.id.replace(".","-"))).addClass('red-ui-workspace-disabled');
                 }
-                RED.menu.setDisabled("menu-item-workspace-delete",workspaceTabCount <= 1);
+                RED.menu.setDisabled("menu-item-workspace-delete",activeWorkspace === 0 || workspaceTabCount <= 1);
                 if (workspaceTabCount === 1) {
                     showWorkspace();
                 }
@@ -286,14 +177,23 @@ RED.workspaces = (function() {
             onremove: function(tab) {
                 if (tab.type === "tab") {
                     workspaceTabCount--;
+                } else {
+                    hideStack.push(tab.id);
                 }
-                RED.menu.setDisabled("menu-item-workspace-delete",workspaceTabCount <= 1);
+                RED.menu.setDisabled("menu-item-workspace-delete",activeWorkspace === 0 || workspaceTabCount <= 1);
                 if (workspaceTabCount === 0) {
                     hideWorkspace();
                 }
             },
             onreorder: function(oldOrder, newOrder) {
-                RED.history.push({t:'reorder',order:oldOrder,dirty:RED.nodes.dirty()});
+                RED.history.push({
+                    t:'reorder',
+                    workspaces: {
+                        from:oldOrder,
+                        to:newOrder
+                    },
+                    dirty:RED.nodes.dirty()
+                });
                 RED.nodes.dirty(true);
                 setWorkspaceOrder(newOrder);
             },
@@ -312,12 +212,86 @@ RED.workspaces = (function() {
                     $(".red-ui-sidebar-shade").show();
                 }
             },
+            onhide: function(tab) {
+                hideStack.push(tab.id);
+
+                var hiddenTabs = JSON.parse(RED.settings.getLocal("hiddenTabs")||"{}");
+                hiddenTabs[tab.id] = true;
+                RED.settings.setLocal("hiddenTabs",JSON.stringify(hiddenTabs));
+
+                RED.events.emit("workspace:hide",{workspace: tab.id})
+            },
+            onshow: function(tab) {
+                removeFromHideStack(tab.id);
+
+                var hiddenTabs = JSON.parse(RED.settings.getLocal("hiddenTabs")||"{}");
+                delete hiddenTabs[tab.id];
+                RED.settings.setLocal("hiddenTabs",JSON.stringify(hiddenTabs));
+
+                RED.events.emit("workspace:show",{workspace: tab.id})
+            },
             minimumActiveTabWidth: 150,
             scrollable: true,
             addButton: "core:add-flow",
             addButtonCaption: RED._("workspace.addFlow"),
-            searchButton: "core:list-flows",
-            searchButtonCaption: RED._("workspace.listFlows")
+            menu: function() {
+                var menuItems = [
+                    {
+                        id:"red-ui-tabs-menu-option-search-flows",
+                        label: RED._("workspace.listFlows"),
+                        onselect: "core:list-flows"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-search-subflows",
+                        label: RED._("workspace.listSubflows"),
+                        onselect: "core:list-subflows"
+                    },
+                    null,
+                    {
+                        id:"red-ui-tabs-menu-option-add-flow",
+                        label: RED._("workspace.addFlow"),
+                        onselect: "core:add-flow"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-flow-right",
+                        label: RED._("workspace.addFlowToRight"),
+                        onselect: "core:add-flow-to-right"
+                    },
+                    null,
+                    {
+                        id:"red-ui-tabs-menu-option-add-hide-flows",
+                        label: RED._("workspace.hideFlow"),
+                        onselect: "core:hide-flow"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-hide-other-flows",
+                        label: RED._("workspace.hideOtherFlows"),
+                        onselect: "core:hide-other-flows"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-show-all-flows",
+                        label: RED._("workspace.showAllFlows"),
+                        onselect: "core:show-all-flows"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-hide-all-flows",
+                        label: RED._("workspace.hideAllFlows"),
+                        onselect: "core:hide-all-flows"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-show-last-flow",
+                        label: RED._("workspace.showLastHiddenFlow"),
+                        onselect: "core:show-last-hidden-flow"
+                    }
+                ]
+                if (hideStack.length > 0) {
+                    menuItems.unshift({
+                        label: RED._("workspace.hiddenFlows",{count: hideStack.length}),
+                        onselect: "core:list-hidden-flows"
+                    })
+                }
+                return menuItems;
+            }
         });
         workspaceTabCount = 0;
     }
@@ -368,15 +342,107 @@ RED.workspaces = (function() {
         });
 
         RED.actions.add("core:add-flow",function(opts) { addWorkspace(undefined,undefined,opts?opts.index:undefined)});
+        RED.actions.add("core:add-flow-to-right",function(opts) { addWorkspace(undefined,undefined,workspace_tabs.activeIndex()+1)});
         RED.actions.add("core:edit-flow",editWorkspace);
         RED.actions.add("core:remove-flow",removeWorkspace);
         RED.actions.add("core:enable-flow",enableWorkspace);
         RED.actions.add("core:disable-flow",disableWorkspace);
 
+        RED.actions.add("core:hide-flow", function() {
+            var selection = workspace_tabs.selection();
+            if (selection.length === 0) {
+                selection = [{id:activeWorkspace}]
+            }
+            var hiddenTabs = [];
+            selection.forEach(function(ws) {
+                RED.workspaces.hide(ws.id);
+                hideStack.pop();
+                hiddenTabs.push(ws.id);
+            })
+            if (hiddenTabs.length > 0) {
+                hideStack.push(hiddenTabs);
+            }
+            workspace_tabs.clearSelection();
+        })
+
+        RED.actions.add("core:hide-other-flows", function() {
+            var selection = workspace_tabs.selection();
+            if (selection.length === 0) {
+                selection = [{id:activeWorkspace}]
+            }
+            var selected = new Set(selection.map(function(ws) { return ws.id }))
+
+            var currentTabs = workspace_tabs.listTabs();
+            var hiddenTabs = [];
+            currentTabs.forEach(function(id) {
+                if (!selected.has(id)) {
+                    RED.workspaces.hide(id);
+                    hideStack.pop();
+                    hiddenTabs.push(id);
+                }
+            })
+            if (hiddenTabs.length > 0) {
+                hideStack.push(hiddenTabs);
+            }
+        })
+
+        RED.actions.add("core:hide-all-flows", function() {
+            var currentTabs = workspace_tabs.listTabs();
+            currentTabs.forEach(function(id) {
+                RED.workspaces.hide(id);
+                hideStack.pop();
+            })
+            if (currentTabs.length > 0) {
+                hideStack.push(currentTabs);
+            }
+            workspace_tabs.clearSelection();
+        })
+        RED.actions.add("core:show-all-flows", function() {
+            var currentTabs = workspace_tabs.listTabs();
+            currentTabs.forEach(function(id) {
+                RED.workspaces.show(id, null, true)
+            })
+        })
+        // RED.actions.add("core:toggle-flows", function() {
+        //     var currentTabs = workspace_tabs.listTabs();
+        //     var visibleCount = workspace_tabs.count();
+        //     currentTabs.forEach(function(id) {
+        //         if (visibleCount === 0) {
+        //             RED.workspaces.show(id)
+        //         } else {
+        //             RED.workspaces.hide(id)
+        //         }
+        //     })
+        // })
+        RED.actions.add("core:show-last-hidden-flow", function() {
+            var id = hideStack.pop();
+            if (id) {
+                if (typeof id === 'string') {
+                    RED.workspaces.show(id);
+                } else {
+                    var last = id.pop();
+                    id.forEach(function(i) {
+                        RED.workspaces.show(i, null, true);
+                    })
+                    setTimeout(function() {
+                        RED.workspaces.show(last);
+                    },150)
+
+                }
+            }
+        })
+        RED.actions.add("core:list-modified-nodes",function() {
+            RED.actions.invoke("core:search","is:modified ");
+        })
+        RED.actions.add("core:list-hidden-flows",function() {
+            RED.actions.invoke("core:search","is:hidden ");
+        })
         RED.actions.add("core:list-flows",function() {
             RED.actions.invoke("core:search","type:tab ");
         })
-
+        RED.actions.add("core:list-subflows",function() {
+            RED.actions.invoke("core:search","type:subflow ");
+        })
         RED.actions.add("core:go-to-previous-location", function() {
             if (viewStackPos > 0) {
                 if (viewStackPos === viewStack.length) {
@@ -392,8 +458,6 @@ RED.workspaces = (function() {
                 RED.workspaces.show(viewStack[++viewStackPos],true);
             }
         })
-
-
         hideWorkspace();
     }
 
@@ -416,7 +480,7 @@ RED.workspaces = (function() {
             var changes = { disabled: workspace.disabled };
             workspace.disabled = disabled;
             $("#red-ui-tab-"+(workspace.id.replace(".","-"))).toggleClass('red-ui-workspace-disabled',!!workspace.disabled);
-            if (id === activeWorkspace) {
+            if (!id || (id === activeWorkspace)) {
                 $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!workspace.disabled);
             }
             var historyEvent = {
@@ -445,7 +509,6 @@ RED.workspaces = (function() {
         }
     }
 
-
     function removeWorkspace(ws) {
         if (!ws) {
             deleteWorkspace(RED.nodes.workspace(activeWorkspace));
@@ -471,10 +534,38 @@ RED.workspaces = (function() {
         workspace_tabs.order(order);
     }
 
+    function flashTab(tabId) {
+        if(flashingTab && flashingTab.length) {
+            //cancel current flashing node before flashing new node
+            clearInterval(flashingTabTimer);
+            flashingTabTimer = null;
+            flashingTab.removeClass('highlighted');
+            flashingTab = null;
+        }
+        let tab = $("#red-ui-tab-" + tabId);
+        if(!tab || !tab.length) { return; }
+
+        flashingTabTimer = setInterval(function(flashEndTime) {
+            if (flashEndTime >= Date.now()) {
+                const highlighted = tab.hasClass("highlighted");
+                tab.toggleClass('highlighted', !highlighted)
+            } else {
+                clearInterval(flashingTabTimer);
+                flashingTabTimer = null;
+                flashingTab = null;
+                tab.removeClass('highlighted');
+            }
+        }, 100, Date.now() + 2200);
+        flashingTab = tab;
+        tab.addClass('highlighted');
+    }
     return {
         init: init,
         add: addWorkspace,
+        // remove: remove workspace without editor history etc
         remove: removeWorkspace,
+        // delete: remove workspace and update editor history
+        delete: deleteWorkspace,
         order: setWorkspaceOrder,
         edit: editWorkspace,
         contains: function(id) {
@@ -489,7 +580,18 @@ RED.workspaces = (function() {
         selection: function() {
             return workspace_tabs.selection();
         },
-        show: function(id,skipStack) {
+        hide: function(id) {
+            if (!id) {
+                id = activeWorkspace;
+            }
+            if (workspace_tabs.contains(id)) {
+                workspace_tabs.hideTab(id);
+            }
+        },
+        isHidden: function(id) {
+            return hideStack.includes(id)
+        },
+        show: function(id,skipStack,unhideOnly,flash) {
             if (!workspace_tabs.contains(id)) {
                 var sf = RED.nodes.subflow(id);
                 if (sf) {
@@ -498,19 +600,27 @@ RED.workspaces = (function() {
                         null,
                         workspace_tabs.activeIndex()+1
                     );
+                    removeFromHideStack(id);
                 } else {
                     return;
                 }
             }
-            if (!skipStack && activeWorkspace !== id) {
-                addToViewStack(activeWorkspace)
+            if (unhideOnly) {
+                workspace_tabs.showTab(id);
+            } else {
+                if (!skipStack && activeWorkspace !== id) {
+                    addToViewStack(activeWorkspace)
+                }
+                workspace_tabs.activateTab(id);
+            }
+            if(flash) {
+                flashTab(id.replace(".","-"))
             }
-            workspace_tabs.activateTab(id);
         },
         refresh: function() {
             RED.nodes.eachWorkspace(function(ws) {
                 workspace_tabs.renameTab(ws.id,ws.label);
-
+                $("#red-ui-tab-"+(ws.id.replace(".","-"))).attr("flowname",ws.label)
             })
             RED.nodes.eachSubflow(function(sf) {
                 if (workspace_tabs.contains(sf.id)) {

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

@@ -21,10 +21,10 @@ RED.user = (function() {
             opts = {};
         }
 
-        var dialog = $('<div id="node-dialog-login" class="hide">'+
-                       '<div style="display: inline-block;width: 250px; vertical-align: top; margin-right: 10px; margin-bottom: 20px;"><img id="node-dialog-login-image" src=""/></div>'+
-                       '<div style="display: inline-block; width: 250px; vertical-align: bottom; margin-left: 10px; margin-bottom: 20px;">'+
-                       '<form id="node-dialog-login-fields" class="form-horizontal" style="margin-bottom: 0px;"></form>'+
+        var dialog = $('<div id="node-dialog-login" class="hide" style="display: flex; align-items: flex-end;">'+
+                       '<div style="width: 250px; flex-grow: 0;"><img id="node-dialog-login-image" src=""/></div>'+
+                       '<div style="flex-grow: 1;">'+
+                            '<form id="node-dialog-login-fields" class="form-horizontal" style="margin-bottom: 0px; margin-left:20px;"></form>'+
                        '</div>'+
                        '</div>');
 
@@ -76,7 +76,7 @@ RED.user = (function() {
                         }
                         row.appendTo("#node-dialog-login-fields");
                     }
-                    $('<div class="form-row" style="text-align: right; margin-top: 10px;"><span id="node-dialog-login-failed" style="line-height: 2em;float:left;" class="hide">'+RED._("user.loginFailed")+'</span><img src="red/images/spin.svg" style="height: 30px; margin-right: 10px; " class="login-spinner hide"/>'+
+                    $('<div class="form-row" style="text-align: right; margin-top: 10px;"><span id="node-dialog-login-failed" style="line-height: 2em;float:left;color:var(--red-ui-text-color-error);" class="hide">'+RED._("user.loginFailed")+'</span><img src="red/images/spin.svg" style="height: 30px; margin-right: 10px; " class="login-spinner hide"/>'+
                         (opts.cancelable?'<a href="#" id="node-dialog-login-cancel" class="red-ui-button" style="margin-right: 20px;" tabIndex="'+(i+1)+'">'+RED._("common.label.cancel")+'</a>':'')+
                         '<input type="submit" id="node-dialog-login-submit" class="red-ui-button" style="width: auto;" tabIndex="'+(i+2)+'" value="'+RED._("user.login")+'"></div>').appendTo("#node-dialog-login-fields");
 
@@ -121,6 +121,24 @@ RED.user = (function() {
                     i = 0;
                     for (;i<data.prompts.length;i++) {
                         var field = data.prompts[i];
+                        var sessionMessage = /[?&]session_message=(.*?)(?:$|&)/.exec(window.location.search);
+                        if (sessionMessage) {
+                            RED.sessionMessages = RED.sessionMessages || [];
+                            RED.sessionMessages.push(sessionMessage[1]);
+                            if (history.pushState) {
+                                var newurl = window.location.protocol+"//"+window.location.host+window.location.pathname
+                                window.history.replaceState({ path: newurl }, "", newurl);
+                            } else {
+                                window.location.search = "";
+                            }
+                        }
+                        if (RED.sessionMessages) {
+                            var sessionMessages = $("<div/>",{class:"form-row",style:"text-align: center"}).appendTo("#node-dialog-login-fields");
+                            RED.sessionMessages.forEach(function (msg) {
+                                $('<div>').css("color","var(--red-ui-text-color-error)").text(msg).appendTo(sessionMessages);
+                            });
+                            delete RED.sessionMessages;
+                        }
                         var row = $("<div/>",{class:"form-row",style:"text-align: center"}).appendTo("#node-dialog-login-fields");
 
                         var loginButton = $('<a href="#" class="red-ui-button"></a>',{style: "padding: 10px"}).appendTo(row).on("click", function() {
@@ -152,7 +170,7 @@ RED.user = (function() {
                     });
                 }
 
-                var loginImageSrc = data.image || "red/images/node-red-256.png";
+                var loginImageSrc = data.image || "red/images/node-red-256.svg";
 
                 $("#node-dialog-login-image").load(function() {
                     dialog.dialog("open");

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

@@ -149,7 +149,7 @@ body {
     .red-ui-font-code {
         font-family: $monospace-font;
         font-size: $primary-font-size;
-        color: $info-text-code-color;
+        color: $text-color-code;
         white-space: nowrap;
     }
 
@@ -158,7 +158,7 @@ body {
         font-size: $primary-font-size;
         padding: 0px;
         margin: 1px;
-        color: $info-text-code-color;
+        color: $text-color-code;
         white-space: nowrap;
     }
 

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

@@ -48,15 +48,22 @@ $tertiary-text-color: #aaa;//#90f;
 // Heading text
 $header-text-color: #444;//#f00;
 
-$text-color-warning: #AD1625;
-$text-color-green: #3a3;
+$text-color-error: #AD1625;
+$text-color-warning: #CAB200;
+$text-color-success: #3a3;
+$text-color-code: #AD1625;
+$text-color-link: #0088cc;
+
 
 $primary-border-color: #bbbbbb;//#f00;
 $secondary-border-color: #dddddd;//#0f0;
 $tertiary-border-color: #ccc;//#00f;
 
-$form-background: $secondary-background;
+$border-color-error: #DF2935;
+$border-color-warning: #FFCF70;
+$border-color-success: #4B8400;
 
+$form-background: $secondary-background;
 $form-placeholder-color: $tertiary-text-color;
 $form-text-color: $primary-text-color;
 $form-text-color-disabled: $secondary-text-color-disabled;
@@ -133,8 +140,8 @@ $workspace-button-color-focus-outline: $form-input-focus-color;
 
 $shade-color: rgba(160,160,160,0.5);
 
-
 $popover-background: #333;
+$popover-border: $popover-background;
 $popover-color: #eee;
 $popover-button-border-color: #bbb;
 $popover-button-border-color-hover: #666;
@@ -190,6 +197,7 @@ $view-select-mode-background: $secondary-background-selected;
 $view-grid-color: #eee;
 
 $node-label-color: #333;
+$node-port-label-color: #888;
 $node-border: #999;
 $node-border-unknown: #f33;
 $node-border-placeholder: #aaa;
@@ -257,16 +265,13 @@ $headerMenuCaret: #C7C7C7;
 
 $vcCommitShaColor: #c38888;
 
-$info-text-code-color: #AD1625;
-$info-text-link-color: #0088cc;
-
 $dnd-background: rgba(0,0,0,0.3);
 $dnd-color: #fff;
 
 $notification-border-default: #325C80;
-$notification-border-success: #4B8400;
-$notification-border-warning: #D74108;
-$notification-border-error: $text-color-warning;
+$notification-border-success: $border-color-success;
+$notification-border-warning: $border-color-warning;
+$notification-border-error: $border-color-error;
 
 $debug-message-background: $secondary-background;
 $debug-message-background-hover: $secondary-background-selected;
@@ -282,11 +287,19 @@ $debug-message-text-color-msg-type-number: #2033d6;
 
 $debug-message-border: #eee;
 $debug-message-border-hover: #999;
-$debug-message-border-warning: #ffdf9d;
-$debug-message-border-error: #f99;
+$debug-message-border-warning: $border-color-warning;
+$debug-message-border-error: $border-color-error;
 
 $group-default-fill: none;
 $group-default-fill-opacity: 1;
 $group-default-stroke: #999;
 $group-default-stroke-opacity: 1;
-$group-default-label-color: #a4a4a4;
+$group-default-label-color: #a4a4a4;
+
+$tourGuide-border: #c56c6c;
+$tourGuide-heading-color: #c56c6c;
+
+// Deprecated
+$text-color-green: $text-color-success;
+$info-text-code-color: $text-color-code;
+$info-text-link-color: $text-color-link;

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

@@ -43,12 +43,24 @@
     border-bottom: 1px solid $secondary-border-color;
     box-shadow: 0 2px 6px $shadow;
 }
-.red-ui-debug-filter-row {
-    .red-ui-nodeList {
-        margin: 10px 0;
+#red-ui-sidebar-debug-filter-node-list-row {
+    .red-ui-treeList-label.disabled {
+        font-style: italic;
+        color: $secondary-text-color-disabled;
+    }
+
+    .red-ui-treeList-label {
+        &.selected, &.selected .red-ui-treeList-sublabel-text {
+            background: inherit;
+        }
+        &.selected, &.selected .red-ui-treeList-sublabel-text {
+            background: inherit;
+        }
+        &.focus, &.focus .red-ui-treeList-sublabel-text {
+            background: $list-item-background-hover !important;
+        }
     }
 }
-
 .red-ui-debug-msg {
     position: relative;
     border-bottom: 1px solid $debug-message-border;