ydb-embedded-ui 4.5.2 → 4.6.0

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

@@ -1,85 +1,88 @@
 import {ReactNode, useCallback} from 'react';
-import {shallowEqual, useDispatch, useSelector} from 'react-redux';
+import {shallowEqual, useDispatch} from 'react-redux';
 
 import {Loader} from '../../../../components/Loader';
-
-//@ts-ignore
 import {TableIndexInfo} from '../../../../components/InfoViewer/schemaInfo';
 import {ResponseError} from '../../../../components/Errors/ResponseError';
 
-import {TopicInfo} from './TopicInfo';
-import {ChangefeedInfo} from './ChangefeedInfo';
-import {TableInfo} from './TableInfo';
-
 import {EPathType} from '../../../../types/api/schema';
+import {useAutofetcher, useTypedSelector} from '../../../../utils/hooks';
+import {selectSchemaMergedChildrenPaths} from '../../../../store/reducers/schema/schema';
+import {getTopic} from '../../../../store/reducers/topic';
+import {
+    getOlapStats,
+    resetLoadingState as resetOlapLoadingState,
+} from '../../../../store/reducers/olapStats';
+import {
+    getOverview,
+    getOverviewBatched,
+    setCurrentOverviewPath,
+    setDataWasNotLoaded,
+} from '../../../../store/reducers/overview/overview';
+
 import {
     isEntityWithMergedImplementation,
     isColumnEntityType,
     isTableType,
     isPathTypeWithTopic,
 } from '../../utils/schema';
-//@ts-ignore
-import {
-    getSchema,
-    getSchemaBatched,
-    resetLoadingState,
-    selectSchemaMergedChildrenPaths,
-} from '../../../../store/reducers/schema';
-import {getTopic} from '../../../../store/reducers/topic';
-//@ts-ignore
-import {
-    getOlapStats,
-    resetLoadingState as resetOlapLoadingState,
-} from '../../../../store/reducers/olapStats';
-import {useAutofetcher, useTypedSelector} from '../../../../utils/hooks';
+
+import {TopicInfo} from './TopicInfo';
+import {ChangefeedInfo} from './ChangefeedInfo';
+import {TableInfo} from './TableInfo';
 
 interface OverviewProps {
     type?: EPathType;
-    className?: string;
     tenantName?: string;
 }
 
-function Overview({type, tenantName, className}: OverviewProps) {
+function Overview({type, tenantName}: OverviewProps) {
     const dispatch = useDispatch();
 
+    const {autorefresh, currentSchemaPath} = useTypedSelector((state) => state.schema);
     const {
-        currentSchema: currentItem = {},
-        loading: schemaLoading,
-        wasLoaded,
-        autorefresh,
-        currentSchemaPath,
-        error,
-    } = useSelector((state: any) => state.schema);
-
-    const {data: {result: olapStats} = {result: undefined}, loading: olapStatsLoading} =
-        useTypedSelector((state) => state.olapStats);
-
-    const loading = schemaLoading || olapStatsLoading;
+        data,
+        additionalData,
+        loading: overviewLoading,
+        wasLoaded: overviewWasLoaded,
+        error: overviewError,
+    } = useTypedSelector((state) => state.overview);
+    const {
+        data: {result: olapStats} = {result: undefined},
+        loading: olapStatsLoading,
+        wasLoaded: olapStatsWasLoaded,
+    } = useTypedSelector((state) => state.olapStats);
 
     const isEntityWithMergedImpl = isEntityWithMergedImplementation(type);
 
-    // There is a circular dependency here. Fetch data depends on children paths
-    // When data in store updated on fetch request,
-    // new object is set there, so source children array is updated
-    // This updates selector, the selector returns a new array, and data is fetched again
-    // To prevent it, shallowEqual, which compares array content, was added
+    // shalloEqual prevents rerenders when new schema data is loaded
     const mergedChildrenPaths = useTypedSelector(
         (state) => selectSchemaMergedChildrenPaths(state, currentSchemaPath, type),
         shallowEqual,
     );
 
+    const entityLoading =
+        (overviewLoading && !overviewWasLoaded) || (olapStatsLoading && !olapStatsWasLoaded);
+    const entityNotReady = isEntityWithMergedImpl && !mergedChildrenPaths;
+
     const fetchData = useCallback(
         (isBackground: boolean) => {
-            if (!isBackground) {
-                dispatch(resetLoadingState());
+            const schemaPath = currentSchemaPath || tenantName;
+
+            if (!schemaPath) {
+                return;
             }
 
-            const schemaPath = currentSchemaPath || tenantName;
+            dispatch(setCurrentOverviewPath(schemaPath));
+
+            if (!isBackground) {
+                dispatch(setDataWasNotLoaded());
+            }
 
             if (!isEntityWithMergedImpl) {
-                dispatch(getSchema({path: schemaPath}));
+                dispatch(getOverview({path: schemaPath}));
             } else if (mergedChildrenPaths) {
-                dispatch(getSchemaBatched([schemaPath, ...mergedChildrenPaths]));
+                dispatch(getOverviewBatched([schemaPath, ...mergedChildrenPaths]));
             }
 
             if (isTableType(type) && isColumnEntityType(type)) {
@@ -113,32 +116,32 @@ function Overview({type, tenantName, className}: OverviewProps) {
             [EPathType.EPathTypeDir]: undefined,
             [EPathType.EPathTypeTable]: undefined,
             [EPathType.EPathTypeSubDomain]: undefined,
-            [EPathType.EPathTypeTableIndex]: () => <TableIndexInfo data={currentItem} />,
+            [EPathType.EPathTypeTableIndex]: () => <TableIndexInfo data={data} />,
             [EPathType.EPathTypeExtSubDomain]: undefined,
             [EPathType.EPathTypeColumnStore]: undefined,
             [EPathType.EPathTypeColumnTable]: undefined,
             [EPathType.EPathTypeCdcStream]: () => (
-                <ChangefeedInfo data={currentItem} childrenPaths={mergedChildrenPaths} />
+                <ChangefeedInfo data={data} topic={additionalData?.[0]} />
             ),
-            [EPathType.EPathTypePersQueueGroup]: () => <TopicInfo data={currentItem} />,
+            [EPathType.EPathTypePersQueueGroup]: () => <TopicInfo data={data} />,
         };
 
         return (
             (type && pathTypeToComponent[type]?.()) || (
-                <TableInfo data={currentItem} type={type} olapStats={olapStats} />
+                <TableInfo data={data} type={type} olapStats={olapStats} />
             )
         );
     };
 
-    if ((loading && !wasLoaded) || (isEntityWithMergedImpl && !mergedChildrenPaths)) {
+    if (entityLoading || entityNotReady) {
         return <Loader size="m" />;
     }
 
-    if (error) {
-        return <ResponseError error={error} />;
+    if (overviewError) {
+        return <ResponseError error={overviewError} />;
     }
 
-    return <div className={className}>{renderContent()}</div>;
+    return <div>{renderContent()}</div>;
 }
 
 export default Overview;

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

@@ -16,7 +16,7 @@ import {
     setShardsState,
     setShardsQueryFilters,
 } from '../../../../store/reducers/shardsWorkload';
-import {setCurrentSchemaPath, getSchema} from '../../../../store/reducers/schema';
+import {setCurrentSchemaPath, getSchema} from '../../../../store/reducers/schema/schema';
 import {EShardsWorkloadMode, IShardsWorkloadFilters} from '../../../../types/store/shardsWorkload';
 
 import type {EPathType} from '../../../../types/api/schema';

package/dist/containers/Tenant/ObjectSummary/ObjectSummary.tsx

@@ -46,7 +46,7 @@ import {
     paneVisibilityToggleReducerCreator,
     PaneVisibilityToggleButtons,
 } from '../utils/paneVisibilityToggleHelpers';
-import {setShowPreview} from '../../../store/reducers/schema';
+import {setShowPreview} from '../../../store/reducers/schema/schema';
 import {setTopLevelTab} from '../../../store/reducers/tenant/tenant';
 import {TENANT_GENERAL_TABS_IDS} from '../../../store/reducers/tenant/constants';
 

package/dist/containers/Tenant/Preview/Preview.js

@@ -15,7 +15,7 @@ import {prepareQueryError} from '../../../utils/query';
 import {isTableType} from '../utils/schema';
 import {AutoFetcher} from '../../../utils/autofetcher';
 import EnableFullscreenButton from '../../../components/EnableFullscreenButton/EnableFullscreenButton';
-import {setShowPreview} from '../../../store/reducers/schema';
+import {setShowPreview} from '../../../store/reducers/schema/schema';
 
 import './Preview.scss';
 

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

@@ -8,12 +8,6 @@ import MonacoEditor from 'react-monaco-editor';
 import SplitPane from '../../../components/SplitPane';
 import {QueryResultTable} from '../../../components/QueryResultTable';
 
-import SavedQueries from './SavedQueries/SavedQueries';
-import QueryResult from './QueryResult/QueryResult';
-import QueryExplain from './QueryExplain/QueryExplain';
-import {QueryEditorControls} from './QueryEditorControls/QueryEditorControls';
-import {OldQueryEditorControls} from './QueryEditorControls/OldQueryEditorControls';
-
 import {
     sendExecuteQuery,
     changeUserInput,
@@ -25,22 +19,31 @@ import {
 } from '../../../store/reducers/executeQuery';
 import {getExplainQuery, getExplainQueryAst} from '../../../store/reducers/explainQuery';
 import {getParsedSettingValue, setSettingValue} from '../../../store/reducers/settings/settings';
+import {setShowPreview} from '../../../store/reducers/schema/schema';
 import {
     DEFAULT_IS_QUERY_RESULT_COLLAPSED,
     DEFAULT_SIZE_RESULT_PANE_KEY,
     SAVED_QUERIES_KEY,
     QUERY_INITIAL_MODE_KEY,
-    ENABLE_QUERY_MODES_FOR_EXPLAIN,
+    ENABLE_ADDITIONAL_QUERY_MODES,
 } from '../../../utils/constants';
+import {useSetting} from '../../../utils/hooks';
+import {QueryModes} from '../../../types/store/query';
 
-import './QueryEditor.scss';
-import QueriesHistory from './QueriesHistory/QueriesHistory';
 import {
     PaneVisibilityActionTypes,
     paneVisibilityToggleReducerCreator,
 } from '../utils/paneVisibilityToggleHelpers';
 import Preview from '../Preview/Preview';
-import {setShowPreview} from '../../../store/reducers/schema';
+
+import SavedQueries from './SavedQueries/SavedQueries';
+import QueryResult from './QueryResult/QueryResult';
+import QueryExplain from './QueryExplain/QueryExplain';
+import {QueryEditorControls} from './QueryEditorControls/QueryEditorControls';
+import {OldQueryEditorControls} from './QueryEditorControls/OldQueryEditorControls';
+import QueriesHistory from './QueriesHistory/QueriesHistory';
+
+import './QueryEditor.scss';
 
 const TABLE_SETTINGS = {
     sortable: false,
@@ -83,7 +86,15 @@ function QueryEditor(props) {
     const [resultType, setResultType] = useState(RESULT_TYPES.EXECUTE);
 
     const [isResultLoaded, setIsResultLoaded] = useState(false);
-    const [queryMode, setQueryMode] = useState(props.initialQueryMode);
+    const [queryMode, setQueryMode] = useSetting(QUERY_INITIAL_MODE_KEY);
+    const [enableAdditionalQueryModes] = useSetting(ENABLE_ADDITIONAL_QUERY_MODES);
+
+    useEffect(() => {
+        const isNewQueryMode = queryMode !== QueryModes.script && queryMode !== QueryModes.scan;
+        if (!enableAdditionalQueryModes && isNewQueryMode) {
+            setQueryMode(QueryModes.script);
+        }
+    }, [enableAdditionalQueryModes, queryMode, setQueryMode]);
 
     const [resultVisibilityState, dispatchResultVisibilityState] = useReducer(
         paneVisibilityToggleReducerCreator(DEFAULT_IS_QUERY_RESULT_COLLAPSED),
@@ -510,15 +521,10 @@ function QueryEditor(props) {
         setSettingValue(SAVED_QUERIES_KEY, JSON.stringify(newSavedQueries));
     };
 
-    const onUpdateQueryMode = (mode) => {
-        setQueryMode(mode);
-        props.setSettingValue(QUERY_INITIAL_MODE_KEY, mode);
-    };
-
     const renderControls = () => {
-        const {executeQuery, explainQuery, savedQueries, enableQueryModesForExplain} = props;
+        const {executeQuery, explainQuery, savedQueries} = props;
 
-        if (enableQueryModesForExplain) {
+        if (enableAdditionalQueryModes) {
             return (
                 <QueryEditorControls
                     onRunButtonClick={handleSendExecuteClick}
@@ -528,7 +534,7 @@ function QueryEditor(props) {
                     onSaveQueryClick={onSaveQueryHandler}
                     savedQueries={savedQueries}
                     disabled={!executeQuery.input}
-                    onUpdateQueryMode={onUpdateQueryMode}
+                    onUpdateQueryMode={setQueryMode}
                     queryMode={queryMode}
                 />
             );
@@ -543,7 +549,7 @@ function QueryEditor(props) {
                 onSaveQueryClick={onSaveQueryHandler}
                 savedQueries={savedQueries}
                 disabled={!executeQuery.input}
-                onUpdateQueryMode={onUpdateQueryMode}
+                onUpdateQueryMode={setQueryMode}
                 queryMode={queryMode}
             />
         );
@@ -607,8 +613,6 @@ const mapStateToProps = (state) => {
         executeQuery: state.executeQuery,
         explainQuery: state.explainQuery,
         savedQueries: getParsedSettingValue(state, SAVED_QUERIES_KEY),
-        initialQueryMode: getParsedSettingValue(state, QUERY_INITIAL_MODE_KEY),
-        enableQueryModesForExplain: getParsedSettingValue(state, ENABLE_QUERY_MODES_FOR_EXPLAIN),
         showPreview: state.schema.showPreview,
         currentSchema: state.schema.currentSchema,
         monacoHotKey: state.executeQuery?.monacoHotKey,

package/dist/containers/Tenant/QueryEditor/QueryEditorControls/OldQueryEditorControls.tsx

@@ -6,10 +6,17 @@ import {Icon} from '../../../../components/Icon';
 
 import SaveQuery from '../SaveQuery/SaveQuery';
 
-import {b, QueryEditorControlsProps, QueryModeSelectorTitles} from './shared';
+import {QueryEditorControlsProps, b} from './shared';
 
 import './QueryEditorControls.scss';
 
+type OldQueryModes = QueryModes.script | QueryModes.scan;
+
+export const QueryModeSelectorTitles = {
+    [QueryModes.script]: 'Script',
+    [QueryModes.scan]: 'Scan',
+} as const;
+
 export const OldQueryEditorControls = ({
     onRunButtonClick,
     runIsLoading,
@@ -26,7 +33,7 @@ export const OldQueryEditorControls = ({
             return {
                 text: `Run ${title}`,
                 action: () => {
-                    onUpdateQueryMode(mode as QueryModes);
+                    onUpdateQueryMode(mode as OldQueryModes);
                 },
             };
         });
@@ -44,7 +51,7 @@ export const OldQueryEditorControls = ({
                         loading={runIsLoading}
                     >
                         <Icon name="startPlay" viewBox="0 0 16 16" width={16} height={16} />
-                        {`Run ${QueryModeSelectorTitles[queryMode]}`}
+                        {`Run ${QueryModeSelectorTitles[queryMode as OldQueryModes]}`}
                     </Button>
                     <DropdownMenu
                         items={runModeSelectorMenuItems}

package/dist/containers/Tenant/QueryEditor/QueryEditorControls/QueryEditorControls.tsx

@@ -8,10 +8,17 @@ import SaveQuery from '../SaveQuery/SaveQuery';
 
 import i18n from '../i18n';
 
-import {b, QueryEditorControlsProps, QueryModeSelectorTitles} from './shared';
+import {QueryEditorControlsProps, b} from './shared';
 
 import './QueryEditorControls.scss';
 
+export const QueryModeSelectorTitles = {
+    [QueryModes.script]: 'Script',
+    [QueryModes.scan]: 'Scan',
+    [QueryModes.data]: 'Data',
+    [QueryModes.query]: 'Query',
+} as const;
+
 export const QueryEditorControls = ({
     onRunButtonClick,
     runIsLoading,

package/dist/containers/Tenant/QueryEditor/QueryEditorControls/shared.ts

@@ -1,14 +1,9 @@
 import block from 'bem-cn-lite';
 
-import {QueryModes} from '../../../../types/store/query';
+import type {QueryModes} from '../../../../types/store/query';
 
 export const b = block('ydb-query-editor-controls');
 
-export const QueryModeSelectorTitles = {
-    [QueryModes.script]: 'Script',
-    [QueryModes.scan]: 'Scan',
-} as const;
-
 export interface QueryEditorControlsProps {
     onRunButtonClick: (mode?: QueryModes) => void;
     runIsLoading: boolean;

package/dist/containers/Tenant/Schema/SchemaTree/SchemaTree.tsx

@@ -3,7 +3,7 @@ import {useDispatch} from 'react-redux';
 
 import {NavigationTree} from 'ydb-ui-components';
 
-import {setCurrentSchemaPath, preloadSchemas} from '../../../../store/reducers/schema';
+import {setCurrentSchemaPath, preloadSchemas} from '../../../../store/reducers/schema/schema';
 import type {EPathType, TEvDescribeSchemeResult} from '../../../../types/api/schema';
 
 import {isChildlessPathType, mapPathTypeToNavigationTreeType} from '../../utils/schema';

package/dist/containers/Tenant/Tenant.tsx

@@ -8,15 +8,16 @@ import type {TEvDescribeSchemeResult} from '../../types/api/schema';
 
 import {DEFAULT_IS_TENANT_SUMMARY_COLLAPSED, DEFAULT_SIZE_TENANT_KEY} from '../../utils/constants';
 import {useTypedSelector} from '../../utils/hooks';
-import routes, {CLUSTER_PAGES, createHref} from '../../routes';
+import routes, {createHref} from '../../routes';
 import {setHeader} from '../../store/reducers/header';
-import {disableAutorefresh, getSchema, resetLoadingState} from '../../store/reducers/schema';
+import {disableAutorefresh, getSchema} from '../../store/reducers/schema/schema';
 import {getSchemaAcl} from '../../store/reducers/schemaAcl/schemaAcl';
-import {getTenantInfo, clearTenant} from '../../store/reducers/tenant/tenant';
 
 import SplitPane from '../../components/SplitPane';
 import {AccessDenied} from '../../components/Errors/403';
 
+import {getClusterPath} from '../Cluster/utils';
+
 import ObjectGeneralTabs from './ObjectGeneralTabs/ObjectGeneralTabs';
 import ObjectSummary from './ObjectSummary/ObjectSummary';
 import ObjectGeneral from './ObjectGeneral/ObjectGeneral';
@@ -62,7 +63,6 @@ function Tenant(props: TenantProps) {
     const {PathType: currentPathType, PathSubType: currentPathSubType} =
         (currentItem as TEvDescribeSchemeResult).PathDescription?.Self || {};
 
-    const {error: {status: tenantStatus = 200} = {}} = useTypedSelector((state) => state.tenant);
     const {error: {status: schemaStatus = 200} = {}} = useTypedSelector((state) => state.schema);
 
     const dispatch = useDispatch();
@@ -82,7 +82,6 @@ function Tenant(props: TenantProps) {
     }, [tenantName, dispatch]);
 
     useEffect(() => {
-        dispatch(resetLoadingState());
         dispatch(getSchema({path: currentSchemaPath}));
         dispatch(getSchemaAcl({path: currentSchemaPath}));
     }, [currentSchemaPath, dispatch]);
@@ -93,12 +92,11 @@ function Tenant(props: TenantProps) {
 
     useEffect(() => {
         if (tenantName) {
-            dispatch(getTenantInfo({path: tenantName}));
             dispatch(
                 setHeader([
                     {
-                        text: CLUSTER_PAGES.tenants.title,
-                        link: createHref(routes.cluster, {activeTab: CLUSTER_PAGES.tenants.id}),
+                        text: 'Cluster',
+                        link: getClusterPath(),
                     },
                     {
                         text: tenantName.startsWith('/') ? tenantName.slice(1) : tenantName,
@@ -109,9 +107,6 @@ function Tenant(props: TenantProps) {
                 ]),
             );
         }
-        return () => {
-            dispatch(clearTenant());
-        };
     }, [tenantName, dispatch]);
 
     const onCollapseSummaryHandler = () => {
@@ -125,7 +120,7 @@ function Tenant(props: TenantProps) {
         dispatchSummaryVisibilityAction(PaneVisibilityActionTypes.clear);
     };
 
-    const showBlockingError = tenantStatus === 403 || schemaStatus === 403;
+    const showBlockingError = schemaStatus === 403;
 
     return (
         <div className={b()}>

package/dist/containers/Tenant/utils/schemaActions.ts

@@ -2,7 +2,7 @@ import {Dispatch} from 'react';
 import type {NavigationTreeNodeType, NavigationTreeProps} from 'ydb-ui-components';
 
 import {changeUserInput} from '../../../store/reducers/executeQuery';
-import {setShowPreview} from '../../../store/reducers/schema';
+import {setShowPreview} from '../../../store/reducers/schema/schema';
 import {setTopLevelTab} from '../../../store/reducers/tenant/tenant';
 import {TENANT_GENERAL_TABS_IDS} from '../../../store/reducers/tenant/constants';
 import createToast from '../../../utils/createToast';

package/dist/containers/Tenants/Tenants.js

@@ -15,7 +15,7 @@ import {ProblemFilter} from '../../components/ProblemFilter';
 import {Illustration} from '../../components/Illustration';
 import {AutoFetcher} from '../../utils/autofetcher';
 
-import routes, {CLUSTER_PAGES, createHref} from '../../routes';
+import routes, {createHref} from '../../routes';
 import {formatCPU, formatBytesToGigabyte, formatNumber} from '../../utils';
 import {withSearch} from '../../HOCS';
 import {DEFAULT_TABLE_SETTINGS, TENANT_INITIAL_TAB_KEY} from '../../utils/constants';
@@ -25,7 +25,6 @@ import {
     getSettingValue,
     ProblemFilterValues,
 } from '../../store/reducers/settings/settings';
-import {setHeader} from '../../store/reducers/header';
 
 import {clusterName} from '../../store';
 import {TenantTabsGroups, TENANT_GENERAL_TABS, TENANT_INFO_TABS} from '../Tenant/TenantPages';
@@ -51,7 +50,6 @@ class Tenants extends React.Component {
         tenants: PropTypes.array,
         searchQuery: PropTypes.string,
         handleSearchQuery: PropTypes.func,
-        setHeader: PropTypes.func,
         filter: PropTypes.string,
         changeFilter: PropTypes.func,
         cluster: PropTypes.object,
@@ -77,12 +75,6 @@ class Tenants extends React.Component {
         this.autofetcher = new AutoFetcher();
         this.props.getTenantsInfo(clusterName);
         this.autofetcher.fetch(() => this.props.getTenantsInfo(clusterName));
-        this.props.setHeader([
-            {
-                text: CLUSTER_PAGES.tenants.title,
-                link: createHref(routes.cluster, {activeTab: CLUSTER_PAGES.tenants.id}),
-            },
-        ]);
     }
 
     componentWillUnmount() {
@@ -94,14 +86,15 @@ class Tenants extends React.Component {
 
         return (
             <div className={b('controls')}>
-                <TextInput
-                    className={b('search')}
-                    placeholder="Database name"
-                    value={searchQuery}
-                    onUpdate={handleSearchQuery}
-                    hasClear
-                    autoFocus
-                />
+                <div className={b('search')}>
+                    <TextInput
+                        placeholder="Database name"
+                        value={searchQuery}
+                        onUpdate={handleSearchQuery}
+                        hasClear
+                        autoFocus
+                    />
+                </div>
                 <ProblemFilter value={filter} onChange={changeFilter} />
             </div>
         );
@@ -309,16 +302,14 @@ class Tenants extends React.Component {
 
         return (
             <div className={b('table-wrapper')}>
-                <div className={b('table-content')}>
-                    <DataTable
-                        theme="yandex-cloud"
-                        data={filteredTenants}
-                        columns={columns}
-                        settings={DEFAULT_TABLE_SETTINGS}
-                        dynamicRender={true}
-                        emptyDataMessage="No such tenants"
-                    />
-                </div>
+                <DataTable
+                    theme="yandex-cloud"
+                    data={filteredTenants}
+                    columns={columns}
+                    settings={DEFAULT_TABLE_SETTINGS}
+                    dynamicRender={true}
+                    emptyDataMessage="No such tenants"
+                />
             </div>
         );
     };
@@ -363,7 +354,6 @@ const mapStateToProps = (state) => {
 const mapDispatchToProps = {
     getTenantsInfo,
     changeFilter,
-    setHeader,
 };
 
 export default withSearch(connect(mapStateToProps, mapDispatchToProps)(Tenants));

package/dist/containers/Tenants/Tenants.scss

@@ -1,7 +1,7 @@
 @import '../../styles/mixins.scss';
 
 .tenants {
-    overflow: auto;
+    height: 100%;
     @include flex-container();
 
     &__format-label {
@@ -34,10 +34,8 @@
 
     &__table-wrapper {
         overflow: auto;
-        @include flex-container();
-    }
+        flex-grow: 1;
 
-    &__table-content {
         @include freeze-nth-column(1);
 
         @include table-styles;

package/dist/containers/UserSettings/i18n/en.json

@@ -15,6 +15,6 @@
   "settings.useNodesEndpoint.title": "Break the Nodes tab in Diagnostics",
   "settings.useNodesEndpoint.popover": "Use /viewer/json/nodes endpoint for Nodes Tab in diagnostics. It returns incorrect data on versions before 23-1",
 
-  "settings.enableQueryModesForExplain.title": "Enable query modes for explain",
-  "settings.enableQueryModesForExplain.popover": "Enable script | scan query mode selector for both run and explain. May not work on versions before 23-2"
+  "settings.enableAdditionalQueryModes.title": "Enable additional query modes",
+  "settings.enableAdditionalQueryModes.popover": "Adds 'data' and 'query' modes for run. Enables query modes for explain. May not work on some versions"
 }

package/dist/containers/UserSettings/i18n/ru.json

@@ -15,6 +15,6 @@
   "settings.useNodesEndpoint.title": "Сломать вкладку Nodes в диагностике",
   "settings.useNodesEndpoint.popover": "Использовать эндпоинт /viewer/json/nodes для вкладки Nodes в диагностике. Может возвращать некорректные данные на версиях до 23-1",
 
-  "settings.enableQueryModesForExplain.title": "Включить режимы выполнения запроса для explain",
-  "settings.enableQueryModesForExplain.popover": "Включить общий переключатель script | scan для run и explain. Может работать некорректно на версиях до 23-2"
+  "settings.enableAdditionalQueryModes.title": "Включить дополнительные режимы выполнения запросов",
+  "settings.enableAdditionalQueryModes.popover": "Добавляет режимы 'data' и 'query' для run. Включает возможность выбрать режим выполнения запроса для explain. Может работать некорректно на некоторых версиях"
 }

package/dist/containers/UserSettings/settings.ts

@@ -4,7 +4,7 @@ import favoriteFilledIcon from '../../assets/icons/star.svg';
 import flaskIcon from '../../assets/icons/flask.svg';
 
 import {
-    ENABLE_QUERY_MODES_FOR_EXPLAIN,
+    ENABLE_ADDITIONAL_QUERY_MODES,
     INVERTED_DISKS_KEY,
     THEME_KEY,
     USE_NODES_ENDPOINT_IN_DIAGNOSTICS_KEY,
@@ -59,9 +59,9 @@ export const useNodesEndpointSetting: SettingProps = {
     helpPopoverContent: i18n('settings.useNodesEndpoint.popover'),
 };
 export const enableQueryModesForExplainSetting: SettingProps = {
-    settingKey: ENABLE_QUERY_MODES_FOR_EXPLAIN,
-    title: i18n('settings.enableQueryModesForExplain.title'),
-    helpPopoverContent: i18n('settings.enableQueryModesForExplain.popover'),
+    settingKey: ENABLE_ADDITIONAL_QUERY_MODES,
+    title: i18n('settings.enableAdditionalQueryModes.title'),
+    helpPopoverContent: i18n('settings.enableAdditionalQueryModes.popover'),
 };
 
 export const generalSection: SettingsSection = {

package/dist/containers/Versions/Versions.scss

@@ -3,10 +3,6 @@
 .ydb-versions {
     $_: &;
 
-    &__content {
-        padding: 20px;
-    }
-
     &__controls {
         display: flex;
         align-items: center;