Skip to content

Commit f648f08

Browse files
fix(VDisk): do not show vdisk as not replicated if no data (#1921)
1 parent 58a0f08 commit f648f08

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

src/components/VDiskPopup/VDiskPopup.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ const prepareVDiskData = (data: PreparedVDisk, withDeveloperUILink?: boolean) =>
124124
vdiskData.push({label: 'FrontQueues', value: FrontQueues});
125125
}
126126

127-
if (!Replicated) {
127+
if (Replicated === false) {
128128
vdiskData.push({label: 'Replicated', value: 'NO'});
129129
}
130130

src/store/reducers/storage/utils.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,11 @@ const prepareStorageGroupData = (
8484
AvailableSize: PDiskAvailableSize,
8585
} = prepareWhiteboardPDiskData(PDisk);
8686

87-
if (!Replicated || PDiskState !== TPDiskState.Normal || VDiskState !== EVDiskState.OK) {
87+
if (
88+
Replicated === false ||
89+
PDiskState !== TPDiskState.Normal ||
90+
VDiskState !== EVDiskState.OK
91+
) {
8892
missing += 1;
8993
}
9094

src/utils/disks/__test__/calculateVDiskSeverity.test.ts

+9
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,15 @@ describe('VDisk state', () => {
102102
expect(severity2).not.toEqual(DISK_COLOR_STATE_TO_NUMERIC_SEVERITY.Blue);
103103
});
104104

105+
it('Should not display VDisk as replicating if Replicated is undefined', () => {
106+
const severity = calculateVDiskSeverity({
107+
VDiskState: EVDiskState.OK, // severity 1, green
108+
Replicated: undefined,
109+
});
110+
111+
expect(severity).not.toEqual(DISK_COLOR_STATE_TO_NUMERIC_SEVERITY.Blue);
112+
});
113+
105114
it('Should display replicating VDisks in a not-OK state with a regular color', () => {
106115
const severity1 = calculateVDiskSeverity({
107116
VDiskState: EVDiskState.Initial, // severity 3, yellow

src/utils/disks/calculateVDiskSeverity.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export function calculateVDiskSeverity<
3232
let severity = Math.max(DiskSpaceSeverity, VDiskSpaceSeverity, FrontQueuesSeverity);
3333

3434
// donors are always in the not replicated state since they are leftovers
35-
if (!Replicated && severity === DISK_COLOR_STATE_TO_NUMERIC_SEVERITY.Green) {
35+
if (Replicated === false && severity === DISK_COLOR_STATE_TO_NUMERIC_SEVERITY.Green) {
3636
severity = DISK_COLOR_STATE_TO_NUMERIC_SEVERITY.Blue;
3737
}
3838

0 commit comments

Comments
 (0)