From e1f2e0656b15b7d1de564295a5afdf6feeae6d7a Mon Sep 17 00:00:00 2001 From: Gerrit Riessen Date: Fri, 15 Dec 2023 10:54:11 +0100 Subject: [PATCH 1/4] Client Events: fix off-in-on pattern emulating once This fixes an issue when RED.events.off(..) is called in a RED.events.on(..) callback: ``` let cb = () => { RED.events.off("event-name", cb) .... } RED.events.on("event-name", cb) ``` This pattern emulates a once(..), i.e., execute a callback once-only for an event. Discussed in [Forum](https://discourse.nodered.org/t/event-offing-an-on-event-to-perform-only-once/83726) --- .../node_modules/@node-red/editor-client/src/js/events.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/events.js b/packages/node_modules/@node-red/editor-client/src/js/events.js index bd2abd8d0..943854393 100644 --- 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 Date: Sat, 23 Dec 2023 19:51:57 +0900 Subject: [PATCH 2/4] Fix location of subflow ports in palette --- .../node_modules/@node-red/editor-client/src/js/ui/palette.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git 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 index db915fd8b..6b9beb326 100644 --- 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,8 @@ 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||"")); } From 8365310ca7cd8095382c39c7562e4eb8598386de Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Fri, 29 Dec 2023 20:32:14 +0900 Subject: [PATCH 3/4] Put the changed code on one line to avoid jshint error --- .../node_modules/@node-red/editor-client/src/js/ui/palette.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git 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 index 6b9beb326..23f30fc61 100644 --- 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,8 +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 - || sf.in.length > 0 || sf.out.length > 0) { + 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||"")); } From 7f24de442f997e376b512b79258f083c6010a12e Mon Sep 17 00:00:00 2001 From: GogoVega <92022724+GogoVega@users.noreply.github.com> Date: Mon, 1 Jan 2024 15:33:39 +0100 Subject: [PATCH 4/4] Replace 'rename' with 'edit' for the flow label --- .../node_modules/@node-red/editor-client/locales/de/editor.json | 1 - .../@node-red/editor-client/locales/en-US/editor.json | 1 - .../node_modules/@node-red/editor-client/locales/fr/editor.json | 1 - .../node_modules/@node-red/editor-client/locales/ja/editor.json | 1 - .../node_modules/@node-red/editor-client/locales/ko/editor.json | 1 - .../@node-red/editor-client/locales/pt-BR/editor.json | 1 - .../node_modules/@node-red/editor-client/locales/ru/editor.json | 1 - .../@node-red/editor-client/locales/zh-CN/editor.json | 1 - .../@node-red/editor-client/locales/zh-TW/editor.json | 1 - packages/node_modules/@node-red/editor-client/src/js/red.js | 2 +- 10 files changed, 1 insertion(+), 10 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/locales/de/editor.json b/packages/node_modules/@node-red/editor-client/locales/de/editor.json index f2955c266..bb811eae4 100644 --- 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", diff --git 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 index 1836b6a9e..68e89366e 100644 --- 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", diff --git a/packages/node_modules/@node-red/editor-client/locales/fr/editor.json b/packages/node_modules/@node-red/editor-client/locales/fr/editor.json index b58bed283..35c1de246 100644 --- 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", diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json index ceb001a10..05dd1b93e 100644 --- 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": "ログイン", diff --git a/packages/node_modules/@node-red/editor-client/locales/ko/editor.json b/packages/node_modules/@node-red/editor-client/locales/ko/editor.json index ad4f4354f..4de2cb5d2 100644 --- 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": "로그인", diff --git 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 index f65ec62e9..cb43e1051 100644 --- 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", diff --git a/packages/node_modules/@node-red/editor-client/locales/ru/editor.json b/packages/node_modules/@node-red/editor-client/locales/ru/editor.json index 8cfea1bde..69562f806 100644 --- 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": "Войти", diff --git 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 index 271326d05..9d98ef8af 100644 --- 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": "登录", diff --git 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 index 022205a70..485ce3c2f 100644 --- 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": "登入", diff --git a/packages/node_modules/@node-red/editor-client/src/js/red.js b/packages/node_modules/@node-red/editor-client/src/js/red.js index 3878965e3..d13d7ca24 100644 --- 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: [