Skip to content

Commit 744752f

Browse files
committed
fix: tests and typecheck
1 parent 5d2f295 commit 744752f

File tree

3 files changed

+21
-24
lines changed

3 files changed

+21
-24
lines changed

src/store/reducers/storage/__tests__/calculateMaximumDisksPerNode.test.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ describe('calculateMaximumDisksPerNode', () => {
77
const nodes: TNodeInfo[] = [];
88
const providedMaximumDisksPerNode = '5';
99

10-
expect(calculateMaximumDisksPerNode(nodes, providedMaximumDisksPerNode)).toBe('5');
10+
expect(calculateMaximumDisksPerNode(nodes, providedMaximumDisksPerNode)).toBe(5);
1111
});
1212

1313
test('should return "1" for empty nodes array', () => {
1414
const nodes: TNodeInfo[] = [];
1515

16-
expect(calculateMaximumDisksPerNode(nodes)).toBe('1');
16+
expect(calculateMaximumDisksPerNode(nodes)).toBe(1);
1717
});
1818

1919
test('should return "1" for undefined nodes', () => {
20-
expect(calculateMaximumDisksPerNode(undefined)).toBe('1');
20+
expect(calculateMaximumDisksPerNode(undefined)).toBe(1);
2121
});
2222

2323
test('should return "1" for nodes without PDisks', () => {
@@ -28,7 +28,7 @@ describe('calculateMaximumDisksPerNode', () => {
2828
},
2929
];
3030

31-
expect(calculateMaximumDisksPerNode(nodes)).toBe('1');
31+
expect(calculateMaximumDisksPerNode(nodes)).toBe(1);
3232
});
3333

3434
test('should calculate maximum disks correctly for single node with multiple PDisks', () => {
@@ -53,7 +53,7 @@ describe('calculateMaximumDisksPerNode', () => {
5353
},
5454
];
5555

56-
expect(calculateMaximumDisksPerNode(nodes)).toBe('3');
56+
expect(calculateMaximumDisksPerNode(nodes)).toBe(3);
5757
});
5858

5959
test('should calculate maximum disks across multiple nodes', () => {
@@ -106,7 +106,7 @@ describe('calculateMaximumDisksPerNode', () => {
106106
},
107107
];
108108

109-
expect(calculateMaximumDisksPerNode(nodes)).toBe('4');
109+
expect(calculateMaximumDisksPerNode(nodes)).toBe(4);
110110
});
111111

112112
test('should handle nodes with empty PDisks array', () => {
@@ -132,6 +132,6 @@ describe('calculateMaximumDisksPerNode', () => {
132132
},
133133
];
134134

135-
expect(calculateMaximumDisksPerNode(nodes)).toBe('2');
135+
expect(calculateMaximumDisksPerNode(nodes)).toBe(2);
136136
});
137137
});

src/store/reducers/storage/__tests__/calculateMaximumSlotsPerDisk.test.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ describe('calculateMaximumSlotsPerDisk', () => {
1717
const nodes: TNodeInfo[] = [];
1818
const providedMaximumSlotsPerDisk = '5';
1919

20-
expect(calculateMaximumSlotsPerDisk(nodes, providedMaximumSlotsPerDisk)).toBe('5');
20+
expect(calculateMaximumSlotsPerDisk(nodes, providedMaximumSlotsPerDisk)).toBe(5);
2121
});
2222

2323
test('should return "1" for empty nodes array', () => {
2424
const nodes: TNodeInfo[] = [];
2525

26-
expect(calculateMaximumSlotsPerDisk(nodes)).toBe('1');
26+
expect(calculateMaximumSlotsPerDisk(nodes)).toBe(1);
2727
});
2828

2929
test('should return "1" for undefined nodes', () => {
30-
expect(calculateMaximumSlotsPerDisk(undefined)).toBe('1');
30+
expect(calculateMaximumSlotsPerDisk(undefined)).toBe(1);
3131
});
3232

3333
test('should return "1" for nodes without PDisks or VDisks', () => {
@@ -38,7 +38,7 @@ describe('calculateMaximumSlotsPerDisk', () => {
3838
},
3939
];
4040

41-
expect(calculateMaximumSlotsPerDisk(nodes)).toBe('1');
41+
expect(calculateMaximumSlotsPerDisk(nodes)).toBe(1);
4242
});
4343

4444
test('should calculate maximum slots correctly for single node with one PDisk and multiple VDisks', () => {
@@ -67,7 +67,7 @@ describe('calculateMaximumSlotsPerDisk', () => {
6767
},
6868
];
6969

70-
expect(calculateMaximumSlotsPerDisk(nodes)).toBe('2');
70+
expect(calculateMaximumSlotsPerDisk(nodes)).toBe(2);
7171
});
7272

7373
test('should calculate maximum slots across multiple nodes', () => {
@@ -118,7 +118,7 @@ describe('calculateMaximumSlotsPerDisk', () => {
118118
},
119119
];
120120

121-
expect(calculateMaximumSlotsPerDisk(nodes)).toBe('3');
121+
expect(calculateMaximumSlotsPerDisk(nodes)).toBe(3);
122122
});
123123

124124
test('should handle nodes with multiple PDisks', () => {
@@ -156,7 +156,7 @@ describe('calculateMaximumSlotsPerDisk', () => {
156156
},
157157
];
158158

159-
expect(calculateMaximumSlotsPerDisk(nodes)).toBe('2');
159+
expect(calculateMaximumSlotsPerDisk(nodes)).toBe(2);
160160
});
161161

162162
test('should ignore VDisks with non-matching PDiskId', () => {
@@ -185,6 +185,6 @@ describe('calculateMaximumSlotsPerDisk', () => {
185185
},
186186
];
187187

188-
expect(calculateMaximumSlotsPerDisk(nodes)).toBe('1');
188+
expect(calculateMaximumSlotsPerDisk(nodes)).toBe(1);
189189
});
190190
});

src/store/reducers/storage/utils.ts

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ export const calculateMaximumSlotsPerDisk = (
235235
nodes: TNodeInfo[] | undefined,
236236
providedMaximumSlotsPerDisk?: string,
237237
): number => {
238-
if (providedMaximumSlotsPerDisk) {
238+
if (providedMaximumSlotsPerDisk && !isNaN(Number(providedMaximumSlotsPerDisk))) {
239239
return Number(providedMaximumSlotsPerDisk);
240240
}
241241

@@ -261,7 +261,7 @@ export const calculateMaximumDisksPerNode = (
261261
nodes: TNodeInfo[] | undefined,
262262
providedMaximumDisksPerNode?: string,
263263
): number => {
264-
if (providedMaximumDisksPerNode) {
264+
if (providedMaximumDisksPerNode && !isNaN(Number(providedMaximumDisksPerNode))) {
265265
return Number(providedMaximumDisksPerNode);
266266
}
267267

@@ -287,21 +287,18 @@ export const prepareStorageNodesResponse = (data: TNodesInfo): PreparedStorageRe
287287
return undefined;
288288
}).filter((group): group is TableGroup => Boolean(group));
289289

290-
const maximumSlots = calculateMaximumSlotsPerDisk(Nodes, MaximumSlotsPerDisk);
291-
const maximumDisks = calculateMaximumDisksPerNode(Nodes, MaximumDisksPerNode);
290+
const maxSlotsPerDisk = calculateMaximumSlotsPerDisk(Nodes, MaximumSlotsPerDisk);
291+
const maxDisksPerNode = calculateMaximumDisksPerNode(Nodes, MaximumDisksPerNode);
292292
const preparedNodes = Nodes?.map((node) =>
293-
prepareStorageNodeData(node, maximumSlots, maximumDisks),
293+
prepareStorageNodeData(node, maxSlotsPerDisk, maxDisksPerNode),
294294
);
295295

296296
return {
297297
nodes: preparedNodes,
298298
total: Number(TotalNodes) || preparedNodes?.length,
299299
found: Number(FoundNodes),
300300
tableGroups,
301-
columnSettings: {
302-
maxSlotsPerDisk: Number(maximumSlots),
303-
maxDisksPerNode: Number(maximumDisks),
304-
},
301+
columnSettings: {maxSlotsPerDisk, maxDisksPerNode},
305302
};
306303
};
307304

0 commit comments

Comments
 (0)