@openshift-assisted/ui-lib 2.51.0 → 2.51.2

package/lib/common/validationSchemas/addressValidation.tsx

@@ -29,10 +29,7 @@ export const ipNoSuffixValidationSchema = (t: TFunction) =>
 
 export const macAddressValidationSchema = (t: TFunction) =>
   Yup.string().matches(MAC_REGEX, {
-    message: (params: { value?: unknown }) =>
-      t('ai:Value "{{value}}" is not valid MAC address.', {
-        value: params?.value !== undefined ? String(params.value) : '',
-      }),
+    message: (value) => t('ai:Value "{{value}}" is not valid MAC address.', { value }),
     excludeEmptyString: true,
   });
 

package/lib/common/validationSchemas/clusterDetailsValidation.tsx

@@ -123,55 +123,23 @@ export const dnsNameValidationSchema = (t: TFunction) =>
       excludeEmptyString: true,
     });
 
-const MAX_DNS_NAME_LENGTH = 253;
-/** Only letters, digits, hyphen, and dot (valid DNS/hostname characters). */
-const DNS_CHARS_REGEX = /^[a-z0-9.-]+$/i;
-
-/**
- * Validates the full cluster address [clusterName].[baseDomain] as a single DNS/hostname
- * (e.g. "doma.ca" is valid even though "ca" alone might not pass standalone base-domain rules).
- */
-export const isValidFullClusterAddress = (full: string): boolean => {
-  if (!full || full === '.' || /\s/.test(full)) {
-    return false;
-  }
-  if (full.length > MAX_DNS_NAME_LENGTH) {
-    return false;
-  }
-  if (!DNS_CHARS_REGEX.test(full)) {
-    return false;
-  }
-  const labels = full.split('.');
-  if (labels.some((label) => label.length === 0 || label.length > 63)) {
-    return false;
-  }
-  return HOST_NAME_REGEX.test(full);
-};
-
 export const baseDomainValidationSchema = (t: TFunction) =>
-  Yup.string()
-    .test(
-      'dns-name-label-length',
-      t(
-        'ai: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 as string)) {
-          return false; // Value contains spaces, validation fails
-        }
+  Yup.string().test(
+    'dns-name-label-length',
+    t(
+      'ai: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 as string)) {
+        return false; // Value contains spaces, validation fails
+      }
 
-        // Check the label lengths
-        const labels = (value || '').split('.');
-        return labels.every((label: string) => label.length <= 63);
-      },
-    )
-    .matches(NAME_CHARS_REGEX, {
-      message: t(
-        'ai:Base domain can only contain letters, digits, hyphens, and dots. Example: example.com',
-      ),
-      excludeEmptyString: true,
-    });
+      // Check the label lengths
+      const labels = (value || '').split('.');
+      return labels.every((label: string) => label.length <= 63);
+    },
+  );
 
 export const locationValidationSchema = (t: TFunction) =>
   Yup.string()

package/lib/ocm/components/Routes.tsx

@@ -34,9 +34,7 @@ export const UILibRoutes = ({
     <>
       <Routes>
         <Route path="assisted-installer/clusters" element={<Outlet />}>
-          <Route path="~new" element={<NewClusterPage />}>
-            <Route path=":clusterId" element={<NewClusterPage />} />
-          </Route>
+          <Route path="~new" element={<NewClusterPage />} />
           <Route path=":clusterId" element={<ClusterPage />} />
           <Route index element={<Clusters />} />
         </Route>

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

@@ -20,7 +20,6 @@ export const discoveryImageTypes: Record<DiscoveryImageType, string> = {
   'minimal-iso': 'Minimal image file - Download an ISO that fetches content on boot',
   'full-iso': 'Full image file - Download a self-contained ISO',
   'discovery-image-ipxe': 'iPXE - Provision from your network server',
-  'disconnected-iso': 'Disconnected ISO - Provision from a local file',
 };
 
 type DiscoveryImageTypeDropdownProps = {

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

@@ -16,6 +16,7 @@ import { Formik, FormikHelpers } from 'formik';
 import { TFunction } from 'i18next';
 import {
   HostStaticNetworkConfig,
+  ImageType,
   InfraEnv,
   Proxy,
 } from '@openshift-assisted/types/assisted-installer-service';
@@ -71,7 +72,7 @@ type OcmDiscoveryImageConfigFormProps = Proxy & {
     formikActions: FormikHelpers<OcmDiscoveryImageFormValues>,
   ) => Promise<void>;
   sshPublicKey?: string;
-  imageType?: DiscoveryImageType;
+  imageType?: ImageType;
   isIpxeSelected?: boolean;
   enableCertificate?: boolean;
   trustBundle?: InfraEnv['additionalTrustBundle'];
@@ -105,7 +106,7 @@ export const OcmDiscoveryImageConfigForm = ({
     httpsProxy: httpsProxy || '',
     noProxy: noProxy || '',
     enableProxy: !!(httpProxy || httpsProxy || noProxy),
-    imageType: imageType,
+    imageType: imageTypeValue as ImageType,
     enableCertificate: enableCertificate || false,
     trustBundle: trustBundle || '',
   };

package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/CustomManifestsPage.tsx

@@ -15,8 +15,9 @@ import {
 import { CustomManifests } from './components/CustomManifests';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 import { CustomManifestFormState } from './components/propTypes';
-import { ClustersAPI, ClusterWizardStepHeader } from '../../../../common';
-import { isOciPlatformType, isThirdPartyCNI } from '../../utils';
+import { ClustersAPI, ClusterWizardStepHeader, isThirdPartyCNI } from '../../../../common';
+import { getFieldId } from '../../../../common/components/ui/formik';
+import { isOciPlatformType } from '../../utils';
 import DeleteCustomManifestModal from './DeleteCustomManifestModal';
 import { ClustersService } from '../../../services';
 import { useClusterWizardContext } from '../../clusterWizard/ClusterWizardContext';
@@ -77,9 +78,14 @@ export const CustomManifestsPage = ({
     await ClustersService.removeClusterManifests(manifests, cluster.id);
     setUseCustomManifests(false);
     setDeleteModalOpen(false);
-    await clusterWizardContext.updateUISettings({ customManifestsAdded: false });
+    await clusterWizardContext.updateUISettings({
+      customManifestsAdded: false,
+      customManifestsUpdated: true,
+    });
   }, [cluster.id, clusterWizardContext]);
 
+  const fieldId = getFieldId('use-custom-manifests', 'switch');
+
   const tooltipWhenDisabled = isRequired
     ? 'Custom manifests are required when using a third-party CNI or Oracle Cloud Infrastructure.'
     : '';
@@ -133,11 +139,13 @@ export const CustomManifestsPage = ({
           configuration of the cluster.
         </Content>
       </Content>
-      <FormGroup fieldId="use-custom-manifests" label="">
+      <FormGroup fieldId={fieldId} label="">
         <Tooltip content={tooltipWhenDisabled} hidden={!isRequired}>
           <span style={{ display: 'inline-block', cursor: isRequired ? 'not-allowed' : undefined }}>
             <Switch
-              id="use-custom-manifests"
+              id={fieldId}
+              data-testid={fieldId}
+              data-checked={useCustomManifests}
               isChecked={useCustomManifests}
               isDisabled={isRequired}
               onChange={handleSwitchChange}
@@ -146,7 +154,7 @@ export const CustomManifestsPage = ({
           </span>
         </Tooltip>
       </FormGroup>
-      {!useCustomManifests && <div style={{ minHeight: '120px' }} aria-hidden="true" />}
+      {!useCustomManifests && <div style={{ minHeight: '250px' }} aria-hidden="true" />}
       {useCustomManifests && (
         <>
           {reminderAlerts}

package/lib/ocm/components/clusterConfiguration/manifestsConfiguration/components/CustomManifestsArray.tsx

@@ -12,6 +12,7 @@ import { CustomManifest } from './CustomManifest';
 import { getEmptyManifest, getManifestName } from './utils';
 import { CustomManifestValues } from '../data/dataTypes';
 import { selectCurrentClusterPermissionsState } from '../../../../store/slices/current-cluster/selectors';
+import { useClusterWizardContext } from '../../../clusterWizard/ClusterWizardContext';
 
 const fieldName = 'manifests';
 
@@ -40,6 +41,8 @@ export const CustomManifestsArray = ({
   clusterId,
   ...props
 }: CustomManifestsArrayProps) => {
+  const { updateUISettings } = useClusterWizardContext();
+
   const [field, { error }] = useField<CustomManifestValues[]>({
     name: fieldName,
   });
@@ -67,6 +70,7 @@ export const CustomManifestsArray = ({
             manifestToRemove['folder'] as string,
             manifestToRemove['filename'],
           );
+          await updateUISettings({ customManifestsUpdated: true });
         } catch (e) {
           handleApiError(e, () =>
             addAlert({
@@ -77,7 +81,7 @@ export const CustomManifestsArray = ({
         }
       }
     },
-    [addAlert, field.value],
+    [addAlert, field.value, updateUISettings],
   );
 
   const onConfirm = React.useCallback(async (): Promise<void> => {

package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkConfiguration.tsx

@@ -4,7 +4,6 @@ import { useSelector } from 'react-redux';
 import { Stack, StackItem, Tooltip } from '@patternfly/react-core';
 import {
   canBeDualStack,
-  canSelectNetworkTypeSDN,
   CpuArchitecture,
   DUAL_STACK,
   HostSubnets,
@@ -144,9 +143,6 @@ const NetworkConfiguration = ({
   const isDualStack = values.stackType === DUAL_STACK;
 
   const isDualStackSelectable = React.useMemo(() => canBeDualStack(hostSubnets), [hostSubnets]);
-  const isSDNSelectable = React.useMemo(() => {
-    return canSelectNetworkTypeSDN(isSNOCluster, isDualStack);
-  }, [isSNOCluster, isDualStack]);
 
   const [isAdvanced, setAdvanced] = React.useState(
     isDualStack || isAdvNetworkConf(cluster, defaultNetworkSettings),
@@ -262,7 +258,6 @@ const NetworkConfiguration = ({
       <StackItem>
         <NetworkTypeDropDown
           isDisabled={isViewerMode}
-          isSDNSelectable={isSDNSelectable}
           featureSupportLevelData={featureSupportLevelData}
         />
       </StackItem>

package/lib/ocm/components/clusterConfiguration/networkConfiguration/NetworkTypeDropdown.tsx

@@ -12,82 +12,71 @@ import {
   StackItem,
   Tooltip,
 } from '@patternfly/react-core';
-import {
-  NETWORK_TYPE_CALICO,
-  NETWORK_TYPE_CILIUM,
-  NETWORK_TYPE_CISCO_ACI,
-  NETWORK_TYPE_LABELS,
-  NETWORK_TYPE_NONE,
-  NETWORK_TYPE_OVN,
-  NETWORK_TYPE_SDN,
-} from '../../../../common/config';
 import { getFieldId, ExternalLink } from '../../../../common/components/ui';
 import {
   NewFeatureSupportLevelMap,
   useNewFeatureSupportLevel,
 } from '../../../../common/components/newFeatureSupportLevels';
-import { TechnologyPreview } from '../../../../common/components/ui/TechnologyPreview';
+import NewFeatureSupportLevelBadge from '../../../../common/components/newFeatureSupportLevels/NewFeatureSupportLevelBadge';
 import type { NetworkConfigurationValues } from '../../../../common/types/clusters';
-import { isThirdPartyCNI } from '../../utils';
+import {
+  NETWORK_TYPE_OVN,
+  NETWORK_TYPE_LABELS,
+  NETWORK_TYPE_FEATURE_IDS,
+  isThirdPartyCNI,
+} from '../../../../common/types/networkType';
 import { RED_HAT_CNI_SUPPORT_MATRIX_LINK } from '../../../../common/config/docs_links';
 
 export interface NetworkTypeDropDownProps {
   isDisabled?: boolean;
-  isSDNSelectable: boolean;
   featureSupportLevelData: NewFeatureSupportLevelMap | null;
 }
 
 export const NetworkTypeDropDown = ({
   isDisabled = false,
-  isSDNSelectable,
   featureSupportLevelData,
 }: NetworkTypeDropDownProps) => {
   const [field, , { setValue }] = useField<string>('networkType');
   const [isOpen, setOpen] = React.useState(false);
   const { values } = useFormikContext<NetworkConfigurationValues>();
-  const { getFeatureDisabledReason } = useNewFeatureSupportLevel();
+  const { getFeatureDisabledReason, getFeatureSupportLevel } = useNewFeatureSupportLevel();
   const fieldId = getFieldId('networkType', 'input');
   const showThirdPartyBanner = isThirdPartyCNI(values.networkType);
 
-  const sdnDisabledReason = React.useMemo(() => {
-    if (!isSDNSelectable) {
-      return 'SDN is not supported for SNO clusters or when IPv6 is detected.';
-    }
-    return getFeatureDisabledReason('SDN_NETWORK_TYPE', featureSupportLevelData ?? undefined);
-  }, [isSDNSelectable, featureSupportLevelData, getFeatureDisabledReason]);
-
   React.useEffect(() => {
-    if (field.value === NETWORK_TYPE_SDN && sdnDisabledReason) {
+    if (
+      getFeatureDisabledReason(
+        NETWORK_TYPE_FEATURE_IDS[field.value],
+        featureSupportLevelData ?? undefined,
+      ) !== undefined
+    ) {
       setValue(NETWORK_TYPE_OVN);
     }
-  }, [sdnDisabledReason, field.value, setValue]);
+  }, [field.value, setValue, featureSupportLevelData, getFeatureDisabledReason]);
 
   const currentDisplayValue = NETWORK_TYPE_LABELS[field.value];
 
   const dropdownItems = Object.entries(NETWORK_TYPE_LABELS).map(([value, label]) => {
-    const isSDN = value === NETWORK_TYPE_SDN;
-    const disabledReason = isSDN ? sdnDisabledReason : undefined;
-    const isTechPreview = [
-      NETWORK_TYPE_CISCO_ACI,
-      NETWORK_TYPE_CILIUM,
-      NETWORK_TYPE_CALICO,
-      NETWORK_TYPE_NONE,
-    ].includes(value);
+    const disabledReason = getFeatureDisabledReason(
+      NETWORK_TYPE_FEATURE_IDS[value],
+      featureSupportLevelData ?? undefined,
+    );
+    const featureId = NETWORK_TYPE_FEATURE_IDS[value];
+    const supportLevel = featureId
+      ? getFeatureSupportLevel(featureId, featureSupportLevelData ?? undefined)
+      : undefined;
+    const shouldDisable =
+      supportLevel === 'unavailable' ||
+      supportLevel === 'unsupported' ||
+      disabledReason !== undefined;
     return (
-      <DropdownItem
-        key={value}
-        id={value}
-        value={value}
-        isAriaDisabled={disabledReason !== undefined}
-      >
+      <DropdownItem key={value} id={value} value={value} isAriaDisabled={shouldDisable}>
         <Tooltip hidden={!disabledReason} content={disabledReason} position="top">
           <div>
             {label}
-            {isTechPreview && (
-              <span onClick={(event) => event.stopPropagation()}>
-                <TechnologyPreview testId={`${value}-support-level`} />
-              </span>
-            )}
+            <span onClick={(event) => event.stopPropagation()}>
+              <NewFeatureSupportLevelBadge featureId={featureId} supportLevel={supportLevel} />
+            </span>
           </div>
         </Tooltip>
       </DropdownItem>
@@ -132,11 +121,7 @@ export const NetworkTypeDropDown = ({
       </StackItem>
       {showThirdPartyBanner && (
         <StackItem>
-          <Alert
-            variant={AlertVariant.warning}
-            isInline
-            title="Third-party CNI (Technology Preview)"
-          >
+          <Alert variant={AlertVariant.warning} isInline title="Third-party CNI">
             <Stack hasGutter>
               <StackItem>
                 Third-party CNIs require uploading CNI manifests. Please verify you have the

package/lib/ocm/components/clusterConfiguration/review/ReviewStep.tsx

@@ -24,19 +24,17 @@ const ReviewStep = ({ cluster }: { cluster: Cluster }) => {
   const [disableInstallButton, setDisableInstallButton] = React.useState<boolean>();
 
   React.useEffect(() => {
-    if (
+    const manifestFail =
       cluster['last-installation-preparation']?.status === 'failed' &&
-      cluster['last-installation-preparation'].reason?.includes('manifest')
-    ) {
-      if (clusterWizardContext.uiSettings?.customManifestsUpdated === undefined) {
-        setDisableInstallButton(true);
-        void clusterWizardContext.updateUISettings({ customManifestsUpdated: false });
-      } else if (clusterWizardContext.uiSettings?.customManifestsUpdated === false) {
-        setDisableInstallButton(true);
-      }
-    } else {
-      setDisableInstallButton(isViewerMode || isStartingInstallation || cluster.status !== 'ready');
-    }
+      cluster['last-installation-preparation'].reason?.includes('manifest');
+    const userDidntAddressManifestIssue =
+      clusterWizardContext.uiSettings?.customManifestsUpdated !== true;
+    setDisableInstallButton(
+      (manifestFail && userDidntAddressManifestIssue) ||
+        isViewerMode ||
+        isStartingInstallation ||
+        cluster.status !== 'ready',
+    );
   }, [cluster, isStartingInstallation, isViewerMode, clusterWizardContext]);
 
   const handleClusterInstall = async () => {

package/lib/ocm/components/clusterConfiguration/staticIp/commonValidationSchemas.tsx

@@ -92,17 +92,11 @@ export const getIpAddressValidationSchema = (protocolVersion: ProtocolVersion) =
   const protocolVersionLabel = protocolVersion === ProtocolVersion.ipv4 ? 'IPv4' : 'IPv6';
   return Yup.string().test(
     protocolVersion,
-    (params: { value?: unknown }) =>
-      `Value "${
-        params?.value !== undefined ? String(params.value) : ''
-      }" is not a valid ${protocolVersionLabel} address`,
+    `Value \${value} is not a valid ${protocolVersionLabel} address`,
     (value?: string) => {
-      if (value === undefined || value === '') {
+      if (!value) {
         return true;
       }
-      if (typeof value !== 'string') {
-        return false;
-      }
       return isValidAddress(value, protocolVersion);
     },
   );

package/lib/ocm/components/clusterConfiguration/staticIp/components/FormViewHosts/FormViewHostsFields.tsx

@@ -96,7 +96,6 @@ const getExpandedHostComponent = (protocolType: StaticProtocolType) => {
               label={`IP address (${getProtocolVersionLabel(protocolVersion)})`}
               fieldId={getFieldId(`${fieldName}.ips.${protocolVersion}`, 'input')}
               key={protocolVersion}
-              isRequired
             >
               <OcmInputField
                 name={`${fieldName}.ips.${protocolVersion}`}

package/lib/ocm/components/clusterConfiguration/staticIp/components/FormViewNetworkWide/FormViewNetworkWide.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { StaticIpForm } from '../StaticIpForm';
 import { StaticIpFormProps, StaticIpViewProps } from '../propTypes';
 import { FormViewHost, FormViewNetworkWideValues } from '../../data/dataTypes';
-import { getNetworkWideValidationSchema } from './formViewNetworkWideValidationSchema';
+import { networkWideValidationSchema } from './formViewNetworkWideValidationSchema';
 import { networkWideToInfraEnvField } from '../../data/formDataToInfraEnvField';
 import { FormViewNetworkWideFields } from './FormViewNetworkWideFields';
 import { getFormData, getFormViewNetworkWideValues } from '../../data/fromInfraEnv';
@@ -22,7 +22,7 @@ export const FormViewNetworkWide: React.FC<StaticIpViewProps> = ({ infraEnv, ...
     setFormProps({
       infraEnv,
       ...props,
-      validationSchema: getNetworkWideValidationSchema(infraEnv.rendezvousIp),
+      validationSchema: networkWideValidationSchema,
       getInitialValues: (infraEnv: InfraEnv) => {
         return getFormViewNetworkWideValues(infraEnv);
       },

package/lib/ocm/components/clusterConfiguration/staticIp/components/FormViewNetworkWide/formViewNetworkWideValidationSchema.tsx

@@ -95,71 +95,32 @@ const getAddressDataValidationSchema = (protocolVersion: ProtocolVersion, ipConf
   });
 };
 
-/**
- * Validates that Rendezvous IP (when set) is within the IPv4 subnet.
- * Default gateway is already validated by getAddressDataValidationSchema (getInMachineNetworkValidationSchema).
- */
-const getRendezvousIpCoherenceTest = (rendezvousIp: string | undefined) => {
-  return Yup.object().test(
-    'rendezvous-ip-in-subnet',
-    'Rendezvous IP must be within the IPv4 subnet.',
-    (value: unknown, context: Yup.TestContext) => {
-      const values = value as FormViewNetworkWideValues | undefined;
-      const machineNetwork = values?.ipConfigs?.ipv4?.machineNetwork;
-      if (
-        !rendezvousIp?.trim() ||
-        !machineNetwork?.ip?.trim() ||
-        machineNetwork.prefixLength === '' ||
-        typeof machineNetwork.prefixLength !== 'number'
-      ) {
-        return true;
-      }
-      const inSubnetSchema = getInMachineNetworkValidationSchema(
-        ProtocolVersion.ipv4,
-        machineNetwork,
-      );
-      if (!inSubnetSchema.isValidSync(rendezvousIp)) {
-        return context.createError({
-          path: 'ipConfigs.ipv4.machineNetwork.ip',
-          message: 'Rendezvous IP must be within the IPv4 subnet.',
-        });
-      }
-      return true;
-    },
-  );
-};
-
-export const getNetworkWideValidationSchema = (rendezvousIp?: string) =>
-  Yup.lazy((values: FormViewNetworkWideValues) => {
-    const ipConfigsValidationSchemas = Yup.object({
-      ipv4: getAddressDataValidationSchema(ProtocolVersion.ipv4, values.ipConfigs.ipv4),
-      ipv6: showProtocolVersion(values.protocolType, ProtocolVersion.ipv6)
-        ? getAddressDataValidationSchema(ProtocolVersion.ipv6, values.ipConfigs.ipv6)
-        : Yup.object<IpConfig>(),
-    });
-
-    const baseSchema = Yup.object({
-      useVlan: Yup.boolean(),
-      vlanId: Yup.mixed().when('useVlan', {
-        is: (useVlan: boolean) => useVlan,
-        then: () =>
-          Yup.number()
-            .required(MUST_BE_A_NUMBER)
-            .min(1, `Must be more than or equal to 1`)
-            .max(MAX_VLAN_ID, `Must be less than or equal to ${MAX_VLAN_ID}`)
-            .test('not-number', MUST_BE_A_NUMBER, () => validateNumber(values.vlanId))
-            .nullable()
-            .transform(transformNumber) as Yup.NumberSchema,
-      }),
-      protocolType: Yup.string(),
-      dns: getDNSValidationSchema(values.protocolType),
-      ipConfigs: ipConfigsValidationSchemas,
-    });
-
-    return baseSchema.concat(getRendezvousIpCoherenceTest(rendezvousIp));
+export const networkWideValidationSchema = Yup.lazy((values: FormViewNetworkWideValues) => {
+  const ipConfigsValidationSchemas = Yup.object({
+    ipv4: getAddressDataValidationSchema(ProtocolVersion.ipv4, values.ipConfigs.ipv4),
+    ipv6: showProtocolVersion(values.protocolType, ProtocolVersion.ipv6)
+      ? getAddressDataValidationSchema(ProtocolVersion.ipv6, values.ipConfigs.ipv6)
+      : Yup.object<IpConfig>(),
   });
 
-export const networkWideValidationSchema = getNetworkWideValidationSchema();
+  return Yup.object({
+    useVlan: Yup.boolean(),
+    vlanId: Yup.mixed().when('useVlan', {
+      is: (useVlan: boolean) => useVlan,
+      then: () =>
+        Yup.number()
+          .required(MUST_BE_A_NUMBER)
+          .min(1, `Must be more than or equal to 1`)
+          .max(MAX_VLAN_ID, `Must be less than or equal to ${MAX_VLAN_ID}`)
+          .test('not-number', MUST_BE_A_NUMBER, () => validateNumber(values.vlanId))
+          .nullable()
+          .transform(transformNumber) as Yup.NumberSchema,
+    }),
+    protocolType: Yup.string(),
+    dns: getDNSValidationSchema(values.protocolType),
+    ipConfigs: ipConfigsValidationSchemas,
+  });
+});
 
 export const validateNumber = (vlanId: FormViewNetworkWideValues['vlanId']) => {
   //We need to validate that value is a number(without letters) and is not an exponential number (ex: 1e2)

package/lib/ocm/components/clusterWizard/ClusterDetails.tsx

@@ -39,6 +39,7 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
   const navigate = useNavigate();
   const dispatch = useDispatch();
   const { usedClusterNames } = useUsedClusterNames(cluster?.id || '');
+  const pullSecret = usePullSecret();
   const {
     error: errorOCPVersions,
     loading: loadingOCPVersions,
@@ -46,8 +47,6 @@ const ClusterDetails = ({ cluster, infraEnv }: ClusterDetailsProps) => {
   } = useOpenShiftVersionsContext();
   const location = useLocation();
   const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
-  const defaultPullSecret = usePullSecret();
-  const pullSecret = isSingleClusterFeatureEnabled ? infraEnv?.pullSecret || '' : defaultPullSecret;
 
   const handleClusterUpdate = React.useCallback(
     async (clusterId: Cluster['id'], params: ClusterDetailsUpdateParams) => {

package/lib/ocm/components/clusterWizard/ClusterDetailsForm.tsx

@@ -11,9 +11,10 @@ import {
   getRichTextValidation,
   useAlerts,
   TechnologyPreview,
+  OpenshiftVersionOptionType,
+  getFormikErrorFields,
 } from '../../../common';
 import { canNextClusterDetails } from './wizardTransition';
-import { OpenshiftVersionOptionType, getFormikErrorFields } from '../../../common';
 import ClusterWizardFooter from './ClusterWizardFooter';
 import { isInOcm } from '../../../common/api';
 import {

package/lib/ocm/components/clusterWizard/ClusterWizardContext.tsx

@@ -3,7 +3,6 @@ import { HostsNetworkConfigurationType } from '../../services';
 import { StaticIpView } from '../clusterConfiguration/staticIp/data/dataTypes';
 import { ClusterWizardStepsType } from './wizardTransition';
 import { UISettingsValues } from '../../../common';
-import { InfraEnv } from '@openshift-assisted/types/assisted-installer-service';
 
 export type ClusterWizardContextType = {
   currentStepId: ClusterWizardStepsType;
@@ -19,8 +18,6 @@ export type ClusterWizardContextType = {
   uiSettings?: UISettingsValues;
   installDisconnected: boolean;
   setInstallDisconnected: (enabled: boolean) => void;
-  disconnectedInfraEnv?: InfraEnv;
-  setDisconnectedInfraEnv: (infraEnv: InfraEnv | undefined) => void;
 };
 
 export const ClusterWizardContext = React.createContext<ClusterWizardContextType | null>(null);