refactor: merge query reducers

Author: artemmufazalov

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

@@ -13,7 +13,7 @@ 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 {ExecuteQueryResult} from '../../../../store/reducers/query/executeQueryTypes';
+import type {QueryResult} from '../../../../store/reducers/query/types';
 import type {TKqpStatsQuery} from '../../../../types/api/query';
 import type {ValueOf} from '../../../../types/common';
 import {getArray} from '../../../../utils';
@@ -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/query/expainUtils';
+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,14 +9,15 @@ 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 {ExplainQueryResult} from '../../../../store/reducers/query/executeQueryTypes';
+import type {QueryResult} from '../../../../store/reducers/query/types';
 import type {ValueOf} from '../../../../types/common';
 import {cn} from '../../../../utils/cn';
 import {getStringifiedData} from '../../../../utils/dataFormatters/dataFormatters';
 import {useTypedDispatch} from '../../../../utils/hooks';
-import {parseQueryErrorToString} from '../../../../utils/query';
+import {parseQueryError} from '../../../../utils/query';
 import {PaneVisibilityToggleButtons} from '../../utils/paneVisibilityToggleHelpers';
 import {CancelQueryButton} from '../CancelQueryButton/CancelQueryButton';
+import {ResultIssues} from '../Issues/Issues';
 import {QueryDuration} from '../QueryDuration/QueryDuration';
 import {QuerySettingsBanner} from '../QuerySettingsBanner/QuerySettingsBanner';
 import {isQueryCancelledError} from '../utils/isQueryCancelledError';
@@ -59,7 +60,7 @@ const explainOptions = [
 
 interface ExplainResultProps {
     theme: string;
-    result: ExplainQueryResult;
+    result: QueryResult;
     tenantName: string;
     isResultsCollapsed?: boolean;
     onCollapseResults: VoidFunction;
@@ -81,7 +82,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 () => {
@@ -99,13 +100,23 @@ export function ExplainResult({
         );
     };
 
-    const renderContent = () => {
-        if (isQueryCancelledError(error)) {
+    const renderIssues = () => {
+        const parsedError = parseQueryError(error);
+
+        if (!parsedError) {
             return null;
         }
 
+        if (typeof parsedError === 'object') {
+            return <ResultIssues data={parsedError} />;
+        }
+
+        return <div className={b('error')}>{parsedError}</div>;
+    };
+
+    const renderContent = () => {
         if (error) {
-            return <div className={b('text-message')}>{parseQueryErrorToString(error)}</div>;
+            return renderIssues();
         }
 
         switch (activeOption) {

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

@@ -1,6 +1,6 @@
 import {YDBGraph} from '../../../../../../components/Graph/Graph';
-import {explainVersions} from '../../../../../../store/reducers/query/expainUtils';
-import type {PreparedExplainResponse} from '../../../../../../store/reducers/query/explainQueryTypes';
+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/query/explainQueryTypes';
+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/query/explainQueryTypes';
+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/query/explainQueryTypes';
+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/query/explainQueryTypes';
+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

@@ -9,7 +9,7 @@ import {
     selectQueriesHistoryFilter,
     setQueryHistoryFilter,
 } from '../../../../store/reducers/query/executeQuery';
-import type {QueryInHistory} from '../../../../store/reducers/query/executeQueryTypes';
+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 {cn} from '../../../../utils/cn';

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

@@ -10,9 +10,9 @@ 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,
@@ -21,9 +21,7 @@ import {
     selectUserInput,
     setTenantPath,
 } from '../../../../store/reducers/query/executeQuery';
-import type {QueryResult} from '../../../../store/reducers/query/executeQueryTypes';
-import {ResultType} from '../../../../store/reducers/query/executeQueryTypes';
-import {explainQueryApi} from '../../../../store/reducers/query/explainQuery';
+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';
@@ -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.useExecuteQueryMutation();
 
     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}