Bump for 1.0.4

Now works correctly in multiple topics mode.
And update tests

.github/ISSUE_TEMPLATE.md

@@ -28,7 +28,7 @@ To help us understand the issue, please fill-in as much of the following informa
 ### Please tell us about your environment:
 
 - [ ] Node-RED version:
-- [ ] node.js version:
+- [ ] Node.js version:
 - [ ] npm version:
 - [ ] Platform/OS:
 - [ ] Browser:

.github/ISSUE_TEMPLATE/--bug_report.md

@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Reproducable software issues in the core of Node-RED
+about: Reproducible software issues in the core of Node-RED
 title: ''
 labels: ''
 assignees: ''
@@ -33,7 +33,7 @@ To help us understand the issue, please fill-in as much of the following informa
 ### Please tell us about your environment:
 
 - [ ] Node-RED version:
-- [ ] node.js version:
+- [ ] Node.js version:
 - [ ] npm version:
 - [ ] Platform/OS:
 - [ ] Browser:

.github/ISSUE_TEMPLATE/-anything-else.md

@@ -7,8 +7,11 @@ assignees: ''
 
 ---
 
-Please use the [Node-RED Forum](https://discourse.nodered.org) or [slack team](https://nodered.org/slack).
+Please DO NOT raise an issue.
 
-You could also consider asking a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/node-red) and tag it `node-red`.
+We DO NOT use the issue tracker for general support or feature requests. Only bug reports should be raised here using the 'Bug report' template.
 
+For general support, please use the [Node-RED Forum](https://discourse.nodered.org) or [slack team](https://nodered.org/slack). You could also consider asking a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/node-red) and tag it `node-red`. 
 That way the whole Node-RED user community can help, rather than rely on the core development team.
+
+For feature requests, please use the Node-RED Forum](https://discourse.nodered.org). Many ideas have already been discussed there and you should search that for your request before starting a new discussion.

.github/PULL_REQUEST_TEMPLATE.md

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

.travis.yml

@@ -9,5 +9,3 @@ matrix:
       before_script:
         - npm install -g istanbul coveralls
     - node_js: "8"
-  allow_failures:
-    - node_js: "12"

CONTRIBUTING.md

@@ -26,7 +26,7 @@ relevant nodes, press Ctrl-E and copy the flow data from the Export dialog.
 At a minimum, please include:
 
  - Version of Node-RED - either release number if you downloaded a zip, or the first few lines of `git log` if you are cloning the repository directly.
- - Version of node.js - what does `node -v` say?
+ - Version of Node.js - what does `node -v` say?
 
 ## Feature requests
 

Gruntfile.js

@@ -16,6 +16,7 @@
 
 var path = require("path");
 var fs = require("fs-extra");
+var sass = require("node-sass");
 
 module.exports = function(grunt) {
 
@@ -25,9 +26,13 @@ module.exports = function(grunt) {
         nodemonArgs.push(flowFile);
     }
 
+    var browserstack = grunt.option('browserstack');
+    if (browserstack) {
+        process.env.BROWSERSTACK = true;
+    }
     var nonHeadless = grunt.option('non-headless');
     if (nonHeadless) {
-        process.env.NODE_RED_NON_HEADLESS = 'true';
+        process.env.NODE_RED_NON_HEADLESS = true;
     }
     grunt.initConfig({
         pkg: grunt.file.readJSON('package.json'),
@@ -79,20 +84,20 @@ module.exports = function(grunt) {
                 //"loopfunc": true, // allow functions to be defined in loops
                 //"sub": true       // don't warn that foo['bar'] should be written as foo.bar
             },
-            all: [
-                'Gruntfile.js',
-                'red.js',
-                'packages/**/*.js'
-            ],
-            core: {
-                files: {
-                    src: [
-                        'Gruntfile.js',
-                        'red.js',
-                        'packages/**/*.js',
-                    ]
-                }
-            },
+            // all: [
+            //     'Gruntfile.js',
+            //     'red.js',
+            //     'packages/**/*.js'
+            // ],
+            // core: {
+            //     files: {
+            //         src: [
+            //             'Gruntfile.js',
+            //             'red.js',
+            //             'packages/**/*.js',
+            //         ]
+            //     }
+            // },
             nodes: {
                 files: {
                     src: [ 'nodes/core/*/*.js' ]
@@ -100,7 +105,7 @@ module.exports = function(grunt) {
             },
             editor: {
                 files: {
-                    src: [ 'editor/js/**/*.js' ]
+                    src: [ 'packages/node_modules/@node-red/editor-client/src/js/**/*.js' ]
                 }
             },
             tests: {
@@ -169,6 +174,7 @@ module.exports = function(grunt) {
                     "packages/node_modules/@node-red/editor-client/src/js/ui/library.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/notifications.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/search.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/actionList.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js",
@@ -187,7 +193,8 @@ module.exports = function(grunt) {
                         "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-migrate-3.0.1.min.js",
                         "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-ui.min.js",
                         "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery.ui.touch-punch.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/marked/marked.min.js",
+                        "node_modules/marked/marked.min.js",
+                        "node_modules/dompurify/dist/purify.min.js",
                         "packages/node_modules/@node-red/editor-client/src/vendor/d3/d3.v3.min.js",
                         "packages/node_modules/@node-red/editor-client/src/vendor/i18next/i18next.min.js",
                         "node_modules/jsonata/jsonata-es5.min.js",
@@ -219,6 +226,7 @@ module.exports = function(grunt) {
         sass: {
             build: {
                 options: {
+                    implementation: sass,
                     outputStyle: 'compressed'
                 },
                 files: [{
@@ -275,7 +283,7 @@ module.exports = function(grunt) {
                 files: [
                     'packages/node_modules/@node-red/editor-client/src/js/**/*.js'
                 ],
-                tasks: ['copy:build','concat','uglify','attachCopyright:js']
+                tasks: ['copy:build','concat',/*'uglify',*/ 'attachCopyright:js']
             },
             sass: {
                 files: [
@@ -495,7 +503,9 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-chmod');
     grunt.loadNpmTasks('grunt-jsonlint');
     grunt.loadNpmTasks('grunt-mocha-istanbul');
-    grunt.loadNpmTasks('grunt-webdriver');
+    if (fs.existsSync(path.join("node_modules", "grunt-webdriver"))) {
+        grunt.loadNpmTasks('grunt-webdriver');
+    }
     grunt.loadNpmTasks('grunt-jsdoc');
     grunt.loadNpmTasks('grunt-jsdoc-to-markdown');
     grunt.loadNpmTasks('grunt-npm-command');
@@ -554,12 +564,25 @@ module.exports = function(grunt) {
     });
 
     grunt.registerTask('verifyUiTestDependencies', function() {
-        if (!fs.existsSync(path.join("node_modules", "chromedriver"))) {
-            grunt.fail.fatal('You need to run "npm install chromedriver@2" before running UI test.');
+        if (!fs.existsSync(path.join("node_modules", "grunt-webdriver"))) {
+            grunt.fail.fatal('You need to install the UI test dependencies first.\nUse the script in "scripts/install-ui-test-dependencies.sh"');
             return false;
         }
     });
+    grunt.registerTask('generatePublishScript',
+        'Generates a script to publish build output to npm',
+            function () {
+                const done = this.async();
+                const generatePublishScript = require("./scripts/generate-publish-script.js");
+                generatePublishScript().then(function(output) {
+                    grunt.log.writeln(output);
 
+                    const filePath = path.join(grunt.config.get('paths.dist'),"modules","publish.sh");
+                    grunt.file.write(filePath,output);
+
+                    done();
+                });
+            });
     grunt.registerTask('setDevEnv',
         'Sets NODE_ENV=development so non-minified assets are used',
             function () {
@@ -578,9 +601,15 @@ module.exports = function(grunt) {
         'Runs code style check on editor code',
         ['jshint:editor']);
 
-    grunt.registerTask('test-ui',
-        'Builds editor content then runs unit tests on editor ui',
-        ['verifyUiTestDependencies','build','jshint:editor','webdriver:all']);
+    if (!fs.existsSync(path.join("node_modules", "grunt-webdriver"))) {
+        grunt.registerTask('test-ui',
+            'Builds editor content then runs unit tests on editor ui',
+            ['verifyUiTestDependencies']);
+    } else {
+        grunt.registerTask('test-ui',
+            'Builds editor content then runs unit tests on editor ui',
+            ['verifyUiTestDependencies','build','jshint:editor','webdriver:all']);
+    }
 
     grunt.registerTask('test-nodes',
         'Runs unit tests on core nodes',
@@ -596,7 +625,7 @@ module.exports = function(grunt) {
 
     grunt.registerTask('release',
         'Create distribution zip file',
-        ['build','verifyPackageDependencies','clean:release','mkdir:release','chmod:release','compress:release','pack-modules']);
+        ['build','verifyPackageDependencies','clean:release','mkdir:release','chmod:release','compress:release','pack-modules','generatePublishScript']);
 
     grunt.registerTask('pack-modules',
         'Create module pack files for release',

README.md

@@ -5,9 +5,9 @@ http://nodered.org
 [![Build Status](https://travis-ci.org/node-red/node-red.svg?branch=master)](https://travis-ci.org/node-red/node-red)
 [![Coverage Status](https://coveralls.io/repos/node-red/node-red/badge.svg?branch=master)](https://coveralls.io/r/node-red/node-red?branch=master)
 
-A visual tool for wiring the Internet of Things.
+Low-code programming for event-driven applications.
 
-![Node-RED: A visual tool for wiring the Internet of Things](http://nodered.org/images/node-red-screenshot.png)
+![Node-RED: Low-code programming for event-driven applications](http://nodered.org/images/node-red-screenshot.png)
 
 ## Quick Start
 
@@ -56,7 +56,7 @@ This project adheres to the [Contributor Covenant 1.4](http://contributor-covena
 
 ## Authors
 
-Node-RED is a project of the [JS Foundation](http://js.foundation).
+Node-RED is a project of the [OpenJS Foundation](https://openjsf.org).
 
 It was created by [IBM Emerging Technology](https://www.ibm.com/blogs/emerging-technology/).
 
@@ -67,4 +67,4 @@ It was created by [IBM Emerging Technology](https://www.ibm.com/blogs/emerging-t
 
 ## Copyright and license
 
-Copyright JS Foundation and other contributors, http://js.foundation under [the Apache 2.0 license](LICENSE).
+Copyright JS Foundation and other contributors, https://openjsf.org under [the Apache 2.0 license](LICENSE).

SECURITY.md

@@ -0,0 +1,13 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 1.0.0   | :white_check_mark: |
+| 0.20.x  | :white_check_mark: |
+
+
+## Reporting a Vulnerability
+
+Please report any potential security issues to `team@nodered.org`. This will notify the core project team who will respond accordingly.

package.json

@@ -1,7 +1,7 @@
 {
     "name": "node-red",
-    "version": "1.0.0-beta.1",
-    "description": "A visual tool for wiring the Internet of Things",
+    "version": "1.0.4",
+    "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
     "repository": {
@@ -24,7 +24,7 @@
         }
     ],
     "dependencies": {
-        "ajv": "6.10.0",
+        "ajv": "6.12.0",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "body-parser": "1.19.0",
@@ -34,85 +34,81 @@
         "cookie": "0.4.0",
         "cookie-parser": "1.4.4",
         "cors": "2.8.5",
-        "cron": "1.7.1",
+        "cron": "1.8.2",
         "denque": "1.4.1",
-        "express": "4.17.0",
-        "express-session": "1.16.1",
-        "fs-extra": "8.0.1",
+        "express": "4.17.1",
+        "express-session": "1.17.0",
+        "fs-extra": "8.1.0",
         "fs.notify": "0.0.4",
-        "hash-sum": "1.0.2",
-        "https-proxy-agent": "2.2.1",
+        "hash-sum": "2.0.0",
+        "https-proxy-agent": "5.0.0",
         "i18next": "15.1.2",
-        "iconv-lite": "0.4.24",
+        "iconv-lite": "0.5.1",
         "is-utf8": "0.2.1",
         "js-yaml": "3.13.1",
         "json-stringify-safe": "5.0.1",
-        "jsonata": "1.6.4",
-        "memorystore": "1.6.1",
-        "mime": "2.4.3",
+        "jsonata": "1.8.1",
+        "media-typer": "1.1.0",
+        "memorystore": "1.6.2",
+        "mime": "2.4.4",
         "mqtt": "2.18.8",
-        "multer": "1.4.1",
-        "mustache": "3.0.1",
-        "node-red-node-email": "^1.4.0",
-        "node-red-node-feedparser": "^0.1.14",
-        "node-red-node-rbe": "^0.2.4",
-        "node-red-node-sentiment": "^0.1.3",
-        "node-red-node-tail": "^0.0.2",
-        "node-red-node-twitter": "^1.1.4",
+        "multer": "1.4.2",
+        "mustache": "4.0.0",
+        "node-red-node-rbe": "^0.2.6",
+        "node-red-node-sentiment": "^0.1.6",
+        "node-red-node-tail": "^0.1.0",
         "nopt": "4.0.1",
         "oauth2orize": "1.11.0",
         "on-headers": "1.0.2",
-        "passport": "0.4.0",
+        "passport": "0.4.1",
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
-        "raw-body": "2.4.0",
+        "raw-body": "2.4.1",
         "request": "2.88.0",
-        "semver": "6.0.0",
-        "uglify-js": "3.5.15",
+        "semver": "6.3.0",
+        "uglify-js": "3.8.0",
         "when": "3.7.8",
         "ws": "6.2.1",
-        "xml2js": "0.4.19"
+        "xml2js": "0.4.23"
     },
     "optionalDependencies": {
         "bcrypt": "3.0.6"
     },
     "devDependencies": {
-        "grunt": "~1.0.3",
+        "marked": "0.8.0",
+        "dompurify": "2.0.8",
+        "grunt": "~1.0.4",
         "grunt-chmod": "~1.1.1",
         "grunt-cli": "~1.3.2",
         "grunt-concurrent": "~2.3.1",
-        "grunt-contrib-clean": "~1.1.0",
-        "grunt-contrib-compress": "~1.4.0",
+        "grunt-contrib-clean": "~2.0.0",
+        "grunt-contrib-compress": "~1.5.0",
         "grunt-contrib-concat": "~1.0.1",
         "grunt-contrib-copy": "~1.0.0",
-        "grunt-contrib-jshint": "~1.1.0",
-        "grunt-contrib-uglify": "~3.4.0",
+        "grunt-contrib-jshint": "~2.1.0",
+        "grunt-contrib-uglify": "~4.0.1",
         "grunt-contrib-watch": "~1.1.0",
         "grunt-jsdoc": "^2.2.1",
         "grunt-jsdoc-to-markdown": "^4.0.0",
-        "grunt-jsonlint": "~1.1.0",
+        "grunt-jsonlint": "~2.0.0",
         "grunt-mkdir": "~1.0.0",
         "grunt-mocha-istanbul": "5.0.2",
         "grunt-nodemon": "~0.4.2",
         "grunt-npm-command": "~0.1.2",
-        "grunt-sass": "~2.0.0",
+        "grunt-sass": "~3.1.0",
         "grunt-simple-mocha": "~0.4.1",
-        "grunt-webdriver": "^2.0.3",
-        "http-proxy": "^1.16.2",
+        "http-proxy": "1.18.0",
         "istanbul": "0.4.5",
+        "jsdoc-nr-template": "github:node-red/jsdoc-nr-template",
         "minami": "1.2.3",
         "mocha": "^5.2.0",
         "mosca": "^2.8.3",
+        "node-red-node-test-helper": "^0.2.3",
+        "node-sass": "^4.13.1",
         "should": "^8.4.0",
         "sinon": "1.17.7",
         "stoppable": "^1.1.0",
-        "supertest": "3.4.2",
-        "wdio-chromedriver-service": "^0.1.5",
-        "wdio-mocha-framework": "^0.6.4",
-        "wdio-spec-reporter": "^0.1.5",
-        "webdriverio": "^4.14.1",
-        "node-red-node-test-helper": "^0.2.2",
-        "jsdoc-nr-template": "node-red/jsdoc-nr-template"
+        "supertest": "3.4.2"
     },
     "engines": {
         "node": ">=8"

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

@@ -30,7 +30,8 @@ module.exports = {
             scope: req.params.scope,
             id: req.params.id,
             key: req.params[0],
-            store: req.query['store']
+            store: req.query['store'],
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.context.getValue(opts).then(function(result) {
             res.json(result);
@@ -45,7 +46,8 @@ module.exports = {
             scope: req.params.scope,
             id: req.params.id,
             key: req.params[0],
-            store: req.query['store']
+            store: req.query['store'],
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.context.delete(opts).then(function(result) {
             res.status(204).end();

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

@@ -24,7 +24,8 @@ module.exports = {
     get: function(req,res) {
         var opts = {
             user: req.user,
-            id: req.params.id
+            id: req.params.id,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.flows.getFlow(opts).then(function(result) {
             return res.json(result);
@@ -35,7 +36,8 @@ module.exports = {
     post: function(req,res) {
         var opts = {
             user: req.user,
-            flow: req.body
+            flow: req.body,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.flows.addFlow(opts).then(function(id) {
             return res.json({id:id});
@@ -47,7 +49,8 @@ module.exports = {
         var opts = {
             user: req.user,
             id: req.params.id,
-            flow: req.body
+            flow: req.body,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.flows.updateFlow(opts).then(function(id) {
             return res.json({id:id});
@@ -58,7 +61,8 @@ module.exports = {
     delete: function(req,res) {
         var opts = {
             user: req.user,
-            id: req.params.id
+            id: req.params.id,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.flows.deleteFlow(opts).then(function() {
             res.status(204).end();

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

@@ -27,7 +27,8 @@ module.exports = {
             return res.status(400).json({code:"invalid_api_version", message:"Invalid API Version requested"});
         }
         var opts = {
-            user: req.user
+            user: req.user,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.flows.getFlows(opts).then(function(result) {
             if (version === "v1") {
@@ -46,7 +47,8 @@ module.exports = {
         }
         var opts = {
             user: req.user,
-            deploymentType: req.get("Node-RED-Deployment-Type")||"full"
+            deploymentType: req.get("Node-RED-Deployment-Type")||"full",
+            req: apiUtils.getRequestLogObject(req)
         }
 
         if (opts.deploymentType !== 'reload') {

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

@@ -48,13 +48,13 @@ module.exports = {
         // Nodes
         adminApp.get("/nodes",needsPermission("nodes.read"),nodes.getAll,apiUtil.errorHandler);
         adminApp.post("/nodes",needsPermission("nodes.write"),nodes.post,apiUtil.errorHandler);
-        adminApp.get(/\/nodes\/messages/,needsPermission("nodes.read"),nodes.getModuleCatalogs,apiUtil.errorHandler);
-        adminApp.get(/\/nodes\/((@[^\/]+\/)?[^\/]+\/[^\/]+)\/messages/,needsPermission("nodes.read"),nodes.getModuleCatalog,apiUtil.errorHandler);
-        adminApp.get(/\/nodes\/((@[^\/]+\/)?[^\/]+)$/,needsPermission("nodes.read"),nodes.getModule,apiUtil.errorHandler);
-        adminApp.put(/\/nodes\/((@[^\/]+\/)?[^\/]+)$/,needsPermission("nodes.write"),nodes.putModule,apiUtil.errorHandler);
-        adminApp.delete(/\/nodes\/((@[^\/]+\/)?[^\/]+)$/,needsPermission("nodes.write"),nodes.delete,apiUtil.errorHandler);
-        adminApp.get(/\/nodes\/((@[^\/]+\/)?[^\/]+)\/([^\/]+)$/,needsPermission("nodes.read"),nodes.getSet,apiUtil.errorHandler);
-        adminApp.put(/\/nodes\/((@[^\/]+\/)?[^\/]+)\/([^\/]+)$/,needsPermission("nodes.write"),nodes.putSet,apiUtil.errorHandler);
+        adminApp.get(/^\/nodes\/messages/,needsPermission("nodes.read"),nodes.getModuleCatalogs,apiUtil.errorHandler);
+        adminApp.get(/^\/nodes\/((@[^\/]+\/)?[^\/]+\/[^\/]+)\/messages/,needsPermission("nodes.read"),nodes.getModuleCatalog,apiUtil.errorHandler);
+        adminApp.get(/^\/nodes\/((@[^\/]+\/)?[^\/]+)$/,needsPermission("nodes.read"),nodes.getModule,apiUtil.errorHandler);
+        adminApp.put(/^\/nodes\/((@[^\/]+\/)?[^\/]+)$/,needsPermission("nodes.write"),nodes.putModule,apiUtil.errorHandler);
+        adminApp.delete(/^\/nodes\/((@[^\/]+\/)?[^\/]+)$/,needsPermission("nodes.write"),nodes.delete,apiUtil.errorHandler);
+        adminApp.get(/^\/nodes\/((@[^\/]+\/)?[^\/]+)\/([^\/]+)$/,needsPermission("nodes.read"),nodes.getSet,apiUtil.errorHandler);
+        adminApp.put(/^\/nodes\/((@[^\/]+\/)?[^\/]+)\/([^\/]+)$/,needsPermission("nodes.write"),nodes.putSet,apiUtil.errorHandler);
 
         // Context
         adminApp.get("/context/:scope(global)",needsPermission("context.read"),context.get,apiUtil.errorHandler);

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

@@ -24,7 +24,8 @@ module.exports = {
     },
     getAll: function(req,res) {
         var opts = {
-            user: req.user
+            user: req.user,
+            req: apiUtils.getRequestLogObject(req)
         }
         if (req.get("accept") == "application/json") {
             runtimeAPI.nodes.getNodeList(opts).then(function(list) {
@@ -42,7 +43,8 @@ module.exports = {
         var opts = {
             user: req.user,
             module: req.body.module,
-            version: req.body.version
+            version: req.body.version,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.addModule(opts).then(function(info) {
             res.json(info);
@@ -54,7 +56,8 @@ module.exports = {
     delete: function(req,res) {
         var opts = {
             user: req.user,
-            module: req.params[0]
+            module: req.params[0],
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.removeModule(opts).then(function() {
             res.status(204).end();
@@ -66,7 +69,8 @@ module.exports = {
     getSet: function(req,res) {
         var opts = {
             user: req.user,
-            id: req.params[0] + "/" + req.params[2]
+            id: req.params[0] + "/" + req.params[2],
+            req: apiUtils.getRequestLogObject(req)
         }
         if (req.get("accept") === "application/json") {
             runtimeAPI.nodes.getNodeInfo(opts).then(function(result) {
@@ -87,7 +91,8 @@ module.exports = {
     getModule: function(req,res) {
         var opts = {
             user: req.user,
-            module: req.params[0]
+            module: req.params[0],
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.getModuleInfo(opts).then(function(result) {
             res.send(result);
@@ -106,7 +111,8 @@ module.exports = {
         var opts = {
             user: req.user,
             id: req.params[0] + "/" + req.params[2],
-            enabled: body.enabled
+            enabled: body.enabled,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.setNodeSetState(opts).then(function(result) {
             res.send(result);
@@ -125,7 +131,8 @@ module.exports = {
         var opts = {
             user: req.user,
             module: req.params[0],
-            enabled: body.enabled
+            enabled: body.enabled,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.setModuleState(opts).then(function(result) {
             res.send(result);
@@ -139,7 +146,8 @@ module.exports = {
         var opts = {
             user: req.user,
             module: req.params[0],
-            lang: req.query.lng
+            lang: req.query.lng,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.getModuleCatalog(opts).then(function(result) {
             res.json(result);
@@ -152,7 +160,8 @@ module.exports = {
     getModuleCatalogs: function(req,res) {
         var opts = {
             user: req.user,
-            lang: req.query.lng
+            lang: req.query.lng,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.getModuleCatalogs(opts).then(function(result) {
             res.json(result);
@@ -164,7 +173,8 @@ module.exports = {
 
     getIcons: function(req,res) {
         var opts = {
-            user: req.user
+            user: req.user,
+            req: apiUtils.getRequestLogObject(req)
         }
         runtimeAPI.nodes.getIconList(opts).then(function(list) {
             res.json(list);

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

@@ -100,7 +100,10 @@ function login(req,res) {
             }
         } else if (mergedAdminAuth.type === "strategy") {
 
-            var urlPrefix = (settings.httpAdminRoot==='/')?"":settings.httpAdminRoot;
+            var urlPrefix = (settings.httpAdminRoot||"").replace(/\/$/,"");
+            if (urlPrefix.length > 0) {
+                urlPrefix += "/";
+            }
             response = {
                 "type":"strategy",
                 "prompts":[{type:"button",label:mergedAdminAuth.strategy.label, url: urlPrefix + "auth/strategy"}]

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

@@ -56,7 +56,7 @@ function expireSessions() {
     }
     if (nextExpiry < Number.MAX_SAFE_INTEGER) {
         // Allow 5 seconds grace
-        expiryTimeout = setTimeout(expireSessions,(nextExpiry - Date.now()) + 5000)
+        expiryTimeout = setTimeout(expireSessions,Math.min(2147483647,(nextExpiry - Date.now()) + 5000))
     }
     if (modified) {
         return storage.saveSessions(sessions);
@@ -129,7 +129,7 @@ module.exports = {
             sessions[accessToken] = session;
 
             if (!expiryTimeout) {
-                expiryTimeout = setTimeout(expireSessions,(accessTokenExpiresAt - Date.now()) + 5000)
+                expiryTimeout = setTimeout(expireSessions,Math.min(2147483647,(accessTokenExpiresAt - Date.now()) + 5000))
             }
 
             return storage.saveSessions(sessions).then(function() {

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

@@ -88,13 +88,13 @@ module.exports = {
             // Locales
             var locales = require("./locales");
             locales.init(runtimeAPI);
-            editorApp.get(/locales\/(.+)\/?$/,locales.get,apiUtil.errorHandler);
+            editorApp.get(/^\/locales\/(.+)\/?$/,locales.get,apiUtil.errorHandler);
 
             // Library
             var library = require("./library");
             library.init(runtimeAPI);
-            editorApp.get(/library\/([^\/]+)\/([^\/]+)(?:$|\/(.*))/,needsPermission("library.read"),library.getEntry);
-            editorApp.post(/library\/([^\/]+)\/([^\/]+)\/(.*)/,needsPermission("library.write"),library.saveEntry);
+            editorApp.get(/^\/library\/([^\/]+)\/([^\/]+)(?:$|\/(.*))/,needsPermission("library.read"),library.getEntry);
+            editorApp.post(/^\/library\/([^\/]+)\/([^\/]+)\/(.*)/,needsPermission("library.write"),library.saveEntry);
 
 
             // Credentials

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

@@ -15,7 +15,7 @@
  **/
 var fs = require('fs');
 var path = require('path');
-//var apiUtil = require('../util');
+// var apiUtil = require('../util');
 
 var i18n = require("@node-red/util").i18n; // TODO: separate module
 
@@ -41,7 +41,7 @@ module.exports = {
         var namespace = req.params[0];
         var lngs = req.query.lng;
         namespace = namespace.replace(/\.json$/,"");
-        var lang = req.query.lng; //apiUtil.determineLangFromHeaders(req.acceptsLanguages() || []);
+        var lang = req.query.lng || i18n.defaultLang; //apiUtil.determineLangFromHeaders(req.acceptsLanguages() || []);
         var prevLang = i18n.i.language;
         // Trigger a load from disk of the language if it is not the default
         i18n.i.changeLanguage(lang, function(){

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

@@ -22,7 +22,8 @@ var needsPermission = require("../auth").needsPermission;
 
 function listProjects(req,res) {
     var opts = {
-        user: req.user
+        user: req.user,
+        req: apiUtils.getRequestLogObject(req)
     }
     runtimeAPI.projects.listProjects(opts).then(function(result) {
         res.json(result);
@@ -33,7 +34,8 @@ function listProjects(req,res) {
 function getProject(req,res) {
     var opts = {
         user: req.user,
-        id: req.params.id
+        id: req.params.id,
+        req: apiUtils.getRequestLogObject(req)
     }
     runtimeAPI.projects.getProject(opts).then(function(data) {
         if (data) {
@@ -49,7 +51,8 @@ function getProjectStatus(req,res) {
     var opts = {
         user: req.user,
         id: req.params.id,
-        remote: req.query.remote
+        remote: req.query.remote,
+        req: apiUtils.getRequestLogObject(req)
     }
     runtimeAPI.projects.getStatus(opts).then(function(data){
         if (data) {
@@ -64,7 +67,8 @@ function getProjectStatus(req,res) {
 function getProjectRemotes(req,res) {
     var opts = {
         user: req.user,
-        id: req.params.id
+        id: req.params.id,
+        req: apiUtils.getRequestLogObject(req)
     }
     runtimeAPI.projects.getRemotes(opts).then(function(data) {
         res.json(data);
@@ -98,7 +102,8 @@ module.exports = {
         app.post("/", needsPermission("projects.write"), function(req,res) {
             var opts = {
                 user: req.user,
-                project: req.body
+                project: req.body,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.createProject(opts).then(function(result) {
                 res.json(result);
@@ -112,7 +117,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                project: req.body
+                project: req.body,
+                req: apiUtils.getRequestLogObject(req)
             }
 
             if (req.body.active) {
@@ -150,7 +156,8 @@ module.exports = {
         app.delete("/:id", needsPermission("projects.write"), function(req,res) {
             var opts = {
                 user: req.user,
-                id: req.params.id
+                id: req.params.id,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.deleteProject(opts).then(function() {
                 res.status(204).end();
@@ -168,7 +175,8 @@ module.exports = {
         app.get("/:id/files", needsPermission("projects.read"), function(req,res) {
             var opts = {
                 user: req.user,
-                id: req.params.id
+                id: req.params.id,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getFiles(opts).then(function(data) {
                 res.json(data);
@@ -185,7 +193,8 @@ module.exports = {
                 user: req.user,
                 id: req.params.id,
                 path: req.params[0],
-                tree: req.params.treeish
+                tree: req.params.treeish,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getFile(opts).then(function(data) {
                 res.json({content:data});
@@ -199,7 +208,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                path: req.params[0]
+                path: req.params[0],
+                req: apiUtils.getRequestLogObject(req)
             }
 
             runtimeAPI.projects.revertFile(opts).then(function() {
@@ -214,7 +224,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                path: req.params[0]
+                path: req.params[0],
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.stageFile(opts).then(function() {
                 getProjectStatus(req,res);
@@ -228,7 +239,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                path: req.body.files
+                path: req.body.files,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.stageFile(opts).then(function() {
                 getProjectStatus(req,res);
@@ -242,7 +254,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                message: req.body.message
+                message: req.body.message,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.commit(opts).then(function() {
                 getProjectStatus(req,res);
@@ -256,7 +269,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                path: req.params[0]
+                path: req.params[0],
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.unstageFile(opts).then(function() {
                 getProjectStatus(req,res);
@@ -269,7 +283,8 @@ module.exports = {
         app.delete("/:id/stage", needsPermission("projects.write"), function(req, res) {
             var opts = {
                 user: req.user,
-                id: req.params.id
+                id: req.params.id,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.unstageFile(opts).then(function() {
                 getProjectStatus(req,res);
@@ -284,7 +299,8 @@ module.exports = {
                 user: req.user,
                 id: req.params.id,
                 path: req.params[0],
-                type: req.params.type
+                type: req.params.type,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getFileDiff(opts).then(function(data) {
                 res.json({
@@ -301,7 +317,8 @@ module.exports = {
                 user: req.user,
                 id: req.params.id,
                 limit: req.query.limit || 20,
-                before: req.query.before
+                before: req.query.before,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getCommits(opts).then(function(data) {
                 res.json(data);
@@ -315,7 +332,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                sha: req.params.sha
+                sha: req.params.sha,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getCommit(opts).then(function(data) {
                 res.json({commit:data});
@@ -330,7 +348,8 @@ module.exports = {
                 user: req.user,
                 id: req.params.id,
                 remote: req.params[0],
-                track: req.query.u
+                track: req.query.u,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.push(opts).then(function(data) {
                 res.status(204).end();
@@ -346,7 +365,8 @@ module.exports = {
                 id: req.params.id,
                 remote: req.params[0],
                 track: req.query.setUpstream,
-                allowUnrelatedHistories: req.query.allowUnrelatedHistories
+                allowUnrelatedHistories: req.query.allowUnrelatedHistories,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.pull(opts).then(function(data) {
                 res.status(204).end();
@@ -359,7 +379,8 @@ module.exports = {
         app.delete("/:id/merge", needsPermission("projects.write"), function(req, res) {
             var opts = {
                 user: req.user,
-                id: req.params.id
+                id: req.params.id,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.abortMerge(opts).then(function() {
                 res.status(204).end();
@@ -374,7 +395,8 @@ module.exports = {
                 user: req.user,
                 id: req.params.id,
                 path: req.params[0],
-                resolution: req.body.resolutions
+                resolution: req.body.resolutions,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.resolveMerge(opts).then(function() {
                 res.status(204).end();
@@ -388,7 +410,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                remote: false
+                remote: false,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getBranches(opts).then(function(data) {
                 res.json(data);
@@ -403,7 +426,8 @@ module.exports = {
                 user: req.user,
                 id: req.params.id,
                 branch: req.params.branchName,
-                force: !!req.query.force
+                force: !!req.query.force,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.deleteBranch(opts).then(function(data) {
                 res.status(204).end();
@@ -417,7 +441,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                remote: true
+                remote: true,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getBranches(opts).then(function(data) {
                 res.json(data);
@@ -431,7 +456,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                branch: req.params[0]
+                branch: req.params[0],
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.getBranchStatus(opts).then(function(data) {
                 res.json(data);
@@ -446,7 +472,8 @@ module.exports = {
                 user: req.user,
                 id: req.params.id,
                 branch: req.body.name,
-                create: req.body.create
+                create: req.body.create,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.setBranch(opts).then(function(data) {
                 res.json(data);
@@ -463,7 +490,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                remote: req.body
+                remote: req.body,
+                req: apiUtils.getRequestLogObject(req)
             }
             if (/^https?:\/\/[^/]+@/i.test(req.body.url)) {
                 res.status(400).json({error:"unexpected_error", message:"Git http url must not include username/password"});
@@ -481,7 +509,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                remote: req.params.remoteName
+                remote: req.params.remoteName,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.removeRemote(opts).then(function(data) {
                 getProjectRemotes(req,res);
@@ -497,7 +526,8 @@ module.exports = {
             var opts = {
                 user: req.user,
                 id: req.params.id,
-                remote: remote
+                remote: remote,
+                req: apiUtils.getRequestLogObject(req)
             }
             runtimeAPI.projects.updateRemote(opts).then(function() {
                 res.status(204).end();

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

@@ -28,7 +28,7 @@ var defaultContext = {
     },
     header: {
         title: "Node-RED",
-        image: "red/images/node-red.png"
+        image: "red/images/node-red.svg"
     },
     asset: {
         red: (process.env.NODE_ENV == "development")? "red/red.js":"red/red.min.js",

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

@@ -25,7 +25,7 @@ var theme = require("./theme");
 
 var runtimeAPI;
 var editorClientDir = path.dirname(require.resolve("@node-red/editor-client"));
-var defaultNodeIcon = path.join(editorClientDir,"public","red","images","icons","arrow-in.png");
+var defaultNodeIcon = path.join(editorClientDir,"public","red","images","icons","arrow-in.svg");
 var editorTemplatePath = path.join(editorClientDir,"templates","index.mst");
 var editorTemplate;
 

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

@@ -42,7 +42,7 @@ var editor;
 /**
  * Initialise the module.
  * @param  {Object}     settings   The runtime settings
- * @param  {HTTPServer} server     An instance of HTTP Server
+ * @param  {HTTPServer} _server     An instance of HTTP Server
  * @param  {Storage}    storage    An instance of Node-RED Storage
  * @param  {Runtime}    runtimeAPI An instance of Node-RED Runtime
  * @memberof @node-red/editor-api

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

@@ -47,5 +47,12 @@ module.exports = {
             code: err.code||"unexpected_error",
             message: err.message||err.toString()
         });
+    },
+    getRequestLogObject: function(req) {
+        return {
+            user: req.user,
+            path: req.path,
+            ip: (req.headers && req.headers['x-forwarded-for']) || (req.connection && req.connection.remoteAddress) || undefined
+        }
     }
 }

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "1.0.0-beta.1",
+    "version": "1.0.4",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,25 +16,25 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "1.0.0-beta.1",
-        "@node-red/editor-client": "1.0.0-beta.1",
+        "@node-red/util": "1.0.4",
+        "@node-red/editor-client": "1.0.4",
         "bcryptjs": "2.4.3",
         "body-parser": "1.19.0",
         "clone": "2.1.2",
         "cors": "2.8.5",
-        "express-session": "1.16.1",
-        "express": "4.17.0",
-        "memorystore": "1.6.1",
-        "mime": "2.4.3",
-        "mustache": "3.0.1",
+        "express-session": "1.17.0",
+        "express": "4.17.1",
+        "memorystore": "1.6.2",
+        "mime": "2.4.4",
+        "mustache": "4.0.0",
         "oauth2orize": "1.11.0",
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
-        "passport": "0.4.0",
+        "passport": "0.4.1",
         "when": "3.7.8",
         "ws": "6.2.1"
     },
     "optionalDependencies": {
-        "bcrypt": "3.0.5"
+        "bcrypt": "3.0.6"
     }
 }

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

@@ -26,8 +26,7 @@
     "status" : "Status",
     "enabled" : "Aktiviert",
     "disabled" : "Inaktiviert",
-    "info" : "Beschreibung",
-    "tip" : "Beschreibung akzeptiert Markdown und wird auf der Registerkarte Info angezeigt."
+    "info" : "Beschreibung"
   },
   "menu" : {
     "label" : {
@@ -237,7 +236,6 @@
     "deleteSubflow" : "Subflow löschen",
     "info" : "Beschreibung",
     "category" : "Kategorie",
-    "format" : "Markdown-Format",
     "errors" : {
       "noNodesSelected" : "<strong> Subflow kann nicht erstellt werden </strong>: Es wurden keine Nodes ausgewählt.",
       "multipleInputsToSelection" : "<strong> Subflow kann nicht erstellt werden </strong>: Mehrere Eingaben zur Auswahl"
@@ -446,8 +444,8 @@
       "none" : "keine",
       "subflows" : "Subflows",
       "flows" : "Flows",
-      "filterUnused" : "Nicht verwendet",
       "filterAll" : "alle",
+      "filterUnused" : "Nicht verwendet",
       "filtered" : "__count__ verdeckt"
     },
     "context" : {

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

@@ -15,6 +15,17 @@
             "next": "Next",
             "clone": "Clone project",
             "cont": "Continue"
+        },
+        "type": {
+            "string": "string",
+            "number": "number",
+            "boolean": "boolean",
+            "array": "array",
+            "buffer": "buffer",
+            "object": "object",
+            "jsonString": "JSON string",
+            "undefined": "undefined",
+            "null": "null"
         }
     },
     "workspace": {
@@ -310,10 +321,12 @@
         "addNewType": "Add new __type__...",
         "nodeProperties": "node properties",
         "label": "Label",
+        "color": "Color",
         "portLabels": "Port labels",
         "labelInputs": "Inputs",
         "labelOutputs": "Outputs",
         "settingIcon": "Icon",
+        "default": "default",
         "noDefaultLabel": "none",
         "defaultLabel": "use default label",
         "searchIcons": "Search icons",
@@ -321,6 +334,40 @@
         "description": "Description",
         "show": "Show",
         "hide": "Hide",
+        "locale": "Select UI Language",
+        "icon": "Icon",
+        "inputType": "Input type",
+        "inputs" : {
+            "input": "input",
+            "select": "select",
+            "checkbox": "checkbox",
+            "spinner": "spinner",
+            "none": "none",
+            "hidden": "hide property"
+        },
+        "types": {
+            "str": "string",
+            "num": "number",
+            "bool": "bool",
+            "json": "JSON",
+            "bin": "buffer",
+            "env": "env variable"
+        },
+        "menu": {
+            "input": "input",
+            "select": "select",
+            "checkbox": "checkbox",
+            "spinner": "spinner",
+            "hidden": "label only"
+        },
+        "select": {
+            "label": "Label",
+            "value": "Value"
+        },
+        "spinner": {
+            "min": "Minimum",
+            "max": "Maximum"
+        },
         "errors": {
             "scopeChange": "Changing the scope will make it unavailable to nodes in other flows that use it",
             "invalidProperties": "Invalid properties:"
@@ -351,7 +398,8 @@
         "pasteNode": "Paste nodes",
         "undoChange": "Undo the last change performed",
         "searchBox": "Open search box",
-        "managePalette": "Manage palette"
+        "managePalette": "Manage palette",
+        "actionList":"Action list"
     },
     "library": {
         "library": "Library",
@@ -365,6 +413,7 @@
         "savedNodes": "Saved nodes",
         "savedType": "Saved __type__",
         "saveFailed": "Save failed: __message__",
+        "newFolder": "New folder",
         "types": {
             "local": "Local",
             "examples": "Examples"
@@ -377,9 +426,13 @@
         "addCategory": "Add new...",
         "label": {
             "subflows": "subflows",
+            "network": "network",
+            "common": "common",
             "input": "input",
             "output": "output",
             "function": "function",
+            "sequence": "sequence",
+            "parser": "parser",
             "social": "social",
             "storage": "storage",
             "analysis": "analysis",
@@ -516,8 +569,10 @@
             "none": "none",
             "subflows": "subflows",
             "flows": "flows",
-            "filterUnused":"unused",
-            "filterAll":"all",
+            "filterAll": "all",
+            "showAllConfigNodes": "Show all config nodes",
+            "filterUnused": "unused",
+            "showAllUnusedConfigNodes": "Show all unused config nodes",
             "filtered": "__count__ hidden"
         },
         "context": {
@@ -530,7 +585,9 @@
             "flow": "Flow",
             "global": "Global",
             "deleteConfirm": "Are you sure you want to delete this item?",
-            "autoRefresh": "Auto-refresh"
+            "autoRefresh": "Refresh on selection change",
+            "refrsh": "Refresh",
+            "delete": "Delete"
         },
         "palette": {
             "name": "Palette management",
@@ -545,6 +602,7 @@
             "noSummaryAvailable": "No summary available",
             "editDescription": "Edit project description",
             "editDependencies": "Edit project dependencies",
+            "noDescriptionAvailable": "No description available",
             "editReadme": "Edit README.md",
             "showProjectSettings": "Show project settings",
             "projectSettings": {
@@ -736,10 +794,23 @@
     },
     "jsonEditor": {
         "title": "JSON editor",
-        "format": "format JSON"
+        "format": "format JSON",
+        "rawMode": "Edit JSON",
+        "uiMode": "Visual editor",
+        "insertAbove": "Insert above",
+        "insertBelow": "Insert below",
+        "addItem": "Add item",
+        "copyPath": "Copy path to item",
+        "expandItems": "Expand items",
+        "collapseItems": "Collapse items",
+        "duplicate": "Duplicate",
+	"error": {
+	    "invalidJSON": "Invalid JSON: "
+	}
     },
     "markdownEditor": {
         "title": "Markdown editor",
+        "expand": "Expand",
         "format": "Formatted with markdown",
         "heading1": "Heading 1",
         "heading2": "Heading 2",
@@ -926,8 +997,18 @@
     },
     "editor-tab": {
         "properties": "Properties",
+        "envProperties": "Environment Variables",
         "description": "Description",
         "appearance": "Appearance",
-        "env": "Environment Variables"
+        "preview": "UI Preview",
+        "defaultValue": "Default value"
+    },
+    "languages" : {
+        "de": "German",
+        "en-US": "English",
+        "ja": "Japanese",
+        "ko": "Korean",
+        "zh-CN": "Chinese(Simplified)",
+        "zh-TW": "Chinese(Traditional)"
     }
 }

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

@@ -1,7 +1,7 @@
 {
     "$string": {
-        "args": "arg",
-        "desc": "Casts the *arg* parameter to a string using the following casting rules:\n\n - Strings are unchanged\n - Functions are converted to an empty string\n - Numeric infinity and NaN throw an error because they cannot be represented as a JSON number\n - All other values are converted to a JSON string using the `JSON.stringify` function"
+        "args": "arg[, prettify]",
+        "desc": "Casts the `arg` parameter to a string using the following casting rules:\n\n - Strings are unchanged\n - Functions are converted to an empty string\n - Numeric infinity and NaN throw an error because they cannot be represented as a JSON number\n - All other values are converted to a JSON string using the `JSON.stringify` function.  If `prettify` is true, then \"prettified\" JSON is produced. i.e One line per field and lines will be indented based on the field depth."
     },
     "$length": {
         "args": "str",
@@ -185,7 +185,7 @@
     },
     "$reduce": {
         "args":"array, function [, init]",
-        "desc":"Returns an aggregated value derived from applying the `function` parameter successively to each value in `array` in combination with the result of the previous application of the function.\n\nThe function must accept two arguments, and behaves like an infix operator between each value within the `array`.\n\nThe optional `init` parameter is used as the initial value in the aggregation."
+        "desc":"Returns an aggregated value derived from applying the `function` parameter successively to each value in `array` in combination with the result of the previous application of the function.\n\nThe function must accept two arguments, and behaves like an infix operator between each value within the `array`. The signature of `function` must be of the form: `myfunc($accumulator, $value[, $index[, $array]])`\n\nThe optional `init` parameter is used as the initial value in the aggregation."
     },
     "$flowContext": {
         "args": "string[, string]",
@@ -230,6 +230,41 @@
     "$parseInteger": {
         "args": "string, picture",
         "desc": "Parses the contents of the `string` parameter to an integer (as a JSON number) using the format specified by the `picture` string. The `picture` string parameter has the same format as `$formatInteger`."
-
+    },
+    "$error": {
+        "args": "[str]",
+        "desc": "Throws an error with a message.  The optional `str` will replace the default message of `$error() function evaluated`"
+    },
+    "$assert": {
+        "args": "arg, str",
+        "desc": "If `arg` is true the function returns undefined.  If `arg` is false an exception is thrown with `str` as the message of the exception."
+    },
+    "$single": {
+        "args": "array, function",
+        "desc": "Returns the one and only value in the `array` parameter that satisfies the `function` predicate (i.e. the `function` returns Boolean `true` when passed the value).  Throws an exception if the number of matching values is not exactly one.\n\nThe function should be supplied in the following signature: `function(value [, index [, array]])` where value is each input of the array, index is the position of that value and the whole array is passed as the third argument"
+    },
+    "$encodeUrl": {
+        "args": "str",
+        "desc": "Encodes a Uniform Resource Locator (URL) component by replacing each instance of certain characters by one, two, three, or four escape sequences representing the UTF-8 encoding of the character.\n\nExample: `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
+    },
+    "$encodeUrlComponent": {
+        "args": "str",
+        "desc": "Encodes a Uniform Resource Locator (URL) by replacing each instance of certain characters by one, two, three, or four escape sequences representing the UTF-8 encoding of the character. \n\nExample: `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
+    },
+    "$decodeUrl": {
+        "args": "str",
+        "desc": "Decodes a Uniform Resource Locator (URL) component previously created by encodeUrlComponent. \n\nExample: `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
+    },
+    "$decodeUrlComponent": {
+        "args": "str",
+        "desc": "Decodes a Uniform Resource Locator (URL) previously created by encodeUrl. \n\nExample: `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
+    },
+    "$distinct": {
+        "args": "array",
+        "desc": "Returns an array with duplicate values removed from `array`"
+    },
+    "$type": {
+        "args": "value",
+        "desc": "Returns the type of `value` as a string. If `value` is undefined, this will return `undefined`"
     }
 }

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

@@ -15,6 +15,17 @@
             "next": "進む",
             "clone": "プロジェクトをクローン",
             "cont": "続ける"
+        },
+        "type": {
+            "string": "文字列",
+            "number": "数値",
+            "boolean": "真偽値",
+            "array": "配列",
+            "buffer": "バッファ",
+            "object": "オブジェクト",
+            "jsonString": "JSON文字列",
+            "undefined": "undefined",
+            "null": "null"
         }
     },
     "workspace": {
@@ -28,7 +39,8 @@
         "status": "状態",
         "enabled": "有効",
         "disabled": "無効",
-        "info": "詳細"
+        "info": "詳細",
+        "selectNodes": "ノードをクリックして選択"
     },
     "menu": {
         "label": {
@@ -42,7 +54,9 @@
                 "defaultDir": "標準",
                 "ltr": "左から右",
                 "rtl": "右から左",
-                "auto": "文脈"
+                "auto": "文脈",
+                "language": "表示言語",
+                "browserDefault": "ブラウザのデフォルト"
             },
             "sidebar": {
                 "show": "サイドバーを表示"
@@ -77,7 +91,7 @@
             "projects-new": "新規",
             "projects-open": "開く",
             "projects-settings": "設定",
-            "showNodeLabelDefault": "追加したノードのラベルを表示する"
+            "showNodeLabelDefault": "追加したノードのラベルを表示"
         }
     },
     "actions": {
@@ -179,7 +193,11 @@
             "all": "全てのタブ",
             "compact": "インデントのないJSONフォーマット",
             "formatted": "インデント付きのJSONフォーマット",
-            "copy": "書き出し"
+            "copy": "書き出し",
+            "export": "ライブラリに書き出し",
+            "exportAs": "書き出し先",
+            "overwrite": "更新",
+            "exists": "<p><b>\"__file__\"</b>は既に存在します。</p><p>更新しますか?</p>"
         },
         "import": {
             "import": "読み込み先",
@@ -303,10 +321,12 @@
         "addNewType": "新規に __type__ を追加...",
         "nodeProperties": "プロパティ",
         "label": "ラベル",
+        "color": "色",
         "portLabels": "ポートラベル",
         "labelInputs": "入力",
         "labelOutputs": "出力",
         "settingIcon": "アイコン",
+        "default": "デフォルト",
         "noDefaultLabel": "なし",
         "defaultLabel": "既定のラベルを使用",
         "searchIcons": "アイコンを検索",
@@ -314,8 +334,43 @@
         "description": "詳細",
         "show": "表示",
         "hide": "非表示",
+        "locale": "UI言語の選択",
+        "icon": "記号",
+        "inputType": "入力形式",
+        "inputs": {
+            "input": "入力",
+            "select": "メニュー",
+            "checkbox": "チェックボックス",
+            "spinner": "スピナー",
+            "none": "無し",
+            "hidden": "非表示"
+        },
+        "types": {
+            "str": "文字列",
+            "num": "数値",
+            "bool": "真偽",
+            "json": "JSON",
+            "bin": "バッファ",
+            "env": "環境変数"
+        },
+        "menu": {
+            "input": "入力",
+            "select": "選択",
+            "checkbox": "チェックボックス",
+            "spinner": "数値",
+            "hidden": "ラベルのみ"
+        },
+        "select": {
+            "label": "ラベル",
+            "value": "値"
+        },
+        "spinner": {
+            "min": "最小値",
+            "max": "最大値"
+        },
         "errors": {
-            "scopeChange": "スコープの変更は、他のフローで使われているノードを無効にします"
+            "scopeChange": "スコープの変更は、他のフローで使われているノードを無効にします",
+            "invalidProperties": "プロパティが不正です:"
         }
     },
     "keyboard": {
@@ -343,7 +398,8 @@
         "pasteNode": "ノードを貼り付け",
         "undoChange": "変更操作を戻す",
         "searchBox": "ノードを検索",
-        "managePalette": "パレットの管理"
+        "managePalette": "パレットの管理",
+        "actionList": "動作一覧"
     },
     "library": {
         "library": "ライブラリ",
@@ -351,12 +407,15 @@
         "saveToLibrary": "ライブラリへ保存",
         "typeLibrary": "__type__ ライブラリ",
         "unnamedType": "名前なし __type__",
+        "exportedToLibrary": "ライブラリにノードを書き出しました",
         "dialogSaveOverwrite": "__libraryName__ という __libraryType__ は既に存在しています 上書きしますか？",
         "invalidFilename": "不正なファイル名",
         "savedNodes": "フローを保存しました",
         "savedType": "__type__ を保存しました",
         "saveFailed": "保存に失敗しました: __message__",
+        "newFolder": "新規フォルダ",
         "types": {
+            "local": "ローカル",
             "examples": "サンプル"
         }
     },
@@ -367,9 +426,13 @@
         "addCategory": "新規追加...",
         "label": {
             "subflows": "サブフロー",
+            "network": "ネットワーク",
+            "common": "共通",
             "input": "入力",
             "output": "出力",
             "function": "機能",
+            "sequence": "シーケンス",
+            "parser": "パーサ",
             "social": "ソーシャル",
             "storage": "ストレージ",
             "analysis": "分析",
@@ -506,8 +569,10 @@
             "none": "なし",
             "subflows": "サブフロー",
             "flows": "フロー",
-            "filterUnused": "未使用",
             "filterAll": "全て",
+            "showAllConfigNodes": "全設定ノードを表示",
+            "filterUnused": "未使用",
+            "showAllUnusedConfigNodes": "未使用の全設定ノードを表示",
             "filtered": "__count__ 個が無効"
         },
         "context": {
@@ -516,10 +581,13 @@
             "none": "選択されていません",
             "refresh": "読み込みのため更新してください",
             "empty": "データが存在しません",
-            "node": "Node",
-            "flow": "Flow",
-            "global": "Global",
-            "deleteConfirm": "データを削除しても良いですか?"
+            "node": "ノード",
+            "flow": "フロー",
+            "global": "グローバル",
+            "deleteConfirm": "データを削除しても良いですか?",
+            "autoRefresh": "選択対象が変化した場合更新",
+            "refrsh": "更新",
+            "delete": "削除"
         },
         "palette": {
             "name": "パレットの管理",
@@ -531,9 +599,10 @@
             "description": "詳細",
             "dependencies": "依存関係",
             "settings": "設定",
-            "noSummaryAvailable": "サマリが存在しません",
+            "noSummaryAvailable": "要約が存在しません",
             "editDescription": "プロジェクトの詳細を編集",
             "editDependencies": "プロジェクトの依存関係を編集",
+            "noDescriptionAvailable": "詳細が存在しません",
             "editReadme": "README.mdを編集",
             "showProjectSettings": "プロジェクト設定を表示",
             "projectSettings": {
@@ -719,12 +788,28 @@
     "jsEditor": {
         "title": "JavaScriptエディタ"
     },
+    "textEditor": {
+        "title": "テキストエディタ"
+    },
     "jsonEditor": {
         "title": "JSONエディタ",
-        "format": "JSONフォーマット"
+        "format": "JSONフォーマット",
+        "rawMode": "JSONを編集",
+        "uiMode": "ビジュアルエディタ",
+        "insertAbove": "上に挿入",
+        "insertBelow": "下に挿入",
+        "addItem": "要素を追加",
+        "copyPath": "要素のパスをコピー",
+        "expandItems": "要素を展開",
+        "collapseItems": "要素を折り畳む",
+        "duplicate": "複製",
+        "error": {
+            "invalidJSON": "不正なJSON: "
+        }
     },
     "markdownEditor": {
         "title": "マークダウンエディタ",
+        "expand": "拡大",
         "format": "マークダウン形式で記述",
         "heading1": "見出しレベル1",
         "heading2": "見出しレベル2",
@@ -885,7 +970,7 @@
             "confirm": "<p>デプロイされていない変更は失われます。</p><p>続けますか?</p>"
         },
         "send-req": {
-            "auth-req": "リポジトリ対する認証が必要です",
+            "auth-req": "リポジトリに対する認証が必要です",
             "username": "ユーザ名",
             "password": "パスワード",
             "passphrase": "パスフレーズ",
@@ -911,8 +996,18 @@
     },
     "editor-tab": {
         "properties": "プロパティ",
+        "envProperties": "環境変数",
         "description": "説明",
         "appearance": "外観",
-        "env": "環境変数"
+        "preview": "UIプレビュー",
+        "defaultValue": "デフォルト値"
+    },
+    "languages": {
+        "de": "ドイツ語",
+        "en-US": "英語",
+        "ja": "日本語",
+        "ko": "韓国語",
+        "zh-CN": "中国語(簡体)",
+        "zh-TW": "中国語(繁体)"
     }
 }

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

@@ -1,7 +1,7 @@
 {
     "$string": {
-        "args": "arg",
-        "desc": "以下の型変換ルールを用いて、引数 *arg* を文字列へ型変換します。:\n\n - 文字列は変換しません。\n - 関数は空の文字列に変換します。\n - JSONの数値として表現できないため、無限大やNaNはエラーになります。\n - 他の値は `JSON.stringify` 関数を用いて、JSONの文字列へ変換します。"
+        "args": "arg[, prettify]",
+        "desc": "以下の型変換ルールを用いて、引数 *arg* を文字列へ型変換します。:\n\n - 文字列は変換しません。\n - 関数は空の文字列に変換します。\n - JSONの数値として表現できないため、無限大やNaNはエラーになります。\n - 他の値は `JSON.stringify` 関数を用いて、JSONの文字列へ変換します。`prettify`が真の場合、JSONを整形出力します。フィールドを1行毎に出力。フィールドのネスト深さによってインデントを行います。"
     },
     "$length": {
         "args": "str",
@@ -185,7 +185,7 @@
     },
     "$reduce": {
         "args": "array, function [, init]",
-        "desc": "配列の各要素値に関数 `function` を連続的に適用して得られる集約値を返します。 `function` の適用の際には、直前の `function` の適用結果と要素値が引数として与えられます。\n\n関数 `function` は引数を2つ取り、配列の各要素の間に配置する中置演算子のように作用しなくてはなりません。\n\n任意の引数 `init` には、集約時の初期値を設定します。"
+        "desc": "配列の各要素値に関数 `function` を連続的に適用して得られる集約値を返します。 `function` の適用の際には、直前の `function` の適用結果と要素値が引数として与えられます。\n\n関数 `function` は引数を2つ取り、配列の各要素の間に配置する中置演算子のように作用しなくてはなりません。関数`function`のシグネチャは`myfunc($accumulator, $value[, $index[, $array]])`という形式でなければなりません。\n\n任意の引数 `init` には、集約時の初期値を設定します。"
     },
     "$flowContext": {
         "args": "string",
@@ -230,5 +230,41 @@
     "$parseInteger": {
         "args": "string, picture",
         "desc": "`picture`文字列の指定に従って、`string`パラメータを整数(JSON数値)に変換します。`picture`文字列は`$formatInteger`と同じ形式です。"
+    },
+    "$error": {
+        "args": "[str]",
+        "desc": "メッセージを指定して例外を送出します。メッセージ`str`を省略した場合は`$error() function evaluated`をメッセージとします。"
+    },
+    "$assert": {
+        "args": "arg, str",
+        "desc": "`arg`が真の場合、undefinedを返します。偽の場合、`str`をメッセージとする例外を送出します。"
+    },
+    "$single": {
+        "args": "array, function",
+        "desc": "`array`の要素のうち、条件判定関数`function`を満たす(`function`に与えた場合に真偽値`true`を返す)要素が1つのみである場合、それを返します。マッチする要素が1つのみでない場合、例外を送出します。\n\n指定する関数は`function(value [, index [, array]])`というシグネチャでなければなりません。ここで、`value`は`array`の要素値、`index`は要素の添字、第三引数には配列全体を渡します。"
+    },
+    "$encodeUrl": {
+        "args": "str",
+        "desc": "Uniform Resource Locator (URL)を構成する文字を1、2、3、もしくは、4文字エスケープシーケンスのUTF-8文字エンコーディングで置換します。\n\n例: `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
+    },
+    "$encodeUrlComponent": {
+        "args": "str",
+        "desc": "Uniform Resource Locator (URL)要素を構成する文字を1、2、3、もしくは、4文字エスケープシーケンスのUTF-8文字エンコーディングで置換します。\n\n例: `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
+    },
+    "$decodeUrl": {
+        "args": "str",
+        "desc": "encodeUrlComponentで置換したUniform Resource Locator (URL)をデコードします。\n\n例: `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
+    },
+    "$decodeUrlComponent": {
+        "args": "str",
+        "desc": "encodeUrlで置換したUniform Resource Locator (URL)要素をデコードします。 \n\n例: `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
+    },
+    "$distinct": {
+        "args": "array",
+        "desc": "配列`array`から重複要素を削除した配列を返します。"
+    },
+    "$type": {
+        "args": "value",
+        "desc": "`value` の型を文字列として返します。もし `value` が未定義の場合、 `undefined` が返されます。"
     }
 }

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

@@ -273,7 +273,6 @@
     "deleteSubflow": "서브 플로우 삭제",
     "info": "상세내역",
     "category": "카테고리",
-    "format": "Markdown 형식",
     "errors": {
       "noNodesSelected": "<strong>서브 플로우를 생성할 수 없습니다</strong> : 노드가 선택되지 않았습니다",
       "multipleInputsToSelection": "<strong>서브 플로우를 생성할 수 없습니다</strong> : 복수의 입력이 선택되었습니다"
@@ -495,8 +494,8 @@
       "none": "없음",
       "subflows": "보조 플로우",
       "flows": "플로우",
-      "filterUnused": "미사용",
       "filterAll": "전체",
+      "filterUnused": "미사용",
       "filtered": "__count__ 개 숨김"
     },
     "context": {

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-client",
-    "version": "1.0.0-beta.1",
+    "version": "1.0.4",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",

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

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

packages/node_modules/@node-red/editor-client/src/images/deploy-flows-o.svg

@@ -0,0 +1 @@
+<svg width="27" height="18" xmlns="http://www.w3.org/2000/svg"><g color="#000"><path fill="#fff" d="M0 5.002h10v5H0zM17 .002h10v5H17z"/><path d="M17 13.002h10v5H17z"/></g><path d="M9.5 7.502h2l4-5h2" fill="none" stroke="#fff" stroke-width="1.5"/></svg>

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

@@ -0,0 +1 @@
+<svg width="32" height="32" xmlns="http://www.w3.org/2000/svg"><path color="#000" fill="#8c101c" d="M0 .002h32v32H0z"/><g color="#000"><path fill="#fff" d="M2 13.002h10v5H2zM19 8.002h10v5H19z"/><path d="M19 21.002h10v5H19z"/></g><path d="M11.5 15.502h2l4-5h2" fill="none" stroke="#fff" stroke-width="1.5"/></svg>

packages/node_modules/@node-red/editor-client/src/images/deploy-full-o.svg

@@ -0,0 +1 @@
+<svg width="27" height="18" xmlns="http://www.w3.org/2000/svg"><g fill="#fff" color="#000"><path d="M0 5h10v5H0zM17 0h10v5H17zM17 13h10v5H17z"/></g><path d="M9.5 7.5h2l4-5h2" fill="none" stroke="#fff" stroke-width="1.5"/></svg>

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

@@ -0,0 +1 @@
+<svg width="32" height="32" xmlns="http://www.w3.org/2000/svg"><path color="#000" fill="#8c101c" d="M0 0h32v32H0z"/><g fill="#fff" color="#000"><path d="M2 13h10v5H2zM19 8h10v5H19zM19 21h10v5H19z"/></g><path d="M11.5 15.5h2l4-5h2" fill="none" stroke="#fff" stroke-width="1.5"/></svg>

packages/node_modules/@node-red/editor-client/src/images/deploy-nodes-o.svg

@@ -0,0 +1 @@
+<svg width="27" height="18" xmlns="http://www.w3.org/2000/svg"><path color="#000" d="M0 5.002h10v5H0zM17 13.002h10v5H17z"/><path d="M9.5 7.502h2l4-5h2" fill="none" stroke="#000" stroke-width="1.5"/><path color="#000" fill="#fff" d="M17 .002h10v5H17z"/></svg>

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

@@ -0,0 +1 @@
+<svg width="32" height="32" xmlns="http://www.w3.org/2000/svg"><path color="#000" fill="#8c101c" d="M0 .002h32v32H0z"/><path color="#000" d="M2 13.002h10v5H2zM19 21.002h10v5H19z"/><path d="M11.5 15.502h2l4-5h2" fill="none" stroke="#000" stroke-width="1.5"/><path color="#000" fill="#fff" d="M19 8.002h10v5H19z"/></svg>

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

@@ -0,0 +1 @@
+<svg width="32" height="32" xmlns="http://www.w3.org/2000/svg"><g color="#000"><path fill="#8c101c" d="M0 .006h32v32H0z"/><path d="M11.81 25.429a10.02 10.02 0 0 0 4.19.914c5.562 0 10.107-4.545 10.107-10.106S21.562 6.131 16 6.131 5.895 10.676 5.895 16.237h3.368c0-3.74 2.997-6.737 6.738-6.737s6.737 2.996 6.737 6.737-2.996 6.738-6.737 6.738a6.775 6.775 0 0 1-2.533-.486l1.43-3.48-6.947 1.317 2.13 8.485z" fill="#fff" style="isolation:auto;mix-blend-mode:normal;text-decoration-color:#000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-transform:none;white-space:normal"/></g></svg>

packages/node_modules/@node-red/editor-client/src/images/icons/arrow-in.svg

@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M18 5v12H7v26h11v12l14-25z" fill="#fff"/></svg>

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

@@ -0,0 +1 @@
+<svg width="46.994" height="18.006" xmlns="http://www.w3.org/2000/svg"><g stroke="#d6d6d6"><g fill="#9e3131" stroke-linejoin="round" stroke-width="3.847" transform="matrix(.25848 0 0 .2614 -63.87 -108.483)"><rect x="249.04" y="435.92" width="50.294" height="22.953" ry="6.608"/><rect x="345.63" y="416.93" width="50.294" height="22.953" ry="6.608"/><rect x="376.71" y="459.01" width="50.294" height="22.953" ry="6.608"/></g><path d="M301.04 447.43c24.406.184 7.107-18.84 42.708-19.03M374.82 470.48c-46.966.538-28.989-22.664-73.619-22.944" fill="none" stroke-width="5.771" transform="matrix(.25848 0 0 .2614 -63.87 -108.483)"/></g></svg>

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

@@ -0,0 +1 @@
+<svg width="40" height="40" viewBox="0, 0, 40, 40" xmlns="http://www.w3.org/2000/svg"><path d="M25 16h7c.58 0 1-.42 1-1v-2c0-.58-.42-1-1-1h-7c-.58 0-1 .42-1 1v2c0 .58.42 1 1 1zM8 28h7c.58 0 1-.42 1-1v-2c0-.58-.42-1-1-1H8c-.58 0-1 .42-1 1v2c0 .58.42 1 1 1zm-.416 11C5.624 39 4 37.375 4 35.416V4.582C4 2.622 5.625 1 7.584 1h24.832C34.376 1 36 2.623 36 4.582v30.834C36 37.376 34.375 39 32.416 39zM32 27H19c0 2.19-1.81 4-4 4H7v4.416c0 .35.235.584.584.584h24.832c.35 0 .584-.235.584-.584v-8.417zm1-2v-6h-8c-2.19 0-4-1.81-4-4h-1c-4.333-.002-8.667.004-13 0v6h8c2.19 0 4 1.81 4 4h13zm0-16V4.582c0-.35-.235-.582-.584-.582H7.584C7.234 4 7 4.233 7 4.582v8.417c4.333.002 8.667.001 13 .001h1c0-2.19 1.81-4 4-4z" color="#000" fill="#333"/></svg>

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

@@ -0,0 +1 @@
+<svg width="26" height="36" viewBox="0, 0, 26, 36" xmlns="http://www.w3.org/2000/svg"><path d="M14.16 27.38l1.555-.144c.132.731.383 1.261.755 1.591.371.33.848.494 1.429.494.497 0 .931-.114 1.303-.341.377-.228.686-.53.926-.908.24-.383.44-.899.602-1.546a8.122 8.122 0 0 0 .233-2.3 3.732 3.732 0 0 1-1.33 1.258 3.605 3.605 0 0 1-1.815.476c-1.09 0-2.013-.395-2.768-1.186s-1.133-1.834-1.133-3.128c0-1.336.393-2.411 1.178-3.226.79-.815 1.78-1.223 2.966-1.223.856 0 1.638.231 2.345.692.713.462 1.253 1.12 1.618 1.978.372.85.557 2.085.557 3.702 0 1.684-.182 3.026-.548 4.027-.365.994-.91 1.752-1.636 2.274-.719.52-1.563.781-2.534.781-1.03 0-1.872-.284-2.525-.853-.654-.576-1.046-1.381-1.178-2.418zm6.624-5.815c0-.928-.249-1.666-.746-2.21-.492-.546-1.085-.819-1.78-.819-.719 0-1.345.294-1.878.881s-.8 1.348-.8 2.283c0 .839.252 1.522.755 2.05.51.52 1.135.781 1.878.781.75 0 1.363-.26 1.843-.782.485-.527.728-1.255.728-2.184zM4.858 10.466c0-1.558.158-2.81.476-3.757.324-.952.8-1.686 1.429-2.201.635-.516 1.432-.773 2.39-.773.708 0 1.328.143 1.861.431.533.282.974.692 1.321 1.231.348.534.62 1.187.818 1.96.198.767.297 1.803.297 3.11 0 1.545-.16 2.794-.477 3.747-.317.947-.794 1.68-1.429 2.202-.629.515-1.426.773-2.39.773-1.27 0-2.268-.456-2.993-1.366-.869-1.097-1.303-2.882-1.303-5.357zm1.662 0c0 2.163.252 3.604.755 4.323.51.713 1.136 1.07 1.879 1.07.743 0 1.366-.36 1.87-1.079.508-.719.763-2.157.763-4.314 0-2.169-.255-3.61-.764-4.323-.503-.713-1.132-1.07-1.887-1.07-.743 0-1.336.315-1.78.944-.557.803-.836 2.286-.836 4.45z" fill="#444"/></svg>

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

@@ -0,0 +1 @@
+<svg width="26" height="36" viewBox="0, 0, 26, 36" xmlns="http://www.w3.org/2000/svg"><path d="M13.27 29.15l6.733-8.143h-6.235V19.3h8.8v1.559l-6.69 8.09h6.892v1.707h-9.5zm4.909-10.125zM6.577 12.58q0 .827.604 1.304.605.478 1.432.478 1.007 0 1.95-.467 1.59-.774 1.59-2.534V9.824q-.349.222-.9.37-.552.15-1.082.213l-1.155.148q-1.04.138-1.56.435-.88.498-.88 1.59zM11.2 8.721q.657-.085.88-.551.127-.255.127-.732 0-.975-.7-1.41-.689-.445-1.983-.445-1.495 0-2.12.805-.35.446-.456 1.326H5.167q.053-2.1 1.357-2.916 1.315-.827 3.043-.827 2.004 0 3.255.763 1.24.764 1.24 2.375v6.542q0 .297.117.477.127.18.52.18.127 0 .286-.01.159-.021.34-.053v1.41q-.446.127-.68.16-.233.031-.636.031-.986 0-1.43-.7-.234-.37-.33-1.05-.583.764-1.675 1.326t-2.407.562q-1.58 0-2.587-.954-.996-.965-.996-2.407 0-1.58.986-2.45.986-.869 2.587-1.07zm-1.58-4.75z" fill="#444"/></svg>

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

@@ -0,0 +1 @@
+<svg width="26" height="36" viewBox="0, 0, 26, 36" xmlns="http://www.w3.org/2000/svg"><path d="M18.8 33.9c3.328 0 4.776-2.603 4.776-7.066s-1.448-7.066-4.776-7.066-4.776 2.603-4.776 7.066S15.473 33.9 18.8 33.9zm0-1.429c-2.192 0-3.073-1.781-3.073-4.522v-2.23c0-2.741.88-4.523 3.073-4.523s3.073 1.782 3.073 4.522v2.231c0 2.74-.88 4.522-3.073 4.522zm-6.306 1.194v-1.429H8.892V20.002H6.328l-3.621 3.386.959 1.038 3.445-3.21h.137v11.02H3.333v1.429zm11.2-17.7v-1.429h-3.602V2.302h-2.564l-3.621 3.386.959 1.038 3.445-3.21h.137v11.02h-3.915v1.429zM7.5 16.2c3.327 0 4.776-2.603 4.776-7.066S10.828 2.068 7.5 2.068 2.725 4.67 2.725 9.134 4.173 16.2 7.5 16.2zm0-1.429c-2.193 0-3.074-1.781-3.074-4.522V8.02c0-2.741.881-4.523 3.074-4.523s3.073 1.782 3.073 4.522v2.231c0 2.74-.881 4.522-3.073 4.522z" fill="#444"/></svg>

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

@@ -0,0 +1 @@
+<svg width="26" height="36" viewBox="0, 0, 26, 36" xmlns="http://www.w3.org/2000/svg"><path d="M9.96 21.98a5 5 0 1 1 6.11-7.917zm3.035-13.973c-5.512 0-10 4.488-10 10s4.488 9.998 10 9.998 10-4.486 10-9.998-4.488-10-10-10zm0 1.816c4.53 0 8.182 3.655 8.182 8.184s-3.652 8.182-8.182 8.182-8.181-3.653-8.181-8.182 3.652-8.184 8.181-8.184z" color="#000" fill="#444"/></svg>

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

@@ -0,0 +1 @@
+<svg width="26" height="36" viewBox="0, 0, 26, 36" xmlns="http://www.w3.org/2000/svg"><path d="M14.33 27.19q2.916-.136 4.024-2.131.58-1.024.58-2.37 0-2.132-1.569-3.24-.904-.648-3.035-1.228zM8.55 10.736q0 1.688 1.108 2.643 1.125.955 3.018 1.33V6.695q-2.234.085-3.189 1.364-.937 1.279-.937 2.677zm-3.07.205q0-2.592 1.893-4.672 1.91-2.08 5.337-2.115V1.887h1.62V4.12q3.393.239 5.2 2.012 1.825 1.757 1.91 4.655h-2.984q-.119-1.296-.699-2.233-1.074-1.723-3.427-1.808v8.287q3.956 1.108 5.371 2.08 2.302 1.603 2.302 4.74 0 4.536-2.95 6.446-1.637 1.057-4.723 1.398v3.308h-1.62v-3.308q-4.962-.324-6.735-3.513-.972-1.722-.972-4.655h3.018q.136 2.336.733 3.41 1.057 1.927 3.922 2.166v-9.293q-3.683-.699-5.44-2.336Q5.48 13.84 5.48 10.941z" fill="#444"/></svg>

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

@@ -0,0 +1 @@
+<svg width="26" height="36" viewBox="0, 0, 26, 36" xmlns="http://www.w3.org/2000/svg"><g transform="translate(-337.103 -913.25) scale(1.2585)" fill="#444" stroke-width=".795"><circle cx="284.36" cy="733.68" r="1.5" color="#000" style="isolation:auto;mix-blend-mode:normal"/><circle cx="284.33" cy="740.74" r="1.5" color="#000" style="isolation:auto;mix-blend-mode:normal"/><path d="M276.18 727.78l4.396-1.565v18.515c-.711 2.606-2.922 4.394-5.812 5.812l-4.135 1.974-.559-1.192 3.353-1.639c1.459-.724 2.689-1.87 2.869-4.955z" fill-rule="evenodd"/></g></svg>

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

@@ -0,0 +1 @@
+<svg width="26" height="36" viewBox="0, 0, 26, 36" xmlns="http://www.w3.org/2000/svg"><path d="M15 5.225v-1.92h2.24q.608 0 1.216.288.608.256 1.12.8.48.512.8 1.312.32.768.32 1.792v5.824q0 .832.224 1.536t.608 1.216q.352.48.832.768.48.256.992.256v2.176q-.512 0-.992.256t-.832.736q-.384.48-.608 1.184t-.224 1.568v5.792q0 1.024-.32 1.792-.32.8-.8 1.312-.512.544-1.12.8-.608.288-1.216.288H15v-1.92h1.6q.48 0 .768-.256.288-.224.48-.64.16-.384.224-.896.064-.48.064-.96v-5.824q0-1.216.352-2.016.32-.8.768-1.28.448-.512.928-.736.448-.224.736-.256v-.096q-.288-.064-.736-.32-.48-.256-.928-.768t-.768-1.28q-.352-.8-.352-1.92V7.977q0-.512-.064-.992-.064-.512-.224-.896-.192-.384-.48-.608-.288-.256-.768-.256zm-3.648 0v-1.92h-2.24q-.608 0-1.216.288-.608.256-1.12.8-.48.512-.8 1.312-.32.768-.32 1.792v5.824q0 .832-.224 1.536t-.608 1.216q-.352.48-.832.768-.48.256-.992.256v2.176q.512 0 .992.256t.832.736q.384.48.608 1.184t.224 1.568v5.792q0 1.024.32 1.792.32.8.8 1.312.512.544 1.12.8.608.288 1.216.288h2.24v-1.92h-1.6q-.48 0-.768-.256-.288-.224-.48-.64-.16-.384-.224-.896-.064-.48-.064-.96v-5.824q0-1.216-.352-2.016-.32-.8-.768-1.28-.448-.512-.928-.736-.448-.224-.736-.256v-.096q.288-.064.736-.32.48-.256.928-.768t.768-1.28q.352-.8.352-1.92V7.977q0-.512.064-.992.064-.512.224-.896.192-.384.48-.608.288-.256.768-.256z" fill="#444"/></svg>

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

@@ -0,0 +1 @@
+<svg width="26" height="36" viewBox="0, 0, 26, 36" xmlns="http://www.w3.org/2000/svg"><path d="M2 19h5v5H2zm16.099-3.304v-5.659h-2.654v5.66l-5.309-2.004-.901 2.404L14.543 18l-3.255 4.557 2.254 1.553 3.255-4.808 3.455 4.808 2.054-1.553L19 18l5.46-1.903-1.002-2.404z" color="#000" fill="#444444"/></svg>

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

@@ -0,0 +1 @@
+<svg width="26" height="36" viewBox="0, 0, 26, 36" xmlns="http://www.w3.org/2000/svg"><path d="M11 5v5.77a7.542 7.542 0 0 0-5.234 5.25L1 16c-1.432 1.397-1.232 2.722 0 4l4.75-.078a7.542 7.542 0 0 0 5.22 5.297L11 31c1.316 1.303 2.649 1.363 4 0l.009-5.775A7.542 7.542 0 0 0 20.228 20H25c1.261-1.294 1.404-2.623 0-4l-4.774-.01a7.542 7.542 0 0 0-5.23-5.22L15 5c-1.3-1.273-2.63-1.393-4 0zm2 7.499c3.05 0 5.5 2.45 5.5 5.5s-2.45 5.5-5.5 5.5-5.5-2.45-5.5-5.5 2.45-5.5 5.5-5.5z" color="#000" fill="#444"/></svg>

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

@@ -14,7 +14,8 @@
  * limitations under the License.
  **/
 RED.history = (function() {
-    var undo_history = [];
+    var undoHistory = [];
+    var redoHistory = [];
 
     function undoEvent(ev) {
         var i;
@@ -22,52 +23,81 @@ RED.history = (function() {
         var node;
         var subflow;
         var modifiedTabs = {};
+        var inverseEv;
         if (ev) {
             if (ev.t == 'multi') {
+                inverseEv = {
+                    t: 'multi',
+                    events: []
+                };
                 len = ev.events.length;
                 for (i=len-1;i>=0;i--) {
-                    undoEvent(ev.events[i]);
+                    var r = undoEvent(ev.events[i]);
+                    inverseEv.events.push(r);
                 }
             } else if (ev.t == 'replace') {
+                inverseEv = {
+                    t: 'replace',
+                    config: RED.nodes.createCompleteNodeSet(),
+                    changed: {},
+                    rev: RED.nodes.version()
+                };
                 RED.nodes.clear();
                 var imported = RED.nodes.import(ev.config);
                 imported[0].forEach(function(n) {
                     if (ev.changed[n.id]) {
                         n.changed = true;
+                        inverseEv.changed[n.id] = true;
                     }
                 })
 
                 RED.nodes.version(ev.rev);
             } else if (ev.t == 'add') {
+                inverseEv = {
+                    t: "delete",
+                };
                 if (ev.nodes) {
+                    inverseEv.nodes = [];
                     for (i=0;i<ev.nodes.length;i++) {
                         node = RED.nodes.node(ev.nodes[i]);
                         if (node.z) {
                             modifiedTabs[node.z] = true;
                         }
+                        inverseEv.nodes.push(node);
                         RED.nodes.remove(ev.nodes[i]);
                     }
                 }
                 if (ev.links) {
+                    inverseEv.links = [];
                     for (i=0;i<ev.links.length;i++) {
+                        inverseEv.links.push(ev.links[i]);
                         RED.nodes.removeLink(ev.links[i]);
                     }
                 }
                 if (ev.workspaces) {
+                    inverseEv.workspaces = [];
                     for (i=0;i<ev.workspaces.length;i++) {
+                        var workspaceOrder = RED.nodes.getWorkspaceOrder();
+                        ev.workspaces[i]._index = workspaceOrder.indexOf(ev.workspaces[i].id);
+                        inverseEv.workspaces.push(ev.workspaces[i]);
                         RED.nodes.removeWorkspace(ev.workspaces[i].id);
                         RED.workspaces.remove(ev.workspaces[i]);
                     }
                 }
                 if (ev.subflows) {
+                    inverseEv.subflows = [];
                     for (i=0;i<ev.subflows.length;i++) {
+                        inverseEv.subflows.push(ev.subflows[i]);
                         RED.nodes.removeSubflow(ev.subflows[i]);
                         RED.workspaces.remove(ev.subflows[i]);
                     }
                 }
                 if (ev.subflow) {
+                    inverseEv.subflow = {};
                     if (ev.subflow.instances) {
+                        inverseEv.subflow.instances = [];
                         ev.subflow.instances.forEach(function(n) {
+                            inverseEv.subflow.instances.push(n);
                             var node = RED.nodes.node(n.id);
                             if (node) {
                                 node.changed = n.changed;
@@ -83,21 +113,30 @@ RED.history = (function() {
                     }
                 }
                 if (ev.removedLinks) {
+                    inverseEv.createdLinks = [];
                     for (i=0;i<ev.removedLinks.length;i++) {
+                        inverseEv.createdLinks.push(ev.removedLinks[i]);
                         RED.nodes.addLink(ev.removedLinks[i]);
                     }
                 }
 
             } else if (ev.t == "delete") {
+                inverseEv = {
+                    t: "add"
+                };
                 if (ev.workspaces) {
+                    inverseEv.workspaces = [];
                     for (i=0;i<ev.workspaces.length;i++) {
+                        inverseEv.workspaces.push(ev.workspaces[i]);
                         RED.nodes.addWorkspace(ev.workspaces[i],ev.workspaces[i]._index);
                         RED.workspaces.add(ev.workspaces[i],undefined,ev.workspaces[i]._index);
                         delete ev.workspaces[i]._index;
                     }
                 }
                 if (ev.subflows) {
+                    inverseEv.subflows = [];
                     for (i=0;i<ev.subflows.length;i++) {
+                        inverseEv.subflows.push(ev.subflows[i]);
                         RED.nodes.addSubflow(ev.subflows[i]);
                     }
                 }
@@ -126,8 +165,11 @@ RED.history = (function() {
                     }
                 }
                 if (ev.subflow) {
+                    inverseEv.subflow = {};
                     if (ev.subflow.hasOwnProperty('instances')) {
+                        inverseEv.subflow.instances = [];
                         ev.subflow.instances.forEach(function(n) {
+                            inverseEv.subflow.instances.push(n);
                             var node = RED.nodes.node(n.id);
                             if (node) {
                                 node.changed = n.changed;
@@ -152,14 +194,25 @@ RED.history = (function() {
                     });
                 }
                 if (ev.nodes) {
+                    inverseEv.nodes = [];
                     for (i=0;i<ev.nodes.length;i++) {
                         RED.nodes.add(ev.nodes[i]);
                         modifiedTabs[ev.nodes[i].z] = true;
+                        inverseEv.nodes.push(ev.nodes[i].id);
                     }
                 }
                 if (ev.links) {
+                    inverseEv.links = [];
                     for (i=0;i<ev.links.length;i++) {
                         RED.nodes.addLink(ev.links[i]);
+                        inverseEv.links.push(ev.links[i]);
+                    }
+                }
+                if (ev.createdLinks) {
+                    inverseEv.removedLinks = [];
+                    for (i=0;i<ev.createdLinks.length;i++) {
+                        inverseEv.removedLinks.push(ev.createdLinks[i]);
+                        RED.nodes.removeLink(ev.createdLinks[i]);
                     }
                 }
                 if (ev.changes) {
@@ -179,8 +232,14 @@ RED.history = (function() {
 
                 }
             } else if (ev.t == "move") {
+                inverseEv = {
+                    t: 'move',
+                    nodes: []
+                };
                 for (i=0;i<ev.nodes.length;i++) {
                     var n = ev.nodes[i];
+                    var rn = {n: n.n, ox: n.n.x, oy: n.n.y, dirty: true, moved: n.moved};
+                    inverseEv.nodes.push(rn);
                     n.n.x = n.ox;
                     n.n.y = n.oy;
                     n.n.dirty = true;
@@ -188,18 +247,28 @@ RED.history = (function() {
                 }
                 // A move could have caused a link splice
                 if (ev.links) {
+                    inverseEv.removedLinks = [];
                     for (i=0;i<ev.links.length;i++) {
+                        inverseEv.removedLinks.push(ev.links[i]);
                         RED.nodes.removeLink(ev.links[i]);
                     }
                 }
                 if (ev.removedLinks) {
+                    inverseEv.links = [];
                     for (i=0;i<ev.removedLinks.length;i++) {
+                        inverseEv.links.push(ev.removedLinks[i]);
                         RED.nodes.addLink(ev.removedLinks[i]);
                     }
                 }
             } else if (ev.t == "edit") {
+                inverseEv = {
+                    t: "edit",
+                    changes: {}
+                };
+                inverseEv.node = ev.node;
                 for (i in ev.changes) {
                     if (ev.changes.hasOwnProperty(i)) {
+                        inverseEv.changes[i] = ev.node[i];
                         if (ev.node._def.defaults && ev.node._def.defaults[i] && ev.node._def.defaults[i].type) {
                             // This is a config node property
                             var currentConfigNode = RED.nodes.node(ev.node[i]);
@@ -214,23 +283,34 @@ RED.history = (function() {
                         ev.node[i] = ev.changes[i];
                     }
                 }
+                if (ev.node.type === 'tab' && ev.changes.hasOwnProperty('disabled')) {
+                    $("#red-ui-tab-"+(ev.node.id.replace(".","-"))).toggleClass('red-ui-workspace-disabled',!!ev.node.disabled);
+                    $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!ev.node.disabled);
+                }
                 if (ev.subflow) {
+                    inverseEv.subflow = {};
                     if (ev.subflow.hasOwnProperty('inputCount')) {
+                        inverseEv.subflow.inputCount = ev.node.in.length;
                         if (ev.node.in.length > ev.subflow.inputCount) {
+                            inverseEv.subflow.inputs = ev.node.in.slice(ev.subflow.inputCount);
                             ev.node.in.splice(ev.subflow.inputCount);
                         } else if (ev.subflow.inputs.length > 0) {
                             ev.node.in = ev.node.in.concat(ev.subflow.inputs);
                         }
                     }
                     if (ev.subflow.hasOwnProperty('outputCount')) {
+                        inverseEv.subflow.outputCount = ev.node.out.length;
                         if (ev.node.out.length > ev.subflow.outputCount) {
+                            inverseEv.subflow.outputs = ev.node.out.slice(ev.subflow.outputCount);
                             ev.node.out.splice(ev.subflow.outputCount);
                         } else if (ev.subflow.outputs.length > 0) {
                             ev.node.out = ev.node.out.concat(ev.subflow.outputs);
                         }
                     }
                     if (ev.subflow.hasOwnProperty('instances')) {
+                        inverseEv.subflow.instances = [];
                         ev.subflow.instances.forEach(function(n) {
+                            inverseEv.subflow.instances.push(n);
                             var node = RED.nodes.node(n.id);
                             if (node) {
                                 node.changed = n.changed;
@@ -254,9 +334,11 @@ RED.history = (function() {
                     var outputMap;
                     if (ev.outputMap) {
                         outputMap = {};
+                        inverseEv.outputMap = {};
                         for (var port in ev.outputMap) {
                             if (ev.outputMap.hasOwnProperty(port) && ev.outputMap[port] !== "-1") {
                                 outputMap[ev.outputMap[port]] = port;
+                                inverseEv.outputMap[ev.outputMap[port]] = port;
                             }
                         }
                     }
@@ -264,39 +346,107 @@ RED.history = (function() {
                     RED.editor.validateNode(ev.node);
                 }
                 if (ev.links) {
+                    inverseEv.createdLinks = [];
                     for (i=0;i<ev.links.length;i++) {
                         RED.nodes.addLink(ev.links[i]);
+                        inverseEv.createdLinks.push(ev.links[i]);
+                    }
+                }
+                if (ev.createdLinks) {
+                    inverseEv.links = [];
+                    for (i=0;i<ev.createdLinks.length;i++) {
+                        RED.nodes.removeLink(ev.createdLinks[i]);
+                        inverseEv.links.push(ev.createdLinks[i]);
                     }
                 }
                 ev.node.dirty = true;
                 ev.node.changed = ev.changed;
             } else if (ev.t == "createSubflow") {
+                inverseEv = {
+                    t: "deleteSubflow",
+                    activeWorkspace: ev.activeWorkspace,
+                    dirty: RED.nodes.dirty()
+                };
                 if (ev.nodes) {
+                    inverseEv.movedNodes = [];
+                    var z = ev.activeWorkspace;
                     RED.nodes.filterNodes({z:ev.subflow.subflow.id}).forEach(function(n) {
                         n.x += ev.subflow.offsetX;
                         n.y += ev.subflow.offsetY;
-                        n.z = ev.activeWorkspace;
                         n.dirty = true;
+                        inverseEv.movedNodes.push(n.id);
+                        RED.nodes.moveNodeToTab(n, z);
                     });
+                    inverseEv.subflows = [];
                     for (i=0;i<ev.nodes.length;i++) {
+                        inverseEv.subflows.push(RED.nodes.node(ev.nodes[i]));
                         RED.nodes.remove(ev.nodes[i]);
                     }
                 }
                 if (ev.links) {
+                    inverseEv.links = [];
                     for (i=0;i<ev.links.length;i++) {
+                        inverseEv.links.push(ev.links[i]);
                         RED.nodes.removeLink(ev.links[i]);
                     }
                 }
 
+                inverseEv.subflow = ev.subflow;
                 RED.nodes.removeSubflow(ev.subflow.subflow);
                 RED.workspaces.remove(ev.subflow.subflow);
 
                 if (ev.removedLinks) {
+                    inverseEv.createdLinks = [];
                     for (i=0;i<ev.removedLinks.length;i++) {
+                        inverseEv.createdLinks.push(ev.removedLinks[i]);
                         RED.nodes.addLink(ev.removedLinks[i]);
                     }
                 }
+            } else if (ev.t == "deleteSubflow") {
+                inverseEv = {
+                    t: "createSubflow",
+                    activeWorkspace: ev.activeWorkspace,
+                    dirty: RED.nodes.dirty(),
+                };
+                if (ev.subflow) {
+                    RED.nodes.addSubflow(ev.subflow.subflow);
+                    inverseEv.subflow = ev.subflow;
+                }
+                if (ev.subflows) {
+                    inverseEv.nodes = [];
+                    for (i=0;i<ev.subflows.length;i++) {
+                        RED.nodes.add(ev.subflows[i]);
+                        inverseEv.nodes.push(ev.subflows[i].id);
+                    }
+                }
+                if (ev.movedNodes) {
+                    ev.movedNodes.forEach(function(nid) {
+                        nn = RED.nodes.node(nid);
+                        nn.x -= ev.subflow.offsetX;
+                        nn.y -= ev.subflow.offsetY;
+                        nn.dirty = true;
+                        RED.nodes.moveNodeToTab(nn, ev.subflow.subflow.id);
+                    });
+                }
+                if (ev.links) {
+                    inverseEv.links = [];
+                    for (i=0;i<ev.links.length;i++) {
+                        inverseEv.links.push(ev.links[i]);
+                        RED.nodes.addLink(ev.links[i]);
+                    }
+                }
+                if  (ev.createdLinks) {
+                    inverseEv.removedLinks = [];
+                    for (i=0;i<ev.createdLinks.length;i++) {
+                        inverseEv.removedLinks.push(ev.createdLinks[i]);
+                        RED.nodes.removeLink(ev.createdLinks[i]);
+                    }
+                }
             } else if (ev.t == "reorder") {
+                inverseEv = {
+                    t: 'reorder',
+                    order: RED.nodes.getWorkspaceOrder()
+                };
                 if (ev.order) {
                     RED.workspaces.order(ev.order);
                 }
@@ -316,6 +466,8 @@ RED.history = (function() {
             RED.workspaces.refresh();
             RED.sidebar.config.refresh();
             RED.subflow.refresh();
+
+            return inverseEv;
         }
 
     }
@@ -323,28 +475,42 @@ RED.history = (function() {
     return {
         //TODO: this function is a placeholder until there is a 'save' event that can be listened to
         markAllDirty: function() {
-            for (var i=0;i<undo_history.length;i++) {
-                undo_history[i].dirty = true;
+            for (var i=0;i<undoHistory.length;i++) {
+                undoHistory[i].dirty = true;
             }
         },
         list: function() {
-            return undo_history
+            return undoHistory;
         },
         depth: function() {
-            return undo_history.length;
+            return undoHistory.length;
         },
         push: function(ev) {
-            undo_history.push(ev);
+            undoHistory.push(ev);
+            redoHistory = [];
         },
         pop: function() {
-            var ev = undo_history.pop();
-            undoEvent(ev);
+            var ev = undoHistory.pop();
+            var rev = undoEvent(ev);
+            if (rev) {
+                redoHistory.push(rev);
+            }
         },
         peek: function() {
-            return undo_history[undo_history.length-1];
+            return undoHistory[undoHistory.length-1];
         },
         clear: function() {
-            undo_history = [];
+            undoHistory = [];
+            redoHistory = [];
+        },
+        redo: function() {
+            var ev = redoHistory.pop();
+            if (ev) {
+                var uev = undoEvent(ev);
+                if (uev) {
+                    undoHistory.push(uev);
+                }
+            }
         }
     }
 

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

@@ -50,8 +50,21 @@ RED.i18n = (function() {
             }
 
         },
+        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 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'
+        },
         loadNodeCatalog: function(namespace,done) {
-            var languageList = i18n.functions.toLanguages(i18n.detectLanguage());
+            var languageList = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
             var toLoad = languageList.length;
             languageList.forEach(function(lang) {
                 $.ajax({
@@ -73,7 +86,7 @@ RED.i18n = (function() {
         },
 
         loadNodeCatalogs: function(done) {
-            var languageList = i18n.functions.toLanguages(i18n.detectLanguage());
+            var languageList = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
             var toLoad = languageList.length;
 
             languageList.forEach(function(lang) {

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

@@ -1,6 +1,6 @@
 {
     "*": {
-        "ctrl-shift-p":"core:manage-palette",
+        "alt-shift-p":"core:manage-palette",
         "ctrl-f": "core:search",
         "ctrl-shift-f": "core:list-flows",
         "ctrl-=": "core:zoom-in",
@@ -8,6 +8,7 @@
         "ctrl-0": "core:zoom-reset",
         "ctrl-enter": "core:confirm-edit-tray",
         "ctrl-escape": "core:cancel-edit-tray",
+        "ctrl-d": "core:deploy-flows",
         "ctrl-g i": "core:show-info-tab",
         "ctrl-g d": "core:show-debug-tab",
         "ctrl-g c": "core:show-config-tab",
@@ -17,17 +18,20 @@
         "ctrl-space": "core:toggle-sidebar",
         "ctrl-p": "core:toggle-palette",
         "ctrl-,": "core:show-user-settings",
+        "ctrl-alt-l": "core:clear-debug-messages",
         "ctrl-alt-r": "core:show-remote-diff",
         "ctrl-alt-n": "core:new-project",
         "ctrl-alt-o": "core:open-project",
         "ctrl-g v": "core:show-version-control-tab",
-        "ctrl-shift-l": "core:show-event-log"
+        "ctrl-shift-l": "core:show-event-log",
+        "ctrl-shift-p":"core:show-action-list"
     },
     "red-ui-sidebar-node-config": {
         "backspace": "core:delete-config-selection",
         "delete": "core:delete-config-selection",
         "ctrl-a": "core:select-all-config-nodes",
-        "ctrl-z": "core:undo"
+        "ctrl-z": "core:undo",
+        "ctrl-y": "core:redo"
     },
     "red-ui-workspace": {
         "backspace": "core:delete-selection",
@@ -37,6 +41,7 @@
         "ctrl-x": "core:cut-selection-to-internal-clipboard",
         "ctrl-v": "core:paste-from-internal-clipboard",
         "ctrl-z": "core:undo",
+        "ctrl-y": "core:redo",
         "ctrl-a": "core:select-all-nodes",
         "shift-?": "core:show-help",
         "up": "core:move-selection-up",

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

@@ -17,6 +17,8 @@ RED.nodes = (function() {
 
     var node_defs = {};
     var nodes = [];
+    var nodeTabMap = {};
+
     var configNodes = {};
     var links = [];
     var defaultWorkspace;
@@ -213,6 +215,11 @@ RED.nodes = (function() {
                 n.i = nextId+1;
             }
             nodes.push(n);
+            if (nodeTabMap[n.z]) {
+                nodeTabMap[n.z][n.id] = n;
+            } else {
+                console.warn("Node added to unknown tab/subflow:",n);
+            }
         }
         RED.events.emit('nodes:add',n);
     }
@@ -246,6 +253,9 @@ RED.nodes = (function() {
             node = getNode(id);
             if (node) {
                 nodes.splice(nodes.indexOf(node),1);
+                if (nodeTabMap[node.z]) {
+                    delete nodeTabMap[node.z][node.id];
+                }
                 removedLinks = links.filter(function(l) { return (l.source === node) || (l.target === node); });
                 removedLinks.forEach(function(l) {links.splice(links.indexOf(l), 1); });
                 var updatedConfigNode = false;
@@ -291,6 +301,17 @@ RED.nodes = (function() {
         return {links:removedLinks,nodes:removedNodes};
     }
 
+    function moveNodeToTab(node, z) {
+        if (nodeTabMap[node.z]) {
+            delete nodeTabMap[node.z][node.id];
+        }
+        if (!nodeTabMap[z]) {
+            nodeTabMap[z] = {};
+        }
+        nodeTabMap[z][node.id] = node;
+        node.z = z;
+    }
+
     function removeLink(l) {
         var index = links.indexOf(l);
         if (index != -1) {
@@ -300,6 +321,8 @@ RED.nodes = (function() {
 
     function addWorkspace(ws,targetIndex) {
         workspaces[ws.id] = ws;
+        nodeTabMap[ws.id] = {};
+
         ws._def = RED.nodes.getType('tab');
         if (targetIndex === undefined) {
             workspacesOrder.push(ws.id);
@@ -312,6 +335,7 @@ RED.nodes = (function() {
     }
     function removeWorkspace(id) {
         delete workspaces[id];
+        delete nodeTabMap[id];
         workspacesOrder.splice(workspacesOrder.indexOf(id),1);
 
         var removedNodes = [];
@@ -357,30 +381,32 @@ RED.nodes = (function() {
             sf.name = subflowName;
         }
         subflows[sf.id] = sf;
+        nodeTabMap[sf.id] = {};
+
         RED.nodes.registerType("subflow:"+sf.id, {
             defaults:{
                 name:{value:""},
                 env:{value:[]}
             },
-            icon: function() { return sf.icon||"subflow.png" },
+            icon: function() { return sf.icon||"subflow.svg" },
             category: sf.category || "subflows",
             inputs: sf.in.length,
             outputs: sf.out.length,
-            color: "#da9",
+            color: sf.color || "#DDAA99",
             label: function() { return this.name||RED.nodes.subflow(sf.id).name },
             labelStyle: function() { return this.name?"red-ui-flow-node-label-italic":""; },
             paletteLabel: function() { return RED.nodes.subflow(sf.id).name },
             inputLabels: function(i) { return sf.inputLabels?sf.inputLabels[i]:null },
             outputLabels: function(i) { return sf.outputLabels?sf.outputLabels[i]:null },
             oneditresize: function(size) {
-                var rows = $("#dialog-form>div:not(.node-input-env-container-row)");
+                // var rows = $(".dialog-form>div:not(.node-input-env-container-row)");
                 var height = size.height;
-                for (var i=0; i<rows.size(); i++) {
-                    height -= $(rows[i]).outerHeight(true);
-                }
-                var editorRow = $("#dialog-form>div.node-input-env-container-row");
-                height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
-                $("#node-input-env-container").editableList('height',height-80);
+                // for (var i=0; i<rows.size(); i++) {
+                //     height -= $(rows[i]).outerHeight(true);
+                // }
+                // var editorRow = $("#dialog-form>div.node-input-env-container-row");
+                // height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
+                $("ol.red-ui-editor-subflow-env-list").editableList('height',height);
             },
             set:{
                 module: "node-red"
@@ -393,6 +419,7 @@ RED.nodes = (function() {
     }
     function removeSubflow(sf) {
         delete subflows[sf.id];
+        delete nodeTabMap[sf.id];
         registry.removeNodeType("subflow:"+sf.id);
     }
 
@@ -463,7 +490,9 @@ RED.nodes = (function() {
         node.id = n.id;
         node.type = n.type;
         node.z = n.z;
-
+        if (n.d === true) {
+            node.d = true;
+        }
         if (node.type == "unknown") {
             for (var p in n._orig) {
                 if (n._orig.hasOwnProperty(p)) {
@@ -549,6 +578,7 @@ RED.nodes = (function() {
         node.in = [];
         node.out = [];
         node.env = n.env;
+        node.color = n.color;
 
         n.in.forEach(function(p) {
             var nIn = {x:p.x,y:p.y,wires:[]};
@@ -581,7 +611,7 @@ RED.nodes = (function() {
             node.outputLabels = n.outputLabels.slice();
         }
         if (n.icon) {
-            if (n.icon !== "node-red/subflow.png") {
+            if (n.icon !== "node-red/subflow.svg") {
                 node.icon = n.icon;
             }
         }
@@ -815,7 +845,7 @@ RED.nodes = (function() {
             var m = /^subflow:(.+)$/.exec(newNodes[i].type);
             if (m) {
                 var subflowId = m[1];
-                var parent = getSubflow(newNodes[i].z || activeWorkspace);
+                var parent = getSubflow(activeWorkspace);
                 if (parent) {
                     var err;
                     if (subflowId === parent.id) {
@@ -967,6 +997,9 @@ RED.nodes = (function() {
                         users:[],
                         _config:{}
                     };
+                    if (n.hasOwnProperty('d')) {
+                        configNode.d = n.d;
+                    }
                     for (d in def.defaults) {
                         if (def.defaults.hasOwnProperty(d)) {
                             configNode[d] = n[d];
@@ -1016,6 +1049,9 @@ RED.nodes = (function() {
                     if (n.hasOwnProperty('l')) {
                         node.l = n.l;
                     }
+                    if (n.hasOwnProperty('d')) {
+                        node.d = n.d;
+                    }
                     if (createNewIds) {
                         if (subflow_blacklist[n.z]) {
                             continue;
@@ -1158,6 +1194,7 @@ RED.nodes = (function() {
         var nodeTypeArrayReferences = {
             "catch":"scope",
             "status":"scope",
+            "complete": "scope",
             "link in":"links",
             "link out":"links"
         }
@@ -1258,13 +1295,22 @@ RED.nodes = (function() {
     // TODO: supports filter.z|type
     function filterNodes(filter) {
         var result = [];
+        var searchSet = nodes;
+        var doZFilter = false;
+        if (filter.hasOwnProperty("z")) {
+            if (Object.hasOwnProperty("values") && nodeTabMap.hasOwnProperty(filter.z) ) {
+                searchSet = Object.values(nodeTabMap[filter.z]);
+            } else {
+                doZFilter = true;
+            }
+        }
 
-        for (var n=0;n<nodes.length;n++) {
-            var node = nodes[n];
-            if (filter.hasOwnProperty("z") && node.z !== filter.z) {
+        for (var n=0;n<searchSet.length;n++) {
+            var node = searchSet[n];
+            if (filter.hasOwnProperty("type") && node.type !== filter.type) {
                 continue;
             }
-            if (filter.hasOwnProperty("type") && node.type !== filter.type) {
+            if (doZFilter && node.z !== filter.z) {
                 continue;
             }
             result.push(node);
@@ -1331,6 +1377,7 @@ RED.nodes = (function() {
     function clear() {
         nodes = [];
         links = [];
+        nodeTabMap = {};
         configNodes = {};
         workspacesOrder = [];
         var subflowIds = Object.keys(subflows);
@@ -1440,6 +1487,8 @@ RED.nodes = (function() {
         remove: removeNode,
         clear: clear,
 
+        moveNodeToTab: moveNodeToTab,
+
         addLink: addLink,
         removeLink: removeLink,
 

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

@@ -107,9 +107,12 @@ var RED = (function() {
     }
 
     function loadNodes() {
+        var lang = localStorage.getItem("editor-language")||i18n.detectLanguage();
+
         $.ajax({
             headers: {
-                "Accept":"text/html"
+                "Accept":"text/html",
+                "Accept-Language": lang
             },
             cache: false,
             url: 'nodes',
@@ -415,8 +418,6 @@ var RED = (function() {
                 RED.notify(RED._("palette.event.nodeUpgraded", {module:msg.module,version:msg.version}),"success");
                 RED.nodes.registry.setModulePendingUpdated(msg.module,msg.version);
             }
-            // Refresh flow library to ensure any examples are updated
-            RED.library.loadFlowLibrary();
         });
         RED.comms.subscribe("event-log/#", function(topic,payload) {
             var id = topic.substring(9);
@@ -430,7 +431,7 @@ var RED = (function() {
             '<img width="50px" src="red/images/node-red-icon.svg" />'+
             '</div>';
 
-            RED.sidebar.info.set(aboutHeader+marked(data));
+            RED.sidebar.info.set(aboutHeader+RED.utils.renderMarkdown(data));
             RED.sidebar.info.show();
         });
     }
@@ -448,11 +449,16 @@ var RED = (function() {
             {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},
             {id:"menu-item-event-log",label:RED._("eventLog.title"),onselect:"core:show-event-log"},
+            {id:"menu-item-action-list",label:RED._("keyboard.actionList"),onselect:"core:show-action-list"},
             null
         ]});
         menuOptions.push(null);
-        menuOptions.push({id:"menu-item-import",label:RED._("menu.label.import"),onselect:"core:show-import-dialog"});
-        menuOptions.push({id:"menu-item-export",label:RED._("menu.label.export"),onselect:"core:show-export-dialog"});
+        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"});
+        }
+        if (RED.settings.theme("menu.menu-item-export-library", true)) {
+            menuOptions.push({id: "menu-item-export", label: RED._("menu.label.export"), onselect: "core:show-export-dialog"});
+        }
         menuOptions.push(null);
         menuOptions.push({id:"menu-item-search",label:RED._("menu.label.search"),onselect:"core:search"});
         menuOptions.push(null);
@@ -475,7 +481,9 @@ var RED = (function() {
         menuOptions.push({id:"menu-item-user-settings",label:RED._("menu.label.settings"),onselect:"core:show-user-settings"});
         menuOptions.push(null);
 
-        menuOptions.push({id:"menu-item-keyboard-shortcuts",label:RED._("menu.label.keyboardShortcuts"),onselect:"core:show-help"});
+        if (RED.settings.theme("menu.menu-item-keyboard-shortcuts", true)) {
+            menuOptions.push({id: "menu-item-keyboard-shortcuts", label: RED._("menu.label.keyboardShortcuts"), onselect: "core:show-help"});
+        }
         menuOptions.push({id:"menu-item-help",
             label: RED.settings.theme("menu.menu-item-help.label",RED._("menu.label.help")),
             href: RED.settings.theme("menu.menu-item-help.url","http://nodered.org/docs")
@@ -518,6 +526,7 @@ var RED = (function() {
         RED.subflow.init();
         RED.clipboard.init();
         RED.search.init();
+        RED.actionList.init();
         RED.editor.init();
         RED.diff.init();
 

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

@@ -56,8 +56,9 @@ RED.settings = (function () {
         if (key === "auth-tokens") {
             return JSON.parse(localStorage.getItem(key));
         } else {
+            var v;
             try {
-                var v = RED.utils.getMessageProperty(userSettings,key);
+                v = RED.utils.getMessageProperty(userSettings,key);
                 if (v === undefined) {
                     v = defaultIfUndefined;
                 }

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

@@ -0,0 +1,230 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+RED.actionList = (function() {
+
+    var disabled = false;
+    var dialog = null;
+    var searchInput;
+    var searchResults;
+    var selected = -1;
+    var visible = false;
+
+    var filterTerm = "";
+    var filterTerms = [];
+    var previousActiveElement;
+
+    function ensureSelectedIsVisible() {
+        var selectedEntry = searchResults.find("li.selected");
+        if (selectedEntry.length === 1) {
+            var scrollWindow = searchResults.parent();
+            var scrollHeight = scrollWindow.height();
+            var scrollOffset = scrollWindow.scrollTop();
+            var y = selectedEntry.position().top;
+            var h = selectedEntry.height();
+            if (y+h > scrollHeight) {
+                scrollWindow.animate({scrollTop: '-='+(scrollHeight-(y+h)-10)},50);
+            } else if (y<0) {
+                scrollWindow.animate({scrollTop: '+='+(y-10)},50);
+            }
+        }
+    }
+
+    function createDialog() {
+        dialog = $("<div>",{id:"red-ui-actionList",class:"red-ui-search"}).appendTo("#red-ui-main-container");
+        var searchDiv = $("<div>",{class:"red-ui-search-container"}).appendTo(dialog);
+        searchInput = $('<input type="text" data-i18n="[placeholder]keyboard.filterActions">').appendTo(searchDiv).searchBox({
+            change: function() {
+                filterTerm = $(this).val().trim();
+                filterTerms = filterTerm.split(" ");
+                searchResults.editableList('filter');
+                searchResults.find("li.selected").removeClass("selected");
+                var children = searchResults.children(":visible");
+                if (children.length) {
+                    $(children[0]).addClass('selected');
+                }
+            }
+        });
+
+        searchInput.on('keydown',function(evt) {
+            var selectedChild;
+            if (evt.keyCode === 40) {
+                // Down
+                selectedChild = searchResults.find("li.selected");
+                if (!selectedChild.length) {
+                    var children = searchResults.children(":visible");
+                    if (children.length) {
+                        $(children[0]).addClass('selected');
+                    }
+                } else {
+                    var nextChild = selectedChild.nextAll(":visible").first();
+                    if (nextChild.length) {
+                        selectedChild.removeClass('selected');
+                        nextChild.addClass('selected');
+                    }
+                }
+                ensureSelectedIsVisible();
+                evt.preventDefault();
+            } else if (evt.keyCode === 38) {
+                // Up
+                selectedChild = searchResults.find("li.selected");
+                var nextChild = selectedChild.prevAll(":visible").first();
+                if (nextChild.length) {
+                    selectedChild.removeClass('selected');
+                    nextChild.addClass('selected');
+                }
+                ensureSelectedIsVisible();
+                evt.preventDefault();
+            } else if (evt.keyCode === 13) {
+                // Enter
+                selectedChild = searchResults.find("li.selected");
+                selectCommand(searchResults.editableList('getItem',selectedChild));
+            }
+        });
+        searchInput.i18n();
+
+        var searchResultsDiv = $("<div>",{class:"red-ui-search-results-container"}).appendTo(dialog);
+        searchResults = $('<ol>',{style:"position: absolute;top: 5px;bottom: 5px;left: 5px;right: 5px;"}).appendTo(searchResultsDiv).editableList({
+            addButton: false,
+            addItem: function(container,i,action) {
+                if (action.id === undefined) {
+                    $('<div>',{class:"red-ui-search-empty"}).text(RED._('search.empty')).appendTo(container);
+                } else {
+                    var div = $('<a>',{href:'#',class:"red-ui-search-result"}).appendTo(container);
+                    var contentDiv = $('<div>',{class:"red-ui-search-result-action"}).appendTo(div);
+
+
+                    $('<div>').text(action.label).appendTo(contentDiv);
+                    // $('<div>',{class:"red-ui-search-result-node-type"}).text(node.type).appendTo(contentDiv);
+                    // $('<div>',{class:"red-ui-search-result-node-id"}).text(node.id).appendTo(contentDiv);
+                    if (action.key) {
+                        $('<div>',{class:"red-ui-search-result-action-key"}).html(RED.keyboard.formatKey(action.key)).appendTo(contentDiv);
+                    }
+                    div.on("click", function(evt) {
+                        evt.preventDefault();
+                        selectCommand(action);
+                    });
+                }
+            },
+            scrollOnAdd: false,
+            filter: function(item) {
+                if (filterTerm !== "") {
+                    var pos=0;
+                    for (var i=0;i<filterTerms.length;i++) {
+                        var j = item._label.indexOf(filterTerms[i],pos);
+                        if (j > -1) {
+                            pos = j;
+                        } else {
+                            return false;
+                        }
+                    }
+                    return true;
+                }
+                return true;
+            }
+        });
+
+    }
+
+    function selectCommand(command) {
+        hide();
+        if (command) {
+            RED.actions.invoke(command.id);
+        }
+    }
+
+    function show(v) {
+        if (disabled) {
+            return;
+        }
+        if (!visible) {
+            previousActiveElement = document.activeElement;
+            RED.keyboard.add("*","escape",function(){hide()});
+            $("#red-ui-header-shade").show();
+            $("#red-ui-editor-shade").show();
+            $("#red-ui-palette-shade").show();
+            $("#red-ui-sidebar-shade").show();
+            $("#red-ui-sidebar-separator").hide();
+            if (dialog === null) {
+                createDialog();
+            }
+            dialog.slideDown(300);
+            searchInput.searchBox('value',v)
+            searchResults.editableList('empty');
+            results = [];
+            var actions = RED.actions.list();
+            actions.sort(function(A,B) {
+                return A.id.localeCompare(B.id);
+            });
+            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)
+            })
+            RED.events.emit("actionList:open");
+            visible = true;
+        }
+        searchInput.trigger("focus");
+        var children = searchResults.children(":visible");
+        if (children.length) {
+            $(children[0]).addClass('selected');
+        }
+    }
+
+    function hide() {
+        if (visible) {
+            RED.keyboard.remove("escape");
+            visible = false;
+            $("#red-ui-header-shade").hide();
+            $("#red-ui-editor-shade").hide();
+            $("#red-ui-palette-shade").hide();
+            $("#red-ui-sidebar-shade").hide();
+            $("#red-ui-sidebar-separator").show();
+            if (dialog !== null) {
+                dialog.slideUp(200,function() {
+                    searchInput.searchBox('value','');
+                });
+            }
+            RED.events.emit("actionList:close");
+            if (previousActiveElement) {
+                $(previousActiveElement).trigger("focus");
+                previousActiveElement = null;
+            }
+        }
+    }
+
+    function init() {
+        RED.actions.add("core:show-action-list",show);
+
+        RED.events.on("editor:open",function() { disabled = true; });
+        RED.events.on("editor:close",function() { disabled = false; });
+        RED.events.on("search:open",function() { disabled = true; });
+        RED.events.on("search:close",function() { disabled = false; });
+        RED.events.on("type-search:open",function() { disabled = true; });
+        RED.events.on("type-search:close",function() { disabled = false; });
+
+        $("#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);
+    }
+
+    return {
+        init: init,
+        show: show,
+        hide: hide
+    };
+
+})();

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

@@ -59,7 +59,7 @@ RED.clipboard = (function() {
                             element.setAttribute('download', "flows.json");
                             element.style.display = 'none';
                             document.body.appendChild(element);
-                            element.trigger("click");
+                            element.click();
                             document.body.removeChild(element);
                             $( this ).dialog( "close" );
                         }
@@ -396,14 +396,6 @@ RED.clipboard = (function() {
             label: RED._("library.types.examples")
         });
 
-        tabs.activateTab("red-ui-clipboard-dialog-import-tab-"+mode);
-        if (mode === 'clipboard') {
-            setTimeout(function() {
-                $("#red-ui-clipboard-dialog-import-text").trigger("focus");
-            },100)
-        }
-
-
         $("#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");
@@ -475,6 +467,14 @@ RED.clipboard = (function() {
             $("#red-ui-clipboard-dialog-import-file-upload").trigger("click");
         })
 
+        tabs.activateTab("red-ui-clipboard-dialog-import-tab-"+mode);
+        if (mode === 'clipboard') {
+            setTimeout(function() {
+                $("#red-ui-clipboard-dialog-import-text").trigger("focus");
+            },100)
+        }
+
+
         dialog.dialog("option","title",RED._("clipboard.importNodes")).dialog("open");
         popover = RED.popover.create({
             target: $("#red-ui-clipboard-dialog-import-text"),
@@ -521,8 +521,6 @@ RED.clipboard = (function() {
             label: RED._("library.library")
         });
 
-        tabs.activateTab("red-ui-clipboard-dialog-export-tab-"+mode);
-
         $("#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");
@@ -638,6 +636,7 @@ RED.clipboard = (function() {
         } else {
             $("#red-ui-clipboard-dialog-export-fmt-mini").trigger("click");
         }
+        tabs.activateTab("red-ui-clipboard-dialog-export-tab-"+mode);
         dialog.dialog("option","title",RED._("clipboard.exportNodes")).dialog( "open" );
 
         $("#red-ui-clipboard-dialog-export-text").trigger("focus");
@@ -655,7 +654,7 @@ RED.clipboard = (function() {
         //         icon: 'fa fa-hdd-o',
         //         label: RED._("library.types.examples"),
         //         path: "",
-        //         children: function(item,done) {
+        //         children: function(done,item) {
         //             RED.library.loadLibraryFolder("_examples_","flows","",function(children) {
         //                 item.children = children;
         //                 done(children);
@@ -670,13 +669,14 @@ RED.clipboard = (function() {
             label: label,
             path: "",
             expanded: true,
-            children: function(item,done) {
+            children: function(done, item) {
                 RED.library.loadLibraryFolder(library,"flows","",function(children) {
                     item.children = children;
                     done(children);
                 })
             }
-        }]);
+        }], true);
+
     }
 
     function hideDropTarget() {
@@ -730,17 +730,20 @@ RED.clipboard = (function() {
         init: function() {
             setupDialogs();
 
-            $('<input type="text" id="red-ui-clipboard-hidden">').appendTo("#red-ui-editor");
+            $('<input type="text" id="red-ui-clipboard-hidden" tabIndex="-1">').appendTo("#red-ui-editor");
 
             RED.actions.add("core:show-export-dialog",exportNodes);
             RED.actions.add("core:show-import-dialog",importNodes);
 
-            RED.actions.add("core:library-export",function() { exportNodes('library') });
+            RED.actions.add("core:show-library-export-dialog",function() { exportNodes('library') });
+            RED.actions.add("core:show-library-import-dialog",function() { importNodes('library') });
 
             RED.events.on("editor:open",function() { disabled = true; });
             RED.events.on("editor:close",function() { disabled = false; });
             RED.events.on("search:open",function() { disabled = true; });
             RED.events.on("search:close",function() { disabled = false; });
+            RED.events.on("actionList:open",function() { disabled = true; });
+            RED.events.on("actionList:close",function() { disabled = false; });
             RED.events.on("type-search:open",function() { disabled = true; });
             RED.events.on("type-search:close",function() { disabled = false; });
 

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

@@ -32,7 +32,10 @@
  *   - scrollOnAdd : boolean - whether to scroll to newly added items
  * methods:
  *   - addItem(itemData)
+ *   - insertItemAt : function(data,index) - add an item at the specified index
  *   - removeItem(itemData)
+ *   - getItemAt(index)
+ *   - indexOf(itemData)
  *   - width(width)
  *   - height(height)
  *   - items()
@@ -185,6 +188,11 @@
             }
         },
         _destroy: function() {
+            if (this.topContainer) {
+                var tc = this.topContainer;
+                delete this.topContainer;
+                tc.remove();
+            }
         },
         _refreshFilter: function() {
             var that = this;
@@ -230,7 +238,24 @@
             this.uiHeight = desiredHeight;
             this._resize();
         },
-        addItem: function(data) {
+        getItemAt: function(index) {
+            var items = this.items();
+            if (index >= 0 && index < items.length) {
+                return $(items[index]).data('data');
+            } else {
+                return;
+            }
+        },
+        indexOf: function(data) {
+            var items = this.items();
+            for (var i=0;i<items.length;i++) {
+                if ($(items[i]).data('data') === data) {
+                    return i
+                }
+            }
+            return -1
+        },
+        insertItemAt: function(data,index) {
             var that = this;
             data = data || {};
             var li = $('<li>');
@@ -248,7 +273,13 @@
                 });
             }
             if (!added) {
-                li.appendTo(this.element);
+                if (index <= 0) {
+                    li.prependTo(this.element);
+                } else if (index > that.element.children().length-1) {
+                    li.appendTo(this.element);
+                } else {
+                    li.insertBefore(this.element.children().eq(index));
+                }
             }
             var row = $('<div/>').addClass("red-ui-editableList-item-content").appendTo(li);
             row.data('data',data);
@@ -293,6 +324,9 @@
                 },0);
             }
         },
+        addItem: function(data) {
+            this.insertItemAt(data,this.element.children().length)
+        },
         addItems: function(items) {
             for (var i=0; i<items.length;i++) {
                 this.addItem(items[i]);
@@ -312,6 +346,7 @@
         },
         empty: function() {
             this.element.empty();
+            this.uiContainer.scrollTop(0);
         },
         filter: function(filter) {
             if (filter !== undefined) {
@@ -335,6 +370,14 @@
             if (items.length > 0) {
                 this.uiContainer.scrollTop(this.uiContainer.scrollTop()+items.position().top)
             }
+        },
+        getItem: function(li) {
+            var el = li.find(".red-ui-editableList-item-content");
+            if (el.length) {
+                return el.data('data');
+            } else {
+                return null;
+            }
         }
     });
 })(jQuery);

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

@@ -71,7 +71,7 @@ RED.menu = (function() {
 
             }
             if (opt.icon !== undefined) {
-                if (/\.png/.test(opt.icon)) {
+                if (/\.(png|svg)/.test(opt.icon)) {
                     linkContent += '<img src="'+opt.icon+'"/> ';
                 } else {
                     linkContent += '<i class="'+(opt.icon?opt.icon:'" style="display: inline-block;"')+'"></i> ';
@@ -98,21 +98,10 @@ RED.menu = (function() {
                         return;
                     }
                     if (opt.toggle) {
-                        var selected = isSelected(opt.id);
-                        if (typeof opt.toggle === "string") {
-                            if (!selected) {
-                                for (var m in menuItems) {
-                                    if (menuItems.hasOwnProperty(m)) {
-                                        var mi = menuItems[m];
-                                        if (mi.id != opt.id && opt.toggle == mi.toggle) {
-                                            setSelected(mi.id,false);
-                                        }
-                                    }
-                                }
-                                setSelected(opt.id,true);
-                            }
+                        if (opt.toggle === true) {
+                            setSelected(opt.id, !isSelected(opt.id));
                         } else {
-                            setSelected(opt.id, !selected);
+                            setSelected(opt.id, true);
                         }
                     } else {
                         triggerAction(opt.id);
@@ -209,8 +198,9 @@ RED.menu = (function() {
     }
 
     function setSelected(id,state) {
+        var alreadySet = false;
         if (isSelected(id) == state) {
-            return;
+            alreadySet = true;
         }
         var opt = menuItems[id];
         if (state) {
@@ -218,10 +208,26 @@ RED.menu = (function() {
         } else {
             $("#"+id).removeClass("active");
         }
-        if (opt && opt.onselect) {
-            triggerAction(opt.id,state);
+        if (opt) {
+            if (opt.toggle && typeof opt.toggle === "string") {
+                if (state) {
+                    for (var m in menuItems) {
+                        if (menuItems.hasOwnProperty(m)) {
+                            var mi = menuItems[m];
+                            if (mi.id != opt.id && opt.toggle == mi.toggle) {
+                                setSelected(mi.id,false);
+                            }
+                        }
+                    }
+                }
+            }
+            if (!alreadySet && opt.onselect) {
+                triggerAction(opt.id,state);
+            }
+            if (!opt.local && !alreadySet) {
+                RED.settings.set(opt.setting||("menu-"+opt.id), state);
+            }
         }
-        RED.settings.set(opt.setting||("menu-"+opt.id), state);
     }
 
     function toggleSelected(id) {
@@ -238,7 +244,7 @@ RED.menu = (function() {
 
     function addItem(id,opt) {
         var item = createMenuItem(opt);
-        if (opt.group) {
+        if (opt !== null && opt.group) {
             var groupItems = $("#"+id+"-submenu").children(".red-ui-menu-group-"+opt.group);
             if (groupItems.length === 0) {
                 item.appendTo("#"+id+"-submenu");

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

@@ -52,6 +52,11 @@ RED.popover = (function() {
 
         var openPopup = function(instant) {
             if (active) {
+                var existingPopover = target.data("red-ui-popover");
+                if (options.tooltip && existingPopover) {
+                    active = false;
+                    return;
+                }
                 div = $('<div class="red-ui-popover"></div>');
                 if (size !== "default") {
                     div.addClass("red-ui-popover-size-"+size);
@@ -122,7 +127,15 @@ RED.popover = (function() {
                     }
                 }
                 div.addClass('red-ui-popover-'+d).css({top: top, left: left});
-
+                if (existingPopover) {
+                    existingPopover.close(true);
+                }
+                target.data("red-ui-popover",res)
+                if (options.tooltip) {
+                    div.on("mousedown", function(evt) {
+                        closePopup(true);
+                    });
+                }
                 if (instant) {
                     div.show();
                 } else {
@@ -142,6 +155,7 @@ RED.popover = (function() {
                         });
                     }
                     div = null;
+                    target.removeData("red-ui-popover",res)
                 }
             }
         }
@@ -236,6 +250,7 @@ RED.popover = (function() {
                 }
             }
             return RED.popover.create({
+                tooltip: true,
                 target:target,
                 trigger: "hover",
                 size: "small",
@@ -243,6 +258,71 @@ RED.popover = (function() {
                 content: label,
                 delay: { show: 750, hide: 50 }
             });
+        },
+        panel: function(content) {
+            var panel = $('<div class="red-ui-editor-dialog red-ui-popover-panel"></div>');
+            panel.css({ display: "none" });
+            panel.appendTo(document.body);
+            content.appendTo(panel);
+            var closeCallback;
+
+            function hide() {
+                $(document).off("mousedown.red-ui-popover-panel-close");
+                panel.hide();
+                panel.css({
+                    height: "auto"
+                });
+                panel.remove();
+            }
+            function show(options) {
+                var closeCallback = options.onclose;
+                var target = options.target;
+                var align = options.align || "left";
+
+                var pos = target.offset();
+                var targetWidth = target.width();
+                var targetHeight = target.height();
+                var panelHeight = panel.height();
+                var panelWidth = panel.width();
+
+                var top = (targetHeight+pos.top);
+                if (top+panelHeight > $(window).height()) {
+                    top -= (top+panelHeight)-$(window).height() + 5;
+                }
+                if (top < 0) {
+                    panelHeight.height(panelHeight+top)
+                    top = 0;
+                }
+                if (align === "left") {
+                    panel.css({
+                        top: top+"px",
+                        left: (pos.left)+"px",
+                    });
+                } else if(align === "right") {
+                    panel.css({
+                        top: top+"px",
+                        left: (pos.left-panelWidth)+"px",
+                    });
+                }
+                panel.slideDown(100);
+
+                $(document).on("mousedown.red-ui-popover-panel-close", function(event) {
+                    if(!$(event.target).closest(panel).length && !$(event.target).closest(".red-ui-editor-dialog").length) {
+                        if (closeCallback) {
+                            closeCallback();
+                        }
+                        hide();
+                    }
+                    // if ($(event.target).closest(target).length) {
+                    //     event.preventDefault();
+                    // }
+                })
+            }
+            return  {
+                container: panel,
+                show:show,
+                hide:hide
+            }
         }
     }
 

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

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

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

@@ -19,6 +19,9 @@
 RED.tabs = (function() {
 
     var defaultTabIcon = "fa fa-lemon-o";
+    var dragActive = false;
+    var dblClickTime;
+    var dblClickArmed = false;
 
     function createTabs(options) {
         var tabs = {};
@@ -201,12 +204,21 @@ RED.tabs = (function() {
         }
 
         function onTabClick(evt) {
-            evt.preventDefault();
+            if (dragActive) {
+                return
+            }
+            if (dblClickTime && Date.now()-dblClickTime < 400) {
+                dblClickTime = 0;
+                dblClickArmed = true;
+                return onTabDblClick.call(this,evt);
+            }
+            dblClickTime = Date.now();
+
             var currentTab = ul.find("li.red-ui-tab.active");
             var thisTab = $(this).parent();
             var fireSelectionChanged = false;
             if (options.onselect) {
-                if (evt.metaKey) {
+                if (evt.metaKey || evt.ctrlKey) {
                     if (thisTab.hasClass("selected")) {
                         thisTab.removeClass("selected");
                         if (thisTab[0] !== currentTab[0]) {
@@ -267,7 +279,6 @@ RED.tabs = (function() {
             if (fireSelectionChanged) {
                 selectionChanged();
             }
-            return false;
         }
 
         function updateScroll() {
@@ -289,7 +300,6 @@ RED.tabs = (function() {
         }
         function onTabDblClick(evt) {
             evt.preventDefault();
-            evt.stopPropagation();
             if (evt.metaKey || evt.shiftKey) {
                 return;
             }
@@ -418,7 +428,11 @@ RED.tabs = (function() {
 
         }
 
-        ul.find("li.red-ui-tab a").on("click",onTabClick).on("dblclick",onTabDblClick);
+        ul.find("li.red-ui-tab a")
+            .on("mouseup",onTabClick)
+            .on("click", function(evt) {evt.preventDefault(); })
+            .on("dblclick", function(evt) {evt.stopPropagation(); evt.preventDefault(); })
+
         setTimeout(function() {
             updateTabWidths();
         },0);
@@ -524,8 +538,9 @@ RED.tabs = (function() {
                     RED.popover.tooltip($(pinnedLink), tab.name, tab.action);
 
                 }
-                link.on("click",onTabClick);
-                link.on("dblclick",onTabDblClick);
+                link.on("mouseup",onTabClick);
+                link.on("click", function(evt) { evt.preventDefault(); })
+                link.on("dblclick", function(evt) { evt.stopPropagation(); evt.preventDefault(); })
 
 
                 if (tab.closeable) {
@@ -560,6 +575,8 @@ RED.tabs = (function() {
                         axis:"x",
                         distance: 20,
                         start: function(event,ui) {
+                            if (dblClickArmed) { dblClickArmed = false; return false }
+                            dragActive = true;
                             originalTabOrder = [];
                             tabElements = [];
                             ul.children().each(function(i) {
@@ -615,6 +632,7 @@ RED.tabs = (function() {
                             }
                         },
                         stop: function(event,ui) {
+                            dragActive = false;
                             ul.children().css({position:"relative",left:"",transition:""});
                             if (!li.hasClass('active')) {
                                 li.css({zIndex:""});

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

@@ -39,15 +39,14 @@
             var baseClass = this.options.baseClass || "red-ui-button";
             var enabledIcon = this.options.enabledIcon || "fa-check-square-o";
             var disabledIcon = this.options.disabledIcon || "fa-square-o";
-            var enabledLabel = this.options.enabledLabel || RED._("editor:workspace.enabled");
-            var disabledLabel = this.options.disabledLabel || RED._("editor:workspace.disabled");
+            var enabledLabel = this.options.hasOwnProperty('enabledLabel') ? this.options.enabledLabel : RED._("editor:workspace.enabled");
+            var disabledLabel = this.options.hasOwnProperty('disabledLabel') ? this.options.disabledLabel : RED._("editor:workspace.disabled");
 
-            this.element.addClass("red-ui-toggleButton");
             this.element.css("display","none");
             this.element.on("focus", function() {
                 that.button.focus();
             });
-            this.button = $('<button type="button" class="'+baseClass+' toggle single"><i class="fa"></i> <span></span></button>');
+            this.button = $('<button type="button" class="red-ui-toggleButton '+baseClass+' toggle single"><i class="fa"></i> <span></span></button>');
             if (this.options.class) {
                 this.button.addClass(this.options.class)
             }

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

@@ -20,6 +20,10 @@
  *   - data : array - initial items to display in tree
  *   - multi : boolean - if true, .selected will return an array of results
  *                       otherwise, returns the first selected item
+ *   - sortable: boolean/string - TODO: see editableList
+ *   - rootSortable: boolean - if 'sortable' is set, then setting this to
+ *                             false, prevents items being sorted to the
+ *                             top level of the tree
  *
  * methods:
  *   - data(items) - clears existing items and replaces with new data
@@ -27,25 +31,57 @@
  * events:
  *   - treelistselect : function(event, item) {}
  *   - treelistconfirm : function(event,item) {}
+ *   - treelistchangeparent: function(event,item, oldParent, newParent) {}
  *
  * data:
  * [
  *     {
  *         label: 'Local', // label for the item
+ *         sublabel: 'Local', // a sub-label for the item
  *         icon: 'fa fa-rocket', // (optional) icon for the item
  *         selected: true/false, // (optional) if present, display checkbox accordingly
- *         children: [] | function(item,done) // (optional) an array of child items, or a function
+ *         children: [] | function(done,item) // (optional) an array of child items, or a function
  *                                       // that will call the `done` callback with an array
  *                                       // of child items
+ *         expanded: true/false, // show the child items by default
+ *         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
  *     }
  * ]
  *
- *
- *
  * var treeList = $("<div>").css({width: "100%", height: "100%"}).treeList({data:[...]})
  * treeList.on('treelistselect', function(e,item) { console.log(item)})
  * treeList.treeList('data',[ ... ] )
  *
+ *
+ * After `data` has been added to the tree, each item is augmented the following
+ * properties and functions:
+ *
+ *   item.parent - set to the parent item
+ *   item.treeList.container
+ *   item.treeList.label - the label element for the item
+ *   item.treeList.depth - the depth in the tree (0 == root)
+ *   item.treeList.parentList  - the editableList instance this item is in
+ *   item.treeList.remove() - removes the item from the tree
+ *   item.treeList.makeLeaf(detachChildElements) - turns an element with children into a leaf node,
+ *                                                 removing the UI decoration etc.
+ *                                                 detachChildElements - any children with custom
+ *                                                 elements will be detached rather than removed
+ *                                                 so jQuery event handlers are preserved in case
+ *                                                 the child elements need to be reattached later
+ *   item.treeList.makeParent(children) - turns an element into a parent node, adding the necessary
+ *                                        UI decoration.
+ *   item.treeList.insertChildAt(newItem,position,select) - adds a child item an the specified position.
+ *                                                          Optionally selects the item after adding.
+ *   item.treeList.addChild(newItem,select) - appends a child item.
+ *                                            Optionally selects the item after adding.
+ *   item.treeList.expand(done) - expands the parent item to show children. Optional 'done' callback.
+ *   item.treeList.collapse() - collapse the parent item to hide children.
+ *
+ *
+ *
+ *
  */
 
     $.widget( "nodered.treeList", {
@@ -116,20 +152,30 @@
             });
             this._data = [];
 
-            this._topList = $('<ol>').css({
+            this._topList = $('<ol class="red-ui-treeList-list">').css({
                 position:'absolute',
                 top: 0,
                 left:0,
                 right:0,
                 bottom:0
-            }).appendTo(wrapper).editableList({
+            }).appendTo(wrapper);
+
+            var topListOptions = {
                 addButton: false,
                 scrollOnAdd: false,
                 height: '100%',
                 addItem: function(container,i,item) {
                     that._addSubtree(that._topList,container,item,0);
                 }
-            })
+            };
+            if (this.options.rootSortable !== false && !!this.options.sortable) {
+                topListOptions.sortable = this.options.sortable;
+                topListOptions.connectWith = '.red-ui-treeList-sortable';
+                this._topList.addClass('red-ui-treeList-sortable');
+            }
+            this._topList.editableList(topListOptions)
+
+
             if (this.options.data) {
                 this.data(this.options.data);
             }
@@ -171,23 +217,82 @@
         },
         _addChildren: function(container,parent,children,depth) {
             var that = this;
-            var subtree = $('<ol>').appendTo(container).editableList({
+            var subtree = $('<ol class="red-ui-treeList-list">').appendTo(container).editableList({
+                connectWith: ".red-ui-treeList-sortable",
+                sortable: that.options.sortable,
                 addButton: false,
                 scrollOnAdd: false,
                 height: 'auto',
                 addItem: function(container,i,item) {
                     that._addSubtree(subtree,container,item,depth+1);
+                },
+                sortItems: function(data) {
+                    var children = [];
+                    var reparented = [];
+                    data.each(function() {
+                        var child = $(this).data('data');
+                        children.push(child);
+                        var evt = that._fixDepths(parent,child);
+                        if (evt) {
+                            reparented.push(evt);
+                        }
+                    })
+                    if (Array.isArray(parent.children)) {
+                        parent.children = children;
+                    }
+                    reparented.forEach(function(evt) {
+                        that._trigger("changeparent",null,evt);
+                    });
+                    that._trigger("sort",null,parent);
                 }
             });
+            if (!!that.options.sortable) {
+                subtree.addClass('red-ui-treeList-sortable');
+            }
             for (var i=0;i<children.length;i++) {
                 children[i].parent = parent;
                 subtree.editableList('addItem',children[i])
             }
             return subtree;
         },
+        _fixDepths: function(parent,child) {
+            // If child has just been moved into parent in the UI
+            // this will fix up the internal data structures to match.
+            // The calling function must take care of getting child
+            // into the parent.children array. The rest is up to us.
+            var that = this;
+            var reparentedEvent = null;
+            if (child.parent !== parent) {
+                reparented = true;
+                var oldParent = child.parent;
+                child.parent = parent;
+                reparentedEvent = {
+                    item: child,
+                    old: oldParent,
+                }
+            }
+            if (child.depth !== parent.depth+1) {
+                child.depth = parent.depth+1;
+                var labelPaddingWidth = ((child.gutter?child.gutter.width()+2:0)+(child.depth*20));
+                child.treeList.labelPadding.width(labelPaddingWidth+'px');
+                if (child.element) {
+                    $(child.element).css({
+                        width: "calc(100% - "+(labelPaddingWidth+20+(child.icon?20:0))+"px)"
+                    })
+                }
+                // This corrects all child item depths
+                if (child.children && Array.isArray(child.children)) {
+                    child.children.forEach(function(item) {
+                        that._fixDepths(child,item);
+                    })
+                }
+            }
+            return reparentedEvent;
+        },
         _addSubtree: function(parentList, container, item, depth) {
             var that = this;
             item.treeList = {};
+            item.treeList.depth = depth;
             item.treeList.container = container;
 
             item.treeList.parentList = parentList;
@@ -196,87 +301,80 @@
                 if (item.parent) {
                     var index = item.parent.children.indexOf(item);
                     item.parent.children.splice(index,1)
+                    that._trigger("sort",null,item.parent);
                 }
             }
-            var labelNodeType = "<div>";
-            // if (item.children && item.hasOwnProperty('selected')) {
-            //     labelNodeType = "<div>";
-            // }
-            var label = $(labelNodeType,{class:"red-ui-treeList-label"}).appendTo(container);
+
+            var label = $("<div>",{class:"red-ui-treeList-label"}).appendTo(container);
             item.treeList.label = label;
             if (item.class) {
                 label.addClass(item.class);
             }
-            label.css({
-                paddingLeft: (depth*15)+'px'
-            })
+            if (item.gutter) {
+                item.gutter.css({
+                    position: 'absolute'
+                }).appendTo(label)
+
+            }
+            var labelPaddingWidth = (item.gutter?item.gutter.width()+2:0)+(depth*20);
+            item.treeList.labelPadding = $('<span>').css({
+                display: "inline-block",
+                width:  labelPaddingWidth+'px'
+            }).appendTo(label);
+
             label.on('mouseover',function(e) { that._trigger('itemmouseover',e,item); })
             label.on('mouseout',function(e) { that._trigger('itemmouseout',e,item); })
             label.on('mouseenter',function(e) { that._trigger('itemmouseenter',e,item); })
             label.on('mouseleave',function(e) { that._trigger('itemmouseleave',e,item); })
 
-            if (item.children) {
-                item.treeList.addChild = function(newItem,select) {
-                    item.treeList.childList.editableList('addItem',newItem)
-                    newItem.parent = item;
-                    item.children.push(newItem);
-                    if (select) {
-                        setTimeout(function() {
-                            that.select(newItem)
-                        },100);
-                    }
+            item.treeList.makeLeaf = function(detachChildElements) {
+                if (!treeListIcon.children().length) {
+                    // Already a leaf
+                    return
                 }
-                item.treeList.expand = function(done) {
-                    if (container.hasClass("expanded")) {
-                        done && done();
-                        return;
-                    }
-                    if (!container.hasClass("built") && typeof item.children === 'function') {
-                        container.addClass('built');
-                        var childrenAdded = false;
-                        var spinner;
-                        var startTime = 0;
-                        item.children(item,function(children) {
-                            childrenAdded = true;
-                            item.treeList.childList = that._addChildren(container,item,children,depth).hide();
-                            var delta = Date.now() - startTime;
-                            if (delta < 400) {
-                                setTimeout(function() {
-                                    item.treeList.childList.slideDown('fast');
-                                    if (spinner) {
-                                        spinner.remove();
-                                    }
-                                },400-delta);
-                            } else {
-                                item.treeList.childList.slideDown('fast');
-                                if (spinner) {
-                                    spinner.remove();
+                if (detachChildElements && item.children) {
+                    var detachChildren = function(item) {
+                        if (item.children) {
+                            item.children.forEach(function(child) {
+                                if (child.element) {
+                                    child.element.detach();
                                 }
-                            }
-                            done && done();
-                            that._trigger("childrenloaded",null,item)
-                        });
-                        if (!childrenAdded) {
-                            startTime = Date.now();
-                            spinner = $('<div class="red-ui-treeList-spinner">').css({
-                                "background-position": (35+depth*15)+'px 50%'
-                            }).appendTo(container);
+                                if (child.gutter) {
+                                    child.gutter.detach();
+                                }
+                                detachChildren(child);
+                            });
                         }
-
-                    } else {
-                        item.treeList.childList.slideDown('fast');
-                        done && done();
                     }
-                    container.addClass("expanded");
+                    detachChildren(item);
                 }
-                item.treeList.collapse = function() {
-                    item.treeList.childList.slideUp('fast');
-                    container.removeClass("expanded");
+                treeListIcon.empty();
+                if (!item.deferBuild) {
+                    item.treeList.childList.remove();
+                    delete item.treeList.childList;
                 }
-
-                $('<span class="red-ui-treeList-icon"><i class="fa fa-angle-right" /></span>').appendTo(label);
+                label.off("click.red-ui-treeList-expand");
+                treeListIcon.off("click.red-ui-treeList-expand");
+                delete item.children;
+                container.removeClass("expanded");
+            }
+            item.treeList.makeParent = function(children) {
+                if (treeListIcon.children().length) {
+                    // Already a parent because we've got the angle-right icon
+                    return;
+                }
+                $('<i class="fa fa-angle-right" />').appendTo(treeListIcon);
+                treeListIcon.on("click.red-ui-treeList-expand", function(e) {
+                        e.stopPropagation();
+                        e.preventDefault();
+                        if (container.hasClass("expanded")) {
+                            item.treeList.collapse();
+                        } else {
+                            item.treeList.expand();
+                        }
+                    });
                 // $('<span class="red-ui-treeList-icon"><i class="fa fa-folder-o" /></span>').appendTo(label);
-                label.on("click", function(e) {
+                label.on("click.red-ui-treeList-expand", function(e) {
                     if (container.hasClass("expanded")) {
                         if (item.hasOwnProperty('selected') || label.hasClass("selected")) {
                             item.treeList.collapse();
@@ -285,9 +383,97 @@
                         item.treeList.expand();
                     }
                 })
-            } else {
-                $('<span class="red-ui-treeList-icon"></span>').appendTo(label);
+                if (!item.children) {
+                    item.children = children||[];
+                    item.treeList.childList = that._addChildren(container,item,item.children,depth).hide();
+                }
             }
+            item.treeList.insertChildAt = function(newItem,position,select) {
+                newItem.parent = item;
+                item.children.splice(position,0,newItem);
+
+                if (!item.deferBuild) {
+                    item.treeList.childList.editableList('insertItemAt',newItem,position)
+                    if (select) {
+                        setTimeout(function() {
+                            that.select(newItem)
+                        },100);
+                    }
+                    that._trigger("sort",null,item);
+                }
+            }
+            item.treeList.addChild = function(newItem,select) {
+                item.treeList.insertChildAt(newItem,item.children.length,select);
+            }
+            item.treeList.expand = function(done) {
+                if (!item.children) {
+                    return;
+                }
+                if (container.hasClass("expanded")) {
+                    if (done) { done() }
+                    return;
+                }
+                if (!container.hasClass("built") && (item.deferBuild || typeof item.children === 'function')) {
+                    container.addClass('built');
+                    var childrenAdded = false;
+                    var spinner;
+                    var startTime = 0;
+                    var completeBuild = function(children) {
+                        childrenAdded = true;
+                        item.treeList.childList = that._addChildren(container,item,children,depth).hide();
+                        var delta = Date.now() - startTime;
+                        if (delta < 400) {
+                            setTimeout(function() {
+                                item.treeList.childList.slideDown('fast');
+                                if (spinner) {
+                                    spinner.remove();
+                                }
+                            },400-delta);
+                        } else {
+                            item.treeList.childList.slideDown('fast');
+                            if (spinner) {
+                                spinner.remove();
+                            }
+                        }
+                        if (done) { done() }
+                        that._trigger("childrenloaded",null,item)
+                    }
+                    if (typeof item.children === 'function') {
+                        item.children(completeBuild,item);
+                    } else {
+                        delete item.deferBuild;
+                        completeBuild(item.children);
+                    }
+                    if (!childrenAdded) {
+                        startTime = Date.now();
+                        spinner = $('<div class="red-ui-treeList-spinner">').css({
+                            "background-position": (35+depth*20)+'px 50%'
+                        }).appendTo(container);
+                    }
+
+                } else {
+                    if (that._loadingData) {
+                        item.treeList.childList.show();
+                    } else {
+                        item.treeList.childList.slideDown('fast');
+                    }
+                    if (done) { done() }
+                }
+                container.addClass("expanded");
+            }
+            item.treeList.collapse = function() {
+                if (!item.children) {
+                    return;
+                }
+                item.treeList.childList.slideUp('fast');
+                container.removeClass("expanded");
+            }
+
+            var treeListIcon = $('<span class="red-ui-treeList-icon"></span>').appendTo(label);
+            if (item.children) {
+                item.treeList.makeParent();
+            }
+
             if (item.hasOwnProperty('selected')) {
                 var selectWrapper = $('<span class="red-ui-treeList-icon"></span>').appendTo(label);
                 var cb = $('<input class="red-ui-treeList-checkbox" type="checkbox">').prop('checked',item.selected).appendTo(selectWrapper);
@@ -326,19 +512,22 @@
             if (item.icon) {
                 $('<span class="red-ui-treeList-icon"><i class="'+item.icon+'" /></span>').appendTo(label);
             }
-            if (item.label || item.sublabel) {
-                if (item.label) {
+            if (item.hasOwnProperty('label') || item.hasOwnProperty('sublabel')) {
+                if (item.hasOwnProperty('label')) {
                     $('<span class="red-ui-treeList-label-text"></span>').text(item.label).appendTo(label);
                 }
-                if (item.sublabel) {
+                if (item.hasOwnProperty('sublabel')) {
                     $('<span class="red-ui-treeList-sublabel-text"></span>').text(item.sublabel).appendTo(label);
                 }
 
             } else if (item.element) {
                 $(item.element).appendTo(label);
+                $(item.element).css({
+                    width: "calc(100% - "+(labelPaddingWidth+20+(item.icon?20:0))+"px)"
+                })
             }
             if (item.children) {
-                if (Array.isArray(item.children)) {
+                if (Array.isArray(item.children) && !item.deferBuild) {
                     item.treeList.childList = that._addChildren(container,item,item.children,depth).hide();
                 }
                 if (item.expanded) {
@@ -350,12 +539,17 @@
             this._topList.editableList('empty');
         },
         data: function(items) {
+            var that = this;
             if (items !== undefined) {
                 this._data = items;
                 this._topList.editableList('empty');
+                this._loadingData = true;
                 for (var i=0; i<items.length;i++) {
                     this._topList.editableList('addItem',items[i]);
                 }
+                setTimeout(function() {
+                    delete that._loadingData;
+                },200);
                 this._trigger("select")
 
             } else {
@@ -384,7 +578,11 @@
                 })
                 return res;
             }
-            return s.parent().data('data');
+            if (s.length) {
+                return s.parent().data('data');
+            } else {
+                return undefined;
+            }
         }
     });
 

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

@@ -32,6 +32,12 @@
             return v;
         }
     }
+    var mapDeprecatedIcon = function(icon) {
+        if (/^red\/images\/typedInput\/.+\.png$/.test(icon)) {
+            icon = icon.replace(/.png$/,".svg");
+        }
+        return icon;
+    }
     var allOptions = {
         msg: {value:"msg",label:"msg.",validate:RED.utils.validatePropertyExpression},
         flow: {value:"flow",label:"flow.",hasValue:true,
@@ -46,13 +52,13 @@
             parse: contextParse,
             export: contextExport
         },
-        str: {value:"str",label:"string",icon:"red/images/typedInput/az.png"},
-        num: {value:"num",label:"number",icon:"red/images/typedInput/09.png",validate:/^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$/},
-        bool: {value:"bool",label:"boolean",icon:"red/images/typedInput/bool.png",options:["true","false"]},
+        str: {value:"str",label:"string",icon:"red/images/typedInput/az.svg"},
+        num: {value:"num",label:"number",icon:"red/images/typedInput/09.svg",validate:/^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$/},
+        bool: {value:"bool",label:"boolean",icon:"red/images/typedInput/bool.svg",options:["true","false"]},
         json: {
             value:"json",
             label:"JSON",
-            icon:"red/images/typedInput/json.png",
+            icon:"red/images/typedInput/json.svg",
             validate: function(v) { try{JSON.parse(v);return true;}catch(e){return false;}},
             expand: function() {
                 var that = this;
@@ -74,12 +80,12 @@
                 })
             }
         },
-        re: {value:"re",label:"regular expression",icon:"red/images/typedInput/re.png"},
-        date: {value:"date",label:"timestamp",hasValue:false},
+        re: {value:"re",label:"regular expression",icon:"red/images/typedInput/re.svg"},
+        date: {value:"date",label:"timestamp",icon:"fa fa-clock-o",hasValue:false},
         jsonata: {
             value: "jsonata",
             label: "expression",
-            icon: "red/images/typedInput/expr.png",
+            icon: "red/images/typedInput/expr.svg",
             validate: function(v) { try{jsonata(v);return true;}catch(e){return false;}},
             expand:function() {
                 var that = this;
@@ -94,7 +100,7 @@
         bin: {
             value: "bin",
             label: "buffer",
-            icon: "red/images/typedInput/bin.png",
+            icon: "red/images/typedInput/bin.svg",
             expand: function() {
                 var that = this;
                 RED.editor.editBuffer({
@@ -108,12 +114,12 @@
         env: {
             value: "env",
             label: "env variable",
-            icon: "red/images/typedInput/env.png"
+            icon: "red/images/typedInput/env.svg"
         },
         node: {
             value: "node",
             label: "node",
-            icon: "red/images/typedInput/target.png",
+            icon: "red/images/typedInput/target.svg",
             valueLabel: function(container,value) {
                 var node = RED.nodes.node(value);
                 var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).css({
@@ -209,7 +215,7 @@
                 that.input.css("margin"+d,0);
             });
 
-            ["type","placeholder"].forEach(function(d) {
+            ["type","placeholder","autocomplete","data-i18n"].forEach(function(d) {
                 var m = that.element.attr(d);
                 that.input.attr(d,m);
             });
@@ -225,6 +231,8 @@
 
             this.selectLabel = $('<span class="red-ui-typedInput-type-label"></span>').appendTo(this.selectTrigger);
 
+            this.valueLabelContainer = $('<div class="red-ui-typedInput-value-label">').appendTo(this.uiSelect)
+
             this.types(this.options.types);
 
             if (this.options.typeField) {
@@ -247,9 +255,15 @@
                 that.validate();
                 that.element.val(that.value());
                 that.element.trigger('change',that.propertyType,that.value());
+            });
+            this.input.on('keydown', function(evt) {
+                if (evt.keyCode >= 37 && evt.keyCode <= 40) {
+                    evt.stopPropagation();
+                }
             })
             this.selectTrigger.on("click", function(event) {
                 event.preventDefault();
+                event.stopPropagation();
                 that._showTypeMenu();
             });
             this.selectTrigger.on('keydown',function(evt) {
@@ -257,12 +271,11 @@
                     // Down
                     that._showTypeMenu();
                 }
+                evt.stopPropagation();
             }).on('focus', function() {
                 that.uiSelect.addClass('red-ui-typedInput-focus');
             })
 
-            this.valueLabelContainer = $('<div class="red-ui-typedInput-value-label">').appendTo(this.uiSelect)
-
             // 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);
@@ -271,19 +284,22 @@
             });
             this.optionSelectTrigger.on("click", function(event) {
                 event.preventDefault();
+                event.stopPropagation();
                 that._showOptionSelectMenu();
             }).on('keydown', function(evt) {
                 if (evt.keyCode === 40) {
                     // Down
                     that._showOptionSelectMenu();
                 }
+                evt.stopPropagation();
             }).on('blur', function() {
                 that.uiSelect.removeClass('red-ui-typedInput-focus');
             }).on('focus', function() {
                 that.uiSelect.addClass('red-ui-typedInput-focus');
             });
 
-            this.optionExpandButton = $('<button tabindex="0" class="red-ui-typedInput-option-expand" style="display:inline-block"><i class="red-ui-typedInput-icon fa fa-ellipsis-h"></i></button>').appendTo(this.uiSelect);
+            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);
         }catch(err) {
             console.log(err.stack);
@@ -321,6 +337,17 @@
             menu.css({
                 height: "auto"
             });
+
+            if (menu.opts.multiple) {
+                var selected = [];
+                menu.find('input[type="checkbox"]').each(function() {
+                    if ($(this).prop("checked")) {
+                        selected.push($(this).data('value'))
+                    }
+                })
+                menu.callback(selected);
+            }
+
             if (this.elementDiv.is(":visible")) {
                 this.input.trigger("focus");
             } else if (this.optionSelectTrigger.is(":visible")){
@@ -329,10 +356,12 @@
                 this.selectTrigger.trigger("focus");
             }
         },
-        _createMenu: function(opts,callback) {
+        _createMenu: function(menuOptions,opts,callback) {
             var that = this;
-            var menu = $("<div>").addClass("red-ui-typedInput-options");
-            opts.forEach(function(opt) {
+            var menu = $("<div>").addClass("red-ui-typedInput-options red-ui-editor-dialog");
+            menu.opts = opts;
+            menu.callback = callback;
+            menuOptions.forEach(function(opt) {
                 if (typeof opt === 'string') {
                     opt = {value:opt,label:opt};
                 }
@@ -344,7 +373,7 @@
                     if (opt.icon.indexOf("<") === 0) {
                         $(opt.icon).prependTo(op);
                     } else if (opt.icon.indexOf("/") !== -1) {
-                        $('<img>',{src:opt.icon,style:"margin-right: 4px; height: 18px;"}).prependTo(op);
+                        $('<img>',{src:mapDeprecatedIcon(opt.icon),style:"margin-right: 4px; height: 18px;"}).prependTo(op);
                     } else {
                         $('<i>',{class:"red-ui-typedInput-icon "+opt.icon}).prependTo(op);
                     }
@@ -354,11 +383,20 @@
                 if (!opt.icon && !opt.label) {
                     op.text(opt.value);
                 }
+                var cb;
+                if (opts.multiple) {
+                    cb = $('<input type="checkbox">').css("pointer-events","none").data('value',opt.value).prependTo(op).on("mousedown", function(evt) { evt.preventDefault() });
+                }
 
                 op.on("click", function(event) {
                     event.preventDefault();
-                    callback(opt.value);
-                    that._hideMenu(menu);
+                    event.stopPropagation();
+                    if (!opts.multiple) {
+                        callback(opt.value);
+                        that._hideMenu(menu);
+                    } else {
+                        cb.prop("checked",!cb.prop("checked"));
+                    }
                 });
             });
             menu.css({
@@ -376,13 +414,12 @@
                     // UP
                     $(this).children(":focus").prev().trigger("focus");
                 } else if (evt.keyCode === 27) {
+                    // ESCAPE
                     evt.preventDefault();
                     that._hideMenu(menu);
                 }
+                evt.stopPropagation();
             })
-
-
-
             return menu;
 
         },
@@ -391,11 +428,22 @@
                 this.disarmClick = false;
                 return
             }
+            if (menu.opts.multiple) {
+                var selected = {};
+                 this.value().split(",").forEach(function(f) {
+                     selected[f] = true;
+                 })
+                menu.find('input[type="checkbox"]').each(function() {
+                    $(this).prop("checked",selected[$(this).data('value')])
+                })
+            }
+
+
             var that = this;
             var pos = relativeTo.offset();
             var height = relativeTo.height();
             var menuHeight = menu.height();
-            var top = (height+pos.top-3);
+            var top = (height+pos.top);
             if (top+menuHeight > $(window).height()) {
                 top -= (top+menuHeight)-$(window).height()+5;
             }
@@ -405,7 +453,7 @@
             }
             menu.css({
                 top: top+"px",
-                left: (2+pos.left)+"px",
+                left: (pos.left)+"px",
             });
             menu.slideDown(100);
             this._delay(function() {
@@ -421,20 +469,27 @@
                 })
             });
         },
-        _getLabelWidth: function(label) {
+        _getLabelWidth: function(label, done) {
             var labelWidth = label.outerWidth();
             if (labelWidth === 0) {
-                var container = $('<div class="red-ui-typedInput-container"></div>').css({
+                var wrapper = $('<div class="red-ui-editor"></div>').css({
                     position:"absolute",
-                    top:0
+                    "white-space": "nowrap",
+                    top:-2000
                 }).appendTo(document.body);
+                var container = $('<div class="red-ui-typedInput-container"></div>').appendTo(wrapper);
                 var newTrigger = label.clone().appendTo(container);
-                labelWidth = newTrigger.outerWidth();
-                container.remove();
+                setTimeout(function() {
+                    labelWidth = newTrigger.outerWidth();
+                    wrapper.remove();
+                    done(labelWidth);
+                },50)
+            } else {
+                done(labelWidth);
             }
-            return labelWidth;
         },
         _resize: function() {
+            var that = this;
             if (this.uiWidth !== null) {
                 this.uiSelect.width(this.uiWidth);
             }
@@ -443,71 +498,78 @@
                 this.selectTrigger.addClass("red-ui-typedInput-full-width");
             } else {
                 this.selectTrigger.removeClass("red-ui-typedInput-full-width");
-                var labelWidth = this._getLabelWidth(this.selectTrigger);
-                this.elementDiv.css('left',labelWidth+"px");
-                this.valueLabelContainer.css('left',labelWidth+"px");
-                if (this.optionExpandButton.is(":visible")) {
-                    this.elementDiv.css('right',"22px");
-                    this.valueLabelContainer.css('right',"22px");
-                } else {
-                    this.elementDiv.css('right','0');
-                    this.valueLabelContainer.css('right','0');
-                    this.input.css({
-                        'border-top-right-radius': '4px',
-                        'border-bottom-right-radius': '4px'
-                    });
-                }
-
-                // if (this.optionSelectTrigger) {
-                //     this.optionSelectTrigger.css({'left':(labelWidth)+"px",'width':'calc( 100% - '+labelWidth+'px )'});
-                // }
-
-                if (this.optionSelectTrigger) {
-                    if (type && type.options && type.hasValue === true) {
-                        this.optionSelectLabel.css({'left':'auto'})
-                        var lw = this._getLabelWidth(this.optionSelectLabel);
-                        this.optionSelectTrigger.css({'width':(23+lw)+"px"});
-                        this.elementDiv.css('right',(23+lw)+"px");
-                        this.input.css({
-                            'border-top-right-radius': 0,
-                            'border-bottom-right-radius': 0
-                        });
+                this._getLabelWidth(this.selectTrigger, function(labelWidth) {
+                    that.elementDiv.css('left',labelWidth+"px");
+                    that.valueLabelContainer.css('left',labelWidth+"px");
+                    if (that.optionExpandButton.shown) {
+                        that.elementDiv.css('right',"22px");
+                        that.valueLabelContainer.css('right',"22px");
                     } else {
-                        this.optionSelectLabel.css({'left':'0'})
-                        this.optionSelectTrigger.css({'width':'calc( 100% - '+labelWidth+'px )'});
-                        if (!this.optionExpandButton.is(":visible")) {
-                            this.elementDiv.css({'right':0});
-                            this.input.css({
-                                'border-top-right-radius': '4px',
-                                'border-bottom-right-radius': '4px'
+                        that.elementDiv.css('right','0');
+                        that.valueLabelContainer.css('right','0');
+                        that.input.css({
+                            'border-top-right-radius': '4px',
+                            'border-bottom-right-radius': '4px'
+                        });
+                    }
+                    if (that.optionSelectTrigger) {
+                        if (type && type.options && type.hasValue === true) {
+                            that.optionSelectLabel.css({'left':'auto'})
+                            that._getLabelWidth(that.optionSelectLabel, function(lw) {
+                                that.optionSelectTrigger.css({'width':(23+lw)+"px"});
+                                that.elementDiv.css('right',(23+lw)+"px");
+                                that.input.css({
+                                    'border-top-right-radius': 0,
+                                    'border-bottom-right-radius': 0
+                                });
                             });
+                        } else {
+                            that.optionSelectLabel.css({'left':'0'})
+                            that.optionSelectTrigger.css({'width':'calc( 100% - '+labelWidth+'px )'});
+                            if (!that.optionExpandButton.shown) {
+                                that.elementDiv.css({'right':0});
+                                that.input.css({
+                                    'border-top-right-radius': '4px',
+                                    'border-bottom-right-radius': '4px'
+                                });
+                            }
                         }
                     }
-                }
+                });
             }
         },
         _updateOptionSelectLabel: function(o) {
             var opt = this.typeMap[this.propertyType];
             this.optionSelectLabel.empty();
-            if (o.icon) {
-                if (o.icon.indexOf("<") === 0) {
-                    $(o.icon).prependTo(this.optionSelectLabel);
-                } else if (o.icon.indexOf("/") !== -1) {
-                    // url
-                    $('<img>',{src:o.icon,style:"height: 18px;"}).prependTo(this.optionSelectLabel);
+            if (this.typeMap[this.propertyType].valueLabel) {
+                if (opt.multiple) {
+                    this.typeMap[this.propertyType].valueLabel.call(this,this.optionSelectLabel,o);
                 } else {
-                    // icon class
-                    $('<i>',{class:"red-ui-typedInput-icon "+o.icon}).prependTo(this.optionSelectLabel);
+                    this.typeMap[this.propertyType].valueLabel.call(this,this.optionSelectLabel,o.value);
+                }
+            } else if (!opt.multiple) {
+                if (o.icon) {
+                    if (o.icon.indexOf("<") === 0) {
+                        $(o.icon).prependTo(this.optionSelectLabel);
+                    } else if (o.icon.indexOf("/") !== -1) {
+                        // url
+                        $('<img>',{src:mapDeprecatedIcon(o.icon),style:"height: 18px;"}).prependTo(this.optionSelectLabel);
+                    } else {
+                        // icon class
+                        $('<i>',{class:"red-ui-typedInput-icon "+o.icon}).prependTo(this.optionSelectLabel);
+                    }
+                } else if (o.label) {
+                    this.optionSelectLabel.text(o.label);
+                } else {
+                    this.optionSelectLabel.text(o.value);
+                }
+                if (opt.hasValue) {
+                    this.optionValue = o.value;
+                    this._resize();
+                    this.input.trigger('change',this.propertyType,this.value());
                 }
-            } else if (o.label) {
-                this.optionSelectLabel.text(o.label);
             } else {
-                this.optionSelectLabel.text(o.value);
-            }
-            if (opt.hasValue) {
-                this.optionValue = o.value;
-                this._resize();
-                this.input.trigger('change',this.propertyType,this.value());
+                this.optionSelectLabel.text(o.length+" selected");
             }
         },
         _destroy: function() {
@@ -515,6 +577,7 @@
                 this.optionMenu.remove();
             }
             this.menu.remove();
+            this.uiSelect.remove();
         },
         types: function(types) {
             var that = this;
@@ -535,7 +598,7 @@
             if (this.menu) {
                 this.menu.remove();
             }
-            this.menu = this._createMenu(this.typeList, function(v) { that.type(v) });
+            this.menu = this._createMenu(this.typeList,{},function(v) { that.type(v) });
             if (currentType && !this.typeMap.hasOwnProperty(currentType)) {
                 this.type(this.typeList[0].value);
             } else {
@@ -549,37 +612,51 @@
             this._resize();
         },
         value: function(value) {
+            var that = this;
+            var opt = this.typeMap[this.propertyType];
             if (!arguments.length) {
                 var v = this.input.val();
-                if (this.typeMap[this.propertyType].export) {
-                    v = this.typeMap[this.propertyType].export(v,this.optionValue)
+                if (opt.export) {
+                    v = opt.export(v,this.optionValue)
                 }
                 return v;
             } else {
-                var selectedOption;
-                if (this.typeMap[this.propertyType].options) {
-                    for (var i=0;i<this.typeMap[this.propertyType].options.length;i++) {
-                        var op = this.typeMap[this.propertyType].options[i];
-                        if (typeof op === "string") {
-                            if (op === value) {
-                                selectedOption = this.activeOptions[op];
+                var selectedOption = [];
+                if (opt.options) {
+                    var checkValues = [value];
+                    if (opt.multiple) {
+                        selectedOption = [];
+                        checkValues = value.split(",");
+                    }
+                    checkValues.forEach(function(value) {
+                        for (var i=0;i<opt.options.length;i++) {
+                            var op = opt.options[i];
+                            if (typeof op === "string") {
+                                if (op === value || op === ""+value) {
+                                    selectedOption.push(that.activeOptions[op]);
+                                    break;
+                                }
+                            } else if (op.value === value) {
+                                selectedOption.push(op);
                                 break;
                             }
-                        } else if (op.value === value) {
-                            selectedOption = op;
-                            break;
                         }
+                    })
+                    this.input.val(value);
+                    if (!opt.multiple) {
+                        if (selectedOption.length === 0) {
+                            selectedOption = [{value:""}];
+                        }
+                        this._updateOptionSelectLabel(selectedOption[0])
+                    } else {
+                        this._updateOptionSelectLabel(selectedOption)
                     }
-                    if (!selectedOption) {
-                        selectedOption = {value:""}
-                    }
-                    this._updateOptionSelectLabel(selectedOption)
                 } else {
                     this.input.val(value);
-                }
-                if (this.typeMap[this.propertyType].valueLabel) {
-                    this.valueLabelContainer.empty();
-                    this.typeMap[this.propertyType].valueLabel.call(this,this.valueLabelContainer,value);
+                    if (opt.valueLabel) {
+                        this.valueLabelContainer.empty();
+                        opt.valueLabel.call(this,this.valueLabelContainer,value);
+                    }
                 }
                 this.input.trigger('change',this.type(),value);
             }
@@ -597,20 +674,23 @@
                     }
                     this.selectLabel.empty();
                     var image;
-                    if (opt.icon) {
+                    if (opt.icon && opt.showLabel !== false) {
                         if (opt.icon.indexOf("<") === 0) {
                             $(opt.icon).prependTo(this.selectLabel);
                         }
                         else if (opt.icon.indexOf("/") !== -1) {
                             image = new Image();
+                            image.onload = function() { that._resize(); }
+                            image.onerror = function() { that._resize(); }
                             image.name = opt.icon;
-                            image.src = opt.icon;
-                            $('<img>',{src:opt.icon,style:"margin-right: 4px;height: 18px;"}).prependTo(this.selectLabel);
+                            image.src = mapDeprecatedIcon(opt.icon);
+                            $('<img>',{src:mapDeprecatedIcon(opt.icon),style:"margin-right: 4px;height: 18px;"}).prependTo(this.selectLabel);
                         }
                         else {
                             $('<i>',{class:"red-ui-typedInput-icon "+opt.icon}).prependTo(this.selectLabel);
                         }
-                    } else {
+                    }
+                    if (opt.hasValue === false || (opt.showLabel !== false && !opt.icon)) {
                         this.selectLabel.text(opt.label);
                     }
                     if (this.optionMenu) {
@@ -620,6 +700,7 @@
                     if (opt.options) {
                         if (this.optionExpandButton) {
                             this.optionExpandButton.hide();
+                            this.optionExpandButton.shown = false;
                         }
                         if (this.optionSelectTrigger) {
                             this.optionSelectTrigger.show();
@@ -642,36 +723,50 @@
                             if (!that.activeOptions.hasOwnProperty(that.optionValue)) {
                                 that.optionValue = null;
                             }
-                            this.optionMenu = this._createMenu(opt.options,function(v){
-                                that._updateOptionSelectLabel(that.activeOptions[v]);
-                                if (!opt.hasValue) {
-                                    that.value(that.activeOptions[v].value)
-                                }
-                            });
+
                             var op;
                             if (!opt.hasValue) {
-                                var currentVal = this.input.val();
                                 var validValue = false;
-                                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;
+                                var currentVal = 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) {
-                                    op = opt.options[0];
-                                    if (typeof op === "string") {
-                                        this.value(op);
-                                        that._updateOptionSelectLabel({value:op});
-                                    } else {
-                                        this.value(op.value);
-                                        that._updateOptionSelectLabel(op);
+                                    if (!validValue) {
+                                        op = opt.options[0];
+                                        if (typeof op === "string") {
+                                            this.value(op);
+                                            that._updateOptionSelectLabel({value:op});
+                                        } else {
+                                            this.value(op.value);
+                                            that._updateOptionSelectLabel(op);
+                                        }
+                                    }
+                                } 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(","));
                                     }
                                 }
                             } else {
@@ -707,7 +802,21 @@
                                     this.optionSelectTrigger.hide();
                                 }
                             }
+                            this.optionMenu = this._createMenu(opt.options,opt,function(v){
+                                if (!opt.multiple) {
+                                    that._updateOptionSelectLabel(that.activeOptions[v]);
+                                    if (!opt.hasValue) {
+                                        that.value(that.activeOptions[v].value)
+                                    }
+                                } else {
+                                    that._updateOptionSelectLabel(v);
+                                    if (!opt.hasValue) {
+                                        that.value(v.join(","))
+                                    }
+                                }
+                            });
                         }
+                        this._trigger("typechange",null,this.propertyType);
                         this.input.trigger('change',this.propertyType,this.value());
                     } else {
                         if (this.optionSelectTrigger) {
@@ -732,23 +841,47 @@
                             this.elementDiv.show();
                         }
                         if (this.optionExpandButton) {
-                            if (opt.expand && typeof opt.expand === 'function') {
+                            if (opt.expand) {
+                                if (opt.expand.icon) {
+                                    this.optionExpandButtonIcon.removeClass().addClass("red-ui-typedInput-icon fa "+opt.expand.icon)
+                                } else {
+                                    this.optionExpandButtonIcon.removeClass().addClass("red-ui-typedInput-icon fa fa-ellipsis-h")
+                                }
+                                this.optionExpandButton.shown = true;
                                 this.optionExpandButton.show();
                                 this.optionExpandButton.off('click');
                                 this.optionExpandButton.on('click',function(evt) {
                                     evt.preventDefault();
-                                    opt.expand.call(that);
+                                    if (typeof opt.expand === 'function') {
+                                        opt.expand.call(that);
+                                    } else {
+                                        var container = $('<div>');
+                                        var content = opt.expand.content.call(that,container);
+                                        var panel = RED.popover.panel(container);
+                                        panel.container.css({
+                                            width:that.valueLabelContainer.width()
+                                        });
+                                        if (opt.expand.minWidth) {
+                                            panel.container.css({
+                                                minWidth: opt.expand.minWidth+"px"
+                                            });
+                                        }
+                                        panel.show({
+                                            target:that.optionExpandButton,
+                                            onclose:content.onclose,
+                                            align: "right"
+                                        });
+                                    }
                                 })
                             } else {
+                                this.optionExpandButton.shown = false;
                                 this.optionExpandButton.hide();
                             }
                         }
+                        this._trigger("typechange",null,this.propertyType);
                         this.input.trigger('change',this.propertyType,this.value());
                     }
-                    if (image) {
-                        image.onload = function() { that._resize(); }
-                        image.onerror = function() { that._resize(); }
-                    } else {
+                    if (!image) {
                         this._resize();
                     }
                 }

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

@@ -17,9 +17,9 @@
 RED.deploy = (function() {
 
     var deploymentTypes = {
-        "full":{img:"red/images/deploy-full-o.png"},
-        "nodes":{img:"red/images/deploy-nodes-o.png"},
-        "flows":{img:"red/images/deploy-flows-o.png"}
+        "full":{img:"red/images/deploy-full-o.svg"},
+        "nodes":{img:"red/images/deploy-nodes-o.svg"},
+        "flows":{img:"red/images/deploy-flows-o.svg"}
     }
 
     var ignoreDeployWarnings = {
@@ -44,7 +44,7 @@ RED.deploy = (function() {
      *   type: "default" - Button with drop-down options - no further customisation available
      *   type: "simple"  - Button without dropdown. Customisations:
      *      label: the text to display - default: "Deploy"
-     *      icon : the icon to use. Null removes the icon. default: "red/images/deploy-full-o.png"
+     *      icon : the icon to use. Null removes the icon. default: "red/images/deploy-full-o.svg"
      */
     function init(options) {
         options = options || {};
@@ -54,7 +54,7 @@ RED.deploy = (function() {
             $('<li><span class="red-ui-deploy-button-group button-group">'+
               '<a id="red-ui-header-button-deploy" class="red-ui-deploy-button disabled" href="#">'+
                 '<span class="red-ui-deploy-button-content">'+
-                 '<img id="red-ui-header-button-deploy-icon" src="red/images/deploy-full-o.png"> '+
+                 '<img id="red-ui-header-button-deploy-icon" src="red/images/deploy-full-o.svg"> '+
                  '<span>'+RED._("deploy.deploy")+'</span>'+
                 '</span>'+
                 '<span class="red-ui-deploy-button-spinner hide">'+
@@ -65,17 +65,17 @@ RED.deploy = (function() {
               '</span></li>').prependTo(".red-ui-header-toolbar");
               RED.menu.init({id:"red-ui-header-button-deploy-options",
                   options: [
-                      {id:"deploymenu-item-full",toggle:"deploy-type",icon:"red/images/deploy-full.png",label:RED._("deploy.full"),sublabel:RED._("deploy.fullDesc"),selected: true, onselect:function(s) { if(s){changeDeploymentType("full")}}},
-                      {id:"deploymenu-item-flow",toggle:"deploy-type",icon:"red/images/deploy-flows.png",label:RED._("deploy.modifiedFlows"),sublabel:RED._("deploy.modifiedFlowsDesc"), onselect:function(s) {if(s){changeDeploymentType("flows")}}},
-                      {id:"deploymenu-item-node",toggle:"deploy-type",icon:"red/images/deploy-nodes.png",label:RED._("deploy.modifiedNodes"),sublabel:RED._("deploy.modifiedNodesDesc"),onselect:function(s) { if(s){changeDeploymentType("nodes")}}},
+                      {id:"deploymenu-item-full",toggle:"deploy-type",icon:"red/images/deploy-full.svg",label:RED._("deploy.full"),sublabel:RED._("deploy.fullDesc"),selected: true, onselect:function(s) { if(s){changeDeploymentType("full")}}},
+                      {id:"deploymenu-item-flow",toggle:"deploy-type",icon:"red/images/deploy-flows.svg",label:RED._("deploy.modifiedFlows"),sublabel:RED._("deploy.modifiedFlowsDesc"), onselect:function(s) {if(s){changeDeploymentType("flows")}}},
+                      {id:"deploymenu-item-node",toggle:"deploy-type",icon:"red/images/deploy-nodes.svg",label:RED._("deploy.modifiedNodes"),sublabel:RED._("deploy.modifiedNodesDesc"),onselect:function(s) { if(s){changeDeploymentType("nodes")}}},
                       null,
-                      {id:"deploymenu-item-reload", icon:"red/images/deploy-reload.png",label:RED._("deploy.restartFlows"),sublabel:RED._("deploy.restartFlowsDesc"),onselect:"core:restart-flows"},
+                      {id:"deploymenu-item-reload", icon:"red/images/deploy-reload.svg",label:RED._("deploy.restartFlows"),sublabel:RED._("deploy.restartFlowsDesc"),onselect:"core:restart-flows"},
 
                   ]
               });
         } else if (type == "simple") {
             var label = options.label || RED._("deploy.deploy");
-            var icon = 'red/images/deploy-full-o.png';
+            var icon = 'red/images/deploy-full-o.svg';
             if (options.hasOwnProperty('icon')) {
                 icon = options.icon;
             }
@@ -99,7 +99,13 @@ RED.deploy = (function() {
         });
 
         RED.actions.add("core:deploy-flows",save);
-        RED.actions.add("core:restart-flows",restart);
+        if (type === "default") {
+            RED.actions.add("core:restart-flows",restart);
+            RED.actions.add("core:set-deploy-type-to-full",function() { RED.menu.setSelected("deploymenu-item-full",true);});
+            RED.actions.add("core:set-deploy-type-to-modified-flows",function() { RED.menu.setSelected("deploymenu-item-flow",true); });
+            RED.actions.add("core:set-deploy-type-to-modified-nodes",function() { RED.menu.setSelected("deploymenu-item-node",true); });
+        }
+
 
 
         RED.events.on('nodes:change',function(state) {
@@ -328,8 +334,7 @@ RED.deploy = (function() {
                 var invalidNodes = [];
 
                 RED.nodes.eachNode(function(node) {
-                    hasInvalid = hasInvalid || !node.valid;
-                    if (!node.valid) {
+                    if (!node.valid && !node.d) {
                         invalidNodes.push(getNodeInfo(node));
                     }
                     if (node.type === "unknown") {
@@ -339,6 +344,7 @@ RED.deploy = (function() {
                     }
                 });
                 hasUnknown = unknownNodes.length > 0;
+                hasInvalid = invalidNodes.length > 0;
 
                 var unusedConfigNodes = [];
                 RED.nodes.eachConfig(function(node) {

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

@@ -399,9 +399,9 @@ RED.diff = (function() {
                             diff: localDiff,
                             def: {
                                 defaults:{},
-                                icon:"subflow.png",
+                                icon:"subflow.svg",
                                 category: "subflows",
-                                color: "#da9"
+                                color: "#DDAA99"
                             },
                             tab:currentConfig.subflows[subflowId]
                         }
@@ -422,9 +422,9 @@ RED.diff = (function() {
                             diff: localDiff,
                             def: {
                                 defaults:{},
-                                icon:"subflow.png",
+                                icon:"subflow.svg",
                                 category: "subflows",
-                                color: "#da9"
+                                color: "#DDAA99"
                             },
                             tab:newConfig.subflows[subflowId],
                             newTab:newConfig.subflows[subflowId]
@@ -443,9 +443,9 @@ RED.diff = (function() {
                                 remoteDiff: remoteDiff,
                                 def: {
                                     defaults:{},
-                                    icon:"subflow.png",
+                                    icon:"subflow.svg",
                                     category: "subflows",
-                                    color: "#da9"
+                                    color: "#DDAA99"
                                 },
                                 tab:remoteDiff.newConfig.subflows[subflowId],
                                 remoteTab: remoteDiff.newConfig.subflows[subflowId]
@@ -549,9 +549,9 @@ RED.diff = (function() {
         if (def === undefined) {
             if (/^subflow:/.test(node.type)) {
                 def = {
-                    icon:"subflow.png",
+                    icon:"subflow.svg",
                     category: "subflows",
-                    color: "#da9",
+                    color: "#DDAA99",
                     defaults:{name:{value:""}}
                 }
             } else {
@@ -1029,9 +1029,9 @@ RED.diff = (function() {
         }
 
         var localSelectDiv = $('<label>',{class:"red-ui-diff-selectbox",for:safeNodeId+"-local"}).on("click", function(e) { e.stopPropagation();}).appendTo(localDiv);
-        var localRadio = $('<input>',{class:"red-ui-diff-selectbox-input",id:safeNodeId+"-local",type:'radio',value:"local",name:safeNodeId,class:className+"-local"}).data('node-id',node.id).on("change", changeHandler).appendTo(localSelectDiv);
+        var localRadio = $('<input>',{class:"red-ui-diff-selectbox-input "+className+"-local",id:safeNodeId+"-local",type:'radio',value:"local",name:safeNodeId}).data('node-id',node.id).on("change", changeHandler).appendTo(localSelectDiv);
         var remoteSelectDiv = $('<label>',{class:"red-ui-diff-selectbox",for:safeNodeId+"-remote"}).on("click", function(e) { e.stopPropagation();}).appendTo(remoteDiv);
-        var remoteRadio = $('<input>',{class:"red-ui-diff-selectbox-input",id:safeNodeId+"-remote",type:'radio',value:"remote",name:safeNodeId,class:className+"-remote"}).data('node-id',node.id).on("change", changeHandler).appendTo(remoteSelectDiv);
+        var remoteRadio = $('<input>',{class:"red-ui-diff-selectbox-input "+className+"-remote",id:safeNodeId+"-remote",type:'radio',value:"remote",name:safeNodeId}).data('node-id',node.id).on("change", changeHandler).appendTo(remoteSelectDiv);
         if (state === 'local') {
             localRadio.prop('checked',true);
         } else if (state === 'remote') {

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

@@ -19,7 +19,6 @@
  */
 RED.editor = (function() {
 
-
     var editStack = [];
     var editing_node = null;
     var editing_config_node = null;
@@ -203,6 +202,7 @@ RED.editor = (function() {
     function updateNodeProperties(node, outputMap) {
         node.resize = true;
         node.dirty = true;
+        node.dirtyStatus = true;
         var removedLinks = [];
         if (node.ports) {
             if (outputMap) {
@@ -231,8 +231,12 @@ RED.editor = (function() {
                 }
             }
         }
+        node.inputs = Math.min(1,Math.max(0,parseInt(node.inputs)));
+        if (isNaN(node.inputs)) {
+            node.inputs = 0;
+        }
         if (node.inputs === 0) {
-            removedLinks.concat(RED.nodes.filterLinks({target:node}));
+            removedLinks = removedLinks.concat(RED.nodes.filterLinks({target:node}));
         }
         for (var l=0;l<removedLinks.length;l++) {
             RED.nodes.removeLink(removedLinks[l]);
@@ -526,7 +530,7 @@ RED.editor = (function() {
             } else if (node.type.indexOf("subflow:")===0) {
                 var subflow = RED.nodes.subflow(node.type.substring(8));
                 label = RED._("subflow.editSubflowInstance",{name:RED.utils.sanitize(subflow.name)})
-            } else {
+            } else if (node._def !== undefined) {
                 if (typeof node._def.paletteLabel !== "undefined") {
                     try {
                         label = RED.utils.sanitize((typeof node._def.paletteLabel === "function" ? node._def.paletteLabel.call(node._def) : node._def.paletteLabel)||"");
@@ -546,146 +550,7 @@ RED.editor = (function() {
         return label;
     }
 
-    function buildEnvForm(container, node) {
-        var env_container = $('#node-input-env-container');
-        env_container
-            .css({
-                'min-height':'150px',
-                'min-width':'450px'
-            })
-            .editableList({
-                addItem: function(container, i, opt) {
-                    var row = $('<div/>').appendTo(container);
-                    if (opt.parent) {
-                        $('<div/>', {
-                            class:"uneditable-input",
-                            style: "margin-left: 5px; width: calc(40% - 8px)",
-                        }).appendTo(row).text(opt.name);
-                    } else {
-                        $('<input/>', {
-                            class: "node-input-env-name",
-                            type: "text",
-                            style: "margin-left: 5px; width: calc(40% - 8px)",
-                            placeholder: RED._("common.label.name")
-                        }).appendTo(row).val(opt.name);
-                    }
-                    var valueField = $('<input/>',{
-                        class: "node-input-env-value",
-                        type: "text",
-                        style: "margin-left: 5px; width: calc(60% - 8px)"
-                    }).appendTo(row)
-
-                    valueField.typedInput({default:'str',
-                                           types:['str','num','bool','json','bin','env']
-                                          });
-
-                    valueField.typedInput('type', opt.parent?(opt.type||opt.parent.type):opt.type);
-                    valueField.typedInput('value', opt.parent?((opt.value !== undefined)?opt.value:opt.parent.value):opt.value);
-
-                    var actionButton = $('<a/>',{href:"#",class:"red-ui-editableList-item-remove red-ui-button red-ui-button-small"}).appendTo(container);
-                    $('<i/>',{class:"fa "+(opt.parent?"fa-reply":"fa-remove")}).appendTo(actionButton);
-                    container.parent().addClass("red-ui-editableList-item-removable");
-                    if (opt.parent) {
-                        if ((opt.value !== undefined) && (opt.value !== opt.parent.value || opt.type !== opt.parent.type)) {
-                            actionButton.show();
-                        } else {
-                            actionButton.hide();
-                        }
-                        var restoreTip = RED.popover.tooltip(actionButton,RED._("subflow.env.restore"));
-                        valueField.on("change", function(evt) {
-                            var newType = valueField.typedInput('type');
-                            var newValue = valueField.typedInput('value');
-                            if (newType === opt.parent.type && newValue === opt.parent.value) {
-                                actionButton.hide();
-                            } else {
-                                actionButton.show();
-                            }
-                        })
-                        actionButton.on("click", function(evt) {
-                            evt.preventDefault();
-                            restoreTip.close();
-                            valueField.typedInput('type', opt.parent.type);
-                            valueField.typedInput('value', opt.parent.value);
-                        })
-                    } else {
-                        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() {
-                                env_container.editableList('removeItem',opt);
-                            });
-                        });
-                    }
-                },
-                sortable: false,
-                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
-                        }
-                    }
-                    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
-                    });
-                }
-            }
-        }
-        envList.forEach(function(env) {
-            env_container.editableList('addItem', env);
-        })
-    }
-
-    function exportEnvList(list) {
-        if (list) {
-            var env = [];
-            list.each(function(i) {
-                var entry = $(this);
-                var item = entry.data('data');
-                var name = item.parent?item.name:entry.find(".node-input-env-name").val();
-                var valueInput = entry.find(".node-input-env-value");
-                var value = valueInput.typedInput("value");
-                var type = valueInput.typedInput("type");
-                if (!item.parent || (item.parent.value !== value || item.parent.type !== type)) {
-                    var item = {
-                        name: name,
-                        type: type,
-                        value: value
-                    };
-                    env.push(item);
-                }
-            });
-            return env;
-        }
-        return null;
-    }
-
-    function isSameEnv(env0, env1) {
+    function isSameObj(env0, env1) {
         return (JSON.stringify(env0) === JSON.stringify(env1));
     }
 
@@ -711,16 +576,18 @@ RED.editor = (function() {
             $(this).attr("data-i18n",keys.join(";"));
         });
 
-        if ((type === "subflow") || (type === "subflow-template")) {
-            buildEnvForm(dialogForm, node);
+        if (type === "subflow-template" || type === "subflow") {
+            RED.subflow.buildEditForm(dialogForm,type,node);
         }
 
         // Add dummy fields to prevent 'Enter' submitting the form in some
         // cases, and also prevent browser auto-fill of password
-        // Add in reverse order as they are prepended...
-        $('<input type="password" style="display: none;" />').prependTo(dialogForm);
-        $('<input type="text" style="display: none;" />').prependTo(dialogForm);
+        //  - the elements cannot be hidden otherwise Chrome will ignore them.
+        //  - the elements need to have id's that imply password/username
+        $('<span style="position: absolute; top: -2000px;"><input id="red-ui-trap-password" type="password"/></span>').prependTo(dialogForm);
+        $('<span style="position: absolute; top: -2000px;"><input id="red-ui-trap-username"  type="text"/></span>').prependTo(dialogForm);
         dialogForm.on("submit", function(e) { e.preventDefault();});
+        dialogForm.find('input').attr("autocomplete","off");
         return dialogForm;
     }
 
@@ -733,10 +600,18 @@ RED.editor = (function() {
         var outputsDiv = $("#red-ui-editor-node-label-form-outputs");
 
         var inputCount;
-        if (node.type === 'subflow') {
-            inputCount = node.in.length;
+        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 = node.inputs || node._def.inputs || 0;
+            inputCount = Math.min(1,Math.max(0,parseInt(formInputs)));
+            if (isNaN(inputCount)) {
+                inputCount = 0;
+            }
         }
 
         var children = inputsDiv.children();
@@ -854,30 +729,8 @@ RED.editor = (function() {
         }
         return result;
     }
-    function showIconPicker(container, node, iconPath, done) {
-        var containerPos = container.offset();
-        var pickerBackground = $('<div>').css({
-            position: "absolute",top:0,bottom:0,left:0,right:0,zIndex:20
-        }).appendTo("body");
-
-        var top = containerPos.top - 30;
-
-        if (top+280 > $( window ).height()) {
-            top = $( window ).height() - 280;
-        }
-        var picker = $('<div class="red-ui-icon-picker">').css({
-            top: top+"px",
-            left: containerPos.left+"px",
-        }).appendTo("#red-ui-editor");
-
-        var hide = function() {
-            pickerBackground.remove();
-            picker.remove();
-            RED.keyboard.remove("escape");
-        }
-        RED.keyboard.add("*","escape",function(){hide()});
-        pickerBackground.on("mousedown", hide);
-
+    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,
@@ -905,89 +758,256 @@ RED.editor = (function() {
         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();
-            hide();
+            iconPanel.hide();
             done(null);
         });
-        var iconSets = RED.nodes.getIconSets();
-        Object.keys(iconSets).forEach(function(moduleName) {
-            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 colour = RED.utils.getNodeColor(node.type, node._def);
-                    var icon_url = RED.settings.apiRootUrl+"icons/"+moduleName+"/"+icon;
-                    iconDiv.data('icon',icon_url);
-                    nodeDiv.css('backgroundColor',colour);
-                    var iconContainer = $('<div/>',{class:"red-ui-palette-icon-container"}).appendTo(nodeDiv);
-                    RED.utils.createIconElement(icon_url, iconContainer, true);
+        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 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);
+                        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);
+                        })
                     })
-                    iconDiv.on("mouseout", function() {
-                        summary.html("&nbsp;");
-                    })
-                    iconDiv.on("click", function() {
-                        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");
     }
 
+    function createColorPicker(colorRow, color) {
+
+        var colorButton = $('<button type="button" class="red-ui-button red-ui-editor-node-appearance-button">').appendTo(colorRow);
+        $('<i class="fa fa-caret-down"></i>').appendTo(colorButton);
+
+        var colorDisp = $('<div>',{class:"red-ui-search-result-node"}).appendTo(colorButton);
+
+        var selector = $("<input/>", {
+            id: "red-ui-editor-node-color",
+            type: "text",
+            value: color
+        }).css({
+            marginLeft: "10px",
+            width: "150px",
+        }).appendTo(colorRow);
+
+        selector.on("change", function (e) {
+            var color = selector.val();
+            $(".red-ui-editor-node-appearance-button .red-ui-search-result-node").css({
+                "background-color": color
+            });
+        });
+        selector.trigger("change");
+        colorButton.on("click", function (e) {
+            var recommendedColors = [
+                "#DDAA99",
+                "#3FADB5", "#87A980", "#A6BBCF",
+                "#AAAA66", "#C0C0C0", "#C0DEED",
+                "#C7E9C0", "#D7D7A0", "#D8BFD8",
+                "#DAC4B4", "#DEB887", "#DEBD5C",
+                "#E2D96E", "#E6E0F8", "#E7E7AE",
+                "#E9967A", "#F3B567", "#FDD0A2",
+                "#FDF0C2", "#FFAAAA", "#FFCC66",
+                "#FFF0F0", "#FFFFFF"
+            ].map(function(c) {
+                var r = parseInt(c.substring(1, 3), 16) / 255;
+                var g = parseInt(c.substring(3, 5), 16) / 255;
+                var b = parseInt(c.substring(5, 7), 16) / 255;
+                return {
+                    hex: c,
+                    r: r,
+                    g: g,
+                    b: b,
+                    l: 0.3 * r + 0.59 * g + 0.11 * b
+                }
+            });
+            // Sort by luminosity.
+            recommendedColors.sort(function (a, b) {
+                return a.l - b.l;
+            });
+
+            var numColors = recommendedColors.length;
+            var width = 30;
+            var height = 30;
+            var margin = 2;
+            var perRow = 6;
+            var picker = $("<div/>", {
+                class: "red-ui-color-picker"
+            }).css({
+                width: ((width+margin+margin)*perRow)+"px",
+                height: Math.ceil(numColors/perRow)*(height+margin+margin)+"+px"
+            });
+            var count = 0;
+            var row = null;
+            recommendedColors.forEach(function (col) {
+                if ((count % perRow) == 0) {
+                    row = $("<div/>").appendTo(picker);
+                }
+                var button = $("<button/>", {
+                }).css({
+                    width: width+"px",
+                    height: height+"px",
+                    margin: margin+"px",
+                    backgroundColor: col.hex,
+                    "border-style": "solid",
+                    "border-width": "1px",
+                    "border-color": col.luma<0.92?col.hex:'#ccc'
+                }).appendTo(row);
+                button.on("click",  function (e) {
+                    e.preventDefault();
+                    colorPanel.hide();
+                    selector.val(col.hex);
+                    selector.trigger("change");
+                });
+                count++;
+            });
+            var colorPanel = RED.popover.panel(picker);
+            colorPanel.show({
+                target: colorButton
+            })
+        });
+    }
+
     function buildAppearanceForm(container,node) {
         var dialogForm = $('<form class="dialog-form form-horizontal" autocomplete="off"></form>').appendTo(container);
 
         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:userCount})).show();
+        }
+
         $('<div class="form-row">'+
             '<label for="node-input-show-label-btn" data-i18n="editor.label"></label>'+
-            '<button type="button" id="node-input-show-label-btn" class="red-ui-button" style="min-width: 80px; text-align: left;" type="button"><i id="node-input-show-label-btn-i" class="fa fa-toggle-on"></i> <span id="node-input-show-label-label"></span></button> '+
-            '<input type="checkbox" id="node-input-show-label" style="display: none;"/>'+
+            '<span style="margin-right: 2px;"/>'+
+            '<input type="checkbox" id="node-input-show-label"/>'+
         '</div>').appendTo(dialogForm);
 
-        var setToggleState = function(state) {
-            var i = $("#node-input-show-label-btn-i");
-            if (!state) {
-                i.addClass('fa-toggle-off');
-                i.removeClass('fa-toggle-on');
-                $("#node-input-show-label").prop("checked",false);
-                $("#node-input-show-label-label").text(RED._("editor.hide"));
-            } else {
-                i.addClass('fa-toggle-on');
-                i.removeClass('fa-toggle-off');
-                $("#node-input-show-label").prop("checked",true);
-                $("#node-input-show-label-label").text(RED._("editor.show"));
-            }
-        }
-        dialogForm.find('#node-input-show-label-btn').on("click",function(e) {
-            e.preventDefault();
-            var i = $("#node-input-show-label-btn-i");
-            setToggleState(i.hasClass('fa-toggle-off'));
+        $("#node-input-show-label").toggleButton({
+            enabledLabel: RED._("editor.show"),
+            disabledLabel: RED._("editor.hide")
         })
+
         if (!node.hasOwnProperty("l")) {
             // Show label if type not link
             node.l = !/^link (in|out)$/.test(node._def.type);
         }
-        setToggleState(node.l);
+        $("#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);
+            createColorPicker(colorRow, color);
+        }
+
 
         // 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" id="red-ui-editor-node-icon-button">').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);
@@ -998,21 +1018,30 @@ RED.editor = (function() {
             iconButton.on("click", function(e) {
                 e.preventDefault();
                 var iconPath;
-                var icon = $("#red-ui-editor-node-icon").text()||"";
+                var icon = $("#red-ui-editor-node-icon").val()||"";
                 if (icon) {
                     iconPath = RED.utils.separateIconPath(icon);
                 } else {
                     iconPath = RED.utils.getDefaultNodeIcon(node._def, node);
                 }
-                showIconPicker(iconRow,node,iconPath,function(newIcon) {
-                    $("#red-ui-editor-node-icon").text(newIcon||"");
+                var backgroundColor = RED.utils.getNodeColor(node.type, node._def);
+                if (node.type === "subflow") {
+                    backgroundColor = $("#red-ui-editor-node-color").val();
+                }
+                showIconPicker(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);
                 });
             });
-            $('<div id="red-ui-editor-node-icon">').text(node.icon).appendTo(iconButton);
+
+            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;
@@ -1048,6 +1077,7 @@ RED.editor = (function() {
         }
     }
 
+
     function updateLabels(editing_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");
@@ -1291,11 +1321,13 @@ RED.editor = (function() {
                                                 newValue = parseInt(newValue);
                                             }
                                         }
+                                        if (editing_node._def.defaults[d].type) {
+                                            if (newValue == "_ADD_") {
+                                                newValue = "";
+                                            }
+                                        }
                                         if (editing_node[d] != newValue) {
                                             if (editing_node._def.defaults[d].type) {
-                                                if (newValue == "_ADD_") {
-                                                    newValue = "";
-                                                }
                                                 // Change to a related config node
                                                 var configNode = RED.nodes.node(editing_node[d]);
                                                 if (configNode) {
@@ -1335,7 +1367,7 @@ RED.editor = (function() {
                         }
 
                         if (!editing_node._def.defaults || !editing_node._def.defaults.hasOwnProperty("icon")) {
-                            var icon = $("#red-ui-editor-node-icon").text()||""
+                            var icon = $("#red-ui-editor-node-icon").val()||""
                             if (!isDefaultIcon) {
                                 if (icon !== editing_node.icon) {
                                     changes.icon = editing_node.icon;
@@ -1393,6 +1425,20 @@ RED.editor = (function() {
                                 node.l = true;
                             }
                         }
+                        if ($("#node-input-node-disabled").prop('checked')) {
+                            if (node.d !== true) {
+                                changes.d = node.d;
+                                changed = true;
+                                node.d = true;
+                            }
+                        } else {
+                            if (node.d === true) {
+                                changes.d = node.d;
+                                changed = true;
+                                delete node.d;
+                            }
+                        }
+
                         node.resize = true;
 
                         var oldInfo = node.info;
@@ -1424,13 +1470,13 @@ RED.editor = (function() {
 
                         if (type === "subflow") {
                             var old_env = editing_node.env;
-                            var new_env = exportEnvList($("#node-input-env-container").editableList("items"));
-                            if (!isSameEnv(old_env, new_env)) {
+                            var new_env = RED.subflow.exportSubflowInstanceEnv(editing_node);
+                            if (!isSameObj(old_env, new_env)) {
                                 editing_node.env = new_env;
                                 changes.env = editing_node.env;
                                 changed = true;
                             }
-                        }
+                         }
 
                         if (changed) {
                             var wasChanged = editing_node.changed;
@@ -1495,6 +1541,14 @@ RED.editor = (function() {
                 var trayBody = tray.find('.red-ui-tray-body');
                 trayBody.parent().css('overflow','hidden');
 
+                var trayFooterLeft = $('<div class="red-ui-tray-footer-left"></div>').appendTo(trayFooter)
+
+                $('<input id="node-input-node-disabled" type="checkbox">').prop("checked",!!node.d).appendTo(trayFooterLeft).toggleButton({
+                    enabledIcon: "fa-circle-thin",
+                    disabledIcon: "fa-ban",
+                    invertState: true
+                })
+
                 var editorTabEl = $('<ul></ul>').appendTo(trayBody);
                 var editorContent = $('<div></div>').appendTo(trayBody);
 
@@ -1540,6 +1594,19 @@ RED.editor = (function() {
                 buildEditForm(nodePropertiesTab.content,"dialog-form",type,ns,node);
                 editorTabs.addTab(nodePropertiesTab);
 
+                if (/^subflow:/.test(node.type)) {
+                    var subflowPropertiesTab = {
+                        id: "editor-subflow-envProperties",
+                        label: RED._("editor-tab.envProperties"),
+                        name: RED._("editor-tab.envProperties"),
+                        content: $('<div>', {class:"red-ui-tray-content"}).appendTo(editorContent).hide(),
+                        iconClass: "fa fa-list"
+                    };
+
+                    RED.subflow.buildPropertiesForm(subflowPropertiesTab.content,node);
+                    editorTabs.addTab(subflowPropertiesTab);
+                }
+
                 if (!node._def.defaults || !node._def.defaults.hasOwnProperty('info'))  {
                     var descriptionTab = {
                         id: "editor-tab-description",
@@ -1672,9 +1739,17 @@ RED.editor = (function() {
                 var trayHeader = tray.find(".red-ui-tray-header");
                 var trayBody = tray.find('.red-ui-tray-body');
                 var trayFooter = tray.find(".red-ui-tray-footer");
-                var userCountDiv;
+
+                var trayFooterLeft = $('<div class="red-ui-tray-footer-left"></div>').appendTo(trayFooter)
+
+                $('<input id="node-config-input-node-disabled" type="checkbox">').prop("checked",!!editing_config_node.d).appendTo(trayFooterLeft).toggleButton({
+                    enabledIcon: "fa-circle-thin",
+                    disabledIcon: "fa-ban",
+                    invertState: true
+                })
+
                 if (node_def.hasUsers !== false) {
-                    userCountDiv = $('<div class="red-ui-tray-footer-left"><i class="fa fa-info-circle"></i> <span></span></div>').prependTo(trayFooter);
+                    $('<span><i class="fa fa-info-circle"></i> <span id="red-ui-editor-config-user-count"></span></span>').css("margin-left", "10px").appendTo(trayFooterLeft);
                 }
                 trayFooter.append('<span class="red-ui-tray-footer-right"><span id="red-ui-editor-config-scope-warning" data-i18n="[title]editor.errors.scopeChange"><i class="fa fa-warning"></i></span><select id="red-ui-editor-config-scope"></select></span>');
 
@@ -1693,7 +1768,8 @@ RED.editor = (function() {
                             RED.tray.resize();
                         }
                     },
-                    collapsible: true
+                    collapsible: true,
+                    menu: false
                 });
 
                 var nodePropertiesTab = {
@@ -1768,8 +1844,8 @@ RED.editor = (function() {
                             }
                         });
                     }
-                    if (node_def.hasUsers !== false && userCountDiv) {
-                        userCountDiv.find("span").text(RED._("editor.nodesUse", {count:editing_config_node.users.length})).parent().show();
+                    if (node_def.hasUsers !== false) {
+                        $("#red-ui-editor-config-user-count").text(RED._("editor.nodesUse", {count:editing_config_node.users.length})).parent().show();
                     }
                     trayBody.i18n();
                     trayFooter.i18n();
@@ -1800,7 +1876,6 @@ RED.editor = (function() {
                     var configId = editing_config_node.id;
                     var configAdding = adding;
                     var configTypeDef = RED.nodes.getType(configType);
-
                     if (configTypeDef.oneditcancel) {
                         // TODO: what to pass as this to call
                         if (configTypeDef.oneditcancel) {
@@ -1904,6 +1979,16 @@ RED.editor = (function() {
                     editing_config_node.label = configTypeDef.label;
                     editing_config_node.z = scope;
 
+                    if ($("#node-config-input-node-disabled").prop('checked')) {
+                        if (editing_config_node.d !== true) {
+                            editing_config_node.d = true;
+                        }
+                    } else {
+                        if (editing_config_node.d === true) {
+                            delete editing_config_node.d;
+                        }
+                    }
+
                     if (scope) {
                         // Search for nodes that use this one that are no longer
                         // in scope, so must be removed
@@ -2058,7 +2143,7 @@ RED.editor = (function() {
                 RED.nodes.eachConfig(function(config) {
                     if (config.type == type && (!config.z || config.z === activeWorkspace.id)) {
                         var label = RED.utils.getNodeLabel(config,config.id);
-                        config.__label__ = label;
+                        config.__label__ = label+(config.d?" ["+RED._("workspace.disabled")+"]":"");
                         configNodes.push(config);
                     }
                 });
@@ -2127,16 +2212,16 @@ RED.editor = (function() {
                         if (updateLabels(editing_node, changes, null)) {
                             changed = true;
                         }
-                        var icon = $("#red-ui-editor-node-icon").text()||"";
-                        if ((editing_node.icon === undefined && icon !== "node-red/subflow.png") ||
+                        var icon = $("#red-ui-editor-node-icon").val()||"";
+                        if ((editing_node.icon === undefined && icon !== "node-red/subflow.svg") ||
                             (editing_node.icon !== undefined && editing_node.icon !== icon)) {
                             changes.icon = editing_node.icon;
                             editing_node.icon = icon;
                             changed = true;
                         }
-                        var newCategory = $("#subflow-input-category").val().trim();
+                        var newCategory = $("#subflow-appearance-input-category").val().trim();
                         if (newCategory === "_custom_") {
-                            newCategory = $("#subflow-input-custom-category").val().trim();
+                            newCategory = $("#subflow-appearance-input-custom-category").val().trim();
                             if (newCategory === "") {
                                 newCategory = editing_node.category;
                             }
@@ -2150,14 +2235,28 @@ RED.editor = (function() {
                             changed = true;
                         }
 
+                        var oldColor = editing_node.color;
+                        var newColor =  $("#red-ui-editor-node-color").val();
+                        if (oldColor !== newColor) {
+                            editing_node.color = newColor;
+                            changes.color = newColor;
+                            changed = true;
+                            RED.utils.clearNodeColorCache();
+                            if (editing_node.type === "subflow") {
+                                var nodeDefinition = RED.nodes.getType(
+                                    "subflow:" + editing_node.id
+                                );
+                                nodeDefinition["color"] = newColor;
+                            }
+                        }
+
                         var old_env = editing_node.env;
-                        var new_env = exportEnvList($("#node-input-env-container").editableList("items"));
-                        if (!isSameEnv(old_env, new_env)) {
+                        var new_env = RED.subflow.exportSubflowTemplateEnv($("#node-input-env-container").editableList("items"));
+                        if (!isSameObj(old_env, new_env)) {
                             editing_node.env = new_env;
                             changes.env = editing_node.env;
                             changed = true;
                         }
-
                         RED.palette.refresh();
 
                         if (changed) {
@@ -2171,6 +2270,7 @@ RED.editor = (function() {
                                         id:n.id,
                                         changed:n.changed
                                     })
+                                    n._def.color = editing_node.color;
                                     n.changed = true;
                                     n.dirty = true;
                                     updateNodeProperties(n);
@@ -2198,21 +2298,39 @@ RED.editor = (function() {
             ],
             resize: function(size) {
                 $(".red-ui-tray-content").height(size.height - 50);
-                // var form = $(".red-ui-tray-content form").height(size.height - 50 - 40);
-                var rows = $("#dialog-form>div:not(.node-input-env-container-row)");
-                var height = size.height;
-                for (var i=0; i<rows.size(); i++) {
-                    height -= $(rows[i]).outerHeight(true);
+                var envContainer = $("#node-input-env-container");
+                if (envContainer.length) {
+                    // var form = $(".red-ui-tray-content form").height(size.height - 50 - 40);
+                    var rows = $("#dialog-form>div:not(#subflow-env-tabs-content)");
+                    var height = size.height;
+                    for (var i=0; i<rows.size(); i++) {
+                        height -= $(rows[i]).outerHeight(true);
+                    }
+                    // var editorRow = $("#dialog-form>div.node-input-env-container-row");
+                    // height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
+                    $("#node-input-env-container").editableList('height',height-95);
                 }
-                var editorRow = $("#dialog-form>div.node-input-env-container-row");
-                height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
-                $("#node-input-env-container").editableList('height',height-80);
             },
             open: function(tray) {
                 var trayFooter = tray.find(".red-ui-tray-footer");
+                var trayFooterLeft = $("<div/>", {
+                    class: "red-ui-tray-footer-left"
+                }).appendTo(trayFooter)
                 var trayBody = tray.find('.red-ui-tray-body');
                 trayBody.parent().css('overflow','hidden');
 
+                if (editing_node.type === "subflow") {
+                    var span = $("<span/>").css({
+                        "margin-left": "10px"
+                    }).appendTo(trayFooterLeft);
+                    $("<i/>", {
+                        class: "fa fa-info-circle"
+                    }).appendTo(span);
+                    $("<span/>").text(" ").appendTo(span);
+                    $("<i/>", {
+                        id: "red-ui-editor-subflow-user-count"
+                    }).appendTo(span);
+                }
 
                 if (editing_node) {
                     RED.sidebar.info.refresh(editing_node);
@@ -2233,7 +2351,8 @@ RED.editor = (function() {
                             RED.tray.resize();
                         }
                     },
-                    collapsible: true
+                    collapsible: true,
+                    menu: false
                 });
 
                 var nodePropertiesTab = {
@@ -2272,46 +2391,9 @@ RED.editor = (function() {
                 buildAppearanceForm(appearanceTab.content,editing_node);
                 editorTabs.addTab(appearanceTab);
 
-
-
-
                 $("#subflow-input-name").val(subflow.name);
                 RED.text.bidi.prepareInput($("#subflow-input-name"));
 
-                $("#subflow-input-category").empty();
-                var categories = RED.palette.getCategories();
-                categories.sort(function(A,B) {
-                    return A.label.localeCompare(B.label);
-                })
-                categories.forEach(function(cat) {
-                    $("#subflow-input-category").append($("<option></option>").val(cat.id).text(cat.label));
-                })
-                $("#subflow-input-category").append($("<option></option>").attr('disabled',true).text("---"));
-                $("#subflow-input-category").append($("<option></option>").val("_custom_").text(RED._("palette.addCategory")));
-
-
-                $("#subflow-input-category").on("change", function() {
-                    var val = $(this).val();
-                    if (val === "_custom_") {
-                        $("#subflow-input-category").width(120);
-                        $("#subflow-input-custom-category").show();
-                    } else {
-                        $("#subflow-input-category").width(250);
-                        $("#subflow-input-custom-category").hide();
-                    }
-                })
-
-                $("#subflow-input-category").val(subflow.category||"subflows");
-                var userCount = 0;
-                var subflowType = "subflow:"+editing_node.id;
-
-                RED.nodes.eachNode(function(n) {
-                    if (n.type === subflowType) {
-                        userCount++;
-                    }
-                });
-                $("#subflow-dialog-user-count").text(RED._("subflow.subflowInstances", {count:userCount})).show();
-
                 trayBody.i18n();
                 finishedBuilding = true;
             },
@@ -2405,7 +2487,7 @@ RED.editor = (function() {
             editor.toolbar = 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();
@@ -2432,6 +2514,7 @@ RED.editor = (function() {
                 content: RED._("markdownEditor.format"),
                 autoClose: 50
             });
+            session.setUseWrapMode(true);
         }
         return editor;
     }
@@ -2464,6 +2547,8 @@ RED.editor = (function() {
         validateNode: validateNode,
         updateNodeProperties: updateNodeProperties, // TODO: only exposed for edit-undo
 
+        showIconPicker:showIconPicker,
+
         /**
          * Show a type editor.
          * @param {string} type - the type to display
@@ -2476,7 +2561,7 @@ RED.editor = (function() {
         /**
          * Register a type editor.
          * @param {string} type - the type name
-         * @param {object} options - the editor definition
+         * @param {object} definition - the editor definition
          * @function
          * @memberof RED.editor
          */

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

@@ -102,7 +102,7 @@
                         var f = $(this).val();
                         var args = RED._('jsonata:'+f+".args",{defaultValue:''});
                         var title = "<h5>"+f+"("+args+")</h5>";
-                        var body = marked(RED._('jsonata:'+f+'.desc',{defaultValue:''}));
+                        var body = RED.utils.renderMarkdown(RED._('jsonata:'+f+'.desc',{defaultValue:''}));
                         $("#red-ui-editor-type-expression-help").html(title+"<p>"+body+"</p>");
 
                     })
@@ -207,6 +207,7 @@
                         }
                         expressionEditor.getSession().setValue(v||"",-1);
                     });
+                    funcSelect.change();
 
                     var tabs = RED.tabs.create({
                         element: $("#red-ui-editor-type-expression-tabs"),