refactor: move and rename files

artemmufazalov · artemmufazalov · commit baf543acb200 · 2024-11-19T11:06:20.000+03:00
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopQueries.tsx b/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/executeQuery';
 import {
     TENANT_DIAGNOSTICS_TABS_IDS,
     TENANT_PAGE,
diff --git a/src/containers/Tenant/Diagnostics/TopQueries/TopQueries.tsx b/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/executeQuery';
 import {
     TENANT_PAGE,
     TENANT_PAGES_IDS,
diff --git a/src/containers/Tenant/ObjectSummary/SchemaTree/SchemaTree.tsx b/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/executeQuery';
 import {schemaApi} from '../../../../store/reducers/schema/schema';
 import {tableSchemaDataApi} from '../../../../store/reducers/tableSchemaData';
 import type {GetTableSchemaDataParams} from '../../../../store/reducers/tableSchemaData';
diff --git a/src/containers/Tenant/Query/ExecuteResult/ExecuteResult.tsx b/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 {ExecuteQueryResult} from '../../../../store/reducers/query/executeQueryTypes';
 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';
diff --git a/src/containers/Tenant/Query/ExecuteResult/utils.ts b/src/containers/Tenant/Query/ExecuteResult/utils.ts
@@ -1,4 +1,4 @@
-import {explainVersions} from '../../../../store/reducers/explainQuery/utils';
+import {explainVersions} from '../../../../store/reducers/query/expainUtils';
 import type {IQueryResult} from '../../../../types/store/query';
 import {preparePlan, prepareSimplifiedPlan} from '../../../../utils/prepareQueryExplain';
 import {parseQueryExplainPlan} from '../../../../utils/query';
diff --git a/src/containers/Tenant/Query/ExplainResult/ExplainResult.tsx b/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 {ExplainQueryResult} from '../../../../store/reducers/query/executeQueryTypes';
 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';
diff --git a/src/containers/Tenant/Query/ExplainResult/components/Graph/Graph.tsx b/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/expainUtils';
+import type {PreparedExplainResponse} from '../../../../../../store/reducers/query/explainQueryTypes';
 import {cn} from '../../../../../../utils/cn';
 import i18n from '../../i18n';
 
diff --git a/src/containers/Tenant/Query/ExplainResult/components/SimplifiedPlan/SimplifiedPlan.tsx b/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/explainQueryTypes';
 import {configuredNumeral} from '../../../../../../utils/numeral';
 import {formatToMs} from '../../../../../../utils/timeParsers';
 import {toExponential} from '../../../../../../utils/utils';
diff --git a/src/containers/Tenant/Query/ExplainResult/components/SimplifiedPlan/__tests__/utils.test.ts b/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/explainQueryTypes';
 import type {ExtendedSimplifiesPlanItem} from '../types';
 import {getExtendedTreeNodes} from '../utils';
 
diff --git a/src/containers/Tenant/Query/ExplainResult/components/SimplifiedPlan/types.ts b/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/explainQueryTypes';
 
 export interface ExtendedSimplifiesPlanItem extends Omit<SimplifiedPlanItem, 'children'> {
     lines?: string;
diff --git a/src/containers/Tenant/Query/ExplainResult/components/SimplifiedPlan/utils.ts b/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/explainQueryTypes';
 import {cn} from '../../../../../../utils/cn';
 
 import type {ExtendedSimplifiesPlanItem} from './types';
diff --git a/src/containers/Tenant/Query/QueriesHistory/QueriesHistory.tsx b/src/containers/Tenant/Query/QueriesHistory/QueriesHistory.tsx
@@ -8,10 +8,10 @@ import {
     selectQueriesHistory,
     selectQueriesHistoryFilter,
     setQueryHistoryFilter,
-} from '../../../../store/reducers/executeQuery';
+} from '../../../../store/reducers/query/executeQuery';
+import type {QueryInHistory} from '../../../../store/reducers/query/executeQueryTypes';
 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';
diff --git a/src/containers/Tenant/Query/Query.tsx b/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/executeQuery';
 import {TENANT_QUERY_TABS_ID} from '../../../store/reducers/tenant/constants';
 import type {EPathType} from '../../../types/api/schema';
 import {cn} from '../../../utils/cn';
diff --git a/src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx b/src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx
@@ -20,13 +20,13 @@ import {
     selectTenantPath,
     selectUserInput,
     setTenantPath,
-} from '../../../../store/reducers/executeQuery';
-import {explainQueryApi} from '../../../../store/reducers/explainQuery/explainQuery';
+} 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 {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 {
diff --git a/src/store/reducers/index.ts b/src/store/reducers/index.ts
@@ -4,12 +4,12 @@ import {api} from './api';
 import authentication from './authentication/authentication';
 import cluster from './cluster/cluster';
 import clusters from './clusters/clusters';
-import executeQuery from './executeQuery';
 import executeTopQueries from './executeTopQueries/executeTopQueries';
 import fullscreen from './fullscreen';
 import header from './header/header';
 import heatmap from './heatmap';
 import partitions from './partitions/partitions';
+import executeQuery from './query/executeQuery';
 import queryActions from './queryActions/queryActions';
 import schema from './schema/schema';
 import settings from './settings/settings';
diff --git a/src/store/reducers/query/executeQuery.ts b/src/store/reducers/query/executeQuery.ts
@@ -1,17 +1,21 @@
 import {createSlice} from '@reduxjs/toolkit';
 import type {PayloadAction} from '@reduxjs/toolkit';
 
-import {settingsManager} from '../../services/settings';
-import {TracingLevelNumber} from '../../types/api/query';
-import type {ExecuteActions} from '../../types/api/query';
-import {ResultType} from '../../types/store/executeQuery';
-import type {ExecuteQueryState, QueryInHistory, QueryResult} from '../../types/store/executeQuery';
-import type {QueryRequestParams, QuerySettings, QuerySyntax} from '../../types/store/query';
-import {QUERIES_HISTORY_KEY} from '../../utils/constants';
-import {QUERY_SYNTAX, isQueryErrorResponse, parseQueryAPIExecuteResponse} from '../../utils/query';
-import {isNumeric} from '../../utils/utils';
+import {settingsManager} from '../../../services/settings';
+import {TracingLevelNumber} from '../../../types/api/query';
+import type {ExecuteActions} from '../../../types/api/query';
+import type {QueryRequestParams, QuerySettings, QuerySyntax} from '../../../types/store/query';
+import {QUERIES_HISTORY_KEY} from '../../../utils/constants';
+import {
+    QUERY_SYNTAX,
+    isQueryErrorResponse,
+    parseQueryAPIExecuteResponse,
+} from '../../../utils/query';
+import {isNumeric} from '../../../utils/utils';
+import {api} from '../api';
 
-import {api} from './api';
+import type {ExecuteQueryState, QueryInHistory, QueryResult} from './executeQueryTypes';
+import {ResultType} from './executeQueryTypes';
 
 const MAXIMUM_QUERIES_IN_HISTORY = 20;
 
diff --git a/src/store/reducers/query/executeQueryTypes.ts b/src/store/reducers/query/executeQueryTypes.ts
@@ -1,6 +1,6 @@
-import type {PreparedExplainResponse} from '../../store/reducers/explainQuery/types';
+import type {IQueryResult} from '../../../types/store/query';
 
-import type {IQueryResult} from './query';
+import type {PreparedExplainResponse} from './explainQueryTypes';
 
 export interface QueryInHistory {
     queryId?: string;
diff --git a/src/store/reducers/query/expainUtils.ts b/src/store/reducers/query/expainUtils.ts
@@ -4,7 +4,7 @@ import type {ExplainQueryResponse, ExplainScriptResponse} from '../../../types/a
 import {preparePlan, prepareSimplifiedPlan} from '../../../utils/prepareQueryExplain';
 import {parseQueryAPIExplainResponse, parseQueryExplainPlan} from '../../../utils/query';
 
-import type {PreparedExplainResponse} from './types';
+import type {PreparedExplainResponse} from './explainQueryTypes';
 
 export const explainVersions = {
     v2: '0.2',
diff --git a/src/store/reducers/query/explainQuery.ts b/src/store/reducers/query/explainQuery.ts
@@ -1,13 +1,13 @@
 import {TracingLevelNumber} from '../../../types/api/query';
 import type {ExplainActions} from '../../../types/api/query';
-import {ResultType} from '../../../types/store/executeQuery';
 import type {QueryRequestParams, QuerySettings, QuerySyntax} from '../../../types/store/query';
 import {QUERY_SYNTAX, isQueryErrorResponse} from '../../../utils/query';
 import {isNumeric} from '../../../utils/utils';
 import {api} from '../api';
-import {setQueryResult} from '../executeQuery';
 
-import {prepareExplainResponse} from './utils';
+import {setQueryResult} from './executeQuery';
+import {ResultType} from './executeQueryTypes';
+import {prepareExplainResponse} from './expainUtils';
 
 interface ExplainQueryParams extends QueryRequestParams {
     queryId: string;
diff --git a/src/store/reducers/query/explainQueryTypes.ts b/src/store/reducers/query/explainQueryTypes.ts
diff --git a/src/store/reducers/trace.ts b/src/store/reducers/trace.ts
@@ -1,5 +1,5 @@
 import {api} from './api';
-import {setQueryTraceReady} from './executeQuery';
+import {setQueryTraceReady} from './query/executeQuery';
 
 interface CheckTraceParams {
     url: string;
diff --git a/src/utils/__test__/prepareQueryExplain.test.ts b/src/utils/__test__/prepareQueryExplain.test.ts
@@ -1,4 +1,4 @@
-import type {SimplifiedPlanItem} from '../../store/reducers/explainQuery/types';
+import type {SimplifiedPlanItem} from '../../store/reducers/query/explainQueryTypes';
 import type {SimplifiedNode} from '../../types/api/query';
 import {prepareSimplifiedPlan} from '../prepareQueryExplain';
 
diff --git a/src/utils/hooks/withConfirmation/useChangeInputWithConfirmation.tsx b/src/utils/hooks/withConfirmation/useChangeInputWithConfirmation.tsx
@@ -5,7 +5,7 @@ import NiceModal from '@ebay/nice-modal-react';
 import {useTypedSelector} from '..';
 import {CONFIRMATION_DIALOG} from '../../../components/ConfirmationDialog/ConfirmationDialog';
 import {SaveQueryButton} from '../../../containers/Tenant/Query/SaveQuery/SaveQuery';
-import {selectUserInput} from '../../../store/reducers/executeQuery';
+import {selectUserInput} from '../../../store/reducers/query/executeQuery';
 
 import i18n from './i18n';
 
diff --git a/src/utils/prepareQueryExplain.ts b/src/utils/prepareQueryExplain.ts
@@ -7,7 +7,7 @@ import type {
     TopologyNodeDataStatsSection,
 } from '@gravity-ui/paranoid';
 
-import type {SimplifiedPlanItem} from '../store/reducers/explainQuery/types';
+import type {SimplifiedPlanItem} from '../store/reducers/query/explainQueryTypes';
 import type {PlanNode, SimplifiedNode} from '../types/api/query';
 
 const CONNECTION_NODE_META_FIELDS = new Set(['PlanNodeId', 'PlanNodeType', 'Node Type', 'Plans']);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import {explainVersions} from '../../../../store/reducers/explainQuery/utils';`
	`1`	`+import {explainVersions} from '../../../../store/reducers/query/expainUtils';`
`2`	`2`	`import type {IQueryResult} from '../../../../types/store/query';`
`3`	`3`	`import {preparePlan, prepareSimplifiedPlan} from '../../../../utils/prepareQueryExplain';`
`4`	`4`	`import {parseQueryExplainPlan} from '../../../../utils/query';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type {SimplifiedPlanItem} from '../../../../../../../store/reducers/explainQuery/types';`
	`1`	`+import type {SimplifiedPlanItem} from '../../../../../../../store/reducers/query/explainQueryTypes';`
`2`	`2`	`import type {ExtendedSimplifiesPlanItem} from '../types';`
`3`	`3`	`import {getExtendedTreeNodes} from '../utils';`
`4`	`4`