Merge pull request #11068 from bipuladh/fix-ibm-dev-badge

[release-4.9] Bug 2055100: Revert "Add Dev Preview tag for IBM FlashSystem"
openshift · Feb 23, 2022 · 8d748bd · 8d748bd
2 parents ec1dd11 + 49453dd
commit 8d748bd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/...storage-system/create-storage-system-steps/backing-storage-step/backing-storage-step.scss b/...storage-system/create-storage-system-steps/backing-storage-step/backing-storage-step.scss
@@ -1,10 +1,5 @@
-.odf-backing-storage__selection {
-    &--width {
-        width: 22rem;
-    }
-    &--spacer {
-        margin-right: var(--pf-global--spacer--md);
-    }
+.odf-backing-storage__selection--width {
+    width: 22rem;
 }
 
 .odf-backing-storage__deployment-type {

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
@@ -1,7 +1,7 @@
 import * as React from 'react';
 
 import { useTranslation } from 'react-i18next';
-import { useFlag, DevPreviewBadge } from '@console/shared/src';
+import { useFlag } from '@console/shared/src';
 import {
   Form,
   FormGroup,
@@ -19,7 +19,7 @@ import {
   ClusterServiceVersionModel,
 } from '@console/operator-lifecycle-manager/src';
 import { AdvancedSection } from './advanced-section';
-import { SUPPORTED_EXTERNAL_STORAGE, isStorageProviderDevPreview } from '../../external-storage';
+import { SUPPORTED_EXTERNAL_STORAGE } from '../../external-storage';
 import { StorageSystemKind } from '../../../../types';
 import {
   getODFCsv,
@@ -76,14 +76,13 @@ const ExternalSystemSelection: React.FC<ExternalSystemSelectionProps> = ({
         aria-label={t('ceph-storage-plugin~Select external system from list')}
         value={selectedStorage}
         id="storage-platform-name"
-        className="odf-backing-storage__selection--width  odf-backing-storage__selection--spacer"
+        className="odf-backing-storage__selection--width"
         onChange={handleSelection}
       >
         {selectOptions.map(({ displayName, model: { kind } }) => (
           <FormSelectOption key={kind} value={kind} label={displayName} />
         ))}
       </FormSelect>
-      {isStorageProviderDevPreview(selectedStorage) && <DevPreviewBadge />}
     </FormGroup>
   );
 };

diff --git a/...ckages/ceph-storage-plugin/src/components/create-storage-system/external-storage/index.ts b/...ckages/ceph-storage-plugin/src/components/create-storage-system/external-storage/index.ts
@@ -34,5 +34,3 @@ export const SUPPORTED_EXTERNAL_STORAGE: ExternalStorage[] = [
     canGoToNextStep: flashSystemCanGoToNextStep,
   },
 ];
-
-export const isStorageProviderDevPreview = (kind: string) => kind === IBMFlashSystemModel.kind;