refactor: merge query reducers

src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopQueries.tsx

@@ -3,11 +3,11 @@ 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 {changeUserInput} from '../../../../../store/reducers/query/query';
 import {
     TENANT_DIAGNOSTICS_TABS_IDS,
     TENANT_PAGE,

src/containers/Tenant/Diagnostics/TopQueries/TopQueries.tsx

@@ -11,8 +11,8 @@ import {DateRange} from '../../../../components/DateRange';
 import {Search} from '../../../../components/Search';
 import {TableWithControlsLayout} from '../../../../components/TableWithControlsLayout/TableWithControlsLayout';
 import {parseQuery} from '../../../../routes';
-import {changeUserInput} from '../../../../store/reducers/executeQuery';
 import {setTopQueriesFilters} from '../../../../store/reducers/executeTopQueries/executeTopQueries';
+import {changeUserInput} from '../../../../store/reducers/query/query';
 import {
     TENANT_PAGE,
     TENANT_PAGES_IDS,

src/containers/Tenant/ObjectSummary/SchemaTree/SchemaTree.tsx

@@ -6,7 +6,7 @@ import React from 'react';
 import {NavigationTree} from 'ydb-ui-components';
 
 import {useCreateDirectoryFeatureAvailable} from '../../../../store/reducers/capabilities/hooks';
-import {selectUserInput} from '../../../../store/reducers/executeQuery';
+import {selectUserInput} from '../../../../store/reducers/query/query';
 import {schemaApi} from '../../../../store/reducers/schema/schema';
 import {tableSchemaDataApi} from '../../../../store/reducers/tableSchemaData';
 import type {GetTableSchemaDataParams} from '../../../../store/reducers/tableSchemaData';

src/containers/Tenant/Query/ExecuteResult/ExecuteResult.tsx

@@ -13,9 +13,9 @@ import {LoaderWrapper} from '../../../../components/LoaderWrapper/LoaderWrapper'
 import {QueryExecutionStatus} from '../../../../components/QueryExecutionStatus';
 import {QueryResultTable} from '../../../../components/QueryResultTable/QueryResultTable';
 import {disableFullscreen} from '../../../../store/reducers/fullscreen';
+import type {QueryResult} from '../../../../store/reducers/query/types';
 import type {TKqpStatsQuery} from '../../../../types/api/query';
 import type {ValueOf} from '../../../../types/common';
-import type {ExecuteQueryResult} from '../../../../types/store/executeQuery';
 import {getArray} from '../../../../utils';
 import {cn} from '../../../../utils/cn';
 import {USE_SHOW_PLAN_SVG_KEY} from '../../../../utils/constants';
@@ -50,7 +50,7 @@ const resultOptionsIds = {
 type SectionID = ValueOf<typeof resultOptionsIds>;
 
 interface ExecuteResultProps {
-    result: ExecuteQueryResult;
+    result: QueryResult;
     isResultsCollapsed?: boolean;
     theme?: string;
     tenantName: string;

src/containers/Tenant/Query/ExecuteResult/utils.ts

@@ -1,4 +1,4 @@
-import {explainVersions} from '../../../../store/reducers/explainQuery/utils';
+import {explainVersions} from '../../../../store/reducers/query/prepareQueryData';
 import type {IQueryResult} from '../../../../types/store/query';
 import {preparePlan, prepareSimplifiedPlan} from '../../../../utils/prepareQueryExplain';
 import {parseQueryExplainPlan} from '../../../../utils/query';

src/containers/Tenant/Query/ExplainResult/ExplainResult.tsx

@@ -9,8 +9,8 @@ import Fullscreen from '../../../../components/Fullscreen/Fullscreen';
 import {LoaderWrapper} from '../../../../components/LoaderWrapper/LoaderWrapper';
 import {QueryExecutionStatus} from '../../../../components/QueryExecutionStatus';
 import {disableFullscreen} from '../../../../store/reducers/fullscreen';
+import type {QueryResult} from '../../../../store/reducers/query/types';
 import type {ValueOf} from '../../../../types/common';
-import type {ExplainQueryResult} from '../../../../types/store/executeQuery';
 import {cn} from '../../../../utils/cn';
 import {getStringifiedData} from '../../../../utils/dataFormatters/dataFormatters';
 import {useTypedDispatch} from '../../../../utils/hooks';
@@ -59,7 +59,7 @@ const explainOptions = [
 
 interface ExplainResultProps {
     theme: string;
-    result: ExplainQueryResult;
+    result: QueryResult;
     tenantName: string;
     isResultsCollapsed?: boolean;
     onCollapseResults: VoidFunction;
@@ -81,7 +81,7 @@ export function ExplainResult({
     const [isPending, startTransition] = React.useTransition();
     const {error, isLoading, queryId} = result;
 
-    const {plan: explain, ast, simplifiedPlan} = result.data || {};
+    const {preparedPlan: explain, ast, simplifiedPlan} = result.data || {};
 
     React.useEffect(() => {
         return () => {

src/containers/Tenant/Query/ExplainResult/components/Graph/Graph.tsx

@@ -1,6 +1,6 @@
 import {YDBGraph} from '../../../../../../components/Graph/Graph';
-import type {PreparedExplainResponse} from '../../../../../../store/reducers/explainQuery/types';
-import {explainVersions} from '../../../../../../store/reducers/explainQuery/utils';
+import {explainVersions} from '../../../../../../store/reducers/query/prepareQueryData';
+import type {PreparedPlan} from '../../../../../../store/reducers/query/types';
 import {cn} from '../../../../../../utils/cn';
 import i18n from '../../i18n';
 
@@ -9,7 +9,7 @@ import './Graph.scss';
 const b = cn('ydb-query-explain-graph');
 
 interface GraphProps {
-    explain: PreparedExplainResponse['plan'];
+    explain: PreparedPlan;
     theme: string;
 }
 

src/containers/Tenant/Query/ExplainResult/components/SimplifiedPlan/SimplifiedPlan.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import {Table, useTable} from '@gravity-ui/table';
 import type {CellContext, ColumnDef, ExpandedState} from '@tanstack/react-table';
 
-import type {SimplifiedPlanItem} from '../../../../../../store/reducers/explainQuery/types';
+import type {SimplifiedPlanItem} from '../../../../../../store/reducers/query/types';
 import {configuredNumeral} from '../../../../../../utils/numeral';
 import {formatToMs} from '../../../../../../utils/timeParsers';
 import {toExponential} from '../../../../../../utils/utils';

src/containers/Tenant/Query/ExplainResult/components/SimplifiedPlan/__tests__/utils.test.ts

@@ -1,4 +1,4 @@
-import type {SimplifiedPlanItem} from '../../../../../../../store/reducers/explainQuery/types';
+import type {SimplifiedPlanItem} from '../../../../../../../store/reducers/query/types';
 import type {ExtendedSimplifiesPlanItem} from '../types';
 import {getExtendedTreeNodes} from '../utils';
 

src/containers/Tenant/Query/ExplainResult/components/SimplifiedPlan/types.ts

@@ -1,4 +1,4 @@
-import type {SimplifiedPlanItem} from '../../../../../../store/reducers/explainQuery/types';
+import type {SimplifiedPlanItem} from '../../../../../../store/reducers/query/types';
 
 export interface ExtendedSimplifiesPlanItem extends Omit<SimplifiedPlanItem, 'children'> {
     lines?: string;

src/containers/Tenant/Query/ExplainResult/components/SimplifiedPlan/utils.ts

@@ -1,4 +1,4 @@
-import type {SimplifiedPlanItem} from '../../../../../../store/reducers/explainQuery/types';
+import type {SimplifiedPlanItem} from '../../../../../../store/reducers/query/types';
 import {cn} from '../../../../../../utils/cn';
 
 import type {ExtendedSimplifiesPlanItem} from './types';

src/containers/Tenant/Query/QueriesHistory/QueriesHistory.tsx

@@ -8,10 +8,10 @@ import {
     selectQueriesHistory,
     selectQueriesHistoryFilter,
     setQueryHistoryFilter,
-} from '../../../../store/reducers/executeQuery';
+} from '../../../../store/reducers/query/query';
+import type {QueryInHistory} from '../../../../store/reducers/query/types';
 import {TENANT_QUERY_TABS_ID} from '../../../../store/reducers/tenant/constants';
 import {setQueryTab} from '../../../../store/reducers/tenant/tenant';
-import type {QueryInHistory} from '../../../../types/store/executeQuery';
 import {cn} from '../../../../utils/cn';
 import {formatDateTime} from '../../../../utils/dataFormatters/dataFormatters';
 import {useTypedDispatch, useTypedSelector} from '../../../../utils/hooks';

src/containers/Tenant/Query/Query.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 
 import {Helmet} from 'react-helmet-async';
 
-import {changeUserInput} from '../../../store/reducers/executeQuery';
+import {changeUserInput} from '../../../store/reducers/query/query';
 import {TENANT_QUERY_TABS_ID} from '../../../store/reducers/tenant/constants';
 import type {EPathType} from '../../../types/api/schema';
 import {cn} from '../../../utils/cn';

src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx

@@ -10,23 +10,21 @@ import {MonacoEditor} from '../../../../components/MonacoEditor/MonacoEditor';
 import SplitPane from '../../../../components/SplitPane';
 import {useTracingLevelOptionAvailable} from '../../../../store/reducers/capabilities/hooks';
 import {
-    executeQueryApi,
     goToNextQuery,
     goToPreviousQuery,
+    queryApi,
     saveQueryToHistory,
     selectQueriesHistory,
     selectQueriesHistoryCurrentIndex,
     selectResult,
     selectTenantPath,
     selectUserInput,
     setTenantPath,
-} from '../../../../store/reducers/executeQuery';
-import {explainQueryApi} from '../../../../store/reducers/explainQuery/explainQuery';
+} from '../../../../store/reducers/query/query';
+import type {QueryResult} from '../../../../store/reducers/query/types';
 import {setQueryAction} from '../../../../store/reducers/queryActions/queryActions';
 import {selectShowPreview, setShowPreview} from '../../../../store/reducers/schema/schema';
 import type {EPathType} from '../../../../types/api/schema';
-import {ResultType} from '../../../../types/store/executeQuery';
-import type {QueryResult} from '../../../../types/store/executeQuery';
 import type {QueryAction} from '../../../../types/store/query';
 import {cn} from '../../../../utils/cn';
 import {
@@ -104,8 +102,7 @@ export default function QueryEditor(props: QueryEditorProps) {
         LAST_USED_QUERY_ACTION_KEY,
     );
 
-    const [sendExecuteQuery] = executeQueryApi.useExecuteQueryMutation();
-    const [sendExplainQuery] = explainQueryApi.useExplainQueryMutation();
+    const [sendQuery] = queryApi.useUseSendQueryMutation();
 
     React.useEffect(() => {
         if (savedPath !== tenantName) {
@@ -147,7 +144,8 @@ export default function QueryEditor(props: QueryEditorProps) {
         }
         const queryId = uuidv4();
 
-        sendExecuteQuery({
+        sendQuery({
+            actionType: 'execute',
             query,
             database: tenantName,
             querySettings,
@@ -180,7 +178,8 @@ export default function QueryEditor(props: QueryEditorProps) {
 
         const queryId = uuidv4();
 
-        sendExplainQuery({
+        sendQuery({
+            actionType: 'explain',
             query: input,
             database: tenantName,
             querySettings,
@@ -400,7 +399,7 @@ function Result({
         return <Preview database={tenantName} path={path} type={type} />;
     }
 
-    if (result?.type === ResultType.EXECUTE) {
+    if (result?.type === 'execute') {
         return (
             <ExecuteResult
                 result={result}
@@ -413,7 +412,7 @@ function Result({
         );
     }
 
-    if (result?.type === ResultType.EXPLAIN) {
+    if (result?.type === 'explain') {
         return (
             <ExplainResult
                 result={result}

src/store/configureStore.ts

@@ -33,7 +33,7 @@ function _configureStore<
                 },
                 serializableCheck: {
                     ignoredPaths: ['tooltip.currentHoveredRef', 'api'],
-                    ignoredActions: [UPDATE_REF, 'api/executeQuery/rejected'],
+                    ignoredActions: [UPDATE_REF, 'api/sendQuery/rejected'],
                 },
             }).concat(locationMiddleware, ...middleware),
     });

src/store/reducers/cancelQuery.ts

@@ -1,6 +1,6 @@
 import type {CancelActions} from '../../types/api/query';
 import type {IQueryResult, QueryRequestParams} from '../../types/store/query';
-import {isQueryErrorResponse, parseQueryAPIExecuteResponse} from '../../utils/query';
+import {isQueryErrorResponse, parseQueryAPIResponse} from '../../utils/query';
 
 import {api} from './api';
 
@@ -28,7 +28,7 @@ export const cancelQueryApi = api.injectEndpoints({
                         return {error: response};
                     }
 
-                    const data = parseQueryAPIExecuteResponse(response);
+                    const data = parseQueryAPIResponse(response);
 
                     return {data};
                 } catch (error) {

src/store/reducers/cluster/utils.ts

@@ -1,6 +1,6 @@
 import type {TClusterInfoV2, TStorageStats} from '../../../types/api/cluster';
 import type {ExecuteQueryResponse, KeyValueRow} from '../../../types/api/query';
-import {parseQueryAPIExecuteResponse} from '../../../utils/query';
+import {parseQueryAPIResponse} from '../../../utils/query';
 
 import type {ClusterGroupsStats} from './types';
 
@@ -88,7 +88,7 @@ function getGroupStats(data?: KeyValueRow[] | TStorageStats[]) {
 export const parseGroupsStatsQueryResponse = (
     data: ExecuteQueryResponse | null,
 ): ClusterGroupsStats => {
-    const parsedData = parseQueryAPIExecuteResponse(data).resultSets?.[0]?.result;
+    const parsedData = parseQueryAPIResponse(data).resultSets?.[0]?.result;
     return getGroupStats(parsedData);
 };
 

src/store/reducers/executeTopQueries/executeTopQueries.ts

@@ -2,7 +2,7 @@ import {isLikeRelative} from '@gravity-ui/date-utils';
 import {createSlice} from '@reduxjs/toolkit';
 import type {PayloadAction} from '@reduxjs/toolkit';
 
-import {isQueryErrorResponse, parseQueryAPIExecuteResponse} from '../../../utils/query';
+import {isQueryErrorResponse, parseQueryAPIResponse} from '../../../utils/query';
 import {api} from '../api';
 
 import type {TopQueriesFilters} from './types';
@@ -70,7 +70,7 @@ export const topQueriesApi = api.injectEndpoints({
                         throw response;
                     }
 
-                    const data = parseQueryAPIExecuteResponse(response);
+                    const data = parseQueryAPIResponse(response);
                     return {data};
                 } catch (error) {
                     return {error};
@@ -123,7 +123,7 @@ export const topQueriesApi = api.injectEndpoints({
                         throw response;
                     }
 
-                    const data = parseQueryAPIExecuteResponse(response);
+                    const data = parseQueryAPIResponse(response);
 
                     return {data};
                 } catch (error) {