@openshift-assisted/ui-lib 2.56.1 → 2.56.2

package/build/cjs/ocm/components/wizard/wizardComponents/ClusterWizardNavigation.js

@@ -1,10 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClusterWizardNavigation = void 0;
+exports.ClusterWizardNavigation = exports.getWizardNavEntries = void 0;
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importDefault(require("react"));
 const react_core_1 = require("@patternfly/react-core");
 const wizardTransition_1 = require("../utils/wizardTransition");
+const getWizardNavEntries = (wizardStepIds) => {
+    const entries = [];
+    let i = 0;
+    let visualNumber = 1;
+    while (i < wizardStepIds.length) {
+        const stepId = wizardStepIds[i];
+        if (stepId === 'static-ip-network-wide-configurations') {
+            entries.push({ stepId, visualNumber, isStaticIpFormGroup: true });
+            i += 2;
+        }
+        else {
+            entries.push({ stepId, visualNumber, isStaticIpFormGroup: false });
+            i += 1;
+        }
+        visualNumber += 1;
+    }
+    return entries;
+};
+exports.getWizardNavEntries = getWizardNavEntries;
 const ClusterWizardContext_1 = require("../clusterWizardContext/ClusterWizardContext");
 const constants_1 = require("../constants");
 const WizardNavItem_1 = tslib_1.__importDefault(require("../../../../common/components/ui/WizardNavItem"));
@@ -39,31 +58,23 @@ const ClusterWizardNavigation = ({ cluster }) => {
     const isStepDisabled = (idx, stepId) => {
         return stepId === 'cluster-details' ? false : isStepIdxAfterCurrent(idx);
     };
-    const getNavItem = (idx, stepId) => {
-        return (react_1.default.createElement(WizardNavItem_1.default, { stepIndex: idx, key: stepId, id: `wizard-nv-${stepId}`, content: constants_1.wizardStepNames[stepId], onClick: () => clusterWizardContext.setCurrentStepId(stepId), isCurrent: clusterWizardContext.currentStepId === stepId, isDisabled: isStepDisabled(idx, stepId), isValid: () => isStepValid(stepId, cluster), "data-testid": `cluster-wizard-nav-item-${stepId}` }));
+    const getNavItem = (idx, stepId, visualNumber) => {
+        return (react_1.default.createElement(WizardNavItem_1.default, { stepIndex: idx, key: stepId, id: `wizard-nv-${stepId}`, content: constants_1.wizardStepNames[stepId], onClick: () => clusterWizardContext.setCurrentStepId(stepId), isCurrent: clusterWizardContext.currentStepId === stepId, isDisabled: isStepDisabled(idx, stepId), isValid: () => isStepValid(stepId, cluster), "data-testid": `cluster-wizard-nav-item-${stepId}`, style: { '--cluster-wizard-step-number': `"${visualNumber}"` } }));
     };
-    const getStaticIpFormViewNavItem = (idx) => {
-        return (react_1.default.createElement(WizardNavItem_1.default, { stepIndex: idx, isExpandable: true, content: "Static network configurations", key: "static-network-configuration-form-view", isCurrent: (0, wizardTransition_1.isStaticIpStep)(clusterWizardContext.currentStepId), isDisabled: isStepIdxAfterCurrent(idx), "data-testid": `cluster-wizard-nav-item-static-network-configuration-form-view` },
+    const getStaticIpFormViewNavItem = (idx, visualNumber) => {
+        return (react_1.default.createElement(WizardNavItem_1.default, { stepIndex: idx, isExpandable: true, content: "Static network configurations", key: "static-network-configuration-form-view", isCurrent: (0, wizardTransition_1.isStaticIpStep)(clusterWizardContext.currentStepId), isDisabled: isStepIdxAfterCurrent(idx), "data-testid": `cluster-wizard-nav-item-static-network-configuration-form-view`, style: { '--cluster-wizard-step-number': `"${visualNumber}"` } },
             react_1.default.createElement(react_core_1.WizardNav, { isInnerList: true, "data-testid": "cluster-wizard-nav-item-static-network-configuration-form-view-inner-list" }, constants_1.staticIpFormViewSubSteps.map((stepId, subIdx) => {
-                return getNavItem(idx + subIdx, stepId);
+                return getNavItem(idx + subIdx, stepId, visualNumber);
             }))));
     };
     const getWizardNavItems = () => {
-        const navItems = [];
-        let i = 0;
-        while (i < clusterWizardContext.wizardStepIds.length) {
-            const stepId = clusterWizardContext.wizardStepIds[i];
-            if (stepId !== 'static-ip-network-wide-configurations') {
-                navItems.push(getNavItem(i, stepId));
-                i += 1;
-            }
-            else {
-                navItems.push(getStaticIpFormViewNavItem(i));
-                //skip iteration on form view sub steps
-                i += 2;
+        return (0, exports.getWizardNavEntries)(clusterWizardContext.wizardStepIds).map((entry) => {
+            const idx = clusterWizardContext.wizardStepIds.indexOf(entry.stepId);
+            if (entry.isStaticIpFormGroup) {
+                return getStaticIpFormViewNavItem(idx, entry.visualNumber);
             }
-        }
-        return navItems;
+            return getNavItem(idx, entry.stepId, entry.visualNumber);
+        });
     };
     return react_1.default.createElement(react_core_1.WizardNav, { "data-testid": "cluster-wizard-nav" }, getWizardNavItems());
 };

package/build/cjs/ocm/components/wizard/wizardComponents/ClusterWizardNavigation.js.map

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

package/lib/common/components/clusterWizard/ClusterWizardStep.css

@@ -2,6 +2,15 @@
   white-space: nowrap;
 }
 
+/* PatternFly CSS counters do not re-sequence when nav items are added or removed */
+.cluster-wizard-step
+  .pf-v6-c-wizard__nav
+  > .pf-v6-c-wizard__nav-list
+  > .pf-v6-c-wizard__nav-item
+  > .pf-v6-c-wizard__nav-link::before {
+  content: var(--cluster-wizard-step-number, counter(wizard-nav-count));
+}
+
 .wizard-nav-item-warning-icon {
   margin-left: var(--pf-v6-global--spacer--sm);
 }

package/lib/common/config/constants.ts

@@ -329,6 +329,7 @@ export const singleClusterOperators = [
   OPERATOR_NAME_NUMA_RESOURCES,
   OPERATOR_NAME_LOKI,
   OPERATOR_NAME_OPENSHIFT_LOGGING,
+  OPERATOR_NAME_LVM,
 ];
 
 export const singleClusterBundles = ['virtualization'];

package/lib/common/validationSchemas/_validationSchemas.test.ts

@@ -131,6 +131,7 @@ describe('validationSchemas', () => {
 
   test('ipValidationSchema', async () => {
     const valid = [
+      '',
       '1.1.1.1',
       '0.0.0.0',
       '255.255.255.255',
@@ -139,7 +140,6 @@ describe('validationSchemas', () => {
       '::',
     ];
     const invalid = [
-      '',
       '1.1.1.1.',
       '1.1.1',
       '1.1.1.',

package/lib/common/validationSchemas/addressValidation.tsx

@@ -17,13 +17,13 @@ export const ipValidationSchema = (t: TFunction) =>
   Yup.string().test(
     'ip-validation',
     t('ai:Not a valid IP address'),
-    (value?: string) => Address4.isValid(value || '') || Address6.isValid(value || ''),
+    (value?: string) => !value || Address4.isValid(value) || Address6.isValid(value),
   );
 
 export const ipNoSuffixValidationSchema = (t: TFunction) =>
   Yup.string().test('ip-validation-no-suffix', t('ai:Not a valid IP address'), (value?: string) => {
     if (!value) return true;
-    const address = getAddress(value || '');
+    const address = getAddress(value);
     return !!address && address.address === address.addressMinusSuffix;
   });
 

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

@@ -8,6 +8,7 @@ import {
   BasicStep,
   OptionalConfigurationsStep,
   DisconnectedReviewStep,
+  DisconnectedStaticIp,
 } from './steps';
 import { useClusterWizardContext } from './clusterWizardContext';
 import { ClusterWizardStepsType } from './utils';
@@ -20,6 +21,10 @@ const getCurrentStep = (currentStepId: ClusterWizardStepsType, infraEnv?: InfraE
       return <OptionalConfigurationsStep />;
     case 'disconnected-basic':
       return <BasicStep />;
+    case 'static-ip-yaml-view':
+    case 'static-ip-network-wide-configurations':
+    case 'static-ip-host-configurations':
+      return <DisconnectedStaticIp />;
     default:
       return <ClusterDetails infraEnv={infraEnv} />;
   }

package/lib/ocm/components/wizard/clusterWizardContext/ClusterWizardContextProvider.tsx

@@ -1,76 +1,26 @@
 import React, { PropsWithChildren } from 'react';
 import { useLocation } from 'react-router';
-import { ClusterWizardContextType, ClusterWizardContext } from './ClusterWizardContext';
+import { AlertVariant } from '@patternfly/react-core';
+import { Cluster, InfraEnv } from '@openshift-assisted/types/assisted-installer-service';
+
+import { useAlerts, AssistedInstallerOCMPermissionTypesListType } from '../../../../common';
+import { isThirdPartyCNI } from '../../../../common/types/networkType';
+import { useFeature, useUISettings } from '../../../hooks';
+import useSetClusterPermissions from '../../../hooks/useSetClusterPermissions';
+import { HostsNetworkConfigurationType } from '../../../services';
+import { isOciPlatformType } from '../../utils';
+import { StaticIpView } from '../steps/staticIp/data/dataTypes';
+import { getStaticIpInfo } from '../steps/staticIp/data/fromInfraEnv';
 import {
-  ClusterWizardFlowStateType,
   ClusterWizardStepsType,
+  ClusterWizardFlowStateType,
   disconnectedSteps,
   getClusterWizardFirstStep,
-  isStaticIpStep,
   isStepAfter,
-} from '../utils/wizardTransition';
-import { HostsNetworkConfigurationType } from '../../../services';
-import { defaultWizardSteps, staticIpFormViewSubSteps } from '../constants';
-import { AssistedInstallerOCMPermissionTypesListType, useAlerts } 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 { isThirdPartyCNI } from '../../../../common/types/networkType';
-import { isOciPlatformType } from '../../utils';
-import { StaticIpView, getStaticIpInfo } from '../steps/staticIp/data';
-
-const addStepToClusterWizard = (
-  wizardStepIds: ClusterWizardStepsType[],
-  addAfterStep: ClusterWizardStepsType,
-  itemsToAdd: ClusterWizardStepsType[],
-) => {
-  const stepsIds = [...wizardStepIds];
-  const referencePosition = stepsIds.findIndex((step) => step === addAfterStep);
-  const found = wizardStepIds.filter((step) => step === itemsToAdd[0]);
-  if (referencePosition !== -1 && found.length === 0) {
-    stepsIds.splice(referencePosition + 1, 0, ...itemsToAdd);
-  }
-  return stepsIds;
-};
-
-const removeStepFromClusterWizard = (
-  wizardStepIds: ClusterWizardStepsType[],
-  itemToRemove: ClusterWizardStepsType,
-  numberItemsToRemove: number,
-) => {
-  const stepsIds = [...wizardStepIds];
-  const position = stepsIds.findIndex((step) => step === itemToRemove);
-  if (position !== -1) {
-    stepsIds.splice(position, numberItemsToRemove);
-  }
-  return stepsIds;
-};
-
-const getWizardStepIds = (
-  wizardStepIds: ClusterWizardStepsType[] | undefined,
-  staticIpView?: StaticIpView | 'dhcp-selected',
-
-  isSingleClusterFeatureEnabled?: boolean,
-): ClusterWizardStepsType[] => {
-  let stepsCopy = wizardStepIds ? [...wizardStepIds] : [...defaultWizardSteps];
-  if (staticIpView === StaticIpView.YAML) {
-    stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-network-wide-configurations', 2);
-    stepsCopy = addStepToClusterWizard(stepsCopy, 'cluster-details', ['static-ip-yaml-view']);
-  } else if (staticIpView === StaticIpView.FORM) {
-    stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-yaml-view', 1);
-    stepsCopy = addStepToClusterWizard(stepsCopy, 'cluster-details', staticIpFormViewSubSteps);
-  } else if (staticIpView === 'dhcp-selected') {
-    stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-network-wide-configurations', 2);
-  }
-
-  if (isSingleClusterFeatureEnabled && !stepsCopy.includes('credentials-download')) {
-    stepsCopy = addStepToClusterWizard(stepsCopy, 'custom-manifests', ['credentials-download']);
-  }
-
-  return stepsCopy;
-};
+  isStaticIpStep,
+} from '../utils';
+import { ClusterWizardContextType, ClusterWizardContext } from './ClusterWizardContext';
+import { getDisconnectedWizardStepIds, getWizardStepIds } from './utils';
 
 export const ClusterWizardContextProvider = ({
   children,
@@ -89,6 +39,8 @@ export const ClusterWizardContextProvider = ({
   const [installDisconnected, setInstallDisconnected] = React.useState(false);
   const [disconnectedCluster, setDisconnectedCluster] = React.useState<Cluster | undefined>();
   const [disconnectedInfraEnv, setDisconnectedInfraEnv] = React.useState<InfraEnv | undefined>();
+  const [disconnectedWizardStepIds, setDisconnectedWizardStepIds] =
+    React.useState<ClusterWizardStepsType[]>(disconnectedSteps);
   const location = useLocation();
   const locationState = location.state as ClusterWizardFlowStateType | undefined;
   const {
@@ -100,7 +52,7 @@ export const ClusterWizardContextProvider = ({
   const { clearAlerts, addAlert, alerts } = useAlerts();
   const setClusterPermissions = useSetClusterPermissions();
 
-  const wizardStepIds = installDisconnected ? disconnectedSteps : connectedWizardStepIds;
+  const wizardStepIds = installDisconnected ? disconnectedWizardStepIds : connectedWizardStepIds;
 
   React.useEffect(() => {
     if (!UISettingsLoading) {
@@ -158,17 +110,26 @@ export 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 staticIpInfo = infraEnv ? getStaticIpInfo(infraEnv) : undefined;
-      if (!staticIpInfo) {
-        throw `Wizard step is currently ${currentStepId}, but no static ip info is defined`;
+      if (installDisconnected) {
+        const staticIpInfo = disconnectedInfraEnv
+          ? getStaticIpInfo(disconnectedInfraEnv)
+          : undefined;
+        if (!staticIpInfo) {
+          throw `Wizard step is currently ${currentStepId}, but no static ip info is defined`;
+        }
+        setDisconnectedWizardStepIds(getDisconnectedWizardStepIds(staticIpInfo.view));
+      } else {
+        const staticIpInfo = infraEnv ? getStaticIpInfo(infraEnv) : undefined;
+        if (!staticIpInfo) {
+          throw `Wizard step is currently ${currentStepId}, but no static ip info is defined`;
+        }
+        const newStepIds = getWizardStepIds(
+          wizardStepIds,
+          staticIpInfo.view,
+          isSingleClusterFeatureEnabled,
+        );
+        setWizardStepIds(newStepIds);
       }
-
-      const newStepIds = getWizardStepIds(
-        wizardStepIds,
-        staticIpInfo.view,
-        isSingleClusterFeatureEnabled,
-      );
-      setWizardStepIds(newStepIds);
     };
 
     const onSetCurrentStepId = (stepId: ClusterWizardStepsType) => {
@@ -200,17 +161,33 @@ export const ClusterWizardContextProvider = ({
         } else {
           setCurrentStepId('static-ip-network-wide-configurations');
         }
-        setWizardStepIds(getWizardStepIds(wizardStepIds, view, isSingleClusterFeatureEnabled));
+        if (installDisconnected) {
+          setDisconnectedWizardStepIds(getDisconnectedWizardStepIds(view));
+        } else {
+          setWizardStepIds(getWizardStepIds(wizardStepIds, view, isSingleClusterFeatureEnabled));
+        }
       },
       onUpdateHostNetworkConfigType(type: HostsNetworkConfigurationType): void {
-        if (type === HostsNetworkConfigurationType.STATIC) {
-          setWizardStepIds(
-            getWizardStepIds(wizardStepIds, StaticIpView.FORM, isSingleClusterFeatureEnabled),
-          );
+        if (installDisconnected) {
+          if (type === HostsNetworkConfigurationType.STATIC) {
+            const staticIpInfo = disconnectedInfraEnv
+              ? getStaticIpInfo(disconnectedInfraEnv)
+              : undefined;
+            const view = staticIpInfo?.view ?? StaticIpView.FORM;
+            setDisconnectedWizardStepIds(getDisconnectedWizardStepIds(view));
+          } else {
+            setDisconnectedWizardStepIds(getDisconnectedWizardStepIds('dhcp-selected'));
+          }
         } else {
-          setWizardStepIds(
-            getWizardStepIds(wizardStepIds, 'dhcp-selected', isSingleClusterFeatureEnabled),
-          );
+          if (type === HostsNetworkConfigurationType.STATIC) {
+            const staticIpInfo = infraEnv ? getStaticIpInfo(infraEnv) : undefined;
+            const view = staticIpInfo?.view ?? StaticIpView.FORM;
+            setWizardStepIds(getWizardStepIds(wizardStepIds, view, isSingleClusterFeatureEnabled));
+          } else {
+            setWizardStepIds(
+              getWizardStepIds(wizardStepIds, 'dhcp-selected', isSingleClusterFeatureEnabled),
+            );
+          }
         }
       },
       wizardStepIds: wizardStepIds,
@@ -224,6 +201,7 @@ export const ClusterWizardContextProvider = ({
       setInstallDisconnected: (enabled: boolean) => {
         setInstallDisconnected(enabled);
         if (enabled) {
+          setDisconnectedWizardStepIds(disconnectedSteps);
           onSetCurrentStepId(disconnectedSteps[0]);
         } else {
           connectedWizardStepIds?.length && onSetCurrentStepId(connectedWizardStepIds[0]);

package/lib/ocm/components/wizard/clusterWizardContext/utils.ts

@@ -0,0 +1,73 @@
+import { defaultWizardSteps, staticIpFormViewSubSteps } from '../constants';
+import { StaticIpView } from '../steps/staticIp/data/dataTypes';
+import { ClusterWizardStepsType, disconnectedSteps } from '../utils';
+
+export const addStepToClusterWizard = (
+  wizardStepIds: ClusterWizardStepsType[],
+  addAfterStep: ClusterWizardStepsType,
+  itemsToAdd: ClusterWizardStepsType[],
+): ClusterWizardStepsType[] => {
+  const stepsIds = [...wizardStepIds];
+  const referencePosition = stepsIds.findIndex((step) => step === addAfterStep);
+  const found = wizardStepIds.filter((step) => step === itemsToAdd[0]);
+  if (referencePosition !== -1 && found.length === 0) {
+    stepsIds.splice(referencePosition + 1, 0, ...itemsToAdd);
+  }
+  return stepsIds;
+};
+
+export const removeStepFromClusterWizard = (
+  wizardStepIds: ClusterWizardStepsType[],
+  itemToRemove: ClusterWizardStepsType,
+  numberItemsToRemove: number,
+): ClusterWizardStepsType[] => {
+  const stepsIds = [...wizardStepIds];
+  const position = stepsIds.findIndex((step) => step === itemToRemove);
+  if (position !== -1) {
+    stepsIds.splice(position, numberItemsToRemove);
+  }
+  return stepsIds;
+};
+
+export const getWizardStepIds = (
+  wizardStepIds: ClusterWizardStepsType[] | undefined,
+  staticIpView?: StaticIpView | 'dhcp-selected',
+  isSingleClusterFeatureEnabled?: boolean,
+): ClusterWizardStepsType[] => {
+  let stepsCopy = wizardStepIds ? [...wizardStepIds] : [...defaultWizardSteps];
+  if (staticIpView === StaticIpView.YAML) {
+    stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-network-wide-configurations', 2);
+    stepsCopy = addStepToClusterWizard(stepsCopy, 'cluster-details', ['static-ip-yaml-view']);
+  } else if (staticIpView === StaticIpView.FORM) {
+    stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-yaml-view', 1);
+    stepsCopy = addStepToClusterWizard(stepsCopy, 'cluster-details', staticIpFormViewSubSteps);
+  } else if (staticIpView === 'dhcp-selected') {
+    stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-network-wide-configurations', 2);
+  }
+
+  if (isSingleClusterFeatureEnabled && !stepsCopy.includes('credentials-download')) {
+    stepsCopy = addStepToClusterWizard(stepsCopy, 'custom-manifests', ['credentials-download']);
+  }
+
+  return stepsCopy;
+};
+
+export const getDisconnectedWizardStepIds = (
+  staticIpView?: StaticIpView | 'dhcp-selected',
+): ClusterWizardStepsType[] => {
+  // Always rebuild from the base disconnected steps so toggling static IP / DHCP
+  // cannot leave leftover sub-steps in the list.
+  const copy = [...disconnectedSteps];
+
+  if (staticIpView === StaticIpView.YAML) {
+    return addStepToClusterWizard(copy, 'disconnected-basic', ['static-ip-yaml-view']);
+  }
+  if (staticIpView === StaticIpView.FORM) {
+    return addStepToClusterWizard(copy, 'disconnected-basic', [
+      'static-ip-network-wide-configurations',
+      'static-ip-host-configurations',
+    ]);
+  }
+
+  return copy;
+};

package/lib/ocm/components/wizard/steps/clusterDetails/ClusterDetailsForm.tsx

@@ -19,7 +19,6 @@ import {
   getFormikErrorFields,
   ClusterWizardStep,
   ClusterWizardStepHeader,
-  TechnologyPreview,
   isInOcm,
   useTranslation,
 } from '../../../../../common';
@@ -184,7 +183,6 @@ export const ClusterDetailsForm = (props: ClusterDetailsFormProps) => {
                     <span>
                       {t("ai:I'm installing on a disconnected/air-gapped/secured environment")}
                     </span>
-                    <TechnologyPreview />
                   </Flex>
                 </GridItem>
               )}

package/lib/ocm/components/wizard/steps/disconnected/BasicStep.tsx

@@ -1,24 +1,60 @@
 import * as React from 'react';
-import { Grid, GridItem, Content, Flex, Form } from '@patternfly/react-core';
+import * as Yup from 'yup';
+import { Formik, useFormikContext } from 'formik';
+import { AlertVariant, Grid, GridItem, Content, Flex, Form } from '@patternfly/react-core';
+import { ImageType } from '@openshift-assisted/types/assisted-installer-service';
 import {
   ClusterWizardStep,
-  TechnologyPreview,
   StaticTextField,
   WithErrorBoundary,
+  useAlerts,
+  ClustersAPI,
+  InfraEnvsAPI,
+  handleApiError,
+  getApiErrorMessage,
+  isInOcm,
+  PullSecret,
+  pullSecretValidationSchema,
+  useTranslation,
+  getFormikErrorFields,
 } from '../../../../../common';
+import { usePullSecret } from '../../../../hooks';
 import { useClusterWizardContext } from '../../clusterWizardContext';
 import { ClusterWizardNavigation, ClusterWizardFooter } from '../../wizardComponents';
+import { HostsNetworkConfigurationControlGroup } from '../clusterDetails/fields/HostsNetworkConfigurationControlGroup';
+import { HostsNetworkConfigurationType } from '../../../../services/types';
+import { getDummyInfraEnvField } from '../staticIp/data/dummyData';
+import { getStaticNetworkConfig } from '../staticIp/data/fromInfraEnv';
 import { InstallDisconnectedSwitch } from './InstallDisconnectedSwitch';
 
-export const DISCONNECTED_OPENSHIFT_VERSION = '4.21.27';
+export const DISCONNECTED_OPENSHIFT_VERSION = '4.22.13';
 
-export const BasicStep = () => {
-  const { moveNext } = useClusterWizardContext();
+const DISCONNECTED_IMAGE_TYPE: ImageType = 'disconnected-iso';
+const DISCONNECTED_CLUSTER_NAME = 'disconnected-cluster';
+
+type BasicStepValues = {
+  hostsNetworkConfigurationType: HostsNetworkConfigurationType;
+  pullSecret: string;
+};
+
+const BasicStepForm: React.FC<{
+  isSubmitting: boolean;
+  defaultPullSecret?: string;
+}> = ({ isSubmitting, defaultPullSecret }) => {
+  const { submitForm, isValid, errors, touched } = useFormikContext<BasicStepValues>();
+  const errorFields = getFormikErrorFields(errors, touched);
 
   return (
     <ClusterWizardStep
       navigation={<ClusterWizardNavigation />}
-      footer={<ClusterWizardFooter onNext={moveNext} />}
+      footer={
+        <ClusterWizardFooter
+          onNext={() => void submitForm()}
+          isSubmitting={isSubmitting}
+          isNextDisabled={!isValid || isSubmitting}
+          errorFields={errorFields}
+        />
+      }
     >
       <WithErrorBoundary title="Failed to load Basic step">
         <Grid hasGutter>
@@ -29,7 +65,6 @@ export const BasicStep = () => {
             <Flex alignItems={{ default: 'alignItemsCenter' }} gap={{ default: 'gapSm' }}>
               <InstallDisconnectedSwitch />
               <span>I'm installing on a disconnected/air-gapped/secured environment</span>
-              <TechnologyPreview />
             </Flex>
           </GridItem>
           <GridItem>
@@ -40,6 +75,8 @@ export const BasicStep = () => {
               <StaticTextField name="cpuArchitecture" label="CPU architecture">
                 x86_64
               </StaticTextField>
+              <HostsNetworkConfigurationControlGroup clusterExists={false} isDisabled={false} />
+              {!isInOcm && <PullSecret isOcm={false} defaultPullSecret={defaultPullSecret} />}
             </Form>
           </GridItem>
         </Grid>
@@ -47,3 +84,106 @@ export const BasicStep = () => {
     </ClusterWizardStep>
   );
 };
+
+export const BasicStep = () => {
+  const { t } = useTranslation();
+  const {
+    moveNext,
+    disconnectedCluster,
+    setDisconnectedCluster,
+    disconnectedInfraEnv,
+    setDisconnectedInfraEnv,
+  } = useClusterWizardContext();
+  const { addAlert, clearAlerts } = useAlerts();
+  const [isSubmitting, setIsSubmitting] = React.useState(false);
+  const defaultPullSecret = usePullSecret();
+
+  const validationSchema = React.useMemo(
+    () =>
+      Yup.object({
+        pullSecret: isInOcm ? Yup.string() : pullSecretValidationSchema(t),
+      }),
+    [t],
+  );
+
+  const initialValues: BasicStepValues = {
+    hostsNetworkConfigurationType: disconnectedInfraEnv?.staticNetworkConfig
+      ? HostsNetworkConfigurationType.STATIC
+      : HostsNetworkConfigurationType.DHCP,
+    pullSecret: defaultPullSecret ?? '',
+  };
+
+  const handleNext = React.useCallback(
+    async (values: BasicStepValues) => {
+      clearAlerts();
+      setIsSubmitting(true);
+      try {
+        const isStatic =
+          values.hostsNetworkConfigurationType === HostsNetworkConfigurationType.STATIC;
+        let infraEnvToUse = disconnectedInfraEnv;
+
+        if (!disconnectedCluster?.id || !infraEnvToUse?.id) {
+          const { data: cluster } = await ClustersAPI.registerDisconnected({
+            name: DISCONNECTED_CLUSTER_NAME,
+            openshiftVersion: DISCONNECTED_OPENSHIFT_VERSION,
+          });
+          setDisconnectedCluster(cluster);
+
+          const pullSecret = isInOcm ? defaultPullSecret ?? '' : values.pullSecret;
+          const { data: createdInfraEnv } = await InfraEnvsAPI.register({
+            name: 'disconnected-infra-env',
+            pullSecret,
+            clusterId: cluster.id,
+            imageType: DISCONNECTED_IMAGE_TYPE,
+            openshiftVersion: DISCONNECTED_OPENSHIFT_VERSION,
+            staticNetworkConfig: isStatic ? getDummyInfraEnvField() : undefined,
+          });
+          infraEnvToUse = createdInfraEnv;
+        } else {
+          const staticNetworkConfig = isStatic
+            ? getStaticNetworkConfig(infraEnvToUse) ?? getDummyInfraEnvField()
+            : [];
+          const { data: updatedInfraEnv } = await InfraEnvsAPI.update(infraEnvToUse.id, {
+            staticNetworkConfig,
+          });
+          infraEnvToUse = updatedInfraEnv;
+        }
+
+        setDisconnectedInfraEnv(infraEnvToUse);
+        moveNext();
+      } catch (error) {
+        handleApiError(error, () => {
+          addAlert({
+            title: 'Failed to save basic information',
+            message: getApiErrorMessage(error),
+            variant: AlertVariant.danger,
+          });
+        });
+      } finally {
+        setIsSubmitting(false);
+      }
+    },
+    [
+      clearAlerts,
+      defaultPullSecret,
+      disconnectedCluster,
+      disconnectedInfraEnv,
+      setDisconnectedCluster,
+      setDisconnectedInfraEnv,
+      addAlert,
+      moveNext,
+    ],
+  );
+
+  return (
+    <Formik<BasicStepValues>
+      initialValues={initialValues}
+      validationSchema={validationSchema}
+      onSubmit={(values) => void handleNext(values)}
+    >
+      <BasicStepForm isSubmitting={isSubmitting} defaultPullSecret={defaultPullSecret} />
+    </Formik>
+  );
+};
+
+export default BasicStep;