ui/nodes:

Add missing constant for Node status User constants instead of strings in NodeUtils table data generator to be consistent with Sorting Implement Status Sorting Refs: #2919
scality · Nov 12, 2020 · 6283bd2 · 6283bd2
1 parent e70489e
commit 6283bd2
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 8 deletions.
diff --git a/ui/src/components/NodeListTable.js b/ui/src/components/NodeListTable.js
@@ -21,6 +21,12 @@ import {
   TableHeader,
 } from './CommonLayoutStyle';
 import { compareHealth } from '../services/utils';
+import {
+  API_STATUS_READY,
+  API_STATUS_NOT_READY,
+  API_STATUS_UNKNOWN,
+  API_STATUS_DEPLOYING,
+} from '../constants';
 
 const NodeListContainer = styled.div`
   color: ${(props) => props.theme.brand.textPrimary};
@@ -219,6 +225,18 @@ function Table({ columns, data, rowClicked, theme, selectedNodeName }) {
           row1?.values?.health?.health,
         );
       },
+      status: (row1, row2) => {
+        const weights = {};
+        weights[API_STATUS_READY] = 3;
+        weights[API_STATUS_NOT_READY] = 2;
+        weights[API_STATUS_DEPLOYING] = 1;
+        weights[API_STATUS_UNKNOWN] = 0;
+
+        return (
+          weights[row1?.values?.status?.status] -
+          weights[row2?.values?.status?.status]
+        );
+      },
     };
   }, []);
 
@@ -422,7 +440,6 @@ const NodeListTable = (props) => {
         cellStyle: { textAlign: 'center', width: '80px' },
         Cell: (cellProps) => {
           const { statusTextColor, computedStatus } = cellProps.value;
-          console.log(computedStatus);
           return computedStatus.map((status) => {
             return (
               <StatusText key={status} textColor={statusTextColor}>
@@ -431,6 +448,7 @@ const NodeListTable = (props) => {
             );
           });
         },
+        sortType: 'status',
       },
     ],
     [],

diff --git a/ui/src/constants.js b/ui/src/constants.js
@@ -13,6 +13,7 @@ export const STATUS_HEALTH = 'health';
 export const API_STATUS_READY = 'ready';
 export const API_STATUS_NOT_READY = 'not_ready';
 export const API_STATUS_UNKNOWN = 'unknown';
+export const API_STATUS_DEPLOYING = 'deploying';
 
 export const STATUS_BOUND = 'Bound';
 export const STATUS_PENDING = 'Pending';

diff --git a/ui/src/services/NodeUtils.js b/ui/src/services/NodeUtils.js
@@ -6,7 +6,10 @@ import {
   STATUS_WARNING,
   STATUS_HEALTH,
   STATUS_NONE,
+  API_STATUS_READY,
+  API_STATUS_NOT_READY,
   API_STATUS_UNKNOWN,
+  API_STATUS_DEPLOYING,
 } from '../constants';
 
 const METALK8S_CONTROL_PLANE_IP = 'metalk8s:control_plane_ip';
@@ -64,25 +67,25 @@ export const getNodeListData = createSelector(
         // "yellow" when status.conditions['Ready'] == True and some other conditions are true
         // "red" when status.conditions['Ready'] == False
         // "grey" when there is no status.conditions
-        if (node?.status === 'ready' && node?.conditions.length === 0) {
+        if (node?.status === API_STATUS_READY && node?.conditions.length === 0) {
           statusTextColor = brand?.healthy;
-          computedStatus.push('ready');
-        } else if (node?.status === 'ready' && node?.conditions.length !== 0) {
+          computedStatus.push(API_STATUS_READY);
+        } else if (node?.status === API_STATUS_READY && node?.conditions.length !== 0) {
           statusTextColor = brand?.warning;
           nodes.conditions.map((cond) => {
             return computedStatus.push(cond);
           });
         } else if (node.deploying && node.status === API_STATUS_UNKNOWN) {
           statusTextColor = brand?.textSecondary;
-          computedStatus.push('deploying');
+          computedStatus.push(API_STATUS_DEPLOYING);
           health = STATUS_NONE;
-        } else if (node?.status !== 'ready') {
+        } else if (node?.status !== API_STATUS_READY) {
           statusTextColor = brand?.critical;
-          computedStatus.push('not_ready');
+          computedStatus.push(API_STATUS_NOT_READY);
           health = STATUS_NONE;
         } else {
           statusTextColor = brand?.textSecondary;
-          computedStatus.push('unknown');
+          computedStatus.push(API_STATUS_UNKNOWN);
           health = STATUS_NONE;
         }