@openshift-assisted/ui-lib 2.13.0-cim → 2.14.1-cim

package/lib/common/components/clusterConfiguration/CertificateFields.css

@@ -1,3 +1,3 @@
-.ai-certificate-fields .pf-c-check__body {
+.ai-certificate-fields .pf-v5-c-check__body {
   width: 100%;
 }

package/lib/common/components/clusterConfiguration/CertificateFields.tsx

@@ -1,7 +1,13 @@
 import React from 'react';
 import { useField, useFormikContext } from 'formik';
-import { Grid } from '@patternfly/react-core';
-import { CheckboxField, HelperText, PopoverIcon } from '../ui';
+import {
+  FormGroup,
+  FormHelperText,
+  Grid,
+  HelperText,
+  HelperTextItem,
+} from '@patternfly/react-core';
+import { CheckboxField, PopoverIcon } from '../ui';
 import { TrustedCertificateFieldsType } from '../../types';
 import { useTranslation } from '../../hooks/use-translation-wrapper';
 
@@ -13,9 +19,17 @@ const FIELD_NAME = 'trustBundle';
 export const CertificateFieldsHelperText = ({ fieldId = FIELD_NAME }) => {
   const { t } = useTranslation();
   return (
-    <HelperText fieldId={fieldId}>
-      {t('ai:Paste in 1 or more PEM formatted certificates that you want the cluster to trust.')}
-    </HelperText>
+    <FormGroup>
+      <FormHelperText>
+        <HelperText id={fieldId}>
+          <HelperTextItem>
+            {t(
+              'ai:Paste in 1 or more PEM formatted certificates that you want the cluster to trust.',
+            )}
+          </HelperTextItem>
+        </HelperText>
+      </FormHelperText>
+    </FormGroup>
   );
 };
 export const CertificateInputFields = () => {

package/lib/common/components/clusterConfiguration/ControlPlaneNodesDropdown.tsx

@@ -0,0 +1,93 @@
+import * as React from 'react';
+import { Dropdown, DropdownItem, DropdownToggle } from '@patternfly/react-core/deprecated';
+import { FormGroup, Tooltip } from '@patternfly/react-core';
+import { useTranslation } from '../../hooks/use-translation-wrapper';
+import { getFieldId, StaticField } from '../..';
+import { useField } from 'formik';
+import toNumber from 'lodash-es/toNumber';
+
+interface ControlPlaneNodesOption {
+  value: number;
+  label: string;
+}
+
+const isDropdownItemEnabled = (controlPlaneNodeCount: number, isNutanix?: boolean): boolean => {
+  return (controlPlaneNodeCount === 1 && !isNutanix) || controlPlaneNodeCount !== 1;
+};
+
+const ControlPlaneNodesDropdown = ({
+  isDisabled = false,
+  isNutanix,
+}: {
+  isDisabled?: boolean;
+  isNutanix?: boolean;
+}) => {
+  const { t } = useTranslation();
+  const [{ name, value: selectedValue }, , { setValue }] = useField<number | 3>(
+    'controlPlaneCount',
+  );
+
+  const options: ControlPlaneNodesOption[] = [
+    { value: 1, label: t('ai:1 (Single Node OpenShift - not highly available cluster)') },
+    { value: 3, label: t('ai:3 (highly available cluster)') },
+    { value: 4, label: t('ai:4 (highly available cluster+)') },
+    { value: 5, label: t('ai:5 (highly available cluster++)') },
+  ];
+
+  const dropdownItems = options.map(({ value, label }) => {
+    const isItemEnabled = isDropdownItemEnabled(value, isNutanix);
+    const disabledReason = t('ai:This option is not available for Nutanix platform');
+    return (
+      <DropdownItem
+        key={value}
+        id={value.toString()}
+        isAriaDisabled={!isItemEnabled}
+        selected={selectedValue === value}
+        value={value}
+      >
+        <Tooltip hidden={isItemEnabled} content={disabledReason} position="top">
+          <div>{label}</div>
+        </Tooltip>
+      </DropdownItem>
+    );
+  });
+
+  const [controlPlanelOpen, setControlPlanelOpen] = React.useState(false);
+  const fieldId = getFieldId(name, 'input');
+
+  const onControlPlaneSelect = (e?: React.SyntheticEvent<HTMLDivElement>) => {
+    const val = e?.currentTarget.id as string;
+    setValue(toNumber(val));
+    setControlPlanelOpen(false);
+  };
+
+  return !isDisabled ? (
+    <FormGroup isInline fieldId={fieldId} label={t('ai:Number of control plane nodes')} isRequired>
+      <Dropdown
+        toggle={
+          <DropdownToggle
+            onToggle={() => setControlPlanelOpen(!controlPlanelOpen)}
+            className="pf-u-w-100"
+          >
+            {selectedValue ? selectedValue : '3'}
+          </DropdownToggle>
+        }
+        name="controlPlaneCount"
+        isOpen={controlPlanelOpen}
+        onSelect={onControlPlaneSelect}
+        dropdownItems={dropdownItems}
+        className="pf-u-w-100"
+      />
+    </FormGroup>
+  ) : (
+    <StaticField
+      name={'controlPlaneCount'}
+      label={t('ai:Number of control plane nodes')}
+      isRequired
+    >
+      {selectedValue}
+    </StaticField>
+  );
+};
+
+export default ControlPlaneNodesDropdown;

package/lib/common/components/clusterConfiguration/DiscoveryImageConfigForm.tsx

@@ -27,7 +27,7 @@ import { ProxyFieldsType, StatusErrorType } from '../../types';
 import ProxyFields from './ProxyFields';
 import UploadSSH from './UploadSSH';
 import DiscoveryImageTypeControlGroup from './DiscoveryImageTypeControlGroup';
-import { getOCPStaticIPDocLink } from '../../config/constants';
+import { getOCPStaticIPDocLink } from '../../config/docs_links';
 import { useTranslation } from '../../hooks/use-translation-wrapper';
 
 export const StaticIPInfo = ({ docVersion }: { docVersion?: string }) => {
@@ -56,7 +56,7 @@ export const StaticIPInfo = ({ docVersion }: { docVersion?: string }) => {
 export type DiscoveryImageFormValues = ImageCreateParams & ProxyFieldsType;
 
 const getValidationSchema = (allowEmpty: boolean) =>
-  Yup.lazy<DiscoveryImageFormValues>((values) =>
+  Yup.lazy((values: DiscoveryImageFormValues) =>
     Yup.object<DiscoveryImageFormValues>().shape({
       sshPublicKey: sshPublicKeyValidationSchema,
       httpProxy: httpProxyValidationSchema({ values, pairValueName: 'httpsProxy', allowEmpty }),
@@ -116,17 +116,6 @@ export const DiscoveryImageConfigForm: React.FC<DiscoveryImageConfigFormProps> =
           <>
             <ModalBoxBody>
               <Stack hasGutter>
-                <StackItem>
-                  <Alert
-                    variant={AlertVariant.info}
-                    isInline
-                    title={
-                      isIPXE
-                        ? t('ai:To add hosts to the cluster, generate iPXE script.')
-                        : t('ai:To add hosts to the cluster, generate a Discovery ISO.')
-                    }
-                  />
-                </StackItem>
                 {hasDHCP === false && (
                   <StackItem>
                     <StaticIPInfo docVersion={docVersion} />
@@ -134,8 +123,17 @@ export const DiscoveryImageConfigForm: React.FC<DiscoveryImageConfigFormProps> =
                 )}
                 <StackItem>
                   <Form>
-                    <AlertFormikError status={status as StatusErrorType} />
                     {!hideDiscoveryImageType && <DiscoveryImageTypeControlGroup />}
+                    <AlertFormikError status={status as StatusErrorType} />
+                    <Alert
+                      variant={AlertVariant.info}
+                      isInline
+                      title={
+                        isIPXE
+                          ? t('ai:To add hosts to the cluster, generate iPXE script.')
+                          : t('ai:To add hosts to the cluster, generate a Discovery ISO.')
+                      }
+                    />
                     <UploadSSH />
                     <ProxyFields />
                   </Form>

package/lib/common/components/clusterConfiguration/DiscoveryImageTypeControlGroup.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Stack, StackItem } from '@patternfly/react-core';
+import { Flex, FlexItem } from '@patternfly/react-core';
 import { PopoverIcon, RadioField } from '../ui';
 import { useTranslation } from '../../hooks/use-translation-wrapper';
 
@@ -20,38 +20,38 @@ const DiscoveryImageTypeControlGroupLabel = ({
 const DiscoveryImageTypeControlGroup = () => {
   const { t } = useTranslation();
   return (
-    <Stack hasGutter>
-      <StackItem>
+    <Flex>
+      <FlexItem spacer={{ default: 'spacer3xl' }}>
         <RadioField
           name={GROUP_NAME}
           id={'minimal-iso'}
           value={'minimal-iso'}
           label={
             <DiscoveryImageTypeControlGroupLabel
-              text={t('ai:Minimal image file: Provision with virtual media')}
+              text={t('ai:Minimal image file')}
               popoverContent={t(
                 "ai:Recommended option. The generated discovery ISO will be smaller, but will need to download additional data during boot. This option is useful if ISO storage capacity is limited or if it's being served over a constrained network.",
               )}
             />
           }
         />
-      </StackItem>
-      <StackItem>
+      </FlexItem>
+      <FlexItem>
         <RadioField
           name={GROUP_NAME}
           id={'full-iso'}
           value={'full-iso'}
           label={
             <DiscoveryImageTypeControlGroupLabel
-              text={t('ai:Full image file: Provision with physical media')}
+              text={t('ai:Full image file')}
               popoverContent={t(
                 'ai:The generated discovery ISO will contain everything needed to boot.',
               )}
             />
           }
         />
-      </StackItem>
-    </Stack>
+      </FlexItem>
+    </Flex>
   );
 };
 

package/lib/common/components/clusterConfiguration/DiscoveryTroubleshootingModal.tsx

@@ -14,11 +14,11 @@ import {
   HelperTextItem,
 } from '@patternfly/react-core';
 import { InfoCircleIcon } from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
-import { PrismCode, SimpleAIPrismTheme } from '../ui';
+import { PrismCode, SimpleAIPrismTheme, UiIcon } from '../ui';
 import { useTranslation } from '../../hooks/use-translation-wrapper';
 import { Trans } from 'react-i18next';
 import { saveAs } from 'file-saver';
-import { CHANGE_ISO_PASSWORD_FILE_LINK } from '../../config/constants';
+import { CHANGE_ISO_PASSWORD_FILE_LINK } from '../../config/docs_links';
 import * as Sentry from '@sentry/browser';
 
 export const DiscoveryTroubleshootingModalContent = () => {
@@ -208,7 +208,7 @@ export const HostsNotShowingLink = ({
     <Button variant={ButtonVariant.link} onClick={() => setDiscoveryHintModalOpen(true)} isInline>
       {!isInline && (
         <>
-          <InfoCircleIcon size="sm" />
+          <UiIcon size="sm" icon={<InfoCircleIcon />} />
           &nbsp;
         </>
       )}

package/lib/common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionControlGroup.tsx

@@ -30,12 +30,14 @@ export interface DiskEncryptionControlGroupProps {
   values: DiskEncryptionValues;
   isSNO: boolean;
   isDisabled?: boolean;
+  docVersion?: string;
 }
 
 const DiskEncryptionControlGroup = ({
   values,
   isSNO = false,
   isDisabled = false,
+  docVersion,
 }: DiskEncryptionControlGroupProps) => {
   const {
     enableDiskEncryptionOnMasters,
@@ -108,6 +110,7 @@ const DiskEncryptionControlGroup = ({
               diskEncryptionMode={diskEncryptionMode}
               isDisabled={isDisabled}
               tooltipProps={tooltipProps}
+              docVersion={docVersion || ''}
             />
           </StackItem>
         </RenderIf>

package/lib/common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionMode.tsx

@@ -11,14 +11,14 @@ import {
   TooltipProps,
   Tooltip,
 } from '@patternfly/react-core';
-import { ENCRYPTING_DISK_DURING_INSTALLATION } from '../../../config';
+import { getEncryptingDiskDuringInstallationDocsLink } from '../../../config';
 import PopoverIcon from '../../ui/PopoverIcon';
 import { RadioField } from '../../ui/formik';
 import { TangServers } from './TangServers';
 import { DiskEncryption } from '@openshift-assisted/types/assisted-installer-service';
 import { useTranslation } from '../../../hooks/use-translation-wrapper';
 
-const DiskEncryptionModeTPMv2 = () => {
+const DiskEncryptionModeTPMv2 = ({ docVersion }: { docVersion: string }) => {
   const { t } = useTranslation();
   return (
     <>
@@ -32,7 +32,11 @@ const DiskEncryptionModeTPMv2 = () => {
               'ai:TPM v2 stores passphrases in a secure cryptoprocessor contained within as server.',
             )}
             &nbsp;
-            <a href={ENCRYPTING_DISK_DURING_INSTALLATION} target="_blank" rel="noopener noreferrer">
+            <a
+              href={getEncryptingDiskDuringInstallationDocsLink(docVersion)}
+              target="_blank"
+              rel="noopener noreferrer"
+            >
               {t('ai:Learn more')} <ExternalLinkAltIcon />
             </a>
           </p>
@@ -42,7 +46,7 @@ const DiskEncryptionModeTPMv2 = () => {
   );
 };
 
-const DiskEncryptionModeTang = () => {
+const DiskEncryptionModeTang = ({ docVersion }: { docVersion: string }) => {
   const { t } = useTranslation();
   return (
     <>
@@ -53,7 +57,11 @@ const DiskEncryptionModeTang = () => {
         bodyContent={
           <p>
             {t('ai:Tang server component that enable network-bound disk encryption (NBDE).')} &nbsp;
-            <a href={ENCRYPTING_DISK_DURING_INSTALLATION} target="_blank" rel="noopener noreferrer">
+            <a
+              href={getEncryptingDiskDuringInstallationDocsLink(docVersion)}
+              target="_blank"
+              rel="noopener noreferrer"
+            >
               {t('ai:Learn more')} <ExternalLinkAltIcon />
             </a>
           </p>
@@ -67,12 +75,14 @@ export interface DiskEncryptionModeProps {
   isDisabled: boolean;
   diskEncryptionMode: DiskEncryption['mode'];
   tooltipProps: TooltipProps;
+  docVersion: string;
 }
 
 export const DiskEncryptionMode = ({
   diskEncryptionMode,
   isDisabled,
   tooltipProps,
+  docVersion,
 }: DiskEncryptionModeProps) => {
   const { t } = useTranslation();
   return (
@@ -84,7 +94,7 @@ export const DiskEncryptionMode = ({
               <RadioField
                 isDisabled={isDisabled}
                 name="diskEncryptionMode"
-                label={<DiskEncryptionModeTPMv2 />}
+                label={<DiskEncryptionModeTPMv2 docVersion={docVersion} />}
                 id="TPMV2-button"
                 value="tpmv2"
               />
@@ -95,7 +105,7 @@ export const DiskEncryptionMode = ({
               <RadioField
                 isDisabled={isDisabled}
                 name="diskEncryptionMode"
-                label={<DiskEncryptionModeTang />}
+                label={<DiskEncryptionModeTang docVersion={docVersion} />}
                 id="tang-button"
                 value="tang"
               />

package/lib/common/components/clusterConfiguration/DownloadIpxeScript.tsx

@@ -18,7 +18,7 @@ import { useTranslation } from '../../hooks/use-translation-wrapper';
 export type DownloadISOProps = {
   isSNO?: boolean;
   fileName?: string;
-  downloadUrl?: string;
+  downloadUrl: string;
   onClose: () => void;
   onReset?: () => void;
 };

package/lib/common/components/clusterConfiguration/DownloadIso.tsx

@@ -15,12 +15,14 @@ import { DetailItem, DetailList } from '../ui';
 import DiscoveryInstructions from './DiscoveryInstructions';
 import { StaticIPInfo } from './DiscoveryImageConfigForm';
 import { useTranslation } from '../../hooks/use-translation-wrapper';
+import { ExternalLinkAltIcon } from '@patternfly/react-icons/dist/js/icons/external-link-alt-icon';
+import { getCiscoIntersightLink } from '../../config';
 
 export type DownloadISOProps = {
   hasDHCP?: boolean;
   isSNO?: boolean;
   fileName?: string;
-  downloadUrl?: string;
+  downloadUrl: string;
   onClose: () => void;
   onReset?: () => void;
   docVersion?: string;
@@ -58,6 +60,17 @@ const DownloadIso = ({
               <StaticIPInfo docVersion={docVersion} />
             </StackItem>
           )}
+          <StackItem>
+            <Button
+              variant="link"
+              icon={<ExternalLinkAltIcon />}
+              iconPosition="right"
+              isInline
+              onClick={() => window.open(getCiscoIntersightLink(downloadUrl), '_blank', 'noopener')}
+            >
+              {t('ai:Add hosts from Cisco Intersight')}
+            </Button>
+          </StackItem>
           <StackItem>
             <DetailList>
               <DetailItem

package/lib/common/components/clusterConfiguration/OpenShiftVersionSelect.tsx

@@ -2,11 +2,10 @@ import React from 'react';
 import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-circle-icon';
 import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons/dist/js/icons/external-link-alt-icon';
-import { global_warning_color_100 as warningColor } from '@patternfly/react-tokens/dist/js/global_warning_color_100';
-import { global_danger_color_100 as dangerColor } from '@patternfly/react-tokens/dist/js/global_danger_color_100';
+
 import { OPENSHIFT_LIFE_CYCLE_DATES_LINK } from '../../config';
 import { OpenshiftVersionOptionType } from '../../types';
-import { SelectField } from '../ui';
+import { SelectField, UiIcon } from '../ui';
 import { useTranslation } from '../../hooks/use-translation-wrapper';
 import { SelectFieldProps } from '../ui/formik/types';
 
@@ -26,7 +25,7 @@ const getOpenshiftVersionHelperText =
     if (!versions.length) {
       return (
         <>
-          <ExclamationCircleIcon color={dangerColor.value} size="sm" />
+          <UiIcon size="sm" status="danger" icon={<ExclamationCircleIcon />} />
           &nbsp; {t('ai:No release image is available.')}
         </>
       );
@@ -36,10 +35,13 @@ const getOpenshiftVersionHelperText =
       return null;
     }
 
-    if (selectedVersion.supportLevel !== 'production') {
+    if (
+      selectedVersion.supportLevel !== 'production' &&
+      selectedVersion.supportLevel !== 'maintenance'
+    ) {
       return (
         <>
-          <ExclamationTriangleIcon color={warningColor.value} size="sm" />
+          <UiIcon size="sm" status="warning" icon={<ExclamationTriangleIcon />} />
           &nbsp;{t('ai:Please note that this version is not production-ready.')}&nbsp;
           <OpenShiftLifeCycleDatesLink />
         </>
@@ -56,12 +58,10 @@ type OpenShiftVersionSelectProps = {
 const OpenShiftVersionSelect: React.FC<OpenShiftVersionSelectProps> = ({ versions, onChange }) => {
   const selectOptions = React.useMemo(
     () =>
-      versions
-        .filter((version) => version.supportLevel !== 'maintenance')
-        .map((version) => ({
-          label: version.label,
-          value: version.value,
-        })),
+      versions.map((version) => ({
+        label: version.label,
+        value: version.value,
+      })),
     [versions],
   );
   const { t } = useTranslation();

package/lib/common/components/clusterConfiguration/ProxyFields.css

@@ -1,3 +1,3 @@
-.ai-proxy-fields .pf-c-check__body {
+.ai-proxy-fields .pf-v5-c-check__body {
   width: 100%;
 }

package/lib/common/components/clusterConfiguration/SecurityFields.tsx

@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { useFormikContext } from 'formik';
-import { Checkbox, FormGroup } from '@patternfly/react-core';
+import { Checkbox, FormGroup, HelperText, HelperTextItem } from '@patternfly/react-core';
 
 import { RenderIf } from '../ui/RenderIf';
-import { getFieldId, HelperText, TextAreaField, trimSshPublicKey, ExternalLink } from '../ui';
+import { getFieldId, TextAreaField, trimSshPublicKey, ExternalLink } from '../ui';
 import { Cluster } from '@openshift-assisted/types/assisted-installer-service';
 import { NetworkConfigurationValues } from '../../types/clusters';
 import { SSH_GENERATION_DOC_LINK } from '../../config';
@@ -14,11 +14,13 @@ export const SshPublicKeyHelperText: React.FC<{
 }> = ({ fieldId = 'sshPublicKey' }) => {
   const { t } = useTranslation();
   return (
-    <HelperText fieldId={fieldId}>
-      {t(
-        'ai:Paste the content of a public ssh key you want to use to connect to the hosts into this field.',
-      )}{' '}
-      <ExternalLink href={SSH_GENERATION_DOC_LINK}>{t('ai:Learn more')}</ExternalLink>
+    <HelperText id={fieldId}>
+      <HelperTextItem>
+        {t(
+          'ai:Paste the content of a public ssh key you want to use to connect to the hosts into this field.',
+        )}{' '}
+        <ExternalLink href={SSH_GENERATION_DOC_LINK}>{t('ai:Learn more')}</ExternalLink>
+      </HelperTextItem>
     </HelperText>
   );
 };
@@ -38,11 +40,9 @@ const SecurityFields = ({
   //clusterSshKey updating causes the textarea to disappear when the user clears it to edit it
   const defaultShareSshKey = !!imageSshKey && (clusterSshKey === imageSshKey || !clusterSshKey);
   const [shareSshKey, setShareSshKey] = React.useState(defaultShareSshKey);
-  const { values, setFieldValue, errors, touched } =
+  const { values, setFieldValue } =
     useFormikContext<Pick<NetworkConfigurationValues, 'sshPublicKey'>>();
 
-  const errorMsg = errors.sshPublicKey;
-
   const handleSshKeyBlur = () => {
     if (values.sshPublicKey) {
       setFieldValue('sshPublicKey', trimSshPublicKey(values.sshPublicKey));
@@ -62,7 +62,6 @@ const SecurityFields = ({
       <FormGroup
         fieldId={fieldId}
         label={t('ai:Host SSH Public Key for troubleshooting after installation')}
-        validated={touched && errorMsg ? 'error' : 'default'}
       >
         <RenderIf condition={Boolean(imageSshKey)}>
           <Checkbox
@@ -72,7 +71,7 @@ const SecurityFields = ({
             aria-describedby={`${fieldId}-helper`}
             isChecked={shareSshKey}
             isDisabled={isDisabled}
-            onChange={setShareSshKey}
+            onChange={(_event, value) => setShareSshKey(value)}
           />
         </RenderIf>
         <RenderIf condition={!shareSshKey}>

package/lib/common/components/clusterConfiguration/UploadSSH.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { useField } from 'formik';
 
-import { PopoverIcon, trimSshPublicKey, UploadField } from '../ui';
+import { PopoverIcon, UploadField, trimSshPublicKey } from '../ui';
 import { SshPublicKeyHelperText } from './SecurityFields';
 import { useTranslation } from '../../hooks/use-translation-wrapper';
 
@@ -11,7 +11,7 @@ type UploadSSHProps = {
 };
 
 const UploadSSH: React.FC<UploadSSHProps> = ({ isRequired, labelText }) => {
-  const [{ name, value }, , { setValue }] = useField<string>('sshPublicKey');
+  const [{ name }, , { setValue }] = useField<string>('sshPublicKey');
   const { t } = useTranslation();
   const defaultLabelText = t(
     'ai:Provide an SSH key to be able to connect to the hosts for debugging purposes during the discovery process',
@@ -27,16 +27,8 @@ const UploadSSH: React.FC<UploadSSHProps> = ({ isRequired, labelText }) => {
       name={name}
       helperText={<SshPublicKeyHelperText />}
       idPostfix="discovery"
-      onBlur={() => value && setValue(trimSshPublicKey(value))}
-      dropzoneProps={{
-        accept: '.pub',
-        maxSize: 2048,
-        onDropRejected:
-          ({ setError }) =>
-          () =>
-            setError(t('ai:File not supported.')),
-      }}
       isRequired={isRequired}
+      onBlur={(_event, value) => value && setValue(trimSshPublicKey(value))}
     />
   );
 };

package/lib/common/components/clusterConfiguration/utils.ts

@@ -9,7 +9,7 @@ import {
   MachineNetwork,
   ServiceNetwork,
 } from '@openshift-assisted/types/assisted-installer-service';
-import { NETWORK_TYPE_OVN, NETWORK_TYPE_SDN, NO_SUBNET_SET } from '../../config';
+import { NO_SUBNET_SET } from '../../config';
 import {
   selectClusterNetworkCIDR,
   selectClusterNetworkHostPrefix,
@@ -173,10 +173,6 @@ export const canSelectNetworkTypeSDN = (isSNO: boolean, isIPv6 = false) => {
   return !(isSNO || isIPv6);
 };
 
-export const getDefaultNetworkType = (isSNO: boolean, isIPv6 = false) => {
-  return isSNO || isIPv6 ? NETWORK_TYPE_OVN : NETWORK_TYPE_SDN;
-};
-
 export const canBeDualStack = (subnets: HostSubnets) =>
   subnets.some((subnet) => Address4.isValid(subnet.subnet)) &&
   subnets.some((subnet) => Address6.isValid(subnet.subnet));

package/lib/common/components/clusterDetail/ConsoleModal.tsx

@@ -84,14 +84,14 @@ export const WebConsoleHint: React.FC<WebConsoleHintProps> = ({ cluster, console
       </Text>
       <ModalExpandableSection
         toggleText={t('ai:Option 1: Add the following records to your DNS server (recommended)')}
-        className="pf-u-pb-md"
+        className="pf-v5-u-pb-md"
         isExpanded={isDNSExpanded}
         onToggle={handleToggle}
         requiredList={aRecords}
       />
       <ModalExpandableSection
         toggleText={t('ai:Option 2: Update your local /etc/hosts or /etc/resolv.conf files')}
-        className="pf-u-pb-md"
+        className="pf-v5-u-pb-md"
         isExpanded={!isDNSExpanded}
         onToggle={handleToggle}
         requiredList={etcHosts}

package/lib/common/components/clusterDetail/FinalizingProgress.tsx

@@ -7,8 +7,8 @@ import { CheckCircleIcon } from '@patternfly/react-icons/dist/js/icons/check-cir
 import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-circle-icon';
 import { InProgressIcon } from '@patternfly/react-icons/dist/js/icons/in-progress-icon';
 import { PendingIcon } from '@patternfly/react-icons/dist/js/icons/pending-icon';
-import { global_success_color_100 as okColor } from '@patternfly/react-tokens/dist/esm/global_success_color_100';
-import { global_danger_color_100 as dangerColor } from '@patternfly/react-tokens/dist/esm/global_danger_color_100';
+import { global_success_color_100 as okColor } from '@patternfly/react-tokens/dist/js/global_success_color_100';
+import { global_danger_color_100 as dangerColor } from '@patternfly/react-tokens/dist/js/global_danger_color_100';
 import ClusterProgressItem from './ClusterProgressItem';
 import capitalize from 'lodash-es/capitalize.js';
 import { useTranslation } from '../../hooks/use-translation-wrapper';

package/lib/common/components/clusterDetail/ProgressBarTexts.tsx

@@ -3,8 +3,8 @@ import { Host, HostRole } from '@openshift-assisted/types/assisted-installer-ser
 import { CheckCircleIcon } from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
 import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-circle-icon';
 import { InProgressIcon } from '@patternfly/react-icons/dist/js/icons/in-progress-icon';
-import { global_danger_color_100 as dangerColor } from '@patternfly/react-tokens/dist/esm/global_danger_color_100';
-import { global_success_color_100 as okColor } from '@patternfly/react-tokens/dist/esm/global_success_color_100';
+import { global_danger_color_100 as dangerColor } from '@patternfly/react-tokens/dist/js/global_danger_color_100';
+import { global_success_color_100 as okColor } from '@patternfly/react-tokens/dist/js/global_success_color_100';
 import ClusterProgressItem from './ClusterProgressItem';
 import { useTranslation } from '../../hooks/use-translation-wrapper';