Merge branch 'master' into fix-group-unknown

Update packages/node_modules/@node-red/editor-client/src/js/nodes.js
Co-authored-by: Stephen McLaughlin <44235289+Steve-Mcl@users.noreply.github.com>
2025-03-01 10:36:34 +00:00 · 2022-10-26 00:52:34 +01:00 · 2022-10-26 00:51:41 +01:00 · 2022-10-26 00:40:47 +01:00 · 2022-10-16 23:10:57 +01:00 · 2022-10-16 22:47:34 +01:00
93 changed files with 1190 additions and 1635 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,6 +5,9 @@ on:
  release:
    types: [published]

+permissions:
+  contents: read
+
 jobs:
  generate:
    name: 'Update node-red-docker image'
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -6,8 +6,14 @@ on:
  pull_request:
    branches: [ master, dev ]

+permissions:
+  contents: read
+
 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:
--- a/.jshintrc
+++ b/.jshintrc
@@ -15,5 +15,5 @@
    "shadow": true,     // allow variable shadowing (re-use of names...)
    "sub": true,        // don't warn that foo['bar'] should be written as foo.bar
    "proto": true,      // allow setting of __proto__ in node < v0.12,
-    "esversion": 11      // allow es11(ES2020)
+    "esversion": 6      // allow es6
 }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,37 @@
+#### 3.0.2: Maintenance Release
+
+Editor
+
+ - Fix workspace chart bottom property (#3812) @bonanitech
+ - Update german translation (#3802) @Dennis14e
+ - Support color reset to the default in subflow and group (#3801) @kazuhitoyokoi
+ - Allow generateNodeNames to handle names containing regex control chars (#3817) @knolleary
+ - Hide scrollbars until they're needed (#3808) @bonanitech
+ - Include junctions/groups when exporting subflows plus related fixes (#3816) @knolleary
+ - remove console.log (#3820) @Steve-Mcl
+
+Runtime
+
+ - Register subflow module instance node with parent flow (#3818) @knolleary
+
+Nodes
+
+ - HTTP Request: Allow HTTP Headers not in spec (#3776) @hardillb
+
+#### 3.0.1: Maintenance Release
+
+Editor
+
+ - Allow codeEditor theme to be set even if `codeEditor` is not set in settings.js (#3794) @Steve-Mcl
+ - Sys info (diagnostics report) amendments (#3793) @Steve-Mcl
+ - Allow `mode` and `title` to be omitted in `options` argument for `createEditor` (#3791) @Steve-Mcl
+ - Fix focus issues (#3789) @Steve-Mcl
+ - Ensure all typedInput buttons have button type set (#3788) @knolleary
+ - Do not flag hasUsers=false nodes as unused in search (#3787) @knolleary
+ - Properly position quick-add dialog in all cases (#3786) @knolleary
+ - Ensure quick-add dialog does not obscure ghost node when shifted (#3785) @knolleary
+ - Remove use of Object.hasOwn (#3784) @knolleary
+
 #### 3.0.0: Milestone Release

 Editor
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "node-red",
-    "version": "3.1.0-beta.0",
+    "version": "3.0.2",
    "description": "Low-code programming for event-driven applications",
    "homepage": "http://nodered.org",
    "license": "Apache-2.0",
@@ -40,7 +40,7 @@
        "cookie-parser": "1.4.6",
        "cors": "2.8.5",
        "cronosjs": "1.7.1",
-        "denque": "2.0.1",
+        "denque": "2.1.0",
        "express": "4.18.1",
        "express-session": "1.17.3",
        "form-data": "4.0.0",
@@ -49,7 +49,7 @@
        "hash-sum": "2.0.0",
        "hpagent": "1.0.0",
        "https-proxy-agent": "5.0.1",
-        "i18next": "21.8.14",
+        "i18next": "21.8.16",
        "iconv-lite": "0.6.3",
        "is-utf8": "0.2.1",
        "js-yaml": "4.1.0",
@@ -76,7 +76,7 @@
        "semver": "7.3.7",
        "tar": "6.1.11",
        "tough-cookie": "4.0.0",
-        "uglify-js": "3.16.2",
+        "uglify-js": "3.16.3",
        "uuid": "8.3.2",
        "ws": "7.5.6",
        "xml2js": "0.4.23"
@@ -85,7 +85,7 @@
        "bcrypt": "5.0.1"
    },
    "devDependencies": {
-        "dompurify": "2.3.9",
+        "dompurify": "2.3.10",
        "grunt": "1.5.3",
        "grunt-chmod": "~1.1.1",
        "grunt-cli": "~1.4.3",
@@ -114,7 +114,7 @@
        "node-red-node-test-helper": "^0.3.0",
        "nodemon": "2.0.19",
        "proxy": "^1.0.2",
-        "sass": "1.53.0",
+        "sass": "1.54.2",
        "should": "13.2.3",
        "sinon": "11.1.2",
        "stoppable": "^1.1.0",
--- a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
@@ -327,9 +327,8 @@ module.exports = {
                        themeContext.header.url = themePlugin.header.url || themeContext.header.url
                    }
                }
-                if(theme.codeEditor) {
-                    theme.codeEditor.options = Object.assign({}, themePlugin.monacoOptions, theme.codeEditor.options);
-                }
+                theme.codeEditor = theme.codeEditor || {}
+                theme.codeEditor.options = Object.assign({}, themePlugin.monacoOptions, theme.codeEditor.options);
            }
            activeThemeInitialised = true;
        }
--- a/packages/node_modules/@node-red/editor-api/package.json
+++ b/packages/node_modules/@node-red/editor-api/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@node-red/editor-api",
-    "version": "3.1.0-beta.0",
+    "version": "3.0.2",
    "license": "Apache-2.0",
    "main": "./lib/index.js",
    "repository": {
@@ -16,8 +16,8 @@
        }
    ],
    "dependencies": {
-        "@node-red/util": "3.1.0-beta.0",
-        "@node-red/editor-client": "3.1.0-beta.0",
+        "@node-red/util": "3.0.2",
+        "@node-red/editor-client": "3.0.2",
        "bcryptjs": "2.4.3",
        "body-parser": "1.20.0",
        "clone": "2.1.2",
--- a/packages/node_modules/@node-red/editor-client/locales/de/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/de/editor.json
@@ -105,7 +105,7 @@
            "search": "Flows durchsuchen",
            "searchInput": "Flows durchsuchen",
            "subflows": "Subflow",
-            "createSubflow": "Subflow",
+            "createSubflow": "Hinzufügen",
            "selectionToSubflow": "Auswahl in Subflow umwandeln",
            "flows": "Flow",
            "add": "Hinzufügen",
@@ -152,7 +152,8 @@
        "zoom-in": "Vergrößern",
        "search-flows": "Flows durchsuchen",
        "search-prev": "Vorherige",
-        "search-next": "Nächste"
+        "search-next": "Nächste",
+        "search-counter": "\"__term__\" __result__ von __count__"
    },
    "user": {
        "loggedInAs": "Angemeldet als __name__",
@@ -168,7 +169,11 @@
        }
    },
    "notification": {
-        "warning": "<strong>Warnung:</strong> __message__",
+        "state": {
+            "flowsStopped": "Flows gestoppt",
+            "flowsStarted": "Flows gestartet"
+        },
+        "warning": "<strong>Warnung</strong>: __message__",
        "warnings": {
            "undeployedChanges": "Node hat nicht übernommene (deploy) Änderungen",
            "nodeActionDisabled": "Node-Aktionen deaktiviert",
@@ -177,15 +182,15 @@
            "missing-modules": "<p>Flows angehalten aufgrund fehlender Module</p>",
            "safe-mode": "<p>Flows sind im abgesicherten Modus gestoppt.</p><p>Flows können bearbeitet und übernommen (deploy) werden, um sie neu zu starten.</p>",
            "restartRequired": "Node-RED muss neu gestartet werden, damit die Module nach Upgrade aktiviert werden",
-            "credentials_load_failed": "<p>Flows gestoppt, da die Berechtigungen nicht entschlüsselt werden konnten.</p><p>Die Datei mit dem Flow-Berechtigungen ist verschlüsselt, aber der Schlüssel des Projekts fehlt oder ist ungültig.</p>",
-            "credentials_load_failed_reset": "<p>Die Berechtigungen konnten nicht entschlüsselt werden.</p><p>Die Datei mit den Flow-Berechtigungen ist verschlüsselt, aber der Schlüssel des Projekts fehlt oder ist ungültig.</p><p>Die Datei mit den Flow-Berechtigungen wird bei der nächsten Übernahme (deploy) zurückgesetzt. Alle vorhandenen Flow-Berechtigungen werden gelöscht.</p>",
+            "credentials_load_failed": "<p>Flows gestoppt, da die Credentials nicht entschlüsselt werden konnten.</p><p>Die Datei mit den Flow-Credentials ist verschlüsselt, aber der Schlüssel des Projekts fehlt oder ist ungültig.</p>",
+            "credentials_load_failed_reset": "<p>Die Credentials konnten nicht entschlüsselt werden.</p><p>Die Datei mit den Flow-Credentials ist verschlüsselt, aber der Schlüssel des Projekts fehlt oder ist ungültig.</p><p>Die Datei mit den Flow-Credentials wird bei der nächsten Übernahme (deploy) zurückgesetzt. Alle vorhandenen Flow-Credentials werden gelöscht.</p>",
            "missing_flow_file": "<p>Die Flow-Datei des Projekts wurde nicht gefunden.</p><p>Das Projekt ist nicht mit einer Flow-Datei konfiguriert.</p>",
            "missing_package_file": "<p>Die Paket-Datei des Projekts wurde nicht gefunden.</p><p>In dem Projekt fehlt die 'package.json'-Datei.</p>",
            "project_empty": "<p>Das Projekt ist leer.</p><p>Soll ein Standardsatz an Projektdateien erstellen werden?<br/>Andernfalls müssen die Dateien manuell außerhalb des Editors dem Projekt hinzugefügt werden.</p>",
            "project_not_found": "<p>Das Projekt '__project__' wurde nicht gefunden.</p>",
            "git_merge_conflict": "<p>Der automatische Merge der Änderungen ist fehlgeschlagen.</p><p>Die Merge-Konflikte müssen behoben und die Ergebnisse ins Repository übertragen werden (commit).</p>"
        },
-        "error": "<strong>Fehler:</strong> __message__",
+        "error": "<strong>Fehler</strong>: __message__",
        "errors": {
            "lostConnection": "Verbindung zum Server verloren. Verbindung wird erneut hergestellt ...",
            "lostConnectionReconnect": "Verbindung zum Server verloren. Wiederherstellung der Verbindung in __time__s.",
@@ -203,7 +208,7 @@
            "pull": "Projekt '__project__' erneut geladen",
            "revert": "Änderungen im Projekt '__project__' rückgängig gemacht",
            "merge-complete": "Git-Merge abgeschlossen",
-            "setupCredentials": "Berechtigungen einrichten",
+            "setupCredentials": "Credentials einrichten",
            "setupProjectFiles": "Projektdateien einrichten",
            "no": "Nein, Danke",
            "createDefault": "Standardprojektdateien erstellen",
@@ -211,7 +216,7 @@
        },
        "label": {
            "manage-project-dep": "Projektabhängigkeiten verwalten",
-            "setup-cred": "Berechtigungen einrichten",
+            "setup-cred": "Credentials einrichten",
            "setup-project": "Projektdateien einrichten",
            "create-default-package": "Standardpaketdatei erstellen",
            "no-thanks": "Nein, Danke",
@@ -295,6 +300,10 @@
        "modifiedFlowsDesc": "Übernimmt nur Flows, die geänderte Nodes enthalten",
        "modifiedNodes": "Geänderte Nodes",
        "modifiedNodesDesc": "Übernimmt nur Nodes, die sich geändert haben",
+        "startFlows": "Start",
+        "startFlowsDesc": "Flows starten",
+        "stopFlows": "Stop",
+        "stopFlowsDesc": "Flows stoppen",
        "restartFlows": "Flows neustarten",
        "restartFlowsDesc": "Startet die aktuell übernommenen Flows (ohne vorheriges Deploy)",
        "successfulDeploy": "Erfolgreich übernommen (deploy)",
@@ -376,7 +385,7 @@
        "confirmDelete": "Sind Sie sicher mit dem Löschen dieses Subflows?",
        "info": "Beschreibung",
        "category": "Kategorie",
-        "module": "Module",
+        "module": "Modul",
        "license": "Lizenz",
        "licenseNone": "Keine",
        "licenseOther": "Andere",
@@ -434,7 +443,7 @@
        "icon": "Icon",
        "inputType": "Eingangstyp",
        "selectType": "Wähle Typen ...",
-        "loadCredentials": "Lade Node-Berechtigungen",
+        "loadCredentials": "Lade Node-Credentials",
        "inputs": {
            "input": "Eingang",
            "select": "Auswahl",
@@ -450,7 +459,7 @@
            "json": "JSON",
            "bin": "buffer",
            "env": "Umgebungsvariable",
-            "cred": "Berechtigung"
+            "cred": "Credentials"
        },
        "menu": {
            "input": "Eingang",
@@ -470,7 +479,7 @@
        "errors": {
            "scopeChange": "Wenn Sie den Geltungsbereich (scope) ändern, wird er für Nodes in anderen Flows nicht verfügbar sein",
            "invalidProperties": "Ungültige Eigenschaften:",
-            "credentialLoadFailed": "Laden der Node-Berechtigungen fehlgeschlagen"
+            "credentialLoadFailed": "Laden der Node-Credentials fehlgeschlagen"
        }
    },
    "keyboard": {
@@ -683,7 +692,8 @@
            "showHelp": "Hilfe zeigen",
            "showInOutline": "Zeige im Editor",
            "showTopics": "Zeige Hilfethemen",
-            "noHelp": "Kein Hilfethema ausgewählt"
+            "noHelp": "Kein Hilfethema ausgewählt",
+            "changeLog": "Änderungsprotokoll"
        },
        "config": {
            "name": "Konfigurations-Node",
@@ -737,7 +747,7 @@
                "addToProject": "Zu Projekt hinzufügen",
                "files": "Dateien",
                "flow": "Flow",
-                "credentials": "Berechtigungen",
+                "credentials": "Credentials",
                "package": "Paket",
                "packageCreate": "Datei wird erstellt beim Speichern der Änderungen",
                "fileNotExist": "Datei existiert nicht",
@@ -750,7 +760,7 @@
                "changeTheEncryptionKey": "Schlüssel ändern",
                "currentKey": "Aktueller Schlüssel",
                "newKey": "Neuer Schlüssel",
-                "credentialsAlert": "Dadurch werden alle vorhandenen Berechtigungen gelöscht",
+                "credentialsAlert": "Dadurch werden alle vorhandenen Credentials gelöscht",
                "versionControl": "Versionsverwaltung (Git)",
                "branches": "Branches",
                "noBranches": "Keine Branches",
@@ -886,7 +896,7 @@
            "date": "timestamp",
            "jsonata": "JSONata",
            "env": "Umgebungsvariable",
-            "cred": "Berechtigung"
+            "cred": "Credentials"
        }
    },
    "editableList": {
@@ -1026,7 +1036,7 @@
            "passphrase": "Passphrase",
            "ssh-key-desc": "Bevor Sie ein Repository über SSH lokal klonen können, müssen Sie einen SSH-Schlüssel hinzufügen, um auf diesen zugreifen zu können",
            "ssh-key-add": "SSH-Schlüssel hinzufügen",
-            "credential-key": "Schlüssel für Berechtigungen",
+            "credential-key": "Schlüssel für Credentials",
            "cant-get-ssh-key": "Fehler! Der ausgewählte SSH-Schlüsselpfad kann nicht abgerufen werden",
            "already-exists2": "bereits vorhanden",
            "git-error": "Git-Fehler",
@@ -1038,27 +1048,27 @@
            "create": "Erstellen Sie Ihre Projektdateien",
            "desc0": "Ein Projekt enthält Ihre Flow-Dateien, eine README-Datei und die 'package.json'-Datei.",
            "desc1": "Es kann alle anderen Dateien enthalten, die im Git-Repository verwaltet werden sollen.",
-            "desc2": "Ihre vorhandenen Flow- und Berechtigungs-Dateien werden in das Projekt kopiert.",
+            "desc2": "Ihre vorhandenen Flow- und Credential-Dateien werden in das Projekt kopiert.",
            "flow-file": "Flow-Datei",
-            "credentials-file": "Datei mit Berechtigungen"
+            "credentials-file": "Datei mit Credentials"
        },
        "encryption-config": {
-            "setup": "Einrichtung der Verschlüsselung Ihrer Datei mit den Berechtigungen",
-            "desc0": "Die Datei mit den Flow-Berechtigungen kann verschlüsselt werden, um ihren Inhalt zu schützen.",
-            "desc1": "Wenn Sie diese Berechtigungen in einem öffentlichen Repository speichern möchten, müssen Sie sie mit einen geheimen Schlüsselausdruck verschlüsseln.",
-            "desc2": "Die Datei mit den Flow-Berechtigungen ist derzeit nicht verschlüsselt.",
+            "setup": "Einrichtung der Verschlüsselung Ihrer Datei mit den Credentials",
+            "desc0": "Die Datei mit den Flow-Credentials kann verschlüsselt werden, um ihren Inhalt zu schützen.",
+            "desc1": "Wenn Sie diese Credentials in einem öffentlichen Repository speichern möchten, müssen Sie sie mit einen geheimen Schlüsselausdruck verschlüsseln.",
+            "desc2": "Die Datei mit den Flow-Credentials ist derzeit nicht verschlüsselt.",
            "desc3": "D.h. ihr Inhalt (z.B. Passwörter und Zugriffs-Tokens) kann von jedem mit Zugriff auf die Datei gelesen werden.",
-            "desc4": "Wenn Sie diese Berechtigungen in einen öffentlichen Repository speichern möchten, müssen Sie diese verschlüsseln, indem Sie einen geheimen Schlüsselausdruck eingeben.",
-            "desc5": "Ihre Datei mit den Flow-Berechtigungen wird derzeit mit dem Eintrag 'credentialSecret' Ihrer Einstellungsdatei als Schlüssel verschlüsselt.",
-            "desc6": "Die Datei mit den Flow-Berechtigungen wird derzeit mit einem vom System generierten Schlüssel verschlüsselt. Sie sollten einen neuen geheimen Schlüssel für dieses Projekt vorgeben.",
+            "desc4": "Wenn Sie diese Credentials in einen öffentlichen Repository speichern möchten, müssen Sie diese verschlüsseln, indem Sie einen geheimen Schlüsselausdruck eingeben.",
+            "desc5": "Ihre Datei mit den Flow-Credentials wird derzeit mit dem Eintrag 'credentialSecret' Ihrer Einstellungsdatei als Schlüssel verschlüsselt.",
+            "desc6": "Die Datei mit den Flow-Credentials wird derzeit mit einem vom System generierten Schlüssel verschlüsselt. Sie sollten einen neuen geheimen Schlüssel für dieses Projekt vorgeben.",
            "desc7": "Der Schlüssel wird separat von den Projektdateien gespeichert. Sie müssen den Schlüssel angeben, damit dieses Projekt auch in einem anderen Node-RED-System verwendet werden kann.",
-            "credentials": "Berechtigung",
+            "credentials": "Credentials",
            "enable": "Verschlüsselung aktivieren",
            "disable": "Verschlüsselung deaktivieren",
            "disabled": "deaktiviert",
            "copy": "Vorhandenen Schlüssel ersetzen",
            "use-custom": "Eigenen Schlüssel verwenden",
-            "desc8": "Die Datei mit den Berechtigungen wird nicht verschlüsselt, und ihr Inhalt kann leicht gelesen werden",
+            "desc8": "Die Datei mit den Credentials wird nicht verschlüsselt und ihr Inhalt kann leicht gelesen werden",
            "create-project-files": "Projektdateien erstellen",
            "create-project": "Projekt erstellen",
            "already-exists": "bereits vorhanden",
@@ -1083,12 +1093,12 @@
            "desc": "Beschreibung",
            "opt": "Optional",
            "flow-file": "Flow-Datei",
-            "credentials": "Berechtigungen",
+            "credentials": "Credentials",
            "enable-encryption": "Verschlüsselung aktivieren",
            "disable-encryption": "Verschlüsselung deaktivieren",
            "encryption-key": "Schlüssel",
-            "desc0": "Eine Floskel, mit der Sie Ihre Berechtigungen schützen",
-            "desc1": "Die Datei mit den Berechtigungen wird nicht verschlüsselt, und ihr Inhalt kann leicht gelesen werden",
+            "desc0": "Eine Ausdruck, mit der Sie Ihre Credentials schützen",
+            "desc1": "Die Datei mit den Credentials wird nicht verschlüsselt und ihr Inhalt kann leicht gelesen werden",
            "git-url": "Git-Repository-URL",
            "protocols": "https://, ssh:// oder file://",
            "auth-failed": "Authentifizierung fehlgeschlagen",
@@ -1098,7 +1108,7 @@
            "passphrase": "Passphrase",
            "desc2": "Bevor Sie ein Repository über SSH klonen können, müssen Sie einen SSH-Schlüssel hinzufügen, um auf diesen zu zugreifen",
            "add-ssh-key": "Einen SSH-Schlüssel hinzufügen",
-            "credentials-encryption-key": "Schlüssel für Berechtigungen",
+            "credentials-encryption-key": "Schlüssel für Credentials",
            "already-exists-2": "bereits vorhanden",
            "git-error": "Git-Fehler",
            "con-failed": "Verbindung fehlgeschlagen",
@@ -1156,7 +1166,8 @@
    "tourGuide": {
        "takeATour": "Tour starten",
        "start": "Start",
-        "next": "Nächste"
+        "next": "Nächste",
+        "welcomeTours": "Welcome Tours"
    },
    "diagnostics": {
        "title": "System-Informationen"
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -57,24 +57,18 @@
        "addFlowToRight": "Add flow to the right",
        "hideFlow": "Hide flow",
        "hideOtherFlows": "Hide other flows",
-        "showAllFlows": "Show all flows (__count__ hidden)",
+        "showAllFlows": "Show all flows",
        "hideAllFlows": "Hide all flows",
        "hiddenFlows": "List __count__ hidden flow",
        "hiddenFlows_plural": "List __count__ hidden flows",
-        "showLastHiddenFlow": "Reopen hidden flow",
+        "showLastHiddenFlow": "Show last hidden flow",
        "listFlows": "List flows",
        "listSubflows": "List subflows",
        "status": "Status",
        "enabled": "Enabled",
        "disabled": "Disabled",
        "info": "Description",
-        "selectNodes": "Click nodes to select",
-        "enableFlow": "Enable flow",
-        "disableFlow": "Disable flow",
-        "lockFlow": "Lock flow",
-        "unlockFlow": "Unlock flow",
-        "moveToStart": "Move flow to start",
-        "moveToEnd": "Move flow to end"
+        "selectNodes": "Click nodes to select"
    },
    "menu": {
        "label": {
@@ -689,9 +683,7 @@
            "empty": "empty",
            "globalConfig": "Global Configuration Nodes",
            "triggerAction": "Trigger action",
-            "find": "Find in workspace",
-            "copyItemUrl": "Copy item url",
-	    "copyURL2Clipboard": "Copied url to clipboard"
+            "find": "Find in workspace"
        },
        "help": {
            "name": "Help",
@@ -944,6 +936,9 @@
            "invalid-expr": "Invalid JSONata expression:\n  __message__",
            "invalid-msg": "Invalid example JSON message:\n  __message__",
            "context-unsupported": "Cannot test context functions\n $flowContext or $globalContext",
+            "env-unsupported": "Cannot test $env function",
+            "moment-unsupported": "Cannot test $moment function",
+            "clone-unsupported": "Cannot test $clone function",
            "eval": "Error evaluating expression:\n  __message__"
        }
    },
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -683,8 +683,7 @@
            "empty": "空",
            "globalConfig": "グローバル設定ノード",
            "triggerAction": "アクションを実行",
-            "find": "ワークスペース内を検索",
-	    "copyURL2Clipboard": "URLをクリップボードにコピーしました"
+            "find": "ワークスペース内を検索"
        },
        "help": {
            "name": "ヘルプ",
@@ -936,8 +935,11 @@
        "errors": {
            "invalid-expr": "不正なJSONata式:\n  __message__",
            "invalid-msg": "不正なJSONメッセージ例:\n  __message__",
-            "context-unsupported": "$flowContext や $globalContextの\nコンテキスト機能をテストできません",
-            "eval": "表現評価エラー:\n  __message__"
+            "context-unsupported": "$flowContext や $globalContextの\nコンテキスト関数をテストできません",
+            "env-unsupported": "$env関数はテストできません",
+            "moment-unsupported": "$moment関数はテストできません",
+            "clone-unsupported": "$clone関数はテストできません",
+            "eval": "式評価エラー:\n  __message__"
        }
    },
    "monaco": {
@@ -1169,8 +1171,7 @@
        "takeATour": "ツアーを開始",
        "start": "開始",
        "next": "次へ",
-        "welcomeTours": "ウェルカムツアー",
-        "tours": "ツアー"
+        "welcomeTours": "ウェルカムツアー"
    },
    "diagnostics": {
        "title": "システム情報"
@@ -1349,8 +1350,6 @@
        "show-project-settings": "プロジェクト設定を表示",
        "show-version-control-tab": "バージョンコントロールタブを表示",
        "start-flows": "フローを開始",
-        "stop-flows": "フローを停止",
-	"copy-item-url": "要素のURLをコピー",
-	"copy-item-edit-url": "要素の編集URLをコピー"
+        "stop-flows": "フローを停止"
    }
 }
--- a/packages/node_modules/@node-red/editor-client/package.json
+++ b/packages/node_modules/@node-red/editor-client/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@node-red/editor-client",
-    "version": "3.1.0-beta.0",
+    "version": "3.0.2",
    "license": "Apache-2.0",
    "repository": {
        "type": "git",
--- a/packages/node_modules/@node-red/editor-client/src/js/history.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/history.js
@@ -14,7 +14,7 @@
 * limitations under the License.
 **/

-/**
+/** 
 * An API for undo / redo history buffer
 * @namespace RED.history
 */
@@ -434,9 +434,7 @@ RED.history = (function() {

                if (ev.node.type === 'tab' && ev.changes.hasOwnProperty('disabled')) {
                    $("#red-ui-tab-"+(ev.node.id.replace(".","-"))).toggleClass('red-ui-workspace-disabled',!!ev.node.disabled);
-                }
-                if (ev.node.type === 'tab' && ev.changes.hasOwnProperty('locked')) {
-                    $("#red-ui-tab-"+(ev.node.id.replace(".","-"))).toggleClass('red-ui-workspace-locked',!!ev.node.locked);
+                    $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!ev.node.disabled);
                }
                if (ev.subflow) {
                    inverseEv.subflow = {};
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -19,6 +19,7 @@
 * @namespace RED.nodes
 */
 RED.nodes = (function() {
+
    var PORT_TYPE_INPUT = 1;
    var PORT_TYPE_OUTPUT = 0;

@@ -62,7 +63,6 @@ RED.nodes = (function() {
            defaults: {
                label: {value:""},
                disabled: {value: false},
-                locked: {value: false},
                info: {value: ""},
                env: {value: []}
            }
@@ -575,48 +575,15 @@ RED.nodes = (function() {
        }
    }

-    const nodeProxyHandler = {
-        get(node, prop) {
-            if (prop === '__isProxy__') {
-                return true
-            } else if (prop == '__node__') {
-                return node
-            }
-            return node[prop]
-        },
-        set(node, prop, value) {
-            if (node.z && (RED.nodes.workspace(node.z)?.locked || RED.nodes.subflow(node.z)?.locked)) {
-                if (
-                    node._def.defaults[prop] ||
-                    prop === 'z' ||
-                    prop === 'l' ||
-                    prop === 'd' ||
-                    (prop === 'changed' && (!!node.changed) !== (!!value)) || // jshint ignore:line
-                    ((prop === 'x' || prop === 'y') && !node.resize && node.type !== 'group')
-                ) {
-                    throw new Error(`Cannot modified property '${prop}' of locked object '${node.type}:${node.id}'`)
-                }
-            }
-            node[prop] = value;
-            return true
-        }
-    }

    function addNode(n) {
-        let newNode
-        if (!n.__isProxy__) {
-            newNode = new Proxy(n, nodeProxyHandler)
-        } else {
-            newNode = n
-        }
-
        if (n.type.indexOf("subflow") !== 0) {
            n["_"] = n._def._;
        } else {
            var subflowId = n.type.substring(8);
            var sf = RED.nodes.subflow(subflowId);
            if (sf) {
-                sf.instances.push(newNode);
+                sf.instances.push(sf);
            }
            n["_"] = RED._;
        }
@@ -633,13 +600,12 @@ RED.nodes = (function() {
                });
                n.i = nextId+1;
            }
-            allNodes.addNode(newNode);
+            allNodes.addNode(n);
            if (!nodeLinks[n.id]) {
                nodeLinks[n.id] = {in:[],out:[]};
            }
        }
-        RED.events.emit('nodes:add',newNode);
-        return newNode
+        RED.events.emit('nodes:add',n);
    }
    function addLink(l) {
        if (nodeLinks[l.source.id]) {
@@ -902,14 +868,7 @@ RED.nodes = (function() {
            var node;

            if (allNodes.hasTab(id)) {
-                removedNodes = allNodes.getNodes(id).filter(n => {
-                    if (n.type === 'junction') {
-                        removedJunctions.push(n)
-                        return false
-                    } else {
-                        return true
-                    }
-                })
+                removedNodes = allNodes.getNodes(id).slice()
            }
            for (i in configNodes) {
                if (configNodes.hasOwnProperty(i)) {
@@ -919,6 +878,7 @@ RED.nodes = (function() {
                    }
                }
            }
+            removedJunctions = RED.nodes.junctions(id)

            for (i=0;i<removedNodes.length;i++) {
                var result = removeNode(removedNodes[i].id);
@@ -1086,9 +1046,6 @@ RED.nodes = (function() {
        node.type = n.type;
        for (var d in n._def.defaults) {
            if (n._def.defaults.hasOwnProperty(d)) {
-                if (d === 'locked' && !n.locked) {
-                    continue
-                }
                node[d] = n[d];
            }
        }
@@ -1403,6 +1360,10 @@ RED.nodes = (function() {
                            exportedConfigNodes[n.id] = true;
                        }
                    });
+
+                    subflowSet = subflowSet.concat(RED.nodes.junctions(subflowId))
+                    subflowSet = subflowSet.concat(RED.nodes.groups(subflowId))
+
                    var exportableSubflow = createExportableNodeSet(subflowSet, exportedIds, exportedSubflows, exportedConfigNodes);
                    nns = exportableSubflow.concat(nns);
                }
@@ -2004,7 +1965,7 @@ RED.nodes = (function() {
                        }
                    }
                } else {
-                    const keepNodesCurrentZ = reimport && n.z && RED.workspaces.contains(n.z)
+                    const keepNodesCurrentZ = reimport && n.z && (RED.workspaces.contains(n.z) || RED.nodes.subflow(n.z))
                    if (!keepNodesCurrentZ && n.z && !workspace_map[n.z] && !subflow_map[n.z]) {
                        n.z = activeWorkspace;
                    }
@@ -2106,7 +2067,7 @@ RED.nodes = (function() {
                        node.id = getID();
                    } else {
                        node.id = n.id;
-                        const keepNodesCurrentZ = reimport && node.z && RED.workspaces.contains(node.z)
+                        const keepNodesCurrentZ = reimport && node.z && (RED.workspaces.contains(node.z) || RED.nodes.subflow(node.z))
                        if (!keepNodesCurrentZ && (node.z == null || (!workspace_map[node.z] && !subflow_map[node.z]))) {
                            if (createMissingWorkspace) {
                                if (missingWorkspace === null) {
@@ -2354,6 +2315,19 @@ RED.nodes = (function() {
            if (n.g && !new_group_set.has(n.g)) {
                delete n.g;
            }
+            n.nodes = n.nodes.map(function(id) {
+                return node_map[id];
+            })
+            // Just in case the group references a node that doesn't exist for some reason
+            n.nodes = n.nodes.filter(function(v) {
+                if (v) {
+                    // Repair any nodes that have forgotten they are in this group
+                    if (v.g !== n.id) {
+                        v.g = n.id;
+                    }
+                }
+                return !!v
+            });
            if (!n.g) {
                groupDepthMap[n.id] = 0;
            }
@@ -2376,22 +2350,21 @@ RED.nodes = (function() {
            return groupDepthMap[A.id] - groupDepthMap[B.id];
        });
        for (i=0;i<new_groups.length;i++) {
-            new_groups[i] = addGroup(new_groups[i]);
-            node_map[new_groups[i].id] = new_groups[i]
+            n = new_groups[i];
+            addGroup(n);
        }

        for (i=0;i<new_junctions.length;i++) {
-            new_junctions[i] = addJunction(new_junctions[i]);
-            node_map[new_junctions[i].id] = new_junctions[i]
+            var junction = new_junctions[i];
+            addJunction(junction);
        }


        // Now the nodes have been fully updated, add them.
        for (i=0;i<new_nodes.length;i++) {
-            new_nodes[i] = addNode(new_nodes[i])
-            node_map[new_nodes[i].id] = new_nodes[i]
+            var node = new_nodes[i];
+            addNode(node);
        }
-
        // Finally validate them all.
        // This has to be done after everything is added so that any checks for
        // dependent config nodes will pass
@@ -2399,39 +2372,6 @@ RED.nodes = (function() {
            var node = new_nodes[i];
            RED.editor.validateNode(node);
        }
-        const lookupNode = (id) => {
-            const mappedNode = node_map[id]
-            if (!mappedNode) {
-                return null
-            }
-            if (mappedNode.__isProxy__) {
-                return mappedNode
-            } else {
-                return node_map[mappedNode.id]
-            }
-        }
-        // Update groups to reference proxy node objects
-        for (i=0;i<new_groups.length;i++) {
-            n = new_groups[i];
-            // bypass the proxy in case the flow is locked
-            n.__node__.nodes = n.nodes.map(lookupNode)
-            // Just in case the group references a node that doesn't exist for some reason
-            n.__node__.nodes = n.nodes.filter(function(v) {
-                if (v) {
-                    // Repair any nodes that have forgotten they are in this group
-                    if (v.g !== n.id) {
-                        v.g = n.id;
-                    }
-                }
-                return !!v
-            });
-        }
-
-        // Update links to use proxy node objects
-        for (i=0;i<new_links.length;i++) {
-            new_links[i].source = lookupNode(new_links[i].source.id) || new_links[i].source
-            new_links[i].target = lookupNode(new_links[i].target.id) || new_links[i].target
-        }

        RED.workspaces.refresh();

@@ -2585,14 +2525,10 @@ RED.nodes = (function() {
    }

    function addGroup(group) {
-        if (!group.__isProxy__) {
-            group = new Proxy(group, nodeProxyHandler)
-        }
        groupsByZ[group.z] = groupsByZ[group.z] || [];
        groupsByZ[group.z].push(group);
        groups[group.id] = group;
        RED.events.emit("groups:add",group);
-        return group
    }
    function removeGroup(group) {
        var i = groupsByZ[group.z].indexOf(group);
@@ -2613,9 +2549,6 @@ RED.nodes = (function() {
    }

    function addJunction(junction) {
-        if (!junction.__isProxy__) {
-            junction = new Proxy(junction, nodeProxyHandler)
-        }
        junctionsByZ[junction.z] = junctionsByZ[junction.z] || []
        junctionsByZ[junction.z].push(junction)
        junctions[junction.id] = junction;
@@ -2623,7 +2556,6 @@ RED.nodes = (function() {
            nodeLinks[junction.id] = {in:[],out:[]};
        }
        RED.events.emit("junctions:add", junction)
-        return junction
    }
    function removeJunction(junction) {
        var i = junctionsByZ[junction.z].indexOf(junction)
@@ -2808,6 +2740,7 @@ RED.nodes = (function() {
                    }
                });

+                const nodeGroupMap = {}
                var replaceNodeIds = Object.keys(replaceNodes);
                if (replaceNodeIds.length > 0) {
                    var reimportList = [];
@@ -2818,6 +2751,12 @@ RED.nodes = (function() {
                        } else {
                            allNodes.removeNode(n);
                        }
+                        if (n.g) {
+                            // reimporting a node *without* including its group object
+                            // will cause the g property to be cleared. Cache it
+                            // here so we can restore it
+                            nodeGroupMap[n.id] = n.g
+                        }
                        reimportList.push(convertNode(n));
                        RED.events.emit('nodes:remove',n);
                    });
@@ -2839,6 +2778,18 @@ RED.nodes = (function() {
                    var newNodeMap = {};
                    result.nodes.forEach(function(n) {
                        newNodeMap[n.id] = n;
+                        if (nodeGroupMap[n.id]) {
+                            // This node is in a group - need to substitute the
+                            // node reference inside the group
+                            n.g = nodeGroupMap[n.id]
+                            const group = RED.nodes.group(n.g)
+                            if (group) {
+                                var index = group.nodes.findIndex(gn => gn.id === n.id)
+                                if (index > -1) {
+                                    group.nodes[index] = n
+                                }
+                            }
+                        }
                    });
                    RED.nodes.eachLink(function(l) {
                        if (newNodeMap.hasOwnProperty(l.source.id)) {
@@ -2899,7 +2850,7 @@ RED.nodes = (function() {
        },
        addWorkspace: addWorkspace,
        removeWorkspace: removeWorkspace,
-        getWorkspaceOrder: function() { return [...workspacesOrder] },
+        getWorkspaceOrder: function() { return workspacesOrder },
        setWorkspaceOrder: function(order) { workspacesOrder = order; },
        workspace: getWorkspace,

--- a/packages/node_modules/@node-red/editor-client/src/js/red.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/red.js
@@ -249,35 +249,8 @@ var RED = (function() {
                        RED.nodes.import(nodes.flows);
                        RED.nodes.dirty(false);
                        RED.view.redraw(true);
-                        if (/^#(flow|node|group)\/.+$/.test(currentHash)) {
-                            const hashParts = currentHash.split('/')
-                            const showEditDialog = hashParts.length > 2 && hashParts[2] === 'edit'
-                            if (hashParts[0] === '#flow') {
-                                RED.workspaces.show(hashParts[1], true);
-                                if (showEditDialog) {
-                                    RED.workspaces.edit()
-                                }
-                            } else if (hashParts[0] === '#node') {
-                                const nodeToShow = RED.nodes.node(hashParts[1])
-                                if (nodeToShow) {
-                                    setTimeout(() => {
-                                        RED.view.reveal(nodeToShow.id)
-                                        window.location.hash = currentHash
-                                        if (showEditDialog) {
-                                            RED.editor.edit(nodeToShow)
-                                        }
-                                    }, 50)
-                                }
-                            } else if (hashParts[0] === '#group') {
-                                const nodeToShow = RED.nodes.group(hashParts[1])
-                                if (nodeToShow) {
-                                    RED.view.reveal(nodeToShow.id)
-                                    window.location.hash = currentHash
-                                    if (showEditDialog) {
-                                        RED.editor.editGroup(nodeToShow)
-                                    }
-                                }
-                            }
+                        if (/^#flow\/.+$/.test(currentHash)) {
+                            RED.workspaces.show(currentHash.substring(6),true);
                        }
                        if (RED.workspaces.count() > 0) {
                            const hiddenTabs = JSON.parse(RED.settings.getLocal("hiddenTabs")||"{}");
@@ -668,6 +641,11 @@ var RED = (function() {
        ]});

        menuOptions.push({id:"menu-item-arrange-menu", label:RED._("menu.label.arrange"), options: [
+            {id: "menu-item-view-tools-move-to-back", label:RED._("menu.label.moveToBack"), disabled: true, onselect: "core:move-selection-to-back"},
+            {id: "menu-item-view-tools-move-to-front", label:RED._("menu.label.moveToFront"), disabled: true, onselect: "core:move-selection-to-front"},
+            {id: "menu-item-view-tools-move-backwards", label:RED._("menu.label.moveBackwards"), disabled: true, onselect: "core:move-selection-backwards"},
+            {id: "menu-item-view-tools-move-forwards", label:RED._("menu.label.moveForwards"), disabled: true, onselect: "core:move-selection-forwards"},
+            null,
            {id: "menu-item-view-tools-align-left", label:RED._("menu.label.alignLeft"), disabled: true, onselect: "core:align-selection-to-left"},
            {id: "menu-item-view-tools-align-center", label:RED._("menu.label.alignCenter"), disabled: true, onselect: "core:align-selection-to-center"},
            {id: "menu-item-view-tools-align-right", label:RED._("menu.label.alignRight"), disabled: true, onselect: "core:align-selection-to-right"},
@@ -677,12 +655,7 @@ var RED = (function() {
            {id: "menu-item-view-tools-align-bottom", label:RED._("menu.label.alignBottom"), disabled: true, onselect: "core:align-selection-to-bottom"},
            null,
            {id: "menu-item-view-tools-distribute-horizontally", label:RED._("menu.label.distributeHorizontally"), disabled: true, onselect: "core:distribute-selection-horizontally"},
-            {id: "menu-item-view-tools-distribute-veritcally", label:RED._("menu.label.distributeVertically"), disabled: true, onselect: "core:distribute-selection-vertically"},
-            null,
-            {id: "menu-item-view-tools-move-to-back", label:RED._("menu.label.moveToBack"), disabled: true, onselect: "core:move-selection-to-back"},
-            {id: "menu-item-view-tools-move-to-front", label:RED._("menu.label.moveToFront"), disabled: true, onselect: "core:move-selection-to-front"},
-            {id: "menu-item-view-tools-move-backwards", label:RED._("menu.label.moveBackwards"), disabled: true, onselect: "core:move-selection-backwards"},
-            {id: "menu-item-view-tools-move-forwards", label:RED._("menu.label.moveForwards"), disabled: true, onselect: "core:move-selection-forwards"}
+            {id: "menu-item-view-tools-distribute-veritcally", label:RED._("menu.label.distributeVertically"), disabled: true, onselect: "core:distribute-selection-vertically"}
        ]});

        menuOptions.push(null);
@@ -793,7 +766,7 @@ var RED = (function() {
        $('<div id="red-ui-header-shade" class="hide"></div>').appendTo(header);
        $('<div id="red-ui-main-container" class="red-ui-sidebar-closed hide">'+
            '<div id="red-ui-workspace"></div>'+
-            '<div id="red-ui-editor-stack"></div>'+
+            '<div id="red-ui-editor-stack" tabindex="-1"></div>'+
            '<div id="red-ui-palette"></div>'+
            '<div id="red-ui-sidebar"></div>'+
            '<div id="red-ui-sidebar-separator"></div>'+
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
@@ -423,10 +423,11 @@ RED.clipboard = (function() {
        }
    }

-    function showImportNodes(library = 'clipboard') {
+    function showImportNodes(mode) {
        if (disabled) {
            return;
        }
+        mode = mode || "clipboard";

        dialogContainer.empty();
        dialogContainer.append($(importNodesDialog));
@@ -503,7 +504,7 @@ RED.clipboard = (function() {
        $("#red-ui-clipboard-dialog-import-text").on("keyup", validateImport);
        $("#red-ui-clipboard-dialog-import-text").on('paste',function() { setTimeout(validateImport,10)});

-        if (RED.workspaces.active() === 0 || RED.workspaces.isActiveLocked()) {
+        if (RED.workspaces.active() === 0) {
            $("#red-ui-clipboard-dialog-import-opt-current").addClass('disabled').removeClass("selected");
            $("#red-ui-clipboard-dialog-import-opt-new").addClass("selected");
        } else {
@@ -532,8 +533,8 @@ RED.clipboard = (function() {
            $("#red-ui-clipboard-dialog-import-file-upload").trigger("click");
        })

-        tabs.activateTab("red-ui-clipboard-dialog-import-tab-"+library);
-        if (library === 'clipboard') {
+        tabs.activateTab("red-ui-clipboard-dialog-import-tab-"+mode);
+        if (mode === 'clipboard') {
            setTimeout(function() {
                $("#red-ui-clipboard-dialog-import-text").trigger("focus");
            },100)
@@ -557,16 +558,13 @@ RED.clipboard = (function() {
        });
    }

-    /**
-     * Show the export dialog
-     * @params library which export destination to show
-     * @params mode whether to default to 'auto' (default) or 'flow'
-     **/
-    function showExportNodes(library = 'clipboard', mode = 'auto' ) {
+    function showExportNodes(mode) {
        if (disabled) {
            return;
        }

+        mode = mode || "clipboard";
+
        dialogContainer.empty();
        dialogContainer.append($(exportNodesDialog));

@@ -768,15 +766,12 @@ RED.clipboard = (function() {
                }
            }
        }
-        if (mode === 'flow' && !$("#red-ui-clipboard-dialog-export-rng-flow").hasClass('disabled')) {
-            $("#red-ui-clipboard-dialog-export-rng-flow").trigger("click");
-        }
        if (format === "red-ui-clipboard-dialog-export-fmt-full") {
            $("#red-ui-clipboard-dialog-export-fmt-full").trigger("click");
        } else {
            $("#red-ui-clipboard-dialog-export-fmt-mini").trigger("click");
        }
-        tabs.activateTab("red-ui-clipboard-dialog-export-tab-"+library);
+        tabs.activateTab("red-ui-clipboard-dialog-export-tab-"+mode);

        var dialogHeight = 400;
        var winHeight = $(window).height();
@@ -1271,17 +1266,15 @@ RED.clipboard = (function() {
            RED.keyboard.add("#red-ui-drop-target", "escape" ,hideDropTarget);

            $('#red-ui-workspace-chart').on("dragenter",function(event) {
-                if (!RED.workspaces.isActiveLocked() && (
-                    $.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1 ||
-                     $.inArray("Files",event.originalEvent.dataTransfer.types) != -1)) {
+                if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1 ||
+                     $.inArray("Files",event.originalEvent.dataTransfer.types) != -1) {
                    $("#red-ui-drop-target").css({display:'table'}).focus();
                }
            });

            $('#red-ui-drop-target').on("dragover",function(event) {
                if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1 ||
-                     $.inArray("Files",event.originalEvent.dataTransfer.types) != -1 ||
-                        RED.workspaces.isActiveLocked()) {
+                     $.inArray("Files",event.originalEvent.dataTransfer.types) != -1) {
                    event.preventDefault();
                }
            })
@@ -1289,29 +1282,27 @@ RED.clipboard = (function() {
                hideDropTarget();
            })
            .on("drop",function(event) {
-                if (!RED.workspaces.isActiveLocked()) {
-                    try {
-                        if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1) {
-                            var data = event.originalEvent.dataTransfer.getData("text/plain");
-                            data = data.substring(data.indexOf('['),data.lastIndexOf(']')+1);
-                            importNodes(data);
-                        } else if ($.inArray("Files",event.originalEvent.dataTransfer.types) != -1) {
-                            var files = event.originalEvent.dataTransfer.files;
-                            if (files.length === 1) {
-                                var file = files[0];
-                                var reader = new FileReader();
-                                reader.onload = (function(theFile) {
-                                    return function(e) {
-                                        importNodes(e.target.result);
-                                    };
-                                })(file);
-                                reader.readAsText(file);
-                            }
+                try {
+                    if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1) {
+                        var data = event.originalEvent.dataTransfer.getData("text/plain");
+                        data = data.substring(data.indexOf('['),data.lastIndexOf(']')+1);
+                        importNodes(data);
+                    } else if ($.inArray("Files",event.originalEvent.dataTransfer.types) != -1) {
+                        var files = event.originalEvent.dataTransfer.files;
+                        if (files.length === 1) {
+                            var file = files[0];
+                            var reader = new FileReader();
+                            reader.onload = (function(theFile) {
+                                return function(e) {
+                                    importNodes(e.target.result);
+                                };
+                            })(file);
+                            reader.readAsText(file);
                        }
-                    } catch(err) {
-                        // Ensure any errors throw above doesn't stop the drop target from
-                        // being hidden.
                    }
+                } catch(err) {
+                    // Ensure any errors throw above doesn't stop the drop target from
+                    // being hidden.
                }
                hideDropTarget();
                event.preventDefault();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
@@ -160,7 +160,7 @@
                this.element.css("maxHeight",null);
            }
            if (this.options.height !== 'auto') {
-                this.uiContainer.css("overflow-y","scroll");
+                this.uiContainer.css("overflow-y","auto");
                if (!isNaN(this.options.height)) {
                    this.uiHeight = this.options.height;
                }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js
@@ -94,8 +94,8 @@ RED.menu = (function() {

            var link = $(linkContent).appendTo(item);
            opt.link = link;
-            if (typeof opt.onselect === 'string' || opt.shortcut) {
-                var shortcut = opt.shortcut || RED.keyboard.getShortcut(opt.onselect);
+            if (typeof opt.onselect === 'string') {
+                var shortcut = RED.keyboard.getShortcut(opt.onselect);
                if (shortcut && shortcut.key) {
                    opt.shortcutSpan = $('<span class="red-ui-popover-key">'+RED.keyboard.formatKey(shortcut.key, true)+'</span>').appendTo(link.find(".red-ui-menu-label"));
                }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
@@ -141,29 +141,7 @@ RED.tabs = (function() {
            })
        }

-        if (options.contextmenu) {
-            wrapper.on('contextmenu', function(evt) {
-                let clickedTab
-                let target = evt.target
-                while(target.nodeName !== 'A' && target.nodeName !== 'UL' && target.nodeName !== 'BODY') {
-                    target = target.parentNode
-                }
-                if (target.nodeName === 'A') {
-                    const href = target.getAttribute('href')
-                    if (href) {
-                        clickedTab = tabs[href.slice(1)]
-                    }
-                }
-                evt.preventDefault()
-                evt.stopPropagation()
-                RED.contextMenu.show({
-                    x:evt.clientX-5,
-                    y:evt.clientY-5,
-                    options: options.contextmenu(clickedTab)
-                })
-                return false
-            })
-        }
+

        var scrollLeft;
        var scrollRight;
@@ -831,17 +809,17 @@ RED.tabs = (function() {
                    });
                    RED.popover.tooltip(closeLink,RED._("workspace.hideFlow"));
                }
-                // if (tab.hideable) {
-                //     li.addClass("red-ui-tabs-closeable")
-                //     var closeLink = $("<a/>",{href:"#",class:"red-ui-tab-close red-ui-tab-hide"}).appendTo(li);
-                //     closeLink.append('<i class="fa fa-eye" />');
-                //     closeLink.append('<i class="fa fa-eye-slash" />');
-                //     closeLink.on("click",function(event) {
-                //         event.preventDefault();
-                //         hideTab(tab.id);
-                //     });
-                //     RED.popover.tooltip(closeLink,RED._("workspace.hideFlow"));
-                // }
+                if (tab.hideable) {
+                    li.addClass("red-ui-tabs-closeable")
+                    var closeLink = $("<a/>",{href:"#",class:"red-ui-tab-close red-ui-tab-hide"}).appendTo(li);
+                    closeLink.append('<i class="fa fa-eye" />');
+                    closeLink.append('<i class="fa fa-eye-slash" />');
+                    closeLink.on("click",function(event) {
+                        event.preventDefault();
+                        hideTab(tab.id);
+                    });
+                    RED.popover.tooltip(closeLink,RED._("workspace.hideFlow"));
+                }

                var badges = $('<span class="red-ui-tabs-badges"></span>').appendTo(li);
                if (options.onselect) {
@@ -960,9 +938,6 @@ RED.tabs = (function() {
            activeIndex: function() {
                return ul.find("li.active").index()
            },
-            getTabIndex: function (id) {
-                return ul.find("a[href='#"+id+"']").parent().index()
-            },
            contains: function(id) {
                return ul.find("a[href='#"+id+"']").length > 0;
            },
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
@@ -90,10 +90,10 @@
                        optEl.append(generateSpans(srcMatch));
                        optEl.appendTo(element);
                    }
-                    matches.push({ 
-                        value: optVal, 
-                        label: element, 
-                        i: (valMatch.found ? valMatch.index : srcMatch.index) 
+                    matches.push({
+                        value: optVal,
+                        label: element,
+                        i: (valMatch.found ? valMatch.index : srcMatch.index)
                    });
                }
            })
@@ -146,7 +146,7 @@
        { value: "reset", source: ["delay","trigger","join","rbe"] },
        { value: "responseCookies", source: ["http request"] },
        { value: "responseTopic", source: ["mqtt"] },
-        { value: "responseURL", source: ["http request"] },
+        { value: "responseUrl", source: ["http request"] },
        { value: "restartTimeout", source: ["join"] },
        { value: "retain", source: ["mqtt"] },
        { value: "schema", source: ["json"] },
@@ -501,7 +501,7 @@
                this.options.types = this.options.types||Object.keys(allOptions);
            }

-            this.selectTrigger = $('<button class="red-ui-typedInput-type-select" tabindex="0"></button>').prependTo(this.uiSelect);
+            this.selectTrigger = $('<button type="button" class="red-ui-typedInput-type-select" tabindex="0"></button>').prependTo(this.uiSelect);
            $('<i class="red-ui-typedInput-icon fa fa-caret-down"></i>').toggle(this.options.types.length > 1).appendTo(this.selectTrigger);

            this.selectLabel = $('<span class="red-ui-typedInput-type-label"></span>').appendTo(this.selectTrigger);
@@ -570,7 +570,7 @@
            })

            // explicitly set optionSelectTrigger display to inline-block otherwise jQ sets it to 'inline'
-            this.optionSelectTrigger = $('<button tabindex="0" class="red-ui-typedInput-option-trigger" style="display:inline-block"><span class="red-ui-typedInput-option-caret"><i class="red-ui-typedInput-icon fa fa-caret-down"></i></span></button>').appendTo(this.uiSelect);
+            this.optionSelectTrigger = $('<button type="button" tabindex="0" class="red-ui-typedInput-option-trigger" style="display:inline-block"><span class="red-ui-typedInput-option-caret"><i class="red-ui-typedInput-icon fa fa-caret-down"></i></span></button>').appendTo(this.uiSelect);
            this.optionSelectLabel = $('<span class="red-ui-typedInput-option-label"></span>').prependTo(this.optionSelectTrigger);
            // RED.popover.tooltip(this.optionSelectLabel,function() {
            //     return that.optionValue;
@@ -591,7 +591,7 @@
                that.uiSelect.addClass('red-ui-typedInput-focus');
            });

-            this.optionExpandButton = $('<button tabindex="0" class="red-ui-typedInput-option-expand" style="display:inline-block"></button>').appendTo(this.uiSelect);
+            this.optionExpandButton = $('<button type="button" tabindex="0" class="red-ui-typedInput-option-expand" style="display:inline-block"></button>').appendTo(this.uiSelect);
            this.optionExpandButtonIcon = $('<i class="red-ui-typedInput-icon fa fa-ellipsis-h"></i>').appendTo(this.optionExpandButton);

            this.type(this.typeField.val() || this.options.default||this.typeList[0].value);
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js
@@ -1,6 +1,21 @@
 RED.contextMenu = (function () {

    let menu;
+    function createMenu() {
+        // menu = RED.popover.menu({
+        //     options: [
+        //         {
+        //             label: 'delete selection',
+        //             onselect: function() {
+        //                 RED.actions.invoke('core:delete-selection')
+        //                 RED.view.focus()
+        //             }
+        //         },
+        //         { label: 'world' }
+        //     ],
+        //     width: 200,
+        // })
+    }

    function disposeMenu() {
        $(document).off("mousedown.red-ui-workspace-context-menu");
@@ -13,164 +28,114 @@ RED.contextMenu = (function () {
        if (menu) {
            menu.remove()
        }
-        let menuItems = []
-        if (options.options) {
-            menuItems = options.options
-        } else if (options.type === 'workspace') {
-            const selection = RED.view.selection()
-            const noSelection = !selection || Object.keys(selection).length === 0
-            const hasSelection = (selection.nodes && selection.nodes.length > 0);
-            const hasMultipleSelection = hasSelection && selection.nodes.length > 1;
-            const virtulLinks = (selection.links && selection.links.filter(e => !!e.link)) || [];
-            const wireLinks = (selection.links && selection.links.filter(e => !e.link)) || [];
-            const hasLinks = wireLinks.length > 0;
-            const isSingleLink = !hasSelection && hasLinks && wireLinks.length === 1
-            const isMultipleLinks = !hasSelection && hasLinks && wireLinks.length > 1
-            const canDelete = hasSelection || hasLinks
-            const isGroup = hasSelection && selection.nodes.length === 1 && selection.nodes[0].type === 'group'
-            const canEdit = !RED.workspaces.isActiveLocked()
-            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
-            const offset = $("#red-ui-workspace-chart").offset()

-            let addX = options.x - offset.left + $("#red-ui-workspace-chart").scrollLeft()
-            let addY = options.y - offset.top + $("#red-ui-workspace-chart").scrollTop()
+        const selection = RED.view.selection()
+        const noSelection = !selection || Object.keys(selection).length === 0
+        const hasSelection = (selection.nodes && selection.nodes.length > 0);
+        const hasMultipleSelection = hasSelection && selection.nodes.length > 1;
+        const virtulLinks = (selection.links && selection.links.filter(e => !!e.link)) || [];
+        const wireLinks = (selection.links && selection.links.filter(e => !e.link)) || [];
+        const hasLinks = wireLinks.length > 0;
+        const isSingleLink = !hasSelection && hasLinks && wireLinks.length === 1
+        const isMultipleLinks = !hasSelection && hasLinks && wireLinks.length > 1
+        const canDelete = hasSelection || hasLinks
+        const isGroup = hasSelection && selection.nodes.length === 1 && selection.nodes[0].type === 'group'

-            if (RED.view.snapGrid) {
-                const gridSize = RED.view.gridSize()
-                addX = gridSize * Math.floor(addX / gridSize)
-                addY = gridSize * Math.floor(addY / gridSize)
-            }
+        const canRemoveFromGroup = hasSelection && !!selection.nodes[0].g
+        const offset = $("#red-ui-workspace-chart").offset()

-            menuItems.push(
-                { onselect: 'core:show-action-list', onpostselect: function () { } }
-            )
+        // addX/addY must be the position in the workspace accounting for both scroll and scale
+        // The +5 is because we display the contextMenu -5,-5 to actual click position
+        let addX = (options.x + 5 - offset.left + $("#red-ui-workspace-chart").scrollLeft()) / RED.view.scale()
+        let addY = (options.y + 5 - offset.top + $("#red-ui-workspace-chart").scrollTop()) / RED.view.scale()

-            const insertOptions = []
-            menuItems.push({ label: RED._("contextMenu.insert"), options: insertOptions })
-            insertOptions.push(
-                {
-                    label: RED._("contextMenu.node"),
-                    onselect: function () {
-                        RED.view.showQuickAddDialog({
-                            position: [addX, addY],
-                            touchTrigger: true,
-                            splice: isSingleLink ? selection.links[0] : undefined,
-                            // spliceMultiple: isMultipleLinks
-                        })
-                    },
-                    disabled: !canEdit
-                },
-                (hasLinks) ? { // has least 1 wire selected
-                    label: RED._("contextMenu.junction"),
-                    onselect: 'core:split-wires-with-junctions',
-                    disabled: !canEdit || !hasLinks
-                } : {
-                    label: RED._("contextMenu.junction"),
-                    onselect: function () {
-                        const nn = {
-                            _def: { defaults: {} },
-                            type: 'junction',
-                            z: RED.workspaces.active(),
-                            id: RED.nodes.id(),
-                            x: addX,
-                            y: addY,
-                            w: 0, h: 0,
-                            outputs: 1,
-                            inputs: 1,
-                            dirty: true
+        const menuItems = [
+            { onselect: 'core:show-action-list', onpostselect: function () { } },
+            {
+                label: RED._("contextMenu.insert"),
+                options: [
+                    {
+                        label: RED._("contextMenu.node"),
+                        onselect: function () {
+                            RED.view.showQuickAddDialog({
+                                position: [addX, addY],
+                                touchTrigger: true,
+                                splice: isSingleLink ? selection.links[0] : undefined,
+                                // spliceMultiple: isMultipleLinks
+                            })
+                        },
+                        onpostselect: function() {
+                            // ensure quick add dialog search input has focus
+                            $('#red-ui-type-search-input').trigger('focus')
                        }
-                        const historyEvent = {
-                            dirty: RED.nodes.dirty(),
-                            t: 'add',
-                            junctions: [nn]
-                        }
-                        RED.nodes.addJunction(nn);
-                        RED.history.push(historyEvent);
-                        RED.nodes.dirty(true);
-                        RED.view.select({nodes: [nn] });
-                        RED.view.redraw(true)
                    },
-                    disabled: !canEdit
-                },
-                {
-                    label: RED._("contextMenu.linkNodes"),
-                    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: 'Import Example Flow' }
-            )
-            if (hasSelection && canEdit) {
-                const nodeOptions = []
-                if (!hasMultipleSelection && !isGroup) {
-                    nodeOptions.push(
-                        { onselect: 'core:show-node-help' },
-                        null
-                    )
-                }
-                nodeOptions.push(
-                    { onselect: 'core:enable-selected-nodes' },
-                    { onselect: 'core:disable-selected-nodes' },
-                    null,
-                    { onselect: 'core:show-selected-node-labels' },
-                    { onselect: 'core:hide-selected-node-labels' }
-                )
-                menuItems.push({
-                    label: 'Node',
-                    options: nodeOptions
-                })
-                menuItems.push({
-                    label: 'Group',
-                    options: [
-                        { onselect: 'core:group-selection' },
-                        { onselect: 'core:ungroup-selection', disabled: !hasGroup },
-                        null,
-                        { onselect: 'core:copy-group-style', disabled: !hasGroup },
-                        { onselect: 'core:paste-group-style', disabled: !hasGroup}
-                    ]
-                })
-                if (canRemoveFromGroup) {
-                    menuItems[menuItems.length - 1].options.push(
-                        null,
-                        { onselect: 'core:remove-selection-from-group', label: RED._("menu.label.groupRemoveSelection") }
-                    )
-                }
-            }
-            if (canEdit && hasMultipleSelection) {
-                menuItems.push({
-                    label: 'Arrange',
-                    options: [
-                        { label:RED._("menu.label.alignLeft"), onselect: "core:align-selection-to-left"},
-                        { label:RED._("menu.label.alignCenter"), onselect: "core:align-selection-to-center"},
-                        { label:RED._("menu.label.alignRight"), onselect: "core:align-selection-to-right"},
-                        null,
-                        { label:RED._("menu.label.alignTop"), onselect: "core:align-selection-to-top"},
-                        { label:RED._("menu.label.alignMiddle"), onselect: "core:align-selection-to-middle"},
-                        { label:RED._("menu.label.alignBottom"), onselect: "core:align-selection-to-bottom"},
-                        null,
-                        { label:RED._("menu.label.distributeHorizontally"), onselect: "core:distribute-selection-horizontally"},
-                        { label:RED._("menu.label.distributeVertically"), onselect: "core:distribute-selection-vertically"}
-                    ]
-                })
-            }
+                    (hasLinks) ? { // has least 1 wire selected
+                        label: RED._("contextMenu.junction"),
+                        onselect: 'core:split-wires-with-junctions',
+                        disabled: !hasLinks
+                    } : {
+                        label: RED._("contextMenu.junction"),
+                        onselect: function () {
+                            const nn = {
+                                _def: { defaults: {} },
+                                type: 'junction',
+                                z: RED.workspaces.active(),
+                                id: RED.nodes.id(),
+                                x: addX,
+                                y: addY,
+                                w: 0, h: 0,
+                                outputs: 1,
+                                inputs: 1,
+                                dirty: true
+                            }
+                            const historyEvent = {
+                                dirty: RED.nodes.dirty(),
+                                t: 'add',
+                                junctions: [nn]
+                            }
+                            RED.nodes.addJunction(nn);
+                            RED.history.push(historyEvent);
+                            RED.nodes.dirty(true);
+                            RED.view.select({nodes: [nn] });
+                            RED.view.redraw(true)
+                        }
+                    },
+                    {
+                        label: RED._("contextMenu.linkNodes"),
+                        onselect: 'core:split-wire-with-link-nodes',
+                        disabled: !hasLinks
+                    }
+                ]


+
+            }
+        ]
+
+        menuItems.push(
+            null,
+            { onselect: 'core:undo', disabled: RED.history.list().length === 0 },
+            { onselect: 'core:redo', disabled: RED.history.listRedo().length === 0 },
+            null,
+            { onselect: 'core:cut-selection-to-internal-clipboard', label: RED._("keyboard.cutNode"), disabled: !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: !RED.view.clipboard() },
+            { onselect: 'core:delete-selection', disabled: !canDelete },
+            { onselect: 'core:show-export-dialog', label: RED._("menu.label.export") },
+            { onselect: 'core:select-all-nodes' }
+        )
+
+        if (hasSelection) {
            menuItems.push(
                null,
-                { onselect: 'core:undo', disabled: RED.history.list().length === 0 },
-                { onselect: 'core:redo', 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-and-reconnect', label: 'Delete and Reconnect', disabled: !canEdit || !canDelete },
-                { onselect: 'core:show-export-dialog', label: RED._("menu.label.export") },
-                { onselect: 'core:select-all-nodes' },
+                isGroup ?
+                    { onselect: 'core:ungroup-selection', disabled: !isGroup }
+                    : { onselect: 'core:group-selection', disabled: !hasSelection }
            )
+            if (canRemoveFromGroup) {
+                menuItems.push({ onselect: 'core:remove-selection-from-group', label: RED._("menu.label.groupRemoveSelection") })
+            }
+
        }

        var direction = "right";
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
@@ -558,11 +558,6 @@ RED.deploy = (function() {
                RED.notify('<p>' + RED._("deploy.successfulDeploy") + '</p>', "success");
            }
            RED.nodes.eachNode(function (node) {
-                const flow = node.z && (RED.nodes.workspace(node.z) || RED.nodes.subflow(node.z) || null);
-                const isLocked = flow ? flow.locked : false;
-                if (flow && isLocked) {
-                    flow.locked = false;
-                }
                if (node.changed) {
                    node.dirty = true;
                    node.changed = false;
@@ -574,9 +569,6 @@ RED.deploy = (function() {
                if (node.credentials) {
                    delete node.credentials;
                }
-                if (flow && isLocked) {
-                    flow.locked = isLocked;
-                }
            });
            RED.nodes.eachConfig(function (confNode) {
                confNode.changed = false;
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -1105,6 +1105,10 @@ RED.editor = (function() {
                if (editing_node) {
                    RED.sidebar.info.refresh(editing_node);
                    RED.sidebar.help.show(editing_node.type, false);
+                    //ensure focused element is NOT body (for keyboard scope to operate correctly)
+                    if (document.activeElement.tagName === 'BODY') {
+                        $('#red-ui-editor-stack').trigger('focus')
+                    }
                }
            }
        }
@@ -1847,15 +1851,11 @@ RED.editor = (function() {
                            workspace.disabled = disabled;

                            $("#red-ui-tab-"+(workspace.id.replace(".","-"))).toggleClass('red-ui-workspace-disabled',!!workspace.disabled);
+                            if (workspace.id === RED.workspaces.active()) {
+                                $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!workspace.disabled);
+                            }
                        }

-                        var locked = $("#node-input-locked").prop("checked");
-                        if (workspace.locked !== locked) {
-                            editState.changes.locked = workspace.locked;
-                            editState.changed = true;
-                            workspace.locked = locked;
-                            $("#red-ui-tab-"+(workspace.id.replace(".","-"))).toggleClass('red-ui-workspace-locked',!!workspace.locked);
-                        }
                        if (editState.changed) {
                            var historyEvent = {
                                t: "edit",
@@ -1896,7 +1896,6 @@ RED.editor = (function() {
                var trayBody = tray.find('.red-ui-tray-body');
                trayBody.parent().css('overflow','hidden');
                var trayFooterLeft = $('<div class="red-ui-tray-footer-left"></div>').appendTo(trayFooter)
-                var trayFooterRight = $('<div class="red-ui-tray-footer-right"></div>').appendTo(trayFooter)

                var nodeEditPanes = [
                    'editor-tab-flow-properties',
@@ -1911,18 +1910,6 @@ RED.editor = (function() {
                    disabledIcon: "fa-ban",
                    invertState: true
                })
-
-                if (!workspace.hasOwnProperty("locked")) {
-                    workspace.locked = false;
-                }
-                $('<input id="node-input-locked" type="checkbox">').prop("checked",workspace.locked).appendTo(trayFooterRight).toggleButton({
-                    enabledLabel: 'Unlocked',
-                    enabledIcon: "fa-unlock-alt",
-                    disabledLabel: 'Locked',
-                    disabledIcon: "fa-lock",
-                    invertState: true
-                })
-
                prepareEditDialog(trayBody, nodeEditPanes, workspace, {}, "node-input", defaultTab, function(_activeEditPanes) {
                    activeEditPanes = _activeEditPanes;
                    trayBody.i18n();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js
@@ -100,7 +100,7 @@ RED.editor.codeEditor.monaco = (function() {
        "node-red-util": {package: "node-red", module: "util", path: "node-red/util.d.ts" },
        "node-red-func": {package: "node-red", module: "func", path: "node-red/func.d.ts" },
    }
-    const defaultServerSideTypes = [ knownModules["node-red-util"], knownModules["node-red-func"], knownModules["globals"], knownModules["console"], knownModules["buffer"] ];
+    const defaultServerSideTypes = [ knownModules["node-red-util"], knownModules["node-red-func"], knownModules["globals"], knownModules["console"], knownModules["buffer"] , knownModules["util"] ];

    const modulesCache = {};

@@ -764,7 +764,7 @@ RED.editor.codeEditor.monaco = (function() {

        
        if(!options.stateId && options.stateId !== false) {
-            options.stateId = RED.editor.generateViewStateId("monaco", options, (options.mode || options.title).split("/").pop());
+            options.stateId = RED.editor.generateViewStateId("monaco", options, (options.mode || options.title || "").split("/").pop());
        }
        var el = options.element || $("#"+options.id)[0];
        var toolbarRow = $("<div>").appendTo(el);
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/colorPicker.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/colorPicker.js
@@ -76,6 +76,9 @@ RED.editor.colorPicker = RED.colorPicker = (function() {
            var focusTarget = colorInput;
            colorInput.on("change", function (e) {
                var color = colorInput.val();
+                if (options.defaultValue && !color.match(/^([a-z]+|#[0-9a-fA-F]{6}|#[0-9a-fA-F]{3})$/)) {
+                    color = options.defaultValue;
+                }
                colorHiddenInput.val(color).trigger('change');
                refreshDisplay(color);
            });
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/envVarList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/envVarList.js
@@ -2,7 +2,7 @@ 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'];
+    var DEFAULT_ENV_TYPE_LIST_INC_CRED = ['str','num','bool','json','bin','env','cred'];

    /**
     * Create env var edit interface
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js
@@ -255,6 +255,9 @@
                        var currentExpression = expressionEditor.getValue();
                        var expr;
                        var usesContext = false;
+                        var usesEnv = false;
+                        var usesMoment = false;
+                        var usesClone = false;
                        var legacyMode = /(^|[^a-zA-Z0-9_'".])msg([^a-zA-Z0-9_'"]|$)/.test(currentExpression);
                        $(".red-ui-editor-type-expression-legacy").toggle(legacyMode);
                        try {
@@ -267,6 +270,18 @@
                                usesContext = true;
                                return null;
                            });
+                            expr.assign("env", function(name) {
+                                usesEnv = true;
+                                return null;
+                            });
+                            expr.assign("moment", function(name) {
+                                usesMoment = true;
+                                return null;
+                            });
+                            expr.assign("clone", function(name) {
+                                usesClone = true;
+                                return null;
+                            });
                        } catch(err) {
                            testResultEditor.setValue(RED._("expressionEditor.errors.invalid-expr",{message:err.message}),-1);
                            return;
@@ -284,6 +299,18 @@
                                testResultEditor.setValue(RED._("expressionEditor.errors.context-unsupported"),-1);
                                return;
                            }
+                            if (usesEnv) {
+                                testResultEditor.setValue(RED._("expressionEditor.errors.env-unsupported"),-1);
+                                return;
+                            }
+                            if (usesMoment) {
+                                testResultEditor.setValue(RED._("expressionEditor.errors.moment-unsupported"),-1);
+                                return;
+                            }
+                            if (usesClone) {
+                                testResultEditor.setValue(RED._("expressionEditor.errors.clone-unsupported"),-1);
+                                return;
+                            }

                            var formattedResult;
                            if (result !== undefined) {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/appearance.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/appearance.js
@@ -235,6 +235,7 @@
            RED.editor.colorPicker.create({
                id: "red-ui-editor-node-color",
                value: color,
+                defaultValue: "#DDAA99",
                palette: recommendedColors,
                sortPalette: function (a, b) {return a.l - b.l;}
            }).appendTo(colorRow);
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/flowProperties.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/flowProperties.js
@@ -52,6 +52,8 @@
                    node.info = info;
                }
                $("#red-ui-tab-"+(node.id.replace(".","-"))).toggleClass('red-ui-workspace-disabled',!!node.disabled);
+                $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!node.disabled);
+
            }
        }
    });
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/group.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/group.js
@@ -101,6 +101,7 @@ RED.group = (function() {
            RED.editor.colorPicker.create({
                id:"node-input-style-stroke",
                value: style.stroke || defaultGroupStyle.stroke || "#a4a4a4",
+                defaultValue: "#a4a4a4",
                palette: colorPalette,
                cellPerRow: colorCount,
                cellWidth: 16,
@@ -112,6 +113,7 @@ RED.group = (function() {
            RED.editor.colorPicker.create({
                id:"node-input-style-fill",
                value: style.fill || defaultGroupStyle.fill ||"none",
+                defaultValue: "none",
                palette: colorPalette,
                cellPerRow: colorCount,
                cellWidth: 16,
@@ -129,6 +131,7 @@ RED.group = (function() {
            RED.editor.colorPicker.create({
                id:"node-input-style-color",
                value: style.color || defaultGroupStyle.color ||"#a4a4a4",
+                defaultValue: "#a4a4a4",
                palette: colorPalette,
                cellPerRow: colorCount,
                cellWidth: 16,
@@ -185,8 +188,6 @@ RED.group = (function() {
            var activateMerge = false;
            var activateRemove = false;
            var singleGroupSelected = false;
-            var locked = RED.workspaces.isActiveLocked()
-
            if (activateGroup) {
                singleGroupSelected = selection.nodes.length === 1 && selection.nodes[0].type === 'group';
                selection.nodes.forEach(function (n) {
@@ -201,12 +202,12 @@ RED.group = (function() {
                    activateMerge = (selection.nodes.length > 1);
                }
            }
-            RED.menu.setDisabled("menu-item-group-group", locked || !activateGroup);
-            RED.menu.setDisabled("menu-item-group-ungroup", locked || !activateUngroup);
-            RED.menu.setDisabled("menu-item-group-merge", locked || !activateMerge);
-            RED.menu.setDisabled("menu-item-group-remove", locked || !activateRemove);
+            RED.menu.setDisabled("menu-item-group-group", !activateGroup);
+            RED.menu.setDisabled("menu-item-group-ungroup", !activateUngroup);
+            RED.menu.setDisabled("menu-item-group-merge", !activateMerge);
+            RED.menu.setDisabled("menu-item-group-remove", !activateRemove);
            RED.menu.setDisabled("menu-item-edit-copy-group-style", !singleGroupSelected);
-            RED.menu.setDisabled("menu-item-edit-paste-group-style", locked || !activateUngroup);
+            RED.menu.setDisabled("menu-item-edit-paste-group-style", !activateUngroup);
        });

        RED.actions.add("core:group-selection", function() { groupSelection() })
@@ -263,7 +264,6 @@ RED.group = (function() {
        }
    }
    function pasteGroupStyle() {
-        if (RED.workspaces.isActiveLocked()) { return }
        if (RED.view.state() !== RED.state.DEFAULT) { return }
        if (groupStyleClipboard) {
            var selection = RED.view.selection();
@@ -298,7 +298,6 @@ RED.group = (function() {
    }

    function groupSelection() {
-        if (RED.workspaces.isActiveLocked()) { return }
        if (RED.view.state() !== RED.state.DEFAULT) { return }
        var selection = RED.view.selection();
        if (selection.nodes) {
@@ -317,7 +316,6 @@ RED.group = (function() {
        }
    }
    function ungroupSelection() {
-        if (RED.workspaces.isActiveLocked()) { return }
        if (RED.view.state() !== RED.state.DEFAULT) { return }
        var selection = RED.view.selection();
        if (selection.nodes) {
@@ -341,7 +339,6 @@ RED.group = (function() {
    }

    function ungroup(g) {
-        if (RED.workspaces.isActiveLocked()) { return }
        var nodes = [];
        var parentGroup = RED.nodes.group(g.g);
        g.nodes.forEach(function(n) {
@@ -368,7 +365,6 @@ RED.group = (function() {
    }

    function mergeSelection() {
-        if (RED.workspaces.isActiveLocked()) { return }
        if (RED.view.state() !== RED.state.DEFAULT) { return }
        var selection = RED.view.selection();
        if (selection.nodes) {
@@ -438,7 +434,6 @@ RED.group = (function() {
    }

    function removeSelection() {
-        if (RED.workspaces.isActiveLocked()) { return }
        if (RED.view.state() !== RED.state.DEFAULT) { return }
        var selection = RED.view.selection();
        if (selection.nodes) {
@@ -466,7 +461,6 @@ RED.group = (function() {
        }
    }
    function createGroup(nodes) {
-        if (RED.workspaces.isActiveLocked()) { return }
        if (nodes.length === 0) {
            return;
        }
@@ -489,7 +483,7 @@ RED.group = (function() {
        }

        group.z = nodes[0].z;
-        group = RED.nodes.addGroup(group);
+        RED.nodes.addGroup(group);

        try {
            addToGroup(group,nodes);
@@ -572,7 +566,6 @@ RED.group = (function() {
        markDirty(group);
    }
    function removeFromGroup(group, nodes, reparent) {
-        if (RED.workspaces.isActiveLocked()) { return }
        if (!Array.isArray(nodes)) {
            nodes = [nodes];
        }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -175,9 +175,19 @@ RED.palette = (function() {
                    $('<button type="button" onclick="RED.workspaces.show(\''+type.substring(8).replace(/'/g,"\\'")+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-pencil"></i></button>').appendTo(popOverContent)
                }

-                var safeType = type.replace(/'/g,"\\'");
+                const safeType = type.replace(/'/g,"\\'");
+                const wrapStr = function (str) {
+                    if(str.indexOf(' ') >= 0) {
+                        return '"' + str + '"'
+                    }
+                    return str
+                }

-                $('<button type="button" onclick="RED.search.show(\'type:'+safeType+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-search"></i></button>').appendTo(popOverContent)
+                $('<button type="button"; return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-search"></i></button>')
+                    .appendTo(popOverContent)
+                    .on('click', function() {
+                        RED.search.show('type:' + wrapStr(safeType))
+                    })
                $('<button type="button" onclick="RED.sidebar.help.show(\''+safeType+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-book"></i></button>').appendTo(popOverContent)

                $('<p>',{style:"font-size: 0.8em"}).text(metaData).appendTo(popOverContent);
@@ -282,7 +292,6 @@ RED.palette = (function() {
            var hoverGroup;
            var paletteWidth;
            var paletteTop;
-            var dropEnabled;
            $(d).draggable({
                helper: 'clone',
                appendTo: '#red-ui-editor',
@@ -290,7 +299,6 @@ RED.palette = (function() {
                revertDuration: 200,
                containment:'#red-ui-main-container',
                start: function() {
-                    dropEnabled = !RED.nodes.workspace(RED.workspaces.active()).locked;
                    paletteWidth = $("#red-ui-palette").width();
                    paletteTop = $("#red-ui-palette").parent().position().top + $("#red-ui-palette-container").position().top;
                    hoverGroup = null;
@@ -301,100 +309,96 @@ RED.palette = (function() {
                    RED.view.focus();
                },
                stop: function() {
-                    if (dropEnabled) {
-                        d3.select('.red-ui-flow-link-splice').classed('red-ui-flow-link-splice',false);
-                        if (hoverGroup) {
-                            document.getElementById("group_select_"+hoverGroup.id).classList.remove("red-ui-flow-group-hovered");
-                        }
-                        if (activeGroup) {
-                            document.getElementById("group_select_"+activeGroup.id).classList.remove("red-ui-flow-group-active-hovered");
-                        }
-                        if (spliceTimer) { clearTimeout(spliceTimer); spliceTimer = null; }
-                        if (groupTimer) { clearTimeout(groupTimer); groupTimer = null; }
+                    d3.select('.red-ui-flow-link-splice').classed('red-ui-flow-link-splice',false);
+                    if (hoverGroup) {
+                        document.getElementById("group_select_"+hoverGroup.id).classList.remove("red-ui-flow-group-hovered");
                    }
+                    if (activeGroup) {
+                        document.getElementById("group_select_"+activeGroup.id).classList.remove("red-ui-flow-group-active-hovered");
+                    }
+                    if (spliceTimer) { clearTimeout(spliceTimer); spliceTimer = null; }
+                    if (groupTimer) { clearTimeout(groupTimer); groupTimer = null; }
                },
                drag: function(e,ui) {
                    var paletteNode = getPaletteNode(nt);
                    ui.originalPosition.left = paletteNode.offset().left;
-                    if (dropEnabled) {
-                        mouseX = ui.position.left - paletteWidth + (ui.helper.width()/2) + chart.scrollLeft();
-                        mouseY = ui.position.top - paletteTop + (ui.helper.height()/2) + chart.scrollTop() + 10;
-                        if (!groupTimer) {
-                            groupTimer = setTimeout(function() {
+                    mouseX = ui.position.left - paletteWidth + (ui.helper.width()/2) + chart.scrollLeft();
+                    mouseY = ui.position.top - paletteTop + (ui.helper.height()/2) + chart.scrollTop() + 10;
+                    if (!groupTimer) {
+                        groupTimer = setTimeout(function() {
+                            var mx = mouseX / RED.view.scale();
+                            var my = mouseY / RED.view.scale();
+                            var group = RED.view.getGroupAtPoint(mx,my);
+                            if (group !== hoverGroup) {
+                                if (hoverGroup) {
+                                    document.getElementById("group_select_"+hoverGroup.id).classList.remove("red-ui-flow-group-hovered");
+                                }
+                                if (group) {
+                                    document.getElementById("group_select_"+group.id).classList.add("red-ui-flow-group-hovered");
+                                }
+                                hoverGroup = group;
+                                if (hoverGroup) {
+                                    $(ui.helper).data('group',hoverGroup);
+                                } else {
+                                    $(ui.helper).removeData('group');
+                                }
+                            }
+                            groupTimer = null;
+
+                        },200)
+                    }
+                    if (def.inputs > 0 && def.outputs > 0) {
+                        if (!spliceTimer) {
+                            spliceTimer = setTimeout(function() {
+                                var nodes = [];
+                                var bestDistance = Infinity;
+                                var bestLink = null;
+                                if (chartSVG.getIntersectionList) {
+                                    var svgRect = chartSVG.createSVGRect();
+                                    svgRect.x = mouseX;
+                                    svgRect.y = mouseY;
+                                    svgRect.width = 1;
+                                    svgRect.height = 1;
+                                    nodes = chartSVG.getIntersectionList(svgRect,chartSVG);
+                                } else {
+                                    // Firefox doesn't do getIntersectionList and that
+                                    // makes us sad
+                                    nodes = RED.view.getLinksAtPoint(mouseX,mouseY);
+                                }
                                var mx = mouseX / RED.view.scale();
                                var my = mouseY / RED.view.scale();
-                                var group = RED.view.getGroupAtPoint(mx,my);
-                                if (group !== hoverGroup) {
-                                    if (hoverGroup) {
-                                        document.getElementById("group_select_"+hoverGroup.id).classList.remove("red-ui-flow-group-hovered");
-                                    }
-                                    if (group) {
-                                        document.getElementById("group_select_"+group.id).classList.add("red-ui-flow-group-hovered");
-                                    }
-                                    hoverGroup = group;
-                                    if (hoverGroup) {
-                                        $(ui.helper).data('group',hoverGroup);
-                                    } else {
-                                        $(ui.helper).removeData('group');
-                                    }
-                                }
-                                groupTimer = null;
-
-                            },200)
-                        }
-                        if (def.inputs > 0 && def.outputs > 0) {
-                            if (!spliceTimer) {
-                                spliceTimer = setTimeout(function() {
-                                    var nodes = [];
-                                    var bestDistance = Infinity;
-                                    var bestLink = null;
-                                    if (chartSVG.getIntersectionList) {
-                                        var svgRect = chartSVG.createSVGRect();
-                                        svgRect.x = mouseX;
-                                        svgRect.y = mouseY;
-                                        svgRect.width = 1;
-                                        svgRect.height = 1;
-                                        nodes = chartSVG.getIntersectionList(svgRect,chartSVG);
-                                    } else {
-                                        // Firefox doesn't do getIntersectionList and that
-                                        // makes us sad
-                                        nodes = RED.view.getLinksAtPoint(mouseX,mouseY);
-                                    }
-                                    var mx = mouseX / RED.view.scale();
-                                    var my = mouseY / RED.view.scale();
-                                    for (var i=0;i<nodes.length;i++) {
-                                        var node = d3.select(nodes[i]);
-                                        if (node.classed('red-ui-flow-link-background') && !node.classed('red-ui-flow-link-link')) {
-                                            var length = nodes[i].getTotalLength();
-                                            for (var j=0;j<length;j+=10) {
-                                                var p = nodes[i].getPointAtLength(j);
-                                                var d2 = ((p.x-mx)*(p.x-mx))+((p.y-my)*(p.y-my));
-                                                if (d2 < 200 && d2 < bestDistance) {
-                                                    bestDistance = d2;
-                                                    bestLink = nodes[i];
-                                                }
+                                for (var i=0;i<nodes.length;i++) {
+                                    var node = d3.select(nodes[i]);
+                                    if (node.classed('red-ui-flow-link-background') && !node.classed('red-ui-flow-link-link')) {
+                                        var length = nodes[i].getTotalLength();
+                                        for (var j=0;j<length;j+=10) {
+                                            var p = nodes[i].getPointAtLength(j);
+                                            var d2 = ((p.x-mx)*(p.x-mx))+((p.y-my)*(p.y-my));
+                                            if (d2 < 200 && d2 < bestDistance) {
+                                                bestDistance = d2;
+                                                bestLink = nodes[i];
                                            }
                                        }
                                    }
-                                    if (activeSpliceLink && activeSpliceLink !== bestLink) {
-                                        d3.select(activeSpliceLink.parentNode).classed('red-ui-flow-link-splice',false);
-                                    }
+                                }
+                                if (activeSpliceLink && activeSpliceLink !== bestLink) {
+                                    d3.select(activeSpliceLink.parentNode).classed('red-ui-flow-link-splice',false);
+                                }
+                                if (bestLink) {
+                                    d3.select(bestLink.parentNode).classed('red-ui-flow-link-splice',true)
+                                } else {
+                                    d3.select('.red-ui-flow-link-splice').classed('red-ui-flow-link-splice',false);
+                                }
+                                if (activeSpliceLink !== bestLink) {
                                    if (bestLink) {
-                                        d3.select(bestLink.parentNode).classed('red-ui-flow-link-splice',true)
+                                        $(ui.helper).data('splice',d3.select(bestLink).data()[0]);
                                    } else {
-                                        d3.select('.red-ui-flow-link-splice').classed('red-ui-flow-link-splice',false);
+                                        $(ui.helper).removeData('splice');
                                    }
-                                    if (activeSpliceLink !== bestLink) {
-                                        if (bestLink) {
-                                            $(ui.helper).data('splice',d3.select(bestLink).data()[0]);
-                                        } else {
-                                            $(ui.helper).removeData('splice');
-                                        }
-                                    }
-                                    activeSpliceLink = bestLink;
-                                    spliceTimer = null;
-                                },200);
-                            }
+                                }
+                                activeSpliceLink = bestLink;
+                                spliceTimer = null;
+                            },200);
                        }
                    }
                }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js
@@ -545,7 +545,7 @@ RED.projects = (function() {
                        var sshwarningRow = $('<div class="red-ui-projects-dialog-screen-create-row-auth-error-no-keys"></div>').hide().appendTo(subrow);
                        $('<div class="form-row"><i class="fa fa-warning"></i> '+RED._("projects.clone-project.ssh-key-desc")+'</div>').appendTo(sshwarningRow);
                        subrow = $('<div style="text-align: center">').appendTo(sshwarningRow);
-                        $('<button class="red-ui-button red-ui-projects-dialog-button">'+RED._("projects.clone-project.ssh-key-add")+'</button>').appendTo(subrow).on("click", function(e) {
+                        $('<button type="button" class="red-ui-button red-ui-projects-dialog-button">'+RED._("projects.clone-project.ssh-key-add")+'</button>').appendTo(subrow).on("click", function(e) {
                            e.preventDefault();
                            dialog.dialog( "close" );
                            RED.userSettings.show('gitconfig');
@@ -1171,11 +1171,11 @@ RED.projects = (function() {

                        row = $('<div class="form-row button-group"></div>').appendTo(container);

-                        var openProject = $('<button data-type="open" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-folder-open"></i><br/>'+RED._("projects.create.open")+'</button>').appendTo(row);
-                        var createAsEmpty = $('<button data-type="empty" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-asterisk"></i><br/>'+RED._("projects.create.create")+'</button>').appendTo(row);
-                        // var createAsCopy = $('<button data-type="copy" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i class="fa fa-long-arrow-right fa-2x"></i><i class="fa fa-archive fa-2x"></i><br/>Copy existing</button>').appendTo(row);
-                        var createAsClone = $('<button data-type="clone" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-git"></i><br/>'+RED._("projects.create.clone")+'</button>').appendTo(row);
-                        // var createAsClone = $('<button data-type="clone" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-git fa-2x"></i><i class="fa fa-arrows-h fa-2x"></i><i class="fa fa-archive fa-2x"></i><br/>Clone Repository</button>').appendTo(row);
+                        var openProject = $('<button type="button" data-type="open" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-folder-open"></i><br/>'+RED._("projects.create.open")+'</button>').appendTo(row);
+                        var createAsEmpty = $('<button type="button" data-type="empty" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-asterisk"></i><br/>'+RED._("projects.create.create")+'</button>').appendTo(row);
+                        // var createAsCopy = $('<button type="button" data-type="copy" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i class="fa fa-long-arrow-right fa-2x"></i><i class="fa fa-archive fa-2x"></i><br/>Copy existing</button>').appendTo(row);
+                        var createAsClone = $('<button type="button" data-type="clone" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-git"></i><br/>'+RED._("projects.create.clone")+'</button>').appendTo(row);
+                        // var createAsClone = $('<button type="button" data-type="clone" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-git fa-2x"></i><i class="fa fa-arrows-h fa-2x"></i><i class="fa fa-archive fa-2x"></i><br/>Clone Repository</button>').appendTo(row);
                        row.find(".red-ui-projects-dialog-screen-create-type").on("click", function(evt) {
                            evt.preventDefault();
                            container.find(".red-ui-projects-dialog-screen-create-type").removeClass('selected');
@@ -1271,7 +1271,7 @@ RED.projects = (function() {
                        var credentialsLeftBox = $('<div class="red-ui-projects-dialog-credentials-box-left">').appendTo(credentialsBox);

                        var credentialsEnabledBox = $('<div class="form-row red-ui-projects-dialog-credentials-box-enabled"></div>').appendTo(credentialsLeftBox);
-                        $('<label class="red-ui-projects-edit-form-inline-label"><input type="radio" name="projects-encryption-type" value="enabled"> <i class="fa fa-lock"></i> <span>'+RED._("projects.encryption-config.enable")+'</span></label>').appendTo(credentialsEnabledBox);
+                        $('<label class="red-ui-projects-edit-form-inline-label"><input type="radio" name="projects-encryption-type" value="enabled" checked> <i class="fa fa-lock"></i> <span>'+RED._("projects.encryption-config.enable")+'</span></label>').appendTo(credentialsEnabledBox);
                        var credentialsDisabledBox = $('<div class="form-row red-ui-projects-dialog-credentials-box-disabled disabled"></div>').appendTo(credentialsLeftBox);
                        $('<label class="red-ui-projects-edit-form-inline-label"><input type="radio" name="projects-encryption-type" value="disabled"> <i class="fa fa-unlock"></i> <span>'+RED._("projects.encryption-config.disable")+'</span></label>').appendTo(credentialsDisabledBox);

@@ -1397,7 +1397,7 @@ RED.projects = (function() {
                        var sshwarningRow = $('<div class="red-ui-projects-dialog-screen-create-row-auth-error-no-keys"></div>').hide().appendTo(subrow);
                        $('<div class="form-row"><i class="fa fa-warning"></i> '+RED._("projects.create.desc2")+'</div>').appendTo(sshwarningRow);
                        subrow = $('<div style="text-align: center">').appendTo(sshwarningRow);
-                        $('<button class="red-ui-button red-ui-projects-dialog-button">'+RED._("projects.create.add-ssh-key")+'</button>').appendTo(subrow).on("click", function(e) {
+                        $('<button type="button" class="red-ui-button red-ui-projects-dialog-button">'+RED._("projects.create.add-ssh-key")+'</button>').appendTo(subrow).on("click", function(e) {
                            e.preventDefault();
                            $('#red-ui-projects-dialog-cancel').trigger("click");
                            RED.userSettings.show('gitconfig');
@@ -1631,14 +1631,14 @@ RED.projects = (function() {
    function deleteProject(row,name,done) {
        var cover = $('<div class="red-ui-projects-dialog-project-list-entry-delete-confirm"></div>').on("click", function(evt) { evt.stopPropagation(); }).appendTo(row);
        $('<span>').text(RED._("projects.delete.confirm")).appendTo(cover);
-        $('<button class="red-ui-button red-ui-projects-dialog-button">'+RED._("common.label.cancel")+'</button>')
+        $('<button type="button" class="red-ui-button red-ui-projects-dialog-button">'+RED._("common.label.cancel")+'</button>')
            .appendTo(cover)
            .on("click", function(e) {
                e.stopPropagation();
                cover.remove();
                done(true);
            });
-        $('<button class="red-ui-button red-ui-projects-dialog-button primary">'+RED._("common.label.delete")+'</button>')
+        $('<button type="button" class="red-ui-button red-ui-projects-dialog-button primary">'+RED._("common.label.delete")+'</button>')
            .appendTo(cover)
            .on("click", function(e) {
                e.stopPropagation();
@@ -1822,7 +1822,7 @@ RED.projects = (function() {
                header.addClass("selectable");

                var tools = $('<div class="red-ui-projects-dialog-project-list-entry-tools"></div>').appendTo(header);
-                $('<button class="red-ui-button red-ui-projects-dialog-button red-ui-button-small" style="float: right;"><i class="fa fa-trash"></i></button>')
+                $('<button type="button" class="red-ui-button red-ui-projects-dialog-button red-ui-button-small" style="float: right;"><i class="fa fa-trash"></i></button>')
                    .appendTo(tools)
                    .on("click", function(e) {
                        e.stopPropagation();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/search.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/search.js
@@ -106,38 +106,51 @@ RED.search = (function() {
        return val;
    }

-    function search(val) {
-        var results = [];
-        var typeFilter;
-        var m = /(?:^| )type:([^ ]+)/.exec(val);
-        if (m) {
-            val = val.replace(/(?:^| )type:[^ ]+/,"");
-            typeFilter = m[1];
+    function extractType(val, flags) {
+        // extracts:  type:XYZ  &  type:"X Y Z"
+        const regEx = /(?:type):\s*(?:"([^"]+)"|([^" ]+))/;
+        let m
+        while ((m = regEx.exec(val)) !== null) {
+            // avoid infinite loops with zero-width matches
+            if (m.index === regEx.lastIndex) {
+                regEx.lastIndex++;
+            }
+            val = val.replace(m[0]," ").trim()
+            const flag = m[2] || m[1] // quoted entries in capture group 1, unquoted in capture group 2
+            flags.type = flags.type || [];
+            flags.type.push(flag);
        }
-        var flags = {};
+        return val;
+    }
+
+    function search(val) {
+        const results = [];
+        const flags = {};
        val = extractFlag(val,"invalid",flags);
        val = extractFlag(val,"unused",flags);
        val = extractFlag(val,"config",flags);
        val = extractFlag(val,"subflow",flags);
        val = extractFlag(val,"hidden",flags);
        val = extractFlag(val,"modified",flags);
-        val = extractValue(val,"flow",flags);// flow:active or flow:<flow-id>
+        val = extractValue(val,"flow",flags);// flow:current or flow:<flow-id>
        val = extractValue(val,"uses",flags);// uses:<node-id>
+        val = extractType(val,flags);// type:<node-type>
        val = val.trim();
-        var hasFlags = Object.keys(flags).length > 0;
+        const hasFlags = Object.keys(flags).length > 0;
+        const hasTypeFilter = flags.type && flags.type.length > 0
        if (flags.flow && flags.flow.indexOf("current") >= 0) {
            let idx = flags.flow.indexOf("current");
-            flags.flow[idx] = RED.workspaces.active();//convert active to flow ID
+            flags.flow[idx] = RED.workspaces.active();//convert 'current' to active flow ID
        }
        if (flags.flow && flags.flow.length) {
            flags.flow = [ ...new Set(flags.flow) ]; //deduplicate
        }
-        if (val.length > 0 || typeFilter || hasFlags) {
+        if (val.length > 0 || hasFlags) {
            val = val.toLowerCase();
-            var i;
-            var j;
-            var list = [];
-            var nodes = {};
+            let i;
+            let j;
+            let list = [];
+            const nodes = {};
            let keys = [];
            if (flags.uses) {
                keys = flags.uses;
@@ -145,10 +158,10 @@ RED.search = (function() {
                keys = Object.keys(index);
            }
            for (i=0;i<keys.length;i++) {
-                var key = keys[i];
-                var kpos = keys[i].indexOf(val);
-                if (kpos > -1) {
-                    var ids = Object.keys(index[key]||{});
+                const key = keys[i];
+                const kpos = val ? keys[i].indexOf(val) : -1;
+                if (kpos > -1 || (val === "" && hasFlags)) {
+                    const ids = Object.keys(index[key]||{});
                    for (j=0;j<ids.length;j++) {
                        var node = index[key][ids[j]];
                        var isConfigNode = node.node._def.category === "config" && node.node.type !== 'group';
@@ -156,7 +169,7 @@ RED.search = (function() {
                            continue;
                        }
                        if (flags.hasOwnProperty("invalid")) {
-                            var nodeIsValid = !node.node.hasOwnProperty("valid") || node.node.valid;
+                            const nodeIsValid = !node.node.hasOwnProperty("valid") || node.node.valid;
                            if (flags.invalid === nodeIsValid) {
                                continue;
                            }
@@ -186,8 +199,8 @@ RED.search = (function() {
                            }
                        }
                        if (flags.hasOwnProperty("unused")) {
-                            var isUnused = (node.node.type === 'subflow' && node.node.instances.length === 0) ||
-                                           (isConfigNode && node.node.users.length === 0)
+                            const isUnused = (node.node.type === 'subflow' && node.node.instances.length === 0) ||
+                                           (isConfigNode && node.node.users.length === 0 && node.node._def.hasUsers !== false)
                            if (flags.unused !== isUnused) {
                                continue;
                            }
@@ -197,12 +210,16 @@ RED.search = (function() {
                                continue;
                            }
                        }
-                        if (!typeFilter || node.node.type === typeFilter) {
-                            nodes[node.node.id] = nodes[node.node.id] = {
+                        let typeIndex = -1
+                        if(hasTypeFilter) {
+                            typeIndex = flags.type.indexOf(node.node.type)
+                        }
+                        if (!hasTypeFilter || typeIndex > -1) {
+                            nodes[node.node.id] = nodes[node.node.id] || {
                                node: node.node,
                                label: node.label
                            };
-                            nodes[node.node.id].index = Math.min(nodes[node.node.id].index||Infinity,kpos);
+                            nodes[node.node.id].index = Math.min(nodes[node.node.id].index || Infinity, typeIndex > -1 ? typeIndex : kpos);
                        }
                    }
                }
@@ -538,7 +555,7 @@ RED.search = (function() {
                $(previousActiveElement).trigger("focus");
            }
            previousActiveElement = null;
-        } 
+        }
        if(!keepSearchToolbar) {
            clearActiveSearch();
        }
@@ -630,7 +647,7 @@ RED.search = (function() {
        $("#red-ui-sidebar-shade").on('mousedown',hide);

        $("#red-ui-view-searchtools-close").on("click", function close() {
-            clearActiveSearch();            
+            clearActiveSearch();
            updateSearchToolbar();
        });
        $("#red-ui-view-searchtools-close").trigger("click");
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
@@ -431,7 +431,44 @@ RED.subflow = (function() {

        $("#red-ui-subflow-delete").on("click", function(event) {
            event.preventDefault();
-            RED.subflow.delete(RED.workspaces.active())
+            var subflow = RED.nodes.subflow(RED.workspaces.active());
+            if (subflow.instances.length > 0) {
+                var msg = $('<div>')
+                $('<p>').text(RED._("subflow.subflowInstances",{count: subflow.instances.length})).appendTo(msg);
+                $('<p>').text(RED._("subflow.confirmDelete")).appendTo(msg);
+                var confirmDeleteNotification = RED.notify(msg, {
+                    modal: true,
+                    fixed: true,
+                    buttons: [
+                        {
+                            text: RED._('common.label.cancel'),
+                            click: function() {
+                                confirmDeleteNotification.close();
+                            }
+                        },
+                        {
+                            text: RED._('workspace.confirmDelete'),
+                            class: "primary",
+                            click: function() {
+                                confirmDeleteNotification.close();
+                                completeDelete();
+                            }
+                        }
+                    ]
+                });
+
+                return;
+            } else {
+                completeDelete();
+            }
+            function completeDelete() {
+                var startDirty = RED.nodes.dirty();
+                var historyEvent = removeSubflow(RED.workspaces.active());
+                historyEvent.t = 'delete';
+                historyEvent.dirty = startDirty;
+                RED.history.push(historyEvent);
+            }
+
        });

        refreshToolbar(activeSubflow);
@@ -444,51 +481,7 @@ RED.subflow = (function() {
        $("#red-ui-workspace-toolbar").hide().empty();
        $("#red-ui-workspace-chart").css({"margin-top": "0"});
    }
-    function deleteSubflow(id) {
-        const subflow = RED.nodes.subflow(id || RED.workspaces.active());
-        if (!subflow) {
-            return
-        }
-        if (subflow.instances.length > 0) {
-            if (subflow.instances.some(sf => { const ws = RED.nodes.workspace(sf.z); return ws?ws.locked:false })) {
-                return
-            }
-            const msg = $('<div>')
-            $('<p>').text(RED._("subflow.subflowInstances",{count: subflow.instances.length})).appendTo(msg);
-            $('<p>').text(RED._("subflow.confirmDelete")).appendTo(msg);
-            const confirmDeleteNotification = RED.notify(msg, {
-                modal: true,
-                fixed: true,
-                buttons: [
-                    {
-                        text: RED._('common.label.cancel'),
-                        click: function() {
-                            confirmDeleteNotification.close();
-                        }
-                    },
-                    {
-                        text: RED._('workspace.confirmDelete'),
-                        class: "primary",
-                        click: function() {
-                            confirmDeleteNotification.close();
-                            completeDelete();
-                        }
-                    }
-                ]
-            });

-            return;
-        } else {
-            completeDelete();
-        }
-        function completeDelete() {
-            const startDirty = RED.nodes.dirty();
-            const historyEvent = removeSubflow(subflow.id);
-            historyEvent.t = 'delete';
-            historyEvent.dirty = startDirty;
-            RED.history.push(historyEvent);
-        }
-    }
    function removeSubflow(id, keepInstanceNodes) {
        // TODO:  A lot of this logic is common with RED.nodes.removeWorkspace
        var removedNodes = [];
@@ -513,6 +506,13 @@ RED.subflow = (function() {
        RED.nodes.groups(id).forEach(function(n) {
            removedGroups.push(n);
        })
+
+        var removedJunctions = RED.nodes.junctions(id)
+        for (var i=0;i<removedJunctions.length;i++) {
+            var removedEntities = RED.nodes.removeJunction(removedJunctions[i])
+            removedLinks = removedLinks.concat(removedEntities.links)
+        }
+
        var removedConfigNodes = [];
        for (var i=0;i<removedNodes.length;i++) {
            var removedEntities = RED.nodes.remove(removedNodes[i].id);
@@ -543,6 +543,7 @@ RED.subflow = (function() {
            nodes:removedNodes,
            links:removedLinks,
            groups: removedGroups,
+            junctions: removedJunctions,
            subflows: [activeSubflow]
        }
    }
@@ -557,7 +558,7 @@ RED.subflow = (function() {
            }
        });
        RED.events.on("view:selection-changed",function(selection) {
-            if (!selection.nodes || RED.workspaces.isActiveLocked()) {
+            if (!selection.nodes) {
                RED.menu.setDisabled("menu-item-subflow-convert",true);
            } else {
                RED.menu.setDisabled("menu-item-subflow-convert",false);
@@ -620,9 +621,6 @@ RED.subflow = (function() {
    }

    function convertToSubflow() {
-        if (RED.workspaces.isActiveLocked()) {
-            return
-        }
        var selection = RED.view.selection();
        if (!selection.nodes) {
            RED.notify(RED._("subflow.errors.noNodesSelected"),"error");
@@ -778,7 +776,7 @@ RED.subflow = (function() {
        }
        subflowInstance._def = RED.nodes.getType(subflowInstance.type);
        RED.editor.validateNode(subflowInstance);
-        subflowInstance = RED.nodes.add(subflowInstance);
+        RED.nodes.add(subflowInstance);

        if (containingGroup) {
            RED.group.addToGroup(containingGroup, subflowInstance);
@@ -942,7 +940,6 @@ RED.subflow = (function() {


    function buildEnvUIRow(row, tenv, ui, node) {
-        console.log(tenv, ui)
        ui.label = ui.label||{};
        if ((tenv.type === "cred" || (tenv.parent && tenv.parent.type === "cred")) && !ui.type) {
            ui.type = "cred";
@@ -1333,10 +1330,7 @@ RED.subflow = (function() {
        init: init,
        createSubflow: createSubflow,
        convertToSubflow: convertToSubflow,
-        // removeSubflow: Internal function to remove subflow
        removeSubflow: removeSubflow,
-        // delete: Prompt user for confirmation
-        delete: deleteSubflow,
        refresh: refresh,
        removeInput: removeSubflowInput,
        removeOutput: removeSubflowOutput,
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js
@@ -43,15 +43,12 @@ RED.sidebar.config = (function() {

    var categories = {};

-    function getOrCreateCategory(name,parent,label,isLocked) {
+    function getOrCreateCategory(name,parent,label) {
        name = name.replace(/\./i,"-");
        if (!categories[name]) {
            var container = $('<div class="red-ui-palette-category red-ui-sidebar-config-category" id="red-ui-sidebar-config-category-'+name+'"></div>').appendTo(parent);
            var header = $('<div class="red-ui-sidebar-config-tray-header red-ui-palette-header"><i class="fa fa-angle-down expanded"></i></div>').appendTo(container);
-            let lockIcon
            if (label) {
-                lockIcon = $('<span style="margin-right: 5px"><i class="fa fa-lock"/></span>').appendTo(header)
-                lockIcon.toggle(!!isLocked)
                $('<span class="red-ui-palette-node-config-label"/>').text(label).appendTo(header);
            } else {
                $('<span class="red-ui-palette-node-config-label" data-i18n="sidebar.config.'+name+'">').appendTo(header);
@@ -65,7 +62,6 @@ RED.sidebar.config = (function() {
            var icon = header.find("i");
            var result = {
                label: label,
-                lockIcon,
                list: category,
                size: function() {
                    return result.list.find("li:not(.red-ui-palette-node-config-none)").length
@@ -104,9 +100,6 @@ RED.sidebar.config = (function() {
            });
            categories[name] = result;
        } else {
-            if (isLocked !== undefined && categories[name].lockIcon) {
-                categories[name].lockIcon.toggle(!!isLocked)
-            }
            if (categories[name].label !== label) {
                categories[name].list.parent().find('.red-ui-palette-node-config-label').text(label);
                categories[name].label = label;
@@ -223,7 +216,7 @@ RED.sidebar.config = (function() {

        RED.nodes.eachWorkspace(function(ws) {
            validList[ws.id.replace(/\./g,"-")] = true;
-            getOrCreateCategory(ws.id,flowCategories,ws.label, ws.locked);
+            getOrCreateCategory(ws.id,flowCategories,ws.label);
        })
        RED.nodes.eachSubflow(function(sf) {
            validList[sf.id.replace(/\./g,"-")] = true;
@@ -281,15 +274,6 @@ RED.sidebar.config = (function() {
                    changes: {},
                    dirty: RED.nodes.dirty()
                }
-                for (let i = 0; i < selectedNodes.length; i++) {
-                    let node = RED.nodes.node(selectedNodes[i])
-                    if (node.z) {
-                        let ws = RED.nodes.workspace(node.z)
-                        if (ws && ws.locked) {
-                            return
-                        }
-                    }
-                }
                selectedNodes.forEach(function(id) {
                    var node = RED.nodes.node(id);
                    try {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js
@@ -50,7 +50,7 @@ RED.sidebar.help = (function() {

        tocPanel = $("<div>", {class: "red-ui-sidebar-help-toc"}).appendTo(stackContainer);
        var helpPanel = $("<div>").css({
-            "overflow-y": "scroll"
+            "overflow-y": "auto"
        }).appendTo(stackContainer);

        panels = RED.panels.create({
@@ -141,8 +141,7 @@ RED.sidebar.help = (function() {
        RED.events.on('registry:node-type-removed', queueRefresh);
        RED.events.on('subflows:change', refreshSubflow);

-        RED.actions.add("core:show-help-tab", show);
-        RED.actions.add("core:show-node-help", showNodeHelp)
+        RED.actions.add("core:show-help-tab",show);

    }

@@ -339,19 +338,6 @@ RED.sidebar.help = (function() {
        resizeStack();
    }

-    function showNodeHelp(node) {
-        if (!node) {
-            const selection = RED.view.selection()
-            if (selection.nodes && selection.nodes.length > 0) {
-                node = selection.nodes.find(n => n.type !== 'group' && n.type !== 'junction')
-            }
-        }
-        if (node) {
-            show(node.type, true)
-        }
-    }
-
-
    // TODO: DRY - projects.js
    function addTargetToExternalLinks(el) {
        $(el).find("a").each(function(el) {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js
@@ -221,22 +221,6 @@ RED.sidebar.info.outliner = (function() {
        } else {
            $('<div class="red-ui-info-outline-item-control-spacer">').appendTo(controls)
        }
-        if (n.type === 'tab') {
-            var lockToggleButton = $('<button type="button" class="red-ui-info-outline-item-control-lock red-ui-button red-ui-button-small"><i class="fa fa-unlock-alt"></i><i class="fa fa-lock"></i></button>').appendTo(controls).on("click",function(evt) {
-                evt.preventDefault();
-                evt.stopPropagation();
-                if (n.locked) {
-                    RED.workspaces.unlock(n.id)
-                } else {
-                    RED.workspaces.lock(n.id)
-                }
-            })
-            RED.popover.tooltip(lockToggleButton,function() {
-                return RED._("common.label."+(n.locked?"unlock":"lock"));
-            });
-        } else {
-            $('<div class="red-ui-info-outline-item-control-spacer">').appendTo(controls)
-        }
        controls.find("button").on("dblclick", function(evt) {
            evt.preventDefault();
            evt.stopPropagation();
@@ -380,8 +364,6 @@ RED.sidebar.info.outliner = (function() {
        flowList.treeList.addChild(objects[ws.id])
        objects[ws.id].element.toggleClass("red-ui-info-outline-item-disabled", !!ws.disabled)
        objects[ws.id].treeList.container.toggleClass("red-ui-info-outline-item-disabled", !!ws.disabled)
-        objects[ws.id].element.toggleClass("red-ui-info-outline-item-locked", !!ws.locked)
-        objects[ws.id].treeList.container.toggleClass("red-ui-info-outline-item-locked", !!ws.locked)
        updateSearch();

    }
@@ -396,8 +378,6 @@ RED.sidebar.info.outliner = (function() {
        existingObject.element.find(".red-ui-info-outline-item-label").text(label);
        existingObject.element.toggleClass("red-ui-info-outline-item-disabled", !!n.disabled)
        existingObject.treeList.container.toggleClass("red-ui-info-outline-item-disabled", !!n.disabled)
-        existingObject.element.toggleClass("red-ui-info-outline-item-locked", !!n.locked)
-        existingObject.treeList.container.toggleClass("red-ui-info-outline-item-locked", !!n.locked)
        updateSearch();
    }
    function onFlowsReorder(order) {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
@@ -25,7 +25,6 @@ RED.sidebar.info = (function() {
    var propertiesPanelHeaderLabel;
    var propertiesPanelHeaderReveal;
    var propertiesPanelHeaderHelp;
-    var propertiesPanelHeaderCopyLink;

    var selectedObject;

@@ -68,20 +67,10 @@ RED.sidebar.info = (function() {

        propertiesPanelHeaderIcon = $("<span>").appendTo(propertiesPanelHeader);
        propertiesPanelHeaderLabel = $("<span>").appendTo(propertiesPanelHeader);
-
-        propertiesPanelHeaderCopyLink = $('<button type="button" class="red-ui-button red-ui-button-small"><i class="fa fa-link"></button>').css({
+        propertiesPanelHeaderHelp = $('<button class="red-ui-button red-ui-button-small"><i class="fa fa-book"></button>').css({
            position: 'absolute',
            top: '12px',
            right: '32px'
-        }).on("click", function(evt) {
-            RED.actions.invoke('core:copy-item-url',selectedObject)
-        }).appendTo(propertiesPanelHeader);
-        RED.popover.tooltip(propertiesPanelHeaderCopyLink,RED._("sidebar.info.copyItemUrl"));
-
-        propertiesPanelHeaderHelp = $('<button type="button" class="red-ui-button red-ui-button-small"><i class="fa fa-book"></button>').css({
-            position: 'absolute',
-            top: '12px',
-            right: '56px'
        }).on("click", function(evt) {
            evt.preventDefault();
            evt.stopPropagation();
@@ -91,7 +80,8 @@ RED.sidebar.info = (function() {
        }).appendTo(propertiesPanelHeader);
        RED.popover.tooltip(propertiesPanelHeaderHelp,RED._("sidebar.help.showHelp"));

-        propertiesPanelHeaderReveal = $('<button type="button" class="red-ui-button red-ui-button-small"><i class="fa fa-search"></button>').css({
+
+        propertiesPanelHeaderReveal = $('<button class="red-ui-button red-ui-button-small"><i class="fa fa-search"></button>').css({
            position: 'absolute',
            top: '12px',
            right: '8px'
@@ -108,7 +98,7 @@ RED.sidebar.info = (function() {

        propertiesPanelContent = $("<div>").css({
            "flex":"1 1 auto",
-            "overflow-y":"scroll",
+            "overflow-y":"auto",
        }).appendTo(propertiesPanel);


@@ -195,7 +185,6 @@ RED.sidebar.info = (function() {
            propertiesPanelHeaderLabel.text("");
            propertiesPanelHeaderReveal.hide();
            propertiesPanelHeaderHelp.hide();
-            propertiesPanelHeaderCopyLink.hide();
            return;
        } else if (Array.isArray(node)) {
            // Multiple things selected
@@ -207,7 +196,6 @@ RED.sidebar.info = (function() {
            propertiesPanelHeaderLabel.text("Selection");
            propertiesPanelHeaderReveal.hide();
            propertiesPanelHeaderHelp.hide();
-            propertiesPanelHeaderCopyLink.hide();
            selectedObject = null;

            var types = {
@@ -289,11 +277,9 @@ RED.sidebar.info = (function() {
            if (node.type === "tab" || node.type === "subflow") {
                // If nothing is selected, but we're on a flow or subflow tab.
                propertiesPanelHeaderHelp.hide();
-                propertiesPanelHeaderCopyLink.show();

            } else if (node.type === "group") {
                propertiesPanelHeaderHelp.hide();
-                propertiesPanelHeaderCopyLink.show();

                propRow = $('<tr class="red-ui-help-info-row"><td>&nbsp;</td><td></td></tr>').appendTo(tableBody);

@@ -318,10 +304,8 @@ RED.sidebar.info = (function() {
                }
            } else if (node.type === 'junction') {
                propertiesPanelHeaderHelp.hide();
-                propertiesPanelHeaderCopyLink.hide();
            } else {
                propertiesPanelHeaderHelp.show();
-                propertiesPanelHeaderCopyLink.show();

                if (!subflowRegex) {
                    propRow = $('<tr class="red-ui-help-info-row"><td>'+RED._("sidebar.info.type")+'</td><td></td></tr>').appendTo(tableBody);
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js
@@ -269,8 +269,8 @@ RED.typeSearch = (function() {
        moveCallback = opts.move;
        RED.events.emit("type-search:open");
        //shade.show();
-        if ($("#red-ui-main-container").height() - opts.y - 150 < 0) {
-            opts.y = opts.y - 235;
+        if ($("#red-ui-main-container").height() - opts.y - 195 < 0) {
+            opts.y = opts.y - 275;
        }
        dialog.css({left:opts.x+"px",top:opts.y+"px"}).show();
        searchResultsDiv.slideDown(300);
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js
@@ -15,7 +15,7 @@
 **/

 RED.view.tools = (function() {
-    'use strict';
+
    function selectConnected(type) {
        var selection = RED.view.selection();
        var visited = new Set();
@@ -39,9 +39,6 @@ RED.view.tools = (function() {
    }

    function alignToGrid() {
-        if (RED.workspaces.isActiveLocked()) {
-            return
-        }
        var selection = RED.view.selection();
        if (selection.nodes) {
            var changedNodes = [];
@@ -90,9 +87,6 @@ RED.view.tools = (function() {
    }

    function moveSelection(dx,dy) {
-        if (RED.workspaces.isActiveLocked()) {
-            return
-        }
        if (moving_set === null) {
            moving_set = [];
            var selection = RED.view.selection();
@@ -159,9 +153,6 @@ RED.view.tools = (function() {
    }

    function setSelectedNodeLabelState(labelShown) {
-        if (RED.workspaces.isActiveLocked()) {
-            return
-        }
        var selection = RED.view.selection();
        var historyEvents = [];
        var nodes = [];
@@ -448,9 +439,6 @@ RED.view.tools = (function() {
    }

    function alignSelectionToEdge(direction) {
-        // if (RED.workspaces.isActiveLocked()) {
-        //     return
-        // }
        var selection = RED.view.selection();

        if (selection.nodes && selection.nodes.length > 1) {
@@ -551,10 +539,8 @@ RED.view.tools = (function() {
        }
    }

+
    function distributeSelection(direction) {
-        if (RED.workspaces.isActiveLocked()) {
-            return
-        }
        var selection = RED.view.selection();

        if (selection.nodes && selection.nodes.length > 2) {
@@ -713,9 +699,6 @@ RED.view.tools = (function() {
    }

    function reorderSelection(dir) {
-        if (RED.workspaces.isActiveLocked()) {
-            return
-        }
        var selection = RED.view.selection();
        if (selection.nodes) {
            var nodesToMove = [];
@@ -751,10 +734,8 @@ RED.view.tools = (function() {
        }
    }

+
    function wireSeriesOfNodes() {
-        if (RED.workspaces.isActiveLocked()) {
-            return
-        }
        var selection = RED.view.selection();
        if (selection.nodes) {
            if (selection.nodes.length > 1) {
@@ -795,9 +776,6 @@ RED.view.tools = (function() {
    }

    function wireNodeToMultiple() {
-        if (RED.workspaces.isActiveLocked()) {
-            return
-        }
        var selection = RED.view.selection();
        if (selection.nodes) {
            if (selection.nodes.length > 1) {
@@ -845,9 +823,6 @@ RED.view.tools = (function() {
     * @param {Object || Object[]} wires The wire(s) to split and replace with link-out, link-in nodes.
     */
    function splitWiresWithLinkNodes(wires) {
-        if (RED.workspaces.isActiveLocked()) {
-            return
-        }
        let wiresToSplit = wires || (RED.view.selection().links && RED.view.selection().links.filter(e => !e.link));
        if (!wiresToSplit) {
            return
@@ -902,6 +877,7 @@ RED.view.tools = (function() {
            if(!nnLinkOut) {
                const nLinkOut = RED.view.createNode("link out"); //create link node
                nnLinkOut = nLinkOut.node;
+                nodeSrcMap[linkOutMapId] = nnLinkOut;
                let yOffset = 0;
                if(nSrc.outputs > 1) {

@@ -916,8 +892,7 @@ RED.view.tools = (function() {
                    updateNewNodePosXY(nSrc, nnLinkOut, false, RED.view.snapGrid, yOffset);
                }
                //add created node
-                nnLinkOut = RED.nodes.add(nnLinkOut);
-                nodeSrcMap[linkOutMapId] = nnLinkOut;
+                RED.nodes.add(nnLinkOut);
                RED.editor.validateNode(nnLinkOut);
                history.events.push(nLinkOut.historyEvent);
                //connect node to link node
@@ -938,10 +913,10 @@ RED.view.tools = (function() {
            if(!nnLinkIn) {
                const nLinkIn = RED.view.createNode("link in"); //create link node
                nnLinkIn = nLinkIn.node;
+                nodeTrgMap[nTrg.id] = nnLinkIn;
                updateNewNodePosXY(nTrg, nnLinkIn, true, RED.view.snapGrid, 0);
                //add created node
-                nnLinkIn = RED.nodes.add(nnLinkIn);
-                nodeTrgMap[nTrg.id] = nnLinkIn;
+                RED.nodes.add(nnLinkIn);
                RED.editor.validateNode(nnLinkIn);
                history.events.push(nLinkIn.historyEvent);
                //connect node to link node
@@ -1016,9 +991,6 @@ RED.view.tools = (function() {
     * @param {{ renameBlank: boolean, renameClash: boolean, generateHistory: boolean }} options Possible options are `renameBlank`, `renameClash` and `generateHistory`
     */
    function generateNodeNames(node, options) {
-        if (RED.workspaces.isActiveLocked()) {
-            return
-        }
        options = Object.assign({
            renameBlank: true,
            renameClash: true,
@@ -1043,7 +1015,7 @@ RED.view.tools = (function() {
                const nodeDef = n._def || RED.nodes.getType(n.type)
                if (nodeDef && nodeDef.defaults && nodeDef.defaults.name) {
                    const paletteLabel = RED.utils.getPaletteLabel(n.type, nodeDef)
-                    const defaultNodeNameRE = new RegExp('^'+paletteLabel+' (\\d+)$')
+                    const defaultNodeNameRE = new RegExp('^'+paletteLabel.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')+' (\\d+)$')
                    if (!typeIndex.hasOwnProperty(n.type)) {
                        const existingNodes = RED.nodes.filterNodes({type: n.type})
                        let maxNameNumber = 0;
@@ -1089,9 +1061,6 @@ RED.view.tools = (function() {
    }

    function addJunctionsToWires(wires) {
-        if (RED.workspaces.isActiveLocked()) {
-            return
-        }
        let wiresToSplit = wires || (RED.view.selection().links && RED.view.selection().links.filter(e => !e.link));
        if (!wiresToSplit) {
            return
@@ -1162,7 +1131,7 @@ RED.view.tools = (function() {

            var nodeGroups = new Set()

-            junction = RED.nodes.addJunction(junction)
+            RED.nodes.addJunction(junction)
            addedJunctions.push(junction)
            let newLink
            if (gid === links[0].source.id+":"+links[0].sourcePort) {
@@ -1223,30 +1192,6 @@ RED.view.tools = (function() {
        RED.view.redraw(true);
    }

-    function copyItemUrl(node, isEdit) {
-        if (!node) {
-            const selection = RED.view.selection();
-            if (selection.nodes && selection.nodes.length > 0) {
-                node = selection.nodes[0]
-            }
-        }
-        if (node) {
-            let thingType = 'node'
-            if (node.type === 'group') {
-                thingType = 'group'
-            } else if (node.type === 'tab' || node.type === 'subflow') {
-                thingType = 'flow'
-            }
-            let url = `${window.location.origin}${window.location.pathname}#${thingType}/${node.id}`
-            if (isEdit) {
-                url += '/edit'
-            }
-            if (RED.clipboard.copyText(url)) {
-                RED.notify(RED._("sidebar.info.copyURL2Clipboard"), { timeout: 2000 })
-            }
-        }
-    }
-
    return {
        init: function() {
            RED.actions.add("core:show-selected-node-labels", function() { setSelectedNodeLabelState(true); })
@@ -1313,9 +1258,6 @@ RED.view.tools = (function() {

            RED.actions.add("core:generate-node-names", generateNodeNames )

-            RED.actions.add("core:copy-item-url", function (node) { copyItemUrl(node) })
-            RED.actions.add("core:copy-item-edit-url", function (node) { copyItemUrl(node, true) })
-
            // RED.actions.add("core:add-node", function() { addNode() })
        },
        /**
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -54,7 +54,6 @@ RED.view = (function() {
    var spliceTimer;
    var groupHoverTimer;

-    var activeFlowLocked = false;
    var activeSubflow = null;
    var activeNodes = [];
    var activeLinks = [];
@@ -212,7 +211,6 @@ RED.view = (function() {
            evt.preventDefault()
            evt.stopPropagation()
            RED.contextMenu.show({
-                type: 'workspace',
                x:evt.clientX-5,
                y:evt.clientY-5
            })
@@ -412,19 +410,8 @@ RED.view = (function() {

            activeSubflow = RED.nodes.subflow(event.workspace);

-            if (activeSubflow) {
-                activeFlowLocked = activeSubflow.locked
-            } else {
-                var activeWorkspace = RED.nodes.workspace(event.workspace)
-                if (activeWorkspace) {
-                    activeFlowLocked = activeWorkspace.locked
-                } else {
-                    activeFlowLocked = true
-                }
-            }
-
-            RED.menu.setDisabled("menu-item-workspace-edit", activeFlowLocked || activeSubflow || event.workspace === 0);
-            RED.menu.setDisabled("menu-item-workspace-delete",activeFlowLocked || event.workspace === 0 || RED.workspaces.count() == 1 || activeSubflow);
+            RED.menu.setDisabled("menu-item-workspace-edit", activeSubflow || event.workspace === 0);
+            RED.menu.setDisabled("menu-item-workspace-delete",event.workspace === 0 || RED.workspaces.count() == 1 || activeSubflow);

            if (workspaceScrollPositions[event.workspace]) {
                chart.scrollLeft(workspaceScrollPositions[event.workspace].left);
@@ -451,15 +438,6 @@ RED.view = (function() {
            redraw();
        });

-        RED.events.on("flows:change", function(workspace) {
-            if (workspace.id === RED.workspaces.active()) {
-                activeFlowLocked = !!workspace.locked
-                $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!workspace.disabled);
-                $("#red-ui-workspace").toggleClass("red-ui-workspace-locked",!!workspace.locked);
-
-            }
-        })
-
        RED.statusBar.add({
            id: "view-zoom-controls",
            align: "right",
@@ -517,9 +495,6 @@ RED.view = (function() {
        chart.droppable({
            accept:".red-ui-palette-node",
            drop: function( event, ui ) {
-                if (activeFlowLocked) {
-                    return
-                }
                d3.event = event;
                var selected_tool = $(ui.draggable[0]).attr("data-palette-type");
                var result = createNode(selected_tool);
@@ -527,7 +502,9 @@ RED.view = (function() {
                    return;
                }
                var historyEvent = result.historyEvent;
-                var nn = RED.nodes.add(result.node);
+                var nn = result.node;
+
+                RED.nodes.add(nn);

                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")) {
@@ -654,9 +631,6 @@ RED.view = (function() {
        RED.actions.add("core:copy-selection-to-internal-clipboard",copySelection);
        RED.actions.add("core:cut-selection-to-internal-clipboard",function(){copySelection(true);deleteSelection();});
        RED.actions.add("core:paste-from-internal-clipboard",function(){
-            if (RED.workspaces.isActiveLocked()) {
-                return
-            }
            importNodes(clipboard,{generateIds: clipboardSource === 'copy', generateDefaultNames: clipboardSource === 'copy'});
        });

@@ -665,27 +639,22 @@ RED.view = (function() {
        RED.events.on("view:selection-changed", function(selection) {
            var hasSelection = (selection.nodes && selection.nodes.length > 0);
            var hasMultipleSelection = hasSelection && selection.nodes.length > 1;
-            var hasLinkSelected = selection.links && selection.links.length > 0;
-            var canEdit = !activeFlowLocked && hasSelection
-            var canEditMultiple = !activeFlowLocked && hasMultipleSelection
-            RED.menu.setDisabled("menu-item-edit-cut", !canEdit);
-            RED.menu.setDisabled("menu-item-edit-copy", !hasSelection);
-            RED.menu.setDisabled("menu-item-edit-select-connected", !hasSelection);
-            RED.menu.setDisabled("menu-item-view-tools-move-to-back", !canEdit);
-            RED.menu.setDisabled("menu-item-view-tools-move-to-front", !canEdit);
-            RED.menu.setDisabled("menu-item-view-tools-move-backwards", !canEdit);
-            RED.menu.setDisabled("menu-item-view-tools-move-forwards", !canEdit);
+            RED.menu.setDisabled("menu-item-edit-cut",!hasSelection);
+            RED.menu.setDisabled("menu-item-edit-copy",!hasSelection);
+            RED.menu.setDisabled("menu-item-edit-select-connected",!hasSelection);
+            RED.menu.setDisabled("menu-item-view-tools-move-to-back",!hasSelection);
+            RED.menu.setDisabled("menu-item-view-tools-move-to-front",!hasSelection);
+            RED.menu.setDisabled("menu-item-view-tools-move-backwards",!hasSelection);
+            RED.menu.setDisabled("menu-item-view-tools-move-forwards",!hasSelection);

-            RED.menu.setDisabled("menu-item-view-tools-align-left", !canEditMultiple);
-            RED.menu.setDisabled("menu-item-view-tools-align-center", !canEditMultiple);
-            RED.menu.setDisabled("menu-item-view-tools-align-right", !canEditMultiple);
-            RED.menu.setDisabled("menu-item-view-tools-align-top", !canEditMultiple);
-            RED.menu.setDisabled("menu-item-view-tools-align-middle", !canEditMultiple);
-            RED.menu.setDisabled("menu-item-view-tools-align-bottom", !canEditMultiple);
-            RED.menu.setDisabled("menu-item-view-tools-distribute-horizontally", !canEditMultiple);
-            RED.menu.setDisabled("menu-item-view-tools-distribute-veritcally", !canEditMultiple);
-
-            RED.menu.setDisabled("menu-item-edit-split-wire-with-links", activeFlowLocked || !hasLinkSelected);
+            RED.menu.setDisabled("menu-item-view-tools-align-left",!hasMultipleSelection);
+            RED.menu.setDisabled("menu-item-view-tools-align-center",!hasMultipleSelection);
+            RED.menu.setDisabled("menu-item-view-tools-align-right",!hasMultipleSelection);
+            RED.menu.setDisabled("menu-item-view-tools-align-top",!hasMultipleSelection);
+            RED.menu.setDisabled("menu-item-view-tools-align-middle",!hasMultipleSelection);
+            RED.menu.setDisabled("menu-item-view-tools-align-bottom",!hasMultipleSelection);
+            RED.menu.setDisabled("menu-item-view-tools-distribute-horizontally",!hasMultipleSelection);
+            RED.menu.setDisabled("menu-item-view-tools-distribute-veritcally",!hasMultipleSelection);
        })

        RED.actions.add("core:delete-selection",deleteSelection);
@@ -1075,7 +1044,7 @@ RED.view = (function() {
                            .attr("class", "nr-ui-view-lasso");
                        d3.event.preventDefault();
                    }
-                } else if (d3.event.altKey && !activeFlowLocked) {
+                } else if (d3.event.altKey) {
                    //Alt [+shift] held - Begin slicing
                    clearSelection();
                    mouse_mode = (d3.event.shiftKey) ? RED.state.SLICING_JUNCTION : RED.state.SLICING;
@@ -1089,9 +1058,6 @@ RED.view = (function() {
    }

    function showQuickAddDialog(options) {
-        if (activeFlowLocked) {
-            return
-        }
        options = options || {};
        var point = options.position || lastClickPosition;
        var spliceLink = options.splice;
@@ -1105,12 +1071,15 @@ RED.view = (function() {
            RED.view.redraw();
        }

+        // `point` is the place in the workspace the mouse has clicked.
+        //  This takes into account scrolling and scaling of the workspace.
        var ox = point[0];
        var oy = point[1];

+        // Need to map that to browser location to position the pop-up
        const offset = $("#red-ui-workspace-chart").offset()
-        var clientX = ox + offset.left - $("#red-ui-workspace-chart").scrollLeft()
-        var clientY = oy + offset.top - $("#red-ui-workspace-chart").scrollTop()
+        var clientX = (ox * scaleFactor) + offset.left - $("#red-ui-workspace-chart").scrollLeft()
+        var clientY = (oy * scaleFactor) + offset.top - $("#red-ui-workspace-chart").scrollTop()

        if (RED.settings.get("editor").view['view-snap-grid']) {
            // eventLayer.append("circle").attr("cx",point[0]).attr("cy",point[1]).attr("r","2").attr('fill','red')
@@ -1271,11 +1240,6 @@ RED.view = (function() {
                if (showLabel !== undefined && (nn._def.hasOwnProperty("showLabel")?nn._def.showLabel:true) && !nn._def.defaults.hasOwnProperty("l")) {
                    nn.l = showLabel;
                }
-                if (nn.type === 'junction') {
-                    nn = RED.nodes.addJunction(nn);
-                } else {
-                    nn = RED.nodes.add(nn);
-                }
                if (quickAddLink) {
                    var drag_line = quickAddLink;
                    var src = null,dst,src_port;
@@ -1378,7 +1342,11 @@ RED.view = (function() {
                        }
                    }
                }
-
+                if (nn.type === 'junction') {
+                    RED.nodes.addJunction(nn);
+                } else {
+                    RED.nodes.add(nn);
+                }
                RED.editor.validateNode(nn);

                if (targetGroup) {
@@ -1636,18 +1604,16 @@ RED.view = (function() {
            }
            var d = (mouse_offset[0]-mousePos[0])*(mouse_offset[0]-mousePos[0]) + (mouse_offset[1]-mousePos[1])*(mouse_offset[1]-mousePos[1]);
            if ((d > 3 && !dblClickPrimed) || (dblClickPrimed && d > 10)) {
+                mouse_mode = RED.state.MOVING_ACTIVE;
                clickElapsed = 0;
-                if (!activeFlowLocked) {
-                    mouse_mode = RED.state.MOVING_ACTIVE;
-                    spliceActive = false;
-                    if (movingSet.length() === 1) {
-                        node = movingSet.get(0);
-                        spliceActive = node.n.hasOwnProperty("_def") &&
-                                       ((node.n.hasOwnProperty("inputs") && node.n.inputs > 0) || (!node.n.hasOwnProperty("inputs") && node.n._def.inputs > 0)) &&
-                                       ((node.n.hasOwnProperty("outputs") && node.n.outputs > 0) || (!node.n.hasOwnProperty("outputs") && node.n._def.outputs > 0)) &&
-                                       RED.nodes.filterLinks({ source: node.n }).length === 0 &&
-                                       RED.nodes.filterLinks({ target: node.n }).length === 0;
-                    }
+                spliceActive = false;
+                if (movingSet.length() === 1) {
+                    node = movingSet.get(0);
+                    spliceActive = node.n.hasOwnProperty("_def") &&
+                                   ((node.n.hasOwnProperty("inputs") && node.n.inputs > 0) || (!node.n.hasOwnProperty("inputs") && node.n._def.inputs > 0)) &&
+                                   ((node.n.hasOwnProperty("outputs") && node.n.outputs > 0) || (!node.n.hasOwnProperty("outputs") && node.n._def.outputs > 0)) &&
+                                   RED.nodes.filterLinks({ source: node.n }).length === 0 &&
+                                   RED.nodes.filterLinks({ target: node.n }).length === 0;
                }
            }
        } else if (mouse_mode == RED.state.MOVING_ACTIVE || mouse_mode == RED.state.IMPORT_DRAGGING || mouse_mode == RED.state.DETACHED_DRAGGING) {
@@ -2492,7 +2458,6 @@ RED.view = (function() {
    }

    function editSelection() {
-        if (RED.workspaces.isActiveLocked()) { return }
        if (movingSet.length() > 0) {
            var node = movingSet.get(0).n;
            if (node.type === "subflow") {
@@ -2508,9 +2473,6 @@ RED.view = (function() {
        if (mouse_mode === RED.state.SELECTING_NODE) {
            return;
        }
-        if (activeFlowLocked) {
-            return
-        }
        if (portLabelHover) {
            portLabelHover.remove();
            portLabelHover = null;
@@ -2826,7 +2788,6 @@ RED.view = (function() {


    function detachSelectedNodes() {
-        if (RED.workspaces.isActiveLocked()) { return }
        var selection = RED.view.selection();
        if (selection.nodes) {
            const {newLinks, removedLinks} = RED.nodes.detachNodes(selection.nodes);
@@ -2968,7 +2929,7 @@ RED.view = (function() {
        mousedown_node = d;
        mousedown_port_type = portType;
        mousedown_port_index = portIndex || 0;
-        if (mouse_mode !== RED.state.QUICK_JOINING && !activeFlowLocked) {
+        if (mouse_mode !== RED.state.QUICK_JOINING) {
            mouse_mode = RED.state.JOINING;
            document.body.style.cursor = "crosshair";
            if (evt.ctrlKey || evt.metaKey) {
@@ -3408,11 +3369,6 @@ RED.view = (function() {
        }
        if (dblClickPrimed && mousedown_node == d && clickElapsed > 0 && clickElapsed < dblClickInterval) {
            mouse_mode = RED.state.DEFAULT;
-            if (RED.workspaces.isActiveLocked()) {
-                clickElapsed = 0;
-                d3.event.stopPropagation();
-                return
-            }
            if (d.type != "subflow") {
                if (/^subflow:/.test(d.type) && (d3.event.ctrlKey || d3.event.metaKey)) {
                    RED.workspaces.show(d.type.substring(8));
@@ -3736,6 +3692,7 @@ RED.view = (function() {
            }
            // selectedLinks.clear();
            if (d3.event.button != 2) {
+                mouse_mode = RED.state.MOVING;
                var mouse = d3.touches(this)[0]||d3.mouse(this);
                mouse[0] += d.x-d.w/2;
                mouse[1] += d.y-d.h/2;
@@ -3928,7 +3885,6 @@ RED.view = (function() {
        if (RED.view.DEBUG) {
            console.warn("groupMouseUp", { mouse_mode, event: d3.event });
        }
-        if (RED.workspaces.isActiveLocked()) { return }
        if (dblClickPrimed && mousedown_group == g && clickElapsed > 0 && clickElapsed < dblClickInterval) {
            mouse_mode = RED.state.DEFAULT;
            RED.editor.editGroup(g);
@@ -4099,7 +4055,7 @@ RED.view = (function() {
    function isButtonEnabled(d) {
        var buttonEnabled = true;
        var ws = RED.nodes.workspace(RED.workspaces.active());
-        if (ws && !ws.disabled && !d.d && !ws.locked) {
+        if (ws && !ws.disabled && !d.d) {
            if (d._def.button.hasOwnProperty('enabled')) {
                if (typeof d._def.button.enabled === "function") {
                    buttonEnabled = d._def.button.enabled.call(d);
@@ -4122,7 +4078,7 @@ RED.view = (function() {
        }
        var activeWorkspace = RED.workspaces.active();
        var ws = RED.nodes.workspace(activeWorkspace);
-        if (ws && !ws.disabled && !d.d && !ws.locked) {
+        if (ws && !ws.disabled && !d.d) {
            if (d._def.button.toggle) {
                d[d._def.button.toggle] = !d[d._def.button.toggle];
                d.dirty = true;
@@ -4137,7 +4093,7 @@ RED.view = (function() {
            if (d.dirty) {
                redraw();
            }
-        } else if (!ws || !ws.locked){
+        } else {
            if (activeSubflow) {
                RED.notify(RED._("notification.warning", {message:RED._("notification.warnings.nodeActionDisabledSubflow")}),"warning");
            } else {
@@ -4152,15 +4108,14 @@ RED.view = (function() {
    function showTouchMenu(obj,pos) {
        var mdn = mousedown_node;
        var options = [];
-        const isActiveLocked = RED.workspaces.isActiveLocked()
-        options.push({name:"delete",disabled:(isActiveLocked || movingSet.length()===0 && selectedLinks.length() === 0),onselect:function() {deleteSelection();}});
-        options.push({name:"cut",disabled:(isActiveLocked || movingSet.length()===0),onselect:function() {copySelection(true);deleteSelection();}});
-        options.push({name:"copy",disabled:(isActiveLocked || movingSet.length()===0),onselect:function() {copySelection();}});
-        options.push({name:"paste",disabled:(isActiveLocked || clipboard.length===0),onselect:function() {importNodes(clipboard, {generateIds: true, touchImport: true});}});
-        options.push({name:"edit",disabled:(isActiveLocked || movingSet.length() != 1),onselect:function() { RED.editor.edit(mdn);}});
+        options.push({name:"delete",disabled:(movingSet.length()===0 && selectedLinks.length() === 0),onselect:function() {deleteSelection();}});
+        options.push({name:"cut",disabled:(movingSet.length()===0),onselect:function() {copySelection(true);deleteSelection();}});
+        options.push({name:"copy",disabled:(movingSet.length()===0),onselect:function() {copySelection();}});
+        options.push({name:"paste",disabled:(clipboard.length===0),onselect:function() {importNodes(clipboard, {generateIds: true, touchImport: true});}});
+        options.push({name:"edit",disabled:(movingSet.length() != 1),onselect:function() { RED.editor.edit(mdn);}});
        options.push({name:"select",onselect:function() {selectAll();}});
        options.push({name:"undo",disabled:(RED.history.depth() === 0),onselect:function() {RED.history.pop();}});
-        options.push({name:"add",disabled:isActiveLocked, onselect:function() {
+        options.push({name:"add",onselect:function() {
            chartPos = chart.offset();
            showQuickAddDialog({
                position:[pos[0]-chartPos.left+chart.scrollLeft(),pos[1]-chartPos.top+chart.scrollTop()],
@@ -4954,7 +4909,7 @@ RED.view = (function() {
                        if (d._def.button) {
                            var buttonEnabled = isButtonEnabled(d);
                            this.__buttonGroup__.classList.toggle("red-ui-flow-node-button-disabled", !buttonEnabled);
-                            if (RED.runtime && Object.hasOwn(RED.runtime,'started')) {
+                            if (RED.runtime && RED.runtime.started !== undefined) {
                                this.__buttonGroup__.classList.toggle("red-ui-flow-node-button-stopped", !RED.runtime.started);
                            }

@@ -5858,9 +5813,6 @@ RED.view = (function() {
        if (mouse_mode === RED.state.SELECTING_NODE) {
            return;
        }
-        if (activeFlowLocked) {
-            return
-        }
        var workspaceSelection = RED.workspaces.selection();
        var changed = false;
        if (workspaceSelection.length > 0) {
@@ -6188,9 +6140,7 @@ RED.view = (function() {
                    if (node.z && (node.type === "group" || node._def.category !== 'config')) {
                        node.dirty = true;
                        RED.workspaces.show(node.z);
-                        if (node.type === "group" && !node.w && !node.h) {
-                            _redraw();
-                        }
+
                        var screenSize = [chart[0].clientWidth/scaleFactor,chart[0].clientHeight/scaleFactor];
                        var scrollPos = [chart.scrollLeft()/scaleFactor,chart.scrollTop()/scaleFactor];
                        var cx = node.x;
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
@@ -58,9 +58,6 @@ RED.workspaces = (function() {
            if (!ws.closeable) {
                ws.hideable = true;
            }
-            if (!ws.hasOwnProperty('locked')) {
-                ws.locked = false
-            }
            workspace_tabs.addTab(ws,targetIndex);

            var hiddenTabs = JSON.parse(RED.settings.getLocal("hiddenTabs")||"{}");
@@ -78,7 +75,6 @@ RED.workspaces = (function() {
                type: "tab",
                id: tabId,
                disabled: false,
-                locked: false,
                info: "",
                label: RED._('workspace.defaultName',{number:workspaceIndex}),
                env: [],
@@ -103,9 +99,6 @@ RED.workspaces = (function() {
        if (workspaceTabCount === 1) {
            return;
        }
-        if (ws.locked) {
-            return
-        }
        var workspaceOrder = RED.nodes.getWorkspaceOrder();
        ws._index = workspaceOrder.indexOf(ws.id);
        removeWorkspace(ws);
@@ -126,198 +119,13 @@ RED.workspaces = (function() {
                RED.editor.editSubflow(subflow);
            }
        } else {
-            if (!workspace.locked) {
-                RED.editor.editFlow(workspace);
-            }
+            RED.editor.editFlow(workspace);
        }
    }


    var workspace_tabs;
    var workspaceTabCount = 0;
-
-    function getMenuItems(isMenuButton, tab) {
-        let hiddenFlows = new Set()
-        for (let i = 0; i < hideStack.length; i++) {
-            let ids = hideStack[i]
-            if (!Array.isArray(ids)) {
-                ids = [ids]
-            }
-            ids.forEach(id => {
-                if (RED.nodes.workspace(id)) {
-                    hiddenFlows.add(id)
-                }
-            })
-        }
-        const hiddenflowCount = hiddenFlows.size;
-        let activeWorkspace = tab || RED.nodes.workspace(RED.workspaces.active()) || RED.nodes.subflow(RED.workspaces.active())
-        let isFlowDisabled = activeWorkspace ? activeWorkspace.disabled : false
-
-        let isCurrentLocked = RED.workspaces.isActiveLocked()
-        if (tab) {
-            isCurrentLocked = tab.locked
-        }
-
-        var menuItems = []
-        if (isMenuButton) {
-            menuItems.push({
-                id:"red-ui-tabs-menu-option-search-flows",
-                label: RED._("workspace.listFlows"),
-                onselect: "core:list-flows"
-            },
-            {
-                id:"red-ui-tabs-menu-option-search-subflows",
-                label: RED._("workspace.listSubflows"),
-                onselect: "core:list-subflows"
-            },
-            null)
-        }
-        menuItems.push(
-            {
-                id:"red-ui-tabs-menu-option-add-flow",
-                label: RED._("workspace.addFlow"),
-                onselect: "core:add-flow"
-            }
-        )
-        if (isMenuButton || !!tab) {
-            menuItems.push(
-                {
-                    id:"red-ui-tabs-menu-option-add-flow-right",
-                    label: RED._("workspace.addFlowToRight"),
-                    shortcut: RED.keyboard.getShortcut("core:add-flow-to-right"),
-                    onselect: function() {
-                        RED.actions.invoke("core:add-flow-to-right", tab)
-                    }
-                },
-                null
-            )
-            if (activeWorkspace && activeWorkspace.type === 'tab') {
-                menuItems.push(
-                    isFlowDisabled ? {
-                        label: RED._("workspace.enableFlow"),
-                        shortcut: RED.keyboard.getShortcut("core:enable-flow"),
-                        onselect: function() {
-                            RED.actions.invoke("core:enable-flow", tab?tab.id:undefined)
-                        },
-                        disabled: isCurrentLocked
-                    } : {
-                        label: RED._("workspace.disableFlow"),
-                        shortcut: RED.keyboard.getShortcut("core:disable-flow"),
-                        onselect: function() {
-                            RED.actions.invoke("core:disable-flow", tab?tab.id:undefined)
-                        },
-                        disabled: isCurrentLocked
-                    },
-                    isCurrentLocked? {
-                        label: RED._("workspace.unlockFlow"),
-                        shortcut: RED.keyboard.getShortcut("core:unlock-flow"),
-                        onselect: function() {
-                            RED.actions.invoke('core:unlock-flow', tab?tab.id:undefined)
-                        }
-                    } : {
-                        label: RED._("workspace.lockFlow"),
-                        shortcut: RED.keyboard.getShortcut("core:lock-flow"),
-                        onselect: function() {
-                            RED.actions.invoke('core:lock-flow', tab?tab.id:undefined)
-                        }
-                    },
-                    null
-                )
-            }
-            const currentTabs = workspace_tabs.listTabs()
-            const activeIndex = currentTabs.findIndex(id => id === activeWorkspace.id)
-            menuItems.push(
-                {
-                    label: RED._("workspace.moveToStart"),
-                    shortcut: RED.keyboard.getShortcut("core:move-flow-to-start"),
-                    onselect: function() {
-                        RED.actions.invoke("core:move-flow-to-start", tab?tab.id:undefined)
-                    },
-                    disabled: activeIndex === 0
-                },
-                {
-                    label: RED._("workspace.moveToEnd"),
-                    shortcut: RED.keyboard.getShortcut("core:move-flow-to-end"),
-                    onselect: function() {
-                        RED.actions.invoke("core:move-flow-to-end", tab?tab.id:undefined)
-                    },
-                    disabled: activeIndex === currentTabs.length - 1
-                }
-            )
-        }
-        menuItems.push(null)
-        if (isMenuButton || !!tab) {
-            menuItems.push(
-                {
-                    id:"red-ui-tabs-menu-option-add-hide-flows",
-                    label: RED._("workspace.hideFlow"),
-                    shortcut: RED.keyboard.getShortcut("core:hide-flow"),
-                    onselect: function() {
-                        RED.actions.invoke("core:hide-flow", tab)
-                    }
-                },
-                {
-                    id:"red-ui-tabs-menu-option-add-hide-other-flows",
-                    label: RED._("workspace.hideOtherFlows"),
-                    shortcut: RED.keyboard.getShortcut("core:hide-other-flows"),
-                    onselect: function() {
-                        RED.actions.invoke("core:hide-other-flows", tab)
-                    }
-                }
-            )
-
-        }
-        menuItems.push(
-            {
-                id:"red-ui-tabs-menu-option-add-hide-all-flows",
-                label: RED._("workspace.hideAllFlows"),
-                onselect: "core:hide-all-flows"
-            },
-            {
-                id:"red-ui-tabs-menu-option-add-show-all-flows",
-                disabled: hiddenflowCount === 0,
-                label: RED._("workspace.showAllFlows", { count: hiddenflowCount }),
-                onselect: "core:show-all-flows"
-            },
-            {
-                id:"red-ui-tabs-menu-option-add-show-last-flow",
-                disabled: hideStack.length === 0,
-                label: RED._("workspace.showLastHiddenFlow"),
-                onselect: "core:show-last-hidden-flow"
-            }
-        )
-        if (tab) {
-            menuItems.push(
-                null,
-                {
-                    label: RED._("common.label.delete"),
-                    disabled: isCurrentLocked,
-                    onselect: function() {
-                        if (tab.type === 'tab') {
-                            RED.workspaces.delete(tab)
-                        } else if (tab.type === 'subflow') {
-                            RED.subflow.delete(tab.id)
-                        }
-                    }
-                },
-                {
-                    label: RED._("menu.label.export"),
-                    shortcut: RED.keyboard.getShortcut("core:show-export-dialog"),
-                    onselect: function() {
-                        RED.workspaces.show(tab.id)
-                        RED.actions.invoke('core:show-export-dialog', null, 'flow')
-                    }
-                }
-            )
-        }
-        // if (isMenuButton && hiddenflowCount > 0) {
-        //     menuItems.unshift({
-        //         label: RED._("workspace.hiddenFlows",{count: hiddenflowCount}),
-        //         onselect: "core:list-hidden-flows"
-        //     })
-        // }
-        return menuItems;
-    }
    function createWorkspaceTabs() {
        workspace_tabs = RED.tabs.create({
            id: "red-ui-workspace-tabs",
@@ -329,9 +137,8 @@ RED.workspaces = (function() {
                    $("#red-ui-workspace-chart").show();
                    activeWorkspace = tab.id;
                    window.location.hash = 'flow/'+tab.id;
-                    $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled", !!tab.disabled);
-                    $("#red-ui-workspace").toggleClass("red-ui-workspace-locked", !!tab.locked);
-                } else {
+                    $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!tab.disabled);
+                    } else {
                    $("#red-ui-workspace-chart").hide();
                    activeWorkspace = 0;
                    window.location.hash = '';
@@ -362,12 +169,6 @@ RED.workspaces = (function() {
                if (tab.disabled) {
                    $("#red-ui-tab-"+(tab.id.replace(".","-"))).addClass('red-ui-workspace-disabled');
                }
-                $('<span class="red-ui-workspace-locked-icon"><i class="fa fa-lock"></i> </span>').prependTo("#red-ui-tab-"+(tab.id.replace(".","-"))+" .red-ui-tab-label");
-                if (tab.locked) {
-                    $("#red-ui-tab-"+(tab.id.replace(".","-"))).addClass('red-ui-workspace-locked');
-                }
-
-
                RED.menu.setDisabled("menu-item-workspace-delete",activeWorkspace === 0 || workspaceTabCount <= 1);
                if (workspaceTabCount === 1) {
                    showWorkspace();
@@ -388,19 +189,13 @@ RED.workspaces = (function() {
                RED.history.push({
                    t:'reorder',
                    workspaces: {
-                        from: oldOrder,
-                        to: newOrder
+                        from:oldOrder,
+                        to:newOrder
                    },
                    dirty:RED.nodes.dirty()
                });
-                // Only mark flows dirty if flow-order has changed (excluding subflows)
-                const filteredOldOrder = oldOrder.filter(id => !!RED.nodes.workspace(id))
-                const filteredNewOrder = newOrder.filter(id => !!RED.nodes.workspace(id))
-
-                if (JSON.stringify(filteredOldOrder) !== JSON.stringify(filteredNewOrder)) {
-                    RED.nodes.dirty(true);
-                    setWorkspaceOrder(newOrder);
-                }
+                RED.nodes.dirty(true);
+                setWorkspaceOrder(newOrder);
            },
            onselect: function(selectedTabs) {
                RED.view.select(false)
@@ -419,12 +214,12 @@ RED.workspaces = (function() {
            },
            onhide: function(tab) {
                hideStack.push(tab.id);
-                if (tab.type === "tab") {
-                    var hiddenTabs = JSON.parse(RED.settings.getLocal("hiddenTabs")||"{}");
-                    hiddenTabs[tab.id] = true;
-                    RED.settings.setLocal("hiddenTabs",JSON.stringify(hiddenTabs));
-                    RED.events.emit("workspace:hide",{workspace: tab.id})
-                }
+
+                var hiddenTabs = JSON.parse(RED.settings.getLocal("hiddenTabs")||"{}");
+                hiddenTabs[tab.id] = true;
+                RED.settings.setLocal("hiddenTabs",JSON.stringify(hiddenTabs));
+
+                RED.events.emit("workspace:hide",{workspace: tab.id})
            },
            onshow: function(tab) {
                removeFromHideStack(tab.id);
@@ -439,8 +234,77 @@ RED.workspaces = (function() {
            scrollable: true,
            addButton: "core:add-flow",
            addButtonCaption: RED._("workspace.addFlow"),
-            menu: function() { return getMenuItems(true) },
-            contextmenu: function(tab) { return getMenuItems(false, tab) }
+            menu: function() {
+                var menuItems = [
+                    {
+                        id:"red-ui-tabs-menu-option-search-flows",
+                        label: RED._("workspace.listFlows"),
+                        onselect: "core:list-flows"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-search-subflows",
+                        label: RED._("workspace.listSubflows"),
+                        onselect: "core:list-subflows"
+                    },
+                    null,
+                    {
+                        id:"red-ui-tabs-menu-option-add-flow",
+                        label: RED._("workspace.addFlow"),
+                        onselect: "core:add-flow"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-flow-right",
+                        label: RED._("workspace.addFlowToRight"),
+                        onselect: "core:add-flow-to-right"
+                    },
+                    null,
+                    {
+                        id:"red-ui-tabs-menu-option-add-hide-flows",
+                        label: RED._("workspace.hideFlow"),
+                        onselect: "core:hide-flow"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-hide-other-flows",
+                        label: RED._("workspace.hideOtherFlows"),
+                        onselect: "core:hide-other-flows"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-show-all-flows",
+                        label: RED._("workspace.showAllFlows"),
+                        onselect: "core:show-all-flows"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-hide-all-flows",
+                        label: RED._("workspace.hideAllFlows"),
+                        onselect: "core:hide-all-flows"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-show-last-flow",
+                        label: RED._("workspace.showLastHiddenFlow"),
+                        onselect: "core:show-last-hidden-flow"
+                    }
+                ]
+                let hiddenFlows = new Set()
+                for (let i = 0; i < hideStack.length; i++) {
+                    let ids = hideStack[i]
+                    if (!Array.isArray(ids)) {
+                        ids = [ids]
+                    }
+                    ids.forEach(id => {
+                        if (RED.nodes.workspace(id)) {
+                            hiddenFlows.add(id)
+                        }
+                    })
+                }
+                const flowCount = hiddenFlows.size;
+                if (flowCount > 0) {
+                    menuItems.unshift({
+                        label: RED._("workspace.hiddenFlows",{count: flowCount}),
+                        onselect: "core:list-hidden-flows"
+                    })
+                }
+                return menuItems;
+            }
        });
        workspaceTabCount = 0;
    }
@@ -491,33 +355,16 @@ RED.workspaces = (function() {
        });

        RED.actions.add("core:add-flow",function(opts) { addWorkspace(undefined,undefined,opts?opts.index:undefined)});
-        RED.actions.add("core:add-flow-to-right",function(workspace) {
-            let index
-            if (workspace) {
-                index = workspace_tabs.getTabIndex(workspace.id)+1
-            } else {
-                index = workspace_tabs.activeIndex()+1
-            }
-            addWorkspace(undefined,undefined,index)
-        });
+        RED.actions.add("core:add-flow-to-right",function(opts) { addWorkspace(undefined,undefined,workspace_tabs.activeIndex()+1)});
        RED.actions.add("core:edit-flow",editWorkspace);
        RED.actions.add("core:remove-flow",removeWorkspace);
        RED.actions.add("core:enable-flow",enableWorkspace);
        RED.actions.add("core:disable-flow",disableWorkspace);
-        RED.actions.add("core:lock-flow",lockWorkspace);
-        RED.actions.add("core:unlock-flow",unlockWorkspace);
-        RED.actions.add("core:move-flow-to-start", function(id) { moveWorkspace(id, 'start') });
-        RED.actions.add("core:move-flow-to-end", function(id) { moveWorkspace(id, 'end') });

-        RED.actions.add("core:hide-flow", function(workspace) {
-            let selection
-            if (workspace) {
-                selection = [workspace]
-            } else {
-                selection = workspace_tabs.selection();
-                if (selection.length === 0) {
-                    selection = [{id:activeWorkspace}]
-                }
+        RED.actions.add("core:hide-flow", function() {
+            var selection = workspace_tabs.selection();
+            if (selection.length === 0) {
+                selection = [{id:activeWorkspace}]
            }
            var hiddenTabs = [];
            selection.forEach(function(ws) {
@@ -531,15 +378,10 @@ RED.workspaces = (function() {
            workspace_tabs.clearSelection();
        })

-        RED.actions.add("core:hide-other-flows", function(workspace) {
-            let selection
-            if (workspace) {
-                selection = [workspace]
-            } else {
-                selection = workspace_tabs.selection();
-                if (selection.length === 0) {
-                    selection = [{id:activeWorkspace}]
-                }
+        RED.actions.add("core:hide-other-flows", function() {
+            var selection = workspace_tabs.selection();
+            if (selection.length === 0) {
+                selection = [{id:activeWorkspace}]
            }
            var selected = new Set(selection.map(function(ws) { return ws.id }))

@@ -644,7 +486,7 @@ RED.workspaces = (function() {
    }
    function setWorkspaceState(id,disabled) {
        var workspace = RED.nodes.workspace(id||activeWorkspace);
-        if (!workspace || workspace.locked) {
+        if (!workspace) {
            return;
        }
        if (workspace.disabled !== disabled) {
@@ -679,58 +521,11 @@ RED.workspaces = (function() {
            }
        }
    }
-    function lockWorkspace(id) {
-        setWorkspaceLockState(id,true);
-    }
-    function unlockWorkspace(id) {
-        setWorkspaceLockState(id,false);
-    }
-    function setWorkspaceLockState(id,locked) {
-        var workspace = RED.nodes.workspace(id||activeWorkspace);
-        if (!workspace) {
-            return;
-        }
-        if (workspace.locked !== locked) {
-            var changes = { locked: workspace.locked };
-            workspace.locked = locked;
-            $("#red-ui-tab-"+(workspace.id.replace(".","-"))).toggleClass('red-ui-workspace-locked',!!workspace.locked);
-            if (!id || (id === activeWorkspace)) {
-                $("#red-ui-workspace").toggleClass("red-ui-workspace-locked",!!workspace.locked);
-            }
-            var historyEvent = {
-                t: "edit",
-                changes:changes,
-                node: workspace,
-                dirty: RED.nodes.dirty()
-            }
-            workspace.changed = true;
-            RED.history.push(historyEvent);
-            RED.events.emit("flows:change",workspace);
-            RED.nodes.dirty(true);
-            // RED.sidebar.config.refresh();
-            // var selection = RED.view.selection();
-            // if (!selection.nodes && !selection.links && workspace.id === activeWorkspace) {
-            //     RED.sidebar.info.refresh(workspace);
-            // }
-            // if (changes.hasOwnProperty('disabled')) {
-            //     RED.nodes.eachNode(function(n) {
-            //         if (n.z === workspace.id) {
-            //             n.dirty = true;
-            //         }
-            //     });
-            //     RED.view.redraw();
-            // }
-        }
-    }

    function removeWorkspace(ws) {
        if (!ws) {
-            ws = RED.nodes.workspace(activeWorkspace)
-            if (ws && !ws.locked) {
-                deleteWorkspace(RED.nodes.workspace(activeWorkspace));
-            }
+            deleteWorkspace(RED.nodes.workspace(activeWorkspace));
        } else {
-            if (ws.locked) { return }
            if (workspace_tabs.contains(ws.id)) {
                workspace_tabs.removeTab(ws.id);
            }
@@ -740,46 +535,16 @@ RED.workspaces = (function() {
        }
    }

-    function moveWorkspace(id, direction) {
-        const workspace = RED.nodes.workspace(id||activeWorkspace) || RED.nodes.subflow(id||activeWorkspace);
-        if (!workspace) {
-            return;
-        }
-        const currentOrder = workspace_tabs.listTabs()
-        const oldOrder = [...currentOrder]
-        const currentIndex = currentOrder.findIndex(id => id === workspace.id)
-        currentOrder.splice(currentIndex, 1)
-        if (direction === 'start') {
-            currentOrder.unshift(workspace.id)
-        } else if (direction === 'end') {
-            currentOrder.push(workspace.id)
-        }
-        const newOrder = setWorkspaceOrder(currentOrder)
-        if (JSON.stringify(newOrder) !== JSON.stringify(oldOrder)) {
-            RED.history.push({
-                t:'reorder',
-                workspaces: {
-                    from:oldOrder,
-                    to:newOrder
-                },
-                dirty:RED.nodes.dirty()
-            });
-            const filteredOldOrder = oldOrder.filter(id => !!RED.nodes.workspace(id))
-            const filteredNewOrder = newOrder.filter(id => !!RED.nodes.workspace(id))
-            if (JSON.stringify(filteredOldOrder) !== JSON.stringify(filteredNewOrder)) {
-                RED.nodes.dirty(true);
-            }
-        }
-    }
    function setWorkspaceOrder(order) {
-        var newOrder = order.filter(id => !!RED.nodes.workspace(id))
+        var newOrder = order.filter(function(id) {
+            return RED.nodes.workspace(id) !== undefined;
+        })
        var currentOrder = RED.nodes.getWorkspaceOrder();
        if (JSON.stringify(newOrder) !== JSON.stringify(currentOrder)) {
            RED.nodes.setWorkspaceOrder(newOrder);
            RED.events.emit("flows:reorder",newOrder);
        }
        workspace_tabs.order(order);
-        return newOrder
    }

    function flashTab(tabId) {
@@ -825,10 +590,6 @@ RED.workspaces = (function() {
        active: function() {
            return activeWorkspace
        },
-        isActiveLocked: function() {
-            var ws = RED.nodes.workspace(activeWorkspace) || RED.nodes.subflow(activeWorkspace)
-            return ws && ws.locked
-        },
        selection: function() {
            return workspace_tabs.selection();
        },
@@ -885,8 +646,6 @@ RED.workspaces = (function() {
            workspace_tabs.resize();
        },
        enable: enableWorkspace,
-        disable: disableWorkspace,
-        lock: lockWorkspace,
-        unlock: unlockWorkspace
+        disable: disableWorkspace
    }
 })();
--- a/packages/node_modules/@node-red/editor-client/src/sass/debug.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/debug.scss
@@ -30,7 +30,7 @@
    bottom: 0px;
    left:0px;
    right: 0px;
-    overflow-y: scroll;
+    overflow-y: auto;
 }
 .red-ui-debug-filter-box {
    position:absolute;
--- a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
@@ -368,7 +368,7 @@ button.red-ui-button-small
    border:1px solid var(--red-ui-secondary-border-color);
    border-radius:5px;
    height: calc(100% - 21px);
-    overflow-y: scroll;
+    overflow-y: auto;
    background: var(--red-ui-secondary-background);
 }

@@ -562,7 +562,7 @@ div.red-ui-button-small.red-ui-color-picker-opacity-slider-handle {
 .red-ui-icon-list {
    width: 308px;
    height: 200px;
-    overflow-y: scroll;
+    overflow-y: auto;
    line-height: 0px;
    position: relative;
    &.red-ui-icon-list-dark {
--- a/packages/node_modules/@node-red/editor-client/src/sass/flow.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/flow.scss
@@ -68,9 +68,6 @@
    stroke: var(--red-ui-node-border);
    cursor: move;
    stroke-width: 1;
-    .red-ui-workspace-locked & {
-        cursor: pointer;
-    }
 }
 .red-ui-workspace-select-mode {
    g.red-ui-flow-node.red-ui-flow-node-hovered * {
@@ -290,11 +287,9 @@ g.red-ui-flow-node-selected {
    text-anchor:start;
 }

-#red-ui-workspace:not(.red-ui-workspace-locked) {
-    .red-ui-flow-port-hovered {
-        stroke: var(--red-ui-port-selected-color);
-        fill:  var(--red-ui-port-selected-color);
-    }
+.red-ui-flow-port-hovered {
+    stroke: var(--red-ui-port-selected-color);
+    fill:  var(--red-ui-port-selected-color);
 }

 .red-ui-flow-subflow-port {
--- a/packages/node_modules/@node-red/editor-client/src/sass/projects.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/projects.scss
@@ -26,7 +26,7 @@
    }
 }
 #red-ui-project-settings-tab-settings {
-    overflow-y: scroll;
+    overflow-y: auto;
 }
 .red-ui-sidebar-vc-shade {
    background: var(--red-ui-primary-background);
@@ -183,7 +183,7 @@
 }
 .red-ui-projects-dialog-project-list-inner-container {
    flex-grow: 1 ;
-    overflow-y: scroll;
+    overflow-y: auto;
    position:relative;
    .red-ui-editableList-border {
        border: none;
--- a/packages/node_modules/@node-red/editor-client/src/sass/tab-context.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/tab-context.scss
@@ -20,7 +20,7 @@
    bottom: 0;
    left: 0;
    right: 0;
-    overflow-y: scroll;
+    overflow-y: auto;

    .red-ui-palette-category {
        &:not(.expanded) button {
--- a/packages/node_modules/@node-red/editor-client/src/sass/tab-info.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/tab-info.scss
@@ -467,9 +467,6 @@ div.red-ui-info-table {
        .fa-eye {
            display: none;
        }
-        .fa-unlock-alt {
-            display: none;
-        }
    }
    .red-ui-info-outline-item-control-reveal,
    .red-ui-info-outline-item-control-action {
@@ -503,25 +500,6 @@ div.red-ui-info-table {
            display: none;
        }
    }
-    .fa-lock {
-        display: none;
-    }
-    .red-ui-info-outline-item.red-ui-info-outline-item-locked & {
-        .fa-lock {
-            display: inline-block;
-        }
-        .fa-unlock-alt {
-            display: none;
-        }
-    }
-    // If the parent is locked, do not show the display/action buttons when
-    // hovering in the outline
-    .red-ui-info-outline-item-locked .red-ui-info-outline-item & {
-        .red-ui-info-outline-item-control-disable,
-        .red-ui-info-outline-item-control-action {
-            display: none;
-        }
-    }
    button {
        margin-right: 3px
    }
@@ -539,6 +517,8 @@ div.red-ui-info-table {
    }
 }

+
+
 .red-ui-icons {
    display: inline-block;
    width: 18px;
--- a/packages/node_modules/@node-red/editor-client/src/sass/userSettings.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/userSettings.scss
@@ -67,7 +67,7 @@
    left: 0;
    bottom: 0;
    padding: 8px 20px 20px;
-    overflow-y: scroll;
+    overflow-y: auto;
 }
 .red-ui-settings-row {
    padding: 5px 10px 2px;
--- a/packages/node_modules/@node-red/editor-client/src/sass/workspace.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/workspace.scss
@@ -29,7 +29,7 @@
 #red-ui-workspace-chart {
   overflow: auto;
   position: absolute;
-   bottom:25px;
+   bottom:26px;
   top: 35px;
   left:0px;
   right:0px;
@@ -106,28 +106,6 @@
    }
 }

-.red-ui-workspace-locked-icon {
-    display: none;
-}
-.red-ui-workspace-locked {
-    &.red-ui-tab {
-        // border-top-style: dashed;
-        // border-left-style: dashed;
-        // border-right-style: dashed;
-
-        // a {
-        //     font-style: italic;
-        //     color: var(--red-ui-tab-text-color-disabled-inactive) !important;
-        // }
-        // &.active a {
-        //     font-weight: normal;
-        //     color: var(--red-ui-tab-text-color-disabled-active) !important;
-        // }
-        .red-ui-workspace-locked-icon {
-            display: inline;
-        }
-    }
-}

 #red-ui-navigator-canvas {
    position: absolute;
--- a/packages/node_modules/@node-red/editor-client/src/types/node-red/func.d.ts
+++ b/packages/node_modules/@node-red/editor-client/src/types/node-red/func.d.ts
@@ -14,6 +14,9 @@ declare var msg: NodeMessage;
 /** @type {string} the id of the incoming `msg` (alias of msg._msgid) */
 declare const __msgid__:string;

+declare const util:typeof import('util')
+declare const promisify:typeof import('util').promisify
+
 /**
 * @typedef NodeStatus
 * @type {object}
--- a/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js
+++ b/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js
@@ -160,6 +160,7 @@
        '$base64encode':{ args:[  ]},
        '$boolean':{ args:[ 'arg' ]},
        '$ceil':{ args:[ 'number' ]},
+        '$clone': { args:[ 'arg' ]},
        '$contains':{ args:[ 'str', 'pattern' ]},
        '$count':{ args:[ 'array' ]},
        '$decodeUrl':{ args:[ 'str' ]},
--- a/packages/node_modules/@node-red/nodes/core/common/24-complete.html
+++ b/packages/node_modules/@node-red/nodes/core/common/24-complete.html
@@ -1,6 +1,6 @@
 <script type="text/html" data-template-name="complete">
    <div class="form-row node-input-target-row">
-        <button id="node-input-complete-target-select" class="red-ui-button" data-i18n="common.label.selectNodes"></button>
+        <button type="button" id="node-input-complete-target-select" class="red-ui-button" data-i18n="common.label.selectNodes"></button>
    </div>
    <div class="form-row node-input-target-row node-input-target-list-row" style="position: relative; min-height: 100px">
        <div style="position: absolute; top: -30px; right: 0;"><input type="text" id="node-input-complete-target-filter"></div>
--- a/packages/node_modules/@node-red/nodes/core/common/25-catch.html
+++ b/packages/node_modules/@node-red/nodes/core/common/25-catch.html
@@ -12,7 +12,7 @@
        <label for="node-input-uncaught" style="width: auto" data-i18n="catch.label.uncaught"></label>
    </div>
    <div class="form-row node-input-target-row">
-        <button id="node-input-catch-target-select" class="red-ui-button" data-i18n="common.label.selectNodes"></button>
+        <button type="button" id="node-input-catch-target-select" class="red-ui-button" data-i18n="common.label.selectNodes"></button>
    </div>
    <div class="form-row node-input-target-row node-input-target-list-row" style="position: relative; min-height: 100px">
        <div style="position: absolute; top: -30px; right: 0;"><input type="text" id="node-input-catch-target-filter"></div>
--- a/packages/node_modules/@node-red/nodes/core/common/25-status.html
+++ b/packages/node_modules/@node-red/nodes/core/common/25-status.html
@@ -8,7 +8,7 @@
        </select>
    </div>
    <div class="form-row node-input-target-row">
-        <button id="node-input-status-target-select" class="red-ui-button" data-i18n="common.label.selectNodes"></button>
+        <button type="button" id="node-input-status-target-select" class="red-ui-button" data-i18n="common.label.selectNodes"></button>
    </div>
    <div class="form-row node-input-target-row node-input-target-list-row" style="position: relative; min-height: 100px">
        <div style="position: absolute; top: -30px; right: 0;"><input type="text" id="node-input-status-target-filter"></div>
--- a/packages/node_modules/@node-red/nodes/core/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-function.html
@@ -91,21 +91,21 @@
        <div id="func-tab-init" style="display:none">
            <div class="form-row node-text-editor-row" style="position:relative">
                <div style="height: 250px; min-height:150px;" class="node-text-editor" id="node-input-init-editor" ></div>
-                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 10;"><button id="node-init-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
+                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 10;"><button type="button" id="node-init-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
            </div>
        </div>

        <div id="func-tab-body" style="display:none">
            <div class="form-row node-text-editor-row" style="position:relative">
                <div style="height: 220px; min-height:150px;" class="node-text-editor" id="node-input-func-editor" ></div>
-                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 10;"><button id="node-function-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
+                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 10;"><button type="button" id="node-function-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
            </div>
        </div>

        <div id="func-tab-finalize" style="display:none">
            <div class="form-row node-text-editor-row" style="position:relative">
                <div style="height: 250px; min-height:150px;" class="node-text-editor" id="node-input-finalize-editor" ></div>
-                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 10;"><button id="node-finalize-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
+                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 10;"><button type="button" id="node-finalize-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
            </div>
        </div>

@@ -294,7 +294,7 @@
                    if (val === "_custom_") {
                        val = $(this).val();
                    }
-                    var varName = val.trim().replace(/^@/,"").replace(/@.*$/,"").replace(/[-_/].?/g, function(v) { return v[1]?v[1].toUpperCase():"" });
+                    var varName = val.trim().replace(/^@/,"").replace(/@.*$/,"").replace(/[-_/\.].?/g, function(v) { return v[1]?v[1].toUpperCase():"" });
                    fvar.val(varName);
                    fvar.trigger("change");

@@ -451,11 +451,13 @@
            tabs.activateTab("func-tab-body");

            $( "#node-input-outputs" ).spinner({
-                min:0,
+                min: 0,
+                max: 500,
                change: function(event, ui) {
-                    var value = this.value;
-                    if (!value.match(/^\d+$/)) { value = 1;  }
-                    else if (value < this.min) { value = this.min; }
+                    var value = parseInt(this.value);
+                    value = isNaN(value) ? 1 : value;
+                    value = Math.max(value, parseInt($(this).attr("aria-valuemin")));
+                    value = Math.min(value, parseInt($(this).attr("aria-valuemax")));
                    if (value !== this.value) { $(this).spinner("value", value); }
                }
            });
--- a/packages/node_modules/@node-red/nodes/core/function/15-change.js
+++ b/packages/node_modules/@node-red/nodes/core/function/15-change.js
@@ -318,7 +318,7 @@ module.exports = function(RED) {
            }
            var r = node.rules[currentRule];
            if (r.t === "move") {
-                if ((r.tot !== r.pt) || (r.p.indexOf(r.to) !== -1)) {
+                if ((r.tot !== r.pt) || (r.p.indexOf(r.to) !== -1) && (r.p !== r.to)) {
                    applyRule(msg,{t:"set", p:r.to, pt:r.tot, to:r.p, tot:r.pt},(err,msg) => {
                        applyRule(msg,{t:"delete", p:r.p, pt:r.pt}, (err,msg) => {
                            completeApplyingRules(msg,currentRule,done);
--- a/packages/node_modules/@node-red/nodes/core/function/16-range.html
+++ b/packages/node_modules/@node-red/nodes/core/function/16-range.html
@@ -10,7 +10,6 @@
            <option value="scale" data-i18n="range.scale.payload"></option>
            <option value="clamp" data-i18n="range.scale.limit"></option>
            <option value="roll" data-i18n="range.scale.wrap"></option>
-            <option value="drop" data-i18n="range.scale.drop"></option>
        </select>
    </div>
    <br/>
--- a/packages/node_modules/@node-red/nodes/core/function/16-range.js
+++ b/packages/node_modules/@node-red/nodes/core/function/16-range.js
@@ -32,15 +32,11 @@ module.exports = function(RED) {
            if (value !== undefined) {
                var n = Number(value);
                if (!isNaN(n)) {
-                    if (node.action === "drop") {
-                        if (n < node.minin) { done(); return; }
-                        if (n > node.maxin) { done(); return; }
-                    }
-                    if (node.action === "clamp") {
+                    if (node.action == "clamp") {
                        if (n < node.minin) { n = node.minin; }
                        if (n > node.maxin) { n = node.maxin; }
                    }
-                    if (node.action === "roll") {
+                    if (node.action == "roll") {
                        var divisor = node.maxin - node.minin;
                        n = ((n - node.minin) % divisor + divisor) % divisor + node.minin;
                    }
--- a/packages/node_modules/@node-red/nodes/core/function/80-template.html
+++ b/packages/node_modules/@node-red/nodes/core/function/80-template.html
@@ -26,7 +26,7 @@
                <option value="yaml">YAML</option>
                <option value="text" data-i18n="template.label.none"></option>
            </select>
-            <button id="node-template-expand-editor" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button>
+            <button type="button" id="node-template-expand-editor" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button>
        </div>
    </div>
    <div class="form-row node-text-editor-row">
--- a/packages/node_modules/@node-red/nodes/core/function/89-delay.js
+++ b/packages/node_modules/@node-red/nodes/core/function/89-delay.js
@@ -201,7 +201,6 @@ module.exports = function(RED) {
            });
            node.on("close", function() { clearDelayList(); });
        }
-
        else if (node.pauseType === "random") {
            node.on("input", function(msg, send, done) {
                var wait = node.randomFirst + (node.diff * Math.random());
@@ -227,19 +226,34 @@ module.exports = function(RED) {
        // The rate limit/queue type modes
        else if (node.pauseType === "rate") {
            node.on("input", function(msg, send, done) {
+                if (msg.hasOwnProperty("reset")) {
+                    if (node.intervalID !== -1 ) {
+                        clearInterval(node.intervalID);
+                        node.intervalID = -1;
+                    }
+                    delete node.lastSent;
+                    node.buffer = [];
+                    node.rate = node.fixedrate;
+                    node.status({fill:"blue",shape:"ring",text:0});
+                    done();
+                    return;
+                }
+
                if (!node.drop) {
                    var m = RED.util.cloneMessage(msg);
+                    delete m.flush;
+                    delete m.lifo;
                    if (Object.keys(m).length > 1) {
                        if (node.intervalID !== -1) {
-                            if (node.allowrate && m.hasOwnProperty("rate") && !isNaN(parseFloat(m.rate)) && node.rate !== m.rate) {
-                                node.rate = m.rate;
+                            if (node.allowrate && msg.hasOwnProperty("rate") && !isNaN(parseFloat(msg.rate)) && node.rate !== msg.rate) {
+                                node.rate = msg.rate;
                                clearInterval(node.intervalID);
                                node.intervalID = setInterval(sendMsgFromBuffer, node.rate);
                            }
                            var max_msgs = maxKeptMsgsCount(node);
                            if ((max_msgs > 0) && (node.buffer.length >= max_msgs)) {
                                node.buffer = [];
-                                node.error(RED._("delay.errors.too-many"), m);
+                                node.error(RED._("delay.errors.too-many"), msg);
                            } else if (msg.toFront === true) {
                                node.buffer.unshift({msg: m, send: send, done: done});
                                node.reportDepth();
@@ -249,8 +263,8 @@ module.exports = function(RED) {
                            }
                        }
                        else {
-                            if (node.allowrate && m.hasOwnProperty("rate") && !isNaN(parseFloat(m.rate))) {
-                                node.rate = m.rate;
+                            if (node.allowrate && msg.hasOwnProperty("rate") && !isNaN(parseFloat(msg.rate))) {
+                                node.rate = msg.rate;
                            }
                            send(m);
                            node.reportDepth();
@@ -268,8 +282,6 @@ module.exports = function(RED) {
                        else {
                            while (len > 0) {
                                const msgInfo = node.buffer.shift();
-                                delete msgInfo.msg.flush;
-                                delete msgInfo.msg.reset;
                                if (Object.keys(msgInfo.msg).length > 1) {
                                    node.send(msgInfo.msg);
                                    msgInfo.done();
@@ -323,21 +335,6 @@ module.exports = function(RED) {
                    }
                    done();
                }
-
-                if (msg.hasOwnProperty("reset")) {
-                    if (msg.flush === undefined) {
-                        if (node.intervalID !== -1 ) {
-                            clearInterval(node.intervalID);
-                            node.intervalID = -1;
-                        }
-                        delete node.lastSent;
-                    }
-                    node.buffer = [];
-                    node.rate = node.fixedrate;
-                    node.status({fill:"blue",shape:"ring",text:0});
-                    done();
-                    return;
-                }
            });
            node.on("close", function() {
                clearInterval(node.intervalID);
@@ -390,22 +387,6 @@ module.exports = function(RED) {
                    node.buffer.push({msg, send, done}); // if not add to end of queue
                    node.reportDepth();
                }
-                if (msg.hasOwnProperty("flush")) {
-                    var len = node.buffer.length;
-                    if (typeof(msg.flush) == 'number') { len = Math.min(Math.floor(msg.flush,len)); }
-                    while (len > 0) {
-                        const msgInfo = node.buffer.shift();
-                        delete msgInfo.msg.flush;
-                        delete msgInfo.msg.reset;
-                        if (Object.keys(msgInfo.msg).length > 2) {
-                            node.send(msgInfo.msg);
-                            msgInfo.done();
-                        }
-                        len = len - 1;
-                    }
-                    node.status({});
-                    done();
-                }
                if (msg.hasOwnProperty("reset")) {
                    while (node.buffer.length > 0) {
                        const msgInfo = node.buffer.shift();
@@ -416,6 +397,21 @@ module.exports = function(RED) {
                    node.status({text:"reset"});
                    done();
                }
+                if (msg.hasOwnProperty("flush")) {
+                    var len = node.buffer.length;
+                    if (typeof(msg.flush) == 'number') { len = Math.min(Math.floor(msg.flush,len)); }
+                    while (len > 0) {
+                        const msgInfo = node.buffer.shift();
+                        delete msgInfo.msg.flush;
+                        if (Object.keys(msgInfo.msg).length > 2) {
+                            node.send(msgInfo.msg);
+                            msgInfo.done();
+                        }
+                        len = len - 1;
+                    }
+                    node.status({});
+                    done();
+                }
            });
            node.on("close", function() {
                clearInterval(node.intervalID);
--- a/packages/node_modules/@node-red/nodes/core/network/05-tls.html
+++ b/packages/node_modules/@node-red/nodes/core/network/05-tls.html
@@ -25,7 +25,7 @@
            <label class="red-ui-button" for="node-config-input-certfile"><i class="fa fa-upload"></i> <span data-i18n="tls.label.upload"></span></label>
            <input class="hide" type="file" id="node-config-input-certfile">
            <span id="tls-config-certname" style="width: calc(100% - 280px); overflow: hidden; line-height:34px; height:34px; text-overflow: ellipsis; white-space: nowrap; display: inline-block; vertical-align: middle;"> </span>
-            <button class="red-ui-button red-ui-button-small" id="tls-config-button-cert-clear" style="margin-left: 10px"><i class="fa fa-times"></i></button>
+            <button type="button" class="red-ui-button red-ui-button-small" id="tls-config-button-cert-clear" style="margin-left: 10px"><i class="fa fa-times"></i></button>
        </span>
        <input type="hidden" id="node-config-input-certname">
        <input type="hidden" id="node-config-input-certdata">
@@ -37,7 +37,7 @@
            <label class="red-ui-button" for="node-config-input-keyfile"><i class="fa fa-upload"></i> <span data-i18n="tls.label.upload"></span></label>
            <input class="hide" type="file" id="node-config-input-keyfile">
            <span id="tls-config-keyname" style="width: calc(100% - 280px); overflow: hidden; line-height:34px; height:34px; text-overflow: ellipsis; white-space: nowrap; display: inline-block; vertical-align: middle;"> </span>
-            <button class="red-ui-button red-ui-button-small" id="tls-config-button-key-clear" style="margin-left: 10px"><i class="fa fa-times"></i></button>
+            <button type="button" class="red-ui-button red-ui-button-small" id="tls-config-button-key-clear" style="margin-left: 10px"><i class="fa fa-times"></i></button>
        </span>
        <input type="hidden" id="node-config-input-keyname">
        <input type="hidden" id="node-config-input-keydata">
@@ -53,7 +53,7 @@
            <label class="red-ui-button" for="node-config-input-cafile"><i class="fa fa-upload"></i> <span data-i18n="tls.label.upload"></span></label>
            <input class="hide" type="file" title=" " id="node-config-input-cafile">
            <span id="tls-config-caname" style="width: calc(100% - 280px); overflow: hidden; line-height:34px; height:34px; text-overflow: ellipsis; white-space: nowrap; display: inline-block; vertical-align: middle;"> </span>
-            <button class="red-ui-button red-ui-button-small" id="tls-config-button-ca-clear" style="margin-left: 10px"><i class="fa fa-times"></i></button>
+            <button type="button" class="red-ui-button red-ui-button-small" id="tls-config-button-ca-clear" style="margin-left: 10px"><i class="fa fa-times"></i></button>
        </span>
        <input type="hidden" id="node-config-input-caname">
        <input type="hidden" id="node-config-input-cadata">
--- a/packages/node_modules/@node-red/nodes/core/network/06-httpproxy.html
+++ b/packages/node_modules/@node-red/nodes/core/network/06-httpproxy.html
@@ -101,6 +101,7 @@
                            hostField.val(data.host);
                        }
                    },
+                    sortable: true,
                    removable: true
                });
            if (this.noproxy) {
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
@@ -421,7 +421,11 @@
 <script type="text/javascript">
 (function() {

-    var typedInputNoneOpt = { value: 'none', label: '', hasValue: false };
+    var typedInputNoneOpt = {
+        value: 'none',
+        label: RED._("node-red:mqtt.label.none"),
+        hasValue: false
+    };
    var makeTypedInputOpt = function(value){
        return {
            value: value,
@@ -436,7 +440,11 @@
        makeTypedInputOpt("text/csv"),
        makeTypedInputOpt("text/html"),
        makeTypedInputOpt("text/plain"),
-        {value:"other", label:""}
+        {
+            value: "other",
+            label: RED._("node-red:mqtt.label.other"),
+            icon: "red/images/typedInput/az.svg"
+        }
    ];

    function getDefaultContentType(value) {
@@ -499,17 +507,17 @@
            cleansession: {value: true},
            birthTopic: {value:"", validate:validateMQTTPublishTopic},
            birthQos: {value:"0"},
-            birthRetain: {value:false},
+            birthRetain: {value:"false"},
            birthPayload: {value:""},
            birthMsg: { value: {}},
            closeTopic: {value:"", validate:validateMQTTPublishTopic},
            closeQos: {value:"0"},
-            closeRetain: {value:false},
+            closeRetain: {value:"false"},
            closePayload: {value:""},
            closeMsg: { value: {}},
            willTopic: {value:"", validate:validateMQTTPublishTopic},
            willQos: {value:"0"},
-            willRetain: {value:false},
+            willRetain: {value:"false"},
            willPayload: {value:""},
            willMsg: { value: {}},
            userProps: { value: ""},
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
@@ -459,7 +459,6 @@ module.exports = function(RED) {
            if(!opts || typeof opts !== "object") {
                return; //nothing to change, simply return
            }
-            const originalBrokerURL = node.brokerurl;

            //apply property changes (only if the property exists in the opts object)
            setIfHasProperty(opts, node, "url", init);
@@ -468,13 +467,11 @@ module.exports = function(RED) {
            setIfHasProperty(opts, node, "clientid", init);
            setIfHasProperty(opts, node, "autoConnect", init);
            setIfHasProperty(opts, node, "usetls", init);
-            setIfHasProperty(opts, node, "usews", init);
            setIfHasProperty(opts, node, "verifyservercert", init);
            setIfHasProperty(opts, node, "compatmode", init);
            setIfHasProperty(opts, node, "protocolVersion", init);
            setIfHasProperty(opts, node, "keepalive", init);
            setIfHasProperty(opts, node, "cleansession", init);
-            setIfHasProperty(opts, node, "sessionExpiry", init);
            setIfHasProperty(opts, node, "topicAliasMaximum", init);
            setIfHasProperty(opts, node, "maximumPacketSize", init);
            setIfHasProperty(opts, node, "receiveMaximum", init);
@@ -484,6 +481,11 @@ module.exports = function(RED) {
            } else if (hasProperty(opts, "userProps")) {
                node.userProperties = opts.userProps;
            }
+            if (hasProperty(opts, "sessionExpiry")) {
+                node.sessionExpiryInterval = opts.sessionExpiry;
+            } else if (hasProperty(opts, "sessionExpiryInterval")) {
+                node.sessionExpiryInterval = opts.sessionExpiryInterval
+            }

            function createLWT(topic, payload, qos, retain, v5opts, v5SubPropName) {
                let message = undefined;
@@ -567,9 +569,6 @@ module.exports = function(RED) {
            if (typeof node.usetls === 'undefined') {
                node.usetls = false;
            }
-            if (typeof node.usews === 'undefined') {
-                node.usews = false;
-            }
            if (typeof node.verifyservercert === 'undefined') {
                node.verifyservercert = false;
            }
@@ -782,7 +781,9 @@ module.exports = function(RED) {

                        // Send any birth message
                        if (node.birthMessage) {
-                            node.publish(node.birthMessage);
+                            setTimeout(() => {
+                                node.publish(node.birthMessage);
+                            }, 1);
                        }
                    });
                    node._clientOn("reconnect", function() {
@@ -991,14 +992,21 @@ module.exports = function(RED) {
                }

                if (topicOK) {
-                    node.client.publish(msg.topic, msg.payload, options, function(err) {
-                        done && done(err);
-                        return
-                    });
+                    node.client.publish(msg.topic, msg.payload, options, function (err) {
+                        if (done) {
+                            done(err)
+                        } else if(err) {
+                            node.error(err, msg)
+                        }
+                    })
                } else {
-                    const error = new Error(RED._("mqtt.errors.invalid-topic"));
-                    error.warn = true;
-                    done(error);
+                    const error = new Error(RED._("mqtt.errors.invalid-topic"))
+                    error.warn = true
+                    if (done) {
+                        done(error)
+                    } else {
+                        node.warn(error, msg)
+                    }
                }
            }
        };
--- a/packages/node_modules/@node-red/nodes/core/network/21-httpin.html
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httpin.html
@@ -227,6 +227,7 @@
                        }
                    });
                },
+                sortable: true,
                removable: true
            });

--- a/packages/node_modules/@node-red/nodes/core/network/21-httpin.js
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httpin.js
@@ -282,7 +282,7 @@ module.exports = function(RED) {
        RED.nodes.createNode(this,n);
        var node = this;
        this.headers = n.headers||{};
-        this.statusCode = n.statusCode;
+        this.statusCode = parseInt(n.statusCode);
        this.on("input",function(msg,_send,done) {
            if (msg.res) {
                var headers = RED.util.cloneMessage(node.headers);
@@ -323,7 +323,7 @@ module.exports = function(RED) {
                        }
                    }
                }
-                var statusCode = node.statusCode || msg.statusCode || 200;
+                var statusCode = node.statusCode || parseInt(msg.statusCode) || 200;
                if (typeof msg.payload == "object" && !Buffer.isBuffer(msg.payload)) {
                    msg.res._res.status(statusCode).jsonp(msg.payload);
                } else {
--- a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html
@@ -91,6 +91,11 @@
        <label for="node-input-senderr" style="width: auto" data-i18n="httpin.senderr"></label>
    </div>

+    <div class="form-row">
+        <input type="checkbox" id="node-input-insecureHTTPParser" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-insecureHTTPParser", style="width: auto;" data-i18n="httpin.insecureHTTPParser"></label>
+    </div>
+

    <div class="form-row">
        <label for="node-input-ret"><i class="fa fa-arrow-left"></i> <span data-i18n="httpin.label.return"></span></label>
@@ -227,6 +232,7 @@
            persist: {value:false},
            proxy: {type:"http proxy",required: false,
                    label:RED._("node-red:httpin.proxy-config") },
+            insecureHTTPParser: {value: false},
            authType: {value: ""},
            senderr: {value: false},
            headers: { value: [] }
@@ -338,6 +344,12 @@
            } else {
                $("#node-input-useProxy").prop("checked", false);
            }
+
+            if (node.insecureHTTPParser) {
+                $("node-intput-insecureHTTPParser").prop("checked", true)
+            } else {
+                $("node-intput-insecureHTTPParser").prop("checked", false)
+            }
            updateProxyOptions();
            $("#node-input-useProxy").on("click", function() {
                updateProxyOptions();
@@ -405,6 +417,7 @@
                    });

                },
+                sortable: true,
                removable: true
            });
            if (node.headers) {
--- a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
@@ -86,6 +86,7 @@ in your Node-RED user directory (${RED.settings.userDir}).
        if (n.paytoqs === true || n.paytoqs === "query") { paytoqs = true; }
        else if (n.paytoqs === "body") { paytobody = true; }

+        node.insecureHTTPParser = n.insecureHTTPParser

        var prox, noprox;
        if (process.env.http_proxy) { prox = process.env.http_proxy; }
@@ -244,6 +245,10 @@ in your Node-RED user directory (${RED.settings.userDir}).
                                delete options.headers[h];
                            }
                        })
+
+                        if (node.insecureHTTPParser) {
+                            options.insecureHTTPParser = true
+                        }
                    }
                ],
                beforeRedirect: [
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js
@@ -110,7 +110,12 @@ module.exports = function(RED) {
                                        if (msg.payload[s].hasOwnProperty(p)) {
                                            /* istanbul ignore else */
                                            if (typeof msg.payload[s][p] !== "object") {
-                                                var q = "" + msg.payload[s][p];
+                                            // Fix to honour include null values flag
+                                            //if (typeof msg.payload[s][p] !== "object" || (node.include_null_values === true && msg.payload[s][p] === null)) {
+                                                var q = "";
+                                                if (msg.payload[s][p] !== undefined) {
+                                                    q += msg.payload[s][p];
+                                                }
                                                if (q.indexOf(node.quo) !== -1) { // add double quotes if any quotes
                                                    q = q.replace(/"/g, '""');
                                                    ou += node.quo + q + node.quo + node.sep;
@@ -130,9 +135,12 @@ module.exports = function(RED) {
                                            ou += node.sep;
                                        }
                                        else {
-                                            var p = RED.util.ensureString(RED.util.getMessageProperty(msg,"payload["+s+"]['"+template[t]+"']"));
+                                            var p = RED.util.getMessageProperty(msg,"payload["+s+"]['"+template[t]+"']");
                                            /* istanbul ignore else */
-                                            if (p === "undefined") { p = ""; }
+                                            if (p === undefined) { p = ""; }
+                                            // fix to honour include null values flag
+                                            //if (p === null && node.include_null_values !== true) { p = "";}
+                                            p = RED.util.ensureString(p);
                                            if (p.indexOf(node.quo) !== -1) { // add double quotes if any quotes
                                                p = p.replace(/"/g, '""');
                                                ou += node.quo + p + node.quo + node.sep;
--- a/packages/node_modules/@node-red/nodes/locales/en-US/function/16-range.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/16-range.html
@@ -34,14 +34,11 @@
    the range specified within the target range.</p>
    <p><i>Scale and wrap within the target range</i> means that the result will
    be wrapped within the target range.</p>
-    <p><i>Scale, but drop if outside input range</i> means that the result will
-    be scaled, but any inputs outside of the inout range will be dropped.</p>
    <p>For example an input 0 - 10 mapped to 0 - 100.</p>
    <table style="outline-width:#888 solid thin">
        <tr><th width="80px">mode</th><th width="80px">input</th><th width="80px">output</th></tr>
        <tr><td><center>scale</center></td><td><center>12</center></td><td><center>120</center></td></tr>
        <tr><td><center>limit</center></td><td><center>12</center></td><td><center>100</center></td></tr>
        <tr><td><center>wrap</center></td><td><center>12</center></td><td><center>20</center></td></tr>
-        <tr><td><center>drop</center></td><td><center>12</center></td><td><center><i>(no output)</i></center></td></tr>
    </table>
 </script>
--- a/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/80-template.html
@@ -52,4 +52,7 @@
       used to mark the templated sections. For example, to use <code>[[ ]]</code>
       instead, add the following line to the top of the template:</p>
    <pre>{{=[[ ]]=}}</pre>
+    <h4>Using environment variables</h4>
+    <p>The template node can access environment variables using the syntax:</p>
+    <pre>My favourite colour is {{env.COLOUR}}.</pre>
 </script>
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -446,7 +446,9 @@
            "staticTopic": "Subscribe to single topic",
            "dynamicTopic": "Dynamic subscription",
            "auto-connect": "Connect automatically",
-            "auto-mode-depreciated": "This option is depreciated. Please use the new auto-detect mode."
+            "auto-mode-depreciated": "This option is depreciated. Please use the new auto-detect mode.",
+            "none": "none",
+            "other": "other"
        },
        "sections-label": {
            "birth-message": "Message sent on connection (birth message)",
@@ -554,7 +556,8 @@
        },
        "status": {
            "requesting": "requesting"
-        }
+        },
+        "insecureHTTPParser": "Disable strict HTTP parsing"
    },
    "websocket": {
        "label": {
@@ -813,8 +816,7 @@
        "scale": {
            "payload": "Scale the message property",
            "limit": "Scale and limit to the target range",
-            "wrap": "Scale and wrap within the target range",
-            "drop": "Scale, but drop msg if outside input range"
+            "wrap": "Scale and wrap within the target range"
        },
        "tip": "Tip: This node ONLY works with numbers.",
        "errors": {
--- a/packages/node_modules/@node-red/nodes/locales/ja/function/80-template.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/function/80-template.html
@@ -48,4 +48,7 @@
    <p><b>注: </b>デフォルトでは、<i>mustache</i>形式は置換対象のHTML要素をエスケープします。これを抑止するには<code>{{{三重}}}</code>括弧形式を使います。</p>
    <p>もし、コンテンツの中で<code>{{ }}</code>を出力する必要がある場合は、テンプレートで使われる記号文字を変えることもできます。例えば、<code>[[ ]]</code>を代わりに用いるには、テンプレートの先頭に以下の行を追加します。</p>
    <pre>{{=[[ ]]=}}</pre>
+    <h4>環境変数の利用</h4>
+    <p>templateノードでは、次の構文を用いると環境変数にアクセスできます:</p>
+    <pre>私の好きな色は{{env.COLOUR}}です。</pre>
 </script>
--- a/packages/node_modules/@node-red/nodes/locales/ja/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/ja/messages.json
@@ -446,7 +446,9 @@
            "staticTopic": "1つのトピックを購読",
            "dynamicTopic": "動的な購読",
            "auto-connect": "自動接続",
-            "auto-mode-depreciated": "本オプションは非推奨になりました。新しい自動判定モードを使用してください。"
+            "auto-mode-depreciated": "本オプションは非推奨になりました。新しい自動判定モードを使用してください。",
+            "none": "なし",
+            "other": "その他"
        },
        "sections-label": {
            "birth-message": "接続時の送信メッセージ(Birthメッセージ)",
@@ -554,7 +556,8 @@
        },
        "status": {
            "requesting": "要求中"
-        }
+        },
+        "insecureHTTPParser": "厳密なHTTPパース処理を無効化"
    },
    "websocket": {
        "label": {
--- a/packages/node_modules/@node-red/nodes/package.json
+++ b/packages/node_modules/@node-red/nodes/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@node-red/nodes",
-    "version": "3.1.0-beta.0",
+    "version": "3.0.2",
    "license": "Apache-2.0",
    "repository": {
        "type": "git",
@@ -25,7 +25,7 @@
        "cookie": "0.5.0",
        "cors": "2.8.5",
        "cronosjs": "1.7.1",
-        "denque": "2.0.1",
+        "denque": "2.1.0",
        "form-data": "4.0.0",
        "fs-extra": "10.1.0",
        "got": "11.8.5",
--- a/packages/node_modules/@node-red/registry/package.json
+++ b/packages/node_modules/@node-red/registry/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@node-red/registry",
-    "version": "3.1.0-beta.0",
+    "version": "3.0.2",
    "license": "Apache-2.0",
    "main": "./lib/index.js",
    "repository": {
@@ -16,11 +16,11 @@
        }
    ],
    "dependencies": {
-        "@node-red/util": "3.1.0-beta.0",
+        "@node-red/util": "3.0.2",
        "clone": "2.1.2",
        "fs-extra": "10.1.0",
        "semver": "7.3.7",
        "tar": "6.1.11",
-        "uglify-js": "3.16.2"
+        "uglify-js": "3.16.3"
    }
 }
--- a/packages/node_modules/@node-red/runtime/lib/api/diagnostics.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/diagnostics.js
@@ -100,9 +100,13 @@ function buildDiagnosticReport(scope, callback) {
            version: os.version(),
        },
        runtime: {
-            isStarted: runtime.isStarted(),
-            modules: modules,
            version: runtime.settings.version,
+            isStarted: runtime.isStarted(),
+            flows: {
+                state: runtime.flows && runtime.flows.state(),
+                started: runtime.flows && runtime.flows.started,
+            },
+            modules: modules,
            settings: {
                available: runtime.settings.available(),
                apiMaxLength: runtime.settings.apiMaxLength || "UNSET",
@@ -114,6 +118,11 @@ function buildDiagnosticReport(scope, callback) {
                flowFile: runtime.settings.flowFile || "UNSET",
                mqttReconnectTime: runtime.settings.mqttReconnectTime || "UNSET",
                serialReconnectTime: runtime.settings.serialReconnectTime || "UNSET",
+                socketReconnectTime: runtime.settings.socketReconnectTime || "UNSET",
+                socketTimeout: runtime.settings.socketTimeout || "UNSET",
+                tcpMsgQueueSize: runtime.settings.tcpMsgQueueSize || "UNSET",
+                inboundWebSocketTimeout: runtime.settings.inboundWebSocketTimeout || "UNSET",
+                runtimeState: runtime.settings.runtimeState || "UNSET",

                adminAuth: runtime.settings.adminAuth ? "SET" : "UNSET",

@@ -131,6 +140,7 @@ function buildDiagnosticReport(scope, callback) {
                uiHost: runtime.settings.uiHost ? "SET" : "UNSET",
                uiPort: runtime.settings.uiPort ? "SET" : "UNSET",
                userDir: runtime.settings.userDir ? "SET" : "UNSET",
+                nodesDir: runtime.settings.nodesDir && runtime.settings.nodesDir.length ? "SET" : "UNSET",
            }
        }
    }
--- a/packages/node_modules/@node-red/runtime/lib/flows/util.js
+++ b/packages/node_modules/@node-red/runtime/lib/flows/util.js
@@ -134,10 +134,12 @@ function createNode(flow,config) {
                subflowInstanceConfig,
                instanceConfig
            );
+            // Register this subflow as an instance node of the parent flow.
+            // This allows nodes inside the subflow to get ahold of each other
+            // such as a node accessing its config node
+            flow.subflowInstanceNodes[config.id] = subflow
            subflow.start();
            return subflow.node;
-
-            Log.error(Log._("nodes.flow.unknown-type", {type:type}));
        }
    } catch(err) {
        Log.error(err);
--- a/packages/node_modules/@node-red/runtime/locales/de/runtime.json
+++ b/packages/node_modules/@node-red/runtime/locales/de/runtime.json
@@ -1,6 +1,6 @@
 {
    "runtime": {
-        "welcome": "Willkommen bei Node-RED!",
+        "welcome": "Willkommen bei Node-RED",
        "version": "__component__ Version: __version__",
        "unsupported_version": "Nicht unterstützte Version von __component__. Erforderlich: __requires__, jedoch gefunden: __version__",
        "paths": {
@@ -8,7 +8,6 @@
            "httpStatic": "HTTP-Statisch: __path__"
        }
    },
-
    "server": {
        "loading": "Paletten-Nodes werden geladen",
        "palette-editor": {
@@ -34,17 +33,19 @@
            "install-failed-not-found": "Das Modul $t(server.install.install-failed-long) wurde nicht gefunden",
            "install-failed-name": "$t(server.install.install-failed-long). Ungültiger Modulname: __name__",
            "install-failed-url": "$t(server.install.install-failed-long). Ungültige URL: __url__",
+            "post-install-error": "Fehler bei der Ausführung des 'postInstall'-Hooks:",
            "upgrading": "Upgrade von Modul __name__ auf Version __version__ gestartet",
            "upgraded": "Upgrade von Modul __name__ war erfolgreich. Neustart von Node-RED für die Verwendung der neuen Version erforderlich.",
            "upgrade-failed-not-found": "Upgrade fehlgeschlagen. $t(server.install.install-failed-long). Version nicht gefunden.",
            "uninstalling": "Das Modul __name__ wird deinstalliert",
            "uninstall-failed": "Deinstallation fehlgeschlagen",
            "uninstall-failed-long": "Die Deinstallation des Moduls __name__ ist fehlgeschlagen:",
-            "uninstalled": "Das Modul __name__ ist deinstalliert"
+            "uninstalled": "Das Modul __name__ ist deinstalliert",
+            "old-ext-mod-dir-warning": "\n\n---------------------------------------------------------------------\nNode-RED 1.3 Verzeichnis externer Module erkannt:\n    __oldDir__\nDieses Verzeichnis wird nicht mehr verwendet. Die externen Module werden\nin Ihrem Node-RED-Benutzerverzeichnis neu installiert:\n   __newDir__\nLöschen Sie das alte externalModules-Verzeichnis, um diese Meldung abzustellen.\n---------------------------------------------------------------------\n"
        },
        "deprecatedOption": "Die Verwendung von __old__ ist abgekündigt. Stattdessen __new__ verwenden.",
        "unable-to-listen": "Überwachen (listen) von __listenpath__ nicht möglich",
-        "port-in-use": "FEHLER: Port wird verwendet",
+        "port-in-use": "Fehler: Port wird verwendet",
        "uncaught-exception": "Nicht abgefangene Ausnahmebedingung:",
        "admin-ui-disabled": "Administrator-Benutzeroberfläche deaktiv",
        "now-running": "Server wird jetzt auf __listenpath__ ausgeführt",
@@ -55,11 +56,10 @@
            "refresh-interval": "Erneuerung der https-Einstellungen erfolgt alle __interval__ Stunden",
            "settings-refreshed": "https-Einstellungen wurden erneuert",
            "refresh-failed": "Erneuerung der https-Einstellungen fehlgeschlagen: __message__",
-            "nodejs-version": "httpsRefreshInterval erfordert Node.js 11 or later",
+            "nodejs-version": "httpsRefreshInterval erfordert Node.js 11 oder höher",
            "function-required": "httpsRefreshInterval erfordert die https-Eigenschaft in Form einer Funktion"
        }
    },
-
    "api": {
        "flows": {
            "error-save": "Fehler beim Speichern der Flows: __message__",
@@ -77,17 +77,16 @@
            "error-enable": "Der Node konnte nicht aktiviert werden:"
        }
    },
-
    "comms": {
        "error": "Kommunikationskanal-Fehler: __message__",
        "error-server": "Kommunikationsserver-Fehler: __message__",
        "error-send": "Kommunikationsende-Fehler: __message__"
    },
-
    "settings": {
        "user-not-available": "Einstellungen konnten nicht gespeichert werden: __message__",
        "not-available": "Einstellungen nicht verfügbar",
-        "property-read-only": "Die Eigenschaft '__prop__ 'ist schreibgeschützt"
+        "property-read-only": "Die Eigenschaft '__prop__' ist schreibgeschützt",
+        "readonly-mode": "Laufzeitumgebung im Nur-Lese-Modus. Änderungen werden nicht gespeichert."
    },
    "library": {
        "unknownLibrary": "Unbekannte Bibliothek (Library): __library__",
@@ -98,10 +97,12 @@
    },
    "nodes": {
        "credentials": {
-            "error": "Fehler beim Laden der Berechtigungen: __message__",
-            "error-saving": "Fehler beim Speichern der Berechtigungen: __message__",
-            "not-registered": "Der Berechtigung-Typ '__type__' ist nicht registriert",
-            "system-key-warning": "\n---------------------------------------------------------------------\nDie Datei mit den Flow-Berechtigungen wird mit einem vom System\ngenerierten Schlüssel verschlüsselt.\nWenn der vom System generierte Schlüssel aus irgendeinem Grund\nverloren geht, kann die Datei mit den Berechtigungen nicht\nwiederhergestellt werden. Sie muss dann gelöscht und die\nBerechtigungen müssen erneut eingestellt werden.\nEs sollte ein eigener Schlüssel mit Hilfe der Option\n'credentialSecret' in der Einstellungsdatei vorgegeben werden.\nNode-RED wird dann die Datei mit den Flow-Berechtigungen\nbei der nächsten Übernahme (deploy) einer Änderung erneut\nverschlüsseln.\n---------------------------------------------------------------------"
+            "error": "Fehler beim Laden der Credentials: __message__",
+            "error-saving": "Fehler beim Speichern der Credentials: __message__",
+            "not-registered": "Der Credentials-Typ '__type__' ist nicht registriert",
+            "system-key-warning": "\n---------------------------------------------------------------------\nDie Datei mit den Flow-Credentials wird mit einem vom System\ngenerierten Schlüssel verschlüsselt.\nWenn der vom System generierte Schlüssel aus irgendeinem Grund\nverloren geht, kann die Datei mit den Credentials nicht\nwiederhergestellt werden. Sie muss dann gelöscht und die\nCredentials müssen erneut eingestellt werden.\nEs sollte ein eigener Schlüssel mit Hilfe der Option\n'credentialSecret' in der Einstellungsdatei vorgegeben werden.\nNode-RED wird dann die Datei mit den Flow-Credentials\nbei der nächsten Übernahme (deploy) einer Änderung erneut\nverschlüsseln.\n---------------------------------------------------------------------",
+            "unencrypted": "Verwende unverschlüsselte Credentials",
+            "encryptedNotFound": "Verschlüsselte Credentials nicht gefunden"
        },
        "flows": {
            "safe-mode": "Die Flows sind gestoppt im abgesicherten Modus. Übernahme (deploy) zum Starten.",
@@ -121,6 +122,7 @@
            "stopped-flows": "Flows sind gestoppt",
            "stopped": "gestoppt",
            "stopping-error": "Fehler beim Stoppen des Nodes: __message__",
+            "updated-flows": "Flows aktualisiert",
            "added-flow": "Flow wird hinzugefügt: __label__",
            "updated-flow": "Aktualisierter Flow: __label__",
            "removed-flow": "Entfernter Flow: __label__",
@@ -145,7 +147,6 @@
            }
        }
    },
-
    "storage": {
        "index": {
            "forbidden-flow-name": "Unzulässiger Flow-Name"
@@ -159,6 +160,7 @@
            "restore": "Die '__type__'-Dateisicherung wird wiederhergestellt: __path__",
            "restore-fail": "Die Wiederherstellung der '__type__'-Dateisicherung ist fehlgeschlagen: __message__",
            "fsync-fail": "Die Übertragung der Datei __path__ auf das Laufwerk ist fehlgeschlagen: __message__",
+            "warn_name": "Name der Flows-Datei nicht festgelegt. Name wird unter Verwendung des Hostnamens generiert.",
            "projects": {
                "changing-project": "Aktives Projekt wird festgelegt: __project__",
                "active-project": "Aktives Projekt: __project__",
@@ -174,7 +176,6 @@
            }
        }
    },
-
    "context": {
        "log-store-init": "Kontextspeicher: __name__ [__info__]",
        "error-loading-module": "Fehler beim Laden des Kontextspeichers: __message__",
@@ -189,5 +190,4 @@
            "error-write": "Fehler beim Schreiben des Kontextes: __message__"
        }
    }
-
 }
--- a/packages/node_modules/@node-red/runtime/package.json
+++ b/packages/node_modules/@node-red/runtime/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@node-red/runtime",
-    "version": "3.1.0-beta.0",
+    "version": "3.0.2",
    "license": "Apache-2.0",
    "main": "./lib/index.js",
    "repository": {
@@ -16,8 +16,8 @@
        }
    ],
    "dependencies": {
-        "@node-red/registry": "3.1.0-beta.0",
-        "@node-red/util": "3.1.0-beta.0",
+        "@node-red/registry": "3.0.2",
+        "@node-red/util": "3.0.2",
        "async-mutex": "0.3.2",
        "clone": "2.1.2",
        "express": "4.18.1",
--- a/packages/node_modules/@node-red/util/lib/util.js
+++ b/packages/node_modules/@node-red/util/lib/util.js
@@ -696,19 +696,13 @@ function evaluateNodeProperty(value, type, node, msg, callback) {
 function prepareJSONataExpression(value,node) {
    var expr = jsonata(value);
    expr.assign('flowContext', function(val, store) {
-        if (node) {
-            return node.context().flow.get(val, store);
-        }
-        return "";
+        return node.context().flow.get(val, store);
    });
    expr.assign('globalContext', function(val, store) {
-        if (node) {
-            return node.context().global.get(val, store);
-        }
-        return "";
+        return node.context().global.get(val, store);
    });
    expr.assign('env', function(name) {
-        var val = getSetting(node, name, node ? node._flow : null);
+        var val = getSetting(node, name, node._flow);
        if (typeof val !== 'undefined') {
            return val;
        } else {
--- a/packages/node_modules/@node-red/util/package.json
+++ b/packages/node_modules/@node-red/util/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@node-red/util",
-    "version": "3.1.0-beta.0",
+    "version": "3.0.2",
    "license": "Apache-2.0",
    "repository": {
        "type": "git",
@@ -16,7 +16,7 @@
    ],
    "dependencies": {
        "fs-extra": "10.1.0",
-        "i18next": "21.8.14",
+        "i18next": "21.8.16",
        "json-stringify-safe": "5.0.1",
        "jsonata": "1.8.6",
        "lodash.clonedeep": "^4.5.0",
--- a/packages/node_modules/node-red/package.json
+++ b/packages/node_modules/node-red/package.json
@@ -1,6 +1,6 @@
 {
    "name": "node-red",
-    "version": "3.1.0-beta.0",
+    "version": "3.0.2",
    "description": "Low-code programming for event-driven applications",
    "homepage": "http://nodered.org",
    "license": "Apache-2.0",
@@ -31,10 +31,10 @@
        "flow"
    ],
    "dependencies": {
-        "@node-red/editor-api": "3.1.0-beta.0",
-        "@node-red/runtime": "3.1.0-beta.0",
-        "@node-red/util": "3.1.0-beta.0",
-        "@node-red/nodes": "3.1.0-beta.0",
+        "@node-red/editor-api": "3.0.2",
+        "@node-red/runtime": "3.0.2",
+        "@node-red/util": "3.0.2",
+        "@node-red/nodes": "3.0.2",
        "basic-auth": "2.0.1",
        "bcryptjs": "2.4.3",
        "express": "4.18.1",
--- a/test/nodes/core/function/15-change_spec.js
+++ b/test/nodes/core/function/15-change_spec.js
@@ -1717,6 +1717,24 @@ describe('change Node', function() {
                changeNode1.receive({topic:{foo:{bar:1}}, payload:"String"});
            });
        });
+        it('moves the value of a message property object to itself', function(done) {
+            var flow = [{"id":"changeNode1","type":"change","rules":[{"t":"move","p":"payload","pt":"msg","to":"payload","tot":"msg"}],"name":"changeNode","wires":[["helperNode1"]]},
+                        {id:"helperNode1", type:"helper", wires:[]}];
+            helper.load(changeNode, flow, function() {
+                var changeNode1 = helper.getNode("changeNode1");
+                var helperNode1 = helper.getNode("helperNode1");
+                helperNode1.on("input", function(msg) {
+                    try {
+                        msg.should.have.property('payload');
+                        msg.payload.should.equal("bar");
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                });
+                changeNode1.receive({payload:"bar"});
+            });
+        });
        it('moves the value of a message property object to a sub-property', function(done) {
            var flow = [{"id":"changeNode1","type":"change","rules":[{"t":"move","p":"payload","pt":"msg","to":"payload.foo","tot":"msg"}],"name":"changeNode","wires":[["helperNode1"]]},
                        {id:"helperNode1", type:"helper", wires:[]}];
--- a/test/nodes/core/function/16-range_spec.js
+++ b/test/nodes/core/function/16-range_spec.js
@@ -106,27 +106,6 @@ describe('range Node', function() {
        genericRangeTest("clamp", 0, 10, 0, 1000, false, -1, 0, done);
    });

-    it('drops msg if in drop mode and input outside range', function(done) {
-        var flow = [{"id":"rangeNode1","type":"range","minin":2,"maxin":8,"minout":20,"maxout":80,"action":"drop","round":true,"name":"rangeNode","wires":[["helperNode1"]]},
-                    {id:"helperNode1", type:"helper", wires:[]}];
-        helper.load(rangeNode, flow, function() {
-            var rangeNode1 = helper.getNode("rangeNode1");
-            var helperNode1 = helper.getNode("helperNode1");
-            helperNode1.on("input", function(msg) {
-                try {
-                    msg.should.have.property('payload');
-                    msg.payload.should.equal(50);
-                    done();
-                } catch(err) {
-                    done(err);
-                }
-            });
-            rangeNode1.receive({payload:1});
-            rangeNode1.receive({payload:9});
-            rangeNode1.receive({payload:5});
-        });
-    });
-
    it('just passes on msg if payload not present', function(done) {
        var flow = [{"id":"rangeNode1","type":"range","minin":0,"maxin":100,"minout":0,"maxout":100,"action":"scale","round":true,"name":"rangeNode","wires":[["helperNode1"]]},
                    {id:"helperNode1", type:"helper", wires:[]}];
--- a/test/nodes/core/function/89-delay_spec.js
+++ b/test/nodes/core/function/89-delay_spec.js
@@ -817,105 +817,6 @@ describe('delay Node', function() {
        });
    });

-    it('can part flush and reset rate limit queue', function(done) {
-        this.timeout(2000);
-        var flow = [{"id":"delayNode1","type":"delay","name":"delayNode","pauseType":"rate","timeout":1,"timeoutUnits":"seconds","rate":1,"rateUnits":"second","randomFirst":"1","randomLast":"5","randomUnits":"seconds","drop":false,"allowrate":false,"outputs":1,"wires":[["helperNode1"]]},
-                    {id:"helperNode1", type:"helper", wires:[]}];
-        helper.load(delayNode, flow, function() {
-            var delayNode1 = helper.getNode("delayNode1");
-            var helperNode1 = helper.getNode("helperNode1");
-            var t = Date.now();
-            var c = 0;
-            helperNode1.on("input", function(msg) {
-                // console.log("GOT",Date.now() - t,msg)
-                msg.should.have.a.property('payload');
-                msg.should.have.a.property('topic');
-                try {
-                    if (msg.topic === "foo") {
-                        msg.payload.should.equal(1);
-                        (Date.now() - t).should.be.approximately(0,50);
-                        c = c + 1;
-                    }
-                    else if (msg.topic === "bar") {
-                        msg.payload.should.equal(2);
-                        (Date.now() - t).should.be.approximately(200,100);
-                        c = c + 1;
-                    }
-                    else if (msg.topic === "fob") {
-                        msg.payload.should.equal(5);
-                        (Date.now() - t).should.be.approximately(400,100);
-                        c = 5;
-                    }
-                    if (c === 5) { done(); }
-                } catch(e) {
-                    done(e);
-                }
-            });
-
-            // send test messages
-            // delayNode1.receive({payload:1,topic:"foo"});
-            setImmediate( function() { delayNode1.receive({payload:1,topic:"foo"}); }  );
-            setTimeout( function() { delayNode1.receive({payload:2,topic:"far"}); }, 10  );
-            setTimeout( function() { delayNode1.receive({payload:3,topic:"boo"}); }, 20  );
-            setTimeout( function() { delayNode1.receive({payload:4,topic:"bar"}); }, 30  );
-            setTimeout( function() { delayNode1.receive({flush:2,reset:true});  }, 200);
-            setTimeout( function() { delayNode1.receive({payload:5,topic:"fob"}); }, 300  );
-            setTimeout( function() { delayNode1.receive({flush:1,reset:true});  }, 400);
-        });
-    });
-
-    it('can full flush and reset rate limit queue', function(done) {
-        this.timeout(2000);
-        var flow = [{"id":"delayNode1","type":"delay","name":"delayNode","pauseType":"rate","timeout":1,"timeoutUnits":"seconds","rate":1,"rateUnits":"second","randomFirst":"1","randomLast":"5","randomUnits":"seconds","drop":false,"allowrate":false,"outputs":1,"wires":[["helperNode1"]]},
-                    {id:"helperNode1", type:"helper", wires:[]}];
-        helper.load(delayNode, flow, function() {
-            var delayNode1 = helper.getNode("delayNode1");
-            var helperNode1 = helper.getNode("helperNode1");
-            var t = Date.now();
-            var c = 0;
-            helperNode1.on("input", function(msg) {
-                // console.log("GOT",Date.now() - t,msg)
-                msg.should.have.a.property('payload');
-                msg.should.have.a.property('topic');
-                try {
-                    if (msg.topic === "foo") {
-                        msg.payload.should.equal(1);
-                        (Date.now() - t).should.be.approximately(0,50);
-                        c = c + 1;
-                    }
-                    else if (msg.topic === "bar") {
-                        msg.payload.should.equal(4);
-                        (Date.now() - t).should.be.approximately(200,100);
-                        c = c + 1;
-                    }
-                    else if (msg.topic === "all") {
-                        msg.payload.should.equal(5);
-                        (Date.now() - t).should.be.approximately(200,100);
-                        c = c + 1;
-                    }
-                    else if (msg.topic === "fob") {
-                        msg.payload.should.equal(6);
-                        (Date.now() - t).should.be.approximately(400,100);
-                        c = 5;
-                    }
-                    if (c === 5) { done(); }
-                } catch(e) {
-                    done(e);
-                }
-            });
-
-            // send test messages
-            // delayNode1.receive({payload:1,topic:"foo"});
-            setImmediate( function() { delayNode1.receive({payload:1,topic:"foo"}); }  );
-            setTimeout( function() { delayNode1.receive({payload:2,topic:"far"}); }, 10  );
-            setTimeout( function() { delayNode1.receive({payload:3,topic:"boo"}); }, 20  );
-            setTimeout( function() { delayNode1.receive({payload:4,topic:"bar"}); }, 30  );
-            setTimeout( function() { delayNode1.receive({payload:5,topic:"last",flush:true,reset:true});  }, 200);
-            setTimeout( function() { delayNode1.receive({payload:6,topic:"fob"}); }, 300  );
-            setTimeout( function() { delayNode1.receive({flush:1,reset:true});  }, 400);
-        });
-    });
-
    it('can part push to front of rate limit queue', function(done) {
        this.timeout(2000);
        var flow = [{"id":"delayNode1","type":"delay","name":"delayNode","pauseType":"rate","timeout":1,"timeoutUnits":"seconds","rate":1,"rateUnits":"second","randomFirst":"1","randomLast":"5","randomUnits":"seconds","drop":false,"wires":[["helperNode1"]]},
--- a/test/nodes/core/network/21-httprequest_spec.js
+++ b/test/nodes/core/network/21-httprequest_spec.js
@@ -31,6 +31,8 @@ var multer = require("multer");
 var RED = require("nr-test-utils").require("node-red/lib/red");
 var fs = require('fs-extra');
 var auth = require('basic-auth');
+const { version } = require("os");
+const net = require('net')

 describe('HTTP Request Node', function() {
    var testApp;
@@ -1527,7 +1529,7 @@ describe('HTTP Request Node', function() {
                        msg.payload.headers.should.have.property('Content-Type').which.startWith('application/json');
                        //msg.dynamicHeaderName should be present in headers with the value of msg.dynamicHeaderValue
                        msg.payload.headers.should.have.property('dyn-header-name').which.startWith('dyn-header-value');
-                        //static (custom) header set in Flow UI should be present 
+                        //static (custom) header set in Flow UI should be present
                        msg.payload.headers.should.have.property('static-header-name').which.startWith('static-header-value');
                        //msg.headers['location'] should be deleted because Flow UI "Location" header has a blank value
                        //ensures headers with matching characters but different case are eliminated
@@ -2265,4 +2267,71 @@ describe('HTTP Request Node', function() {
            });
        });
    });
+
+    describe('should parse broken headers', function() {
+
+        const versions = process.versions.node.split('.')
+
+        if (( versions[0] == 14 && versions[1] >= 20 ) ||
+            ( versions[0] == 16 && versions[1] >= 16 ) ||
+            ( versions[0] == 18 && versions[1] >= 5 ) ||
+            ( versions[0] > 18)) {
+            // only test if on new enough NodeJS version
+
+            let port = testPort++
+
+            let server;
+
+            before(function() {
+                server = net.createServer(function (socket) {
+                    socket.write("HTTP/1.0 200\nContent-Type: text/plain\n\nHelloWorld")
+                    socket.end()
+                })
+
+                server.listen(port,'127.0.0.1', function(err) {
+                })
+            });
+
+            after(function() {
+                server.close()
+            });
+
+            it('should accept broken headers', function (done) {
+                var flow = [{id:'n1',type:'http request',wires:[['n2']],method:'GET',ret:'obj',url:`http://localhost:${port}/`, insecureHTTPParser: true},
+                {id:"n2", type:"helper"}];
+                helper.load(httpRequestNode, flow, function() {
+                    var n1 = helper.getNode("n1");
+                    var n2 = helper.getNode("n2");
+                    n2.on('input', function(msg) {
+                        try {
+                            msg.payload.should.equal('HelloWorld')
+                            done()
+                        } catch (err) {
+                            done(err)
+                        }
+                    })
+                    n1.receive({payload: 'foo'})
+                });
+            });
+
+            it('should reject broken headers', function (done) {
+                var flow = [{id:'n1',type:'http request',wires:[['n2']],method:'GET',ret:'obj',url:`http://localhost:${port}/`},
+                {id:"n2", type:"helper"}];
+                helper.load(httpRequestNode, flow, function() {
+                    var n1 = helper.getNode("n1");
+                    var n2 = helper.getNode("n2");
+                    n2.on('input', function(msg) {
+                        try{
+                            msg.payload.should.match(/RequestError: Parse Error/)
+                            done()
+                        } catch (err) {
+                            done(err)
+                        }
+                    })
+                    n1.receive({payload: 'foo'})
+
+                });
+            });
+        }
+    });
 });
--- a/test/nodes/core/network/21-mqtt_spec.js
+++ b/test/nodes/core/network/21-mqtt_spec.js
@@ -27,7 +27,7 @@ describe('MQTT Nodes', function () {
        } catch (error) { }
    });

-    it('should be loaded and have default values', function (done) {
+    it('should be loaded and have default values (MQTT V4)', function (done) {
        this.timeout = 2000;
        const { flow, nodes } = buildBasicMQTTSendRecvFlow({ id: "mqtt.broker", name: "mqtt_broker", autoConnect: false }, { id: "mqtt.in", topic: "in_topic" }, { id: "mqtt.out", topic: "out_topic" });
        helper.load(mqttNodes, flow, function () {
@@ -61,6 +61,52 @@ describe('MQTT Nodes', function () {
                mqttBroker.options.clientId.should.containEql('nodered_');
                mqttBroker.options.should.have.property('keepalive').type("number");
                mqttBroker.options.should.have.property('reconnectPeriod').type("number");
+                //as this is not a v5 connection, ensure v5 properties are not present
+                mqttBroker.options.should.not.have.property('protocolVersion', 5);
+                mqttBroker.options.should.not.have.property('properties');
+                done();
+            } catch (error) {
+                done(error)
+            }
+        });
+    });
+    it('should be loaded and have default values (MQTT V5)', function (done) {
+        this.timeout = 2000;
+        const { flow, nodes } = buildBasicMQTTSendRecvFlow({ id: "mqtt.broker", name: "mqtt_broker", autoConnect: false, cleansession: false, clientid: 'clientid', keepalive: 35, sessionExpiry: '6000', protocolVersion: '5', userProps: {"prop": "val"}}, { id: "mqtt.in", topic: "in_topic" }, { id: "mqtt.out", topic: "out_topic" });
+        helper.load(mqttNodes, flow, function () {
+            try {
+                const mqttIn = helper.getNode("mqtt.in");
+                const mqttOut = helper.getNode("mqtt.out");
+                const mqttBroker = helper.getNode("mqtt.broker");
+
+                should(mqttIn).be.type("object", "mqtt in node should be an object")
+                mqttIn.should.have.property('broker', nodes.mqtt_broker.id); //should be the id of the broker node
+                mqttIn.should.have.property('datatype', 'utf8'); //default: 'utf8'
+                mqttIn.should.have.property('isDynamic', false);  //default: false
+                mqttIn.should.have.property('inputs', 0); //default: 0 
+                mqttIn.should.have.property('qos', 2); //default: 2
+                mqttIn.should.have.property('topic', "in_topic");
+                mqttIn.should.have.property('wires', [["helper.node"]]);
+
+                should(mqttOut).be.type("object", "mqtt out node should be an object")
+                mqttOut.should.have.property('broker', nodes.mqtt_broker.id); //should be the id of the broker node
+                mqttOut.should.have.property('topic', "out_topic");
+
+                should(mqttBroker).be.type("object", "mqtt broker node should be an object")
+                mqttBroker.should.have.property('broker', BROKER_HOST);
+                mqttBroker.should.have.property('port', BROKER_PORT);
+                mqttBroker.should.have.property('brokerurl');
+                // mqttBroker.should.have.property('autoUnsubscribe', true);//default: true 
+                mqttBroker.should.have.property('autoConnect', false);//Set "autoConnect:false" in brokerOptions 
+                mqttBroker.should.have.property('options');
+                mqttBroker.options.should.have.property('clean', false);
+                mqttBroker.options.should.have.property('clientId', 'clientid');
+                mqttBroker.options.should.have.property('keepalive').type("number", 35);
+                mqttBroker.options.should.have.property('reconnectPeriod').type("number");
+                //as this IS a v5 connection, ensure v5 properties are not present
+                mqttBroker.options.should.have.property('protocolVersion', 5);
+                mqttBroker.options.should.have.property('properties');
+                mqttBroker.options.properties.should.have.property('sessionExpiryInterval');
                done();
            } catch (error) {
                done(error)
@@ -173,7 +219,7 @@ describe('MQTT Nodes', function () {
            topic: nextTopic(),
            payload: '{prop:"value3", "num":3}', // send invalid JSON ...
        }
-        const hooks = { done: done, beforeLoad: null, afterLoad: null, afterConnect: null }
+        const hooks = { done: null, beforeLoad: null, afterLoad: null, afterConnect: null }
        hooks.afterLoad = (helperNode, mqttBroker, mqttIn, mqttOut) => {
            helperNode.on("input", function (msg) {
                try {
@@ -299,7 +345,7 @@ describe('MQTT Nodes', function () {
            topic: nextTopic(),
            payload: '{prop:"value3", "num":3}', contentType: "application/json", // send invalid JSON ...
        }
-        const hooks = { done: done, beforeLoad: null, afterLoad: null, afterConnect: null }
+        const hooks = { done: null, beforeLoad: null, afterLoad: null, afterConnect: null }
        hooks.afterLoad = (helperNode, mqttBroker, mqttIn, mqttOut) => {
            helperNode.on("input", function (msg) {
                try {
@@ -385,7 +431,7 @@ describe('MQTT Nodes', function () {
        if (skipTests) { return this.skip() }
        this.timeout = 2000;
        const options = {}
-        const hooks = { done: done, beforeLoad: null, afterLoad: null, afterConnect: null }
+        const hooks = { beforeLoad: null, afterLoad: null, afterConnect: null }
        hooks.beforeLoad = (flow) => { //add a status node pointed at MQTT Out node (to watch for connection status change)
            flow.push({ "id": "status.node", "type": "status", "name": "status_node", "scope": ["mqtt.out"], "wires": [["helper.node"]] });//add status node to watch mqtt_out
        }
@@ -416,20 +462,66 @@ describe('MQTT Nodes', function () {
        this.timeout = 2000;
        const baseTopic = nextTopic();
        const brokerOptions = {
+            autoConnect: false,
            protocolVersion: 4,
            birthTopic: baseTopic + "/birth",
-            birthPayload: "broker connected",
+            birthPayload: "broker birth",
            birthQos: 2,
        }
-        const options = {};
-        const hooks = { done: done, beforeLoad: null, afterLoad: null, afterConnect: null };
-        options.expectMsg = {
+        const expectMsg = {
            topic: brokerOptions.birthTopic,
            payload: brokerOptions.birthPayload,
            qos: brokerOptions.birthQos
        };
+        const options = { };
+        const hooks = { };
+        hooks.afterLoad = (helperNode, mqttBroker, mqttIn, mqttOut) => {
+            helperNode.on("input", function (msg) {
+                try {
+                    compareMsgToExpected(msg, expectMsg);
+                    done();
+                } catch (error) {
+                    done(error)
+                }
+            })
+            mqttIn.receive({ "action": "connect" }); //now request connect action
+            return true; //handled
+        }       
        testSendRecv(brokerOptions, { topic: brokerOptions.birthTopic }, {}, options, hooks);
    });
+    itConditional('should safely discard bad birth topic', function (done) {
+        if (skipTests) { return this.skip() }
+        this.timeout = 2000;
+        const baseTopic = nextTopic();
+        const brokerOptions = {
+            protocolVersion: 4,
+            birthTopic: baseTopic + "#", // a publish topic should never have a wildcard
+            birthPayload: "broker connected",
+            birthQos: 2,
+        }
+        const options = {};
+        const hooks = { done: null, beforeLoad: null, afterLoad: null, afterConnect: null };
+        hooks.afterLoad = (helperNode, mqttBroker, mqttIn, mqttOut) => {
+            helperNode.on("input", function (msg) {
+                try {
+                    msg.should.have.a.property("error").type("object");
+                    msg.error.should.have.a.property("source").type("object");
+                    msg.error.source.should.have.a.property("id", mqttIn.id);
+                    done();
+                } catch (err) {
+                    done(err)
+                }
+            });
+            return true; //handled
+        }
+        options.expectMsg = null;
+        try {
+            testSendRecv(brokerOptions, { topic: brokerOptions.birthTopic }, {}, options, hooks);
+            done()
+        } catch(err) {
+            done(e)
+        }
+    });
    itConditional('should publish close message', function (done) {
        if (skipTests) { return this.skip() }
        this.timeout = 2000;
@@ -587,12 +679,13 @@ function testSendRecv(brokerOptions, inNodeOptions, outNodeOptions, options, hoo
            const mqttBroker = helper.getNode(brokerOptions.id);
            const mqttIn = helper.getNode(nodes.mqtt_in.id);
            const mqttOut = helper.getNode(nodes.mqtt_out.id);
-            let afterLoadHandled = false;
+            let afterLoadHandled = false, finished = false;
            if (hooks.afterLoad) {
                afterLoadHandled = hooks.afterLoad(helperNode, mqttBroker, mqttIn, mqttOut)
            }
            if (!afterLoadHandled) {
                helperNode.on("input", function (msg) {
+                    finished = true
                    try {
                        compareMsgToExpected(msg, expectMsg);
                        if (hooks.done) { hooks.done(); }
@@ -617,10 +710,12 @@ function testSendRecv(brokerOptions, inNodeOptions, outNodeOptions, options, hoo
                }
            })
            .catch((e) => {
+                if(finished) { return }
                if (hooks.done) { hooks.done(e); }
                else { throw e; }
            });
        } catch (err) {
+            if(finished) { return }
            if (hooks.done) { hooks.done(err); }
            else { throw err; }
        }
@@ -666,6 +761,7 @@ function buildMQTTBrokerNode(id, name, brokerHost, brokerPort, options) {
    node.cleansession = String(options.cleansession) == "false" ? false : true;
    node.autoUnsubscribe = String(options.autoUnsubscribe) == "false" ? false : true;
    node.autoConnect = String(options.autoConnect) == "false" ? false : true;
+    node.sessionExpiry = options.sessionExpiry ? options.sessionExpiry : undefined;

    if (options.birthTopic) {
        node.birthTopic = options.birthTopic;
@@ -760,8 +856,8 @@ function waitBrokerConnect(broker, timeLimit) {
    let waitConnected = (broker, timeLimit) => {
        const brokers = Array.isArray(broker) ? broker : [broker];
        timeLimit = timeLimit || 1000;
-        let timer, resolved = false;
        return new Promise( (resolve, reject) => {
+            let timer, resolved = false;
            timer = wait();
            function wait() {
                if (brokers.every(e => e.connected == true)) {
--- a/test/nodes/core/parsers/70-CSV_spec.js
+++ b/test/nodes/core/parsers/70-CSV_spec.js
@@ -693,19 +693,20 @@ describe('CSV node', function() {
    describe('json object to csv', function() {

        it('should convert a simple object back to a csv', function(done) {
-            var flow = [ { id:"n1", type:"csv", temp:"a,b,c,,e,f", wires:[["n2"]] },
+            var flow = [ { id:"n1", type:"csv", temp:"a,b,c,,e,f,g,h,i,j,k", wires:[["n2"]] },
                {id:"n2", type:"helper"} ];
            helper.load(csvNode, flow, function() {
                var n1 = helper.getNode("n1");
                var n2 = helper.getNode("n2");
                n2.on("input", function(msg) {
+                    // console.log("GOT",msg)
                    try {
-                        msg.should.have.property('payload', '4,foo,true,,0,"Hello\nWorld"\n');
+                        msg.should.have.property('payload', '4,foo,true,,0,"Hello\nWorld",,,undefined,null,null\n');
                        done();
                    }
                    catch(e) { done(e); }
                });
-                var testJson = { e:0, d:1, b:"foo", c:true, a:4, f:"Hello\nWorld" };
+                var testJson = { e:0, d:1, b:"foo", c:true, a:4, f:"Hello\nWorld", h:undefined, i:"undefined",j:null,k:"null" };
                n1.emit("input", {payload:testJson});
            });
        });
@@ -717,13 +718,14 @@ describe('CSV node', function() {
                var n1 = helper.getNode("n1");
                var n2 = helper.getNode("n2");
                n2.on("input", function(msg) {
+                    // console.log("GOT",msg)
                    try {
-                        msg.should.have.property('payload', '1,foo,"ba""r","di,ng"\n');
+                        msg.should.have.property('payload', '1,foo,"ba""r","di,ng",,undefined,null\n');
                        done();
                    }
                    catch(e) { done(e); }
                });
-                var testJson = { d:1, b:"foo", c:"ba\"r", a:"di,ng" };
+                var testJson = { d:1, b:"foo", c:"ba\"r", a:"di,ng", e:undefined, f:"undefined", g:null,h:"null" };
                n1.emit("input", {payload:testJson});
            });
        });
--- a/test/nodes/subflow/subflow_spec.js
+++ b/test/nodes/subflow/subflow_spec.js
@@ -260,8 +260,7 @@ describe('subflow', function() {
                 {name: "KB", type: "bool", value: "true"},
                 {name: "KJ", type: "json", value: "[1,2,3]"},
                 {name: "Kb", type: "bin", value: "[65,65]"},
-                 {name: "Ke", type: "env", value: "KS"},
-                 {name: "Kj", type: "jsonata", value: "1+2"},
+                 {name: "Ke", type: "env", value: "KS"}
             ],
             wires:[["n2"]]},
            {id:"n2", x:10, y:10, z:"t0", type:"helper", wires:[]},
@@ -280,7 +279,7 @@ describe('subflow', function() {
             ]
            },
            {id:"s1-n1", x:10, y:10, z:"s1", type:"function",
-             func:"msg.VE = env.get('Ke'); msg.VS = env.get('KS'); msg.VN = env.get('KN'); msg.VB = env.get('KB'); msg.VJ = env.get('KJ'); msg.Vb = env.get('Kb'); msg.Vj = env.get('Kj'); return msg;",
+             func:"msg.VE = env.get('Ke'); msg.VS = env.get('KS'); msg.VN = env.get('KN'); msg.VB = env.get('KB'); msg.VJ = env.get('KJ'); msg.Vb = env.get('Kb'); return msg;",
             wires:[]}
        ];
        helper.load(functionNode, flow, function() {
@@ -295,7 +294,6 @@ describe('subflow', function() {
                    msg.should.have.property("Vb");
                    should.ok(msg.Vb instanceof Buffer);
                    msg.should.have.property("VE","STR");
-                    msg.should.have.property("Vj",3);
                    done();
                }
                catch (e) {
--- a/test/unit/@node-red/editor-api/lib/index_spec.js
+++ b/test/unit/@node-red/editor-api/lib/index_spec.js
@@ -61,7 +61,7 @@ describe("api/index", function() {
        should.not.exist(api.httpAdmin);
        done();
    });
-    describe('initalises admin api without adminAuth', function(done) {
+    describe('initalises admin api without adminAuth', function() {
        before(function() {
            beforeEach();
            api.init({},{},{},{});
@@ -78,7 +78,7 @@ describe("api/index", function() {
        })
    });

-    describe('initalises admin api without editor', function(done) {
+    describe('initalises admin api without editor', function() {
        before(function() {
            beforeEach();
            api.init({ disableEditor: true },{},{},{});
@@ -95,7 +95,7 @@ describe("api/index", function() {
        })
    });

-    describe('initialises api with admin middleware', function(done) {
+    describe('initialises api with admin middleware', function() {
        it('ignores non-function values',function(done) {
            api.init({ httpAdminRoot: true, httpAdminMiddleware: undefined },{},{},{});
            const middlewareFound = api.httpAdmin._router.stack.filter((layer) => layer.name === 'testMiddleware')
@@ -112,7 +112,7 @@ describe("api/index", function() {
        });
    });

-    describe('initialises api with authentication enabled', function(done) {
+    describe('initialises api with authentication enabled', function() {

        it('enables an oauth/openID based authentication mechanism',function(done) {
            const stub = sinon.stub(apiAuth, 'genericStrategy').callsFake(function(){});
@@ -135,7 +135,7 @@ describe("api/index", function() {

    });

-    describe('initialises api with custom cors config', function (done) {
+    describe('initialises api with custom cors config', function () {
        const httpAdminCors = {
            origin: "*",
            methods: "GET,PUT,POST,DELETE"
@@ -156,7 +156,7 @@ describe("api/index", function() {
        })
    });

-    describe('editor start', function (done) {
+    describe('editor start', function () {

        it('cannot be started when editor is disabled', function (done) {
            const stub = sinon.stub(apiEditor, 'start').callsFake(function () {
--- a/test/unit/@node-red/runtime/lib/api/diagnostics_spec.js
+++ b/test/unit/@node-red/runtime/lib/api/diagnostics_spec.js
@@ -33,6 +33,11 @@ describe("runtime-api/diagnostics", function() {
                    flowFile: "flows.json",
                    mqttReconnectTime: 321,
                    serialReconnectTime: 432,
+                    socketReconnectTime: 2222,
+                    socketTimeout: 3333,
+                    tcpMsgQueueSize: 4444,
+                    inboundWebSocketTimeout: 5555,
+                    runtimeState: {enabled: true, ui: false},
                    adminAuth: {},//should be sanitised to "SET"
                    httpAdminRoot: "/admin/root/",
                    httpAdminCors: {},//should be sanitised to "SET"
@@ -45,6 +50,7 @@ describe("runtime-api/diagnostics", function() {
                    uiHost: "something.secret.com",//should be sanitised to "SET"
                    uiPort: 1337,//should be sanitised to "SET"
                    userDir: "/var/super/secret/",//should be sanitised to "SET",
+                    nodesDir: "/var/super/secret/",//should be sanitised to "SET",
                    contextStorage: {
                        default    : { module: "memory" },
                        file: { module: "localfilesystem" },
@@ -73,8 +79,9 @@ describe("runtime-api/diagnostics", function() {

                //result.runtime.xxxxx
                const runtimeCount = Object.keys(result.runtime).length;
-                runtimeCount.should.eql(4);//ensure no more than 4 keys are present in runtime 
+                runtimeCount.should.eql(5);//ensure 5 keys are present in runtime 
                result.runtime.should.have.property('isStarted',true)
+                result.runtime.should.have.property('flows')
                result.runtime.should.have.property('modules').type("object");
                result.runtime.should.have.property('settings').type("object");
                result.runtime.should.have.property('version','7.7.7');
@@ -87,7 +94,7 @@ describe("runtime-api/diagnostics", function() {

                //result.runtime.settings.xxxxx
                const settingsCount = Object.keys(result.runtime.settings).length;
-                settingsCount.should.eql(21);//ensure no more than the 21 settings listed below are present in the settings object
+                settingsCount.should.eql(27);//ensure no more than the 21 settings listed below are present in the settings object
                result.runtime.settings.should.have.property('available',true);
                result.runtime.settings.should.have.property('apiMaxLength', "UNSET");//deliberately disabled to ensure UNSET is returned
                result.runtime.settings.should.have.property('debugMaxLength', 1111);
@@ -96,6 +103,11 @@ describe("runtime-api/diagnostics", function() {
                result.runtime.settings.should.have.property('flowFile', "flows.json");
                result.runtime.settings.should.have.property('mqttReconnectTime', 321);
                result.runtime.settings.should.have.property('serialReconnectTime', 432);
+                result.runtime.settings.should.have.property('socketReconnectTime', 2222);
+                result.runtime.settings.should.have.property('socketTimeout', 3333);
+                result.runtime.settings.should.have.property('tcpMsgQueueSize', 4444);
+                result.runtime.settings.should.have.property('inboundWebSocketTimeout', 5555);
+                result.runtime.settings.should.have.property('runtimeState', {enabled: true, ui: false});
                result.runtime.settings.should.have.property("adminAuth", "SET"); //should be sanitised to "SET"
                result.runtime.settings.should.have.property("httpAdminCors", "SET"); //should be sanitised to "SET"
                result.runtime.settings.should.have.property('httpAdminRoot', "/admin/root/");
@@ -109,6 +121,7 @@ describe("runtime-api/diagnostics", function() {
                result.runtime.settings.should.have.property("uiPort", "SET"); //should be sanitised to "SET"
                result.runtime.settings.should.have.property("userDir", "SET"); //should be sanitised to "SET"
                result.runtime.settings.should.have.property('contextStorage').type("object");
+                result.runtime.settings.should.have.property('nodesDir', "SET")

                //result.runtime.settings.contextStorage.xxxxx
                const contextCount = Object.keys(result.runtime.settings.contextStorage).length;
--- a/test/unit/@node-red/runtime/lib/flows/Flow_spec.js
+++ b/test/unit/@node-red/runtime/lib/flows/Flow_spec.js
@@ -1322,40 +1322,6 @@ describe('Flow', function() {
                
        });

-        it("can define environment variable using JSONata", function (done) {
-            try {
-                after(function() {
-                    delete process.env.V0;
-                })
-                var config = flowUtils.parseConfig([
-                    {id:"t1",type:"tab",env:[
-                        {"name": "V0", value: "1+2", type: "jsonata"}
-                    ]},
-                    {id:"g1",type:"group",z:"t1",env:[
-                        {"name": "V1", value: "2+3", type: "jsonata"},
-                    ]},
-                    {id:"1",x:10,y:10,z:"t1",g:"g1",type:"test",foo:"$(V0)",wires:[]},
-                    {id:"2",x:10,y:10,z:"t1",g:"g1",type:"test",foo:"$(V1)",wires:[]},
-                ]);
-                var flow = Flow.create({getSetting:v=>process.env[v]},config,config.flows["t1"]);
-                flow.start();
-
-                var activeNodes = flow.getActiveNodes();
-
-                activeNodes["1"].foo.should.equal(3);
-                activeNodes["2"].foo.should.equal(5);
-
-                flow.stop().then(function() {
-                    done();
-                });
-            }
-            catch (e) {
-                console.log(e.stack);
-                done(e);
-            }
-                
-        });
-
    });

 });
Author	SHA1	Message	Date
Nick O'Leary	902ce68164	Merge branch 'master' into fix-group-unknown	2022-10-26 00:52:34 +01:00
Nick O'Leary	cd0474ce7b	Update packages/node_modules/@node-red/editor-client/src/js/nodes.js Co-authored-by: Stephen McLaughlin <44235289+Steve-Mcl@users.noreply.github.com>	2022-10-26 00:51:41 +01:00
Nick O'Leary	946def022f	Merge pull request #3922 from node-red/fix-httpreq-tests Fix httprequest tests to be more lenient on error message	2022-10-26 00:40:47 +01:00
Nick O'Leary	c62a101635	Fix httprequest tests to be more lenient on error message	2022-10-16 23:10:57 +01:00
Nick O'Leary	69a575097d	Remove debug	2022-10-16 22:47:34 +01:00
Nick O'Leary	b40551a8fa	Handle replacing unknown node inside group or subflow	2022-10-16 22:38:11 +01:00
Nick O'Leary	32999ffa84	Merge pull request #3906 from node-red/Fix-for-csv-undefined-property Fix for CSV undefined property	2022-10-04 15:38:37 +01:00
Nick O'Leary	f06c53f1f1	Merge pull request #3905 from node-red/mqtt-followups Fix birth topic handling in MQTT node	2022-10-04 15:36:49 +01:00
Nick O'Leary	a9eec28360	Merge pull request #3884 from node-red/fix-auto-complete Fix autocomplete entry for responseUrl	2022-10-04 15:35:10 +01:00
Nick O'Leary	5cda972872	Merge pull request #3890 from kazuhitoyokoi/master-fixmqttproperty Fix pull-down menus of MQTT configuration node	2022-10-04 15:34:50 +01:00
Nick O'Leary	087946876b	Merge pull request #3907 from boahc077/github_actions_token_permission ci: add minimum GitHub token permissions for workflows	2022-10-04 15:32:47 +01:00
Nick O'Leary	318f0f1b7e	Merge pull request #3899 from node-red/fix-change-self-overwrite Fix change node overwriting msg with itself	2022-10-04 15:29:23 +01:00
Nick O'Leary	93c1600980	Merge pull request #3886 from kazuhitoyokoi/master2 Limit number of ports in function node	2022-10-04 11:00:18 +01:00
Nick O'Leary	c3d1e6181f	Merge pull request #3894 from hardillb/http-response-status-number Ensure statusCode is a number	2022-10-04 10:28:04 +01:00
Ashish Kurmi	87e7f3a61c	ci: add minimum GitHub token permissions for workflows Signed-off-by: Ashish Kurmi <akurmi@stepsecurity.io>	2022-10-02 11:16:13 -07:00
Dave Conway-Jones	e724f216bf	Fix for CSV undefined property to close #3900 main issue and add tests (other fix is commented out but no tests)	2022-09-30 13:48:48 +01:00
Steve-Mcl	b0abba15a6	remove dud code instead of commenting	2022-09-29 19:08:46 +01:00
Steve-Mcl	81b4874a7c	fix new test and fix bug found in previous PR	2022-09-29 19:05:53 +01:00
Steve-Mcl	f11b9c1e18	add test bad birth topic part of #3865	2022-09-29 13:12:15 +01:00
Steve-Mcl	e15ecc00ce	remove old unused code (5y+ not used)	2022-09-29 13:11:25 +01:00
Dave Conway-Jones	3e4c45ac6a	Fix change node overwriting msg with itself and add test to close #3891	2022-09-22 20:22:11 +01:00
Ben Hardill	4115c13a65	Ensure statusCode is a number Fixes #3893 Used parseInt instead of the suggested fix so that we don't end up with statusCode = 200.5	2022-09-19 19:43:06 +01:00
Kazuhito Yokoi	f872e2ab80	Add icon to typedInput in MQTT node	2022-09-18 19:11:33 +09:00
Kazuhito Yokoi	a81b1aa0cb	Support i18n in MQTT node property	2022-09-18 17:10:19 +09:00
Kazuhito Yokoi	efc0f1ab91	Fix default values for MQTT retain settings	2022-09-18 16:24:25 +09:00
Kazuhito Yokoi	ce31edc803	Fix handling of max and min values in function outputs	2022-09-18 02:22:52 +09:00
Kazuhito Yokoi	199caccbc3	Change the maximum number of ports to 500	2022-09-17 00:25:46 +09:00
Nick O'Leary	f060309002	Merge pull request #3872 from node-red-hitachi/fix-Japanese-editor-message-for-JSONata Fix Japanese translation for JSONata editor	2022-09-15 21:25:30 +01:00
Nick O'Leary	fc3d86e6ff	Merge pull request #3882 from kazuhitoyokoi/master-addenvinfo2template Add information about environment variable to template node	2022-09-15 21:24:32 +01:00
Nick O'Leary	9fd4989142	Fix autocomplete entry for responseUrl Fixes #3883	2022-09-15 21:22:55 +01:00
Kazuhito Yokoi	7507a7b459	Limit number of ports in function node	2022-09-16 02:10:14 +09:00
Kazuhito Yokoi	d657817211	Add information about environment variable to template node	2022-09-13 22:08:22 +09:00
Hiroyasu Nishiyama	954649007c	merge master	2022-09-13 10:52:48 +09:00
Nick O'Leary	b0d9903fe2	Merge pull request #3873 from node-red-hitachi/fix-describe-arg Remove done from describe	2022-09-12 19:29:14 +01:00
Nick O'Leary	6375f3c445	Merge pull request #3841 from Steve-Mcl/fix-search-type-with-spaces Fix search type with spaces	2022-09-12 19:27:09 +01:00
Nick O'Leary	2328f418be	Merge pull request #3871 from node-red-hitachi/fix-extended-function-error-handling-of-jsonata-editor Fix error hanndling of JSONata expression editor for extended functions	2022-09-12 19:26:15 +01:00
Nick O'Leary	22b6564847	Merge pull request #3880 from kazuhitoyokoi/master-replacedot4function Remove dot from variable name for external module in function node	2022-09-12 19:25:39 +01:00
Nick O'Leary	25c8bfefe2	Merge pull request #3868 from Steve-Mcl/func-types-monaco-util-promisify add function node monaco types util and promisify	2022-09-12 19:25:07 +01:00
Nick O'Leary	30f4524821	Merge pull request #3866 from kazuhitoyokoi/master-fixbutton4addsshkey Add button type to the adding SSH key button	2022-09-12 19:18:49 +01:00
Nick O'Leary	9e4c3a7200	Merge pull request #3879 from kazuhitoyokoi/master-fixradiobutton4project Check radio button as default in project dialog	2022-09-12 19:18:15 +01:00
Nick O'Leary	5b7e84c1b0	Merge pull request #3869 from Steve-Mcl/fix-mqtt-birth-bad-topic-crash Prevent invalid mqtt birth topic crashing node-red	2022-09-12 19:17:43 +01:00
Nick O'Leary	e6097e4968	Merge pull request #3874 from node-red-hitachi/support-clone-in-monaco Add $clone as supported function	2022-09-12 19:16:18 +01:00
Kazuhito Yokoi	0f2829097b	Remove dot from variable name for external module in function node	2022-09-10 12:17:18 +09:00
Kazuhito Yokoi	e2a9f940e2	Check radio button as default in project dialog	2022-09-09 01:05:53 +09:00
Hiroyasu Nishiyama	3eb2b2ac5d	add $clone as supported function	2022-09-06 18:52:13 +09:00
Hiroyasu Nishiyama	ce7b0a3b5e	remove done from describe	2022-09-06 18:05:50 +09:00
Hiroyasu Nishiyama	7bd7c99dd4	Fix Japanese translation for JSONata editor	2022-09-06 16:53:38 +09:00
Hiroyasu Nishiyama	b0d12c4125	Fix error hanndling of JSONata expression editor for extennded functions	2022-09-06 15:38:49 +09:00
Kazuhito Yokoi	745607b5bc	Add button type to buttons on node properties	2022-09-04 23:21:34 +09:00
Kazuhito Yokoi	cc5a770b16	Add button type to buttons on projects dialog	2022-09-04 21:58:02 +09:00
Steve-Mcl	fbde0091de	fix node-red crash with invalid mqtt birth topic fixes #3865	2022-09-04 11:08:41 +01:00
Steve-Mcl	a533943a40	add function node monaco types util and promisify fixes #3851	2022-09-04 01:50:54 +01:00
Stephen McLaughlin	e11f17672c	Update packages/node_modules/@node-red/editor-client/src/js/ui/palette.js	2022-09-03 22:01:54 +01:00
Stephen McLaughlin	c038c99f9d	Update packages/node_modules/@node-red/editor-client/src/js/ui/search.js Co-authored-by: Nick O'Leary <nick.oleary@gmail.com>	2022-09-03 21:54:41 +01:00
Stephen McLaughlin	5f159c1fbd	Update packages/node_modules/@node-red/editor-client/src/js/ui/search.js Co-authored-by: Nick O'Leary <nick.oleary@gmail.com>	2022-09-03 21:54:21 +01:00
Kazuhito Yokoi	cd8ca8981b	Add button type to the adding SSH key button	2022-09-03 21:03:08 +09:00
Nick O'Leary	a5d7f7acce	Merge pull request #3842 from hardillb/fix-broken-headers-tests Add missing property to node object HTTPRequest	2022-09-02 20:46:22 +01:00
Nick O'Leary	a032c2e326	Merge pull request #3840 from Steve-Mcl/fix-mqtt-session-time ensure sessionExpiry(Interval) is applied	2022-09-02 20:45:41 +01:00
Nick O'Leary	9d770ed436	Merge pull request #3857 from kazuhitoyokoi/master-fixeditablelist4httprequest Support sortable list on property UI of http request and http response nodes	2022-09-02 20:45:08 +01:00
Nick O'Leary	ae753940f3	Merge pull request #3852 from kazuhitoyokoi/master-addjpn Add Japanese translation for v3.0.2	2022-09-02 20:44:45 +01:00
Kazuhito Yokoi	d0d22c333c	Add Japanese translation for v3.0.2	2022-08-28 02:04:13 +09:00
Kazuhito Yokoi	266ba17ebb	Use sortable list in http response node and proxy setting	2022-08-18 11:52:56 +09:00
Kazuhito Yokoi	0d0d5bafb0	Make pre-defined header list sortable in http request node	2022-08-18 01:29:07 +09:00
Ben Hardill	58b951e134	Make port number dynamic in test	2022-08-14 15:09:48 +01:00
Ben Hardill	30956b5441	Add missing property to node object HTTPRequest Also add tests for broken headers	2022-08-14 15:02:39 +01:00
Steve-Mcl	9540cfe749	fix flags search without val	2022-08-13 18:09:11 +01:00
Steve-Mcl	31b17faa2a	fix MQTT test fail due to birth sent before connection done	2022-08-12 18:23:07 +01:00
Steve-Mcl	5c6b8e9e50	opportunistic tidy up MQTT tests	2022-08-12 18:21:36 +01:00
Steve-Mcl	5a36e8fb11	add tests for MQTT v5 (sessionExpiry property)	2022-08-12 18:20:11 +01:00
Steve-Mcl	7d4c857a43	ensure sessionExpiry(Interval) is applied	2022-08-12 15:47:15 +01:00
Steve-Mcl	598bcf675f	fix searching by type when type name has a space	2022-08-12 15:45:12 +01:00
Nick O'Leary	5365786386	Merge pull request #3830 from node-red/release-302 Bump for 3.0.2	2022-08-04 14:13:26 +01:00
Nick O'Leary	c9b0a7c2dd	Bump for 3.0.2	2022-08-04 13:50:31 +01:00
Nick O'Leary	371d8042d6	Merge pull request #3776 from hardillb/relaxed-http-req-headers Allow HTTP Headers not in spec	2022-08-04 13:36:24 +01:00
Nick O'Leary	be343cb21e	Merge pull request #3812 from bonanitech/workspace-chart-bottom Fix workspace chart bottom property	2022-08-04 13:12:21 +01:00
Nick O'Leary	e9eabd6881	Merge pull request #3802 from Dennis14e/patch-de-2 Update german translation	2022-08-04 13:10:52 +01:00
Nick O'Leary	abccdc7f21	Update packages/node_modules/@node-red/nodes/locales/en-US/messages.json	2022-08-04 13:10:05 +01:00
Nick O'Leary	4ae914f729	Merge pull request #3801 from kazuhitoyokoi/master-subflowcolor Support color reset to the default in subflow and group	2022-08-04 13:02:04 +01:00
Nick O'Leary	86ac955b79	Merge pull request #3817 from node-red/fix-regex-name-handle Allow generateNodeNames to handle names containing regex control chars	2022-08-04 12:58:06 +01:00
Nick O'Leary	9734691cac	Merge pull request #3808 from bonanitech/overflow-auto Hide scrollbars until they're needed	2022-08-04 12:57:53 +01:00
Nick O'Leary	d94f3a477d	Merge pull request #3818 from node-red/fix-subflow-module-node-lookup Register subflow module instance node with parent flow	2022-08-04 12:57:21 +01:00
Nick O'Leary	d53cd209f7	Merge pull request #3816 from node-red/import-junction-fix Include junctions/groups when exporting subflows plus related fixes	2022-08-04 12:57:06 +01:00
Nick O'Leary	65cacb39d2	Merge pull request #3820 from node-red/remove-console-log-subflow-js remove console.log	2022-08-04 12:56:48 +01:00
Stephen McLaughlin	b008a6a2aa	remove console.log fixes #3819	2022-08-04 11:05:27 +01:00
Nick O'Leary	5c29feec63	Register subflow module instance node with parent flow Fixes #3798	2022-08-02 00:05:21 +01:00
Nick O'Leary	d8e350d603	Allow generateNodeNames to handle names containing regex control characters Fixes #3813	2022-08-01 21:05:52 +01:00
Nick O'Leary	14a3366850	Include junctins/groups when exporting subflows plus related fixes Fixes #3805	2022-08-01 20:54:05 +01:00
Mauricio Bonani	5ea0c6fca1	Fix workspace chart bottom property	2022-07-29 09:49:59 -04:00
Mauricio Bonani	f454c29b8c	Hide scrollbars until they're needed	2022-07-28 10:56:38 -04:00
Dennis Neufeld	fe5132be1d	Update german translation 2	2022-07-24 16:31:01 +02:00
Dennis Neufeld	b50ba3e0e4	Update german translation	2022-07-23 18:53:39 +02:00
Kazuhito Yokoi	4fb40f9077	Support color reset to the default in subflow	2022-07-23 21:39:07 +09:00
Nick O'Leary	dc7fef6395	Merge pull request #3797 from node-red/301 Update changelog and bump for 3.0.1	2022-07-22 10:27:46 +01:00
Nick O'Leary	da65bf7292	Update changelog and bump for 3.0.1	2022-07-22 09:50:37 +01:00
Nick O'Leary	17d9c2577e	Merge pull request #3794 from Steve-Mcl/fix-code-editor-theme-from-theme Allow codeEditor theme to be set even if `codeEditor` is not set in settings.js	2022-07-21 16:27:41 +01:00
Steve-Mcl	bc7852c1cc	Allow codeEditor theme to be set missing from settings.js	2022-07-21 14:44:29 +01:00
Nick O'Leary	51d8792f62	Merge pull request #3793 from Steve-Mcl/sys-info-amendments Sys info (diagnostics report) amendments	2022-07-21 11:39:50 +01:00
Nick O'Leary	bfdbeb0964	Merge pull request #3791 from Steve-Mcl/allow-editor-create-no-title-no-mode Allow `mode` and `title` to be omitted in `options` argument for `createEditor`	2022-07-21 11:39:02 +01:00
Nick O'Leary	ede82ad0d5	Merge pull request #3789 from Steve-Mcl/fix-focus-issues Fix focus issues	2022-07-21 11:38:38 +01:00
Nick O'Leary	f50dcb9e40	Merge pull request #3788 from node-red/fix-typedinput-submit Ensure all typedInput buttons have button type set	2022-07-21 11:37:52 +01:00
Nick O'Leary	676c5e5df5	Merge pull request #3787 from node-red/fix-search-unused Do not flag hasUsers=false nodes as unused in search	2022-07-21 11:37:39 +01:00
Nick O'Leary	d52be76c8a	Merge pull request #3786 from node-red/fix-quick-add-pos Properly position quick-add dialog in all cases	2022-07-21 11:37:26 +01:00
Nick O'Leary	c6a517c88c	Merge pull request #3785 from node-red/ts-pos Ensure quick-add dialog does not obscure ghost node when shifted	2022-07-21 11:37:10 +01:00
Nick O'Leary	96eb8719b8	Merge pull request #3784 from node-red/remove-hasown Remove use of Object.hasOwn	2022-07-21 11:36:56 +01:00
Steve-Mcl	bcd31610f6	update tests for sys info diagnostics ammendments	2022-07-21 10:07:40 +01:00
Steve-Mcl	a4d66622a5	add a handful of missing settings to basic report	2022-07-21 09:30:49 +01:00
Steve-Mcl	af4f07cb26	include flows stop/start state	2022-07-21 09:29:51 +01:00
Steve-Mcl	f7120b32f5	Allow `mode` and `title` to be empty fixes #3774	2022-07-20 13:58:03 +01:00
Steve-Mcl	273404e24d	focus search input when opened via context menu	2022-07-20 12:30:52 +01:00
Steve-Mcl	1b53b5b927	focus stack when re-showing nested editor	2022-07-20 12:30:15 +01:00
Steve-Mcl	7c5413e568	ensure red-ui-editor-stack is focusable	2022-07-20 12:29:16 +01:00
Nick O'Leary	39b2fe45a5	Ensure all typedInput buttons have button type set Fixes #3780 Otherwise they act as type="submit" and the browser will click on them when enter is pressed in an input	2022-07-20 11:11:44 +01:00
Nick O'Leary	8d3c5d09f6	Do not flag hasUsers=false nodes as unused in search Fixes #3777	2022-07-20 10:47:57 +01:00
Nick O'Leary	5944fdb5dc	Properly position quick-add dialog in all cases Fixes #3781	2022-07-20 10:40:20 +01:00
Nick O'Leary	e120bad779	Ensure quick-add dialog does not obscure ghost node when shifted	2022-07-20 10:37:40 +01:00
Nick O'Leary	d546a4a15b	Remove use of Object.hasOwn Fixes #3778	2022-07-20 10:14:06 +01:00
Ben Hardill	660a2e0ed6	Allow HTTP Headers not in spec potential fix for #3772	2022-07-16 19:51:35 +01:00