ydb-embedded-ui 6.10.3 → 6.12.0

package/dist/containers/Tenant/Diagnostics/Diagnostics.js

@@ -78,13 +78,13 @@ function Diagnostics(props) {
                 return _jsx(Network, { tenantName: tenantName });
             }
             case TENANT_DIAGNOSTICS_TABS_IDS.describe: {
-                return _jsx(Describe, { path: path, type: type });
+                return _jsx(Describe, { path: path, database: tenantName, type: type });
             }
             case TENANT_DIAGNOSTICS_TABS_IDS.hotKeys: {
-                return _jsx(HotKeys, { path: path });
+                return _jsx(HotKeys, { path: path, database: tenantName });
             }
             case TENANT_DIAGNOSTICS_TABS_IDS.graph: {
-                return _jsx(Heatmap, { path: path });
+                return _jsx(Heatmap, { path: path, database: tenantName });
             }
             case TENANT_DIAGNOSTICS_TABS_IDS.consumers: {
                 return _jsx(Consumers, { path: path, type: type });

package/dist/containers/Tenant/Diagnostics/Diagnostics.scss

@@ -1,3 +1,5 @@
+@import '../../../styles/mixins.scss';
+
 .kv-tenant-diagnostics {
     display: flex;
     overflow: hidden;
@@ -16,7 +18,7 @@
         justify-content: space-between;
         align-items: center;
 
-        box-shadow: inset 0 -1px 0 0 var(--g-color-line-generic);
+        @include tabs-wrapper-styles();
         & .g-tabs_direction_horizontal {
             box-shadow: unset;
         }

package/dist/containers/Tenant/Diagnostics/HotKeys/HotKeys.d.ts

@@ -1,6 +1,7 @@
 import './HotKeys.scss';
 interface HotKeysProps {
+    database: string;
     path: string;
 }
-export declare function HotKeys({ path }: HotKeysProps): import("react/jsx-runtime").JSX.Element;
+export declare function HotKeys({ path, database }: HotKeysProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/containers/Tenant/Diagnostics/HotKeys/HotKeys.js

@@ -37,11 +37,11 @@ const getHotKeysColumns = (keyColumnsIds = []) => {
         },
     ];
 };
-export function HotKeys({ path }) {
+export function HotKeys({ path, database }) {
     var _a, _b;
-    const { currentData: data, isFetching, error } = hotKeysApi.useGetHotKeysQuery({ path });
+    const { currentData: data, isFetching, error } = hotKeysApi.useGetHotKeysQuery({ path, database });
     const loading = isFetching && data === undefined;
-    const { data: schemaData, isLoading: schemaLoading } = useGetSchemaQuery({ path });
+    const { data: schemaData, isLoading: schemaLoading } = useGetSchemaQuery({ path, database });
     const keyColumnsIds = (_b = (_a = schemaData === null || schemaData === void 0 ? void 0 : schemaData.PathDescription) === null || _a === void 0 ? void 0 : _a.Table) === null || _b === void 0 ? void 0 : _b.KeyColumnNames;
     const tableColumns = React.useMemo(() => {
         return getHotKeysColumns(keyColumnsIds);

package/dist/containers/Tenant/Diagnostics/Overview/Overview.d.ts

@@ -3,6 +3,7 @@ import { EPathType } from '../../../../types/api/schema';
 interface OverviewProps {
     type?: EPathType;
     path: string;
+    database: string;
 }
-declare function Overview({ type, path }: OverviewProps): string | number | true | Iterable<React.ReactNode> | import("react/jsx-runtime").JSX.Element;
+declare function Overview({ type, path, database }: OverviewProps): string | number | true | Iterable<React.ReactNode> | import("react/jsx-runtime").JSX.Element;
 export default Overview;

package/dist/containers/Tenant/Diagnostics/Overview/Overview.js

@@ -16,36 +16,24 @@ import { AsyncReplicationInfo } from './AsyncReplicationInfo';
 import { ChangefeedInfo } from './ChangefeedInfo';
 import { TableInfo } from './TableInfo';
 import { TopicInfo } from './TopicInfo';
-function Overview({ type, path }) {
+function Overview({ type, path, database }) {
     const [autoRefreshInterval] = useAutoRefreshInterval();
-    // FIXME: The request is too heavy, stats table may have millions of items
-    // Disabled until fixed
-    // https://github.com/ydb-platform/ydb-embedded-ui/issues/907
-    // https://github.com/ydb-platform/ydb-embedded-ui/issues/908
-    // const olapParams = isTableType(type) && isColumnEntityType(type) ? {path} : skipToken;
-    // const {currentData: olapData, isFetching: olapIsFetching} = olapApi.useGetOlapStatsQuery(
-    //     olapParams,
-    //     {pollingInterval: autoRefreshInterval},
-    // );
-    // const olapStatsLoading = olapIsFetching && olapData === undefined;
-    // const {result: olapStats} = olapData || {result: undefined};
     const isEntityWithMergedImpl = isEntityWithMergedImplementation(type);
     // shallowEqual prevents rerenders when new schema data is loaded
-    const mergedChildrenPaths = useTypedSelector((state) => selectSchemaMergedChildrenPaths(state, path, type), shallowEqual);
-    let paths = skipToken;
+    const mergedChildrenPaths = useTypedSelector((state) => selectSchemaMergedChildrenPaths(state, path, type, database), shallowEqual);
+    let paths = [];
     if (!isEntityWithMergedImpl) {
         paths = [path];
     }
     else if (mergedChildrenPaths) {
         paths = [path, ...mergedChildrenPaths];
     }
-    const { currentData, isFetching, error: overviewError, } = overviewApi.useGetOverviewQuery(paths, {
+    const { currentData, isFetching, error: overviewError, } = overviewApi.useGetOverviewQuery(paths.length ? { paths, database } : skipToken, {
         pollingInterval: autoRefreshInterval,
     });
     const overviewLoading = isFetching && currentData === undefined;
     const { data: rawData, additionalData } = currentData || {};
-    const { error: schemaError } = useGetSchemaQuery({ path });
-    // overviewLoading || olapStatsLoading
+    const { error: schemaError } = useGetSchemaQuery({ path, database });
     const entityLoading = overviewLoading;
     const entityNotReady = isEntityWithMergedImpl && !mergedChildrenPaths;
     const renderContent = () => {
@@ -72,7 +60,7 @@ function Overview({ type, path }) {
             [EPathType.EPathTypeView]: () => _jsx(ViewInfo, { data: data }),
             [EPathType.EPathTypeReplication]: () => _jsx(AsyncReplicationInfo, { data: data }),
         };
-        return ((type && ((_a = pathTypeToComponent[type]) === null || _a === void 0 ? void 0 : _a.call(pathTypeToComponent))) || (_jsx(TableInfo, { data: data, type: type })));
+        return (type && ((_a = pathTypeToComponent[type]) === null || _a === void 0 ? void 0 : _a.call(pathTypeToComponent))) || _jsx(TableInfo, { data: data, type: type });
     };
     if (entityLoading || entityNotReady) {
         return _jsx(Loader, { size: "m" });

package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/TableInfo.d.ts

@@ -1,10 +1,8 @@
-import type { KeyValueRow } from '../../../../../types/api/query';
 import type { EPathType, TEvDescribeSchemeResult } from '../../../../../types/api/schema';
 import './TableInfo.scss';
 interface TableInfoProps {
     data?: TEvDescribeSchemeResult;
     type?: EPathType;
-    olapStats?: KeyValueRow[];
 }
-export declare const TableInfo: ({ data, type, olapStats }: TableInfoProps) => import("react/jsx-runtime").JSX.Element;
+export declare const TableInfo: ({ data, type }: TableInfoProps) => import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/TableInfo.js

@@ -7,8 +7,8 @@ import i18n from './i18n';
 import { prepareTableInfo } from './prepareTableInfo';
 import './TableInfo.scss';
 const b = cn('ydb-diagnostics-table-info');
-export const TableInfo = ({ data, type, olapStats }) => {
+export const TableInfo = ({ data, type }) => {
     const title = _jsx(EntityTitle, { data: data === null || data === void 0 ? void 0 : data.PathDescription });
-    const { generalInfo, tableStatsInfo, tabletMetricsInfo = [], partitionConfigInfo = [], } = React.useMemo(() => prepareTableInfo(data, type, olapStats), [data, type, olapStats]);
+    const { generalInfo, tableStatsInfo, tabletMetricsInfo = [], partitionConfigInfo = [], } = React.useMemo(() => prepareTableInfo(data, type), [data, type]);
     return (_jsxs("div", { className: b(), children: [_jsx(InfoViewer, { info: generalInfo, title: title, className: b('info-block'), renderEmptyState: () => _jsx("div", { className: b('title'), children: title }) }), _jsxs("div", { className: b('row'), children: [tableStatsInfo ? (_jsx("div", { className: b('col'), children: tableStatsInfo.map((info, index) => (_jsx(InfoViewer, { info: info, title: index === 0 ? i18n('tableStats') : undefined, className: b('info-block'), renderEmptyState: () => null }, index))) })) : null, tabletMetricsInfo.length > 0 || partitionConfigInfo.length > 0 ? (_jsxs("div", { className: b('col'), children: [_jsx(InfoViewer, { info: tabletMetricsInfo, title: i18n('tabletMetrics'), className: b('info-block'), renderEmptyState: () => null }), _jsx(InfoViewer, { info: partitionConfigInfo, title: i18n('partitionConfig'), className: b('info-block'), renderEmptyState: () => null })] })) : null] })] }));
 };

package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/i18n/en.json

@@ -1,5 +1,18 @@
 {
     "tableStats": "Table Stats",
     "tabletMetrics": "Tablet Metrics",
-    "partitionConfig": "Partition Config"
+    "partitionConfig": "Partition Config",
+    "label.ttl": "TTL for rows",
+    "value.ttl": "column: '{{columnName}}', expire after: {{expireTime}}",
+    "label.standalone": "Standalone",
+    "label.partitioning": "Partitioning",
+    "label.partitioning-by-size": "Partitioning by size",
+    "value.partitioning-by-size.enabled": "Enabled, split size: {{size}}",
+    "label.partitioning-by-load": "Partitioning by load",
+    "label.partitions-min": "Min number of partitions",
+    "label.partitions-max": "Max number of partitions",
+    "label.read-replicas": "Read replicas (followers)",
+    "label.bloom-filter": "Bloom filter",
+    "enabled": "Enabled",
+    "disabled": "Disabled"
 }

package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/i18n/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (key: "tableStats" | "tabletMetrics" | "partitionConfig", params?: import("@gravity-ui/i18n").Params) => string;
+declare const _default: (key: "disabled" | "tableStats" | "tabletMetrics" | "partitionConfig" | "label.ttl" | "value.ttl" | "label.standalone" | "label.partitioning" | "label.partitioning-by-size" | "value.partitioning-by-size.enabled" | "label.partitioning-by-load" | "label.partitions-min" | "label.partitions-max" | "label.read-replicas" | "label.bloom-filter" | "enabled", params?: import("@gravity-ui/i18n").Params) => string;
 export default _default;

package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/i18n/index.js

@@ -1,5 +1,4 @@
 import { registerKeysets } from '../../../../../../utils/i18n';
 import en from './en.json';
-import ru from './ru.json';
 const COMPONENT = 'ydb-diagnostics-overview-table-info';
-export default registerKeysets(COMPONENT, { ru, en });
+export default registerKeysets(COMPONENT, { en });

package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/prepareTableInfo.d.ts

@@ -1,16 +1,15 @@
 import type { InfoViewerItem } from '../../../../../components/InfoViewer';
-import type { KeyValueRow } from '../../../../../types/api/query';
 import type { TEvDescribeSchemeResult } from '../../../../../types/api/schema';
 import { EPathType } from '../../../../../types/api/schema';
 /** Prepares data for Table, ColumnTable and ColumnStore */
-export declare const prepareTableInfo: (data?: TEvDescribeSchemeResult, type?: EPathType, olapStats?: KeyValueRow[]) => {
+export declare const prepareTableInfo: (data?: TEvDescribeSchemeResult, type?: EPathType) => {
     generalInfo?: undefined;
     tableStatsInfo?: undefined;
     tabletMetricsInfo?: undefined;
     partitionConfigInfo?: undefined;
 } | {
     generalInfo: InfoViewerItem[];
-    tableStatsInfo: InfoViewerItem[][] | undefined;
+    tableStatsInfo: InfoViewerItem[][];
     tabletMetricsInfo: InfoViewerItem[];
     partitionConfigInfo: InfoViewerItem[];
 };

package/dist/containers/Tenant/Diagnostics/Overview/TableInfo/prepareTableInfo.js

@@ -1,49 +1,41 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Text } from '@gravity-ui/uikit';
+import omit from 'lodash/omit';
 import { formatObject } from '../../../../../components/InfoViewer';
 import { formatFollowerGroupItem, formatPartitionConfigItem, formatTableStatsItem, formatTabletMetricsItem, } from '../../../../../components/InfoViewer/formatters';
 import { EPathType } from '../../../../../types/api/schema';
 import { formatBytes, formatNumber } from '../../../../../utils/dataFormatters/dataFormatters';
 import { formatDurationToShortTimeFormat } from '../../../../../utils/timeParsers';
-import { isNumeric } from '../../../../../utils/utils';
+import i18n from './i18n';
 const isInStoreColumnTable = (table) => {
     // SchemaPresetId could be 0
     return table.SchemaPresetName && table.SchemaPresetId !== undefined;
 };
-const prepareOlapStats = (olapStats) => {
-    var _a, _b, _c;
-    const Bytes = olapStats === null || olapStats === void 0 ? void 0 : olapStats.reduce((acc, el) => {
-        const value = isNumeric(el.Bytes) ? Number(el.Bytes) : 0;
-        return acc + value;
-    }, 0);
-    const Rows = olapStats === null || olapStats === void 0 ? void 0 : olapStats.reduce((acc, el) => {
-        const value = isNumeric(el.Rows) ? Number(el.Rows) : 0;
-        return acc + value;
-    }, 0);
-    const tabletIds = olapStats === null || olapStats === void 0 ? void 0 : olapStats.reduce((acc, el) => {
-        acc.add(el.TabletId);
-        return acc;
-    }, new Set());
-    return [
-        { label: 'PartCount', value: (_a = tabletIds === null || tabletIds === void 0 ? void 0 : tabletIds.size) !== null && _a !== void 0 ? _a : 0 },
-        { label: 'RowCount', value: (_b = formatNumber(Rows)) !== null && _b !== void 0 ? _b : 0 },
-        { label: 'DataSize', value: (_c = formatBytes(Bytes)) !== null && _c !== void 0 ? _c : 0 },
-    ];
-};
 const prepareTTL = (ttl) => {
     // ExpireAfterSeconds could be 0
     if (ttl.Enabled && ttl.Enabled.ColumnName && ttl.Enabled.ExpireAfterSeconds !== undefined) {
-        const value = `column: '${ttl.Enabled.ColumnName}', expire after: ${formatDurationToShortTimeFormat(ttl.Enabled.ExpireAfterSeconds * 1000, 1)}`;
-        return { label: 'TTL for rows', value };
+        const value = i18n('value.ttl', {
+            columnName: ttl.Enabled.ColumnName,
+            expireTime: formatDurationToShortTimeFormat(ttl.Enabled.ExpireAfterSeconds * 1000, 1),
+        });
+        return { label: i18n('label.ttl'), value };
     }
     return undefined;
 };
 function prepareColumnTableGeneralInfo(columnTable) {
+    var _a, _b;
     const columnTableGeneralInfo = [];
     columnTableGeneralInfo.push({
-        label: 'Standalone',
+        label: i18n('label.standalone'),
         value: String(!isInStoreColumnTable(columnTable)),
     });
-    if (columnTable.Sharding && columnTable.Sharding.HashSharding) {
-        columnTableGeneralInfo.push({ label: 'Sharding', value: 'hash' });
+    if ((_b = (_a = columnTable.Sharding) === null || _a === void 0 ? void 0 : _a.HashSharding) === null || _b === void 0 ? void 0 : _b.Columns) {
+        const columns = columnTable.Sharding.HashSharding.Columns.join(', ');
+        const content = `PARTITION BY HASH(${columns})`;
+        columnTableGeneralInfo.push({
+            label: i18n('label.partitioning'),
+            value: (_jsx(Text, { variant: "code-2", wordBreak: "break-word", children: content })),
+        });
     }
     if (columnTable.TtlSettings) {
         const ttlInfo = prepareTTL(columnTable === null || columnTable === void 0 ? void 0 : columnTable.TtlSettings);
@@ -58,18 +50,20 @@ const prepareTableGeneralInfo = (PartitionConfig, TTLSettings) => {
     const { PartitioningPolicy = {}, FollowerGroups, EnableFilterByKey } = PartitionConfig;
     const generalTableInfo = [];
     const partitioningBySize = PartitioningPolicy.SizeToSplit && Number(PartitioningPolicy.SizeToSplit) > 0
-        ? `Enabled, split size: ${formatBytes(PartitioningPolicy.SizeToSplit)}`
-        : 'Disabled';
+        ? i18n('value.partitioning-by-size.enabled', {
+            size: formatBytes(PartitioningPolicy.SizeToSplit),
+        })
+        : i18n('disabled');
     const partitioningByLoad = ((_a = PartitioningPolicy.SplitByLoadSettings) === null || _a === void 0 ? void 0 : _a.Enabled)
-        ? 'Enabled'
-        : 'Disabled';
-    generalTableInfo.push({ label: 'Partitioning by size', value: partitioningBySize }, { label: 'Partitioning by load', value: partitioningByLoad }, {
-        label: 'Min number of partitions',
+        ? i18n('enabled')
+        : i18n('disabled');
+    generalTableInfo.push({ label: i18n('label.partitioning-by-size'), value: partitioningBySize }, { label: i18n('label.partitioning-by-load'), value: partitioningByLoad }, {
+        label: i18n('label.partitions-min'),
         value: formatNumber(PartitioningPolicy.MinPartitionsCount || 0),
     });
     if (PartitioningPolicy.MaxPartitionsCount) {
         generalTableInfo.push({
-            label: 'Max number of partitions',
+            label: i18n('label.partitions-max'),
             value: formatNumber(PartitioningPolicy.MaxPartitionsCount),
         });
     }
@@ -82,7 +76,7 @@ const prepareTableGeneralInfo = (PartitionConfig, TTLSettings) => {
         else {
             readReplicasConfig = `ANY_AZ: ${FollowerCount}`;
         }
-        generalTableInfo.push({ label: 'Read replicas (followers)', value: readReplicasConfig });
+        generalTableInfo.push({ label: i18n('label.read-replicas'), value: readReplicasConfig });
     }
     if (TTLSettings) {
         const ttlInfo = prepareTTL(TTLSettings);
@@ -91,13 +85,13 @@ const prepareTableGeneralInfo = (PartitionConfig, TTLSettings) => {
         }
     }
     generalTableInfo.push({
-        label: 'Bloom filter',
-        value: EnableFilterByKey ? 'Enabled' : 'Disabled',
+        label: i18n('label.bloom-filter'),
+        value: EnableFilterByKey ? i18n('enabled') : i18n('disabled'),
     });
     return generalTableInfo;
 };
 /** Prepares data for Table, ColumnTable and ColumnStore */
-export const prepareTableInfo = (data, type, olapStats) => {
+export const prepareTableInfo = (data, type) => {
     if (!data) {
         return {};
     }
@@ -116,45 +110,39 @@ export const prepareTableInfo = (data, type, olapStats) => {
             break;
         }
     }
-    let tableStatsInfo;
-    // There is no TableStats and TabletMetrics for ColumnTables inside ColumnStore
-    // Therefore we parse olapStats
-    if (type === EPathType.EPathTypeColumnTable && isInStoreColumnTable(ColumnTableDescription)) {
-        if (olapStats) {
-            tableStatsInfo = [prepareOlapStats(olapStats)];
-        }
-    }
-    else {
-        tableStatsInfo = [
-            formatObject(formatTableStatsItem, {
-                PartCount,
-                RowCount,
-                DataSize,
-                IndexSize,
-            }),
-            formatObject(formatTableStatsItem, {
-                LastAccessTime,
-                LastUpdateTime,
-            }),
-            formatObject(formatTableStatsItem, {
-                ImmediateTxCompleted,
-                PlannedTxCompleted,
-                TxRejectedByOverload,
-                TxRejectedBySpace,
-                TxCompleteLagMsec,
-                InFlightTxCount,
-            }),
-            formatObject(formatTableStatsItem, {
-                RowUpdates,
-                RowDeletes,
-                RowReads,
-                RangeReads,
-                RangeReadRows,
-            }),
-        ];
-    }
-    //@ts-expect-error
-    const tabletMetricsInfo = formatObject(formatTabletMetricsItem, TabletMetrics);
+    const tableStatsInfo = [
+        formatObject(formatTableStatsItem, {
+            PartCount,
+            RowCount,
+            DataSize,
+            IndexSize,
+        }),
+        formatObject(formatTableStatsItem, {
+            LastAccessTime,
+            LastUpdateTime,
+        }),
+        formatObject(formatTableStatsItem, {
+            ImmediateTxCompleted,
+            PlannedTxCompleted,
+            TxRejectedByOverload,
+            TxRejectedBySpace,
+            TxCompleteLagMsec,
+            InFlightTxCount,
+        }),
+        formatObject(formatTableStatsItem, {
+            RowUpdates,
+            RowDeletes,
+            RowReads,
+            RangeReads,
+            RangeReadRows,
+        }),
+    ];
+    const tabletMetricsInfo = formatObject(formatTabletMetricsItem, omit(TabletMetrics, [
+        'GroupReadIops',
+        'GroupReadThroughput',
+        'GroupWriteIops',
+        'GroupWriteThroughput',
+    ]));
     let partitionConfigInfo = [];
     if (Array.isArray(FollowerGroups) && FollowerGroups.length > 0) {
         partitionConfigInfo = formatObject(formatFollowerGroupItem, FollowerGroups[0]);

package/dist/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopQueries.js

@@ -3,12 +3,12 @@ import React from 'react';
 import { useHistory, useLocation } from 'react-router-dom';
 import { parseQuery } from '../../../../../routes';
 import { changeUserInput } from '../../../../../store/reducers/executeQuery';
+import { setTopQueriesFilters, topQueriesApi, } from '../../../../../store/reducers/executeTopQueries/executeTopQueries';
 import { TENANT_DIAGNOSTICS_TABS_IDS, TENANT_PAGE, TENANT_PAGES_IDS, TENANT_QUERY_TABS_ID, } from '../../../../../store/reducers/tenant/constants';
-import { topQueriesApi } from '../../../../../store/reducers/tenantOverview/topQueries/tenantOverviewTopQueries';
 import { useAutoRefreshInterval, useTypedDispatch } from '../../../../../utils/hooks';
 import { parseQueryErrorToString } from '../../../../../utils/query';
 import { TenantTabsGroups, getTenantPath } from '../../../TenantPages';
-import { TOP_QUERIES_COLUMNS_WIDTH_LS_KEY, getTenantOverviewTopQueriesColumns, } from '../../TopQueries/getTopQueriesColumns';
+import { TENANT_OVERVIEW_TOP_QUERUES_COLUMNS, TOP_QUERIES_COLUMNS_WIDTH_LS_KEY, } from '../../TopQueries/getTopQueriesColumns';
 import { TenantOverviewTableLayout } from '../TenantOverviewTableLayout';
 import { getSectionTitle } from '../getSectionTitle';
 import i18n from '../i18n';
@@ -19,8 +19,8 @@ export function TopQueries({ tenantName }) {
     const history = useHistory();
     const query = parseQuery(location);
     const [autoRefreshInterval] = useAutoRefreshInterval();
-    const columns = getTenantOverviewTopQueriesColumns();
-    const { currentData, isFetching, error } = topQueriesApi.useGetOverviewTopQueriesQuery({ database: tenantName }, { pollingInterval: autoRefreshInterval });
+    const columns = TENANT_OVERVIEW_TOP_QUERUES_COLUMNS;
+    const { currentData, isFetching, error } = topQueriesApi.useGetTopQueriesQuery({ database: tenantName }, { pollingInterval: autoRefreshInterval });
     const loading = isFetching && currentData === undefined;
     const { result: data } = currentData || {};
     const handleRowClick = React.useCallback((row) => {
@@ -36,7 +36,10 @@ export function TopQueries({ tenantName }) {
     }, [dispatch, history, location]);
     const title = getSectionTitle({
         entity: i18n('queries'),
-        postfix: i18n('by-cpu-time'),
+        postfix: i18n('by-cpu-time', { executionPeriod: i18n('executed-last-hour') }),
+        onClick: () => {
+            dispatch(setTopQueriesFilters({ from: undefined, to: undefined }));
+        },
         link: getTenantPath({
             ...query,
             [TenantTabsGroups.diagnosticsTab]: TENANT_DIAGNOSTICS_TABS_IDS.topQueries,

package/dist/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Loader } from '@gravity-ui/uikit';
 import { EntityStatus } from '../../../../components/EntityStatus/EntityStatus';
+import { useGetSchemaQuery } from '../../../../store/reducers/schema/schema';
 import { TENANT_METRICS_TABS_IDS } from '../../../../store/reducers/tenant/constants';
 import { tenantApi } from '../../../../store/reducers/tenant/tenant';
 import { calculateTenantMetrics } from '../../../../store/reducers/tenants/utils';
@@ -16,7 +17,7 @@ import { TenantStorage } from './TenantStorage/TenantStorage';
 import { b } from './utils';
 import './TenantOverview.scss';
 export function TenantOverview({ tenantName, additionalTenantProps, additionalNodesProps, }) {
-    var _a;
+    var _a, _b, _c;
     const { metricsTab } = useTypedSelector((state) => state.tenant);
     const [autoRefreshInterval] = useAutoRefreshInterval();
     const { currentData: tenant, isFetching } = tenantApi.useGetTenantInfoQuery({ path: tenantName }, {
@@ -25,7 +26,31 @@ export function TenantOverview({ tenantName, additionalTenantProps, additionalNo
     const tenantLoading = isFetching && tenant === undefined;
     const { Name, Type, Overall } = tenant || {};
     const tenantType = mapDatabaseTypeToDBName(Type);
-    const { blobStorage, tabletStorage, blobStorageLimit, tabletStorageLimit, poolsStats, memoryStats, blobStorageStats, tabletStorageStats, } = calculateTenantMetrics(tenant !== null && tenant !== void 0 ? tenant : undefined);
+    // FIXME: remove after correct data is added to tenantInfo
+    const { data: tenantSchemaData } = useGetSchemaQuery({ path: tenantName, database: tenantName });
+    const { Tables, Topics } = ((_b = (_a = tenantSchemaData === null || tenantSchemaData === void 0 ? void 0 : tenantSchemaData.PathDescription) === null || _a === void 0 ? void 0 : _a.DomainDescription) === null || _b === void 0 ? void 0 : _b.DiskSpaceUsage) || {};
+    const usedTabletStorage = [
+        Tables === null || Tables === void 0 ? void 0 : Tables.TotalSize,
+        Topics === null || Topics === void 0 ? void 0 : Topics.AccountSize,
+        Topics === null || Topics === void 0 ? void 0 : Topics.DataSize,
+        Topics === null || Topics === void 0 ? void 0 : Topics.ReserveSize,
+        Topics === null || Topics === void 0 ? void 0 : Topics.UsedReserveSize,
+    ].reduce((sum, current) => {
+        if (current) {
+            return sum + Number(current);
+        }
+        return sum;
+    }, 0);
+    const tenantData = {
+        ...tenant,
+        Metrics: {
+            ...tenant === null || tenant === void 0 ? void 0 : tenant.Metrics,
+            // Replace incorrect tenant metric with correct value
+            Storage: String(usedTabletStorage),
+        },
+    };
+    // === === ===
+    const { blobStorage, tabletStorage, blobStorageLimit, tabletStorageLimit, poolsStats, memoryStats, blobStorageStats, tabletStorageStats, } = calculateTenantMetrics(tenantData);
     const storageMetrics = {
         blobStorageUsed: blobStorage,
         blobStorageLimit,
@@ -57,5 +82,5 @@ export function TenantOverview({ tenantName, additionalTenantProps, additionalNo
     if (tenantLoading) {
         return (_jsx("div", { className: b('loader'), children: _jsx(Loader, { size: "m" }) }));
     }
-    return (_jsxs("div", { className: b(), children: [_jsxs("div", { className: b('info'), children: [_jsx("div", { className: b('top-label'), children: tenantType }), _jsxs("div", { className: b('top'), children: [renderName(), (_a = additionalTenantProps === null || additionalTenantProps === void 0 ? void 0 : additionalTenantProps.getMonitoringLink) === null || _a === void 0 ? void 0 : _a.call(additionalTenantProps, Name, Type)] }), _jsx(MetricsCards, { poolsCpuStats: poolsStats, memoryStats: memoryStats, blobStorageStats: blobStorageStats, tabletStorageStats: tabletStorageStats, tenantName: tenantName })] }), renderTabContent()] }));
+    return (_jsxs("div", { className: b(), children: [_jsxs("div", { className: b('info'), children: [_jsx("div", { className: b('top-label'), children: tenantType }), _jsxs("div", { className: b('top'), children: [renderName(), (_c = additionalTenantProps === null || additionalTenantProps === void 0 ? void 0 : additionalTenantProps.getMonitoringLink) === null || _c === void 0 ? void 0 : _c.call(additionalTenantProps, Name, Type)] }), _jsx(MetricsCards, { poolsCpuStats: poolsStats, memoryStats: memoryStats, blobStorageStats: blobStorageStats, tabletStorageStats: tabletStorageStats, tenantName: tenantName })] }), renderTabContent()] }));
 }

package/dist/containers/Tenant/Diagnostics/TenantOverview/getSectionTitle.d.ts

@@ -3,6 +3,7 @@ interface GetSectionTitleParams {
     postfix: string;
     prefix?: string;
     link?: string;
+    onClick?: () => void;
 }
-export declare const getSectionTitle: ({ prefix, entity, postfix, link, }: GetSectionTitleParams) => string | import("react/jsx-runtime").JSX.Element;
+export declare const getSectionTitle: ({ prefix, entity, postfix, link, onClick, }: GetSectionTitleParams) => string | import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/containers/Tenant/Diagnostics/TenantOverview/getSectionTitle.js

@@ -3,9 +3,9 @@ import React from 'react';
 import { InternalLink } from '../../../../components/InternalLink/InternalLink';
 import i18n from './i18n';
 // Titles are formed by the principle "Top entities by parameter"
-export const getSectionTitle = ({ prefix = i18n('top'), entity, postfix, link, }) => {
+export const getSectionTitle = ({ prefix = i18n('top'), entity, postfix, link, onClick, }) => {
     if (link) {
-        return (_jsxs(React.Fragment, { children: [prefix, " ", _jsx(InternalLink, { to: link, children: entity }), " ", postfix] }));
+        return (_jsxs(React.Fragment, { children: [prefix, ' ', _jsx(InternalLink, { to: link, onClick: onClick, children: entity }), ' ', postfix] }));
     }
     return `${prefix} ${entity} ${postfix}`;
 };

package/dist/containers/Tenant/Diagnostics/TenantOverview/i18n/en.json

@@ -10,7 +10,7 @@
     "queries": "queries",
     "tables": "tables",
     "by-pools-usage": "by pools usage",
-    "by-cpu-time": "by cpu time",
+    "by-cpu-time": "by cpu time, {{executionPeriod}}",
     "by-cpu-usage": "by cpu usage",
     "by-load": "by load",
     "by-memory": "by memory",
@@ -27,5 +27,6 @@
     "storage.tablet-storage-title": "Tablet storage",
     "storage.tablet-storage-description": "Size of user data and indexes stored in schema objects (tables, topics, etc.)",
     "storage.db-storage-title": "Database storage",
-    "storage.db-storage-description": "Size of data stored in distributed storage with all overheads for redundancy"
+    "storage.db-storage-description": "Size of data stored in distributed storage with all overheads for redundancy",
+    "executed-last-hour": "executed in the last hour"
 }

package/dist/containers/Tenant/Diagnostics/TenantOverview/i18n/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (key: "nodes" | "queries" | "groups" | "no-data" | "top" | "shards" | "tables" | "no-pools-data" | "top-nodes.empty-data" | "top-groups.empty-data" | "by-pools-usage" | "by-cpu-time" | "by-cpu-usage" | "by-load" | "by-memory" | "by-usage" | "by-size" | "cards.cpu-label" | "cards.storage-label" | "cards.memory-label" | "charts.queries-per-second" | "charts.transaction-latency" | "charts.cpu-usage" | "charts.storage-usage" | "charts.memory-usage" | "storage.tablet-storage-title" | "storage.tablet-storage-description" | "storage.db-storage-title" | "storage.db-storage-description", params?: import("@gravity-ui/i18n").Params) => string;
+declare const _default: (key: "nodes" | "queries" | "groups" | "no-data" | "top" | "shards" | "tables" | "no-pools-data" | "top-nodes.empty-data" | "top-groups.empty-data" | "by-pools-usage" | "by-cpu-time" | "by-cpu-usage" | "by-load" | "by-memory" | "by-usage" | "by-size" | "cards.cpu-label" | "cards.storage-label" | "cards.memory-label" | "charts.queries-per-second" | "charts.transaction-latency" | "charts.cpu-usage" | "charts.storage-usage" | "charts.memory-usage" | "storage.tablet-storage-title" | "storage.tablet-storage-description" | "storage.db-storage-title" | "storage.db-storage-description" | "executed-last-hour", params?: import("@gravity-ui/i18n").Params) => string;
 export default _default;

package/dist/containers/Tenant/Diagnostics/TopQueries/TopQueries.js

@@ -16,7 +16,7 @@ import { parseQueryErrorToString } from '../../../../utils/query';
 import { TenantTabsGroups, getTenantPath } from '../../TenantPages';
 import { QUERY_TABLE_SETTINGS } from '../../utils/constants';
 import { isColumnEntityType } from '../../utils/schema';
-import { TOP_QUERIES_COLUMNS_WIDTH_LS_KEY, getTopQueriesColumns } from './getTopQueriesColumns';
+import { TOP_QUERIES_COLUMNS, TOP_QUERIES_COLUMNS_WIDTH_LS_KEY } from './getTopQueriesColumns';
 import i18n from './i18n';
 import './TopQueries.scss';
 const b = cn('kv-top-queries');
@@ -32,7 +32,7 @@ export const TopQueries = ({ tenantName, type }) => {
     }, { pollingInterval: autoRefreshInterval });
     const loading = isFetching && currentData === undefined;
     const { result: data } = currentData || {};
-    const rawColumns = getTopQueriesColumns();
+    const rawColumns = TOP_QUERIES_COLUMNS;
     const columns = rawColumns.map((column) => ({
         ...column,
         sortable: isSortableTopQueriesProperty(column.name),

package/dist/containers/Tenant/Diagnostics/TopQueries/getTopQueriesColumns.d.ts

@@ -2,5 +2,5 @@ import type { Column } from '@gravity-ui/react-data-table';
 import type { KeyValueRow } from '../../../../types/api/query';
 import './TopQueries.scss';
 export declare const TOP_QUERIES_COLUMNS_WIDTH_LS_KEY = "topQueriesColumnsWidth";
-export declare const getTopQueriesColumns: () => Column<KeyValueRow>[];
-export declare const getTenantOverviewTopQueriesColumns: () => Column<KeyValueRow>[];
+export declare const TOP_QUERIES_COLUMNS: Column<KeyValueRow>[];
+export declare const TENANT_OVERVIEW_TOP_QUERUES_COLUMNS: Column<KeyValueRow>[];