Merge pull request #4544 from openshift-cherrypick-robot/cherry-pick-…

…4521-to-release-4.4 [release-4.4] Bug 1807293: Fix sort criteria for capacity on console
openshift · Feb 28, 2020 · 85786a8 · 85786a8
2 parents a90192c + 469c780
commit 85786a8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/frontend/public/components/factory/table.tsx b/frontend/public/components/factory/table.tsx
@@ -6,7 +6,7 @@ import { getNodeRoles, getMachinePhase } from '@console/shared';
 import * as UIActions from '../../actions/ui';
 import { ingressValidHosts } from '../ingress';
 import { alertStateOrder, silenceStateOrder } from '../../reducers/monitoring';
-import { EmptyBox, StatusBox, WithScrollContainer } from '../utils';
+import { convertToBaseValue, EmptyBox, StatusBox, WithScrollContainer } from '../utils';
 import {
   getClusterOperatorStatus,
   getClusterOperatorVersion,
@@ -111,6 +111,8 @@ const sorts = {
   podPhase,
   podReadiness: (pod: PodKind): number => podReadiness(pod).readyCount,
   podRestarts,
+  pvStorage: (pv) => _.toInteger(convertToBaseValue(pv?.spec?.capacity?.storage)),
+  pvcStorage: (pvc) => _.toInteger(convertToBaseValue(pvc?.status?.capacity?.storage)),
   serviceClassDisplayName,
   silenceStateOrder,
   string: (val) => JSON.stringify(val),

diff --git a/frontend/public/components/persistent-volume-claim.jsx b/frontend/public/components/persistent-volume-claim.jsx
@@ -67,7 +67,7 @@ const PVCTableHeader = () => {
     },
     {
       title: 'Capacity',
-      sortField: 'status.capacity.storage',
+      sortFunc: 'pvcStorage',
       transforms: [sortable],
       props: { className: tableColumnClasses[4] },
     },

diff --git a/frontend/public/components/persistent-volume.jsx b/frontend/public/components/persistent-volume.jsx
@@ -56,7 +56,7 @@ const PVTableHeader = () => {
     },
     {
       title: 'Capacity',
-      sortField: 'spec.capacity.storage',
+      sortFunc: 'pvStorage',
       transforms: [sortable],
       props: { className: tableColumnClasses[3] },
     },