Merge pull request #7389 from cloudbehl/validations

Validation on storage & nodes install step
openshift · Dec 3, 2020 · f302424 · f302424
2 parents 56268f4 + 0bb0a4f
commit f302424
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/...s/ceph-storage-plugin/src/components/ocs-install/attached-devices/create-sc/create-sc.tsx b/...s/ceph-storage-plugin/src/components/ocs-install/attached-devices/create-sc/create-sc.tsx
@@ -217,6 +217,8 @@ const CreateSC: React.FC<CreateSCProps> = ({ match, hasNoProvSC, mode, lsoNs })
         if (!state.volumeSetName.trim().length) return true;
         if (state.filteredNodes.length < MINIMUM_NODES) return true;
         return !state.volumeSetName.trim().length;
+      case CreateStepsSC.STORAGEANDNODES:
+        return state.nodes.length < MINIMUM_NODES || !getName(state.storageClass);
       case CreateStepsSC.REVIEWANDCREATE:
         return (
           state.nodes.length < MINIMUM_NODES ||

diff --git a/.../packages/ceph-storage-plugin/src/components/ocs-install/internal-mode/install-wizard.tsx b/.../packages/ceph-storage-plugin/src/components/ocs-install/internal-mode/install-wizard.tsx
@@ -74,6 +74,7 @@ export const CreateInternalCluster: React.FC<CreateInternalClusterProps> = ({ ma
       name: 'Select capacity and nodes',
       id: CreateStepsSC.STORAGEANDNODES,
       component: <SelectCapacityAndNodes state={state} dispatch={dispatch} />,
+      enableNext: !!(state.nodes.length >= MINIMUM_NODES && scName),
     },
     {
       name: 'Configure',