Skip to content

Commit 815952f

Browse files
committed
fix: use only for calculation
1 parent 34fe48e commit 815952f

File tree

6 files changed

+4
-22
lines changed

6 files changed

+4
-22
lines changed

src/containers/Cluster/ClusterInfo/utils/utils.tsx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,7 @@ export const getInfo = (cluster: TClusterInfo, additionalInfo: InfoItem[]) => {
6363

6464
info.push({
6565
label: i18n('label_load'),
66-
value: (
67-
<ProgressViewer
68-
value={cluster?.LoadAverage}
69-
capacity={cluster?.RealNumberOfCpus ?? cluster?.NumberOfCpus}
70-
/>
71-
),
66+
value: <ProgressViewer value={cluster?.LoadAverage} capacity={cluster?.NumberOfCpus} />,
7267
});
7368

7469
info.push(...additionalInfo);

src/containers/Clusters/ClustersStatistics.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ export const ClustersStatistics = ({count, stats}: ClustersStatisticsProps) => {
1818
Tenants,
1919
LoadAverage,
2020
NumberOfCpus,
21-
RealNumberOfCpus,
2221
StorageUsed,
2322
StorageTotal,
2423
} = stats;
@@ -52,7 +51,7 @@ export const ClustersStatistics = ({count, stats}: ClustersStatisticsProps) => {
5251
<ProgressViewer
5352
size="ns"
5453
value={LoadAverage}
55-
capacity={RealNumberOfCpus || NumberOfCpus}
54+
capacity={NumberOfCpus}
5655
colorizeProgress={true}
5756
/>
5857
</div>

src/containers/Clusters/columns.tsx

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -176,20 +176,13 @@ export const CLUSTERS_COLUMNS: Column<PreparedCluster>[] = [
176176
return cluster?.NumberOfCpus;
177177
},
178178
render: ({row}) => {
179-
const {
180-
LoadAverage = 0,
181-
NumberOfCpus = 0,
182-
RealNumberOfCpus,
183-
Overall,
184-
} = row.cluster || {};
179+
const {LoadAverage = 0, NumberOfCpus = 0, Overall} = row.cluster || {};
185180

186181
if (!Overall) {
187182
return EMPTY_CELL;
188183
}
189184

190-
return (
191-
<ProgressViewer value={LoadAverage} capacity={RealNumberOfCpus ?? NumberOfCpus} />
192-
);
185+
return <ProgressViewer value={LoadAverage} capacity={NumberOfCpus} />;
193186
},
194187
},
195188
{

src/store/reducers/clusters/selectors.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ export function aggregateClustersInfo(clusters: PreparedCluster[]): ClusterDataA
8989
NodesAlive = 0,
9090
LoadAverage = 0,
9191
NumberOfCpus = 0,
92-
RealNumberOfCpus = 0,
9392
StorageUsed = 0,
9493
StorageTotal = 0,
9594
Tenants = 0;
@@ -104,7 +103,6 @@ export function aggregateClustersInfo(clusters: PreparedCluster[]): ClusterDataA
104103
Tenants += Number(cluster?.Tenants) || 0;
105104
LoadAverage += Number(cluster?.LoadAverage) || 0;
106105
NumberOfCpus += cluster?.NumberOfCpus || 0;
107-
RealNumberOfCpus += cluster?.RealNumberOfCpus || 0;
108106
StorageUsed += cluster?.StorageUsed ? Math.floor(parseInt(cluster.StorageUsed, 10)) : 0;
109107
StorageTotal += cluster?.StorageTotal ? Math.floor(parseInt(cluster.StorageTotal, 10)) : 0;
110108
});
@@ -116,7 +114,6 @@ export function aggregateClustersInfo(clusters: PreparedCluster[]): ClusterDataA
116114
Tenants,
117115
LoadAverage,
118116
NumberOfCpus,
119-
RealNumberOfCpus,
120117
StorageUsed,
121118
StorageTotal,
122119
};

src/store/reducers/clusters/types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ export interface ClusterDataAggregation {
1212
Tenants: number;
1313
LoadAverage: number;
1414
NumberOfCpus: number;
15-
RealNumberOfCpus?: number;
1615
StorageUsed: number;
1716
StorageTotal: number;
1817
}

src/types/api/cluster.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ export interface TClusterInfoV1 {
1313
NodesTotal?: number;
1414
NodesAlive?: number;
1515
NumberOfCpus?: number;
16-
RealNumberOfCpus?: number;
1716
/** double */
1817
LoadAverage?: number;
1918
/** uint64 */

0 commit comments

Comments
 (0)