@openshift-assisted/ui-lib 2.54.2 → 2.55.1

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

@@ -118,7 +118,7 @@ export const CimConfigurationModal: React.FC<CimConfigurationModalProps> = ({
       agentServiceConfig?.spec?.filesystemStorage?.resources?.requests?.storage,
     ),
     imgVolSize: getStorageSizeGiB(
-      50,
+      100,
       agentServiceConfig?.spec?.imageStorage?.resources?.requests?.storage,
     ),
     configureLoadBalancer: platform === 'AWS',
@@ -134,7 +134,7 @@ export const CimConfigurationModal: React.FC<CimConfigurationModalProps> = ({
       .min(MIN_FS_VOL_SIZE, t('ai:Minimal value is 1Gi'))
       .required(t('ai:Required field')),
     imgVolSize: Yup.number()
-      .min(MIN_IMG_VOL_SIZE, t('ai:Minimal value is 10Gi'))
+      .min(MIN_IMG_VOL_SIZE, t('ai:Minimal value is 50Gi'))
       .required(t('ai:Required field')),
     configureLoadBalancer: Yup.boolean(),
     addCiscoIntersightURL: Yup.boolean(),

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

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

package/lib/cim/components/modals/CimConfiguration/constants.ts

@@ -1,5 +1,5 @@
 export const MIN_DB_VOL_SIZE = 1; // In Gi
 export const MIN_FS_VOL_SIZE = 1;
-export const MIN_IMG_VOL_SIZE = 10;
+export const MIN_IMG_VOL_SIZE = 50;
 
 export const CIM_CONFIG_TIMEOUT = 5 * 60 * 1000; // in ms

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

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { TFunction } from 'i18next';
 import { Button, Flex, FlexItem, Icon, Popover } from '@patternfly/react-core';
 import { InfoCircleIcon } from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
-import { Link } from 'react-router-dom-v5-compat';
+import { Link } from 'react-router';
 
 import { Host } from '@openshift-assisted/types/assisted-installer-service';
 import {

package/lib/common/api/assisted-service/ClustersAPI.ts

@@ -3,6 +3,7 @@ import {
   Cluster,
   ClusterCreateParams,
   ClusterDefaultConfig,
+  DisconnectedClusterCreateParams,
   V2ClusterUpdateParams,
   Credentials,
   Host,
@@ -142,6 +143,13 @@ const ClustersAPI = {
     );
   },
 
+  registerDisconnected(params: DisconnectedClusterCreateParams) {
+    return client.post<Cluster, AxiosResponse<Cluster>, DisconnectedClusterCreateParams>(
+      `${ClustersAPI.makeBaseURI()}disconnected`,
+      params,
+    );
+  },
+
   update(clusterId: Cluster['id'], params: V2ClusterUpdateParams) {
     return client.patch<Cluster, AxiosResponse<Cluster>, V2ClusterUpdateParams>(
       `${ClustersAPI.makeBaseURI(clusterId)}`,

package/lib/common/components/clusterConfiguration/utils.test.ts

@@ -1,5 +1,5 @@
 import { test, describe, expect } from 'vitest';
-import { isDualStack } from './utils';
+import { isDualStack, getIPv6FromDualstack } from './utils';
 import {
   MachineNetwork,
   ClusterNetwork,
@@ -273,3 +273,45 @@ describe('isDualStack', () => {
     });
   });
 });
+
+describe('getIPv6FromDualstack', () => {
+  test('returns the IPv6 entry from a dualstack array', () => {
+    const networks = [
+      { cidr: '10.128.0.0/14', hostPrefix: 23, clusterId: 'test' },
+      { cidr: 'fd01::/48', hostPrefix: 64, clusterId: 'test' },
+    ];
+    const result = getIPv6FromDualstack(networks);
+    expect(result).toEqual({ cidr: 'fd01::/48', hostPrefix: 64, clusterId: 'test' });
+  });
+
+  test('returns the IPv6 entry when IPv6 is first', () => {
+    const networks = [
+      { cidr: 'fd01::/48', hostPrefix: 64, clusterId: 'test' },
+      { cidr: '10.128.0.0/14', hostPrefix: 23, clusterId: 'test' },
+    ];
+    const result = getIPv6FromDualstack(networks);
+    expect(result).toEqual({ cidr: 'fd01::/48', hostPrefix: 64, clusterId: 'test' });
+  });
+
+  test('returns undefined when no IPv6 entry is present', () => {
+    const networks = [{ cidr: '10.128.0.0/14', hostPrefix: 23, clusterId: 'test' }];
+    expect(getIPv6FromDualstack(networks)).toBeUndefined();
+  });
+
+  test('returns undefined for an empty array', () => {
+    expect(getIPv6FromDualstack([])).toBeUndefined();
+  });
+
+  test('returns undefined for undefined input', () => {
+    expect(getIPv6FromDualstack(undefined)).toBeUndefined();
+  });
+
+  test('works with service networks (no hostPrefix)', () => {
+    const networks = [
+      { cidr: '172.30.0.0/16', clusterId: 'test' },
+      { cidr: 'fd02::/112', clusterId: 'test' },
+    ];
+    const result = getIPv6FromDualstack(networks);
+    expect(result).toEqual({ cidr: 'fd02::/112', clusterId: 'test' });
+  });
+});

package/lib/common/components/clusterConfiguration/utils.ts

@@ -188,6 +188,19 @@ export const canBeDualStack = (subnets: HostSubnets) =>
   subnets.some((subnet) => Address4.isValid(subnet.subnet)) &&
   subnets.some((subnet) => Address6.isValid(subnet.subnet));
 
+export const isPrimaryIPv6 = (machineNetworks: MachineNetwork[] | undefined): boolean => {
+  const cidr = machineNetworks?.[0]?.cidr;
+  return !!cidr && Address6.isValid(cidr);
+};
+
+/**
+ * Find the IPv6 entry in a dualstack network array.
+ * Dualstack arrays contain one IPv4 and one IPv6 entry; this helper returns the IPv6 one.
+ */
+export const getIPv6FromDualstack = <T extends { cidr?: string }>(
+  networks: T[] | undefined,
+): T | undefined => networks?.find((n) => n.cidr && Address6.isValid(n.cidr));
+
 const areNetworksDualStack = (
   networks: (MachineNetwork | ClusterNetwork | ServiceNetwork)[] | undefined,
   openshiftVersion?: string,

package/lib/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import {
   Alert,
   AlertActionLink,
@@ -8,7 +8,7 @@ import {
   Stack,
   StackItem,
 } from '@patternfly/react-core';
-import { FieldArray, useFormikContext, FormikHelpers } from 'formik';
+import { FieldArray, useFormikContext } from 'formik';
 import { Address4, Address6 } from 'ip-address';
 
 import { HostSubnet, NetworkConfigurationValues } from '../../../types';
@@ -17,39 +17,11 @@ import { isMajorMinorVersionEqualOrGreater } from '../../../utils';
 import { useTranslation } from '../../../hooks/use-translation-wrapper';
 import { SubnetsDropdown } from './SubnetsDropdown';
 import { reorderNetworksForPrimary } from './reorderNetworks';
-import {
-  Cluster,
-  Host,
-  MachineNetwork,
-} from '@openshift-assisted/types/assisted-installer-service';
+import { Cluster, Host } from '@openshift-assisted/types/assisted-installer-service';
 
 const subnetSort = (subA: HostSubnet, subB: HostSubnet) =>
   subA.humanized.localeCompare(subB.humanized);
 
-const useAutoSelectDefaultMachineNetworks = (
-  autoSelectNetwork: boolean,
-  setFieldValue: FormikHelpers<NetworkConfigurationValues>['setFieldValue'],
-  cidrV4: MachineNetwork['cidr'],
-  cidrV6: MachineNetwork['cidr'],
-  clusterId: string,
-  isDualStack: boolean,
-) => {
-  useEffect(() => {
-    if (autoSelectNetwork) {
-      setFieldValue(
-        'machineNetworks',
-        isDualStack
-          ? [
-              { cidr: cidrV4, clusterId },
-              { cidr: cidrV6, clusterId },
-            ]
-          : [{ cidr: cidrV4, clusterId }],
-        false,
-      );
-    }
-  }, [autoSelectNetwork, cidrV4, cidrV6, clusterId, isDualStack, setFieldValue]);
-};
-
 export interface AvailableSubnetsControlProps {
   clusterId: Cluster['id'];
   hostSubnets: HostSubnet[];
@@ -81,31 +53,24 @@ export const AvailableSubnetsControl = ({
   const supportsIPv6Primary =
     openshiftVersion && isMajorMinorVersionEqualOrGreater(openshiftVersion, '4.12');
 
-  const IPv4Subnets = hostSubnets
-    .filter((subnet) => Address4.isValid(subnet.subnet))
-    .sort(subnetSort);
-  const IPv6Subnets = hostSubnets
-    .filter((subnet) => Address6.isValid(subnet.subnet))
-    .sort(subnetSort);
-
   // For OCP >= 4.12, both networks can use either IPv4 or IPv6
-  const allSubnets = supportsIPv6Primary
-    ? [...IPv4Subnets, ...IPv6Subnets].sort(subnetSort)
-    : IPv4Subnets;
+  const { IPv4Subnets, IPv6Subnets, allSubnets } = React.useMemo(() => {
+    const IPv4Subnets = hostSubnets
+      .filter((subnet) => Address4.isValid(subnet.subnet))
+      .sort(subnetSort);
 
-  // For auto-selection, prefer IPv4 as primary (even for dual-stack)
-  const cidrV4 = IPv4Subnets.length >= 1 ? IPv4Subnets[0].subnet : NO_SUBNET_SET;
-  const cidrV6 = IPv6Subnets.length >= 1 ? IPv6Subnets[0].subnet : NO_SUBNET_SET;
-  const hasEmptySelection = (values.machineNetworks ?? []).length === 0;
-  const autoSelectNetwork = !isViewerMode && hasEmptySelection;
-  useAutoSelectDefaultMachineNetworks(
-    autoSelectNetwork,
-    setFieldValue,
-    cidrV4,
-    cidrV6,
-    clusterId,
-    isDualStack,
-  );
+    const IPv6Subnets = hostSubnets
+      .filter((subnet) => Address6.isValid(subnet.subnet))
+      .sort(subnetSort);
+
+    const allSubnets = supportsIPv6Primary ? [...IPv4Subnets, ...IPv6Subnets] : IPv4Subnets;
+
+    return {
+      IPv4Subnets,
+      IPv6Subnets,
+      allSubnets,
+    };
+  }, [hostSubnets, supportsIPv6Primary]);
 
   // Ensure primary and secondary machine networks are not in the same stack (IPv4/IPv6).
   // If the user switches primary to the same address family as secondary, adjust secondary to the opposite family
@@ -236,6 +201,15 @@ export const AvailableSubnetsControl = ({
     }
   }, [supportsIPv6Primary, primaryNetworkCidr, IPv4Subnets, IPv6Subnets, allSubnets]);
 
+  // Autoselect values in case machineNetworks is empty
+  React.useEffect(() => {
+    if (!isViewerMode && values.machineNetworks?.length === 0 && primaryMachineSubnets.length) {
+      setFieldValue('machineNetworks', [{ cidr: primaryMachineSubnets[0].subnet, clusterId }]);
+    }
+    // Run only once
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   return (
     <>
       <FormGroup
@@ -252,9 +226,9 @@ export const AvailableSubnetsControl = ({
                   name="machineNetworks.0.cidr"
                   machineSubnets={primaryMachineSubnets}
                   isDisabled={isDisabled}
-                  onAfterSelect={(newSelection) =>
-                    reorderNetworksForPrimary(newSelection, values, setFieldValue)
-                  }
+                  onAfterSelect={(newSelection) => {
+                    reorderNetworksForPrimary(newSelection, values, setFieldValue);
+                  }}
                   data-testid="subnets-dropdown-toggle-primary"
                 />
               </StackItem>

package/lib/common/components/clusterWizard/networkingSteps/StackTypeControlGroup.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ButtonVariant, FormGroup, Split, SplitItem, Tooltip } from '@patternfly/react-core';
+import { ButtonVariant, FormGroup, Radio, Split, SplitItem, Tooltip } from '@patternfly/react-core';
 import { useFormikContext } from 'formik';
 import { Address4, Address6 } from 'ip-address';
 
@@ -9,10 +9,9 @@ import {
   NETWORK_TYPE_OVN,
   NETWORK_TYPE_SDN,
 } from '../../../types';
-import { getFieldId } from '../../ui';
+import { ConfirmationModal, getFieldId, PopoverIcon } from '../../ui';
 import { DUAL_STACK, NO_SUBNET_SET, SINGLE_STACK } from '../../../config';
 import { RadioField } from '../../ui/formik';
-import { ConfirmationModal, PopoverIcon } from '../../ui';
 import { useTranslation } from '../../../hooks/use-translation-wrapper';
 import { reorderNetworksByCurrentPrimary } from './reorderNetworks';
 import {
@@ -72,36 +71,32 @@ export const StackTypeControlGroup = ({
 
   const IPv6Subnets = hostSubnets.filter((subnet) => Address6.isValid(subnet.subnet));
   const cidrIPv6 = IPv6Subnets.length >= 1 ? IPv6Subnets[0].subnet : NO_SUBNET_SET;
+  const isSingleStackSelected = values.stackType !== DUAL_STACK;
+
   const shouldSetSingleStack =
     !isViewerMode && !isDualStackSelectable && values.stackType === DUAL_STACK;
 
   const setSingleStack = React.useCallback(() => {
     setFieldValue('stackType', SINGLE_STACK);
 
-    // Determine whether the first machine network is IPv4
     const firstNetwork = values.machineNetworks?.[0];
     const isFirstIPv4 = Boolean(firstNetwork?.cidr && Address4.isValid(firstNetwork.cidr));
 
     if (values.machineNetworks && values.machineNetworks?.length >= 2) {
-      // For single-stack IPv4, prefer IPv4 machine network
       if (isFirstIPv4) {
-        // Keep the first network if it's IPv4
         setFieldValue('machineNetworks', [firstNetwork]);
       } else {
-        // If first is IPv6, look for IPv4 network or set empty for auto-selection
         const ipv4Network = values.machineNetworks.find(
           (network) => network.cidr && Address4.isValid(network.cidr),
         );
         if (ipv4Network) {
           setFieldValue('machineNetworks', [ipv4Network]);
         } else {
-          // No IPv4 network found, set empty for auto-selection
           setFieldValue('machineNetworks', []);
         }
       }
     }
 
-    // Set cluster/service to IPv4 defaults when switching to single-stack
     if (values.clusterNetworks && values.clusterNetworks.length >= 1) {
       const defaultCluster =
         defaultNetworkValues.clusterNetworksIpv4 && defaultNetworkValues.clusterNetworksIpv4[0];
@@ -110,12 +105,12 @@ export const StackTypeControlGroup = ({
         ? {
             cidr: defaultCluster.cidr,
             hostPrefix: defaultCluster.hostPrefix,
-            clusterId: firstCluster.clusterId, // ← Preserve clusterId from original network
+            clusterId: firstCluster.clusterId,
           }
         : {
             cidr: '',
             hostPrefix: '',
-            clusterId: clusterId, // ← Use current clusterId
+            clusterId: clusterId,
           };
       setFieldValue('clusterNetworks', [ipv4Cluster]);
     }
@@ -126,22 +121,20 @@ export const StackTypeControlGroup = ({
       const ipv4Service = defaultService
         ? {
             cidr: defaultService.cidr,
-            clusterId: firstService.clusterId, // ← Preserve clusterId from original network
+            clusterId: firstService.clusterId,
           }
         : {
             cidr: '',
-            clusterId: clusterId, // ← Use current clusterId
+            clusterId: clusterId,
           };
       setFieldValue('serviceNetworks', [ipv4Service]);
     }
 
-    // Keep only IPv4 VIPs when switching to single-stack (unless DHCP allocation is used)
     if (!values.vipDhcpAllocation) {
       const pruneVips = (
         vips?: { ip?: string; clusterId?: Cluster['id'] }[],
       ): { ip: string; clusterId: Cluster['id'] }[] => {
         if (!vips || vips.length === 0) return [];
-        // Choose which index to keep based on whether the first network is IPv4
         const keepIndex = isFirstIPv4 ? 0 : 1;
         const chosen = vips[keepIndex];
         return chosen && chosen.ip
@@ -177,12 +170,10 @@ export const StackTypeControlGroup = ({
     }
 
     if (values.machineNetworks && values.machineNetworks?.length < 2) {
-      // Ensure IPv4 is primary when switching to dual-stack
       const firstNetwork = values.machineNetworks[0];
       const isFirstIPv6 = firstNetwork?.cidr && Address6.isValid(firstNetwork.cidr);
 
       if (isFirstIPv6) {
-        // If first network is IPv6, make IPv4 primary and IPv6 secondary
         const IPv4Subnets = hostSubnets.filter((subnet) => Address4.isValid(subnet.subnet));
         const cidrIPv4 = IPv4Subnets.length >= 1 ? IPv4Subnets[0].subnet : NO_SUBNET_SET;
         setFieldValue(
@@ -194,7 +185,6 @@ export const StackTypeControlGroup = ({
           false,
         );
       } else {
-        // If first network is IPv4, add IPv6 as secondary
         setFieldValue(
           'machineNetworks',
           [...values.machineNetworks, { cidr: cidrIPv6, clusterId: clusterId }],
@@ -225,7 +215,6 @@ export const StackTypeControlGroup = ({
       };
       setFieldValue('serviceNetworks', [...values.serviceNetworks, secondServiceNetwork], false);
     }
-    // Initialize VIPs for dual-stack
     if (values.apiVips && values.apiVips.length < 2) {
       setFieldValue(
         'apiVips',
@@ -244,8 +233,9 @@ export const StackTypeControlGroup = ({
       );
     }
   };
-  // Ensure cluster/service networks ordering matches the new primary family
+
   const primaryCidr = values.machineNetworks?.[0]?.cidr;
+
   React.useEffect(() => {
     if (isViewerMode) {
       return;
@@ -261,10 +251,11 @@ export const StackTypeControlGroup = ({
     values.serviceNetworks,
   ]);
 
-  const setStackType = (e: React.ChangeEvent<HTMLInputElement>) => {
-    if (e.target.value === DUAL_STACK) {
-      setDualStack();
-    } else if (
+  const handleSingleStackRadioClick = () => {
+    if (isSingleStackSelected) {
+      return;
+    }
+    if (
       hasDualStackConfigurationChanged(
         defaultNetworkValues.clusterNetworksDualstack || [],
         defaultNetworkValues.serviceNetworksDualstack || [],
@@ -284,32 +275,34 @@ export const StackTypeControlGroup = ({
     }
   }, [shouldSetSingleStack, setSingleStack]);
 
+  const singleStackPopoverContent = allowSingleStackIPv6
+    ? t('ai:Select a single address family (IPv4 or IPv6) for your machine network.')
+    : t('ai:Select this when your hosts are using only IPv4.');
+
+  const singleStackRadioId = getFieldId('stackType', 'radio', SINGLE_STACK);
+
   return (
     <>
       <FormGroup
-        label="Networking stack type"
+        label={t('ai:Networking stack type')}
         fieldId={getFieldId('stackType', 'radio')}
-        onChange={setStackType}
         isInline
       >
         <Split>
           <SplitItem>
-            <RadioField
-              name={'stackType'}
+            <Radio
+              id={singleStackRadioId}
+              name="stackType"
               value={SINGLE_STACK}
-              isDisabled={!isDualStackSelectable || isViewerMode}
               label={`${singleStackLabel}\u00A0`}
+              isChecked={isSingleStackSelected}
+              isDisabled={!isDualStackSelectable || isViewerMode}
+              onChange={() => handleSingleStackRadioClick()}
+              data-testid="form-radio-stackType-singleStack-field"
             />
           </SplitItem>
           <SplitItem>
-            <PopoverIcon
-              bodyContent={
-                allowSingleStackIPv6
-                  ? t('ai:Select a single address family (IPv4 or IPv6) for your machine network.')
-                  : t('ai:Select this when your hosts are using only IPv4.')
-              }
-              buttonStyle={{ top: '-4px' }}
-            />
+            <PopoverIcon bodyContent={singleStackPopoverContent} buttonStyle={{ top: '-4px' }} />
           </SplitItem>
         </Split>
         <Split>
@@ -325,6 +318,8 @@ export const StackTypeControlGroup = ({
                 value={DUAL_STACK}
                 isDisabled={!isDualStackSelectable || isViewerMode}
                 label="Dual-stack&nbsp;"
+                callFormikOnChange={false}
+                onChange={() => setDualStack()}
               />
             </Tooltip>
           </SplitItem>
@@ -343,7 +338,7 @@ export const StackTypeControlGroup = ({
           titleIconVariant={'warning'}
           confirmationButtonText={'Change'}
           confirmationButtonVariant={ButtonVariant.primary}
-          content={<p>All data and configuration done for 'Dual-stack' will be lost.</p>}
+          content={<p>All data and configuration done for &apos;Dual-stack&apos; will be lost.</p>}
           onClose={() => {
             setConfirmModal(false);
             setDualStack();

package/lib/common/components/operators/operatorSpecs.tsx

@@ -53,11 +53,8 @@ import {
   NODE_HEALTHCHECK_LINK,
   NODE_MAINTENANCE_LINK,
   ODF_LINK,
-  ODF_REQUIREMENTS_LINK,
   OPENSHIFT_AI_LINK,
-  OPENSHIFT_AI_REQUIREMENTS_LINK,
   OSC_LINK,
-  OSC_REQUIREMENTS_LINK,
   PIPELINES_OPERATOR_LINK,
   SERVERLESS_OPERATOR_LINK,
   SERVICE_MESH_OPERATOR_LINK,
@@ -183,11 +180,6 @@ export const getOperatorSpecs = (
         title: 'OpenShift Data Foundation',
         featureId: 'ODF',
         descriptionText: DESCRIPTION_ODF,
-        Requirements: () => (
-          <ExternalLink href={ODF_REQUIREMENTS_LINK}>
-            Learn more about the requirements for OpenShift Data Foundation
-          </ExternalLink>
-        ),
         Description: ({ searchTerm }) => (
           <>
             <HighlightedText text={DESCRIPTION_ODF} searchTerm={searchTerm} />{' '}
@@ -246,11 +238,6 @@ export const getOperatorSpecs = (
         title: 'OpenShift sandboxed containers',
         featureId: 'OSC',
         descriptionText: DESCRIPTION_OSC,
-        Requirements: () => (
-          <ExternalLink href={OSC_REQUIREMENTS_LINK}>
-            Learn more about the requirements for OpenShift sandboxed containers
-          </ExternalLink>
-        ),
         Description: ({ searchTerm }) => (
           <>
             <HighlightedText text={DESCRIPTION_OSC} searchTerm={searchTerm} />{' '}
@@ -266,9 +253,6 @@ export const getOperatorSpecs = (
         title: 'OpenShift AI',
         featureId: 'OPENSHIFT_AI',
         descriptionText: DESCRIPTION_OPENSHIFT_AI,
-        Requirements: () => (
-          <ExternalLink href={OPENSHIFT_AI_REQUIREMENTS_LINK}>Learn more</ExternalLink>
-        ),
         Description: ({ searchTerm }) => (
           <>
             <HighlightedText text={DESCRIPTION_OPENSHIFT_AI} searchTerm={searchTerm} />{' '}

package/lib/common/components/ui/formik/PullSecretField.tsx

@@ -65,7 +65,10 @@ const GetPullSecretHelperText: React.FC<{ isOcm: boolean }> = ({ isOcm }) => {
   );
 };
 
-const PullSecretField: React.FC<{ isOcm: boolean }> = ({ isOcm }) => {
+const PullSecretField: React.FC<{ isOcm: boolean; isRequired?: boolean }> = ({
+  isOcm,
+  isRequired = true,
+}) => {
   const { t } = useTranslation();
   return (
     <TextAreaField
@@ -75,7 +78,7 @@ const PullSecretField: React.FC<{ isOcm: boolean }> = ({ isOcm }) => {
       getErrorText={(error) => error}
       helperText={<GetPullSecretHelperText isOcm={isOcm} />}
       rows={10}
-      isRequired
+      isRequired={isRequired}
     />
   );
 };

package/lib/common/config/docs_links.ts

@@ -118,7 +118,7 @@ export const getMceDocsLink = (ocpVersion?: string) =>
 export const getLvmsDocsLink = (ocpVersion?: string) =>
   `https://docs.redhat.com/en/documentation/openshift_container_platform/${getDocsOpenshiftVersion(
     ocpVersion,
-  )}/html/storage/configuring-persistent-storage#overview-of-lvm-storage-functionality_ways-to-provision-local-storage`;
+  )}/html-single/storage/index#persistent-storage-using-lvms`;
 
 export const NODE_HEALTHCHECK_LINK =
   'https://docs.redhat.com/en/documentation/workload_availability_for_red_hat_openshift/latest/html/remediation_fencing_and_maintenance/node-health-check-operator';
@@ -229,7 +229,7 @@ export const getClusterObservabilityLink = (ocpVersion?: string) =>
 export const getLokiLink = (ocpVersion?: string) =>
   `https://docs.redhat.com/en/documentation/openshift_container_platform/${getDocsOpenshiftVersion(
     ocpVersion,
-  )}/html/network_observability/network-observability-overview`;
+  )}/html/network_observability/installing-network-observability-operators#network-observability-loki-installation_network_observability`;
 
 export const getOpenShiftLoggingLink = (ocpVersion?: string) =>
   `https://docs.redhat.com/en/documentation/openshift_container_platform/${getDocsOpenshiftVersion(

package/lib/common/types/clusters.ts

@@ -73,4 +73,4 @@ export const SupportedPlatformIntegrations: SupportedPlatformType[] = [
 ];
 export const NonPlatformIntegrations: PlatformType[] = ['baremetal', 'none'];
 
-export type DiscoveryImageType = ImageType | 'discovery-image-ipxe';
+export type DiscoveryImageType = Exclude<ImageType, 'disconnected-iso'> | 'discovery-image-ipxe';

package/lib/common/validationSchemas/addressValidation.tsx

@@ -9,7 +9,7 @@ import { HostSubnets, NetworkConfigurationValues } from '../types';
 import { IP_V4_ZERO, IP_V6_ZERO, MAC_REGEX } from './regexes';
 import { getArrayIndexFromPath, isIPorDN, isIPv4Address, isIPv6Address } from './utils';
 import { NO_SUBNET_SET } from '../config';
-import { overlap } from 'cidr-tools';
+import { overlapCidr } from 'cidr-tools';
 import parseUrl from 'parse-url';
 import { TFunction } from 'i18next';
 
@@ -272,7 +272,7 @@ export const ipBlockValidationSchema = (
     .test('cidrs-can-not-overlap', t('ai:Provided CIDRs can not overlap.'), (cidr: string) => {
       try {
         if (cidr && reservedCidrs && reservedCidrs.length > 0) {
-          return !overlap(cidr, reservedCidrs);
+          return !overlapCidr(cidr, reservedCidrs);
         }
       } catch {
         return false;

package/lib/ocm/components/Routes.tsx

@@ -7,7 +7,7 @@ import {
   Outlet,
   unstable_HistoryRouter as HistoryRouter,
   HistoryRouterProps,
-} from 'react-router-dom-v5-compat';
+} from 'react-router';
 import { Clusters, ClusterPage, NewClusterPage } from './clusters';
 import type { FeatureListType } from '../../common/features/featureGate';
 import { AssistedUILibVersion } from './ui';
@@ -39,7 +39,7 @@ export const UILibRoutes = ({
           <Route index element={<Clusters />} />
         </Route>
         {children}
-        <Route path="*" element={<Navigate to="assisted-installer/clusters" />} />
+        <Route path="*" element={<Navigate to="/assisted-installer/clusters" />} />
       </Routes>
     </>
   );

package/lib/ocm/components/clusterConfiguration/OcmDiscoveryImageConfigForm.tsx

@@ -106,7 +106,7 @@ export const OcmDiscoveryImageConfigForm = ({
     httpsProxy: httpsProxy || '',
     noProxy: noProxy || '',
     enableProxy: !!(httpProxy || httpsProxy || noProxy),
-    imageType: imageTypeValue as ImageType,
+    imageType: imageTypeValue as DiscoveryImageType,
     enableCertificate: enableCertificate || false,
     trustBundle: trustBundle || '',
   };
@@ -155,7 +155,7 @@ export const OcmDiscoveryImageConfigForm = ({
                   <Form>
                     <DiscoveryImageTypeDropdown
                       name="imageType"
-                      defaultValue={discoveryImageTypes[imageTypeValue]}
+                      defaultValue={discoveryImageTypes[imageTypeValue as DiscoveryImageType]}
                       onChange={updateDiscoveryButtonAndAlertText}
                       selectedCpuArchitecture={selectedCpuArchitecture}
                       isDisabled={isOracleCloudInfrastructure}