From 5e4fce1e12e8383ca9260ab83a58d4fe0667b651 Mon Sep 17 00:00:00 2001 From: Dave Conway-Jones Date: Sat, 27 May 2023 17:51:21 +0100 Subject: [PATCH 1/5] Fix delay node flush issue to close #4202 --- packages/node_modules/@node-red/nodes/core/function/89-delay.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/node_modules/@node-red/nodes/core/function/89-delay.js b/packages/node_modules/@node-red/nodes/core/function/89-delay.js index 6d4843caf..0b9ca412f 100644 --- a/packages/node_modules/@node-red/nodes/core/function/89-delay.js +++ b/packages/node_modules/@node-red/nodes/core/function/89-delay.js @@ -229,6 +229,7 @@ module.exports = function(RED) { node.on("input", function(msg, send, done) { if (!node.drop) { var m = RED.util.cloneMessage(msg); + delete m.flush; if (Object.keys(m).length > 1) { if (node.intervalID !== -1) { if (node.allowrate && m.hasOwnProperty("rate") && !isNaN(parseFloat(m.rate)) && node.rate !== m.rate) { From a78da0db1e61ae64ebd432b2ca6cce7ecdd288ee Mon Sep 17 00:00:00 2001 From: Steve-Mcl Date: Mon, 29 May 2023 22:47:29 +0100 Subject: [PATCH 2/5] Update status and catch node labels in group mode --- .../@node-red/nodes/core/common/25-catch.html | 4 +++- .../@node-red/nodes/core/common/25-status.html | 10 +++++++++- .../@node-red/nodes/locales/en-US/messages.json | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/node_modules/@node-red/nodes/core/common/25-catch.html b/packages/node_modules/@node-red/nodes/core/common/25-catch.html index fe68b46db..4b92c9758 100644 --- a/packages/node_modules/@node-red/nodes/core/common/25-catch.html +++ b/packages/node_modules/@node-red/nodes/core/common/25-catch.html @@ -41,7 +41,9 @@ if (this.name) { return this.name; } - if (this.scope) { + if (this.scope === "group") { + return this._("catch.catchGroup"); + } else if (Array.isArray(this.scope)) { return this._("catch.catchNodes",{number:this.scope.length}); } return this.uncaught?this._("catch.catchUncaught"):this._("catch.catch") diff --git a/packages/node_modules/@node-red/nodes/core/common/25-status.html b/packages/node_modules/@node-red/nodes/core/common/25-status.html index 0efdede33..b5efadeac 100644 --- a/packages/node_modules/@node-red/nodes/core/common/25-status.html +++ b/packages/node_modules/@node-red/nodes/core/common/25-status.html @@ -33,7 +33,15 @@ outputs:1, icon: "status.svg", label: function() { - return this.name||(this.scope?this._("status.statusNodes",{number:this.scope.length}):this._("status.status")); + if (this.name) { + return this.name; + } + if (this.scope === "group") { + return this._("status.statusGroup"); + } else if (Array.isArray(this.scope)) { + return this._("status.statusNodes",{number:this.scope.length}); + } + return this._("status.status") }, labelStyle: function() { return this.name?"node_label_italic":""; diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json index 52fd1455d..673440b8f 100644 --- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json +++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json @@ -94,6 +94,7 @@ }, "catch": { "catch": "catch: all", + "catchGroup": "catch: in same group", "catchNodes": "catch: __number__", "catchUncaught": "catch: uncaught", "label": { @@ -109,6 +110,7 @@ }, "status": { "status": "status: all", + "statusGroup": "status: in same group", "statusNodes": "status: __number__", "label": { "source": "Report status from", From 613a345771172871bdfbfff438978d06828a4acd Mon Sep 17 00:00:00 2001 From: HiroyasuNishiyama Date: Tue, 30 May 2023 20:58:17 +0900 Subject: [PATCH 3/5] add additional Japanese translation for status and catch node --- packages/node_modules/@node-red/nodes/locales/ja/messages.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/node_modules/@node-red/nodes/locales/ja/messages.json b/packages/node_modules/@node-red/nodes/locales/ja/messages.json index a5736c60e..2e0865011 100644 --- a/packages/node_modules/@node-red/nodes/locales/ja/messages.json +++ b/packages/node_modules/@node-red/nodes/locales/ja/messages.json @@ -103,6 +103,7 @@ }, "scope": { "all": "全てのノード", + "group": "同一グループ内", "selected": "選択したノード" } }, @@ -115,6 +116,7 @@ }, "scope": { "all": "全てのノード", + "group": "同一グループ内", "selected": "選択したノード" } }, From 5eee38e7de4e49409e1b07c4ce37d4f56449438f Mon Sep 17 00:00:00 2001 From: Stephen McLaughlin <44235289+Steve-Mcl@users.noreply.github.com> Date: Wed, 31 May 2023 14:10:59 +0100 Subject: [PATCH 4/5] Update packages/node_modules/@node-red/nodes/locales/en-US/messages.json Co-authored-by: Nick O'Leary --- .../node_modules/@node-red/nodes/locales/en-US/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json index 673440b8f..235a9d07c 100644 --- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json +++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json @@ -94,7 +94,7 @@ }, "catch": { "catch": "catch: all", - "catchGroup": "catch: in same group", + "catchGroup": "catch: group", "catchNodes": "catch: __number__", "catchUncaught": "catch: uncaught", "label": { From f8175fc3254966252b824475335e296a608071d5 Mon Sep 17 00:00:00 2001 From: Stephen McLaughlin <44235289+Steve-Mcl@users.noreply.github.com> Date: Wed, 31 May 2023 14:11:06 +0100 Subject: [PATCH 5/5] Update packages/node_modules/@node-red/nodes/locales/en-US/messages.json Co-authored-by: Nick O'Leary --- .../node_modules/@node-red/nodes/locales/en-US/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json index 235a9d07c..2f282036c 100644 --- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json +++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json @@ -110,7 +110,7 @@ }, "status": { "status": "status: all", - "statusGroup": "status: in same group", + "statusGroup": "status: group", "statusNodes": "status: __number__", "label": { "source": "Report status from",