ui/volume: rephrase the volume status from Available to Ready

The volume status available is confusing. For example, when the PV is bound, we displayed Available Refs: #2245
scality · Feb 20, 2020 · 8f428ff · 8f428ff
1 parent 8ba6b40
commit 8f428ff
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/ui/src/constants.js b/ui/src/constants.js
@@ -23,6 +23,7 @@ export const STATUS_FAILED = 'Failed';
 export const STATUS_AVAILABLE = 'Available';
 export const STATUS_RELEASED = 'Released';
 export const STATUS_UNKNOWN = 'Unknown';
+export const STATUS_READY = 'Ready';
 
 export const SPARSE_LOOP_DEVICE = 'sparseLoopDevice';
 export const RAW_BLOCK_DEVICE = 'rawBlockDevice';
diff --git a/ui/src/containers/NodeVolumes.js b/ui/src/containers/NodeVolumes.js
@@ -32,8 +32,8 @@ import {
   STATUS_TERMINATING,
   STATUS_PENDING,
   STATUS_FAILED,
-  STATUS_AVAILABLE,
   STATUS_BOUND,
+  STATUS_READY,
 } from '../constants';
 
 const VolumeTable = styled.div`
@@ -172,7 +172,7 @@ const NodeVolumes = props => {
               hintMessage = intl.messages.volume_status_unknown_hint;
               break;
             case STATUS_FAILED:
-            case STATUS_AVAILABLE:
+            case STATUS_READY:
               const persistentVolume = persistentVolumes.find(
                 pv => pv?.metadata?.name === rowData.name,
               );

diff --git a/ui/src/services/NodeVolumesUtils.js b/ui/src/services/NodeVolumesUtils.js
@@ -6,6 +6,7 @@ import {
   STATUS_AVAILABLE,
   STATUS_BOUND,
   STATUS_RELEASED,
+  STATUS_READY,
 } from '../constants';
 
 export const isVolumeDeletable = (rowData, persistentVolumes) => {
@@ -18,7 +19,7 @@ export const isVolumeDeletable = (rowData, persistentVolumes) => {
     case STATUS_TERMINATING:
       return false;
     case STATUS_FAILED:
-    case STATUS_AVAILABLE:
+    case STATUS_READY:
       if (persistentVolumes?.length === 0) {
         return true;
       } else {
@@ -80,7 +81,7 @@ export const computeVolumeGlobalStatus = (name, status) => {
 
   switch(condStatus) {
   case 'True':
-    return STATUS_AVAILABLE;
+    return STATUS_READY;
   case 'False':
     return STATUS_FAILED;
   case 'Unknown':