From 93a598bf7933fa7b0bc0b5afedb56a521e353848 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Tue, 6 Jan 2026 11:20:44 +0100
Subject: [PATCH 01/12] dbeaver/pro#7772 adds truncated tooltips for context
 menus

---
 .../core-blocks/src/Menu/MenuItemElement.tsx  | 15 ++---
 webapp/packages/core-blocks/src/index.ts      |  3 +-
 .../core-blocks/src/useTruncatedTooltip.ts    | 60 +++++++++++++++++++
 3 files changed, 70 insertions(+), 8 deletions(-)
 create mode 100644 webapp/packages/core-blocks/src/useTruncatedTooltip.ts

diff --git a/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx b/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx
index 66533a72265..314db503d08 100644
--- a/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx
+++ b/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx
@@ -1,11 +1,12 @@
 /*
  * 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.
  */
 import { observer } from 'mobx-react-lite';
+import { type HTMLAttributes, useRef } from 'react';
 
 import { Icon } from '../Icon.js';
 import { IconOrImage } from '../IconOrImage.js';
@@ -14,8 +15,8 @@ import { useTranslate } from '../localization/useTranslate.js';
 import { s } from '../s.js';
 import { useS } from '../useS.js';
 import { useStateDelay } from '../useStateDelay.js';
+import { useTruncatedTooltip } from '../useTruncatedTooltip.js';
 import style from './MenuItemElement.module.css';
-import type { HTMLAttributes } from 'react';
 
 export interface IMenuItemGroupArrowElementProps extends HTMLAttributes<HTMLButtonElement> {}
 
@@ -43,12 +44,12 @@ export const MenuItemElement = observer<IMenuItemElementProps>(function MenuItem
 }) {
   const styles = useS(style);
   const translate = useTranslate();
-
-  const title = translate(label);
+  const textRef = useRef<HTMLDivElement | null>(null);
+  const truncatedLabel = useTruncatedTooltip(textRef, label);
   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={tooltip || truncatedLabel}>
       <div className={s(styles, { menuItemMain: true })}>
         <div className={s(styles, { menuItemIcon: true })}>
           <Loader className={s(styles, { loader: true })} suspense small fullSize>
@@ -56,8 +57,8 @@ export const MenuItemElement = observer<IMenuItemElementProps>(function MenuItem
           </Loader>
         </div>
         {!onlyIcons ? (
-          <div className={s(styles, { menuItemText: true })} title={title}>
-            {title}
+          <div ref={textRef} className={s(styles, { menuItemText: true })}>
+            {translate(label)}
           </div>
         ) : (
           <div />
diff --git a/webapp/packages/core-blocks/src/index.ts b/webapp/packages/core-blocks/src/index.ts
index 01abe042c44..6cb8148e53d 100644
--- a/webapp/packages/core-blocks/src/index.ts
+++ b/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.
@@ -231,6 +231,7 @@ export * from './usePermission.js';
 export * from './usePromiseState.js';
 export * from './useS.js';
 export * from './useStateDelay.js';
+export * from './useTruncatedTooltip.js';
 export * from './useErrorDetails.js';
 export * from './useActivationDelay.js';
 export * from './useAdministrationSettings.js';
diff --git a/webapp/packages/core-blocks/src/useTruncatedTooltip.ts b/webapp/packages/core-blocks/src/useTruncatedTooltip.ts
new file mode 100644
index 00000000000..0c5c481e521
--- /dev/null
+++ b/webapp/packages/core-blocks/src/useTruncatedTooltip.ts
@@ -0,0 +1,60 @@
+/*
+ * 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 { useEffect, useRef, useState } from 'react';
+
+import { useTranslate } from './localization/useTranslate.js';
+
+export function useTruncatedTooltip(ref: React.RefObject<HTMLDivElement | null>, tooltip: string | undefined): string | undefined {
+  const [isTextTruncated, setIsTextTruncated] = useState(false);
+  const translate = useTranslate();
+  const observerRef = useRef<ResizeObserver | null>(null);
+  const elementRef = useRef<HTMLDivElement | null>(null);
+
+  function checkTruncation() {
+    if (elementRef.current) {
+      setIsTextTruncated(elementRef.current.scrollWidth > elementRef.current.clientWidth);
+    }
+  }
+
+  useEffect(() => {
+    const element = ref.current;
+
+    if (elementRef.current === element) {
+      return;
+    }
+
+    if (observerRef.current) {
+      observerRef.current.disconnect();
+      observerRef.current = null;
+    }
+
+    elementRef.current = element;
+
+    if (!element) {
+      return;
+    }
+
+    checkTruncation();
+
+    const resizeObserver = new ResizeObserver(checkTruncation);
+    resizeObserver.observe(element);
+    observerRef.current = resizeObserver;
+
+    return () => {
+      resizeObserver.disconnect();
+    };
+  });
+
+  const translatedTooltip = tooltip ? translate(tooltip) : undefined;
+
+  if (isTextTruncated && translatedTooltip) {
+    return translatedTooltip;
+  }
+
+  return;
+}

From a7365de65d37643b74f93b870664b526703e5052 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Thu, 8 Jan 2026 13:47:38 +0100
Subject: [PATCH 02/12] dbeaver/pro#7772 adds " ... " for long labels

---
 .../core-blocks/src/Menu/MenuItemElement.tsx  | 17 ++----
 webapp/packages/core-blocks/src/index.ts      |  1 -
 .../core-blocks/src/useTruncatedTooltip.ts    | 60 -------------------
 .../core-view/src/Menu/getMenuLabelClipped.ts | 19 ++++++
 webapp/packages/core-view/src/index.ts        |  3 +-
 .../DataGridContextMenuFilterService.ts       | 31 ++++++----
 .../ConnectionSchemaManagerBootstrap.ts       | 28 +++++----
 .../src/NavigationTreeFiltersBootstrap.ts     | 10 +++-
 .../SqlGenerators/SqlGeneratorsBootstrap.ts   | 39 ++++++------
 9 files changed, 91 insertions(+), 117 deletions(-)
 delete mode 100644 webapp/packages/core-blocks/src/useTruncatedTooltip.ts
 create mode 100644 webapp/packages/core-view/src/Menu/getMenuLabelClipped.ts

diff --git a/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx b/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx
index 314db503d08..465f39d46f6 100644
--- a/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx
+++ b/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx
@@ -6,7 +6,6 @@
  * you may not use this file except in compliance with the License.
  */
 import { observer } from 'mobx-react-lite';
-import { type HTMLAttributes, useRef } from 'react';
 
 import { Icon } from '../Icon.js';
 import { IconOrImage } from '../IconOrImage.js';
@@ -15,8 +14,8 @@ import { useTranslate } from '../localization/useTranslate.js';
 import { s } from '../s.js';
 import { useS } from '../useS.js';
 import { useStateDelay } from '../useStateDelay.js';
-import { useTruncatedTooltip } from '../useTruncatedTooltip.js';
 import style from './MenuItemElement.module.css';
+import type { HTMLAttributes } from 'react';
 
 export interface IMenuItemGroupArrowElementProps extends HTMLAttributes<HTMLButtonElement> {}
 
@@ -44,25 +43,19 @@ export const MenuItemElement = observer<IMenuItemElementProps>(function MenuItem
 }) {
   const styles = useS(style);
   const translate = useTranslate();
-  const textRef = useRef<HTMLDivElement | null>(null);
-  const truncatedLabel = useTruncatedTooltip(textRef, label);
+
+  const title = translate(label);
   loading = useStateDelay(loading, 300);
 
   return (
-    <button {...rest} className={s(styles, { menuPanelItem: true }, rest.className)} title={tooltip || truncatedLabel}>
+    <button {...rest} className={s(styles, { menuPanelItem: true }, rest.className)} title={tooltip ? translate(tooltip) : undefined}>
       <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 ref={textRef} className={s(styles, { menuItemText: true })}>
-            {translate(label)}
-          </div>
-        ) : (
-          <div />
-        )}
+        {!onlyIcons ? <div className={s(styles, { menuItemText: true })}>{title}</div> : <div />}
         <div className={s(styles, { menuItemBinding: true })} title={binding}>
           {binding}
         </div>
diff --git a/webapp/packages/core-blocks/src/index.ts b/webapp/packages/core-blocks/src/index.ts
index 6cb8148e53d..f4cffa91ba2 100644
--- a/webapp/packages/core-blocks/src/index.ts
+++ b/webapp/packages/core-blocks/src/index.ts
@@ -231,7 +231,6 @@ export * from './usePermission.js';
 export * from './usePromiseState.js';
 export * from './useS.js';
 export * from './useStateDelay.js';
-export * from './useTruncatedTooltip.js';
 export * from './useErrorDetails.js';
 export * from './useActivationDelay.js';
 export * from './useAdministrationSettings.js';
diff --git a/webapp/packages/core-blocks/src/useTruncatedTooltip.ts b/webapp/packages/core-blocks/src/useTruncatedTooltip.ts
deleted file mode 100644
index 0c5c481e521..00000000000
--- a/webapp/packages/core-blocks/src/useTruncatedTooltip.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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 { useEffect, useRef, useState } from 'react';
-
-import { useTranslate } from './localization/useTranslate.js';
-
-export function useTruncatedTooltip(ref: React.RefObject<HTMLDivElement | null>, tooltip: string | undefined): string | undefined {
-  const [isTextTruncated, setIsTextTruncated] = useState(false);
-  const translate = useTranslate();
-  const observerRef = useRef<ResizeObserver | null>(null);
-  const elementRef = useRef<HTMLDivElement | null>(null);
-
-  function checkTruncation() {
-    if (elementRef.current) {
-      setIsTextTruncated(elementRef.current.scrollWidth > elementRef.current.clientWidth);
-    }
-  }
-
-  useEffect(() => {
-    const element = ref.current;
-
-    if (elementRef.current === element) {
-      return;
-    }
-
-    if (observerRef.current) {
-      observerRef.current.disconnect();
-      observerRef.current = null;
-    }
-
-    elementRef.current = element;
-
-    if (!element) {
-      return;
-    }
-
-    checkTruncation();
-
-    const resizeObserver = new ResizeObserver(checkTruncation);
-    resizeObserver.observe(element);
-    observerRef.current = resizeObserver;
-
-    return () => {
-      resizeObserver.disconnect();
-    };
-  });
-
-  const translatedTooltip = tooltip ? translate(tooltip) : undefined;
-
-  if (isTextTruncated && translatedTooltip) {
-    return translatedTooltip;
-  }
-
-  return;
-}
diff --git a/webapp/packages/core-view/src/Menu/getMenuLabelClipped.ts b/webapp/packages/core-view/src/Menu/getMenuLabelClipped.ts
new file mode 100644
index 00000000000..c035710f2e3
--- /dev/null
+++ b/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 };
+}
diff --git a/webapp/packages/core-view/src/index.ts b/webapp/packages/core-view/src/index.ts
index cba87731eea..90536fd8a85 100644
--- a/webapp/packages/core-view/src/index.ts
+++ b/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';
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts
index a0e34dc3105..d34d1e607c0 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.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,8 +9,7 @@ import { importLazyComponent } from '@cloudbeaver/core-blocks';
 import { injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 import { ClipboardService } from '@cloudbeaver/core-ui';
-import { replaceMiddle } from '@cloudbeaver/core-utils';
-import { ActionService, MenuBaseItem, MenuService } from '@cloudbeaver/core-view';
+import { ActionService, getMenuLabelClipped, MenuBaseItem, MenuService } from '@cloudbeaver/core-view';
 import {
   DATA_CONTEXT_DV_DDM,
   DATA_CONTEXT_DV_DDM_RESULT_INDEX,
@@ -113,14 +112,16 @@ export class DataGridContextMenuFilterService {
 
         for (const filter of [IS_NULL_ID, IS_NOT_NULL_ID]) {
           const label = `${resultColumn ? `"${resultColumn.label}" ` : ''}${filter.split('_').join(' ')}`;
+          const { clippedLabel, tooltip } = getMenuLabelClipped(label);
 
           if (supportedOperations.some(operation => operation.id === filter)) {
             result.push(
               new MenuBaseItem(
                 {
                   id: filter,
-                  label,
+                  label: clippedLabel,
                   icon: 'filter',
+                  tooltip,
                 },
                 {
                   onSelect: async () => {
@@ -190,9 +191,13 @@ export class DataGridContextMenuFilterService {
         const resultColumn = data.getColumn(key.column) as SqlResultColumn | undefined;
 
         if (action === ACTION_DATA_GRID_FILTER_DELETE_FOR_COLUMN) {
+          const label = localizationService.translate('data_grid_table_filter_delete_for_column', undefined, { column: resultColumn?.name ?? '' });
+          const { clippedLabel, tooltip } = getMenuLabelClipped(label);
+
           return {
             ...action.info,
-            label: localizationService.translate('data_grid_table_filter_delete_for_column', undefined, { column: resultColumn?.name ?? '' }),
+            label: clippedLabel,
+            tooltip,
           };
         }
 
@@ -261,13 +266,15 @@ export class DataGridContextMenuFilterService {
           .filter(operation => !nullOperationsFilter(operation))
           .map(operation => {
             const wrappedValue = wrapOperationArgument(operation.id, cellValue);
-            const clippedValue = replaceMiddle(wrappedValue, ' ... ', 8, 30);
+            const fullLabel = `${columnLabel} ${operation.expression} ${wrappedValue}`;
+            const { clippedLabel, tooltip } = getMenuLabelClipped(fullLabel);
 
             return new MenuBaseItem(
               {
                 id: operation.id,
-                label: `${columnLabel} ${operation.expression} ${clippedValue}`,
+                label: clippedLabel,
                 icon: 'filter',
+                tooltip,
               },
               {
                 onSelect: async () => {
@@ -318,12 +325,14 @@ export class DataGridContextMenuFilterService {
           .filter(operation => !nullOperationsFilter(operation))
           .map(operation => {
             const title = `${columnLabel} ${operation.expression}`;
+            const { clippedLabel, tooltip } = getMenuLabelClipped(title);
 
             return new MenuBaseItem(
               {
                 id: operation.id,
-                label: title + ' ..',
+                label: clippedLabel + ' ..',
                 icon: 'filter-custom',
+                tooltip,
               },
               {
                 onSelect: async () => {
@@ -408,11 +417,11 @@ export class DataGridContextMenuFilterService {
             .map(operation => {
               const val = this.clipboardService.clipboardValue || '';
               const wrappedValue = wrapOperationArgument(operation.id, val);
-              const clippedValue = replaceMiddle(wrappedValue, ' ... ', 8, 30);
-              const label = `${columnLabel} ${operation.expression} ${clippedValue}`;
+              const label = `${columnLabel} ${operation.expression} ${wrappedValue}`;
+              const { clippedLabel, tooltip } = getMenuLabelClipped(label);
 
               return new MenuBaseItem(
-                { id: operation.id, icon: 'filter-clipboard', label },
+                { id: operation.id, icon: 'filter-clipboard', label: clippedLabel, tooltip },
                 {
                   onSelect: async () => {
                     const wrappedValue = wrapOperationArgument(operation.id, val);
diff --git a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.ts b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.ts
index db399f9b0f1..50b079901d7 100644
--- a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.ts
+++ b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.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.
@@ -23,7 +23,7 @@ import { EObjectFeature, NodeManagerUtils } from '@cloudbeaver/core-navigation-t
 import { ProjectsService } from '@cloudbeaver/core-projects';
 import { getCachedMapResourceLoaderState } from '@cloudbeaver/core-resource';
 import { ContextMenuSearchItem, DATA_CONTEXT_MENU_SEARCH, OptionsPanelService } from '@cloudbeaver/core-ui';
-import { MenuBaseItem, menuExtractItems, MenuSeparatorItem, MenuService } from '@cloudbeaver/core-view';
+import { getMenuLabelClipped, MenuBaseItem, menuExtractItems, MenuSeparatorItem, MenuService } from '@cloudbeaver/core-view';
 import { MENU_APP_ACTIONS } from '@cloudbeaver/plugin-top-app-bar';
 
 import { ConnectionSchemaManagerService } from './ConnectionSchemaManagerService.js';
@@ -88,10 +88,12 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
       getInfo: (context, menu) => {
         const connection = this.connectionSchemaManagerService.currentConnection;
         const label = connection?.name || 'plugin_datasource_context_switch_select_connection';
+        const { clippedLabel: clippedLabel, tooltip } = getMenuLabelClipped(label);
 
         return {
           ...menu,
-          label,
+          label: clippedLabel,
+          tooltip,
         };
       },
       iconComponent: () => ConnectionIcon,
@@ -158,11 +160,12 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
         for (const connection of connections) {
           const connectionKey = createConnectionParam(connection);
 
+          const { clippedLabel } = getMenuLabelClipped(connection.name);
           items.push(
             new MenuBaseItem<IConnectionSelectorExtraProps>(
               {
                 id: serializeConnectionParam(connectionKey),
-                label: connection.name,
+                label: clippedLabel,
                 tooltip: connection.description,
               },
               {
@@ -226,6 +229,8 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
           label = 'plugin_datasource_context_switch_select_container';
         }
 
+        const { clippedLabel } = getMenuLabelClipped(label);
+
         if (!connectionSchemaManagerService.currentObjectSchema && !connectionSchemaManagerService.currentObjectCatalog) {
           icon = undefined;
         } else if (connectionSchemaManagerService.currentObjectSchema?.object?.features?.includes(EObjectFeature.schema)) {
@@ -242,7 +247,7 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
         return {
           ...menu,
           icon,
-          label,
+          label: clippedLabel,
           tooltip,
         };
       },
@@ -313,11 +318,12 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
             continue;
           }
 
+          const { clippedLabel } = getMenuLabelClipped(schemaName);
           items.push(
             new MenuBaseItem(
               {
                 id: schemaName,
-                label: schemaName,
+                label: clippedLabel,
                 tooltip: schemaName,
                 icon: '/icons/plugin_datasource_context_switch_schema_contrast_sm.svg',
               },
@@ -350,6 +356,7 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
 
           if (catalogData.schemaList.length === 0) {
             const excluded = !!filter && !catalogName.toLowerCase().includes(filter.toLowerCase());
+            const { clippedLabel, tooltip } = getMenuLabelClipped(catalogName);
 
             if (excluded) {
               continue;
@@ -359,8 +366,8 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
               new MenuBaseItem(
                 {
                   id: catalogName,
-                  label: catalogName,
-                  tooltip: catalogName,
+                  label: clippedLabel,
+                  tooltip,
                   icon: '/icons/plugin_datasource_context_switch_database_contrast_sm.svg',
                 },
                 {
@@ -382,6 +389,7 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
 
             const title = NodeManagerUtils.concatSchemaAndCatalog(catalog.name, schema.name);
             const excluded = !!filter && !title.toLowerCase().includes(filter.toLowerCase());
+            const { clippedLabel, tooltip } = getMenuLabelClipped(title);
 
             if (excluded) {
               continue;
@@ -391,8 +399,8 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
               new MenuBaseItem(
                 {
                   id: title,
-                  label: title,
-                  tooltip: title,
+                  label: clippedLabel,
+                  tooltip,
                   icon: '/icons/plugin_datasource_context_switch_schema_contrast_sm.svg',
                 },
                 {
diff --git a/webapp/packages/plugin-navigation-tree-filters/src/NavigationTreeFiltersBootstrap.ts b/webapp/packages/plugin-navigation-tree-filters/src/NavigationTreeFiltersBootstrap.ts
index c9fcfdc984f..40a3576f4b6 100644
--- a/webapp/packages/plugin-navigation-tree-filters/src/NavigationTreeFiltersBootstrap.ts
+++ b/webapp/packages/plugin-navigation-tree-filters/src/NavigationTreeFiltersBootstrap.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.
@@ -11,7 +11,7 @@ import { CommonDialogService } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 import { DATA_CONTEXT_NAV_NODE, ENodeFeature, NavTreeResource } from '@cloudbeaver/core-navigation-tree';
-import { DATA_CONTEXT_MENU, MenuBaseItem, MenuService } from '@cloudbeaver/core-view';
+import { DATA_CONTEXT_MENU, getMenuLabelClipped, MenuBaseItem, MenuService } from '@cloudbeaver/core-view';
 
 import { MENU_NAVIGATION_TREE_FILTERS } from './MENU_NAVIGATION_TREE_FILTERS.js';
 
@@ -52,11 +52,15 @@ export class NavigationTreeFiltersBootstrap extends Bootstrap {
       contexts: [DATA_CONTEXT_NAV_NODE],
       getItems: (context, items) => {
         const node = context.get(DATA_CONTEXT_NAV_NODE)!;
+        const translatedLabel =
+          this.localizationService.translate('plugin_navigation_tree_filters_configuration', undefined, { name: node.name }) + '...';
+        const { clippedLabel, tooltip } = getMenuLabelClipped(translatedLabel);
         const actions = [
           new MenuBaseItem(
             {
               id: 'configure-filter',
-              label: this.localizationService.translate('plugin_navigation_tree_filters_configuration', undefined, { name: node.name }) + '...',
+              label: clippedLabel,
+              tooltip,
             },
             {
               onSelect: async () => {
diff --git a/webapp/packages/plugin-sql-generator/src/SqlGenerators/SqlGeneratorsBootstrap.ts b/webapp/packages/plugin-sql-generator/src/SqlGenerators/SqlGeneratorsBootstrap.ts
index e4ca129c8dd..96fd2157f0e 100644
--- a/webapp/packages/plugin-sql-generator/src/SqlGenerators/SqlGeneratorsBootstrap.ts
+++ b/webapp/packages/plugin-sql-generator/src/SqlGenerators/SqlGeneratorsBootstrap.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,7 +10,7 @@ import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService } from '@cloudbeaver/core-dialogs';
 import { DATA_CONTEXT_NAV_NODE, EObjectFeature } from '@cloudbeaver/core-navigation-tree';
 import { getCachedMapResourceLoaderState } from '@cloudbeaver/core-resource';
-import { MenuBaseItem, MenuService } from '@cloudbeaver/core-view';
+import { getMenuLabelClipped, MenuBaseItem, MenuService } from '@cloudbeaver/core-view';
 
 import { MENU_SQL_GENERATORS } from './MENU_SQL_GENERATORS.js';
 import { SqlGeneratorsResource } from './SqlGeneratorsResource.js';
@@ -68,24 +68,25 @@ export class SqlGeneratorsBootstrap extends Bootstrap {
 
         return [
           ...items,
-          ...actions.map(
-            action =>
-              new MenuBaseItem(
-                {
-                  id: action.id,
-                  label: action.label,
-                  tooltip: action.description,
-                },
-                {
-                  onSelect: () => {
-                    this.commonDialogService.open(GeneratedSqlDialog, {
-                      generatorId: action.id,
-                      pathId: node.id,
-                    });
-                  },
+          ...actions.map(action => {
+            const { clippedLabel, tooltip } = getMenuLabelClipped(action.label);
+
+            return new MenuBaseItem(
+              {
+                id: action.id,
+                label: clippedLabel,
+                tooltip,
+              },
+              {
+                onSelect: () => {
+                  this.commonDialogService.open(GeneratedSqlDialog, {
+                    generatorId: action.id,
+                    pathId: node.id,
+                  });
                 },
-              ),
-          ),
+              },
+            );
+          }),
         ];
       },
     });

From 178dfe81a34b6c7bfb5606035eff87433cf470b3 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Thu, 8 Jan 2026 14:16:29 +0100
Subject: [PATCH 03/12] adds unit tests

---
 webapp/packages/core-view/package.json        |   7 +-
 .../src/Menu/getMenuLabelClipped.test.ts      | 104 ++++++++++++++++++
 webapp/packages/core-view/tsconfig.json       |   9 ++
 .../ConnectionSchemaManagerBootstrap.ts       |   7 +-
 webapp/yarn.lock                              |   4 +
 5 files changed, 127 insertions(+), 4 deletions(-)
 create mode 100644 webapp/packages/core-view/src/Menu/getMenuLabelClipped.test.ts

diff --git a/webapp/packages/core-view/package.json b/webapp/packages/core-view/package.json
index d6654037540..d3bbe5dd482 100644
--- a/webapp/packages/core-view/package.json
+++ b/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"
   }
 }
diff --git a/webapp/packages/core-view/src/Menu/getMenuLabelClipped.test.ts b/webapp/packages/core-view/src/Menu/getMenuLabelClipped.test.ts
new file mode 100644
index 00000000000..bb4c9271e48
--- /dev/null
+++ b/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);
+  });
+});
diff --git a/webapp/packages/core-view/tsconfig.json b/webapp/packages/core-view/tsconfig.json
index 8d4ba678614..96e2c7b25c0 100644
--- a/webapp/packages/core-view/tsconfig.json
+++ b/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": [
diff --git a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.ts b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.ts
index 50b079901d7..7527eb767ef 100644
--- a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.ts
+++ b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.ts
@@ -88,7 +88,7 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
       getInfo: (context, menu) => {
         const connection = this.connectionSchemaManagerService.currentConnection;
         const label = connection?.name || 'plugin_datasource_context_switch_select_connection';
-        const { clippedLabel: clippedLabel, tooltip } = getMenuLabelClipped(label);
+        const { clippedLabel, tooltip } = getMenuLabelClipped(label);
 
         return {
           ...menu,
@@ -318,13 +318,14 @@ export class ConnectionSchemaManagerBootstrap extends Bootstrap {
             continue;
           }
 
-          const { clippedLabel } = getMenuLabelClipped(schemaName);
+          const { clippedLabel, tooltip } = getMenuLabelClipped(schemaName);
+
           items.push(
             new MenuBaseItem(
               {
                 id: schemaName,
                 label: clippedLabel,
-                tooltip: schemaName,
+                tooltip,
                 icon: '/icons/plugin_datasource_context_switch_schema_contrast_sm.svg',
               },
               {
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 5d8442e5fb5..9e5e0611fe9 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2311,8 +2311,11 @@ __metadata:
     "@cloudbeaver/core-extensions": "workspace:*"
     "@cloudbeaver/core-localization": "workspace:*"
     "@cloudbeaver/core-utils": "workspace:*"
+    "@cloudbeaver/tests-runner": "workspace:*"
     "@cloudbeaver/tsconfig": "workspace:*"
+    "@dbeaver/cli": "workspace:*"
     "@dbeaver/js-helpers": "workspace:*"
+    "@dbeaver/react-tests": "workspace:*"
     "@types/react": "npm:^19"
     mobx: "npm:^6"
     mobx-react-lite: "npm:^4"
@@ -2322,6 +2325,7 @@ __metadata:
     tslib: "npm:^2"
     typescript: "npm:^5"
     typescript-plugin-css-modules: "npm:^5"
+    vitest: "npm:^4"
   languageName: unknown
   linkType: soft
 

From e0e4162a6c7f40795a35a1203e3c850ec4526bc0 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Thu, 8 Jan 2026 16:28:50 +0100
Subject: [PATCH 04/12] Update
 webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx

Co-authored-by: Alexey Potsetsuev <wrouds@gmail.com>
---
 webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx b/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx
index 465f39d46f6..ab24509df55 100644
--- a/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx
+++ b/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx
@@ -48,7 +48,7 @@ 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) : undefined}>
+    <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>

From 67ad19b29a0dfb473fec310f96de6ca772230f77 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Fri, 9 Jan 2026 11:49:17 +0100
Subject: [PATCH 05/12] adds binding for delete row

---
 .../src/ContextMenu/MenuActionElement.tsx       |  6 +++---
 .../src/Action/KeyBinding/getBindingLabel.ts    |  7 ++++---
 .../KeyBinding/getCommonAndOSSpecificKeys.ts    |  4 ++--
 .../DataGridContextMenuCellEditingService.ts    | 17 +++++++++++++----
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/webapp/packages/core-ui/src/ContextMenu/MenuActionElement.tsx b/webapp/packages/core-ui/src/ContextMenu/MenuActionElement.tsx
index c061a4a8dbb..d932c91987b 100644
--- a/webapp/packages/core-ui/src/ContextMenu/MenuActionElement.tsx
+++ b/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.
@@ -8,7 +8,7 @@
 import { observer } from 'mobx-react-lite';
 
 import { Checkbox, getComputed, Radio, registry, useTranslate, type IMenuItemElementProps } from '@cloudbeaver/core-blocks';
-import { getBindingLabel, type IMenuActionItem, type IMenuInfo } from '@cloudbeaver/core-view';
+import { getBindingLabels, type IMenuActionItem, type IMenuInfo } from '@cloudbeaver/core-view';
 import type { IContextMenuItemProps } from './IContextMenuItemProps.js';
 import { MenuItem, MenuItemCheckbox, MenuItemRadio } from '@dbeaver/ui-kit';
 import { useCallback } from 'react';
@@ -40,7 +40,7 @@ export const MenuActionElement = registry(
     const loading = getComputed(() => item.action.isLoading());
     let binding: string | undefined;
     if (item.action.binding !== null) {
-      binding = getBindingLabel(item.action.binding.binding);
+      binding = getBindingLabels(item.action.binding.binding);
     }
 
     const label = translate(actionInfo.label);
diff --git a/webapp/packages/core-view/src/Action/KeyBinding/getBindingLabel.ts b/webapp/packages/core-view/src/Action/KeyBinding/getBindingLabel.ts
index e4fe2fe94cb..9eb748df818 100644
--- a/webapp/packages/core-view/src/Action/KeyBinding/getBindingLabel.ts
+++ b/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.
@@ -32,6 +32,7 @@ const FORMAT_SHORTCUT_KEYS_MAP: Record<string, string> = {
 };
 const SOURCE_DIVIDER_REGEXP = /\+/gi;
 const APPLIED_DIVIDER = ' + ';
+const BINDINGS_DIVIDER = ' | ';
 
 function transformKeys(keyBinding: IKeyBinding): string[] {
   return getCommonAndOSSpecificKeys(keyBinding).map(shortcut =>
@@ -62,6 +63,6 @@ function formatKeyToDisplayKey(code: string): string {
   }
 }
 
-export function getBindingLabel(binding: IKeyBinding): string | undefined {
-  return transformKeys(binding)[0];
+export function getBindingLabels(binding: IKeyBinding): string | undefined {
+  return transformKeys(binding).join(BINDINGS_DIVIDER);
 }
diff --git a/webapp/packages/core-view/src/Action/KeyBinding/getCommonAndOSSpecificKeys.ts b/webapp/packages/core-view/src/Action/KeyBinding/getCommonAndOSSpecificKeys.ts
index 306091b0088..05ccf872455 100644
--- a/webapp/packages/core-view/src/Action/KeyBinding/getCommonAndOSSpecificKeys.ts
+++ b/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.
@@ -28,7 +28,7 @@ export function getCommonAndOSSpecificKeys(keyBinding: IKeyBinding | undefined):
     }
   }
 
-  return keys;
+  return Array.from(new Set(keys));
 }
 
 export function getOSSpecificKeys(keyBinding: IKeyBinding): string | string[] | undefined {
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuCellEditingService.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuCellEditingService.ts
index 0caaf233af9..edaced67f7b 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuCellEditingService.ts
+++ b/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.
@@ -9,7 +9,7 @@ import { injectable } from '@cloudbeaver/core-di';
 import {
   ACTION_EDIT,
   ActionService,
-  getBindingLabel,
+  getBindingLabels,
   KEY_BINDING_ADD,
   KEY_BINDING_DUPLICATE,
   MenuService,
@@ -30,6 +30,7 @@ import {
   IDatabaseDataViewAction,
   isBooleanValuePresentationAvailable,
   isResultSetDataSource,
+  KEY_BINDING_DELETE_ROW,
   ResultSetDataContentAction,
   type IDatabaseValueHolder,
   type IGridDataKey,
@@ -206,14 +207,14 @@ export class DataGridContextMenuCellEditingService {
       return {
         ...action.info,
         label: 'data_grid_table_editing_row_add',
-        tooltip: t('data_grid_table_editing_row_add') + ' (' + getBindingLabel(KEY_BINDING_ADD) + ')',
+        tooltip: t('data_grid_table_editing_row_add') + ' (' + getBindingLabels(KEY_BINDING_ADD) + ')',
       };
     }
     if (action === ACTION_DATA_GRID_EDITING_DUPLICATE_ROW) {
       return {
         ...action.info,
         label: 'data_grid_table_editing_row_add_copy',
-        tooltip: t('data_grid_table_editing_row_add_copy') + ' (' + getBindingLabel(KEY_BINDING_DUPLICATE) + ')',
+        tooltip: t('data_grid_table_editing_row_add_copy') + ' (' + getBindingLabels(KEY_BINDING_DUPLICATE) + ')',
       };
     }
 
@@ -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') + ' (' + getBindingLabels(KEY_BINDING_DELETE_ROW) + ')',
+      };
+    }
+
     return action.info;
   }
 }

From c8455bda119dd0ecaeddb495deab0026f853b268 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Fri, 9 Jan 2026 12:44:36 +0100
Subject: [PATCH 06/12] removes tooltips

---
 webapp/packages/core-view/src/Action/Actions/ACTION_EXPORT.ts  | 3 +--
 .../src/Actions/ACTION_TREE_CREATE_CONNECTION.ts               | 3 +--
 .../Filters/ACTION_DATA_GRID_FILTERS_RESET_OR_SORTING.ts       | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/webapp/packages/core-view/src/Action/Actions/ACTION_EXPORT.ts b/webapp/packages/core-view/src/Action/Actions/ACTION_EXPORT.ts
index 24ae1c93fa0..caf262caf97 100644
--- a/webapp/packages/core-view/src/Action/Actions/ACTION_EXPORT.ts
+++ b/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',
 });
diff --git a/webapp/packages/plugin-connections/src/Actions/ACTION_TREE_CREATE_CONNECTION.ts b/webapp/packages/plugin-connections/src/Actions/ACTION_TREE_CREATE_CONNECTION.ts
index a0bea59cca0..7322432016a 100644
--- a/webapp/packages/plugin-connections/src/Actions/ACTION_TREE_CREATE_CONNECTION.ts
+++ b/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',
 });
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Actions/Filters/ACTION_DATA_GRID_FILTERS_RESET_OR_SORTING.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Actions/Filters/ACTION_DATA_GRID_FILTERS_RESET_OR_SORTING.ts
index b91fe2428a8..60b0ce35948 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Actions/Filters/ACTION_DATA_GRID_FILTERS_RESET_OR_SORTING.ts
+++ b/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',
 });

From b2eb3204797b34083bbbb9955d3959d1cd874c3c Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Fri, 9 Jan 2026 16:29:27 +0100
Subject: [PATCH 07/12] fixes tree filters clipping

---
 .../src/NavigationTreeFiltersBootstrap.ts         | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/webapp/packages/plugin-navigation-tree-filters/src/NavigationTreeFiltersBootstrap.ts b/webapp/packages/plugin-navigation-tree-filters/src/NavigationTreeFiltersBootstrap.ts
index 40a3576f4b6..99325cfe263 100644
--- a/webapp/packages/plugin-navigation-tree-filters/src/NavigationTreeFiltersBootstrap.ts
+++ b/webapp/packages/plugin-navigation-tree-filters/src/NavigationTreeFiltersBootstrap.ts
@@ -11,7 +11,7 @@ import { CommonDialogService } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 import { DATA_CONTEXT_NAV_NODE, ENodeFeature, NavTreeResource } from '@cloudbeaver/core-navigation-tree';
-import { DATA_CONTEXT_MENU, getMenuLabelClipped, MenuBaseItem, MenuService } from '@cloudbeaver/core-view';
+import { DATA_CONTEXT_MENU, MenuBaseItem, MenuService } from '@cloudbeaver/core-view';
 
 import { MENU_NAVIGATION_TREE_FILTERS } from './MENU_NAVIGATION_TREE_FILTERS.js';
 
@@ -52,15 +52,18 @@ export class NavigationTreeFiltersBootstrap extends Bootstrap {
       contexts: [DATA_CONTEXT_NAV_NODE],
       getItems: (context, items) => {
         const node = context.get(DATA_CONTEXT_NAV_NODE)!;
-        const translatedLabel =
-          this.localizationService.translate('plugin_navigation_tree_filters_configuration', undefined, { name: node.name }) + '...';
-        const { clippedLabel, tooltip } = getMenuLabelClipped(translatedLabel);
+        const nodeName = node?.name || '';
+        const fullLabel = this.localizationService.translate('plugin_navigation_tree_filters_configuration', undefined, { name: nodeName });
+        const isLongNodeName = nodeName?.length > 10;
+        const label = `${isLongNodeName ? fullLabel.replace(nodeName, nodeName.slice(0, 3) + '...') : fullLabel}...`;
+        const tooltip = isLongNodeName ? fullLabel : undefined;
+
         const actions = [
           new MenuBaseItem(
             {
               id: 'configure-filter',
-              label: clippedLabel,
-              tooltip,
+              label,
+              tooltip: tooltip,
             },
             {
               onSelect: async () => {

From cd3ee3d95cb61d220f68e09d6e306534026f93b8 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Mon, 12 Jan 2026 15:07:58 +0100
Subject: [PATCH 08/12] clips only names, not whole labels

---
 .../DataGridContextMenuFilterService.ts       | 25 ++++++++-----
 .../src/NavigationTreeFiltersBootstrap.ts     | 15 ++++----
 .../SqlGenerators/SqlGeneratorsBootstrap.ts   | 37 +++++++++----------
 3 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts
index d34d1e607c0..d1da5186d59 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts
@@ -191,8 +191,11 @@ export class DataGridContextMenuFilterService {
         const resultColumn = data.getColumn(key.column) as SqlResultColumn | undefined;
 
         if (action === ACTION_DATA_GRID_FILTER_DELETE_FOR_COLUMN) {
-          const label = localizationService.translate('data_grid_table_filter_delete_for_column', undefined, { column: resultColumn?.name ?? '' });
-          const { clippedLabel, tooltip } = getMenuLabelClipped(label);
+          const columnName = resultColumn?.name ?? '';
+          const { clippedLabel: clippedColumnName } = getMenuLabelClipped(columnName);
+          const clippedLabel = localizationService.translate('data_grid_table_filter_delete_for_column', undefined, { column: clippedColumnName });
+          const fullLabel = localizationService.translate('data_grid_table_filter_delete_for_column', undefined, { column: columnName });
+          const tooltip = fullLabel !== clippedLabel ? fullLabel : undefined;
 
           return {
             ...action.info,
@@ -266,15 +269,15 @@ export class DataGridContextMenuFilterService {
           .filter(operation => !nullOperationsFilter(operation))
           .map(operation => {
             const wrappedValue = wrapOperationArgument(operation.id, cellValue);
+            const { clippedLabel: clippedValue } = getMenuLabelClipped(wrappedValue);
             const fullLabel = `${columnLabel} ${operation.expression} ${wrappedValue}`;
-            const { clippedLabel, tooltip } = getMenuLabelClipped(fullLabel);
 
             return new MenuBaseItem(
               {
                 id: operation.id,
-                label: clippedLabel,
+                label: clippedValue,
                 icon: 'filter',
-                tooltip,
+                tooltip: fullLabel !== clippedValue ? fullLabel : undefined,
               },
               {
                 onSelect: async () => {
@@ -324,21 +327,23 @@ export class DataGridContextMenuFilterService {
         const filters = supportedOperations
           .filter(operation => !nullOperationsFilter(operation))
           .map(operation => {
-            const title = `${columnLabel} ${operation.expression}`;
-            const { clippedLabel, tooltip } = getMenuLabelClipped(title);
+            const { clippedLabel: clippedColumnLabel } = getMenuLabelClipped(columnLabel);
+            const fullLabel = `${columnLabel} ${operation.expression}..`;
+            const label = `${clippedColumnLabel} ${operation.expression}..`;
+            const tooltip = fullLabel !== label ? fullLabel : undefined;
 
             return new MenuBaseItem(
               {
                 id: operation.id,
-                label: clippedLabel + ' ..',
-                icon: 'filter-custom',
+                label,
                 tooltip,
+                icon: 'filter-custom',
               },
               {
                 onSelect: async () => {
                   const { status, result } = await this.commonDialogService.open(FilterCustomValueDialog, {
                     defaultValue: displayString,
-                    inputTitle: title + ':',
+                    inputTitle: label + ':',
                   });
 
                   if (status === DialogueStateResult.Resolved && result !== undefined) {
diff --git a/webapp/packages/plugin-navigation-tree-filters/src/NavigationTreeFiltersBootstrap.ts b/webapp/packages/plugin-navigation-tree-filters/src/NavigationTreeFiltersBootstrap.ts
index 99325cfe263..064d71e90a3 100644
--- a/webapp/packages/plugin-navigation-tree-filters/src/NavigationTreeFiltersBootstrap.ts
+++ b/webapp/packages/plugin-navigation-tree-filters/src/NavigationTreeFiltersBootstrap.ts
@@ -11,7 +11,7 @@ import { CommonDialogService } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { LocalizationService } from '@cloudbeaver/core-localization';
 import { DATA_CONTEXT_NAV_NODE, ENodeFeature, NavTreeResource } from '@cloudbeaver/core-navigation-tree';
-import { DATA_CONTEXT_MENU, MenuBaseItem, MenuService } from '@cloudbeaver/core-view';
+import { DATA_CONTEXT_MENU, getMenuLabelClipped, MenuBaseItem, MenuService } from '@cloudbeaver/core-view';
 
 import { MENU_NAVIGATION_TREE_FILTERS } from './MENU_NAVIGATION_TREE_FILTERS.js';
 
@@ -52,18 +52,17 @@ export class NavigationTreeFiltersBootstrap extends Bootstrap {
       contexts: [DATA_CONTEXT_NAV_NODE],
       getItems: (context, items) => {
         const node = context.get(DATA_CONTEXT_NAV_NODE)!;
-        const nodeName = node?.name || '';
-        const fullLabel = this.localizationService.translate('plugin_navigation_tree_filters_configuration', undefined, { name: nodeName });
-        const isLongNodeName = nodeName?.length > 10;
-        const label = `${isLongNodeName ? fullLabel.replace(nodeName, nodeName.slice(0, 3) + '...') : fullLabel}...`;
-        const tooltip = isLongNodeName ? fullLabel : undefined;
+        const { clippedLabel: clippedNodeName } = getMenuLabelClipped(node.name ?? '');
+        const fullLabel = this.localizationService.translate('plugin_navigation_tree_filters_configuration', undefined, { name: node.name ?? '' });
+        const clippedLabel = this.localizationService.translate('plugin_navigation_tree_filters_configuration', undefined, { name: clippedNodeName });
+        const tooltip = fullLabel !== clippedLabel ? fullLabel : undefined;
 
         const actions = [
           new MenuBaseItem(
             {
               id: 'configure-filter',
-              label,
-              tooltip: tooltip,
+              label: `${clippedLabel}...`,
+              tooltip,
             },
             {
               onSelect: async () => {
diff --git a/webapp/packages/plugin-sql-generator/src/SqlGenerators/SqlGeneratorsBootstrap.ts b/webapp/packages/plugin-sql-generator/src/SqlGenerators/SqlGeneratorsBootstrap.ts
index 96fd2157f0e..25a96a035c0 100644
--- a/webapp/packages/plugin-sql-generator/src/SqlGenerators/SqlGeneratorsBootstrap.ts
+++ b/webapp/packages/plugin-sql-generator/src/SqlGenerators/SqlGeneratorsBootstrap.ts
@@ -10,7 +10,7 @@ import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService } from '@cloudbeaver/core-dialogs';
 import { DATA_CONTEXT_NAV_NODE, EObjectFeature } from '@cloudbeaver/core-navigation-tree';
 import { getCachedMapResourceLoaderState } from '@cloudbeaver/core-resource';
-import { getMenuLabelClipped, MenuBaseItem, MenuService } from '@cloudbeaver/core-view';
+import { MenuBaseItem, MenuService } from '@cloudbeaver/core-view';
 
 import { MENU_SQL_GENERATORS } from './MENU_SQL_GENERATORS.js';
 import { SqlGeneratorsResource } from './SqlGeneratorsResource.js';
@@ -68,25 +68,24 @@ export class SqlGeneratorsBootstrap extends Bootstrap {
 
         return [
           ...items,
-          ...actions.map(action => {
-            const { clippedLabel, tooltip } = getMenuLabelClipped(action.label);
-
-            return new MenuBaseItem(
-              {
-                id: action.id,
-                label: clippedLabel,
-                tooltip,
-              },
-              {
-                onSelect: () => {
-                  this.commonDialogService.open(GeneratedSqlDialog, {
-                    generatorId: action.id,
-                    pathId: node.id,
-                  });
+          ...actions.map(
+            action =>
+              new MenuBaseItem(
+                {
+                  id: action.id,
+                  label: action.label,
+                  tooltip: action.description,
+                },
+                {
+                  onSelect: () => {
+                    this.commonDialogService.open(GeneratedSqlDialog, {
+                      generatorId: action.id,
+                      pathId: node.id,
+                    });
+                  },
                 },
-              },
-            );
-          }),
+              ),
+          ),
         ];
       },
     });

From 1e01d0485091f184b64c0666f3f1ae0d8bbb6c56 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Mon, 12 Jan 2026 15:19:37 +0100
Subject: [PATCH 09/12] clips only names, not whole labels [2]

---
 .../DataGridContextMenuFilterService.ts                     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts
index d1da5186d59..a38050c7147 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts
@@ -422,8 +422,10 @@ export class DataGridContextMenuFilterService {
             .map(operation => {
               const val = this.clipboardService.clipboardValue || '';
               const wrappedValue = wrapOperationArgument(operation.id, val);
-              const label = `${columnLabel} ${operation.expression} ${wrappedValue}`;
-              const { clippedLabel, tooltip } = getMenuLabelClipped(label);
+              const { clippedLabel: clippedValue } = getMenuLabelClipped(wrappedValue);
+              const clippedLabel = `${columnLabel} ${operation.expression} ${clippedValue}`;
+              const fullLabel = `${columnLabel} ${operation.expression} ${wrappedValue}`;
+              const tooltip = fullLabel !== clippedLabel ? fullLabel : undefined;
 
               return new MenuBaseItem(
                 { id: operation.id, icon: 'filter-clipboard', label: clippedLabel, tooltip },

From f3c996daa46723a4f708d058c342c7c985c7455c Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Mon, 12 Jan 2026 15:47:07 +0100
Subject: [PATCH 10/12] reverts getBindingLabels + fixes the os specific keys
 to show it first

---
 .../core-ui/src/ContextMenu/MenuActionElement.tsx         | 4 ++--
 .../core-view/src/Action/KeyBinding/getBindingLabel.ts    | 5 ++---
 .../src/Action/KeyBinding/getCommonAndOSSpecificKeys.ts   | 7 ++++---
 .../DataGridContextMenuCellEditingService.ts              | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/webapp/packages/core-ui/src/ContextMenu/MenuActionElement.tsx b/webapp/packages/core-ui/src/ContextMenu/MenuActionElement.tsx
index d932c91987b..1f2f28dcf99 100644
--- a/webapp/packages/core-ui/src/ContextMenu/MenuActionElement.tsx
+++ b/webapp/packages/core-ui/src/ContextMenu/MenuActionElement.tsx
@@ -8,7 +8,7 @@
 import { observer } from 'mobx-react-lite';
 
 import { Checkbox, getComputed, Radio, registry, useTranslate, type IMenuItemElementProps } from '@cloudbeaver/core-blocks';
-import { getBindingLabels, type IMenuActionItem, type IMenuInfo } from '@cloudbeaver/core-view';
+import { getBindingLabel, type IMenuActionItem, type IMenuInfo } from '@cloudbeaver/core-view';
 import type { IContextMenuItemProps } from './IContextMenuItemProps.js';
 import { MenuItem, MenuItemCheckbox, MenuItemRadio } from '@dbeaver/ui-kit';
 import { useCallback } from 'react';
@@ -40,7 +40,7 @@ export const MenuActionElement = registry(
     const loading = getComputed(() => item.action.isLoading());
     let binding: string | undefined;
     if (item.action.binding !== null) {
-      binding = getBindingLabels(item.action.binding.binding);
+      binding = getBindingLabel(item.action.binding.binding);
     }
 
     const label = translate(actionInfo.label);
diff --git a/webapp/packages/core-view/src/Action/KeyBinding/getBindingLabel.ts b/webapp/packages/core-view/src/Action/KeyBinding/getBindingLabel.ts
index 9eb748df818..06088ee3e0a 100644
--- a/webapp/packages/core-view/src/Action/KeyBinding/getBindingLabel.ts
+++ b/webapp/packages/core-view/src/Action/KeyBinding/getBindingLabel.ts
@@ -32,7 +32,6 @@ const FORMAT_SHORTCUT_KEYS_MAP: Record<string, string> = {
 };
 const SOURCE_DIVIDER_REGEXP = /\+/gi;
 const APPLIED_DIVIDER = ' + ';
-const BINDINGS_DIVIDER = ' | ';
 
 function transformKeys(keyBinding: IKeyBinding): string[] {
   return getCommonAndOSSpecificKeys(keyBinding).map(shortcut =>
@@ -63,6 +62,6 @@ function formatKeyToDisplayKey(code: string): string {
   }
 }
 
-export function getBindingLabels(binding: IKeyBinding): string | undefined {
-  return transformKeys(binding).join(BINDINGS_DIVIDER);
+export function getBindingLabel(binding: IKeyBinding): string | undefined {
+  return transformKeys(binding)[0];
 }
diff --git a/webapp/packages/core-view/src/Action/KeyBinding/getCommonAndOSSpecificKeys.ts b/webapp/packages/core-view/src/Action/KeyBinding/getCommonAndOSSpecificKeys.ts
index 05ccf872455..af6731fbc75 100644
--- a/webapp/packages/core-view/src/Action/KeyBinding/getCommonAndOSSpecificKeys.ts
+++ b/webapp/packages/core-view/src/Action/KeyBinding/getCommonAndOSSpecificKeys.ts
@@ -14,6 +14,7 @@ export function getCommonAndOSSpecificKeys(keyBinding: IKeyBinding | undefined):
     return [];
   }
   const specificKeys = getOSSpecificKeys(keyBinding);
+  const specificKeysFlat: string[] = [];
   let keys: string[] = [];
 
   if (keyBinding.keys !== undefined) {
@@ -22,13 +23,13 @@ export function getCommonAndOSSpecificKeys(keyBinding: IKeyBinding | undefined):
 
   if (specificKeys !== undefined) {
     if (Array.isArray(specificKeys)) {
-      keys.push(...specificKeys);
+      specificKeysFlat.push(...specificKeys);
     } else {
-      keys.push(specificKeys);
+      specificKeysFlat.push(specificKeys);
     }
   }
 
-  return Array.from(new Set(keys));
+  return [...specificKeysFlat, ...keys];
 }
 
 export function getOSSpecificKeys(keyBinding: IKeyBinding): string | string[] | undefined {
diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuCellEditingService.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuCellEditingService.ts
index edaced67f7b..45b98c54587 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuCellEditingService.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuCellEditingService.ts
@@ -9,7 +9,7 @@ import { injectable } from '@cloudbeaver/core-di';
 import {
   ACTION_EDIT,
   ActionService,
-  getBindingLabels,
+  getBindingLabel,
   KEY_BINDING_ADD,
   KEY_BINDING_DUPLICATE,
   MenuService,
@@ -207,14 +207,14 @@ export class DataGridContextMenuCellEditingService {
       return {
         ...action.info,
         label: 'data_grid_table_editing_row_add',
-        tooltip: t('data_grid_table_editing_row_add') + ' (' + getBindingLabels(KEY_BINDING_ADD) + ')',
+        tooltip: t('data_grid_table_editing_row_add') + ' (' + getBindingLabel(KEY_BINDING_ADD) + ')',
       };
     }
     if (action === ACTION_DATA_GRID_EDITING_DUPLICATE_ROW) {
       return {
         ...action.info,
         label: 'data_grid_table_editing_row_add_copy',
-        tooltip: t('data_grid_table_editing_row_add_copy') + ' (' + getBindingLabels(KEY_BINDING_DUPLICATE) + ')',
+        tooltip: t('data_grid_table_editing_row_add_copy') + ' (' + getBindingLabel(KEY_BINDING_DUPLICATE) + ')',
       };
     }
 
@@ -226,7 +226,7 @@ export class DataGridContextMenuCellEditingService {
       return {
         ...action.info,
         label: t('data_grid_table_editing_row_delete'),
-        tooltip: t('data_grid_table_editing_row_delete') + ' (' + getBindingLabels(KEY_BINDING_DELETE_ROW) + ')',
+        tooltip: t('data_grid_table_editing_row_delete') + ' (' + getBindingLabel(KEY_BINDING_DELETE_ROW) + ')',
       };
     }
 

From 34d169601d13333ee71acc9f8083082b48965e76 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Mon, 12 Jan 2026 16:03:01 +0100
Subject: [PATCH 11/12] clips only names, not whole labels [3]

---
 .../DataGridContextMenuFilterService.ts             | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts
index a38050c7147..d88df166d27 100644
--- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts
+++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.ts
@@ -111,17 +111,19 @@ export class DataGridContextMenuFilterService {
         const result = [];
 
         for (const filter of [IS_NULL_ID, IS_NOT_NULL_ID]) {
-          const label = `${resultColumn ? `"${resultColumn.label}" ` : ''}${filter.split('_').join(' ')}`;
-          const { clippedLabel, tooltip } = getMenuLabelClipped(label);
+          const { clippedLabel } = getMenuLabelClipped(resultColumn?.label ?? '');
+          const fullLabel = `${resultColumn ? `"${resultColumn.label}" ` : ''}${filter.split('_').join(' ')}`;
+          const label = `${resultColumn ? `"${clippedLabel}" ` : ''}${filter.split('_').join(' ')}`;
+          const tooltip = fullLabel !== label ? fullLabel : undefined;
 
           if (supportedOperations.some(operation => operation.id === filter)) {
             result.push(
               new MenuBaseItem(
                 {
                   id: filter,
-                  label: clippedLabel,
-                  icon: 'filter',
+                  label,
                   tooltip,
+                  icon: 'filter',
                 },
                 {
                   onSelect: async () => {
@@ -271,13 +273,14 @@ export class DataGridContextMenuFilterService {
             const wrappedValue = wrapOperationArgument(operation.id, cellValue);
             const { clippedLabel: clippedValue } = getMenuLabelClipped(wrappedValue);
             const fullLabel = `${columnLabel} ${operation.expression} ${wrappedValue}`;
+            const tooltip = fullLabel !== clippedValue ? fullLabel : undefined;
 
             return new MenuBaseItem(
               {
                 id: operation.id,
                 label: clippedValue,
                 icon: 'filter',
-                tooltip: fullLabel !== clippedValue ? fullLabel : undefined,
+                tooltip,
               },
               {
                 onSelect: async () => {

From 87436248b7217050b578da48a9e3854f2f4f30a6 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Mon, 12 Jan 2026 16:27:49 +0100
Subject: [PATCH 12/12] dbeaver/pro#7772 simplifies keys helpers logic

---
 .../KeyBinding/getCommonAndOSSpecificKeys.ts  | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/webapp/packages/core-view/src/Action/KeyBinding/getCommonAndOSSpecificKeys.ts b/webapp/packages/core-view/src/Action/KeyBinding/getCommonAndOSSpecificKeys.ts
index af6731fbc75..049f4571296 100644
--- a/webapp/packages/core-view/src/Action/KeyBinding/getCommonAndOSSpecificKeys.ts
+++ b/webapp/packages/core-view/src/Action/KeyBinding/getCommonAndOSSpecificKeys.ts
@@ -13,34 +13,25 @@ export function getCommonAndOSSpecificKeys(keyBinding: IKeyBinding | undefined):
   if (keyBinding === undefined) {
     return [];
   }
-  const specificKeys = getOSSpecificKeys(keyBinding);
-  const specificKeysFlat: string[] = [];
-  let keys: string[] = [];
 
-  if (keyBinding.keys !== undefined) {
-    keys = Array.isArray(keyBinding.keys) ? keyBinding.keys : [keyBinding.keys];
-  }
-
-  if (specificKeys !== undefined) {
-    if (Array.isArray(specificKeys)) {
-      specificKeysFlat.push(...specificKeys);
-    } else {
-      specificKeysFlat.push(specificKeys);
-    }
-  }
-
-  return [...specificKeysFlat, ...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);
 }