@openshift-assisted/ui-lib 2.16.2-cim → 2.16.4-cim

package/lib/cim/components/ClusterDeployment/{networking/ClusterDeploymentHostsNetworkTable.tsx → ClusterDeploymentHostsNetworkTable.tsx}

@@ -1,26 +1,26 @@
 import * as React from 'react';
 import { ConnectedIcon } from '@patternfly/react-icons/dist/js/icons/connected-icon';
-import { EmptyState } from '../../../../common';
-import { AgentTableActions } from '../types';
+import { EmptyState } from '../../../common';
+import { AgentTableActions } from './types';
 import {
   AgentClusterInstallK8sResource,
   AgentK8sResource,
   ClusterDeploymentK8sResource,
-} from '../../../types';
-import { getAICluster, getIsSNOCluster } from '../../helpers';
-import { AdditionalNTPSourcesDialogToggle } from '../components/AdditionalNTPSourcesDialogToggle';
-import { agentStatusColumn, useAgentsTable } from '../../Agent/tableUtils';
-import HostsTable from '../../../../common/components/hosts/HostsTable';
-import { HostDetail } from '../../../../common/components/hosts/HostRowDetail';
+} from '../../types';
+import { getAICluster, getIsSNOCluster } from '../helpers';
+import { AdditionalNTPSourcesDialogToggle } from './AdditionalNTPSourcesDialogToggle';
+import { agentStatusColumn, useAgentsTable } from '../Agent/tableUtils';
+import HostsTable from '../../../common/components/hosts/HostsTable';
+import { HostDetail } from '../../../common/components/hosts/HostRowDetail';
 import {
   activeNICColumn,
   hostnameColumn,
   roleColumn,
-} from '../../../../common/components/hosts/tableUtils';
-import { usePagination } from '../../../../common/components/hosts/usePagination';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
+} from '../../../common/components/hosts/tableUtils';
+import { usePagination } from '../../../common/components/hosts/usePagination';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { Host } from '@openshift-assisted/types/assisted-installer-service';
-import { agentStatus } from '../../helpers/agentStatus';
+import { agentStatus } from '../helpers/agentStatus';
 
 type ExpandComponentContextType = {
   onSetInstallationDiskId?: ClusterDeploymentHostsNetworkTableProps['onSetInstallationDiskId'];

package/lib/cim/components/ClusterDeployment/{hostSelection/ClusterDeploymentHostsSelection.tsx → ClusterDeploymentHostsSelection.tsx}

@@ -1,36 +1,21 @@
 import React from 'react';
 import { useFormikContext } from 'formik';
-import { Grid, GridItem, TextContent, Form } from '@patternfly/react-core';
-import { SwitchField } from '../../../../common';
+import { Grid, GridItem, Content, Form } from '@patternfly/react-core';
+import { SwitchField } from '../../../common';
 import {
   ClusterDeploymentHostsSelectionProps,
   ClusterDeploymentHostsSelectionValues,
-} from '../types';
+} from './types';
 import ClusterDeploymentHostsSelectionBasic from './ClusterDeploymentHostsSelectionBasic';
-import { ClusterDeploymentHostsSelectionAdvanced } from './ClusterDeploymentHostsSelectionAdvanced';
+import ClusterDeploymentHostsSelectionAdvanced from './ClusterDeploymentHostsSelectionAdvanced';
 import {
   getAgentsForSelection,
   getClusterDeploymentCpuArchitecture,
   getIsSNOCluster,
-  getIsTNACluster,
-} from '../../helpers';
-import MinimalHWRequirements from '../../Agent/MinimalHWRequirements';
-import NoAgentsAlert from '../../Agent/NoAgentsAlert';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
-import { TFunction } from 'i18next';
-
-const getHostRequirementText = (isSNO: boolean, isTNA: boolean, t: TFunction) => {
-  if (isSNO) {
-    return t(
-      'ai:Exactly 1 host is required, capable of functioning both as control plane and worker node.',
-    );
-  } else if (isTNA) {
-    return t(
-      'ai:Exactly 2 hosts capable of functioning as control plane nodes, and one arbiter, are required.',
-    );
-  }
-  return t('ai:At least 3 hosts are required, capable of functioning as control plane nodes.');
-};
+} from '../helpers';
+import MinimalHWRequirements from '../Agent/MinimalHWRequirements';
+import NoAgentsAlert from '../Agent/NoAgentsAlert';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 
 const ClusterDeploymentHostsSelection: React.FC<ClusterDeploymentHostsSelectionProps> = ({
   agentClusterInstall,
@@ -43,11 +28,9 @@ const ClusterDeploymentHostsSelection: React.FC<ClusterDeploymentHostsSelectionP
   onSetInstallationDiskId,
   isNutanix,
 }) => {
-  const { t } = useTranslation();
   const { values } = useFormikContext<ClusterDeploymentHostsSelectionValues>();
   const { autoSelectHosts } = values;
   const isSNOCluster = getIsSNOCluster(agentClusterInstall);
-  const isTNA = getIsTNACluster(agentClusterInstall);
 
   const cdName = clusterDeployment?.metadata?.name;
   const cdNamespace = clusterDeployment?.metadata?.namespace;
@@ -62,20 +45,22 @@ const ClusterDeploymentHostsSelection: React.FC<ClusterDeploymentHostsSelectionP
           !agent.spec.clusterDeploymentName?.namespace &&
           agent.status?.inventory.cpu?.architecture === cpuArchitecture),
     );
-
     return isNutanix
       ? filtered.filter((a) => a.status?.inventory?.systemVendor?.manufacturer === 'Nutanix')
       : filtered;
   }, [agents, cdNamespace, cdName, cpuArchitecture, isNutanix]);
-
-  const hostRequirementText = getHostRequirementText(isSNOCluster, isTNA, t);
-
+  const { t } = useTranslation();
   return (
     <Grid hasGutter>
       <GridItem>
-        <TextContent>{hostRequirementText}</TextContent>
+        <Content>
+          {isSNOCluster
+            ? t(
+                'ai:Exactly 1 host is required, capable of functioning both as control plane and worker node.',
+              )
+            : t('ai:At least 3 hosts are required, capable of functioning as control plane nodes.')}
+        </Content>
       </GridItem>
-
       {aiConfigMap && (
         <GridItem>
           <MinimalHWRequirements aiConfigMap={aiConfigMap} isSNOCluster={isSNOCluster} />

package/lib/cim/components/ClusterDeployment/{hostSelection/ClusterDeploymentHostsSelectionAdvanced.tsx → ClusterDeploymentHostsSelectionAdvanced.tsx}

@@ -4,15 +4,15 @@ import React from 'react';
 import Measure from 'react-measure';
 import { Alert, AlertVariant, Grid, GridItem } from '@patternfly/react-core';
 
-import { AgentK8sResource } from '../../../types';
-import { AGENT_LOCATION_LABEL_KEY, AGENT_NOLOCATION_VALUE } from '../../common';
-import LocationsSelector from '../LocationsSelector';
-import { ClusterDeploymentHostsSelectionValues, ScaleUpFormValues } from '../types';
-import LabelsSelector, { infraEnvLabelKeys } from '../LabelsSelector';
-import AgentsSelectionTable from '../../Agent/AgentsSelectionTable';
-import { AgentTableActions } from '../types';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
-import { CpuArchitecture } from '../../../../common';
+import { AgentK8sResource } from '../../types';
+import { AGENT_LOCATION_LABEL_KEY, AGENT_NOLOCATION_VALUE } from '../common';
+import LocationsSelector from './LocationsSelector';
+import { ClusterDeploymentHostsSelectionValues, ScaleUpFormValues } from './types';
+import LabelsSelector, { infraEnvLabelKeys } from './LabelsSelector';
+import AgentsSelectionTable from '../Agent/AgentsSelectionTable';
+import { AgentTableActions } from './types';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import { CpuArchitecture } from '../../../common';
 
 type ClusterDeploymentHostsSelectionAdvancedProps = {
   availableAgents: AgentK8sResource[];
@@ -25,7 +25,7 @@ type ClusterDeploymentHostsSelectionAdvancedProps = {
 
 type FormValues = ClusterDeploymentHostsSelectionValues | ScaleUpFormValues;
 
-export const ClusterDeploymentHostsSelectionAdvanced = <T extends FormValues>({
+const ClusterDeploymentHostsSelectionAdvanced = <T extends FormValues>({
   availableAgents,
   onEditRole,
   onSetInstallationDiskId,
@@ -103,3 +103,5 @@ export const ClusterDeploymentHostsSelectionAdvanced = <T extends FormValues>({
     </>
   );
 };
+
+export default ClusterDeploymentHostsSelectionAdvanced;

package/lib/cim/components/ClusterDeployment/{hostSelection/ClusterDeploymentHostsSelectionBasic.tsx → ClusterDeploymentHostsSelectionBasic.tsx}

@@ -1,15 +1,15 @@
 import React from 'react';
 import { Grid, GridItem } from '@patternfly/react-core';
-import { CheckboxField, NumberInputField } from '../../../../common';
-import { HOSTS_MAX_COUNT, HOSTS_MIN_COUNT } from '../constants';
+import { CheckboxField, NumberInputField } from '../../../common';
+import { HOSTS_MAX_COUNT, HOSTS_MIN_COUNT } from './constants';
 import { useFormikContext } from 'formik';
-import { ClusterDeploymentHostsSelectionValues } from '../types';
-import LocationsSelector from '../LocationsSelector';
-import { AgentK8sResource } from '../../../types';
-import AgentsSelectionHostCountAlerts from '../../Agent/AgentsSelectionHostCountAlerts';
-import AgentsSelectionHostCountLabelIcon from '../../Agent/AgentsSelectionHostCountLabelIcon';
-import { useAgentsAutoSelection } from '../../Agent/AgentsSelectionUtils';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
+import { ClusterDeploymentHostsSelectionValues } from './types';
+import LocationsSelector from './LocationsSelector';
+import { AgentK8sResource } from '../../types';
+import AgentsSelectionHostCountAlerts from '../Agent/AgentsSelectionHostCountAlerts';
+import AgentsSelectionHostCountLabelIcon from '../Agent/AgentsSelectionHostCountLabelIcon';
+import { useAgentsAutoSelection } from '../Agent/AgentsSelectionUtils';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 
 type ClusterDeploymentHostsSelectionBasicProps = {
   availableAgents: AgentK8sResource[];

package/lib/cim/components/ClusterDeployment/{networking/ClusterDeploymentNetworkingForm.tsx → ClusterDeploymentNetworkingForm.tsx}

@@ -5,9 +5,8 @@ import {
   Grid,
   GridItem,
   Spinner,
-  Text,
-  TextContent,
-  TextVariants,
+  Content,
+  ContentVariants,
   Checkbox,
   Split,
   SplitItem,
@@ -20,21 +19,25 @@ import {
   SecurityFields,
   ProxyFields,
   ProxyInputFields,
-} from '../../../../common';
-import NetworkConfiguration from '../NetworkConfiguration';
+} from '../../../common';
+import NetworkConfiguration from './NetworkConfiguration';
 import ClusterDeploymentHostsNetworkTable from './ClusterDeploymentHostsNetworkTable';
-import { getAICluster, getIsSNOCluster } from '../../helpers';
+import { getAICluster, getIsSNOCluster } from '../helpers';
 import {
   AgentClusterInstallK8sResource,
   AgentK8sResource,
   ClusterDeploymentK8sResource,
   InfraEnvK8sResource,
-} from '../../../types';
-import { AgentTableActions, ClusterDeploymentNetworkingValues } from '../types';
+} from '../../types';
+import { AgentTableActions, ClusterDeploymentNetworkingValues } from './types';
 import { useFormikContext } from 'formik';
-import { getGridSpans } from '../helpers';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
+import { getGridSpans } from './helpers';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { Trans } from 'react-i18next';
+import { ClusterDefaultConfig } from '@openshift-assisted/types/assisted-installer-service';
+
+// TODO(mlibra): So far a constant. Should be queried from somewhere.
+export const defaultNetworkSettings: ClusterDefaultConfig = CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV4;
 
 type ClusterDeploymentNetworkingFormProps = {
   clusterDeployment: ClusterDeploymentK8sResource;
@@ -96,16 +99,14 @@ const ClusterDeploymentNetworkingForm: React.FC<ClusterDeploymentNetworkingFormP
     if (!sameProxies) {
       proxyConfig = (
         <>
-          <TextContent>
-            <Text component="h2">{t('ai:Cluster-wide proxy')}</Text>
-            <Text component={TextVariants.p}>
-              <Trans
-                t={t}
-                components={{ bold: <strong /> }}
-                i18nKey="ai:The hosts you selected are using different proxy settings. Configure a proxy that will be applied for these hosts. <bold>Configure at least one of the proxy settings below.</bold>"
-              />
-            </Text>
-          </TextContent>
+          <Content component="h2">{t('ai:Cluster-wide proxy')}</Content>
+          <Content component={ContentVariants.p}>
+            <Trans
+              t={t}
+              components={{ bold: <strong /> }}
+              i18nKey="ai:The hosts you selected are using different proxy settings. Configure a proxy that will be applied for these hosts. <bold>Configure at least one of the proxy settings below.</bold>"
+            />
+          </Content>
           <ProxyInputFields />
         </>
       );
@@ -136,7 +137,7 @@ const ClusterDeploymentNetworkingForm: React.FC<ClusterDeploymentNetworkingFormP
                 cluster={cluster}
                 hostSubnets={hostSubnets}
                 isVipDhcpAllocationDisabled
-                defaultNetworkSettings={CLUSTER_DEFAULT_NETWORK_SETTINGS_IPV4}
+                defaultNetworkSettings={defaultNetworkSettings}
                 hideManagedNetworking={getIsSNOCluster(agentClusterInstall) || isNutanix}
               />
             </GridItem>
@@ -160,9 +161,7 @@ const ClusterDeploymentNetworkingForm: React.FC<ClusterDeploymentNetworkingFormP
           <SecurityFields clusterSshKey={cluster.sshPublicKey} />
         </StackItem>
         <StackItem>
-          <TextContent>
-            <Text component="h2">{t('ai:Host inventory')}</Text>
-          </TextContent>
+          <Content component="h2">{t('ai:Host inventory')}</Content>
           <ClusterDeploymentHostsNetworkTable
             clusterDeployment={clusterDeployment}
             agentClusterInstall={agentClusterInstall}

package/lib/cim/components/ClusterDeployment/{networking/ClusterDeploymentNetworkingStep.tsx → ClusterDeploymentNetworkingStep.tsx}

@@ -17,21 +17,21 @@ import {
   getFormikErrorFields,
   clusterFieldLabels,
   Alerts,
-} from '../../../../common';
+} from '../../../common';
 
 import {
   ClusterDeploymentDetailsNetworkingProps,
   AgentTableActions,
   ClusterDeploymentNetworkingValues,
-} from '../types';
+} from './types';
 import ClusterDeploymentNetworkingForm from './ClusterDeploymentNetworkingForm';
-import { isAgentOfCluster } from '../helpers';
-import { useInfraEnvProxies, useNetworkingFormik } from '../use-networking-formik';
-import { canNextFromNetworkingStep } from '../wizardTransition';
-import { AgentK8sResource } from '../../../types';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
-import { ValidationSection } from '../components/ValidationSection';
-import { ClusterDeploymentWizardContext } from '../ClusterDeploymentWizardContext';
+import { isAgentOfCluster } from './helpers';
+import { useInfraEnvProxies, useNetworkingFormik } from './use-networking-formik';
+import { canNextFromNetworkingStep } from './wizardTransition';
+import { AgentK8sResource } from '../../types';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import { ValidationSection } from './components/ValidationSection';
+import { ClusterDeploymentWizardContext } from './ClusterDeploymentWizardContext';
 
 type NetworkingFormProps = {
   clusterDeployment: ClusterDeploymentDetailsNetworkingProps['clusterDeployment'];
@@ -200,7 +200,7 @@ export const NetworkingForm = ({
         {syncError && (
           <GridItem>
             <ValidationSection currentStepId={'networking'} hosts={[]}>
-              <Alert variant={AlertVariant.danger} title={t('ai:An error occurred')} isInline>
+              <Alert variant={AlertVariant.danger} title={t('ai:An error occured')} isInline>
                 {syncError}
               </Alert>
             </ValidationSection>
@@ -212,7 +212,7 @@ export const NetworkingForm = ({
   );
 };
 
-export const ClusterDeploymentNetworkingStep = ({
+const ClusterDeploymentNetworkingStep = ({
   clusterDeployment,
   agentClusterInstall,
   agents,
@@ -261,3 +261,5 @@ export const ClusterDeploymentNetworkingStep = ({
     </Formik>
   );
 };
+
+export default ClusterDeploymentNetworkingStep;

package/lib/cim/components/ClusterDeployment/{review/ClusterDeploymentReviewStep.tsx → ClusterDeploymentReviewStep.tsx}

@@ -8,14 +8,14 @@ import {
   WizardFooter,
 } from '@patternfly/react-core';
 import * as React from 'react';
-import { canNextFromReviewStep } from '../wizardTransition';
+import { canNextFromReviewStep } from './wizardTransition';
 import {
   AgentClusterInstallK8sResource,
   AgentK8sResource,
   ClusterDeploymentK8sResource,
   ClusterImageSetK8sResource,
   InfraEnvK8sResource,
-} from '../../../types';
+} from '../../types';
 import {
   ClusterWizardStepHeader,
   DetailList,
@@ -24,25 +24,18 @@ import {
   ClusterValidations,
   HostsValidations,
   useAlerts,
-  getPlatforms,
-} from '../../../../common';
-import {
-  getSelectedVersion,
-  getAICluster,
-  getClusterDeploymentCpuArchitecture,
-} from '../../helpers';
-import { isAgentOfCluster } from '../helpers';
-import { wizardStepNames } from '../constants';
+} from '../../../common';
+import { getSelectedVersion, getAICluster, getClusterDeploymentCpuArchitecture } from '../helpers';
+import { isAgentOfCluster } from './helpers';
+import { wizardStepNames } from './constants';
 import {
   wizardStepsValidationsMap,
   ClusterWizardStepsType,
   allClusterWizardSoftValidationIds,
-} from '../wizardTransition';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
-import { ClusterDeploymentWizardContext } from '../ClusterDeploymentWizardContext';
-import { ReviewConfigMapsTable } from './ReviewConfigMapsTable';
-import { ValidationSection } from '../components/ValidationSection';
-import { PlatformType } from '@openshift-assisted/types/assisted-installer-service';
+} from './wizardTransition';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import { ClusterDeploymentWizardContext } from './ClusterDeploymentWizardContext';
+import { ValidationSection } from './components/ValidationSection';
 
 type ClusterDeploymentReviewStepProps = {
   clusterDeployment: ClusterDeploymentK8sResource;
@@ -54,7 +47,7 @@ type ClusterDeploymentReviewStepProps = {
   infraEnv?: InfraEnvK8sResource;
 };
 
-export const ClusterDeploymentReviewStep = ({
+const ClusterDeploymentReviewStep = ({
   agentClusterInstall,
   agents,
   onFinish,
@@ -84,7 +77,7 @@ export const ClusterDeploymentReviewStep = ({
       await onFinish();
     } catch (err) {
       const error = err as Error;
-      addAlert({ title: error.message || t('ai:An error occurred while starting installation.') });
+      addAlert({ title: error.message || t('ai:An error occured while starting installation.') });
     } finally {
       setSubmitting(false);
     }
@@ -104,10 +97,6 @@ export const ClusterDeploymentReviewStep = ({
   useWizardFooter(footer);
 
   const openShiftVersion = getSelectedVersion(clusterImages, agentClusterInstall);
-  const platform =
-    getPlatforms(t)[
-      (agentClusterInstall?.spec?.platformType?.toLowerCase() || 'baremetal') as PlatformType
-    ];
 
   const cluster = React.useMemo(
     () => getAICluster({ clusterDeployment, agentClusterInstall, agents: clusterAgents }),
@@ -138,11 +127,6 @@ export const ClusterDeploymentReviewStep = ({
             value={cpuArchitecture}
             testId="cpu-architecture"
           />
-          <DetailItem
-            title={t('ai:External partner platform')}
-            value={platform}
-            testId="platform-type"
-          />
           <DetailItem
             title={t('ai:API IP')}
             value={agentClusterInstall?.status?.apiVIP || agentClusterInstall?.spec?.apiVIP}
@@ -159,13 +143,6 @@ export const ClusterDeploymentReviewStep = ({
             value={<ReviewHostsInventory hosts={cluster.hosts} />}
           />
 
-          {!!agentClusterInstall.spec?.manifestsConfigMapRefs?.length ? (
-            <DetailItem
-              title={t('ai:Custom manifests')}
-              value={<ReviewConfigMapsTable agentClusterInstall={agentClusterInstall} />}
-            />
-          ) : undefined}
-
           <DetailItem
             title={t('ai:Cluster validations')}
             value={
@@ -196,7 +173,7 @@ export const ClusterDeploymentReviewStep = ({
       {syncError && (
         <GridItem>
           <ValidationSection currentStepId={'review'} hosts={[]}>
-            <Alert variant={AlertVariant.danger} title={t('ai:An error occurred')} isInline>
+            <Alert variant={AlertVariant.danger} title={t('ai:An error occured')} isInline>
               {syncError}
             </Alert>
           </ValidationSection>
@@ -205,3 +182,5 @@ export const ClusterDeploymentReviewStep = ({
     </Grid>
   );
 };
+
+export default ClusterDeploymentReviewStep;

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

@@ -2,18 +2,17 @@ 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 ClusterDeploymentDetailsStep from './ClusterDeploymentDetailsStep';
+import ClusterDeploymentNetworkingStep from './ClusterDeploymentNetworkingStep';
+import ClusterDeploymentHostSelectionStep from './ClusterDeploymentHostSelectionStep';
 import { ClusterDeploymentWizardProps } from './types';
+import ClusterDeploymentHostsDiscoveryStep from './ClusterDeploymentHostsDiscoveryStep';
 import { ACMFeatureSupportLevelProvider } from '../featureSupportLevels';
+import ClusterDeploymentReviewStep from './ClusterDeploymentReviewStep';
 import { YamlPreview, useYamlPreview } from '../YamlPreview';
 import { wizardStepNames } from './constants';
 import { ClusterDeploymentWizardContextProvider } from './ClusterDeploymentWizardContext';
 import { isCIMFlow } from './helpers';
-import { ClusterDeploymentDetailsStep } from './clusterDetails';
-import { ClusterDeploymentHostSelectionStep } from './hostSelection';
-import { ClusterDeploymentHostsDiscoveryStep } from './hostDiscovery';
-import { ClusterDeploymentNetworkingStep } from './networking';
-import { ClusterDeploymentReviewStep } from './review';
-import { ClusterDeploymentCustomManifestsStep } from './customManifests';
 
 export const ClusterDeploymentWizard = ({
   className,
@@ -77,7 +76,6 @@ export const ClusterDeploymentWizard = ({
                   id={'installation-type'}
                   isDisabled
                 />
-
                 <WizardStep name={stepNames['cluster-details']} id={'cluster-details'}>
                   <ClusterDeploymentDetailsStep
                     clusterImages={clusterImages}
@@ -91,9 +89,7 @@ export const ClusterDeploymentWizard = ({
                     isNutanix={isNutanix}
                   />
                 </WizardStep>
-
                 <WizardStep name={stepNames['automation']} id={'automation'} isDisabled />
-
                 {isCIMFlow(clusterDeployment) ? (
                   <WizardStep name={stepNames['hosts-selection']} id={'host-selection'}>
                     {agentClusterInstall?.metadata?.name ? (
@@ -135,7 +131,6 @@ export const ClusterDeploymentWizard = ({
                     )}
                   </WizardStep>
                 )}
-
                 <WizardStep name={stepNames['networking']} id={'networking'}>
                   <ClusterDeploymentNetworkingStep
                     clusterDeployment={clusterDeployment}
@@ -150,11 +145,6 @@ export const ClusterDeploymentWizard = ({
                     isNutanix={isNutanix}
                   />
                 </WizardStep>
-
-                <WizardStep name={stepNames['custom-manifests']} id={'custom-manifests'}>
-                  <ClusterDeploymentCustomManifestsStep agentClusterInstall={agentClusterInstall} />
-                </WizardStep>
-
                 <WizardStep name={stepNames['review']} id={'review'}>
                   <ClusterDeploymentReviewStep
                     onFinish={onFinish}

package/lib/cim/components/ClusterDeployment/{clusterDetails/ClusterDetailsFormFields.tsx → ClusterDetailsFormFields.tsx}

@@ -3,24 +3,23 @@ import { Form } from '@patternfly/react-core';
 import { useFormikContext } from 'formik';
 
 import {
-  ExternalPlatformsDropdown,
   isMajorMinorVersionEqualOrGreater,
   OpenShiftVersionDropdown,
   OpenShiftVersionModal,
-} from '../../../../common';
-import { StaticTextField } from '../../../../common/components/ui/StaticTextField';
-import { PullSecret } from '../../../../common/components/clusters';
-import { OpenshiftVersionOptionType, SupportedCpuArchitecture } from '../../../../common/types';
+} from '../../../common';
+import { StaticTextField } from '../../../common/components/ui/StaticTextField';
+import { PullSecret } from '../../../common/components/clusters';
+import { OpenshiftVersionOptionType, SupportedCpuArchitecture } from '../../../common/types';
 import {
   InputField,
   RichInputField,
   acmClusterNameValidationMessages,
-} from '../../../../common/components/ui/formik';
-import { ClusterDetailsValues } from '../../../../common/components/clusterWizard/types';
-import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
-import CpuArchitectureDropdown from '../../common/CpuArchitectureDropdown';
-import ControlPlaneNodesDropdown from '../../../../common/components/clusterConfiguration/ControlPlaneNodesDropdown';
-import { getNetworkType } from '../../helpers';
+} from '../../../common/components/ui/formik';
+import { ClusterDetailsValues } from '../../../common/components/clusterWizard/types';
+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;
@@ -70,7 +69,7 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
   React.useEffect(() => {
     if (!versions.length && !values.openshiftVersion) {
       const fallbackOpenShiftVersion = allVersions.find((version) => version.default);
-      setFieldValue('customOpenshiftSelect', fallbackOpenShiftVersion?.value);
+      setFieldValue('customOpenshiftSelect', fallbackOpenShiftVersion);
       setFieldValue('openshiftVersion', fallbackOpenShiftVersion?.value);
       setFieldValue('networkType', getNetworkType(fallbackOpenShiftVersion));
     }
@@ -90,23 +89,28 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
     [versions],
   );
 
-  const additionalSelectOption = React.useMemo(() => {
+  const additionalSelectOptions = React.useMemo(() => {
     if (
       values.customOpenshiftSelect &&
-      !versions.some((version) => version.value === values.customOpenshiftSelect)
+      !selectOptions.some((option) => option.value === values.customOpenshiftSelect?.value)
     ) {
-      return allVersions.find((option) => option.value === values.customOpenshiftSelect);
+      return [
+        {
+          value: values.customOpenshiftSelect.value,
+          label: values.customOpenshiftSelect.label,
+        },
+      ];
     }
-    return undefined;
-  }, [allVersions, values.customOpenshiftSelect, versions]);
+    return [];
+  }, [selectOptions, values.customOpenshiftSelect]);
 
   const allowTNA = React.useMemo(() => {
     const current =
-      values.customOpenshiftSelect ||
+      values.customOpenshiftSelect?.version ||
       versions.find((version) => version.value === values.openshiftVersion)?.version;
 
     return isMajorMinorVersionEqualOrGreater(current, '4.19') && values.platform === 'baremetal';
-  }, [values.customOpenshiftSelect, values.openshiftVersion, values.platform, versions]);
+  }, [values.customOpenshiftSelect?.version, values.openshiftVersion, values.platform, versions]);
 
   return (
     <Form id="wizard-cluster-details__form">
@@ -155,7 +159,7 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
             versions={versions}
             showReleasesLink={false}
             showOpenshiftVersionModal={() => setOpenshiftVersionModalOpen(true)}
-            customItem={additionalSelectOption}
+            customItems={additionalSelectOptions}
           />
           {openshiftVersionModalOpen && (
             <OpenShiftVersionModal
@@ -174,8 +178,6 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
         <CpuArchitectureDropdown cpuArchitectures={cpuArchitectures} isDisabled={isEditFlow} />
       )}
 
-      <ExternalPlatformsDropdown isDisabled={isEditFlow} />
-
       {extensionAfter?.['openshiftVersion'] && extensionAfter['openshiftVersion']}
 
       {!isEditFlow && <PullSecret />}

package/lib/cim/components/ClusterDeployment/LabelSelector.css

@@ -3,7 +3,7 @@
   border: none !important;
 }
 
-.ai-split-filter-hosts .pf-v5-c-label-group__label {
+.ai-split-filter-hosts .pf-v6-c-label-group__label {
   overflow: unset !important;
   max-width: unset !important;
 }