From 3db5ec1b7ec17ff7502bb81ce33a5bc8a7772db4 Mon Sep 17 00:00:00 2001 From: Aleksey Potsetsuev Date: Tue, 8 Nov 2022 20:15:35 +0300 Subject: [PATCH] CB-2647 fix: localization and submenu mark --- webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBar.tsx | 4 +++- .../plugin-connections/src/ContextMenu/MENU_CONNECTIONS.ts | 3 ++- .../src/ACTION_SQL_EDITOR_NEW.ts | 1 + .../plugin-sql-editor-navigation-tab/src/locales/en.ts | 1 + .../plugin-sql-editor-navigation-tab/src/locales/it.ts | 2 ++ .../plugin-sql-editor-navigation-tab/src/locales/ru.ts | 2 ++ .../plugin-sql-editor-navigation-tab/src/locales/zh.ts | 2 ++ webapp/packages/plugin-tools-panel/src/Menu/MENU_TOOLS.ts | 3 ++- 8 files changed, 15 insertions(+), 3 deletions(-) diff --git a/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBar.tsx b/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBar.tsx index 82617bb8eb..030ca29c23 100644 --- a/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBar.tsx +++ b/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBar.tsx @@ -201,10 +201,12 @@ const SubMenuItem = observer(function SubmenuItem({ const extraProps = handler?.getExtraProps?.() ?? item.getExtraProps?.() as any; /** @deprecated must be refactored (#1)*/ const displayLabel = getComputed(() => handler?.isLabelVisible?.(subMenuData.context, subMenuData.menu) ?? true); + const loaded = getComputed(() => !subMenuData.loaders.some(loader => !loader.isLoaded())); const info = handler?.getInfo?.(subMenuData.context, subMenuData.menu); const label = info?.label ?? item.label ?? item.menu.label; const icon = info?.icon ?? item.icon ?? item.menu.icon; const tooltip = info?.tooltip ?? item.tooltip ?? item.menu.tooltip; + const panelAvailable = subMenuData.available || !loaded; return styled(styles)( (function SubmenuItem({ loading={loading} disabled={disabled} style={style} - displaySubmenuMark={!disabled} + displaySubmenuMark={panelAvailable} {...use({ hidden: item.hidden })} /> )} diff --git a/webapp/packages/plugin-connections/src/ContextMenu/MENU_CONNECTIONS.ts b/webapp/packages/plugin-connections/src/ContextMenu/MENU_CONNECTIONS.ts index 1b811d0a63..9f918182aa 100644 --- a/webapp/packages/plugin-connections/src/ContextMenu/MENU_CONNECTIONS.ts +++ b/webapp/packages/plugin-connections/src/ContextMenu/MENU_CONNECTIONS.ts @@ -11,5 +11,6 @@ import { createMenu } from '@cloudbeaver/core-view'; export const MENU_CONNECTIONS = createMenu( 'connections', 'plugin_connections_menu_connections_label', - '/icons/plugin_connections_menu_m.svg' + '/icons/plugin_connections_menu_m.svg', + 'plugin_connections_menu_connections_label' ); diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/ACTION_SQL_EDITOR_NEW.ts b/webapp/packages/plugin-sql-editor-navigation-tab/src/ACTION_SQL_EDITOR_NEW.ts index c6b6f3f516..03d1f6ca5f 100644 --- a/webapp/packages/plugin-sql-editor-navigation-tab/src/ACTION_SQL_EDITOR_NEW.ts +++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/ACTION_SQL_EDITOR_NEW.ts @@ -13,5 +13,6 @@ export const ACTION_SQL_EDITOR_NEW = createAction( { label: 'plugin_sql_editor_navigation_tab_action_sql_editor_new', icon: '/icons/plugin_sql_editor_navigation_tab_new_m.svg', + tooltip: 'plugin_sql_editor_navigation_tab_action_sql_editor_new_tooltip', } ); diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/locales/en.ts b/webapp/packages/plugin-sql-editor-navigation-tab/src/locales/en.ts index c205985613..3afbfcc31c 100644 --- a/webapp/packages/plugin-sql-editor-navigation-tab/src/locales/en.ts +++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/locales/en.ts @@ -1,3 +1,4 @@ export default [ ['plugin_sql_editor_navigation_tab_action_sql_editor_new', 'SQL'], + ['plugin_sql_editor_navigation_tab_action_sql_editor_new_tooltip', 'Open SQL Editor'], ]; diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/locales/it.ts b/webapp/packages/plugin-sql-editor-navigation-tab/src/locales/it.ts index 9f25cb126f..3afbfcc31c 100644 --- a/webapp/packages/plugin-sql-editor-navigation-tab/src/locales/it.ts +++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/locales/it.ts @@ -1,2 +1,4 @@ export default [ + ['plugin_sql_editor_navigation_tab_action_sql_editor_new', 'SQL'], + ['plugin_sql_editor_navigation_tab_action_sql_editor_new_tooltip', 'Open SQL Editor'], ]; diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/locales/ru.ts b/webapp/packages/plugin-sql-editor-navigation-tab/src/locales/ru.ts index 9f25cb126f..10aa38a1ae 100644 --- a/webapp/packages/plugin-sql-editor-navigation-tab/src/locales/ru.ts +++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/locales/ru.ts @@ -1,2 +1,4 @@ export default [ + ['plugin_sql_editor_navigation_tab_action_sql_editor_new', 'SQL'], + ['plugin_sql_editor_navigation_tab_action_sql_editor_new_tooltip', 'Открыть SQL Редактор'], ]; diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/locales/zh.ts b/webapp/packages/plugin-sql-editor-navigation-tab/src/locales/zh.ts index 9f25cb126f..3afbfcc31c 100644 --- a/webapp/packages/plugin-sql-editor-navigation-tab/src/locales/zh.ts +++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/locales/zh.ts @@ -1,2 +1,4 @@ export default [ + ['plugin_sql_editor_navigation_tab_action_sql_editor_new', 'SQL'], + ['plugin_sql_editor_navigation_tab_action_sql_editor_new_tooltip', 'Open SQL Editor'], ]; diff --git a/webapp/packages/plugin-tools-panel/src/Menu/MENU_TOOLS.ts b/webapp/packages/plugin-tools-panel/src/Menu/MENU_TOOLS.ts index 9683d6bb73..b42b4ac92e 100644 --- a/webapp/packages/plugin-tools-panel/src/Menu/MENU_TOOLS.ts +++ b/webapp/packages/plugin-tools-panel/src/Menu/MENU_TOOLS.ts @@ -11,5 +11,6 @@ import { createMenu } from '@cloudbeaver/core-view'; export const MENU_TOOLS = createMenu( 'tools', 'plugin_tools_panel_menu_title', - '/icons/plugin_tools_panel_m.svg' + '/icons/plugin_tools_panel_m.svg', + 'plugin_tools_panel_menu_title' );