Show BC dropdown only for Noobaa Provisioners

openshift · May 14, 2020 · cc1527f · cc1527f
1 parent b688d05
commit cc1527f
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 27 deletions.
diff --git a/...end/packages/noobaa-storage-plugin/src/components/object-bucket-claim-page/create-obc.tsx b/...end/packages/noobaa-storage-plugin/src/components/object-bucket-claim-page/create-obc.tsx
@@ -26,7 +26,7 @@ import { ActionGroup, Button } from '@patternfly/react-core';
 import { StorageClass } from '@console/internal/components/storage-class-form';
 import { filterScOnProvisioner, getName, ResourceDropdown } from '@console/shared';
 import { commonReducer, defaultState } from '../object-bucket-page/state';
-import { OCS_NS } from '../../constants';
+import { OCS_NS, NB_PROVISIONER } from '../../constants';
 import './create-obc.scss';
 
 export const CreateOBCPage: React.FC<CreateOBCPageProps> = (props) => {
@@ -80,6 +80,11 @@ export const CreateOBCPage: React.FC<CreateOBCPageProps> = (props) => {
     [],
   );
 
+  const onScChange = (sc) => {
+    dispatch({ type: 'setStorage', name: getName(sc) });
+    dispatch({ type: 'setProvisioner', name: sc.provisioner });
+  };
+
   return (
     <div className="co-m-pane__body co-m-pane__form">
       <Helmet>
@@ -119,7 +124,7 @@ export const CreateOBCPage: React.FC<CreateOBCPageProps> = (props) => {
             </div>
             <div className="form-group">
               <StorageClassDropdown
-                onChange={(sc) => dispatch({ type: 'setStorage', name: getName(sc) })}
+                onChange={onScChange}
                 required
                 name="storageClass"
                 hideClassName="co-required"
@@ -130,31 +135,33 @@ export const CreateOBCPage: React.FC<CreateOBCPageProps> = (props) => {
                 Defines the object-store service and the bucket provisioner.
               </p>
             </div>
-            <div className="form-group">
-              <label className="control-label co-required" htmlFor="obc-name">
-                Bucket Class
-              </label>
-              <Firehose
-                resources={[
-                  {
-                    isList: true,
-                    kind: referenceForModel(NooBaaBucketClassModel),
-                    namespace: OCS_NS,
-                    prop: 'bucketClass',
-                  },
-                ]}
-              >
-                <ResourceDropdown
-                  onChange={(sc) => dispatch({ type: 'setBucketClass', name: sc })}
-                  dataSelector={['metadata', 'name']}
-                  selectedKey={state.bucketClass}
-                  placeholder="Select Bucket Class"
-                  dropDownClassName="dropdown--full-width"
-                  className="nb-create-obc__bc-dropdown"
-                  id="bc-dropdown"
-                />
-              </Firehose>
-            </div>
+            {state.scProvisioner.includes(NB_PROVISIONER) && (
+              <div className="form-group">
+                <label className="control-label co-required" htmlFor="obc-name">
+                  Bucket Class
+                </label>
+                <Firehose
+                  resources={[
+                    {
+                      isList: true,
+                      kind: referenceForModel(NooBaaBucketClassModel),
+                      namespace: OCS_NS,
+                      prop: 'bucketClass',
+                    },
+                  ]}
+                >
+                  <ResourceDropdown
+                    onChange={(sc) => dispatch({ type: 'setBucketClass', name: sc })}
+                    dataSelector={['metadata', 'name']}
+                    selectedKey={state.bucketClass}
+                    placeholder="Select Bucket Class"
+                    dropDownClassName="dropdown--full-width"
+                    className="nb-create-obc__bc-dropdown"
+                    id="bc-dropdown"
+                  />
+                </Firehose>
+              </div>
+            )}
           </div>
         </div>
         <ButtonBar errorMessage={state.error} inProgress={state.progress}>

diff --git a/frontend/packages/noobaa-storage-plugin/src/components/object-bucket-page/state.ts b/frontend/packages/noobaa-storage-plugin/src/components/object-bucket-page/state.ts
@@ -3,6 +3,7 @@ import { K8sResourceKind } from '@console/internal/module/k8s';
 type State = {
   name: string;
   scName: string;
+  scProvisioner: string;
   sizeValue: string;
   sizeUnit: string;
   progress: boolean;
@@ -14,6 +15,7 @@ type State = {
 export const defaultState = {
   name: '',
   scName: '',
+  scProvisioner: '',
   progress: false,
   error: '',
   payload: {},
@@ -25,6 +27,7 @@ export const defaultState = {
 type Action =
   | { type: 'setName'; name: string }
   | { type: 'setStorage'; name: string }
+  | { type: 'setProvisioner'; name: string }
   | { type: 'setProgress' }
   | { type: 'unsetProgress' }
   | { type: 'setError'; message: string }
@@ -38,6 +41,8 @@ export const commonReducer = (state: State, action: Action) => {
       return Object.assign({}, state, { name: action.name });
     case 'setStorage':
       return Object.assign({}, state, { scName: action.name });
+    case 'setProvisioner':
+      return Object.assign({}, state, { scProvisioner: action.name });
     case 'setProgress':
       return Object.assign({}, state, { progress: true });
     case 'unsetProgress':

diff --git a/frontend/packages/noobaa-storage-plugin/src/constants/index.ts b/frontend/packages/noobaa-storage-plugin/src/constants/index.ts
@@ -7,6 +7,7 @@ export const BY_EGRESS = 'Egress';
 export const PROJECTS = 'Projects';
 export const BUCKET_CLASS = 'Bucket Class';
 export const OCS_NS = 'openshift-storage';
+export const NB_PROVISIONER = 'noobaa.io/obc';
 
 export const CHART_LABELS = {
   [BY_LOGICAL_USAGE]: 'Logical used capacity per account',

diff --git a/frontend/packages/noobaa-storage-plugin/src/utils.ts b/frontend/packages/noobaa-storage-plugin/src/utils.ts
@@ -2,6 +2,7 @@ import * as _ from 'lodash';
 import { Alert } from '@console/internal/components/monitoring';
 import { PrometheusResponse } from '@console/internal/components/graphs';
 import { K8sResourceKind } from '@console/internal/module/k8s';
+import { StorageClass } from '@console/internal/components/storage-class-form';
 
 export const filterNooBaaAlerts = (alerts: Alert[]): Alert[] =>
   alerts.filter((alert) => _.get(alert, 'annotations.storage_type') === 'NooBaa');
@@ -21,3 +22,5 @@ export const getPhase = (obj: K8sResourceKind): string => {
 };
 
 export const isBound = (obj: K8sResourceKind): boolean => getPhase(obj) === 'Bound';
+
+export const getSCProvisioner = (obj: StorageClass) => obj.provisioner;