ydb-embedded-ui 6.10.3 → 6.11.0

package/dist/components/DeveloperUiLink/DeveloperUiLink.d.ts

@@ -0,0 +1,8 @@
+import './DeveloperUiLink.scss';
+interface DeveloperUiLinkProps {
+    className?: string;
+    visible?: boolean;
+    href: string;
+}
+export declare function DeveloperUiLink({ href, visible, className }: DeveloperUiLinkProps): import("react/jsx-runtime").JSX.Element;
+export {};

package/dist/components/DeveloperUiLink/DeveloperUiLink.js

@@ -0,0 +1,9 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { ArrowUpRightFromSquare } from '@gravity-ui/icons';
+import { Button, Icon } from '@gravity-ui/uikit';
+import { cn } from '../../utils/cn';
+import './DeveloperUiLink.scss';
+const b = cn('developer-ui-link');
+export function DeveloperUiLink({ href, visible = false, className }) {
+    return (_jsx(Button, { size: "s", href: href, className: b({ visible }, className), target: "_blank", children: _jsx(Icon, { data: ArrowUpRightFromSquare }) }));
+}

package/dist/components/DeveloperUiLink/DeveloperUiLink.scss

@@ -0,0 +1,11 @@
+.developer-ui-link {
+    display: none;
+
+    &_visible {
+        display: inline-block;
+    }
+
+    .data-table__row:hover & {
+        display: inline-block;
+    }
+}

package/dist/components/NodeHostWrapper/NodeHostWrapper.js

@@ -3,6 +3,7 @@ import { ArrowUpRightFromSquare } from '@gravity-ui/icons';
 import { Button, Icon, PopoverBehavior } from '@gravity-ui/uikit';
 import { getDefaultNodePath } from '../../containers/Node/NodePages';
 import { cn } from '../../utils/cn';
+import { createDeveloperUILinkWithNodeId } from '../../utils/developerUI/developerUI';
 import { isUnavailableNode } from '../../utils/nodes';
 import { CellWithPopover } from '../CellWithPopover/CellWithPopover';
 import { EntityStatus } from '../EntityStatus/EntityStatus';
@@ -14,12 +15,18 @@ export const NodeHostWrapper = ({ node, getNodeRef }) => {
         return _jsx("span", { children: "\u2014" });
     }
     const isNodeAvailable = !isUnavailableNode(node);
-    const nodeRef = isNodeAvailable && getNodeRef ? getNodeRef(node) + 'internal' : undefined;
+    let nodeHref;
+    if (getNodeRef) {
+        nodeHref = getNodeRef(node) + 'internal';
+    }
+    else if (node.NodeId) {
+        nodeHref = createDeveloperUILinkWithNodeId(node.NodeId) + 'internal';
+    }
     const nodePath = isNodeAvailable
         ? getDefaultNodePath(node.NodeId, {
             tenantName: node.TenantName,
         })
         : undefined;
-    const additionalControls = nodeRef ? (_jsx(Button, { size: "s", href: nodeRef, className: b('external-button'), target: "_blank", children: _jsx(Icon, { data: ArrowUpRightFromSquare }) })) : null;
+    const additionalControls = nodeHref ? (_jsx(Button, { size: "s", href: nodeHref, className: b('external-button'), target: "_blank", children: _jsx(Icon, { data: ArrowUpRightFromSquare }) })) : null;
     return (_jsx(CellWithPopover, { disabled: !isNodeAvailable, content: _jsx(NodeEndpointsTooltipContent, { data: node }), placement: ['top', 'bottom'], behavior: PopoverBehavior.Immediate, children: _jsx(EntityStatus, { name: node.Host, status: node.SystemState, path: nodePath, hasClipboardButton: true, additionalControls: additionalControls }) }));
 };

package/dist/containers/Tablets/Tablets.js

@@ -3,12 +3,14 @@ import { ArrowsRotateRight } from '@gravity-ui/icons';
 import { Icon, Label, Text } from '@gravity-ui/uikit';
 import { skipToken } from '@reduxjs/toolkit/query';
 import { ButtonWithConfirmDialog } from '../../components/ButtonWithConfirmDialog/ButtonWithConfirmDialog';
+import { DeveloperUiLink } from '../../components/DeveloperUiLink/DeveloperUiLink';
 import { EntityStatus } from '../../components/EntityStatus/EntityStatus';
 import { ResponseError } from '../../components/Errors/ResponseError';
 import { InternalLink } from '../../components/InternalLink';
 import { ResizeableDataTable } from '../../components/ResizeableDataTable/ResizeableDataTable';
 import { TableSkeleton } from '../../components/TableSkeleton/TableSkeleton';
 import routes, { createHref } from '../../routes';
+import { backend } from '../../store';
 import { selectTabletsWithFqdn, tabletsApi } from '../../store/reducers/tablets';
 import { ETabletState } from '../../types/api/tablet';
 import { cn } from '../../utils/cn';
@@ -31,13 +33,15 @@ const columns = [
     },
     {
         name: 'TabletId',
+        width: 230,
         get header() {
             return i18n('Tablet');
         },
         render: ({ row }) => {
+            var _a;
             const tabletPath = row.TabletId &&
                 createHref(routes.tablet, { id: row.TabletId }, { nodeId: row.NodeId, type: row.Type });
-            return _jsx(InternalLink, { to: tabletPath, children: row.TabletId });
+            return (_jsx(EntityStatus, { name: (_a = row.TabletId) === null || _a === void 0 ? void 0 : _a.toString(), path: tabletPath, hasClipboardButton: true, showStatus: false, additionalControls: _jsx(DeveloperUiLink, { href: `${backend}/tablets?TabletID=${row.TabletId}` }) }));
         },
     },
     {

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

@@ -18,17 +18,6 @@ import { TableInfo } from './TableInfo';
 import { TopicInfo } from './TopicInfo';
 function Overview({ type, path }) {
     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);
@@ -45,7 +34,6 @@ function Overview({ type, path }) {
     const overviewLoading = isFetching && currentData === undefined;
     const { data: rawData, additionalData } = currentData || {};
     const { error: schemaError } = useGetSchemaQuery({ path });
-    // overviewLoading || olapStatsLoading
     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/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

@@ -3,31 +3,10 @@ import { formatFollowerGroupItem, formatPartitionConfigItem, formatTableStatsIte
 import { EPathType } from '../../../../../types/api/schema';
 import { formatBytes, formatNumber } from '../../../../../utils/dataFormatters/dataFormatters';
 import { formatDurationToShortTimeFormat } from '../../../../../utils/timeParsers';
-import { isNumeric } from '../../../../../utils/utils';
 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) {
@@ -97,7 +76,7 @@ const prepareTableGeneralInfo = (PartitionConfig, TTLSettings) => {
     return generalTableInfo;
 };
 /** Prepares data for Table, ColumnTable and ColumnStore */
-export const prepareTableInfo = (data, type, olapStats) => {
+export const prepareTableInfo = (data, type) => {
     if (!data) {
         return {};
     }
@@ -116,43 +95,33 @@ 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,
-            }),
-        ];
-    }
+    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,
+        }),
+    ];
     //@ts-expect-error
     const tabletMetricsInfo = formatObject(formatTabletMetricsItem, TabletMetrics);
     let partitionConfigInfo = [];

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 });
+    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/TopQueries/getTopQueriesColumns.js

@@ -3,26 +3,17 @@ import DataTable from '@gravity-ui/react-data-table';
 import { OneLineQueryWithPopover, TruncatedQuery, } from '../../../../components/TruncatedQuery/TruncatedQuery';
 import { cn } from '../../../../utils/cn';
 import { formatDateTime, formatNumber } from '../../../../utils/dataFormatters/dataFormatters';
+import { TOP_QUERIES_COLUMNS_IDS } from '../../../../utils/diagnostics';
 import { generateHash } from '../../../../utils/generateHash';
-import { parseUsToMs } from '../../../../utils/timeParsers';
+import { formatToMs, parseUsToMs } from '../../../../utils/timeParsers';
 import { MAX_QUERY_HEIGHT } from '../../utils/constants';
 import './TopQueries.scss';
 const b = cn('kv-top-queries');
 export const TOP_QUERIES_COLUMNS_WIDTH_LS_KEY = 'topQueriesColumnsWidth';
-const TOP_QUERIES_COLUMNS_IDS = {
-    CPUTimeUs: 'CPUTimeUs',
-    QueryText: 'QueryText',
-    EndTime: 'EndTime',
-    ReadRows: 'ReadRows',
-    ReadBytes: 'ReadBytes',
-    UserSID: 'UserSID',
-    OneLineQueryText: 'OneLineQueryText',
-    QueryHash: 'QueryHash',
-    Duration: 'Duration',
-};
 const cpuTimeUsColumn = {
     name: TOP_QUERIES_COLUMNS_IDS.CPUTimeUs,
     sortAccessor: (row) => Number(row.CPUTimeUs),
+    render: ({ row }) => { var _a; return formatToMs(parseUsToMs((_a = row.CPUTimeUs) !== null && _a !== void 0 ? _a : undefined)); },
     width: 120,
     align: DataTable.RIGHT,
     sortable: false,
@@ -78,8 +69,8 @@ const queryHashColumn = {
 };
 const durationColumn = {
     name: TOP_QUERIES_COLUMNS_IDS.Duration,
-    header: 'Duration, ms',
-    render: ({ row }) => { var _a; return formatNumber(parseUsToMs((_a = row.Duration) !== null && _a !== void 0 ? _a : undefined)); },
+    header: 'Duration',
+    render: ({ row }) => { var _a; return formatToMs(parseUsToMs((_a = row.Duration) !== null && _a !== void 0 ? _a : undefined)); },
     sortAccessor: (row) => Number(row.Duration),
     align: DataTable.RIGHT,
     width: 150,

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

@@ -9,7 +9,7 @@ import { EShardsWorkloadMode } from '../../../../store/reducers/shardsWorkload/t
 import { cn } from '../../../../utils/cn';
 import { DEFAULT_TABLE_SETTINGS, HOUR_IN_SECONDS } from '../../../../utils/constants';
 import { formatDateTime } from '../../../../utils/dataFormatters/dataFormatters';
-import { isSortableTopShardsProperty } from '../../../../utils/diagnostics';
+import { TOP_SHARD_COLUMNS_IDS, isSortableTopShardsProperty } from '../../../../utils/diagnostics';
 import { useAutoRefreshInterval, useTypedDispatch, useTypedSelector } from '../../../../utils/hooks';
 import { parseQueryErrorToString } from '../../../../utils/query';
 import { isColumnEntityType } from '../../utils/schema';
@@ -25,16 +25,6 @@ const TABLE_SETTINGS = {
     disableSortReset: true,
     defaultOrder: DataTable.DESCENDING,
 };
-const tableColumnsNames = {
-    TabletId: 'TabletId',
-    CPUCores: 'CPUCores',
-    DataSize: 'DataSize',
-    Path: 'Path',
-    NodeId: 'NodeId',
-    PeakTime: 'PeakTime',
-    InFlightTxCount: 'InFlightTxCount',
-    IntervalEnd: 'IntervalEnd',
-};
 function prepareDateTimeValue(value) {
     if (!value) {
         return '–';
@@ -83,7 +73,7 @@ export const TopShards = ({ tenantName, path, type }) => {
         }
         return defaultValue;
     });
-    const [sortOrder, setSortOrder] = React.useState(tableColumnsNames.CPUCores);
+    const [sortOrder, setSortOrder] = React.useState(TOP_SHARD_COLUMNS_IDS.CPUCores);
     const { data: result, isFetching, error, } = shardApi.useSendShardQueryQuery({
         database: tenantName,
         path: path,
@@ -124,14 +114,14 @@ export const TopShards = ({ tenantName, path, type }) => {
         if (filters.mode === EShardsWorkloadMode.History) {
             // after NodeId
             columns.splice(5, 0, {
-                name: tableColumnsNames.PeakTime,
+                name: TOP_SHARD_COLUMNS_IDS.PeakTime,
                 render: ({ row }) => {
                     return prepareDateTimeValue(row.PeakTime);
                 },
                 sortable: false,
             });
             columns.push({
-                name: tableColumnsNames.IntervalEnd,
+                name: TOP_SHARD_COLUMNS_IDS.IntervalEnd,
                 render: ({ row }) => {
                     return prepareDateTimeValue(row.IntervalEnd);
                 },

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

@@ -1,9 +1,12 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import DataTable from '@gravity-ui/react-data-table';
+import { DeveloperUiLink } from '../../../../components/DeveloperUiLink/DeveloperUiLink';
+import { EntityStatus } from '../../../../components/EntityStatus/EntityStatus';
 import { InternalLink } from '../../../../components/InternalLink';
 import { LinkToSchemaObject } from '../../../../components/LinkToSchemaObject/LinkToSchemaObject';
 import { UsageLabel } from '../../../../components/UsageLabel/UsageLabel';
 import routes, { createHref } from '../../../../routes';
+import { backend } from '../../../../store';
 import { getLoadSeverityForShard } from '../../../../store/reducers/tenantOverview/topShards/utils';
 import { formatNumber, roundToPrecision } from '../../../../utils/dataFormatters/dataFormatters';
 import { getDefaultNodePath } from '../../../Node/NodePages';
@@ -61,10 +64,11 @@ const tabletIdColumn = {
     name: TOP_SHARDS_COLUMNS_IDS.TabletId,
     header: tableColumnsNames[TOP_SHARDS_COLUMNS_IDS.TabletId],
     render: ({ row }) => {
+        var _a;
         if (!row.TabletId) {
             return '–';
         }
-        return (_jsx(InternalLink, { to: createHref(routes.tablet, { id: row.TabletId }), children: row.TabletId }));
+        return (_jsx(EntityStatus, { name: (_a = row.TabletId) === null || _a === void 0 ? void 0 : _a.toString(), path: createHref(routes.tablet, { id: row.TabletId }), hasClipboardButton: true, showStatus: false, additionalControls: _jsx(DeveloperUiLink, { href: `${backend}/tablets?TabletID=${row.TabletId}` }) }));
     },
     sortable: false,
     width: 190,

package/dist/store/reducers/executeTopQueries/executeTopQueries.js

@@ -29,6 +29,7 @@ SELECT
     Duration
 FROM \`${path}/.sys/top_queries_by_cpu_time_one_hour\`
 WHERE ${filterConditions || 'true'}
+ORDER BY CPUTimeUs DESC
 `;
 };
 export const topQueriesApi = api.injectEndpoints({

package/dist/types/api/schema/schema.d.ts

@@ -148,6 +148,8 @@ interface TDomainState {
 }
 interface TDiskSpaceUsage {
     Tables?: TTables;
+    Topics?: TTopics;
+    TStoragePoolUsage?: TStoragePoolUsage[];
 }
 interface TTables {
     /** uint64 */
@@ -157,6 +159,25 @@ interface TTables {
     /** uint64 */
     IndexSize?: string;
 }
+interface TTopics {
+    /** uint64 */
+    ReserveSize?: string;
+    /** uint64 */
+    AccountSize?: string;
+    /** uint64 */
+    DataSize?: string;
+    /** uint64 */
+    UsedReserveSize?: string;
+}
+interface TStoragePoolUsage {
+    PoolKind?: string;
+    /** uint64 */
+    TotalSize?: string;
+    /** uint64 */
+    DataSize?: string;
+    /** uint64 */
+    IndexSize?: string;
+}
 interface TStoragePool {
     Name?: string;
     Kind?: string;

package/dist/utils/diagnostics.d.ts

@@ -1,19 +1,23 @@
-import type { ValueOf } from '../types/common';
-declare const TOP_SHARDS_SORT_VALUES: {
-    readonly CPUCores: "CPUCores";
-    readonly DataSize: "DataSize";
-    readonly InFlightTxCount: "InFlightTxCount";
+export declare const TOP_QUERIES_COLUMNS_IDS: {
+    CPUTimeUs: string;
+    QueryText: string;
+    EndTime: string;
+    ReadRows: string;
+    ReadBytes: string;
+    UserSID: string;
+    OneLineQueryText: string;
+    QueryHash: string;
+    Duration: string;
 };
-declare const TOP_QUERIES_SORT_VALUES: {
-    readonly CPUTimeUs: "CPUTimeUs";
-    readonly EndTime: "EndTime";
-    readonly ReadRows: "ReadRows";
-    readonly ReadBytes: "ReadBytes";
-    readonly UserSID: "UserSID";
-    readonly Duration: "Duration";
+export declare const TOP_SHARD_COLUMNS_IDS: {
+    TabletId: string;
+    CPUCores: string;
+    DataSize: string;
+    Path: string;
+    NodeId: string;
+    PeakTime: string;
+    InFlightTxCount: string;
+    IntervalEnd: string;
 };
-type TopShardsSortValue = ValueOf<typeof TOP_SHARDS_SORT_VALUES>;
-type TopQueriesSortValue = ValueOf<typeof TOP_QUERIES_SORT_VALUES>;
-export declare const isSortableTopShardsProperty: (value: string) => value is TopShardsSortValue;
-export declare const isSortableTopQueriesProperty: (value: string) => value is TopQueriesSortValue;
-export {};
+export declare const isSortableTopShardsProperty: (value: string) => boolean;
+export declare const isSortableTopQueriesProperty: (value: string) => boolean;

package/dist/utils/diagnostics.js

@@ -1,15 +1,36 @@
-const TOP_SHARDS_SORT_VALUES = {
-    CPUCores: 'CPUCores',
-    DataSize: 'DataSize',
-    InFlightTxCount: 'InFlightTxCount',
-};
-const TOP_QUERIES_SORT_VALUES = {
-    CPUTimeUs: 'CPUTimeUs',
+export const TOP_QUERIES_COLUMNS_IDS = {
+    CPUTimeUs: 'CPUTime',
+    QueryText: 'QueryText',
     EndTime: 'EndTime',
     ReadRows: 'ReadRows',
     ReadBytes: 'ReadBytes',
     UserSID: 'UserSID',
+    OneLineQueryText: 'OneLineQueryText',
+    QueryHash: 'QueryHash',
     Duration: 'Duration',
 };
+export const TOP_SHARD_COLUMNS_IDS = {
+    TabletId: 'TabletId',
+    CPUCores: 'CPUCores',
+    DataSize: 'DataSize',
+    Path: 'Path',
+    NodeId: 'NodeId',
+    PeakTime: 'PeakTime',
+    InFlightTxCount: 'InFlightTxCount',
+    IntervalEnd: 'IntervalEnd',
+};
+const TOP_SHARDS_SORT_VALUES = [
+    TOP_SHARD_COLUMNS_IDS.CPUCores,
+    TOP_SHARD_COLUMNS_IDS.DataSize,
+    TOP_SHARD_COLUMNS_IDS.InFlightTxCount,
+];
+const TOP_QUERIES_SORT_VALUES = [
+    TOP_QUERIES_COLUMNS_IDS.CPUTimeUs,
+    TOP_QUERIES_COLUMNS_IDS.EndTime,
+    TOP_QUERIES_COLUMNS_IDS.ReadRows,
+    TOP_QUERIES_COLUMNS_IDS.ReadBytes,
+    TOP_QUERIES_COLUMNS_IDS.UserSID,
+    TOP_QUERIES_COLUMNS_IDS.Duration,
+];
 export const isSortableTopShardsProperty = (value) => Object.values(TOP_SHARDS_SORT_VALUES).includes(value);
 export const isSortableTopQueriesProperty = (value) => Object.values(TOP_QUERIES_SORT_VALUES).includes(value);

package/dist/utils/monaco/yql/yql.completionItemProvider.js

@@ -10,7 +10,7 @@ function disableCodeSuggestions() {
 export function registerYQLCompletionItemProvider(database) {
     disableCodeSuggestions();
     completionProvider = monaco.languages.registerCompletionItemProvider(LANGUAGE_YQL_ID, {
-        triggerCharacters: [' ', '', ',', '.', '`', '(', '/'],
+        triggerCharacters: [' ', '.', '`', '(', '/'],
         provideCompletionItems: createProvideSuggestionsFunction(database),
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ydb-embedded-ui",
-  "version": "6.10.3",
+  "version": "6.11.0",
   "files": [
     "dist"
   ],

package/dist/store/reducers/olapStats.d.ts

@@ -1,5 +0,0 @@
-export declare const olapApi: import("@reduxjs/toolkit/query").Api<import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("./api")._NEVER, unknown, {}>, {
-    getOlapStats: import("@reduxjs/toolkit/query").QueryDefinition<{
-        path?: string;
-    } | undefined, import("@reduxjs/toolkit/query").BaseQueryFn<void, typeof import("./api")._NEVER, unknown, {}>, "All", import("../../types/store/query").IQueryResult | undefined, "api">;
-}, "api", "All", typeof import("@reduxjs/toolkit/query").coreModuleName | typeof import("@reduxjs/toolkit/query/react").reactHooksModuleName>;

package/dist/store/reducers/olapStats.js

@@ -1,31 +0,0 @@
-import { isQueryErrorResponse, parseQueryAPIExecuteResponse } from '../../utils/query';
-import { api } from './api';
-function createOlatStatsQuery(path) {
-    return `SELECT * FROM \`${path}/.sys/primary_index_stats\``;
-}
-const queryAction = 'execute-scan';
-export const olapApi = api.injectEndpoints({
-    endpoints: (build) => ({
-        getOlapStats: build.query({
-            queryFn: async ({ path = '' } = {}, { signal }) => {
-                try {
-                    const response = await window.api.sendQuery({
-                        schema: 'modern',
-                        query: createOlatStatsQuery(path),
-                        database: path,
-                        action: queryAction,
-                    }, { signal });
-                    if (isQueryErrorResponse(response)) {
-                        return { error: response };
-                    }
-                    return { data: parseQueryAPIExecuteResponse(response) };
-                }
-                catch (error) {
-                    return { error: error || new Error('Unauthorized') };
-                }
-            },
-            providesTags: ['All'],
-        }),
-    }),
-    overrideExisting: 'throw',
-});