diff --git a/CHANGELOG.md b/CHANGELOG.md index 872c40e7f..04fd110ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ #### 3.1.0-beta.1: Beta Release + Editor - NEW: Locking Flows (#3938) @knolleary @@ -7,7 +8,8 @@ Editor - NEW: Add support for inline image in markdown editor by drag and drop of an image file (#4006) @HiroyasuNishiyama - NEW: Add support for mermaid diagram to markdown editor (#4007) @HiroyasuNishiyama - NEW: Support uri fragments for nodes and groups including edit support (#3870) @knolleary - + - NEW: Add global environment variable feature (#3941) @HiroyasuNishiyama + - Remember compact/pretty flow export user choice (#3974) @Steve-Mcl - fix .red-ui-notification class (#4035) @xiaobinqt - Fix border radius on Modules list header (#4038) @bonanitech @@ -38,7 +40,6 @@ Editor Runtime - - NEW: Add global environment variable feature (#3941) @HiroyasuNishiyama - Force IPv4 name resolution to have priority (#4019) @dceejay - Fix async loading of modules containing both nodes and plugins (#3999) @knolleary - Use main branch as default in project feature (#4036) @kazuhitoyokoi diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tour/tourGuide.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tour/tourGuide.js index 406715651..7d16e640b 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/tour/tourGuide.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tour/tourGuide.js @@ -435,10 +435,15 @@ RED.tourGuide = (function() { function listTour() { return [ + { + id: "3_1", + label: "3.1", + path: "./tours/welcome.js" + }, { id: "3_0", label: "3.0", - path: "./tours/welcome.js" + path: "./tours/3.0/welcome.js" }, { id: "2_2", diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js index 788e79455..9077ca399 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js @@ -299,7 +299,6 @@ RED.workspaces = (function() { null, { label: RED._("common.label.delete"), - disabled: isCurrentLocked, onselect: function() { if (tab.type === 'tab') { RED.workspaces.delete(tab) @@ -307,7 +306,7 @@ RED.workspaces = (function() { RED.subflow.delete(tab.id) } }, - disabled: (workspaceTabCount === 1) + disabled: isCurrentLocked || (workspaceTabCount === 1) }, { label: RED._("menu.label.export"), diff --git a/packages/node_modules/@node-red/editor-client/src/tours/3.0/images/context-menu.png b/packages/node_modules/@node-red/editor-client/src/tours/3.0/images/context-menu.png new file mode 100644 index 000000000..1acaab48b Binary files /dev/null and b/packages/node_modules/@node-red/editor-client/src/tours/3.0/images/context-menu.png differ diff --git a/packages/node_modules/@node-red/editor-client/src/tours/images/continuous-search.png b/packages/node_modules/@node-red/editor-client/src/tours/3.0/images/continuous-search.png similarity index 100% rename from packages/node_modules/@node-red/editor-client/src/tours/images/continuous-search.png rename to packages/node_modules/@node-red/editor-client/src/tours/3.0/images/continuous-search.png diff --git a/packages/node_modules/@node-red/editor-client/src/tours/images/debug-path-tooltip.png b/packages/node_modules/@node-red/editor-client/src/tours/3.0/images/debug-path-tooltip.png similarity index 100% rename from packages/node_modules/@node-red/editor-client/src/tours/images/debug-path-tooltip.png rename to packages/node_modules/@node-red/editor-client/src/tours/3.0/images/debug-path-tooltip.png diff --git a/packages/node_modules/@node-red/editor-client/src/tours/images/junction-quick-add.png b/packages/node_modules/@node-red/editor-client/src/tours/3.0/images/junction-quick-add.png similarity index 100% rename from packages/node_modules/@node-red/editor-client/src/tours/images/junction-quick-add.png rename to packages/node_modules/@node-red/editor-client/src/tours/3.0/images/junction-quick-add.png diff --git a/packages/node_modules/@node-red/editor-client/src/tours/images/junction-slice.gif b/packages/node_modules/@node-red/editor-client/src/tours/3.0/images/junction-slice.gif similarity index 100% rename from packages/node_modules/@node-red/editor-client/src/tours/images/junction-slice.gif rename to packages/node_modules/@node-red/editor-client/src/tours/3.0/images/junction-slice.gif diff --git a/packages/node_modules/@node-red/editor-client/src/tours/images/split-wire-with-links.gif b/packages/node_modules/@node-red/editor-client/src/tours/3.0/images/split-wire-with-links.gif similarity index 100% rename from packages/node_modules/@node-red/editor-client/src/tours/images/split-wire-with-links.gif rename to packages/node_modules/@node-red/editor-client/src/tours/3.0/images/split-wire-with-links.gif diff --git a/packages/node_modules/@node-red/editor-client/src/tours/3.0/welcome.js b/packages/node_modules/@node-red/editor-client/src/tours/3.0/welcome.js new file mode 100644 index 000000000..7d095ba8c --- /dev/null +++ b/packages/node_modules/@node-red/editor-client/src/tours/3.0/welcome.js @@ -0,0 +1,155 @@ +export default { + version: "3.0.0", + steps: [ + { + titleIcon: "fa fa-map-o", + title: { + "en-US": "Welcome to Node-RED 3.0!", + "ja": "Node-RED 3.0へようこそ!" + }, + description: { + "en-US": "

Let's take a moment to discover the new features in this release.

", + "ja": "

本リリースの新機能を見つけてみましょう。

" + } + }, + { + title: { + "en-US": "Context Menu", + "ja": "コンテキストメニュー" + }, + image: 'images/context-menu.png', + description: { + "en-US": `

The editor now has its own context menu when you + right-click in the workspace.

+

This makes many of the built-in actions much easier + to access.

`, + "ja": `

ワークスペースで右クリックすると、エディタに独自のコンテキストメニューが表示されるようになりました。

+

これによって多くの組み込み動作を、より簡単に利用できます。

` + } + }, + { + title: { + "en-US": "Wire Junctions", + "ja": "分岐点をワイヤーに追加" + }, + image: 'images/junction-slice.gif', + description: { + "en-US": `

To make it easier to route wires around your flows, + it is now possible to add junction nodes that give + you more control.

+

Junctions can be added to wires by holding both the Alt key and the Shift key + then click and drag the mouse across the wires.

`, + "ja": `

フローのワイヤーの経路をより制御しやすくするために、分岐点ノードを追加できるようになりました。

+

Altキーとシフトキーを押しながらマウスをクリックし、ワイヤーを横切るようにドラッグすることで、分岐点を追加できます。

` + }, + }, + { + title: { + "en-US": "Wire Junctions", + "ja": "分岐点をワイヤーに追加" + }, + image: 'images/junction-quick-add.png', + description: { + "en-US": `

Junctions can also be added using the quick-add dialog.

+

The dialog is opened by holding the Ctrl (or Cmd) key when + clicking in the workspace.

`, + "ja": `

クイック追加ダイアログを用いて、分岐点を追加することもできます。

+

本ダイアログを開くには、Ctrl(またはCmd)キーを押しながら、ワークスペース上でクリックします。

` + }, + }, + { + title: { + "en-US": "Debug Path Tooltip", + "ja": "デバッグパスのツールチップ" + }, + image: 'images/debug-path-tooltip.png', + description: { + "en-US": `

When hovering over a node name in the Debug sidebar, a + new tooltip shows the full location of the node.

+

This is useful when working with subflows, making it + much easier to identify exactly which node generated + the message.

+

Clicking on any item in the list will reveal it in + the workspace.

`, + "ja": `

デバックサイドバー内のノード名の上にマウスカーソルを乗せると、新たにツールチップが表示され、ノードの場所が分かるようになっています。

+

これは、サブフローを用いる時に役立つ機能であり、メッセージがどのノードから出力されたかを正確に特定することが遥かに簡単になります。

+

本リスト内の要素をクリックすると、ワークスペース内にその要素が表示されます。

` + }, + }, + { + title: { + "en-US": "Continuous Search", + "ja": "連続した検索" + }, + image: 'images/continuous-search.png', + description: { + "en-US": `

When searching for things in the editor, a new toolbar in + the workspace provides options to quickly jump between + the search results.

`, + "ja": `

ワークスペース内の新しいツールバーにあるオプションによって、エディタ内を検索する際に、検索結果の間を素早く移動できます。

` + }, + }, + { + title: { + "en-US": "New wiring actions", + "ja": "新しいワイヤー操作" + }, + image: "images/split-wire-with-links.gif", + description: { + "en-US": `

A new action has been added that will replace a wire with a pair of connected Link nodes:

+ +

Actions can be accessed from the Action List in the main menu.

`, + "ja": `

ワイヤーを、接続されたLinkノードのペアに置き換える動作が新たに追加されました:

+ +

本アクションは、メインメニュー内の動作一覧から呼び出せます。

`, + }, + }, + { + title: { + "en-US": "Default node names", + "ja": "標準ノードの名前" + }, + // image: "images/", + description: { + "en-US": `

Some nodes have been updated to generate a unique name when + new instances are added to the workspace. This applies to + Debug, Function and Link nodes.

+

A new action has also been added to generate default names for the selected + nodes:

+

Actions can be accessed from the Action List in the main menu.

+ `, + "ja": `

一部のノードは、ワークスペース上に新インスタンスとして追加した際に、一意の名前を付けるよう変更されました。この変更は、DebugFunctionLinkノードに適用されています。

+

選択したノードに対して、標準の名前を生成する動作も新たに追加されました:

+

本アクションは、メインメニュー内の動作一覧から呼び出せます。

+ ` + } + }, + { + title: { + "en-US": "Node Updates", + "ja": "ノードの更新" + }, + // image: "images/", + description: { + "en-US": ``, + "ja": `` + } + } + ] +} diff --git a/packages/node_modules/@node-red/editor-client/src/tours/images/context-menu.png b/packages/node_modules/@node-red/editor-client/src/tours/images/context-menu.png index 1acaab48b..df6352e64 100644 Binary files a/packages/node_modules/@node-red/editor-client/src/tours/images/context-menu.png and b/packages/node_modules/@node-red/editor-client/src/tours/images/context-menu.png differ diff --git a/packages/node_modules/@node-red/editor-client/src/tours/images/global-env-vars.png b/packages/node_modules/@node-red/editor-client/src/tours/images/global-env-vars.png new file mode 100644 index 000000000..8967cc031 Binary files /dev/null and b/packages/node_modules/@node-red/editor-client/src/tours/images/global-env-vars.png differ diff --git a/packages/node_modules/@node-red/editor-client/src/tours/images/hiding-flows.png b/packages/node_modules/@node-red/editor-client/src/tours/images/hiding-flows.png new file mode 100644 index 000000000..56d399078 Binary files /dev/null and b/packages/node_modules/@node-red/editor-client/src/tours/images/hiding-flows.png differ diff --git a/packages/node_modules/@node-red/editor-client/src/tours/images/locking-flows.png b/packages/node_modules/@node-red/editor-client/src/tours/images/locking-flows.png new file mode 100644 index 000000000..16110748c Binary files /dev/null and b/packages/node_modules/@node-red/editor-client/src/tours/images/locking-flows.png differ diff --git a/packages/node_modules/@node-red/editor-client/src/tours/images/mermaid.png b/packages/node_modules/@node-red/editor-client/src/tours/images/mermaid.png new file mode 100644 index 000000000..8b3cfa01b Binary files /dev/null and b/packages/node_modules/@node-red/editor-client/src/tours/images/mermaid.png differ diff --git a/packages/node_modules/@node-red/editor-client/src/tours/welcome.js b/packages/node_modules/@node-red/editor-client/src/tours/welcome.js index 7d095ba8c..1f74fb7f8 100644 --- a/packages/node_modules/@node-red/editor-client/src/tours/welcome.js +++ b/packages/node_modules/@node-red/editor-client/src/tours/welcome.js @@ -1,137 +1,97 @@ export default { - version: "3.0.0", + version: "3.1.0-beta.1", steps: [ { titleIcon: "fa fa-map-o", title: { - "en-US": "Welcome to Node-RED 3.0!", - "ja": "Node-RED 3.0へようこそ!" + "en-US": "Welcome to Node-RED 3.1 Beta 1!", + // "ja": "Node-RED 3.1へようこそ!" }, description: { - "en-US": "

Let's take a moment to discover the new features in this release.

", - "ja": "

本リリースの新機能を見つけてみましょう。

" + "en-US": "

This is the first beta release for 3.1.0 and we have a few new features to tell you about.

", + // "ja": "" } }, { title: { - "en-US": "Context Menu", - "ja": "コンテキストメニュー" + "en-US": "Improved Context Menu", + // "ja": "" }, image: 'images/context-menu.png', description: { - "en-US": `

The editor now has its own context menu when you - right-click in the workspace.

-

This makes many of the built-in actions much easier - to access.

`, - "ja": `

ワークスペースで右クリックすると、エディタに独自のコンテキストメニューが表示されるようになりました。

-

これによって多くの組み込み動作を、より簡単に利用できます。

` + "en-US": `

The editor's context menu has been expanded to make lots more of + the built-in actions available.

+

Adding nodes, working with groups and plenty + of other useful tools are now just a click away.

+

The flow tab bar also has its own context menu to make working + with your flows much easier.

`, + // "ja": `` } }, { title: { - "en-US": "Wire Junctions", - "ja": "分岐点をワイヤーに追加" + "en-US": "Hiding Flows", + // "ja": "" }, - image: 'images/junction-slice.gif', + image: 'images/hiding-flows.png', description: { - "en-US": `

To make it easier to route wires around your flows, - it is now possible to add junction nodes that give - you more control.

-

Junctions can be added to wires by holding both the Alt key and the Shift key - then click and drag the mouse across the wires.

`, - "ja": `

フローのワイヤーの経路をより制御しやすくするために、分岐点ノードを追加できるようになりました。

-

Altキーとシフトキーを押しながらマウスをクリックし、ワイヤーを横切るようにドラッグすることで、分岐点を追加できます。

` + "en-US": `

Hiding flows is now done through the flow context menu.

+

The 'hide' button in previous releases has been removed from the tabs + as they were being clicked accidentally too often.

`, + // "ja": `` }, }, { title: { - "en-US": "Wire Junctions", - "ja": "分岐点をワイヤーに追加" + "en-US": "Locking Flows", + // "ja": "" }, - image: 'images/junction-quick-add.png', + image: 'images/locking-flows.png', description: { - "en-US": `

Junctions can also be added using the quick-add dialog.

-

The dialog is opened by holding the Ctrl (or Cmd) key when - clicking in the workspace.

`, - "ja": `

クイック追加ダイアログを用いて、分岐点を追加することもできます。

-

本ダイアログを開くには、Ctrl(またはCmd)キーを押しながら、ワークスペース上でクリックします。

` + "en-US": `

Flows can now be locked to prevent accidental changes being made.

+

When locked you cannot modify the nodes in any way.

+

The flow context menu provides the options to lock and unlock flows, + as well as in the Info sidebar explorer.

`, + // "ja": `` }, }, { title: { - "en-US": "Debug Path Tooltip", - "ja": "デバッグパスのツールチップ" + "en-US": "Adding Images to node/flow descriptions", + // "ja": "" }, - image: 'images/debug-path-tooltip.png', + // image: 'images/debug-path-tooltip.png', description: { - "en-US": `

When hovering over a node name in the Debug sidebar, a - new tooltip shows the full location of the node.

-

This is useful when working with subflows, making it - much easier to identify exactly which node generated - the message.

-

Clicking on any item in the list will reveal it in - the workspace.

`, - "ja": `

デバックサイドバー内のノード名の上にマウスカーソルを乗せると、新たにツールチップが表示され、ノードの場所が分かるようになっています。

-

これは、サブフローを用いる時に役立つ機能であり、メッセージがどのノードから出力されたかを正確に特定することが遥かに簡単になります。

-

本リスト内の要素をクリックすると、ワークスペース内にその要素が表示されます。

` + "en-US": `

You can now add images to a node's or flows's description.

+

Simply drag the image into the text editor and it will get added inline.

+

When the description is shown in the Info sidebar, the image will be displayed.`, + // "ja": `` }, }, { title: { - "en-US": "Continuous Search", - "ja": "連続した検索" + "en-US": "Adding Mermaid Diagrams", + // "ja": "" }, - image: 'images/continuous-search.png', + image: 'images/mermaid.png', description: { - "en-US": `

When searching for things in the editor, a new toolbar in - the workspace provides options to quickly jump between - the search results.

`, - "ja": `

ワークスペース内の新しいツールバーにあるオプションによって、エディタ内を検索する際に、検索結果の間を素早く移動できます。

` + "en-US": `

You can also add Mermaid diagrams directly into your node or flow descriptions.

+

This gives you much richer options for documenting your flows.

`, + // "ja": `` }, }, { title: { - "en-US": "New wiring actions", - "ja": "新しいワイヤー操作" + "en-US": "Managing Global Environment Variables", + // "ja": "" }, - image: "images/split-wire-with-links.gif", + image: 'images/global-env-vars.png', description: { - "en-US": `

A new action has been added that will replace a wire with a pair of connected Link nodes:

- -

Actions can be accessed from the Action List in the main menu.

`, - "ja": `

ワイヤーを、接続されたLinkノードのペアに置き換える動作が新たに追加されました:

- -

本アクションは、メインメニュー内の動作一覧から呼び出せます。

`, + "en-US": `

You can set environment variables that apply to all nodes and flows in the new + 'Global Environment Variables' section of User Settings.

`, + // "ja": `` }, }, - { - title: { - "en-US": "Default node names", - "ja": "標準ノードの名前" - }, - // image: "images/", - description: { - "en-US": `

Some nodes have been updated to generate a unique name when - new instances are added to the workspace. This applies to - Debug, Function and Link nodes.

-

A new action has also been added to generate default names for the selected - nodes:

-

Actions can be accessed from the Action List in the main menu.

- `, - "ja": `

一部のノードは、ワークスペース上に新インスタンスとして追加した際に、一意の名前を付けるよう変更されました。この変更は、DebugFunctionLinkノードに適用されています。

-

選択したノードに対して、標準の名前を生成する動作も新たに追加されました:

-

本アクションは、メインメニュー内の動作一覧から呼び出せます。

- ` - } - }, { title: { "en-US": "Node Updates", @@ -139,16 +99,9 @@ export default { }, // image: "images/", description: { - "en-US": ``, - "ja": `` + "en-US": `

The core nodes have received lots of minor fixes, documentation updates and + small enhancements. Check the full changelog in the Help sidebar for a full list.

`, + // "ja": `` } } ]