Skip to content

Commit c32cb69

Browse files
committed
refactor: K8sResourceList - update CPU & Memory Usage sorting based on percentage
1 parent bc5a316 commit c32cb69

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

src/components/ResourceBrowser/Constants.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,8 @@ export const NODE_LIST_HEADERS_TO_KEY_MAP: Record<(typeof NODE_LIST_HEADERS)[num
311311
'node group': 'nodeGroup',
312312
pods: 'podCount',
313313
taints: 'taintCount',
314-
'cpu usage': 'cpu.usage',
315-
'mem usage': 'memory.usage',
314+
'cpu usage': 'cpu.usagePercentage',
315+
'mem usage': 'memory.usagePercentage',
316316
age: 'age',
317317
unschedulable: 'unschedulable',
318318
} as const

src/components/ResourceBrowser/ResourceList/K8sResourceListTableCellComponent.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ const K8sResourceListTableCellComponent = ({
210210
lastSeen: resourceData[EVENT_LIST.dataKeys.lastSeen] as string,
211211
}
212212

213-
if (columnName === 'cpu.usage') {
213+
if (columnName === 'cpu.usagePercentage') {
214214
return (
215215
<K8sResourceListTableUsageCell
216216
percentage={resourceData['cpu.usagePercentage'] as string}
@@ -221,7 +221,7 @@ const K8sResourceListTableCellComponent = ({
221221
)
222222
}
223223

224-
if (columnName === 'memory.usage') {
224+
if (columnName === 'memory.usagePercentage') {
225225
return (
226226
<K8sResourceListTableUsageCell
227227
percentage={resourceData['memory.usagePercentage'] as string}

src/components/ResourceBrowser/ResourceList/K8sResourceListTableUsageCell.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export const K8sResourceListTableUsageCell = ({
3535
</div>
3636
}
3737
>
38-
<div className="flexbox-col dc__content-center dc__gap-4 py-10 cursor">
38+
<div className="flexbox-col dc__content-center dc__gap-4 py-10">
3939
<div className="flex left dc__gap-8">
4040
<p className="m-0 fs-13 lh-20 cn-9 flex-grow-1">{absoluteValue}</p>
4141
<p className="m-0 fs-13 lh-20 cn-7">{percentage}</p>

src/components/ResourceBrowser/ResourceList/utils.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,8 @@ const propertyComparatorMap = {
223223
errors: numberInStringComparator,
224224
'k8s version': versionComparatorBySortOrder,
225225
taints: numberInStringComparator,
226-
'cpu usage (%)': numberInStringComparator,
227-
'cpu allocatable': numberInStringComparator,
228-
'mem usage (%)': numberInStringComparator,
229-
'mem allocatable': numberInStringComparator,
230-
'cpu usage (absolute)': numberInStringComparator,
226+
'cpu usage': numberInStringComparator,
227+
'mem usage': numberInStringComparator,
231228
restarts: numberInStringComparator,
232229
}
233230

0 commit comments

Comments
 (0)