Merge branch 'master' into patch-1

2025-03-01 10:36:34 +00:00 · 2024-01-19 16:14:20 +00:00
parent 0b0f1f8701 5b9d002f56
commit a1e242ec1e
31 changed files with 165 additions and 64 deletions
--- a/packages/node_modules/@node-red/editor-client/locales/de/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/de/editor.json
@@ -109,7 +109,6 @@
            "selectionToSubflow": "Auswahl in Subflow umwandeln",
            "flows": "Flow",
            "add": "Hinzufügen",
-            "rename": "Umbenennen",
            "delete": "Löschen",
            "keyboardShortcuts": "Tastenkürzel",
            "login": "Anmelden",
--- 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
@@ -122,7 +122,6 @@
            "selectionToSubflow": "Selection to Subflow",
            "flows": "Flows",
            "add": "Add",
-            "rename": "Rename",
            "delete": "Delete",
            "keyboardShortcuts": "Keyboard shortcuts",
            "login": "Login",
@@ -1223,6 +1222,7 @@
            "invalid-expr": "Invalid JSONata expression: __error__",
            "invalid-prop": "Invalid property expression",
            "invalid-num": "Invalid number",
+            "invalid-num-prop": "__prop__: invalid number",
            "invalid-regexp": "Invalid input pattern",
            "invalid-regex-prop": "__prop__: invalid input pattern",
            "missing-required-prop": "__prop__: property value missing",
--- a/packages/node_modules/@node-red/editor-client/locales/fr/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/fr/editor.json
@@ -122,7 +122,6 @@
      "selectionToSubflow": "Convertir en sous-flux",
      "flows": "Flux",
      "add": "Ajouter",
-      "rename": "Renommer",
      "delete": "Supprimer",
      "keyboardShortcuts": "Raccourcis clavier",
      "login": "Se connecter",
@@ -1218,6 +1217,7 @@
      "invalid-expr": "Expression JSONata invalide : __error__",
      "invalid-prop": "Expression de propriété invalide",
      "invalid-num": "Numéro invalide",
+      "invalid-num-prop": "__prop__: numéro invalide",
      "invalid-regexp": "Modèle d'entrée non valide",
      "invalid-regex-prop": "__prop__: modèle d'entrée non valide",
      "missing-required-prop": "__prop__: valeur de la propriété manquante",
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -122,7 +122,6 @@
            "selectionToSubflow": "選択部分をサブフロー化",
            "flows": "フロー",
            "add": "フローを新規追加",
-            "rename": "フロー名を変更",
            "delete": "フローを削除",
            "keyboardShortcuts": "ショートカットキーの説明",
            "login": "ログイン",
@@ -130,6 +129,11 @@
            "editPalette": "パレットの管理",
            "other": "その他",
            "showTips": "ヒントを表示",
+            "showNodeHelp": "ノードのヘルプを表示",
+            "enableSelectedNodes": "選択したノードを有効化",
+            "disableSelectedNodes": "選択したノードを無効化",
+            "showSelectedNodeLabels": "選択したノードのラベル表示",
+            "hideSelectedNodeLabels": "選択したノードのラベル非表示",
            "showWelcomeTours": "新バージョンのガイドツアーを表示",
            "help": "Node-REDウェブサイト",
            "projects": "プロジェクト",
@@ -511,7 +515,7 @@
        "selectAllConnected": "接続されたノードを選択",
        "addRemoveNode": "ノードの選択、選択解除",
        "editSelected": "選択したノードを編集",
-        "deleteSelected": "選択したノードや接続を削除",
+        "deleteSelected": "選択部分を削除",
        "deleteReconnect": "削除と再接続",
        "importNode": "フローの読み込み",
        "exportNode": "フローの書き出し",
@@ -1215,8 +1219,10 @@
    "validator": {
        "errors": {
            "invalid-json": "JSONデータが不正: __error__",
+            "invalid-expr": "不正なJSONata式: __error__",
            "invalid-prop": "プロパティ式が不正",
            "invalid-num": "数値が不正",
+            "invalid-num-prop": "__prop__: 数値が不正",
            "invalid-regexp": "入力パターンが不正",
            "invalid-regex-prop": "__prop__: 入力パターンが不正",
            "missing-required-prop": "__prop__: プロパティが未設定",
@@ -1226,6 +1232,7 @@
        }
    },
    "contextMenu": {
+        "showActionList": "動作一覧を表示",
        "insert": "挿入",
        "node": "ノード",
        "junction": "分岐点",
--- a/packages/node_modules/@node-red/editor-client/locales/ko/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ko/editor.json
@@ -79,7 +79,6 @@
      "selectionToSubflow": "서브 플로우 선택",
      "flows": "플로우",
      "add": "추가",
-      "rename": "이름변경",
      "delete": "삭제",
      "keyboardShortcuts": "단축키",
      "login": "로그인",
--- a/packages/node_modules/@node-red/editor-client/locales/pt-BR/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/pt-BR/editor.json
@@ -109,7 +109,6 @@
            "selectionToSubflow": "Seleção para subfluxo",
            "flows": "Fluxos",
            "add": "Adicionar",
-            "rename": "Renomear",
            "delete": "Apagar",
            "keyboardShortcuts": "Atalhos do teclado",
            "login": "Ingressar",
@@ -1188,6 +1187,7 @@
            "invalid-json": "Dados JSON inválidos: __error__",
            "invalid-prop": "Expressão de propriedade inválida",
            "invalid-num": "Número inválido",
+            "invalid-num-prop": "__prop__: número inválido",
            "invalid-regexp": "Padrão de entrada inválido",
            "invalid-regex-prop": "__prop__: Padrão de entrada inválido",
            "missing-required-prop": "__prop__: valor de propriedade ausente",
--- a/packages/node_modules/@node-red/editor-client/locales/ru/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ru/editor.json
@@ -95,7 +95,6 @@
            "selectionToSubflow": "Выделение в подпоток",
            "flows": "Потоки",
            "add": "Добавить",
-            "rename": "Переименовать",
            "delete": "Удалить",
            "keyboardShortcuts": "Сочетания клавиш",
            "login": "Войти",
--- a/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json
@@ -120,7 +120,6 @@
      "selectionToSubflow": "将选择部分更改为子流程",
      "flows": "流程",
      "add": "增加",
-      "rename": "重命名",
      "delete": "删除",
      "keyboardShortcuts": "键盘快捷方式",
      "login": "登录",
@@ -1221,6 +1220,7 @@
      "invalid-expr": "无效的 JSONata 表达式: __error__",
      "invalid-prop": "无效的属性表达式",
      "invalid-num": "无效的数字",
+      "invalid-num-prop": "__prop__: 无效的数字",
      "invalid-regexp": "输入格式无效",
      "invalid-regex-prop": "__prop__: 输入格式无效",
      "missing-required-prop": "__prop__: 缺少属性值",
--- a/packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json
@@ -120,7 +120,6 @@
            "selectionToSubflow": "將選擇部分更改為子流程",
            "flows": "流程",
            "add": "增加",
-            "rename": "重新命名",
            "delete": "刪除",
            "keyboardShortcuts": "鍵盤快速鍵",
            "login": "登入",
--- a/packages/node_modules/@node-red/editor-client/src/js/events.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/events.js
@@ -39,15 +39,16 @@
             console.warn(evt,args);
         }
         if (handlers[evt]) {
-             for (var i=0;i<handlers[evt].length;i++) {
+             let cpyHandlers = [...handlers[evt]];
+          
+             for (var i=0;i<cpyHandlers.length;i++) {
                 try {
-                     handlers[evt][i].apply(null, args);
+                     cpyHandlers[i].apply(null, args);
                 } catch(err) {
                     console.warn("RED.events.emit error: ["+evt+"] "+(err.toString()));
                     console.warn(err);
                 }
             }
-
         }
     }
     return {
--- a/packages/node_modules/@node-red/editor-client/src/js/red.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/red.js
@@ -722,7 +722,7 @@ var RED = (function() {
        menuOptions.push({id:"menu-item-config-nodes",label:RED._("menu.label.displayConfig"),onselect:"core:show-config-tab"});
        menuOptions.push({id:"menu-item-workspace",label:RED._("menu.label.flows"),options:[
            {id:"menu-item-workspace-add",label:RED._("menu.label.add"),onselect:"core:add-flow"},
-            {id:"menu-item-workspace-edit",label:RED._("menu.label.rename"),onselect:"core:edit-flow"},
+            {id:"menu-item-workspace-edit",label:RED._("menu.label.edit"),onselect:"core:edit-flow"},
            {id:"menu-item-workspace-delete",label:RED._("menu.label.delete"),onselect:"core:remove-flow"}
        ]});
        menuOptions.push({id:"menu-item-subflow",label:RED._("menu.label.subflows"), options: [
--- 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
@@ -30,8 +30,26 @@ RED.contextMenu = (function () {
            const isGroup = hasSelection && selection.nodes.length === 1 && selection.nodes[0].type === 'group'
            const canEdit = !RED.workspaces.isLocked()
            const canRemoveFromGroup = hasSelection && !!selection.nodes[0].g
-            const isAllGroups = hasSelection && selection.nodes.filter(n => n.type !== 'group').length === 0
-            const hasGroup = hasSelection && selection.nodes.filter(n => n.type === 'group' ).length > 0
+            let hasGroup, isAllGroups = true, hasDisabledNode, hasEnabledNode, hasLabeledNode, hasUnlabeledNode;
+            if (hasSelection) {
+                selection.nodes.forEach(n => {
+                    if (n.type === 'group') {
+                        hasGroup = true;
+                    } else {
+                        isAllGroups = false;
+                    }
+                    if (n.d) {
+                        hasDisabledNode = true;
+                    } else {
+                        hasEnabledNode = true;
+                    }
+                    if (n.l === undefined || n.l) {
+                        hasLabeledNode = true;
+                    } else {
+                        hasUnlabeledNode = true;
+                    }
+                });
+            }
            const offset = $("#red-ui-workspace-chart").offset()

            let addX = options.x - offset.left + $("#red-ui-workspace-chart").scrollLeft()
@@ -55,7 +73,7 @@ RED.contextMenu = (function () {
                    onselect: function () {
                        RED.view.showQuickAddDialog({
                            position: [addX, addY],
-                            touchTrigger: true,
+                            touchTrigger: 'ontouchstart' in window,
                            splice: isSingleLink ? selection.links[0] : undefined,
                            // spliceMultiple: isMultipleLinks
                        })
@@ -113,11 +131,11 @@ RED.contextMenu = (function () {
                    )
                }
                nodeOptions.push(
-                    { onselect: 'core:enable-selected-nodes', label: RED._('menu.label.enableSelectedNodes') },
-                    { onselect: 'core:disable-selected-nodes', label: RED._('menu.label.disableSelectedNodes') },
+                    { onselect: 'core:enable-selected-nodes', label: RED._('menu.label.enableSelectedNodes'), disabled: !hasDisabledNode },
+                    { onselect: 'core:disable-selected-nodes', label: RED._('menu.label.disableSelectedNodes'), disabled: !hasEnabledNode },
                    null,
-                    { onselect: 'core:show-selected-node-labels', label: RED._('menu.label.showSelectedNodeLabels') },
-                    { onselect: 'core:hide-selected-node-labels', label: RED._('menu.label.hideSelectedNodeLabels') }
+                    { onselect: 'core:show-selected-node-labels', label: RED._('menu.label.showSelectedNodeLabels'), disabled: !hasUnlabeledNode },
+                    { onselect: 'core:hide-selected-node-labels', label: RED._('menu.label.hideSelectedNodeLabels'), disabled: !hasLabeledNode }
                )
                menuItems.push({
                    label: RED._('sidebar.info.node'),
--- 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
@@ -1231,7 +1231,11 @@ RED.editor = (function() {
                })

                if (node_def.hasUsers !== false) {
-                    $('<span><i class="fa fa-info-circle"></i> <span id="red-ui-editor-config-user-count"></span></span>').css("margin-left", "10px").appendTo(trayFooterLeft);
+                    // $('<span><i class="fa fa-info-circle"></i> <span id="red-ui-editor-config-user-count"></span></span>').css("margin-left", "10px").appendTo(trayFooterLeft);
+                    $('<button type="button" class="red-ui-button"><i class="fa fa-user"></i><span id="red-ui-editor-config-user-count"></span></button>').on('click', function() {
+                        RED.sidebar.info.outliner.search('uses:'+editing_config_node.id)
+                        RED.sidebar.info.show()
+                    }).appendTo(trayFooterLeft);
                }
                trayFooter.append('<span class="red-ui-tray-footer-right"><span id="red-ui-editor-config-scope-warning" data-i18n="[title]editor.errors.scopeChange"><i class="fa fa-warning"></i></span><select id="red-ui-editor-config-scope"></select></span>');

@@ -1289,7 +1293,8 @@ RED.editor = (function() {
                        });
                    }
                    if (node_def.hasUsers !== false) {
-                        $("#red-ui-editor-config-user-count").text(RED._("editor.nodesUse", {count:editing_config_node.users.length})).parent().show();
+                        $("#red-ui-editor-config-user-count").text(editing_config_node.users.length).parent().show();
+                        RED.popover.tooltip($("#red-ui-editor-config-user-count").parent(), function() { return RED._('editor.nodesUse',{count:editing_config_node.users.length})});
                    }
                    trayBody.i18n();
                    trayFooter.i18n();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/env-var.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/env-var.js
@@ -71,7 +71,7 @@ RED.envVar = (function() {
                };
                if (item.name.trim() !== "") {
                    new_env.push(item);
-                    if ((item.type === "cred") && (item.value !== "__PWRD__")) {
+                    if (item.type === "cred") {
                        credentials.map[item.name] = item.value;
                        credentials.map["has_"+item.name] = (item.value !== "");
                        item.value = "__PWRD__";
--- 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
@@ -484,7 +484,7 @@ RED.palette = (function() {
        var currentLabel = paletteNode.attr("data-palette-label");
        var currentInfo = paletteNode.attr("data-palette-info");

-        if (currentLabel !== sf.name || currentInfo !== sf.info) {
+        if (currentLabel !== sf.name || currentInfo !== sf.info || sf.in.length > 0 || sf.out.length > 0) {
            paletteNode.attr("data-palette-info",sf.info);
            setLabel(sf.type+":"+sf.id,paletteNode,sf.name,RED.utils.renderMarkdown(sf.info||""));
        }
--- 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
@@ -158,6 +158,7 @@ RED.sidebar.config = (function() {
                entry.data('node',node.id);
                nodeDiv.data('node',node.id);
                var label = $('<div class="red-ui-palette-label"></div>').text(labelText).appendTo(nodeDiv);
+
                if (node.d) {
                    nodeDiv.addClass("red-ui-palette-node-config-disabled");
                    $('<i class="fa fa-ban"></i>').prependTo(label);
@@ -179,6 +180,20 @@ RED.sidebar.config = (function() {
                        nodeDiv.addClass("red-ui-palette-node-config-unused");
                    }
                }
+
+                if (!node.valid) {
+                    nodeDiv.addClass("red-ui-palette-node-config-invalid")
+                    const nodeDivAnnotations = $('<svg class="red-ui-palette-node-annotations red-ui-flow-node-error" width="10" height="10"></svg>').appendTo(nodeDiv)
+                    const errorBadge = document.createElementNS("http://www.w3.org/2000/svg","path");
+                    errorBadge.setAttribute("d","M 0,9 l 10,0 -5,-8 z");
+                    nodeDivAnnotations.append($(errorBadge))
+                    RED.popover.tooltip(nodeDivAnnotations, function () {
+                        if (node.validationErrors && node.validationErrors.length > 0) {
+                            return RED._("editor.errors.invalidProperties")+"<br>  - "+node.validationErrors.join("<br>  - ")
+                        }
+                    })
+                }
+
                nodeDiv.on('click',function(e) {
                    e.stopPropagation();
                    RED.view.select(false);
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js
@@ -232,7 +232,7 @@ RED.sidebar.context = (function() {
                                    typeHint: data.format,
                                    sourceId: id+"."+k,
                                    tools: tools,
-                                    path: ""
+                                    path: k
                                }).appendTo(propRow.children()[1]);
                            }
                        })
@@ -278,7 +278,7 @@ RED.sidebar.context = (function() {
                                                    typeHint: data.format,
                                                    sourceId: id+"."+k,
                                                    tools: tools,
-                                                    path: ""
+                                                    path: k
                                                }).appendTo(propRow.children()[1]);
                                            }
                                        });
@@ -299,7 +299,7 @@ RED.sidebar.context = (function() {
                        typeHint: v.format,
                        sourceId: id+"."+k,
                        tools: tools,
-                        path: ""
+                        path: k
                    }).appendTo(propRow.children()[1]);
                    if (contextStores.length > 1) {
                        $("<span>",{class:"red-ui-sidebar-context-property-storename"}).text(v.store).appendTo($(propRow.children()[0]))
--- 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
@@ -186,8 +186,15 @@ RED.typeSearch = (function() {
                var iconContainer = $('<div/>',{class:"red-ui-palette-icon-container"}).appendTo(nodeDiv);
                RED.utils.createIconElement(icon_url, iconContainer, false);

-
-                if (!/^_action_:/.test(object.type) && object.type !== "junction") {
+                if (/^subflow:/.test(object.type)) {
+                    var sf = RED.nodes.subflow(object.type.substring(8));
+                    if (sf.in.length > 0) {
+                        $('<div/>',{class:"red-ui-search-result-node-port"}).appendTo(nodeDiv);
+                    }
+                    if (sf.out.length > 0) {
+                        $('<div/>',{class:"red-ui-search-result-node-port red-ui-search-result-node-output"}).appendTo(nodeDiv);
+                    }
+                } else if (!/^_action_:/.test(object.type) && object.type !== "junction") {
                    if (def.inputs > 0) {
                        $('<div/>',{class:"red-ui-search-result-node-port"}).appendTo(nodeDiv);
                    }
--- 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
@@ -4155,10 +4155,15 @@ RED.view = (function() {
                        scaleFactor = 30/largestEdge;
                    }
                    var width = img.width * scaleFactor;
+                    if (width > 20) {
+                        scalefactor *= 20/width;
+                        width = 20;
+                    }
                    var height = img.height * scaleFactor;
                    icon.attr("width",width);
                    icon.attr("height",height);
                    icon.attr("x",15-width/2);
+                    icon.attr("y",(30-height)/2);
                }
                icon.attr("xlink:href",iconUrl);
                icon.style("display",null);
--- a/packages/node_modules/@node-red/editor-client/src/sass/tab-config.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/tab-config.scss
@@ -36,7 +36,7 @@ ul.red-ui-sidebar-node-config-list {
        text-align: center;
    }
    .red-ui-palette-node {
-        overflow: hidden;
+        // overflow: hidden;
        cursor: default;
        &.selected {
            border-color: transparent;
@@ -113,6 +113,15 @@ ul.red-ui-sidebar-node-config-list li.red-ui-palette-node-config-type {
        margin-right: 5px;
    }
 }
+.red-ui-palette-node-config-invalid {
+    border-color: var(--red-ui-form-input-border-error-color)
+}
+.red-ui-palette-node-annotations {
+    position: absolute;
+    left: calc(100% - 15px);
+    top: -8px;
+    display: block;
+}
 .red-ui-sidebar-node-config-filter-info {
    position: absolute;
    top: 0;
--- a/packages/node_modules/@node-red/editor-client/templates/index.mst
+++ b/packages/node_modules/@node-red/editor-client/templates/index.mst
@@ -24,24 +24,24 @@
 <title>{{ page.title }}</title>
 <link rel="icon" type="image/png" href="{{{ page.favicon }}}">
 <link rel="mask-icon" href="{{{ page.tabicon.icon }}}" color="{{ page.tabicon.colour }}">
-<link rel="stylesheet" href="vendor/jquery/css/base/jquery-ui.min.css?v={{ page.version }}">
-<link rel="stylesheet" href="vendor/font-awesome/css/font-awesome.min.css?v={{ page.version }}">
-<link rel="stylesheet" href="red/style.min.css?v={{ page.version }}">
+<link rel="stylesheet" href="vendor/jquery/css/base/jquery-ui.min.css?v={{ cacheBuster }}">
+<link rel="stylesheet" href="vendor/font-awesome/css/font-awesome.min.css?v={{ cacheBuster }}">
+<link rel="stylesheet" href="red/style.min.css?v={{ cacheBuster }}">
 {{#page.css}}
 <link rel="stylesheet" href="{{.}}">
 {{/page.css}}
 {{#asset.vendorMonaco}}
-<link rel="stylesheet" href="vendor/monaco/style.css?v={{ page.version }}">
+<link rel="stylesheet" href="vendor/monaco/style.css?v={{ cacheBuster }}">
 {{/asset.vendorMonaco}}
 </head>
 <body spellcheck="false">
 <div id="red-ui-editor"></div>
-<script src="vendor/vendor.js?v={{ page.version }}"></script>
+<script src="vendor/vendor.js?v={{ cacheBuster }}"></script>
 {{#asset.vendorMonaco}}
-<script src="{{{ asset.vendorMonaco }}}?v={{ page.version }}"></script>
+<script src="{{{ asset.vendorMonaco }}}?v={{ cacheBuster }}"></script>
 {{/asset.vendorMonaco}}
-<script src="{{{ asset.red }}}?v={{ page.version }}"></script>
-<script src="{{{ asset.main }}}?v={{ page.version }}"></script>
+<script src="{{{ asset.red }}}?v={{ cacheBuster }}"></script>
+<script src="{{{ asset.main }}}?v={{ cacheBuster }}"></script>
 {{# page.scripts }}
 <script src="{{.}}"></script>
 {{/ page.scripts }}