refactor: migrate tenants reducer to ts

Author: artemmufazalov

src/containers/Tenants/Tenants.js

@@ -20,7 +20,7 @@ import {formatCPU, formatBytesToGigabyte, formatNumber} from '../../utils';
 import {hideTooltip, showTooltip} from '../../store/reducers/tooltip';
 import {withSearch} from '../../HOCS';
 import {ALL, DEFAULT_TABLE_SETTINGS, TENANT_INITIAL_TAB_KEY} from '../../utils/constants';
-import {getTenantsInfo} from '../../store/reducers/tenants';
+import {getTenantsInfo} from '../../store/reducers/tenants/tenants';
 import {changeFilter, getSettingValue} from '../../store/reducers/settings';
 import {setHeader} from '../../store/reducers/header';
 

src/store/reducers/index.ts

@@ -15,7 +15,7 @@ import schema from './schema';
 import host from './host';
 import network from './network';
 import pool from './pool';
-import tenants from './tenants';
+import tenants from './tenants/tenants';
 import tablet from './tablet';
 import topic from './topic';
 import consumer from './consumer';

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

@@ -1,12 +1,15 @@
-import _ from 'lodash';
-import {createRequestActionTypes, createApiRequest} from '../utils';
-import '../../services/api';
+import type {Reducer} from 'redux';
 
-const FETCH_TENANTS = createRequestActionTypes('tenants', 'FETCH_TENANTS');
+import '../../../services/api';
+import {createRequestActionTypes, createApiRequest} from '../../utils';
 
-const initialState = {loading: true, wasLoaded: false, data: {}};
+import type {TenantsAction, TenantsState} from './types';
 
-const tenants = function (state = initialState, action) {
+export const FETCH_TENANTS = createRequestActionTypes('tenants', 'FETCH_TENANTS');
+
+const initialState = {loading: true, wasLoaded: false};
+
+const tenants: Reducer<TenantsState, TenantsAction> = (state = initialState, action) => {
     switch (action.type) {
         case FETCH_TENANTS.REQUEST: {
             return {
@@ -35,20 +38,22 @@ const tenants = function (state = initialState, action) {
     }
 };
 
-export function getTenantsInfo(clusterName) {
+export function getTenantsInfo(clusterName?: string) {
     return createApiRequest({
         request: window.api.getTenants(clusterName),
         actions: FETCH_TENANTS,
         dataHandler: (response, getState) => {
             const {singleClusterMode} = getState();
+
             if (singleClusterMode) {
                 return response.TenantInfo;
             } else {
-                return response.databases?.map((tenant) => {
+                return response.TenantInfo?.map((tenant) => {
                     const node = tenant.Nodes ? tenant.Nodes[0] : {};
                     const address =
                         node.Host && node.Endpoints
-                            ? _.find(node.Endpoints, {Name: 'http-mon'})?.Address
+                            ? node.Endpoints.find((endpoint) => endpoint.Name === 'http-mon')
+                                  ?.Address
                             : undefined;
                     const backend = node.Host ? `${node.Host}${address ? address : ''}` : undefined;
                     return {...tenant, backend};

src/store/reducers/tenants/types.ts

@@ -0,0 +1,17 @@
+import {FETCH_TENANTS} from './tenants';
+
+import type {TTenant} from '../../../types/api/tenant';
+import type {ApiRequestAction} from '../../utils';
+
+export interface PreparedTenant extends TTenant {
+    backend?: string;
+}
+
+export interface TenantsState {
+    loading: boolean;
+    wasLoaded: boolean;
+    tenants?: PreparedTenant[];
+    error?: unknown;
+}
+
+export type TenantsAction = ApiRequestAction<typeof FETCH_TENANTS, PreparedTenant[], unknown>;

src/types/api/tenant.ts

@@ -54,6 +54,7 @@ export interface TTenant {
     CoresUsed: number;
     /** uint64 */
     StorageGroups: string;
+
     MonitoringEndpoint?: string; // additional
     ControlPlane?: ControlPlane; // additional
 }