From db98641a3277f01b8c98d128b555d230ba3ebd1b Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Tue, 27 Jun 2023 09:53:39 +0200 Subject: [PATCH 1/5] help: Template might be a better fit to create multiline strings The inject node doesn't create multiline strings as the help text explains. While there's indeed many ways to circumvent this, the Template node might be more "low-code" than the function node is. --- .../@node-red/nodes/locales/en-US/common/20-inject.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/common/20-inject.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/20-inject.html index 6f72a5c33..bf0fb5c24 100644 --- a/packages/node_modules/@node-red/nodes/locales/en-US/common/20-inject.html +++ b/packages/node_modules/@node-red/nodes/locales/en-US/common/20-inject.html @@ -36,5 +36,5 @@ greater than one day you should consider using a scheduler node that can cope wi

Note: The "Interval between times" and "at a specific time" options use the standard cron system. This means that 20 minutes will be at the next hour, 20 minutes past and 40 minutes past - not in 20 minutes time. If you want every 20 minutes from now - use the "interval" option.

-

Note: To include a newline in a string you must use a Function node to create the payload.

+

Note: To include a newline in a string you must use the Function or Template node to create the payload.

From cd76c934b61e79318ca57acc5fe58c8b359922e7 Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Sun, 2 Jul 2023 00:40:15 +0900 Subject: [PATCH 2/5] Fix broken text input in the switch node --- .../@node-red/nodes/core/function/10-switch.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/node_modules/@node-red/nodes/core/function/10-switch.html b/packages/node_modules/@node-red/nodes/core/function/10-switch.html index ebe22d65c..78cfa0793 100644 --- a/packages/node_modules/@node-red/nodes/core/function/10-switch.html +++ b/packages/node_modules/@node-red/nodes/core/function/10-switch.html @@ -103,6 +103,11 @@ } else if (type === "istype") { r.v = rule.find(".node-input-rule-type-value").typedInput('type'); r.vt = rule.find(".node-input-rule-type-value").typedInput('type'); + if (r.vt === "number") { + r.vt = "num"; + } else { + r.vt = "str"; + } } else if (type === "jsonata_exp") { r.v = rule.find(".node-input-rule-exp-value").typedInput('value'); r.vt = rule.find(".node-input-rule-exp-value").typedInput('type'); From 18e1b670ca6f32941783a0056bc23b2ca0bc51e1 Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Sun, 2 Jul 2023 01:33:11 +0900 Subject: [PATCH 3/5] Make handlings one line --- .../@node-red/nodes/core/function/10-switch.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/node_modules/@node-red/nodes/core/function/10-switch.html b/packages/node_modules/@node-red/nodes/core/function/10-switch.html index 78cfa0793..c10a53827 100644 --- a/packages/node_modules/@node-red/nodes/core/function/10-switch.html +++ b/packages/node_modules/@node-red/nodes/core/function/10-switch.html @@ -103,11 +103,7 @@ } else if (type === "istype") { r.v = rule.find(".node-input-rule-type-value").typedInput('type'); r.vt = rule.find(".node-input-rule-type-value").typedInput('type'); - if (r.vt === "number") { - r.vt = "num"; - } else { - r.vt = "str"; - } + r.vt = (r.vt === "number") ? "num" : "str"; } else if (type === "jsonata_exp") { r.v = rule.find(".node-input-rule-exp-value").typedInput('value'); r.vt = rule.find(".node-input-rule-exp-value").typedInput('type'); From c4019bd91d11f6ea2f9c1da52547ef94be580493 Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Sun, 2 Jul 2023 15:51:35 +0900 Subject: [PATCH 4/5] Add Japanese translation for error message when creating subflow --- .../@node-red/editor-client/locales/en-US/editor.json | 1 + .../node_modules/@node-red/editor-client/locales/ja/editor.json | 1 + .../node_modules/@node-red/editor-client/src/js/ui/subflow.js | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) 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 5474d1a23..4f617fff3 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 @@ -403,6 +403,7 @@ }, "errors": { "noNodesSelected": "Cannot create subflow: no nodes selected", + "acrossMultipleGroups": "Cannot create subflow across multiple groups", "multipleInputsToSelection": "Cannot create subflow: multiple inputs to selection" } }, 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 6022b5e81..fc3e898f9 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 @@ -403,6 +403,7 @@ }, "errors": { "noNodesSelected": "サブフローを作成できません: ノードが選択されていません", + "acrossMultipleGroups": "複数のグループをまたがるサブフローは作成できません", "multipleInputsToSelection": "サブフローを作成できません: 複数の入力が選択されています" } }, diff --git 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 index abe6402db..c304aeb6d 100644 --- 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 @@ -647,7 +647,7 @@ RED.subflow = (function() { for (i=0; i Date: Sat, 15 Jul 2023 17:23:14 +0900 Subject: [PATCH 5/5] Update Japanese translation for inject node --- .../@node-red/nodes/locales/ja/common/20-inject.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/nodes/locales/ja/common/20-inject.html b/packages/node_modules/@node-red/nodes/locales/ja/common/20-inject.html index f6706844e..060a03f33 100644 --- a/packages/node_modules/@node-red/nodes/locales/ja/common/20-inject.html +++ b/packages/node_modules/@node-red/nodes/locales/ja/common/20-inject.html @@ -30,5 +30,5 @@

また、フロー開始の際に一度だけメッセージを送出させることもできます。

「時間間隔」に指定可能な値の最大値は、約596時間(もしくは24日)です。一日より長い間隔を扱いたい場合は、電源停止や再起動にも対応可能なスケジューラノードの利用を検討すると良いでしょう。

注:「指定した時間間隔、日時」と「指定した日時」オプションは標準的なcronシステムを内部で利用します。したがって「20分」という指定は、その時点から20分後ではなく、毎時きっかり、20分、40分を意味します。現時刻から20分毎を指定するには「指定した時間間隔」オプションを用います。

-

注: 文字列に改行を含めたい場合は、functionノードを使ってペイロードを設定してください。

+

注: 文字列に改行を含めたい場合は、functionノードまたはtemplateノードを使ってペイロードを設定してください。