From 720d44d53ecc00a493575f3fefe7343b37113a1d Mon Sep 17 00:00:00 2001 From: Hiroyasu Nishiyama Date: Mon, 30 Jan 2023 10:30:06 +0900 Subject: [PATCH 1/3] fix workspace reference error in case of empty tabs --- .../@node-red/editor-client/src/js/ui/workspaces.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d274ba519..4e95ede63 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 @@ -195,7 +195,7 @@ RED.workspaces = (function() { ) } const currentTabs = workspace_tabs.listTabs() - const activeIndex = currentTabs.findIndex(id => id === activeWorkspace.id) + const activeIndex = currentTabs.findIndex(id => (activeWorkspace && (id === activeWorkspace.id))); menuItems.push( { label: RED._("workspace.moveToStart"), From 9b1b7437b3c97d1524b03aa040ef745aafedf520 Mon Sep 17 00:00:00 2001 From: Hiroyasu Nishiyama Date: Mon, 30 Jan 2023 10:59:34 +0900 Subject: [PATCH 2/3] disable delete tab menu when single tab exists --- .../@node-red/editor-client/src/js/ui/workspaces.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 d274ba519..7327fa59e 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 @@ -266,7 +266,8 @@ RED.workspaces = (function() { } else if (tab.type === 'subflow') { RED.subflow.delete(tab.id) } - } + }, + disabled: (workspaceTabCount === 1) }, { label: RED._("menu.label.export"), From 013ee2f1f47bb92e8f878c65eea2fc7b73a15e50 Mon Sep 17 00:00:00 2001 From: Hiroyasu Nishiyama Date: Mon, 30 Jan 2023 16:24:52 +0900 Subject: [PATCH 3/3] fix hide subflow tooltip --- .../@node-red/editor-client/locales/en-US/editor.json | 1 + .../node_modules/@node-red/editor-client/locales/ja/editor.json | 1 + .../@node-red/editor-client/src/js/ui/common/tabs.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 9ffde4df0..ccab81cf0 100755 --- 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 @@ -55,6 +55,7 @@ "dropFlowHere": "Drop the flow here", "addFlow": "Add flow", "addFlowToRight": "Add flow to the right", + "closeFlow": "Close flow", "hideFlow": "Hide flow", "hideOtherFlows": "Hide other flows", "showAllFlows": "Show all flows (__count__ hidden)", 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 5bd7de5a4..5117e10e1 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 @@ -55,6 +55,7 @@ "dropFlowHere": "ここにフローをドロップしてください", "addFlow": "フローの追加", "addFlowToRight": "右側にフローを追加", + "closeFlow": "フローを閉じる", "hideFlow": "フローを非表示", "hideOtherFlows": "他のフローを非表示", "showAllFlows": "全てのフローを表示", diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js index a8e7ea727..4aa6ac232 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js @@ -829,7 +829,7 @@ RED.tabs = (function() { event.preventDefault(); removeTab(tab.id); }); - RED.popover.tooltip(closeLink,RED._("workspace.hideFlow")); + RED.popover.tooltip(closeLink,RED._("workspace.closeFlow")); } // if (tab.hideable) { // li.addClass("red-ui-tabs-closeable")