CB-2647 fix: localization and submenu mark

This commit is contained in:
Aleksey Potsetsuev
2022-11-08 20:15:35 +03:00
parent fdd2add2d1
commit 3db5ec1b7e
8 changed files with 15 additions and 3 deletions
@@ -201,10 +201,12 @@ const SubMenuItem = observer<ISubMenuItemProps>(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)(
<ContextMenu
@@ -232,7 +234,7 @@ const SubMenuItem = observer<ISubMenuItemProps>(function SubmenuItem({
loading={loading}
disabled={disabled}
style={style}
displaySubmenuMark={!disabled}
displaySubmenuMark={panelAvailable}
{...use({ hidden: item.hidden })}
/>
)}
@@ -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'
);
@@ -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',
}
);
@@ -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'],
];
@@ -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'],
];
@@ -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 Редактор'],
];
@@ -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'],
];
@@ -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'
);