Merge branch 'dev' into function-modules

2025-03-01 10:36:34 +00:00 · 2021-02-13 00:21:27 +00:00
parent e899d2d5b8 f5da2eb633
commit 6336ab121e
122 changed files with 3732 additions and 545 deletions
--- 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
@@ -38,6 +38,7 @@
        }
    },
    "event": {
+        "loadPlugins": "Loading Plugins",
        "loadPalette": "Loading Palette",
        "loadNodeCatalogs": "Loading Node catalogs",
        "loadNodes": "Loading Nodes __count__",
@@ -338,6 +339,7 @@
        "output": "outputs:",
        "status": "status node",
        "deleteSubflow": "delete subflow",
+        "confirmDelete": "Are you sure you want to delete this subflow?",
        "info": "Description",
        "category": "Category",
        "module": "Module",
@@ -397,6 +399,7 @@
        "icon": "Icon",
        "inputType": "Input type",
        "selectType": "select types...",
+        "loadCredentials": "Loading node credentials",
        "inputs" : {
            "input": "input",
            "select": "select",
@@ -431,7 +434,8 @@
        },
        "errors": {
            "scopeChange": "Changing the scope will make it unavailable to nodes in other flows that use it",
-            "invalidProperties": "Invalid properties:"
+            "invalidProperties": "Invalid properties:",
+            "credentialLoadFailed": "Failed to load node credentials"
        }
    },
    "keyboard": {
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json
@@ -243,19 +243,19 @@
        "args": "array, function",
        "desc": "Returns the one and only value in the `array` parameter that satisfies the `function` predicate (i.e. the `function` returns Boolean `true` when passed the value).  Throws an exception if the number of matching values is not exactly one.\n\nThe function should be supplied in the following signature: `function(value [, index [, array]])` where value is each input of the array, index is the position of that value and the whole array is passed as the third argument"
    },
-    "$encodeUrl": {
+    "$encodeUrlComponent": {
        "args": "str",
        "desc": "Encodes a Uniform Resource Locator (URL) component by replacing each instance of certain characters by one, two, three, or four escape sequences representing the UTF-8 encoding of the character.\n\nExample: `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
    },
-    "$encodeUrlComponent": {
+    "$encodeUrl": {
        "args": "str",
        "desc": "Encodes a Uniform Resource Locator (URL) by replacing each instance of certain characters by one, two, three, or four escape sequences representing the UTF-8 encoding of the character. \n\nExample: `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
    },
-    "$decodeUrl": {
+    "$decodeUrlComponent": {
        "args": "str",
        "desc": "Decodes a Uniform Resource Locator (URL) component previously created by encodeUrlComponent. \n\nExample: `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
    },
-    "$decodeUrlComponent": {
+    "$decodeUrl": {
        "args": "str",
        "desc": "Decodes a Uniform Resource Locator (URL) previously created by encodeUrl. \n\nExample: `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
    },
--- a/packages/node_modules/@node-red/editor-client/locales/ja/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/jsonata.json
@@ -243,19 +243,19 @@
        "args": "array, function",
        "desc": "`array`の要素のうち、条件判定関数`function`を満たす(`function`に与えた場合に真偽値`true`を返す)要素が1つのみである場合、それを返します。マッチする要素が1つのみでない場合、例外を送出します。\n\n指定する関数は`function(value [, index [, array]])`というシグネチャでなければなりません。ここで、`value`は`array`の要素値、`index`は要素の添字、第三引数には配列全体を渡します。"
    },
-    "$encodeUrl": {
+    "$encodeUrlComponent": {
        "args": "str",
        "desc": "Uniform Resource Locator (URL)を構成する文字を1、2、3、もしくは、4文字エスケープシーケンスのUTF-8文字エンコーディングで置換します。\n\n例: `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
    },
-    "$encodeUrlComponent": {
+    "$encodeUrl": {
        "args": "str",
        "desc": "Uniform Resource Locator (URL)要素を構成する文字を1、2、3、もしくは、4文字エスケープシーケンスのUTF-8文字エンコーディングで置換します。\n\n例: `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
    },
-    "$decodeUrl": {
+    "$decodeUrlComponent": {
        "args": "str",
        "desc": "encodeUrlComponentで置換したUniform Resource Locator (URL)をデコードします。\n\n例: `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
    },
-    "$decodeUrlComponent": {
+    "$decodeUrl": {
        "args": "str",
        "desc": "encodeUrlで置換したUniform Resource Locator (URL)要素をデコードします。 \n\n例: `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
    },
--- a/packages/node_modules/@node-red/editor-client/locales/ru/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ru/editor.json
@@ -246,8 +246,8 @@
        "import": {
            "import": "Импортировать в",
            "importSelected": "Импортировать выбранные",
-            "importCopy": "Импортировать копию",
-            "viewNodes": "Посмотреть узлы...",
+            "importCopy": "Импортировать копии",
+            "viewNodes": "Показать узлы...",
            "newFlow": "новый поток",
            "replace": "заменить",
            "errors": {
@@ -257,7 +257,7 @@
                "missingType": "Недопустимый поток - у элемента __index__ отсутствует свойство 'type'"
            },
            "conflictNotification1": "Некоторые импортируемые Вами узлы уже существуют в рабочей области.",
-            "conflictNotification2": "Выберите, какие узлы импортировать и следует ли заменить существующие узлы или импортировать их копию."
+            "conflictNotification2": "Выберите, какие узлы импортировать и следует ли заменить ими существующие узлы или импортировать их копии."
        },
        "copyMessagePath": "Путь скопирован",
        "copyMessageValue": "Значение скопировано",
@@ -373,12 +373,12 @@
        "configAdd": "Добавить",
        "configUpdate": "Обновить",
        "configDelete": "Удалить",
-        "nodesUse": "__count__ узел использует эту конфигурацию",
-        "nodesUse_plural_2": "__count__ узла используют эту конфигурацию",
-        "nodesUse_plural_5": "__count__ узлов используют эту конфигурацию",
-        "addNewConfig": "Добавить новый конфигурационный узел __type__",
+        "nodesUse": "__count__ узел использует этот конфиг",
+        "nodesUse_plural_2": "__count__ узла используют этот конфиг",
+        "nodesUse_plural_5": "__count__ узлов используют этот конфиг",
+        "addNewConfig": "Добавить новый конфиг узел __type__",
        "editNode": "Изменить узел __type__",
-        "editConfig": "Изменить конфигурационный узел __type__",
+        "editConfig": "Изменить конфиг узел __type__",
        "addNewType": "Добавить новый __type__...",
        "nodeProperties": "свойства узла",
        "label": "Метка",
@@ -615,7 +615,7 @@
        "info": {
            "name": "Информация",
            "tabName": "Имя",
-            "label": "сведения",
+            "label": "инфо",
            "node": "Узел",
            "type": "Тип",
            "group": "Группа",
@@ -648,8 +648,8 @@
            "showTips":"Вы можете открыть советы из панели настроек",
            "outline": "Структура",
            "empty": "пусто",
-            "globalConfig": "Узлы глобальной конфигурации",
-            "triggerAction": "Запустить действие",
+            "globalConfig": "Глобальные конфиг узлы",
+            "triggerAction": "Вызвать действие",
            "find": "Найти в рабочей области",
            "search": {
                "configNodes": "Узлы конфигурации",
@@ -671,8 +671,8 @@
        },
        "config": {
            "name": "Узлы конфигураций",
-            "label": "конфигурация",
-            "global": "На всех потока",
+            "label": "конфиг",
+            "global": "На всех потоках",
            "none": "нет",
            "subflows": "подпотоки",
            "flows": "потоки",
@@ -690,8 +690,8 @@
            "none": "ничего не выбрано",
            "refresh": "обновите, чтобы загрузить",
            "empty": "пусто",
-            "node": "Узел",
-            "flow": "Поток",
+            "node": "Узловой",
+            "flow": "Потоковый",
            "global": "Глобальный",
            "deleteConfirm": "Вы уверены, что хотите удалить этот элемент?",
            "autoRefresh": "Обновить при изменении выбора",
@@ -877,7 +877,7 @@
            "bool": "логический тип",
            "json": "JSON",
            "bin": "буфер",
-            "date": "отметка времени",
+            "date": "метка времени",
            "jsonata": "выражение",
            "env": "переменная среды",
            "cred": "учетные данные"
--- a/packages/node_modules/@node-red/editor-client/locales/ru/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ru/jsonata.json
@@ -243,19 +243,19 @@
        "args": "array, function",
        "desc": "Возвращает одно-единственное значение из массива `array`, которое удовлетворяет предикату `function` (то есть когда `function` возвращает логическое `true` при передаче значения). Выдает исключение, если число подходящих значений не одно.\n\nФункция должна соответствовать следующей сигнатуре: `function(value [, index [, array]])` где value - элемент массива, index - позиция этого значения, а весь массив передается в качестве третьего аргумента"
    },
-    "$encodeUrl": {
+    "$encodeUrlComponent": {
        "args": "str",
        "desc": "Кодирует компонент Uniform Resource Locator (URL), заменяя каждый экземпляр определенных символов одной, двумя, тремя или четырьмя escape-последовательностями, представляющими кодировку UTF-8 символа.\n\nПример: `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
    },
-    "$encodeUrlComponent": {
+    "$encodeUrl": {
        "args": "str",
        "desc": "Кодирует Uniform Resource Locator (URL), заменяя каждый экземпляр определенных символов одной, двумя, тремя или четырьмя escape-последовательностями, представляющими кодировку UTF-8 символа.\n\nПример: `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
    },
-    "$decodeUrl": {
+    "$decodeUrlComponent": {
        "args": "str",
        "desc": "Декодирует компонент Uniform Resource Locator (URL), ранее созданный с помощью encodeUrlComponent.\n\nПример: `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
    },
-    "$decodeUrlComponent": {
+    "$decodeUrl": {
        "args": "str",
        "desc": "Декодирует компонент Uniform Resource Locator (URL), ранее созданный с помощью encodeUrl. \n\nПример: `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
    },
--- a/packages/node_modules/@node-red/editor-client/locales/zh-CN/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/zh-CN/jsonata.json
@@ -243,19 +243,19 @@
        "args": "array, function",
        "desc": "返回满足参数function谓语的array参数中的唯一值 (比如：传递值时，函数返回布尔值“true”)。如果匹配值的数量不唯一时，则抛出异常。\n\n应在以下签名中提供函数： `function（value [，index [，array []]]）` 其中value是数组的每个输入，index是该值的位置，整个数组作为第三个参数传递。"
    },
-    "$encodeUrl": {
+    "$encodeUrlComponent": {
        "args": "str",
        "desc": "通过用表示字符的UTF-8编码的一个，两个，三个或四个转义序列替换某些字符的每个实例，对统一资源定位符（URL）组件进行编码。\n\n示例： `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
    },
-    "$encodeUrlComponent": {
+    "$encodeUrl": {
        "args": "str",
        "desc": "通过用表示字符的UTF-8编码的一个，两个，三个或四个转义序列替换某些字符的每个实例，对统一资源定位符（URL）进行编码。\n\n示例： `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
    },
-    "$decodeUrl": {
+    "$decodeUrlComponent": {
        "args": "str",
        "desc": "解码以前由encodeUrlComponent创建的统一资源定位器（URL）组件。 \n\n示例： `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
    },
-    "$decodeUrlComponent": {
+    "$decodeUrl": {
        "args": "str",
        "desc": "解码先前由encodeUrl创建的统一资源定位符（URL）。 \n\n示例： `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
    },
--- a/packages/node_modules/@node-red/editor-client/locales/zh-TW/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/zh-TW/jsonata.json
@@ -243,19 +243,19 @@
        "args": "array, function",
        "desc": "返回滿足參數function謂語的array參數中的唯一值 (比如：傳遞值時，函數返回布林值“true”)。如果匹配值的數量不唯一時，則拋出異常。\n\n應在以下簽名中提供函數：`function（value [，index [，array []]]）`其中value是數組的每個輸入，index是該值的位置，整個數組作為第三個參數傳遞。"
    },
-    "$encodeUrl": {
+    "$encodeUrlComponent": {
        "args": "str",
        "desc": "通過用表示字符的UTF-8編碼的一個，兩個，三個或四個轉義序列替換某些字符的每個實例，對統一資源定位符（URL）組件進行編碼。\n\n示例：`$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
    },
-    "$encodeUrlComponent": {
+    "$encodeUrl": {
        "args": "str",
        "desc": "通過用表示字符的UTF-8編碼的一個，兩個，三個或四個轉義序列替換某些字符的每個實例，對統一資源定位符（URL）進行編碼。\n\n示例： `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
    },
-    "$decodeUrl": {
+    "$decodeUrlComponent": {
        "args": "str",
        "desc": "解碼以前由encodeUrlComponent創建的統一資源定位器（URL）組件。 \n\n示例： `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
    },
-    "$decodeUrlComponent": {
+    "$decodeUrl": {
        "args": "str",
        "desc": "解碼先前由encodeUrl創建的統一資源定位符（URL）。 \n\n示例： `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
    },
--- a/packages/node_modules/@node-red/editor-client/src/js/history.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/history.js
@@ -343,17 +343,29 @@ RED.history = (function() {
                    if (ev.changes.hasOwnProperty(i)) {
                        inverseEv.changes[i] = ev.node[i];
                        if (ev.node._def.defaults && ev.node._def.defaults[i] && ev.node._def.defaults[i].type) {
-                            // This is a config node property
-                            var currentConfigNode = RED.nodes.node(ev.node[i]);
-                            if (currentConfigNode) {
-                                currentConfigNode.users.splice(currentConfigNode.users.indexOf(ev.node),1);
-                                RED.events.emit("nodes:change",currentConfigNode);
+                            // This property is a reference to another node or nodes.
+                            var nodeList = ev.node[i];
+                            if (!Array.isArray(nodeList)) {
+                                nodeList = [nodeList];
                            }
-                            var newConfigNode = RED.nodes.node(ev.changes[i]);
-                            if (newConfigNode) {
-                                newConfigNode.users.push(ev.node);
-                                RED.events.emit("nodes:change",newConfigNode);
+                            nodeList.forEach(function(id) {
+                                var currentConfigNode = RED.nodes.node(id);
+                                if (currentConfigNode && currentConfigNode._def.category === "config") {
+                                    currentConfigNode.users.splice(currentConfigNode.users.indexOf(ev.node),1);
+                                    RED.events.emit("nodes:change",currentConfigNode);
+                                }
+                            });
+                            nodeList = ev.changes[i];
+                            if (!Array.isArray(nodeList)) {
+                                nodeList = [nodeList];
                            }
+                            nodeList.forEach(function(id) {
+                                var newConfigNode = RED.nodes.node(id);
+                                if (newConfigNode && newConfigNode._def.category === "config") {
+                                    newConfigNode.users.push(ev.node);
+                                    RED.events.emit("nodes:change",newConfigNode);
+                                }
+                            });
                        }
                        ev.node[i] = ev.changes[i];
                    }
--- a/packages/node_modules/@node-red/editor-client/src/js/i18n.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/i18n.js
@@ -108,6 +108,31 @@ RED.i18n = (function() {
                    }
                });
            })
+        },
+
+        loadPluginCatalogs: function(done) {
+            var languageList = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
+            var toLoad = languageList.length;
+
+            languageList.forEach(function(lang) {
+                $.ajax({
+                    headers: {
+                        "Accept":"application/json"
+                    },
+                    cache: false,
+                    url: apiRootUrl+'plugins/messages?lng='+lang,
+                    success: function(data) {
+                        var namespaces = Object.keys(data);
+                        namespaces.forEach(function(ns) {
+                            i18n.addResourceBundle(lang,ns,data[ns]);
+                        });
+                        toLoad--;
+                        if (toLoad === 0) {
+                            done();
+                        }
+                    }
+                });
+            })
        }
    }
 })();
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -164,6 +164,21 @@ RED.nodes = (function() {

                    // TODO: too tightly coupled into palette UI
                }
+                if (def.defaults) {
+                    for (var d in def.defaults) {
+                        if (def.defaults.hasOwnProperty(d)) {
+                            if (def.defaults[d].type) {
+                                try {
+                                    def.defaults[d]._type = parseNodePropertyTypeString(def.defaults[d].type)
+                                } catch(err) {
+                                    console.warn(err);
+                                }
+                            }
+                        }
+                    }
+                }
+
+
                RED.events.emit("registry:node-type-added",nt);
            },
            removeNodeType: function(nt) {
@@ -193,6 +208,59 @@ RED.nodes = (function() {
        return (1+Math.random()*4294967295).toString(16);
    }

+    function parseNodePropertyTypeString(typeString) {
+        typeString = typeString.trim();
+        var c;
+        var pos = 0;
+        var isArray = /\[\]$/.test(typeString);
+        if (isArray) {
+            typeString = typeString.substring(0,typeString.length-2);
+        }
+
+        var l = typeString.length;
+        var inBrackets = false;
+        var inToken = false;
+        var currentToken = "";
+        var types = [];
+        while (pos < l) {
+            c = typeString[pos];
+            if (inToken) {
+                if (c === "|") {
+                    types.push(currentToken.trim())
+                    currentToken = "";
+                    inToken = false;
+                } else if (c === ")") {
+                    types.push(currentToken.trim())
+                    currentToken = "";
+                    inBrackets = false;
+                    inToken = false;
+                } else {
+                    currentToken += c;
+                }
+            } else {
+                if (c === "(") {
+                    if (inBrackets) {
+                        throw new Error("Invalid character '"+c+"' at position "+pos)
+                    }
+                    inBrackets = true;
+                } else if (c !== " ") {
+                    inToken = true;
+                    currentToken = c;
+                }
+            }
+            pos++;
+        }
+        currentToken = currentToken.trim();
+        if (currentToken.length > 0) {
+            types.push(currentToken)
+        }
+        return {
+            types: types,
+            array: isArray
+        }
+    }
+
+
    function addNode(n) {
        if (n.type.indexOf("subflow") !== 0) {
            n["_"] = n._def._;
@@ -781,6 +849,12 @@ RED.nodes = (function() {
                            subflowSet.push(n);
                        }
                    });
+                    RED.nodes.eachConfig(function(n) {
+                        if (n.z == subflowId) {
+                            subflowSet.push(n);
+                            exportedConfigNodes[n.id] = true;
+                        }
+                    });
                    var exportableSubflow = createExportableNodeSet(subflowSet, exportedIds, exportedSubflows, exportedConfigNodes);
                    nns = exportableSubflow.concat(nns);
                }
@@ -788,16 +862,29 @@ RED.nodes = (function() {
            if (node.type !== "subflow") {
                var convertedNode = RED.nodes.convertNode(node);
                for (var d in node._def.defaults) {
-                    if (node._def.defaults[d].type && node[d] in configNodes) {
-                        var confNode = configNodes[node[d]];
-                        var exportable = registry.getNodeType(node._def.defaults[d].type).exportable;
-                        if ((exportable == null || exportable)) {
-                            if (!(node[d] in exportedConfigNodes)) {
-                                exportedConfigNodes[node[d]] = true;
-                                set.push(confNode);
+                    if (node._def.defaults[d].type) {
+                        var nodeList = node[d];
+                        if (!Array.isArray(nodeList)) {
+                            nodeList = [nodeList];
+                        }
+                        nodeList = nodeList.filter(function(id) {
+                            if (id in configNodes) {
+                                var confNode = configNodes[id];
+                                if (confNode._def.exportable !== false) {
+                                    if (!(id in exportedConfigNodes)) {
+                                        exportedConfigNodes[id] = true;
+                                        set.push(confNode);
+                                        return true;
+                                    }
+                                }
+                                return false;
                            }
+                            return true;
+                        })
+                        if (nodeList.length === 0) {
+                            convertedNode[d] = Array.isArray(node[d])?[]:""
                        } else {
-                            convertedNode[d] = "";
+                            convertedNode[d] = Array.isArray(node[d])?nodeList:nodeList[0]
                        }
                    }
                }
@@ -1588,15 +1675,6 @@ RED.nodes = (function() {
                }
            }
        }
-        // TODO: make this a part of the node definition so it doesn't have to
-        //       be hardcoded here
-        var nodeTypeArrayReferences = {
-            "catch":"scope",
-            "status":"scope",
-            "complete": "scope",
-            "link in":"links",
-            "link out":"links"
-        }

        // Remap all wires and config node references
        for (i=0;i<new_nodes.length;i++) {
@@ -1625,19 +1703,24 @@ RED.nodes = (function() {
            }
            for (var d3 in n._def.defaults) {
                if (n._def.defaults.hasOwnProperty(d3)) {
-                    if (n._def.defaults[d3].type && node_map[n[d3]]) {
-                        configNode = node_map[n[d3]];
-                        n[d3] = configNode.id;
-                        if (configNode.users.indexOf(n) === -1) {
-                            configNode.users.push(n);
+                    if (n._def.defaults[d3].type) {
+                        var nodeList = n[d3];
+                        if (!Array.isArray(nodeList)) {
+                            nodeList = [nodeList];
                        }
-                    } else if (nodeTypeArrayReferences.hasOwnProperty(n.type) && nodeTypeArrayReferences[n.type] === d3 && n[d3] !== undefined && n[d3] !== null) {
-                        for (var j = 0;j<n[d3].length;j++) {
-                            if (node_map[n[d3][j]]) {
-                                n[d3][j] = node_map[n[d3][j]].id;
+                        nodeList = nodeList.map(function(id) {
+                            var node = node_map[id];
+                            if (node) {
+                                if (node._def.category === 'config') {
+                                    if (node.users.indexOf(n) === -1) {
+                                        node.users.push(n);
+                                    }
+                                }
+                                return node.id;
                            }
-                        }
-
+                            return id;
+                        })
+                        n[d3] = Array.isArray(n[d3])?nodeList:nodeList[0];
                    }
                }
            }
--- a/packages/node_modules/@node-red/editor-client/src/js/plugins.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/plugins.js
@@ -0,0 +1,46 @@
+RED.plugins = (function() {
+    var plugins = {};
+    var pluginsByType = {};
+
+    function registerPlugin(id,definition) {
+        plugins[id] = definition;
+        if (definition.type) {
+            pluginsByType[definition.type] = pluginsByType[definition.type] || [];
+            pluginsByType[definition.type].push(definition);
+        }
+        if (RED._loadingModule) {
+            definition.module = RED._loadingModule;
+            definition["_"] = function() {
+                var args = Array.prototype.slice.call(arguments);
+                var originalKey = args[0];
+                if (!/:/.test(args[0])) {
+                    args[0] = definition.module+":"+args[0];
+                }
+                var result = RED._.apply(null,args);
+                if (result === args[0]) {
+                    return originalKey;
+                }
+                return result;
+            }
+        } else {
+            definition["_"] = RED["_"]
+        }
+        if (definition.onadd && typeof definition.onadd === 'function') {
+            definition.onadd();
+        }
+        RED.events.emit("registry:plugin-added",id);
+    }
+
+    function getPlugin(id) {
+        return plugins[id]
+    }
+
+    function getPluginsByType(type) {
+        return pluginsByType[type] || [];
+    }
+    return {
+        registerPlugin: registerPlugin,
+        getPlugin: getPlugin,
+        getPluginsByType: getPluginsByType
+    }
+})();
--- a/packages/node_modules/@node-red/editor-client/src/js/red.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/red.js
@@ -15,19 +15,65 @@
 **/
 var RED = (function() {

-    function appendNodeConfig(nodeConfig,done) {
+
+    function loadPluginList() {
+        loader.reportProgress(RED._("event.loadPlugins"), 10)
+        $.ajax({
+            headers: {
+                "Accept":"application/json"
+            },
+            cache: false,
+            url: 'plugins',
+            success: function(data) {
+                loader.reportProgress(RED._("event.loadPlugins"), 13)
+                RED.i18n.loadPluginCatalogs(function() {
+                    loadPlugins(function() {
+                        loadNodeList();
+                    });
+                });
+            }
+        });
+    }
+    function loadPlugins(done) {
+        loader.reportProgress(RED._("event.loadPlugins",{count:""}), 17)
+        var lang = localStorage.getItem("editor-language")||i18n.detectLanguage();
+
+        $.ajax({
+            headers: {
+                "Accept":"text/html",
+                "Accept-Language": lang
+            },
+            cache: false,
+            url: 'plugins',
+            success: function(data) {
+                var configs = data.trim().split(/(?=<!-- --- \[red-plugin:\S+\] --- -->)/);
+                var totalCount = configs.length;
+                var stepConfig = function() {
+                    // loader.reportProgress(RED._("event.loadNodes",{count:(totalCount-configs.length)+"/"+totalCount}), 30 + ((totalCount-configs.length)/totalCount)*40 )
+                    if (configs.length === 0) {
+                        done();
+                    } else {
+                        var config = configs.shift();
+                        appendPluginConfig(config,stepConfig);
+                    }
+                }
+                stepConfig();
+            }
+        });
+    }
+
+    function appendConfig(config, moduleIdMatch, targetContainer, done) {
        done = done || function(){};
-        var m = /<!-- --- \[red-module:(\S+)\] --- -->/.exec(nodeConfig.trim());
        var moduleId;
-        if (m) {
-            moduleId = m[1];
+        if (moduleIdMatch) {
+            moduleId = moduleIdMatch[1];
+            RED._loadingModule = moduleId;
        } else {
            moduleId = "unknown";
        }
        try {
            var hasDeferred = false;
-
-            var nodeConfigEls = $("<div>"+nodeConfig+"</div>");
+            var nodeConfigEls = $("<div>"+config+"</div>");
            var scripts = nodeConfigEls.find("script");
            var scriptCount = scripts.length;
            scripts.each(function(i,el) {
@@ -38,14 +84,15 @@ var RED = (function() {
                    newScript.onload = function() {
                        scriptCount--;
                        if (scriptCount === 0) {
-                            $("#red-ui-editor-node-configs").append(nodeConfigEls);
+                            $(targetContainer).append(nodeConfigEls);
+                            delete RED._loadingModule;
                            done()
                        }
                    }
                    if ($(el).attr('type') === "module") {
                        newScript.type = "module";
                    }
-                    $("#red-ui-editor-node-configs").append(newScript);
+                    $(targetContainer).append(newScript);
                    newScript.src = RED.settings.apiRootUrl+srcUrl;
                    hasDeferred = true;
                } else {
@@ -61,7 +108,8 @@ var RED = (function() {
                }
            })
            if (!hasDeferred) {
-                $("#red-ui-editor-node-configs").append(nodeConfigEls);
+                $(targetContainer).append(nodeConfigEls);
+                delete RED._loadingModule;
                done();
            }
        } catch(err) {
@@ -70,9 +118,27 @@ var RED = (function() {
                timeout: 10000
            });
            console.log("["+moduleId+"] "+err.toString());
+            delete RED._loadingModule;
            done();
        }
    }
+    function appendPluginConfig(pluginConfig,done) {
+        appendConfig(
+            pluginConfig,
+            /<!-- --- \[red-plugin:(\S+)\] --- -->/.exec(pluginConfig.trim()),
+            "#red-ui-editor-plugin-configs",
+            done
+        );
+    }
+
+    function appendNodeConfig(nodeConfig,done) {
+        appendConfig(
+            nodeConfig,
+            /<!-- --- \[red-module:(\S+)\] --- -->/.exec(nodeConfig.trim()),
+            "#red-ui-editor-node-configs",
+            done
+        );
+    }

    function loadNodeList() {
        loader.reportProgress(RED._("event.loadPalette"), 20)
@@ -186,6 +252,7 @@ var RED = (function() {
                            RED.workspaces.show(currentHash.substring(6));
                        }
                    } catch(err) {
+                        console.warn(err);
                        RED.notify(
                            RED._("event.importError", {message: err.message}),
                            {
@@ -593,7 +660,7 @@ var RED = (function() {

        RED.actions.add("core:show-about", showAbout);

-        loadNodeList();
+        loadPluginList();
    }


@@ -609,6 +676,7 @@ var RED = (function() {
            '<div id="red-ui-sidebar"></div>'+
            '<div id="red-ui-sidebar-separator"></div>'+
        '</div>').appendTo(options.target);
+        $('<div id="red-ui-editor-plugin-configs"></div>').appendTo(options.target);
        $('<div id="red-ui-editor-node-configs"></div>').appendTo(options.target);
        $('<div id="red-ui-full-shade" class="hide"></div>').appendTo(options.target);

@@ -627,9 +695,12 @@ var RED = (function() {
                    $('<span>').html(theme.header.title).appendTo(logo);
                }
            }
+            if (theme.themes) {
+                knownThemes = theme.themes;
+            }
        });
    }
-
+    var knownThemes = null;
    var initialised = false;

    function init(options) {
@@ -649,7 +720,13 @@ var RED = (function() {
        buildEditor(options);

        RED.i18n.init(options, function() {
-            RED.settings.init(options, loadEditor);
+            RED.settings.init(options, function() {
+                if (knownThemes) {
+                    RED.settings.editorTheme = RED.settings.editorTheme || {};
+                    RED.settings.editorTheme.themes = knownThemes;
+                }
+                loadEditor();
+            });
        })
    }

--- 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
@@ -72,9 +72,7 @@ RED.clipboard = (function() {
                        text: RED._("clipboard.export.copy"),
                        click: function() {
                            if (activeTab === "red-ui-clipboard-dialog-export-tab-clipboard") {
-                                $("#red-ui-clipboard-dialog-export-text").select();
-                                document.execCommand("copy");
-                                document.getSelection().removeAllRanges();
+                                copyText($("#red-ui-clipboard-dialog-export-text").val());
                                RED.notify(RED._("clipboard.nodesExported"),{id:"clipboard"});
                                $( this ).dialog( "close" );
                            } else {
@@ -222,14 +220,22 @@ RED.clipboard = (function() {
                '</div>'+
                '<div id="red-ui-clipboard-dialog-export-tabs-content" class="red-ui-clipboard-dialog-tabs-content">'+
                    '<div id="red-ui-clipboard-dialog-export-tab-clipboard" class="red-ui-clipboard-dialog-tab-clipboard">'+
-                        '<div class="form-row" style="height:calc(100% - 30px)">'+
-                            '<textarea readonly id="red-ui-clipboard-dialog-export-text"></textarea>'+
+                        '<div id="red-ui-clipboard-dialog-export-tab-clipboard-tab-bar">'+
+                            '<ul id="red-ui-clipboard-dialog-export-tab-clipboard-tabs"></ul>'+
                        '</div>'+
-                        '<div class="form-row" style="text-align: right;">'+
-                            '<span id="red-ui-clipboard-dialog-export-fmt-group" class="button-group">'+
-                                '<a id="red-ui-clipboard-dialog-export-fmt-mini" class="red-ui-button red-ui-button-small toggle" href="#" data-i18n="clipboard.export.compact"></a>'+
-                                '<a id="red-ui-clipboard-dialog-export-fmt-full" class="red-ui-button red-ui-button-small toggle" href="#" data-i18n="clipboard.export.formatted"></a>'+
-                            '</span>'+
+                        '<div class="red-ui-clipboard-dialog-export-tab-clipboard-tab" id="red-ui-clipboard-dialog-export-tab-clipboard-preview">'+
+                            '<div id="red-ui-clipboard-dialog-export-tab-clipboard-preview-list"></div>'+
+                        '</div>'+
+                        '<div class="red-ui-clipboard-dialog-export-tab-clipboard-tab" id="red-ui-clipboard-dialog-export-tab-clipboard-json">'+
+                            '<div class="form-row" style="height:calc(100% - 40px)">'+
+                                '<textarea readonly id="red-ui-clipboard-dialog-export-text"></textarea>'+
+                            '</div>'+
+                            '<div class="form-row" style="text-align: right;">'+
+                                '<span id="red-ui-clipboard-dialog-export-fmt-group" class="button-group">'+
+                                    '<a id="red-ui-clipboard-dialog-export-fmt-mini" class="red-ui-button red-ui-button-small toggle" href="#" data-i18n="clipboard.export.compact"></a>'+
+                                    '<a id="red-ui-clipboard-dialog-export-fmt-full" class="red-ui-button red-ui-button-small toggle" href="#" data-i18n="clipboard.export.formatted"></a>'+
+                                '</span>'+
+                            '</div>'+
                        '</div>'+
                    '</div>'+
                    '<div id="red-ui-clipboard-dialog-export-tab-library" class="red-ui-clipboard-dialog-tab-library">'+
@@ -592,6 +598,30 @@ RED.clipboard = (function() {
        })
        loadFlowLibrary(libraryBrowser,"local",RED._("library.types.local"));

+        var clipboardTabs = RED.tabs.create({
+            id: "red-ui-clipboard-dialog-export-tab-clipboard-tabs",
+            onchange: function(tab) {
+                $(".red-ui-clipboard-dialog-export-tab-clipboard-tab").hide();
+                $("#" + tab.id).show();
+            }
+        });
+
+        clipboardTabs.addTab({
+            id: "red-ui-clipboard-dialog-export-tab-clipboard-preview",
+            label: RED._("clipboard.exportNodes")
+        });
+
+        clipboardTabs.addTab({
+            id: "red-ui-clipboard-dialog-export-tab-clipboard-json",
+            label: RED._("editor.types.json")
+        });
+
+
+        var previewList = $("#red-ui-clipboard-dialog-export-tab-clipboard-preview-list").css({position:"absolute",top:0,right:0,bottom:0,left:0}).treeList({
+            data: []
+        })
+        refreshExportPreview();
+
        $("#red-ui-clipboard-dialog-tab-library-name").val("flows.json").select();

        dialogContainer.i18n();
@@ -630,10 +660,10 @@ RED.clipboard = (function() {
            }
            $(this).parent().children().removeClass('selected');
            $(this).addClass('selected');
-            var type = $(this).attr('id');
+            var type = $(this).attr('id').substring("red-ui-clipboard-dialog-export-rng-".length);
            var flow = "";
            var nodes = null;
-            if (type === 'red-ui-clipboard-dialog-export-rng-selected') {
+            if (type === 'selected') {
                var selection = RED.workspaces.selection();
                if (selection.length > 0) {
                    nodes = [];
@@ -647,14 +677,14 @@ RED.clipboard = (function() {
                }
                // Don't include the subflow meta-port nodes in the exported selection
                nodes = RED.nodes.createExportableNodeSet(nodes.filter(function(n) { return n.type !== 'subflow'}));
-            } else if (type === 'red-ui-clipboard-dialog-export-rng-flow') {
+            } else if (type === 'flow') {
                var activeWorkspace = RED.workspaces.active();
                nodes = RED.nodes.groups(activeWorkspace);
                nodes = nodes.concat(RED.nodes.filterNodes({z:activeWorkspace}));
                var parentNode = RED.nodes.workspace(activeWorkspace)||RED.nodes.subflow(activeWorkspace);
                nodes.unshift(parentNode);
                nodes = RED.nodes.createExportableNodeSet(nodes);
-            } else if (type === 'red-ui-clipboard-dialog-export-rng-full') {
+            } else if (type === 'full') {
                nodes = RED.nodes.createCompleteNodeSet(false);
            }
            if (nodes !== null) {
@@ -670,8 +700,10 @@ RED.clipboard = (function() {
                $("#red-ui-clipboard-dialog-export").addClass('disabled');
            }
            $("#red-ui-clipboard-dialog-export-text").val(flow);
-            setTimeout(function() { $("#red-ui-clipboard-dialog-export-text").scrollTop(0); },50);
-            $("#red-ui-clipboard-dialog-export-text").trigger("focus");
+            setTimeout(function() {
+                $("#red-ui-clipboard-dialog-export-text").scrollTop(0);
+                refreshExportPreview(type);
+            },50);
        })

        $("#red-ui-clipboard-dialog-ok").hide();
@@ -717,6 +749,93 @@ RED.clipboard = (function() {

    }

+    function refreshExportPreview(type) {
+
+        var flowData = $("#red-ui-clipboard-dialog-export-text").val() || "[]";
+        var flow = JSON.parse(flowData);
+        var flows = {};
+        var subflows = {};
+        var nodes = [];
+        var nodesByZ = {};
+
+        var treeFlows = [];
+        var treeSubflows = [];
+
+        flow.forEach(function(node) {
+            if (node.type === "tab") {
+                flows[node.id] = {
+                    element: getFlowLabel(node,false),
+                    deferBuild: type !== "flow",
+                    expanded: type === "flow",
+                    children: []
+                };
+                treeFlows.push(flows[node.id])
+            } else if (node.type === "subflow") {
+                subflows[node.id] = {
+                    element: getNodeLabel(node,false),
+                    deferBuild: true,
+                    children: []
+                };
+                treeSubflows.push(subflows[node.id])
+            } else {
+                nodes.push(node);
+            }
+        });
+
+        var globalNodes = [];
+        var parentlessNodes = [];
+
+        nodes.forEach(function(node) {
+            var treeNode = {
+                element: getNodeLabel(node, false, false)
+            };
+            if (node.z) {
+                if (!flows[node.z] && !subflows[node.z]) {
+                    parentlessNodes.push(treeNode)
+                } else if (flows[node.z]) {
+                    flows[node.z].children.push(treeNode)
+                } else if (subflows[node.z]) {
+                    subflows[node.z].children.push(treeNode)
+                }
+            } else {
+                globalNodes.push(treeNode);
+            }
+        });
+        var treeData = [];
+
+        if (parentlessNodes.length > 0) {
+            treeData = treeData.concat(parentlessNodes);
+        }
+        if (type === "flow") {
+            treeData = treeData.concat(treeFlows);
+        } else if (treeFlows.length > 0) {
+            treeData.push({
+                label: RED._("menu.label.flows"),
+                deferBuild: treeFlows.length > 20,
+                expanded: treeFlows.length <= 20,
+                children: treeFlows
+            })
+        }
+        if (treeSubflows.length > 0) {
+            treeData.push({
+                label: RED._("menu.label.subflows"),
+                deferBuild: treeSubflows.length > 10,
+                expanded: treeSubflows.length <= 10,
+                children: treeSubflows
+            })
+        }
+        if (globalNodes.length > 0) {
+            treeData.push({
+                label: RED._("sidebar.info.globalConfig"),
+                deferBuild: globalNodes.length > 10,
+                expanded: globalNodes.length <= 10,
+                children: globalNodes
+            })
+        }
+
+        $("#red-ui-clipboard-dialog-export-tab-clipboard-preview-list").treeList('data',treeData);
+    }
+
    function loadFlowLibrary(browser,library,label) {
        // if (includeExamples) {
        //     listing.push({
@@ -756,6 +875,7 @@ RED.clipboard = (function() {
    }
    function copyText(value,element,msg) {
        var truncated = false;
+        var currentFocus = document.activeElement;
        if (typeof value !== "string" ) {
            value = JSON.stringify(value, function(key,value) {
                if (value !== null && typeof value === 'object') {
@@ -787,7 +907,7 @@ RED.clipboard = (function() {
        if (truncated) {
            msg += "_truncated";
        }
-        $("#red-ui-clipboard-hidden").val(value).select();
+        $("#red-ui-clipboard-hidden").val(value).focus().select();
        var result =  document.execCommand("copy");
        if (result && element) {
            var popover = RED.popover.create({
@@ -801,6 +921,10 @@ RED.clipboard = (function() {
            },1000);
            popover.open();
        }
+        $("#red-ui-clipboard-hidden").val("");
+        if (currentFocus) {
+            $(currentFocus).focus();
+        }
        return result;
    }

--- 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
@@ -444,16 +444,18 @@ RED.editor = (function() {
        for (var d in definition.defaults) {
            if (definition.defaults.hasOwnProperty(d)) {
                if (definition.defaults[d].type) {
-                    var configTypeDef = RED.nodes.getType(definition.defaults[d].type);
-                    if (configTypeDef) {
-                        if (configTypeDef.exclusive) {
-                            prepareConfigNodeButton(node,d,definition.defaults[d].type,prefix);
+                    if (!definition.defaults[d]._type.array) {
+                        var configTypeDef = RED.nodes.getType(definition.defaults[d].type);
+                        if (configTypeDef && configTypeDef.category === 'config') {
+                            if (configTypeDef.exclusive) {
+                                prepareConfigNodeButton(node,d,definition.defaults[d].type,prefix);
+                            } else {
+                                prepareConfigNodeSelect(node,d,definition.defaults[d].type,prefix);
+                            }
                        } else {
-                            prepareConfigNodeSelect(node,d,definition.defaults[d].type,prefix);
+                            console.log("Unknown type:", definition.defaults[d].type);
+                            preparePropertyEditor(node,d,prefix,definition.defaults);
                        }
-                    } else {
-                        console.log("Unknown type:", definition.defaults[d].type);
-                        preparePropertyEditor(node,d,prefix,definition.defaults);
                    }
                } else {
                    preparePropertyEditor(node,d,prefix,definition.defaults);
@@ -494,11 +496,13 @@ RED.editor = (function() {
                populateCredentialsInputs(node, definition.credentials, node.credentials, prefix);
                completePrepare();
            } else {
-                $.getJSON(getCredentialsURL(node.type, node.id), function (data) {
-                    node.credentials = data;
-                    node.credentials._ = $.extend(true,{},data);
-                    if (!/^subflow:/.test(definition.type)) {
-                        populateCredentialsInputs(node, definition.credentials, node.credentials, prefix);
+                getNodeCredentials(node.type, node.id, function(data) {
+                    if (data) {
+                        node.credentials = data;
+                        node.credentials._ = $.extend(true,{},data);
+                        if (!/^subflow:/.test(definition.type)) {
+                            populateCredentialsInputs(node, definition.credentials, node.credentials, prefix);
+                        }
                    }
                    completePrepare();
                });
@@ -1086,8 +1090,11 @@ RED.editor = (function() {
        node.infoEditor = nodeInfoEditor;
        return nodeInfoEditor;
    }
+var buildingEditDialog = false;

    function showEditDialog(node, defaultTab) {
+        if (buildingEditDialog) { return }
+        buildingEditDialog = true;
        var editing_node = node;
        var isDefaultIcon;
        var defaultIcon;
@@ -1612,6 +1619,7 @@ RED.editor = (function() {
                    if (defaultTab) {
                        editorTabs.activateTab(defaultTab);
                    }
+                    buildingEditDialog = false;
                    done();
                });
            },
@@ -1663,6 +1671,8 @@ RED.editor = (function() {
     * prefix - the input prefix of the parent property
     */
    function showEditConfigNodeDialog(name,type,id,prefix) {
+        if (buildingEditDialog) { return }
+        buildingEditDialog = true;
        var adding = (id == "_ADD_");
        var node_def = RED.nodes.getType(type);
        var editing_config_node = RED.nodes.node(id);
@@ -1826,6 +1836,7 @@ RED.editor = (function() {
                    trayBody.i18n();
                    trayFooter.i18n();
                    finishedBuilding = true;
+                    buildingEditDialog = false;
                    done();
                });
            },
@@ -2149,6 +2160,8 @@ RED.editor = (function() {
    }

    function showEditSubflowDialog(subflow) {
+        if (buildingEditDialog) { return }
+        buildingEditDialog = true;
        var editing_node = subflow;
        editStack.push(subflow);
        RED.view.state(RED.state.EDITING);
@@ -2405,15 +2418,17 @@ RED.editor = (function() {

                buildEditForm(nodePropertiesTab.content,"dialog-form","subflow-template", undefined, editing_node);
                trayBody.i18n();
-
-                $.getJSON(getCredentialsURL("subflow", subflow.id), function (data) {
-                    subflow.credentials = data;
-                    subflow.credentials._ = $.extend(true,{},data);
-
+                getNodeCredentials("subflow", subflow.id, function(data) {
+                    if (data) {
+                        subflow.credentials = data;
+                        subflow.credentials._ = $.extend(true,{},data);
+                    }
                    $("#subflow-input-name").val(subflow.name);
                    RED.text.bidi.prepareInput($("#subflow-input-name"));

                    finishedBuilding = true;
+                    buildingEditDialog = false;
+
                    done();
                });
            },
@@ -2434,7 +2449,39 @@ RED.editor = (function() {
        RED.tray.show(trayOptions);
    }

+    function getNodeCredentials(type, id, done) {
+        var timeoutNotification;
+        var intialTimeout = setTimeout(function() {
+            timeoutNotification = RED.notify($('<p data-i18n="[prepend]editor.loadCredentials">  <img src="red/images/spin.svg"/></p>').i18n(),{fixed: true})
+        },800);
+
+        $.ajax({
+            url: getCredentialsURL(type,id),
+            dataType: 'json',
+            success: function(data) {
+                if (timeoutNotification) {
+                    timeoutNotification.close();
+                    timeoutNotification = null;
+                }
+                clearTimeout(intialTimeout);
+                done(data);
+            },
+            error: function(jqXHR,status,error) {
+                if (timeoutNotification) {
+                    timeoutNotification.close();
+                    timeoutNotification = null;
+                }
+                clearTimeout(intialTimeout);
+                RED.notify(RED._("editor.errors.credentialLoadFailed"),"error")
+                done(null);
+            },
+            timeout: 30000,
+        });
+    }
+
    function showEditGroupDialog(group) {
+        if (buildingEditDialog) { return }
+        buildingEditDialog = true;
        var editing_node = group;
        editStack.push(group);
        RED.view.state(RED.state.EDITING);
@@ -2658,6 +2705,7 @@ RED.editor = (function() {
                prepareEditDialog(group,group._def,"node-input", function() {
                    trayBody.i18n();
                    finishedBuilding = true;
+                    buildingEditDialog = false;
                    done();
                });
            },
--- 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
@@ -97,13 +97,18 @@ RED.palette = (function() {
        label = RED.utils.sanitize(label);


-        var words = label.split(/[ -]/);
+        var words = label.split(/([ -]|\\n )/);

        var displayLines = [];

        var currentLine = "";
        for (var i=0;i<words.length;i++) {
            var word = words[i];
+            if (word === "\\n ") {
+                displayLines.push(currentLine);
+                currentLine = "";
+                continue;
+            }
            var sep = (i == 0) ? "" : " ";
            var newWidth = RED.view.calculateTextWidth(currentLine+sep+word, "red-ui-palette-label");
            if (newWidth < nodeWidth) {
@@ -165,7 +170,16 @@ RED.palette = (function() {
                    metaData = typeInfo.set.module+" : ";
                }
                metaData += type;
-                $('<button type="button" onclick="RED.sidebar.help.show(\''+type+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right"><i class="fa fa-book"></i></button>').appendTo(popOverContent)
+
+                if (/^subflow:/.test(type)) {
+                    $('<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,"\\'");
+
+                $('<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" 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);
            }
        } catch(err) {
@@ -396,7 +410,8 @@ RED.palette = (function() {
                    RED.workspaces.show(nt.substring(8));
                    e.preventDefault();
                });
-                nodeInfo = RED.utils.renderMarkdown(def.info||"");
+                var subflow = RED.nodes.subflow(nt.substring(8));
+                nodeInfo = RED.utils.renderMarkdown(subflow.info||"");
            }
            setLabel(nt,d,label,nodeInfo);

--- 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
@@ -464,12 +464,43 @@ RED.subflow = (function() {

        $("#red-ui-subflow-delete").on("click", function(event) {
            event.preventDefault();
-            var startDirty = RED.nodes.dirty();
-            var historyEvent = removeSubflow(RED.workspaces.active());
-            historyEvent.t = 'delete';
-            historyEvent.dirty = startDirty;
+            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();
+                            }
+                        }
+                    ]
+                });

-            RED.history.push(historyEvent);
+                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);
+            }

        });

--- 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
@@ -119,34 +119,17 @@ RED.sidebar.info.outliner = (function() {
        return div;
    }

-    function getSubflowLabel(n) {
-
-        var div = $('<div>',{class:"red-ui-info-outline-item"});
-        RED.utils.createNodeIcon(n).appendTo(div);
-        var contentDiv = $('<div>',{class:"red-ui-search-result-description"}).appendTo(div);
-        var labelText = getNodeLabelText(n);
-        var label = $('<div>',{class:"red-ui-search-result-node-label red-ui-info-outline-item-label"}).appendTo(contentDiv);
-        if (labelText) {
-            label.text(labelText)
-        } else {
-            label.html("&nbsp;")
-        }
-
-        addControls(n, div);
-
-        return div;
-
-
-        // var div = $('<div>',{class:"red-ui-info-outline-item red-ui-info-outline-item-flow"});
-        // var contentDiv = $('<div>',{class:"red-ui-search-result-description red-ui-info-outline-item-label"}).appendTo(div);
-        // contentDiv.text(n.name || n.id);
-        // addControls(n, div);
-        // return div;
-    }
-
    function addControls(n,div) {
        var controls = $('<div>',{class:"red-ui-info-outline-item-controls red-ui-info-outline-item-hover-controls"}).appendTo(div);

+        if (n.type === "subflow") {
+            var subflowInstanceBadge = $('<button type="button" class="red-ui-info-outline-item-control-users red-ui-button red-ui-button-small"><i class="fa fa-toggle-right"></i></button>').text(n.instances.length).appendTo(controls).on("click",function(evt) {
+                evt.preventDefault();
+                evt.stopPropagation();
+                RED.search.show("type:subflow:"+n.id);
+            })
+            // RED.popover.tooltip(userCountBadge,function() { return RED._('editor.nodesUse',{count:n.users.length})});
+        }
        if (n._def.category === "config" && n.type !== "group") {
            var userCountBadge = $('<button type="button" class="red-ui-info-outline-item-control-users red-ui-button red-ui-button-small"><i class="fa fa-toggle-right"></i></button>').text(n.users.length).appendTo(controls).on("click",function(evt) {
                evt.preventDefault();
@@ -169,7 +152,7 @@ RED.sidebar.info.outliner = (function() {
        //     evt.stopPropagation();
        //     RED.view.reveal(n.id);
        // })
-        if (n.type !== 'group' && n.type !== 'subflow') {
+        if (n.type !== 'subflow') {
            var toggleButton = $('<button type="button" class="red-ui-info-outline-item-control-disable red-ui-button red-ui-button-small"><i class="fa fa-circle-thin"></i><i class="fa fa-ban"></i></button>').appendTo(controls).on("click",function(evt) {
                evt.preventDefault();
                evt.stopPropagation();
@@ -179,6 +162,46 @@ RED.sidebar.info.outliner = (function() {
                    } else {
                        RED.workspaces.disable(n.id)
                    }
+                } else if (n.type === 'group') {
+                    var groupNodes = RED.group.getNodes(n,true);
+                    var groupHistoryEvent = {
+                        t:'multi',
+                        events:[],
+                        dirty: RED.nodes.dirty()
+                    }
+                    var targetState;
+                    groupNodes.forEach(function(n) {
+                        if (n.type !== 'group') {
+                            if (targetState === undefined) {
+                                targetState = !n.d;
+                            }
+                            var state = !!n.d;
+                            if (state !== targetState) {
+                                var historyEvent = {
+                                    t: "edit",
+                                    node: n,
+                                    changed: n.changed,
+                                    changes: {
+                                        d: n.d
+                                    }
+                                }
+                                if (n.d) {
+                                    delete n.d;
+                                } else {
+                                    n.d = true;
+                                }
+                                n.dirty = true;
+                                n.changed = true;
+                                RED.events.emit("nodes:change",n);
+                                groupHistoryEvent.events.push(historyEvent);
+                            }
+                        }
+                        if (groupHistoryEvent.events.length > 0) {
+                            RED.history.push(groupHistoryEvent);
+                            RED.nodes.dirty(true)
+                            RED.view.redraw();
+                        }
+                    })
                } else {
                    // TODO: this ought to be a utility function in RED.nodes
                    var historyEvent = {
@@ -198,11 +221,15 @@ RED.sidebar.info.outliner = (function() {
                    n.dirty = true;
                    n.changed = true;
                    RED.events.emit("nodes:change",n);
+                    RED.history.push(historyEvent);
                    RED.nodes.dirty(true)
                    RED.view.redraw();
                }
            });
            RED.popover.tooltip(toggleButton,function() {
+                if (n.type === "group") {
+                    return RED._("common.label.enable")+" / "+RED._("common.label.disable")
+                }
                return RED._("common.label."+(((n.type==='tab' && n.disabled) || (n.type!=='tab' && n.d))?"enable":"disable"));
            });
        } else {
@@ -486,6 +513,13 @@ RED.sidebar.info.outliner = (function() {
        existingObject.treeList.remove();
        delete objects[n.id]

+        if (/^subflow:/.test(n.type)) {
+            var sfType = n.type.substring(8);
+            if (objects[sfType]) {
+                objects[sfType].element.find(".red-ui-info-outline-item-control-users").text(RED.nodes.subflow(sfType).instances.length);
+            }
+        }
+
        // If this is a group being removed, it may have an empty item
        if (empties[n.id]) {
            delete empties[n.id];
@@ -587,6 +621,12 @@ RED.sidebar.info.outliner = (function() {
            configNodeTypes[parent].types[n.type].treeList.addChild(objects[n.id]);
        }
        objects[n.id].element.toggleClass("red-ui-info-outline-item-disabled", !!n.d)
+        if (/^subflow:/.test(n.type)) {
+            var sfType = n.type.substring(8);
+            if (objects[sfType]) {
+                objects[sfType].element.find(".red-ui-info-outline-item-control-users").text(RED.nodes.subflow(sfType).instances.length);
+            }
+        }
        updateSearch();
    }

--- 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
@@ -338,7 +338,7 @@ RED.sidebar.info = (function() {
                                count++;
                                propRow = $('<tr class="red-ui-help-info-property-row'+(expandedSections.property?"":" hide")+'"><td></td><td></td></tr>').appendTo(tableBody);
                                $(propRow.children()[0]).text(n);
-                                if (defaults[n].type) {
+                                if (defaults[n].type && !defaults[n]._type.array) {
                                    var configNode = RED.nodes.node(val);
                                    if (!configNode) {
                                        RED.utils.createObjectElement(undefined).appendTo(propRow.children()[1]);
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js
@@ -109,13 +109,19 @@ RED.userSettings = (function() {
    function compText(a, b) {
        return a.text.localeCompare(b.text);
    }
-    
+
    var viewSettings = [
        {
            options: [
                {setting:"editor-language",local: true, label:"menu.label.view.language",options:function(done){ done([{val:'',text:RED._('menu.label.view.browserDefault')}].concat(RED.settings.theme("languages").map(localeToName).sort(compText))) }},
            ]
-        },{
+        },
+        // {
+        //     options: [
+        //         {setting:"theme", label:"Theme",options:function(done){ done([{val:'',text:'default'}].concat(RED.settings.theme("themes"))) }},
+        //     ]
+        // },
+        {
            title: "menu.label.view.grid",
            options: [
                {setting:"view-show-grid",oldSetting:"menu-menu-item-view-show-grid",label:"menu.label.view.showGrid", default: true, toggle:true,onchange:"core:toggle-show-grid"},
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
@@ -615,18 +615,25 @@ RED.utils = (function() {
        return element;
    }

-    function normalisePropertyExpression(str) {
+    function createError(code, message) {
+        var e = new Error(message);
+        e.code = code;
+        return e;
+    }
+
+    function normalisePropertyExpression(str,msg) {
        // This must be kept in sync with validatePropertyExpression
        // in editor/js/ui/utils.js

        var length = str.length;
        if (length === 0) {
-            throw new Error("Invalid property expression: zero-length");
+            throw createError("INVALID_EXPR","Invalid property expression: zero-length");
        }
        var parts = [];
        var start = 0;
        var inString = false;
        var inBox = false;
+        var boxExpression = false;
        var quoteChar;
        var v;
        for (var i=0;i<length;i++) {
@@ -634,14 +641,14 @@ RED.utils = (function() {
            if (!inString) {
                if (c === "'" || c === '"') {
                    if (i != start) {
-                        throw new Error("Invalid property expression: unexpected "+c+" at position "+i);
+                        throw createError("INVALID_EXPR","Invalid property expression: unexpected "+c+" at position "+i);
                    }
                    inString = true;
                    quoteChar = c;
                    start = i+1;
                } else if (c === '.') {
                    if (i===0) {
-                        throw new Error("Invalid property expression: unexpected . at position 0");
+                        throw createError("INVALID_EXPR","Invalid property expression: unexpected . at position 0");
                    }
                    if (start != i) {
                        v = str.substring(start,i);
@@ -652,57 +659,99 @@ RED.utils = (function() {
                        }
                    }
                    if (i===length-1) {
-                        throw new Error("Invalid property expression: unterminated expression");
+                        throw createError("INVALID_EXPR","Invalid property expression: unterminated expression");
                    }
                    // Next char is first char of an identifier: a-z 0-9 $ _
                    if (!/[a-z0-9\$\_]/i.test(str[i+1])) {
-                        throw new Error("Invalid property expression: unexpected "+str[i+1]+" at position "+(i+1));
+                        throw createError("INVALID_EXPR","Invalid property expression: unexpected "+str[i+1]+" at position "+(i+1));
                    }
                    start = i+1;
                } else if (c === '[') {
                    if (i === 0) {
-                        throw new Error("Invalid property expression: unexpected "+c+" at position "+i);
+                        throw createError("INVALID_EXPR","Invalid property expression: unexpected "+c+" at position "+i);
                    }
                    if (start != i) {
                        parts.push(str.substring(start,i));
                    }
                    if (i===length-1) {
-                        throw new Error("Invalid property expression: unterminated expression");
+                        throw createError("INVALID_EXPR","Invalid property expression: unterminated expression");
                    }
-                    // Next char is either a quote or a number
-                    if (!/["'\d]/.test(str[i+1])) {
-                        throw new Error("Invalid property expression: unexpected "+str[i+1]+" at position "+(i+1));
+                    // Start of a new expression. If it starts with msg it is a nested expression
+                    // Need to scan ahead to find the closing bracket
+                    if (/^msg[.\[]/.test(str.substring(i+1))) {
+                        var depth = 1;
+                        var inLocalString = false;
+                        var localStringQuote;
+                        for (var j=i+1;j<length;j++) {
+                            if (/["']/.test(str[j])) {
+                                if (inLocalString) {
+                                    if (str[j] === localStringQuote) {
+                                        inLocalString = false
+                                    }
+                                } else {
+                                    inLocalString = true;
+                                    localStringQuote = str[j]
+                                }
+                            }
+                            if (str[j] === '[') {
+                                depth++;
+                            } else if (str[j] === ']') {
+                                depth--;
+                            }
+                            if (depth === 0) {
+                                try {
+                                    if (msg) {
+                                        parts.push(getMessageProperty(msg, str.substring(i+1,j)))
+                                    } else {
+                                        parts.push(normalisePropertyExpression(str.substring(i+1,j), msg));
+                                    }
+                                    inBox = false;
+                                    i = j;
+                                    start = j+1;
+                                    break;
+                                } catch(err) {
+                                    throw createError("INVALID_EXPR","Invalid expression started at position "+(i+1))
+                                }
+                            }
+                        }
+                        if (depth > 0) {
+                            throw createError("INVALID_EXPR","Invalid property expression: unmatched '[' at position "+i);
+                        }
+                        continue;
+                    } else if (!/["'\d]/.test(str[i+1])) {
+                        // Next char is either a quote or a number
+                        throw createError("INVALID_EXPR","Invalid property expression: unexpected "+str[i+1]+" at position "+(i+1));
                    }
                    start = i+1;
                    inBox = true;
                } else if (c === ']') {
                    if (!inBox) {
-                        throw new Error("Invalid property expression: unexpected "+c+" at position "+i);
+                        throw createError("INVALID_EXPR","Invalid property expression: unexpected "+c+" at position "+i);
                    }
                    if (start != i) {
                        v = str.substring(start,i);
                        if (/^\d+$/.test(v)) {
                            parts.push(parseInt(v));
                        } else {
-                            throw new Error("Invalid property expression: unexpected array expression at position "+start);
+                            throw createError("INVALID_EXPR","Invalid property expression: unexpected array expression at position "+start);
                        }
                    }
                    start = i+1;
                    inBox = false;
                } else if (c === ' ') {
-                    throw new Error("Invalid property expression: unexpected ' ' at position "+i);
+                    throw createError("INVALID_EXPR","Invalid property expression: unexpected ' ' at position "+i);
                }
            } else {
                if (c === quoteChar) {
                    if (i-start === 0) {
-                        throw new Error("Invalid property expression: zero-length string at position "+start);
+                        throw createError("INVALID_EXPR","Invalid property expression: zero-length string at position "+start);
                    }
                    parts.push(str.substring(start,i));
                    // If inBox, next char must be a ]. Otherwise it may be [ or .
                    if (inBox && !/\]/.test(str[i+1])) {
-                        throw new Error("Invalid property expression: unexpected array expression at position "+start);
+                        throw createError("INVALID_EXPR","Invalid property expression: unexpected array expression at position "+start);
                    } else if (!inBox && i+1!==length && !/[\[\.]/.test(str[i+1])) {
-                        throw new Error("Invalid property expression: unexpected "+str[i+1]+" expression at position "+(i+1));
+                        throw createError("INVALID_EXPR","Invalid property expression: unexpected "+str[i+1]+" expression at position "+(i+1));
                    }
                    start = i+1;
                    inString = false;
@@ -711,7 +760,7 @@ RED.utils = (function() {

        }
        if (inBox || inString) {
-            throw new Error("Invalid property expression: unterminated expression");
+            throw new createError("INVALID_EXPR","Invalid property expression: unterminated expression");
        }
        if (start < length) {
            parts.push(str.substring(start));
--- 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
@@ -2276,7 +2276,7 @@ RED.view = (function() {
    }

    function calculateTextWidth(str, className) {
-        var result=convertLineBreakCharacter(str);
+        var result = convertLineBreakCharacter(str);
        var width = 0;
        for (var i=0;i<result.length;i++) {
            var calculateTextW=calculateTextDimensions(result[i],className)[0];
--- a/packages/node_modules/@node-red/editor-client/src/sass/base.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/base.scss
@@ -15,6 +15,9 @@
 **/


+body {
+    overflow: hidden;
+}

 .red-ui-editor {
    font-size: $primary-font-size;
--- a/packages/node_modules/@node-red/editor-client/src/sass/library.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/library.scss
@@ -29,8 +29,30 @@
        }
    }
 }
-.red-ui-clipboard-dialog-tab-clipboard {
+
+#red-ui-clipboard-dialog-export-tab-clipboard-preview {
+    .red-ui-treeList-container,.red-ui-editableList-border {
+        border: none;
+        border-radius: 0;
+    }
+}
+#red-ui-clipboard-dialog-export-tab-clipboard-json {
+    padding: 10px 10px 0;
+}
+#red-ui-clipboard-dialog-import-tab-clipboard {
    padding: 10px;
+}
+.red-ui-clipboard-dialog-export-tab-clipboard-tab {
+    position: absolute;
+    top: 40px;
+    right: 0;
+    left: 0;
+    bottom: 0;
+}
+
+.red-ui-clipboard-dialog-tab-clipboard {
+
+
    textarea {
         resize: none;
         width: 100%;
--- a/packages/node_modules/@node-red/editor-client/src/sass/palette.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/palette.scss
@@ -131,10 +131,10 @@
    width: 120px;
    background-size: contain;
    position: relative;
-    &:not(.red-ui-palette-node-config):first-child {
+    &:not(.red-ui-palette-node-config):not(.red-ui-palette-node-small):first-child {
        margin-top: 15px;
    }
-    &:not(.red-ui-palette-node-config):last-child {
+    &:not(.red-ui-palette-node-config):not(.red-ui-palette-node-small):first-child {
        margin-bottom: 15px;
    }
 }
--- 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
@@ -326,7 +326,7 @@ div.red-ui-info-table {
        border-bottom: 1px solid $secondary-border-color;
    }
 }
-.red-ui-info-outline,.red-ui-sidebar-help-toc, #red-ui-clipboard-dialog-import-conflicts-list {
+.red-ui-info-outline,.red-ui-sidebar-help-toc, #red-ui-clipboard-dialog-import-conflicts-list, #red-ui-clipboard-dialog-export-tab-clipboard-preview {
    .red-ui-info-outline-item {
        display: inline-block;
        padding: 0;