Merge pull request #9818 from afreen23/404-message

Bug 1994586: Create local volume set step says "An error has occurred"
openshift · Aug 19, 2021 · 6dd364d · 6dd364d
2 parents d37cf6e + d1f3192
commit 6dd364d
Show file tree

Hide file tree

Showing 21 changed files with 677 additions and 490 deletions.
diff --git a/frontend/packages/ceph-storage-plugin/locales/en/ceph-storage-plugin.json b/frontend/packages/ceph-storage-plugin/locales/en/ceph-storage-plugin.json
@@ -156,46 +156,46 @@
   "Can be used on any platform having nodes with local devices. The infrastructure storage class is provided by Local Storage Operator on top of the local devices.": "Can be used on any platform having nodes with local devices. The infrastructure storage class is provided by Local Storage Operator on top of the local devices.",
   "Connect an external storage platform": "Connect an external storage platform",
   "Can be used to connect an external storage platform to OpenShift Data Foundation.": "Can be used to connect an external storage platform to OpenShift Data Foundation.",
-  "{{nodeCount, number}} node": "{{nodeCount, number}} node",
-  "{{nodeCount, number}} node_plural": "{{nodeCount, number}} nodes",
-  "selected ({{cpu}} CPU and {{memory}} on ": "selected ({{cpu}} CPU and {{memory}} on ",
-  "{{zoneCount, number}} zone": "{{zoneCount, number}} zone",
-  "{{zoneCount, number}} zone_plural": "{{zoneCount, number}} zones",
   "Select Capacity": "Select Capacity",
   "Requested Capacity": "Requested Capacity",
   "Select Nodes": "Select Nodes",
   "Select at least 3 nodes preferably in 3 different zones. It is recommended to start with at least 14 CPUs and 34 GiB per node.": "Select at least 3 nodes preferably in 3 different zones. It is recommended to start with at least 14 CPUs and 34 GiB per node.",
-  "Search by node name...": "Search by node name...",
-  "Search by node label...": "Search by node label...",
+  "Selected Capacity": "Selected Capacity",
   "Available Raw Capacity": "Available Raw Capacity",
-  "The available capacity is based on all attached disks associated with the selectedStorageClass <2>\"{{storageClassName}}\"</2>": "The available capacity is based on all attached disks associated with the selectedStorageClass <2>\"{{storageClassName}}\"</2>",
+  "The available capacity is based on all attached disks associated with the selected StorageClass <3>\"{{storageClassName}}\"</3>": "The available capacity is based on all attached disks associated with the selected StorageClass <3>\"{{storageClassName}}\"</3>",
   "Selected Nodes": "Selected Nodes",
   "Role": "Role",
   "CPU": "CPU",
   "Memory": "Memory",
   "Zone": "Zone",
   "Selected nodes table": "Selected nodes table",
   "Connection details": "Connection details",
-  "LocalVolumeSet Name": "LocalVolumeSet Name",
-  "StorageClass Name": "StorageClass Name",
-  "Filter Disks By": "Filter Disks By",
   "Disks on all nodes": "Disks on all nodes",
   "{{nodes, number}} node": "{{nodes, number}} node",
   "{{nodes, number}} node_plural": "{{nodes, number}} nodes",
+  "Please enter a positive Integer": "Please enter a positive Integer",
+  "LocalVolumeSet Name": "LocalVolumeSet Name",
+  "A LocalVolumeSet allows you to filter a set of disks, group them and create a dedicated StorageClass to consume storage from them.": "A LocalVolumeSet allows you to filter a set of disks, group them and create a dedicated StorageClass to consume storage from them.",
+  "StorageClass Name": "StorageClass Name",
+  "Filter Disks By": "Filter Disks By",
+  "Uses the available disks that match the selected filters on all nodes.": "Uses the available disks that match the selected filters on all nodes.",
   "Disks on selected nodes": "Disks on selected nodes",
   "Uses the available disks that match the selected filters only on selected nodes.": "Uses the available disks that match the selected filters only on selected nodes.",
   "Disk Type": "Disk Type",
   "Volume Mode": "Volume Mode",
+  "Select disk types": "Select disk types",
   "Disk Size": "Disk Size",
   "Min": "Min",
+  "Please enter a value less than or equal to max disk size": "Please enter a value less than or equal to max disk size",
   "Max": "Max",
+  "Please enter a value greater than or equal to min disk size": "Please enter a value greater than or equal to min disk size",
   "Maximum Disks Limit": "Maximum Disks Limit",
   "Disks limit will set the maximum number of PVs to create on a node. If the field is empty we will create PVs for all available disks on the matching nodes.": "Disks limit will set the maximum number of PVs to create on a node. If the field is empty we will create PVs for all available disks on the matching nodes.",
   "All": "All",
-  "Uses the available disks that match the selected filters on all nodes selected in the previous step.": "Uses the available disks that match the selected filters on all nodes selected in the previous step.",
-  "A LocalVolumeSet allows you to filter a set of disks, group them and create a dedicated StorageClass to consume storage from them.": "A LocalVolumeSet allows you to filter a set of disks, group them and create a dedicated StorageClass to consume storage from them.",
   "Local Storage Operator not installed": "Local Storage Operator not installed",
-  "Before we can create a StorageCluster, the Local Storage operator needs to be installed. When installation is finished come back to OpenShift Container Storage to create a StorageCluster.<1><0>Install</0></1>": "Before we can create a StorageCluster, the Local Storage operator needs to be installed. When installation is finished come back to OpenShift Container Storage to create a StorageCluster.<1><0>Install</0></1>",
+  "Before we can create a StorageCluster, the Local Storage Operator needs to be installed. When installation is finished come back to OpenShift Container Storage to create a StorageCluster.<1><0>Install</0></1>": "Before we can create a StorageCluster, the Local Storage Operator needs to be installed. When installation is finished come back to OpenShift Container Storage to create a StorageCluster.<1><0>Install</0></1>",
+  "Checking Local Storage Operator installation": "Checking Local Storage Operator installation",
+  "Discovering disks on all hosts. This may take a few minutes.": "Discovering disks on all hosts. This may take a few minutes.",
   "Minimum Node Requirement": "Minimum Node Requirement",
   "A minimum of 3 nodes are required for the initial deployment. Only {{nodes}} node match to the selected filters. Please adjust the filters to include more nodes.": "A minimum of 3 nodes are required for the initial deployment. Only {{nodes}} node match to the selected filters. Please adjust the filters to include more nodes.",
   "After the LocalVolumeSet and StorageClass are created you won't be able to go back to this step.": "After the LocalVolumeSet and StorageClass are created you won't be able to go back to this step.",
@@ -208,7 +208,6 @@
   "Capacity": "Capacity",
   "Selected Disks": "Selected Disks",
   "Disk List": "Disk List",
-  "Selected Capacity": "Selected Capacity",
   "{{nodes, number}} Node": "{{nodes, number}} Node",
   "{{nodes, number}} Node_plural": "{{nodes, number}} Nodes",
   "{{disks, number}} Disk": "{{disks, number}} Disk",
@@ -259,6 +258,13 @@
   "An error has occurred": "An error has occurred",
   "Create StorageSystem": "Create StorageSystem",
   "StorageSystem is an entity of OpenShift Data Foundation. It represents all of the required storage and compute resources.": "StorageSystem is an entity of OpenShift Data Foundation. It represents all of the required storage and compute resources.",
+  "{{nodeCount, number}} node": "{{nodeCount, number}} node",
+  "{{nodeCount, number}} node_plural": "{{nodeCount, number}} nodes",
+  "selected ({{cpu}} CPU and {{memory}} on ": "selected ({{cpu}} CPU and {{memory}} on ",
+  "{{zoneCount, number}} zone": "{{zoneCount, number}} zone",
+  "{{zoneCount, number}} zone_plural": "{{zoneCount, number}} zones",
+  "Search by node name...": "Search by node name...",
+  "Search by node label...": "Search by node label...",
   "Not found": "Not found",
   "Compression eligibility": "Compression eligibility",
   "Compression eligibility indicates the percentage of incoming data that is compressible": "Compression eligibility indicates the percentage of incoming data that is compressible",
@@ -538,6 +544,7 @@
   "Object Bucket Details": "Object Bucket Details",
   "Object Bucket Claim": "Object Bucket Claim",
   "OBTableHeader": "OBTableHeader",
+  "Uses the available disks that match the selected filters on all nodes selected in the previous step.": "Uses the available disks that match the selected filters on all nodes selected in the previous step.",
   "OpenShift Container Storage's StorageCluster requires a minimum of 3 nodes for the initial deployment. Only {{nodes}} node match to the selected filters. Please adjust the filters to include more nodes.": "OpenShift Container Storage's StorageCluster requires a minimum of 3 nodes for the initial deployment. Only {{nodes}} node match to the selected filters. Please adjust the filters to include more nodes.",
   "Review StorageCluster": "Review StorageCluster",
   "Storage and nodes": "Storage and nodes",
@@ -553,6 +560,7 @@
   "Review and create": "Review and create",
   "Internal - Attached devices": "Internal - Attached devices",
   "Can be used on any platform where there are attached devices to the nodes, using the Local Storage Operator. The infrastructure StorageClass is provided by Local Storage Operator, on top of the attached drives.": "Can be used on any platform where there are attached devices to the nodes, using the Local Storage Operator. The infrastructure StorageClass is provided by Local Storage Operator, on top of the attached drives.",
+  "Before we can create a StorageCluster, the Local Storage operator needs to be installed. When installation is finished come back to OpenShift Container Storage to create a StorageCluster.<1><0>Install</0></1>": "Before we can create a StorageCluster, the Local Storage operator needs to be installed. When installation is finished come back to OpenShift Container Storage to create a StorageCluster.<1><0>Install</0></1>",
   "Node Table": "Node Table",
   "StorageCluster exists": "StorageCluster exists",
   "Back to operator page": "Back to operator page",

diff --git a/frontend/packages/ceph-storage-plugin/src/components/create-storage-system/create-steps.tsx b/frontend/packages/ceph-storage-plugin/src/components/create-storage-system/create-steps.tsx
@@ -31,6 +31,8 @@ export const createSteps = (
     storageClass,
     capacityAndNodes,
     securityAndNetwork,
+    nodes,
+    createLocalVolumeSet,
   } = state;
   const { externalStorage, deployment } = backingStorage;
 
@@ -42,6 +44,8 @@ export const createSteps = (
           dispatch={dispatch}
           state={capacityAndNodes}
           storageClass={storageClass}
+          volumeSetName={createLocalVolumeSet.volumeSetName}
+          nodes={nodes}
         />
       ),
     },
@@ -131,6 +135,8 @@ export const createSteps = (
               state={state.createLocalVolumeSet}
               dispatch={dispatch}
               storageClass={storageClass}
+              nodes={nodes}
+              stepIdReached={stepIdReached}
             />
           ),
         },

diff --git a/...-storage-system/create-storage-system-steps/backing-storage-step/backing-storage-step.tsx b/...-storage-system/create-storage-system-steps/backing-storage-step/backing-storage-step.tsx
@@ -8,7 +8,6 @@ import { AdvancedSection } from './advanced-section';
 import { SUPPORTED_EXTERNAL_STORAGE } from '../../external-storage';
 import { StorageSystemKind } from '../../../../types';
 import { getStorageSystemKind } from '../../../../utils/create-storage-system';
-import { filterSCWithoutNoProv } from '../../../../utils/install';
 import { WizardState, WizardDispatch } from '../../reducer';
 import {
   BackingStorageType,
@@ -78,7 +77,6 @@ const StorageClassSelection: React.FC<StorageClassSelectionProps> = ({ dispatch,
         noSelection
         onChange={onStorageClassSelect}
         selectedKey={selected.name}
-        filter={filterSCWithoutNoProv}
         data-test="storage-class-dropdown"
       />
     </div>
@@ -152,10 +150,15 @@ export const BackingStorage: React.FC<BackingStorageProps> = ({
 
   const onRadioSelect = (_, event) => {
     dispatch({ type: 'backingStorage/setType', payload: event.target.value });
-    dispatch({
-      type: 'wizard/setStepIdReached',
-      payload: 1,
-    });
+    if (stepIdReached !== 1) {
+      // Reset the wizard when a new flow is selected
+      // Avoid resetting when user has not visited any step other than this
+      dispatch({ type: 'wizard/setInitialState' });
+      dispatch({
+        type: 'wizard/setStepIdReached',
+        payload: 1,
+      });
+    }
   };
 
   return (