@openshift-assisted/ui-lib 2.11.2-cim → 2.12.0-cim

package/build/cjs/ocm/components/clusters/ClustersListToolbar.js

@@ -2,14 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importDefault(require("react"));
-const react_router_dom_1 = require("react-router-dom");
+const react_router_dom_v5_compat_1 = require("react-router-dom-v5-compat");
 const react_core_1 = require("@patternfly/react-core");
 const filter_icon_1 = require("@patternfly/react-icons/dist/js/icons/filter-icon");
 const sync_icon_1 = require("@patternfly/react-icons/dist/js/icons/sync-icon");
 const common_1 = require("../../../common");
 const common_2 = require("../../../common");
 const slice_1 = require("../../store/slices/clusters/slice");
-const config_1 = require("../../config");
 const omit_js_1 = tslib_1.__importDefault(require("lodash-es/omit.js"));
 const use_translation_wrapper_1 = require("../../../common/hooks/use-translation-wrapper");
 const store_1 = require("../../store");
@@ -17,7 +16,7 @@ const selectors_1 = require("../../store/slices/clusters/selectors");
 const clusterStatusFilterLabels = (t) => Array.from(new Set(Object.values((0, omit_js_1.default)((0, common_1.clusterStatusLabels)(t), 'adding-hosts'))));
 const ClustersListToolbar = ({ searchString, setSearchString, filters, setFilters, }) => {
     const [isStatusExpanded, setStatusExpanded] = react_1.default.useState(false);
-    const history = (0, react_router_dom_1.useHistory)();
+    const navigate = (0, react_router_dom_v5_compat_1.useNavigate)();
     const clustersUIState = (0, store_1.useSelectorDay1)(selectors_1.selectClustersUIState);
     const dispatch = (0, store_1.useDispatchDay1)();
     const fetchClusters = react_1.default.useCallback(() => void dispatch((0, slice_1.fetchClustersAsync)()), [dispatch]);
@@ -59,7 +58,7 @@ const ClustersListToolbar = ({ searchString, setSearchString, filters, setFilter
                     react_1.default.createElement(react_core_1.TextInput, { name: "search-string", id: "search-string", type: "search", "aria-label": "string to be searched in cluster names or ids", onChange: onSearchNameChanged, value: searchString, placeholder: "Filter by Name, ID or Base domain", title: "Filter by Name, ID or Base domain" }))),
             react_1.default.createElement(react_core_1.ToolbarFilter, { chips: filters.status, deleteChip: onDeleteChip, deleteChipGroup: onDeleteChipGroup, categoryName: "status" },
                 react_1.default.createElement(react_core_1.Select, { variant: "checkbox", "aria-label": "status", onToggle: onStatusToggle, onSelect: onStatusSelect, selections: filters.status, isOpen: isStatusExpanded, placeholderText: statusPlaceholder, toggleId: "cluster-list-filter-status" }, clusterStatusFilterLabels(t).map((label) => (react_1.default.createElement(react_core_1.SelectOption, { key: label, value: label, inputId: `cluster-list-filter-status-${label}` }))))),
-            react_1.default.createElement(common_1.ToolbarButton, { variant: react_core_1.ButtonVariant.primary, onClick: () => history.push(`${config_1.routeBasePath}/clusters/~new`), id: "button-create-new-cluster", "data-ouia-id": "button-create-new-cluster" }, "Create Cluster"),
+            react_1.default.createElement(common_1.ToolbarButton, { variant: react_core_1.ButtonVariant.primary, onClick: () => navigate(`~new`), id: "button-create-new-cluster", "data-ouia-id": "button-create-new-cluster" }, "Create Cluster"),
             clustersUIState === common_2.ResourceUIState.RELOADING && react_1.default.createElement(react_core_1.Spinner, { size: "lg" }),
             react_1.default.createElement(react_core_1.ToolbarGroup, { alignment: { lg: 'alignRight' } },
                 react_1.default.createElement(common_1.ToolbarButton, { variant: react_core_1.ButtonVariant.plain, onClick: () => fetchClusters(), isDisabled: clustersUIState === common_2.ResourceUIState.RELOADING },

package/build/cjs/ocm/components/clusters/ClustersListToolbar.js.map

@@ -1 +1 @@
-{"version":3,"file":"ClustersListToolbar.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusters/ClustersListToolbar.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ClustersListToolbar.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusters/ClustersListToolbar.tsx"],"names":[],"mappings":"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"}

package/build/cjs/ocm/components/clusters/NewClusterPage.js

@@ -14,7 +14,7 @@ const ClusterLoading_1 = tslib_1.__importDefault(require("./ClusterLoading"));
 const ClusterPageErrors_1 = require("./ClusterPageErrors");
 const featureSupportLevels_1 = require("../featureSupportLevels");
 const AssistedInstallerHeader_1 = require("./AssistedInstallerHeader");
-const NewClusterPageGeneric = ({ pageTitleSection, }) => {
+const NewClusterPageGeneric = ({ pageTitleSection }) => {
     return (react_1.default.createElement(common_1.AlertsContextProvider, null,
         react_1.default.createElement(SentryErrorMonitorContextProvider_1.SentryErrorMonitorContextProvider, null,
             react_1.default.createElement(ClusterDefaultConfigurationContext_1.ClusterDefaultConfigurationProvider, { loadingUI: react_1.default.createElement(ClusterLoading_1.default, null), errorUI: react_1.default.createElement(ClusterPageErrors_1.ClusterUiError, null) },

package/build/cjs/ocm/components/clusters/NewClusterPage.js.map

@@ -1 +1 @@
-{"version":3,"file":"NewClusterPage.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusters/NewClusterPage.tsx"],"names":[],"mappings":";;;;AAAA,0DAAyC;AACzC,uDAA0E;AAC1E,4CAAwD;AACxD,sFAAsD;AACtD,mHAAiH;AACjH,iGAAiE;AACjE,yHAAyF;AACzF,4FAAyF;AACzF,8EAA8C;AAC9C,2DAAqD;AACrD,kEAAyE;AACzE,uEAAoE;AAEpE,MAAM,qBAAqB,GAA+C,CAAC,EACzE,gBAAgB,GACjB,EAAE,EAAE;IACH,OAAO,CACL,8BAAC,8BAAqB;QACpB,8BAAC,qEAAiC;YAChC,8BAAC,wEAAmC,IAClC,SAAS,EAAE,8BAAC,wBAAc,OAAG,EAC7B,OAAO,EAAE,8BAAC,kCAAc,OAAG;gBAE3B,8BAAC,qDAA8B,IAAC,SAAS,EAAE,8BAAC,wBAAc,OAAG;oBAC1D,gBAAgB;oBACjB,8BAAC,wBAAW,IAAC,OAAO,EAAE,gCAAmB,CAAC,KAAK,EAAE,QAAQ;wBACvD,8BAAC,sCAA4B;4BAC3B,8BAAC,0BAAgB,OAAG,CACS,CACnB,CACiB,CACG,CACJ,CACd,CACzB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAa,GAAG,EAAE,CAAC,CAC7C;IACE,8BAAC,4BAAkB,IAAC,WAAW,EAAC,aAAa,GAAG;IAChD,8BAAC,wBAAW,IAAC,OAAO,EAAE,gCAAmB,CAAC,KAAK;QAC7C,8BAAC,iDAAuB,OAAG,CACf,CACb,CACJ,CAAC;AAEK,MAAM,oBAAoB,GAAa,GAAG,EAAE,CAAC,8BAAC,qBAAqB,OAAG,CAAC;AAAjE,QAAA,oBAAoB,wBAA6C;AACvE,MAAM,cAAc,GAAa,GAAG,EAAE,CAAC,CAC5C,8BAAC,qBAAqB,IAAC,gBAAgB,EAAE,8BAAC,sBAAsB,OAAG,GAAI,CACxE,CAAC;AAFW,QAAA,cAAc,kBAEzB"}
+{"version":3,"file":"NewClusterPage.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusters/NewClusterPage.tsx"],"names":[],"mappings":";;;;AAAA,0DAAyC;AACzC,uDAA0E;AAC1E,4CAAwD;AACxD,sFAAsD;AACtD,mHAAiH;AACjH,iGAAiE;AACjE,yHAAyF;AACzF,4FAAyF;AACzF,8EAA8C;AAC9C,2DAAqD;AACrD,kEAAyE;AACzE,uEAAoE;AAEpE,MAAM,qBAAqB,GAAG,CAAC,EAAE,gBAAgB,EAAoC,EAAE,EAAE;IACvF,OAAO,CACL,8BAAC,8BAAqB;QACpB,8BAAC,qEAAiC;YAChC,8BAAC,wEAAmC,IAClC,SAAS,EAAE,8BAAC,wBAAc,OAAG,EAC7B,OAAO,EAAE,8BAAC,kCAAc,OAAG;gBAE3B,8BAAC,qDAA8B,IAAC,SAAS,EAAE,8BAAC,wBAAc,OAAG;oBAC1D,gBAAgB;oBACjB,8BAAC,wBAAW,IAAC,OAAO,EAAE,gCAAmB,CAAC,KAAK,EAAE,QAAQ;wBACvD,8BAAC,sCAA4B;4BAC3B,8BAAC,0BAAgB,OAAG,CACS,CACnB,CACiB,CACG,CACJ,CACd,CACzB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,GAAG,EAAE,CAAC,CACnC;IACE,8BAAC,4BAAkB,IAAC,WAAW,EAAC,aAAa,GAAG;IAChD,8BAAC,wBAAW,IAAC,OAAO,EAAE,gCAAmB,CAAC,KAAK;QAC7C,8BAAC,iDAAuB,OAAG,CACf,CACb,CACJ,CAAC;AAEK,MAAM,oBAAoB,GAAG,GAAG,EAAE,CAAC,8BAAC,qBAAqB,OAAG,CAAC;AAAvD,QAAA,oBAAoB,wBAAmC;AAC7D,MAAM,cAAc,GAAG,GAAG,EAAE,CAAC,CAClC,8BAAC,qBAAqB,IAAC,gBAAgB,EAAE,8BAAC,sBAAsB,OAAG,GAAI,CACxE,CAAC;AAFW,QAAA,cAAc,kBAEzB"}

package/build/cjs/ocm/components/ui/Buttons/BackButton.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BackButton = void 0;
 const tslib_1 = require("tslib");
-const react_router_dom_1 = require("react-router-dom");
+const react_router_dom_v5_compat_1 = require("react-router-dom-v5-compat");
 const react_core_1 = require("@patternfly/react-core");
 const react_1 = tslib_1.__importDefault(require("react"));
-const BackButton = ({ to, variant = 'secondary' }) => (react_1.default.createElement(react_core_1.Button, { variant: variant, component: (props) => react_1.default.createElement(react_router_dom_1.Link, Object.assign({ to: to }, props)) }, "Back"));
+const BackButton = ({ to, variant = 'secondary' }) => (react_1.default.createElement(react_core_1.Button, { variant: variant, component: (props) => react_1.default.createElement(react_router_dom_v5_compat_1.Link, Object.assign({ to: to }, props)) }, "Back"));
 exports.BackButton = BackButton;
 //# sourceMappingURL=BackButton.js.map

package/build/cjs/ocm/components/ui/Buttons/BackButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"BackButton.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/ui/Buttons/BackButton.tsx"],"names":[],"mappings":";;;;AAAA,uDAAwC;AAIxC,uDAAgD;AAChD,0DAA0B;AAMnB,MAAM,UAAU,GAAG,CAAC,EAAE,EAAE,EAAE,OAAO,GAAG,WAAW,EAAmB,EAAE,EAAE,CAAC,CAC5E,8BAAC,mBAAM,IAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,8BAAC,uBAAI,kBAAC,EAAE,EAAE,EAAE,IAAM,KAAK,EAAI,WAElE,CACV,CAAC;AAJW,QAAA,UAAU,cAIrB"}
+{"version":3,"file":"BackButton.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/ui/Buttons/BackButton.tsx"],"names":[],"mappings":";;;;AAAA,2EAA6D;AAE7D,uDAAgD;AAChD,0DAA0B;AAMnB,MAAM,UAAU,GAAG,CAAC,EAAE,EAAE,EAAE,OAAO,GAAG,WAAW,EAAmB,EAAE,EAAE,CAAC,CAC5E,8BAAC,mBAAM,IAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,8BAAC,iCAAI,kBAAC,EAAE,EAAE,EAAE,IAAM,KAAK,EAAI,WAElE,CACV,CAAC;AAJW,QAAA,UAAU,cAIrB"}

package/build/cjs/ocm/store/slices/clusters/selectors.js

@@ -4,10 +4,9 @@ exports.selectClusterNames = exports.selectClusterTableRows = exports.getCluster
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importDefault(require("react"));
 const toolkit_1 = require("@reduxjs/toolkit");
-const react_router_dom_1 = require("react-router-dom");
+const react_router_dom_v5_compat_1 = require("react-router-dom-v5-compat");
 const common_1 = require("../../../../common");
 const ClusterStatus_1 = tslib_1.__importStar(require("../../../components/clusters/ClusterStatus"));
-const config_1 = require("../../../config");
 const selectClusters = (state) => state.clusters.data;
 const clustersUIState = (state) => state.clusters.uiState;
 exports.selectClustersUIState = (0, toolkit_1.createSelector)([selectClusters, clustersUIState], (clusters, uiState) => {
@@ -30,7 +29,7 @@ const clusterToClusterTableRow = (cluster, t) => {
     return {
         cells: [
             {
-                title: (react_1.default.createElement(react_router_dom_1.Link, { key: name, to: `${config_1.routeBasePath}/clusters/${id}`, id: `cluster-link-${id}` }, name)),
+                title: (react_1.default.createElement(react_router_dom_v5_compat_1.Link, { key: name, to: id, id: `cluster-link-${id}` }, name)),
                 props: { 'data-testid': `cluster-name-${name}` },
                 sortableValue: name,
             },

package/build/cjs/ocm/store/slices/clusters/selectors.js.map

@@ -1 +1 @@
-{"version":3,"file":"selectors.js","sourceRoot":"","sources":["../../../../../../lib/ocm/store/slices/clusters/selectors.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"selectors.js","sourceRoot":"","sources":["../../../../../../lib/ocm/store/slices/clusters/selectors.tsx"],"names":[],"mappings":"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"}

package/lib/cim/components/Agent/NoAgentsAlert.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Alert, AlertVariant, List, ListComponent, ListItem } from '@patternfly/react-core';
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router-dom-v5-compat';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { Trans } from 'react-i18next';
 import { CpuArchitecture } from '../../../common';

package/lib/cim/components/Agent/tableUtils.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { sortable, expandable, breakWord } from '@patternfly/react-table';
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router-dom-v5-compat';
 
 import {
   HostsTableActions,

package/lib/cim/components/Hypershift/DetailsPage/NodePoolsTable.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router-dom-v5-compat';
 import { Button, Label, Popover, Stack, StackItem } from '@patternfly/react-core';
 import { PlusCircleIcon } from '@patternfly/react-icons/dist/js/icons/plus-circle-icon';
 import {

package/lib/cim/components/InfraEnv/AddHostDropdown.tsx

@@ -16,7 +16,7 @@ import { AddHostDropdownProps } from './types';
 import './AddHostDropdown.css';
 import { PopoverIcon } from '../../../common';
 import { Trans } from 'react-i18next';
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router-dom-v5-compat';
 
 type ModalType = 'iso' | 'bmc' | 'yaml' | 'ipxe' | undefined;
 

package/lib/cim/components/helpers/network.ts

@@ -3,7 +3,7 @@ import { AgentClusterInstallK8sResource } from '../../types/k8s/agent-cluster-in
 
 type ConnectivityMajorityGroups = {
   l3_connected_addresses: object;
-  majority_groups: { [key: string]: string[] };
+  majority_groups?: { [key: string]: string[] };
 };
 
 export const getHostNetworks = (
@@ -18,12 +18,14 @@ export const getHostNetworks = (
     agentClusterInstall.status.connectivityMajorityGroups,
   ) as ConnectivityMajorityGroups;
 
-  return Object.keys(connectivityMajorityGroups.majority_groups)
+  const majorityGroups = connectivityMajorityGroups.majority_groups || {};
+
+  return Object.keys(majorityGroups)
     .filter((k) => !['IPv4', 'IPv6'].includes(k))
     .map((cidr) => {
       const hostIds: string[] = [];
 
-      connectivityMajorityGroups.majority_groups[cidr].forEach((hostName: string) => {
+      majorityGroups[cidr].forEach((hostName: string) => {
         const agent: AgentK8sResource | undefined = agents.find(
           (agent) => agent.metadata?.name === hostName,
         );

package/lib/cim/components/modals/CimConfiguration/CimConfigProgressAlert.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { useHistory } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom-v5-compat';
 import {
   Alert,
   AlertVariant,
@@ -26,7 +26,7 @@ export const CimConfigProgressAlert: React.FC<CimConfigProgressAlertProps> = ({
   assistedServiceDeploymentUrl,
 }) => {
   const { t } = useTranslation();
-  const history = useHistory();
+  const navigate = useNavigate();
   const [hideSuccess, setHideSuccess] = React.useState(true);
 
   React.useEffect(
@@ -68,7 +68,7 @@ export const CimConfigProgressAlert: React.FC<CimConfigProgressAlertProps> = ({
       variant={ButtonVariant.link}
       isInline
       key="assisted-service-deployment"
-      onClick={() => history.push(assistedServiceDeploymentUrl)}
+      onClick={() => navigate(assistedServiceDeploymentUrl)}
     >
       {t('ai:Troubleshoot in the assisted service deployment')} <ExternalLinkAltIcon />
     </Button>

package/lib/cim/components/modals/CimConfiguration/CimStorageMissingAlert.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { useHistory } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom-v5-compat';
 import { Alert, AlertActionLink, AlertVariant } from '@patternfly/react-core';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons/dist/js/icons/external-link-alt-icon';
 
@@ -10,7 +10,7 @@ export const CimStorageMissingAlert: React.FC<{
   storageOperatorUrl: string;
 }> = ({ docStorageUrl, storageOperatorUrl }) => {
   const { t } = useTranslation();
-  const history = useHistory();
+  const navigate = useNavigate();
 
   const contentWorkaround = (
     <>
@@ -20,10 +20,7 @@ export const CimStorageMissingAlert: React.FC<{
   );
 
   const actionLinks: React.ReactNode[] = [
-    <AlertActionLink
-      key="install-storage-operator"
-      onClick={() => history.push(storageOperatorUrl)}
-    >
+    <AlertActionLink key="install-storage-operator" onClick={() => navigate(storageOperatorUrl)}>
       {t('ai:Install storage operator')}
     </AlertActionLink>,
     <AlertActionLink key="storage-class" onClick={() => window.open(docStorageUrl, '_blank')}>

package/lib/cim/components/modals/MassDeleteAgentModal.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Button, Flex, FlexItem, Popover } from '@patternfly/react-core';
 import { InfoCircleIcon } from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router-dom-v5-compat';
 import { sortable } from '@patternfly/react-table';
 import { global_palette_blue_300 as blueInfoColor } from '@patternfly/react-tokens/dist/js/global_palette_blue_300';
 import {

package/lib/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabMock.tsx

@@ -1,5 +1,4 @@
 import React from 'react';
-import { RouteComponentProps } from 'react-router-dom';
 import {
   ButtonVariant,
   EmptyState,
@@ -9,7 +8,6 @@ import {
   PageSectionVariants,
   Title,
 } from '@patternfly/react-core';
-import { HostsClusterDetailTabProps } from './types';
 import {
   OcmCpuArchitecture,
   STANDALONE_DEPLOYMENT_ENABLED_FEATURES,
@@ -43,9 +41,7 @@ const getCluster = (type: string) => {
   }
 };
 
-export const HostsClusterDetailTabMock: React.FC<
-  RouteComponentProps & HostsClusterDetailTabProps
-> = () => {
+export const HostsClusterDetailTabMock = () => {
   const [tabShown, setTabShown] = React.useState<string>('');
   const [isMocked, setIsMocked] = React.useState<boolean>(false);
 

package/lib/ocm/components/Routes.tsx

@@ -1,29 +1,33 @@
 import React from 'react';
 import { Provider } from 'react-redux';
-import { Switch, Route, Redirect } from 'react-router-dom';
+import { Routes, Route, Navigate, Outlet } from 'react-router-dom-v5-compat';
 import { Clusters, ClusterPage, NewClusterPage } from './clusters';
 import type { FeatureListType } from '../../common/features/featureGate';
-import { routeBasePath } from '../config';
 import { AssistedUILibVersion } from './ui';
 import { storeDay1 } from '../store';
 import { useFeatureDetection } from '../hooks/use-feature-detection';
 
-export const Routes: React.FC<{ allEnabledFeatures: FeatureListType }> = ({
+export const UILibRoutes = ({
   allEnabledFeatures,
   children,
+}: {
+  allEnabledFeatures: FeatureListType;
+  children: React.ReactNode;
 }) => {
   useFeatureDetection(allEnabledFeatures);
 
   return (
     <Provider store={storeDay1}>
       <AssistedUILibVersion />
-      <Switch>
-        <Route path={`${routeBasePath}/clusters/~new`} component={NewClusterPage} />
-        <Route path={`${routeBasePath}/clusters/:clusterId`} component={ClusterPage} />
-        <Route path={`${routeBasePath}/clusters`} component={Clusters} />
+      <Routes>
+        <Route path="clusters" element={<Outlet />}>
+          <Route path="~new" element={<NewClusterPage />} />
+          <Route path=":clusterId" element={<ClusterPage />} />
+          <Route index element={<Clusters />} />
+        </Route>
         {children}
-        <Redirect to={`${routeBasePath}/clusters`} />
-      </Switch>
+        <Route path="*" element={<Navigate to="clusters" />} />
+      </Routes>
     </Provider>
   );
 };

package/lib/ocm/components/clusterDetail/AssistedInstallerDetailCard.tsx

@@ -2,7 +2,6 @@ import React from 'react';
 import { Provider } from 'react-redux';
 import { Card, CardBody, CardHeader, Title } from '@patternfly/react-core';
 import { storeDay1 } from '../../store';
-import { OCM_CLUSTER_LIST_LINK } from '../../config';
 import {
   AlertsContextProvider,
   AssistedInstallerOCMPermissionTypesListType,
@@ -62,7 +61,7 @@ const ClusterLoadFailed = ({ clusterId, error }: { clusterId: Cluster['id']; err
         <ErrorState
           title="Failed to fetch the cluster"
           fetchData={fetchCluster}
-          actions={[<BackButton key={'cancel'} to={OCM_CLUSTER_LIST_LINK} />]}
+          actions={[<BackButton key={'cancel'} to={'..'} />]}
           content={error}
         />
       </CardBody>
@@ -80,7 +79,7 @@ const LoadingDefaultConfigFailedCard = () => (
     <CardBody>
       <ErrorState
         title="Failed to retrieve the default configuration"
-        actions={[<BackButton key={'cancel'} to={OCM_CLUSTER_LIST_LINK} />]}
+        actions={[<BackButton key={'cancel'} to={'..'} />]}
       />
     </CardBody>
   </Card>

package/lib/ocm/components/clusterDetail/ClusterDetail.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useHistory } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom-v5-compat';
 import {
   Stack,
   StackItem,
@@ -40,7 +40,7 @@ const ClusterDetail: React.FC<ClusterDetailProps> = ({ cluster }) => {
   const isSNOExpansionAllowed =
     featureSupportLevelContext.isFeatureSupported('SINGLE_NODE_EXPANSION');
   const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
-  const history = useHistory();
+  const navigate = useNavigate();
   const canAddHosts =
     (!isSNO(cluster) || isSNOExpansionAllowed) && cluster.status === 'installed' && !isInOcm;
 
@@ -49,13 +49,13 @@ const ClusterDetail: React.FC<ClusterDetailProps> = ({ cluster }) => {
       try {
         const { data } = await ClustersAPI.allowAddHosts(cluster.id);
         updateCluster(data);
-        history.push(`${routeBasePath}/clusters/${cluster.id}`);
+        navigate(`${routeBasePath}/clusters/${cluster.id}`);
       } catch (e) {
         handleApiError(e);
       }
     };
     void doItAsync();
-  }, [cluster.id, history]);
+  }, [cluster.id, navigate]);
 
   return (
     <Stack hasGutter>
@@ -112,7 +112,7 @@ const ClusterDetail: React.FC<ClusterDetailProps> = ({ cluster }) => {
           {!isSingleClusterFeatureEnabled && (
             <ToolbarButton
               variant={ButtonVariant.link}
-              onClick={() => history.push(`${routeBasePath}/clusters`)}
+              onClick={() => navigate('..')}
               id={getClusterDetailId('button-back-to-all-clusters')}
             >
               Back to all clusters

package/lib/ocm/components/clusterWizard/ClusterDetails.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useHistory } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom-v5-compat';
 import { useDispatch } from 'react-redux';
 import { useAlerts, LoadingState, ClusterWizardStep, ErrorState } from '../../../common';
 import { usePullSecret } from '../../hooks';
@@ -10,7 +10,6 @@ import { canNextClusterDetails, ClusterWizardFlowStateNew } from './wizardTransi
 import { useOpenshiftVersions, useManagedDomains, useUsedClusterNames } from '../../hooks';
 import ClusterDetailsForm from './ClusterDetailsForm';
 import ClusterWizardNavigation from './ClusterWizardNavigation';
-import { routeBasePath } from '../../config';
 import {
   ClusterDetailsUpdateParams,
   ClustersService,
@@ -28,7 +27,7 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
   const clusterWizardContext = useClusterWizardContext();
   const managedDomains = useManagedDomains();
   const { addAlert, clearAlerts } = useAlerts();
-  const history = useHistory();
+  const navigate = useNavigate();
   const dispatch = useDispatch();
   const { usedClusterNames } = useUsedClusterNames(cluster?.id || '');
   const pullSecret = usePullSecret();
@@ -69,7 +68,7 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
       clearAlerts();
       try {
         const cluster = await ClustersService.create(params);
-        history.push(`${routeBasePath}/clusters/${cluster.id}`, ClusterWizardFlowStateNew);
+        navigate(`../${cluster.id}`, { state: ClusterWizardFlowStateNew });
         await UISettingService.update(cluster.id, { addCustomManifests });
       } catch (e) {
         handleApiError(e, () =>
@@ -80,7 +79,7 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
         }
       }
     },
-    [clearAlerts, history, addAlert, dispatch],
+    [clearAlerts, navigate, addAlert, dispatch],
   );
 
   const navigation = <ClusterWizardNavigation cluster={cluster} />;

package/lib/ocm/components/clusterWizard/ClusterDetailsForm.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
-import { useLocation } from 'react-router-dom';
+import { useLocation } from 'react-router-dom-v5-compat';
 import { Grid, GridItem } from '@patternfly/react-core';
 import isUndefined from 'lodash-es/isUndefined.js';
 import { Formik, FormikHelpers } from 'formik';

package/lib/ocm/components/clusterWizard/ClusterWizardContextProvider.tsx

@@ -1,5 +1,5 @@
 import React, { PropsWithChildren } from 'react';
-import { useLocation } from 'react-router-dom';
+import { useLocation } from 'react-router-dom-v5-compat';
 import { ClusterWizardContextType, ClusterWizardContext } from './ClusterWizardContext';
 import {
   ClusterWizardFlowStateType,
@@ -91,7 +91,8 @@ const ClusterWizardContextProvider = ({
   const [wizardStepIds, setWizardStepIds] = React.useState<ClusterWizardStepsType[]>();
   const [wizardPerPage, setWizardPerPage] = React.useState(10);
   const [customManifestsStep, setCustomManifestsStep] = React.useState<boolean>(false);
-  const { state: locationState } = useLocation<ClusterWizardFlowStateType>();
+  const location = useLocation();
+  const locationState = location.state as ClusterWizardFlowStateType | undefined;
   const {
     uiSettings,
     updateUISettings,

package/lib/ocm/components/clusterWizard/ClusterWizardFooter.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useHistory } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom-v5-compat';
 import { Alert, AlertGroup, AlertVariant } from '@patternfly/react-core';
 import {
   WizardFooter,
@@ -9,7 +9,6 @@ import {
   clusterFieldLabels,
   selectClusterValidationsInfo,
 } from '../../../common';
-import { routeBasePath } from '../../config';
 import { wizardStepsValidationsMap } from './wizardTransition';
 import { useClusterWizardContext } from './ClusterWizardContext';
 import ClusterWizardStepValidationsAlert from '../../../common/components/clusterWizard/ClusterWizardStepValidationsAlert';
@@ -79,12 +78,9 @@ const ClusterWizardFooter = ({
   ...rest
 }: ClusterWizardFooterProps) => {
   const { alerts } = useAlerts();
-  const history = useHistory();
+  const navigate = useNavigate();
 
-  const handleCancel = React.useCallback(
-    () => history.push(`${routeBasePath}/clusters/`),
-    [history],
-  );
+  const handleCancel = React.useCallback(() => navigate('..'), [navigate]);
 
   const alertsSection = alerts.length ? <Alerts /> : undefined;
 

package/lib/ocm/components/clusterWizard/Operators.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useDispatch } from 'react-redux';
-import { useHistory, useLocation } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom-v5-compat';
 import { Formik, FormikConfig, useFormikContext } from 'formik';
 import {
   ClusterWizardStep,
@@ -42,7 +42,7 @@ const OperatorsForm = ({ cluster }: { cluster: Cluster }) => {
   const clusterWizardContext = useClusterWizardContext();
   const isAutoSaveRunning = useFormikAutoSave();
   const { errors, touched, isSubmitting, isValid } = useFormikContext<OperatorsValues>();
-  const history = useHistory();
+  const navigate = useNavigate();
   const { pathname } = useLocation();
 
   const isNextDisabled =
@@ -53,7 +53,9 @@ const OperatorsForm = ({ cluster }: { cluster: Cluster }) => {
     !canNextOperators({ cluster });
 
   const handleNext = () => {
-    history.replace(pathname, undefined);
+    if (window.location.pathname.indexOf('assisted-installer') > -1) {
+      navigate(pathname, { state: undefined, replace: true });
+    }
     clusterWizardContext.moveNext();
   };
 

package/lib/ocm/components/clusters/ClusterBreadcrumbs.tsx

@@ -5,8 +5,7 @@ import {
   BreadcrumbItem,
   PageSection,
 } from '@patternfly/react-core';
-import { Link } from 'react-router-dom';
-import { routeBasePath } from '../../config';
+import { Link } from 'react-router-dom-v5-compat';
 import { isInOcm } from '../../../common/api';
 
 const ClusterBreadcrumbs = ({ clusterName }: { clusterName?: string }) => (
@@ -18,7 +17,7 @@ const ClusterBreadcrumbs = ({ clusterName }: { clusterName?: string }) => (
         </BreadcrumbItem>
         {clusterName ? (
           <BreadcrumbItem>
-            <Link to={`${routeBasePath}/clusters`}>Assisted Clusters</Link>
+            <Link to={`..`}>Assisted Clusters</Link>
           </BreadcrumbItem>
         ) : (
           <BreadcrumbItem isActive>Assisted Clusters</BreadcrumbItem>

package/lib/ocm/components/clusters/ClusterPage.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Redirect, RouteComponentProps } from 'react-router-dom';
+import { useParams, Navigate } from 'react-router-dom-v5-compat';
 import { useDispatch } from 'react-redux';
 import { PageSection, PageSectionVariants, Text, TextContent } from '@patternfly/react-core';
 import {
@@ -34,13 +34,12 @@ import { usePullSecret } from '../../hooks';
 import { Cluster, InfraEnv } from '@openshift-assisted/types/assisted-installer-service';
 import { AssistedInstallerHeader } from './AssistedInstallerHeader';
 
-type MatchParams = {
-  clusterId: string;
-};
-
-const ClusterPageGeneric: React.FC<{ clusterId: string; showBreadcrumbs?: boolean }> = ({
+const ClusterPageGeneric = ({
   clusterId,
   showBreadcrumbs = false,
+}: {
+  clusterId: string;
+  showBreadcrumbs?: boolean;
 }) => {
   if (!clusterId) {
     // console.error('ClusterPageGeneric: missing clusterId');
@@ -129,7 +128,7 @@ const ClusterPageGeneric: React.FC<{ clusterId: string; showBreadcrumbs?: boolea
 
   if (uiState === ResourceUIState.POLLING_ERROR && !cluster) {
     if (Number(errorDetail?.code) === 404) {
-      return <Redirect to={`${routeBasePath}/clusters`} />;
+      return <Navigate to={`${routeBasePath}/clusters`} />;
     }
     return (
       <PageSection variant={PageSectionVariants.light} isFilled>
@@ -138,7 +137,7 @@ const ClusterPageGeneric: React.FC<{ clusterId: string; showBreadcrumbs?: boolea
           fetchData={
             Number(errorDetail?.code) === 401 ? () => window.location.reload() : fetchCluster
           }
-          actions={[<BackButton key={'cancel'} to={`${routeBasePath}/clusters`} />]}
+          actions={[<BackButton key={'cancel'} to={'..'} />]}
         />
       </PageSection>
     );
@@ -149,7 +148,7 @@ const ClusterPageGeneric: React.FC<{ clusterId: string; showBreadcrumbs?: boolea
       <PageSection variant={PageSectionVariants.light} isFilled>
         <ErrorState
           title="Cluster details not found"
-          actions={[<BackButton key={'cancel'} to={`${routeBasePath}/clusters`} />]}
+          actions={[<BackButton key={'cancel'} to={`..`} />]}
           content={
             'Check to make sure the cluster-ID is valid. Otherwise, the cluster details may have been deleted.'
           }
@@ -193,16 +192,20 @@ const ClusterPageGeneric: React.FC<{ clusterId: string; showBreadcrumbs?: boolea
     );
   }
 
-  return <Redirect to="/clusters" />;
+  return <Navigate to="/clusters" />;
 };
 
-export const SingleClusterPage: React.FC<{ clusterId: string }> = ({ clusterId }) => (
+export const SingleClusterPage = ({ clusterId }: { clusterId: string }) => (
   <AlertsContextProvider>
     <ClusterPageGeneric clusterId={clusterId} />
   </AlertsContextProvider>
 );
-export const ClusterPage: React.FC<RouteComponentProps<MatchParams>> = ({ match }) => (
-  <AlertsContextProvider>
-    <ClusterPageGeneric clusterId={match.params.clusterId} showBreadcrumbs />
-  </AlertsContextProvider>
-);
+
+export const ClusterPage = () => {
+  const { clusterId } = useParams<{ clusterId: string }>();
+  return (
+    <AlertsContextProvider>
+      <ClusterPageGeneric clusterId={clusterId || ''} showBreadcrumbs />
+    </AlertsContextProvider>
+  );
+};