ydb-embedded-ui 6.11.0 → 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,24 +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();
     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 });
+    const { error: schemaError } = useGetSchemaQuery({ path, database });
     const entityLoading = overviewLoading;
     const entityNotReady = isEntityWithMergedImpl && !mergedChildrenPaths;
     const renderContent = () => {

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.js

@@ -1,8 +1,12 @@
+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 i18n from './i18n';
 const isInStoreColumnTable = (table) => {
     // SchemaPresetId could be 0
     return table.SchemaPresetName && table.SchemaPresetId !== undefined;
@@ -10,19 +14,28 @@ const isInStoreColumnTable = (table) => {
 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);
@@ -37,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),
         });
     }
@@ -61,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);
@@ -70,8 +85,8 @@ 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;
 };
@@ -122,8 +137,12 @@ export const prepareTableInfo = (data, type) => {
             RangeReadRows,
         }),
     ];
-    //@ts-expect-error
-    const tabletMetricsInfo = formatObject(formatTabletMetricsItem, TabletMetrics);
+    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

@@ -27,7 +27,7 @@ export function TenantOverview({ tenantName, additionalTenantProps, additionalNo
     const { Name, Type, Overall } = tenant || {};
     const tenantType = mapDatabaseTypeToDBName(Type);
     // FIXME: remove after correct data is added to tenantInfo
-    const { data: tenantSchemaData } = useGetSchemaQuery({ path: tenantName });
+    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,

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>[];

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

@@ -75,17 +75,17 @@ const durationColumn = {
     align: DataTable.RIGHT,
     width: 150,
 };
-export const getTopQueriesColumns = () => {
-    return [
-        cpuTimeUsColumn,
-        queryTextColumn,
-        endTimeColumn,
-        durationColumn,
-        readRowsColumn,
-        readBytesColumn,
-        userSIDColumn,
-    ];
-};
-export const getTenantOverviewTopQueriesColumns = () => {
-    return [queryHashColumn, oneLineQueryTextColumn, cpuTimeUsColumn];
-};
+export const TOP_QUERIES_COLUMNS = [
+    cpuTimeUsColumn,
+    queryTextColumn,
+    endTimeColumn,
+    durationColumn,
+    readRowsColumn,
+    readBytesColumn,
+    userSIDColumn,
+];
+export const TENANT_OVERVIEW_TOP_QUERUES_COLUMNS = [
+    queryHashColumn,
+    oneLineQueryTextColumn,
+    cpuTimeUsColumn,
+];

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

@@ -7,7 +7,7 @@ import { TableWithControlsLayout } from '../../../../components/TableWithControl
 import { setShardsQueryFilters, shardApi, } from '../../../../store/reducers/shardsWorkload/shardsWorkload';
 import { EShardsWorkloadMode } from '../../../../store/reducers/shardsWorkload/types';
 import { cn } from '../../../../utils/cn';
-import { DEFAULT_TABLE_SETTINGS, HOUR_IN_SECONDS } from '../../../../utils/constants';
+import { DEFAULT_TABLE_SETTINGS } from '../../../../utils/constants';
 import { formatDateTime } from '../../../../utils/dataFormatters/dataFormatters';
 import { TOP_SHARD_COLUMNS_IDS, isSortableTopShardsProperty } from '../../../../utils/diagnostics';
 import { useAutoRefreshInterval, useTypedDispatch, useTypedSelector } from '../../../../utils/hooks';
@@ -52,8 +52,8 @@ function dataTableToStringSortOrder(value = []) {
     return sortOrders.map(({ columnId }) => columnId).join(',');
 }
 function fillDateRangeFor(value) {
-    value.to = Date.now();
-    value.from = value.to - HOUR_IN_SECONDS * 1000;
+    value.to = 'now';
+    value.from = 'now-1h';
     return value;
 }
 export const TopShards = ({ tenantName, path, type }) => {

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

@@ -1,14 +1,14 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import DataTable from '@gravity-ui/react-data-table';
-import { DeveloperUiLink } from '../../../../components/DeveloperUiLink/DeveloperUiLink';
+import { DeveloperUILinkButton } from '../../../../components/DeveloperUILinkButton/DeveloperUILinkButton';
 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 { createTabletDeveloperUIHref } from '../../../../utils/developerUI/developerUI';
 import { getDefaultNodePath } from '../../../Node/NodePages';
 export const TOP_SHARDS_COLUMNS_WIDTH_LS_KEY = 'topShardsColumnsWidth';
 const TOP_SHARDS_COLUMNS_IDS = {
@@ -68,10 +68,10 @@ const tabletIdColumn = {
         if (!row.TabletId) {
             return '–';
         }
-        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}` }) }));
+        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(DeveloperUILinkButton, { href: createTabletDeveloperUIHref(row.TabletId) }) }));
     },
     sortable: false,
-    width: 190,
+    width: 220,
 };
 const nodeIdColumn = {
     name: TOP_SHARDS_COLUMNS_IDS.NodeId,

package/dist/containers/Tenant/ObjectSummary/ObjectSummary.js

@@ -8,6 +8,7 @@ import { Link, useLocation } from 'react-router-dom';
 import { StringParam, useQueryParam } from 'use-query-params';
 import { AsyncReplicationState } from '../../../components/AsyncReplicationState';
 import { ClipboardButton } from '../../../components/ClipboardButton';
+import { toFormattedSize } from '../../../components/FormattedBytes/utils';
 import InfoViewer from '../../../components/InfoViewer/InfoViewer';
 import { LinkWithIcon } from '../../../components/LinkWithIcon/LinkWithIcon';
 import { Loader } from '../../../components/Loader';
@@ -19,7 +20,7 @@ import { setQueryTab, setSummaryTab, setTenantPage } from '../../../store/reduce
 import { EPathSubType, EPathType } from '../../../types/api/schema';
 import { cn } from '../../../utils/cn';
 import { DEFAULT_IS_TENANT_COMMON_INFO_COLLAPSED, DEFAULT_SIZE_TENANT_SUMMARY_KEY, } from '../../../utils/constants';
-import { formatDateTime, formatSecondsToHours } from '../../../utils/dataFormatters/dataFormatters';
+import { formatDateTime, formatNumber, formatSecondsToHours, } from '../../../utils/dataFormatters/dataFormatters';
 import { useTypedDispatch, useTypedSelector } from '../../../utils/hooks';
 import { Acl } from '../Acl/Acl';
 import { EntityTitle } from '../EntityTitle/EntityTitle';
@@ -48,7 +49,7 @@ export function ObjectSummary({ type, subType, tenantName, path, onCollapseSumma
     const queryParams = qs.parse(location.search, {
         ignoreQueryPrefix: true,
     });
-    const { data: currentObjectData } = useGetSchemaQuery({ path });
+    const { data: currentObjectData } = useGetSchemaQuery({ path, database: tenantName });
     const currentSchemaData = (_a = currentObjectData === null || currentObjectData === void 0 ? void 0 : currentObjectData.PathDescription) === null || _a === void 0 ? void 0 : _a.Self;
     React.useEffect(() => {
         const isTable = isTableType(type);
@@ -86,10 +87,33 @@ export function ObjectSummary({ type, subType, tenantName, path, onCollapseSumma
         overview.push({ label: i18n('summary.version'), value: PathVersion });
         overview.push({
             label: i18n('summary.created'),
-            value: formatDateTime(CreateStep, ''),
+            value: formatDateTime(CreateStep),
         });
         const { PathDescription } = currentObjectData;
+        if (PathDescription === null || PathDescription === void 0 ? void 0 : PathDescription.TableStats) {
+            const { DataSize, RowCount } = PathDescription.TableStats;
+            overview.push({
+                label: i18n('summary.data-size'),
+                value: toFormattedSize(DataSize),
+            }, {
+                label: i18n('summary.row-count'),
+                value: formatNumber(RowCount),
+            });
+        }
         const title = _jsx(EntityTitle, { data: PathDescription });
+        const getDatabaseOverview = () => {
+            var _a, _b;
+            return [
+                {
+                    label: i18n('summary.paths'),
+                    value: (_a = PathDescription === null || PathDescription === void 0 ? void 0 : PathDescription.DomainDescription) === null || _a === void 0 ? void 0 : _a.PathsInside,
+                },
+                {
+                    label: i18n('summary.shards'),
+                    value: (_b = PathDescription === null || PathDescription === void 0 ? void 0 : PathDescription.DomainDescription) === null || _b === void 0 ? void 0 : _b.ShardsInside,
+                },
+            ];
+        };
         const getPathTypeOverview = {
             [EPathType.EPathTypeInvalid]: undefined,
             [EPathType.EPathTypeDir]: undefined,
@@ -102,21 +126,9 @@ export function ObjectSummary({ type, subType, tenantName, path, onCollapseSumma
                     },
                 ];
             },
-            [EPathType.EPathTypeSubDomain]: undefined,
+            [EPathType.EPathTypeSubDomain]: getDatabaseOverview,
             [EPathType.EPathTypeTableIndex]: undefined,
-            [EPathType.EPathTypeExtSubDomain]: () => {
-                var _a, _b;
-                return [
-                    {
-                        label: i18n('summary.paths'),
-                        value: (_a = PathDescription === null || PathDescription === void 0 ? void 0 : PathDescription.DomainDescription) === null || _a === void 0 ? void 0 : _a.PathsInside,
-                    },
-                    {
-                        label: i18n('summary.shards'),
-                        value: (_b = PathDescription === null || PathDescription === void 0 ? void 0 : PathDescription.DomainDescription) === null || _b === void 0 ? void 0 : _b.ShardsInside,
-                    },
-                ];
-            },
+            [EPathType.EPathTypeExtSubDomain]: getDatabaseOverview,
             [EPathType.EPathTypeColumnStore]: () => {
                 var _a, _b;
                 return [
@@ -212,7 +224,7 @@ export function ObjectSummary({ type, subType, tenantName, path, onCollapseSumma
     const renderTabContent = () => {
         switch (summaryTab) {
             case TENANT_SUMMARY_TABS_IDS.acl: {
-                return _jsx(Acl, { path: path });
+                return _jsx(Acl, { path: path, database: tenantName });
             }
             case TENANT_SUMMARY_TABS_IDS.schema: {
                 return _jsx(SchemaViewer, { type: type, path: path, tenantName: tenantName });
@@ -257,6 +269,7 @@ function ObjectTree({ tenantName, path }) {
     var _a;
     const { data: tenantData = {}, isLoading } = useGetSchemaQuery({
         path: tenantName,
+        database: tenantName,
     });
     const pathData = (_a = tenantData === null || tenantData === void 0 ? void 0 : tenantData.PathDescription) === null || _a === void 0 ? void 0 : _a.Self;
     const [, setCurrentPath] = useQueryParam('schema', StringParam);

package/dist/containers/Tenant/Query/ExplainResult/ExplainResult.js

@@ -12,7 +12,7 @@ import { explainVersions } from '../../../../store/reducers/explainQuery/utils';
 import { disableFullscreen } from '../../../../store/reducers/fullscreen';
 import { cn } from '../../../../utils/cn';
 import { useTypedDispatch, useTypedSelector } from '../../../../utils/hooks';
-import { LANGUAGE_S_EXPRESSION_ID } from '../../../../utils/monaco/s-expression/constants';
+import { S_EXPRESSION_LANGUAGE_ID } from '../../../../utils/monaco/constats';
 import { parseQueryErrorToString } from '../../../../utils/query';
 import { PaneVisibilityToggleButtons } from '../../utils/paneVisibilityToggleHelpers';
 import { renderExplainNode } from './utils';
@@ -98,7 +98,7 @@ export function ExplainResult(props) {
         return (_jsxs(React.Fragment, { children: [content, isFullscreen && _jsx(Fullscreen, { children: content })] }));
     };
     const renderAstExplain = () => {
-        const content = (_jsx("div", { className: b('ast'), children: _jsx(MonacoEditor, { language: LANGUAGE_S_EXPRESSION_ID, value: props.ast, options: EDITOR_OPTIONS, wrappingIndent: "indent", theme: `vs-${props.theme}` }) }));
+        const content = (_jsx("div", { className: b('ast'), children: _jsx(MonacoEditor, { language: S_EXPRESSION_LANGUAGE_ID, value: props.ast, options: EDITOR_OPTIONS, wrappingIndent: "indent", theme: `vs-${props.theme}` }) }));
         return (_jsxs(React.Fragment, { children: [content, isFullscreen && _jsx(Fullscreen, { children: content })] }));
     };
     const renderGraph = () => {

package/dist/containers/Tenant/Query/QueryEditor/QueryEditor.js

@@ -11,13 +11,14 @@ import { setShowPreview } from '../../../../store/reducers/schema/schema';
 import { cn } from '../../../../utils/cn';
 import { DEFAULT_IS_QUERY_RESULT_COLLAPSED, DEFAULT_SIZE_RESULT_PANE_KEY, LAST_USED_QUERY_ACTION_KEY, QUERY_USE_MULTI_SCHEMA_KEY, } from '../../../../utils/constants';
 import { useQueryModes, useSetting } from '../../../../utils/hooks';
-import { LANGUAGE_YQL_ID } from '../../../../utils/monaco/yql/constants';
+import { YQL_LANGUAGE_ID } from '../../../../utils/monaco/constats';
 import { QUERY_ACTIONS } from '../../../../utils/query';
 import { PaneVisibilityActionTypes, paneVisibilityToggleReducerCreator, } from '../../utils/paneVisibilityToggleHelpers';
 import { ExecuteResult } from '../ExecuteResult/ExecuteResult';
 import { ExplainResult } from '../ExplainResult/ExplainResult';
 import { Preview } from '../Preview/Preview';
 import { QueryEditorControls } from '../QueryEditorControls/QueryEditorControls';
+import { QuerySettingsDialog } from '../QuerySettingsDialog/QuerySettingsDialog';
 import { SaveQueryDialog } from '../SaveQuery/SaveQuery';
 import i18n from '../i18n';
 import { useEditorOptions } from './helpers';
@@ -133,6 +134,10 @@ function QueryEditor(props) {
         }
         dispatchResultVisibilityState(PaneVisibilityActionTypes.triggerExpand);
     };
+    const handleSettingsClick = () => {
+        setQueryAction('settings');
+        props.setShowPreview(false);
+    };
     const handleGetExplainQueryClick = (mode) => {
         const { input } = executeQuery;
         setLastUsedQueryAction(QUERY_ACTIONS.explain);
@@ -255,11 +260,11 @@ function QueryEditor(props) {
         dispatchResultVisibilityState(PaneVisibilityActionTypes.clear);
     };
     const renderControls = () => {
-        return (_jsx(QueryEditorControls, { onRunButtonClick: handleSendExecuteClick, runIsLoading: executeQueryResult.isLoading, onExplainButtonClick: handleGetExplainQueryClick, explainIsLoading: explainQueryResult.isLoading, disabled: !executeQuery.input, onUpdateQueryMode: setQueryMode, queryMode: queryMode, highlightedAction: lastUsedQueryAction }));
+        return (_jsx(QueryEditorControls, { onRunButtonClick: handleSendExecuteClick, onSettingsButtonClick: handleSettingsClick, runIsLoading: executeQueryResult.isLoading, onExplainButtonClick: handleGetExplainQueryClick, explainIsLoading: explainQueryResult.isLoading, disabled: !executeQuery.input, onUpdateQueryMode: setQueryMode, queryMode: queryMode, highlightedAction: lastUsedQueryAction }));
     };
     return (_jsxs("div", { className: b(), children: [_jsxs(SplitPane, { direction: "vertical", defaultSizePaneKey: DEFAULT_SIZE_RESULT_PANE_KEY, triggerCollapse: resultVisibilityState.triggerCollapse, triggerExpand: resultVisibilityState.triggerExpand, minSize: [0, 52], collapsedSizes: [100, 0], onSplitStartDragAdditional: onSplitStartDragAdditional, children: [_jsxs("div", { className: b('pane-wrapper', {
                             top: true,
-                        }), children: [_jsx("div", { className: b('monaco-wrapper'), children: _jsx("div", { className: b('monaco'), children: _jsx(MonacoEditor, { language: LANGUAGE_YQL_ID, value: executeQuery.input, options: editorOptions, onChange: onChange, editorDidMount: editorDidMount, theme: `vs-${theme}` }) }) }), renderControls()] }), _jsx("div", { className: b('pane-wrapper'), children: _jsx(Result, { executeQueryData: executeQueryResult.data, executeQueryError: executeQueryResult.error, explainQueryData: explainQueryResult.data, explainQueryError: explainQueryResult.error, explainQueryLoading: explainQueryResult.isLoading, resultVisibilityState: resultVisibilityState, onExpandResultHandler: onExpandResultHandler, onCollapseResultHandler: onCollapseResultHandler, type: type, theme: theme, resultType: resultType, tenantName: tenantName, path: path, showPreview: showPreview }) })] }), _jsx(SaveQueryDialog, {})] }));
+                        }), children: [_jsx("div", { className: b('monaco-wrapper'), children: _jsx("div", { className: b('monaco'), children: _jsx(MonacoEditor, { language: YQL_LANGUAGE_ID, value: executeQuery.input, options: editorOptions, onChange: onChange, editorDidMount: editorDidMount, theme: `vs-${theme}` }) }) }), renderControls()] }), _jsx("div", { className: b('pane-wrapper'), children: _jsx(Result, { executeQueryData: executeQueryResult.data, executeQueryError: executeQueryResult.error, explainQueryData: explainQueryResult.data, explainQueryError: explainQueryResult.error, explainQueryLoading: explainQueryResult.isLoading, resultVisibilityState: resultVisibilityState, onExpandResultHandler: onExpandResultHandler, onCollapseResultHandler: onCollapseResultHandler, type: type, theme: theme, resultType: resultType, tenantName: tenantName, path: path, showPreview: showPreview }) })] }), _jsx(SaveQueryDialog, {}), _jsx(QuerySettingsDialog, {})] }));
 }
 const mapStateToProps = (state) => {
     return {