Skip to content

Commit 060635e

Browse files
krosy1337krosy1337
committed
refactor: migrate some functions from utils/index.js to ts
1 parent eedb779 commit 060635e

File tree

47 files changed

+190
-358
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+190
-358
lines changed

‎src/components/FullNodeViewer/FullNodeViewer.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import cn from 'bem-cn-lite';
33
import type {TSystemStateInfo} from '../../types/api/nodes';
44

55
import {LOAD_AVERAGE_TIME_INTERVALS} from '../../utils/constants';
6-
import {calcUptime} from '../../utils';
6+
import {calcUptime} from '../../utils/dataFormatters/dataFormatters';
77

88
import InfoViewer from '../InfoViewer/InfoViewer';
9-
import ProgressViewer from '../ProgressViewer/ProgressViewer';
9+
import {ProgressViewer} from '../ProgressViewer/ProgressViewer';
1010
import {PoolUsage} from '../PoolUsage/PoolUsage';
1111

1212
import './FullNodeViewer.scss';

‎src/components/InfoViewer/formatters/common.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type {TDirEntry} from '../../../types/api/schema';
2-
import {formatDateTime} from '../../../utils';
2+
import {formatDateTime} from '../../../utils/dataFormatters/dataFormatters';
33

44
import {createInfoFormatter} from '../utils';
55

‎src/components/InfoViewer/formatters/pqGroup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
TPQPartitionConfig,
55
TPQTabletConfig,
66
} from '../../../types/api/schema';
7-
import {formatBps, formatBytes, formatNumber} from '../../../utils';
7+
import {formatBps, formatBytes, formatNumber} from '../../../utils/dataFormatters/dataFormatters';
88
import {HOUR_IN_SECONDS} from '../../../utils/constants';
99

1010
import {createInfoFormatter} from '../utils';

‎src/components/InfoViewer/formatters/table.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
import type {TFollowerGroup, TPartitionConfig, TTableStats} from '../../../types/api/schema';
22
import type {TMetrics} from '../../../types/api/tenant';
3-
import {formatCPU, formatNumber, formatBps, formatDateTime} from '../../../utils';
3+
import {
4+
formatBps,
5+
formatCPU,
6+
formatDateTime,
7+
formatNumber,
8+
} from '../../../utils/dataFormatters/dataFormatters';
49
import {toFormattedSize} from '../../FormattedBytes/utils';
510

611
import {createInfoFormatter} from '../utils';

‎src/components/ProgressViewer/ProgressViewer.js

-92
This file was deleted.

‎src/components/ProgressViewer/ProgressViewer.scss

-94
This file was deleted.

‎src/components/TooltipsContent/TabletTooltipContent/TabletTooltipContent.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type {TTabletStateInfo} from '../../../types/api/tablet';
22

3-
import {calcUptime} from '../../../utils';
3+
import {calcUptime} from '../../../utils/dataFormatters/dataFormatters';
44
import {InfoViewer, createInfoFormatter, formatObject} from '../../InfoViewer';
55

66
const formatTablet = createInfoFormatter<TTabletStateInfo>({

‎src/containers/Cluster/ClusterInfo/ClusterInfo.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import block from 'bem-cn-lite';
33
import {Skeleton} from '@gravity-ui/uikit';
44

55
import EntityStatus from '../../../components/EntityStatus/EntityStatus';
6-
import ProgressViewer from '../../../components/ProgressViewer/ProgressViewer';
6+
import {ProgressViewer} from '../../../components/ProgressViewer/ProgressViewer';
77
import InfoViewer, {InfoViewerItem} from '../../../components/InfoViewer/InfoViewer';
88
import {Tags} from '../../../components/Tags';
99
import {Tablet} from '../../../components/Tablet';
@@ -16,7 +16,7 @@ import type {AdditionalClusterProps, ClusterLink} from '../../../types/additiona
1616
import type {VersionValue} from '../../../types/versions';
1717
import type {TClusterInfo} from '../../../types/api/cluster';
1818
import {backend, customBackend} from '../../../store';
19-
import {formatStorageValues} from '../../../utils';
19+
import {formatStorageValues} from '../../../utils/dataFormatters/dataFormatters';
2020
import {useSetting, useTypedSelector} from '../../../utils/hooks';
2121
import {
2222
CLUSTER_DEFAULT_TITLE,

‎src/containers/Heatmap/Heatmap.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {Checkbox, Select} from '@gravity-ui/uikit';
77
import type {IHeatmapMetricValue} from '../../types/store/heatmap';
88
import {getTabletsInfo, setHeatmapOptions} from '../../store/reducers/heatmap';
99
import {showTooltip, hideTooltip} from '../../store/reducers/tooltip';
10-
import {formatNumber} from '../../utils';
10+
import {formatNumber} from '../../utils/dataFormatters/dataFormatters';
1111
import {useAutofetcher, useTypedSelector} from '../../utils/hooks';
1212

1313
import {Loader} from '../../components/Loader';

‎src/containers/Heatmap/Histogram/Histogram.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
33
import cn from 'bem-cn-lite';
44

55
import {getColorRange, getCurrentMetricLimits} from '../util';
6-
import {formatNumber} from '../../../utils';
6+
import {formatNumber} from '../../../utils/dataFormatters/dataFormatters';
77

88
import './Histogram.scss';
99

‎src/containers/Node/NodeStructure/Pdisk.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import DataTable, {Column, Settings} from '@gravity-ui/react-data-table';
88

99
import EntityStatus from '../../../components/EntityStatus/EntityStatus';
1010
import InfoViewer from '../../../components/InfoViewer/InfoViewer';
11-
import ProgressViewer from '../../../components/ProgressViewer/ProgressViewer';
11+
import {ProgressViewer} from '../../../components/ProgressViewer/ProgressViewer';
1212
import {Icon} from '../../../components/Icon';
1313
import {Vdisk} from './Vdisk';
1414

1515
import {bytesToGB, pad9} from '../../../utils/utils';
16-
import {formatStorageValuesToGb} from '../../../utils';
16+
import {formatStorageValuesToGb} from '../../../utils/dataFormatters/dataFormatters';
1717
import {getPDiskType} from '../../../utils/pdisk';
1818

1919
import {DEFAULT_TABLE_SETTINGS} from '../../../utils/constants';

‎src/containers/Node/NodeStructure/Vdisk.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
import React from 'react';
22
import cn from 'bem-cn-lite';
33

4-
import ProgressViewer from '../../../components/ProgressViewer/ProgressViewer';
5-
import {formatStorageValuesToGb, stringifyVdiskId} from '../../../utils';
4+
import {ProgressViewer} from '../../../components/ProgressViewer/ProgressViewer';
5+
import {
6+
formatStorageValuesToGb,
7+
stringifyVdiskId,
8+
} from '../../../utils/dataFormatters/dataFormatters';
69
import {bytesToGB, bytesToSpeed} from '../../../utils/utils';
710
import EntityStatus from '../../../components/EntityStatus/EntityStatus';
811
import {valueIsDefined} from './NodeStructure';

‎src/containers/Nodes/getNodesColumns.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import DataTable, {Column} from '@gravity-ui/react-data-table';
22
import {Popover} from '@gravity-ui/uikit';
33

44
import {PoolsGraph} from '../../components/PoolsGraph/PoolsGraph';
5-
import ProgressViewer from '../../components/ProgressViewer/ProgressViewer';
5+
import {ProgressViewer} from '../../components/ProgressViewer/ProgressViewer';
66
import {TabletsStatistic} from '../../components/TabletsStatistic';
77
import {NodeHostWrapper} from '../../components/NodeHostWrapper/NodeHostWrapper';
88

99
import {isSortableNodesProperty} from '../../utils/nodes';
10-
import {formatBytesToGigabyte} from '../../utils/index';
10+
import {formatBytesToGigabyte} from '../../utils/dataFormatters/dataFormatters';
1111

1212
import type {NodesPreparedEntity} from '../../store/reducers/nodes/types';
1313

‎src/containers/Storage/PDisk/PDisk.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {Stack} from '../../../components/Stack/Stack';
77
import routes, {createHref} from '../../../routes';
88
import {selectVDisksForPDisk} from '../../../store/reducers/storage/selectors';
99
import {TPDiskStateInfo, TPDiskState} from '../../../types/api/pdisk';
10-
import {stringifyVdiskId} from '../../../utils';
10+
import {stringifyVdiskId} from '../../../utils/dataFormatters/dataFormatters';
1111
import {useTypedSelector} from '../../../utils/hooks';
1212
import {getPDiskType} from '../../../utils/pdisk';
1313
import {isFullVDiskData} from '../../../utils/storage';

‎src/containers/Storage/PDiskPopup/PDiskPopup.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {InfoViewer, InfoViewerItem} from '../../../components/InfoViewer';
99

1010
import {EFlag} from '../../../types/api/enums';
1111
import {TPDiskStateInfo} from '../../../types/api/pdisk';
12-
import {getPDiskId} from '../../../utils';
12+
import {getPDiskId} from '../../../utils/dataFormatters/dataFormatters';
1313
import {getPDiskType} from '../../../utils/pdisk';
1414
import {bytesToGB} from '../../../utils/utils';
1515

‎src/containers/Storage/StorageGroups/StorageGroups.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import type {HandleSort} from '../../../utils/hooks/useTableSort';
1010

1111
import {VISIBLE_ENTITIES} from '../../../store/reducers/storage/constants';
1212
import {bytesToGB, bytesToSpeed} from '../../../utils/utils';
13-
import {stringifyVdiskId} from '../../../utils';
13+
import {stringifyVdiskId} from '../../../utils/dataFormatters/dataFormatters';
1414
import {getUsage, isFullVDiskData, isSortableStorageProperty} from '../../../utils/storage';
1515

1616
import shieldIcon from '../../../assets/icons/shield.svg';

‎src/containers/Storage/VDisk/VDisk.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {InternalLink} from '../../../components/InternalLink';
88
import routes, {createHref} from '../../../routes';
99
import {EFlag} from '../../../types/api/enums';
1010
import {EVDiskState, TVDiskStateInfo} from '../../../types/api/vdisk';
11-
import {stringifyVdiskId} from '../../../utils';
11+
import {stringifyVdiskId} from '../../../utils/dataFormatters/dataFormatters';
1212
import {isFullVDiskData} from '../../../utils/storage';
1313

1414
import {STRUCTURE} from '../../Node/NodePages';

‎src/containers/Storage/VDiskPopup/VDiskPopup.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {InfoViewer, InfoViewerItem} from '../../../components/InfoViewer';
99

1010
import {EFlag} from '../../../types/api/enums';
1111
import type {TVDiskStateInfo} from '../../../types/api/vdisk';
12-
import {stringifyVdiskId} from '../../../utils';
12+
import {stringifyVdiskId} from '../../../utils/dataFormatters/dataFormatters';
1313
import {bytesToGB, bytesToSpeed} from '../../../utils/utils';
1414
import {isFullVDiskData} from '../../../utils/storage';
1515

‎src/containers/Tablet/TabletInfo/TabletInfo.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {Link as UIKitLink} from '@gravity-ui/uikit';
55
import {ETabletState, TTabletStateInfo} from '../../../types/api/tablet';
66
import {InfoViewer, InfoViewerItem} from '../../../components/InfoViewer';
77
import routes, {createHref} from '../../../routes';
8-
import {calcUptime} from '../../../utils';
8+
import {calcUptime} from '../../../utils/dataFormatters/dataFormatters';
99
import {getDefaultNodePath} from '../../Node/NodePages';
1010

1111
import {b} from '../Tablet';

‎src/containers/Tablet/TabletTable/TabletTable.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import EntityStatus from '../../../components/EntityStatus/EntityStatus';
44
import {InternalLink} from '../../../components/InternalLink/InternalLink';
55

66
import type {ITabletPreparedHistoryItem} from '../../../types/store/tablet';
7-
import {calcUptime} from '../../../utils';
7+
import {calcUptime} from '../../../utils/dataFormatters/dataFormatters';
88
import {getDefaultNodePath} from '../../Node/NodePages';
99

1010
import {b} from '../Tablet';

‎src/containers/Tenant/Diagnostics/Consumers/TopicStats/ConsumersTopicStats.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import block from 'bem-cn-lite';
22

33
import type {IPreparedTopicStats} from '../../../../../types/store/topic';
4-
import {formatMsToUptime} from '../../../../../utils';
4+
import {formatMsToUptime} from '../../../../../utils/dataFormatters/dataFormatters';
55
import {SpeedMultiMeter} from '../../../../../components/SpeedMultiMeter';
66

77
import './ConsumersTopicStats.scss';

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import type {IPreparedConsumerData} from '../../../../../types/store/topic';
66
import {TENANT_DIAGNOSTICS_TABS_IDS} from '../../../../../store/reducers/tenant/constants';
77
import {SpeedMultiMeter} from '../../../../../components/SpeedMultiMeter';
88
import {InternalLink} from '../../../../../components/InternalLink';
9-
import {formatMsToUptime} from '../../../../../utils';
9+
import {formatMsToUptime} from '../../../../../utils/dataFormatters/dataFormatters';
1010
import routes, {createHref} from '../../../../../routes';
1111

1212
import {TenantTabsGroups} from '../../../TenantPages';

0 commit comments

Comments
 (0)