Skip to content

Commit 52ee19c

Browse files
artemmufazalovartemmufazalov
committed
fix: copilot review
1 parent 1f7a225 commit 52ee19c

File tree

4 files changed

+22
-18
lines changed

4 files changed

+22
-18
lines changed

‎src/components/VersionsBar/VersionsBar.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export function VersionsBar({preparedVersions}: VersionsBarProps) {
2626

2727
return preparedVersions.map((item) => {
2828
return {
29-
value: (item.count || 0 / total) * 100,
29+
value: ((item.count || 0) / total) * 100,
3030
color: item.color,
3131
version: item.version,
3232
count: item.count,
@@ -78,7 +78,7 @@ export function VersionsBar({preparedVersions}: VersionsBarProps) {
7878
return null;
7979
};
8080

81-
const handelMouseLeave = () => {
81+
const handleMouseLeave = () => {
8282
setHoveredVersion(undefined);
8383
};
8484

@@ -106,7 +106,7 @@ export function VersionsBar({preparedVersions}: VersionsBarProps) {
106106
onMouseEnter={() => {
107107
setHoveredVersion(item.version);
108108
}}
109-
onMouseLeave={handelMouseLeave}
109+
onMouseLeave={handleMouseLeave}
110110
className={b('version', {dimmed: isDimmed(item.version)})}
111111
style={{backgroundColor: item.color, width: `${item.value}%`}}
112112
/>
@@ -138,7 +138,7 @@ export function VersionsBar({preparedVersions}: VersionsBarProps) {
138138
onMouseEnter={() => {
139139
setHoveredVersion(item.version);
140140
}}
141-
onMouseLeave={handelMouseLeave}
141+
onMouseLeave={handleMouseLeave}
142142
>
143143
{item.version}
144144
</div>

‎src/utils/versions/__test__/sortVerions.test.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import {sortVerions} from '../sortVersions';
1+
import {sortVersions} from '../sortVersions';
22
import type {PreparedVersion} from '../types';
33

4-
describe('sortVerions', () => {
4+
describe('sortVersions', () => {
55
test('should sort versions by majorIndex in descending order', function () {
66
const versions: PreparedVersion[] = [
77
{version: 'v2.0.0', majorIndex: 1},
88
{version: 'v1.0.0', majorIndex: 2},
99
{version: 'v3.0.0', majorIndex: 0},
1010
];
1111

12-
const sortedVersions = sortVerions(versions);
12+
const sortedVersions = sortVersions(versions);
1313

1414
expect(sortedVersions).toEqual([
1515
{version: 'v3.0.0', majorIndex: 0},
@@ -25,7 +25,7 @@ describe('sortVerions', () => {
2525
{version: 'v3.0.0', majorIndex: 0},
2626
];
2727

28-
const sortedVersions = sortVerions(versions);
28+
const sortedVersions = sortVersions(versions);
2929

3030
expect(sortedVersions).toEqual([
3131
{version: 'v3.0.0', majorIndex: 0},
@@ -41,7 +41,7 @@ describe('sortVerions', () => {
4141
{version: 'v1.3.0', majorIndex: 2, minorIndex: 0},
4242
];
4343

44-
const sortedVersions = sortVerions(versions);
44+
const sortedVersions = sortVersions(versions);
4545

4646
expect(sortedVersions).toEqual([
4747
{version: 'v1.3.0', majorIndex: 2, minorIndex: 0},
@@ -57,7 +57,7 @@ describe('sortVerions', () => {
5757
{version: 'v1.3.0', majorIndex: 2, minorIndex: 0},
5858
];
5959

60-
const sortedVersions = sortVerions(versions);
60+
const sortedVersions = sortVersions(versions);
6161

6262
expect(sortedVersions).toEqual([
6363
{version: 'v1.3.0', majorIndex: 2, minorIndex: 0},
@@ -73,7 +73,7 @@ describe('sortVerions', () => {
7373
{version: 'v1.1.0', majorIndex: 2, minorIndex: 1},
7474
];
7575

76-
const sortedVersions = sortVerions(versions);
76+
const sortedVersions = sortVersions(versions);
7777

7878
expect(sortedVersions).toEqual([
7979
{version: 'v1.1.2', majorIndex: 2, minorIndex: 1},
@@ -89,7 +89,7 @@ describe('sortVerions', () => {
8989
{version: 'v3.0.0', majorIndex: undefined},
9090
];
9191

92-
const sortedVersions = sortVerions(versions);
92+
const sortedVersions = sortVersions(versions);
9393

9494
// When majorIndex is undefined, versions are sorted by hashCode
9595
// This test assumes the hashCode implementation results in this order
@@ -109,7 +109,7 @@ describe('sortVerions', () => {
109109
{version: 'v2.0.0', majorIndex: 1, minorIndex: undefined},
110110
];
111111

112-
const sortedVersions = sortVerions(versions);
112+
const sortedVersions = sortVersions(versions);
113113

114114
expect(sortedVersions).toEqual([
115115
{version: 'v3.0.0', majorIndex: 0, minorIndex: 0},
@@ -122,7 +122,7 @@ describe('sortVerions', () => {
122122

123123
test('should handle empty array', function () {
124124
const versions: PreparedVersion[] = [];
125-
const sortedVersions = sortVerions(versions);
125+
const sortedVersions = sortVersions(versions);
126126
expect(sortedVersions).toEqual([]);
127127
});
128128
});

‎src/utils/versions/clusterVersionColors.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type {MetaClusterVersion} from '../../types/api/meta';
22

3-
import {sortVerions} from './sortVersions';
3+
import {sortVersions} from './sortVersions';
44
import type {
55
ColorIndexToVersionsMap,
66
PreparedVersion,
@@ -74,7 +74,11 @@ export const prepareClusterVersions = (
7474

7575
filteredVersions.forEach((item) => {
7676
if (result[item.version]) {
77-
result[item.version].count = result[item.version].count || 0 + item.count || 0;
77+
// Summ count for versions of different nodes types
78+
const currentCount = result[item.version].count || 0;
79+
const itemCount = item.count || 0;
80+
81+
result[item.version].count = currentCount + itemCount;
7882
}
7983

8084
const minorVersion = getMinorVersion(item.version);
@@ -90,5 +94,5 @@ export const prepareClusterVersions = (
9094
};
9195
});
9296

93-
return sortVerions(Object.values(result));
97+
return sortVersions(Object.values(result));
9498
};

‎src/utils/versions/sortVersions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import type {PreparedVersion} from './types';
1616
* @param versions - Array of prepared cluster versions to sort
1717
* @returns A new sorted array of cluster versions
1818
*/
19-
export function sortVerions(versions: PreparedVersion[]) {
19+
export function sortVersions(versions: PreparedVersion[]) {
2020
return versions.slice().sort((versionA, versionB) => {
2121
if (versionA.majorIndex !== versionB.majorIndex) {
2222
if (versionA.majorIndex === undefined) {

0 commit comments

Comments
 (0)