@openshift-assisted/ui-lib 2.51.0 → 2.51.1

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

@@ -20,7 +20,6 @@ export const discoveryImageTypes: Record<DiscoveryImageType, string> = {
   'minimal-iso': 'Minimal image file - Download an ISO that fetches content on boot',
   'full-iso': 'Full image file - Download a self-contained ISO',
   'discovery-image-ipxe': 'iPXE - Provision from your network server',
-  'disconnected-iso': 'Disconnected ISO - Provision from a local file',
 };
 
 type DiscoveryImageTypeDropdownProps = {

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

@@ -16,6 +16,7 @@ import { Formik, FormikHelpers } from 'formik';
 import { TFunction } from 'i18next';
 import {
   HostStaticNetworkConfig,
+  ImageType,
   InfraEnv,
   Proxy,
 } from '@openshift-assisted/types/assisted-installer-service';
@@ -71,7 +72,7 @@ type OcmDiscoveryImageConfigFormProps = Proxy & {
     formikActions: FormikHelpers<OcmDiscoveryImageFormValues>,
   ) => Promise<void>;
   sshPublicKey?: string;
-  imageType?: DiscoveryImageType;
+  imageType?: ImageType;
   isIpxeSelected?: boolean;
   enableCertificate?: boolean;
   trustBundle?: InfraEnv['additionalTrustBundle'];
@@ -105,7 +106,7 @@ export const OcmDiscoveryImageConfigForm = ({
     httpsProxy: httpsProxy || '',
     noProxy: noProxy || '',
     enableProxy: !!(httpProxy || httpsProxy || noProxy),
-    imageType: imageType,
+    imageType: imageTypeValue as ImageType,
     enableCertificate: enableCertificate || false,
     trustBundle: trustBundle || '',
   };

package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/CustomManifestsPage.tsx

@@ -15,8 +15,9 @@ import {
 import { CustomManifests } from './components/CustomManifests';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 import { CustomManifestFormState } from './components/propTypes';
-import { ClustersAPI, ClusterWizardStepHeader } from '../../../../common';
-import { isOciPlatformType, isThirdPartyCNI } from '../../utils';
+import { ClustersAPI, ClusterWizardStepHeader, isThirdPartyCNI } from '../../../../common';
+import { getFieldId } from '../../../../common/components/ui/formik';
+import { isOciPlatformType } from '../../utils';
 import DeleteCustomManifestModal from './DeleteCustomManifestModal';
 import { ClustersService } from '../../../services';
 import { useClusterWizardContext } from '../../clusterWizard/ClusterWizardContext';
@@ -80,6 +81,8 @@ export const CustomManifestsPage = ({
     await clusterWizardContext.updateUISettings({ customManifestsAdded: false });
   }, [cluster.id, clusterWizardContext]);
 
+  const fieldId = getFieldId('use-custom-manifests', 'switch');
+
   const tooltipWhenDisabled = isRequired
     ? 'Custom manifests are required when using a third-party CNI or Oracle Cloud Infrastructure.'
     : '';
@@ -133,11 +136,13 @@ export const CustomManifestsPage = ({
           configuration of the cluster.
         </Content>
       </Content>
-      <FormGroup fieldId="use-custom-manifests" label="">
+      <FormGroup fieldId={fieldId} label="">
         <Tooltip content={tooltipWhenDisabled} hidden={!isRequired}>
           <span style={{ display: 'inline-block', cursor: isRequired ? 'not-allowed' : undefined }}>
             <Switch
-              id="use-custom-manifests"
+              id={fieldId}
+              data-testid={fieldId}
+              data-checked={useCustomManifests}
               isChecked={useCustomManifests}
               isDisabled={isRequired}
               onChange={handleSwitchChange}
@@ -146,7 +151,7 @@ export const CustomManifestsPage = ({
           </span>
         </Tooltip>
       </FormGroup>
-      {!useCustomManifests && <div style={{ minHeight: '120px' }} aria-hidden="true" />}
+      {!useCustomManifests && <div style={{ minHeight: '250px' }} aria-hidden="true" />}
       {useCustomManifests && (
         <>
           {reminderAlerts}

package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifestsArray.tsx

@@ -12,6 +12,7 @@ import { CustomManifest } from './CustomManifest';
 import { getEmptyManifest, getManifestName } from './utils';
 import { CustomManifestValues } from '../data/dataTypes';
 import { selectCurrentClusterPermissionsState } from '../../../../store/slices/current-cluster/selectors';
+import { useClusterWizardContext } from '../../../clusterWizard/ClusterWizardContext';
 
 const fieldName = 'manifests';
 
@@ -40,6 +41,8 @@ export const CustomManifestsArray = ({
   clusterId,
   ...props
 }: CustomManifestsArrayProps) => {
+  const { updateUISettings } = useClusterWizardContext();
+
   const [field, { error }] = useField<CustomManifestValues[]>({
     name: fieldName,
   });
@@ -67,6 +70,7 @@ export const CustomManifestsArray = ({
             manifestToRemove['folder'] as string,
             manifestToRemove['filename'],
           );
+          await updateUISettings({ customManifestsUpdated: true });
         } catch (e) {
           handleApiError(e, () =>
             addAlert({
@@ -77,7 +81,7 @@ export const CustomManifestsArray = ({
         }
       }
     },
-    [addAlert, field.value],
+    [addAlert, field.value, updateUISettings],
   );
 
   const onConfirm = React.useCallback(async (): Promise<void> => {

package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfiguration.tsx

@@ -4,7 +4,6 @@ import { useSelector } from 'react-redux';
 import { Stack, StackItem, Tooltip } from '@patternfly/react-core';
 import {
   canBeDualStack,
-  canSelectNetworkTypeSDN,
   CpuArchitecture,
   DUAL_STACK,
   HostSubnets,
@@ -144,9 +143,6 @@ const NetworkConfiguration = ({
   const isDualStack = values.stackType === DUAL_STACK;
 
   const isDualStackSelectable = React.useMemo(() => canBeDualStack(hostSubnets), [hostSubnets]);
-  const isSDNSelectable = React.useMemo(() => {
-    return canSelectNetworkTypeSDN(isSNOCluster, isDualStack);
-  }, [isSNOCluster, isDualStack]);
 
   const [isAdvanced, setAdvanced] = React.useState(
     isDualStack || isAdvNetworkConf(cluster, defaultNetworkSettings),
@@ -262,7 +258,6 @@ const NetworkConfiguration = ({
       <StackItem>
         <NetworkTypeDropDown
           isDisabled={isViewerMode}
-          isSDNSelectable={isSDNSelectable}
           featureSupportLevelData={featureSupportLevelData}
         />
       </StackItem>

package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkTypeDropdown.tsx

@@ -12,82 +12,71 @@ import {
   StackItem,
   Tooltip,
 } from '@patternfly/react-core';
-import {
-  NETWORK_TYPE_CALICO,
-  NETWORK_TYPE_CILIUM,
-  NETWORK_TYPE_CISCO_ACI,
-  NETWORK_TYPE_LABELS,
-  NETWORK_TYPE_NONE,
-  NETWORK_TYPE_OVN,
-  NETWORK_TYPE_SDN,
-} from '../../../../common/config';
 import { getFieldId, ExternalLink } from '../../../../common/components/ui';
 import {
   NewFeatureSupportLevelMap,
   useNewFeatureSupportLevel,
 } from '../../../../common/components/newFeatureSupportLevels';
-import { TechnologyPreview } from '../../../../common/components/ui/TechnologyPreview';
+import NewFeatureSupportLevelBadge from '../../../../common/components/newFeatureSupportLevels/NewFeatureSupportLevelBadge';
 import type { NetworkConfigurationValues } from '../../../../common/types/clusters';
-import { isThirdPartyCNI } from '../../utils';
+import {
+  NETWORK_TYPE_OVN,
+  NETWORK_TYPE_LABELS,
+  NETWORK_TYPE_FEATURE_IDS,
+  isThirdPartyCNI,
+} from '../../../../common/types/networkType';
 import { RED_HAT_CNI_SUPPORT_MATRIX_LINK } from '../../../../common/config/docs_links';
 
 export interface NetworkTypeDropDownProps {
   isDisabled?: boolean;
-  isSDNSelectable: boolean;
   featureSupportLevelData: NewFeatureSupportLevelMap | null;
 }
 
 export const NetworkTypeDropDown = ({
   isDisabled = false,
-  isSDNSelectable,
   featureSupportLevelData,
 }: NetworkTypeDropDownProps) => {
   const [field, , { setValue }] = useField<string>('networkType');
   const [isOpen, setOpen] = React.useState(false);
   const { values } = useFormikContext<NetworkConfigurationValues>();
-  const { getFeatureDisabledReason } = useNewFeatureSupportLevel();
+  const { getFeatureDisabledReason, getFeatureSupportLevel } = useNewFeatureSupportLevel();
   const fieldId = getFieldId('networkType', 'input');
   const showThirdPartyBanner = isThirdPartyCNI(values.networkType);
 
-  const sdnDisabledReason = React.useMemo(() => {
-    if (!isSDNSelectable) {
-      return 'SDN is not supported for SNO clusters or when IPv6 is detected.';
-    }
-    return getFeatureDisabledReason('SDN_NETWORK_TYPE', featureSupportLevelData ?? undefined);
-  }, [isSDNSelectable, featureSupportLevelData, getFeatureDisabledReason]);
-
   React.useEffect(() => {
-    if (field.value === NETWORK_TYPE_SDN && sdnDisabledReason) {
+    if (
+      getFeatureDisabledReason(
+        NETWORK_TYPE_FEATURE_IDS[field.value],
+        featureSupportLevelData ?? undefined,
+      ) !== undefined
+    ) {
       setValue(NETWORK_TYPE_OVN);
     }
-  }, [sdnDisabledReason, field.value, setValue]);
+  }, [field.value, setValue, featureSupportLevelData, getFeatureDisabledReason]);
 
   const currentDisplayValue = NETWORK_TYPE_LABELS[field.value];
 
   const dropdownItems = Object.entries(NETWORK_TYPE_LABELS).map(([value, label]) => {
-    const isSDN = value === NETWORK_TYPE_SDN;
-    const disabledReason = isSDN ? sdnDisabledReason : undefined;
-    const isTechPreview = [
-      NETWORK_TYPE_CISCO_ACI,
-      NETWORK_TYPE_CILIUM,
-      NETWORK_TYPE_CALICO,
-      NETWORK_TYPE_NONE,
-    ].includes(value);
+    const disabledReason = getFeatureDisabledReason(
+      NETWORK_TYPE_FEATURE_IDS[value],
+      featureSupportLevelData ?? undefined,
+    );
+    const featureId = NETWORK_TYPE_FEATURE_IDS[value];
+    const supportLevel = featureId
+      ? getFeatureSupportLevel(featureId, featureSupportLevelData ?? undefined)
+      : undefined;
+    const shouldDisable =
+      supportLevel === 'unavailable' ||
+      supportLevel === 'unsupported' ||
+      disabledReason !== undefined;
     return (
-      <DropdownItem
-        key={value}
-        id={value}
-        value={value}
-        isAriaDisabled={disabledReason !== undefined}
-      >
+      <DropdownItem key={value} id={value} value={value} isAriaDisabled={shouldDisable}>
         <Tooltip hidden={!disabledReason} content={disabledReason} position="top">
           <div>
             {label}
-            {isTechPreview && (
-              <span onClick={(event) => event.stopPropagation()}>
-                <TechnologyPreview testId={`${value}-support-level`} />
-              </span>
-            )}
+            <span onClick={(event) => event.stopPropagation()}>
+              <NewFeatureSupportLevelBadge featureId={featureId} supportLevel={supportLevel} />
+            </span>
           </div>
         </Tooltip>
       </DropdownItem>
@@ -132,11 +121,7 @@ export const NetworkTypeDropDown = ({
       </StackItem>
       {showThirdPartyBanner && (
         <StackItem>
-          <Alert
-            variant={AlertVariant.warning}
-            isInline
-            title="Third-party CNI (Technology Preview)"
-          >
+          <Alert variant={AlertVariant.warning} isInline title="Third-party CNI">
             <Stack hasGutter>
               <StackItem>
                 Third-party CNIs require uploading CNI manifests. Please verify you have the

package/lib/ocm/components/clusterConfiguration/staticIp/commonValidationSchemas.tsx

@@ -92,17 +92,11 @@ export const getIpAddressValidationSchema = (protocolVersion: ProtocolVersion) =
   const protocolVersionLabel = protocolVersion === ProtocolVersion.ipv4 ? 'IPv4' : 'IPv6';
   return Yup.string().test(
     protocolVersion,
-    (params: { value?: unknown }) =>
-      `Value "${
-        params?.value !== undefined ? String(params.value) : ''
-      }" is not a valid ${protocolVersionLabel} address`,
+    `Value \${value} is not a valid ${protocolVersionLabel} address`,
     (value?: string) => {
-      if (value === undefined || value === '') {
+      if (!value) {
         return true;
       }
-      if (typeof value !== 'string') {
-        return false;
-      }
       return isValidAddress(value, protocolVersion);
     },
   );

package/lib/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/FormViewHostsFields.tsx

@@ -96,7 +96,6 @@ const getExpandedHostComponent = (protocolType: StaticProtocolType) => {
               label={`IP address (${getProtocolVersionLabel(protocolVersion)})`}
               fieldId={getFieldId(`${fieldName}.ips.${protocolVersion}`, 'input')}
               key={protocolVersion}
-              isRequired
             >
               <OcmInputField
                 name={`${fieldName}.ips.${protocolVersion}`}

package/lib/ocm/components/clusterConfiguration/staticIp/components/FormViewNetworkWide/FormViewNetworkWide.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { StaticIpForm } from '../StaticIpForm';
 import { StaticIpFormProps, StaticIpViewProps } from '../propTypes';
 import { FormViewHost, FormViewNetworkWideValues } from '../../data/dataTypes';
-import { getNetworkWideValidationSchema } from './formViewNetworkWideValidationSchema';
+import { networkWideValidationSchema } from './formViewNetworkWideValidationSchema';
 import { networkWideToInfraEnvField } from '../../data/formDataToInfraEnvField';
 import { FormViewNetworkWideFields } from './FormViewNetworkWideFields';
 import { getFormData, getFormViewNetworkWideValues } from '../../data/fromInfraEnv';
@@ -22,7 +22,7 @@ export const FormViewNetworkWide: React.FC<StaticIpViewProps> = ({ infraEnv, ...
     setFormProps({
       infraEnv,
       ...props,
-      validationSchema: getNetworkWideValidationSchema(infraEnv.rendezvousIp),
+      validationSchema: networkWideValidationSchema,
       getInitialValues: (infraEnv: InfraEnv) => {
         return getFormViewNetworkWideValues(infraEnv);
       },

package/lib/ocm/components/clusterConfiguration/staticIp/components/FormViewNetworkWide/formViewNetworkWideValidationSchema.tsx

@@ -95,71 +95,32 @@ const getAddressDataValidationSchema = (protocolVersion: ProtocolVersion, ipConf
   });
 };
 
-/**
- * Validates that Rendezvous IP (when set) is within the IPv4 subnet.
- * Default gateway is already validated by getAddressDataValidationSchema (getInMachineNetworkValidationSchema).
- */
-const getRendezvousIpCoherenceTest = (rendezvousIp: string | undefined) => {
-  return Yup.object().test(
-    'rendezvous-ip-in-subnet',
-    'Rendezvous IP must be within the IPv4 subnet.',
-    (value: unknown, context: Yup.TestContext) => {
-      const values = value as FormViewNetworkWideValues | undefined;
-      const machineNetwork = values?.ipConfigs?.ipv4?.machineNetwork;
-      if (
-        !rendezvousIp?.trim() ||
-        !machineNetwork?.ip?.trim() ||
-        machineNetwork.prefixLength === '' ||
-        typeof machineNetwork.prefixLength !== 'number'
-      ) {
-        return true;
-      }
-      const inSubnetSchema = getInMachineNetworkValidationSchema(
-        ProtocolVersion.ipv4,
-        machineNetwork,
-      );
-      if (!inSubnetSchema.isValidSync(rendezvousIp)) {
-        return context.createError({
-          path: 'ipConfigs.ipv4.machineNetwork.ip',
-          message: 'Rendezvous IP must be within the IPv4 subnet.',
-        });
-      }
-      return true;
-    },
-  );
-};
-
-export const getNetworkWideValidationSchema = (rendezvousIp?: string) =>
-  Yup.lazy((values: FormViewNetworkWideValues) => {
-    const ipConfigsValidationSchemas = Yup.object({
-      ipv4: getAddressDataValidationSchema(ProtocolVersion.ipv4, values.ipConfigs.ipv4),
-      ipv6: showProtocolVersion(values.protocolType, ProtocolVersion.ipv6)
-        ? getAddressDataValidationSchema(ProtocolVersion.ipv6, values.ipConfigs.ipv6)
-        : Yup.object<IpConfig>(),
-    });
-
-    const baseSchema = Yup.object({
-      useVlan: Yup.boolean(),
-      vlanId: Yup.mixed().when('useVlan', {
-        is: (useVlan: boolean) => useVlan,
-        then: () =>
-          Yup.number()
-            .required(MUST_BE_A_NUMBER)
-            .min(1, `Must be more than or equal to 1`)
-            .max(MAX_VLAN_ID, `Must be less than or equal to ${MAX_VLAN_ID}`)
-            .test('not-number', MUST_BE_A_NUMBER, () => validateNumber(values.vlanId))
-            .nullable()
-            .transform(transformNumber) as Yup.NumberSchema,
-      }),
-      protocolType: Yup.string(),
-      dns: getDNSValidationSchema(values.protocolType),
-      ipConfigs: ipConfigsValidationSchemas,
-    });
-
-    return baseSchema.concat(getRendezvousIpCoherenceTest(rendezvousIp));
+export const networkWideValidationSchema = Yup.lazy((values: FormViewNetworkWideValues) => {
+  const ipConfigsValidationSchemas = Yup.object({
+    ipv4: getAddressDataValidationSchema(ProtocolVersion.ipv4, values.ipConfigs.ipv4),
+    ipv6: showProtocolVersion(values.protocolType, ProtocolVersion.ipv6)
+      ? getAddressDataValidationSchema(ProtocolVersion.ipv6, values.ipConfigs.ipv6)
+      : Yup.object<IpConfig>(),
   });
 
-export const networkWideValidationSchema = getNetworkWideValidationSchema();
+  return Yup.object({
+    useVlan: Yup.boolean(),
+    vlanId: Yup.mixed().when('useVlan', {
+      is: (useVlan: boolean) => useVlan,
+      then: () =>
+        Yup.number()
+          .required(MUST_BE_A_NUMBER)
+          .min(1, `Must be more than or equal to 1`)
+          .max(MAX_VLAN_ID, `Must be less than or equal to ${MAX_VLAN_ID}`)
+          .test('not-number', MUST_BE_A_NUMBER, () => validateNumber(values.vlanId))
+          .nullable()
+          .transform(transformNumber) as Yup.NumberSchema,
+    }),
+    protocolType: Yup.string(),
+    dns: getDNSValidationSchema(values.protocolType),
+    ipConfigs: ipConfigsValidationSchemas,
+  });
+});
 
 export const validateNumber = (vlanId: FormViewNetworkWideValues['vlanId']) => {
   //We need to validate that value is a number(without letters) and is not an exponential number (ex: 1e2)

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

@@ -39,6 +39,7 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
   const navigate = useNavigate();
   const dispatch = useDispatch();
   const { usedClusterNames } = useUsedClusterNames(cluster?.id || '');
+  const pullSecret = usePullSecret();
   const {
     error: errorOCPVersions,
     loading: loadingOCPVersions,
@@ -46,8 +47,6 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
   } = useOpenShiftVersionsContext();
   const location = useLocation();
   const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
-  const defaultPullSecret = usePullSecret();
-  const pullSecret = isSingleClusterFeatureEnabled ? infraEnv?.pullSecret || '' : defaultPullSecret;
 
   const handleClusterUpdate = React.useCallback(
     async (clusterId: Cluster['id'], params: ClusterDetailsUpdateParams) => {

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

@@ -11,9 +11,10 @@ import {
   getRichTextValidation,
   useAlerts,
   TechnologyPreview,
+  OpenshiftVersionOptionType,
+  getFormikErrorFields,
 } from '../../../common';
 import { canNextClusterDetails } from './wizardTransition';
-import { OpenshiftVersionOptionType, getFormikErrorFields } from '../../../common';
 import ClusterWizardFooter from './ClusterWizardFooter';
 import { isInOcm } from '../../../common/api';
 import {

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

@@ -3,7 +3,6 @@ import { HostsNetworkConfigurationType } from '../../services';
 import { StaticIpView } from '../clusterConfiguration/staticIp/data/dataTypes';
 import { ClusterWizardStepsType } from './wizardTransition';
 import { UISettingsValues } from '../../../common';
-import { InfraEnv } from '@openshift-assisted/types/assisted-installer-service';
 
 export type ClusterWizardContextType = {
   currentStepId: ClusterWizardStepsType;
@@ -19,8 +18,6 @@ export type ClusterWizardContextType = {
   uiSettings?: UISettingsValues;
   installDisconnected: boolean;
   setInstallDisconnected: (enabled: boolean) => void;
-  disconnectedInfraEnv?: InfraEnv;
-  setDisconnectedInfraEnv: (infraEnv: InfraEnv | undefined) => void;
 };
 
 export const ClusterWizardContext = React.createContext<ClusterWizardContextType | null>(null);

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

@@ -13,13 +13,17 @@ import { HostsNetworkConfigurationType } from '../../services';
 import { defaultWizardSteps, staticIpFormViewSubSteps } from './constants';
 import { StaticIpView } from '../clusterConfiguration/staticIp/data/dataTypes';
 import { getStaticIpInfo } from '../clusterConfiguration/staticIp/data/fromInfraEnv';
-import { AssistedInstallerOCMPermissionTypesListType, useAlerts } from '../../../common';
+import {
+  AssistedInstallerOCMPermissionTypesListType,
+  useAlerts,
+  isThirdPartyCNI,
+} from '../../../common';
 import useSetClusterPermissions from '../../hooks/useSetClusterPermissions';
 import { Cluster, InfraEnv } from '@openshift-assisted/types/assisted-installer-service';
 import { useUISettings } from '../../hooks';
 import { AlertVariant } from '@patternfly/react-core';
 import { useFeature } from '../../hooks/use-feature';
-import { isOciPlatformType, isThirdPartyCNI } from '../utils';
+import { isOciPlatformType } from '../utils';
 
 const addStepToClusterWizard = (
   wizardStepIds: ClusterWizardStepsType[],
@@ -72,33 +76,6 @@ const getWizardStepIds = (
   return stepsCopy;
 };
 
-// Same logic as getWizardStepIds but for disconnected flow
-// Adds static IP steps after 'disconnected-optional-configurations' instead of 'cluster-details'
-const getDisconnectedWizardStepIds = (
-  wizardStepIds: ClusterWizardStepsType[] | undefined,
-  staticIpView?: StaticIpView | 'dhcp-selected',
-): ClusterWizardStepsType[] => {
-  let stepsCopy = wizardStepIds ? [...wizardStepIds] : [...disconnectedSteps];
-  if (staticIpView === StaticIpView.YAML) {
-    stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-network-wide-configurations', 2);
-    stepsCopy = addStepToClusterWizard(stepsCopy, 'disconnected-optional-configurations', [
-      'static-ip-yaml-view',
-    ]);
-  } else if (staticIpView === StaticIpView.FORM) {
-    stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-yaml-view', 1);
-    stepsCopy = addStepToClusterWizard(
-      stepsCopy,
-      'disconnected-optional-configurations',
-      staticIpFormViewSubSteps,
-    );
-  } else if (staticIpView === 'dhcp-selected') {
-    stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-network-wide-configurations', 2);
-    stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-yaml-view', 1);
-  }
-
-  return stepsCopy;
-};
-
 const ClusterWizardContextProvider = ({
   children,
   cluster,
@@ -112,13 +89,8 @@ const ClusterWizardContextProvider = ({
   const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
   const [currentStepId, setCurrentStepId] = React.useState<ClusterWizardStepsType>();
   const [connectedWizardStepIds, setWizardStepIds] = React.useState<ClusterWizardStepsType[]>();
-  const [disconnectedWizardStepIds, setDisconnectedWizardStepIds] =
-    React.useState<ClusterWizardStepsType[]>(disconnectedSteps);
   const [wizardPerPage, setWizardPerPage] = React.useState(10);
   const [installDisconnected, setInstallDisconnected] = React.useState(false);
-  const [disconnectedInfraEnv, setDisconnectedInfraEnv] = React.useState<InfraEnv | undefined>(
-    infraEnv,
-  );
   const location = useLocation();
   const locationState = location.state as ClusterWizardFlowStateType | undefined;
   const {
@@ -130,7 +102,7 @@ const ClusterWizardContextProvider = ({
   const { clearAlerts, addAlert, alerts } = useAlerts();
   const setClusterPermissions = useSetClusterPermissions();
 
-  const wizardStepIds = installDisconnected ? disconnectedWizardStepIds : connectedWizardStepIds;
+  const wizardStepIds = installDisconnected ? disconnectedSteps : connectedWizardStepIds;
 
   React.useEffect(() => {
     if (!UISettingsLoading) {
@@ -190,29 +162,18 @@ const ClusterWizardContextProvider = ({
 
     const handleMoveFromStaticIp = () => {
       //if static ip view change wasn't persisted, moving from static ip step should change the wizard steps to match the view in the infra env
-      const currentInfraEnv = installDisconnected ? disconnectedInfraEnv : infraEnv;
-      const staticIpInfo = currentInfraEnv ? getStaticIpInfo(currentInfraEnv) : undefined;
+      const staticIpInfo = infraEnv ? getStaticIpInfo(infraEnv) : undefined;
       if (!staticIpInfo) {
         throw `Wizard step is currently ${currentStepId}, but no static ip info is defined`;
       }
 
-      if (installDisconnected) {
-        // For disconnected wizard, update wizard steps directly (same pattern as connected)
-        const newStepIds = getDisconnectedWizardStepIds(
-          disconnectedWizardStepIds,
-          staticIpInfo.view,
-        );
-        setDisconnectedWizardStepIds(newStepIds);
-      } else {
-        // For connected wizard, update wizard steps directly
-        const newStepIds = getWizardStepIds(
-          wizardStepIds,
-          staticIpInfo.view,
+      const newStepIds = getWizardStepIds(
+        wizardStepIds,
+        staticIpInfo.view,
 
-          isSingleClusterFeatureEnabled,
-        );
-        setWizardStepIds(newStepIds);
-      }
+        isSingleClusterFeatureEnabled,
+      );
+      setWizardStepIds(newStepIds);
     };
 
     const onSetCurrentStepId = (stepId: ClusterWizardStepsType) => {
@@ -244,43 +205,22 @@ const ClusterWizardContextProvider = ({
         } else {
           setCurrentStepId('static-ip-network-wide-configurations');
         }
-        if (installDisconnected) {
-          // For disconnected wizard, update wizard steps (same pattern as connected)
-          setDisconnectedWizardStepIds(
-            getDisconnectedWizardStepIds(disconnectedWizardStepIds, view),
-          );
-        } else {
-          setWizardStepIds(getWizardStepIds(wizardStepIds, view, isSingleClusterFeatureEnabled));
-        }
+        setWizardStepIds(getWizardStepIds(wizardStepIds, view, isSingleClusterFeatureEnabled));
       },
       onUpdateHostNetworkConfigType(type: HostsNetworkConfigurationType): void {
-        if (installDisconnected) {
-          // For disconnected wizard, update wizard steps (same pattern as connected)
-          if (type === HostsNetworkConfigurationType.STATIC) {
-            setDisconnectedWizardStepIds(
-              getDisconnectedWizardStepIds(disconnectedWizardStepIds, StaticIpView.FORM),
-            );
-          } else {
-            setDisconnectedWizardStepIds(
-              getDisconnectedWizardStepIds(disconnectedWizardStepIds, 'dhcp-selected'),
-            );
-          }
-        } else {
-          // For connected wizard, update wizard steps directly
-          if (type === HostsNetworkConfigurationType.STATIC) {
-            setWizardStepIds(
-              getWizardStepIds(
-                wizardStepIds,
-                StaticIpView.FORM,
+        if (type === HostsNetworkConfigurationType.STATIC) {
+          setWizardStepIds(
+            getWizardStepIds(
+              wizardStepIds,
+              StaticIpView.FORM,
 
-                isSingleClusterFeatureEnabled,
-              ),
-            );
-          } else {
-            setWizardStepIds(
-              getWizardStepIds(wizardStepIds, 'dhcp-selected', isSingleClusterFeatureEnabled),
-            );
-          }
+              isSingleClusterFeatureEnabled,
+            ),
+          );
+        } else {
+          setWizardStepIds(
+            getWizardStepIds(wizardStepIds, 'dhcp-selected', isSingleClusterFeatureEnabled),
+          );
         }
       },
       wizardStepIds: wizardStepIds,
@@ -299,8 +239,6 @@ const ClusterWizardContextProvider = ({
           connectedWizardStepIds?.length && onSetCurrentStepId(connectedWizardStepIds[0]);
         }
       },
-      disconnectedInfraEnv,
-      setDisconnectedInfraEnv,
     };
   }, [
     wizardStepIds,
@@ -313,8 +251,6 @@ const ClusterWizardContextProvider = ({
     updateUISettings,
     installDisconnected,
     connectedWizardStepIds,
-    disconnectedWizardStepIds,
-    disconnectedInfraEnv,
   ]);
 
   if (!contextValue) {