@openshift-assisted/ui-lib 2.38.4 → 2.39.0

package/lib/{ocm/components/clusterConfiguration → common/components/ui}/OpenShiftVersionModal.tsx

@@ -1,23 +1,23 @@
 import React, { useState } from 'react';
 import { Button, ButtonVariant, FormGroup, Modal, ModalVariant } from '@patternfly/react-core';
-import './OpenshiftVersionModal.css';
-import { OpenshiftSelectWithSearch } from '../../../common/components/ui/OpenshiftSelectWithSearch';
-import { useOpenshiftVersionsContext } from '../clusterWizard/OpenshiftVersionsContext';
-import { HelperTextType } from '../../../common/components/ui/OpenShiftVersionDropdown';
+import { OpenShiftSelectWithSearch } from './OpenShiftSelectWithSearch';
+import { HelperTextType } from './OpenShiftVersionDropdown';
 import { useFormikContext } from 'formik';
-import { ClusterDetailsValues, OpenshiftVersionOptionType } from '../../../common';
+import { ClusterDetailsValues, OpenshiftVersionOptionType } from '../..';
+import './OpenShiftVersionModal.css';
 
 type OpenShiftVersionModalProps = {
+  allVersions: OpenshiftVersionOptionType[];
   setOpenshiftVersionModalOpen: (isOpen: boolean) => void;
-  getHelperText: HelperTextType;
+  getHelperText?: HelperTextType;
 };
 
 export const OpenShiftVersionModal = ({
+  allVersions,
   setOpenshiftVersionModalOpen,
   getHelperText,
 }: OpenShiftVersionModalProps) => {
   const { setFieldValue } = useFormikContext<ClusterDetailsValues>();
-  const { allVersions: versions } = useOpenshiftVersionsContext();
   const onClose = () => setOpenshiftVersionModalOpen(false);
   const [customOpenshiftSelect, setCustomOpenshiftSelect] = useState<OpenshiftVersionOptionType>(); // Cambiar el tipo según lo que esperes aquí
 
@@ -50,8 +50,8 @@ export const OpenShiftVersionModal = ({
         label={'OpenShift version'}
         isRequired
       >
-        <OpenshiftSelectWithSearch
-          versions={versions}
+        <OpenShiftSelectWithSearch
+          versions={allVersions}
           getHelperText={getHelperText}
           setCustomOpenshiftSelect={setCustomOpenshiftSelect}
         />

package/lib/common/components/ui/WizardFooter.tsx

@@ -20,6 +20,7 @@ export type WizardFooterGenericProps = {
   onNext?: () => void;
   onBack?: () => void;
   onCancel?: () => void;
+  onReset?: () => void;
   isNextDisabled?: boolean;
   isBackDisabled?: boolean;
   isSubmitting?: boolean;
@@ -41,6 +42,7 @@ export const WizardFooter: React.FC<WizardFooterProps> = ({
   onNext,
   onBack,
   onCancel,
+  onReset,
   isNextDisabled,
   isBackDisabled,
   leftExtraActions,
@@ -83,16 +85,30 @@ export const WizardFooter: React.FC<WizardFooterProps> = ({
               </Button>
             </ActionListItem>
           )}
-          <ActionListItem>
-            <Button
-              variant={ButtonVariant.link}
-              name="cancel"
-              onClick={onCancel}
-              isDisabled={false}
-            >
-              {t('ai:Cancel')}
-            </Button>
-          </ActionListItem>
+          {onCancel && (
+            <ActionListItem>
+              <Button
+                variant={ButtonVariant.link}
+                name="cancel"
+                onClick={onCancel}
+                isDisabled={false}
+              >
+                {t('ai:Cancel')}
+              </Button>
+            </ActionListItem>
+          )}
+          {onReset && cluster && (
+            <ActionListItem>
+              <Button
+                variant={ButtonVariant.link}
+                name="reset"
+                onClick={onReset}
+                isDisabled={isSubmitting}
+              >
+                {t('ai:Reset')}
+              </Button>
+            </ActionListItem>
+          )}
           {isSubmitting && (
             <ActionListItem>
               <Text component={TextVariants.small}>

package/lib/common/components/ui/formik/RichInputField.tsx

@@ -101,6 +101,7 @@ const RichInputField: React.FC<RichInputFieldPropsProps> = React.forwardRef(
     const fieldId = getFieldId(props.name, 'input', idPostfix);
     const isValid = !(touched && error?.length);
 
+    const errorMessage = isValid ? '' : error[0];
     return (
       <FormGroup
         id={`form-control__${fieldId}`}
@@ -163,14 +164,15 @@ const RichInputField: React.FC<RichInputFieldPropsProps> = React.forwardRef(
             </Popover>
           </InputGroupItem>
         </InputGroup>
-        {helperText && (
+        {(errorMessage || helperText) && (
           <FormHelperText>
             <HelperText>
               <HelperTextItem
+                icon={errorMessage && <ExclamationCircleIcon />}
                 variant={isValid ? 'default' : 'error'}
                 id={isValid ? `${fieldId}-helper` : `${fieldId}-helper-error`}
               >
-                {helperText}
+                {errorMessage ? errorMessage : helperText}
               </HelperTextItem>
             </HelperText>
           </FormHelperText>

package/lib/common/components/ui/formik/validationSchemas.ts

@@ -3,6 +3,8 @@ import { Address4, Address6 } from 'ip-address';
 import isCIDR from 'is-cidr';
 import { isInSubnet } from 'is-in-subnet';
 import * as Yup from 'yup';
+import { head } from 'lodash-es';
+import parseUrl from 'parse-url';
 
 import { TFunction } from 'i18next';
 import {
@@ -27,7 +29,6 @@ import {
 } from './constants';
 import { allSubnetsIPv4, getAddress, trimCommaSeparatedList, trimSshPublicKey } from './utils';
 import { selectApiVip, selectIngressVip } from '../../../selectors';
-import { head } from 'lodash-es';
 import { ClusterDetailsValues } from '../../clusterWizard/types';
 
 const ALPHANUMERIC_REGEX = /^[a-zA-Z0-9]+$/;
@@ -45,10 +46,6 @@ const IP_V4_ZERO = '0.0.0.0';
 const IP_V6_ZERO = '0000:0000:0000:0000:0000:0000:0000:0000';
 const MAC_REGEX = /^([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})$/;
 const HOST_NAME_REGEX = /^[^.]{1,63}(?:[.][^.]{1,63})*$/;
-
-// Source of information: https://github.com/metal3-io/baremetal-operator/blob/main/docs/api.md#baremetalhost-spec
-const BMC_REGEX =
-  /^((redfish-virtualmedia|idrac-virtualmedia)(\+https?)?:(\/\/([a-z0-9\-._~%!$&'()*+,;=]+@)?([a-z0-9\-._~%]+|\[[a-f0-9:.]+\]|\[v[a-f0-9][a-z0-9\-._~%!$&'()*+,;=:]+\])(:[0-9]+)?(\/[a-z0-9\-._~%!$&'()*+,;=:@]+)*\/?|(\/?[a-z0-9\-._~%!$&'()*+,;=:@]+(\/[a-z0-9\-._~%!$&'()*+,;=:@]+)*\/?)?)|([a-z0-9\-._~%!$&'()*+,;=@]+(\/[a-z0-9\-._~%!$&'()*+,;=:@]+)*\/?|(\/[a-z0-9\-._~%!$&'()*+,;=:@]+)+\/?))(\?[a-z0-9\-._~%!$&'()*+,;=:@/?]*)?(#[a-z0-9\-._~%!$&'()*+,;=:@/?]*)?$/i;
 const LOCATION_CHARS_REGEX = /^[a-zA-Z0-9-._]*$/;
 
 export const nameValidationSchema = (
@@ -318,7 +315,7 @@ export const vipArrayValidationSchema = <T extends Yup.Maybe<Yup.AnyObject>>(
   values: NetworkConfigurationValues,
   initialValues?: ApiVip[] | IngressVip[],
 ) =>
-  (values.apiVips?.length && values.managedNetworkingType === 'clusterManaged'
+  (values.managedNetworkingType === 'clusterManaged'
     ? Yup.array<T>().of(
         Yup.object({
           clusterId: Yup.string(),
@@ -643,10 +640,16 @@ export const day2ApiVipValidationSchema = Yup.string().test(
 export const bmcAddressValidationSchema = (t: TFunction) => {
   const bmcAddressValidationMessagesList = bmcAddressValidationMessages(t);
 
-  return Yup.string().required().matches(BMC_REGEX, {
-    message: bmcAddressValidationMessagesList.INVALID_VALUE,
-    excludeEmptyString: true,
-  });
+  return Yup.string()
+    .required()
+    .test('valid-bmc-address', bmcAddressValidationMessagesList.INVALID_VALUE, (val) => {
+      try {
+        const url = parseUrl(val);
+        return ['redfish-virtualmedia', 'idrac-virtualmedia'].includes(url.protocol as string);
+      } catch (error) {
+        return false;
+      }
+    });
 };
 export const locationValidationSchema = (t: TFunction) => {
   const locationValidationMessagesList = locationValidationMessages(t);

package/lib/common/components/ui/index.ts

@@ -12,6 +12,9 @@ export * from './PreviewBadge';
 export * from './TechnologyPreview';
 export * from './DeveloperPreview';
 
+export * from './OpenShiftVersionDropdown';
+export * from './OpenShiftVersionModal';
+
 export * from './utils';
 
 export { default as PopoverIcon } from './PopoverIcon';

package/lib/common/config/constants.ts

@@ -33,7 +33,7 @@ export const hostRoles = (t: TFunction): HostRole[] => [
   },
   {
     value: 'worker',
-    label: t('ai:Worker'),
+    label: t('ai:Worker', { count: 1 }),
     description: t(
       'ai:Runs application workloads. Connect at least 5 hosts to enable dedicated workers.',
     ),
@@ -140,6 +140,11 @@ export const hostValidationLabels = (t: TFunction): { [key in HostValidationId]:
   'nmstate-requirements-satisfied': '',
   'amd-gpu-requirements-satisfied': t('ai:AMD GPU requirements'),
   'kmm-requirements-satisfied': t('ai:Kernel Module Management requirements'),
+  'node-healthcheck-requirements-satisfied': t('ai:Node Healthcheck requirements'),
+  'self-node-remediation-requirements-satisfied': t('ai:Self Node Remediation requirements'),
+  'fence-agents-remediation-requirements-satisfied': t('ai:Fence Agents Remediation requirements'),
+  'node-maintenance-requirements-satisfied': t('ai:Node Maintenance requirements'),
+  'kube-descheduler-requirements-satisfied': t('ai:Kube Descheduler requirements'),
 });
 
 export const hostValidationFailureHints = (
@@ -202,6 +207,11 @@ export const hostValidationFailureHints = (
   'nmstate-requirements-satisfied': '',
   'amd-gpu-requirements-satisfied': '',
   'kmm-requirements-satisfied': '',
+  'node-healthcheck-requirements-satisfied': '',
+  'self-node-remediation-requirements-satisfied': '',
+  'fence-agents-remediation-requirements-satisfied': '',
+  'node-maintenance-requirements-satisfied': '',
+  'kube-descheduler-requirements-satisfied': '',
 });
 
 export const clusterValidationLabels = (
@@ -307,6 +317,11 @@ export const OPERATOR_NAME_NMSTATE = 'nmstate';
 export const OPERATOR_NAME_AUTHORINO = 'authorino';
 export const OPERATOR_NAME_AMD_GPU = 'amd-gpu';
 export const OPERATOR_NAME_KMM = 'kmm';
+export const OPERATOR_NAME_NODE_HEALTHCHECK = 'node-healthcheck';
+export const OPERATOR_NAME_SELF_NODE_REMEDIATION = 'self-node-remediation';
+export const OPERATOR_NAME_FENCE_AGENTS_REMEDIATION = 'fence-agents-remediation';
+export const OPERATOR_NAME_NODE_MAINTENANCE = 'node-maintenance';
+export const OPERATOR_NAME_KUBE_DESCHEDULER = 'kube-descheduler';
 
 const OperatorNames = [
   OPERATOR_NAME_CNV,
@@ -327,6 +342,11 @@ const OperatorNames = [
   OPERATOR_NAME_AUTHORINO,
   OPERATOR_NAME_AMD_GPU,
   OPERATOR_NAME_KMM,
+  OPERATOR_NAME_NODE_HEALTHCHECK,
+  OPERATOR_NAME_SELF_NODE_REMEDIATION,
+  OPERATOR_NAME_FENCE_AGENTS_REMEDIATION,
+  OPERATOR_NAME_NODE_MAINTENANCE,
+  OPERATOR_NAME_KUBE_DESCHEDULER,
 ];
 export const ExposedOperatorNames = [
   OPERATOR_NAME_CNV,
@@ -346,6 +366,11 @@ export const ExposedOperatorNames = [
   OPERATOR_NAME_AUTHORINO,
   OPERATOR_NAME_AMD_GPU,
   OPERATOR_NAME_KMM,
+  OPERATOR_NAME_NODE_HEALTHCHECK,
+  OPERATOR_NAME_SELF_NODE_REMEDIATION,
+  OPERATOR_NAME_FENCE_AGENTS_REMEDIATION,
+  OPERATOR_NAME_NODE_MAINTENANCE,
+  OPERATOR_NAME_KUBE_DESCHEDULER,
 ];
 
 export type OperatorName = (typeof OperatorNames)[number];
@@ -393,6 +418,11 @@ export const operatorLabels = (
     [OPERATOR_NAME_AUTHORINO]: t('ai:Authorino'),
     [OPERATOR_NAME_AMD_GPU]: t('ai:AMD GPU'),
     [OPERATOR_NAME_KMM]: t('ai:Kernel Module Management'),
+    [OPERATOR_NAME_NODE_HEALTHCHECK]: t('ai:Node Healthcheck'),
+    [OPERATOR_NAME_SELF_NODE_REMEDIATION]: t('ai:Self Node Remediation'),
+    [OPERATOR_NAME_FENCE_AGENTS_REMEDIATION]: t('ai:Fence Agents Remediation'),
+    [OPERATOR_NAME_NODE_MAINTENANCE]: t('ai:Node Maintenace'),
+    [OPERATOR_NAME_KUBE_DESCHEDULER]: t('ai:Kube Descheduler'),
   };
 };
 

package/lib/common/config/docs_links.ts

@@ -1,11 +1,14 @@
-const DEFAULT_OPENSHIFT_DOCS_VERSION = '4.15';
+const DEFAULT_OPENSHIFT_DOCS_VERSION = 4.15;
 
 export const getShortOpenshiftVersion = (ocpVersion?: string) => {
-  let shortOcpVersion = ocpVersion
-    ? ocpVersion.split('.').slice(0, 2).join('.')
-    : DEFAULT_OPENSHIFT_DOCS_VERSION;
-  if (shortOcpVersion < '4.14') shortOcpVersion = '4.14';
-  return shortOcpVersion;
+  if (!ocpVersion) {
+    return DEFAULT_OPENSHIFT_DOCS_VERSION;
+  }
+  const versionXY = Number(ocpVersion.split('.').slice(0, 2).join('.'));
+  if (!Number.isFinite(versionXY)) {
+    return DEFAULT_OPENSHIFT_DOCS_VERSION;
+  }
+  return versionXY < 4.14 ? 4.14 : versionXY;
 };
 
 export const getYearForAssistedInstallerDocumentationLink = () => {
@@ -20,6 +23,9 @@ export const OPENSHIFT_LIFE_CYCLE_DATES_LINK =
 
 export const TECH_SUPPORT_LEVEL_LINK = 'https://access.redhat.com/support/offerings/techpreview';
 
+export const DEVELOPER_SUPPORT_LEVEL_LINK =
+  'https://access.redhat.com/support/offerings/devpreview';
+
 export const CLUSTER_MANAGER_SITE_LINK = 'https://console.redhat.com/openshift/install/pull-secret';
 
 export const PULL_SECRET_INFO_LINK = CLUSTER_MANAGER_SITE_LINK;
@@ -33,7 +39,11 @@ export const getEncryptingDiskDuringInstallationDocsLink = (ocpVersion?: string)
 export const getOpenShiftNetworkingDocsLink = (ocpVersion?: string) =>
   `https://docs.redhat.com/en/documentation/openshift_container_platform/${getShortOpenshiftVersion(
     ocpVersion,
-  )}/html/installing_on_bare_metal/installing-bare-metal#installation-network-user-infra_installing-bare-metal`;
+  )}/html/installing_on_bare_metal/${
+    getShortOpenshiftVersion(ocpVersion) > 4.17
+      ? 'user-provisioned-infrastructure'
+      : 'installing-bare-metal'
+  }#installation-network-user-infra_installing-bare-metal`;
 
 export const SSH_GENERATION_DOC_LINK = 'https://www.redhat.com/sysadmin/configure-ssh-keygen';
 
@@ -80,6 +90,9 @@ export const OSC_REQUIREMENTS_LINK =
 
 export const CNV_LINK = 'https://cloud.redhat.com/learn/topics/virtualization/';
 
+export const KMM_LINK =
+  'https://docs.redhat.com/en/documentation/openshift_container_platform/4.12/html/specialized_hardware_and_driver_enablement/kernel-module-management-operator';
+
 export const ODF_LINK = 'https://www.redhat.com/en/resources/openshift-data-foundation-datasheet';
 
 export const getMceDocsLink = (ocpVersion?: string) =>
@@ -92,6 +105,23 @@ export const getLvmsDocsLink = (ocpVersion?: string) =>
     ocpVersion,
   )}/html/storage/configuring-persistent-storage#overview-of-lvm-storage-functionality_ways-to-provision-local-storage`;
 
+export const NODE_HEALTHCHECK_LINK =
+  'https://docs.redhat.com/en/documentation/workload_availability_for_red_hat_openshift/latest/html/remediation_fencing_and_maintenance/node-health-check-operator';
+
+export const SELF_NODE_REMEDIATION_LINK =
+  'https://docs.redhat.com/en/documentation/workload_availability_for_red_hat_openshift/latest/html/remediation_fencing_and_maintenance/self-node-remediation-operator-remediate-nodes';
+
+export const FENCE_AGENTS_REMEDIATION_LINK =
+  'https://docs.redhat.com/en/documentation/workload_availability_for_red_hat_openshift/latest/html/remediation_fencing_and_maintenance/fence-agents-remediation-operator-remediate-nodes';
+
+export const NODE_MAINTENANCE_LINK =
+  'https://docs.redhat.com/en/documentation/workload_availability_for_red_hat_openshift/latest/html/remediation_fencing_and_maintenance/node-maintenance-operator';
+
+export const getKubeDeschedulerLink = (ocpVersion?: string) =>
+  `https://docs.redhat.com/en/documentation/openshift_container_platform/${getShortOpenshiftVersion(
+    ocpVersion,
+  )}/html/nodes/controlling-pod-placement-onto-nodes-scheduling#descheduler`;
+
 //Others
 export const REDHAT_CONSOLE_OPENSHIFT = 'https://console.redhat.com/openshift';
 

package/lib/common/hooks/index.ts

@@ -1,2 +1,3 @@
 export { default as useStateSafely } from './useStateSafely';
 export { default as useDeepCompareMemoize } from './useDeepCompareMemoize';
+export { useTranslation } from './use-translation-wrapper';

package/lib/common/index.ts

@@ -9,4 +9,5 @@ export * from './config';
 export * from './features';
 export * from './reducers';
 export * from './selectors';
+export * from './hooks';
 export { ResourceUIState } from './types/resource-ui-state';

package/lib/common/types/clusters.ts

@@ -76,6 +76,11 @@ export type OperatorsValues = V2ClusterUpdateParams & {
   useNvidiaGpu: boolean;
   useAmdGpu: boolean;
   useKmm: boolean;
+  useNodeHealthcheck: boolean;
+  useSelfNodeRemediation: boolean;
+  useFenceAgentsRemediation: boolean;
+  useNodeMaintenance: boolean;
+  useKubeDescheduler: boolean;
 };
 
 export type SupportedPlatformType = Extract<PlatformType, 'vsphere' | 'nutanix' | 'external'>;

package/lib/ocm/components/AddHosts/day2Wizard/Day2ClusterDetails.tsx

@@ -24,7 +24,7 @@ import Day2HostStaticIpConfigurations from './Day2StaticIpHostConfigurations';
 import { mapClusterCpuArchToInfraEnvCpuArch } from '../../../services/CpuArchitectureService';
 import CpuArchitectureDropdown from '../../clusterConfiguration/CpuArchitectureDropdown';
 import { usePullSecret } from '../../../hooks';
-import { useOpenshiftVersionsContext } from '../../clusterWizard/OpenshiftVersionsContext';
+import { useOpenShiftVersionsContext } from '../../clusterWizard/OpenShiftVersionsContext';
 import {
   Cluster,
   InfraEnv,
@@ -87,7 +87,7 @@ const Day2ClusterDetails = () => {
   const [initialValues, setInitialValues] = React.useState<Day2ClusterDetailValues | null>(null);
   const [isSubmitting, setSubmitting] = React.useState(false);
   const [isAlternativeCpuSelected, setIsAlternativeCpuSelected] = React.useState(false);
-  const { getCpuArchitectures } = useOpenshiftVersionsContext();
+  const { getCpuArchitectures } = useOpenShiftVersionsContext();
   const cpuArchitecturesByVersionImage = getCpuArchitectures(day2Cluster.openshiftVersion);
   const day1CpuArchitecture = mapClusterCpuArchToInfraEnvCpuArch(day2Cluster.cpuArchitecture);
   const [errorState, setErrorState] = React.useState<Error | null>(null);

package/lib/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabContent.tsx

@@ -23,7 +23,7 @@ import {
 import useInfraEnv from '../../hooks/useInfraEnv';
 import { mapOcmArchToCpuArchitecture } from '../../services/CpuArchitectureService';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
-import { OpenshiftVersionsContextProvider } from '../clusterWizard/OpenshiftVersionsContext';
+import { OpenShiftVersionsContextProvider } from '../clusterWizard/OpenShiftVersionsContext';
 
 export const HostsClusterDetailTabContent = ({
   cluster: ocmCluster,
@@ -33,6 +33,9 @@ export const HostsClusterDetailTabContent = ({
   const [day2Cluster, setDay2Cluster] = useStateSafely<Cluster | null>(null);
   const pullSecret = usePullSecret();
 
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  const ocmClusterMemo = React.useMemo(() => ocmCluster, []);
+
   const handleClickTryAgainLink = React.useCallback(() => {
     setError(undefined);
     setDay2Cluster(null);
@@ -53,19 +56,20 @@ export const HostsClusterDetailTabContent = ({
       setDay2Cluster(null);
       return;
     }
-    const day1ClusterHostCount = ocmCluster?.metrics?.nodes?.total || 0;
-    const openshiftClusterId = Day2ClusterService.getOpenshiftClusterId(ocmCluster);
+
+    const day1ClusterHostCount = ocmClusterMemo?.metrics?.nodes?.total || 0;
+    const openshiftClusterId = Day2ClusterService.getOpenshiftClusterId(ocmClusterMemo);
     if (day1ClusterHostCount === 0 || !openshiftClusterId) {
       setError(<UnableToAddHostsError onTryAgain={handleClickTryAgainLink} />);
     }
 
     if (!day2Cluster && pullSecret) {
-      const { apiVipDnsname, errorType } = getApiVipDnsName(ocmCluster);
+      const { apiVipDnsname, errorType } = getApiVipDnsName(ocmClusterMemo);
       if (errorType) {
         const wrongUrlMessage =
           errorType === 'console'
-            ? `Cluster Console URL is not valid (${ocmCluster.console?.url || ''})`
-            : `Cluster API URL is not valid (${ocmCluster.api?.url || ''})`;
+            ? `Cluster Console URL is not valid (${ocmClusterMemo.console?.url || ''})`
+            : `Cluster API URL is not valid (${ocmClusterMemo.api?.url || ''})`;
         setError(
           <>
             {wrongUrlMessage}, you can{' '}
@@ -85,11 +89,11 @@ export const HostsClusterDetailTabContent = ({
 
       const loadDay2Cluster = async () => {
         try {
-          const day2Cluster = await Day2ClusterService.fetchCluster(ocmCluster, pullSecret);
+          const day2Cluster = await Day2ClusterService.fetchCluster(ocmClusterMemo, pullSecret);
 
           const aiCluster = Day2ClusterService.completeAiClusterWithOcmCluster(
             day2Cluster,
-            ocmCluster,
+            ocmClusterMemo,
           );
           setDay2Cluster(aiCluster ?? null);
         } catch (e) {
@@ -103,13 +107,12 @@ export const HostsClusterDetailTabContent = ({
               />,
             );
           }
-          return;
         }
       };
 
       void loadDay2Cluster();
     }
-  }, [ocmCluster, pullSecret, day2Cluster, setDay2Cluster, isVisible, handleClickTryAgainLink]);
+  }, [pullSecret, day2Cluster, setDay2Cluster, isVisible, handleClickTryAgainLink, ocmClusterMemo]);
 
   const refreshCluster = React.useCallback(async () => {
     if (!day2Cluster?.id) {
@@ -156,7 +159,7 @@ export const HostsClusterDetailTabContent = ({
       ocpConsoleUrl={ocmCluster?.console?.url}
       canEdit={ocmCluster.canEdit}
     >
-      <OpenshiftVersionsContextProvider>
+      <OpenShiftVersionsContextProvider>
         <NewFeatureSupportLevelProvider
           loadingUi={<LoadingState />}
           cluster={day2Cluster}
@@ -166,7 +169,7 @@ export const HostsClusterDetailTabContent = ({
         >
           <AddHosts />
         </NewFeatureSupportLevelProvider>
-      </OpenshiftVersionsContextProvider>
+      </OpenShiftVersionsContextProvider>
     </AddHostsContextProvider>
   );
 };

package/lib/ocm/components/HostsClusterDetailTab/HostsClusterDetailTabMock.tsx

@@ -16,7 +16,7 @@ import {
 import { OcmClusterType } from '../AddHosts';
 import HostsClusterDetailTab from './HostsClusterDetailTab';
 import clustersAPI from '../../../common/api/assisted-service/ClustersAPI';
-import { OpenshiftVersionsContextProvider } from '../clusterWizard/OpenshiftVersionsContext';
+import { OpenShiftVersionsContextProvider } from '../clusterWizard/OpenShiftVersionsContext';
 
 const clusterWithoutMetrics = {
   id: 'ocm-cluster-id',
@@ -78,13 +78,13 @@ export const HostsClusterDetailTabMock = () => {
   return (
     <PageSection variant={PageSectionVariants.light} isFilled>
       {tabShown ? (
-        <OpenshiftVersionsContextProvider>
+        <OpenShiftVersionsContextProvider>
           <HostsClusterDetailTab
             cluster={getCluster(tabShown)}
             allEnabledFeatures={STANDALONE_DEPLOYMENT_ENABLED_FEATURES}
             isVisible
           />
-        </OpenshiftVersionsContextProvider>
+        </OpenShiftVersionsContextProvider>
       ) : (
         <Grid hasGutter>
           <ToolbarButton variant={ButtonVariant.primary} onClick={() => onAddHosts('no-metrics')}>

package/lib/ocm/components/clusterConfiguration/HostInventory.tsx

@@ -30,7 +30,6 @@ const schedulableMastersTooltip =
 
 const HostInventory = ({ cluster }: { cluster: Cluster }) => {
   const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
-
   const mastersMustRunWorkloads = selectMastersMustRunWorkloads(cluster);
   const { setFieldValue } = useFormikContext<HostDiscoveryValues>();
   const { isViewerMode } = useSelector(selectCurrentClusterPermissionsState);

package/lib/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.tsx

@@ -24,7 +24,7 @@ import CustomManifestCheckbox from './CustomManifestCheckbox';
 import CpuArchitectureDropdown from './CpuArchitectureDropdown';
 import { OcmBaseDomainField } from './OcmBaseDomainField';
 import useSupportLevelsAPI from '../../hooks/useSupportLevelsAPI';
-import { useOpenshiftVersionsContext } from '../clusterWizard/OpenshiftVersionsContext';
+import { useOpenShiftVersionsContext } from '../clusterWizard/OpenShiftVersionsContext';
 import { ExternalPlatformDropdown } from './platformIntegration/ExternalPlatformDropdown';
 import { HostsNetworkConfigurationType } from '../../services/types';
 import { useNewFeatureSupportLevel } from '../../../common/components/newFeatureSupportLevels';
@@ -64,7 +64,7 @@ export const OcmClusterDetailsFormFields = ({
   const { t } = useTranslation();
   const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
   const { openshiftVersion, platform } = values;
-  const { getCpuArchitectures } = useOpenshiftVersionsContext();
+  const { getCpuArchitectures } = useOpenShiftVersionsContext();
   const cpuArchitecturesByVersionImage = getCpuArchitectures(openshiftVersion);
   const clusterWizardContext = useClusterWizardContext();
   const featureSupportLevelData = useSupportLevelsAPI(
@@ -133,7 +133,6 @@ export const OcmClusterDetailsFormFields = ({
 
       <OcmBaseDomainField managedDomains={managedDomains} clusterExists={clusterExists} />
 
-      {/* TODO(mlibra): For single-cluster: We will probably change this to just a static text */}
       {forceOpenshiftVersion ? (
         <OcmOpenShiftVersion
           versions={versions}
@@ -145,7 +144,7 @@ export const OcmClusterDetailsFormFields = ({
       ) : (
         <OcmOpenShiftVersionSelect versions={versions} />
       )}
-      {clusterExists ? (
+      {clusterExists || isSingleClusterFeatureEnabled ? (
         <StaticTextField name="cpuArchitecture" label="CPU architecture" isRequired>
           {cpuArchitecture}
         </StaticTextField>
@@ -184,15 +183,12 @@ export const OcmClusterDetailsFormFields = ({
       )}
       <CustomManifestCheckbox clusterId={clusterId || ''} isDisabled={platform === 'external'} />
 
-      {
-        // Reason: In the single-cluster flow, the Host discovery phase is replaced by a single one-fits-all ISO download
-        !isSingleClusterFeatureEnabled && (
-          <HostsNetworkConfigurationControlGroup
-            clusterExists={clusterExists}
-            isDisabled={platform === 'external'}
-          />
-        )
-      }
+      {!isSingleClusterFeatureEnabled && (
+        <HostsNetworkConfigurationControlGroup
+          clusterExists={clusterExists}
+          isDisabled={platform === 'external'}
+        />
+      )}
 
       <DiskEncryptionControlGroup
         values={values}

package/lib/ocm/components/clusterConfiguration/OcmOpenShiftVersion.tsx

@@ -23,7 +23,7 @@ const OcmOpenShiftVersion = ({
 }: OcmOpenShiftVersionProps) => {
   return (
     <StaticTextField name="openshiftVersion" label="OpenShift version" isRequired>
-      Openshift{' '}
+      OpenShift{' '}
       {getOpenshiftVersionText({
         openshiftVersion,
         cpuArchitecture: clusterCpuArchitecture as ClusterCpuArchitecture,

package/lib/ocm/components/clusterConfiguration/OcmOpenShiftVersionSelect.tsx

@@ -1,12 +1,15 @@
 import React from 'react';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
-import { OpenshiftVersionOptionType, ClusterDetailsValues } from '../../../common';
+import {
+  OpenshiftVersionOptionType,
+  ClusterDetailsValues,
+  OpenShiftVersionDropdown,
+  OpenShiftVersionModal,
+} from '../../../common';
 import { isInOcm } from '../../../common/api';
-import { OpenShiftVersionDropdown } from '../../../common/components/ui/OpenShiftVersionDropdown';
-import { OpenShiftVersionModal } from './OpenShiftVersionModal';
 import { useFormikContext } from 'formik';
 import { getOpenshiftVersionHelperText } from './OpenshiftVersionHelperText';
-import { useOpenshiftVersionsContext } from '../clusterWizard/OpenshiftVersionsContext';
+import { useOpenShiftVersionsContext } from '../clusterWizard/OpenShiftVersionsContext';
 
 type OcmOpenShiftVersionSelectProps = {
   versions: OpenshiftVersionOptionType[];
@@ -50,7 +53,7 @@ const OcmOpenShiftVersionSelect = ({ versions }: OcmOpenShiftVersionSelectProps)
     return [];
   }, [selectOptions, customOpenshiftSelect]);
 
-  const { allVersions } = useOpenshiftVersionsContext();
+  const { allVersions } = useOpenShiftVersionsContext();
 
   const getHelperText = (value: string | undefined, inModal?: boolean) => {
     return getOpenshiftVersionHelperText(allVersions, value, t, inModal);
@@ -69,6 +72,7 @@ const OcmOpenShiftVersionSelect = ({ versions }: OcmOpenShiftVersionSelectProps)
       />
       {isOpenshiftVersionModalOpen && (
         <OpenShiftVersionModal
+          allVersions={allVersions}
           setOpenshiftVersionModalOpen={setIsOpenshiftVersionModalOpen}
           getHelperText={getHelperText}
         />

package/lib/ocm/components/clusterConfiguration/operators/AmdGpuCheckbox.tsx

@@ -17,10 +17,11 @@ const AmdGpuLabel = ({
   return (
     <>
       <Tooltip hidden={!disabledReason} content={disabledReason}>
-        <span>Install AMD GPU </span>
+        <span>AMD GPU </span>
       </Tooltip>
       <PopoverIcon
         id={AMDGPU_FIELD_NAME}
+        headerContent="Additional requirements"
         component={'a'}
         bodyContent={'Requires at least one supported AMD GPU'}
       />