@openshift-assisted/ui-lib 5.0.0-cim → 5.0.2-cim

package/lib/cim/components/ClusterDeployment/ClusterDeploymentWizard.tsx

@@ -1,9 +1,8 @@
 import * as React from 'react';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { Grid, GridItem, Wizard, WizardStep } from '@patternfly/react-core';
-import { AlertsContextProvider, LoadingState } from '../../../common';
+import { AlertsContextProvider, ErrorState, LoadingState } from '../../../common';
 import { ClusterDeploymentWizardProps } from './types';
-import { ACMFeatureSupportLevelProvider } from '../featureSupportLevels';
 import { YamlPreview, useYamlPreview } from '../YamlPreview';
 import { wizardStepNames } from './constants';
 import { ClusterDeploymentWizardContextProvider } from './ClusterDeploymentWizardContext';
@@ -14,6 +13,7 @@ import { ClusterDeploymentHostsDiscoveryStep } from './hostDiscovery';
 import { ClusterDeploymentNetworkingStep } from './networking';
 import { ClusterDeploymentReviewStep } from './review';
 import { ClusterDeploymentCustomManifestsStep } from './customManifests';
+import { useAgents } from '../../hooks';
 
 export const ClusterDeploymentWizard = ({
   className,
@@ -27,7 +27,6 @@ export const ClusterDeploymentWizard = ({
   fetchSecret,
   clusterDeployment,
   agentClusterInstall,
-  agents,
   bareMetalHosts,
   clusterImages,
   aiConfigMap,
@@ -54,120 +53,121 @@ export const ClusterDeploymentWizard = ({
     fetchKlusterletAddonConfig,
   });
 
+  const [agents, loaded, error] = useAgents({ isList: true });
+
   // if initialStep is set, it is either 'host-selection' or 'host-discovery', both at index 4
   // if initialStep is not set, start at 'cluster-details' which is at index 2
   const startIndex = initialStep ? 4 : 2;
   const stepNames = wizardStepNames(t);
   const isAIFlow = !!infraEnv;
 
+  if (!loaded) {
+    return <LoadingState />;
+  } else if (error) {
+    return <ErrorState />;
+  }
+
   return (
     <Grid style={{ height: '100%' }}>
       <GridItem span={isPreviewOpen ? 7 : 12}>
         <AlertsContextProvider>
-          <ACMFeatureSupportLevelProvider clusterImages={clusterImages} isEditClusterFlow={true}>
-            <ClusterDeploymentWizardContextProvider agentClusterInstall={agentClusterInstall}>
-              <Wizard
-                isVisitRequired
-                startIndex={startIndex}
-                className={className}
-                onClose={onClose}
-              >
-                <WizardStep
-                  name={stepNames['installation-type']}
-                  id={'installation-type'}
-                  isDisabled
-                />
+          <ClusterDeploymentWizardContextProvider agentClusterInstall={agentClusterInstall}>
+            <Wizard isVisitRequired startIndex={startIndex} className={className} onClose={onClose}>
+              <WizardStep
+                name={stepNames['installation-type']}
+                id={'installation-type'}
+                isDisabled
+              />
 
-                <WizardStep name={stepNames['cluster-details']} id={'cluster-details'}>
-                  <ClusterDeploymentDetailsStep
-                    clusterImages={clusterImages}
-                    usedClusterNames={usedClusterNames}
-                    clusterDeployment={clusterDeployment}
-                    agentClusterInstall={agentClusterInstall}
-                    agents={agents}
-                    onSaveDetails={onSaveDetails}
-                    isPreviewOpen={isPreviewOpen}
-                    infraEnv={infraEnv}
-                    isNutanix={isNutanix}
-                  />
-                </WizardStep>
-
-                <WizardStep name={stepNames['automation']} id={'automation'} isDisabled />
+              <WizardStep name={stepNames['cluster-details']} id={'cluster-details'}>
+                <ClusterDeploymentDetailsStep
+                  clusterImages={clusterImages}
+                  usedClusterNames={usedClusterNames}
+                  clusterDeployment={clusterDeployment}
+                  agentClusterInstall={agentClusterInstall}
+                  agents={agents}
+                  onSaveDetails={onSaveDetails}
+                  isPreviewOpen={isPreviewOpen}
+                  infraEnv={infraEnv}
+                  isNutanix={isNutanix}
+                />
+              </WizardStep>
 
-                {isCIMFlow(clusterDeployment) ? (
-                  <WizardStep name={stepNames['hosts-selection']} id={'host-selection'}>
-                    {agentClusterInstall?.metadata?.name ? (
-                      <ClusterDeploymentHostSelectionStep
-                        clusterDeployment={clusterDeployment}
-                        agentClusterInstall={agentClusterInstall}
-                        onSaveHostsSelection={onSaveHostsSelection}
-                        agents={agents}
-                        aiConfigMap={aiConfigMap}
-                        onEditRole={hostActions.onEditRole}
-                        onSetInstallationDiskId={hostActions.onSetInstallationDiskId}
-                        isNutanix={isNutanix}
-                      />
-                    ) : (
-                      <LoadingState />
-                    )}
-                  </WizardStep>
-                ) : (
-                  <WizardStep name={stepNames['hosts-discovery']} id={'host-discovery'}>
-                    {isAIFlow && onSaveISOParams && onCreateBMH ? (
-                      <ClusterDeploymentHostsDiscoveryStep
-                        clusterDeployment={clusterDeployment}
-                        agentClusterInstall={agentClusterInstall}
-                        agents={agents}
-                        bareMetalHosts={bareMetalHosts}
-                        aiConfigMap={aiConfigMap}
-                        infraEnv={infraEnv}
-                        fetchSecret={fetchSecret}
-                        onChangeBMHHostname={onChangeBMHHostname}
-                        onEditRole={hostActions.onEditRole}
-                        onSetInstallationDiskId={hostActions.onSetInstallationDiskId}
-                        onDeleteHost={hostActions.onDeleteHost}
-                        onSaveISOParams={onSaveISOParams}
-                        onCreateBMH={onCreateBMH}
-                        {...rest}
-                      />
-                    ) : (
-                      <LoadingState />
-                    )}
-                  </WizardStep>
-                )}
+              <WizardStep name={stepNames['automation']} id={'automation'} isDisabled />
 
-                <WizardStep name={stepNames['networking']} id={'networking'}>
-                  <ClusterDeploymentNetworkingStep
-                    clusterDeployment={clusterDeployment}
-                    agentClusterInstall={agentClusterInstall}
-                    agents={agents}
-                    onSaveNetworking={onSaveNetworking}
-                    onEditHost={hostActions.onEditHost}
-                    onEditRole={hostActions.onEditRole}
-                    fetchInfraEnv={fetchInfraEnv}
-                    isPreviewOpen={isPreviewOpen}
-                    onSetInstallationDiskId={hostActions.onSetInstallationDiskId}
-                    isNutanix={isNutanix}
-                  />
+              {isCIMFlow(clusterDeployment) ? (
+                <WizardStep name={stepNames['host-selection']} id={'host-selection'}>
+                  {agentClusterInstall?.metadata?.name ? (
+                    <ClusterDeploymentHostSelectionStep
+                      clusterDeployment={clusterDeployment}
+                      agentClusterInstall={agentClusterInstall}
+                      onSaveHostsSelection={onSaveHostsSelection}
+                      agents={agents}
+                      aiConfigMap={aiConfigMap}
+                      onEditRole={hostActions.onEditRole}
+                      onSetInstallationDiskId={hostActions.onSetInstallationDiskId}
+                      isNutanix={isNutanix}
+                    />
+                  ) : (
+                    <LoadingState />
+                  )}
                 </WizardStep>
-
-                <WizardStep name={stepNames['custom-manifests']} id={'custom-manifests'}>
-                  <ClusterDeploymentCustomManifestsStep agentClusterInstall={agentClusterInstall} />
+              ) : (
+                <WizardStep name={stepNames['host-discovery']} id={'host-discovery'}>
+                  {isAIFlow && onSaveISOParams && onCreateBMH ? (
+                    <ClusterDeploymentHostsDiscoveryStep
+                      clusterDeployment={clusterDeployment}
+                      agentClusterInstall={agentClusterInstall}
+                      agents={agents}
+                      bareMetalHosts={bareMetalHosts}
+                      aiConfigMap={aiConfigMap}
+                      infraEnv={infraEnv}
+                      fetchSecret={fetchSecret}
+                      onChangeBMHHostname={onChangeBMHHostname}
+                      onEditRole={hostActions.onEditRole}
+                      onSetInstallationDiskId={hostActions.onSetInstallationDiskId}
+                      onDeleteHost={hostActions.onDeleteHost}
+                      onSaveISOParams={onSaveISOParams}
+                      onCreateBMH={onCreateBMH}
+                      {...rest}
+                    />
+                  ) : (
+                    <LoadingState />
+                  )}
                 </WizardStep>
+              )}
 
-                <WizardStep name={stepNames['review']} id={'review'}>
-                  <ClusterDeploymentReviewStep
-                    onFinish={onFinish}
-                    clusterDeployment={clusterDeployment}
-                    agentClusterInstall={agentClusterInstall}
-                    agents={agents}
-                    clusterImages={clusterImages}
-                    infraEnv={infraEnv}
-                  />
-                </WizardStep>
-              </Wizard>
-            </ClusterDeploymentWizardContextProvider>
-          </ACMFeatureSupportLevelProvider>
+              <WizardStep name={stepNames['networking']} id={'networking'}>
+                <ClusterDeploymentNetworkingStep
+                  clusterDeployment={clusterDeployment}
+                  agentClusterInstall={agentClusterInstall}
+                  agents={agents}
+                  onSaveNetworking={onSaveNetworking}
+                  onEditHost={hostActions.onEditHost}
+                  onEditRole={hostActions.onEditRole}
+                  fetchInfraEnv={fetchInfraEnv}
+                  isPreviewOpen={isPreviewOpen}
+                  onSetInstallationDiskId={hostActions.onSetInstallationDiskId}
+                  isNutanix={isNutanix}
+                />
+              </WizardStep>
+
+              <WizardStep name={stepNames['custom-manifests']} id={'custom-manifests'}>
+                <ClusterDeploymentCustomManifestsStep agentClusterInstall={agentClusterInstall} />
+              </WizardStep>
+
+              <WizardStep name={stepNames['review']} id={'review'}>
+                <ClusterDeploymentReviewStep
+                  onFinish={onFinish}
+                  clusterDeployment={clusterDeployment}
+                  agentClusterInstall={agentClusterInstall}
+                  agents={agents}
+                  clusterImages={clusterImages}
+                  infraEnv={infraEnv}
+                />
+              </WizardStep>
+            </Wizard>
+          </ClusterDeploymentWizardContextProvider>
         </AlertsContextProvider>
       </GridItem>
       {isPreviewOpen && (

package/lib/cim/components/ClusterDeployment/ClusterInstallationError.tsx

@@ -36,7 +36,7 @@ const ClusterInstallationError: React.FC<ClusterInstallationErrorProps> = ({
               agentClusterInstall={agentClusterInstall}
             />
             <AlertActionLink
-              onClick={() => window.open(getReportIssueLink(), '_blank')}
+              onClick={() => window.open(getReportIssueLink(), '_blank', 'noopener,noreferrer')}
               id={getID('button-report-bug')}
             >
               {t('ai:Report a bug')}

package/lib/cim/components/ClusterDeployment/clusterDetails/ACMClusterDeploymentDetailsStep.tsx

@@ -2,9 +2,9 @@ import React from 'react';
 import { Formik, FormikProps, useFormikContext } from 'formik';
 import { Stack } from '@patternfly/react-core';
 import noop from 'lodash-es/noop.js';
-import { ClusterDetailsValues, getRichTextValidation } from '../../../../common';
+import { ClusterDetailsValues, getRichTextValidation, useTranslation } from '../../../../common';
 import { ClusterImageSetK8sResource } from '../../../types/k8s/cluster-image-set';
-import { useDetailsFormik } from './ClusterDeploymentDetailsStep';
+import { useDetailsFormik } from './useDetailsFormik';
 import { ClusterDetailsFormFieldsProps } from './ClusterDetailsFormFields';
 import { OsImage } from '../../../types';
 import { getOCPVersions } from '../../helpers';
@@ -57,10 +57,13 @@ export const ACMClusterDeploymentDetailsStep: React.FC<ACMClusterDeploymentDetai
   isNutanix,
   ...rest
 }) => {
-  const ocpVersions = getOCPVersions(clusterImages, !!isNutanix, osImages);
+  const { t } = useTranslation();
+  const ocpVersions = getOCPVersions(clusterImages, t, !!isNutanix, osImages);
+  const allOcpVersions = getOCPVersions(clusterImages, t, !!isNutanix, osImages, true);
 
   const [initialValues, validationSchema] = useDetailsFormik({
     ocpVersions,
+    allOcpVersions,
     usedClusterNames,
   });
 

package/lib/cim/components/ClusterDeployment/clusterDetails/ClusterDeploymentDetailsForm.tsx

@@ -24,11 +24,11 @@ import { useFormikContext } from 'formik';
 import {
   ClusterDetailsValues,
   CpuArchitecture,
+  isMajorMinorVersionEqualOrGreater,
   SupportedCpuArchitecture,
 } from '../../../../common';
 import { ClusterDeploymentWizardContext } from '../ClusterDeploymentWizardContext';
 import { ValidationSection } from '../components/ValidationSection';
-import { toNumber } from 'lodash-es';
 
 type ClusterDeploymentDetailsFormProps = {
   clusterImages: ClusterImageSetK8sResource[];
@@ -98,13 +98,13 @@ export const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsForm
 }) => {
   const { t } = useTranslation();
   const versions = React.useMemo(
-    () => getOCPVersions(clusterImages, isNutanix, osImages),
-    [clusterImages, isNutanix, osImages],
+    () => getOCPVersions(clusterImages, t, isNutanix, osImages),
+    [clusterImages, isNutanix, osImages, t],
   );
 
   const allVersions = React.useMemo(
-    () => getOCPVersions(clusterImages, isNutanix, osImages, true),
-    [clusterImages, isNutanix, osImages],
+    () => getOCPVersions(clusterImages, t, isNutanix, osImages, true),
+    [clusterImages, isNutanix, osImages, t],
   );
 
   const isEditFlow = !!clusterDeployment;
@@ -116,7 +116,7 @@ export const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsForm
     const version = allVersions.find((ver) => ver.value === values.openshiftVersion);
     const isMulti = version?.cpuArchitectures?.[0] === CpuArchitecture.MULTI;
 
-    const highlyAvailableSupported = toNumber(version?.version?.split('.')?.[1]) >= 18;
+    const highlyAvailableSupported = isMajorMinorVersionEqualOrGreater(version?.version, '4.18');
     return [
       (isMulti ? cpuArchitectures : version?.cpuArchitectures) as SupportedCpuArchitecture[],
       highlyAvailableSupported && !isMulti,

package/lib/cim/components/ClusterDeployment/clusterDetails/ClusterDeploymentDetailsStep.tsx

@@ -1,101 +1,18 @@
 import React from 'react';
 import { Formik } from 'formik';
-import { Lazy } from 'yup';
 import { Grid, GridItem, useWizardContext } from '@patternfly/react-core';
 
-import {
-  useAlerts,
-  getClusterDetailsInitialValues,
-  getClusterDetailsValidationSchema,
-  ClusterWizardStepHeader,
-  ClusterDetailsValues,
-  getRichTextValidation,
-  OpenshiftVersionOptionType,
-} from '../../../../common';
+import { useAlerts, ClusterWizardStepHeader, getRichTextValidation } from '../../../../common';
 
 import { ClusterDeploymentDetailsStepProps, ClusterDeploymentDetailsValues } from '../types';
-import { getAICluster, getNetworkType, getOCPVersions } from '../../helpers';
-import {
-  AgentClusterInstallK8sResource,
-  AgentK8sResource,
-  ClusterDeploymentK8sResource,
-  InfraEnvK8sResource,
-} from '../../../types';
+import { getOCPVersions } from '../../helpers';
 import {
   ClusterDeploymentDetailsForm,
   ClusterDeploymentDetailsFormWrapper,
 } from './ClusterDeploymentDetailsForm';
 import { getGridSpans } from '../helpers';
 import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
-
-type UseDetailsFormikArgs = {
-  usedClusterNames: string[];
-  ocpVersions: OpenshiftVersionOptionType[];
-  clusterDeployment?: ClusterDeploymentK8sResource;
-  agentClusterInstall?: AgentClusterInstallK8sResource;
-  agents?: AgentK8sResource[];
-  infraEnv?: InfraEnvK8sResource;
-};
-
-export const useDetailsFormik = ({
-  clusterDeployment,
-  agentClusterInstall,
-  agents,
-  usedClusterNames,
-  infraEnv,
-  ocpVersions,
-}: UseDetailsFormikArgs): [
-  ClusterDetailsValues & { networkType: 'OpenShiftSDN' | 'OVNKubernetes' },
-  Lazy<{ baseDnsDomain: string }>,
-] => {
-  const { t } = useTranslation();
-  const isEdit = !!clusterDeployment || !!agentClusterInstall;
-
-  const cluster = React.useMemo(
-    () =>
-      clusterDeployment && agentClusterInstall
-        ? getAICluster({
-            clusterDeployment,
-            agentClusterInstall,
-            agents,
-            infraEnv,
-          })
-        : undefined,
-    [agentClusterInstall, clusterDeployment, agents, infraEnv],
-  );
-
-  const initialValues = React.useMemo(
-    () => {
-      const initValues = getClusterDetailsInitialValues({
-        managedDomains: [], // not supported
-        cluster,
-        ocpVersions,
-      });
-
-      const ocpVersion = ocpVersions.find(
-        (ocpVersion) => ocpVersion.value === initValues.openshiftVersion,
-      );
-      return {
-        ...initValues,
-        networkType: getNetworkType(ocpVersion),
-      };
-    },
-    [], // eslint-disable-line react-hooks/exhaustive-deps
-  );
-
-  const validationSchema = React.useMemo(
-    () =>
-      getClusterDetailsValidationSchema({
-        usedClusterNames,
-        pullSecretSet: isEdit,
-        validateUniqueName: true,
-        t,
-      }),
-    [usedClusterNames, isEdit, t],
-  );
-
-  return [initialValues, validationSchema];
-};
+import { useDetailsFormik } from './useDetailsFormik';
 
 export const ClusterDeploymentDetailsStep: React.FC<ClusterDeploymentDetailsStepProps> = ({
   clusterImages,
@@ -112,12 +29,14 @@ export const ClusterDeploymentDetailsStep: React.FC<ClusterDeploymentDetailsStep
   const { addAlert } = useAlerts();
   const { goToNextStep } = useWizardContext();
 
-  const ocpVersions = getOCPVersions(clusterImages, isNutanix);
+  const ocpVersions = getOCPVersions(clusterImages, t, isNutanix);
+  const allOcpVersions = getOCPVersions(clusterImages, t, isNutanix, undefined, true);
   const gridSpans = getGridSpans(isPreviewOpen);
 
   const [initialValues, validationSchema] = useDetailsFormik({
     clusterDeployment,
     ocpVersions,
+    allOcpVersions,
     agentClusterInstall,
     agents,
     usedClusterNames,

package/lib/cim/components/ClusterDeployment/clusterDetails/ClusterDetailsFormFields.tsx

@@ -17,7 +17,6 @@ import { ClusterDetailsValues } from '../../../../common/components/clusterWizar
 import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
 import CpuArchitectureDropdown from '../../common/CpuArchitectureDropdown';
 import ControlPlaneNodesDropdown from '../../../../common/components/clusterConfiguration/ControlPlaneNodesDropdown';
-import { getNetworkType } from '../../helpers';
 
 export type ClusterDetailsFormFieldsProps = {
   isEditFlow: boolean;
@@ -59,19 +58,9 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
   const { t } = useTranslation();
   const nameInputRef = React.useRef<HTMLInputElement>();
   const [openshiftVersionModalOpen, setOpenshiftVersionModalOpen] = React.useState(false);
-  const { values, setFieldValue } = useFormikContext<ClusterDetailsValues>();
+  const { values } = useFormikContext<ClusterDetailsValues>();
   const { name, baseDnsDomain } = values;
 
-  React.useEffect(() => {
-    if (!versions.length && !values.openshiftVersion && !isEditFlow) {
-      const fallbackOpenShiftVersion = allVersions.find((version) => version.default);
-      setFieldValue('customOpenshiftSelect', fallbackOpenShiftVersion?.value);
-      setFieldValue('openshiftVersion', fallbackOpenShiftVersion?.value);
-      setFieldValue('networkType', getNetworkType(fallbackOpenShiftVersion));
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
   React.useEffect(() => {
     nameInputRef.current?.focus();
   }, []);
@@ -131,9 +120,8 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
       )}
       {isEditFlow ? (
         <StaticTextField name="openshiftVersion" label="OpenShift version" isRequired>
-          {t('ai:OpenShift')}{' '}
-          {allVersions.find((v) => v.value === values.openshiftVersion)?.version ||
-            values.openshiftVersion}
+          {allVersions.find((v) => v.value === values.openshiftVersion)?.label ||
+            `${t('ai:OpenShift')} ${values.openshiftVersion}`}
         </StaticTextField>
       ) : (
         <>

package/lib/cim/components/ClusterDeployment/clusterDetails/useDetailsFormik.tsx

@@ -0,0 +1,97 @@
+import React from 'react';
+import { Lazy } from 'yup';
+import {
+  ClusterDetailsValues,
+  getClusterDetailsInitialValues,
+  getClusterDetailsValidationSchema,
+  OpenshiftVersionOptionType,
+  useTranslation,
+} from '../../../../common';
+import {
+  AgentClusterInstallK8sResource,
+  AgentK8sResource,
+  ClusterDeploymentK8sResource,
+  InfraEnvK8sResource,
+} from '../../../types';
+import { getAICluster, getNetworkType } from '../../helpers';
+
+type UseDetailsFormikArgs = {
+  usedClusterNames: string[];
+  ocpVersions: OpenshiftVersionOptionType[];
+  allOcpVersions: OpenshiftVersionOptionType[];
+  clusterDeployment?: ClusterDeploymentK8sResource;
+  agentClusterInstall?: AgentClusterInstallK8sResource;
+  agents?: AgentK8sResource[];
+  infraEnv?: InfraEnvK8sResource;
+};
+
+export const useDetailsFormik = ({
+  clusterDeployment,
+  agentClusterInstall,
+  agents,
+  usedClusterNames,
+  infraEnv,
+  ocpVersions,
+  allOcpVersions,
+}: UseDetailsFormikArgs): [
+  ClusterDetailsValues & { networkType: 'OpenShiftSDN' | 'OVNKubernetes' },
+  Lazy<{ baseDnsDomain: string }>,
+] => {
+  const { t } = useTranslation();
+  const isEdit = !!clusterDeployment || !!agentClusterInstall;
+
+  const cluster = React.useMemo(
+    () =>
+      clusterDeployment && agentClusterInstall
+        ? getAICluster({
+            clusterDeployment,
+            agentClusterInstall,
+            agents,
+            infraEnv,
+          })
+        : undefined,
+    [agentClusterInstall, clusterDeployment, agents, infraEnv],
+  );
+
+  const initialValues = React.useMemo(
+    () => {
+      let initValues = getClusterDetailsInitialValues({
+        managedDomains: [], // not supported
+        cluster,
+        ocpVersions,
+      });
+
+      let ocpVersion = ocpVersions.find(
+        (ocpVersion) => ocpVersion.value === initValues.openshiftVersion,
+      );
+
+      if (!ocpVersion) {
+        ocpVersion = allOcpVersions.find((version) => version.default);
+        initValues = {
+          ...initValues,
+          openshiftVersion: ocpVersion?.value || '',
+          customOpenshiftSelect: ocpVersion?.value || '',
+        };
+      }
+
+      return {
+        ...initValues,
+        networkType: getNetworkType(ocpVersion),
+      };
+    },
+    [], // eslint-disable-line react-hooks/exhaustive-deps
+  );
+
+  const validationSchema = React.useMemo(
+    () =>
+      getClusterDetailsValidationSchema({
+        usedClusterNames,
+        pullSecretSet: isEdit,
+        validateUniqueName: true,
+        t,
+      }),
+    [usedClusterNames, isEdit, t],
+  );
+
+  return [initialValues, validationSchema];
+};

package/lib/cim/components/ClusterDeployment/components/ValidationSection.tsx

@@ -4,11 +4,12 @@ import { Cluster } from '@openshift-assisted/types/./assisted-installer-service'
 import { ValidationsInfo, ClusterWizardStepValidationsAlert } from '../../../../common';
 import { ClusterWizardStepHostStatusDeterminationObject } from '../../../../common/types/hosts';
 import ValidationsRunningAlert from '../../common/ValidationsRunningAlert';
-import { ClusterWizardStepsType, wizardStepsValidationsMap } from '../wizardTransition';
+import { wizardStepsValidationsMap } from '../wizardTransition';
+import { ClusterDeploymentWizardStepsType } from '../types';
 
 type ValidationSectionProps = {
   requireProxy?: boolean;
-  currentStepId: ClusterWizardStepsType;
+  currentStepId: ClusterDeploymentWizardStepsType;
   validationsInfo?: ValidationsInfo;
   clusterStatus?: Cluster['status'];
   hosts: ClusterWizardStepHostStatusDeterminationObject[];

package/lib/cim/components/ClusterDeployment/constants.ts

@@ -15,8 +15,8 @@ export const wizardStepNames = (
   'installation-type': t('ai:Installation type'),
   automation: t('ai:Automation'),
   'cluster-details': t('ai:Cluster details'),
-  'hosts-selection': t('ai:Cluster hosts'),
-  'hosts-discovery': t('ai:Cluster hosts'),
+  'host-selection': t('ai:Cluster hosts'),
+  'host-discovery': t('ai:Cluster hosts'),
   networking: t('ai:Networking'),
   'custom-manifests': t('ai:Custom manifests'),
   review: t('ai:Review and create'),

package/lib/cim/components/ClusterDeployment/hostDiscovery/ClusterDeploymentHostDiscoveryTable.tsx

@@ -88,7 +88,7 @@ const ClusterDeploymentHostDiscoveryTable: React.FC<ClusterDeploymentHostDiscove
         bmhStatuses,
         onEditHostname: onEditHost,
         onApprove,
-        wizardStepId: 'hosts-discovery',
+        wizardStepId: 'host-discovery',
         t,
       }),
       roleColumn(t, hostActions.canEditRole, hostActions.onEditRole),

package/lib/cim/components/ClusterDeployment/hostDiscovery/ClusterDeploymentHostsDiscoveryStep.tsx

@@ -61,7 +61,7 @@ export const ClusterDeploymentHostsDiscoveryStep = ({
     errors.push(t('ai:Hostnames must be unique.'));
   }
   const agentsNotHealthy = infraEnvAgents
-    .map((agent) => getWizardStepAgentStatus(agent, 'hosts-discovery', t).status.key)
+    .map((agent) => getWizardStepAgentStatus(agent, 'host-discovery', t).status.key)
     .some((status) =>
       ['disconnected', 'disabled', 'error', 'insufficient', 'cancelled'].includes(status),
     );
@@ -173,7 +173,7 @@ export const ClusterDeploymentHostsDiscoveryStep = ({
 
       {!!syncError && (
         <GridItem>
-          <ValidationSection currentStepId={'hosts-selection'} hosts={[]}>
+          <ValidationSection currentStepId={'host-selection'} hosts={[]}>
             <Alert variant={AlertVariant.danger} title={t('ai:An error occurred')} isInline>
               {syncError}
             </Alert>

package/lib/cim/components/ClusterDeployment/hostSelection/ClusterDeploymentHostSelectionStep.tsx

@@ -216,7 +216,7 @@ const HostSelectionForm: React.FC<HostSelectionFormProps> = ({
   React.useEffect(() => {
     if (nextRequested && !isSubmitting) {
       const agentStatuses = selectedAgents.map(
-        (agent) => getWizardStepAgentStatus(agent, 'hosts-selection', t).status.key,
+        (agent) => getWizardStepAgentStatus(agent, 'host-selection', t).status.key,
       );
       if (
         agentStatuses.some((status) =>
@@ -227,7 +227,7 @@ const HostSelectionForm: React.FC<HostSelectionFormProps> = ({
       } else if (
         !!selectedAgents.length &&
         selectedAgents.every(
-          (agent) => getWizardStepAgentStatus(agent, 'hosts-selection', t).status.key === 'known',
+          (agent) => getWizardStepAgentStatus(agent, 'host-selection', t).status.key === 'known',
         )
       ) {
         setShowClusterErrors(true);