@openshift-assisted/ui-lib 2.50.0 → 2.50.1

package/lib/common/validationSchemas/addressValidation.tsx

@@ -7,13 +7,7 @@ import { getAddress } from '../components/ui/formik/utils';
 import { getSubnet } from '../components/clusterConfiguration/utils';
 import { HostSubnets, NetworkConfigurationValues } from '../types';
 import { IP_V4_ZERO, IP_V6_ZERO, MAC_REGEX } from './regexes';
-import {
-  alwaysRequired,
-  getArrayIndexFromPath,
-  isIPorDN,
-  isIPv4Address,
-  isIPv6Address,
-} from './utils';
+import { getArrayIndexFromPath, isIPorDN, isIPv4Address, isIPv6Address } from './utils';
 import { NO_SUBNET_SET } from '../config';
 import { overlap } from 'cidr-tools';
 import parseUrl from 'parse-url';
@@ -28,6 +22,7 @@ export const ipValidationSchema = (t: TFunction) =>
 
 export const ipNoSuffixValidationSchema = (t: TFunction) =>
   Yup.string().test('ip-validation-no-suffix', t('ai:Not a valid IP address'), (value?: string) => {
+    if (!value) return true;
     const address = getAddress(value || '');
     return !!address && address.address === address.addressMinusSuffix;
   });
@@ -173,15 +168,25 @@ export const vipNoSuffixValidationSchema = (
         }
         if (apiVip === ingressVip) {
           return this.createError({
-            message: t('ai:The {{label}} Ingress and API IP addresses cannot be the same.', {
-              label: index === 0 ? t('ai:primary') : t('ai:secondary'),
-            }),
+            message:
+              index === 0
+                ? t('ai:The primary Ingress and API IP addresses cannot be the same.')
+                : t('ai:The secondary Ingress and API IP addresses cannot be the same.'),
           });
         }
         return true;
       });
+      const requiredField = (message: string) =>
+        Yup.string().test('required-field', message, function (value?: string) {
+          const index = getArrayIndexFromPath(this.path || '');
+          const api1 = (values.apiVips?.[1]?.ip ?? '').toString().trim();
+          const ingress1 = (values.ingressVips?.[1]?.ip ?? '').toString().trim();
+          // Dual-stack: secondary VIPs (index 1) are optional; skip required when both are empty
+          if (index === 1 && api1 === '' && ingress1 === '') return true;
+          return !!value;
+        });
 
-      return alwaysRequired(t('ai:Required field'))
+      return requiredField(t('ai:Required field'))
         .concat(ipNoSuffixValidationSchema(t))
         .concat(vipFamilyMatchSchema)
         .concat(vipRangeValidationSchema(hostSubnets, values, false, t))

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/networkConfiguration/NetworkConfigurationForm.tsx

@@ -236,9 +236,13 @@ const NetworkConfigurationPage = ({ cluster }: { cluster: Cluster }) => {
       const isMultiNodeCluster = !isSNO(cluster);
       const isUserManagedNetworking = values.managedNetworkingType === 'userManaged';
 
+      // Only send VIPs that have a non-empty IP;
+      const apiVips = (values.apiVips || []).filter((v) => (v?.ip ?? '').trim() !== '');
+      const ingressVips = (values.ingressVips || []).filter((v) => (v?.ip ?? '').trim() !== '');
+
       const params: V2ClusterUpdateParams = {
-        apiVips: values.apiVips,
-        ingressVips: values.ingressVips,
+        apiVips,
+        ingressVips,
         sshPublicKey: values.sshPublicKey,
         vipDhcpAllocation: values.vipDhcpAllocation,
         networkType: values.networkType,
@@ -247,7 +251,6 @@ const NetworkConfigurationPage = ({ cluster }: { cluster: Cluster }) => {
         serviceNetworks: values.serviceNetworks,
         userManagedNetworking: isUserManagedNetworking,
       };
-
       if (params.userManagedNetworking) {
         params.apiVips = [];
         params.ingressVips = [];

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;
@@ -21,14 +20,6 @@ export type ClusterWizardContextType = {
   uiSettings?: UISettingsValues;
   installDisconnected: boolean;
   setInstallDisconnected: (enabled: boolean) => void;
-  disconnectedInfraEnv?: InfraEnv;
-  setDisconnectedInfraEnv: (infraEnv: InfraEnv | undefined) => void;
-  /** Last pull secret submitted in disconnected Optional configurations (restored when going back from Review) */
-  disconnectedFormPullSecret?: string;
-  setDisconnectedFormPullSecret: (value: string | undefined) => void;
-  /** Whether "Edit pull secret" was checked when user last clicked Next (restored when going back from Review) */
-  disconnectedFormEditPullSecret?: boolean;
-  setDisconnectedFormEditPullSecret: (value: boolean) => void;
 };
 
 export const ClusterWizardContext = React.createContext<ClusterWizardContextType | null>(null);

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

@@ -76,33 +76,6 @@ const getWizardStepIds = (
   return stepsCopy;
 };
 
-// Same logic as getWizardStepIds but for disconnected flow
-// Adds static IP steps after 'disconnected-optional-configurations' instead of 'cluster-details'
-const getDisconnectedWizardStepIds = (
-  wizardStepIds: ClusterWizardStepsType[] | undefined,
-  staticIpView?: StaticIpView | 'dhcp-selected',
-): ClusterWizardStepsType[] => {
-  let stepsCopy = wizardStepIds ? [...wizardStepIds] : [...disconnectedSteps];
-  if (staticIpView === StaticIpView.YAML) {
-    stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-network-wide-configurations', 2);
-    stepsCopy = addStepToClusterWizard(stepsCopy, 'disconnected-optional-configurations', [
-      'static-ip-yaml-view',
-    ]);
-  } else if (staticIpView === StaticIpView.FORM) {
-    stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-yaml-view', 1);
-    stepsCopy = addStepToClusterWizard(
-      stepsCopy,
-      'disconnected-optional-configurations',
-      staticIpFormViewSubSteps,
-    );
-  } else if (staticIpView === 'dhcp-selected') {
-    stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-network-wide-configurations', 2);
-    stepsCopy = removeStepFromClusterWizard(stepsCopy, 'static-ip-yaml-view', 1);
-  }
-
-  return stepsCopy;
-};
-
 const ClusterWizardContextProvider = ({
   children,
   cluster,
@@ -116,17 +89,9 @@ const ClusterWizardContextProvider = ({
   const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
   const [currentStepId, setCurrentStepId] = React.useState<ClusterWizardStepsType>();
   const [connectedWizardStepIds, setWizardStepIds] = React.useState<ClusterWizardStepsType[]>();
-  const [disconnectedWizardStepIds, setDisconnectedWizardStepIds] =
-    React.useState<ClusterWizardStepsType[]>(disconnectedSteps);
   const [wizardPerPage, setWizardPerPage] = React.useState(10);
   const [customManifestsStep, setCustomManifestsStep] = React.useState<boolean>(false);
   const [installDisconnected, setInstallDisconnected] = React.useState(false);
-  const [disconnectedInfraEnv, setDisconnectedInfraEnv] = React.useState<InfraEnv | undefined>(
-    infraEnv,
-  );
-  const [disconnectedFormPullSecret, setDisconnectedFormPullSecret] = React.useState<string>();
-  const [disconnectedFormEditPullSecret, setDisconnectedFormEditPullSecret] =
-    React.useState<boolean>();
   const location = useLocation();
   const locationState = location.state as ClusterWizardFlowStateType | undefined;
   const {
@@ -138,7 +103,7 @@ const ClusterWizardContextProvider = ({
   const { clearAlerts, addAlert, alerts } = useAlerts();
   const setClusterPermissions = useSetClusterPermissions();
 
-  const wizardStepIds = installDisconnected ? disconnectedWizardStepIds : connectedWizardStepIds;
+  const wizardStepIds = installDisconnected ? disconnectedSteps : connectedWizardStepIds;
 
   React.useEffect(() => {
     if (!UISettingsLoading) {
@@ -197,29 +162,17 @@ const ClusterWizardContextProvider = ({
 
     const handleMoveFromStaticIp = () => {
       //if static ip view change wasn't persisted, moving from static ip step should change the wizard steps to match the view in the infra env
-      const currentInfraEnv = installDisconnected ? disconnectedInfraEnv : infraEnv;
-      const staticIpInfo = currentInfraEnv ? getStaticIpInfo(currentInfraEnv) : undefined;
+      const staticIpInfo = infraEnv ? getStaticIpInfo(infraEnv) : undefined;
       if (!staticIpInfo) {
         throw `Wizard step is currently ${currentStepId}, but no static ip info is defined`;
       }
-
-      if (installDisconnected) {
-        // For disconnected wizard, update wizard steps directly (same pattern as connected)
-        const newStepIds = getDisconnectedWizardStepIds(
-          disconnectedWizardStepIds,
-          staticIpInfo.view,
-        );
-        setDisconnectedWizardStepIds(newStepIds);
-      } else {
-        // For connected wizard, update wizard steps directly
-        const newStepIds = getWizardStepIds(
-          wizardStepIds,
-          staticIpInfo.view,
-          customManifestsStep,
-          isSingleClusterFeatureEnabled,
-        );
-        setWizardStepIds(newStepIds);
-      }
+      const newStepIds = getWizardStepIds(
+        wizardStepIds,
+        staticIpInfo.view,
+        customManifestsStep,
+        isSingleClusterFeatureEnabled,
+      );
+      setWizardStepIds(newStepIds);
     };
 
     const onSetCurrentStepId = (stepId: ClusterWizardStepsType) => {
@@ -263,57 +216,31 @@ const ClusterWizardContextProvider = ({
         } else {
           setCurrentStepId('static-ip-network-wide-configurations');
         }
-        if (installDisconnected) {
-          // For disconnected wizard, update wizard steps (same pattern as connected)
-          setDisconnectedWizardStepIds(
-            getDisconnectedWizardStepIds(disconnectedWizardStepIds, view),
+        setWizardStepIds(
+          getWizardStepIds(wizardStepIds, view, customManifestsStep, isSingleClusterFeatureEnabled),
+        );
+      },
+      onUpdateHostNetworkConfigType(type: HostsNetworkConfigurationType): void {
+        if (type === HostsNetworkConfigurationType.STATIC) {
+          setWizardStepIds(
+            getWizardStepIds(
+              wizardStepIds,
+              StaticIpView.FORM,
+              customManifestsStep,
+              isSingleClusterFeatureEnabled,
+            ),
           );
         } else {
           setWizardStepIds(
             getWizardStepIds(
               wizardStepIds,
-              view,
+              'dhcp-selected',
               customManifestsStep,
               isSingleClusterFeatureEnabled,
             ),
           );
         }
       },
-      onUpdateHostNetworkConfigType(type: HostsNetworkConfigurationType): void {
-        if (installDisconnected) {
-          // For disconnected wizard, update wizard steps (same pattern as connected)
-          if (type === HostsNetworkConfigurationType.STATIC) {
-            setDisconnectedWizardStepIds(
-              getDisconnectedWizardStepIds(disconnectedWizardStepIds, StaticIpView.FORM),
-            );
-          } else {
-            setDisconnectedWizardStepIds(
-              getDisconnectedWizardStepIds(disconnectedWizardStepIds, 'dhcp-selected'),
-            );
-          }
-        } else {
-          // For connected wizard, update wizard steps directly
-          if (type === HostsNetworkConfigurationType.STATIC) {
-            setWizardStepIds(
-              getWizardStepIds(
-                wizardStepIds,
-                StaticIpView.FORM,
-                customManifestsStep,
-                isSingleClusterFeatureEnabled,
-              ),
-            );
-          } else {
-            setWizardStepIds(
-              getWizardStepIds(
-                wizardStepIds,
-                'dhcp-selected',
-                customManifestsStep,
-                isSingleClusterFeatureEnabled,
-              ),
-            );
-          }
-        }
-      },
       wizardStepIds: wizardStepIds,
       currentStepId,
       setCurrentStepId: onSetCurrentStepId,
@@ -332,12 +259,6 @@ const ClusterWizardContextProvider = ({
           connectedWizardStepIds?.length && onSetCurrentStepId(connectedWizardStepIds[0]);
         }
       },
-      disconnectedInfraEnv,
-      setDisconnectedInfraEnv,
-      disconnectedFormPullSecret,
-      setDisconnectedFormPullSecret,
-      disconnectedFormEditPullSecret,
-      setDisconnectedFormEditPullSecret,
     };
   }, [
     wizardStepIds,
@@ -350,11 +271,8 @@ const ClusterWizardContextProvider = ({
     uiSettings,
     updateUISettings,
     installDisconnected,
+    setInstallDisconnected,
     connectedWizardStepIds,
-    disconnectedWizardStepIds,
-    disconnectedInfraEnv,
-    disconnectedFormPullSecret,
-    disconnectedFormEditPullSecret,
   ]);
 
   if (!contextValue) {

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

@@ -17,8 +17,6 @@ import { onFetchEvents } from '../fetching/fetchEvents';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 import { useFeature } from '../../hooks/use-feature';
 import { useModalDialogsContext } from '../hosts/ModalDialogsContext';
-import ClustersService from '../../services/ClustersService';
-import { handleApiError, getApiErrorMessage } from '../../../common/api';
 
 type ClusterValidationSectionProps = {
   cluster?: Cluster;
@@ -73,7 +71,6 @@ type ClusterWizardFooterProps = WizardFooterGenericProps & {
   errorFields?: string[];
   alertTitle?: string;
   alertContent?: string | null;
-  disconnectedClusterId?: string;
 };
 
 const ClusterWizardFooter = ({
@@ -83,37 +80,19 @@ const ClusterWizardFooter = ({
   alertTitle,
   alertContent,
   onCancel,
-  disconnectedClusterId,
   ...rest
 }: ClusterWizardFooterProps) => {
-  const { alerts, addAlert } = useAlerts();
+  const { alerts } = useAlerts();
   const navigate = useNavigate();
   const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
   const { currentStepId } = useClusterWizardContext();
   const { resetSingleClusterDialog } = useModalDialogsContext();
-  const { setDisconnectedInfraEnv } = useClusterWizardContext();
 
-  const handleCancel = React.useCallback(async () => {
-    if (disconnectedClusterId) {
-      try {
-        await ClustersService.remove(disconnectedClusterId);
-      } catch (e) {
-        handleApiError(e, () =>
-          addAlert({
-            title: 'Failed to remove cluster',
-            message: getApiErrorMessage(e),
-          }),
-        );
-      }
-    }
-    setDisconnectedInfraEnv(undefined);
-    navigate('/cluster-list');
-  }, [navigate, setDisconnectedInfraEnv, addAlert, disconnectedClusterId]);
+  const handleCancel = React.useCallback(() => navigate('/cluster-list'), [navigate]);
 
-  const handleReset = React.useCallback(
-    () => resetSingleClusterDialog.open({ cluster }),
-    [resetSingleClusterDialog, cluster],
-  );
+  const handleReset = React.useCallback(() => {
+    resetSingleClusterDialog.open({ cluster });
+  }, [resetSingleClusterDialog, cluster]);
 
   const alertsSection = alerts.length ? <Alerts /> : undefined;
 

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

@@ -4,10 +4,7 @@ import ClusterDetails from './ClusterDetails';
 import { useClusterWizardContext } from './ClusterWizardContext';
 import ReviewStep from './disconnected/ReviewStep';
 import BasicStep from './disconnected/BasicStep';
-import OptionalConfigurationsStep from './disconnected/OptionalConfigurationsStep';
-import DisconnectedStaticIp from './disconnected/DisconnectedStaticIp';
 import { ClusterWizardStepsType } from './wizardTransition';
-import { ModalDialogsContextProvider } from '../hosts/ModalDialogsContext';
 
 const getCurrentStep = (currentStepId: ClusterWizardStepsType) => {
   switch (currentStepId) {
@@ -15,12 +12,6 @@ const getCurrentStep = (currentStepId: ClusterWizardStepsType) => {
       return <ReviewStep />;
     case 'disconnected-basic':
       return <BasicStep />;
-    case 'disconnected-optional-configurations':
-      return <OptionalConfigurationsStep />;
-    case 'static-ip-yaml-view':
-    case 'static-ip-network-wide-configurations':
-    case 'static-ip-host-configurations':
-      return <DisconnectedStaticIp />;
     default:
       return <ClusterDetails />;
   }
@@ -29,11 +20,9 @@ const getCurrentStep = (currentStepId: ClusterWizardStepsType) => {
 const NewClusterWizard: React.FC = () => {
   const { currentStepId } = useClusterWizardContext();
   return (
-    <ModalDialogsContextProvider>
-      <div className={classNames('pf-v6-c-wizard', 'cluster-wizard')}>
-        {getCurrentStep(currentStepId)}
-      </div>
-    </ModalDialogsContextProvider>
+    <div className={classNames('pf-v6-c-wizard', 'cluster-wizard')}>
+      {getCurrentStep(currentStepId)}
+    </div>
   );
 };
 

package/lib/ocm/components/clusterWizard/constants.ts

@@ -14,7 +14,6 @@ export const wizardStepNames: { [key in ClusterWizardStepsType]: string } = {
   'credentials-download': 'Download credentials',
   'disconnected-review': 'Review and download ISO',
   'disconnected-basic': 'Basic information',
-  'disconnected-optional-configurations': 'Optional configurations',
 };
 
 export const defaultWizardSteps: ClusterWizardStepsType[] = [