setting storage class when selectedKey is set in storageClassDropDown

Signed-off-by: Ankush Behl <cloudbehl@gmail.com>
openshift · Dec 2, 2020 · 0c7e707 · 0c7e707
1 parent 7dbefdf
commit 0c7e707
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/...omponents/ocs-install/attached-devices/create-sc/wizard-pages/create-local-volume-set.tsx b/...omponents/ocs-install/attached-devices/create-sc/wizard-pages/create-local-volume-set.tsx
@@ -29,9 +29,12 @@ const makeLocalVolumeSetCall = (
   const requestData = getLocalVolumeSetRequestData(state, ns);
   k8sCreate(LocalVolumeSetModel, requestData)
     .then(() => {
+      dispatch({
+        type: 'setStorageClassName',
+        name: state.storageClassName || state.volumeSetName,
+      });
       state.onNextClick();
       setInProgress(false);
-      dispatch({ type: 'setFinalStep', value: true });
     })
     .catch((err) => {
       setErrorMessage(err.message);

diff --git a/...components/ocs-install/attached-devices/create-sc/wizard-pages/storage-and-nodes-step.tsx b/...components/ocs-install/attached-devices/create-sc/wizard-pages/storage-and-nodes-step.tsx
@@ -60,7 +60,7 @@ export const StorageAndNodes: React.FC<StorageAndNodesProps> = ({ state, dispatc
 
   let scNodeNames: string[] = []; // names of the nodes, backing the storage of selected storage class
   const { cpu, memory, zones } = getNodeInfo(nodes);
-  const scName: string = getName(storageClass);
+  const scName: string = state.storageClassName;
   const validations: Validation[] = validate(scName, enableMinimal, nodes);
   const nodesCount: number = nodes.length;
 
@@ -76,6 +76,7 @@ export const StorageAndNodes: React.FC<StorageAndNodesProps> = ({ state, dispatc
 
   const handleStorageClass = (sc: StorageClassResourceKind) => {
     dispatch({ type: 'setStorageClass', value: sc });
+    dispatch({ type: 'setStorageClassName', name: getName(sc) });
   };
 
   const setNodes = (filteredData: NodeKind[]) =>
@@ -99,7 +100,7 @@ export const StorageAndNodes: React.FC<StorageAndNodesProps> = ({ state, dispatc
               id="storage-class-dropdown"
               onChange={handleStorageClass}
               filter={filterSCWithNoProv}
-              selectedKey={getName(storageClass) || state.storageClassName || state.volumeSetName}
+              selectedKey={state.storageClassName}
               noSelection
               hideClassName="ocs-install-wizard__storage-class-label"
             />

diff --git a/frontend/public/components/utils/storage-class-dropdown.tsx b/frontend/public/components/utils/storage-class-dropdown.tsx
@@ -98,9 +98,12 @@ export class StorageClassDropdownInner extends React.Component<
 
   componentDidUpdate() {
     const { defaultClass, selectedKey } = this.state;
-    if (!selectedKey && defaultClass) {
+    if (defaultClass) {
       this.onChange(defaultClass);
     }
+    if (selectedKey) {
+      this.onChange(selectedKey);
+    }
   }
 
   shouldComponentUpdate(nextProps, nextState) {