Merge pull request #1049 from SanjalKatiyar/add_cap_sc_dropdown

fix StorageClass filtering for add capacity modal
red-hat-storage · Sep 20, 2023 · 4f5269c · 4f5269c
2 parents 94b95d9 + 179bccf
commit 4f5269c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/odf/modals/add-capacity/add-capacity-modal.tsx b/packages/odf/modals/add-capacity/add-capacity-modal.tsx
@@ -78,7 +78,7 @@ type StorageClassDropdownProps = {
   onChange: any;
   'data-test': string;
   initialSelection: (args) => any;
-  filter: (resource: StorageClassResourceKind) => boolean;
+  filter: (resource: StorageClassResourceKind) => StorageClassResourceKind;
 };
 
 const StorageClassDropdown: React.FC<StorageClassDropdownProps> = ({
@@ -275,10 +275,10 @@ export const AddCapacityModal: React.FC<AddCapacityModalProps> = ({
           (item) => getName(item) === installStorageClass
         );
         if (initialSC?.provisioner === NO_PROVISIONER) {
-          return sc.provisioner === NO_PROVISIONER;
+          return sc.provisioner === NO_PROVISIONER ? sc : undefined;
         }
       }
-      return true;
+      return sc;
     },
     [installStorageClass, scResources, scResourcesLoadError, scResourcesLoaded]
   );

diff --git a/packages/odf/utils/ocs.ts b/packages/odf/utils/ocs.ts
@@ -195,6 +195,7 @@ export const getDeviceSetCount = (pvCount: number, replica: number): number =>
   Math.floor(pvCount / replica) || 1;
 
 export const filterSC = (sc: StorageClassResourceKind) =>
+  !!sc &&
   !OCS_PROVISIONERS.some((ocsProvisioner: string) =>
     sc?.provisioner?.includes(ocsProvisioner)
   );