@openshift-assisted/ui-lib 2.48.3 → 2.48.5

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

@@ -3,9 +3,9 @@ import ClusterWizardFooter from '../ClusterWizardFooter';
 import { useClusterWizardContext } from '../ClusterWizardContext';
 import {
   ClusterWizardStep,
-  TechnologyPreview,
   PULL_SECRET_INFO_LINK,
   singleClusterOperators,
+  TechnologyPreview,
 } from '../../../../common';
 import ClusterWizardNavigation from '../ClusterWizardNavigation';
 import { WithErrorBoundary } from '../../../../common/components/ErrorHandling/WithErrorBoundary';
@@ -26,18 +26,15 @@ import {
 } from '@patternfly/react-core';
 import { Formik } from 'formik';
 import { saveAs } from 'file-saver';
-import { useNavigate, useParams } from 'react-router-dom-v5-compat';
+import { useNavigate } from 'react-router-dom-v5-compat';
 
 import { getOperatorSpecs } from '../../../../common/components/operators/operatorSpecs';
-import ClustersService from '../../../services/ClustersService';
-import { handleApiError, getApiErrorMessage } from '../../../../common/api';
-import { useAlerts } from '../../../../common/components/AlertsContextProvider';
-import { AlertVariant } from '@patternfly/react-core';
+
+const downloadUrl =
+  'https://mirror.openshift.com/pub/cgw/assisted-installer-disconnected/4.20.8/agent-ove.x86_64.iso';
 
 const ReviewStep = () => {
-  const { moveBack, disconnectedInfraEnv, setDisconnectedInfraEnv } = useClusterWizardContext();
-  const { clusterId } = useParams<{ clusterId: string }>();
-  const { addAlert } = useAlerts();
+  const { moveBack } = useClusterWizardContext();
   const opSpecs = getOperatorSpecs(() => undefined);
   const navigate = useNavigate();
 
@@ -53,40 +50,11 @@ const ReviewStep = () => {
         footer={
           <ClusterWizardFooter
             onNext={() => {
-              void (async () => {
-                if (disconnectedInfraEnv?.downloadUrl) {
-                  saveAs(disconnectedInfraEnv.downloadUrl);
-                }
-                if (clusterId) {
-                  try {
-                    await ClustersService.remove(clusterId);
-                    // Remove infraEnv from wizard context after successful deregistration
-                    setDisconnectedInfraEnv(undefined);
-                    // Navigate to cluster-list only after successful deregistration
-                    navigate('/cluster-list');
-                  } catch (error) {
-                    handleApiError(error, () => {
-                      addAlert({
-                        title: 'Failed to deregister cluster',
-                        message: getApiErrorMessage(error),
-                        variant: AlertVariant.danger,
-                      });
-                    });
-                    // Error handling: continue with navigation even if deregistration fails
-                    // Still clear the context to avoid stale data
-                    setDisconnectedInfraEnv(undefined);
-                    // Navigate even on error to avoid getting stuck
-                    navigate('/cluster-list');
-                  }
-                } else {
-                  // If there's no cluster to deregister, navigate immediately
-                  navigate('/cluster-list');
-                }
-              })();
+              downloadUrl && saveAs(downloadUrl);
+              navigate('/cluster-list');
             }}
             onBack={moveBack}
             nextButtonText="Download ISO"
-            disconnectedClusterId={clusterId}
           />
         }
       >

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',
 ];
 
@@ -262,7 +260,6 @@ const credentialsValidationMap = buildEmptyValidationsMap();
 const customManifestsValidationsMap = buildEmptyValidationsMap();
 const disconnectedReviewValidationsMap = buildEmptyValidationsMap();
 const disconnectedBasicValidationsMap = buildEmptyValidationsMap();
-const disconnectedOptionalConfigurationsValidationsMap = buildEmptyValidationsMap();
 
 export const wizardStepsValidationsMap: WizardStepsValidationMap<ClusterWizardStepsType> = {
   'cluster-details': clusterDetailsStepValidationsMap,
@@ -278,7 +275,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/clusters/AssistedInstallerHeader.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Content, Split, SplitItem } from '@patternfly/react-core';
 import {
   ASSISTED_INSTALLER_DOCUMENTATION_LINK,
-  TechnologyPreview,
+  DeveloperPreview,
   ExternalLink,
   isInOcm,
 } from '../../../common';
@@ -15,7 +15,7 @@ export const AssistedInstallerHeader = () => {
       <Content component="h1" className="pf-v6-u-display-inline">
         Install OpenShift with the Assisted Installer
       </Content>
-      {isSingleClusterFeatureEnabled && <TechnologyPreview />}
+      {isSingleClusterFeatureEnabled && <DeveloperPreview />}
       <Split hasGutter>
         <SplitItem>
           <ExternalLink href={ASSISTED_INSTALLER_DOCUMENTATION_LINK}>

package/lib/ocm/components/featureSupportLevels/ReviewClusterFeatureSupportLevels.tsx

@@ -23,7 +23,6 @@ import {
   NewFeatureSupportLevelData,
   useNewFeatureSupportLevel,
 } from '../../../common/components/newFeatureSupportLevels';
-import { useFeature } from '../../hooks/use-feature';
 
 const getFeatureReviewText = (featureId: FeatureId): string => {
   switch (featureId) {
@@ -128,7 +127,6 @@ export const getSupportLevelInfo = (
   featureSupportLevelData: NewFeatureSupportLevelData,
   isSupportedOpenShiftVersion: (version?: string) => boolean,
   t: TFunction,
-  isSingleClusterFeatureEnabled?: boolean,
 ) => {
   const limitedClusterFeatures = getLimitedFeatureSupportLevels(
     cluster,
@@ -139,10 +137,7 @@ export const getSupportLevelInfo = (
   return {
     limitedClusterFeatures,
     hasSupportedVersion,
-    isFullySupported:
-      hasSupportedVersion &&
-      Object.keys(limitedClusterFeatures || {}).length === 0 &&
-      !isSingleClusterFeatureEnabled,
+    isFullySupported: hasSupportedVersion && Object.keys(limitedClusterFeatures || {}).length === 0,
   };
 };
 
@@ -150,25 +145,11 @@ const SupportLevel = ({ cluster }: SupportLevelProps) => {
   const { t } = useTranslation();
   const featureSupportLevelData = useNewFeatureSupportLevel();
   const { isSupportedOpenShiftVersion } = useOpenShiftVersionsContext();
-  const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
 
   const { limitedClusterFeatures, hasSupportedVersion, isFullySupported } =
     React.useMemo<SupportLevelMemo>(
-      () =>
-        getSupportLevelInfo(
-          cluster,
-          featureSupportLevelData,
-          isSupportedOpenShiftVersion,
-          t,
-          isSingleClusterFeatureEnabled,
-        ),
-      [
-        cluster,
-        featureSupportLevelData,
-        t,
-        isSupportedOpenShiftVersion,
-        isSingleClusterFeatureEnabled,
-      ],
+      () => getSupportLevelInfo(cluster, featureSupportLevelData, isSupportedOpenShiftVersion, t),
+      [cluster, featureSupportLevelData, t, isSupportedOpenShiftVersion],
     );
 
   if (!limitedClusterFeatures) {
@@ -184,7 +165,7 @@ const SupportLevel = ({ cluster }: SupportLevelProps) => {
         ) : (
           <LimitedSupportedCluster
             clusterFeatureSupportLevels={limitedClusterFeatures}
-            showVersionWarning={!hasSupportedVersion || isSingleClusterFeatureEnabled}
+            showVersionWarning={!hasSupportedVersion}
           />
         )
       }

package/lib/ocm/services/ClustersService.ts

@@ -171,11 +171,5 @@ const ClustersService = {
       this.getUpdateManifestParams(existingManifest, updatedManifest),
     );
   },
-  registerDisconnected(params: { name: string; openshiftVersion: string }) {
-    return ClustersAPI.registerDisconnected({
-      name: params.name,
-      openshiftVersion: params.openshiftVersion,
-    });
-  },
 };
 export default ClustersService;

package/lib/ocm/services/HostsService.ts

@@ -93,6 +93,14 @@ const HostsService = {
     return HostsAPI.bindHost(host.infraEnvId, host.id, clusterId);
   },
 
+  unbind(host: Host) {
+    if (!host.infraEnvId) {
+      throw new Error(`Cannot unbind host ${host.id}, missing infraEnvId`);
+    }
+
+    return HostsAPI.unbindHost(host.infraEnvId, host.id);
+  },
+
   installAll(hosts: Host[]) {
     const promises = [];
     for (const host of hosts) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "@openshift-assisted/locales": "2.48.3",
-    "@openshift-assisted/types": "2.48.3",
+    "@openshift-assisted/locales": "2.48.5",
+    "@openshift-assisted/types": "2.48.5",
     "@openshift-console/dynamic-plugin-sdk": "0.0.3",
     "@patternfly/patternfly": "6.2.3",
     "@patternfly/react-code-editor": "6.2.2",
@@ -140,5 +140,5 @@
       ]
     }
   },
-  "version": "2.48.3"
+  "version": "2.48.5"
 }

package/build/@types/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.d.ts

@@ -1,4 +0,0 @@
-import * as React from 'react';
-declare const OptionalConfigurationsStep: () => React.JSX.Element;
-export default OptionalConfigurationsStep;
-//# sourceMappingURL=OptionalConfigurationsStep.d.ts.map

package/build/@types/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"OptionalConfigurationsStep.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AA6C/B,QAAA,MAAM,0BAA0B,yBAyJ/B,CAAC;AAEF,eAAe,0BAA0B,CAAC"}

package/build/cjs/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.js

@@ -1,128 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
-const formik_1 = require("formik");
-const Yup = tslib_1.__importStar(require("yup"));
-const common_1 = require("../../../../common");
-const react_core_1 = require("@patternfly/react-core");
-const ClusterWizardContext_1 = require("../ClusterWizardContext");
-const ClusterWizardFooter_1 = tslib_1.__importDefault(require("../ClusterWizardFooter"));
-const ClusterWizardNavigation_1 = tslib_1.__importDefault(require("../ClusterWizardNavigation"));
-const WithErrorBoundary_1 = require("../../../../common/components/ErrorHandling/WithErrorBoundary");
-const UploadSSH_1 = tslib_1.__importDefault(require("../../../../common/components/clusterConfiguration/UploadSSH"));
-const PullSecretField_1 = tslib_1.__importDefault(require("../../../../common/components/ui/formik/PullSecretField"));
-const api_1 = require("../../../../common/api");
-const AlertsContextProvider_1 = require("../../../../common/components/AlertsContextProvider");
-const react_core_2 = require("@patternfly/react-core");
-const InfraEnvsService_1 = tslib_1.__importDefault(require("../../../services/InfraEnvsService"));
-const apis_1 = require("../../../services/apis");
-const usePullSecret_1 = tslib_1.__importDefault(require("../../../hooks/usePullSecret"));
-const react_router_dom_v5_compat_1 = require("react-router-dom-v5-compat");
-const ClustersService_1 = tslib_1.__importDefault(require("../../../services/ClustersService"));
-const PullSecretSync = ({ pullSecret }) => {
-    const { setFieldValue } = (0, formik_1.useFormikContext)();
-    React.useEffect(() => {
-        if (pullSecret !== undefined) {
-            setFieldValue('pullSecret', pullSecret);
-        }
-    }, [pullSecret, setFieldValue]);
-    return null;
-};
-const OptionalConfigurationsStep = () => {
-    const pullSecret = (0, usePullSecret_1.default)() || '';
-    const { clusterId } = (0, react_router_dom_v5_compat_1.useParams)();
-    const [cluster, setCluster] = React.useState(null);
-    const { moveNext, moveBack, setDisconnectedInfraEnv, disconnectedInfraEnv } = (0, ClusterWizardContext_1.useClusterWizardContext)();
-    const { addAlert } = (0, AlertsContextProvider_1.useAlerts)();
-    const [editPullSecret, setEditPullSecret] = React.useState(false);
-    React.useEffect(() => {
-        const fetchCluster = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-            if (!clusterId) {
-                return;
-            }
-            try {
-                const fetchedCluster = yield ClustersService_1.default.get(clusterId);
-                setCluster(fetchedCluster);
-            }
-            catch (error) {
-                (0, api_1.handleApiError)(error, () => {
-                    addAlert({
-                        title: 'Failed to fetch cluster',
-                        message: (0, api_1.getApiErrorMessage)(error),
-                        variant: react_core_2.AlertVariant.danger,
-                    });
-                });
-            }
-        });
-        void fetchCluster();
-    }, [clusterId, addAlert]);
-    const validationSchema = React.useMemo(() => Yup.object().shape({
-        sshPublicKey: common_1.sshPublicKeyValidationSchema,
-        pullSecret: common_1.pullSecretValidationSchema,
-    }), []);
-    const initialValues = {
-        sshPublicKey: '',
-        pullSecret: pullSecret,
-    };
-    return (React.createElement(formik_1.Formik, { initialValues: initialValues, validate: (0, common_1.getRichTextValidation)(validationSchema), onSubmit: (values) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-            if (!cluster || !cluster.id) {
-                addAlert({
-                    title: 'Missing cluster',
-                    message: 'Cluster must be created before configuring infrastructure environment',
-                    variant: react_core_2.AlertVariant.danger,
-                });
-                return;
-            }
-            try {
-                // Check if infraEnv already exists
-                if (disconnectedInfraEnv && disconnectedInfraEnv.id) {
-                    // Update existing infraEnv
-                    const updateParams = Object.assign({ pullSecret: values.pullSecret || pullSecret }, (values.sshPublicKey && { sshAuthorizedKey: values.sshPublicKey }));
-                    const { data: updatedInfraEnv } = yield apis_1.InfraEnvsAPI.update(disconnectedInfraEnv.id, updateParams);
-                    setDisconnectedInfraEnv(updatedInfraEnv);
-                    moveNext();
-                }
-                else {
-                    // Create infraEnv with all params
-                    const createParams = Object.assign({ name: `disconnected-cluster_infra-env`, pullSecret: values.pullSecret || pullSecret, clusterId: cluster.id, openshiftVersion: cluster.openshiftVersion, cpuArchitecture: 'x86_64' }, (values.sshPublicKey && { sshAuthorizedKey: values.sshPublicKey }));
-                    const createdInfraEnv = yield InfraEnvsService_1.default.create(createParams);
-                    setDisconnectedInfraEnv(createdInfraEnv);
-                    moveNext();
-                }
-            }
-            catch (error) {
-                (0, api_1.handleApiError)(error, () => {
-                    addAlert({
-                        title: disconnectedInfraEnv && disconnectedInfraEnv.id
-                            ? 'Failed to update infrastructure environment'
-                            : 'Failed to create infrastructure environment',
-                        message: (0, api_1.getApiErrorMessage)(error),
-                        variant: react_core_2.AlertVariant.danger,
-                    });
-                });
-            }
-        }) }, ({ submitForm, isValid, errors, touched, isSubmitting }) => {
-        const errorFields = (0, common_1.getFormikErrorFields)(errors, touched);
-        const handleNext = () => {
-            void submitForm(); // This will trigger onSubmit
-        };
-        return (React.createElement(common_1.ClusterWizardStep, { navigation: React.createElement(ClusterWizardNavigation_1.default, null), footer: React.createElement(ClusterWizardFooter_1.default, { disconnectedClusterId: clusterId, onNext: handleNext, onBack: moveBack, isNextDisabled: !isValid, errorFields: errorFields, isSubmitting: isSubmitting }) },
-            React.createElement(WithErrorBoundary_1.WithErrorBoundary, { title: "Failed to load Optional Configurations step" },
-                React.createElement(PullSecretSync, { pullSecret: pullSecret }),
-                React.createElement(react_core_1.Grid, { hasGutter: true },
-                    React.createElement(react_core_1.GridItem, null,
-                        React.createElement(react_core_1.Split, null,
-                            React.createElement(react_core_1.SplitItem, null,
-                                React.createElement(react_core_1.Content, { component: "h2" }, "Optional configurations")),
-                            React.createElement(react_core_1.SplitItem, null,
-                                React.createElement(common_1.TechnologyPreview, null)))),
-                    React.createElement(react_core_1.GridItem, null,
-                        React.createElement(react_core_1.Form, { id: "wizard-cluster-optional-configurations__form" },
-                            React.createElement(UploadSSH_1.default, null),
-                            React.createElement(react_core_1.Checkbox, { label: "Edit pull secret", isChecked: editPullSecret, onChange: (_, checked) => setEditPullSecret(checked), id: "edit-pull-secret-checkbox" }),
-                            (editPullSecret || !pullSecret) && React.createElement(PullSecretField_1.default, { isOcm: api_1.isInOcm })))))));
-    }));
-};
-exports.default = OptionalConfigurationsStep;
-//# sourceMappingURL=OptionalConfigurationsStep.js.map

package/build/cjs/ocm/components/clusterWizard/disconnected/OptionalConfigurationsStep.js.map

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

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

@@ -1,201 +0,0 @@
-import * as React from 'react';
-import { Formik, useFormikContext } from 'formik';
-import * as Yup from 'yup';
-import {
-  ClusterWizardStep,
-  TechnologyPreview,
-  getRichTextValidation,
-  sshPublicKeyValidationSchema,
-  pullSecretValidationSchema,
-  getFormikErrorFields,
-} from '../../../../common';
-import { Split, SplitItem, Grid, GridItem, Form, Content, Checkbox } from '@patternfly/react-core';
-import { useClusterWizardContext } from '../ClusterWizardContext';
-import ClusterWizardFooter from '../ClusterWizardFooter';
-import ClusterWizardNavigation from '../ClusterWizardNavigation';
-import { WithErrorBoundary } from '../../../../common/components/ErrorHandling/WithErrorBoundary';
-import UploadSSH from '../../../../common/components/clusterConfiguration/UploadSSH';
-import PullSecretField from '../../../../common/components/ui/formik/PullSecretField';
-import { isInOcm, handleApiError, getApiErrorMessage } from '../../../../common/api';
-import { useAlerts } from '../../../../common/components/AlertsContextProvider';
-import { AlertVariant } from '@patternfly/react-core';
-import InfraEnvsService from '../../../services/InfraEnvsService';
-import { InfraEnvsAPI } from '../../../services/apis';
-import usePullSecret from '../../../hooks/usePullSecret';
-import { useParams } from 'react-router-dom-v5-compat';
-import ClustersService from '../../../services/ClustersService';
-import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
-
-type OptionalConfigurationsFormValues = {
-  sshPublicKey?: string;
-  pullSecret?: string;
-};
-
-const PullSecretSync: React.FC<{ pullSecret?: string }> = ({ pullSecret }) => {
-  const { setFieldValue } = useFormikContext<OptionalConfigurationsFormValues>();
-
-  React.useEffect(() => {
-    if (pullSecret !== undefined) {
-      setFieldValue('pullSecret', pullSecret);
-    }
-  }, [pullSecret, setFieldValue]);
-
-  return null;
-};
-
-const OptionalConfigurationsStep = () => {
-  const pullSecret = usePullSecret() || '';
-  const { clusterId } = useParams<{ clusterId: string }>();
-  const [cluster, setCluster] = React.useState<Cluster | null>(null);
-
-  const { moveNext, moveBack, setDisconnectedInfraEnv, disconnectedInfraEnv } =
-    useClusterWizardContext();
-  const { addAlert } = useAlerts();
-  const [editPullSecret, setEditPullSecret] = React.useState(false);
-
-  React.useEffect(() => {
-    const fetchCluster = async () => {
-      if (!clusterId) {
-        return;
-      }
-      try {
-        const fetchedCluster = await ClustersService.get(clusterId);
-        setCluster(fetchedCluster);
-      } catch (error) {
-        handleApiError(error, () => {
-          addAlert({
-            title: 'Failed to fetch cluster',
-            message: getApiErrorMessage(error),
-            variant: AlertVariant.danger,
-          });
-        });
-      }
-    };
-    void fetchCluster();
-  }, [clusterId, addAlert]);
-
-  const validationSchema = React.useMemo(
-    () =>
-      Yup.object<OptionalConfigurationsFormValues>().shape({
-        sshPublicKey: sshPublicKeyValidationSchema,
-        pullSecret: pullSecretValidationSchema,
-      }),
-    [],
-  );
-
-  const initialValues: OptionalConfigurationsFormValues = {
-    sshPublicKey: '',
-    pullSecret: pullSecret,
-  };
-
-  return (
-    <Formik
-      initialValues={initialValues}
-      validate={getRichTextValidation<OptionalConfigurationsFormValues>(validationSchema)}
-      onSubmit={async (values) => {
-        if (!cluster || !cluster.id) {
-          addAlert({
-            title: 'Missing cluster',
-            message: 'Cluster must be created before configuring infrastructure environment',
-            variant: AlertVariant.danger,
-          });
-          return;
-        }
-
-        try {
-          // Check if infraEnv already exists
-          if (disconnectedInfraEnv && disconnectedInfraEnv.id) {
-            // Update existing infraEnv
-            const updateParams = {
-              pullSecret: values.pullSecret || pullSecret,
-              ...(values.sshPublicKey && { sshAuthorizedKey: values.sshPublicKey }),
-            };
-            const { data: updatedInfraEnv } = await InfraEnvsAPI.update(
-              disconnectedInfraEnv.id,
-              updateParams,
-            );
-            setDisconnectedInfraEnv(updatedInfraEnv);
-            moveNext();
-          } else {
-            // Create infraEnv with all params
-            const createParams = {
-              name: `disconnected-cluster_infra-env`,
-              pullSecret: values.pullSecret || pullSecret,
-              clusterId: cluster.id,
-              openshiftVersion: cluster.openshiftVersion,
-              cpuArchitecture: 'x86_64' as const,
-              ...(values.sshPublicKey && { sshAuthorizedKey: values.sshPublicKey }),
-            };
-            const createdInfraEnv = await InfraEnvsService.create(createParams);
-            setDisconnectedInfraEnv(createdInfraEnv);
-            moveNext();
-          }
-        } catch (error) {
-          handleApiError(error, () => {
-            addAlert({
-              title:
-                disconnectedInfraEnv && disconnectedInfraEnv.id
-                  ? 'Failed to update infrastructure environment'
-                  : 'Failed to create infrastructure environment',
-              message: getApiErrorMessage(error),
-              variant: AlertVariant.danger,
-            });
-          });
-        }
-      }}
-    >
-      {({ submitForm, isValid, errors, touched, isSubmitting }) => {
-        const errorFields = getFormikErrorFields(errors, touched);
-        const handleNext = () => {
-          void submitForm(); // This will trigger onSubmit
-        };
-
-        return (
-          <ClusterWizardStep
-            navigation={<ClusterWizardNavigation />}
-            footer={
-              <ClusterWizardFooter
-                disconnectedClusterId={clusterId}
-                onNext={handleNext} // Changed from moveNext
-                onBack={moveBack}
-                isNextDisabled={!isValid}
-                errorFields={errorFields}
-                isSubmitting={isSubmitting}
-              />
-            }
-          >
-            <WithErrorBoundary title="Failed to load Optional Configurations step">
-              <PullSecretSync pullSecret={pullSecret} />
-              <Grid hasGutter>
-                <GridItem>
-                  <Split>
-                    <SplitItem>
-                      <Content component="h2">Optional configurations</Content>
-                    </SplitItem>
-                    <SplitItem>
-                      <TechnologyPreview />
-                    </SplitItem>
-                  </Split>
-                </GridItem>
-                <GridItem>
-                  <Form id="wizard-cluster-optional-configurations__form">
-                    <UploadSSH />
-                    <Checkbox
-                      label="Edit pull secret"
-                      isChecked={editPullSecret}
-                      onChange={(_, checked) => setEditPullSecret(checked)}
-                      id="edit-pull-secret-checkbox"
-                    />
-                    {(editPullSecret || !pullSecret) && <PullSecretField isOcm={isInOcm} />}
-                  </Form>
-                </GridItem>
-              </Grid>
-            </WithErrorBoundary>
-          </ClusterWizardStep>
-        );
-      }}
-    </Formik>
-  );
-};
-
-export default OptionalConfigurationsStep;