ydb-embedded-ui 4.5.1 → 4.6.0

package/dist/containers/Storage/Storage.js

@@ -35,8 +35,6 @@ import {getNodesList, selectNodesMap} from '../../store/reducers/nodesList';
 import StorageGroups from './StorageGroups/StorageGroups';
 import StorageNodes from './StorageNodes/StorageNodes';
 import {DEFAULT_TABLE_SETTINGS} from '../../utils/constants';
-import {setHeader} from '../../store/reducers/header';
-import routes, {CLUSTER_PAGES, createHref} from '../../routes';
 
 import './Storage.scss';
 
@@ -67,7 +65,6 @@ class Storage extends React.Component {
         setStorageFilter: PropTypes.func,
         setVisibleEntities: PropTypes.func,
         visibleEntities: PropTypes.string,
-        setHeader: PropTypes.func,
         tenant: PropTypes.string,
         nodeId: PropTypes.string,
         nodesUptimeFilter: PropTypes.string,
@@ -77,7 +74,7 @@ class Storage extends React.Component {
     };
 
     componentDidMount() {
-        const {tenant, nodeId, setVisibleEntities, storageType, setHeader, getNodesList} =
+        const {tenant, nodeId, setVisibleEntities, storageType, getNodesList} =
             this.props;
 
         this.autofetcher = new AutoFetcher();
@@ -89,12 +86,6 @@ class Storage extends React.Component {
                 type: storageType,
             });
         } else {
-            setHeader([
-                {
-                    text: CLUSTER_PAGES.storage.title,
-                    link: createHref(routes.cluster, {activeTab: CLUSTER_PAGES.storage.id}),
-                },
-            ]);
             this.getStorageInfo({
                 filter: FILTER_OPTIONS.Missing,
                 type: storageType,
@@ -375,7 +366,6 @@ const mapDispatchToProps = {
     setNodesUptimeFilter,
     getNodesList,
     setStorageType,
-    setHeader,
     setDataWasNotLoaded,
 };
 

package/dist/containers/Tablet/Tablet.tsx

@@ -6,6 +6,9 @@ import {Link as ExternalLink} from '@gravity-ui/uikit';
 
 import {backend} from '../../store';
 import {getTablet, getTabletDescribe} from '../../store/reducers/tablet';
+import {setHeader} from '../../store/reducers/header';
+import routes, {createHref} from '../../routes';
+
 import {useAutofetcher, useTypedSelector} from '../../utils/hooks';
 import '../../services/api';
 
@@ -16,6 +19,8 @@ import {Icon} from '../../components/Icon';
 import {EmptyState} from '../../components/EmptyState';
 import {Loader} from '../../components/Loader';
 
+import {getClusterPath} from '../Cluster/utils';
+
 import {TabletTable} from './TabletTable';
 import {TabletInfo} from './TabletInfo';
 import {TabletControls} from './TabletControls';
@@ -56,6 +61,29 @@ export const Tablet = () => {
 
     useAutofetcher(fetchData, [fetchData], true);
 
+    useEffect(() => {
+        dispatch(
+            setHeader([
+                {
+                    text: 'Cluster',
+                    link: getClusterPath(),
+                },
+                {
+                    text: 'Tablets',
+                    link: createHref(routes.tabletsFilters, undefined, {
+                        nodeIds: tablet.NodeId ? [tablet.NodeId] : [],
+                        state: tablet.State,
+                        type: tablet.Type,
+                        tenantPath,
+                    }),
+                },
+                {
+                    text: tablet.TabletId ?? 'Tablet',
+                },
+            ]),
+        );
+    }, [dispatch, tenantPath, tablet]);
+
     const renderExternalLinks = (link: {name: string; path: string}, index: number) => {
         return (
             <li key={index} className={b('link', {external: true})}>

package/dist/containers/TabletsFilters/TabletsFilters.js

@@ -11,6 +11,7 @@ import ReactList from 'react-list';
 import {Tablet} from '../../components/Tablet';
 import {AccessDenied} from '../../components/Errors/403';
 
+import {setHeader} from '../../store/reducers/header';
 import {tabletColorToTabletState, tabletStates} from '../../utils/tablet';
 import {
     getTabletsInfo,
@@ -21,6 +22,8 @@ import {
     getTablets,
 } from '../../store/reducers/tabletsFilters';
 
+import {getClusterPath} from '../Cluster/utils';
+
 import './TabletsFilters.scss';
 
 const b = cn('tablets-filters');
@@ -41,6 +44,7 @@ class TabletsFilters extends React.Component {
         stateFilter: PropTypes.array,
         typeFilter: PropTypes.array,
         error: PropTypes.oneOf([PropTypes.string, PropTypes.object]),
+        setHeader: PropTypes.func,
     };
 
     static renderLoader() {
@@ -72,7 +76,7 @@ class TabletsFilters extends React.Component {
     reloadDescriptor = -1;
 
     componentDidMount() {
-        const {setStateFilter, setTypeFilter} = this.props;
+        const {setStateFilter, setTypeFilter, setHeader} = this.props;
 
         const queryParams = qs.parse(this.props.location.search, {
             ignoreQueryPrefix: true,
@@ -87,6 +91,16 @@ class TabletsFilters extends React.Component {
         this.setState({nodeFilter: nodes, tenantPath: path}, () => {
             this.makeRequest();
         });
+
+        setHeader([
+            {
+                text: 'Cluster',
+                link: getClusterPath(),
+            },
+            {
+                text: 'Tablets'
+            }
+        ]);
     }
 
     componentDidUpdate(prevProps) {
@@ -326,6 +340,7 @@ const mapDispatchToProps = {
     clearWasLoadingFlag,
     setStateFilter,
     setTypeFilter,
+    setHeader,
 };
 
 export default connect(mapStateToProps, mapDispatchToProps)(TabletsFilters);

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

@@ -15,7 +15,7 @@ import {
     setCurrentDescribePath,
     getDescribeBatched,
 } from '../../../../store/reducers/describe';
-import {selectSchemaMergedChildrenPaths} from '../../../../store/reducers/schema';
+import {selectSchemaMergedChildrenPaths} from '../../../../store/reducers/schema/schema';
 import type {EPathType} from '../../../../types/api/schema';
 
 import {isEntityWithMergedImplementation} from '../../utils/schema';

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

@@ -4,6 +4,9 @@ $section-title-line-height: 24px;
 .kv-detailed-overview {
     display: flex;
     gap: 20px;
+
+    height: 100%;
+
     &__section {
         display: flex;
         overflow-x: hidden;

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

@@ -12,7 +12,7 @@ import type {EPathType} from '../../../types/api/schema';
 import {useTypedSelector} from '../../../utils/hooks';
 import routes, {createHref} from '../../../routes';
 import type {TenantDiagnosticsTab, TenantGeneralTab} from '../../../store/reducers/tenant/types';
-import {enableAutorefresh, disableAutorefresh} from '../../../store/reducers/schema';
+import {enableAutorefresh, disableAutorefresh} from '../../../store/reducers/schema/schema';
 import {setTopLevelTab, setDiagnosticsTab} from '../../../store/reducers/tenant/tenant';
 import {TENANT_DIAGNOSTICS_TABS_IDS} from '../../../store/reducers/tenant/constants';
 
@@ -49,8 +49,8 @@ const b = cn('kv-tenant-diagnostics');
 
 function Diagnostics(props: DiagnosticsProps) {
     const dispatch = useDispatch();
-    const {currentSchemaPath, autorefresh} = useSelector((state: any) => state.schema);
-    const {diagnosticsTab = TENANT_DIAGNOSTICS_TABS_IDS.overview, wasLoaded} = useTypedSelector(
+    const {currentSchemaPath, autorefresh, wasLoaded} = useSelector((state: any) => state.schema);
+    const {diagnosticsTab = TENANT_DIAGNOSTICS_TABS_IDS.overview} = useTypedSelector(
         (state) => state.tenant,
     );
 

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

@@ -12,7 +12,7 @@ import {Icon} from '../../../../components/Icon';
 import {ProblemFilter} from '../../../../components/ProblemFilter';
 import {Illustration} from '../../../../components/Illustration';
 
-import {getNetworkInfo, setDataWasNotLoaded} from '../../../../store/reducers/network';
+import {getNetworkInfo, setDataWasNotLoaded} from '../../../../store/reducers/network/network';
 import {hideTooltip, showTooltip} from '../../../../store/reducers/tooltip';
 import {changeFilter, ProblemFilterValues} from '../../../../store/reducers/settings/settings';
 import {AutoFetcher} from '../../../../utils/autofetcher';
@@ -361,7 +361,7 @@ class Network extends React.Component {
 }
 
 const mapStateToProps = (state) => {
-    const {wasLoaded, loading, data: netWorkInfo} = state.network;
+    const {wasLoaded, loading, data: netWorkInfo = {}} = state.network;
     const {autorefresh} = state.schema;
     return {
         netWorkInfo,

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

@@ -7,7 +7,6 @@ import {
 } from '../../../../../components/InfoViewer/formatters';
 
 import {useTypedSelector} from '../../../../../utils/hooks';
-import {selectSchemaData} from '../../../../../store/reducers/schema';
 
 import {getEntityName} from '../../../utils';
 
@@ -42,27 +41,26 @@ const prepareChangefeedInfo = (
 
 interface ChangefeedProps {
     data?: TEvDescribeSchemeResult;
-    childrenPaths?: string[];
+    topic?: TEvDescribeSchemeResult;
 }
 
 /** Displays overview for CDCStream EPathType */
-export const ChangefeedInfo = ({data, childrenPaths}: ChangefeedProps) => {
+export const ChangefeedInfo = ({data, topic}: ChangefeedProps) => {
     const entityName = getEntityName(data?.PathDescription);
 
     const {error: schemaError} = useTypedSelector((state) => state.schema);
-    const pqGroupData = useTypedSelector((state) => selectSchemaData(state, childrenPaths?.[0]));
 
     if (schemaError) {
         return <div className="error">{schemaError.statusText}</div>;
     }
 
-    if (!data || !pqGroupData) {
+    if (!data || !topic) {
         return <div className="error">No {entityName} data</div>;
     }
 
     return (
         <div>
-            <InfoViewer title={entityName} info={prepareChangefeedInfo(data, pqGroupData)} />
+            <InfoViewer title={entityName} info={prepareChangefeedInfo(data, topic)} />
             <TopicStats />
         </div>
     );

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

@@ -6,7 +6,7 @@ import {Loader} from '@gravity-ui/uikit';
 
 import EntityStatus from '../../../../components/EntityStatus/EntityStatus';
 import InfoViewer from '../../../../components/InfoViewer/InfoViewer';
-import PoolUsage from '../../../../components/PoolUsage/PoolUsage';
+import {PoolUsage} from '../../../../components/PoolUsage/PoolUsage';
 import {Tablet} from '../../../../components/Tablet';
 
 import {getTenantInfo} from '../../../../store/reducers/tenant/tenant';

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;