Merge branch 'dev' into field-type-propty-validation-tooltip-msg

.github/PULL_REQUEST_TEMPLATE.md

@@ -30,5 +30,5 @@ the [forum](https://discourse.nodered.org) or
 
 - [ ] 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 forum/slack team.
-- [ ] I have run `grunt` to verify the unit tests pass
+- [ ] I have run `npm run test` to verify the unit tests pass
 - [ ] I have added suitable unit tests to cover the new/changed functionality

.github/dependabot.yml

@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "monthly"
+    groups:
+      github-actions:
+        patterns:
+          - "*"

.github/workflows/release.yml

@@ -14,25 +14,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out node-red repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
             path: 'node-red'
       - name: Check out node-red-docker repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
             repository: 'node-red/node-red-docker'
             path: 'node-red-docker'
       - name: Check out node-red.github.io repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
             repository: 'node-red/node-red.github.io'
             path: 'node-red.github.io'
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v4
         with:
             node-version: '16'
       - run: node ./node-red/.github/scripts/update-node-red-docker.js
       - name: Create Docker Pull Request
-        uses: peter-evans/create-pull-request@v2
+        uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.NR_REPO_TOKEN }}
           committer: GitHub <noreply@github.com>
@@ -48,7 +48,7 @@ jobs:
             This PR was auto-generated by a GitHub Action. Any questions, speak to @knolleary
       - run: node ./node-red/.github/scripts/update-node-red-website.js
       - name: Create Website Pull Request
-        uses: peter-evans/create-pull-request@v2
+        uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.NR_REPO_TOKEN }}
           committer: GitHub <noreply@github.com>

.github/workflows/tests.yml

@@ -12,16 +12,15 @@ permissions:
 jobs:
   build:
     permissions:
-      checks: write  # for coverallsapp/github-action to create new checks
       contents: read  # for actions/checkout to fetch code
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16, 18, 20]
+        node-version: [18, 20, 22]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
     - name: Install Dependencies
@@ -29,8 +28,3 @@ jobs:
     - name: Run tests
       run: |
         npm run test
-    # - name: Publish to coveralls.io
-    #   if: ${{ matrix.node-version == 16 }}
-    #   uses: coverallsapp/github-action@v1.1.2
-    #   with:
-    #     github-token: ${{ github.token }}

.gitignore

@@ -27,3 +27,4 @@ docs
 .vscode
 .nyc_output
 sync.ffs_db
+package-lock.json

CHANGELOG.md

@@ -1,3 +1,247 @@
+#### 4.0.0-beta.3: Beta Release
+
+Editor
+
+ - Improve background-deploy notification handling (#4692) @knolleary
+ - Hide workspace tab on middle mouse click (#4657) @Steve-Mcl
+ - multiplayer: Add user presence indicators (#4666) @knolleary
+ - Enable updating dependency node of package.json in project feature (#4676) @kazuhitoyokoi
+ - Add French translations for 4.0.0-beta.2 (#4681) @GogoVega
+ - Add Japanese translations for 4.0.0-beta.2 (#4674) @kazuhitoyokoi
+ - Fix saving of conf-type properties in module packaged subflows (#4658) @knolleary
+ - Add npm install timeout notification (#4662) @hardillb
+ - Fix undo of subflow env property edits (#4667) @knolleary
+ - Fix three error typos in monaco.js (#4660) @JoshuaCWebDeveloper
+ - docs: Add closing paragraph tag (#4664) @ZJvandeWeg
+ - Avoid login loops when autoLogin enabled but login fails (#4684) @knolleary
+
+Runtime
+
+ - Allow blank strings to be used for env var property substitutions (#4672) @knolleary
+ - Use rfdc for cloning pure JSON values (#4679) @knolleary
+ - fix: remove outdated Node 11+ check (#4314) @Rotzbua
+ - feat(ci): add new nodejs v22 (#4694) @Rotzbua
+ - fix(node): increase required node >=18.5 (#4690) @Rotzbua
+ - fix(dns): remove outdated node check (#4689) @Rotzbua
+ - fix(polyfill): remove import module polyfill (#4688) @Rotzbua
+ - Fix typo (#4686) @Rotzbua
+
+Nodes
+
+ - Pass full error object in Function node and copy over cause property (#4685) @knolleary
+ - Replacing vm.createScript in favour of vm.Script (#4534) @patlux
+
+#### 4.0.0-beta.2: Beta Release
+
+Editor
+
+ - Introduce multiplayer feature (#4629) @knolleary
+ - Separate the "add new config-node" option into a new (+) button (#4627) @GogoVega
+ - Retain Palette categories collapsed and filter to localStorage (#4634) @knolleary
+ - Ensure palette filter reapplies and clear up unknown categories (#4637) @knolleary
+ - Add support for plugin (only) modules to the palette manager (#4620) @knolleary
+ - Update monaco to latest and node types to 18 LTS (#4615) @Steve-Mcl
+
+Runtime
+
+ - Fix handling of subflow config-node select type in sf module (#4643) @knolleary
+ - Comms API updates (#4628) @knolleary
+ - Add French translations for 4.0.0-beta.1 (#4621) @GogoVega
+ - Add Japanese translations for 4.0.0-beta.1 (#4612) @kazuhitoyokoi
+
+Nodes
+ - Fix change node handling of replacing with boolean (#4639) @knolleary
+
+#### 4.0.0-beta.1: Beta Release
+
+Editor
+
+ - Click on id in debug panel highlights node or flow (#4439) @ralphwetzel
+ - Support config selection in a subflow env var (#4587) @Steve-Mcl
+ - Add timestamp formatting options to TypedInput (#4468) @knolleary
+ - Allow RED.view.select to select links (#4553) @lgrkvst
+ - Add auto-complete to flow/global/env typedInput types (#4480) @knolleary
+ - Improve the appearance of the Node-RED primary header (#4598) @joepavitt
+
+Runtime
+
+ - let settings.httpNodeAuth accept single middleware or array of middlewares (#4572) @kevinGodell
+ - Upgrade to JSONata 2.x (#4590) @knolleary
+ - Bump minimum version to node 18 (#4571) @knolleary
+ - npm: Remove production flag on npm invocation (#4347) @ZJvandeWeg
+ - Timer testing fix (#4367) @hlovdal
+ - Bump to 4.0.0-dev (#4322) @knolleary
+
+Nodes
+
+ - TCP node - when resetting, if no payload, stay disconnected @dceejay
+ - HTML node: add option for collecting attributes and content (#4513) @gorenje
+ - let split node specify property to split on, and join auto join correctly (#4386) @dceejay
+ - Add RFC4180 compliant mode to CSV node (#4540) @Steve-Mcl
+ - Fix change node to return boolean if asked (#4525) @dceejay
+ - Let msg.reset reset Tcp request node connection when in stay connected mode (#4406) @dceejay
+ - Let debug node status msg length be settable via settings (#4402) @dceejay
+ - Feat: Add ability to set headers for WebSocket client (#4436) @marcus-j-davies
+
+#### 3.1.9: Maintenance Release
+
+ - Prevent subflow being added to itself (#4654) @knolleary
+ - Fix use of spawn on windows with cmd files (#4652) @knolleary
+ - Guard refresh of unknown subflow (#4640) @knolleary
+ - Fix subflow module sending messages to debug sidebar (#4642) @knolleary
+
+#### 3.1.8: Maintenance Release
+
+ - Add validation and error handling on subflow instance properties (#4632) @knolleary
+ - Hide import/export context menu if disabled in theme (#4633) @knolleary
+ - Show change indicator on subflow tabs (#4631) @knolleary
+ - Bump dependencies (#4630) @knolleary
+ - Reset workspace index when clearing nodes (#4619) @knolleary
+ - Remove typo in global config (#4613) @kazuhitoyokoi
+
+#### 3.1.7: Maintenance Release
+
+ - Add Japanese translation for v3.1.6 (#4603) @kazuhitoyokoi
+ - Update jsonata version (#4593) @hardillb
+
+#### 3.1.6: Maintenance Release
+
+Editor
+
+ - Do not flag env var in num typedInput as error (#4582) @knolleary
+ - Fix example flow name in import dialog (#4578) @kazuhitoyokoi
+ - Fix missing node icons in workspace (#4570) @knolleary
+
+Runtime
+
+ - Handle undefined env vars (#4581) @knolleary
+ - fix: Removed offending MD5 crypto hash and replaced with SHA1 and SHA256 … (#4568) @JaysonHurst
+ - chore: remove never use import code (#4580) @giscafer
+
+Nodes
+
+ - fix: template node zh-CN translation (#4575) @giscafer
+
+#### 3.1.5: Maintenance Release
+
+Runtime
+
+ - Fix require of dns module (#4562) @knolleary
+ - Ensure global creds object is initialised when adding first cred (#4561) @knolleary
+
+#### 3.1.4: Maintenance Release
+
+Editor
+
+ - Highlight errors in config node sidebar (#4529) @knolleary
+ - Improve feedback in import dialog to show conflicted nodes (#4550) @knolleary
+ - Modify node users info in config editor footer (#4528) @knolleary
+ - Handle modified-nodes deploy after replacing unknown config node (#4556) @knolleary
+ - Handle undefined default export when importing module (#4539) @knolleary
+ - Fix icon scaling for non .svg icons (#4491) @ralphwetzel
+ - (convertNode) Do not create the credentials object if there is nothing to export (#4544) @GogoVega
+ - Ensure subflow instance node has g property set (#4538) @knolleary
+ - Handle importing flow with existing subflow and instance node (#4546) @knolleary
+ - Update index.mst (#4483) @gorenje
+ - Include top level property name when copying path from context (#4527) @knolleary
+ - Add handling to disable items on context menu (#4500) @kazuhitoyokoi
+ - Focus Quick Add dialog from context menu (#4516) @kazuhitoyokoi
+ - Fix subflow ports in Quick Add dialog (#4518) @kazuhitoyokoi
+ - Fix location of subflow ports in palette (#4502) @kazuhitoyokoi
+ - Client/Editor Events: fix off-in-on pattern emulating once (#4484) @gorenje
+ - Restore caching busting functionality without using explict version number (#4512) @knolleary
+ - Do not translate the list of available languages (#4531) @GogoVega
+ - Add French translation of v3.1.3 changes (#4477) @GogoVega
+ - i18n(es-ES) Spanish Spain translation (#4495) @joebordes
+ - Add missing validation messages (#4487) @GogoVega
+ - Add Japanese translations for v3.1.3 (#4498) @kazuhitoyokoi
+ - Replace `rename` by `edit` for the menu flow label (#4506) @GogoVega
+ - Update editor.json fix typo in German translation (#4552) @guidoffm
+
+Runtime
+
+ - Bump the github-actions group with 1 update (#4554) @app/dependabot
+ - Clone objects types when getting env values (#4519) @knolleary
+ - Ensure global-config credential env vars are merged on deploy (#4526) @knolleary
+
+Nodes
+
+ - 21-httprequest.js remove unused code, because of broken use of toLowercase (#4522) @gorenje
+
+#### 3.1.3: Maintenance Release
+
+Editor
+
+ - Add missing en-us messages (#4475) @knolleary
+
+#### 3.1.2: Maintenance Release
+
+Editor 
+
+ - Relax some node validators to allow undefined value (#4471) @knolleary
+ - Fix switch validation of typeof field (#4465) @knolleary
+ - Use move cursor when hovering on group border (#4467) @knolleary
+ - Added action list Chinese (Simplified and Traditional) translation + v3.1.1 changes (#4470) @wangyiyi2056
+ - Add French translation of `action-list` + v3.1.1 changes (#4466) @GogoVega
+ 
+ Runtime
+
+ - Ensure nested groups inside subflows have their g props remapped (#4472) @knolleary
+ 
+#### 3.1.1: Maintenance Release
+
+Editor
+
+ - Fix debug filter (#4461) @knolleary
+ - Fix various issues with debug pop-out window (#4459) @knolleary
+ - Ensure subflow instances keep track of their groups (#4457) @knolleary
+ - Fix `validateNodeProperty` without validator provided (#4455) @GogoVega
+ - Debounce node-removed notifications (#4453) @knolleary
+ - Don't try to load the parents of the first commit (#4448) @bonanitech
+ - Allow a theme to specifiy which theme mermaid should use (#4441) @knolleary
+ - Update browser title with flow name if set (#4427) @knolleary
+ - Ensure typeSearch handles undefined node definitions (#4423) @knolleary
+ - Ensure group w/h are imported if present (#4426) @knolleary
+ - Hide node status background when there is no status to show (#4425) @knolleary
+ - Add a close button to the restart-required notification (#4407) @knolleary
+ - Extend typedInput "num" type validity check to NaN, binary, octal & hex (#4371) @ralphwetzel
+ - Fix unintended new line in node name (#4399) @kazuhitoyokoi
+ - Ctrl-Enter does not close tray (Monaco) #4377 (#4382) @hazymat
+ - fix buffer viewer to handle 0b style binary (#4393) @dceejay
+ - Rework mermaid integration to support off-DOM rendering (#4364) @knolleary
+ - Add missing nls labels to context menu (#4365) @knolleary
+
+Runtime
+
+ - Bump the github-actions group with 2 updates (#4404) @app/dependabot
+ - Handle unknown node reference inside subflow module (#4460) @knolleary
+ - Add modules.install audit event when external module installed (#4452) @knolleary
+ - Allow import of modules with subpath in specifier (#4451) @knolleary
+ - Update node-red-admin version (#4438) @knolleary
+ - Handle false-like env vars properly (#4411) @knolleary
+ - Only save settings once during node load process (#4409) @knolleary
+ - Ensure global-config nodes lookup cred values properly (#4405) @knolleary
+ - Handle credential env var evaluation when no value set (#4362) @knolleary
+ - Don't commit package-lock.json (#4354) @bonanitech
+ - Fix env evaluation when one env references another in the same object (#4361) @knolleary
+ - Add dependabot for Github Actions (#4312) @Rotzbua
+ - Update outdated Github Actions (#4311) @Rotzbua
+ - github: Request `npm run test` in PR template (#4348) @ZJvandeWeg
+ - Add French translation of v3.1.0-beta.4 changes + slight improvements (#4329) @GogoVega
+ - Handle nodes with multiple input handlers properly (#4332) @knolleary
+ - Soften the language around unrequited PRs (#4351) @knolleary
+
+Nodes
+
+ - CSV: make CSV export way faster by not re-allocating and handling huge string (#4349) @Fadoli
+ - Delay: Fix regression in delay node to not pass on msg.reset (#4350) @dceejay
+ - Link Call: Handle undefined linkType value for existing link-call nodes (#4331) @knolleary
+ - MQTT: Guard against node.broker being undefined (#4454) @knolleary
+ - MQTT: check topic length > 0 before publish (#4416) @dceejay
+ - Switch/Change: Improve validation of switch/change node rules (#4368) @knolleary
+ - Template: Fix height of description editor in template node (#4346) @kazuhitoyokoi
+ - Various: Add validators to any fields using msg-typed Input (#4440) @knolleary
+
 #### 3.1.0: Milestone Release
 
 Editor

CONTRIBUTING.md

@@ -16,6 +16,9 @@ behavior to the project's core team at team@nodered.org.
 Please raise any bug reports on the relevant project's issue tracker. Be sure to
 search the list to see if your issue has already been raised.
 
+If your issue is more of a question on how to do something with Node-RED, please
+consider using the [community forum](https://discourse.nodered.org/).
+
 A good bug report is one that make it easy for us to understand what you were
 trying to do and what went wrong.
 
@@ -35,14 +38,18 @@ For feature requests, please raise them on the [forum](https://discourse.nodered
 ## Pull-Requests
 
 If you want to raise a pull-request with a new feature, or a refactoring
-of existing code, it may well get rejected if you haven't discussed it on
-the [forum](https://discourse.nodered.org) first.
+of existing code, please come and discuss it with us first. We prefer to
+do it that way to make sure your time and effort is well spent on something
+that fits with our goals.
+
+If you've got a bug-fix or similar for us, then you are most welcome to
+get it raised - just make sure you link back to the issue it's fixing and
+try to include some tests!
 
 All contributors need to sign the OpenJS Foundation's Contributor License Agreement.
 It is an online process and quick to do. If you raise a pull-request without
 having signed the CLA, you will be prompted to do so automatically.
 
-
 ### Code Branches
 
 When raising a PR for a fix or a new feature, it is important to target the right branch.

Gruntfile.js

@@ -143,6 +143,7 @@ module.exports = function(grunt) {
                     "packages/node_modules/@node-red/editor-client/src/js/user.js",
                     "packages/node_modules/@node-red/editor-client/src/js/comms.js",
                     "packages/node_modules/@node-red/editor-client/src/js/runtime.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/multiplayer.js",
                     "packages/node_modules/@node-red/editor-client/src/js/text/bidi.js",
                     "packages/node_modules/@node-red/editor-client/src/js/text/format.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/state.js",
@@ -151,7 +152,6 @@ module.exports = function(grunt) {
                     "packages/node_modules/@node-red/editor-client/src/js/font-awesome.js",
                     "packages/node_modules/@node-red/editor-client/src/js/history.js",
                     "packages/node_modules/@node-red/editor-client/src/js/validators.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/mermaid.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/utils.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "4.0.0-dev",
+    "version": "4.0.0-beta.3-1",
     "description": "Low-code programming for event-driven applications",
     "homepage": "https://nodered.org",
     "license": "Apache-2.0",
@@ -41,7 +41,7 @@
         "cors": "2.8.5",
         "cronosjs": "1.7.1",
         "denque": "2.1.0",
-        "express": "4.18.2",
+        "express": "4.19.2",
         "express-session": "1.17.3",
         "form-data": "4.0.0",
         "fs-extra": "11.1.1",
@@ -54,7 +54,7 @@
         "is-utf8": "0.2.1",
         "js-yaml": "4.1.0",
         "json-stringify-safe": "5.0.1",
-        "jsonata": "1.8.6",
+        "jsonata": "2.0.4",
         "lodash.clonedeep": "^4.5.0",
         "media-typer": "1.1.0",
         "memorystore": "1.6.7",
@@ -64,7 +64,7 @@
         "mqtt": "4.3.7",
         "multer": "1.4.5-lts.1",
         "mustache": "4.2.0",
-        "node-red-admin": "^3.1.0",
+        "node-red-admin": "^3.1.3",
         "node-watch": "0.7.4",
         "nopt": "5.0.0",
         "oauth2orize": "1.11.1",
@@ -73,8 +73,9 @@
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
         "raw-body": "2.5.2",
+        "rfdc": "^1.3.1",
         "semver": "7.5.4",
-        "tar": "6.1.13",
+        "tar": "6.2.1",
         "tough-cookie": "4.1.3",
         "uglify-js": "3.17.4",
         "uuid": "9.0.0",
@@ -109,10 +110,10 @@
         "jquery-i18next": "1.2.1",
         "jsdoc-nr-template": "github:node-red/jsdoc-nr-template",
         "marked": "4.3.0",
-        "mermaid": "^9.4.3",
+        "mermaid": "^10.4.0",
         "minami": "1.2.3",
         "mocha": "9.2.2",
-        "node-red-node-test-helper": "^0.3.2",
+        "node-red-node-test-helper": "^0.3.3",
         "nodemon": "2.0.20",
         "proxy": "^1.0.2",
         "sass": "1.62.1",
@@ -122,6 +123,6 @@
         "supertest": "6.3.3"
     },
     "engines": {
-        "node": ">=14"
+        "node": ">=18.5"
     }
 }

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

@@ -33,6 +33,9 @@ module.exports = {
             store: req.query['store'],
             req: apiUtils.getRequestLogObject(req)
         }
+        if (req.query['keysOnly'] !== undefined) {
+            opts.keysOnly = true
+        }
         runtimeAPI.context.getValue(opts).then(function(result) {
             res.json(result);
         }).catch(function(err) {

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

@@ -91,6 +91,7 @@ module.exports = {
         // Plugins
         adminApp.get("/plugins", needsPermission("plugins.read"), plugins.getAll, apiUtil.errorHandler);
         adminApp.get("/plugins/messages", needsPermission("plugins.read"), plugins.getCatalogs, apiUtil.errorHandler);
+        adminApp.get(/^\/plugins\/((@[^\/]+\/)?[^\/]+)\/([^\/]+)$/,needsPermission("plugins.read"),plugins.getConfig,apiUtil.errorHandler);
 
         adminApp.get("/diagnostics", needsPermission("diagnostics.read"), diagnostics.getReport, apiUtil.errorHandler);
 

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

@@ -40,5 +40,31 @@ module.exports = {
             console.log(err.stack);
             apiUtils.rejectHandler(req,res,err);
         })
+    },
+    getConfig: function(req, res) {
+
+        let opts = {
+            user: req.user,
+            module: req.params[0],
+            req: apiUtils.getRequestLogObject(req)
+        }
+
+        if (req.get("accept") === "application/json") {
+            runtimeAPI.nodes.getNodeInfo(opts.module).then(function(result) {
+                res.send(result);
+            }).catch(function(err) {
+                apiUtils.rejectHandler(req,res,err);
+            })
+        } else {
+            opts.lang = apiUtils.determineLangFromHeaders(req.acceptsLanguages());
+            if (/[^0-9a-z=\-\*]/i.test(opts.lang)) {
+                opts.lang = "en-US";
+            }
+            runtimeAPI.plugins.getPluginConfig(opts).then(function(result) {
+                return res.send(result);
+            }).catch(function(err) {
+                apiUtils.rejectHandler(req,res,err);
+            })
+        }
     }
 };

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

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-var apiUtils = require("../util");
 var runtimeAPI;
 var settings;
 var theme = require("../editor/theme");

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

@@ -160,20 +160,30 @@ function completeVerify(profile,done) {
 
 
 function genericStrategy(adminApp,strategy) {
-    var crypto = require("crypto")
-    var session = require('express-session')
-    var MemoryStore = require('memorystore')(session)
+    const crypto = require("crypto")
+    const session = require('express-session')
+    const MemoryStore = require('memorystore')(session)
 
-    adminApp.use(session({
-      // As the session is only used across the life-span of an auth
-      // hand-shake, we can use a instance specific random string
-      secret: crypto.randomBytes(20).toString('hex'),
-      resave: false,
-      saveUninitialized: false,
-      store: new MemoryStore({
-        checkPeriod: 86400000 // prune expired entries every 24h
-      })
-    }));
+    const sessionOptions = {
+        // As the session is only used across the life-span of an auth
+        // hand-shake, we can use a instance specific random string
+        secret: crypto.randomBytes(20).toString('hex'),
+        resave: false,
+        saveUninitialized: false,
+        store: new MemoryStore({
+          checkPeriod: 86400000 // prune expired entries every 24h
+        })
+    }
+    if (settings.httpAdminCookieOptions) {
+        sessionOptions.cookie = {
+            path: '/',
+            httpOnly: true,
+            secure: false,
+            maxAge: null,
+            ...settings.httpAdminCookieOptions
+        }
+    }
+    adminApp.use(session(sessionOptions));
     //TODO: all passport references ought to be in ./auth
     adminApp.use(passport.initialize());
     adminApp.use(passport.session());
@@ -205,9 +215,10 @@ function genericStrategy(adminApp,strategy) {
     passport.use(new strategy.strategy(options, verify));
 
     adminApp.get('/auth/strategy',
-        passport.authenticate(strategy.name, {session:false,
+        passport.authenticate(strategy.name, {
+            session:false,
             failureMessage: true,
-            failureRedirect: settings.httpAdminRoot
+            failureRedirect: settings.httpAdminRoot + '?session_message=Login Failed'
         }),
         completeGenerateStrategyAuth,
         handleStrategyError
@@ -221,7 +232,7 @@ function genericStrategy(adminApp,strategy) {
         passport.authenticate(strategy.name, {
             session:false,
             failureMessage: true,
-            failureRedirect: settings.httpAdminRoot
+            failureRedirect: settings.httpAdminRoot + '?session_message=Login Failed'
         }),
         completeGenerateStrategyAuth,
         handleStrategyError

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

@@ -25,7 +25,7 @@ function hasPermission(userScope,permission) {
     }
     var i;
 
-    if (util.isArray(permission)) {
+    if (Array.isArray(permission)) {
         // Multiple permissions requested - check each one
         for (i=0;i<permission.length;i++) {
             if (!hasPermission(userScope,permission[i])) {
@@ -36,7 +36,7 @@ function hasPermission(userScope,permission) {
         return true;
     }
 
-    if (util.isArray(userScope)) {
+    if (Array.isArray(userScope)) {
         if (userScope.length === 0) {
             return false;
         }

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

@@ -18,7 +18,6 @@ var BearerStrategy = require('passport-http-bearer').Strategy;
 var ClientPasswordStrategy = require('passport-oauth2-client-password').Strategy;
 
 var passport = require("passport");
-var crypto = require("crypto");
 var util = require("util");
 
 var Tokens = require("./tokens");

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

@@ -74,7 +74,7 @@ function init(config) {
             } else {
                 var us = config.users;
                 /* istanbul ignore else */
-                if (!util.isArray(us)) {
+                if (!Array.isArray(us)) {
                     us = [us];
                 }
                 for (var i=0;i<us.length;i++) {

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

@@ -77,6 +77,53 @@ function CommsConnection(ws, user) {
         log.trace("comms.close "+self.session);
         removeActiveConnection(self);
     });
+
+    const handleAuthPacket = function(msg) {
+        Tokens.get(msg.auth).then(function(client) {
+            if (client) {
+                Users.get(client.user).then(function(user) {
+                    if (user) {
+                        self.user = user;
+                        log.audit({event: "comms.auth",user:self.user});
+                        completeConnection(msg, client.scope,msg.auth,true);
+                    } else {
+                        log.audit({event: "comms.auth.fail"});
+                        completeConnection(msg, null,null,false);
+                    }
+                });
+            } else {
+                Users.tokens(msg.auth).then(function(user) {
+                    if (user) {
+                        self.user = user;
+                        log.audit({event: "comms.auth",user:self.user});
+                        completeConnection(msg, user.permissions,msg.auth,true);
+                    } else {
+                        log.audit({event: "comms.auth.fail"});
+                        completeConnection(msg, null,null,false);
+                    }
+                });
+            }
+        });
+    }
+    const completeConnection = function(msg, userScope, session, sendAck) {
+        try {
+            if (!userScope || !Permissions.hasPermission(userScope,"status.read")) {
+                ws.send(JSON.stringify({auth:"fail"}));
+                ws.close();
+            } else {
+                pendingAuth = false;
+                addActiveConnection(self);
+                self.token = msg.auth;
+                if (sendAck) {
+                    ws.send(JSON.stringify({auth:"ok"}));
+                }
+            }
+        } catch(err) {
+            console.log(err.stack);
+            // Just in case the socket closes before we attempt
+            // to send anything.
+        }
+    }
     ws.on('message', function(data,flags) {
         var msg = null;
         try {
@@ -86,68 +133,34 @@ function CommsConnection(ws, user) {
             return;
         }
         if (!pendingAuth) {
-            if (msg.subscribe) {
+            if (msg.auth) {
+                handleAuthPacket(msg)
+            } else if (msg.subscribe) {
                 self.subscribe(msg.subscribe);
                 // handleRemoteSubscription(ws,msg.subscribe);
+            } else if (msg.topic) {
+                runtimeAPI.comms.receive({
+                    user: self.user,
+                    client: self,
+                    topic: msg.topic,
+                    data: msg.data
+                })
             }
         } else {
-            var completeConnection = function(userScope,session,sendAck) {
-                try {
-                    if (!userScope || !Permissions.hasPermission(userScope,"status.read")) {
-                        ws.send(JSON.stringify({auth:"fail"}));
-                        ws.close();
-                    } else {
-                        pendingAuth = false;
-                        addActiveConnection(self);
-                        self.token = msg.auth;
-                        if (sendAck) {
-                            ws.send(JSON.stringify({auth:"ok"}));
-                        }
-                    }
-                } catch(err) {
-                    console.log(err.stack);
-                    // Just in case the socket closes before we attempt
-                    // to send anything.
-                }
-            }
             if (msg.auth) {
-                Tokens.get(msg.auth).then(function(client) {
-                    if (client) {
-                        Users.get(client.user).then(function(user) {
-                            if (user) {
-                                self.user = user;
-                                log.audit({event: "comms.auth",user:self.user});
-                                completeConnection(client.scope,msg.auth,true);
-                            } else {
-                                log.audit({event: "comms.auth.fail"});
-                                completeConnection(null,null,false);
-                            }
-                        });
-                    } else {
-                        Users.tokens(msg.auth).then(function(user) {
-                            if (user) {
-                                self.user = user;
-                                log.audit({event: "comms.auth",user:self.user});
-                                completeConnection(user.permissions,msg.auth,true);
-                            } else {
-                                log.audit({event: "comms.auth.fail"});
-                                completeConnection(null,null,false);
-                            }
-                        });
-                    }
-                });
+                handleAuthPacket(msg)
             } else {
                 if (anonymousUser) {
                     log.audit({event: "comms.auth",user:anonymousUser});
                     self.user = anonymousUser;
-                    completeConnection(anonymousUser.permissions,null,false);
+                    completeConnection(msg, anonymousUser.permissions, null, false);
                     //TODO: duplicated code - pull non-auth message handling out
                     if (msg.subscribe) {
                         self.subscribe(msg.subscribe);
                     }
                 } else {
                     log.audit({event: "comms.auth.fail"});
-                    completeConnection(null,null,false);
+                    completeConnection(msg, null,null,false);
                 }
             }
         }

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

@@ -14,11 +14,9 @@
  * limitations under the License.
  **/
 
-var express = require("express");
 var path = require('path');
 
 var comms = require("./comms");
-var library = require("./library");
 var info = require("./settings");
 
 var auth = require("../auth");
@@ -51,7 +49,7 @@ module.exports = {
 
             var ui = require("./ui");
 
-            ui.init(runtimeAPI);
+            ui.init(settings, runtimeAPI);
 
             const editorApp = apiUtil.createExpressApp(settings)
 

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

@@ -15,8 +15,6 @@
  **/
 
 var apiUtils = require("../util");
-var fs = require('fs');
-var fspath = require('path');
 
 var runtimeAPI;
 

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

@@ -13,9 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-var fs = require('fs');
-var path = require('path');
-// var apiUtil = require('../util');
 
 var i18n = require("@node-red/util").i18n; // TODO: separate module
 

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

@@ -15,7 +15,6 @@
  **/
 
 var apiUtils = require("../util");
-var express = require("express");
 var runtimeAPI;
 var settings;
 

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

@@ -14,7 +14,6 @@
  * limitations under the License.
  **/
 
-var express = require("express");
 var util = require("util");
 var path = require("path");
 var fs = require("fs");
@@ -71,7 +70,7 @@ function serveFilesFromTheme(themeValue, themeApp, directory, baseDirectory) {
     var result = [];
     if (themeValue) {
         var array = themeValue;
-        if (!util.isArray(array)) {
+        if (!Array.isArray(array)) {
             array = [array];
         }
 
@@ -234,6 +233,10 @@ module.exports = {
             themeSettings.projects = theme.projects;
         }
 
+        if (theme.hasOwnProperty("multiplayer")) {
+            themeSettings.multiplayer = theme.multiplayer;
+        }
+
         if (theme.hasOwnProperty("keymap")) {
             themeSettings.keymap = theme.keymap;
         }
@@ -339,6 +342,8 @@ module.exports = {
                 }
                 theme.codeEditor = theme.codeEditor || {}
                 theme.codeEditor.options = Object.assign({}, themePlugin.monacoOptions, theme.codeEditor.options);
+
+                theme.mermaid = Object.assign({}, themePlugin.mermaid, theme.mermaid)
             }
             activeThemeInitialised = true;
         }

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

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+const crypto = require('crypto')
 var express = require('express');
 var fs = require("fs");
 var path = require("path");
@@ -24,13 +25,16 @@ var apiUtils = require("../util");
 var theme = require("./theme");
 
 var runtimeAPI;
+let settings;
 var editorClientDir = path.dirname(require.resolve("@node-red/editor-client"));
 var defaultNodeIcon = path.join(editorClientDir,"public","red","images","icons","arrow-in.svg");
 var editorTemplatePath = path.join(editorClientDir,"templates","index.mst");
 var editorTemplate;
+let cacheBuster
 
 module.exports = {
-    init: function(_runtimeAPI) {
+    init: function(_settings, _runtimeAPI) {
+        settings = _settings;
         runtimeAPI = _runtimeAPI;
         editorTemplate = fs.readFileSync(editorTemplatePath,"utf8");
         Mustache.parse(editorTemplate);
@@ -91,6 +95,12 @@ module.exports = {
     },
 
     editor: async function(req,res) {
+        if (!cacheBuster) {
+            // settings.instanceId is set asynchronously to the editor-api
+            // being initiaised. So we defer calculating the cacheBuster hash
+            // until the first load of the editor
+            cacheBuster = crypto.createHash('sha1').update(`${settings.version || 'version'}-${settings.instanceId || 'instanceId'}`).digest("hex").substring(0,12)    
+        }
 
         let sessionMessages;
         if (req.session && req.session.messages) {
@@ -99,6 +109,7 @@ module.exports = {
         }
         res.send(Mustache.render(editorTemplate,{
             sessionMessages,
+            cacheBuster,
             ...await theme.context()
         }));
     },

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

@@ -24,11 +24,8 @@
   * @namespace @node-red/editor-api
   */
 
-var express = require("express");
 var bodyParser = require("body-parser");
-var util = require('util');
 var passport = require('passport');
-var cors = require('cors');
 
 var auth = require("./auth");
 var apiUtil = require("./util");

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "4.0.0-dev",
+    "version": "4.0.0-beta.3-1",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,14 +16,14 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "4.0.0-dev",
-        "@node-red/editor-client": "4.0.0-dev",
+        "@node-red/util": "4.0.0-beta.3-1",
+        "@node-red/editor-client": "4.0.0-beta.3-1",
         "bcryptjs": "2.4.3",
         "body-parser": "1.20.2",
         "clone": "2.1.2",
         "cors": "2.8.5",
         "express-session": "1.17.3",
-        "express": "4.18.2",
+        "express": "4.19.2",
         "memorystore": "1.6.7",
         "mime": "3.0.0",
         "multer": "1.4.5-lts.1",

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

@@ -109,7 +109,6 @@
             "selectionToSubflow": "Auswahl in Subflow umwandeln",
             "flows": "Flow",
             "add": "Hinzufügen",
-            "rename": "Umbenennen",
             "delete": "Löschen",
             "keyboardShortcuts": "Tastenkürzel",
             "login": "Anmelden",
@@ -591,6 +590,8 @@
             },
             "nodeCount": "__label__ Node",
             "nodeCount_plural": "__label__ Nodes",
+            "pluginCount": "__count__ Plugin",
+            "pluginCount_plural": "__count__ Plugins",    
             "moduleCount": "__count__ Modul verfügbar",
             "moduleCount_plural": "__count__ Module verfügbar",
             "inuse": "In Gebrauch",
@@ -1076,7 +1077,7 @@
             "git-auth-error": "Git-Authentifizierungsfehler"
         },
         "create-success": {
-            "success": "Sie haben Ihr erstes Projekt erfolgreich erstduellt!",
+            "success": "Sie haben Ihr erstes Projekt erfolgreich erstellt!",
             "desc0": "Sie können jetzt Node-RED wie bisher verwenden.",
             "desc1": "Im Tab 'Info' in der Seitenleiste wird angezeigt, welches das aktuelle Projekt ist. Über die Schaltfläche rechts neben dem Projektnamen gelangt man zu 'Projekteinstellungen'.",
             "desc2": "Im Tab 'Commit-Historie' in der Seitenleiste werden alle Dateien angezeigt, die sich in Ihrem Projekt geändert haben, und um sie ins lokale Repository zu übertragen (commit). Es zeigt Ihnen eine vollständige Historie Ihrer Commits an und ermöglicht es Ihnen, Ihre Commits in ein (remote) Server-Repository zu schieben (push)."
@@ -1172,17 +1173,6 @@
     "diagnostics": {
         "title": "System-Informationen"
     },
-    "languages": {
-        "de": "Deutsch",
-        "en-US": "Englisch",
-        "fr": "Französisch",
-        "ja": "Japanisch",
-        "ko": "Koreanisch",
-        "pt-BR":"Portugiesisch",
-        "ru": "Russisch",
-        "zh-CN": "Chinesisch (Vereinfacht)",
-        "zh-TW": "Chinesisch (Traditionell)"
-    },
     "validator": {
         "errors": {
             "invalid-json": "Ungültige JSON-Daten: __error__",

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

@@ -113,7 +113,7 @@
             "displayStatus": "Show node status",
             "displayConfig": "Configuration nodes",
             "import": "Import",
-            "importExample": "Import Example Flow",
+            "importExample": "Import example flow",
             "export": "Export",
             "search": "Search flows",
             "searchInput": "search your flows",
@@ -122,7 +122,6 @@
             "selectionToSubflow": "Selection to Subflow",
             "flows": "Flows",
             "add": "Add",
-            "rename": "Rename",
             "delete": "Delete",
             "keyboardShortcuts": "Keyboard shortcuts",
             "login": "Login",
@@ -130,6 +129,11 @@
             "editPalette": "Manage palette",
             "other": "Other",
             "showTips": "Show tips",
+            "showNodeHelp": "Show node help",
+            "enableSelectedNodes": "Enable selected nodes",
+            "disableSelectedNodes": "Disable selected nodes",
+            "showSelectedNodeLabels": "Show selected node labels",
+            "hideSelectedNodeLabels": "Hide selected node labels",
             "showWelcomeTours": "Show guided tours for new versions",
             "help": "Node-RED website",
             "projects": "Projects",
@@ -299,7 +303,8 @@
                 "missingType": "Input not a valid flow - item __index__ missing 'type' property"
             },
             "conflictNotification1": "Some of the nodes you are importing already exist in your workspace.",
-            "conflictNotification2": "Select which nodes to import and whether to replace the existing nodes, or to import a copy of them."
+            "conflictNotification2": "Select which nodes to import and whether to replace the existing nodes, or to import a copy of them.",
+            "alreadyExists": "This node already exists"
         },
         "copyMessagePath": "Path copied",
         "copyMessageValue": "Value copied",
@@ -367,6 +372,7 @@
             "deleted": "deleted",
             "flowDeleted": "flow deleted",
             "flowAdded": "flow added",
+            "moved": "moved",
             "movedTo": "moved to __id__",
             "movedFrom": "moved from __id__"
         },
@@ -511,8 +517,8 @@
         "selectAllConnected": "Select connected",
         "addRemoveNode": "Add/remove node from selection",
         "editSelected": "Edit selected node",
-        "deleteSelected": "Delete selected nodes or link",
-        "deleteReconnect": "Delete and Reconnect",
+        "deleteSelected": "Delete selection",
+        "deleteReconnect": "Delete and reconnect",
         "importNode": "Import nodes",
         "exportNode": "Export nodes",
         "nudgeNode": "Move selected nodes (1px)",
@@ -609,6 +615,8 @@
             },
             "nodeCount": "__label__ node",
             "nodeCount_plural": "__label__ nodes",
+            "pluginCount": "__count__ plugin",
+            "pluginCount_plural": "__count__ plugins",
             "moduleCount": "__count__ module available",
             "moduleCount_plural": "__count__ modules available",
             "inuse": "in use",
@@ -636,6 +644,7 @@
             "errors": {
                 "catalogLoadFailed": "<p>Failed to load node catalogue.</p><p>Check the browser console for more information</p>",
                 "installFailed": "<p>Failed to install: __module__</p><p>__message__</p><p>Check the log for more information</p>",
+                "installTimeout": "<p>Install continuing the background.</p><p>Nodes will appear in palette when complete. Check the log for more information.</p>",
                 "removeFailed": "<p>Failed to remove: __module__</p><p>__message__</p><p>Check the log for more information</p>",
                 "updateFailed": "<p>Failed to update: __module__</p><p>__message__</p><p>Check the log for more information</p>",
                 "enableFailed": "<p>Failed to enable: __module__</p><p>__message__</p><p>Check the log for more information</p>",
@@ -650,6 +659,9 @@
                     "body": "<p>Removing '__module__'</p><p>Removing the node will uninstall it from Node-RED. The node may continue to use resources until Node-RED is restarted.</p>",
                     "title": "Remove nodes"
                 },
+                "removePlugin": {
+                    "body": "<p>Removed plugin __module__. Please reload the editor to clear left-overs.</p>"
+                },
                 "update": {
                     "body": "<p>Updating '__module__'</p><p>Updating the node will require a restart of Node-RED to complete the update. This must be done manually.</p>",
                     "title": "Update nodes"
@@ -661,7 +673,8 @@
                     "review": "Open node information",
                     "install": "Install",
                     "remove": "Remove",
-                    "update": "Update"
+                    "update": "Update",
+                    "understood": "Understood"
                 }
             }
         }
@@ -703,7 +716,7 @@
             "triggerAction": "Trigger action",
             "find": "Find in workspace",
             "copyItemUrl": "Copy item url",
-	    "copyURL2Clipboard": "Copied url to clipboard",
+            "copyURL2Clipboard": "Copied url to clipboard",
             "showFlow": "Show",
             "hideFlow": "Hide"
         },
@@ -919,7 +932,14 @@
             "date": "timestamp",
             "jsonata": "expression",
             "env": "env variable",
-            "cred": "credential"
+            "cred": "credential",
+            "conf-types": "config node"
+        },
+        "date": {
+            "format": {
+                "timestamp": "milliseconds since epoch",
+                "object": "JavaScript Date Object"
+            }
         }
     },
     "editableList": {
@@ -1202,22 +1222,22 @@
         "title": "System Info"
     },
     "languages": {
-        "de": "German",
+        "de": "Deutsch",
         "en-US": "English",
-        "fr": "French",
-        "ja": "Japanese",
+        "es-ES": "Español (España)",
+        "fr": "Français",
+        "ja": "日本語",
         "ko": "Korean",
-        "pt-BR":"Portuguese",
-        "ru": "Russian",
-        "zh-CN": "Chinese(Simplified)",
-        "zh-TW": "Chinese(Traditional)"
+        "pt-BR": "Português (Brasil)",
+        "ru": "Русский",
+        "zh-CN": "简体中文",
+        "zh-TW": "繁體中文"
     },
     "validator": {
         "errors": {
             "invalid-json": "Invalid JSON data: __error__",
-            "invalid-json-prop": "__prop__: invalid JSON data: __error__",
+            "invalid-expr": "Invalid JSONata expression: __error__",
             "invalid-prop": "Invalid property expression",
-            "invalid-prop-prop": "__prop__: invalid property expression",
             "invalid-num": "Invalid number",
             "invalid-num-prop": "__prop__: invalid number",
             "invalid-regexp": "Invalid input pattern",
@@ -1229,6 +1249,7 @@
         }
     },
     "contextMenu": {
+        "showActionList": "Show action list",
         "insert": "Insert",
         "node": "Node",
         "junction": "Junction",

packages/node_modules/@node-red/editor-client/locales/es-ES/infotips.json

@@ -0,0 +1,26 @@
+{
+    "info": {
+        "tip0": "Puedes eliminar los nodos o enlaces seleccionados con {{core:delete-selection}}",
+        "tip1": "Busca nodos con {{core:search}}",
+        "tip2": "{{core:toggle-sidebar}} alternará la vista de esta barra lateral",
+        "tip3": "Puedes gestionar tu paleta de nodos con {{core:manage-palette}}",
+        "tip4": "Tus nodos de configuración de flujo aparecen en el panel de la barra lateral. Se puede acceder desde el menú o con {{core:show-config-tab}}",
+        "tip5": "Activa o desactiva estos consejos desde la opción en la configuración",
+        "tip6": "Mueve los nodos seleccionados usando las teclas [izquierda] [arriba] [abajo] y [derecha]. Mantén pulsada [Mayús] para desplazarlos más",
+        "tip7": "Arrastrar un nodo a un cable lo insertará en el enlace",
+        "tip8": "Exporta los nodos seleccionados, o la pestaña actual con {{core:show-export-dialog}}",
+        "tip9": "Importa un flujo arrastrando su JSON al editor, o con {{core:show-import-dialog}}",
+        "tip10": "[shift][clic] y arrastrar en un puerto de nodo para mover todos los cables conectados o sólo el seleccionado",
+        "tip11": "Mostrar la pestaña Información con {{core:show-info-tab}} o la pestaña Depuración con {{core:show-debug-tab}}",
+        "tip12": "[ctrl] [clic] en el área de trabajo para abrir el diálogo de adición rápida",
+        "tip13": "Mantén pulsada [ctrl] cuando [haces clic] en un puerto de nodo para habilitar el enlazado rápido",
+        "tip14": "Mantén pulsada [shift] cuando [haces clic] en un nodo para seleccionar también todos sus nodos conectados",
+        "tip15": "Mantén pulsada [ctrl] cuando [haces clic] en un nodo para añadirlo o eliminarlo de la selección actual",
+        "tip16": "Cambia de pestaña de flujo con {{core:show-previous-tab}} y {{core:show-next-tab}}",
+        "tip17": "Puedes confirmar tus cambios en la bandeja de edición de nodos con {{core:confirm-edit-tray}} o cancelarlos con {{core:cancel-edit-tray}}",
+        "tip18": "Al pulsar {{core:edit-selected-node}} se editará el primer nodo de la selección actual"
+    }
+}
+
+
+

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

@@ -0,0 +1,278 @@
+{
+    "$string": {
+        "args": "arg[, prettify]",
+        "desc": "Convierte el parámetro `arg` a una cadena usando las siguientes reglas de conversión:\n\n - Las cadenas no cambian\n - Las funciones se convierten en una cadena vacía\n - El infinito numérico y NaN arrojan un error porque no se pueden representar como un número JSON\n: todos los demás valores se convierten a una cadena JSON usando la función `JSON.stringify`. Si `prettify` es verdadero, entonces se produce JSON \"prettified\". es decir, una línea por campo y las líneas se indentarán según la profundidad del campo."
+    },
+    "$length": {
+        "args": "str",
+        "desc": "Devuelve el número de caracteres de la cadena `str`. Se genera un error si `str` no es una cadena."
+    },
+    "$substring": {
+        "args": "str, start[, length]",
+        "desc": "Devuelve una cadena que contiene los caracteres del primer parámetro `str` comenzando en la posición `start` (desplazamiento cero). Si se especifica 'longitud', la subcadena contendrá el máximo de caracteres de 'longitud'. Si 'inicio' es negativo, indica el número de caracteres desde el final de 'cadena'."
+    },
+    "$substringBefore": {
+        "args": "str, chars",
+        "desc": "Devuelve la subcadena antes de la primera aparición de la secuencia de caracteres `chars` en `str`. Si `str` no contiene `caracteres`, entonces devuelve `str`."
+    },
+    "$substringAfter": {
+        "args": "str, chars",
+        "desc": "Devuelve la subcadena después de la primera aparición de la secuencia de caracteres `chars` en `str`. Si `str` no contiene `caracteres`, entonces devuelve `str`."
+    },
+    "$uppercase": {
+        "args": "str",
+        "desc": "Devuelve una cadena con todos los caracteres de `str` convertidos a mayúsculas."
+    },
+    "$lowercase": {
+        "args": "str",
+        "desc": "Devuelve una cadena con todos los caracteres de `str` convertidos a minúsculas."
+    },
+    "$trim": {
+        "args": "str",
+        "desc": "Normaliza y recorta todos los caracteres de espacio en blanco en `str` aplicando los siguientes pasos:\n\n - Todas las tabulaciones, retornos de carro y avances de línea se reemplazan con espacios.\n- Las secuencias contiguas de espacios se reducen a un solo espacio.\n- Se eliminan los espacios iniciales y finales.\n\n Si no se especifica `str` (es decir, esta función se invoca sin argumentos), entonces el valor de contexto se utiliza como el valor de `str`. Se genera un error si `str` no es una cadena."
+    },
+    "$contains": {
+        "args": "str, pattern",
+        "desc": "Devuelve 'verdadero' si 'cadena' coincide con 'patrón', de lo contrario, devuelve 'falso'. Si no se especifica `str` (es decir, esta función se invoca con un argumento), entonces el valor del contexto se utiliza como valor de `str`. El parámetro `patrón` puede ser una cadena o una expresión regular."
+    },
+    "$split": {
+        "args": "str[, separator][, limit]",
+        "desc": "Divide el parámetro `str` en una matriz de subcadenas. Es un error si `str` no es una cadena. El parámetro opcional `separador` especifica los caracteres dentro de la `cadena` sobre los cuales se debe dividir como una cadena o una expresión regular. Si no se especifica 'separador', se supone que la cadena está vacía y 'cadena' se dividirá en una matriz de caracteres individuales. Es un error si el 'separador' no es una cadena. El parámetro opcional 'límite' es un número que especifica el número máximo de subcadenas que se incluirán en la matriz resultante. Cualquier subcadena adicional se descarta. Si no se especifica `límite`, entonces `str` se divide completamente sin límite para el tamaño de la matriz resultante. Es un error si 'límite' no es un número positivo."
+    },
+    "$join": {
+        "args": "array[, separator]",
+        "desc": "Une una matriz de cadenas de componentes en una única cadena concatenada con cada cadena de componentes separada por el parámetro 'separador' opcional. Es un error si la 'matriz' de entrada contiene un elemento que no es una cadena. Si no se especifica 'separador', se supone que es una cadena vacía, es decir, que no hay 'separador' entre las cadenas componentes. Es un error si el 'separador' no es una cadena."
+    },
+    "$match": {
+        "args": "str, pattern [, limit]",
+        "desc": "Aplica la cadena `str` a la expresión regular `pattern` y devuelve una matriz de objetos, cada objeto contiene información sobre cada aparición de una coincidencia dentro de `str`."
+    },
+    "$replace": {
+        "args": "str, pattern, replacement [, limit]",
+        "desc": "Encuentra apariciones de `patrón` dentro de `str` y las reemplaza con `reemplazo`.\n\nEl parámetro opcional `límite` es el número máximo de reemplazos."
+    },
+    "$now": {
+        "args": "$[picture [, timezone]]",
+        "desc": "Genera una marca de tiempo en formato compatible con ISO 8601 y la devuelve como una cadena. Si se proporcionan los parámetros opcionales `picture` y `zona horaria`, entonces la marca de tiempo actual se formatea como se describe en la función `$fromMillis()`"
+    },
+    "$base64encode": {
+        "args": "string",
+        "desc": "Convierte una cadena ASCII a una representación base 64. Cada carácter de la cadena se trata como un byte de datos binarios. Esto requiere que todos los caracteres de la cadena estén en el rango de 0x00 a 0xFF, que incluye todos los caracteres de las cadenas codificadas con URI. No se admiten caracteres Unicode fuera de ese rango."
+    },
+    "$base64decode": {
+        "args": "string",
+        "desc": "Convierte bytes codificados en base 64 en una cadena, utilizando una página de códigos Unicode UTF-8."
+    },
+    "$number": {
+        "args": "arg",
+        "desc": "Convierte el parámetro `arg` a un número usando las siguientes reglas de conversión:\n\n - Los números no cambian\n - Las cadenas que contienen una secuencia de caracteres que representan un número JSON legal se convierten a ese número\n - Todos los demás valores provocar que se arroje un error."
+    },
+    "$abs": {
+        "args": "number",
+        "desc": "Devuelve el valor absoluto del parámetro 'número'."
+    },
+    "$floor": {
+        "args": "number",
+        "desc": "Devuelve el valor de 'número' redondeado hacia abajo al entero más cercano que sea menor o igual a 'número'."
+    },
+    "$ceil": {
+        "args": "number",
+        "desc": "Devuelve el valor de 'número' redondeado al número entero más cercano que sea mayor o igual a 'número'."
+    },
+    "$round": {
+        "args": "number [, precision]",
+        "desc": "Devuelve el valor del parámetro 'número' redondeado al número de decimales especificado por el parámetro opcional 'precisión'."
+    },
+    "$power": {
+        "args": "base, exponent",
+        "desc": "Devuelve el valor de 'base' elevado a la potencia de 'exponente'."
+    },
+    "$sqrt": {
+        "args": "number",
+        "desc": "Devuelve la raíz cuadrada del valor del parámetro 'número'."
+    },
+    "$random": {
+        "args": "",
+        "desc": "Devuelve un número pseudoaleatorio mayor o igual a cero y menor que uno."
+    },
+    "$millis": {
+        "args": "",
+        "desc": "Devuelve el número de milisegundos desde la época Unix (1 de enero de 1970 UTC) como un número. Todas las invocaciones de `$millis()` dentro de una evaluación de una expresión devolverán el mismo valor."
+    },
+    "$sum": {
+        "args": "array",
+        "desc": "Devuelve la suma aritmética de una 'matriz' de números. Es un error si la 'matriz' de entrada contiene un elemento que no es un número."
+    },
+    "$max": {
+        "args": "array",
+        "desc": "Devuelve el número máximo en una 'matriz' de números. Es un error si la 'matriz' de entrada contiene un elemento que no es un número."
+    },
+    "$min": {
+        "args": "array",
+        "desc": "Devuelve el número mínimo en una 'matriz' de números. Es un error si la 'matriz' de entrada contiene un elemento que no es un número."
+    },
+    "$average": {
+        "args": "array",
+        "desc": "Devuelve el valor medio de una 'matriz' de números. Es un error si la 'matriz' de entrada contiene un elemento que no es un número."
+    },
+    "$boolean": {
+        "args": "arg",
+        "desc": "Convierte el argumento a un booleano usando las siguientes reglas:\n\n - `Booleano`: sin cambios\n - `cadena`: vacía: `falso`\n - `cadena`: no vacía: `verdadero`\n - `número`: `0`: `falso`\n - `número`: distinto de cero: `verdadero`\n - `nulo`: `falso`\n - `matriz`: vacía: `falso`\n - `array`: contiene un miembro que se convierte en `true`: `true`\n - `array`: todos los miembros se convierten en `false`: `false`\n - `object`: vacío: `false`\n - `objeto`: no vacío: `verdadero`\n - `función`: `falso`"
+    },
+    "$not": {
+        "args": "arg",
+        "desc": "Devuelve booleano NEGADO del argumento. `arg` se convierte antes en un booleano"
+    },
+    "$exists": {
+        "args": "arg",
+        "desc": "Devuelve booleano 'verdadero' si la expresión 'arg' se evalúa como un valor, o 'falso' si la expresión no coincide con nada (por ejemplo, una ruta a una referencia de campo inexistente)."
+    },
+    "$count": {
+        "args": "array",
+        "desc": "Devuelve el número de elementos de la matriz."
+    },
+    "$append": {
+        "args": "array, array",
+        "desc": "Agrega dos matrices"
+    },
+    "$sort": {
+        "args": "array [, function]",
+        "desc": "Devuelve una matriz que contiene todos los valores en el parámetro `array`, pero ordenados.\n\nSi se proporciona una `función` de comparador, entonces debe ser una función que toma dos parámetros:\n\n`function(left , derecha)`\n\nEsta función es invocada por el algoritmo de clasificación para comparar dos valores `izquierda` y `derecha`. Si el valor de `izquierda` debe colocarse después del valor de `derecha` en el orden de clasificación deseado, entonces la función debe devolver un valor booleano 'verdadero' para indicar un intercambio. De lo contrario debe devolver 'falso'."
+    },
+    "$reverse": {
+        "args": "array",
+        "desc": "Devuelve una matriz que contiene todos los valores del parámetro `matriz`, pero en orden inverso."
+    },
+    "$shuffle": {
+        "args": "array",
+        "desc": "Devuelve una matriz que contiene todos los valores del parámetro `array`, pero mezclados en orden aleatorio."
+    },
+    "$zip": {
+        "args": "array, ...",
+        "desc": "Devuelve una matriz convolucionada (comprimida) que contiene matrices agrupadas de valores de los argumentos `matriz1`... `matrizN` del índice 0, 1, 2...."
+    },
+    "$keys": {
+        "args": "object",
+        "desc": "Devuelve una matriz que contiene las claves del objeto. Si el argumento es una matriz de objetos, entonces la matriz devuelta contiene una lista deduplicada de todas las claves de todos los objetos."
+    },
+    "$lookup": {
+        "args": "object, key",
+        "desc": "Devuelve el valor asociado con la clave en el objeto. Si el primer argumento es una matriz de objetos, entonces se buscan todos los objetos de la matriz y se devuelven los valores asociados con todas las apariciones de la clave."
+    },
+    "$spread": {
+        "args": "object",
+        "desc": "Divide un objeto que contiene pares clave/valor en una matriz de objetos, cada uno de los cuales tiene un único par clave/valor del objeto de entrada. Si el parámetro es una matriz de objetos, entonces la matriz resultante contiene un objeto para cada par clave/valor en cada objeto de la matriz proporcionada."
+    },
+    "$merge": {
+        "args": "array<object>",
+        "desc": "Fusiona una matriz de objetos en un único objeto que contiene todos los pares clave/valor de cada uno de los objetos en la matriz de entrada. Si alguno de los objetos de entrada contiene la misma clave, entonces el objeto devuelto contendrá el valor del último en la matriz. Es un error si la matriz de entrada contiene un elemento que no es un objeto."
+    },
+    "$sift": {
+        "args": "object, function",
+        "desc": "Devuelve un objeto que contiene solo los pares clave/valor del parámetro `objeto` que satisfacen el predicado `función` pasado como segundo parámetro.\n\nLa `función` que se proporciona como segundo parámetro debe tener la siguiente firma:\n\n`función(valor [, clave [, objeto]])`"
+    },
+    "$each": {
+        "args": "object, function",
+        "desc": "Devuelve una matriz que contiene los valores devueltos por la función cuando se aplica a cada par clave/valor en el objeto."
+    },
+    "$map": {
+        "args": "array, function",
+        "desc": "Devuelve una matriz que contiene los resultados de aplicar el parámetro `función` a cada valor en el parámetro `matriz`.\n\nLa `función` que se proporciona como segundo parámetro debe tener la siguiente firma:\n\n`función( valor [, índice [, matriz]])`"
+    },
+    "$filter": {
+        "args": "array, function",
+        "desc": "Devuelve una matriz que contiene solo los valores en el parámetro `matriz` que satisfacen el predicado `función`.\n\nLa `función` que se proporciona como segundo parámetro debe tener la siguiente firma:\n\n`función(valor [ , índice [, matriz]])`"
+    },
+    "$reduce": {
+        "args": "array, function [, init]",
+        "desc": "Devuelve un valor agregado derivado de aplicar el parámetro `función` sucesivamente a cada valor en `matriz` en combinación con el resultado de la aplicación anterior de la función.\n\nLa función debe aceptar dos argumentos y se comporta como un operador infijo entre cada valor dentro de la matriz. La firma de la `función` debe tener la forma: `myfunc($accumulator, $value[, $index[, $array]])`\n\nEl parámetro opcional `init` se utiliza como valor inicial en la agregación."
+    },
+    "$flowContext": {
+        "args": "string[, string]",
+        "desc": "Recupera una propiedad de contexto de flujo.\n\nEsta es una función definida por Node-RED."
+    },
+    "$globalContext": {
+        "args": "string[, string]",
+        "desc": "Recupera una propiedad de contexto global.\n\nEsta es una función definida por Node-RED."
+    },
+    "$pad": {
+        "args": "string, width [, char]",
+        "desc": "Devuelve una copia de la `cadena` con relleno adicional, si es necesario, de modo que su número total de caracteres sea al menos el valor absoluto del parámetro `ancho`.\n\nSi `ancho` es un número positivo, entonces la cadena está acolchado hacia la derecha; si es negativo, se rellena hacia la izquierda.\n\nEl argumento opcional `char` especifica los caracteres de relleno que se utilizarán. Si no se especifica, el valor predeterminado es el carácter de espacio."
+    },
+    "$fromMillis": {
+        "args": "number, [, picture [, timezone]]",
+        "desc": "Convierte el `número` que representa milisegundos desde la época Unix (1 de enero de 1970 UTC) en una representación de cadena formateada según la plantilla en picture.\n\nSi se omite el parámetro opcional `picture`, entonces la marca de tiempo es formateado en el formato ISO 8601.\n\nSi se proporciona la cadena opcional `picture`, entonces la marca de tiempo se formatea de acuerdo con la representación especificada en esa cadena. El comportamiento de esta función es consistente con la versión de dos argumentos de la función XPath/XQuery `format-dateTime` tal como se define en la especificación XPath F&O 3.1. El parámetro de plantilla define cómo se formatea la marca de tiempo y tiene la misma sintaxis que `format-dateTime`.\n\nSi se proporciona la cadena opcional `timezone`, entonces la marca de tiempo formateada estará en esa zona horaria. La cadena `timezone` debe tener el formato '±HHMM', donde ± es el signo más o menos y HHMM es el desplazamiento en horas y minutos desde UTC. Desplazamiento positivo para zonas horarias al este de UTC, desplazamiento negativo para zonas horarias al oeste de UTC."
+    },
+    "$formatNumber": {
+        "args": "number, picture [, options]",
+        "desc": "Convierte el `número` en una cadena y lo formatea en una representación decimal según lo especificado en la cadena `picture`.\n\n El comportamiento de esta función es coherente con la función XPath/XQuery `fn:format-number` tal como se define en la especificación XPath F&O 3.1. El parámetro de cadena `picture` define cómo se formatea el número y tiene la misma sintaxis que `fn:formato-número`.\n\nEl tercer argumento opcional `opciones` se utiliza para anular los caracteres de formato específicos de la configuración regional predeterminada, como el decimal. separador. Si se proporciona, este argumento debe ser un objeto que contenga pares de nombre/valor especificados en la sección de formato decimal de la especificación XPath F&O 3.1."
+    },
+    "$formatBase": {
+        "args": "number [, radix]",
+        "desc": "Convierte el número en una cadena y lo formatea como un número entero representado en la base numérica especificada por el argumento `radix`. Si no se especifica `radix`, el valor predeterminado es la base 10. `radix` puede estar entre 2 y 36; de lo contrario, se genera un error."
+    },
+    "$toMillis": {
+        "args": "timestamp",
+        "desc": "Convierte una cadena de `marca de tiempo` en el formato ISO 8601 al número de milisegundos desde la época Unix (1 de enero de 1970 UTC) como un número. Se genera un error si la cadena no tiene el formato correcto."
+    },
+    "$env": {
+        "args": "arg",
+        "desc": "Devuelve el valor de una variable de entorno.\n\nEsta es una función definida por Node-RED."
+    },
+    "$eval": {
+        "args": "expr [, context]",
+        "desc": "Analiza y evalúa la cadena `expr` que contiene JSON literal o una expresión JSONata utilizando el contexto actual como contexto para la evaluación."
+    },
+    "$formatInteger": {
+        "args": "number, picture",
+        "desc": "Convierte el número en una cadena y lo formatea en una representación entera como lo especifica la cadena `picture`. El parámetro de define cómo se formatea el número y tiene la misma sintaxis que `fn:format-integer` de la especificación XPath F&O 3.1."
+    },
+    "$parseInteger": {
+        "args": "string, picture",
+        "desc": "Analiza el contenido del parámetro cadena en un número entero (como un número JSON) utilizando el formato especificado por la cadena `picture`. El parámetro tiene el mismo formato que `$formatInteger`."
+    },
+    "$error": {
+        "args": "[str]",
+        "desc": "Lanza un error con un mensaje. El parámetro `str` opcional reemplazará el mensaje predeterminado de `$error() función evaluada`"
+    },
+    "$assert": {
+        "args": "arg, str",
+        "desc": "Si `arg` es `verdadero`, la función devuelve indefinido. Si `arg` es `falso`, se lanza una excepción con `str` como mensaje de excepción."
+    },
+    "$single": {
+        "args": "array, function",
+        "desc": "Devuelve el único valor en el parámetro `array` que satisface el predicado de `función` (es decir, la `función` devuelve booleano `verdadero` cuando se pasa el valor). Lanza una excepción si el número de valores coincidentes no es exactamente uno.\n\nLa función debe proporcionarse con la siguiente firma: `función(valor [, índice [, matriz]])` donde el valor es cada entrada de la matriz. El índice es la posición de ese valor y toda la matriz se pasa como tercer argumento."
+    },
+    "$encodeUrlComponent": {
+        "args": "str",
+        "desc": "Codifica un componente de URL reemplazando cada instancia de ciertos caracteres por una, dos, tres o cuatro secuencias de escape que representan la codificación UTF-8 del carácter.\n\nEjemplo: `$encodeUrlComponent(\"?x=prueba\")` => `\"%3Fx%3Dprueba\"`"
+    },
+    "$encodeUrl": {
+        "args": "str",
+        "desc": "Codifica una URL reemplazando cada instancia de ciertos caracteres por una, dos, tres o cuatro secuencias de escape que representan la codificación UTF-8 del carácter.\n\nEjemplo: `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
+    },
+    "$decodeUrlComponent": {
+        "args": "str",
+        "desc": "Decodifica un componente de URL creado previamente por encodeUrlComponent.\n\nEjemplo: `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
+    },
+    "$decodeUrl": {
+        "args": "str",
+        "desc": "Decodifica una URL creado previamente por encodeUrl.\n\nEjemplo: `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
+    },
+    "$distinct": {
+        "args": "array",
+        "desc": "Devuelve una matriz con valores duplicados eliminados de `matriz`"
+    },
+    "$type": {
+        "args": "value",
+        "desc": "Devuelve el tipo de `valor` como una cadena. Si `valor` no está definido, esto devolverá indefinido."
+    },
+    "$moment": {
+        "args": "[str]",
+        "desc": "Obtiene un objeto de fecha usando la biblioteca Moment."
+    },
+    "$clone": {
+        "args": "value",
+        "desc": "Clona un objeto de forma segura."
+    }
+}

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

@@ -119,10 +119,9 @@
       "searchInput": "Rechercher vos flux",
       "subflows": "Sous-flux",
       "createSubflow": "Créer un sous-flux",
-      "selectionToSubflow": "Selection d'un sous-flux",
+      "selectionToSubflow": "Convertir en sous-flux",
       "flows": "Flux",
       "add": "Ajouter",
-      "rename": "Renommer",
       "delete": "Supprimer",
       "keyboardShortcuts": "Raccourcis clavier",
       "login": "Se connecter",
@@ -130,6 +129,11 @@
       "editPalette": "Gérer la palette",
       "other": "Autre",
       "showTips": "Afficher les astuces",
+      "showNodeHelp": "Afficher l'aide du noeud",
+      "enableSelectedNodes": "Activer les noeuds sélectionnés",
+      "disableSelectedNodes": "Désactiver les noeuds sélectionnés",
+      "showSelectedNodeLabels": "Afficher les étiquettes des noeuds sélectionnés",
+      "hideSelectedNodeLabels": "Masquer les étiquettes des noeuds sélectionnés",
       "showWelcomeTours": "Afficher les visites guidées pour les nouvelles versions",
       "help": "Site web de Node-RED",
       "projects": "Projets",
@@ -274,23 +278,23 @@
     "recoveredNodesInfo": "Les noeuds importés sur ce flux contiennent un mauvais identifiant de flux. Ces noeuds ont été ajoutés à ce flux afin que vous puissiez les restaurer ou les supprimer.",
     "recoveredNodesNotification": "<p>Noeuds importés sans identifiant de flux valide</p><p>Ils ont été ajoutés à un nouveau flux appelé '__flowName__'.</p>",
     "export": {
-      "selected": "noeuds sélectionnés",
-      "current": "flux actuel",
+      "selected": "les noeuds sélectionnés",
+      "current": "le flux actuel",
       "all": "tous les flux",
-      "compact": "condensé",
-      "formatted": "formaté",
+      "compact": "Condensé",
+      "formatted": "Formaté",
       "copy": "Copier dans le presse-papier",
       "export": "Exporter vers la bibliothèque",
-      "exportAs": "Exporter en tant que",
+      "exportAs": "Exporter comme",
       "overwrite": "Remplacer",
       "exists": "<p><b>\"__file__\"</b> existe déjà.</p><p>Voulez-vous le remplacer ?</p>"
     },
     "import": {
       "import": "Importer vers",
-      "importSelected": "Importation sélectionnée",
+      "importSelected": "Importer la sélection",
       "importCopy": "Importer une copie",
-      "viewNodes": "Afficher les noeuds...",
-      "newFlow": "Nouveau flux",
+      "viewNodes": "Vérifier ces noeuds",
+      "newFlow": "un nouveau flux",
       "replace": "Remplacer",
       "errors": {
         "notArray": "L'entrée n'est pas un tableau JSON",
@@ -299,7 +303,8 @@
         "missingType": "L'entrée n'est pas un flux valide - l'élément '__index__' n'a pas de propriété 'type'"
       },
       "conflictNotification1": "Certains des noeuds que vous avez importés existent déjà dans votre espace de travail.",
-      "conflictNotification2": "Sélectionner les noeuds à importer et choisir s'il faut remplacer les noeuds existants ou en importer une copie."
+      "conflictNotification2": "Sélectionnez les noeuds à importer et choisissez s'il faut remplacer les noeuds existants ou en importer une copie.",
+      "alreadyExists": "Ce noeud existe déjà"
     },
     "copyMessagePath": "Chemin copié",
     "copyMessageValue": "Valeur copiée",
@@ -391,10 +396,10 @@
     "subflowInstances": "Il existe __count__ instance de ce modèle de sous-flux",
     "subflowInstances_plural": "Il existe __count__ instances de ce modèle de sous-flux",
     "editSubflowProperties": "modifier les propriétés",
-    "input": "entrées:",
-    "output": "sorties:",
-    "status": "statut du noeud",
-    "deleteSubflow": "supprimer le sous-flux",
+    "input": "Entrées:",
+    "output": "Sorties:",
+    "status": "Statut du noeud",
+    "deleteSubflow": "Supprimer le sous-flux",
     "confirmDelete": "Voulez-vous vraiment supprimer ce sous-flux ?",
     "info": "Description",
     "category": "Catégorie",
@@ -416,6 +421,7 @@
     },
     "errors": {
       "noNodesSelected": "<strong>Impossible de créer un sous-flux</strong> : aucun noeud sélectionné",
+      "acrossMultipleGroups": "Impossible de créer un sous-flux sur plusieurs groupes",
       "multipleInputsToSelection": "<strong>Impossible de créer un sous-flux</strong> : plusieurs entrées pour la sélection"
     }
   },
@@ -447,8 +453,8 @@
     "default": "Par défaut",
     "noDefaultLabel": "Aucune",
     "defaultLabel": "Utiliser l'étiquette par défaut",
-    "searchIcons": "Icônes de recherche",
-    "useDefault": "Utilisation par défaut",
+    "searchIcons": "Rechercher une icône",
+    "useDefault": "Icône par défaut",
     "description": "Description",
     "show": "Afficher",
     "hide": "Masquer",
@@ -498,19 +504,19 @@
   "keyboard": {
     "title": "Raccourcis clavier",
     "keyboard": "Clavier",
-    "filterActions": "Actions de filtrage",
-    "shortcut": "raccourci",
-    "scope": "portée",
+    "filterActions": "Rechercher l'action",
+    "shortcut": "Raccourci",
+    "scope": "Portée",
     "unassigned": "Non attribué",
-    "global": "global",
-    "workspace": "espace de travail",
-    "editor": "boîte de dialogue d'édition",
+    "global": "Global",
+    "workspace": "Espace de travail",
+    "editor": "Boîte de dialogue d'édition",
     "selectAll": "Tout sélectionner",
     "selectNone": "Ne rien sélectionner",
     "selectAllConnected": "Sélectionner tous les éléments connectés",
     "addRemoveNode": "Ajouter/supprimer un noeud de la sélection",
     "editSelected": "Modifier le noeud sélectionné",
-    "deleteSelected": "Supprimer les noeuds ou le lien sélectionné(s)",
+    "deleteSelected": "Supprimer la sélection",
     "deleteReconnect": "Supprimer et reconnecter",
     "importNode": "Importer les noeuds",
     "exportNode": "Exporter les noeuds",
@@ -550,22 +556,22 @@
   },
   "palette": {
     "noInfo": "Pas d'information disponible",
-    "filter": "Filtrer les noeuds",
+    "filter": "Rechercher le noeud",
     "search": "Rechercher les modules",
     "addCategory": "Ajouter un nouveau...",
     "label": {
-      "subflows": "sous-flux",
-      "network": "réseau",
-      "common": "commun",
-      "input": "entrée",
-      "output": "sortie",
-      "function": "fonction",
-      "sequence": "séquence",
-      "parser": "analyseur",
-      "social": "social",
-      "storage": "stockage",
-      "analysis": "analyse",
-      "advanced": "avancé"
+      "subflows": "Sous-flux",
+      "network": "Réseau",
+      "common": "Commun",
+      "input": "Entrée",
+      "output": "Sortie",
+      "function": "Fonction",
+      "sequence": "Séquence",
+      "parser": "Analyseur",
+      "social": "Social",
+      "storage": "Stockage",
+      "analysis": "Analyse",
+      "advanced": "Avancé"
     },
     "actions": {
       "collapse-all": "Réduire toutes les catégories",
@@ -586,6 +592,7 @@
     "editor": {
       "title": "Gérer la palette",
       "palette": "Palette",
+      "allCatalogs": "Tous les catalogues",
       "times": {
         "seconds": "il y a quelques secondes",
         "minutes": "il y a quelques minutes",
@@ -607,32 +614,36 @@
       },
       "nodeCount": "__label__ noeud",
       "nodeCount_plural": "__label__ noeuds",
+      "pluginCount": "__count__ plugin",
+      "pluginCount_plural": "__count__ plugins",
       "moduleCount": "__count__ module disponible",
       "moduleCount_plural": "__count__ modules disponibles",
-      "inuse": "en cours d'utilisation",
-      "enableall": "activer tout",
-      "disableall": "désactiver tout",
-      "enable": "activer",
-      "disable": "désactiver",
-      "remove": "supprimer",
-      "update": "mettre à jour vers __version__",
-      "updated": "mis à jour",
-      "install": "installer",
-      "installed": "installé",
-      "conflict": "conflit",
+      "inuse": "En cours d'utilisation",
+      "enableall": "Activer tout",
+      "disableall": "Désactiver tout",
+      "enable": "Activer",
+      "disable": "Désactiver",
+      "remove": "Supprimer",
+      "update": "Mettre à jour vers __version__",
+      "updated": "Mis à jour",
+      "install": "Installer",
+      "installed": "Installé",
+      "conflict": "Conflit",
       "conflictTip": "<p>Ce module ne peut pas être installé car il inclut un<br/>type de noeud qui a déjà été installé</p><p>Conflits avec <code>__module__</code></p>",
       "loading": "Chargement des catalogues...",
       "tab-nodes": "Noeuds",
       "tab-install": "Installer",
-      "sort": "trier:",
-      "sortAZ": "a-z",
-      "sortRecent": "récent",
+      "sort": "Trier:",
+      "sortRelevance": "Pertinence",
+      "sortAZ": "A-Z",
+      "sortRecent": "Récent",
       "more": "+ __count__ en plus",
       "upload": "Charger le fichier tgz du module",
       "refresh": "Actualiser la liste des modules",
       "errors": {
         "catalogLoadFailed": "<p>Échec du chargement du catalogue de noeuds.</p><p>Vérifier la console du navigateur pour plus d'informations</p>",
         "installFailed": "<p>Échec lors de l'installation : __module__</p><p>__message__</p><p>Consulter le journal pour plus d'informations</p>",
+        "installTimeout": "<p>L'installation continue en arrière-plan.</p><p>Les noeuds apparaîtront dans la palette une fois l'installation terminée. Consulter le journal pour plus d'informations.</p>",
         "removeFailed": "<p>Échec lors de la suppression : __module__</p><p>__message__</p><p>Consulter le journal pour plus d'informations</p>",
         "updateFailed": "<p>Échec lors de la mise à jour : __module__</p><p>__message__</p><p>Consulter le journal pour plus d'informations</p>",
         "enableFailed": "<p>Échec lors de l'activation : __module__</p><p>__message__</p><p>Consulter le journal pour plus d'informations</p>",
@@ -644,9 +655,12 @@
           "title": "Installer les noeuds"
         },
         "remove": {
-          "body": "<p>Suppression de '__module__'</p><p>La suppression du noeud le désinstallera de Node-RED. Le noeud peut continuer à utiliser des ressources jusqu'au redémarrage de Node-RED.</p>",
+          "body": "<p>Suppression de '__module__'</p><p>La suppression du noeud le désinstallera de Node-RED. Le noeud peut continuer à utiliser ses ressources jusqu'au redémarrage de Node-RED.</p>",
           "title": "Supprimer les noeuds"
         },
+        "removePlugin": {
+          "body": "<p>Suppression du plugin '__module__'. Veuillez recharger l'éditeur afin d'appliquer les changements.</p>"
+        },
         "update": {
           "body": "<p>Mise à jour de '__module__'</p><p>La mise à jour du noeud nécessitera un redémarrage de Node-RED pour terminer la mise à jour. Cela doit être fait manuellement.</p>",
           "title": "Mettre à jour les noeuds"
@@ -658,7 +672,8 @@
           "review": "Ouvrir la documentation",
           "install": "Installer",
           "remove": "Supprimer",
-          "update": "Mettre à jour"
+          "update": "Mettre à jour",
+          "understood": "Compris"
         }
       }
     }
@@ -667,7 +682,7 @@
     "info": {
       "name": "Information",
       "tabName": "Nom",
-      "label": "info",
+      "label": "Info",
       "node": "Noeud",
       "type": "Type",
       "group": "Groupe",
@@ -681,10 +696,10 @@
       "properties": "Propriétés",
       "info": "Information",
       "desc": "Description",
-      "blank": "vide",
-      "null": "nul",
-      "showMore": "afficher en plus",
-      "showLess": "afficher en moins",
+      "blank": "Vide",
+      "null": "Nul",
+      "showMore": "Afficher en plus",
+      "showLess": "Afficher en moins",
       "flow": "Flux",
       "selection": "Sélection",
       "nodes": "__count__ noeuds",
@@ -695,7 +710,7 @@
       "arrayItems": "__count__ éléments",
       "showTips": "Vous pouvez ouvrir les astuces à partir du panneau des paramètres",
       "outline": "Plan",
-      "empty": "vide",
+      "empty": "Vide",
       "globalConfig": "Noeuds de configuration globale",
       "triggerAction": "Déclencher une action",
       "find": "Rechercher dans l'espace de travail",
@@ -706,7 +721,7 @@
     },
     "help": {
       "name": "Aide",
-      "label": "aide",
+      "label": "Aide",
       "search": "Aide à la recherche",
       "nodeHelp": "Aide sur les noeuds",
       "showHelp": "Afficher l'aide",
@@ -717,23 +732,23 @@
     },
     "config": {
       "name": "Noeuds de configuration",
-      "label": "configuration",
+      "label": "Configuration",
       "global": "Tous les flux",
-      "none": "aucun",
-      "subflows": "sous-flux",
-      "flows": "flux",
-      "filterAll": "tout",
+      "none": "Aucun",
+      "subflows": "Sous-flux",
+      "flows": "Flux",
+      "filterAll": "Tout",
       "showAllConfigNodes": "Afficher tous les noeuds de configuration",
-      "filterUnused": "inutilisé",
+      "filterUnused": "Inutilisé",
       "showAllUnusedConfigNodes": "Afficher tous les noeuds de configuration inutilisés",
       "filtered": "__count__ caché(s)"
     },
     "context": {
       "name": "Données contextuelles",
-      "label": "contexte",
-      "none": "aucune sélection",
-      "refresh": "actualiser pour charger",
-      "empty": "vide",
+      "label": "Contexte",
+      "none": "Aucune sélection",
+      "refresh": "Actualiser pour charger",
+      "empty": "Vide",
       "node": "Noeud",
       "flow": "Flux",
       "global": "Global",
@@ -744,10 +759,10 @@
     },
     "palette": {
       "name": "Gestion des palettes",
-      "label": "palette"
+      "label": "Palette"
     },
     "project": {
-      "label": "projet",
+      "label": "Projet",
       "name": "Projet",
       "description": "Description",
       "dependencies": "Dépendances",
@@ -760,11 +775,11 @@
       "showProjectSettings": "Afficher les paramètres du projet",
       "projectSettings": {
         "title": "Paramètres du projet",
-        "edit": "modifier",
+        "edit": "Modifier",
         "none": "Vide",
-        "install": "installer",
-        "removeFromProject": "supprimer du projet",
-        "addToProject": "ajouter au projet",
+        "install": "Installer",
+        "removeFromProject": "Supprimer du projet",
+        "addToProject": "Ajouter au projet",
         "files": "Fichiers",
         "flow": "Flux",
         "credentials": "Identifiants",
@@ -812,7 +827,7 @@
         "workflowAutoTip": "Les modifications sont validées automatiquement à chaque déploiement",
         "sshKeys": "Clés SSH",
         "sshKeysTip": "Vous permet de créer des connexions sécurisées aux référentiels Git distants.",
-        "add": "ajouter une clé",
+        "add": "Ajouter une clé",
         "addSshKey": "Ajouter une clé SSH",
         "addSshKeyTip": "Générer une nouvelle paire de clés publique/privée",
         "name": "Nom",
@@ -826,7 +841,7 @@
         "copyPublicKey": "Copier la clé publique dans le presse-papiers",
         "delete": "Supprimer une clé",
         "gitConfig": "Configuration Git",
-        "deleteConfirm": "Êtes-vous sûr de vouloir supprimer la clé SSH __nom__ ? Ça ne peut pas être annulé."
+        "deleteConfirm": "Êtes-vous sûr de vouloir supprimer la clé SSH __name__ ? Ça ne peut pas être annulé."
       },
       "versionControl": {
         "unstagedChanges": "Abandon des changements",
@@ -848,7 +863,7 @@
         "none": "Vide",
         "conflictResolve": "Tous les conflits ont été résolus. Valider les modifications pour terminer la fusion.",
         "localFiles": "Fichiers locaux",
-        "all": "tout",
+        "all": "Tout",
         "unmergedChanges": "Modifications non fusionnées",
         "abortMerge": "Abandonner la fusion",
         "commit": "Valider",
@@ -916,7 +931,14 @@
       "date": "horodatage",
       "jsonata": "expression",
       "env": "variable d'environnement",
-      "cred": "identifiant"
+      "cred": "identifiant",
+      "conf-types": "noeud de configuration"
+    },
+    "date": {
+      "format": {
+        "timestamp": "millisecondes depuis l'époque",
+        "object": "Objet de date JavaScript"
+      }
     }
   },
   "editableList": {
@@ -1097,9 +1119,9 @@
       "desc8": "Le fichier contenant les identifiants ne sera pas crypté et son contenu sera facilement lisible",
       "create-project-files": "Créer des fichiers de projet",
       "create-project": "Créer un projet",
-      "already-exists": "existe déjà",
+      "already-exists": "Existe déjà",
       "git-error": "Erreur Git",
-      "git-auth-error": "erreur d'authentification Git"
+      "git-auth-error": "Erreur d'authentification Git"
     },
     "create-success": {
       "success": "Vous avez créé avec succès votre premier projet !",
@@ -1135,8 +1157,8 @@
       "desc2": "Avant de pouvoir cloner un référentiel sur ssh, vous devez ajouter une clé SSH pour y accéder.",
       "add-ssh-key": "Ajouter une clé ssh",
       "credentials-encryption-key": "Clé de chiffrement des identifiants",
-      "already-exists-2": "existe déjà",
-      "git-error": "erreur git",
+      "already-exists-2": "Existe déjà",
+      "git-error": "Erreur git",
       "con-failed": "La connexion a échoué",
       "not-git": "Ce n'est pas un dépôt git",
       "no-resource": "Référentiel introuvable",
@@ -1148,8 +1170,8 @@
       "confirm": "Voulez-vous vraiment supprimer ce projet ?"
     },
     "create-project-list": {
-      "search": "rechercher vos projets",
-      "current": "actuel"
+      "search": "Rechercher vos projets",
+      "current": "Actuel"
     },
     "require-clean": {
       "confirm": "<p>Vous avez des modifications non déployées qui seront perdues.</p><p>Voulez-vous continuer ?</p>"
@@ -1198,23 +1220,11 @@
   "diagnostics": {
     "title": "Information système"
   },
-  "languages": {
-    "de": "Allemand",
-    "en-US": "Anglais",
-    "fr": "Français",
-    "ja": "Japonais",
-    "ko": "Coréen",
-    "pt-BR": "Portugais brésilien",
-    "ru": "Russe",
-    "zh-CN": "Chinois (Simplifié)",
-    "zh-TW": "Chinois (Traditionnel)"
-  },
   "validator": {
     "errors": {
       "invalid-json": "Données JSON invalides : __error__",
-      "invalid-json-prop": "__prop__: données JSON invalides : __error__",
-      "invalid-prop": "Expression de propriété non valide",
-      "invalid-prop-prop": "__prop__: expression de propriété invalide",
+      "invalid-expr": "Expression JSONata invalide : __error__",
+      "invalid-prop": "Expression de propriété invalide",
       "invalid-num": "Numéro invalide",
       "invalid-num-prop": "__prop__: numéro invalide",
       "invalid-regexp": "Modèle d'entrée non valide",
@@ -1226,6 +1236,7 @@
     }
   },
   "contextMenu": {
+    "showActionList": "Afficher la liste des actions",
     "insert": "Insérer",
     "node": "Noeud",
     "junction": "Jonction",
@@ -1235,5 +1246,159 @@
     "environment": "Environment",
     "header": "Variables d'environnement globales",
     "revert": "Rétablir"
+  },
+  "action-list": {
+    "toggle-show-tips": "Basculer l'affichage des astuces",
+    "show-about": "Afficher la description de Node-RED",
+    "show-welcome-tour": "Afficher la visite de bienvenue",
+    "show-next-tab": "Afficher l'onglet suivant",
+    "show-previous-tab": "Afficher l'onglet précédent",
+    "add-flow": "Ajouter un flux",
+    "add-flow-to-right": "Ajouter un flux à droite",
+    "edit-flow": "Modifier le flux",
+    "remove-flow": "Supprimer le flux",
+    "enable-flow": "Activer le flux",
+    "disable-flow": "Désactiver le flux",
+    "hide-flow": "Masquer le flux",
+    "hide-other-flows": "Masquer les autres flux",
+    "hide-all-flows": "Masquer tous les flux",
+    "show-all-flows": "Afficher tous les flux",
+    "show-last-hidden-flow": "Afficher le dernier flux masqué",
+    "list-modified-nodes": "Afficher les flux modifiés",
+    "list-hidden-flows": "Afficher les flux cachés",
+    "list-flows": "Lister les flux",
+    "list-subflows": "Liste les sous-flux",
+    "go-to-previous-location": "Aller à l'emplacement précédent",
+    "go-to-next-location": "Aller à l'emplacement suivant",
+    "copy-selection-to-internal-clipboard": "Copier la sélection dans le presse-papiers",
+    "cut-selection-to-internal-clipboard": "Couper la sélection dans le presse-papiers",
+    "paste-from-internal-clipboard": "Coller depuis le presse-papiers",
+    "detach-selected-nodes": "Détacher les noeuds sélectionnés",
+    "delete-selection": "Supprimer la sélection",
+    "delete-selection-and-reconnect": "Supprimer la sélection et reconnecter",
+    "edit-selected-node": "Modifier le noeud sélectionné",
+    "go-to-selection": "Aller à la sélection",
+    "undo": "Annuler les modifications",
+    "redo": "Rétablir les modifications",
+    "select-all-nodes": "Sélectionner tous les noeuds",
+    "select-none": "Sélectionner un noeud",
+    "enable-selected-nodes": "Activer les noeuds sélectionnés",
+    "disable-selected-nodes": "Désactiver les noeuds sélectionnés",
+    "toggle-show-grid": "Basculer l'affichage de la grille",
+    "toggle-snap-grid": "Basculer l'aide au placement des noeuds",
+    "toggle-status": "Commuter l'état",
+    "show-selected-node-labels": "Afficher les étiquettes des noeuds sélectionnés",
+    "hide-selected-node-labels": "Masquer les étiquettes des noeuds sélectionnés",
+    "scroll-view-up": "Faire défiler vers le haut",
+    "scroll-view-right": "Faire défiler vers la droite",
+    "scroll-view-down": "Faire défiler vers le bas",
+    "scroll-view-left": "Faire défiler vers la gauche",
+    "step-view-up": "Faire défiler d'une unité vers le haut",
+    "step-view-right": "Faire défiler d'une unité vers la droite",
+    "step-view-down": "Faire défiler d'une unité vers le bas",
+    "step-view-left": "Faire défiler d'une unité vers la gauche",
+    "move-selection-up": "Déplacer la sélection vers le haut",
+    "move-selection-right": "Déplacer la sélection vers la droite",
+    "move-selection-down": "Déplacer la sélection vers le bas",
+    "move-selection-left": "Déplacer la sélection vers la gauche",
+    "move-selection-forwards": "Avancer la sélection",
+    "move-selection-backwards": "Reculer la sélection",
+    "move-selection-to-front": "Déplacer la sélection vers l'avant",
+    "move-selection-to-back": "Déplacer la sélection vers l'arrière",
+    "step-selection-up": "Déplacer la sélection d'une unité vers le haut",
+    "step-selection-right": "Déplacer la sélection d'une unité vers la droite",
+    "step-selection-down": "Déplacer la sélection d'une unité vers le bas",
+    "step-selection-left": "Déplacer la sélection d'une unité vers la gauche",
+    "select-connected-nodes": "Sélectionner les noeuds connectés",
+    "select-downstream-nodes": "Sélectionner les noeuds connectés en aval",
+    "select-upstream-nodes": "Sélectionner les noeuds connectés en amont",
+    "go-to-next-node": "Aller au noeud suivant",
+    "go-to-previous-node": "Aller au noeud précédent",
+    "go-to-next-sibling": "Aller au noeud frère suivant",
+    "go-to-previous-sibling": "Aller au noeud frère précédent",
+    "go-to-nearest-node-on-left": "Aller au noeud gauche le plus proche",
+    "go-to-nearest-node-on-right": "Aller au noeud droit le plus proche",
+    "go-to-nearest-node-above": "Aller au noeud supérieur le plus proche",
+    "go-to-nearest-node-below": "Aller au noeud le plus proche ci-dessous",
+    "align-selection-to-grid": "Aligner la sélection",
+    "align-selection-to-left": "Aligner la sélection à gauche",
+    "align-selection-to-right": "Aligner la sélection à droite",
+    "align-selection-to-top": "Aligner la sélection en haut",
+    "align-selection-to-bottom": "Aligner la sélection vers le bas",
+    "align-selection-to-middle": "Aligner la sélection au centre verticalement",
+    "align-selection-to-center": "Aligner la sélection au centre horizontalement",
+    "distribute-selection-horizontally": "Distribuer la sélection horizontalement",
+    "distribute-selection-vertical": "Distribuer la sélection verticalement",
+    "wire-series-of-nodes": "Connecter les noeuds en série",
+    "wire-node-to-multiple": "Connecter les noeuds à plusieurs",
+    "wire-multiple-to-node": "Connecter plusieurs au noeud",
+    "split-wire-with-link-nodes": "Diviser le fil avec des noeuds de liaison",
+    "generate-node-names": "Générer les noms de noeuds",
+    "show-user-settings": "Afficher les paramètres utilisateur",
+    "show-help": "Afficher l'aide",
+    "toggle-palette": "Basculer l'affichage de la palette",
+    "show-event-log": "Afficher le journal des événements",
+    "manage-palette": "Gérer la palette",
+    "toggle-sidebar": "Basculer l'affichage de la barre latérale",
+    "show-info-tab": "Afficher l'onglet d'informations sur le noeud",
+    "show-help-tab": "Afficher l'onglet d'aide du noeud",
+    "show-config-tab": "Afficher l'onglet du noeud de configuration",
+    "select-all-config-nodes": "Sélectionner tous les noeuds de configuration",
+    "delete-config-selection": "Supprimer le noeud de configuration sélectionné",
+    "show-context-tab": "Afficher l'onglet des données contextuelles",
+    "create-subflow": "Créer un sous-flux",
+    "convert-to-subflow": "Convertir la sélection en sous-flux",
+    "group-selection": "Grouper la sélection",
+    "ungroup-selection": "Dissocier la sélection",
+    "merge-selection-to-group": "Fusionner la sélection dans le groupe",
+    "remove-selection-from-group": "Supprimer la sélection du groupe",
+    "copy-group-style": "Copier le style du groupe",
+    "paste-group-style": "Coller le style du groupe",
+    "show-export-dialog": "Afficher la boîte de dialogue d'exportation",
+    "show-import-dialog": "Afficher la boîte de dialogue d'importation",
+    "show-library-export-dialog": "Afficher la boîte de dialogue d'exportation de la bibliothèque",
+    "show-library-import-dialog": "Afficher la boîte de dialogue d'importation de bibliothèque",
+    "show-examples-import-dialog": "Afficher la boîte de dialogue d'importation d'exemples",
+    "search": "Rechercher",
+    "search-previous": "Recherche précédente",
+    "search-next": "Recherche suivante",
+    "show-action-list": "Afficher la liste d'actions",
+    "confirm-edit-tray": "Confirmer la modification",
+    "cancel-edit-tray": "Annuler la modification",
+    "show-remote-diff": "Afficher les différences avec les modifications distantes",
+    "deploy-flows": "Déployer des flux",
+    "restart-flows": "Redémarrer les flux",
+    "set-deploy-type-to-full": "Définir le déploiement sur 'tout'",
+    "set-deploy-type-to-modified-flows": "Définir le déploiement sur 'flux modifiés'",
+    "set-deploy-type-to-modified-nodes": "Définir le déploiement sur 'noeuds modifiés'",
+    "show-debug-tab": "Afficher l'onglet de débogage",
+    "clear-debug-messages": "Supprimer les messages de débogage",
+    "clear-filtered-debug-messages": "Supprimer les messages de débogage filtrés",
+    "activate-selected-debug-nodes": "Activer les noeuds de débogage sélectionnés",
+    "activate-all-debug-nodes": "Activer tous les noeuds de débogage",
+    "activate-all-flow-debug-nodes": "Activer tous les noeuds de débogage dans un flux",
+    "deactivate-selected-debug-nodes": "Désactiver les noeuds de débogage sélectionnés",
+    "deactivate-all-debug-nodes": "Désactiver tous les noeuds de débogage",
+    "deactivate-all-flow-debug-nodes": "Désactiver tous les noeuds de débogage dans un flux",
+    "zoom-in": "Zoomer",
+    "zoom-out": "Dézoomer",
+    "zoom-reset": "Réinitialiser le zoom",
+    "toggle-navigator": "Basculer l'affichage du navigateur",
+    "show-system-info": "Afficher les informations système",
+    "split-wires-with-junctions": "Diviser les fils avec des jonctions",
+    "new-project": "Nouveau projet",
+    "open-project": "Ouvrir le projet",
+    "show-project-settings": "Afficher les paramètres du projet",
+    "show-version-control-tab": "Afficher l'onglet de contrôle de version",
+    "start-flows": "Démarrer les flux",
+    "stop-flows": "Arrêter les flux",
+    "copy-item-url": "Copier l'URL de l'élément",
+    "copy-item-edit-url": "Copier l'URL de modification de l'élément",
+    "move-flow-to-start": "Déplacer le flux jusqu'au début",
+    "move-flow-to-end": "Déplacer le flux jusqu'à la fin",
+    "show-global-env": "Afficher les variables d'environnement globales",
+    "lock-flow": "Verrouiller le flux",
+    "unlock-flow": "Déverrouiller le flux",
+    "show-node-help": "Afficher l'aide du noeud"
   }
 }

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

@@ -270,5 +270,9 @@
     "$moment": {
         "args": "[str]",
         "desc": "Obtient un objet de date à l'aide de la bibliothèque Moment."
+    },
+    "$clone": {
+        "args": "valeur",
+        "desc": "Cloner un objet en toute sécurité."
     }
 }

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

@@ -122,7 +122,6 @@
             "selectionToSubflow": "選択部分をサブフロー化",
             "flows": "フロー",
             "add": "フローを新規追加",
-            "rename": "フロー名を変更",
             "delete": "フローを削除",
             "keyboardShortcuts": "ショートカットキーの説明",
             "login": "ログイン",
@@ -130,6 +129,11 @@
             "editPalette": "パレットの管理",
             "other": "その他",
             "showTips": "ヒントを表示",
+            "showNodeHelp": "ノードのヘルプを表示",
+            "enableSelectedNodes": "選択したノードを有効化",
+            "disableSelectedNodes": "選択したノードを無効化",
+            "showSelectedNodeLabels": "選択したノードのラベル表示",
+            "hideSelectedNodeLabels": "選択したノードのラベル非表示",
             "showWelcomeTours": "新バージョンのガイドツアーを表示",
             "help": "Node-REDウェブサイト",
             "projects": "プロジェクト",
@@ -299,7 +303,8 @@
                 "missingType": "不正なフロー - __index__ 番目の要素に'type'プロパティがありません"
             },
             "conflictNotification1": "読み込もうとしているノードのいくつかは、既にワークスペース内に存在しています。",
-            "conflictNotification2": "読み込むノードを選択し、また既存のノードを置き換えるか、もしくはそれらのコピーを読み込むかも選択してください。"
+            "conflictNotification2": "読み込むノードを選択し、また既存のノードを置き換えるか、もしくはそれらのコピーを読み込むかも選択してください。",
+            "alreadyExists": "本ノードは既に存在"
         },
         "copyMessagePath": "パスをコピーしました",
         "copyMessageValue": "値をコピーしました",
@@ -367,6 +372,7 @@
             "deleted": "削除",
             "flowDeleted": "削除されたフロー",
             "flowAdded": "追加されたフロー",
+            "moved": "移動",
             "movedTo": "__id__ へ移動",
             "movedFrom": "__id__ から移動"
         },
@@ -511,7 +517,7 @@
         "selectAllConnected": "接続されたノードを選択",
         "addRemoveNode": "ノードの選択、選択解除",
         "editSelected": "選択したノードを編集",
-        "deleteSelected": "選択したノードや接続を削除",
+        "deleteSelected": "選択部分を削除",
         "deleteReconnect": "削除と再接続",
         "importNode": "フローの読み込み",
         "exportNode": "フローの書き出し",
@@ -609,6 +615,8 @@
             },
             "nodeCount": "__label__ 個のノード",
             "nodeCount_plural": "__label__ 個のノード",
+            "pluginCount": "__count__ 個のプラグイン",
+            "pluginCount_plural": "__count__ 個のプラグイン",
             "moduleCount": "__count__ 個のモジュール",
             "moduleCount_plural": "__count__ 個のモジュール",
             "inuse": "使用中",
@@ -636,6 +644,7 @@
             "errors": {
                 "catalogLoadFailed": "<p>ノードのカタログの読み込みに失敗しました。</p><p>詳細はブラウザのコンソールを確認してください。</p>",
                 "installFailed": "<p>追加処理が失敗しました: __module__</p><p>__message__</p><p>詳細はログを確認してください。</p>",
+                "installTimeout": "<p>バックグラウンドでインストールが継続されます。</p><p>完了した時にノードが表示されます。詳細はログを確認してください。</p>",
                 "removeFailed": "<p>削除処理が失敗しました: __module__</p><p>__message__</p><p>詳細はログを確認してください。</p>",
                 "updateFailed": "<p>更新処理が失敗しました: __module__</p><p>__message__</p><p>詳細はログを確認してください。</p>",
                 "enableFailed": "<p>有効化処理が失敗しました: __module__</p><p>__message__</p><p>詳細はログを確認してください。</p>",
@@ -650,6 +659,9 @@
                     "body": "<p>__module__ を削除します。</p><p>Node-REDからノードを削除します。ノードはNode-REDが再起動されるまで、リソースを使い続ける可能性があります。</p>",
                     "title": "ノードを削除"
                 },
+                "removePlugin": {
+                    "body": "<p>プラグイン __module__ を削除しました。ブラウザを再読み込みして残った表示を消してください。</p>"
+                },
                 "update": {
                     "body": "<p>__module__ を更新します。</p><p>更新を完了するには手動でNode-REDを再起動する必要があります。</p>",
                     "title": "ノードの更新"
@@ -661,7 +673,8 @@
                     "review": "ノードの情報を参照",
                     "install": "追加",
                     "remove": "削除",
-                    "update": "更新"
+                    "update": "更新",
+                    "understood": "了解"
                 }
             }
         }
@@ -919,7 +932,14 @@
             "date": "日時",
             "jsonata": "JSONata式",
             "env": "環境変数",
-            "cred": "認証情報"
+            "cred": "認証情報",
+            "conf-types": "設定ノード"
+        },
+        "date": {
+            "format": {
+                "timestamp": "エポックからの経過ミリ秒",
+                "object": "JavaScript日付オブジェクト"
+            }
         }
     },
     "editableList": {
@@ -1201,23 +1221,11 @@
     "diagnostics": {
         "title": "システム情報"
     },
-    "languages": {
-        "de": "ドイツ語",
-        "en-US": "英語",
-        "fr": "フランス語",
-        "ja": "日本語",
-        "ko": "韓国語",
-        "pt-BR": "ポルトガル語",
-        "ru": "ロシア語",
-        "zh-CN": "中国語(簡体)",
-        "zh-TW": "中国語(繁体)"
-    },
     "validator": {
         "errors": {
             "invalid-json": "JSONデータが不正: __error__",
-            "invalid-json-prop": "__prop__: JSONデータが不正: __error__",
+            "invalid-expr": "不正なJSONata式: __error__",
             "invalid-prop": "プロパティ式が不正",
-            "invalid-prop-prop": "__prop__: プロパティ式が不正",
             "invalid-num": "数値が不正",
             "invalid-num-prop": "__prop__: 数値が不正",
             "invalid-regexp": "入力パターンが不正",
@@ -1229,6 +1237,7 @@
         }
     },
     "contextMenu": {
+        "showActionList": "動作一覧を表示",
         "insert": "挿入",
         "node": "ノード",
         "junction": "分岐点",
@@ -1236,7 +1245,7 @@
     },
     "env-var": {
         "environment": "環境変数",
-        "header": "大域環境変数",
+        "header": "グローバル環境変数",
         "revert": "破棄"
     },
     "action-list": {
@@ -1388,7 +1397,7 @@
         "copy-item-edit-url": "要素の編集URLをコピー",
         "move-flow-to-start": "フローを先頭に移動",
         "move-flow-to-end": "フローを末尾に移動",
-        "show-global-env": "大域環境変数を表示",
+        "show-global-env": "グローバル環境変数を表示",
         "lock-flow": "フローを固定",
         "unlock-flow": "フローの固定を解除",
         "show-node-help": "ノードのヘルプを表示"

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

@@ -79,7 +79,6 @@
       "selectionToSubflow": "서브 플로우 선택",
       "flows": "플로우",
       "add": "추가",
-      "rename": "이름변경",
       "delete": "삭제",
       "keyboardShortcuts": "단축키",
       "login": "로그인",

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

@@ -109,7 +109,6 @@
             "selectionToSubflow": "Seleção para subfluxo",
             "flows": "Fluxos",
             "add": "Adicionar",
-            "rename": "Renomear",
             "delete": "Apagar",
             "keyboardShortcuts": "Atalhos do teclado",
             "login": "Ingressar",
@@ -1173,22 +1172,10 @@
     "diagnostics": {
         "title": "informações do Sistema"
     },
-    "languages": {
-        "de": "Alemão",
-        "en-US": "Inglês",
-        "ja": "Japonês",
-        "ko": "Coreano",
-        "pt-BR": "Português(Brasil)",
-        "ru": "Russo",
-        "zh-CN": "Chinês(Simplificado)",
-        "zh-TW": "Chinês(Tradicional)"
-   },
     "validator": {
         "errors": {
             "invalid-json": "Dados JSON inválidos: __error__",
-            "invalid-json-prop": "__prop__: dados JSON inválidos: __error__",
             "invalid-prop": "Expressão de propriedade inválida",
-            "invalid-prop-prop": "__prop__: expressão de propriedade inválida",
             "invalid-num": "Número inválido",
             "invalid-num-prop": "__prop__: número inválido",
             "invalid-regexp": "Padrão de entrada inválido",

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

@@ -95,7 +95,6 @@
             "selectionToSubflow": "Выделение в подпоток",
             "flows": "Потоки",
             "add": "Добавить",
-            "rename": "Переименовать",
             "delete": "Удалить",
             "keyboardShortcuts": "Сочетания клавиш",
             "login": "Войти",
@@ -1129,16 +1128,5 @@
         "appearance": "Внешний вид",
         "preview": "Предпросмотр редактора",
         "defaultValue": "Значение по умолчанию"
-    },
-    "languages" : {
-        "de": "Немецкий",
-        "en-US": "Английский",
-        "fr": "Французский",
-        "ja": "Японский",
-        "ko": "Корейский",
-        "pt-BR":"португальский",
-        "ru": "Русский",
-        "zh-CN": "Китайский (упрощенный)",
-        "zh-TW": "Китайский (традиционный)"
     }
 }

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

@@ -23,7 +23,11 @@
       "position": "位置",
       "enable": "启用",
       "disable": "禁用",
-      "upload": "上传"
+      "upload": "上传",
+      "lock": "锁定",
+      "unlock": "解锁",
+      "locked": "锁定",
+      "unlocked": "解锁"
     },
     "type": {
       "string": "字符串",
@@ -68,7 +72,13 @@
     "enabled": "有效",
     "disabled": "无效",
     "info": "详细描述",
-    "selectNodes": "点击节点来选择"
+    "selectNodes": "点击节点来选择",
+    "enableFlow": "启用流程",
+    "disableFlow": "禁用流程",
+    "lockFlow": "锁定流程",
+    "unlockFlow": "解除锁定",
+    "moveToStart": "移动到起始",
+    "moveToEnd": "移动到末尾"
   },
   "menu": {
     "label": {
@@ -101,6 +111,7 @@
       "displayStatus": "显示节点状态",
       "displayConfig": "修改节点配置",
       "import": "导入",
+      "importExample": "导入示例流程",
       "export": "导出",
       "search": "查找流程",
       "searchInput": "查找流程",
@@ -109,7 +120,6 @@
       "selectionToSubflow": "将选择部分更改为子流程",
       "flows": "流程",
       "add": "增加",
-      "rename": "重命名",
       "delete": "删除",
       "keyboardShortcuts": "键盘快捷方式",
       "login": "登录",
@@ -142,7 +152,12 @@
       "moveToBack": "置于底层",
       "moveToFront": "置于顶层",
       "moveBackwards": "向后移动",
-      "moveForwards": "向前移动"
+      "moveForwards": "向前移动",
+      "showNodeHelp":"显示节点帮助",
+      "enableSelectedNodes":"启用当前选中节点",
+      "disableSelectedNodes":"禁用当前选中节点",
+      "showSelectedNodeLabels":"显示选中的节点标签",
+      "hideSelectedNodeLabels":"隐藏选中的节点标签"
     }
   },
   "actions": {
@@ -403,6 +418,7 @@
     },
     "errors": {
       "noNodesSelected": "<strong>无法创建子流程</strong>: 未选择节点",
+      "acrossMultipleGroups": "无法跨多个组创建子流",
       "multipleInputsToSelection": "<strong>无法创建子流程</strong>: 多个输入到了选择"
     }
   },
@@ -491,12 +507,14 @@
     "unassigned": "未分配",
     "global": "全局",
     "workspace": "工作区",
+    "editor": "编辑对话框",
     "selectAll": "选择所有节点",
     "selectNone": "取消所有选择",
     "selectAllConnected": "选择所有连接的节点",
     "addRemoveNode": "从选择中添加/删除节点",
     "editSelected": "编辑选定节点",
     "deleteSelected": "删除选定节点或链接",
+    "deleteReconnect": "删除并重新连接",
     "importNode": "导入节点",
     "exportNode": "导出节点",
     "nudgeNode": "移动所选节点(1px)",
@@ -571,6 +589,7 @@
     "editor": {
       "title": "面板管理",
       "palette": "控制板",
+      "allCatalogs": "所有目录",
       "times": {
         "seconds": "秒前",
         "minutes": "分前",
@@ -610,6 +629,7 @@
       "tab-nodes": "节点",
       "tab-install": "安装",
       "sort": "排序:",
+      "sortRelevance": "关联",
       "sortAZ": "a-z顺序",
       "sortRecent": "日期顺序",
       "more": "增加 __count__ 个",
@@ -683,7 +703,11 @@
       "empty": "空的",
       "globalConfig": "全局配置节点",
       "triggerAction": "触发动作",
-      "find": "在工作区中查找"
+      "find": "在工作区中查找",
+      "copyItemUrl": "复制地址",
+	    "copyURL2Clipboard": "复制地址到剪贴板",
+      "showFlow": "显示流程",
+      "hideFlow": "隐藏流程"
     },
     "help": {
       "name": "帮助",
@@ -984,7 +1008,10 @@
     "quote": "引用",
     "link": "链接",
     "horizontal-rule": "水平线",
-    "toggle-preview": "切换预览"
+    "toggle-preview": "切换预览",
+    "mermaid": {
+      "summary": "美人鱼图"
+    }
   },
   "bufferEditor": {
     "title": "Buffer 编辑器",
@@ -1147,17 +1174,6 @@
       "create": "创建分支",
       "current": "当前的"
     },
-    "languages": {
-        "de": "德语",
-        "en-US": "英文",
-        "fr": "法语",
-        "ja": "日语",
-        "ko": "韩文",
-        "pt-BR":"葡萄牙语",
-        "ru":"俄語",
-        "zh-CN": "简体中文",
-        "zh-TW": "繁体中文"
-    },
     "create-default-file-set": {
       "no-active": "没有活动项目就无法创建默认文件集",
       "no-empty": "无法在非空项目上创建默认文件集",
@@ -1187,21 +1203,11 @@
   "diagnostics": {
     "title": "系统信息"
   },
-  "languages": {
-    "de": "德语-Deutsch",
-    "en-US": "英文-English",
-    "ja": "日语-日本",
-    "ko": "韩文-한국인",
-    "ru": "俄语-Русский",
-    "zh-CN": "简体中文",
-    "zh-TW": "繁體中文"
-  },
   "validator": {
     "errors": {
       "invalid-json": "无效的 JSON 数据： __error__",
-      "invalid-json-prop": "__prop__: 无效的 JSON 数据： __error__",
+      "invalid-expr": "无效的 JSONata 表达式: __error__",
       "invalid-prop": "无效的属性表达式",
-      "invalid-prop-prop": "__prop__: 无效的属性表达式",
       "invalid-num": "无效的数字",
       "invalid-num-prop": "__prop__: 无效的数字",
       "invalid-regexp": "输入格式无效",
@@ -1213,9 +1219,15 @@
     }
   },
   "contextMenu": {
+    "showActionList":"显示动作列表",
     "insert": "插入",
     "node": "节点",
     "junction": "连接点",
     "linkNodes": "链接节点"
+  },
+  "env-var": {
+    "environment": "环境配置",
+    "header": "全局环境变量",
+    "revert": "重置"
   }
 }

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

@@ -270,5 +270,9 @@
     "$moment": {
         "args": "[str]",
         "desc": "使用Moment库获取日期对象。"
+    },
+    "$clone": {
+        "args": "value",
+        "desc": "安全克隆对象."
     }
 }

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

@@ -23,7 +23,11 @@
             "position": "位置",
             "enable": "啟用",
             "disable": "禁用",
-            "upload": "上傳"
+            "upload": "上傳",
+            "lock": "鎖定",
+            "unlock": "解鎖",
+            "locked": "鎖定",
+            "unlocked": "解鎖"
         },
         "type": {
             "string": "字符串",
@@ -38,11 +42,14 @@
         }
     },
     "event": {
+        "loadPlugins": "加載插件",
         "loadPalette": "加載控制板",
         "loadNodeCatalogs": "加載節點目錄",
         "loadNodes": "加載 __count__ 個節點",
         "loadFlows": "加載流程",
-        "importFlows": "往工作區中加載流程"
+        "importFlows": "往工作區中加載流程",
+        "importError": "<p>加載流程錯誤</p><p>__message__</p>",
+        "loadingProject": "加載項目"
     },
     "workspace": {
         "defaultName": "流程__number__",
@@ -51,18 +58,35 @@
         "delete": "確定想要刪除 '__label__'?",
         "dropFlowHere": "把流程放到這裡",
         "addFlow": "新增流程",
-        "listFlows": "流程列表",
+        "addFlowToRight": "在右側新增流程",
+        "hideFlow": "隱藏流程",
+        "hideOtherFlows": "隱藏其它流程",
+        "showAllFlows": "顯示所有流程",
+        "hideAllFlows": "隱藏所有流程",
+        "hiddenFlows": "列出 __count__ 個隱藏流程",
+        "hiddenFlows_plural": "列出 __count__ 個隱藏流程",
+        "showLastHiddenFlow": "顯示最後一個隱藏流程",
+        " ": "流程列表",
+        "listSubflows": "列出子流程",
         "status": "狀態",
         "enabled": "有效",
         "disabled": "無效",
         "info": "詳細描述",
-        "selectNodes": "點擊節點用於選擇"
+        "selectNodes": "點擊節點用於選擇",
+        "enableFlow": "啟用流程",
+        "disableFlow": "禁用流程",
+        "lockFlow": "鎖定流程",
+        "unlockFlow": "解除鎖定",
+        "moveToStart": "移動到起始",
+        "moveToEnd": "移動到末尾"
     },
     "menu": {
         "label": {
             "view": {
                 "view": "顯示",
                 "grid": "格線",
+                "storeZoom": "加載時還原縮放尺寸",
+                "storePosition": "加載時還原滾動位置",
                 "showGrid": "顯示格線",
                 "snapGrid": "對齊格線",
                 "gridSize": "格線尺寸",
@@ -80,12 +104,14 @@
             "palette": {
                 "show": "顯示控制板"
             },
+            "edit": "編輯",
             "settings": "設置",
             "userSettings": "使用者設置",
             "nodes": "節點",
             "displayStatus": "顯示節點狀態",
             "displayConfig": "修改節點配置",
             "import": "匯入",
+            "importExample": "導入示例流程",
             "export": "匯出",
             "search": "搜尋流程",
             "searchInput": "搜尋流程",
@@ -94,7 +120,6 @@
             "selectionToSubflow": "將選擇部分更改為子流程",
             "flows": "流程",
             "add": "增加",
-            "rename": "重新命名",
             "delete": "刪除",
             "keyboardShortcuts": "鍵盤快速鍵",
             "login": "登入",
@@ -102,24 +127,48 @@
             "editPalette": "節點管理",
             "other": "其他",
             "showTips": "顯示小提示",
-            "help": "Node-RED website",
+            "showWelcomeTours": "顯示新版本向導",
+            "help": "Node-RED 文檔主頁",
             "projects": "專案",
             "projects-new": "新專案",
             "projects-open": "開啟專案",
             "projects-settings": "專案設定",
             "showNodeLabelDefault": "顯示新添加節點的標籤",
+            "codeEditor": "代碼編輯器",
             "groups": "組",
             "groupSelection": "選擇組",
             "ungroupSelection": "取消選擇組",
             "groupMergeSelection": "合并選擇",
-            "groupRemoveSelection": "從組中移除"
+            "groupRemoveSelection": "從組中移除",
+            "arrange": "布局",
+            "alignLeft": "左對齊",
+            "alignCenter": "居中對齊",
+            "alignRight": "右對齊",
+            "alignTop": "頂部對齊",
+            "alignMiddle": "垂直居中對齊",
+            "alignBottom": "底部對齊",
+            "distributeHorizontally": "横向分布",
+            "distributeVertically": "垂直分布",
+            "moveToBack": "置於底層",
+            "moveToFront": "置於頂層",
+            "moveBackwards": "向後移動",
+            "moveForwards": "向前移動",
+            "showNodeHelp":"顯示節點幫助",
+            "enableSelectedNodes":"啟用當前選中節點",
+            "disableSelectedNodes":"禁用當前選中節點",
+            "showSelectedNodeLabels":"顯示選中的節點標簽",
+            "hideSelectedNodeLabels":"隱藏選中的節點標簽"
         }
     },
     "actions": {
         "toggle-navigator": "切換導航器",
         "zoom-out": "縮小",
         "zoom-reset": "重置縮放",
-        "zoom-in": "放大"
+        "zoom-in": "放大",
+        "search-flows": "搜索流程",
+        "search-prev": "上一個",
+        "search-next": "下一個",
+        "search-counter": "\"__term__\" __result__ of __count__"
     },
     "user": {
         "loggedInAs": "作為 __name__ 登入",
@@ -135,12 +184,17 @@
         }
     },
     "notification": {
+        "state": {
+          "flowsStopped": "流程已停止",
+          "flowsStarted": "流程已啟動"
+        },
         "warning": "<strong>警告</strong>: __message__",
         "warnings": {
             "undeployedChanges": "節點中存在未部署的更改",
             "nodeActionDisabled": "節點動作在子流程中被禁用",
             "nodeActionDisabledSubflow": "子流程中禁用了節點操作",
             "missing-types": "流程由於缺少節點類型而停止。請檢查日誌的詳細資訊",
+            "missing-modules": "<p>流程因缺少模塊而停止。</p>",
             "safe-mode": "<p>流程在安全模式下停止。</p><p>您可以修改流程並部署更改以重新啟動。</p>",
             "restartRequired": "Node-RED必須重新啟動，以啟用升級的模組",
             "credentials_load_failed": "<p>流程由於無法解密證書而停止。</p> <p>流程證書文件已加密，但是項目的加密密鑰丟失或無效。</p>",
@@ -151,7 +205,7 @@
             "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__ 秒後重新連接",
@@ -208,6 +262,8 @@
         "download": "下載",
         "importUnrecognised": "匯入了無法識別的類型:",
         "importUnrecognised_plural": "匯入了無法識別的類型:",
+        "importDuplicate": "導入了重復節點：",
+        "importDuplicate_plural": "導入了重復節點：",
         "nodesExported": "節點匯出到了剪貼簿",
         "nodesImported": "已匯入:",
         "nodeCopied": "已複製 __count__ 個節點",
@@ -259,6 +315,10 @@
         "modifiedFlowsDesc": "只部署包含已更改節點的流程",
         "modifiedNodes": "已更改的節點",
         "modifiedNodesDesc": "只部署已經更改的節點",
+        "startFlows": "啟動",
+        "startFlowsDesc": "啟動流程",
+        "stopFlows": "停止",
+        "stopFlowsDesc": "停止流程",
         "restartFlows": "重新啟動流程",
         "restartFlowsDesc": "重新啟動當前部署的流程",
         "successfulDeploy": "部署成功",
@@ -337,14 +397,28 @@
         "output": "輸出:",
         "status": "狀態節點",
         "deleteSubflow": "刪除子流程",
+        "confirmDelete": "您確定要刪除此子流程？",
         "info": "詳細描述",
         "category": "類別",
+        "module": "模塊",
+        "license": "許可",
+        "licenseNone": "無",
+        "licenseOther": "其它",
+        "type": "節點類型",
+        "version": "版本",
+        "versionPlaceholder": "x.y.z",
+        "keys": "關鍵字",
+        "keysPlaceholder": "使用英文逗號分隔關鍵字",
+        "author": "作者",
+        "authorPlaceholder": "名字 <email@example.com>",
+        "desc": "描述",
         "env": {
             "restore": "恢復為默認子流程",
             "remove": "類別刪除環境變量"
         },
         "errors": {
             "noNodesSelected": "<strong>無法創建子流程</strong>: 未選擇節點",
+            "acrossMultipleGroups": "無法跨多個組創建子流",
             "multipleInputsToSelection": "<strong>無法創建子流程</strong>: 多個輸入到了選擇"
         }
     },
@@ -367,12 +441,12 @@
         "editConfig": "編輯 __type__ 配置",
         "addNewType": "添加新的 __type__ 節點",
         "nodeProperties": "節點屬性",
-        "label": "Label",
+        "label": "標簽",
         "color": "顏色",
         "portLabels": "埠標籤",
         "labelInputs": "輸入",
         "labelOutputs": "輸出",
-        "settingIcon": "Icon",
+        "settingIcon": "圖標",
         "default": "默認",
         "noDefaultLabel": "無",
         "defaultLabel": "使用默認標籤",
@@ -385,6 +459,7 @@
         "icon": "圖標",
         "inputType": "輸入類型",
         "selectType": "選擇類型...",
+        "loadCredentials": "加載節點憑證",
         "inputs": {
             "input": "輸入",
             "select": "選擇",
@@ -419,7 +494,8 @@
         },
         "errors": {
             "scopeChange": "更改範圍將使其他流程中的節點無法使用",
-            "invalidProperties": "無效的屬性："
+            "invalidProperties": "無效的屬性：",
+            "credentialLoadFailed": "無法加載節點憑據"
         }
     },
     "keyboard": {
@@ -431,11 +507,14 @@
         "unassigned": "未分配",
         "global": "全局",
         "workspace": "工作區",
+        "editor": "編輯對話框",
         "selectAll": "選擇所有節點",
+        "selectNone": "取消所有選擇",
         "selectAllConnected": "選擇所有連接的節點",
         "addRemoveNode": "從選擇中添加/刪除節點",
         "editSelected": "編輯選定節點",
         "deleteSelected": "刪除選定節點或連結",
+        "deleteReconnect": "刪除並重新連接",
         "importNode": "匯入節點",
         "exportNode": "匯出節點",
         "nudgeNode": "移動所選節點(1px)",
@@ -445,10 +524,14 @@
         "copyNode": "複製所選節點",
         "cutNode": "剪切所選節點",
         "pasteNode": "粘貼節點",
+        "copyGroupStyle": "復製組樣式",
+        "pasteGroupStyle": "粘貼組樣式",
         "undoChange": "撤銷上次執行的更改",
+        "redoChange": "重做",
         "searchBox": "打開搜尋框",
         "managePalette": "管理面板",
-        "actionList": "動作列表"
+        "actionList": "動作列表",
+        "splitWireWithLinks": "使用Link節點拆分已選項"
     },
     "library": {
         "library": "庫",
@@ -466,12 +549,11 @@
         "types": {
             "local": "本地",
             "examples": "例子"
-        },
-        "exportToLibrary": "將節點匯出到庫"
+        }
     },
     "palette": {
         "noInfo": "無可用資訊",
-        "filter": "過濾節點",
+        "filter": "過濾已安裝模組",
         "search": "搜尋模組",
         "addCategory": "添加新的...",
         "label": {
@@ -501,11 +583,13 @@
             "nodeEnabled_plural": "啟用多個節點:",
             "nodeDisabled": "禁用節點:",
             "nodeDisabled_plural": "禁用多個節點:",
-            "nodeUpgraded": "節點模組__module__升級到__version__版本"
+            "nodeUpgraded": "節點模組__module__升級到__version__版本",
+            "unknownNodeRegistered": "加載節點錯誤： <ul><li>__type__<br>__error__</li></ul>"
         },
         "editor": {
             "title": "面板管理",
-            "palette": "Palette",
+            "palette": "控製板",
+            "allCatalogs": "所有目錄",
             "times": {
                 "seconds": "秒前",
                 "minutes": "分前",
@@ -545,10 +629,12 @@
             "tab-nodes": "節點",
             "tab-install": "安裝",
             "sort": "排序:",
+            "sortRelevance": "關聯",
             "sortAZ": "a-z順序",
             "sortRecent": "日期順序",
             "more": "增加 __count__ 個",
             "upload": "上傳模塊tgz文件",
+            "refresh": "更新模塊列表",
             "errors": {
                 "catalogLoadFailed": "無法載入節點目錄。<br>查看瀏覽器控制臺瞭解更多資訊",
                 "installFailed": "無法安裝: __module__<br>__message__<br>查看日誌瞭解更多資訊",
@@ -617,7 +703,11 @@
             "empty": "空的",
             "globalConfig": "全局配置節點",
             "triggerAction": "觸發動作",
-            "find": "在工作區中查找"
+            "find": "在工作區中查找",
+            "copyItemUrl": "復製地址",
+            "copyURL2Clipboard": "復製地址到剪貼板",
+            "showFlow": "顯示流程",
+            "hideFlow": "隱藏流程"
         },
         "help": {
             "name": "幫助",
@@ -627,7 +717,8 @@
             "showHelp": "顯示幫助",
             "showInOutline": "在大綱中顯示",
             "showTopics": "顯示主題",
-            "noHelp": "未選擇幫助主題"
+            "noHelp": "未選擇幫助主題",
+            "changeLog": "更新日誌"
         },
         "config": {
             "name": "配置節點",
@@ -828,31 +919,37 @@
             "json": "JSON",
             "bin": "二進位流",
             "date": "時間戳記",
-            "jsonata": "expression",
-            "env": "env variable",
+            "jsonata": "表達式",
+            "env": "環境變量",
             "cred": "證書"
         }
     },
     "editableList": {
-        "add": "添加"
+        "add": "添加",
+        "addTitle": "添加項"
     },
     "search": {
-        "empty": "找不到匹配",
+        "history": "搜索歷史",
+        "clear": "清除所有",
+        "empty": "找不到匹配項",
         "addNode": "添加一個節點...",
         "options": {
             "configNodes": "配置節點",
             "unusedConfigNodes": "未使用的配置節點",
             "invalidNodes": "無效的節點",
             "uknownNodes": "未知的節點",
-            "unusedSubflows": "未使用的子流程"
+            "unusedSubflows": "未使用的子流程",
+            "hiddenFlows": "隱藏的流程",
+            "modifiedNodes": "已修改的節點或流程",
+            "thisFlow": "當前流程"
         }
     },
     "expressionEditor": {
         "functions": "功能",
-        "functionReference": "Function reference",
+        "functionReference": "功能參考",
         "insert": "插入",
         "title": "JSONata運算式編輯器",
-        "test": "Test",
+        "test": "測試",
         "data": "示例消息",
         "result": "結果",
         "format": "格式表達方法",
@@ -863,20 +960,28 @@
             "invalid-expr": "無效的JSONata運算式:\n  __message__",
             "invalid-msg": "無效的示例JSON消息:\n  __message__",
             "context-unsupported": "無法測試上下文函數\n $flowContext 或 $globalContext",
+            "env-unsupported": "無法測試 $env 函數",
+            "moment-unsupported": "無法測試 $moment 函數",
+            "clone-unsupported": "無法測試 $clone 函數",
             "eval": "評估運算式錯誤:\n  __message__"
         }
     },
+    "monaco": {
+      "setTheme": "設置主題"
+    },
     "jsEditor": {
         "title": "JavaScript 編輯器"
     },
     "textEditor": {
-        "title": "Text 編輯器"
+        "title": "文本編輯器"
     },
     "jsonEditor": {
         "title": "JSON編輯器",
         "format": "格式化JSON",
         "rawMode": "編輯 JSON",
-        "uiMode": "Visual編輯器",
+        "uiMode": "可視化編輯器",
+        "rawMode-readonly": "原始JSON",
+        "uiMode-readonly": "可視化",
         "insertAbove": "在上方插入",
         "insertBelow": "在下方插入",
         "addItem": "添加項目",
@@ -892,9 +997,9 @@
         "title": "Markdown 編輯器",
         "expand": "展開",
         "format": "F使用markdown格式化",
-        "heading1": "Heading 1",
-        "heading2": "Heading 2",
-        "heading3": "Heading 3",
+        "heading1": "標題 1",
+        "heading2": "標題 2",
+        "heading3": "標題 3",
         "bold": "粗體",
         "italic": "斜體",
         "code": "程式碼",
@@ -903,7 +1008,10 @@
         "quote": "引用",
         "link": "連結",
         "horizontal-rule": "分隔線",
-        "toggle-preview": "預覽"
+        "toggle-preview": "切換預覽",
+        "mermaid": {
+          "summary": "美人魚圖"
+        }
     },
     "bufferEditor": {
         "title": "緩衝區編輯器",
@@ -1038,7 +1146,8 @@
             "not-git": "不是git倉庫",
             "no-resource": "找不到存儲庫",
             "cant-get-ssh-key-path": "錯誤！ 無法獲取所選的SSH密鑰路徑。",
-            "unexpected_error": "意外的錯誤"
+            "unexpected_error": "意外的錯誤",
+            "clearContext": "更改項目時清除上下文"
         },
         "delete": {
             "confirm": "您確定要刪除此項目嗎？"
@@ -1068,7 +1177,7 @@
         "create-default-file-set": {
             "no-active": "沒有活動項目就無法創建默認文件集",
             "no-empty": "無法在非空項目上創建默認文件集",
-            "git-error": "git error"
+            "git-error": "git錯誤"
         },
         "errors": {
             "no-username-email": "您的Git客戶端未配置用戶名/電子郵件。",
@@ -1079,21 +1188,45 @@
     "editor-tab": {
         "properties": "屬性",
         "envProperties": "環境變量",
+        "module": "模塊屬性",
         "description": "描述",
         "appearance": "外觀",
         "preview": "UI預覽",
-        "defaultValue": "默認值",
-        "env": "環境變量"
+        "defaultValue": "默認值"
     },
-    "languages": {
-        "de": "德語",
-        "en-US": "英語",
-        "fr": "法語",
-        "ja": "日語",
-        "ko": "韓語",
-        "pt-BR":"葡萄牙语",
-        "ru":"俄語",
-        "zh-CN": "簡體中文",
-        "zh-TW": "繁體中文"
+    "tourGuide": {
+      "takeATour": "查看更新內容",
+      "start": "開始",
+      "next": "下一個",
+      "welcomeTours": "歡迎使用 Node-RED"
+    },
+    "diagnostics": {
+      "title": "系统信息"
+    },
+    "validator": {
+      "errors": {
+        "invalid-json": "無效的 JSON 數據： __error__",
+        "invalid-expr": "無效的 JSONata 表達式: __error__",
+        "invalid-prop": "無效的屬性表達式",
+        "invalid-num": "無效的數字",
+        "invalid-regexp": "輸入格式無效",
+        "invalid-regex-prop": "__prop__: 輸入格式無效",
+        "missing-required-prop": "__prop__: 缺少屬性值",
+        "invalid-config": "__prop__: 無效的配置節點",
+        "missing-config": "__prop__: 缺少配置節點",
+        "validation-error": "__prop__: 驗證錯誤: __node__, __id__: __error__"
+      }
+    },
+    "contextMenu": {
+      "showActionList":"顯示動作列表",
+      "insert": "插入",
+      "node": "節點",
+      "junction": "連接點",
+      "linkNodes": "鏈接節點"
+    },
+    "env-var": {
+      "environment": "環境配置",
+      "header": "全局環境變量",
+      "revert": "重置"
     }
 }

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

@@ -270,5 +270,9 @@
     "$moment": {
         "args": "[str]",
         "desc": "使用Moment庫獲取日期對象。"
+    },
+    "$clone": {
+      "args": "value",
+      "desc": "安全克隆對象."
     }
 }

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

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

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

@@ -26,6 +26,15 @@ RED.comms = (function() {
     var reconnectAttempts = 0;
     var active = false;
 
+    RED.events.on('login', function(username) {
+        // User has logged in
+        // Need to upgrade the connection to be authenticated
+        if (ws && ws.readyState == 1) {
+            const auth_tokens = RED.settings.get("auth-tokens");
+            ws.send(JSON.stringify({auth:auth_tokens.access_token}))
+        }
+    })
+
     function connectWS() {
         active = true;
         var wspath;
@@ -56,6 +65,7 @@ RED.comms = (function() {
                     ws.send(JSON.stringify({subscribe:t}));
                 }
             }
+            emit('connect')
         }
 
         ws = new WebSocket(wspath);
@@ -180,9 +190,53 @@ RED.comms = (function() {
         }
     }
 
+    function send(topic, msg) {
+        if (ws && ws.readyState == 1) {
+            ws.send(JSON.stringify({
+                topic,
+                data: msg
+            }))
+        }
+    }
+
+    const eventHandlers = {};
+    function on(evt,func) {
+        eventHandlers[evt] = eventHandlers[evt]||[];
+        eventHandlers[evt].push(func);
+    }
+    function off(evt,func) {
+        const handler = eventHandlers[evt];
+        if (handler) {
+            for (let i=0;i<handler.length;i++) {
+                if (handler[i] === func) {
+                    handler.splice(i,1);
+                    return;
+                }
+            }
+        }
+    }
+    function emit() {
+        const evt = arguments[0]
+        const args = Array.prototype.slice.call(arguments,1);
+        if (eventHandlers[evt]) {
+            let cpyHandlers = [...eventHandlers[evt]];
+            for (let i=0;i<cpyHandlers.length;i++) {
+                try {
+                    cpyHandlers[i].apply(null, args);
+                } catch(err) {
+                    console.warn("RED.comms.emit error: ["+evt+"] "+(err.toString()));
+                    console.warn(err);
+                }
+            }
+        }
+    }
+
     return {
         connect: connectWS,
         subscribe: subscribe,
-        unsubscribe:unsubscribe
+        unsubscribe:unsubscribe,
+        on,
+        off,
+        send
     }
 })();

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

@@ -39,15 +39,16 @@
              console.warn(evt,args);
          }
          if (handlers[evt]) {
-             for (var i=0;i<handlers[evt].length;i++) {
+             let cpyHandlers = [...handlers[evt]];
+          
+             for (var i=0;i<cpyHandlers.length;i++) {
                  try {
-                     handlers[evt][i].apply(null, args);
+                     cpyHandlers[i].apply(null, args);
                  } catch(err) {
                      console.warn("RED.events.emit error: ["+evt+"] "+(err.toString()));
                      console.warn(err);
                  }
              }
-
          }
      }
      return {

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

@@ -29,7 +29,14 @@ RED.history = (function() {
         }
         return RED.nodes.junction(id);
     }
-
+    function ensureUnlocked(id, flowsToLock) {
+        const flow = id && (RED.nodes.workspace(id) || RED.nodes.subflow(id) || null);
+        const isLocked = flow ? flow.locked : false;
+        if (flow && isLocked) {
+            flow.locked = false;
+            flowsToLock.add(flow)
+        }
+    }
     function undoEvent(ev) {
         var i;
         var len;
@@ -59,18 +66,46 @@ RED.history = (function() {
                         t: 'replace',
                         config: RED.nodes.createCompleteNodeSet(),
                         changed: {},
-                        rev: RED.nodes.version()
+                        moved: {},
+                        complete: true,
+                        rev: RED.nodes.version(),
+                        dirty: RED.nodes.dirty()
                     };
+                    var selectedTab = RED.workspaces.active();
+                    inverseEv.config.forEach(n => {
+                        const node = RED.nodes.node(n.id)
+                        if (node) {
+                            inverseEv.changed[n.id] = node.changed
+                            inverseEv.moved[n.id] = node.moved
+                        }
+                    })
                     RED.nodes.clear();
                     var imported = RED.nodes.import(ev.config);
+                    // Clear all change flags from the import
+                    RED.nodes.dirty(false);
+
+                    const flowsToLock = new Set()
+                    
                     imported.nodes.forEach(function(n) {
                         if (ev.changed[n.id]) {
+                            ensureUnlocked(n.z, flowsToLock)
                             n.changed = true;
-                            inverseEv.changed[n.id] = true;
                         }
+                        if (ev.moved[n.id]) {
+                            ensureUnlocked(n.z, flowsToLock)
+                            n.moved = true;
+                        }
+                    })
+                    flowsToLock.forEach(flow => {
+                        flow.locked = true
                     })
 
                     RED.nodes.version(ev.rev);
+                    RED.view.redraw(true);
+                    RED.palette.refresh();
+                    RED.workspaces.refresh();
+                    RED.workspaces.show(selectedTab, true);
+                    RED.sidebar.config.refresh();
                 } else {
                     var importMap = {};
                     ev.config.forEach(function(n) {

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

@@ -0,0 +1,490 @@
+RED.multiplayer = (function () {
+
+    // activeSessionId - used to identify sessions across websocket reconnects
+    let activeSessionId
+
+    let headerWidget
+    // Map of session id to { session:'', user:{}, location:{}}
+    let sessions = {}
+    // Map of username to { user:{}, sessions:[] }
+    let users = {}
+
+    function addUserSession (session) {
+        if (sessions[session.session]) {
+            // This is an existing connection that has been authenticated
+            const existingSession = sessions[session.session]
+            if (existingSession.user.username !== session.user.username) {
+                removeUserHeaderButton(users[existingSession.user.username])
+            }
+        }
+        sessions[session.session] = session
+        const user = users[session.user.username] = users[session.user.username] || {
+            user: session.user,
+            sessions: []
+        }
+        if (session.user.profileColor === undefined) {
+            session.user.profileColor = (1 + Math.floor(Math.random() * 5))
+        }
+        session.location = session.location || {}
+        user.sessions.push(session)
+
+        if (session.session === activeSessionId) {
+            // This is the current user session - do not add a extra button for them
+        } else {
+            if (user.sessions.length === 1) {
+                if (user.button) {
+                    clearTimeout(user.inactiveTimeout)
+                    clearTimeout(user.removeTimeout)
+                    user.button.removeClass('inactive')
+                } else {
+                    addUserHeaderButton(user)
+                }
+            }
+            sessions[session.session].location = session.location
+            updateUserLocation(session.session)
+        }
+    }
+
+    function removeUserSession (sessionId, isDisconnected) {
+        removeUserLocation(sessionId)
+        const session = sessions[sessionId]
+        delete sessions[sessionId]
+        const user = users[session.user.username]
+        const i = user.sessions.indexOf(session)
+        user.sessions.splice(i, 1)
+        if (isDisconnected) {
+            removeUserHeaderButton(user)
+        } else {
+            if (user.sessions.length === 0) {
+                // Give the user 5s to reconnect before marking inactive
+                user.inactiveTimeout = setTimeout(() => {
+                    user.button.addClass('inactive')
+                    // Give the user further 20 seconds to reconnect before removing them
+                    // from the user toolbar entirely
+                    user.removeTimeout = setTimeout(() => {
+                        removeUserHeaderButton(user)
+                    }, 20000)
+                }, 5000)
+            }
+        }
+    }
+
+    function addUserHeaderButton (user) {
+        user.button = $('<li class="red-ui-multiplayer-user"><button type="button" class="red-ui-multiplayer-user-icon"></button></li>')
+            .attr('data-username', user.user.username)
+            .prependTo("#red-ui-multiplayer-user-list");
+        var button = user.button.find("button")
+        RED.popover.tooltip(button, user.user.username)
+        button.on('click', function () {
+            const location = user.sessions[0].location
+            revealUser(location)
+        })
+
+        const userProfile = RED.user.generateUserIcon(user.user)
+        userProfile.appendTo(button)
+    }
+
+    function removeUserHeaderButton (user) {
+        user.button.remove()
+        delete user.button
+    }
+
+    function getLocation () {
+        const location = {
+            workspace: RED.workspaces.active()
+        }
+        const editStack = RED.editor.getEditStack()
+        for (let i = editStack.length - 1; i >= 0; i--) {
+            if (editStack[i].id) {
+                location.node = editStack[i].id
+                break
+            }
+        }
+        return location
+    }
+    function publishLocation () {
+        const location = getLocation()
+        if (location.workspace !== 0) {
+            log('send', 'multiplayer/location', location)
+            RED.comms.send('multiplayer/location', location)
+        }
+    }
+
+    function revealUser(location, skipWorkspace) {
+        if (location.node) {
+            // Need to check if this is a known node, so we can fall back to revealing
+            // the workspace instead
+            const node = RED.nodes.node(location.node)
+            if (node) {
+                RED.view.reveal(location.node)
+            } else if (!skipWorkspace && location.workspace) {
+                RED.view.reveal(location.workspace)
+            }
+        } else if (!skipWorkspace && location.workspace) {
+            RED.view.reveal(location.workspace)
+        }
+    }
+
+    const workspaceTrays = {}
+    function getWorkspaceTray(workspaceId) {
+        // console.log('get tray for',workspaceId)
+        if (!workspaceTrays[workspaceId]) {
+            const tray = $('<div class="red-ui-multiplayer-users-tray"></div>')
+            const users = []
+            const userIcons = {}
+
+            const userCountIcon = $(`<div class="red-ui-multiplayer-user-location"><span class="red-ui-user-profile red-ui-multiplayer-user-count"><span></span></span></div>`)
+            const userCountSpan = userCountIcon.find('span span')
+            userCountIcon.hide()
+            userCountSpan.text('')
+            userCountIcon.appendTo(tray)
+            const userCountTooltip = RED.popover.tooltip(userCountIcon, function () {
+                    const content = $('<div>')
+                    users.forEach(sessionId => {
+                        $('<div>').append($('<a href="#">').text(sessions[sessionId].user.username).on('click', function (evt) {
+                            evt.preventDefault()
+                            revealUser(sessions[sessionId].location, true)
+                            userCountTooltip.close()
+                        })).appendTo(content)
+                    })
+                    return content
+                },
+                null,
+                true
+            )
+
+            const updateUserCount = function () {
+                const maxShown = 2
+                const children = tray.children()
+                children.each(function (index, element) {
+                    const i = users.length - index
+                    if (i > maxShown) {
+                        $(this).hide()
+                    } else if (i >= 0) {
+                        $(this).show()
+                    }
+                })
+                if (users.length < maxShown + 1) { 
+                    userCountIcon.hide()
+                } else {
+                    userCountSpan.text('+'+(users.length - maxShown))
+                    userCountIcon.show()
+                }
+            }
+            workspaceTrays[workspaceId] = {
+                attached: false,
+                tray,
+                users,
+                userIcons,
+                addUser: function (sessionId) {
+                    if (users.indexOf(sessionId) === -1) {
+                        // console.log(`addUser ws:${workspaceId} session:${sessionId}`)
+                        users.push(sessionId)
+                        const userLocationId = `red-ui-multiplayer-user-location-${sessionId}`
+                        const userLocationIcon = $(`<div class="red-ui-multiplayer-user-location" id="${userLocationId}"></div>`)
+                        RED.user.generateUserIcon(sessions[sessionId].user).appendTo(userLocationIcon)
+                        userLocationIcon.prependTo(tray)
+                        RED.popover.tooltip(userLocationIcon, sessions[sessionId].user.username)
+                        userIcons[sessionId] = userLocationIcon
+                        updateUserCount()
+                    }
+                },
+                removeUser: function (sessionId) {
+                    // console.log(`removeUser ws:${workspaceId} session:${sessionId}`)
+                    const userLocationId = `red-ui-multiplayer-user-location-${sessionId}`
+                    const index = users.indexOf(sessionId)
+                    if (index > -1) {
+                        users.splice(index, 1)
+                        userIcons[sessionId].remove()
+                        delete userIcons[sessionId]
+                    }
+                    updateUserCount()
+                },
+                updateUserCount
+            }
+        }
+        const trayDef = workspaceTrays[workspaceId]
+        if (!trayDef.attached) {
+            const workspaceTab = $(`#red-ui-tab-${workspaceId}`)
+            if (workspaceTab.length > 0) {
+                trayDef.attached = true
+                trayDef.tray.appendTo(workspaceTab)
+                trayDef.users.forEach(sessionId => {
+                    trayDef.userIcons[sessionId].on('click', function (evt) {
+                        revealUser(sessions[sessionId].location, true)
+                    })
+                })
+            }
+        }
+        return workspaceTrays[workspaceId]
+    }
+    function attachWorkspaceTrays () {
+        let viewTouched = false
+        for (let sessionId of Object.keys(sessions)) {
+            const location = sessions[sessionId].location
+            if (location) {
+                if (location.workspace) {
+                    getWorkspaceTray(location.workspace).updateUserCount()
+                }
+                if (location.node) {
+                    addUserToNode(sessionId, location.node)
+                    viewTouched = true
+                }
+            }
+        }
+        if (viewTouched) {
+            RED.view.redraw()
+        }
+    }
+
+    function addUserToNode(sessionId, nodeId) {
+        const node = RED.nodes.node(nodeId)
+        if (node) {
+            if (!node._multiplayer) {
+                node._multiplayer = {
+                    users: [sessionId]
+                }
+                node._multiplayer_refresh = true
+            } else {
+                if (node._multiplayer.users.indexOf(sessionId) === -1) {
+                    node._multiplayer.users.push(sessionId)
+                    node._multiplayer_refresh = true
+                }
+            }
+        }
+    }
+    function removeUserFromNode(sessionId, nodeId) {
+        const node = RED.nodes.node(nodeId)
+        if (node && node._multiplayer) {
+            const i = node._multiplayer.users.indexOf(sessionId)
+            if (i > -1) {
+                node._multiplayer.users.splice(i, 1)
+            }
+            if (node._multiplayer.users.length === 0) {
+                delete node._multiplayer
+            } else {
+                node._multiplayer_refresh = true
+            }
+        }
+
+    }
+
+    function removeUserLocation (sessionId) {
+        updateUserLocation(sessionId, {})
+    }
+    function updateUserLocation (sessionId, location) {
+        let viewTouched = false
+        const oldLocation = sessions[sessionId].location
+        if (location) {
+            if (oldLocation.workspace !== location.workspace) {
+                // console.log('removing', sessionId, oldLocation.workspace)
+                workspaceTrays[oldLocation.workspace]?.removeUser(sessionId)
+            }
+            if (oldLocation.node !== location.node) {
+                removeUserFromNode(sessionId, oldLocation.node)
+                viewTouched = true
+            }
+            sessions[sessionId].location = location
+        } else {
+            location = sessions[sessionId].location
+        }
+        // console.log(`updateUserLocation sessionId:${sessionId} oldWS:${oldLocation?.workspace} newWS:${location.workspace}`)
+        if (location.workspace) {
+            getWorkspaceTray(location.workspace).addUser(sessionId)
+        }
+        if (location.node) {
+            addUserToNode(sessionId, location.node)
+            viewTouched = true
+        }
+        if (viewTouched) {
+            RED.view.redraw()
+        }
+    }
+
+    // function refreshUserLocations () {
+    //     for (const session of Object.keys(sessions)) {
+    //         if (session !== activeSessionId) {
+    //             updateUserLocation(session)
+    //         }
+    //     }
+    // }
+
+    return {
+        init: function () {
+
+            function createAnnotationUser(user) {
+
+                const group = document.createElementNS("http://www.w3.org/2000/svg","g");
+                const badge = document.createElementNS("http://www.w3.org/2000/svg","circle");
+                const radius = 20
+                badge.setAttribute("cx",radius/2);
+                badge.setAttribute("cy",radius/2);
+                badge.setAttribute("r",radius/2);
+                badge.setAttribute("class", "red-ui-multiplayer-annotation-background")
+                group.appendChild(badge)
+                if (user && user.profileColor !== undefined) {
+                    badge.setAttribute("class", "red-ui-multiplayer-annotation-background red-ui-user-profile-color-" + user.profileColor)
+                }
+                if (user && user.image) {
+                    const image = document.createElementNS("http://www.w3.org/2000/svg","image");
+                    image.setAttribute("width", radius)
+                    image.setAttribute("height", radius)
+                    image.setAttribute("href", user.image)
+                    image.setAttribute("clip-path", "circle("+Math.floor(radius/2)+")")
+                    group.appendChild(image)
+                } else if (user && user.anonymous) {
+                    const anonIconHead = document.createElementNS("http://www.w3.org/2000/svg","circle");
+                    anonIconHead.setAttribute("cx", radius/2)
+                    anonIconHead.setAttribute("cy", radius/2 - 2)
+                    anonIconHead.setAttribute("r", 2.4)
+                    anonIconHead.setAttribute("class","red-ui-multiplayer-annotation-anon-label");
+                    group.appendChild(anonIconHead)
+                    const anonIconBody = document.createElementNS("http://www.w3.org/2000/svg","path");
+                    anonIconBody.setAttribute("class","red-ui-multiplayer-annotation-anon-label");
+                    // anonIconBody.setAttribute("d",`M ${radius/2 - 4} ${radius/2 + 1} h 8 v4 h -8 z`);
+                    anonIconBody.setAttribute("d",`M ${radius/2} ${radius/2 + 5} h -2.5 c -2 1 -2 -5 0.5 -4.5 c 2 1 2 1 4 0 c 2.5 -0.5  2.5 5.5  0 4.5  z`);
+                    group.appendChild(anonIconBody)
+                } else {
+                    const labelText = user.username ? user.username.substring(0,2) : user
+                    const label = document.createElementNS("http://www.w3.org/2000/svg","text");
+                    if (user.username) {
+                        label.setAttribute("class","red-ui-multiplayer-annotation-label");
+                        label.textContent = user.username.substring(0,2)
+                    } else {
+                        label.setAttribute("class","red-ui-multiplayer-annotation-label red-ui-multiplayer-user-count")
+                        label.textContent = user
+                    }
+                    label.setAttribute("text-anchor", "middle")
+                    label.setAttribute("x",radius/2);
+                    label.setAttribute("y",radius/2 + 3);
+                    group.appendChild(label)
+                }
+                const border = document.createElementNS("http://www.w3.org/2000/svg","circle");
+                border.setAttribute("cx",radius/2);
+                border.setAttribute("cy",radius/2);
+                border.setAttribute("r",radius/2);
+                border.setAttribute("class", "red-ui-multiplayer-annotation-border")
+                group.appendChild(border)
+          
+
+
+                return group
+            }
+            
+            RED.view.annotations.register("red-ui-multiplayer",{
+                type: 'badge',
+                align: 'left',
+                class: "red-ui-multiplayer-annotation",
+                show: "_multiplayer",
+                refresh: "_multiplayer_refresh",
+                element: function(node) {
+                    const containerGroup = document.createElementNS("http://www.w3.org/2000/svg","g");
+                    containerGroup.setAttribute("transform","translate(0,-4)")
+                    if (node._multiplayer) {
+                        let y = 0
+                        for (let i = Math.min(1, node._multiplayer.users.length - 1); i >= 0; i--) {
+                            const user = sessions[node._multiplayer.users[i]].user
+                            const group = createAnnotationUser(user)
+                            group.setAttribute("transform","translate("+y+",0)")
+                            y += 15
+                            containerGroup.appendChild(group)
+                        }
+                        if (node._multiplayer.users.length > 2) {
+                            const group = createAnnotationUser('+'+(node._multiplayer.users.length - 2))
+                            group.setAttribute("transform","translate("+y+",0)")
+                            y += 12
+                            containerGroup.appendChild(group)
+                        }
+
+                    }
+                    return containerGroup;
+                },
+                tooltip: node => { return node._multiplayer.users.map(u => sessions[u].user.username).join('\n') }
+            });
+
+
+            // activeSessionId = RED.settings.getLocal('multiplayer:sessionId')
+            // if (!activeSessionId) {
+                activeSessionId = RED.nodes.id()
+            //     RED.settings.setLocal('multiplayer:sessionId', activeSessionId)
+            //     log('Session ID (new)', activeSessionId)
+            // } else {
+                log('Session ID', activeSessionId)
+            // }
+            
+            headerWidget = $('<li><ul id="red-ui-multiplayer-user-list"></ul></li>').prependTo('.red-ui-header-toolbar')
+
+            RED.comms.on('connect', () => {
+                const location = getLocation()
+                const connectInfo = {
+                    session: activeSessionId
+                }
+                if (location.workspace !== 0) {
+                    connectInfo.location = location
+                }
+                RED.comms.send('multiplayer/connect', connectInfo)
+            })
+            RED.comms.subscribe('multiplayer/#', (topic, msg) => {
+                log('recv', topic, msg)
+                if (topic === 'multiplayer/init') {
+                    // We have just reconnected, runtime has sent state to
+                    // initialise the world
+                    sessions = {}
+                    users = {}
+                    $('#red-ui-multiplayer-user-list').empty()
+
+                    msg.sessions.forEach(session => {
+                        addUserSession(session)
+                    })
+                } else if (topic === 'multiplayer/connection-added') {
+                    addUserSession(msg)
+                } else if (topic === 'multiplayer/connection-removed') {
+                    removeUserSession(msg.session, msg.disconnected)
+                } else if (topic === 'multiplayer/location') {
+                    const session = msg.session
+                    delete msg.session
+                    updateUserLocation(session, msg)
+                }
+            })
+
+            RED.events.on('workspace:change', (event) => {
+                getWorkspaceTray(event.workspace)
+                publishLocation()
+            })
+            RED.events.on('editor:open', () => {
+                publishLocation()
+            })
+            RED.events.on('editor:close', () => {
+                publishLocation()
+            })
+            RED.events.on('editor:change', () => {
+                publishLocation()
+            })
+            RED.events.on('login', () => {
+                publishLocation()
+            })
+            RED.events.on('flows:loaded', () => {
+                attachWorkspaceTrays()
+            })
+            RED.events.on('workspace:close', (event) => {
+                // A subflow tab has been closed. Need to mark its tray as detached
+                if (workspaceTrays[event.workspace]) {
+                    workspaceTrays[event.workspace].attached = false
+                }
+            })
+            RED.events.on('logout', () => {
+                const disconnectInfo = {
+                    session: activeSessionId
+                }
+                RED.comms.send('multiplayer/disconnect', disconnectInfo)
+                RED.settings.removeLocal('multiplayer:sessionId')
+            })
+        }
+    }
+
+    function log() {
+        if (RED.multiplayer.DEBUG) {
+            console.log('[multiplayer]', ...arguments)
+        }
+    }
+})();

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

@@ -91,6 +91,31 @@ RED.nodes = (function() {
             getNodeTypes: function() {
                 return Object.keys(nodeDefinitions);
             },
+            /**
+             * Get an array of node definitions
+             * @param {Object} options - options object
+             * @param {boolean} [options.configOnly] - if true, only return config nodes
+             * @param {function} [options.filter] - a filter function to apply to the list of nodes
+             * @returns array of node definitions
+             */
+            getNodeDefinitions: function(options) {
+                const result = []
+                const configOnly = (options && options.configOnly)
+                const filter = (options && options.filter)
+                const keys = Object.keys(nodeDefinitions)
+                for (const key of keys) {
+                    const def = nodeDefinitions[key]
+                    if(!def) { continue }
+                    if (configOnly && def.category !== "config") {
+                            continue
+                    }
+                    if (filter && !filter(nodeDefinitions[key])) {
+                        continue
+                    }
+                    result.push(nodeDefinitions[key])
+                }
+                return result
+            },
             setNodeList: function(list) {
                 nodeList = [];
                 for(var i=0;i<list.length;i++) {
@@ -124,6 +149,8 @@ RED.nodes = (function() {
             },
             removeNodeSet: function(id) {
                 var ns = nodeSets[id];
+                if (!ns) { return {} }
+
                 for (var j=0;j<ns.types.length;j++) {
                     delete typeToId[ns.types[j]];
                 }
@@ -547,12 +574,16 @@ RED.nodes = (function() {
              * @param {String} z tab id
              */
             checkTabState: function (z) {
-                const ws = workspaces[z]
+                const ws = workspaces[z] || subflows[z]
                 if (ws) {
                     const contentsChanged = tabDirtyMap[z].size > 0 || tabDeletedNodesMap[z].size > 0
                     if (Boolean(ws.contentsChanged) !== contentsChanged) {
                         ws.contentsChanged = contentsChanged
-                        RED.events.emit("flows:change", ws);
+                        if (ws.type === 'tab') {
+                            RED.events.emit("flows:change", ws);
+                        } else {
+                            RED.events.emit("subflows:change", ws);
+                        }
                     }
                 }
             }
@@ -797,8 +828,8 @@ RED.nodes = (function() {
 
         if (node && node._def.onremove) {
             // Deprecated: never documented but used by some early nodes
-            console.log("Deprecated API warning: node type ",node.type," has an onremove function - should be oneditremove - please report");
-            node._def.onremove.call(n);
+            console.log("Deprecated API warning: node type ",node.type," has an onremove function - should be oneditdelete - please report");
+            node._def.onremove.call(node);
         }
         return {links:removedLinks,nodes:removedNodes};
     }
@@ -1025,7 +1056,22 @@ RED.nodes = (function() {
         RED.nodes.registerType("subflow:"+sf.id, {
             defaults:{
                 name:{value:""},
-                env:{value:[]}
+                env:{value:[], validate: function(value) {
+                    const errors = []
+                    if (value) {
+                        value.forEach(env => {
+                            const r = RED.utils.validateTypedProperty(env.value, env.type)
+                            if (r !== true) {
+                                errors.push(env.name+': '+r)
+                            }
+                        })
+                    }
+                    if (errors.length === 0) {
+                        return true
+                    } else {
+                        return errors
+                    }
+                }}
             },
             icon: function() { return sf.icon||"subflow.svg" },
             category: sf.category || "subflows",
@@ -1228,7 +1274,6 @@ RED.nodes = (function() {
                         }
                     }
                 } else if (n.credentials) {
-                    node.credentials = {};
                     // All other nodes have a well-defined list of possible credentials
                     for (var cred in n._def.credentials) {
                         if (n._def.credentials.hasOwnProperty(cred)) {
@@ -2198,6 +2243,12 @@ RED.nodes = (function() {
                         }
                         node._config.x = node.x;
                         node._config.y = node.y;
+                        if (n.hasOwnProperty('w')) {
+                            node.w = n.w
+                        }
+                        if (n.hasOwnProperty('h')) {
+                            node.h = n.h
+                        }
                     } else if (n.type.substring(0,7) === "subflow") {
                         var parentId = n.type.split(":")[1];
                         var subflow = subflow_denylist[parentId]||subflow_map[parentId]||getSubflow(parentId);
@@ -2211,7 +2262,7 @@ RED.nodes = (function() {
                                 set: registry.getNodeSet("node-red/unknown")
                             }
                         } else {
-                            if (createNewIds || options.importMap[n.id] === "copy") {
+                            if (subflow_denylist[parentId] || createNewIds || options.importMap[n.id] === "copy") {
                                 parentId = subflow.id;
                                 node.type = "subflow:"+parentId;
                                 node._def = registry.getNodeType(node.type);

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

@@ -1,6 +1,7 @@
 RED.plugins = (function() {
     var plugins = {};
     var pluginsByType = {};
+    var moduleList = {};
 
     function registerPlugin(id,definition) {
         plugins[id] = definition;
@@ -38,9 +39,43 @@ RED.plugins = (function() {
     function getPluginsByType(type) {
         return pluginsByType[type] || [];
     }
+
+    function setPluginList(list) {
+        for(let i=0;i<list.length;i++) {
+            let p = list[i];
+            addPlugin(p);
+        }
+    }
+
+    function addPlugin(p) {
+
+        moduleList[p.module] = moduleList[p.module] || {
+            name:p.module,
+            version:p.version,
+            local:p.local,
+            sets:{},
+            plugin: true,
+            id: p.id
+        };
+        if (p.pending_version) {
+            moduleList[p.module].pending_version = p.pending_version;
+        }
+        moduleList[p.module].sets[p.name] = p;
+
+        RED.events.emit("registry:plugin-module-added",p.module);
+    }
+
+    function getModule(module) {
+        return moduleList[module];
+    }
+
     return {
         registerPlugin: registerPlugin,
         getPlugin: getPlugin,
-        getPluginsByType: getPluginsByType
+        getPluginsByType: getPluginsByType,
+
+        setPluginList: setPluginList,
+        addPlugin: addPlugin,
+        getModule: getModule
     }
 })();

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

@@ -25,6 +25,7 @@ var RED = (function() {
             cache: false,
             url: 'plugins',
             success: function(data) {
+                RED.plugins.setPluginList(data);
                 loader.reportProgress(RED._("event.loadPlugins"), 13)
                 RED.i18n.loadPluginCatalogs(function() {
                     loadPlugins(function() {
@@ -297,6 +298,7 @@ var RED = (function() {
                                 RED.workspaces.show(workspaces[0]);
                             }
                         }
+                        RED.events.emit('flows:loaded')
                     } catch(err) {
                         console.warn(err);
                         RED.notify(
@@ -498,6 +500,15 @@ var RED = (function() {
                             ]
                         }
                     }
+                } else if (notificationId === 'restart-required') {
+                    options.buttons = [
+                        {
+                            text: RED._("common.label.close"),
+                            click: function() {
+                                persistentNotifications[notificationId].hideNotification();
+                            }
+                        }
+                    ]
                 }
                 if (!persistentNotifications.hasOwnProperty(notificationId)) {
                     persistentNotifications[notificationId] = RED.notify(text,options);
@@ -525,6 +536,45 @@ var RED = (function() {
                 RED.view.redrawStatus(node);
             }
         });
+        RED.comms.subscribe("notification/plugin/#",function(topic,msg) {
+            if (topic == "notification/plugin/added") {
+                RED.settings.refreshSettings(function(err, data) {
+                    let addedPlugins = [];
+                    msg.forEach(function(m) {
+                        let id = m.id;
+                        RED.plugins.addPlugin(m);
+
+                        m.plugins.forEach((p) => {
+                            addedPlugins.push(p.id);
+                        })
+
+                        RED.i18n.loadNodeCatalog(id, function() {
+                            var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage();
+                            $.ajax({
+                                headers: {
+                                    "Accept":"text/html",
+                                    "Accept-Language": lang
+                                },
+                                cache: false,
+                                url: 'plugins/'+id,
+                                success: function(data) {
+                                    appendPluginConfig(data);
+                                }
+                            });
+                        });
+                    });
+                    if (addedPlugins.length) {
+                        let pluginList = "<ul><li>"+addedPlugins.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
+                        // ToDo: Adapt notification (node -> plugin)
+                        RED.notify(RED._("palette.event.nodeAdded", {count:addedPlugins.length})+pluginList,"success");
+                    }
+                })
+            }
+        });
+
+        let pendingNodeRemovedNotifications = []
+        let pendingNodeRemovedTimeout
+
         RED.comms.subscribe("notification/node/#",function(topic,msg) {
             var i,m;
             var typeList;
@@ -562,8 +612,15 @@ var RED = (function() {
                     m = msg[i];
                     info = RED.nodes.removeNodeSet(m.id);
                     if (info.added) {
-                        typeList = "<ul><li>"+m.types.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
-                        RED.notify(RED._("palette.event.nodeRemoved", {count:m.types.length})+typeList,"success");
+                        pendingNodeRemovedNotifications = pendingNodeRemovedNotifications.concat(m.types.map(RED.utils.sanitize))
+                        if (pendingNodeRemovedTimeout) {
+                            clearTimeout(pendingNodeRemovedTimeout)
+                        }
+                        pendingNodeRemovedTimeout = setTimeout(function () {
+                            typeList = "<ul><li>"+pendingNodeRemovedNotifications.join("</li><li>")+"</li></ul>";
+                            RED.notify(RED._("palette.event.nodeRemoved", {count:pendingNodeRemovedNotifications.length})+typeList,"success");
+                            pendingNodeRemovedNotifications = []
+                        }, 200)
                     }
                 }
                 loadIconList();
@@ -702,7 +759,7 @@ var RED = (function() {
         menuOptions.push({id:"menu-item-config-nodes",label:RED._("menu.label.displayConfig"),onselect:"core:show-config-tab"});
         menuOptions.push({id:"menu-item-workspace",label:RED._("menu.label.flows"),options:[
             {id:"menu-item-workspace-add",label:RED._("menu.label.add"),onselect:"core:add-flow"},
-            {id:"menu-item-workspace-edit",label:RED._("menu.label.rename"),onselect:"core:edit-flow"},
+            {id:"menu-item-workspace-edit",label:RED._("menu.label.edit"),onselect:"core:edit-flow"},
             {id:"menu-item-workspace-delete",label:RED._("menu.label.delete"),onselect:"core:remove-flow"}
         ]});
         menuOptions.push({id:"menu-item-subflow",label:RED._("menu.label.subflows"), options: [
@@ -783,6 +840,10 @@ var RED = (function() {
 
         RED.nodes.init();
         RED.runtime.init()
+
+        if (RED.settings.theme("multiplayer.enabled",false)) {
+            RED.multiplayer.init()
+        }
         RED.comms.connect();
 
         $("#red-ui-main-container").show();

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

@@ -819,7 +819,7 @@ RED.clipboard = (function() {
         flow.forEach(function(node) {
             if (node.type === "tab") {
                 flows[node.id] = {
-                    element: getFlowLabel(node,false),
+                    element: getFlowLabel(node),
                     deferBuild: type !== "flow",
                     expanded: type === "flow",
                     children: []
@@ -1000,7 +1000,6 @@ RED.clipboard = (function() {
         try {
             RED.view.importNodes(newNodes, importOptions);
         } catch(error) {
-            console.log(error.importConfig)
             // Thrown for import_conflict
             confirmImport(error.importConfig, newNodes, importOptions);
         }
@@ -1170,9 +1169,9 @@ RED.clipboard = (function() {
     function getNodeElement(n, isConflicted, isSelected, parent) {
         var element;
         if (n.type === "tab") {
-            element = getFlowLabel(n, isSelected);
+            element = getFlowLabel(n, isConflicted);
         } else {
-            element = getNodeLabel(n, isConflicted, isSelected);
+            element = getNodeLabel(n, isConflicted, isSelected, parent);
         }
         var controls = $('<div>',{class:"red-ui-clipboard-dialog-import-conflicts-controls"}).appendTo(element);
         controls.on("click", function(evt) { evt.stopPropagation(); });
@@ -1222,14 +1221,14 @@ RED.clipboard = (function() {
         }
     }
 
-    function getFlowLabel(n) {
+    function getFlowLabel(n, isConflicted) {
         n = JSON.parse(JSON.stringify(n));
         n._def = RED.nodes.getType(n.type) || {};
         if (n._def) {
             n._ = n._def._;
         }
 
-        var div = $('<div>',{class:"red-ui-info-outline-item red-ui-info-outline-item-flow"});
+        var div = $('<div>',{class:"red-ui-info-outline-item red-ui-info-outline-item-flow red-ui-node-list-item"});
         var contentDiv = $('<div>',{class:"red-ui-search-result-description red-ui-info-outline-item-label"}).appendTo(div);
         var label = (typeof n === "string")? n : n.label;
         var newlineIndex = label.indexOf("\\n");
@@ -1237,11 +1236,17 @@ RED.clipboard = (function() {
             label = label.substring(0,newlineIndex)+"...";
         }
         contentDiv.text(label);
+
+        if (!!isConflicted) {
+            const conflictIcon = $('<span style="padding: 0 10px;"><i class="fa fa-exclamation-circle"></span>').appendTo(div)
+            RED.popover.tooltip(conflictIcon, RED._('clipboard.import.alreadyExists'))
+        }
+
         // A conflicted flow should not be imported by default.
         return div;
     }
 
-    function getNodeLabel(n, isConflicted) {
+    function getNodeLabel(n, isConflicted, isSelected, parent) {
         n = JSON.parse(JSON.stringify(n));
         n._def = RED.nodes.getType(n.type) || {};
         if (n._def) {
@@ -1249,6 +1254,11 @@ RED.clipboard = (function() {
         }
         var div = $('<div>',{class:"red-ui-node-list-item"});
         RED.utils.createNodeIcon(n,true).appendTo(div);
+
+        if (!parent && !!isConflicted) {
+            const conflictIcon = $('<span style="padding: 0 10px;"><i class="fa fa-exclamation-circle"></span>').appendTo(div)
+            RED.popover.tooltip(conflictIcon, RED._('clipboard.import.alreadyExists'))
+        }
         return div;
     }
 

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

@@ -174,12 +174,24 @@
                 this.uiContainer.width(m[1]);
             }
             if (this.options.sortable) {
+                var isCanceled = false; // Flag to track if an item has been canceled from being dropped into a different list
+                var noDrop = false; // Flag to track if an item is being dragged into a different list
                 var handle = (typeof this.options.sortable === 'string')?
                                 this.options.sortable :
                                 ".red-ui-editableList-item-handle";
                 var sortOptions = {
                     axis: "y",
                     update: function( event, ui ) {
+                        // dont trigger update if the item is being canceled
+                        const targetList = $(event.target);
+                        const draggedItem = ui.item;
+                        const draggedItemParent = draggedItem.parent();
+                        if (!targetList.is(draggedItemParent) && draggedItem.hasClass("red-ui-editableList-item-constrained")) {
+                            noDrop = true;
+                        }
+                        if (isCanceled || noDrop) {
+                            return;
+                        }
                         if (that.options.sortItems) {
                             that.options.sortItems(that.items());
                         }
@@ -189,8 +201,32 @@
                     tolerance: "pointer",
                     forcePlaceholderSize:true,
                     placeholder: "red-ui-editabelList-item-placeholder",
-                    start: function(e, ui){
-                        ui.placeholder.height(ui.item.height()-4);
+                    start: function (event, ui) {
+                        isCanceled = false;
+                        ui.placeholder.height(ui.item.height() - 4);
+                        ui.item.css('cursor', 'grabbing'); // TODO: this doesn't seem to work, use a class instead?
+                    },
+                    stop: function (event, ui) {
+                        ui.item.css('cursor', 'auto');
+                    },
+                    receive: function (event, ui) {
+                        if (ui.item.hasClass("red-ui-editableList-item-constrained")) {
+                            isCanceled = true;
+                            $(ui.sender).sortable('cancel');
+                        }
+                    },
+                    over: function (event, ui) {
+                        // if the dragged item is constrained, prevent it from being dropped into a different list
+                        const targetList = $(event.target);
+                        const draggedItem = ui.item;
+                        const draggedItemParent = draggedItem.parent();
+                        if (!targetList.is(draggedItemParent) && draggedItem.hasClass("red-ui-editableList-item-constrained")) {
+                            noDrop = true;
+                            draggedItem.css('cursor', 'no-drop'); // TODO: this doesn't seem to work, use a class instead?
+                        } else {
+                            noDrop = false;
+                            draggedItem.css('cursor', 'grabbing'); // TODO: this doesn't seem to work, use a class instead?
+                        }
                     }
                 };
                 if (this.options.connectWith) {

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

@@ -211,7 +211,7 @@ RED.popover = (function() {
                         closePopup(true);
                     });
                 }
-                if (trigger === 'hover' && options.interactive) {
+                if (/*trigger === 'hover' && */options.interactive) {
                     div.on('mouseenter', function(e) {
                         clearTimeout(timer);
                         active = true;
@@ -445,9 +445,12 @@ RED.popover = (function() {
 
     return {
         create: createPopover,
-        tooltip: function(target,content, action) {
+        tooltip: function(target,content, action, interactive) {
             var label = function() {
                 var label = content;
+                if (typeof content === 'function') {
+                    label = content()
+                }
                 if (action) {
                     var shortcut = RED.keyboard.getShortcut(action);
                     if (shortcut && shortcut.key) {
@@ -463,6 +466,7 @@ RED.popover = (function() {
                 size: "small",
                 direction: "bottom",
                 content: label,
+                interactive,
                 delay: { show: 750, hide: 50 }
             });
             popover.setContent = function(newContent) {

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

@@ -365,7 +365,10 @@ RED.tabs = (function() {
 
             var thisTabA = thisTab.find("a");
             if (options.onclick) {
-                options.onclick(tabs[thisTabA.attr('href').slice(1)]);
+                options.onclick(tabs[thisTabA.attr('href').slice(1)], evt);
+                if (evt.isDefaultPrevented() && evt.isPropagationStopped()) {
+                    return false
+                }
             }
             activateTab(thisTabA);
             if (fireSelectionChanged) {
@@ -548,6 +551,8 @@ RED.tabs = (function() {
         ul.find("li.red-ui-tab a")
             .on("mousedown", function(evt) { mousedownTab = evt.currentTarget })
             .on("mouseup",onTabClick)
+            // prevent browser-default middle-click behaviour
+            .on("auxclick", function(evt) { evt.preventDefault() })
             .on("click", function(evt) {evt.preventDefault(); })
             .on("dblclick", function(evt) {evt.stopPropagation(); evt.preventDefault(); })
 
@@ -816,6 +821,8 @@ RED.tabs = (function() {
                 }
                 link.on("mousedown", function(evt) { mousedownTab = evt.currentTarget })
                 link.on("mouseup",onTabClick);
+                // prevent browser-default middle-click behaviour
+                link.on("auxclick", function(evt) { evt.preventDefault() })
                 link.on("click", function(evt) { evt.preventDefault(); })
                 link.on("dblclick", function(evt) { evt.stopPropagation(); evt.preventDefault(); })
 

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

@@ -54,25 +54,26 @@
         return icon;
     }
 
-    var autoComplete = function(options) {
-        function getMatch(value, searchValue) {
-            const idx = value.toLowerCase().indexOf(searchValue.toLowerCase());
-            const len = idx > -1 ? searchValue.length : 0;
-            return {
-                index: idx,
-                found: idx > -1,
-                pre: value.substring(0,idx),
-                match: value.substring(idx,idx+len),
-                post: value.substring(idx+len),
-            }
-        }
-        function generateSpans(match) {
-            const els = [];
-            if(match.pre) { els.push($('<span/>').text(match.pre)); }
-            if(match.match) { els.push($('<span/>',{style:"font-weight: bold; color: var(--red-ui-text-color-link);"}).text(match.match)); }
-            if(match.post) { els.push($('<span/>').text(match.post)); }
-            return els;
+    function getMatch(value, searchValue) {
+        const idx = value.toLowerCase().indexOf(searchValue.toLowerCase());
+        const len = idx > -1 ? searchValue.length : 0;
+        return {
+            index: idx,
+            found: idx > -1,
+            pre: value.substring(0,idx),
+            match: value.substring(idx,idx+len),
+            post: value.substring(idx+len),
         }
+    }
+    function generateSpans(match) {
+        const els = [];
+        if(match.pre) { els.push($('<span/>').text(match.pre)); }
+        if(match.match) { els.push($('<span/>',{style:"font-weight: bold; color: var(--red-ui-text-color-link);"}).text(match.match)); }
+        if(match.post) { els.push($('<span/>').text(match.post)); }
+        return els;
+    }
+    
+    const msgAutoComplete = function(options) {
         return function(val) {
             var matches = [];
             options.forEach(opt => {
@@ -102,6 +103,197 @@
         }
     }
 
+    function getEnvVars (obj, envVars = {}) {
+        contextKnownKeys.env = contextKnownKeys.env || {}
+        if (contextKnownKeys.env[obj.id]) {
+            return contextKnownKeys.env[obj.id]
+        }
+        let parent
+        if (obj.type === 'tab' || obj.type === 'subflow') {
+            RED.nodes.eachConfig(function (conf) {
+                if (conf.type === "global-config") {
+                    parent = conf;
+                }
+            })
+        } else if (obj.g) {
+            parent = RED.nodes.group(obj.g)
+        } else if (obj.z) {
+            parent = RED.nodes.workspace(obj.z) || RED.nodes.subflow(obj.z)
+        }
+        if (parent) {
+            getEnvVars(parent, envVars)
+        }
+        if (obj.env) {
+            obj.env.forEach(env => {
+                envVars[env.name] = obj
+            })
+        }
+        contextKnownKeys.env[obj.id] = envVars
+        return envVars
+    }
+
+    const envAutoComplete = function (val) {
+        const editStack = RED.editor.getEditStack()
+        if (editStack.length === 0) {
+            done([])
+            return
+        }
+        const editingNode = editStack.pop()
+        if (!editingNode) {
+            return []
+        }
+        const envVarsMap = getEnvVars(editingNode)
+        const envVars = Object.keys(envVarsMap)
+        const matches = []
+        const i = val.lastIndexOf('${')
+        let searchKey = val
+        let isSubkey = false
+        if (i > -1) {
+            if (val.lastIndexOf('}') < i) {
+                searchKey = val.substring(i+2)
+                isSubkey = true
+            }
+        }
+        envVars.forEach(v => {
+            let valMatch = getMatch(v, searchKey);
+            if (valMatch.found) {
+                const optSrc = envVarsMap[v]
+                const element = $('<div>',{style: "display: flex"});
+                const valEl = $('<div/>',{style:"font-family: var(--red-ui-monospace-font); white-space:nowrap; overflow: hidden; flex-grow:1"});
+                valEl.append(generateSpans(valMatch))
+                valEl.appendTo(element)
+
+                if (optSrc) {
+                    const optEl = $('<div>').css({ "font-size": "0.8em" });
+                    let label
+                    if (optSrc.type === 'global-config') {
+                        label = RED._('sidebar.context.global')
+                    } else if (optSrc.type === 'group') {
+                        label = RED.utils.getNodeLabel(optSrc) || (RED._('sidebar.info.group') + ': '+optSrc.id)
+                    } else {
+                        label = RED.utils.getNodeLabel(optSrc) || optSrc.id
+                    }
+
+                    optEl.append(generateSpans({ match: label }));
+                    optEl.appendTo(element);
+                }
+                matches.push({
+                    value: isSubkey ? val + v + '}' : v,
+                    label: element,
+                    i: valMatch.index
+                });
+            }
+        })
+        matches.sort(function(A,B){return A.i-B.i})
+        return matches
+    }
+
+    let contextKnownKeys = {}
+    let contextCache = {}
+    if (RED.events) {
+        RED.events.on("editor:close", function () {
+            contextCache = {}
+            contextKnownKeys = {}
+        });
+    }
+
+    const contextAutoComplete = function() {
+        const that = this
+        const getContextKeysFromRuntime = function(scope, store, searchKey, done) {
+            contextKnownKeys[scope] = contextKnownKeys[scope] || {}
+            contextKnownKeys[scope][store] = contextKnownKeys[scope][store] || new Set()
+            if (searchKey.length > 0) {
+                try {
+                    RED.utils.normalisePropertyExpression(searchKey)
+                } catch (err) {
+                    // Not a valid context key, so don't try looking up
+                    done()
+                    return
+                }
+            }
+            const url = `context/${scope}/${encodeURIComponent(searchKey)}?store=${store}&keysOnly`
+            if (contextCache[url]) {
+                // console.log('CACHED', url)
+                done()
+            } else {
+                // console.log('GET', url)
+                $.getJSON(url, function(data) {
+                    // console.log(data)
+                    contextCache[url] = true
+                    const result = data[store] || {}
+                    const keys = result.keys || []
+                    const keyPrefix = searchKey + (searchKey.length > 0 ? '.' : '')
+                    keys.forEach(key => {
+                        if (/^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(key)) {
+                            contextKnownKeys[scope][store].add(keyPrefix + key)
+                        } else {
+                            contextKnownKeys[scope][store].add(searchKey + "[\""+key.replace(/"/,"\\\"")+"\"]")
+                        }                        
+                    })
+                    done()
+                })
+            }
+        }
+        const getContextKeys = function(key, done) {
+            const keyParts = key.split('.')
+            const partialKey = keyParts.pop()
+            let scope = that.propertyType
+            if (scope === 'flow') {
+                // Get the flow id of the node we're editing
+                const editStack = RED.editor.getEditStack()
+                if (editStack.length === 0) {
+                    done([])
+                    return
+                }
+                const editingNode = editStack.pop()
+                if (editingNode.z) {
+                    scope = `${scope}/${editingNode.z}`
+                } else {
+                    done([])
+                    return
+                }
+            }
+            const store = (contextStoreOptions.length === 1) ? contextStoreOptions[0].value : that.optionValue
+            const searchKey = keyParts.join('.')
+           
+            getContextKeysFromRuntime(scope, store, searchKey, function() {
+                if (contextKnownKeys[scope][store].has(key) || key.endsWith(']')) {
+                    getContextKeysFromRuntime(scope, store, key, function() {
+                        done(contextKnownKeys[scope][store])
+                    })
+                }
+                done(contextKnownKeys[scope][store])
+            })
+        }
+
+        return function(val, done) {
+            getContextKeys(val, function (keys) {
+                const matches = []
+                keys.forEach(v => {
+                    let optVal = v
+                    let valMatch = getMatch(optVal, val);
+                    if (!valMatch.found && val.length > 0 && val.endsWith('.')) {
+                        // Search key ends in '.' - but doesn't match. Check again
+                        // with [" at the end instead so we match bracket notation
+                        valMatch = getMatch(optVal, val.substring(0, val.length - 1) + '["')
+                    }
+                    if (valMatch.found) {
+                        const element = $('<div>',{style: "display: flex"});
+                        const valEl = $('<div/>',{style:"font-family: var(--red-ui-monospace-font); white-space:nowrap; overflow: hidden; flex-grow:1"});
+                        valEl.append(generateSpans(valMatch))
+                        valEl.appendTo(element)
+                        matches.push({
+                            value: optVal,
+                            label: element,
+                        });
+                    }
+                })
+                matches.sort(function(a, b) { return a.value.localeCompare(b.value) });
+                done(matches);
+            })
+        }
+    }
+
     // This is a hand-generated list of completions for the core nodes (based on the node help html).
     var msgCompletions = [
         { value: "payload" },
@@ -166,23 +358,27 @@
         { value: "_session", source: ["websocket out","tcp out"] },
     ]
     var allOptions = {
-        msg: {value:"msg",label:"msg.",validate:RED.utils.validatePropertyExpression, autoComplete: autoComplete(msgCompletions)},
+        msg: {value:"msg",label:"msg.",validate:RED.utils.validatePropertyExpression, autoComplete: msgAutoComplete(msgCompletions)},
         flow: {value:"flow",label:"flow.",hasValue:true,
             options:[],
             validate:RED.utils.validatePropertyExpression,
             parse: contextParse,
             export: contextExport,
-            valueLabel: contextLabel
+            valueLabel: contextLabel,
+            autoComplete: contextAutoComplete
         },
         global: {value:"global",label:"global.",hasValue:true,
             options:[],
             validate:RED.utils.validatePropertyExpression,
             parse: contextParse,
             export: contextExport,
-            valueLabel: contextLabel
+            valueLabel: contextLabel,
+            autoComplete: contextAutoComplete
         },
         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]+)?$/},
+        num: {value:"num",label:"number",icon:"red/images/typedInput/09.svg",validate: function(v) {
+            return (true === RED.utils.validateTypedProperty(v, "num"));
+        } },
         bool: {value:"bool",label:"boolean",icon:"red/images/typedInput/bool.svg",options:["true","false"]},
         json: {
             value:"json",
@@ -212,7 +408,25 @@
             }
         },
         re: {value:"re",label:"regular expression",icon:"red/images/typedInput/re.svg"},
-        date: {value:"date",label:"timestamp",icon:"fa fa-clock-o",hasValue:false},
+        date: {
+            value:"date",
+            label:"timestamp",
+            icon:"fa fa-clock-o",
+            options:[
+                {
+                    label: 'milliseconds since epoch',
+                    value: ''
+                },
+                {
+                    label: 'YYYY-MM-DDTHH:mm:ss.sssZ',
+                    value: 'iso'
+                },
+                {
+                    label: 'JavaScript Date Object',
+                    value: 'object'
+                }
+            ]
+        },
         jsonata: {
             value: "jsonata",
             label: "expression",
@@ -249,7 +463,8 @@
         env: {
             value: "env",
             label: "env variable",
-            icon: "red/images/typedInput/env.svg"
+            icon: "red/images/typedInput/env.svg",
+            autoComplete: envAutoComplete
         },
         node: {
             value: "node",
@@ -381,18 +596,75 @@
                     eyeButton.show();
                 }
             }
+        },
+        'conf-types': {
+            value: "conf-types",
+            label: "config",
+            icon: "fa fa-cog",
+            // hasValue: false,
+            valueLabel: function (container, value) {
+                // get the selected option (for access to the "name" and "module" properties)
+                const _options = this._optionsCache || this.typeList.find(opt => opt.value === value)?.options || []
+                const selectedOption = _options.find(opt => opt.value === value) || {
+                    title: '',
+                    name: '',
+                    module: ''
+                }
+                container.attr("title", selectedOption.title) // set tooltip to the full path/id of the module/node
+                container.text(selectedOption.name) // apply the "name" of the selected option
+                // set "line-height" such as to make the "name" appear further up, giving room for the "module" to be displayed below the value
+                container.css("line-height", "1.4em")
+                // add the module name in smaller, lighter font below the value
+                $('<div></div>').text(selectedOption.module).css({
+                    // "font-family": "var(--red-ui-monospace-font)",
+                    color: "var(--red-ui-tertiary-text-color)",
+                    "font-size": "0.8em",
+                    "line-height": "1em",
+                    opacity: 0.8
+                }).appendTo(container);
+            },
+            // hasValue: false,
+            options: function () {
+                if (this._optionsCache) {
+                    return this._optionsCache
+                }
+                const configNodes = RED.nodes.registry.getNodeDefinitions({configOnly: true, filter: (def) => def.type !== "global-config"}).map((def) => {
+                    // create a container with with 2 rows (row 1 for the name, row 2 for the module name in smaller, lighter font)
+                    const container = $('<div style="display: flex; flex-direction: column; justify-content: space-between; row-gap: 1px;">')
+                    const row1Name = $('<div>').text(def.type)
+                    const row2Module = $('<div style="font-size: 0.8em; color: var(--red-ui-tertiary-text-color);">').text(def.set.module)
+                    container.append(row1Name, row2Module)
+        
+                    return {
+                        value: def.type,
+                        name: def.type,
+                        enabled: def.set.enabled ?? true,
+                        local: def.set.local,
+                        title: def.set.id, // tooltip e.g. "node-red-contrib-foo/bar"
+                        module: def.set.module,
+                        icon: container[0].outerHTML.trim(), // the typeInput will interpret this as html text and render it in the anchor
+                    }
+                })
+                this._optionsCache = configNodes
+                return configNodes
+            }
         }
     };
 
+    
     // For a type with options, check value is a valid selection
     // If !opt.multiple, returns the valid option object
     // if opt.multiple, returns an array of valid option objects
     // If not valid, returns null;
 
     function isOptionValueValid(opt, currentVal) {
+        let _options = opt.options
+        if (typeof _options === "function") {
+            _options = _options.call(this)
+        }
         if (!opt.multiple) {
-            for (var i=0;i<opt.options.length;i++) {
-                op = opt.options[i];
+            for (var i=0;i<_options.length;i++) {
+                op = _options[i];
                 if (typeof op === "string" && op === currentVal) {
                     return {value:currentVal}
                 } else if (op.value === currentVal) {
@@ -409,8 +681,8 @@
                     currentValues[v] = true;
                 }
             });
-            for (var i=0;i<opt.options.length;i++) {
-                op = opt.options[i];
+            for (var i=0;i<_options.length;i++) {
+                op = _options[i];
                 var val = typeof op === "string" ? op : op.value;
                 if (currentValues.hasOwnProperty(val)) {
                     delete currentValues[val];
@@ -425,6 +697,7 @@
     }
 
     var nlsd = false;
+    let contextStoreOptions;
 
     $.widget( "nodered.typedInput", {
         _create: function() {
@@ -436,7 +709,7 @@
                     }
                 }
                 var contextStores = RED.settings.context.stores;
-                var contextOptions = contextStores.map(function(store) {
+                contextStoreOptions = contextStores.map(function(store) {
                     return {value:store,label: store, icon:'<i class="red-ui-typedInput-icon fa fa-database"></i>'}
                 }).sort(function(A,B) {
                     if (A.value === RED.settings.context.default) {
@@ -447,13 +720,17 @@
                         return A.value.localeCompare(B.value);
                     }
                 })
-                if (contextOptions.length < 2) {
+                if (contextStoreOptions.length < 2) {
                     allOptions.flow.options = [];
                     allOptions.global.options = [];
                 } else {
-                    allOptions.flow.options = contextOptions;
-                    allOptions.global.options = contextOptions;
+                    allOptions.flow.options = contextStoreOptions;
+                    allOptions.global.options = contextStoreOptions;
                 }
+                // Translate timestamp options
+                allOptions.date.options.forEach(opt => {
+                    opt.label = RED._("typedInput.date.format." + (opt.value || 'timestamp'), {defaultValue: opt.label})
+                })
             }
             nlsd = true;
             var that = this;
@@ -542,7 +819,7 @@
                 that.element.trigger('paste',evt);
             });
             this.input.on('keydown', function(evt) {
-                if (that.typeMap[that.propertyType].autoComplete) {
+                if (that.typeMap[that.propertyType].autoComplete || that.input.hasClass('red-ui-autoComplete')) {
                     return
                 }
                 if (evt.keyCode >= 37 && evt.keyCode <= 40) {
@@ -836,7 +1113,9 @@
             if (this.optionMenu) {
                 this.optionMenu.remove();
             }
-            this.menu.remove();
+            if (this.menu) {
+                this.menu.remove();
+            }
             this.uiSelect.remove();
         },
         types: function(types) {
@@ -869,7 +1148,7 @@
             this.menu = this._createMenu(this.typeList,{},function(v) { that.type(v) });
             if (currentType && !this.typeMap.hasOwnProperty(currentType)) {
                 if (!firstCall) {
-                    this.type(this.typeList[0].value);
+                    this.type(this.typeList[0]?.value || ""); // permit empty typeList
                 }
             } else {
                 this.propertyType = null;
@@ -906,6 +1185,11 @@
                 var selectedOption = [];
                 var valueToCheck = value;
                 if (opt.options) {
+                    let _options = opt.options
+                    if (typeof opt.options === "function") {
+                        _options = opt.options.call(this)
+                    }
+
                     if (opt.hasValue && opt.parse) {
                         var parts = opt.parse(value);
                         if (this.options.debug) { console.log(this.identifier,"new parse",parts) }
@@ -919,8 +1203,8 @@
                         checkValues = valueToCheck.split(",");
                     }
                     checkValues.forEach(function(valueToCheck) {
-                        for (var i=0;i<opt.options.length;i++) {
-                            var op = opt.options[i];
+                        for (var i=0;i<_options.length;i++) {
+                            var op = _options[i];
                             if (typeof op === "string") {
                                 if (op === valueToCheck || op === ""+valueToCheck) {
                                     selectedOption.push(that.activeOptions[op]);
@@ -955,7 +1239,7 @@
         },
         type: function(type) {
             if (!arguments.length) {
-                return this.propertyType;
+                return this.propertyType || this.options?.default || '';
             } else {
                 var that = this;
                 if (this.options.debug) { console.log(this.identifier,"----- SET TYPE -----",type) }
@@ -965,6 +1249,9 @@
                     // If previousType is !null, then this is a change of the type, rather than the initialisation
                     var previousType = this.typeMap[this.propertyType];
                     previousValue = this.input.val();
+                    if (this.input.hasClass('red-ui-autoComplete')) {
+                        this.input.autoComplete("destroy");
+                    }
 
                     if (previousType && this.typeChanged) {
                         if (this.options.debug) { console.log(this.identifier,"typeChanged",{previousType,previousValue}) }
@@ -1011,7 +1298,9 @@
                             this.input.val(this.oldValues.hasOwnProperty("_")?this.oldValues["_"]:(opt.default||""))
                         }
                         if (previousType.autoComplete) {
-                            this.input.autoComplete("destroy");
+                            if (this.input.hasClass('red-ui-autoComplete')) {
+                                this.input.autoComplete("destroy");
+                            }
                         }
                     }
                     this.propertyType = type;
@@ -1051,6 +1340,10 @@
                         this.optionMenu = null;
                     }
                     if (opt.options) {
+                        let _options = opt.options
+                        if (typeof _options === "function") {
+                            _options = opt.options.call(this);
+                        }
                         if (this.optionExpandButton) {
                             this.optionExpandButton.hide();
                             this.optionExpandButton.shown = false;
@@ -1067,7 +1360,7 @@
                                 this.valueLabelContainer.hide();
                             }
                             this.activeOptions = {};
-                            opt.options.forEach(function(o) {
+                            _options.forEach(function(o) {
                                 if (typeof o === 'string') {
                                     that.activeOptions[o] = {label:o,value:o};
                                 } else {
@@ -1087,7 +1380,7 @@
                                     if (validValues) {
                                         that._updateOptionSelectLabel(validValues)
                                     } else {
-                                        op = opt.options[0];
+                                        op = _options[0] || {value:""}; // permit zero options
                                         if (typeof op === "string") {
                                             this.value(op);
                                             that._updateOptionSelectLabel({value:op});
@@ -1106,7 +1399,7 @@
                                     that._updateOptionSelectLabel(validValues);
                                 }
                             } else {
-                                var selectedOption = this.optionValue||opt.options[0];
+                                var selectedOption = this.optionValue||_options[0];
                                 if (opt.parse) {
                                     var selectedOptionObj = typeof selectedOption === "string"?{value:selectedOption}:selectedOption
                                     var parts = opt.parse(this.input.val(),selectedOptionObj);
@@ -1139,8 +1432,18 @@
                                 } else {
                                     this.optionSelectTrigger.hide();
                                 }
+                                if (opt.autoComplete) {
+                                    let searchFunction = opt.autoComplete
+                                    if (searchFunction.length === 0) {
+                                        searchFunction = opt.autoComplete.call(this)
+                                    }
+                                    this.input.autoComplete({
+                                        search: searchFunction,
+                                        minLength: 0
+                                    })
+                                }
                             }
-                            this.optionMenu = this._createMenu(opt.options,opt,function(v){
+                            this.optionMenu = this._createMenu(_options,opt,function(v){
                                 if (!opt.multiple) {
                                     that._updateOptionSelectLabel(that.activeOptions[v]);
                                     if (!opt.hasValue) {
@@ -1181,8 +1484,12 @@
                             this.valueLabelContainer.hide();
                             this.elementDiv.show();
                             if (opt.autoComplete) {
+                                let searchFunction = opt.autoComplete
+                                if (searchFunction.length === 0) {
+                                    searchFunction = opt.autoComplete.call(this)
+                                }
                                 this.input.autoComplete({
-                                    search: opt.autoComplete,
+                                    search: searchFunction,
                                     minLength: 0
                                 })
                             }

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

@@ -30,8 +30,26 @@ RED.contextMenu = (function () {
             const isGroup = hasSelection && selection.nodes.length === 1 && selection.nodes[0].type === 'group'
             const canEdit = !RED.workspaces.isLocked()
             const canRemoveFromGroup = hasSelection && !!selection.nodes[0].g
-            const isAllGroups = hasSelection && selection.nodes.filter(n => n.type !== 'group').length === 0
-            const hasGroup = hasSelection && selection.nodes.filter(n => n.type === 'group' ).length > 0
+            let hasGroup, isAllGroups = true, hasDisabledNode, hasEnabledNode, hasLabeledNode, hasUnlabeledNode;
+            if (hasSelection) {
+                selection.nodes.forEach(n => {
+                    if (n.type === 'group') {
+                        hasGroup = true;
+                    } else {
+                        isAllGroups = false;
+                    }
+                    if (n.d) {
+                        hasDisabledNode = true;
+                    } else {
+                        hasEnabledNode = true;
+                    }
+                    if (n.l === undefined || n.l) {
+                        hasLabeledNode = true;
+                    } else {
+                        hasUnlabeledNode = true;
+                    }
+                });
+            }
             const offset = $("#red-ui-workspace-chart").offset()
 
             let addX = options.x - offset.left + $("#red-ui-workspace-chart").scrollLeft()
@@ -44,7 +62,7 @@ RED.contextMenu = (function () {
             }
 
             menuItems.push(
-                { onselect: 'core:show-action-list', onpostselect: function () { } }
+                { onselect: 'core:show-action-list', label: RED._("contextMenu.showActionList"), onpostselect: function () { } }
             )
 
             const insertOptions = []
@@ -55,7 +73,7 @@ RED.contextMenu = (function () {
                     onselect: function () {
                         RED.view.showQuickAddDialog({
                             position: [addX, addY],
-                            touchTrigger: true,
+                            touchTrigger: 'ontouchstart' in window,
                             splice: isSingleLink ? selection.links[0] : undefined,
                             // spliceMultiple: isMultipleLinks
                         })
@@ -100,24 +118,30 @@ RED.contextMenu = (function () {
                     onselect: 'core:split-wire-with-link-nodes',
                     disabled: !canEdit || !hasLinks
                 },
-                null,
-                { onselect: 'core:show-import-dialog', label: RED._('common.label.import')},
-                { onselect: 'core:show-examples-import-dialog', label: RED._('menu.label.importExample') }
+                null
             )
+            if (RED.settings.theme("menu.menu-item-import-library", true)) {
+                insertOptions.push(
+                    { onselect: 'core:show-import-dialog', label: RED._('common.label.import')},
+                    { onselect: 'core:show-examples-import-dialog', label: RED._('menu.label.importExample') }
+                )
+            }
+
+
             if (hasSelection && canEdit) {
                 const nodeOptions = []
                 if (!hasMultipleSelection && !isGroup) {
                     nodeOptions.push(
-                        { onselect: 'core:show-node-help' },
+                        { onselect: 'core:show-node-help', label: RED._('menu.label.showNodeHelp') },
                         null
                     )
                 }
                 nodeOptions.push(
-                    { onselect: 'core:enable-selected-nodes' },
-                    { onselect: 'core:disable-selected-nodes' },
+                    { onselect: 'core:enable-selected-nodes', label: RED._('menu.label.enableSelectedNodes'), disabled: !hasDisabledNode },
+                    { onselect: 'core:disable-selected-nodes', label: RED._('menu.label.disableSelectedNodes'), disabled: !hasEnabledNode },
                     null,
-                    { onselect: 'core:show-selected-node-labels' },
-                    { onselect: 'core:hide-selected-node-labels' }
+                    { onselect: 'core:show-selected-node-labels', label: RED._('menu.label.showSelectedNodeLabels'), disabled: !hasUnlabeledNode },
+                    { onselect: 'core:hide-selected-node-labels', label: RED._('menu.label.hideSelectedNodeLabels'), disabled: !hasLabeledNode }
                 )
                 menuItems.push({
                     label: RED._('sidebar.info.node'),
@@ -126,8 +150,8 @@ RED.contextMenu = (function () {
                 menuItems.push({
                     label: RED._('sidebar.info.group'),
                     options: [
-                        { onselect: 'core:group-selection' },
-                        { onselect: 'core:ungroup-selection', disabled: !hasGroup },
+                        { onselect: 'core:group-selection', label: RED._("menu.label.groupSelection") },
+                        { onselect: 'core:ungroup-selection', label: RED._("menu.label.ungroupSelection"), disabled: !hasGroup },
                     ]
                 })
                 if (hasGroup) {
@@ -143,8 +167,8 @@ RED.contextMenu = (function () {
                 }
                 menuItems[menuItems.length - 1].options.push(
                     null,
-                    { onselect: 'core:copy-group-style', disabled: !hasGroup },
-                    { onselect: 'core:paste-group-style', disabled: !hasGroup}
+                    { onselect: 'core:copy-group-style', label: RED._("keyboard.copyGroupStyle"), disabled: !hasGroup },
+                    { onselect: 'core:paste-group-style', label: RED._("keyboard.pasteGroupStyle"), disabled: !hasGroup}
                 )
             }
             if (canEdit && hasMultipleSelection) {
@@ -168,16 +192,22 @@ RED.contextMenu = (function () {
 
             menuItems.push(
                 null,
-                { onselect: 'core:undo', disabled: RED.history.list().length === 0 },
-                { onselect: 'core:redo', disabled: RED.history.listRedo().length === 0 },
+                { onselect: 'core:undo', label: RED._("keyboard.undoChange"), disabled: RED.history.list().length === 0 },
+                { onselect: 'core:redo', label: RED._("keyboard.redoChange"), disabled: RED.history.listRedo().length === 0 },
                 null,
                 { onselect: 'core:cut-selection-to-internal-clipboard', label: RED._("keyboard.cutNode"), disabled: !canEdit || !hasSelection },
                 { onselect: 'core:copy-selection-to-internal-clipboard', label: RED._("keyboard.copyNode"), disabled: !hasSelection },
                 { onselect: 'core:paste-from-internal-clipboard', label: RED._("keyboard.pasteNode"), disabled: !canEdit || !RED.view.clipboard() },
-                { onselect: 'core:delete-selection', disabled: !canEdit || !canDelete },
+                { onselect: 'core:delete-selection', label: RED._('keyboard.deleteSelected'), disabled: !canEdit || !canDelete },
                 { onselect: 'core:delete-selection-and-reconnect', label: RED._('keyboard.deleteReconnect'), disabled: !canEdit || !canDelete },
-                { onselect: 'core:show-export-dialog', label: RED._("menu.label.export") },
-                { onselect: 'core:select-all-nodes' },
+            )
+            if (RED.settings.theme("menu.menu-item-export-library", true)) {
+                menuItems.push(
+                    { onselect: 'core:show-export-dialog', label: RED._("menu.label.export") }
+                )
+            }
+            menuItems.push(
+                { onselect: 'core:select-all-nodes', label: RED._("keyboard.selectAll") }
             )
         }
 

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

@@ -34,6 +34,8 @@ RED.deploy = (function() {
 
     var currentDiff = null;
 
+    var activeBackgroundDeployNotification;
+
     function changeDeploymentType(type) {
         deploymentType = type;
         $("#red-ui-header-button-deploy-icon").attr("src",deploymentTypes[type].img);
@@ -61,7 +63,7 @@ RED.deploy = (function() {
                  '<img src="red/images/spin.svg"/>'+
                 '</span>'+
               '</a>'+
-              '<a id="red-ui-header-button-deploy-options" class="red-ui-deploy-button" href="#"><i class="fa fa-caret-down"></i></a>'+
+              '<a id="red-ui-header-button-deploy-options" class="red-ui-deploy-button" href="#"><i class="fa fa-caret-down"></i><i class="fa fa-lock"></i></a>'+
               '</span></li>').prependTo(".red-ui-header-toolbar");
             const mainMenuItems = [
                     {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")}}},
@@ -112,53 +114,80 @@ RED.deploy = (function() {
             RED.actions.add("core:set-deploy-type-to-modified-nodes",function() { RED.menu.setSelected("deploymenu-item-node",true); });
         }
 
-
+        window.addEventListener('beforeunload', function (event) {
+            if (RED.nodes.dirty()) {
+                event.preventDefault();
+                event.stopImmediatePropagation()
+                event.returnValue = RED._("deploy.confirm.undeployedChanges");
+                return
+            }
+        })
 
         RED.events.on('workspace:dirty',function(state) {
+            if (RED.settings.user?.permissions === 'read') {
+                return
+            }
             if (state.dirty) {
-                window.onbeforeunload = function() {
-                    return RED._("deploy.confirm.undeployedChanges");
-                }
+                // window.onbeforeunload = function() {
+                //     return 
+                // }
                 $("#red-ui-header-button-deploy").removeClass("disabled");
             } else {
-                window.onbeforeunload = null;
+                // window.onbeforeunload = null;
                 $("#red-ui-header-button-deploy").addClass("disabled");
             }
         });
 
-        var activeNotifyMessage;
         RED.comms.subscribe("notification/runtime-deploy",function(topic,msg) {
-            if (!activeNotifyMessage) {
-                var currentRev = RED.nodes.version();
-                if (currentRev === null || deployInflight || currentRev === msg.revision) {
-                    return;
-                }
-                var message = $('<p>').text(RED._('deploy.confirm.backgroundUpdate'));
-                activeNotifyMessage = RED.notify(message,{
-                    modal: true,
-                    fixed: true,
-                    buttons: [
-                        {
-                            text: RED._('deploy.confirm.button.ignore'),
-                            click: function() {
-                                activeNotifyMessage.close();
-                                activeNotifyMessage = null;
-                            }
-                        },
-                        {
-                            text: RED._('deploy.confirm.button.review'),
-                            class: "primary",
-                            click: function() {
-                                activeNotifyMessage.close();
-                                var nns = RED.nodes.createCompleteNodeSet();
-                                resolveConflict(nns,false);
-                                activeNotifyMessage = null;
-                            }
+            var currentRev = RED.nodes.version();
+            if (currentRev === null || deployInflight || currentRev === msg.revision) {
+                return;
+            }
+            if (activeBackgroundDeployNotification?.hidden && !activeBackgroundDeployNotification?.closed) {
+                activeBackgroundDeployNotification.showNotification()
+                return
+            }
+            const message = $('<p>').text(RED._('deploy.confirm.backgroundUpdate'));
+            const options = {
+                id: 'background-update',
+                type: 'compact',
+                modal: false,
+                fixed: true,
+                timeout: 10000,
+                buttons: [
+                    {
+                        text: RED._('deploy.confirm.button.review'),
+                        class: "primary",
+                        click: function() {
+                            activeBackgroundDeployNotification.hideNotification();
+                            var nns = RED.nodes.createCompleteNodeSet();
+                            resolveConflict(nns,false);
                         }
-                    ]
-                });
+                    }
+                ]
+            }
+            if (!activeBackgroundDeployNotification || activeBackgroundDeployNotification.closed) {
+                activeBackgroundDeployNotification = RED.notify(message, options)
+            } else {
+                activeBackgroundDeployNotification.update(message, options)
             }
         });
+
+
+        updateLockedState()
+        RED.events.on('login', updateLockedState)
+    }
+
+    function updateLockedState() {
+        if (RED.settings.user?.permissions === 'read') {
+            $(".red-ui-deploy-button-group").addClass("readOnly");
+            $("#red-ui-header-button-deploy").addClass("disabled");
+        } else {
+            $(".red-ui-deploy-button-group").removeClass("readOnly");
+            if (RED.nodes.dirty()) {
+                $("#red-ui-header-button-deploy").removeClass("disabled");
+            }
+        }
     }
 
     function getNodeInfo(node) {
@@ -213,7 +242,11 @@ RED.deploy = (function() {
                 class: "primary disabled",
                 click: function() {
                     if (!$("#red-ui-deploy-dialog-confirm-deploy-review").hasClass('disabled')) {
-                        RED.diff.showRemoteDiff();
+                        RED.diff.showRemoteDiff(null, {
+                            onmerge: function () {
+                                activeBackgroundDeployNotification.close()
+                            }
+                        });
                         conflictNotification.close();
                     }
                 }
@@ -226,6 +259,7 @@ RED.deploy = (function() {
                     if (!$("#red-ui-deploy-dialog-confirm-deploy-merge").hasClass('disabled')) {
                         RED.diff.mergeDiff(currentDiff);
                         conflictNotification.close();
+                        activeBackgroundDeployNotification.close()
                     }
                 }
             }
@@ -238,6 +272,7 @@ RED.deploy = (function() {
                 click: function() {
                     save(true,activeDeploy);
                     conflictNotification.close();
+                    activeBackgroundDeployNotification.close()
                 }
             })
         }
@@ -248,21 +283,17 @@ RED.deploy = (function() {
             buttons: buttons
         });
 
-        var now = Date.now();
         RED.diff.getRemoteDiff(function(diff) {
-            var ellapsed = Math.max(1000 - (Date.now()-now), 0);
             currentDiff = diff;
-            setTimeout(function() {
-                conflictCheck.hide();
-                var d = Object.keys(diff.conflicts);
-                if (d.length === 0) {
-                    conflictAutoMerge.show();
-                    $("#red-ui-deploy-dialog-confirm-deploy-merge").removeClass('disabled')
-                } else {
-                    conflictManualMerge.show();
-                }
-                $("#red-ui-deploy-dialog-confirm-deploy-review").removeClass('disabled')
-            },ellapsed);
+            conflictCheck.hide();
+            var d = Object.keys(diff.conflicts);
+            if (d.length === 0) {
+                conflictAutoMerge.show();
+                $("#red-ui-deploy-dialog-confirm-deploy-merge").removeClass('disabled')
+            } else {
+                conflictManualMerge.show();
+            }
+            $("#red-ui-deploy-dialog-confirm-deploy-review").removeClass('disabled')
         })
     }
     function cropList(list) {
@@ -612,7 +643,10 @@ RED.deploy = (function() {
                 }
             });
             RED.nodes.eachSubflow(function (subflow) {
-                subflow.changed = false;
+                if (subflow.changed) {
+                    subflow.changed = false;
+                    RED.events.emit("subflows:change", subflow);
+                }
             });
             RED.nodes.eachWorkspace(function (ws) {
                 if (ws.changed || ws.added) {

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

@@ -1,5 +1,4 @@
 RED.diff = (function() {
-
     var currentDiff = {};
     var diffVisible = false;
     var diffList;
@@ -62,12 +61,14 @@ RED.diff = (function() {
                         addedCount:0,
                         deletedCount:0,
                         changedCount:0,
+                        movedCount:0,
                         unchangedCount: 0
                     },
                     remote: {
                         addedCount:0,
                         deletedCount:0,
                         changedCount:0,
+                        movedCount:0,
                         unchangedCount: 0
                     },
                     conflicts: 0
@@ -138,7 +139,7 @@ RED.diff = (function() {
                             $(this).parent().toggleClass('collapsed');
                         });
 
-                        createNodePropertiesTable(def,tab,localTabNode,remoteTabNode,conflicts).appendTo(div);
+                        createNodePropertiesTable(def,tab,localTabNode,remoteTabNode).appendTo(div);
                         selectState = "";
                         if (conflicts[tab.id]) {
                             flowStats.conflicts++;
@@ -208,19 +209,26 @@ RED.diff = (function() {
                         var localStats = $('<span>',{class:"red-ui-diff-list-flow-stats"}).appendTo(localCell);
                         $('<span class="red-ui-diff-status"></span>').text(RED._('diff.nodeCount',{count:localNodeCount})).appendTo(localStats);
 
-                        if (flowStats.conflicts + flowStats.local.addedCount + flowStats.local.changedCount + flowStats.local.deletedCount > 0) {
+                        if (flowStats.conflicts + flowStats.local.addedCount + flowStats.local.changedCount + flowStats.local.movedCount + flowStats.local.deletedCount > 0) {
                             $('<span class="red-ui-diff-status"> [ </span>').appendTo(localStats);
                             if (flowStats.conflicts > 0) {
                                 $('<span class="red-ui-diff-status-conflict"><span class="red-ui-diff-status"><i class="fa fa-exclamation"></i> '+flowStats.conflicts+'</span></span>').appendTo(localStats);
                             }
                             if (flowStats.local.addedCount > 0) {
-                                $('<span class="red-ui-diff-status-added"><span class="red-ui-diff-status"><i class="fa fa-plus-square"></i> '+flowStats.local.addedCount+'</span></span>').appendTo(localStats);
+                                const cell = $('<span class="red-ui-diff-status-added"><span class="red-ui-diff-status"><i class="fa fa-plus-square"></i> '+flowStats.local.addedCount+'</span></span>').appendTo(localStats);
+                                RED.popover.tooltip(cell, RED._('diff.type.added'))
                             }
                             if (flowStats.local.changedCount > 0) {
-                                $('<span class="red-ui-diff-status-changed"><span class="red-ui-diff-status"><i class="fa fa-square"></i> '+flowStats.local.changedCount+'</span></span>').appendTo(localStats);
+                                const cell = $('<span class="red-ui-diff-status-changed"><span class="red-ui-diff-status"><i class="fa fa-square"></i> '+flowStats.local.changedCount+'</span></span>').appendTo(localStats);
+                                RED.popover.tooltip(cell, RED._('diff.type.changed'))
+                            }
+                            if (flowStats.local.movedCount > 0) {
+                                const cell = $('<span class="red-ui-diff-status-moved"><span class="red-ui-diff-status"><i class="fa fa-square"></i> '+flowStats.local.movedCount+'</span></span>').appendTo(localStats);
+                                RED.popover.tooltip(cell, RED._('diff.type.moved'))
                             }
                             if (flowStats.local.deletedCount > 0) {
-                                $('<span class="red-ui-diff-status-deleted"><span class="red-ui-diff-status"><i class="fa fa-minus-square"></i> '+flowStats.local.deletedCount+'</span></span>').appendTo(localStats);
+                                const cell = $('<span class="red-ui-diff-status-deleted"><span class="red-ui-diff-status"><i class="fa fa-minus-square"></i> '+flowStats.local.deletedCount+'</span></span>').appendTo(localStats);
+                                RED.popover.tooltip(cell, RED._('diff.type.deleted'))
                             }
                             $('<span class="red-ui-diff-status"> ] </span>').appendTo(localStats);
                         }
@@ -246,19 +254,26 @@ RED.diff = (function() {
                             }
                             var remoteStats = $('<span>',{class:"red-ui-diff-list-flow-stats"}).appendTo(remoteCell);
                             $('<span class="red-ui-diff-status"></span>').text(RED._('diff.nodeCount',{count:remoteNodeCount})).appendTo(remoteStats);
-                            if (flowStats.conflicts + flowStats.remote.addedCount + flowStats.remote.changedCount + flowStats.remote.deletedCount > 0) {
+                            if (flowStats.conflicts + flowStats.remote.addedCount + flowStats.remote.changedCount + flowStats.remote.movedCount + flowStats.remote.deletedCount > 0) {
                                 $('<span class="red-ui-diff-status"> [ </span>').appendTo(remoteStats);
                                 if (flowStats.conflicts > 0) {
                                     $('<span class="red-ui-diff-status-conflict"><span class="red-ui-diff-status"><i class="fa fa-exclamation"></i> '+flowStats.conflicts+'</span></span>').appendTo(remoteStats);
                                 }
                                 if (flowStats.remote.addedCount > 0) {
-                                    $('<span class="red-ui-diff-status-added"><span class="red-ui-diff-status"><i class="fa fa-plus-square"></i> '+flowStats.remote.addedCount+'</span></span>').appendTo(remoteStats);
+                                    const cell = $('<span class="red-ui-diff-status-added"><span class="red-ui-diff-status"><i class="fa fa-plus-square"></i> '+flowStats.remote.addedCount+'</span></span>').appendTo(remoteStats);
+                                    RED.popover.tooltip(cell, RED._('diff.type.added'))
                                 }
                                 if (flowStats.remote.changedCount > 0) {
-                                    $('<span class="red-ui-diff-status-changed"><span class="red-ui-diff-status"><i class="fa fa-square"></i> '+flowStats.remote.changedCount+'</span></span>').appendTo(remoteStats);
+                                    const cell = $('<span class="red-ui-diff-status-changed"><span class="red-ui-diff-status"><i class="fa fa-square"></i> '+flowStats.remote.changedCount+'</span></span>').appendTo(remoteStats);
+                                    RED.popover.tooltip(cell, RED._('diff.type.changed'))
+                                }
+                                if (flowStats.remote.movedCount > 0) {
+                                    const cell = $('<span class="red-ui-diff-status-moved"><span class="red-ui-diff-status"><i class="fa fa-square"></i> '+flowStats.remote.movedCount+'</span></span>').appendTo(remoteStats);
+                                    RED.popover.tooltip(cell, RED._('diff.type.moved'))
                                 }
                                 if (flowStats.remote.deletedCount > 0) {
-                                    $('<span class="red-ui-diff-status-deleted"><span class="red-ui-diff-status"><i class="fa fa-minus-square"></i> '+flowStats.remote.deletedCount+'</span></span>').appendTo(remoteStats);
+                                    const cell = $('<span class="red-ui-diff-status-deleted"><span class="red-ui-diff-status"><i class="fa fa-minus-square"></i> '+flowStats.remote.deletedCount+'</span></span>').appendTo(remoteStats);
+                                    RED.popover.tooltip(cell, RED._('diff.type.deleted'))
                                 }
                                 $('<span class="red-ui-diff-status"> ] </span>').appendTo(remoteStats);
                             }
@@ -293,7 +308,7 @@ RED.diff = (function() {
         if (options.mode === "merge") {
             diffPanel.addClass("red-ui-diff-panel-merge");
         }
-        var diffList = createDiffTable(diffPanel, diff);
+        var diffList = createDiffTable(diffPanel, diff, options);
 
         var localDiff = diff.localDiff;
         var remoteDiff = diff.remoteDiff;
@@ -516,7 +531,6 @@ RED.diff = (function() {
 
         var hasChanges = false; // exists in original and local/remote but with changes
         var unChanged = true; // existing in original,local,remote unchanged
-        var localChanged = false;
 
         if (localDiff.added[node.id]) {
             stats.local.addedCount++;
@@ -535,12 +549,20 @@ RED.diff = (function() {
             unChanged = false;
         }
         if (localDiff.changed[node.id]) {
-            stats.local.changedCount++;
+            if (localDiff.positionChanged[node.id]) {
+                stats.local.movedCount++
+            } else {
+                stats.local.changedCount++;
+            }
             hasChanges = true;
             unChanged = false;
         }
         if (remoteDiff && remoteDiff.changed[node.id]) {
-            stats.remote.changedCount++;
+            if (remoteDiff.positionChanged[node.id]) {
+                stats.remote.movedCount++
+            } else {
+                stats.remote.changedCount++;
+            }
             hasChanges = true;
             unChanged = false;
         }
@@ -605,27 +627,32 @@ RED.diff = (function() {
                     localNodeDiv.addClass("red-ui-diff-status-moved");
                     var localMovedMessage = "";
                     if (node.z === localN.z) {
-                        localMovedMessage = RED._("diff.type.movedFrom",{id:(localDiff.currentConfig.all[node.id].z||'global')});
+                        const movedFromNodeTab = localDiff.currentConfig.all[localDiff.currentConfig.all[node.id].z]
+                        const movedFromLabel = `'${movedFromNodeTab ? (movedFromNodeTab.label || movedFromNodeTab.id) : 'global'}'`
+                        localMovedMessage = RED._("diff.type.movedFrom",{id: movedFromLabel});
                     } else {
-                        localMovedMessage = RED._("diff.type.movedTo",{id:(localN.z||'global')});
+                        const movedToNodeTab = localDiff.newConfig.all[localN.z]
+                        const movedToLabel = `'${movedToNodeTab ? (movedToNodeTab.label || movedToNodeTab.id) : 'global'}'`
+                        localMovedMessage = RED._("diff.type.movedTo",{id:movedToLabel});
                     }
                     $('<span class="red-ui-diff-status"><i class="fa fa-caret-square-o-right"></i> '+localMovedMessage+'</span>').appendTo(localNodeDiv);
                 }
-                localChanged = true;
             } else if (localDiff.deleted[node.z]) {
                 localNodeDiv.addClass("red-ui-diff-empty");
-                localChanged = true;
             } else if (localDiff.deleted[node.id]) {
                 localNodeDiv.addClass("red-ui-diff-status-deleted");
                 $('<span class="red-ui-diff-status"><i class="fa fa-minus-square"></i> <span data-i18n="diff.type.deleted"></span></span>').appendTo(localNodeDiv);
-                localChanged = true;
             } else if (localDiff.changed[node.id]) {
                 if (localDiff.newConfig.all[node.id].z !== node.z) {
                     localNodeDiv.addClass("red-ui-diff-empty");
                 } else {
-                    localNodeDiv.addClass("red-ui-diff-status-changed");
-                    $('<span class="red-ui-diff-status"><i class="fa fa-square"></i> <span data-i18n="diff.type.changed"></span></span>').appendTo(localNodeDiv);
-                    localChanged = true;
+                    if (localDiff.positionChanged[node.id]) {
+                        localNodeDiv.addClass("red-ui-diff-status-moved");
+                        $('<span class="red-ui-diff-status"><i class="fa fa-square"></i> <span data-i18n="diff.type.moved"></span></span>').appendTo(localNodeDiv);
+                    } else {
+                        localNodeDiv.addClass("red-ui-diff-status-changed");
+                        $('<span class="red-ui-diff-status"><i class="fa fa-square"></i> <span data-i18n="diff.type.changed"></span></span>').appendTo(localNodeDiv);
+                    }
                 }
             } else {
                 if (localDiff.newConfig.all[node.id].z !== node.z) {
@@ -646,9 +673,13 @@ RED.diff = (function() {
                         remoteNodeDiv.addClass("red-ui-diff-status-moved");
                         var remoteMovedMessage = "";
                         if (node.z === remoteN.z) {
-                            remoteMovedMessage = RED._("diff.type.movedFrom",{id:(remoteDiff.currentConfig.all[node.id].z||'global')});
+                            const movedFromNodeTab = remoteDiff.currentConfig.all[remoteDiff.currentConfig.all[node.id].z]
+                            const movedFromLabel = `'${movedFromNodeTab ? (movedFromNodeTab.label || movedFromNodeTab.id) : 'global'}'`
+                            remoteMovedMessage = RED._("diff.type.movedFrom",{id:movedFromLabel});
                         } else {
-                            remoteMovedMessage = RED._("diff.type.movedTo",{id:(remoteN.z||'global')});
+                            const movedToNodeTab = remoteDiff.newConfig.all[remoteN.z]
+                            const movedToLabel = `'${movedToNodeTab ? (movedToNodeTab.label || movedToNodeTab.id) : 'global'}'`
+                            remoteMovedMessage = RED._("diff.type.movedTo",{id:movedToLabel});
                         }
                         $('<span class="red-ui-diff-status"><i class="fa fa-caret-square-o-right"></i> '+remoteMovedMessage+'</span>').appendTo(remoteNodeDiv);
                     }
@@ -661,8 +692,13 @@ RED.diff = (function() {
                     if (remoteDiff.newConfig.all[node.id].z !== node.z) {
                         remoteNodeDiv.addClass("red-ui-diff-empty");
                     } else {
-                        remoteNodeDiv.addClass("red-ui-diff-status-changed");
-                        $('<span class="red-ui-diff-status"><i class="fa fa-square"></i> <span data-i18n="diff.type.changed"></span></span>').appendTo(remoteNodeDiv);
+                        if (remoteDiff.positionChanged[node.id]) {
+                            remoteNodeDiv.addClass("red-ui-diff-status-moved");
+                            $('<span class="red-ui-diff-status"><i class="fa fa-square"></i> <span data-i18n="diff.type.moved"></span></span>').appendTo(remoteNodeDiv);
+                        } else {
+                            remoteNodeDiv.addClass("red-ui-diff-status-changed");
+                            $('<span class="red-ui-diff-status"><i class="fa fa-square"></i> <span data-i18n="diff.type.changed"></span></span>').appendTo(remoteNodeDiv);
+                        }
                     }
                 } else {
                     if (remoteDiff.newConfig.all[node.id].z !== node.z) {
@@ -788,7 +824,7 @@ RED.diff = (function() {
             $("<td>",{class:"red-ui-diff-list-cell-label"}).text("position").appendTo(row);
             localCell = $("<td>",{class:"red-ui-diff-list-cell red-ui-diff-list-node-local"}).appendTo(row);
             if (localNode) {
-                localCell.addClass("red-ui-diff-status-"+(localChanged?"changed":"unchanged"));
+                localCell.addClass("red-ui-diff-status-"+(localChanged?"moved":"unchanged"));
                 $('<span class="red-ui-diff-status">'+(localChanged?'<i class="fa fa-square"></i>':'')+'</span>').appendTo(localCell);
                 element = $('<span class="red-ui-diff-list-element"></span>').appendTo(localCell);
                 var localPosition = {x:localNode.x,y:localNode.y};
@@ -813,7 +849,7 @@ RED.diff = (function() {
 
             if (remoteNode !== undefined) {
                 remoteCell = $("<td>",{class:"red-ui-diff-list-cell red-ui-diff-list-node-remote"}).appendTo(row);
-                remoteCell.addClass("red-ui-diff-status-"+(remoteChanged?"changed":"unchanged"));
+                remoteCell.addClass("red-ui-diff-status-"+(remoteChanged?"moved":"unchanged"));
                 if (remoteNode) {
                     $('<span class="red-ui-diff-status">'+(remoteChanged?'<i class="fa fa-square"></i>':'')+'</span>').appendTo(remoteCell);
                     element = $('<span class="red-ui-diff-list-element"></span>').appendTo(remoteCell);
@@ -989,9 +1025,10 @@ RED.diff = (function() {
             }
             if (localNode && remoteNode && typeof localNode[d] === "string") {
                 if (/\n/.test(localNode[d]) || /\n/.test(remoteNode[d])) {
-                    $('<button class="red-ui-button red-ui-button-small red-ui-diff-text-diff-button"><i class="fa fa-file-o"> <i class="fa fa-caret-left"></i> <i class="fa fa-caret-right"></i> <i class="fa fa-file-o"></i></button>').on("click", function() {
+                    var textDiff = $('<button class="red-ui-button red-ui-button-small red-ui-diff-text-diff-button"><i class="fa fa-file-o"> <i class="fa fa-caret-left"></i> <i class="fa fa-caret-right"></i> <i class="fa fa-file-o"></i></button>').on("click", function() {
                         showTextDiff(localNode[d],remoteNode[d]);
                     }).appendTo(propertyNameCell);
+                    RED.popover.tooltip(textDiff, RED._("diff.compareChanges"));
                 }
             }
 
@@ -1098,11 +1135,11 @@ RED.diff = (function() {
     //     var diff = generateDiff(originalFlow,nns);
     //     showDiff(diff);
     // }
-    function showRemoteDiff(diff) {
-        if (diff === undefined) {
-            getRemoteDiff(showRemoteDiff);
+    function showRemoteDiff(diff, options = {}) {
+        if (!diff) {
+            getRemoteDiff((remoteDiff) => showRemoteDiff(remoteDiff, options));
         } else {
-            showDiff(diff,{mode:'merge'});
+            showDiff(diff,{...options, mode:'merge'});
         }
     }
     function parseNodes(nodeList) {
@@ -1143,23 +1180,53 @@ RED.diff = (function() {
         }
     }
     function generateDiff(currentNodes,newNodes) {
-        var currentConfig = parseNodes(currentNodes);
-        var newConfig = parseNodes(newNodes);
-        var added = {};
-        var deleted = {};
-        var changed = {};
-        var moved = {};
+        const currentConfig = parseNodes(currentNodes);
+        const newConfig = parseNodes(newNodes);
+        const added = {};
+        const deleted = {};
+        const changed = {};
+        const positionChanged = {};
+        const moved = {};
 
         Object.keys(currentConfig.all).forEach(function(id) {
-            var node = RED.nodes.workspace(id)||RED.nodes.subflow(id)||RED.nodes.node(id);
+            const node = RED.nodes.workspace(id)||RED.nodes.subflow(id)||RED.nodes.node(id);
             if (!newConfig.all.hasOwnProperty(id)) {
                 deleted[id] = true;
-            } else if (JSON.stringify(currentConfig.all[id]) !== JSON.stringify(newConfig.all[id])) {
+                return
+            }
+            const currentConfigJSON = JSON.stringify(currentConfig.all[id])
+            const newConfigJSON = JSON.stringify(newConfig.all[id])
+            
+            if (currentConfigJSON !== newConfigJSON) {
                 changed[id] = true;
-
                 if (currentConfig.all[id].z !== newConfig.all[id].z) {
                     moved[id] = true;
+                } else if (
+                    currentConfig.all[id].x !== newConfig.all[id].x ||
+                    currentConfig.all[id].y !== newConfig.all[id].y ||
+                    currentConfig.all[id].w !== newConfig.all[id].w ||
+                    currentConfig.all[id].h !== newConfig.all[id].h
+                ) {
+                    // This node's position on its parent has changed. We want to
+                    // check if this is the *only* change for this given node
+                    const currentNodeClone = JSON.parse(currentConfigJSON)
+                    const newNodeClone = JSON.parse(newConfigJSON)
+
+                    delete currentNodeClone.x
+                    delete currentNodeClone.y
+                    delete currentNodeClone.w
+                    delete currentNodeClone.h
+                    delete newNodeClone.x
+                    delete newNodeClone.y
+                    delete newNodeClone.w
+                    delete newNodeClone.h
+                    
+                    if (JSON.stringify(currentNodeClone) === JSON.stringify(newNodeClone)) {
+                        // Only the position has changed - everything else is the same
+                        positionChanged[id] = true
+                    }
                 }
+
             }
         });
         Object.keys(newConfig.all).forEach(function(id) {
@@ -1168,13 +1235,14 @@ RED.diff = (function() {
             }
         });
 
-        var diff = {
-            currentConfig: currentConfig,
-            newConfig: newConfig,
-            added: added,
-            deleted: deleted,
-            changed: changed,
-            moved: moved
+        const diff = {
+            currentConfig,
+            newConfig,
+            added,
+            deleted,
+            changed,
+            positionChanged,
+            moved
         };
         return diff;
     }
@@ -1239,12 +1307,14 @@ RED.diff = (function() {
         return diff;
     }
 
-    function showDiff(diff,options) {
+    function showDiff(diff, options) {
         if (diffVisible) {
             return;
         }
         options = options || {};
         var mode = options.mode || 'merge';
+        
+        options.hidePositionChanges = true
 
         var localDiff = diff.localDiff;
         var remoteDiff = diff.remoteDiff;
@@ -1314,6 +1384,9 @@ RED.diff = (function() {
                         if (!$("#red-ui-diff-view-diff-merge").hasClass('disabled')) {
                             refreshConflictHeader(diff);
                             mergeDiff(diff);
+                            if (options.onmerge) {
+                                options.onmerge()
+                            }
                             RED.tray.close();
                         }
                     }
@@ -1344,6 +1417,7 @@ RED.diff = (function() {
         var newConfig = [];
         var node;
         var nodeChangedStates = {};
+        var nodeMovedStates = {};
         var localChangedStates = {};
         for (id in localDiff.newConfig.all) {
             if (localDiff.newConfig.all.hasOwnProperty(id)) {
@@ -1351,12 +1425,14 @@ RED.diff = (function() {
                 if (resolutions[id] === 'local') {
                     if (node) {
                         nodeChangedStates[id] = node.changed;
+                        nodeMovedStates[id] = node.moved;
                     }
                     newConfig.push(localDiff.newConfig.all[id]);
                 } else if (resolutions[id] === 'remote') {
                     if (!remoteDiff.deleted[id] && remoteDiff.newConfig.all.hasOwnProperty(id)) {
                         if (node) {
                             nodeChangedStates[id] = node.changed;
+                            nodeMovedStates[id] = node.moved;
                         }
                         localChangedStates[id] = 1;
                         newConfig.push(remoteDiff.newConfig.all[id]);
@@ -1380,8 +1456,9 @@ RED.diff = (function() {
         }
         return {
             config: newConfig,
-            nodeChangedStates: nodeChangedStates,
-            localChangedStates: localChangedStates
+            nodeChangedStates,
+            nodeMovedStates,
+            localChangedStates
         }
     }
 
@@ -1392,6 +1469,7 @@ RED.diff = (function() {
 
         var newConfig = appliedDiff.config;
         var nodeChangedStates = appliedDiff.nodeChangedStates;
+        var nodeMovedStates = appliedDiff.nodeMovedStates;
         var localChangedStates = appliedDiff.localChangedStates;
 
         var isDirty = RED.nodes.dirty();
@@ -1400,33 +1478,56 @@ RED.diff = (function() {
             t:"replace",
             config: RED.nodes.createCompleteNodeSet(),
             changed: nodeChangedStates,
+            moved: nodeMovedStates,
+            complete: true,
             dirty: isDirty,
             rev: RED.nodes.version()
         }
 
         RED.history.push(historyEvent);
 
-        var originalFlow = RED.nodes.originalFlow();
-        // originalFlow is what the editor things it loaded
-        //  - add any newly added nodes from remote diff as they are now part of the record
-        for (var id in diff.remoteDiff.added) {
-            if (diff.remoteDiff.added.hasOwnProperty(id)) {
-                if (diff.remoteDiff.newConfig.all.hasOwnProperty(id)) {
-                    originalFlow.push(JSON.parse(JSON.stringify(diff.remoteDiff.newConfig.all[id])));
-                }
-            }
-        }
+        // var originalFlow = RED.nodes.originalFlow();
+        // // originalFlow is what the editor thinks it loaded
+        // //  - add any newly added nodes from remote diff as they are now part of the record
+        // for (var id in diff.remoteDiff.added) {
+        //     if (diff.remoteDiff.added.hasOwnProperty(id)) {
+        //         if (diff.remoteDiff.newConfig.all.hasOwnProperty(id)) {
+        //             originalFlow.push(JSON.parse(JSON.stringify(diff.remoteDiff.newConfig.all[id])));
+        //         }
+        //     }
+        // }
 
         RED.nodes.clear();
         var imported = RED.nodes.import(newConfig);
 
-        // Restore the original flow so subsequent merge resolutions can properly
-        // identify new-vs-old
-        RED.nodes.originalFlow(originalFlow);
+        // // Restore the original flow so subsequent merge resolutions can properly
+        // // identify new-vs-old
+        // RED.nodes.originalFlow(originalFlow);
+
+        // Clear all change flags from the import
+        RED.nodes.dirty(false);
+        
+        const flowsToLock = new Set()
+        function ensureUnlocked(id) {
+            const flow = id && (RED.nodes.workspace(id) || RED.nodes.subflow(id) || null);
+            const isLocked = flow ? flow.locked : false;
+            if (flow && isLocked) {
+                flow.locked = false;
+                flowsToLock.add(flow)
+            }
+        }
         imported.nodes.forEach(function(n) {
-            if (nodeChangedStates[n.id] || localChangedStates[n.id]) {
+            if (nodeChangedStates[n.id]) {
+                ensureUnlocked(n.z)
                 n.changed = true;
             }
+            if (nodeMovedStates[n.id]) {
+                ensureUnlocked(n.z)
+                n.moved = true;
+            }
+        })
+        flowsToLock.forEach(flow => {
+            flow.locked = true
         })
 
         RED.nodes.version(diff.remoteDiff.rev);

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

@@ -115,8 +115,9 @@ RED.editor = (function() {
                 var valid = validateNodeProperty(node, definition, prop, properties[prop]);
                 if ((typeof valid) === "string") {
                     result.push(valid);
-                }
-                else if(!valid) {
+                } else if (Array.isArray(valid)) {
+                    result = result.concat(valid)
+                } else if(!valid) {
                     result.push(prop);
                 }
             }
@@ -165,7 +166,7 @@ RED.editor = (function() {
                 // If the validator takes two arguments, it is a 3.x validator that
                 // can return a String to mean 'invalid' and provide a reason
                 if ((definition[property].validate.length === 2) &&
-                    ((typeof valid) === "string")) {
+                    ((typeof valid) === "string") || Array.isArray(valid)) {
                     return valid;
                 } else {
                     // Otherwise, a 2.x returns a truth-like/false-like value that
@@ -181,6 +182,17 @@ RED.editor = (function() {
                     error: err.message
                 });
             }
+        } else if (valid) {
+            // If the validator is not provided in node property => Check if the input has a validator
+            if ("category" in node._def) {
+                const isConfig = node._def.category === "config";
+                const prefix = isConfig ? "node-config-input" : "node-input";
+                const input = $("#"+prefix+"-"+property);
+                const isTypedInput = input.length > 0 && input.next(".red-ui-typedInput-container").length > 0;
+                if (isTypedInput) {
+                    valid = input.typedInput("validate");
+                }
+            }
         }
         if (valid && definition[property].type && RED.nodes.getType(definition[property].type) && !("validate" in definition[property])) {
             if (!value || value == "_ADD_") {
@@ -324,48 +336,108 @@ RED.editor = (function() {
 
     /**
      * Create a config-node select box for this property
-     * @param node - the node being edited
-     * @param property - the name of the field
-     * @param type - the type of the config-node
+     * @param  {Object} node - the node being edited
+     * @param {String} property - the name of the node property
+     * @param {String} type - the type of the config-node
+     * @param {"node-config-input"|"node-input"|"node-input-subflow-env"} prefix - the prefix to use in the input element ids
+     * @param {Function} [filter] - a function to filter the list of config nodes
+     * @param {Object} [env] - the environment variable object (only used for subflow env vars)
      */
-    function prepareConfigNodeSelect(node,property,type,prefix,filter) {
-        var input = $("#"+prefix+"-"+property);
-        if (input.length === 0 ) {
+    function prepareConfigNodeSelect(node, property, type, prefix, filter, env) {
+        let nodeValue
+        if (prefix === 'node-input-subflow-env') {
+            nodeValue = env?.value
+        } else {
+            nodeValue = node[property]
+        }
+
+        const addBtnId = `${prefix}-btn-${property}-add`;
+        const editBtnId = `${prefix}-btn-${property}-edit`;
+        const selectId = prefix + '-' + property;
+        const input = $(`#${selectId}`);
+        if (input.length === 0) {
             return;
         }
-        var newWidth = input.width();
-        var attrStyle = input.attr('style');
-        var m;
+        const attrStyle = input.attr('style');
+        let newWidth;
+        let m;
         if ((m = /(^|\s|;)width\s*:\s*([^;]+)/i.exec(attrStyle)) !== null) {
             newWidth = m[2].trim();
         } else {
             newWidth = "70%";
         }
-        var outerWrap = $("<div></div>").css({
+        const outerWrap = $("<div></div>").css({
             width: newWidth,
-            display:'inline-flex'
+            display: 'inline-flex'
         });
-        var select = $('<select id="'+prefix+'-'+property+'"></select>').appendTo(outerWrap);
+        const select = $('<select id="' + selectId + '"></select>').appendTo(outerWrap);
         input.replaceWith(outerWrap);
         // set the style attr directly - using width() on FF causes a value of 114%...
         select.css({
             'flex-grow': 1
         });
-        updateConfigNodeSelect(property,type,node[property],prefix,filter);
-        $('<a id="'+prefix+'-lookup-'+property+'" class="red-ui-button"><i class="fa fa-pencil"></i></a>')
-            .css({"margin-left":"10px"})
+
+        updateConfigNodeSelect(property, type, nodeValue, prefix, filter);
+
+        // create the edit button
+        const editButton = $('<a id="' + editBtnId + '" class="red-ui-button"><i class="fa fa-pencil"></i></a>')
+            .css({ "margin-left": "10px" })
             .appendTo(outerWrap);
-        $('#'+prefix+'-lookup-'+property).on("click", function(e) {
-            showEditConfigNodeDialog(property,type,select.find(":selected").val(),prefix,node);
+
+        RED.popover.tooltip(editButton, RED._('editor.editConfig', { type }));
+
+        // create the add button
+        const addButton = $('<a id="' + addBtnId + '" class="red-ui-button"><i class="fa fa-plus"></i></a>')
+            .css({ "margin-left": "10px" })
+            .appendTo(outerWrap);
+        RED.popover.tooltip(addButton, RED._('editor.addNewConfig', { type }));
+
+        const disableButton = function(button, disabled) {
+            $(button).prop("disabled", !!disabled)
+            $(button).toggleClass("disabled", !!disabled)
+        };
+
+        // add the click handler
+        addButton.on("click", function (e) {
+            if (addButton.prop("disabled")) { return }
+            showEditConfigNodeDialog(property, type, "_ADD_", prefix, node);
             e.preventDefault();
         });
+        editButton.on("click", function (e) {
+            const selectedOpt = select.find(":selected")
+            if (selectedOpt.data('env')) { return } // don't show the dialog for env vars items (MVP. Future enhancement: lookup the env, if present, show the associated edit dialog)
+            if (editButton.prop("disabled")) { return }
+            showEditConfigNodeDialog(property, type, selectedOpt.val(), prefix, node);
+            e.preventDefault();
+        });
+
+        // dont permit the user to click the button if the selected option is an env var
+        select.on("change", function () {
+            const selectedOpt = select.find(":selected");
+            const optionsLength = select.find("option").length;
+            if (selectedOpt?.data('env')) {
+                disableButton(addButton, true);
+                disableButton(editButton, true);
+            // disable the edit button if no options available
+            } else if (optionsLength === 1 && selectedOpt.val() === "_ADD_") {
+                disableButton(addButton, false);
+                disableButton(editButton, true);
+            } else if (selectedOpt.val() === "") {
+                disableButton(addButton, false);
+                disableButton(editButton, true);
+            } else {
+                disableButton(addButton, false);
+                disableButton(editButton, false);
+            }
+        });
+
         var label = "";
-        var configNode = RED.nodes.node(node[property]);
-        var node_def = RED.nodes.getType(type);
+        var configNode = RED.nodes.node(nodeValue);
 
         if (configNode) {
-            label = RED.utils.getNodeLabel(configNode,configNode.id);
+            label = RED.utils.getNodeLabel(configNode, configNode.id);
         }
+
         input.val(label);
     }
 
@@ -766,12 +838,9 @@ RED.editor = (function() {
     }
 
     function defaultConfigNodeSort(A,B) {
-        if (A.__label__ < B.__label__) {
-            return -1;
-        } else if (A.__label__ > B.__label__) {
-            return 1;
-        }
-        return 0;
+        // sort case insensitive so that `[env] node-name` items are at the top and
+        // not mixed inbetween the the lower and upper case items
+        return (A.__label__ || '').localeCompare((B.__label__ || ''), undefined, {sensitivity: 'base'})
     }
 
     function updateConfigNodeSelect(name,type,value,prefix,filter) {
@@ -786,7 +855,7 @@ RED.editor = (function() {
                 }
                 $("#"+prefix+"-"+name).val(value);
             } else {
-
+                let inclSubflowEnvvars = false
                 var select = $("#"+prefix+"-"+name);
                 var node_def = RED.nodes.getType(type);
                 select.children().remove();
@@ -794,6 +863,7 @@ RED.editor = (function() {
                 var activeWorkspace = RED.nodes.workspace(RED.workspaces.active());
                 if (!activeWorkspace) {
                     activeWorkspace = RED.nodes.subflow(RED.workspaces.active());
+                    inclSubflowEnvvars = true
                 }
 
                 var configNodes = [];
@@ -809,6 +879,31 @@ RED.editor = (function() {
                         }
                     }
                 });
+ 
+                // as includeSubflowEnvvars is true, this is a subflow.
+                // include any 'conf-types' env vars as a list of avaiable configs
+                // in the config dropdown as `[env] node-name`
+                if (inclSubflowEnvvars && activeWorkspace.env) {
+                    const parentEnv = activeWorkspace.env.filter(env => env.ui?.type === 'conf-types' && env.type === type)
+                    if (parentEnv && parentEnv.length > 0) {
+                        const locale = RED.i18n.lang()
+                        for (let i = 0; i < parentEnv.length; i++) {
+                            const tenv = parentEnv[i]
+                            const ui = tenv.ui || {}
+                            const labels = ui.label || {}
+                            const labelText = RED.editor.envVarList.lookupLabel(labels, labels["en-US"] || tenv.name, locale)
+                            const config = {
+                                env: tenv,
+                                id: '${' + parentEnv[0].name + '}',
+                                type: type,
+                                label: labelText,
+                                __label__: `[env] ${labelText}`
+                            }
+                            configNodes.push(config)
+                        }
+                    }
+                }
+
                 var configSortFn = defaultConfigNodeSort;
                 if (typeof node_def.sort == "function") {
                     configSortFn = node_def.sort;
@@ -820,7 +915,10 @@ RED.editor = (function() {
                 }
 
                 configNodes.forEach(function(cn) {
-                    $('<option value="'+cn.id+'"'+(value==cn.id?" selected":"")+'></option>').text(RED.text.bidi.enforceTextDirectionWithUCC(cn.__label__)).appendTo(select);
+                    const option = $('<option value="'+cn.id+'"'+(value==cn.id?" selected":"")+'></option>').text(RED.text.bidi.enforceTextDirectionWithUCC(cn.__label__)).appendTo(select);
+                    if (cn.env) {
+                        option.data('env', cn.env) // set a data attribute to indicate this is an env var (to inhibit the edit button)
+                    }
                     delete cn.__label__;
                 });
 
@@ -833,7 +931,12 @@ RED.editor = (function() {
                     }
                 }
 
-                select.append('<option value="_ADD_"'+(value===""?" selected":"")+'>'+RED._("editor.addNewType", {type:label})+'</option>');
+                if (!configNodes.length) {
+                    select.append('<option value="_ADD_" selected>' + RED._("editor.addNewType", { type: label }) + '</option>');
+                } else {
+                    select.append('<option value="">' + RED._("editor.inputs.none") + '</option>');
+                }
+
                 window.setTimeout(function() { select.trigger("change");},50);
             }
         }
@@ -1229,7 +1332,11 @@ RED.editor = (function() {
                 })
 
                 if (node_def.hasUsers !== false) {
-                    $('<span><i class="fa fa-info-circle"></i> <span id="red-ui-editor-config-user-count"></span></span>').css("margin-left", "10px").appendTo(trayFooterLeft);
+                    // $('<span><i class="fa fa-info-circle"></i> <span id="red-ui-editor-config-user-count"></span></span>').css("margin-left", "10px").appendTo(trayFooterLeft);
+                    $('<button type="button" class="red-ui-button"><i class="fa fa-user"></i><span id="red-ui-editor-config-user-count"></span></button>').on('click', function() {
+                        RED.sidebar.info.outliner.search('uses:'+editing_config_node.id)
+                        RED.sidebar.info.show()
+                    }).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>');
 
@@ -1287,7 +1394,8 @@ RED.editor = (function() {
                         });
                     }
                     if (node_def.hasUsers !== false) {
-                        $("#red-ui-editor-config-user-count").text(RED._("editor.nodesUse", {count:editing_config_node.users.length})).parent().show();
+                        $("#red-ui-editor-config-user-count").text(editing_config_node.users.length).parent().show();
+                        RED.popover.tooltip($("#red-ui-editor-config-user-count").parent(), function() { return RED._('editor.nodesUse',{count:editing_config_node.users.length})});
                     }
                     trayBody.i18n();
                     trayFooter.i18n();
@@ -1476,9 +1584,16 @@ RED.editor = (function() {
                     }
                     RED.tray.close(function() {
                         var filter = null;
-                        if (editContext && typeof editContext._def.defaults[configProperty].filter === 'function') {
-                            filter = function(n) {
-                                return editContext._def.defaults[configProperty].filter.call(editContext,n);
+                        // when editing a config via subflow edit panel, the `configProperty` will not
+                        // necessarily be a property of the editContext._def.defaults object
+                        // Also, when editing via dashboard sidebar, editContext can be null
+                        // so we need to guard both scenarios
+                        if (editContext?._def) {
+                            const isSubflow = (editContext._def.type === 'subflow' || /subflow:.*/.test(editContext._def.type))
+                            if (editContext && !isSubflow && typeof editContext._def.defaults?.[configProperty]?.filter === 'function') {
+                                filter = function(n) {
+                                    return editContext._def.defaults[configProperty].filter.call(editContext,n);
+                                }
                             }
                         }
                         updateConfigNodeSelect(configProperty,configType,editing_config_node.id,prefix,filter);
@@ -1539,7 +1654,7 @@ RED.editor = (function() {
                     RED.history.push(historyEvent);
                     RED.tray.close(function() {
                         var filter = null;
-                        if (editContext && typeof editContext._def.defaults[configProperty].filter === 'function') {
+                        if (editContext && typeof editContext._def.defaults[configProperty]?.filter === 'function') {
                             filter = function(n) {
                                 return editContext._def.defaults[configProperty].filter.call(editContext,n);
                             }
@@ -1616,8 +1731,8 @@ RED.editor = (function() {
                         }
 
                         if (!isSameObj(old_env, new_env)) {
-                            editing_node.env = new_env;
                             editState.changes.env = editing_node.env;
+                            editing_node.env = new_env;
                             editState.changed = true;
                         }
 
@@ -2080,6 +2195,7 @@ RED.editor = (function() {
             }
         },
         editBuffer: function(options) { showTypeEditor("_buffer", options) },
+        getEditStack: function () { return [...editStack] },
         buildEditForm: buildEditForm,
         validateNode: validateNode,
         updateNodeProperties: updateNodeProperties,
@@ -2124,6 +2240,7 @@ RED.editor = (function() {
                 filteredEditPanes[type] = filter
             }
             editPanes[type] = definition;
-        }
+        },
+        prepareConfigNodeSelect: prepareConfigNodeSelect,
     }
 })();

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

@@ -121,7 +121,7 @@
                         var i=0,l=bufferBinValue.length;
                         var c = 0;
                         for(i=0;i<l;i++) {
-                            var d = parseInt(bufferBinValue[i]);
+                            var d = parseInt(Number(bufferBinValue[i]));
                             if (!isString && (isNaN(d) || d < 0 || d > 255)) {
                                 valid = false;
                                 break;

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

@@ -514,7 +514,7 @@ RED.editor.codeEditor.monaco = (function() {
                 _monaco.languages.json.jsonDefaults.setDiagnosticsOptions(diagnosticOptions);
                 if(modeConfiguration) { _monaco.languages.json.jsonDefaults.setModeConfiguration(modeConfiguration); }
             } catch (error) {
-                console.warn("monaco - Error setting up json options", err)
+                console.warn("monaco - Error setting up json options", error)
             }
         }
 
@@ -526,7 +526,7 @@ RED.editor.codeEditor.monaco = (function() {
                 if(htmlDefaults) { _monaco.languages.html.htmlDefaults.setOptions(htmlDefaults); }
                 if(handlebarDefaults) { _monaco.languages.html.handlebarDefaults.setOptions(handlebarDefaults); }
             } catch (error) {
-                console.warn("monaco - Error setting up html options", err)
+                console.warn("monaco - Error setting up html options", error)
             }
         }
 
@@ -546,7 +546,7 @@ RED.editor.codeEditor.monaco = (function() {
                 if(lessDefaults_modeConfiguration) { _monaco.languages.css.cssDefaults.setDiagnosticsOptions(lessDefaults_modeConfiguration); }
                 if(scssDefaults_modeConfiguration) { _monaco.languages.css.cssDefaults.setDiagnosticsOptions(scssDefaults_modeConfiguration); }
             } catch (error) {
-                console.warn("monaco - Error setting up CSS/SCSS/LESS options", err)
+                console.warn("monaco - Error setting up CSS/SCSS/LESS options", error)
             }
         }
 
@@ -585,7 +585,7 @@ RED.editor.codeEditor.monaco = (function() {
                     createMonacoCompletionItem("set (flow context)", 'flow.set("${1:name}", ${1:value});','Set a value in flow context',range),
                     createMonacoCompletionItem("get (global context)", 'global.get("${1:name}");','Get a value from global context',range),
                     createMonacoCompletionItem("set (global context)", 'global.set("${1:name}", ${1:value});','Set a value in global context',range),
-                    createMonacoCompletionItem("get (env)", 'env.get("${1|NR_NODE_ID,NR_NODE_NAME,NR_NODE_PATH,NR_GROUP_ID,NR_GROUP_NAME,NR_FLOW_ID,NR_FLOW_NAME|}");','Get env variable value',range),
+                    createMonacoCompletionItem("get (env)", 'env.get("${1|NR_NODE_ID,NR_NODE_NAME,NR_NODE_PATH,NR_GROUP_ID,NR_GROUP_NAME,NR_FLOW_ID,NR_FLOW_NAME,NR_SUBFLOW_NAME,NR_SUBFLOW_ID,NR_SUBFLOW_PATH|}");','Get env variable value',range),
                     createMonacoCompletionItem("cloneMessage (RED.util)", 'RED.util.cloneMessage(${1:msg});',
                         ["```typescript",
                         "RED.util.cloneMessage<T extends registry.NodeMessage>(msg: T): T",
@@ -966,12 +966,10 @@ RED.editor.codeEditor.monaco = (function() {
 
         //Unbind ctrl-Enter (default action is to insert a newline in editor) This permits the shortcut to close the tray.
         try {
-            ed._standaloneKeybindingService.addDynamicKeybinding(
-                '-editor.action.insertLineAfter', // command ID prefixed by '-'
-                null, // keybinding
-                () => {} // need to pass an empty handler
-            );
-        } catch (error) { }
+            monaco.editor.addKeybindingRule({keybinding: 0, command: "-editor.action.insertLineAfter"});
+        } catch (error) {
+            console.warn(error)
+        }
 
         ed.nodered = {
             refreshModuleLibs: refreshModuleLibs //expose this for function node externalModules refresh

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

@@ -1,8 +1,9 @@
 RED.editor.envVarList = (function() {
 
     var currentLocale = 'en-US';
-    var DEFAULT_ENV_TYPE_LIST = ['str','num','bool','json','bin','env'];
-    var DEFAULT_ENV_TYPE_LIST_INC_CRED = ['str','num','bool','json','bin','env','cred','jsonata'];
+    const DEFAULT_ENV_TYPE_LIST = ['str','num','bool','json','bin','env'];
+    const DEFAULT_ENV_TYPE_LIST_INC_CONFTYPES = ['str','num','bool','json','bin','env','conf-types'];
+    const DEFAULT_ENV_TYPE_LIST_INC_CRED = ['str','num','bool','json','bin','env','cred','jsonata'];
 
     /**
      * Create env var edit interface
@@ -10,8 +11,8 @@ RED.editor.envVarList = (function() {
      * @param node - subflow node
      */
     function buildPropertiesList(envContainer, node) {
-
-        var isTemplateNode = (node.type === "subflow");
+        if(RED.editor.envVarList.debug) { console.log('envVarList: buildPropertiesList', envContainer, node) }
+        const isTemplateNode = (node.type === "subflow");
 
         envContainer
             .css({
@@ -83,7 +84,14 @@ RED.editor.envVarList = (function() {
                         // if `opt.ui` does not exist, then apply defaults. If these
                         // defaults do not change then they will get stripped off
                         // before saving.
-                        if (opt.type === 'cred') {
+                        if (opt.type === 'conf-types') {
+                            opt.ui = opt.ui || {
+                                icon: "fa fa-cog",
+                                type: "conf-types",
+                                opts: {opts:[]}
+                            }
+                            opt.ui.type = "conf-types";
+                        } else if (opt.type === 'cred') {
                             opt.ui = opt.ui || {
                                 icon: "",
                                 type: "cred"
@@ -119,7 +127,7 @@ RED.editor.envVarList = (function() {
                             }
                         });
 
-                        buildEnvEditRow(uiRow, opt.ui, nameField, valueField);
+                        buildEnvEditRow(uiRow, opt, nameField, valueField);
                         nameField.trigger('change');
                     }
                 },
@@ -181,21 +189,23 @@ RED.editor.envVarList = (function() {
      * @param nameField - name field of env var
      * @param valueField - value field of env var
      */
-     function buildEnvEditRow(container, ui, nameField, valueField) {
+     function buildEnvEditRow(container, opt, nameField, valueField) {
+        const ui = opt.ui
+        if(RED.editor.envVarList.debug) { console.log('envVarList: buildEnvEditRow', container, ui, nameField, valueField) }
          container.addClass("red-ui-editor-subflow-env-ui-row")
          var topRow = $('<div></div>').appendTo(container);
          $('<div></div>').appendTo(topRow);
          $('<div>').text(RED._("editor.icon")).appendTo(topRow);
          $('<div>').text(RED._("editor.label")).appendTo(topRow);
-         $('<div>').text(RED._("editor.inputType")).appendTo(topRow);
+         $('<div class="red-env-ui-input-type-col">').text(RED._("editor.inputType")).appendTo(topRow);
 
          var row = $('<div></div>').appendTo(container);
          $('<div><i class="red-ui-editableList-item-handle fa fa-bars"></i></div>').appendTo(row);
          var typeOptions = {
-             'input': {types:DEFAULT_ENV_TYPE_LIST},
-             'select': {opts:[]},
-             'spinner': {},
-             'cred': {}
+            'input': {types:DEFAULT_ENV_TYPE_LIST_INC_CONFTYPES},
+            'select': {opts:[]},
+            'spinner': {},
+            'cred': {}
          };
          if (ui.opts) {
              typeOptions[ui.type] = ui.opts;
@@ -260,15 +270,16 @@ RED.editor.envVarList = (function() {
             labelInput.attr("placeholder",$(this).val())
         });
 
-        var inputCell = $('<div></div>').appendTo(row);
-        var inputCellInput = $('<input type="text">').css("width","100%").appendTo(inputCell);
+        var inputCell = $('<div class="red-env-ui-input-type-col"></div>').appendTo(row);
+        var uiInputTypeInput = $('<input type="text">').css("width","100%").appendTo(inputCell);
         if (ui.type === "input") {
-            inputCellInput.val(ui.opts.types.join(","));
+            uiInputTypeInput.val(ui.opts.types.join(","));
         }
         var checkbox;
         var selectBox;
 
-        inputCellInput.typedInput({
+        // the options presented in the UI section for an "input" type selection
+        uiInputTypeInput.typedInput({
             types: [
                 {
                     value:"input",
@@ -429,7 +440,7 @@ RED.editor.envVarList = (function() {
                                         }
                                     });
                                     ui.opts.opts = vals;
-                                    inputCellInput.typedInput('value',Date.now())
+                                    uiInputTypeInput.typedInput('value',Date.now())
                                 }
                             }
                         }
@@ -496,12 +507,13 @@ RED.editor.envVarList = (function() {
                                     } else {
                                         delete ui.opts.max;
                                     }
-                                    inputCellInput.typedInput('value',Date.now())
+                                    uiInputTypeInput.typedInput('value',Date.now())
                                 }
                             }
                         }
                     }
                 },
+                'conf-types',
                 {
                     value:"none",
                     label:RED._("editor.inputs.none"), icon:"fa fa-times",hasValue:false
@@ -519,14 +531,20 @@ RED.editor.envVarList = (function() {
                 // In the case of 'input' type, the typedInput uses the multiple-option
                 // mode. Its value needs to be set to a comma-separately list of the
                 // selected options.
-                inputCellInput.typedInput('value',ui.opts.types.join(","))
+                uiInputTypeInput.typedInput('value',ui.opts.types.join(","))
+            } else if (ui.type === 'conf-types') {
+                // In the case of 'conf-types' type, the typedInput will be populated
+                // with a list of all config nodes types installed.
+                // Restore the value to the last selected type
+                uiInputTypeInput.typedInput('value', opt.type)
             } else {
                 // No other type cares about `value`, but doing this will
                 // force a refresh of the label now that `ui.opts` has
                 // been updated.
-                inputCellInput.typedInput('value',Date.now())
+                uiInputTypeInput.typedInput('value',Date.now())
             }
 
+            if(RED.editor.envVarList.debug) { console.log('envVarList: inputCellInput on:typedinputtypechange. ui.type = ' + ui.type) }
             switch (ui.type) {
                 case 'input':
                     valueField.typedInput('types',ui.opts.types);
@@ -544,7 +562,7 @@ RED.editor.envVarList = (function() {
                     valueField.typedInput('types',['cred']);
                     break;
                 default:
-                    valueField.typedInput('types',DEFAULT_ENV_TYPE_LIST)
+                    valueField.typedInput('types', DEFAULT_ENV_TYPE_LIST);
             }
             if (ui.type === 'checkbox') {
                 valueField.typedInput('type','bool');
@@ -556,8 +574,46 @@ RED.editor.envVarList = (function() {
             }
 
         }).on("change", function(evt,type) {
-            if (ui.type === 'input') {
-                var types = inputCellInput.typedInput('value');
+            const selectedType = $(this).typedInput('type') // the UI typedInput type
+            if(RED.editor.envVarList.debug) { console.log('envVarList: inputCellInput on:change. selectedType = ' + selectedType) }
+            if (selectedType === 'conf-types') {
+                const selectedConfigType = $(this).typedInput('value') || opt.type
+                let activeWorkspace = RED.nodes.workspace(RED.workspaces.active());
+                if (!activeWorkspace) {
+                    activeWorkspace = RED.nodes.subflow(RED.workspaces.active());
+                }
+
+                // get a list of all config nodes matching the selectedValue
+                const configNodes = [];
+                RED.nodes.eachConfig(function(config) {
+                    if (config.type == selectedConfigType && (!config.z || config.z === activeWorkspace.id)) {
+                        const modulePath = config._def?.set?.id || ''
+                        let label = RED.utils.getNodeLabel(config, config.id) || config.id;
+                        label += config.d ? ' ['+RED._('workspace.disabled')+']' : '';
+                        const _config = {
+                            _type: selectedConfigType,
+                            value: config.id,
+                            label: label,
+                            title: modulePath ? modulePath + ' - ' + label : label,
+                            enabled: config.d !== true,
+                            disabled: config.d === true,
+                        }
+                        configNodes.push(_config);
+                    }
+                });
+                const tiTypes = {
+                    value: selectedConfigType,
+                    label: "config",
+                    icon: "fa fa-cog",
+                    options: configNodes,
+                }
+                valueField.typedInput('types', [tiTypes]);
+                valueField.typedInput('type', selectedConfigType);
+                valueField.typedInput('value', opt.value);
+
+
+            } else if (ui.type === 'input') {
+                var types = uiInputTypeInput.typedInput('value');
                 ui.opts.types = (types === "") ? ["str"] : types.split(",");
                 valueField.typedInput('types',ui.opts.types);
             }
@@ -569,7 +625,7 @@ RED.editor.envVarList = (function() {
         })
         // Set the input to the right type. This will trigger the 'typedinputtypechange'
         // event handler (just above ^^) to update the value if needed
-        inputCellInput.typedInput('type',ui.type)
+        uiInputTypeInput.typedInput('type',ui.type)
     }
 
     function setLocale(l, list) {

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

@@ -169,7 +169,7 @@
                             var currentScrollTop = $(".red-ui-editor-type-markdown-panel-preview").scrollTop();
                             $(".red-ui-editor-type-markdown-panel-preview").html(RED.utils.renderMarkdown(expressionEditor.getValue()));
                             $(".red-ui-editor-type-markdown-panel-preview").scrollTop(currentScrollTop);
-                            mermaid.init();
+                            RED.editor.mermaid.render()
                         },200);
                     })
                     if (options.header) {
@@ -178,7 +178,7 @@
 
                     if (value) {
                         $(".red-ui-editor-type-markdown-panel-preview").html(RED.utils.renderMarkdown(expressionEditor.getValue()));
-                        mermaid.init();
+                        RED.editor.mermaid.render()
                     }
                     panels = RED.panels.create({
                         id:"red-ui-editor-type-markdown-panels",

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

@@ -0,0 +1,54 @@
+RED.editor.mermaid = (function () {
+    let initializing = false
+    let loaded = false
+    let pendingEvals = []
+    let diagramIds = 0
+
+    function render(selector = '.mermaid') {
+        // $(selector).hide()
+        if (!loaded) {
+            pendingEvals.push(selector)
+            
+            if (!initializing) {
+                initializing = true
+                $.getScript(
+                    'vendor/mermaid/mermaid.min.js',
+                    function (data, stat, jqxhr) {
+                        mermaid.initialize({
+                            startOnLoad: false,
+                            theme: RED.settings.get('mermaid', {}).theme
+                        })
+                        loaded = true
+                        while(pendingEvals.length > 0) {
+                            const pending = pendingEvals.shift()
+                            render(pending)
+                        }
+                    }
+                )
+            }
+        } else {
+            const nodes = document.querySelectorAll(selector)
+
+            nodes.forEach(async node => {
+                if (!node.getAttribute('mermaid-processed')) {
+                    const mermaidContent = node.innerText
+                    node.setAttribute('mermaid-processed', true)
+                    try {
+                        const { svg } = await mermaid.render('mermaid-render-'+Date.now()+'-'+(diagramIds++), mermaidContent);
+                        node.innerHTML = svg
+                    } catch (err) {
+                        $('<div>').css({
+                            fontSize: '0.8em',
+                            border: '1px solid var(--red-ui-border-color-error)',
+                            padding: '5px',
+                            marginBottom: '10px',
+                        }).text(err.toString()).prependTo(node)
+                    }
+                }
+            })
+        }
+    }  
+    return {
+        render: render,
+    };
+})();

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

@@ -196,7 +196,7 @@
         }
 
         $('<div class="form-row">'+
-            '<label for="node-input-show-label-btn" data-i18n="editor.label"></label>'+
+            '<label for="node-input-show-label" data-i18n="editor.label"></label>'+
             '<span style="margin-right: 2px;"/>'+
             '<input type="checkbox" id="node-input-show-label"/>'+
         '</div>').appendTo(dialogForm);

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

@@ -71,7 +71,7 @@ RED.envVar = (function() {
                 };
                 if (item.name.trim() !== "") {
                     new_env.push(item);
-                    if ((item.type === "cred") && (item.value !== "__PWRD__")) {
+                    if (item.type === "cred") {
                         credentials.map[item.name] = item.value;
                         credentials.map["has_"+item.name] = (item.value !== "");
                         item.value = "__PWRD__";
@@ -153,10 +153,6 @@ RED.envVar = (function() {
     }
 
     function init(done) {
-        if (!RED.user.hasPermission("settings.write")) {
-            RED.notify(RED._("user.errors.settings"),"error");
-            return;
-        }
         RED.userSettings.add({
             id:'envvar',
             title: RED._("env-var.environment"),

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

@@ -1,46 +0,0 @@
-// Mermaid diagram stub library for on-demand dynamic loading
-// Will be overwritten after script loading by $.getScript
-var mermaid = (function () {
-    var enabled /* = undefined */;
-    
-    var initializing = false;
-    var initCalled = false;
-
-    function initialize(opt) {
-        if (enabled === undefined) {
-            if (RED.settings.markdownEditor &&
-                RED.settings.markdownEditor.mermaid) {
-                enabled = RED.settings.markdownEditor.mermaid.enabled;
-            }
-            else {
-                enabled = true;
-            }
-        }
-        if (enabled) {
-            initializing = true;
-            $.getScript("vendor/mermaid/mermaid.min.js",
-                        function (data, stat, jqxhr) {
-                            $(".mermaid").show();
-                            // invoke loaded mermaid API
-                            initializing = false; 
-                            mermaid.initialize(opt);
-                            if (initCalled) {
-                                mermaid.init();
-                                initCalled = false;
-                            }
-                        });
-        }
-    }
-
-    function init() {
-        if (initializing) {
-            $(".mermaid").hide();
-            initCalled = true;
-        }
-    }
-    
-    return {
-        initialize: initialize,
-        init: init,
-    };
-})();

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

@@ -221,12 +221,12 @@ RED.notifications = (function() {
                     if (newType) {
                         n.className = "red-ui-notification red-ui-notification-"+newType;
                     }
-
+                    newTimeout = newOptions.hasOwnProperty('timeout')?newOptions.timeout:timeout
                     if (!fixed || newOptions.fixed === false) {
-                        newTimeout = (newOptions.hasOwnProperty('timeout')?newOptions.timeout:timeout)||5000;
+                        newTimeout = newTimeout || 5000
                     }
                     if (newOptions.buttons) {
-                        var buttonSet = $('<div style="margin-top: 20px;" class="ui-dialog-buttonset"></div>').appendTo(nn)
+                        var buttonSet = $('<div class="ui-dialog-buttonset"></div>').appendTo(nn)
                         newOptions.buttons.forEach(function(buttonDef) {
                             var b = $('<button>').text(buttonDef.text).on("click", buttonDef.click).appendTo(buttonSet);
                             if (buttonDef.id) {
@@ -272,6 +272,15 @@ RED.notifications = (function() {
                 };
             })());
             n.timeoutid = window.setTimeout(n.close,timeout||5000);
+        } else if (timeout) {
+            $(n).on("click.red-ui-notification-close", (function() {
+                var nn = n;
+                return function() {
+                    nn.hideNotification();
+                    window.clearTimeout(nn.timeoutid);
+                };
+            })());
+            n.timeoutid = window.setTimeout(n.hideNotification,timeout||5000);
         }
         currentNotifications.push(n);
         if (options.id) {

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

@@ -133,7 +133,7 @@ RED.palette.editor = (function() {
         }).done(function(data,textStatus,xhr) {
             callback();
         }).fail(function(xhr,textStatus,err) {
-            callback(xhr);
+            callback(xhr,textStatus,err);
         });
     }
     function removeNodeModule(id,callback) {
@@ -248,86 +248,106 @@ RED.palette.editor = (function() {
             var moduleInfo = nodeEntries[module].info;
             var nodeEntry = nodeEntries[module].elements;
             if (nodeEntry) {
-                var activeTypeCount = 0;
-                var typeCount = 0;
-                var errorCount = 0;
-                nodeEntry.errorList.empty();
-                nodeEntries[module].totalUseCount = 0;
-                nodeEntries[module].setUseCount = {};
+                if (moduleInfo.plugin) {
+                    nodeEntry.enableButton.hide();
+                    nodeEntry.removeButton.show();
 
-                for (var setName in moduleInfo.sets) {
-                    if (moduleInfo.sets.hasOwnProperty(setName)) {
-                        var inUseCount = 0;
-                        var set = moduleInfo.sets[setName];
-                        var setElements = nodeEntry.sets[setName];
-                        if (set.err) {
-                            errorCount++;
-                            var errMessage = set.err;
-                            if (set.err.message) {
-                                errMessage = set.err.message;
-                            } else if (set.err.code) {
-                                errMessage = set.err.code;
+                    let pluginCount = 0;
+                    for (let setName in moduleInfo.sets) {
+                        if (moduleInfo.sets.hasOwnProperty(setName)) {
+                            let set = moduleInfo.sets[setName];
+                            if (set.plugins) {
+                                pluginCount += set.plugins.length;
                             }
-                            $("<li>").text(errMessage).appendTo(nodeEntry.errorList);
                         }
-                        if (set.enabled) {
-                            activeTypeCount += set.types.length;
-                        }
-                        typeCount += set.types.length;
-                        for (var i=0;i<moduleInfo.sets[setName].types.length;i++) {
-                            var t = moduleInfo.sets[setName].types[i];
-                            inUseCount += (typesInUse[t]||0);
-                            var swatch = setElements.swatches[t];
+                    }
+                    
+                    nodeEntry.setCount.text(RED._('palette.editor.pluginCount',{count:pluginCount,label:pluginCount}));
+
+                } else {
+                    var activeTypeCount = 0;
+                    var typeCount = 0;
+                    var errorCount = 0;
+                    nodeEntry.errorList.empty();
+                    nodeEntries[module].totalUseCount = 0;
+                    nodeEntries[module].setUseCount = {};
+
+                    for (var setName in moduleInfo.sets) {
+                        if (moduleInfo.sets.hasOwnProperty(setName)) {
+                            var inUseCount = 0;
+                            const set = moduleInfo.sets[setName];
+                            const setElements = nodeEntry.sets[setName]
+
+                            if (set.err) {
+                                errorCount++;
+                                var errMessage = set.err;
+                                if (set.err.message) {
+                                    errMessage = set.err.message;
+                                } else if (set.err.code) {
+                                    errMessage = set.err.code;
+                                }
+                                $("<li>").text(errMessage).appendTo(nodeEntry.errorList);
+                            }
                             if (set.enabled) {
-                                var def = RED.nodes.getType(t);
-                                if (def && def.color) {
-                                    swatch.css({background:RED.utils.getNodeColor(t,def)});
-                                    swatch.css({border: "1px solid "+getContrastingBorder(swatch.css('backgroundColor'))})
+                                activeTypeCount += set.types.length;
+                            }
+                            typeCount += set.types.length;
+                            for (var i=0;i<moduleInfo.sets[setName].types.length;i++) {
+                                var t = moduleInfo.sets[setName].types[i];
+                                inUseCount += (typesInUse[t]||0);
+                                if (setElements && set.enabled) {
+                                    var def = RED.nodes.getType(t);
+                                    if (def && def.color) {
+                                        setElements.swatches[t].css({background:RED.utils.getNodeColor(t,def)});
+                                        setElements.swatches[t].css({border: "1px solid "+getContrastingBorder(setElements.swatches[t].css('backgroundColor'))})
+                                    }
                                 }
                             }
-                        }
-                        nodeEntries[module].setUseCount[setName] = inUseCount;
-                        nodeEntries[module].totalUseCount += inUseCount;
+                            nodeEntries[module].setUseCount[setName] = inUseCount;
+                            nodeEntries[module].totalUseCount += inUseCount;
 
-                        if (inUseCount > 0) {
-                            setElements.enableButton.text(RED._('palette.editor.inuse'));
-                            setElements.enableButton.addClass('disabled');
-                        } else {
-                            setElements.enableButton.removeClass('disabled');
-                            if (set.enabled) {
-                                setElements.enableButton.text(RED._('palette.editor.disable'));
-                            } else {
-                                setElements.enableButton.text(RED._('palette.editor.enable'));
+                            if (setElements) {
+                                if (inUseCount > 0) {
+                                    setElements.enableButton.text(RED._('palette.editor.inuse'));
+                                    setElements.enableButton.addClass('disabled');
+                                } else {
+                                    setElements.enableButton.removeClass('disabled');
+                                    if (set.enabled) {
+                                        setElements.enableButton.text(RED._('palette.editor.disable'));
+                                    } else {
+                                        setElements.enableButton.text(RED._('palette.editor.enable'));
+                                    }
+                                }
+                                setElements.setRow.toggleClass("red-ui-palette-module-set-disabled",!set.enabled);
                             }
                         }
-                        setElements.setRow.toggleClass("red-ui-palette-module-set-disabled",!set.enabled);
                     }
-                }
 
-                if (errorCount === 0) {
-                    nodeEntry.errorRow.hide()
-                } else {
-                    nodeEntry.errorRow.show();
-                }
-
-                var nodeCount = (activeTypeCount === typeCount)?typeCount:activeTypeCount+" / "+typeCount;
-                nodeEntry.setCount.text(RED._('palette.editor.nodeCount',{count:typeCount,label:nodeCount}));
-
-                if (nodeEntries[module].totalUseCount > 0) {
-                    nodeEntry.enableButton.text(RED._('palette.editor.inuse'));
-                    nodeEntry.enableButton.addClass('disabled');
-                    nodeEntry.removeButton.hide();
-                } else {
-                    nodeEntry.enableButton.removeClass('disabled');
-                    if (moduleInfo.local) {
-                        nodeEntry.removeButton.css('display', 'inline-block');
-                    }
-                    if (activeTypeCount === 0) {
-                        nodeEntry.enableButton.text(RED._('palette.editor.enableall'));
+                    if (errorCount === 0) {
+                        nodeEntry.errorRow.hide()
                     } else {
-                        nodeEntry.enableButton.text(RED._('palette.editor.disableall'));
+                        nodeEntry.errorRow.show();
+                    }
+
+                    var nodeCount = (activeTypeCount === typeCount)?typeCount:activeTypeCount+" / "+typeCount;
+                    nodeEntry.setCount.text(RED._('palette.editor.nodeCount',{count:typeCount,label:nodeCount}));
+
+                    if (nodeEntries[module].totalUseCount > 0) {
+                        nodeEntry.enableButton.text(RED._('palette.editor.inuse'));
+                        nodeEntry.enableButton.addClass('disabled');
+                        nodeEntry.removeButton.hide();
+                    } else {
+                        nodeEntry.enableButton.removeClass('disabled');
+                        if (moduleInfo.local) {
+                            nodeEntry.removeButton.css('display', 'inline-block');
+                        }
+                        if (activeTypeCount === 0) {
+                            nodeEntry.enableButton.text(RED._('palette.editor.enableall'));
+                        } else {
+                            nodeEntry.enableButton.text(RED._('palette.editor.disableall'));
+                        }
+                        nodeEntry.container.toggleClass("disabled",(activeTypeCount === 0));
                     }
-                    nodeEntry.container.toggleClass("disabled",(activeTypeCount === 0));
                 }
             }
             if (moduleInfo.pending_version) {
@@ -678,6 +698,33 @@ RED.palette.editor = (function() {
                 }
             }
         })
+
+        RED.events.on("registry:plugin-module-added", function(module) {
+
+            if (!nodeEntries.hasOwnProperty(module)) {
+                nodeEntries[module] = {info:RED.plugins.getModule(module)};
+                var index = [module];
+                for (var s in nodeEntries[module].info.sets) {
+                    if (nodeEntries[module].info.sets.hasOwnProperty(s)) {
+                        index.push(s);
+                        index = index.concat(nodeEntries[module].info.sets[s].types)
+                    }
+                }
+                nodeEntries[module].index = index.join(",").toLowerCase();
+                nodeList.editableList('addItem', nodeEntries[module]);
+            } else {
+                _refreshNodeModule(module);
+            }
+
+            for (var i=0;i<filteredList.length;i++) {
+                if (filteredList[i].info.id === module) {
+                    var installButton = filteredList[i].elements.installButton;
+                    installButton.addClass('disabled');
+                    installButton.text(RED._('palette.editor.installed'));
+                    break;
+                }
+            }
+        });
     }
 
     var settingsPane;
@@ -804,6 +851,7 @@ RED.palette.editor = (function() {
                         errorRow: errorRow,
                         errorList: errorList,
                         setCount: setCount,
+                        setButton: setButton,
                         container: container,
                         shade: shade,
                         versionSpan: versionSpan,
@@ -814,49 +862,88 @@ RED.palette.editor = (function() {
                         if (container.hasClass('expanded')) {
                             container.removeClass('expanded');
                             contentRow.slideUp();
+                            setTimeout(() => {
+                                contentRow.empty()
+                            }, 200)
+                            object.elements.sets = {}
                         } else {
                             container.addClass('expanded');
+                            populateSetList()
                             contentRow.slideDown();
                         }
                     })
-
-                    var setList = Object.keys(entry.sets)
-                    setList.sort(function(A,B) {
-                        return A.toLowerCase().localeCompare(B.toLowerCase());
-                    });
-                    setList.forEach(function(setName) {
-                        var set = entry.sets[setName];
-                        var setRow = $('<div>',{class:"red-ui-palette-module-set"}).appendTo(contentRow);
-                        var buttonGroup = $('<div>',{class:"red-ui-palette-module-set-button-group"}).appendTo(setRow);
-                        var typeSwatches = {};
-                        set.types.forEach(function(t) {
-                            var typeDiv = $('<div>',{class:"red-ui-palette-module-type"}).appendTo(setRow);
-                            typeSwatches[t] = $('<span>',{class:"red-ui-palette-module-type-swatch"}).appendTo(typeDiv);
-                            $('<span>',{class:"red-ui-palette-module-type-node"}).text(t).appendTo(typeDiv);
-                        })
-                        var enableButton = $('<a href="#" class="red-ui-button red-ui-button-small"></a>').appendTo(buttonGroup);
-                        enableButton.on("click", function(evt) {
-                            evt.preventDefault();
-                            if (object.setUseCount[setName] === 0) {
-                                var currentSet = RED.nodes.registry.getNodeSet(set.id);
-                                shade.show();
-                                var newState = !currentSet.enabled
-                                changeNodeState(set.id,newState,shade,function(xhr){
-                                    if (xhr) {
-                                        if (xhr.responseJSON) {
-                                            RED.notify(RED._('palette.editor.errors.'+(newState?'enable':'disable')+'Failed',{module: id,message:xhr.responseJSON.message}));
+                    const populateSetList = function () {
+                        var setList = Object.keys(entry.sets)
+                        setList.sort(function(A,B) {
+                            return A.toLowerCase().localeCompare(B.toLowerCase());
+                        });
+                        setList.forEach(function(setName) {
+                            var set = entry.sets[setName];
+                            var setRow = $('<div>',{class:"red-ui-palette-module-set"}).appendTo(contentRow);
+                            var buttonGroup = $('<div>',{class:"red-ui-palette-module-set-button-group"}).appendTo(setRow);
+                            var typeSwatches = {};
+                            let enableButton;
+                            if (set.types) {
+                                set.types.forEach(function(t) {
+                                    var typeDiv = $('<div>',{class:"red-ui-palette-module-type"}).appendTo(setRow);
+                                    typeSwatches[t] = $('<span>',{class:"red-ui-palette-module-type-swatch"}).appendTo(typeDiv);
+                                    if (set.enabled) {
+                                        var def = RED.nodes.getType(t);
+                                        if (def && def.color) {
+                                            typeSwatches[t].css({background:RED.utils.getNodeColor(t,def)});
+                                            typeSwatches[t].css({border: "1px solid "+getContrastingBorder(typeSwatches[t].css('backgroundColor'))})
                                         }
                                     }
-                                });
-                            }
-                        })
+                                    $('<span>',{class:"red-ui-palette-module-type-node"}).text(t).appendTo(typeDiv);
+                                })
+                                enableButton = $('<a href="#" class="red-ui-button red-ui-button-small"></a>').appendTo(buttonGroup);
+                                enableButton.on("click", function(evt) {
+                                    evt.preventDefault();
+                                    if (object.setUseCount[setName] === 0) {
+                                        var currentSet = RED.nodes.registry.getNodeSet(set.id);
+                                        shade.show();
+                                        var newState = !currentSet.enabled
+                                        changeNodeState(set.id,newState,shade,function(xhr){
+                                            if (xhr) {
+                                                if (xhr.responseJSON) {
+                                                    RED.notify(RED._('palette.editor.errors.'+(newState?'enable':'disable')+'Failed',{module: id,message:xhr.responseJSON.message}));
+                                                }
+                                            }
+                                        });
+                                    }
+                                })
 
-                        object.elements.sets[set.name] = {
-                            setRow: setRow,
-                            enableButton: enableButton,
-                            swatches: typeSwatches
-                        };
-                    });
+                                if (object.setUseCount[setName] > 0) {
+                                    enableButton.text(RED._('palette.editor.inuse'));
+                                    enableButton.addClass('disabled');
+                                } else {
+                                    enableButton.removeClass('disabled');
+                                    if (set.enabled) {
+                                        enableButton.text(RED._('palette.editor.disable'));
+                                    } else {
+                                        enableButton.text(RED._('palette.editor.enable'));
+                                    }
+                                }
+                                setRow.toggleClass("red-ui-palette-module-set-disabled",!set.enabled);
+
+
+                            }
+                            if (set.plugins) {
+                                set.plugins.forEach(function(p) {
+                                    var typeDiv = $('<div>',{class:"red-ui-palette-module-type"}).appendTo(setRow);
+                                    // typeSwatches[p.id] = $('<span>',{class:"red-ui-palette-module-type-swatch"}).appendTo(typeDiv);
+                                    $('<span><i class="fa fa-puzzle-piece" aria-hidden="true"></i>  </span>',{class:"red-ui-palette-module-type-swatch"}).appendTo(typeDiv);
+                                    $('<span>',{class:"red-ui-palette-module-type-node"}).text(p.id).appendTo(typeDiv);
+                                })
+                            }
+
+                            object.elements.sets[set.name] = {
+                                setRow: setRow,
+                                enableButton: enableButton,
+                                swatches: typeSwatches
+                            };
+                        });
+                    }
                     enableButton.on("click", function(evt) {
                         evt.preventDefault();
                         if (object.totalUseCount === 0) {
@@ -1226,7 +1313,55 @@ RED.palette.editor = (function() {
                                                 }
                                             }
                                         ]
-                                    });                                }
+                                    });                                
+                                }
+                            } else {
+                                // dedicated list management for plugins
+                                if (entry.plugin) {
+
+                                    let e = nodeEntries[entry.name];
+                                    if (e) {
+                                        nodeList.editableList('removeItem', e);
+                                        delete nodeEntries[entry.name];
+                                    }
+
+                                    // We assume that a plugin that implements onremove
+                                    // cleans the editor accordingly of its left-overs.
+                                    let found_onremove = true;
+
+                                    let keys = Object.keys(entry.sets);
+                                    keys.forEach((key) => {
+                                        let set = entry.sets[key];
+                                        for (let i=0; i<set.plugins?.length; i++) {
+                                            let plgn = RED.plugins.getPlugin(set.plugins[i].id);
+                                            if (plgn && plgn.onremove  && typeof plgn.onremove === 'function') {
+                                                plgn.onremove();
+                                            } else {
+                                                if (plgn && plgn.onadd && typeof plgn.onadd === 'function') {
+                                                    // if there's no 'onadd', there shouldn't be any left-overs
+                                                    found_onremove = false;
+                                                }
+                                            }
+                                        }
+                                    });
+
+                                    if (!found_onremove) {
+                                        let removeNotify = RED.notify(RED._("palette.editor.confirm.removePlugin.body",{module:entry.name}),{
+                                            modal: true,
+                                            fixed: true,
+                                            type: 'warning',
+                                            buttons: [
+                                                {
+                                                    text: RED._("palette.editor.confirm.button.understood"),
+                                                    class:"primary",
+                                                    click: function(e) {
+                                                        removeNotify.close();
+                                                    }
+                                                }
+                                            ]
+                                        });
+                                    }
+                                }        
                             }
                         })
                         notification.close();
@@ -1270,9 +1405,28 @@ RED.palette.editor = (function() {
                     RED.actions.invoke("core:show-event-log");
                 });
                 RED.eventLog.startEvent(RED._("palette.editor.confirm.button.install")+" : "+entry.id+" "+entry.version);
-                installNodeModule(entry.id,entry.version,entry.pkg_url,function(xhr) {
+                installNodeModule(entry.id,entry.version,entry.pkg_url,function(xhr, textStatus,err) {
                     spinner.remove();
-                     if (xhr) {
+                     if (err && xhr.status === 504) {
+                        var notification = RED.notify(RED._("palette.editor.errors.installTimeout"), {
+                            modal: true,
+                            fixed: true,
+                            buttons: [
+                                {
+                                    text: RED._("common.label.close"),
+                                    click: function() {
+                                        notification.close();
+                                    }
+                                },{
+                                    text: RED._("eventLog.view"),
+                                    click: function() {
+                                        notification.close();
+                                        RED.actions.invoke("core:show-event-log");
+                                    }
+                                }
+                            ]
+                        })
+                     } else if (xhr) {
                          if (xhr.responseJSON) {
                              var notification = RED.notify(RED._('palette.editor.errors.installFailed',{module: entry.id,message:xhr.responseJSON.message}),{
                                  type: 'error',

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

@@ -35,6 +35,10 @@ RED.palette = (function() {
     var categoryContainers = {};
     var sidebarControls;
 
+    let paletteState = { filter: "", collapsed: [] };
+
+    let filterRefreshTimeout
+
     function createCategory(originalCategory,rootCategory,category,ns) {
         if ($("#red-ui-palette-base-category-"+rootCategory).length === 0) {
             createCategoryContainer(originalCategory,rootCategory, ns+":palette.label."+rootCategory);
@@ -60,20 +64,57 @@ RED.palette = (function() {
         catDiv.data('label',label);
         categoryContainers[category] = {
             container: catDiv,
-            close: function() {
+            hide: function (instant) {
+                if (instant) {
+                    catDiv.hide()
+                } else {
+                    catDiv.slideUp()
+                }
+            },
+            show: function () {
+                catDiv.show()
+            },
+            isOpen: function () {
+                return !!catDiv.hasClass("red-ui-palette-open")
+            },
+            getNodeCount: function (visibleOnly) {
+                const nodes = catDiv.find(".red-ui-palette-node")
+                if (visibleOnly) {
+                    return nodes.filter(function() { return $(this).css('display') !== 'none'}).length
+                } else {
+                    return nodes.length
+                }
+            },
+            close: function(instant, skipSaveState) {
                 catDiv.removeClass("red-ui-palette-open");
                 catDiv.addClass("red-ui-palette-closed");
-                $("#red-ui-palette-base-category-"+category).slideUp();
+                if (instant) {
+                    $("#red-ui-palette-base-category-"+category).hide();
+                } else {
+                    $("#red-ui-palette-base-category-"+category).slideUp();
+                }
                 $("#red-ui-palette-header-"+category+" i").removeClass("expanded");
+                if (!skipSaveState) {
+                    if (!paletteState.collapsed.includes(category)) {
+                        paletteState.collapsed.push(category);
+                        savePaletteState();
+                    }
+                }
             },
-            open: function() {
+            open: function(skipSaveState) {
                 catDiv.addClass("red-ui-palette-open");
                 catDiv.removeClass("red-ui-palette-closed");
                 $("#red-ui-palette-base-category-"+category).slideDown();
                 $("#red-ui-palette-header-"+category+" i").addClass("expanded");
+                if (!skipSaveState) {
+                    if (paletteState.collapsed.includes(category)) {
+                        paletteState.collapsed.splice(paletteState.collapsed.indexOf(category), 1);
+                        savePaletteState();
+                    }
+                }
             },
             toggle: function() {
-                if (catDiv.hasClass("red-ui-palette-open")) {
+                if (categoryContainers[category].isOpen()) {
                     categoryContainers[category].close();
                 } else {
                     categoryContainers[category].open();
@@ -415,8 +456,16 @@ RED.palette = (function() {
 
             var categoryNode = $("#red-ui-palette-container-"+rootCategory);
             if (categoryNode.find(".red-ui-palette-node").length === 1) {
-                categoryContainers[rootCategory].open();
+                if (!paletteState?.collapsed?.includes(rootCategory)) {
+                    categoryContainers[rootCategory].open();
+                } else {
+                    categoryContainers[rootCategory].close(true);
+                }
             }
+            clearTimeout(filterRefreshTimeout)
+            filterRefreshTimeout = setTimeout(() => {
+                refreshFilter()
+            }, 200)
 
         }
     }
@@ -484,7 +533,7 @@ RED.palette = (function() {
         var currentLabel = paletteNode.attr("data-palette-label");
         var currentInfo = paletteNode.attr("data-palette-info");
 
-        if (currentLabel !== sf.name || currentInfo !== sf.info) {
+        if (currentLabel !== sf.name || currentInfo !== sf.info || sf.in.length > 0 || sf.out.length > 0) {
             paletteNode.attr("data-palette-info",sf.info);
             setLabel(sf.type+":"+sf.id,paletteNode,sf.name,RED.utils.renderMarkdown(sf.info||""));
         }
@@ -516,7 +565,8 @@ RED.palette = (function() {
         paletteNode.css("backgroundColor", sf.color);
     }
 
-    function filterChange(val) {
+    function refreshFilter() {
+        const val = $("#red-ui-palette-search input").val()
         var re = new RegExp(val.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'),'i');
         $("#red-ui-palette-container .red-ui-palette-node").each(function(i,el) {
             var currentLabel = $(el).attr("data-palette-label");
@@ -528,16 +578,26 @@ RED.palette = (function() {
             }
         });
 
-        for (var category in categoryContainers) {
+        for (let category in categoryContainers) {
             if (categoryContainers.hasOwnProperty(category)) {
-                if (categoryContainers[category].container
-                        .find(".red-ui-palette-node")
-                        .filter(function() { return $(this).css('display') !== 'none'}).length === 0) {
-                    categoryContainers[category].close();
-                    categoryContainers[category].container.slideUp();
+                const categorySection = categoryContainers[category]
+                if (categorySection.getNodeCount(true) === 0) {
+                    categorySection.hide()
                 } else {
-                    categoryContainers[category].open();
-                    categoryContainers[category].container.show();
+                    categorySection.show()
+                    if (val) {
+                        // There is a filter being applied and it has matched
+                        // something in this category - show the contents
+                        categorySection.open(true)
+                    } else {
+                        // No filter. Only show the category if it isn't in lastState
+                        if (!paletteState.collapsed.includes(category)) {
+                            categorySection.open(true)
+                        } else if (categorySection.isOpen()) {
+                            // This section should be collapsed but isn't - so make it so
+                            categorySection.close(true, true)
+                        }
+                    }
                 }
             }
         }
@@ -553,6 +613,9 @@ RED.palette = (function() {
 
         $("#red-ui-palette > .red-ui-palette-spinner").show();
 
+        RED.events.on('logout', function () {
+            RED.settings.removeLocal('palette-state')
+        })
 
         RED.events.on('registry:node-type-added', function(nodeType) {
             var def = RED.nodes.getType(nodeType);
@@ -596,14 +659,14 @@ RED.palette = (function() {
 
         RED.events.on("subflows:change",refreshSubflow);
 
-
-
         $("#red-ui-palette-search input").searchBox({
             delay: 100,
             change: function() {
-                filterChange($(this).val());
+                refreshFilter();
+                paletteState.filter = $(this).val();
+                savePaletteState();
             }
-        })
+        });
 
         sidebarControls = $('<div class="red-ui-sidebar-control-left"><i class="fa fa-chevron-left"></i></div>').appendTo($("#red-ui-palette"));
         RED.popover.tooltip(sidebarControls,RED._("keyboard.togglePalette"),"core:toggle-palette");
@@ -669,7 +732,23 @@ RED.palette = (function() {
                 togglePalette(state);
             }
         });
+
+        try {
+            paletteState = JSON.parse(RED.settings.getLocal("palette-state") || '{"filter":"", "collapsed": []}');
+            if (paletteState.filter) {
+                // Apply the category filter
+                $("#red-ui-palette-search input").searchBox("value", paletteState.filter);
+            }
+        } catch (error) {
+            console.error("Unexpected error loading palette state from localStorage: ", error);
+        }
+        setTimeout(() => {
+            // Lazily tidy up any categories that haven't been reloaded
+            paletteState.collapsed = paletteState.collapsed.filter(category => !!categoryContainers[category])
+            savePaletteState()
+        }, 10000)
     }
+
     function togglePalette(state) {
         if (!state) {
             $("#red-ui-main-container").addClass("red-ui-palette-closed");
@@ -689,6 +768,15 @@ RED.palette = (function() {
         })
         return categories;
     }
+
+    function savePaletteState() {
+        try {
+            RED.settings.setLocal("palette-state", JSON.stringify(paletteState));
+        } catch (error) {
+            console.error("Unexpected error saving palette state to localStorage: ", error);
+        }
+    }
+
     return {
         init: init,
         add:addNodeType,

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

@@ -166,7 +166,7 @@ RED.projects.settings = (function() {
         var description = addTargetToExternalLinks($('<span class="red-ui-text-bidi-aware" dir=\"'+RED.text.bidi.resolveBaseTextDir(desc)+'">'+desc+'</span>')).appendTo(container);
         description.find(".red-ui-text-bidi-aware").contents().filter(function() { return this.nodeType === 3 && this.textContent.trim() !== "" }).wrap( "<span></span>" );
         setTimeout(function () {
-            mermaid.init();
+            RED.editor.mermaid.render()
         }, 200);
     }
 
@@ -287,7 +287,7 @@ RED.projects.settings = (function() {
         var notInstalledCount = 0;
 
         for (var m in modulesInUse) {
-            if (modulesInUse.hasOwnProperty(m)) {
+            if (modulesInUse.hasOwnProperty(m) && !activeProject.dependencies.hasOwnProperty(m)) {
                 depsList.editableList('addItem',{
                     id: modulesInUse[m].module,
                     version: modulesInUse[m].version,
@@ -307,8 +307,8 @@ RED.projects.settings = (function() {
 
         if (activeProject.dependencies) {
             for (var m in activeProject.dependencies) {
-                if (activeProject.dependencies.hasOwnProperty(m) && !modulesInUse.hasOwnProperty(m)) {
-                    var installed = !!RED.nodes.registry.getModule(m);
+                if (activeProject.dependencies.hasOwnProperty(m)) {
+                    var installed = !!RED.nodes.registry.getModule(m) && activeProject.dependencies[m] === modulesInUse[m].version;
                     depsList.editableList('addItem',{
                         id: m,
                         version: activeProject.dependencies[m], //RED.nodes.registry.getModule(module).version,

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

@@ -647,9 +647,9 @@ RED.sidebar.versionControl = (function() {
                             $.getJSON("projects/"+activeProject.name+"/commits/"+entry.sha,function(result) {
                                 result.project = activeProject;
                                 result.parents = entry.parents;
-                                result.oldRev = entry.sha+"~1";
+                                result.oldRev = entry.parents[0].length !== 0 ? entry.sha+"~1" : entry.sha;
                                 result.newRev = entry.sha;
-                                result.oldRevTitle = RED._("sidebar.project.versionControl.commitCapital")+" "+entry.sha.substring(0,7)+"~1";
+                                result.oldRevTitle = entry.parents[0].length !== 0 ? RED._("sidebar.project.versionControl.commitCapital")+" "+entry.sha.substring(0,7)+"~1" : " ";
                                 result.newRevTitle = RED._("sidebar.project.versionControl.commitCapital")+" "+entry.sha.substring(0,7);
                                 result.date = humanizeSinceDate(parseInt(entry.date));
                                 RED.diff.showCommitDiff(result);

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

@@ -909,17 +909,19 @@ RED.subflow = (function() {
 
 
     /**
-     * Create interface for controlling env var UI definition
+     * Build the edit dialog for a subflow template (creating/modifying a subflow template)
+     * @param {Object} uiContainer - the jQuery container for the environment variable list
+     * @param {Object} node - the subflow template node
      */
-    function buildEnvControl(envList,node) {
+    function buildEnvControl(uiContainer,node) {
         var tabs = RED.tabs.create({
             id: "subflow-env-tabs",
             onchange: function(tab) {
                 if (tab.id === "subflow-env-tab-preview") {
                     var inputContainer = $("#subflow-input-ui");
-                    var list = envList.editableList("items");
+                    var list = uiContainer.editableList("items");
                     var exportedEnv = exportEnvList(list, true);
-                    buildEnvUI(inputContainer, exportedEnv,node);
+                    buildEnvUI(inputContainer, exportedEnv, node);
                 }
                 $("#subflow-env-tabs-content").children().hide();
                 $("#" + tab.id).show();
@@ -957,12 +959,33 @@ RED.subflow = (function() {
         RED.editor.envVarList.setLocale(locale);
     }
 
-
-    function buildEnvUIRow(row, tenv, ui, node) {
+    /**
+     * Build a UI row for a subflow instance environment variable
+     * Also used to build the UI row for subflow template preview
+     * @param {JQuery} row - A form row element
+     * @param {Object} tenv - A template environment variable
+     * @param {String} tenv.name - The name of the environment variable
+     * @param {String} tenv.type - The type of the environment variable
+     * @param {String} tenv.value - The value set for this environment variable
+     * @param {Object} tenv.parent - The parent environment variable
+     * @param {String} tenv.parent.value - The value set for the parent environment variable
+     * @param {String} tenv.parent.type - The type of the parent environment variable
+     * @param {Object} tenv.ui - The UI configuration for the environment variable
+     * @param {String} tenv.ui.icon - The icon for the environment variable
+     * @param {Object} tenv.ui.label - The label for the environment variable
+     * @param {String} tenv.ui.type - The type of the UI control for the environment variable
+     * @param {Object} node - The subflow instance node
+     */
+    function buildEnvUIRow(row, tenv, node) {
+        if(RED.subflow.debug) { console.log("buildEnvUIRow", tenv) }
+        const ui = tenv.ui || {}
         ui.label = ui.label||{};
         if ((tenv.type === "cred" || (tenv.parent && tenv.parent.type === "cred")) && !ui.type) {
             ui.type = "cred";
             ui.opts = {};
+        } else if (tenv.type === "conf-types") {
+            ui.type = "conf-types"
+            ui.opts = { types: ['conf-types'] }
         } else if (!ui.type) {
             ui.type = "input";
             ui.opts = { types: RED.editor.envVarList.DEFAULT_ENV_TYPE_LIST }
@@ -1006,9 +1029,10 @@ RED.subflow = (function() {
         if (tenv.hasOwnProperty('type')) {
             val.type = tenv.type;
         }
+        const elId = getSubflowEnvPropertyName(tenv.name)
         switch(ui.type) {
             case "input":
-                input = $('<input type="text">').css('width','70%').appendTo(row);
+                input = $('<input type="text">').css('width','70%').attr('id', elId).appendTo(row);
                 if (ui.opts.types && ui.opts.types.length > 0) {
                     var inputType = val.type;
                     if (ui.opts.types.indexOf(inputType) === -1) {
@@ -1035,7 +1059,7 @@ RED.subflow = (function() {
                 }
                 break;
             case "select":
-                input = $('<select>').css('width','70%').appendTo(row);
+                input = $('<select>').css('width','70%').attr('id', elId).appendTo(row);
                 if (ui.opts.opts) {
                     ui.opts.opts.forEach(function(o) {
                         $('<option>').val(o.v).text(RED.editor.envVarList.lookupLabel(o.l, o.l['en-US']||o.v, locale)).appendTo(input);
@@ -1046,7 +1070,7 @@ RED.subflow = (function() {
             case "checkbox":
                 label.css("cursor","default");
                 var cblabel = $('<label>').css('width','70%').appendTo(row);
-                input = $('<input type="checkbox">').css({
+                input = $('<input type="checkbox">').attr('id', elId).css({
                     marginTop: 0,
                     width: 'auto',
                     height: '34px'
@@ -1064,7 +1088,7 @@ RED.subflow = (function() {
                 input.prop("checked",boolVal);
                 break;
             case "spinner":
-                input = $('<input>').css('width','70%').appendTo(row);
+                input = $('<input>').css('width','70%').attr('id', elId).appendTo(row);
                 var spinnerOpts = {};
                 if (ui.opts.hasOwnProperty('min')) {
                     spinnerOpts.min = ui.opts.min;
@@ -1093,18 +1117,25 @@ RED.subflow = (function() {
                     default: 'cred'
                 })
                 break;
-        }
-        if (input) {
-            input.attr('id',getSubflowEnvPropertyName(tenv.name))
+            case "conf-types":
+                // let clsId = 'config-node-input-' + val.type + '-' + val.value + '-' + Math.floor(Math.random() * 100000);
+                // clsId = clsId.replace(/\W/g, '-');
+                // input = $('<input>').css('width','70%').addClass(clsId).attr('id', elId).appendTo(row);
+                input = $('<input>').css('width','70%').attr('id', elId).appendTo(row);
+                const _type = tenv.parent?.type || tenv.type;
+                RED.editor.prepareConfigNodeSelect(node, tenv.name, _type, 'node-input-subflow-env', null, tenv);
+                break;
         }
     }
 
     /**
-     * Create environment variable input UI
+     * Build the edit form for a subflow instance
+     * Also used to build the preview form in the subflow template edit dialog
      * @param uiContainer - container for UI
      * @param envList - env var definitions of template
      */
     function buildEnvUI(uiContainer, envList, node) {
+        if(RED.subflow.debug) { console.log("buildEnvUI",envList) }
         uiContainer.empty();
         for (var i = 0; i < envList.length; i++) {
             var tenv = envList[i];
@@ -1112,7 +1143,7 @@ RED.subflow = (function() {
                 continue;
             }
             var row = $("<div/>", { class: "form-row" }).appendTo(uiContainer);
-            buildEnvUIRow(row,tenv, tenv.ui || {}, node);
+            buildEnvUIRow(row, tenv, node);
         }
     }
     // buildEnvUI
@@ -1185,6 +1216,9 @@ RED.subflow = (function() {
                                         delete ui.opts
                                     }
                                     break;
+                                case "conf-types":
+                                    delete ui.opts;
+                                    break;
                                 default:
                                     delete ui.opts;
                             }
@@ -1207,8 +1241,9 @@ RED.subflow = (function() {
         if (/^subflow:/.test(node.type)) {
             var subflowDef = RED.nodes.subflow(node.type.substring(8));
             if (subflowDef.env) {
-                subflowDef.env.forEach(function(env) {
+                subflowDef.env.forEach(function(env, i) {
                     var item = {
+                        index: i,
                         name:env.name,
                         parent: {
                             type: env.type,
@@ -1245,14 +1280,20 @@ RED.subflow = (function() {
                     var nodePropValue = nodeProp;
                     if (prop.ui && prop.ui.type === "cred") {
                         nodePropType = "cred";
+                    } else if (prop.ui && prop.ui.type === "conf-types") {
+                        nodePropType = prop.value.type
                     } else {
                         switch(typeof nodeProp) {
                             case "string": nodePropType = "str"; break;
                             case "number": nodePropType = "num"; break;
                             case "boolean": nodePropType = "bool"; nodePropValue = nodeProp?"true":"false"; break;
                             default:
-                            nodePropType = nodeProp.type;
-                            nodePropValue = nodeProp.value;
+                                if (nodeProp) {
+                                    nodePropType = nodeProp.type;
+                                    nodePropValue = nodeProp.value;
+                                } else {
+                                    nodePropType = 'str'
+                                }
                         }
                     }
                     var item = {
@@ -1273,6 +1314,7 @@ RED.subflow = (function() {
     }
 
     function exportSubflowInstanceEnv(node) {
+        if(RED.subflow.debug) { console.log("exportSubflowInstanceEnv",node) }
         var env = [];
         // First, get the values for the SubflowTemplate defined properties
         //  - these are the ones with custom UI elements
@@ -1319,6 +1361,9 @@ RED.subflow = (function() {
                         item.type = 'bool';
                         item.value = ""+input.prop("checked");
                         break;
+                    case "conf-types":
+                        item.value = input.val()
+                        item.type = "conf-type"
                 }
                 if (ui.type === "cred" || item.type !== data.parent.type || item.value !== data.parent.value) {
                     env.push(item);
@@ -1332,8 +1377,15 @@ RED.subflow = (function() {
         return 'node-input-subflow-env-'+name.replace(/[^a-z0-9-_]/ig,"_");
     }
 
-    // Called by subflow.oneditprepare for both instances and templates
+    
+    /**
+     * Build the subflow edit form
+     * Called by subflow.oneditprepare for both instances and templates
+     * @param {"subflow"|"subflow-template"} type - the type of subflow being edited
+     * @param {Object} node - the node being edited
+     */
     function buildEditForm(type,node) {
+        if(RED.subflow.debug) { console.log("buildEditForm",type,node) }
         if (type === "subflow-template") {
             // This is the tabbed UI that offers the env list - with UI options
             // plus the preview tab

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

@@ -158,6 +158,7 @@ RED.sidebar.config = (function() {
                 entry.data('node',node.id);
                 nodeDiv.data('node',node.id);
                 var label = $('<div class="red-ui-palette-label"></div>').text(labelText).appendTo(nodeDiv);
+
                 if (node.d) {
                     nodeDiv.addClass("red-ui-palette-node-config-disabled");
                     $('<i class="fa fa-ban"></i>').prependTo(label);
@@ -179,6 +180,20 @@ RED.sidebar.config = (function() {
                         nodeDiv.addClass("red-ui-palette-node-config-unused");
                     }
                 }
+
+                if (!node.valid) {
+                    nodeDiv.addClass("red-ui-palette-node-config-invalid")
+                    const nodeDivAnnotations = $('<svg class="red-ui-palette-node-annotations red-ui-flow-node-error" width="10" height="10"></svg>').appendTo(nodeDiv)
+                    const errorBadge = document.createElementNS("http://www.w3.org/2000/svg","path");
+                    errorBadge.setAttribute("d","M 0,9 l 10,0 -5,-8 z");
+                    nodeDivAnnotations.append($(errorBadge))
+                    RED.popover.tooltip(nodeDivAnnotations, function () {
+                        if (node.validationErrors && node.validationErrors.length > 0) {
+                            return RED._("editor.errors.invalidProperties")+"<br>  - "+node.validationErrors.join("<br>  - ")
+                        }
+                    })
+                }
+
                 nodeDiv.on('click',function(e) {
                     e.stopPropagation();
                     RED.view.select(false);

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

@@ -232,7 +232,7 @@ RED.sidebar.context = (function() {
                                     typeHint: data.format,
                                     sourceId: id+"."+k,
                                     tools: tools,
-                                    path: ""
+                                    path: k
                                 }).appendTo(propRow.children()[1]);
                             }
                         })
@@ -278,7 +278,7 @@ RED.sidebar.context = (function() {
                                                     typeHint: data.format,
                                                     sourceId: id+"."+k,
                                                     tools: tools,
-                                                    path: ""
+                                                    path: k
                                                 }).appendTo(propRow.children()[1]);
                                             }
                                         });
@@ -299,7 +299,7 @@ RED.sidebar.context = (function() {
                         typeHint: v.format,
                         sourceId: id+"."+k,
                         tools: tools,
-                        path: ""
+                        path: k
                     }).appendTo(propRow.children()[1]);
                     if (contextStores.length > 1) {
                         $("<span>",{class:"red-ui-sidebar-context-property-storename"}).text(v.store).appendTo($(propRow.children()[0]))

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

@@ -158,8 +158,10 @@ RED.sidebar.help = (function() {
 
     function refreshSubflow(sf) {
         var item = treeList.treeList('get',"node-type:subflow:"+sf.id);
-        item.subflowLabel = sf._def.label().toLowerCase();
-        item.treeList.replaceElement(getNodeLabel({_def:sf._def,type:sf._def.label()}));
+        if (item) {
+            item.subflowLabel = sf._def.label().toLowerCase();
+            item.treeList.replaceElement(getNodeLabel({_def:sf._def,type:sf._def.label()}));
+        }
     }
 
     function hideTOC() {
@@ -383,6 +385,7 @@ RED.sidebar.help = (function() {
                 $(this).toggleClass('expanded',!isExpanded);
             })
         helpSection.parent().scrollTop(0);
+        RED.editor.mermaid.render()
     }
 
     function set(html,title) {

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

@@ -464,7 +464,7 @@ RED.sidebar.info = (function() {
                 }
                 $(this).toggleClass('expanded',!isExpanded);
             });
-        mermaid.init();
+        RED.editor.mermaid.render()
     }
 
     var tips = (function() {

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

@@ -435,10 +435,15 @@ RED.tourGuide = (function() {
 
     function listTour() {
         return [
+            {
+                id: "4_0",
+                label: "4.0",
+                path: "./tours/welcome.js"
+            },
             {
                 id: "3_1",
                 label: "3.1",
-                path: "./tours/welcome.js"
+                path: "./tours/3.1/welcome.js"
             },
             {
                 id: "3_0",

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

@@ -264,6 +264,7 @@
                 setTimeout(function() {
                     oldTray.tray.detach();
                     showTray(options);
+                    RED.events.emit('editor:change')
                 },250)
             } else {
                 if (stack.length > 0) {
@@ -333,6 +334,7 @@
                         RED.view.focus();
                     } else {
                         stack[stack.length-1].tray.css("z-index", "auto");
+                        RED.events.emit('editor:change')
                     }
                 },250)
             }

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

@@ -186,8 +186,15 @@ RED.typeSearch = (function() {
                 var iconContainer = $('<div/>',{class:"red-ui-palette-icon-container"}).appendTo(nodeDiv);
                 RED.utils.createIconElement(icon_url, iconContainer, false);
 
-
-                if (!/^_action_:/.test(object.type) && object.type !== "junction") {
+                if (/^subflow:/.test(object.type)) {
+                    var sf = RED.nodes.subflow(object.type.substring(8));
+                    if (sf.in.length > 0) {
+                        $('<div/>',{class:"red-ui-search-result-node-port"}).appendTo(nodeDiv);
+                    }
+                    if (sf.out.length > 0) {
+                        $('<div/>',{class:"red-ui-search-result-node-port red-ui-search-result-node-output"}).appendTo(nodeDiv);
+                    }
+                } else if (!/^_action_:/.test(object.type) && object.type !== "junction") {
                     if (def.inputs > 0) {
                         $('<div/>',{class:"red-ui-search-result-node-port"}).appendTo(nodeDiv);
                     }
@@ -323,7 +330,7 @@ RED.typeSearch = (function() {
         }
     }
     function applyFilter(filter,type,def) {
-        return !filter ||
+        return !def || !filter ||
             (
                 (!filter.spliceMultiple) &&
                 (!filter.type || type === filter.type) &&

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

@@ -101,28 +101,8 @@ RED.utils = (function() {
 
     renderer.code = function (code, lang) {
         if(lang === "mermaid") {
-            // mermaid diagram rendering 
-            if (mermaidIsEnabled === undefined) {
-                if (RED.settings.markdownEditor &&
-                    RED.settings.markdownEditor.mermaid) {
-                    mermaidIsEnabled = RED.settings.markdownEditor.mermaid.enabled;
-                }
-                else {
-                    mermaidIsEnabled = true;
-                }
-            }
-            if (mermaidIsEnabled) {
-                if (!mermaidIsInitialized) {
-                    mermaidIsInitialized = true;
-                    mermaid.initialize({startOnLoad:false});
-                }
-                return `<pre class='mermaid'>${code}</pre>`;
-            }
-            else {
-                return `<details><summary>${RED._("markdownEditor.mermaid.summary")}</summary><pre><code>${code}</code></pre></details>`;
-            }
-        }
-        else {
+            return `<pre class='mermaid'>${code}</pre>`;
+        } else {
             return "<pre><code>" +code +"</code></pre>";
         }
     };
@@ -503,6 +483,16 @@ RED.utils = (function() {
                 $('<span class="red-ui-debug-msg-type-string-swatch"></span>').css('backgroundColor',obj).appendTo(e);
             }
 
+            let n = RED.nodes.node(obj) ?? RED.nodes.workspace(obj);
+            if (n) {
+                if (options.nodeSelector && "function" == typeof options.nodeSelector) {
+                    e.css('cursor', 'pointer').on("click", function(evt) {
+                        evt.preventDefault();
+                        options.nodeSelector(n.id);
+                    })
+                }
+            }
+
         } else if (typeof obj === 'number') {
             e = $('<span class="red-ui-debug-msg-type-number"></span>').appendTo(entryObj);
 
@@ -609,6 +599,7 @@ RED.utils = (function() {
                                     exposeApi: exposeApi,
                                     // tools: tools // Do not pass tools down as we
                                                     // keep them attached to the top-level header
+                                    nodeSelector: options.nodeSelector,
                                 }
                             ).appendTo(row);
                         }
@@ -639,6 +630,7 @@ RED.utils = (function() {
                                                 exposeApi: exposeApi,
                                                 // tools: tools // Do not pass tools down as we
                                                                 // keep them attached to the top-level header
+                                                nodeSelector: options.nodeSelector,
                                             }
                                         ).appendTo(row);
                                     }
@@ -695,6 +687,7 @@ RED.utils = (function() {
                                 exposeApi: exposeApi,
                                 // tools: tools // Do not pass tools down as we
                                                 // keep them attached to the top-level header
+                                nodeSelector: options.nodeSelector,
                             }
                         ).appendTo(row);
                     }
@@ -917,6 +910,54 @@ RED.utils = (function() {
         }
     }
 
+    /**
+     * Checks a typed property is valid according to the type.
+     * Returns true if valid.
+     * Return String error message if invalid
+     * @param {*} propertyType 
+     * @param {*} propertyValue 
+     * @returns true if valid, String if invalid
+     */
+    function validateTypedProperty(propertyValue, propertyType, opt) {
+        if (propertyValue && /^\${[^}]+}$/.test(propertyValue)) {
+            // Allow ${ENV_VAR} value
+            return true
+        }
+        let error
+        if (propertyType === 'json') {
+            try {
+                JSON.parse(propertyValue);
+            } catch(err) {
+                error = RED._("validator.errors.invalid-json", {
+                    error: err.message
+                })
+            }
+        } else if (propertyType === 'msg' || propertyType === 'flow' || propertyType === 'global' ) {
+            if (!RED.utils.validatePropertyExpression(propertyValue)) {
+                error = RED._("validator.errors.invalid-prop")
+            }
+        } else if (propertyType === 'num') {
+            if (!/^NaN$|^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$|^[+-]?(0b|0B)[01]+$|^[+-]?(0o|0O)[0-7]+$|^[+-]?(0x|0X)[0-9a-fA-F]+$/.test(propertyValue)) {
+                error = RED._("validator.errors.invalid-num")
+            }
+        } else if (propertyType === 'jsonata') {
+            try { 
+                jsonata(propertyValue)
+            } catch(err) {
+                error = RED._("validator.errors.invalid-expr", {
+                    error: err.message
+                })
+            }
+        }
+        if (error) {
+            if (opt && opt.label) {
+                return opt.label+': '+error
+            }
+            return error
+        }
+        return true
+    }
+
     function getMessageProperty(msg,expr) {
         var result = null;
         var msgPropParts;
@@ -1451,6 +1492,7 @@ RED.utils = (function() {
         getDarkerColor: getDarkerColor,
         parseModuleList: parseModuleList,
         checkModuleAllowed: checkModuleAllowed,
-        getBrowserInfo: getBrowserInfo
+        getBrowserInfo: getBrowserInfo,
+        validateTypedProperty: validateTypedProperty
     }
 })();

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

@@ -9,14 +9,27 @@ RED.view.annotations = (function() {
                     addAnnotation(evt.node.__pendingAnnotation__,evt);
                     delete evt.node.__pendingAnnotation__;
                 }
-                var badgeDX = 0;
-                var controlDX = 0;
-                for (var i=0,l=evt.el.__annotations__.length;i<l;i++) {
-                    var annotation = evt.el.__annotations__[i];
+                let badgeRDX = 0;
+                let badgeLDX = 0;
+                
+                for (let i=0,l=evt.el.__annotations__.length;i<l;i++) {
+                    const annotation = evt.el.__annotations__[i];
                     if (annotations.hasOwnProperty(annotation.id)) {
-                        var opts = annotations[annotation.id];
-                        var showAnnotation = true;
-                        var isBadge = opts.type === 'badge';
+                        const opts = annotations[annotation.id];
+                        let showAnnotation = true;
+                        const isBadge = opts.type === 'badge';
+                        if (opts.refresh !== undefined) {
+                            let refreshAnnotation = false
+                            if (typeof opts.refresh === "string") {
+                                refreshAnnotation = !!evt.node[opts.refresh]
+                                delete evt.node[opts.refresh]
+                            } else if (typeof opts.refresh === "function") {
+                                refreshAnnotation = opts.refresh(evnt.node)
+                            }
+                            if (refreshAnnotation) {
+                                refreshAnnotationElement(annotation.id, annotation.node, annotation.element)
+                            }
+                        }
                         if (opts.show !== undefined) {
                             if (typeof opts.show === "string") {
                                 showAnnotation = !!evt.node[opts.show]
@@ -29,17 +42,24 @@ RED.view.annotations = (function() {
                         }
                         if (isBadge) {
                             if (showAnnotation) {
-                                var rect = annotation.element.getBoundingClientRect();
-                                badgeDX += rect.width;
-                                annotation.element.setAttribute("transform", "translate("+(evt.node.w-3-badgeDX)+", -8)");
-                                badgeDX += 4;
-                            }
-                        } else {
-                            if (showAnnotation) {
-                                var rect = annotation.element.getBoundingClientRect();
-                                annotation.element.setAttribute("transform", "translate("+(3+controlDX)+", -12)");
-                                controlDX += rect.width + 4;
+                                const rect = annotation.element.getBoundingClientRect();
+                                let annotationX
+                                if (!opts.align || opts.align === 'right') {
+                                    annotationX = evt.node.w - 3 - badgeRDX - rect.width
+                                    badgeRDX += rect.width + 4;
+
+                                } else if (opts.align === 'left') {
+                                    annotationX = 3 + badgeLDX
+                                    badgeLDX += rect.width + 4;
+                                }
+                                annotation.element.setAttribute("transform", "translate("+annotationX+", -8)");
                             }
+                        // } else {
+                        //     if (showAnnotation) {
+                        //         var rect = annotation.element.getBoundingClientRect();
+                        //         annotation.element.setAttribute("transform", "translate("+(3+controlDX)+", -12)");
+                        //         controlDX += rect.width + 4;
+                        //     }
                         }
                     } else {
                         annotation.element.parentNode.removeChild(annotation.element);
@@ -95,15 +115,25 @@ RED.view.annotations = (function() {
         annotationGroup.setAttribute("class",opts.class || "");
         evt.el.__annotations__.push({
             id:id,
+            node: evt.node,
             element: annotationGroup
         });
-        var annotation = opts.element(evt.node);
+        refreshAnnotationElement(id, evt.node, annotationGroup)
+        evt.el.appendChild(annotationGroup);
+    }
+
+    function refreshAnnotationElement(id, node, annotationGroup) {
+        const opts = annotations[id];
+        const annotation = opts.element(node);
         if (opts.tooltip) {
-            annotation.addEventListener("mouseenter", getAnnotationMouseEnter(annotation,evt.node,opts.tooltip));
+            annotation.addEventListener("mouseenter", getAnnotationMouseEnter(annotation, node, opts.tooltip));
             annotation.addEventListener("mouseleave", annotationMouseLeave);
         }
+        if (annotationGroup.hasChildNodes()) {
+            annotationGroup.removeChild(annotationGroup.firstChild)
+        }
         annotationGroup.appendChild(annotation);
-        evt.el.appendChild(annotationGroup);
+
     }
 
 

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

@@ -646,120 +646,128 @@ RED.view = (function() {
                 }
                 d3.event = event;
                 var selected_tool = $(ui.draggable[0]).attr("data-palette-type");
-                var result = createNode(selected_tool);
-                if (!result) {
-                    return;
-                }
-                var historyEvent = result.historyEvent;
-                var nn = RED.nodes.add(result.node);
-
-                var showLabel = RED.utils.getMessageProperty(RED.settings.get('editor'),"view.view-node-show-label");
-                if (showLabel !== undefined &&  (nn._def.hasOwnProperty("showLabel")?nn._def.showLabel:true) && !nn._def.defaults.hasOwnProperty("l")) {
-                    nn.l = showLabel;
-                }
-
-                var helperOffset = d3.touches(ui.helper.get(0))[0]||d3.mouse(ui.helper.get(0));
-                var helperWidth = ui.helper.width();
-                var helperHeight = ui.helper.height();
-                var mousePos = d3.touches(this)[0]||d3.mouse(this);
-
                 try {
-                    var isLink = (nn.type === "link in" || nn.type === "link out")
-                    var hideLabel = nn.hasOwnProperty('l')?!nn.l : isLink;
-
-                    var label = RED.utils.getNodeLabel(nn, nn.type);
-                    var labelParts = getLabelParts(label, "red-ui-flow-node-label");
-                    if (hideLabel) {
-                        nn.w = node_height;
-                        nn.h = Math.max(node_height,(nn.outputs || 0) * 15);
-                    } else {
-                        nn.w = Math.max(node_width,20*(Math.ceil((labelParts.width+50+(nn._def.inputs>0?7:0))/20)) );
-                        nn.h = Math.max(6+24*labelParts.lines.length,(nn.outputs || 0) * 15, 30);
+                    var result = createNode(selected_tool);
+                    if (!result) {
+                        return;
                     }
-                } catch(err) {
-                }
+                    var historyEvent = result.historyEvent;
+                    var nn = RED.nodes.add(result.node);
 
-                mousePos[1] += this.scrollTop + ((helperHeight/2)-helperOffset[1]);
-                mousePos[0] += this.scrollLeft + ((helperWidth/2)-helperOffset[0]);
-                mousePos[1] /= scaleFactor;
-                mousePos[0] /= scaleFactor;
+                    var showLabel = RED.utils.getMessageProperty(RED.settings.get('editor'),"view.view-node-show-label");
+                    if (showLabel !== undefined &&  (nn._def.hasOwnProperty("showLabel")?nn._def.showLabel:true) && !nn._def.defaults.hasOwnProperty("l")) {
+                        nn.l = showLabel;
+                    }
 
-                nn.x = mousePos[0];
-                nn.y = mousePos[1];
+                    var helperOffset = d3.touches(ui.helper.get(0))[0]||d3.mouse(ui.helper.get(0));
+                    var helperWidth = ui.helper.width();
+                    var helperHeight = ui.helper.height();
+                    var mousePos = d3.touches(this)[0]||d3.mouse(this);
 
-                var minX = nn.w/2 -5;
-                if (nn.x < minX) {
-                    nn.x = minX;
-                }
-                var minY = nn.h/2 -5;
-                if (nn.y < minY) {
-                    nn.y = minY;
-                }
-                var maxX = space_width -nn.w/2 +5;
-                if (nn.x > maxX) {
-                    nn.x = maxX;
-                }
-                var maxY = space_height -nn.h +5;
-                if (nn.y > maxY) {
-                    nn.y = maxY;
-                }
+                    try {
+                        var isLink = (nn.type === "link in" || nn.type === "link out")
+                        var hideLabel = nn.hasOwnProperty('l')?!nn.l : isLink;
 
-                if (snapGrid) {
-                    var gridOffset = RED.view.tools.calculateGridSnapOffsets(nn);
-                    nn.x -= gridOffset.x;
-                    nn.y -= gridOffset.y;
-                }
+                        var label = RED.utils.getNodeLabel(nn, nn.type);
+                        var labelParts = getLabelParts(label, "red-ui-flow-node-label");
+                        if (hideLabel) {
+                            nn.w = node_height;
+                            nn.h = Math.max(node_height,(nn.outputs || 0) * 15);
+                        } else {
+                            nn.w = Math.max(node_width,20*(Math.ceil((labelParts.width+50+(nn._def.inputs>0?7:0))/20)) );
+                            nn.h = Math.max(6+24*labelParts.lines.length,(nn.outputs || 0) * 15, 30);
+                        }
+                    } catch(err) {
+                    }
 
-                var linkToSplice = $(ui.helper).data("splice");
-                if (linkToSplice) {
-                    spliceLink(linkToSplice, nn, historyEvent)
-                }
+                    mousePos[1] += this.scrollTop + ((helperHeight/2)-helperOffset[1]);
+                    mousePos[0] += this.scrollLeft + ((helperWidth/2)-helperOffset[0]);
+                    mousePos[1] /= scaleFactor;
+                    mousePos[0] /= scaleFactor;
+
+                    nn.x = mousePos[0];
+                    nn.y = mousePos[1];
+
+                    var minX = nn.w/2 -5;
+                    if (nn.x < minX) {
+                        nn.x = minX;
+                    }
+                    var minY = nn.h/2 -5;
+                    if (nn.y < minY) {
+                        nn.y = minY;
+                    }
+                    var maxX = space_width -nn.w/2 +5;
+                    if (nn.x > maxX) {
+                        nn.x = maxX;
+                    }
+                    var maxY = space_height -nn.h +5;
+                    if (nn.y > maxY) {
+                        nn.y = maxY;
+                    }
+
+                    if (snapGrid) {
+                        var gridOffset = RED.view.tools.calculateGridSnapOffsets(nn);
+                        nn.x -= gridOffset.x;
+                        nn.y -= gridOffset.y;
+                    }
+
+                    var linkToSplice = $(ui.helper).data("splice");
+                    if (linkToSplice) {
+                        spliceLink(linkToSplice, nn, historyEvent)
+                    }
+
+                    var group = $(ui.helper).data("group");
+                    if (group) {
+                        var oldX = group.x; 
+                        var oldY = group.y; 
+                        RED.group.addToGroup(group, nn);
+                        var moveEvent = null;
+                        if ((group.x !== oldX) ||
+                            (group.y !== oldY)) {
+                            moveEvent = {
+                                t: "move",
+                                nodes: [{n: group,
+                                        ox: oldX, oy: oldY,
+                                        dx: group.x -oldX,
+                                        dy: group.y -oldY}],
+                                dirty: true
+                            };
+                        }
+                        historyEvent = {
+                            t: 'multi',
+                            events: [historyEvent],
 
-                var group = $(ui.helper).data("group");
-                if (group) {
-                    var oldX = group.x; 
-                    var oldY = group.y; 
-                    RED.group.addToGroup(group, nn);
-                    var moveEvent = null;
-                    if ((group.x !== oldX) ||
-                        (group.y !== oldY)) {
-                        moveEvent = {
-                            t: "move",
-                            nodes: [{n: group,
-                                     ox: oldX, oy: oldY,
-                                     dx: group.x -oldX,
-                                     dy: group.y -oldY}],
-                            dirty: true
                         };
+                        if (moveEvent) {
+                            historyEvent.events.push(moveEvent)
+                        }
+                        historyEvent.events.push({
+                            t: "addToGroup",
+                            group: group,
+                            nodes: nn
+                        })
                     }
-                    historyEvent = {
-                        t: 'multi',
-                        events: [historyEvent],
 
-                    };
-                    if (moveEvent) {
-                        historyEvent.events.push(moveEvent)
+                    RED.history.push(historyEvent);
+                    RED.editor.validateNode(nn);
+                    RED.nodes.dirty(true);
+                    // auto select dropped node - so info shows (if visible)
+                    clearSelection();
+                    nn.selected = true;
+                    movingSet.add(nn);
+                    updateActiveNodes();
+                    updateSelection();
+                    redraw();
+
+                    if (nn._def.autoedit) {
+                        RED.editor.edit(nn);
+                    }
+                } catch (error) {
+                    if (error.code != "NODE_RED") {
+                        RED.notify(RED._("notification.error",{message:error.toString()}),"error");
+                    } else {
+                        RED.notify(RED._("notification.error",{message:error.message}),"error");
                     }
-                    historyEvent.events.push({
-                        t: "addToGroup",
-                        group: group,
-                        nodes: nn
-                    })
-                }
-
-                RED.history.push(historyEvent);
-                RED.editor.validateNode(nn);
-                RED.nodes.dirty(true);
-                // auto select dropped node - so info shows (if visible)
-                clearSelection();
-                nn.selected = true;
-                movingSet.add(nn);
-                updateActiveNodes();
-                updateSelection();
-                redraw();
-
-                if (nn._def.autoedit) {
-                    RED.editor.edit(nn);
                 }
             }
         });
@@ -4155,10 +4163,15 @@ RED.view = (function() {
                         scaleFactor = 30/largestEdge;
                     }
                     var width = img.width * scaleFactor;
+                    if (width > 20) {
+                        scaleFactor *= 20/width;
+                        width = 20;
+                    }
                     var height = img.height * scaleFactor;
                     icon.attr("width",width);
                     icon.attr("height",height);
                     icon.attr("x",15-width/2);
+                    icon.attr("y",(30-height)/2);
                 }
                 icon.attr("xlink:href",iconUrl);
                 icon.style("display",null);
@@ -4187,7 +4200,7 @@ RED.view = (function() {
                 nodeEl.__statusGroup__.style.display = "none";
             } else {
                 nodeEl.__statusGroup__.style.display = "inline";
-                let backgroundWidth = 12
+                let backgroundWidth = 15
                 var fill = status_colours[d.status.fill]; // Only allow our colours for now
                 if (d.status.shape == null && fill == null) {
                     backgroundWidth = 0
@@ -4207,7 +4220,11 @@ RED.view = (function() {
                     nodeEl.__statusLabel__.textContent = "";
                 }
                 const textSize = nodeEl.__statusLabel__.getBBox()
-                nodeEl.__statusBackground__.setAttribute('width', backgroundWidth + textSize.width + 6)
+                backgroundWidth += textSize.width
+                if (backgroundWidth > 0 && textSize.width > 0) {
+                    backgroundWidth += 6
+                }
+                nodeEl.__statusBackground__.setAttribute('width', backgroundWidth)
             }
             delete d.dirtyStatus;
         }
@@ -4619,8 +4636,8 @@ RED.view = (function() {
                 statusBackground.setAttribute("y",-1);
                 statusBackground.setAttribute("width",200);
                 statusBackground.setAttribute("height",13);
-                statusBackground.setAttribute("rx",1);
-                statusBackground.setAttribute("ry",1);
+                statusBackground.setAttribute("rx",2);
+                statusBackground.setAttribute("ry",2);
                 
                 statusEl.appendChild(statusBackground);
                 node[0][0].__statusBackground__ = statusBackground;
@@ -6054,14 +6071,19 @@ RED.view = (function() {
      function createNode(type, x, y, z) {
         const wasDirty = RED.nodes.dirty()
         var m = /^subflow:(.+)$/.exec(type);
-        var activeSubflow = z ? RED.nodes.subflow(z) : null;
+        var activeSubflow = (z || RED.workspaces.active()) ? RED.nodes.subflow(z || RED.workspaces.active()) : null;
+
         if (activeSubflow && m) {
             var subflowId = m[1];
+            let err
             if (subflowId === activeSubflow.id) {
-                throw new Error(RED._("notification.error", { message: RED._("notification.errors.cannotAddSubflowToItself") }))
+                err = new Error(RED._("notification.errors.cannotAddSubflowToItself"))
+            } else if (RED.nodes.subflowContains(m[1], activeSubflow.id)) {
+                err = new Error(RED._("notification.errors.cannotAddCircularReference"))
             }
-            if (RED.nodes.subflowContains(m[1], activeSubflow.id)) {
-                throw new Error(RED._("notification.error", { message: RED._("notification.errors.cannotAddCircularReference") }))
+            if (err) {
+                err.code = 'NODE_RED'
+                throw err
             }
         }
 
@@ -6243,6 +6265,10 @@ RED.view = (function() {
                             }
                         })
                     }
+                    if (selection.links) {
+                        selectedLinks.clear();
+                        selection.links.forEach(selectedLinks.add);
+                    }
                 }
             }
             updateSelection();

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

@@ -17,6 +17,8 @@
 
 RED.workspaces = (function() {
 
+    const documentTitle = document.title;
+
     var activeWorkspace = 0;
     var workspaceIndex = 0;
 
@@ -339,23 +341,35 @@ RED.workspaces = (function() {
                     $("#red-ui-workspace-chart").show();
                     activeWorkspace = tab.id;
                     window.location.hash = 'flow/'+tab.id;
+                    if (tab.label) {
+                        document.title = `${documentTitle} : ${tab.label}`
+                    } else {
+                        document.title = documentTitle
+                    }
                     $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled", !!tab.disabled);
                     $("#red-ui-workspace").toggleClass("red-ui-workspace-locked", !!tab.locked);
                 } else {
                     $("#red-ui-workspace-chart").hide();
                     activeWorkspace = 0;
                     window.location.hash = '';
+                    document.title = documentTitle
                 }
                 event.workspace = activeWorkspace;
                 RED.events.emit("workspace:change",event);
                 RED.sidebar.config.refresh();
                 RED.view.focus();
             },
-            onclick: function(tab) {
-                if (tab.id !== activeWorkspace) {
-                    addToViewStack(activeWorkspace);
+            onclick: function(tab, evt) {
+                if(evt.which === 2) {
+                    evt.preventDefault();
+                    evt.stopPropagation();
+                    RED.actions.invoke("core:hide-flow", tab)
+                } else {
+                    if (tab.id !== activeWorkspace) {
+                        addToViewStack(activeWorkspace);
+                    }
+                    RED.view.focus();
                 }
-                RED.view.focus();
             },
             ondblclick: function(tab) {
                 if (tab.type != "subflow") {
@@ -393,6 +407,7 @@ RED.workspaces = (function() {
                 if (tab.type === "tab") {
                     workspaceTabCount--;
                 } else {
+                    RED.events.emit("workspace:close",{workspace: tab.id})
                     hideStack.push(tab.id);
                 }
                 RED.menu.setDisabled("menu-item-workspace-delete",activeWorkspace === 0 || workspaceTabCount <= 1);
@@ -483,6 +498,11 @@ RED.workspaces = (function() {
         createWorkspaceTabs();
         RED.events.on("sidebar:resize",workspace_tabs.resize);
 
+        RED.events.on("workspace:clear", () => {
+            // Reset the index used to generate new flow names
+            workspaceIndex = 0
+        })
+
         RED.actions.add("core:show-next-tab",function() {
             var oldActive = activeWorkspace;
             workspace_tabs.nextTab();
@@ -649,6 +669,9 @@ RED.workspaces = (function() {
         RED.events.on("flows:change", (ws) => {
             $("#red-ui-tab-"+(ws.id.replace(".","-"))).toggleClass('red-ui-workspace-changed',!!(ws.contentsChanged || ws.changed || ws.added));
         })
+        RED.events.on("subflows:change", (ws) => {
+            $("#red-ui-tab-"+(ws.id.replace(".","-"))).toggleClass('red-ui-workspace-changed',!!(ws.contentsChanged || ws.changed || ws.added));
+        })
 
         hideWorkspace();
     }

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

@@ -187,6 +187,7 @@ RED.user = (function() {
     }
 
     function logout() {
+        RED.events.emit('logout')
         var tokens = RED.settings.get("auth-tokens");
         var token = tokens?tokens.access_token:"";
         $.ajax({
@@ -211,6 +212,8 @@ RED.user = (function() {
 
     function updateUserMenu() {
         $("#red-ui-header-button-user-submenu li").remove();
+        const userMenu = $("#red-ui-header-button-user")
+        userMenu.empty()
         if (RED.settings.user.anonymous) {
             RED.menu.addItem("red-ui-header-button-user",{
                 id:"usermenu-item-login",
@@ -238,7 +241,8 @@ RED.user = (function() {
                 }
             });
         }
-
+        const userIcon = generateUserIcon(RED.settings.user)
+        userIcon.appendTo(userMenu);
     }
 
     function init() {
@@ -247,14 +251,6 @@ RED.user = (function() {
 
                 var userMenu = $('<li><a id="red-ui-header-button-user" class="button hide" href="#"></a></li>')
                     .prependTo(".red-ui-header-toolbar");
-                if (RED.settings.user.image) {
-                    $('<span class="user-profile"></span>').css({
-                        backgroundImage: "url("+RED.settings.user.image+")",
-                    }).appendTo(userMenu.find("a"));
-                } else {
-                    $('<i class="fa fa-user"></i>').appendTo(userMenu.find("a"));
-                }
-
                 RED.menu.init({id:"red-ui-header-button-user",
                     options: []
                 });
@@ -317,12 +313,30 @@ RED.user = (function() {
         return false;
     }
 
+    function generateUserIcon(user) {
+        const userIcon = $('<span class="red-ui-user-profile"></span>')
+        if (user.image) {
+            userIcon.addClass('has_profile_image')
+            userIcon.css({
+                backgroundImage: "url("+user.image+")",
+            })
+        } else if (user.anonymous) {
+            $('<i class="fa fa-user"></i>').appendTo(userIcon);
+        } else {
+            $('<span>').text(user.username.substring(0,2)).appendTo(userIcon);
+        }
+        if (user.profileColor !== undefined) {
+            userIcon.addClass('red-ui-user-profile-color-' + user.profileColor)
+        }
+        return userIcon
+    }
 
     return {
         init: init,
         login: login,
         logout: logout,
-        hasPermission: hasPermission
+        hasPermission: hasPermission,
+        generateUserIcon
     }
 
 })();

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

@@ -16,8 +16,20 @@
 RED.validators = {
     number: function(blankAllowed,mopt){
         return function(v, opt) {
-            if ((blankAllowed&&(v===''||v===undefined)) || (v!=='' && !isNaN(v))) {
-                return true;
+            if (blankAllowed && (v === '' || v === undefined)) {
+                return true
+            }
+            if (v !== '') {
+                if (/^NaN$|^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$|^[+-]?(0b|0B)[01]+$|^[+-]?(0o|0O)[0-7]+$|^[+-]?(0x|0X)[0-9a-fA-F]+$/.test(v)) {
+                    return true
+                }
+                if (/^\${[^}]+}$/.test(v)) {
+                    // Allow ${ENV_VAR} value
+                    return true
+                }
+            }
+            if (!isNaN(v)) {
+                return true
             }
             if (opt && opt.label) {
                 return RED._("validator.errors.invalid-num-prop", {
@@ -40,46 +52,32 @@ RED.validators = {
             return opt ? RED._("validator.errors.invalid-regexp") : false;
         };
     },
-    typedInput: function(ptypeName,isConfig,mopt) {
+    typedInput: function(ptypeName, isConfig, mopt) {
+        let options = ptypeName
+        if (typeof ptypeName === 'string' ) {
+            options = {}
+            options.typeField = ptypeName
+            options.isConfig = isConfig
+            options.allowBlank = false
+        }
         return function(v, opt) {
-            var ptype = $("#node-"+(isConfig?"config-":"")+"input-"+ptypeName).val() || this[ptypeName];
-            if (ptype === 'json') {
-                try {
-                    JSON.parse(v);
-                    return true;
-                } catch(err) {
-                    if (opt && opt.label) {
-                        return RED._("validator.errors.invalid-json-prop", {
-                            error: err.message,
-                            prop: opt.label,
-                        });
-                    }
-                    return opt ? RED._("validator.errors.invalid-json", {
-                        error: err.message
-                    }) : false;
-                }
-            } else if (ptype === 'msg' || ptype === 'flow' || ptype === 'global' ) {
-                if (RED.utils.validatePropertyExpression(v)) {
-                    return true;
-                }
-                if (opt && opt.label) {
-                    return RED._("validator.errors.invalid-prop-prop", {
-                        prop: opt.label
-                    });
-                }
-                return opt ? RED._("validator.errors.invalid-prop") : false;
-            } else if (ptype === 'num') {
-                if (/^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$/.test(v)) {
-                    return true;
-                }
-                if (opt && opt.label) {
-                    return RED._("validator.errors.invalid-num-prop", {
-                        prop: opt.label
-                    });
-                }
-                return opt ? RED._("validator.errors.invalid-num") : false;
+            let ptype = options.type
+            if (!ptype && options.typeField) {
+                ptype = $("#node-"+(options.isConfig?"config-":"")+"input-"+options.typeField).val() || this[options.typeField];
             }
-            return true;
-        };
+            if (options.allowBlank && v === '') {
+                return true
+            }
+            if (options.allowUndefined && v === undefined) {
+                return true
+            }
+            const result = RED.utils.validateTypedProperty(v, ptype, opt)
+            if (result === true || opt) {
+                // Valid, or opt provided - return result as-is
+                return result
+            }
+            // No opt - need to return false for backwards compatibilty
+            return false
+        }
     }
-};
+};

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

@@ -38,7 +38,7 @@ body {
 }
 #red-ui-main-container {
     position: absolute;
-    top:40px; left:0; bottom: 0; right:0;
+    top: var(--red-ui-header-height); left:0; bottom: 0; right:0;
     overflow:hidden;
 }
 

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

@@ -259,7 +259,8 @@ $deploy-button-background-disabled-hover: #555;
 
 $header-background: #000;
 $header-button-background-active: #121212;
-$header-menu-color: #C7C7C7;
+$header-accent: #d41313;
+$header-menu-color: #eee;
 $header-menu-color-disabled: #666;
 $header-menu-heading-color: #fff;
 $header-menu-sublabel-color: #aeaeae;
@@ -313,6 +314,16 @@ $spinner-color: #999;
 
 $tab-icon-color: #dedede;
 
+// Anonymous User Colors
+
+$user-profile-colors: (
+    1: #822e81,
+    2: #955e42,
+    3: #9c914f,
+    4: #748e54,
+    5: #06bcc1
+);
+
 // Deprecated
 $text-color-green: $text-color-success;
 $info-text-code-color: $text-color-code;

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

@@ -114,6 +114,7 @@
     pointer-events: stroke;
 }
 .red-ui-flow-group-outline-select {
+    cursor: move;
     fill: none;
     stroke: var(--red-ui-node-selected-color);
     pointer-events: none;

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

@@ -23,16 +23,20 @@
     top: 0;
     left: 0;
     width: 100%;
-    height: 40px;
+    height: var(--red-ui-header-height);
     background: var(--red-ui-header-background);
     box-sizing: border-box;
     padding: 0px 0px 0px 20px;
     color: var(--red-ui-header-menu-color);
     font-size: 14px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 2px solid var(--red-ui-header-accent);
+    padding-top: 2px;
 
     span.red-ui-header-logo {
         float: left;
-        margin-top: 5px;
         font-size: 30px;
         line-height: 30px;
         text-decoration: none;
@@ -42,7 +46,7 @@
             vertical-align: middle;
             font-size: 16px !important;
             &:not(:first-child) {
-                margin-left: 5px;
+                margin-left: 8px;
             }
         }
         img {
@@ -59,25 +63,29 @@
     }
 
     .red-ui-header-toolbar {
+        display: flex;
+        align-items: stretch;
         padding: 0;
         margin: 0;
         list-style: none;
         float: right;
 
         > li {
-            display: inline-block;
+            display: inline-flex;
+            align-items: stretch;
             padding: 0;
             margin: 0;
             position: relative;
-
         }
     }
 
     .button {
+        height: 100%;
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
         min-width: 20px;
         text-align: center;
-        line-height: 40px;
-        display: inline-block;
         font-size: 20px;
         padding: 0px 12px;
         text-decoration: none;
@@ -178,6 +186,20 @@
         }
     }
 
+    .red-ui-deploy-button-group.readOnly {
+        .fa-caret-down { display: none; }
+        .fa-lock { display: inline-block; }
+    }
+    .red-ui-deploy-button-group:not(.readOnly) {
+        .fa-caret-down { display: inline-block; }
+        .fa-lock { display: none; }
+    }
+    .red-ui-deploy-button-group.readOnly {
+        a {
+            pointer-events: none;
+        }
+    }
+
     li.open .button {
         background: var(--red-ui-header-button-background-active);
         border-color: var(--red-ui-header-button-background-active);
@@ -266,18 +288,44 @@
     #usermenu-item-username > .red-ui-menu-label {
         color: var(--red-ui-header-menu-heading-color);
     }
+}
 
-    #red-ui-header-button-user .user-profile {
-        background-position: center center;
-        background-repeat: no-repeat;
-        background-size: contain;
-        display: inline-block;
-        width: 40px;
-        height: 35px;
-        vertical-align: middle;
+
+.red-ui-user-profile {
+    background-color: var(--red-ui-header-background);
+    border: 2px solid var(--red-ui-header-menu-color);
+    border-radius: 30px;
+    overflow: hidden;
+
+    background-position: center center;
+    background-repeat: no-repeat;
+    background-size: contain;
+    display: inline-flex;
+    justify-content: center;
+    align-items: center;
+    vertical-align: middle;
+    width: 30px;
+    height: 30px;
+    font-size: 20px;
+
+    &.red-ui-user-profile-color-1 {
+        background-color: var(--red-ui-user-profile-colors-1);
+    }
+    &.red-ui-user-profile-color-2 {
+        background-color: var(--red-ui-user-profile-colors-2);
+    }
+    &.red-ui-user-profile-color-3 {
+        background-color: var(--red-ui-user-profile-colors-3);
+    }
+    &.red-ui-user-profile-color-4 {
+        background-color: var(--red-ui-user-profile-colors-4);
+    }
+    &.red-ui-user-profile-color-5 {
+        background-color: var(--red-ui-user-profile-colors-5);
     }
 }
 
+
 @media only screen and (max-width: 450px) {
     span.red-ui-header-logo > span {
         display: none;

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

@@ -194,10 +194,6 @@
     }
 }
 .red-ui-clipboard-dialog-import-conflicts-controls {
-    position: absolute;
-    top:0;
-    bottom: 0;
-    right: 0px;
     text-align: center;
     color: var(--red-ui-form-text-color);
     .form-row & label  {
@@ -218,9 +214,21 @@
         margin: 0;
     }
 }
-#red-ui-clipboard-dialog-import-conflicts-list .disabled .red-ui-info-outline-item {
-    opacity: 0.4;
+#red-ui-clipboard-dialog-import-conflicts-list .disabled {
+    .red-ui-info-outline-item,
+    .red-ui-node-list-item {
+        opacity: 0.4;
+    }
 }
+#red-ui-clipboard-dialog-import-conflicts-list .red-ui-node-list-item {
+    display: flex;
+    align-items: center;
+
+    & > :first-child {
+        flex-grow: 1
+    }
+}
+
 .form-row label.red-ui-clipboard-dialog-import-conflicts-gutter {
     box-sizing: border-box;
     width: 22px;

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

@@ -0,0 +1,116 @@
+#red-ui-multiplayer-user-list {
+    display: inline-flex;
+    align-items: center;
+    margin: 0 5px;
+    li {
+        display: inline-flex;
+        align-items: center;
+        margin: 0 2px;
+    }
+
+}
+
+.red-ui-multiplayer-user-icon {
+    background: none;
+    border: none;
+    display: inline-flex;
+    justify-content: center;
+    align-items: center;
+    text-align: center;
+    box-sizing: border-box;
+    text-decoration: none;
+    color: var(--red-ui-header-menu-color);
+    padding: 0px;
+    margin: 0px;
+    vertical-align: middle;
+
+    &:focus {
+        outline: none;
+    }
+
+    .red-ui-multiplayer-user.inactive & {
+        opacity: 0.5;
+    }
+    .red-ui-user-profile {
+        width: 20px;
+        border-radius: 20px;
+        height: 20px;
+        font-size: 12px
+    }
+}
+.red-ui-multiplayer-users-tray {
+    position: absolute;
+    top: 5px;
+    right: 20px;
+    line-height: normal;
+    cursor: pointer;
+    // &:hover {
+    //     .red-ui-multiplayer-user-location {
+    //         margin-left: 1px;
+    //     }
+    // }
+}
+$multiplayer-user-icon-background: var(--red-ui-primary-background);
+$multiplayer-user-icon-border: var(--red-ui-view-background);
+$multiplayer-user-icon-text-color: var(--red-ui-header-menu-color);
+$multiplayer-user-icon-count-text-color: var(--red-ui-primary-color);
+$multiplayer-user-icon-shadow: 0px 0px 4px var(--red-ui-shadow);
+.red-ui-multiplayer-user-location {
+    display: inline-block;
+    margin-left: -6px;
+    transition: margin-left 0.2s;
+    .red-ui-user-profile {
+        border: 1px solid $multiplayer-user-icon-border;
+        color: $multiplayer-user-icon-text-color;
+        width: 18px;
+        height: 18px;
+        border-radius: 18px;
+        font-size: 10px;
+        font-weight: normal;
+        box-shadow: $multiplayer-user-icon-shadow;
+        &.red-ui-multiplayer-user-count {
+            color: $multiplayer-user-icon-count-text-color;
+            background-color: $multiplayer-user-icon-background;
+        }
+    }
+}
+
+.red-ui-multiplayer-annotation {
+    .red-ui-multiplayer-annotation-background {
+        filter: drop-shadow($multiplayer-user-icon-shadow);
+        fill: $multiplayer-user-icon-background;
+        &.red-ui-user-profile-color-1 {
+            fill: var(--red-ui-user-profile-colors-1);
+        }
+        &.red-ui-user-profile-color-2 {
+            fill: var(--red-ui-user-profile-colors-2);
+        }
+        &.red-ui-user-profile-color-3 {
+            fill: var(--red-ui-user-profile-colors-3);
+        }
+        &.red-ui-user-profile-color-4 {
+            fill: var(--red-ui-user-profile-colors-4);
+        }
+        &.red-ui-user-profile-color-5 {
+            fill: var(--red-ui-user-profile-colors-5);
+        }
+    }
+    .red-ui-multiplayer-annotation-border {
+        stroke: $multiplayer-user-icon-border;
+        stroke-width: 1px;
+        fill: none;
+    }
+    .red-ui-multiplayer-annotation-anon-label {
+        fill: $multiplayer-user-icon-text-color;
+        stroke: none;
+    }
+    text {
+        user-select: none;
+        fill: $multiplayer-user-icon-text-color;
+        stroke: none;
+        font-size: 10px;   
+        &.red-ui-multiplayer-user-count {
+            fill: $multiplayer-user-icon-count-text-color;
+        }     
+    }
+}

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

@@ -825,6 +825,7 @@ div.red-ui-projects-dialog-ssh-public-key {
         margin-top: 0 !important;
         padding: 5px 10px;
         margin-bottom: 10px;
+        border-radius: 3px 3px 0px 0px;
     }
 }
 

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

@@ -0,0 +1,17 @@
+/**
+ * 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.
+ **/
+
+ $header-height: 48px;

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

@@ -15,4 +15,5 @@
 **/
 
 @import "colors";
+@import "sizes";
 @import "variables";

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

@@ -15,6 +15,7 @@
 **/
 
 @import "colors";
+@import "sizes";
 @import "variables";
 @import "mixins";
 
@@ -72,3 +73,5 @@
 @import "radialMenu";
 
 @import "tourGuide";
+
+@import "multiplayer";

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

@@ -36,7 +36,7 @@ ul.red-ui-sidebar-node-config-list {
         text-align: center;
     }
     .red-ui-palette-node {
-        overflow: hidden;
+        // overflow: hidden;
         cursor: default;
         &.selected {
             border-color: transparent;
@@ -113,6 +113,15 @@ ul.red-ui-sidebar-node-config-list li.red-ui-palette-node-config-type {
         margin-right: 5px;
     }
 }
+.red-ui-palette-node-config-invalid {
+    border-color: var(--red-ui-form-input-border-error-color)
+}
+.red-ui-palette-node-annotations {
+    position: absolute;
+    left: calc(100% - 15px);
+    top: -8px;
+    display: block;
+}
 .red-ui-sidebar-node-config-filter-info {
     position: absolute;
     top: 0;

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

@@ -16,6 +16,9 @@
 
     --red-ui-shadow: #{$shadow};
 
+    // Header Height
+    --red-ui-header-height: #{$header-height};
+
 // Main body text
     --red-ui-primary-text-color: #{$primary-text-color};
 // UI control label text
@@ -240,6 +243,7 @@
 
 
     --red-ui-header-background: #{$header-background};
+    --red-ui-header-accent: #{$header-accent};
     --red-ui-header-button-background-active: #{$header-button-background-active};
     --red-ui-header-menu-color: #{$header-menu-color};
     --red-ui-header-menu-color-disabled: #{$header-menu-color-disabled};
@@ -295,4 +299,7 @@
 
     --red-ui-tab-icon-color: #{$tab-icon-color};
 
+    @each $current-color in 1 2 3 4 5 {
+        --red-ui-user-profile-colors-#{"" + $current-color}: #{map-get($user-profile-colors, $current-color)};
+    }
 }