[CB] Remove tooltips from context menu

webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx

@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -48,20 +48,14 @@ export const MenuItemElement = observer<IMenuItemElementProps>(function MenuItem
   loading = useStateDelay(loading, 300);
 
   return (
-    <button {...rest} className={s(styles, { menuPanelItem: true }, rest.className)} title={tooltip ? translate(tooltip) : title}>
+    <button {...rest} className={s(styles, { menuPanelItem: true }, rest.className)} title={translate(tooltip)}>
       <div className={s(styles, { menuItemMain: true })}>
         <div className={s(styles, { menuItemIcon: true })}>
           <Loader className={s(styles, { loader: true })} suspense small fullSize>
             {typeof icon === 'string' ? <IconOrImage className={s(styles, { iconOrImage: true })} icon={icon} /> : icon}
           </Loader>
         </div>
-        {!onlyIcons ? (
-          <div className={s(styles, { menuItemText: true })} title={title}>
-            {title}
-          </div>
-        ) : (
-          <div />
-        )}
+        {!onlyIcons ? <div className={s(styles, { menuItemText: true })}>{title}</div> : <div />}
         <div className={s(styles, { menuItemBinding: true })} title={binding}>
           {binding}
         </div>

webapp/packages/core-blocks/src/index.ts

@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -10,22 +10,22 @@
 
 export * from './AuthenticationProviderLoader.js';
 export * from './useAuthenticationAction.js';
 export * from './CommonDialog/CommonDialog/CommonDialogBody.js';
 export * from './CommonDialog/CommonDialog/CommonDialogFooter.js';
 export * from './CommonDialog/CommonDialog/CommonDialogHeader.js';
 export * from './CommonDialog/CommonDialog/CommonDialogWrapper.js';
 export * from './CommonDialog/ConfirmationDialog.js';
 export { default as ConfirmationDialogStyles } from './CommonDialog/ConfirmationDialog.module.css';
 export * from './CommonDialog/ConfirmationDialogDelete.js';
 export * from './CommonDialog/RenameDialog.js';
 export * from './CommonDialog/DialogsPortal.js';
 export * from './ExportImageDialog/ExportImageDialogLazy.js';
 export * from './ExportImageDialog/ExportImageFormats.js';
 
 export * from './ErrorDetailsDialog/ErrorDetailsDialog.js';
 
 export * from './ComponentsRegistry/CRegistryLoader.js';
 export * from './ComponentsRegistry/registry.js';
 export * from './ComponentsRegistry/CRegistryList.js';
 export * from './ComponentsRegistry/IComponentsTreeNodeValidator.js';
 export * from './ComponentsRegistry/useParentProps.js';

webapp/packages/core-ui/src/ContextMenu/MenuActionElement.tsx

@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.

webapp/packages/core-view/package.json

@@ -19,6 +19,7 @@
     "build": "tsc -b",
     "clean": "rimraf --glob lib",
     "lint": "eslint ./src/ --ext .ts,.tsx",
+    "test": "dbeaver-test",
     "validate-dependencies": "core-cli-validate-dependencies"
   },
   "dependencies": {
@@ -37,10 +38,14 @@
   },
   "devDependencies": {
     "@cloudbeaver/core-cli": "workspace:*",
+    "@cloudbeaver/tests-runner": "workspace:*",
     "@cloudbeaver/tsconfig": "workspace:*",
+    "@dbeaver/cli": "workspace:*",
+    "@dbeaver/react-tests": "workspace:*",
     "@types/react": "^19",
     "rimraf": "^6",
     "typescript": "^5",
-    "typescript-plugin-css-modules": "^5"
+    "typescript-plugin-css-modules": "^5",
+    "vitest": "^4"
   }
 }

webapp/packages/core-view/src/Action/Actions/ACTION_EXPORT.ts

@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2024 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -9,5 +9,4 @@ import { createAction } from '../createAction.js';
 
 export const ACTION_EXPORT = createAction('export', {
   label: 'ui_export',
-  tooltip: 'ui_export',
 });

webapp/packages/core-view/src/Action/KeyBinding/getBindingLabel.ts

@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.

webapp/packages/core-view/src/Action/KeyBinding/getCommonAndOSSpecificKeys.ts

@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2024 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -13,33 +13,25 @@ export function getCommonAndOSSpecificKeys(keyBinding: IKeyBinding | undefined):
   if (keyBinding === undefined) {
     return [];
   }
-  const specificKeys = getOSSpecificKeys(keyBinding);
-  let keys: string[] = [];
 
-  if (keyBinding.keys !== undefined) {
-    keys = Array.isArray(keyBinding.keys) ? keyBinding.keys : [keyBinding.keys];
-  }
-
-  if (specificKeys !== undefined) {
-    if (Array.isArray(specificKeys)) {
-      keys.push(...specificKeys);
-    } else {
-      keys.push(specificKeys);
-    }
-  }
-
-  return keys;
+  return [...getOSSpecificKeys(keyBinding), ...getKeys(keyBinding.keys)];
 }
 
-export function getOSSpecificKeys(keyBinding: IKeyBinding): string | string[] | undefined {
+export function getOSSpecificKeys(keyBinding: IKeyBinding): string[] {
   const OS = getOS();
+  const keys: string[] = [];
+
   if (OS === OperatingSystem.windowsOS) {
-    return keyBinding.keysWin;
+    keys.push(...getKeys(keyBinding.keysWin));
   }
 
   if (OS === OperatingSystem.macOS) {
-    return keyBinding.keysMac;
+    keys.push(...getKeys(keyBinding.keysMac));
   }
 
-  return undefined;
+  return keys;
+}
+
+function getKeys(keys: string[] | string | undefined): string[] {
+  return Array.isArray(keys) ? keys : [keys ?? ''].filter(Boolean);
 }

webapp/packages/core-view/src/Menu/getMenuLabelClipped.test.ts

@@ -0,0 +1,104 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { describe, expect, it } from 'vitest';
+
+import { getMenuLabelClipped } from './getMenuLabelClipped.js';
+
+describe('getMenuLabelClipped', () => {
+  it('should return original label and no tooltip when label is shorter than limiter', () => {
+    const result = getMenuLabelClipped('Short label', 8, 30);
+    expect(result.clippedLabel).toBe('Short label');
+    expect(result.tooltip).toBeUndefined();
+  });
+
+  it('should clip label and return tooltip when label exceeds limiter', () => {
+    const longLabel = 'This is a very long label that exceeds the limiter';
+    const result = getMenuLabelClipped(longLabel, 8, 30);
+    expect(result.clippedLabel).not.toBe(longLabel);
+    expect(result.clippedLabel).toContain(' ... ');
+    expect(result.tooltip).toBe(longLabel);
+  });
+
+  it('should use default sideLength of 8 when not provided', () => {
+    const longLabel = 'This is a very long label that exceeds the limiter';
+    const result = getMenuLabelClipped(longLabel, undefined, 30);
+    expect(result.clippedLabel).toMatch(/^.{8} \.\.\. .{8}$/);
+    expect(result.tooltip).toBe(longLabel);
+  });
+
+  it('should use default limiter of 30 when not provided', () => {
+    const label = '12345678901234567890123456789'; // exactly 29 characters
+    const result = getMenuLabelClipped(label, 8);
+    expect(result.clippedLabel).toBe(label);
+    expect(result.tooltip).toBeUndefined();
+  });
+
+  it('should use custom sideLength', () => {
+    const longLabel = 'This is a very long label that exceeds the limiter';
+    const result = getMenuLabelClipped(longLabel, 5, 30);
+    expect(result.clippedLabel).toMatch(/^.{5} \.\.\. .{5}$/);
+    expect(result.tooltip).toBe(longLabel);
+  });
+
+  it('should use custom limiter', () => {
+    const label = '1234567890123456789'; // exactly 19 characters
+    const result = getMenuLabelClipped(label, 8, 20);
+    expect(result.clippedLabel).toBe(label);
+    expect(result.tooltip).toBeUndefined();
+  });
+
+  it('should handle label exactly at limiter length', () => {
+    const label = '123456789012345678901234567890'; // exactly 30 characters
+    const result = getMenuLabelClipped(label, 8, 30);
+    expect(result.clippedLabel).toBe('12345678 ... 34567890');
+    expect(result.tooltip).toBe(label);
+  });
+
+  it('should handle label one character longer than limiter', () => {
+    const label = '1234567890123456789012345678901'; // 31 characters
+    const result = getMenuLabelClipped(label, 8, 30);
+    expect(result.clippedLabel).not.toBe(label);
+    expect(result.clippedLabel).toContain(' ... ');
+    expect(result.tooltip).toBe(label);
+  });
+
+  it('should handle very long labels', () => {
+    const veryLongLabel = 'A'.repeat(100);
+    const result = getMenuLabelClipped(veryLongLabel, 8, 30);
+    expect(result.clippedLabel.length).toBeLessThan(veryLongLabel.length);
+    expect(result.clippedLabel).toContain(' ... ');
+    expect(result.tooltip).toBe(veryLongLabel);
+  });
+
+  it('should handle empty string', () => {
+    const result = getMenuLabelClipped('', 8, 30);
+    expect(result.clippedLabel).toBe('');
+    expect(result.tooltip).toBeUndefined();
+  });
+
+  it('should handle sideLength of 0', () => {
+    const longLabel = 'This is a very long label that exceeds the limiter';
+    const result = getMenuLabelClipped(longLabel, 0, 30);
+    expect(result.clippedLabel).toContain(' ... ');
+    expect(result.tooltip).toBe(longLabel);
+  });
+
+  it('should handle very small sideLength', () => {
+    const longLabel = 'This is a very long label that exceeds the limiter';
+    const result = getMenuLabelClipped(longLabel, 2, 30);
+    expect(result.clippedLabel).toMatch(/^.{2} \.\.\. .{2}$/);
+    expect(result.tooltip).toBe(longLabel);
+  });
+
+  it('should handle large sideLength', () => {
+    const longLabel = 'This is a very long label that exceeds the limiter';
+    const result = getMenuLabelClipped(longLabel, 15, 30);
+    expect(result.clippedLabel).toMatch(/^.{15} \.\.\. .{15}$/);
+    expect(result.tooltip).toBe(longLabel);
+  });
+});

webapp/packages/core-view/src/Menu/getMenuLabelClipped.ts

@@ -0,0 +1,19 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { replaceMiddle } from '@cloudbeaver/core-utils';
+
+export function getMenuLabelClipped(
+  label: string,
+  sideLength: number = 8,
+  limiter: number = 30,
+): { clippedLabel: string; tooltip: string | undefined } {
+  const clippedLabel = replaceMiddle(label, ' ... ', sideLength, limiter);
+  const tooltip = clippedLabel !== label ? label : undefined;
+
+  return { clippedLabel, tooltip };
+}

webapp/packages/core-view/src/index.ts

@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -76,6 +76,7 @@ export * from './Menu/IMenu.js';
 export * from './Menu/IMenuInfo.js';
 export * from './Menu/menuExtractItems.js';
 export * from './Menu/menuItemsPlaceAfter.js';
+export * from './Menu/getMenuLabelClipped.js';
 export * from './Menu/MenuService.js';
 export * from './Menu/useMenu.js';
 export * from './Menu/useMenuContext.js';

webapp/packages/core-view/tsconfig.json

@@ -7,6 +7,12 @@
     "composite": true
   },
   "references": [
+    {
+      "path": "../../common-react/@dbeaver/react-tests"
+    },
+    {
+      "path": "../../common-typescript/@dbeaver/cli"
+    },
     {
       "path": "../../common-typescript/@dbeaver/js-helpers"
     },
@@ -30,6 +36,9 @@
     },
     {
       "path": "../core-utils"
+    },
+    {
+      "path": "../tests-runner"
     }
   ],
   "include": [

webapp/packages/plugin-connections/src/Actions/ACTION_TREE_CREATE_CONNECTION.ts

@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -9,5 +9,4 @@ import { createAction } from '@cloudbeaver/core-view';
 
 export const ACTION_TREE_CREATE_CONNECTION = createAction('create-tree-connection', {
   label: 'plugin_connections_connection_create_menu_title',
-  tooltip: 'plugin_connections_connection_create_menu_title',
 });

webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Actions/Filters/ACTION_DATA_GRID_FILTERS_RESET_OR_SORTING.ts

@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -9,6 +9,5 @@ import { createAction } from '@cloudbeaver/core-view';
 
 export const ACTION_DATA_GRID_FILTERS_RESET_OR_SORTING = createAction('data-grid-filters-or-sorting-reset', {
   label: 'data_grid_table_delete_filters_and_orders',
-  tooltip: 'data_grid_table_delete_filters_and_orders',
   icon: 'erase',
 });

webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuCellEditingService.ts

@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@ import {
   IDatabaseDataViewAction,
   isBooleanValuePresentationAvailable,
   isResultSetDataSource,
+  KEY_BINDING_DELETE_ROW,
   ResultSetDataContentAction,
   type IDatabaseValueHolder,
   type IGridDataKey,
@@ -221,6 +222,14 @@ export class DataGridContextMenuCellEditingService {
       return { ...action.info, label: t('data_grid_table_editing_open_inline_editor'), icon: 'edit' };
     }
 
+    if (action === ACTION_DATA_GRID_EDITING_DELETE_ROW) {
+      return {
+        ...action.info,
+        label: t('data_grid_table_editing_row_delete'),
+        tooltip: t('data_grid_table_editing_row_delete') + ' (' + getBindingLabel(KEY_BINDING_DELETE_ROW) + ')',
+      };
+    }
+
     return action.info;
   }
 }