@openshift-assisted/ui-lib 2.9.5-cim → 2.9.7-cim

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

@@ -21,6 +21,7 @@ export type ClusterDetailsFormFieldsProps = {
   forceOpenshiftVersion?: string;
   extensionAfter?: { [key: string]: React.ReactElement };
   versions: OpenshiftVersionOptionType[];
+  isNutanix?: boolean;
 };
 
 export const BaseDnsHelperText: React.FC<{ name?: string; baseDnsDomain?: string }> = ({
@@ -46,6 +47,7 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
   versions,
   forceOpenshiftVersion,
   extensionAfter,
+  isNutanix,
 }) => {
   const { values } = useFormikContext<ClusterDetailsValues>();
   const { name, baseDnsDomain, highAvailabilityMode } = values;
@@ -99,8 +101,12 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
       ) : (
         <OpenShiftVersionSelect versions={versions} />
       )}
-      <SNOControlGroup versions={versions} highAvailabilityMode={highAvailabilityMode} />
-      <ArmCheckbox versions={versions} />
+      {!isNutanix && (
+        <>
+          <SNOControlGroup versions={versions} highAvailabilityMode={highAvailabilityMode} />
+          <ArmCheckbox versions={versions} />
+        </>
+      )}
       {extensionAfter?.['openshiftVersion'] && extensionAfter['openshiftVersion']}
       {!isEditFlow && <PullSecret />}
       {extensionAfter?.['pullSecret'] && extensionAfter['pullSecret']}

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

@@ -15,7 +15,7 @@ import { BareMetalHostK8sResource } from '../../types/k8s/bare-metal-host';
 import { ClusterImageSetK8sResource } from '../../types/k8s/cluster-image-set';
 import { BMCFormProps } from '../Agent/types';
 import { AgentMachineK8sResource } from '../Hypershift/types';
-import { AddHostDropdownProps } from '../InfraEnv/types';
+import { AddHostDropdownProps, ProvisioningConfigResult } from '../InfraEnv/types';
 import { AddHostModalProps, EditBMHModalProps, UploadActionModalProps } from '../modals/types';
 
 export type EditAgentModalProps = {
@@ -87,6 +87,7 @@ export type ClusterDeploymentDetailsStepProps = ClusterDeploymentDetailsProps &
   onSaveDetails: (values: ClusterDeploymentDetailsValues) => Promise<unknown>;
   onClose: () => void;
   isPreviewOpen: boolean;
+  isNutanix: boolean;
 };
 
 export type ClusterDeploymentDetailsNetworkingProps = Pick<
@@ -100,6 +101,7 @@ export type ClusterDeploymentDetailsNetworkingProps = Pick<
   onClose: () => void;
   fetchInfraEnv: (name: string, namespace: string) => Promise<InfraEnvK8sResource>;
   isPreviewOpen: boolean;
+  isNutanix: boolean;
 };
 
 export type AgentSelectorChangeProps = {
@@ -153,7 +155,6 @@ export type ClusterDeploymentWizardProps = {
   setPreviewOpen: (open: boolean) => void;
   fetchManagedClusters: () => Promise<K8sResourceCommon[]>;
   fetchKlusterletAddonConfig: () => Promise<K8sResourceCommon[]>;
-  isBMPlatform: boolean;
   onSaveAgent: EditAgentModalProps['onSave'];
   onSaveBMH: EditBMHModalProps['onEdit'];
   onSaveISOParams?: AddHostModalProps['onSaveISOParams'];
@@ -163,6 +164,8 @@ export type ClusterDeploymentWizardProps = {
   onCreateBMH?: BMCFormProps['onCreateBMH'];
   docVersion: string; // ACM version
   onCreateBmcByYaml: UploadActionModalProps['onCreateBmcByYaml'];
+  provisioningConfigResult: ProvisioningConfigResult;
+  isNutanix: boolean;
 };
 
 export type FetchSecret = (name: string, namespace: string) => Promise<SecretK8sResource>;
@@ -176,6 +179,7 @@ export type ClusterDeploymentHostsSelectionProps = {
   onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
   onAutoSelectChange: VoidFunction;
   onHostSelect: VoidFunction;
+  isNutanix: boolean;
 };
 
 export type InfraEnvAgentTableProps = Pick<
@@ -195,7 +199,6 @@ export type InfraEnvAgentTableProps = Pick<
   ) => Promise<BareMetalHostK8sResource>;
   // eslint-disable-next-line
   onMassDeleteHost: (agent?: AgentK8sResource, bmh?: BareMetalHostK8sResource) => Promise<any>;
-  isBMPlatform: boolean;
   agentClusterInstalls: AgentClusterInstallK8sResource[];
 };
 

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

@@ -1,3 +1,4 @@
+import { Host } from '@openshift-assisted/types/assisted-installer-service';
 import {
   getAllClusterWizardSoftValidationIds,
   getWizardStepClusterStatus,
@@ -68,6 +69,15 @@ const networkingStepValidationsMap: WizardStepValidationMap = {
   // TODO(mlibra): remove that container-images-available from soft validations and let backend drive it via disabling it.
   //   Depends on: https://issues.redhat.com/browse/MGMT-5265
   softValidationIds: ['ntp-synced', 'container-images-available'],
+  getPageURL: (host: Host, validationID: string) => {
+    if (validationID === 'ntp-synced') {
+      return {
+        url: `multicloud/infrastructure/environments/details/${host.infraEnvId || ''}`,
+        name: 'infrastructure environment',
+      };
+    }
+    return undefined;
+  },
 };
 
 const reviewStepValidationsMap: WizardStepValidationMap = {

package/lib/cim/components/Hypershift/hooks/useSupportedOCPVersions.ts

@@ -13,7 +13,7 @@ export const useSupportedOCPVersions = (
   supportedVersionsCM?: ConfigMapK8sResource,
 ) => {
   return React.useMemo(() => {
-    const ocpVersions = getOCPVersions(clusterImages);
+    const ocpVersions = getOCPVersions(clusterImages, false);
     const supportedVersionsString = supportedVersionsCM?.data?.['supported-versions'];
     if (supportedVersionsString) {
       try {

package/lib/cim/components/InfraEnv/AddHostDropdown.tsx

@@ -2,20 +2,41 @@ import {
   Dropdown,
   DropdownGroup,
   DropdownItem,
+  DropdownItemProps,
   DropdownSeparator,
   DropdownToggle,
   Split,
   SplitItem,
+  Spinner,
 } from '@patternfly/react-core';
 import * as React from 'react';
-import { PopoverIcon } from '../../../common';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { AddBmcHostModal, AddBmcHostYamlModal, AddHostModal } from '../modals';
 import { AddHostDropdownProps } from './types';
 import './AddHostDropdown.css';
+import { PopoverIcon } from '../../../common';
+import { Trans } from 'react-i18next';
+import { Link } from 'react-router-dom';
 
 type ModalType = 'iso' | 'bmc' | 'yaml' | 'ipxe' | undefined;
 
+const DropdownItemWithLoading = (
+  props: DropdownItemProps & { isLoading: boolean; label: string },
+) => {
+  return (
+    <DropdownItem {...props} isDisabled={props.isDisabled || props.isLoading}>
+      <Split hasGutter>
+        <SplitItem>{props.label}</SplitItem>
+        {props.isLoading && (
+          <SplitItem>
+            <Spinner size="sm" />
+          </SplitItem>
+        )}
+      </Split>
+    </DropdownItem>
+  );
+};
+
 const AddHostDropdown = ({
   infraEnv,
   agentClusterInstall,
@@ -24,10 +45,12 @@ const AddHostDropdown = ({
   onCreateBMH,
   docVersion,
   onCreateBmcByYaml,
-  isBMPlatform,
+  provisioningConfigResult,
 }: AddHostDropdownProps) => {
   const [addModalType, setAddModalType] = React.useState<ModalType>(undefined);
   const [isKebabOpen, setIsKebabOpen] = React.useState(false);
+  const [provisioningConfig, provisioningConfigLoaded, provisioningConfigError] =
+    provisioningConfigResult;
   const { t } = useTranslation();
   return (
     <>
@@ -69,17 +92,19 @@ const AddHostDropdown = ({
               <Split hasGutter>
                 <SplitItem>{t('ai:Baseboard Management Controller (BMC)')}</SplitItem>
                 <SplitItem>
-                  {!isBMPlatform && (
+                  {!provisioningConfig && (
                     <>
                       {' '}
                       <PopoverIcon
                         noVerticalAlign
                         bodyContent={
-                          <p>
-                            {t(
-                              `ai:To enable the host's baseboard management controller (BMC) on the hub cluster, deploy the hub cluster on vSphere, BareMetal, OpenStack, or platform-agnostic (none type).`,
-                            )}
-                          </p>
+                          <Trans t={t}>
+                            ai:To enable the host's baseboard management controller (BMC) on the hub
+                            cluster, you must first{' '}
+                            <Link to="/k8s/cluster/metal3.io~v1alpha1~Provisioning/~new">
+                              create a provisioning configuration.
+                            </Link>
+                          </Trans>
                         }
                       />
                     </>
@@ -88,18 +113,18 @@ const AddHostDropdown = ({
               </Split>
             }
           >
-            <DropdownItem
+            <DropdownItemWithLoading
               key="with-credentials"
               onClick={() => {
                 setIsKebabOpen(false);
                 setAddModalType('bmc');
               }}
               description={t('ai:Discover a single host via Baseboard Management Controller')}
-              isDisabled={!isBMPlatform}
-            >
-              {t('ai:With BMC form')}
-            </DropdownItem>
-            <DropdownItem
+              label={t('ai:With BMC form')}
+              isLoading={!provisioningConfigLoaded}
+              isDisabled={!provisioningConfig && !provisioningConfigError}
+            />
+            <DropdownItemWithLoading
               key="upload-yaml"
               onClick={() => {
                 setIsKebabOpen(false);
@@ -108,10 +133,10 @@ const AddHostDropdown = ({
               description={t(
                 'ai:Discover multiple hosts by providing yaml with Bare Metal Host definitions',
               )}
-              isDisabled={!isBMPlatform}
-            >
-              {t('ai:By uploading a YAML')}
-            </DropdownItem>
+              label={t('ai:By uploading a YAML')}
+              isLoading={!provisioningConfigLoaded}
+              isDisabled={!provisioningConfig && !provisioningConfigError}
+            />
           </DropdownGroup>,
         ]}
         position={'right'}
@@ -145,6 +170,7 @@ const AddHostDropdown = ({
           onCreateBMH={onCreateBMH}
           usedHostnames={usedHostnames}
           docVersion={docVersion}
+          provisioningConfigError={provisioningConfigError}
         />
       )}
       {addModalType === 'yaml' && (
@@ -154,6 +180,7 @@ const AddHostDropdown = ({
           onClose={() => setAddModalType(undefined)}
           onCreateBmcByYaml={onCreateBmcByYaml}
           docVersion={docVersion}
+          provisioningConfigError={provisioningConfigError}
         />
       )}
     </>

package/lib/cim/components/InfraEnv/types.ts

@@ -1,6 +1,9 @@
+import { K8sResourceCommon } from '@openshift-console/dynamic-plugin-sdk';
 import { AgentClusterInstallK8sResource, InfraEnvK8sResource } from '../../types';
 import { AddBmcHostModalProps, AddHostModalProps, UploadActionModalProps } from '../modals/types';
 
+export type ProvisioningConfigResult = [K8sResourceCommon | null, boolean, unknown];
+
 export type AddHostDropdownProps = {
   infraEnv: InfraEnvK8sResource;
   agentClusterInstall?: AgentClusterInstallK8sResource;
@@ -9,5 +12,5 @@ export type AddHostDropdownProps = {
   onCreateBMH: AddBmcHostModalProps['onCreateBMH'];
   usedHostnames: AddBmcHostModalProps['usedHostnames'];
   onCreateBmcByYaml: UploadActionModalProps['onCreateBmcByYaml'];
-  isBMPlatform: boolean;
+  provisioningConfigResult: ProvisioningConfigResult;
 };

package/lib/cim/components/helpers/toAssisted.ts

@@ -67,6 +67,9 @@ export const getAIHosts = (
       progressStages: agentProgress?.progressStages,
       bootstrap: agent.status?.bootstrap,
       installationDiskId: agent.spec.installation_disk_id || agent.status?.installation_disk_id,
+      infraEnvId: `${agent.metadata?.namespace || ''}/${
+        agent.metadata?.labels?.['infraenvs.agent-install.openshift.io'] || ''
+      }`,
     };
   });
 

package/lib/cim/components/helpers/versions.ts

@@ -36,9 +36,16 @@ const getSupportLevelFromChannel = (
 
 export const getOCPVersions = (
   clusterImageSets: ClusterImageSetK8sResource[],
+  isNutanix?: boolean | undefined,
 ): OpenshiftVersionOptionType[] => {
   const versions = clusterImageSets
-    .filter((clusterImageSet) => clusterImageSet.metadata?.labels?.visible !== 'false')
+    .filter((clusterImageSet) => {
+      let supportedPlatform = true;
+      if (isNutanix && clusterImageSet.spec?.releaseImage) {
+        supportedPlatform = clusterImageSet.spec.releaseImage.endsWith('-x86_64');
+      }
+      return supportedPlatform && clusterImageSet.metadata?.labels?.visible !== 'false';
+    })
     .map((clusterImageSet): OpenshiftVersionOptionType => {
       const version = getVersionFromReleaseImage(clusterImageSet.spec?.releaseImage);
       return {

package/lib/cim/components/modals/AddBmcHostModal.tsx

@@ -4,6 +4,7 @@ import BMCForm from '../Agent/BMCForm';
 import { AddBmcHostModalProps } from './types';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { EnvironmentErrors } from '../InfraEnv/EnvironmentErrors';
+import ProvisioningConfigErrorAlert from './ProvisioningConfigErrorAlert';
 
 const AddBmcHostModal: React.FC<AddBmcHostModalProps> = ({
   isOpen,
@@ -12,6 +13,7 @@ const AddBmcHostModal: React.FC<AddBmcHostModalProps> = ({
   onCreateBMH,
   usedHostnames,
   docVersion,
+  provisioningConfigError,
 }) => {
   const hasDHCP = infraEnv.metadata?.labels?.networkType !== 'static';
   const { t } = useTranslation();
@@ -26,6 +28,7 @@ const AddBmcHostModal: React.FC<AddBmcHostModalProps> = ({
       id="add-host-modal"
     >
       <EnvironmentErrors infraEnv={infraEnv} docVersion={docVersion} inModal>
+        <ProvisioningConfigErrorAlert error={provisioningConfigError} />
         <BMCForm
           onCreateBMH={onCreateBMH}
           onClose={onClose}

package/lib/cim/components/modals/AddBmcHostYamlModal.tsx

@@ -4,6 +4,7 @@ import { UploadActionModalProps } from './types';
 import AddBmcHostYamlForm from './AddBmcHostYamlForm';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { EnvironmentErrors } from '../InfraEnv/EnvironmentErrors';
+import ProvisioningConfigErrorAlert from './ProvisioningConfigErrorAlert';
 
 const AddBmcHostYamlModal: React.FC<UploadActionModalProps> = ({
   isOpen,
@@ -11,6 +12,7 @@ const AddBmcHostYamlModal: React.FC<UploadActionModalProps> = ({
   onCreateBmcByYaml,
   infraEnv,
   docVersion,
+  provisioningConfigError,
 }) => {
   const { t } = useTranslation();
   return (
@@ -23,6 +25,7 @@ const AddBmcHostYamlModal: React.FC<UploadActionModalProps> = ({
       hasNoBodyWrapper
     >
       <EnvironmentErrors infraEnv={infraEnv} docVersion={docVersion} inModal>
+        <ProvisioningConfigErrorAlert error={provisioningConfigError} />
         <AddBmcHostYamlForm onClose={onClose} onCreateBmcByYaml={onCreateBmcByYaml} />
       </EnvironmentErrors>
     </Modal>

package/lib/cim/components/modals/ProvisioningConfigErrorAlert.tsx

@@ -0,0 +1,18 @@
+import { Alert } from '@patternfly/react-core';
+import React from 'react';
+import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import { getErrorMessage } from '../../../common/utils';
+
+const ProvisioningConfigErrorAlert = ({ error }: { error: unknown }) => {
+  const { t } = useTranslation();
+  if (!error) {
+    return null;
+  }
+  return (
+    <Alert title={t('ai:Failed to get Provisioning Configuration')} variant="danger" isInline>
+      {getErrorMessage(error)}
+    </Alert>
+  );
+};
+
+export default ProvisioningConfigErrorAlert;

package/lib/cim/components/modals/types.ts

@@ -32,6 +32,7 @@ export type AddBmcHostModalProps = Pick<
 > & {
   isOpen: boolean;
   docVersion: string;
+  provisioningConfigError?: unknown;
 };
 
 export type EditBMHModalProps = Pick<
@@ -70,4 +71,5 @@ export type UploadActionModalProps = {
   isEdit?: boolean;
   docVersion: string;
   infraEnv: InfraEnvK8sResource;
+  provisioningConfigError?: unknown;
 };

package/lib/common/api/assisted-service/ClustersAPI.ts

@@ -7,7 +7,6 @@ import {
   Credentials,
   Host,
   ImportClusterParams,
-  PlatformType,
   PreflightHardwareRequirements,
   PresignedUrl,
   ListManifests,
@@ -62,10 +61,6 @@ const ClustersAPI = {
     return `${ClustersAPI.makeDownloadsBaseURI(clusterId)}/files-presigned`;
   },
 
-  makeSupportedPlatformsBaseURI(clusterId: Cluster['id']) {
-    return `${ClustersAPI.makeBaseURI(clusterId)}/supported-platforms`;
-  },
-
   makeActionsBaseURI(clusterId: string) {
     return `${ClustersAPI.makeBaseURI(clusterId)}/actions`;
   },
@@ -126,10 +121,6 @@ const ClustersAPI = {
     });
   },
 
-  getSupportedPlatforms(clusterId: Cluster['id']) {
-    return client.get<PlatformType[]>(`${ClustersAPI.makeSupportedPlatformsBaseURI(clusterId)}`);
-  },
-
   getPreflightRequirements(clusterId: Cluster['id']) {
     return client.get<PreflightHardwareRequirements>(
       `${ClustersAPI.makeBaseURI(clusterId)}/preflight-requirements`,

package/lib/common/api/axiosClient.ts

@@ -9,12 +9,11 @@ const withAssistedInstallerBasePath = (client: AxiosInstance): AxiosInstance =>
     if (cfg.url) {
       try {
         const url = new URL(cfg.url);
-        cfg.url = `${url.origin}${basePath}${url.pathname}`;
+        cfg.url = `${url.origin}${basePath}${url.pathname}${url.search}`;
       } catch {
+        // This usually happens when the request is issued to a localhost endpoint.
         cfg.url = `${basePath}${cfg.url}`;
       }
-    } else {
-      cfg.url = `${basePath}`;
     }
 
     return cfg;

package/lib/common/components/clusterWizard/ReviewValidations.tsx

@@ -68,6 +68,7 @@ const FailingValidation = <S extends string>({
   setCurrentStepId,
   wizardStepNames,
   wizardStepsValidationsMap,
+  host,
 }: FailingValidationsProps<S>) => {
   const { t } = useTranslation();
 
@@ -88,7 +89,16 @@ const FailingValidation = <S extends string>({
     // no sooner step, so the user can not do anything about it ...
     fix = t('ai:Please wait till all checks are finished.');
   } else if (step) {
-    fix = (
+    const pageURL = host
+      ? wizardStepsValidationsMap[step].getPageURL?.(host, validation.id)
+      : undefined;
+    fix = pageURL ? (
+      <>
+        <Trans t={t}>
+          ai:It can be fixed in the <a href={pageURL.url}>{pageURL.name}</a> page.
+        </Trans>
+      </>
+    ) : (
       <>
         <Trans t={t}>
           ai:It can be fixed in the{' '}
@@ -196,6 +206,7 @@ export const HostsValidations = <S extends string, V extends string[]>({
               <FailingValidation<S>
                 key={validationId}
                 validation={validation}
+                host={host}
                 hostGroup={group}
                 severity={severity}
                 setCurrentStepId={setCurrentStepId}

package/lib/common/components/clusterWizard/networkingSteps/NetworkTypeControlGroup.tsx

@@ -24,7 +24,7 @@ export const NetworkTypeControlGroup = ({
           <Tooltip
             hidden={isSDNSelectable}
             content={t(
-              'ai:Software-Defined Networking (SDN) cannot be selected for SNO clusters or when IPv6 is detected.',
+              'ai:Network type selection is not supported for SNO clusters or when IPv6 is detected.',
             )}
           >
             <RadioField
@@ -50,7 +50,7 @@ export const NetworkTypeControlGroup = ({
           <Tooltip
             hidden={isSDNSelectable}
             content={t(
-              'ai:Software-Defined Networking (SDN) cannot be selected for SNO clusters or when IPv6 is detected.',
+              'ai:Network type selection is not supported for SNO clusters or when IPv6 is detected.',
             )}
           >
             <RadioField

package/lib/common/components/clusterWizard/types.ts

@@ -56,6 +56,7 @@ export type FailingValidationsProps<S extends string> = {
   severity?: 'danger' | 'warning';
   wizardStepNames: { [key in S]: string };
   wizardStepsValidationsMap: WizardStepsValidationMap<S>;
+  host?: Host;
 };
 
 export type ValidationActionLinkProps<S extends string> = {

package/lib/common/components/clusterWizard/validationsInfoUtils.ts

@@ -34,6 +34,15 @@ export type WizardStepValidationMap = {
     validationIds: HostValidationId[];
   };
   softValidationIds: (HostValidationId | ClusterValidationId)[];
+  getPageURL?: (
+    host: Host,
+    validationId: string,
+  ) =>
+    | {
+        url: string;
+        name: string;
+      }
+    | undefined;
 };
 
 export type WizardStepsValidationMap<T extends string> = {

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

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { useField, useFormikContext } from 'formik';
 import { Checkbox, FormGroup, Tooltip } from '@patternfly/react-core';
-import { useFeature } from '../../../features';
 import { OpenshiftVersionOptionType } from '../../../types';
 import { getFieldId } from './utils';
 import HelperText from './HelperText';
@@ -21,7 +20,6 @@ const SingleNodeCheckbox: React.FC<SingleNodeCheckboxProps> = ({
   const {
     values: { openshiftVersion },
   } = useFormikContext<ClusterCreateParams>();
-  const isSingleNodeOpenshiftEnabled = useFeature('ASSISTED_INSTALLER_SNO_FEATURE');
   const [field, meta, helpers] = useField<'None' | 'Full'>({ name: props.name, validate });
   const featureSupportLevelContext = useFeatureSupportLevel();
   const prevVersionRef = React.useRef(openshiftVersion);
@@ -54,7 +52,7 @@ const SingleNodeCheckbox: React.FC<SingleNodeCheckboxProps> = ({
     prevVersionRef.current = openshiftVersion;
   }, [openshiftVersion, onChanged, featureSupportLevelContext]);
 
-  if (isSingleNodeOpenshiftEnabled && isSupportedVersionAvailable) {
+  if (isSupportedVersionAvailable) {
     return (
       <FormGroup isInline fieldId={fieldId}>
         <Tooltip hidden={!disabledReason} content={disabledReason}>

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

@@ -320,29 +320,11 @@ describe('validationSchemas', () => {
   });
 
   test('baseDomainNameValidationSchema', async () => {
-    const valid = [
-      'a.com',
-      'co',
-      '1c',
-      '1-c',
-      '1--c',
-      'aaa',
-      'abc.def',
-      'a-aa.com',
-      'a--aa.com',
-      'aa.com.com.com.com',
-      'red.cat--rahul.com',
-    ];
+    const valid = ['a.com', 'co', '1c'];
     const invalid = [
-      'a',
-      '-',
-      'a-',
-      '-aaa.com.',
-      'aaa-.com',
-      'a.c',
-      'aaa.c',
-      'DNSnamescancontainonlyalphabeticalcharactersa-znumericcharacters0-9theminussign-andtheperiod',
-      'DNSnamescancontainonlyalphabeticalcharactersa-znumericcharacters0-9theminussign-andtheperiod.com',
+      '    ',
+      'a g',
+      'iamnotavaliddnsdomain-iamnotavaliddnsdomain-iamnotavaliddnsdomain',
     ];
 
     await Promise.all(

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

@@ -38,8 +38,6 @@ const CLUSTER_NAME_VALID_CHARS_REGEX = /^[a-z0-9-]*$/;
 const SSH_PUBLIC_KEY_REGEX =
   /^(ssh-rsa|ssh-ed25519|ecdsa-[-a-z0-9]*) AAAA[0-9A-Za-z+/]+[=]{0,3}( .+)?$/;
 const DNS_NAME_REGEX = /^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$/;
-const BASE_DOMAIN_REGEX = /^[a-z\d][\-]*[a-z\d]+$/;
-const DNS_NAME_REGEX_OCM = /^([a-z\d]([\-]*[a-z\d]+)*\.)+[a-z\d]+[\-]*[a-z\d]+$/;
 
 const PROXY_DNS_REGEX =
   /(^\.?([a-zA-Z0-9_]{1}[a-zA-Z0-9_-]{0,62}){1}(\.[a-zA-Z0-9_]{1}[a-zA-Z0-9_-]{0,62})*$)/;
@@ -397,27 +395,20 @@ export const dnsNameValidationSchema = Yup.string()
     excludeEmptyString: true,
   });
 
-export const validateBaseDomainName = (baseDomainName: string) => {
-  if (baseDomainName.match(BASE_DOMAIN_REGEX) && baseDomainName.length > 1) {
-    return true;
-  }
-  return !!baseDomainName.match(DNS_NAME_REGEX_OCM);
-};
+export const baseDomainValidationSchema = Yup.string().test(
+  'dns-name-label-length',
+  'Every single host component in the base domain name cannot contain more than 63 characters and must not contain spaces.',
+  (value: string) => {
+    // Check if the value contains any spaces
+    if (/\s/.test(value)) {
+      return false; // Value contains spaces, validation fails
+    }
 
-export const baseDomainValidationSchema = Yup.string()
-  .test(
-    'dns-name-label-length',
-    'Single label of the DNS name can not be longer than 63 characters.',
-    (value: string) => (value || '').split('.').every((label: string) => label.length <= 63),
-  )
-  .test(
-    'dns-name-validation',
-    '"${value}" is not valid. DNS base domains must have two characters after the dot and must not end in a special character.',
-    (value: string) => {
-      if (value === '') return true;
-      else return validateBaseDomainName(value);
-    },
-  );
+    // Check the label lengths
+    const labels = (value || '').split('.');
+    return labels.every((label: string) => label.length <= 63);
+  },
+);
 
 export const hostPrefixValidationSchema = (
   clusterNetworkCidr: NetworkConfigurationValues['clusterNetworkCidr'],

package/lib/common/config/constants.ts

@@ -10,9 +10,7 @@ import {
 import { ValidationGroup as ClusterValidationGroup } from '../types/clusters';
 import { FeatureSupportLevelData } from '../components/featureSupportLevels/FeatureSupportLevelContext';
 import type { NewFeatureSupportLevelData } from '../components/newFeatureSupportLevels';
-// eslint-disable-next-line @typescript-eslint/no-unused-vars,@typescript-eslint/ban-ts-comment
-// @ts-ignore
-import buildManifest from '@openshift-assisted/ui-lib/package.json'; // This file is generated at build-time.
+import buildManifest from '@openshift-assisted/ui-lib/package.json';
 
 export const getShortOpenshiftVersion = (ocpVersion?: string) =>
   ocpVersion?.split('.').slice(0, 2).join('.');