Skip to content

Commit 8a6376f

Browse files
Merge pull request #2806 from openshift-cherrypick-robot/cherry-pick-2753-to-release-4.22
[release-4.22] DFBUGS-6344: StorageClass dropdown shows provisioner-based classes in TNF
2 parents b0b7747 + cda8b9a commit 8a6376f

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

packages/odf/components/create-storage-system/create-storage-system-steps/backing-storage-step/backing-storage-step.tsx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ const OCS_MULTIPLE_CLUSTER_NS = 'openshift-storage-extended';
4545
const StorageClassSelection: React.FC<StorageClassSelectionProps> = ({
4646
dispatch,
4747
selected,
48+
isTNFEnabled,
4849
}) => {
4950
const { t } = useCustomTranslation();
5051

@@ -64,13 +65,22 @@ const StorageClassSelection: React.FC<StorageClassSelectionProps> = ({
6465
[selected.name]
6566
);
6667

68+
const filterResource = React.useCallback(
69+
(sc: StorageClassResourceKind) => {
70+
if (!isTNFEnabled) return true;
71+
return sc.provisioner === NO_PROVISIONER;
72+
},
73+
[isTNFEnabled]
74+
);
75+
6776
return (
6877
<div className="odf-backing-storage__selection--width">
6978
<ResourceDropdown
7079
resource={scResource}
7180
resourceModel={StorageClassModel}
7281
onSelect={onStorageClassSelect}
7382
secondaryTextGenerator={getStorageClassDescription}
83+
filterResource={filterResource}
7484
initialSelection={getInitialSelection}
7585
data-test="storage-class-dropdown"
7686
>
@@ -95,6 +105,7 @@ const StorageClassSelection: React.FC<StorageClassSelectionProps> = ({
95105
type StorageClassSelectionProps = {
96106
dispatch: WizardDispatch;
97107
selected: WizardState['storageClass'];
108+
isTNFEnabled: boolean;
98109
};
99110

100111
export const BackingStorage: React.FC<BackingStorageProps> = ({
@@ -260,6 +271,7 @@ export const BackingStorage: React.FC<BackingStorageProps> = ({
260271
<StorageClassSelection
261272
dispatch={dispatch}
262273
selected={storageClass}
274+
isTNFEnabled={isTNFEnabled}
263275
/>
264276
)
265277
}

0 commit comments

Comments
 (0)