refactor: update reducers types and redefine IRootState

Author: artemmufazalov

src/containers/Tenant/Diagnostics/Consumers/Consumers.tsx

@@ -4,7 +4,7 @@ import block from 'bem-cn-lite';
 
 import DataTable, {Column} from '@yandex-cloud/react-data-table';
 
-import {IRootState} from '../../../../types/store';
+import {IRootState} from '../../../../store/reducers';
 import {DEFAULT_TABLE_SETTINGS} from '../../../../utils/constants';
 import {useAutofetcher} from '../../../../utils/hooks';
 import {Search} from '../../../../components/Search';

src/containers/Tenant/Diagnostics/Healthcheck/Healthcheck.tsx

@@ -5,7 +5,7 @@ import cn from 'bem-cn-lite';
 import {Loader} from '@gravity-ui/uikit';
 
 import {SelfCheckResult} from '../../../../types/api/healthcheck';
-import {IRootState} from '../../../../types/store';
+import {IRootState} from '../../../../store/reducers';
 import {
     getHealthcheckInfo,
     selectIssuesTreeById,

src/store/reducers/describe.ts

@@ -1,23 +1,25 @@
 import {createSelector, Selector} from 'reselect';
+import {Reducer} from 'redux';
 
 import '../../services/api';
 import {TEvDescribeSchemeResult} from '../../types/api/schema';
 import {IConsumer} from '../../types/api/consumers';
 import {IDescribeRootStateSlice, IDescribeState} from '../../types/store/describe';
+import {IResponseError} from '../../types/api/error';
 import {createRequestActionTypes, createApiRequest, ApiRequestAction} from '../utils';
 
 const FETCH_DESCRIBE = createRequestActionTypes('describe', 'FETCH_DESCRIBE');
 
-const initialState: IDescribeState = {
+const initialState = {
     loading: false,
     wasLoaded: false,
     data: {},
 };
 
-const describe = (
-    state = initialState,
-    action: ApiRequestAction<typeof FETCH_DESCRIBE, TEvDescribeSchemeResult, unknown>,
-) => {
+const describe: Reducer<
+    IDescribeState,
+    ApiRequestAction<typeof FETCH_DESCRIBE, TEvDescribeSchemeResult, IResponseError>
+> = (state = initialState, action) => {
     switch (action.type) {
         case FETCH_DESCRIBE.REQUEST: {
             return {

src/store/reducers/header.ts

@@ -1,10 +1,13 @@
+import {Reducer} from 'redux';
+
 const SET_HEADER = 'SET_HEADER';
 
+type IHeaderAction = ReturnType<typeof setHeader>;
 export type HeaderItemType = {text: string; link?: string};
 
 const initialState: HeaderItemType[] = [];
 
-const header = function (state = initialState, action: ReturnType<typeof setHeader>) {
+const header: Reducer<HeaderItemType[], IHeaderAction> = function (state = initialState, action) {
     switch (action.type) {
         case SET_HEADER:
             return action.data;

src/store/reducers/healthcheckInfo.ts

@@ -3,25 +3,27 @@ import _sortBy from 'lodash/fp/sortBy';
 import _uniqBy from 'lodash/fp/uniqBy';
 import _omit from 'lodash/omit';
 import {createSelector, Selector} from 'reselect';
+import {Reducer} from 'redux';
 
 import {
     IHealthcheckInfoState,
     IHealthcheckInfoRootStateSlice,
     IIssuesTree,
 } from '../../types/store/healthcheck';
 import {HealthCheckAPIResponse, IssueLog, StatusFlag} from '../../types/api/healthcheck';
+import {IResponseError} from '../../types/api/error';
 
 import '../../services/api';
 import {createRequestActionTypes, createApiRequest, ApiRequestAction} from '../utils';
 
 const FETCH_HEALTHCHECK = createRequestActionTypes('cluster', 'FETCH_HEALTHCHECK');
 
-const initialState: IHealthcheckInfoState = {loading: false, wasLoaded: false};
+const initialState = {loading: false, wasLoaded: false};
 
-const healthcheckInfo = function (
-    state = initialState,
-    action: ApiRequestAction<typeof FETCH_HEALTHCHECK, HealthCheckAPIResponse, unknown>,
-) {
+const healthcheckInfo: Reducer<
+    IHealthcheckInfoState,
+    ApiRequestAction<typeof FETCH_HEALTHCHECK, HealthCheckAPIResponse, IResponseError>
+> = function (state = initialState, action) {
     switch (action.type) {
         case FETCH_HEALTHCHECK.REQUEST: {
             return {

src/store/reducers/index.js renamed to src/store/reducers/index.ts

@@ -34,10 +34,7 @@ import authentication from './authentication';
 import header from './header';
 import saveQuery from './saveQuery';
 import fullscreen from './fullscreen';
-
-function singleClusterMode(state = true) {
-    return state;
-}
+import singleClusterMode from './singleClusterMode';
 
 export const rootReducer = {
     singleClusterMode,
@@ -77,6 +74,11 @@ export const rootReducer = {
     fullscreen,
 };
 
-export default combineReducers({
+const combinedReducer = combineReducers({
     ...rootReducer,
 });
+
+export type IRootReducer = typeof combinedReducer;
+export type IRootState = ReturnType<IRootReducer>;
+
+export default combinedReducer;

src/store/reducers/saveQuery.ts

@@ -1,12 +1,14 @@
+import {Reducer} from 'redux';
+
 const SET_QUERY_NAME_TO_EDIT = 'SET_QUERY_NAME_TO_EDIT';
 const CLEAR_QUERY_NAME_TO_EDIT = 'CLEAR_QUERY_NAME_TO_EDIT';
 
+type IAction = ReturnType<typeof setQueryNameToEdit> | ReturnType<typeof clearQueryNameToEdit>;
+type ISaveQueryState = string | null;
+
 const initialState = null;
 
-const saveQuery = function (
-    state = initialState,
-    action: ReturnType<typeof setQueryNameToEdit> | ReturnType<typeof clearQueryNameToEdit>,
-) {
+const saveQuery: Reducer<ISaveQueryState, IAction> = function (state = initialState, action) {
     switch (action.type) {
         case SET_QUERY_NAME_TO_EDIT:
             return action.data;

src/store/reducers/singleClusterMode.ts

@@ -0,0 +1,5 @@
+function singleClusterMode(state = true) {
+    return state;
+}
+
+export default singleClusterMode;