Merge pull request #2133 from SanjalKatiyar/ss_create_fix

Fix StorageSystem Create page routing issue

Author: openshift-merge-bot[bot]

packages/odf/components/create-storage-system/create-storage-system.tsx

@@ -7,20 +7,12 @@ import {
 import { DEFAULT_INFRASTRUCTURE } from '@odf/shared/constants';
 import { useK8sGet } from '@odf/shared/hooks/k8s-get-hook';
 import { useK8sList } from '@odf/shared/hooks/useK8sList';
-import {
-  InfrastructureModel,
-  NamespaceModel,
-  ODFStorageSystem,
-} from '@odf/shared/models';
+import { InfrastructureModel, NamespaceModel } from '@odf/shared/models';
 import { InfrastructureKind } from '@odf/shared/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
-import {
-  getInfrastructurePlatform,
-  referenceForModel,
-} from '@odf/shared/utils';
+import { getInfrastructurePlatform } from '@odf/shared/utils';
 import { useResolvedExtensions } from '@openshift-console/dynamic-plugin-sdk';
 import { Wizard, WizardStep } from '@patternfly/react-core/deprecated';
-import { useNavigate, useLocation } from 'react-router-dom-v5-compat';
 import { Steps, StepsName } from '../../constants';
 import { hasAnyExternalOCS, hasAnyInternalOCS } from '../../utils';
 import { createSteps } from './create-steps';
@@ -31,21 +23,6 @@ import { CreateStorageSystemHeader } from './header';
 import { initialState, reducer, WizardReducer } from './reducer';
 import './create-storage-system.scss';
 
-const CREATE_SS_PAGE_URL = `/odf/resource/${referenceForModel(
-  ODFStorageSystem
-)}/create/~new`;
-
-export const RedirectStorageSystem: React.FC<{}> = () => {
-  const navigate = useNavigate();
-  const { pathname: url } = useLocation();
-
-  if (url !== CREATE_SS_PAGE_URL) {
-    navigate(CREATE_SS_PAGE_URL, { replace: true });
-  }
-
-  return null;
-};
-
 const CreateStorageSystem: React.FC<{}> = () => {
   const { t } = useCustomTranslation();
   const [state, dispatch] = React.useReducer<WizardReducer>(

packages/odf/components/system-list/odf-system-list.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { LSO_OPERATOR } from '@odf/core/constants';
+import { LSO_OPERATOR, CREATE_SS_PAGE_URL } from '@odf/core/constants';
 import { storageClusterResource } from '@odf/core/resources';
 import { isCapacityAutoScalingAllowed } from '@odf/core/utils';
 import {
@@ -16,18 +16,13 @@ import {
 import { useWatchStorageSystems } from '@odf/shared/hooks/useWatchStorageSystems';
 import { CustomKebabItem, Kebab } from '@odf/shared/kebab/kebab';
 import {
-  ClusterServiceVersionModel,
   InfrastructureModel,
   ODFStorageSystem,
   StorageClusterModel,
 } from '@odf/shared/models';
 import { getName, getNamespace } from '@odf/shared/selectors';
 import { Status } from '@odf/shared/status/Status';
-import {
-  ClusterServiceVersionKind,
-  HumanizeResult,
-  StorageSystemKind,
-} from '@odf/shared/types';
+import { HumanizeResult, StorageSystemKind } from '@odf/shared/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import {
   humanizeBinaryBytes,
@@ -378,18 +373,7 @@ const StorageSystemRow: React.FC<RowProps<StorageSystemKind, CustomData>> = ({
   );
 };
 
-type StorageSystemListPageProps = {
-  showTitle?: boolean;
-  namespace?: string;
-  selector?: any;
-  hideLabelFilter?: boolean;
-  hideNameLabelFilters?: boolean;
-  hideColumnManagement?: boolean;
-};
-
-export const StorageSystemListPage: React.FC<StorageSystemListPageProps> = ({
-  selector,
-}) => {
+export const StorageSystemListPage: React.FC = () => {
   const { t } = useCustomTranslation();
 
   const { odfNamespace, isODFNsLoaded, odfNsLoadError } =
@@ -432,21 +416,6 @@ export const StorageSystemListPage: React.FC<StorageSystemListPageProps> = ({
   const [storageClusters] = useK8sWatchResource<StorageClusterKind[]>(
     storageClusterResource
   );
-  const [csv, csvLoaded, csvError] = useK8sWatchResource<
-    ClusterServiceVersionKind[]
-  >({
-    kind: referenceForModel(ClusterServiceVersionModel),
-    isList: true,
-    selector,
-  });
-
-  const odfCsvName: string =
-    csvLoaded && !csvError
-      ? csv?.find((item) => getName(item)?.includes('odf-operator'))?.metadata
-          ?.name
-      : null;
-
-  const createLink = `/k8s/ns/${odfNamespace}/operators.coreos.com~v1alpha1~ClusterServiceVersion/${odfCsvName}/odf.openshift.io~v1alpha1~StorageSystem/~new`;
 
   const normalizedMetrics = React.useMemo(
     () => ({
@@ -471,8 +440,8 @@ export const StorageSystemListPage: React.FC<StorageSystemListPageProps> = ({
   return (
     <>
       <ListPageHeader title={t('StorageSystems')}>
-        {odfCsvName && odfNamespace && (
-          <ListPageCreateLink to={createLink}>
+        {odfNamespace && (
+          <ListPageCreateLink to={CREATE_SS_PAGE_URL}>
             {t('Create StorageSystem')}
           </ListPageCreateLink>
         )}

packages/odf/components/topology/Topology.tsx

@@ -7,11 +7,7 @@ import {
 import { getStorageClusterInNs } from '@odf/core/utils';
 import HandleErrorAndLoading from '@odf/shared/error-handler/ErrorStateHandler';
 import { useDeepCompareMemoize } from '@odf/shared/hooks/deep-compare-memoize';
-import {
-  ClusterServiceVersionModel,
-  DeploymentModel,
-  NodeModel,
-} from '@odf/shared/models';
+import { DeploymentModel, NodeModel } from '@odf/shared/models';
 import { getName, getUID } from '@odf/shared/selectors';
 import { BlueInfoCircleIcon } from '@odf/shared/status';
 import {
@@ -23,14 +19,12 @@ import {
   TopologyViewLevel,
 } from '@odf/shared/topology';
 import {
-  ClusterServiceVersionKind,
   DeploymentKind,
   NodeKind,
   PodKind,
   StorageClusterKind,
 } from '@odf/shared/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
-import { referenceForModel } from '@odf/shared/utils';
 import {
   K8sResourceCommon,
   useK8sWatchResource,
@@ -60,7 +54,7 @@ import {
   defaultControlButtonsOptions,
   createTopologyControlButtons,
 } from '@patternfly/react-topology';
-import { cephStorageLabel } from '../../constants';
+import { cephStorageLabel, CREATE_SS_PAGE_URL } from '../../constants';
 import {
   nodeResource,
   odfDaemonSetResource,
@@ -652,23 +646,7 @@ const TopologyViewErrorMessage: React.FC<TopologyViewErrorMessageProps> = ({
 }) => {
   const { t } = useCustomTranslation();
 
-  const { odfNamespace, isNsSafe } = useODFNamespaceSelector();
-
-  const [csv, csvLoaded, csvError] = useSafeK8sWatchResource<
-    ClusterServiceVersionKind[]
-  >((ns: string) => ({
-    kind: referenceForModel(ClusterServiceVersionModel),
-    isList: true,
-    namespace: ns,
-  }));
-
-  const odfCsvName: string =
-    csvLoaded && !csvError
-      ? csv?.find((item) => item?.metadata?.name?.includes('odf-operator'))
-          ?.metadata?.name
-      : null;
-
-  const createLink = `/k8s/ns/${odfNamespace}/operators.coreos.com~v1alpha1~ClusterServiceVersion/${odfCsvName}/odf.openshift.io~v1alpha1~StorageSystem/~new`;
+  const { isNsSafe } = useODFNamespaceSelector();
 
   // If external mode cluster exists, we do not allow internal mode cluster creation (in case of multiple StorageSystem support)
   const hideCreateSSOption = (isExternalMode && !isInternalMode) || !isNsSafe;
@@ -685,7 +663,7 @@ const TopologyViewErrorMessage: React.FC<TopologyViewErrorMessageProps> = ({
           t('Set up a storage cluster to view the topology')}
       </EmptyStateBody>
       {!hideCreateSSOption && (
-        <Link to={createLink}>{t('Create StorageSystem')} </Link>
+        <Link to={CREATE_SS_PAGE_URL}>{t('Create StorageSystem')} </Link>
       )}
     </EmptyState>
   );

packages/odf/constants/common.ts

@@ -3,7 +3,9 @@ import {
   ResourceProfileRequirementsMap,
 } from '@odf/core/types';
 import { DEFAULT_STORAGE_NAMESPACE } from '@odf/shared/constants';
+import { ODFStorageSystem } from '@odf/shared/models';
 import { Toleration, Taint } from '@odf/shared/types';
+import { referenceForModel } from '@odf/shared/utils';
 import { TFunction } from 'react-i18next';
 
 export const CEPH_BRAND_NAME = 'Red Hat Ceph Storage';
@@ -109,3 +111,7 @@ export enum TimeUnits {
   HOUR = 'Hour',
   MIN = 'Min',
 }
+
+export const CREATE_SS_PAGE_URL = `/odf/resource/${referenceForModel(
+  ODFStorageSystem
+)}/create/~new`;

plugins/odf/console-extensions.json

@@ -108,17 +108,6 @@
       "required": ["ODF_MODEL"]
     }
   },
-  {
-    "type": "console.resource/create",
-    "properties": {
-      "model": {
-        "group": "odf.openshift.io",
-        "version": "v1alpha1",
-        "kind": "StorageSystem"
-      },
-      "component": { "$codeRef": "wizard.RedirectStorageSystem" }
-    }
-  },
   {
     "type": "console.page/route",
     "properties": {