Skip to content

Commit 33bb8a0

Browse files
refactor(Tenants): migrate to ts (#463)
1 parent c246869 commit 33bb8a0

File tree

13 files changed

+454
-396
lines changed

13 files changed

+454
-396
lines changed

src/components/ProblemFilter/ProblemFilter.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import {RadioButton} from '@gravity-ui/uikit';
22

3-
import type {ValueOf} from '../../types/common';
3+
import type {ProblemFilterValue} from '../../store/reducers/settings/types';
44
import {ProblemFilterValues} from '../../store/reducers/settings/settings';
55

66
interface ProblemFilterProps {
7-
value: ValueOf<typeof ProblemFilterValues>;
7+
value: ProblemFilterValue;
88
onChange: (value: string) => void;
99
className?: string;
1010
}

src/containers/Cluster/Cluster.tsx

+9-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ import qs from 'qs';
66

77
import {Tabs} from '@gravity-ui/uikit';
88

9-
import type {AdditionalClusterProps, AdditionalVersionsProps} from '../../types/additionalProps';
9+
import type {
10+
AdditionalClusterProps,
11+
AdditionalTenantsProps,
12+
AdditionalVersionsProps,
13+
} from '../../types/additionalProps';
1014
import type {AdditionalNodesInfo} from '../../utils/nodes';
1115
import routes from '../../routes';
1216

@@ -17,7 +21,7 @@ import {parseNodesToVersionsValues, parseVersionsToVersionToColorMap} from '../.
1721
import {useAutofetcher, useTypedSelector} from '../../utils/hooks';
1822

1923
import {InternalLink} from '../../components/InternalLink';
20-
import Tenants from '../Tenants/Tenants';
24+
import {Tenants} from '../Tenants/Tenants';
2125
import {Nodes} from '../Nodes/Nodes';
2226
import {Storage} from '../Storage/Storage';
2327
import {Versions} from '../Versions/Versions';
@@ -30,15 +34,15 @@ import './Cluster.scss';
3034
const b = cn('cluster');
3135

3236
interface ClusterProps {
33-
additionalTenantsInfo?: unknown;
37+
additionalTenantsProps?: AdditionalTenantsProps;
3438
additionalNodesInfo?: AdditionalNodesInfo;
3539
additionalClusterProps?: AdditionalClusterProps;
3640
additionalVersionsProps?: AdditionalVersionsProps;
3741
}
3842

3943
function Cluster({
4044
additionalClusterProps,
41-
additionalTenantsInfo,
45+
additionalTenantsProps,
4246
additionalNodesInfo,
4347
additionalVersionsProps,
4448
}: ClusterProps) {
@@ -97,7 +101,7 @@ function Cluster({
97101
const renderTab = () => {
98102
switch (activeTab) {
99103
case clusterTabsIds.tenants: {
100-
return <Tenants additionalTenantsInfo={additionalTenantsInfo} />;
104+
return <Tenants additionalTenantsProps={additionalTenantsProps} />;
101105
}
102106
case clusterTabsIds.nodes: {
103107
return <Nodes additionalNodesInfo={additionalNodesInfo} />;

src/containers/Nodes/Nodes.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {useDispatch} from 'react-redux';
55
import DataTable from '@gravity-ui/react-data-table';
66

77
import type {EPathType} from '../../types/api/schema';
8-
import type {ValueOf} from '../../types/common';
8+
import type {ProblemFilterValue} from '../../store/reducers/settings/types';
99

1010
import {AccessDenied} from '../../components/Errors/403';
1111
import {Illustration} from '../../components/Illustration';
@@ -84,7 +84,7 @@ export const Nodes = ({path, type, className, additionalNodesInfo = {}}: NodesPr
8484
};
8585

8686
const handleProblemFilterChange = (value: string) => {
87-
dispatch(changeFilter(value as ValueOf<typeof ProblemFilterValues>));
87+
dispatch(changeFilter(value as ProblemFilterValue));
8888
};
8989

9090
const handleUptimeFilterChange = (value: string) => {

0 commit comments

Comments
 (0)