@openshift-assisted/ui-lib 2.51.0 → 2.51.2

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) {

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

@@ -17,8 +17,6 @@ import { onFetchEvents } from '../fetching/fetchEvents';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 import { useFeature } from '../../hooks/use-feature';
 import { useModalDialogsContext } from '../hosts/ModalDialogsContext';
-import ClustersService from '../../services/ClustersService';
-import { handleApiError, getApiErrorMessage } from '../../../common/api';
 
 type ClusterValidationSectionProps = {
   cluster?: Cluster;
@@ -73,7 +71,6 @@ type ClusterWizardFooterProps = WizardFooterGenericProps & {
   errorFields?: string[];
   alertTitle?: string;
   alertContent?: string | null;
-  disconnectedClusterId?: string;
 };
 
 const ClusterWizardFooter = ({
@@ -83,37 +80,19 @@ const ClusterWizardFooter = ({
   alertTitle,
   alertContent,
   onCancel,
-  disconnectedClusterId,
   ...rest
 }: ClusterWizardFooterProps) => {
-  const { alerts, addAlert } = useAlerts();
+  const { alerts } = useAlerts();
   const navigate = useNavigate();
   const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
   const { currentStepId } = useClusterWizardContext();
   const { resetSingleClusterDialog } = useModalDialogsContext();
-  const { setDisconnectedInfraEnv } = useClusterWizardContext();
 
-  const handleCancel = React.useCallback(async () => {
-    if (disconnectedClusterId) {
-      try {
-        await ClustersService.remove(disconnectedClusterId);
-      } catch (e) {
-        handleApiError(e, () =>
-          addAlert({
-            title: 'Failed to remove cluster',
-            message: getApiErrorMessage(e),
-          }),
-        );
-      }
-    }
-    setDisconnectedInfraEnv(undefined);
-    navigate('/cluster-list');
-  }, [navigate, setDisconnectedInfraEnv, addAlert, disconnectedClusterId]);
+  const handleCancel = React.useCallback(() => navigate('/cluster-list'), [navigate]);
 
-  const handleReset = React.useCallback(
-    () => resetSingleClusterDialog.open({ cluster }),
-    [resetSingleClusterDialog, cluster],
-  );
+  const handleReset = React.useCallback(() => {
+    resetSingleClusterDialog.open({ cluster });
+  }, [resetSingleClusterDialog, cluster]);
 
   const alertsSection = alerts.length ? <Alerts /> : undefined;
 

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

@@ -4,10 +4,7 @@ import ClusterDetails from './ClusterDetails';
 import { useClusterWizardContext } from './ClusterWizardContext';
 import ReviewStep from './disconnected/ReviewStep';
 import BasicStep from './disconnected/BasicStep';
-import OptionalConfigurationsStep from './disconnected/OptionalConfigurationsStep';
-import DisconnectedStaticIp from './disconnected/DisconnectedStaticIp';
 import { ClusterWizardStepsType } from './wizardTransition';
-import { ModalDialogsContextProvider } from '../hosts/ModalDialogsContext';
 
 const getCurrentStep = (currentStepId: ClusterWizardStepsType) => {
   switch (currentStepId) {
@@ -15,12 +12,6 @@ const getCurrentStep = (currentStepId: ClusterWizardStepsType) => {
       return <ReviewStep />;
     case 'disconnected-basic':
       return <BasicStep />;
-    case 'disconnected-optional-configurations':
-      return <OptionalConfigurationsStep />;
-    case 'static-ip-yaml-view':
-    case 'static-ip-network-wide-configurations':
-    case 'static-ip-host-configurations':
-      return <DisconnectedStaticIp />;
     default:
       return <ClusterDetails />;
   }
@@ -29,11 +20,9 @@ const getCurrentStep = (currentStepId: ClusterWizardStepsType) => {
 const NewClusterWizard: React.FC = () => {
   const { currentStepId } = useClusterWizardContext();
   return (
-    <ModalDialogsContextProvider>
-      <div className={classNames('pf-v6-c-wizard', 'cluster-wizard')}>
-        {getCurrentStep(currentStepId)}
-      </div>
-    </ModalDialogsContextProvider>
+    <div className={classNames('pf-v6-c-wizard', 'cluster-wizard')}>
+      {getCurrentStep(currentStepId)}
+    </div>
   );
 };
 

package/lib/ocm/components/clusterWizard/constants.ts

@@ -14,7 +14,6 @@ export const wizardStepNames: { [key in ClusterWizardStepsType]: string } = {
   'credentials-download': 'Download credentials',
   'disconnected-review': 'Review and download ISO',
   'disconnected-basic': 'Basic information',
-  'disconnected-optional-configurations': 'Optional configurations',
 };
 
 export const defaultWizardSteps: ClusterWizardStepsType[] = [

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

@@ -7,162 +7,61 @@ import {
   StaticTextField,
   useTranslation,
 } from '../../../../common';
-import { Flex, Grid, GridItem, Form, Content, Spinner } from '@patternfly/react-core';
+import { Flex, Grid, GridItem, Form, Content } from '@patternfly/react-core';
 import OcmOpenShiftVersion from '../../clusterConfiguration/OcmOpenShiftVersion';
 import { useClusterWizardContext } from '../ClusterWizardContext';
 import ClusterWizardFooter from '../ClusterWizardFooter';
 import ClusterWizardNavigation from '../ClusterWizardNavigation';
 import { WithErrorBoundary } from '../../../../common/components/ErrorHandling/WithErrorBoundary';
 import InstallDisconnectedSwitch from './InstallDisconnectedSwitch';
-import { Formik, useFormikContext } from 'formik';
-import ClustersService from '../../../services/ClustersService';
-import { handleApiError, getApiErrorMessage } from '../../../../common/api';
-import { useAlerts } from '../../../../common/components/AlertsContextProvider';
-import { AlertVariant } from '@patternfly/react-core';
-import { ClusterWizardFlowStateNew } from '../wizardTransition';
-import { useLocation, useNavigate, useParams } from 'react-router-dom-v5-compat';
-import { AxiosResponse } from 'axios';
-import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
-import OcmOpenShiftVersionSelect from '../../clusterConfiguration/OcmOpenShiftVersionSelect';
+import { Formik } from 'formik';
 
-type BasicStepFormikValues = {
-  openshiftVersion: string;
-  customOpenshiftSelect: string | null;
-};
-
-const BasicStepForm = () => {
-  const { clusterId } = useParams<{ clusterId: string }>();
-  const [isLoading, setIsLoading] = React.useState(true);
-  const [cluster, setCluster] = React.useState<Cluster>();
-
-  const { values } = useFormikContext<BasicStepFormikValues>();
+const BasicStep = () => {
   const { t } = useTranslation();
   const { moveNext } = useClusterWizardContext();
-  const { addAlert } = useAlerts();
-  const [isSubmitting, setIsSubmitting] = React.useState(false);
-  const navigate = useNavigate();
-  const location = useLocation();
-  const currentPath = location.pathname;
-
-  React.useEffect(() => {
-    if (!clusterId) {
-      setIsLoading(false);
-    } else {
-      void (async () => {
-        setIsLoading(true);
-        try {
-          setCluster(await ClustersService.get(clusterId));
-        } catch (error) {
-          handleApiError(error, () => {
-            addAlert({
-              title: 'Failed to fetch disconnected cluster',
-              message: getApiErrorMessage(error),
-              variant: AlertVariant.danger,
-            });
-          });
-        } finally {
-          setIsLoading(false);
-        }
-      })();
-    }
-  }, [clusterId, addAlert]);
-
-  const createCluster = async () => {
-    try {
-      setIsSubmitting(true);
-      // Create cluster only - infraEnv will be created in OptionalConfigurationsStep
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-      const { data: disconnectedCluster }: AxiosResponse<Cluster> =
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-        await ClustersService.registerDisconnected({
-          name: 'disconnected-cluster',
-          openshiftVersion: values.openshiftVersion,
-        });
-      navigate(`${currentPath}/${disconnectedCluster.id}`, {
-        state: ClusterWizardFlowStateNew,
-      });
-      moveNext();
-    } catch (error: unknown) {
-      handleApiError(error, () => {
-        addAlert({
-          title: 'Failed to create disconnected cluster',
-          message: getApiErrorMessage(error),
-          variant: AlertVariant.danger,
-        });
-      });
-    } finally {
-      setIsSubmitting(false);
-    }
-  };
 
   return (
-    <ClusterWizardStep
-      navigation={<ClusterWizardNavigation />}
-      footer={
-        <ClusterWizardFooter
-          onNext={() => {
-            clusterId ? moveNext() : void createCluster();
-          }}
-          isSubmitting={isSubmitting}
-          isNextDisabled={isLoading || (cluster ? false : !values.openshiftVersion)}
-          disconnectedClusterId={clusterId}
-        />
-      }
+    <Formik
+      initialValues={{}}
+      onSubmit={() => {
+        // nothing to do
+      }}
     >
-      <WithErrorBoundary title="Failed to load Basic step">
-        <Grid hasGutter>
-          <GridItem>
-            <Content component="h2">Basic information</Content>
-          </GridItem>
-          <GridItem>
-            <Flex alignItems={{ default: 'alignItemsCenter' }} gap={{ default: 'gapSm' }}>
-              <TechnologyPreview />
-              <InstallDisconnectedSwitch isDisabled={!!clusterId} />
-              <span>{t("ai:I'm installing on a disconnected/air-gapped/secured environment")}</span>
-            </Flex>
-          </GridItem>
-          <GridItem>
-            <Form id="wizard-cluster-basic-info__form">
-              {isLoading ? (
-                <Spinner />
-              ) : cluster ? (
-                <OcmOpenShiftVersion
-                  openshiftVersion={cluster.openshiftVersion || ''}
-                  withPreviewText
-                  withMultiText
-                >
+      <ClusterWizardStep
+        navigation={<ClusterWizardNavigation />}
+        footer={<ClusterWizardFooter onNext={moveNext} />}
+      >
+        <WithErrorBoundary title="Failed to load Basic step">
+          <Grid hasGutter>
+            <GridItem>
+              <Content component="h2">Basic information</Content>
+            </GridItem>
+            <GridItem>
+              <Flex alignItems={{ default: 'alignItemsCenter' }} gap={{ default: 'gapSm' }}>
+                <TechnologyPreview />
+                <InstallDisconnectedSwitch />
+                <span>
+                  {t("ai:I'm installing on a disconnected/air-gapped/secured environment")}
+                </span>
+              </Flex>
+            </GridItem>
+            <GridItem>
+              <Form id="wizard-cluster-basic-info__form">
+                <OcmOpenShiftVersion openshiftVersion="4.20" withPreviewText withMultiText>
                   <ExternalLink href={`${window.location.origin}/${OCP_RELEASES_PAGE}`}>
                     <span data-ouia-id="openshift-releases-link">
                       {t('ai:Learn more about OpenShift releases')}
                     </span>
                   </ExternalLink>
                 </OcmOpenShiftVersion>
-              ) : (
-                <OcmOpenShiftVersionSelect minVersionAllowed={4021} />
-              )}
-              <StaticTextField name="cpuArchitecture" label="CPU architecture" isRequired>
-                x86_64
-              </StaticTextField>
-            </Form>
-          </GridItem>
-        </Grid>
-      </WithErrorBoundary>
-    </ClusterWizardStep>
-  );
-};
-
-const BasicStep = () => {
-  return (
-    <Formik<BasicStepFormikValues>
-      initialValues={{
-        openshiftVersion: '',
-        customOpenshiftSelect: null,
-      }}
-      onSubmit={() => {
-        // nothing to do
-      }}
-    >
-      <BasicStepForm />
+                <StaticTextField name="cpuArchitecture" label="CPU architecture" isRequired>
+                  x86_64
+                </StaticTextField>
+              </Form>
+            </GridItem>
+          </Grid>
+        </WithErrorBoundary>
+      </ClusterWizardStep>
     </Formik>
   );
 };

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

@@ -25,13 +25,16 @@ import {
   Content,
 } from '@patternfly/react-core';
 import { Formik } from 'formik';
-import { useNavigate, useParams } from 'react-router-dom-v5-compat';
+import { saveAs } from 'file-saver';
+import { useNavigate } from 'react-router-dom-v5-compat';
 
 import { getOperatorSpecs } from '../../../../common/components/operators/operatorSpecs';
 
+const downloadUrl =
+  'https://mirror.openshift.com/pub/cgw/assisted-installer-disconnected/latest/agent-ove.x86_64.iso';
+
 const ReviewStep = () => {
-  const { moveBack, disconnectedInfraEnv } = useClusterWizardContext();
-  const { clusterId } = useParams<{ clusterId: string }>();
+  const { moveBack } = useClusterWizardContext();
   const opSpecs = getOperatorSpecs(() => undefined);
   const navigate = useNavigate();
 
@@ -47,14 +50,11 @@ const ReviewStep = () => {
         footer={
           <ClusterWizardFooter
             onNext={() => {
-              if (disconnectedInfraEnv?.downloadUrl) {
-                window.open(disconnectedInfraEnv.downloadUrl, '_blank');
-              }
+              downloadUrl && saveAs(downloadUrl);
               navigate('/cluster-list');
             }}
             onBack={moveBack}
             nextButtonText="Download ISO"
-            disconnectedClusterId={clusterId}
           />
         }
       >
@@ -96,19 +96,9 @@ const ReviewStep = () => {
               </List>
             </Alert>
             <DescriptionList isHorizontal>
-              {disconnectedInfraEnv?.rendezvousIp && (
-                <DescriptionListGroup>
-                  <DescriptionListTerm>Rendezvous IP</DescriptionListTerm>
-                  <DescriptionListDescription>
-                    {disconnectedInfraEnv?.rendezvousIp}
-                  </DescriptionListDescription>
-                </DescriptionListGroup>
-              )}
               <DescriptionListGroup>
                 <DescriptionListTerm>OpenShift version</DescriptionListTerm>
-                <DescriptionListDescription>
-                  {disconnectedInfraEnv?.openshiftVersion || ''}
-                </DescriptionListDescription>
+                <DescriptionListDescription>4.20</DescriptionListDescription>
               </DescriptionListGroup>
               <DescriptionListGroup>
                 <DescriptionListTerm>CPU architecture</DescriptionListTerm>
@@ -116,7 +106,7 @@ const ReviewStep = () => {
               </DescriptionListGroup>
               <DescriptionListGroup>
                 <DescriptionListTerm>ISO size</DescriptionListTerm>
-                <DescriptionListDescription>approx. 50 GB</DescriptionListDescription>
+                <DescriptionListDescription>approx. 43.5GB</DescriptionListDescription>
               </DescriptionListGroup>
             </DescriptionList>
           </Grid>

package/lib/ocm/components/clusterWizard/index.ts

@@ -2,5 +2,4 @@ export { default as ClusterDetailsForm } from './ClusterDetailsForm';
 export { default as NewClusterWizard } from './NewClusterWizard';
 export { default as ClusterWizard } from './ClusterWizard';
 export { default as ClusterWizardContextProvider } from './ClusterWizardContextProvider';
-export { useClusterWizardContext } from './ClusterWizardContext';
 export { OpenShiftVersionsContextProvider } from './OpenShiftVersionsContext';

package/lib/ocm/components/clusterWizard/wizardTransition.ts

@@ -31,8 +31,7 @@ export type ClusterWizardStepsType =
   | 'custom-manifests'
   | 'credentials-download'
   | 'disconnected-basic'
-  | 'disconnected-review'
-  | 'disconnected-optional-configurations';
+  | 'disconnected-review';
 
 const wizardStepsOrder: ClusterWizardStepsType[] = [
   'cluster-details',
@@ -50,7 +49,6 @@ const wizardStepsOrder: ClusterWizardStepsType[] = [
 
 export const disconnectedSteps: ClusterWizardStepsType[] = [
   'disconnected-basic',
-  'disconnected-optional-configurations',
   'disconnected-review',
 ];
 
@@ -270,7 +268,6 @@ const credentialsValidationMap = buildEmptyValidationsMap();
 const customManifestsValidationsMap = buildEmptyValidationsMap();
 const disconnectedReviewValidationsMap = buildEmptyValidationsMap();
 const disconnectedBasicValidationsMap = buildEmptyValidationsMap();
-const disconnectedOptionalConfigurationsValidationsMap = buildEmptyValidationsMap();
 
 export const wizardStepsValidationsMap: WizardStepsValidationMap<ClusterWizardStepsType> = {
   'cluster-details': clusterDetailsStepValidationsMap,
@@ -286,7 +283,6 @@ export const wizardStepsValidationsMap: WizardStepsValidationMap<ClusterWizardSt
   'credentials-download': credentialsValidationMap,
   'disconnected-review': disconnectedReviewValidationsMap,
   'disconnected-basic': disconnectedBasicValidationsMap,
-  'disconnected-optional-configurations': disconnectedOptionalConfigurationsValidationsMap,
 };
 
 export const allClusterWizardSoftValidationIds =

package/lib/ocm/components/featureSupportLevels/featureStateUtils.ts

@@ -3,6 +3,7 @@ import {
   architectureData,
   CpuArchitecture,
   FeatureId,
+  isDualStack,
   isSNO,
   SupportedCpuArchitecture,
 } from '../../../common';
@@ -143,6 +144,19 @@ const getOciDisabledReason = (cpuArchitecture: string | undefined, isSupported:
   }
 };
 
+const getSDNDisabledReason = (cluster: Cluster | undefined, isSupported: boolean) => {
+  if (cluster && isSNO(cluster)) {
+    return 'SDN is not supported for single-node clusters.';
+  }
+  if (cluster && isDualStack(cluster)) {
+    return 'SDN is not supported for dual-stack clusters.';
+  }
+  if (!isSupported) {
+    return 'SDN is not supported for the selected configuration.';
+  }
+  return undefined;
+};
+
 export const getNewFeatureDisabledReason = (
   featureId: FeatureId,
   cluster: Cluster | undefined,
@@ -182,10 +196,7 @@ export const getNewFeatureDisabledReason = (
       return getOscDisabledReason(cluster, activeFeatureConfiguration, isSupported);
     }
     case 'SDN_NETWORK_TYPE': {
-      if (!isSupported) {
-        return 'SDN is not available for the selected configuration.';
-      }
-      return undefined;
+      return getSDNDisabledReason(cluster, isSupported);
     }
     case 'NETWORK_TYPE_SELECTION': {
       return getNetworkTypeSelectionDisabledReason(cluster);

package/lib/ocm/components/utils.ts

@@ -1,11 +1,7 @@
 import { Cluster } from '@openshift-assisted/types/./assisted-installer-service';
-import { NETWORK_TYPE_OVN, NETWORK_TYPE_SDN } from '../../common/config';
 
 export const isOciPlatformType = (cluster: Cluster): boolean => {
   return (
     cluster.platform?.type === 'external' && cluster.platform?.external?.platformName === 'oci'
   );
 };
-
-export const isThirdPartyCNI = (networkType: Cluster['networkType']): boolean =>
-  !!networkType && networkType !== NETWORK_TYPE_OVN && networkType !== NETWORK_TYPE_SDN;

package/lib/ocm/hooks/useInfraEnvId.ts

@@ -55,12 +55,12 @@ export default function useInfraEnvId(
   ]);
 
   React.useEffect(() => {
-    if (!clusterId && !isSingleClusterFeatureEnabled) {
+    if (!clusterId) {
       setError('Missing clusterId to load infrastructure environment');
     } else if (!infraEnvId) {
       void findInfraEnvId();
     }
-  }, [clusterId, findInfraEnvId, infraEnvId, isSingleClusterFeatureEnabled]);
+  }, [clusterId, findInfraEnvId, infraEnvId]);
 
   return { infraEnvId, error };
 }