Skip to content

Commit 5322248

Browse files
committed
fix: better code
1 parent 3e348bb commit 5322248

File tree

3 files changed

+10
-29
lines changed

3 files changed

+10
-29
lines changed

src/containers/Tenant/Diagnostics/TenantOverview/TenantStorage/ProgressWrapper.tsx

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ import {Flex, Progress, Text} from '@gravity-ui/uikit';
55
import type {FormatProgressViewerValues} from '../../../../../components/ProgressViewer/ProgressViewer';
66
import {isNumeric, safeParseNumber} from '../../../../../utils/utils';
77

8-
import {DEFAULT_PROGRESS_WIDTH, MAX_PERCENTAGE, MIN_PERCENTAGE, PROGRESS_SIZES} from './constants';
8+
import {DEFAULT_PROGRESS_WIDTH, MAX_PERCENTAGE, MIN_PERCENTAGE, PROGRESS_SIZE} from './constants';
99
import i18n from './i18n';
1010

1111
interface ProgressWrapperProps {
1212
value?: number | string;
1313
capacity?: number | string;
1414
formatValues?: FormatProgressViewerValues;
15-
size?: 'storage';
1615
className?: string;
1716
width?: number;
1817
}
@@ -25,7 +24,6 @@ export function ProgressWrapper({
2524
value,
2625
capacity,
2726
formatValues = defaultFormatValues,
28-
size = 'storage',
2927
className,
3028
width = DEFAULT_PROGRESS_WIDTH,
3129
}: ProgressWrapperProps) {
@@ -64,26 +62,14 @@ export function ProgressWrapper({
6462

6563
const validatedWidth = Math.max(0, width);
6664

67-
if (size === 'storage') {
68-
return (
69-
<Flex alignItems="center" gap="2" className={className}>
70-
<div style={{width: `${validatedWidth}px`}}>
71-
<Progress
72-
value={clampedFillWidth}
73-
theme="success"
74-
size={PROGRESS_SIZES.STORAGE}
75-
/>
76-
</div>
77-
<Text variant="body-1" color="secondary">
78-
{displayText}
79-
</Text>
80-
</Flex>
81-
);
82-
}
83-
8465
return (
85-
<div className={className}>
86-
<Progress value={clampedFillWidth} text={displayText} size={PROGRESS_SIZES.DEFAULT} />
87-
</div>
66+
<Flex alignItems="center" gap="2" className={className}>
67+
<div style={{width: `${validatedWidth}px`}}>
68+
<Progress value={clampedFillWidth} theme="success" size={PROGRESS_SIZE} />
69+
</div>
70+
<Text variant="body-1" color="secondary">
71+
{displayText}
72+
</Text>
73+
</Flex>
8874
);
8975
}

src/containers/Tenant/Diagnostics/TenantOverview/TenantStorage/TenantStorage.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ export function TenantStorage({tenantName, metrics}: TenantStorageProps) {
6666
value={tabletStorageUsed}
6767
capacity={tabletStorageLimit}
6868
formatValues={formatStorageValues}
69-
size="storage"
7069
/>
7170
),
7271
},
@@ -82,7 +81,6 @@ export function TenantStorage({tenantName, metrics}: TenantStorageProps) {
8281
value={blobStorageUsed}
8382
capacity={blobStorageLimit}
8483
formatValues={formatStorageValues}
85-
size="storage"
8684
/>
8785
),
8886
},

src/containers/Tenant/Diagnostics/TenantOverview/TenantStorage/constants.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,4 @@ export const DEFAULT_PROGRESS_WIDTH = 400;
22
export const MAX_PERCENTAGE = 100;
33
export const MIN_PERCENTAGE = 0;
44

5-
export const PROGRESS_SIZES = {
6-
STORAGE: 's',
7-
DEFAULT: 'm',
8-
} as const;
5+
export const PROGRESS_SIZE = 's';

0 commit comments

Comments
 (0)