From 036639c5a5f86fa09904282a31920edc69836276 Mon Sep 17 00:00:00 2001 From: bipuladh Date: Thu, 23 Sep 2021 14:01:01 +0530 Subject: [PATCH] Fix creation for BackingStore, BucketClass and NamespaceStore --- .../src/components/bucket-class/create-bc.tsx | 18 +++++++++------ .../create-backingstore-page/create-bs.tsx | 22 +++++++++++++------ .../create-namespace-store.tsx | 20 +++++++++++------ 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/frontend/packages/ceph-storage-plugin/src/components/bucket-class/create-bc.tsx b/frontend/packages/ceph-storage-plugin/src/components/bucket-class/create-bc.tsx index cc1542348ef5..d9321225b267 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/bucket-class/create-bc.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/bucket-class/create-bc.tsx @@ -27,7 +27,7 @@ import { BucketClassType, NamespacePolicyType } from '../../constants/bucket-cla import { validateBucketClassName, validateDuration } from '../../utils/bucket-class'; import { NooBaaBucketClassModel } from '../../models'; import { PlacementPolicy } from '../../types'; -import { ODF_MODEL_FLAG } from '../../constants'; +import { ODF_MODEL_FLAG, CEPH_STORAGE_NAMESPACE } from '../../constants'; enum CreateStepsBC { GENERAL = 'GENERAL', @@ -39,7 +39,7 @@ enum CreateStepsBC { const CreateBucketClass: React.FC = ({ match }) => { const { t } = useTranslation(); const [state, dispatch] = React.useReducer(reducer, initialState); - const { ns, appName } = match.params; + const { ns = CEPH_STORAGE_NAMESPACE, appName } = match.params; const [clusterServiceVersion, setClusterServiceVersion] = React.useState(null); const isODF = useFlag(ODF_MODEL_FLAG); @@ -159,11 +159,15 @@ const CreateBucketClass: React.FC = ({ match }) => { promiseObj .then((obj) => { dispatch({ type: 'setIsLoading', value: false }); - history.push( - `/k8s/ns/${ns}/clusterserviceversions/${getName( - clusterServiceVersion, - )}/${referenceForModel(NooBaaBucketClassModel)}/${getName(obj)}`, - ); + !isODF + ? history.push( + `/k8s/ns/${ns}/clusterserviceversions/${getName( + clusterServiceVersion, + )}/${referenceForModel(NooBaaBucketClassModel)}/${getName(obj)}`, + ) + : history.push( + `/odf/resource/${referenceForModel(NooBaaBucketClassModel)}/${getName(obj)}`, + ); }) .catch((err) => { dispatch({ type: 'setIsLoading', value: false }); diff --git a/frontend/packages/ceph-storage-plugin/src/components/create-backingstore-page/create-bs.tsx b/frontend/packages/ceph-storage-plugin/src/components/create-backingstore-page/create-bs.tsx index 9eebc4848e9d..9cc82e927284 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/create-backingstore-page/create-bs.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/create-backingstore-page/create-bs.tsx @@ -10,7 +10,7 @@ import { } from '@console/internal/components/utils'; import { apiVersionForModel, k8sCreate, referenceForModel } from '@console/internal/module/k8s'; import { ModalComponentProps } from '@console/internal/components/factory'; -import { getName } from '@console/shared'; +import { getName, useFlag } from '@console/shared'; import { SecretModel } from '@console/internal/models'; import { history } from '@console/internal/components/utils/router'; import { CEPH_STORAGE_NAMESPACE } from '@console/ceph-storage-plugin/src/constants'; @@ -22,6 +22,7 @@ import { NOOBAA_TYPE_MAP, PROVIDERS_NOOBAA_MAP, BUCKET_LABEL_NOOBAA_MAP, + ODF_MODEL_FLAG, } from '../../constants'; import { getExternalProviders, getProviders, secretPayloadCreator } from '../../utils/noobaa-utils'; import { Payload } from '../../types'; @@ -43,6 +44,7 @@ const CreateBackingStoreForm: React.FC = withHandle providerDataReducer, initialState, ); + const isODF = useFlag(ODF_MODEL_FLAG); const handleBsNameTextInputChange = (strVal: string) => { if (strVal.length <= 43) { @@ -59,7 +61,7 @@ const CreateBackingStoreForm: React.FC = withHandle handlePromise, isPage, appName, - namespace, + namespace = CEPH_STORAGE_NAMESPACE, } = props; const onSubmit = (event) => { @@ -135,11 +137,17 @@ const CreateBackingStoreForm: React.FC = withHandle return handlePromise(Promise.all(promises), (resource) => { const lastIndex = resource.length - 1; if (isPage) - history.push( - `/k8s/ns/${namespace}/clusterserviceversions/${appName}/${referenceForModel( - NooBaaBackingStoreModel, - )}/${getName(resource[lastIndex])}`, - ); + !isODF + ? history.push( + `/k8s/ns/${namespace}/clusterserviceversions/${appName}/${referenceForModel( + NooBaaBackingStoreModel, + )}/${getName(resource[lastIndex])}`, + ) + : history.push( + `/odf/resource/${referenceForModel(NooBaaBackingStoreModel)}/${getName( + resource[lastIndex], + )}`, + ); else close(); }); }; diff --git a/frontend/packages/ceph-storage-plugin/src/components/namespace-store/create-namespace-store.tsx b/frontend/packages/ceph-storage-plugin/src/components/namespace-store/create-namespace-store.tsx index be6d2b0570ad..c51d68310e88 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/namespace-store/create-namespace-store.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/namespace-store/create-namespace-store.tsx @@ -11,11 +11,11 @@ import { useFlag } from '@console/shared/src/hooks/flag'; import NamespaceStoreForm from './namespace-store-form'; import '../noobaa-provider-endpoints/noobaa-provider-endpoints.scss'; import { NooBaaNamespaceStoreModel } from '../../models'; -import { ODF_MODEL_FLAG } from '../../constants'; +import { ODF_MODEL_FLAG, CEPH_STORAGE_NAMESPACE } from '../../constants'; const CreateNamespaceStore: React.FC = ({ match }) => { const { t } = useTranslation(); - const { ns, appName } = match.params; + const { ns = CEPH_STORAGE_NAMESPACE, appName } = match.params; const onCancel = () => history.goBack(); const isODF = useFlag(ODF_MODEL_FLAG); @@ -48,11 +48,17 @@ const CreateNamespaceStore: React.FC = ({ match }) => onCancel={onCancel} redirectHandler={(resources) => { const lastIndex = resources.length - 1; - history.push( - `/k8s/ns/${ns}/clusterserviceversions/${appName}/${referenceForModel( - NooBaaNamespaceStoreModel, - )}/${getName(resources[lastIndex])}`, - ); + !isODF + ? history.push( + `/k8s/ns/${ns}/clusterserviceversions/${appName}/${referenceForModel( + NooBaaNamespaceStoreModel, + )}/${getName(resources[lastIndex])}`, + ) + : history.push( + `/odf/resource/${referenceForModel(NooBaaNamespaceStoreModel)}/${getName( + resources[lastIndex], + )}`, + ); }} namespace={ns} className="nb-endpoints-page-form__short"