refactor: migrate cluster reducer to ts

Author: artemmufazalov

src/components/ClusterInfo/ClusterInfo.tsx

@@ -15,7 +15,7 @@ import {Tablet} from '../Tablet';
 //@ts-ignore
 import {hideTooltip, showTooltip} from '../../store/reducers/tooltip';
 //@ts-ignore
-import {getClusterInfo} from '../../store/reducers/cluster';
+import {getClusterInfo} from '../../store/reducers/cluster/cluster';
 //@ts-ignore
 import {clusterName, backend, customBackend} from '../../store';
 
@@ -68,6 +68,8 @@ class ClusterInfo extends React.Component<ClusterInfoProps> {
         return 0;
     }
 
+    private autofetcher: any;
+
     componentDidMount() {
         const {setHeader} = this.props;
         setHeader([
@@ -107,8 +109,6 @@ class ClusterInfo extends React.Component<ClusterInfoProps> {
         return <div className={b(null, className)}>{helper || this.renderContent()}</div>;
     }
 
-    private autofetcher: any;
-
     private getInfo() {
         const {cluster = {}, additionalClusterInfo = [], singleClusterMode} = this.props;
         const {StorageTotal, StorageUsed} = cluster;

src/containers/Header/Header.tsx

@@ -8,7 +8,7 @@ import Divider from '../../components/Divider/Divider';
 import {Icon} from '../../components/Icon';
 
 import {clusterName as clusterNameLocation, backend, customBackend} from '../../store';
-import {getClusterInfo} from '../../store/reducers/cluster';
+import {getClusterInfo} from '../../store/reducers/cluster/cluster';
 import {getHostInfo} from '../../store/reducers/host';
 import {HeaderItemType} from '../../store/reducers/header';
 

src/services/api.ts

@@ -55,10 +55,11 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
             node_id: id,
         });
     }
-    getTenants() {
+    getTenants(clusterName?: string) {
         return this.get<TTenantInfo>(this.getPath('/viewer/json/tenantinfo'), {
             tablets: 1,
             storage: 1,
+            cluster_name: clusterName,
         });
     }
     getTenantInfo({path}: {path: string}) {

src/store/reducers/cluster.js src/store/reducers/cluster/cluster.tssrc/store/reducers/cluster.js renamed to src/store/reducers/cluster/cluster.ts

@@ -1,11 +1,14 @@
-import {createRequestActionTypes, createApiRequest} from '../utils';
-import '../../services/api';
+import type {Reducer} from 'redux';
 
-const FETCH_CLUSTER = createRequestActionTypes('cluster', 'FETCH_CLUSTER');
+import '../../../services/api';
+import {createRequestActionTypes, createApiRequest} from '../../utils';
+import type {ClusterAction, ClusterState} from './types';
+
+export const FETCH_CLUSTER = createRequestActionTypes('cluster', 'FETCH_CLUSTER');
 
 const initialState = {loading: true, wasLoaded: false};
 
-const cluster = function (state = initialState, action) {
+const cluster: Reducer<ClusterState, ClusterAction> = (state = initialState, action) => {
     switch (action.type) {
         case FETCH_CLUSTER.REQUEST: {
             return {
@@ -14,17 +17,9 @@ const cluster = function (state = initialState, action) {
             };
         }
         case FETCH_CLUSTER.SUCCESS: {
-            const {data} = action;
-            const clusterInfo = data.cluster ? data.cluster.cluster : data;
-            const clusterName = data.cluster?.title || data.Name;
             return {
                 ...state,
-                data: {
-                    ...clusterInfo,
-                    balancer: data.cluster?.balancer,
-                    solomon: data.cluster?.solomon,
-                    Name: clusterName,
-                },
+                data: action.data,
                 loading: false,
                 wasLoaded: true,
                 error: undefined,
@@ -42,7 +37,7 @@ const cluster = function (state = initialState, action) {
     }
 };
 
-export function getClusterInfo(clusterName) {
+export function getClusterInfo(clusterName?: string) {
     return createApiRequest({
         request: window.api.getClusterInfo(clusterName),
         actions: FETCH_CLUSTER,

src/store/reducers/cluster/types.ts

@@ -0,0 +1,13 @@
+import {FETCH_CLUSTER} from './cluster';
+
+import type {TClusterInfo} from '../../../types/api/cluster';
+import type {ApiRequestAction} from '../../utils';
+
+export interface ClusterState {
+    loading: boolean;
+    wasLoaded: boolean;
+    data?: TClusterInfo;
+    error?: unknown;
+}
+
+export type ClusterAction = ApiRequestAction<typeof FETCH_CLUSTER, TClusterInfo, unknown>;

src/store/reducers/index.ts

@@ -1,7 +1,7 @@
 import {combineReducers} from 'redux';
 
 import nodes from './nodes';
-import cluster from './cluster';
+import cluster from './cluster/cluster';
 import tenant from './tenant';
 import storage from './storage';
 import node from './node';

src/types/api/cluster.ts

@@ -31,4 +31,7 @@ export interface TClusterInfo {
     Tenants?: string;
     /** uint64 */
     Tablets?: string;
+    
+    Balancer?: string; // additional
+    Solomon?: string; // additional
 }