@openshift-assisted/ui-lib 2.54.1 → 5.0.1-cim

package/lib/ocm/components/clusterConfiguration/review/utils.tsx

@@ -5,8 +5,11 @@ import { Cluster, DiskEncryption } from '@openshift-assisted/types/assisted-inst
 export const getManagementType = ({ userManagedNetworking }: Cluster): string =>
   userManagedNetworking ? 'User-managed networking' : 'Cluster-managed networking';
 
-export const getStackTypeLabel = (cluster: Cluster): string =>
-  isDualStack(cluster) ? 'Dual-stack' : 'IPv4';
+export const getStackTypeLabel = (cluster: Cluster, isSingleClusterFeature = false): string => {
+  if (isDualStack(cluster)) return 'Dual-stack';
+  if (isSingleClusterFeature) return 'Single stack';
+  return 'IPv4';
+};
 
 export const getDiskEncryptionEnabledOnStatus = (diskEncryption: DiskEncryption['enableOn']) => {
   let diskEncryptionType = null;

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

@@ -33,7 +33,7 @@ import {
   unstable_HistoryRouter as HistoryRouter,
   HistoryRouterProps,
   BrowserRouter,
-} from 'react-router-dom-v5-compat';
+} from 'react-router';
 
 type AssistedInstallerDetailCardProps = {
   aiClusterId: string;

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useNavigate } from 'react-router-dom-v5-compat';
+import { useNavigate } from 'react-router';
 import { Stack, StackItem, Content, ButtonVariant, GridItem, Grid } from '@patternfly/react-core';
 import { ToolbarButton, Alerts, getEnabledHosts, selectOlmOperators, isSNO } from '../../../common';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
@@ -41,7 +41,7 @@ const ClusterDetail: React.FC<ClusterDetailProps> = ({ cluster }) => {
       try {
         const { data } = await ClustersAPI.allowAddHosts(cluster.id);
         updateCluster(data);
-        navigate(`${routeBasePath}/clusters/${cluster.id}`);
+        void navigate(`${routeBasePath}/clusters/${cluster.id}`);
       } catch (e) {
         handleApiError(e);
       }
@@ -102,7 +102,7 @@ const ClusterDetail: React.FC<ClusterDetailProps> = ({ cluster }) => {
           {!isSingleClusterFeatureEnabled && (
             <ToolbarButton
               variant={ButtonVariant.link}
-              onClick={() => navigate('..')}
+              onClick={() => void 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 { useLocation, useNavigate } from 'react-router-dom-v5-compat';
+import { useLocation, useNavigate } from 'react-router';
 import { useDispatch } from 'react-redux';
 import {
   useAlerts,
@@ -89,7 +89,7 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
           isAssistedMigration,
           isSingleClusterFeatureEnabled,
         );
-        navigate(`../${cluster.id}`, { state: ClusterWizardFlowStateNew });
+        void navigate(`../${cluster.id}`, { state: ClusterWizardFlowStateNew });
 
         if (isAssistedMigration) {
           try {

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-v5-compat';
+import { useLocation } from 'react-router';
 import { Flex, 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-v5-compat';
+import { useLocation } from 'react-router';
 import { ClusterWizardContextType, ClusterWizardContext } from './ClusterWizardContext';
 import {
   ClusterWizardFlowStateType,

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useNavigate } from 'react-router-dom-v5-compat';
+import { useNavigate } from 'react-router';
 import { Alert, AlertGroup, AlertVariant } from '@patternfly/react-core';
 import {
   WizardFooter,

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useDispatch } from 'react-redux';
-import { useLocation, useNavigate } from 'react-router-dom-v5-compat';
+import { useLocation, useNavigate } from 'react-router';
 import { Formik, FormikConfig, useFormikContext } from 'formik';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 import {
@@ -74,7 +74,7 @@ const OperatorsForm = ({ cluster }: { cluster: Cluster }) => {
 
   const handleNext = () => {
     if (window.location.pathname.indexOf('assisted-installer') > -1) {
-      navigate(pathname, { state: undefined, replace: true });
+      void navigate(pathname, { state: undefined, replace: true });
     }
     clusterWizardContext.moveNext();
   };

package/lib/ocm/components/clusterWizard/disconnected/ReviewStep.tsx

@@ -26,7 +26,7 @@ import {
 } from '@patternfly/react-core';
 import { Formik } from 'formik';
 import { saveAs } from 'file-saver';
-import { useNavigate } from 'react-router-dom-v5-compat';
+import { useNavigate } from 'react-router';
 
 import { getOperatorSpecs } from '../../../../common/components/operators/operatorSpecs';
 
@@ -51,7 +51,7 @@ const ReviewStep = () => {
           <ClusterWizardFooter
             onNext={() => {
               downloadUrl && saveAs(downloadUrl);
-              navigate('/cluster-list');
+              void navigate('/cluster-list');
             }}
             onBack={moveBack}
             nextButtonText="Download ISO"

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Breadcrumb, BreadcrumbItem, PageSection } from '@patternfly/react-core';
-import { Link } from 'react-router-dom-v5-compat';
+import { Link } from 'react-router';
 import { isInOcm } from '../../../common/api';
 
 const ClusterBreadcrumbs = ({ clusterName }: { clusterName?: string }) => {

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useParams, Navigate } from 'react-router-dom-v5-compat';
+import { useParams, Navigate } from 'react-router';
 import { useDispatch } from 'react-redux';
 import { PageSection, Content } from '@patternfly/react-core';
 import {

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useNavigate } from 'react-router-dom-v5-compat';
+import { useNavigate } from 'react-router';
 import { Button, ButtonVariant, Content, PageSection } from '@patternfly/react-core';
 import { AddCircleOIcon } from '@patternfly/react-icons/dist/js/icons/add-circle-o-icon';
 import {
@@ -85,7 +85,7 @@ const Clusters = () => {
             primaryAction={
               <Button
                 variant={ButtonVariant.primary}
-                onClick={() => navigate(`~new`)}
+                onClick={() => void navigate(`~new`)}
                 id="empty-state-new-cluster-button"
                 data-ouia-id="button-create-new-cluster"
               >

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useNavigate } from 'react-router-dom-v5-compat';
+import { useNavigate } from 'react-router';
 import {
   Toolbar,
   ToolbarItem,
@@ -172,7 +172,7 @@ const ClustersListToolbar: React.FC<ClustersListToolbarProps> = ({
         </CustomToolbarFilter>
         <ToolbarButton
           variant={ButtonVariant.primary}
-          onClick={() => navigate(`~new`)}
+          onClick={() => void navigate(`~new`)}
           id="button-create-new-cluster"
           data-ouia-id="button-create-new-cluster"
         >

package/lib/ocm/components/ui/Buttons/BackButton.tsx

@@ -1,4 +1,4 @@
-import { Link, LinkProps } from 'react-router-dom-v5-compat';
+import { Link, LinkProps } from 'react-router';
 import type { ButtonProps } from '@patternfly/react-core';
 import { Button } from '@patternfly/react-core';
 import React from 'react';

package/lib/ocm/store/slices/clusters/selectors.tsx

@@ -1,7 +1,8 @@
 import React from 'react';
 import { createSelector } from '@reduxjs/toolkit';
+import type { Selector } from 'reselect';
 import type { IRow, IRowData } from '@patternfly/react-table';
-import { Link } from 'react-router-dom-v5-compat';
+import { Link } from 'react-router';
 import type { TFunction } from 'i18next';
 import {
   DASH,
@@ -22,7 +23,7 @@ const selectClusters = (state: RootStateDay1) =>
   state.clusters.data.filter((c) => c.kind !== 'DisconnectedCluster');
 const clustersUIState = (state: RootStateDay1) => state.clusters.uiState;
 
-export const selectClustersUIState = createSelector(
+export const selectClustersUIState: (state: RootStateDay1) => ResourceUIState = createSelector(
   [selectClusters, clustersUIState],
   (clusters, uiState): ResourceUIState => {
     const { LOADED, EMPTY } = ResourceUIState;
@@ -95,13 +96,14 @@ const clusterToClusterTableRow = (cluster: Cluster, t: TFunction): IRow => {
 export const getClusterTableStatusCell = (rowData: IRowData) =>
   rowData?.cells?.[3] as HumanizedSortable;
 
-export const selectClusterTableRows = (t: TFunction) => {
+export const selectClusterTableRows = (t: TFunction): Selector<RootStateDay1, ClusterTableRows> => {
   return createSelector(
     selectClusters,
     (clusters): ClusterTableRows => clusters.map((c) => clusterToClusterTableRow(c, t)),
   );
 };
 
-export const selectClusterNames = createSelector(selectClusters, (clusters) =>
-  clusters.map((c) => c.name),
+export const selectClusterNames: Selector<RootStateDay1, (string | undefined)[]> = createSelector(
+  selectClusters,
+  (clusters) => clusters.map((c) => c.name),
 );

package/lib/ocm/store/slices/feature-flags/selectors.ts

@@ -1,12 +1,15 @@
 import type { FeatureListType } from '../../../../common/features/featureGate';
 import type { RootStateDay1 } from '../../store-day1';
 import { createSelector } from '@reduxjs/toolkit';
+import type { Selector } from 'reselect';
 
 export const selectFeatureFlagsSlice = (state: RootStateDay1) => state.featureFlags;
 
-export const isFeatureEnabled = (featureId: keyof FeatureListType) =>
+export const isFeatureEnabled = (
+  featureId: keyof FeatureListType,
+): Selector<RootStateDay1, boolean> =>
   createSelector(
     selectFeatureFlagsSlice,
-    (featureFlags: ReturnType<typeof selectFeatureFlagsSlice>) =>
+    (featureFlags: ReturnType<typeof selectFeatureFlagsSlice>): boolean =>
       featureFlags.data[featureId] ?? false,
   );

package/lib/ocm/store/slices/infra-envs/selectors.ts

@@ -1,10 +1,12 @@
 import { createSelector } from '@reduxjs/toolkit';
+import type { Selector } from 'reselect';
 import type { RootStateDay1 } from '../../store-day1';
 import type { CpuArchitecture } from '../../../../common';
+import type { InfraEnv } from '@openshift-assisted/types/assisted-installer-service';
 
 export const selectInfraEnvsSlice = (state: RootStateDay1) => state.infraEnvs;
 export const selectInfraEnvByCpuArchitecture = createSelector(
   [selectInfraEnvsSlice, (_: RootStateDay1, cpuArchitecture: CpuArchitecture) => cpuArchitecture],
-  (infraEnvs, cpuArchitecture) =>
+  (infraEnvs, cpuArchitecture): InfraEnv | undefined =>
     infraEnvs.find((infraEnv) => infraEnv.cpuArchitecture === cpuArchitecture),
-);
+) as Selector<RootStateDay1, InfraEnv | undefined, [CpuArchitecture]>;

package/package.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
-    "@openshift-assisted/locales": "2.54.1",
-    "@openshift-assisted/types": "2.54.1",
-    "@openshift-console/dynamic-plugin-sdk": "^4.19.1",
+    "@openshift-assisted/locales": "5.0.1-cim",
+    "@openshift-assisted/types": "5.0.1-cim",
+    "@openshift-console/dynamic-plugin-sdk": "^4.22.0",
     "@patternfly/patternfly": "6.4.0",
     "@patternfly/react-code-editor": "6.4.1",
     "@patternfly/react-core": "6.4.1",
@@ -13,7 +13,7 @@
     "@react-hook/resize-observer": "^2.0.2",
     "axios-case-converter": "^0.11.1",
     "camel-case": "^4.1.2",
-    "cidr-tools": "^4.3.0",
+    "cidr-tools": "^12.1.1",
     "classnames": "^2.3.1",
     "file-saver": "^2.0.2",
     "filesize.js": "^2.0.0",
@@ -41,7 +41,7 @@
     "@types/humanize-plus": "^1.8.2",
     "@types/js-yaml": "^4.0.9",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^24.12.4",
+    "@types/node": "^24.13.3",
     "@types/react": "18.2.37",
     "@types/react-autosuggest": "^10.1.5",
     "@types/react-dom": "18.2.15",
@@ -91,7 +91,7 @@
   "peerDependencies": {
     "@reduxjs/toolkit": "^1.9.7",
     "@sentry/browser": "^5.9 || ^6",
-    "axios": "^1.15.2",
+    "axios": "^1.18.1",
     "i18next": "^20.4 || ^21",
     "monaco-editor": "^0.44.0 || ^0.55.0",
     "react": "^18",
@@ -99,7 +99,7 @@
     "react-i18next": ">11.7.3",
     "react-monaco-editor": "^0.55.0 || ^0.59.0",
     "react-redux": "^8.0.5",
-    "react-router-dom-v5-compat": "^6.30.3",
+    "react-router": "^7.17.0",
     "redux": "^4.2.1",
     "uuid": "^8.1",
     "yup": "^1.4.0"
@@ -136,5 +136,5 @@
       ]
     }
   },
-  "version": "2.54.1"
+  "version": "5.0.1-cim"
 }