@openshift-assisted/ui-lib 2.8.3-cim → 2.8.5-cim

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

@@ -80,3 +80,8 @@ export const getMajorMinorVersion = (version = '') => {
   const match = /[0-9].[0-9][0-9]?/g.exec(version);
   return match?.[0] || '';
 };
+
+export const getNetworkType = (
+  ocpVersion: OpenshiftVersionOptionType | undefined,
+): 'OVNKubernetes' | 'OpenShiftSDN' =>
+  parseFloat(getMajorMinorVersion(ocpVersion?.version)) >= 4.12 ? 'OVNKubernetes' : 'OpenShiftSDN';

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

@@ -74,6 +74,7 @@ const AddHostModal: React.FC<AddHostModalProps> = ({
             hasDHCP={hasDHCP}
             isIPXE={isIPXE}
             allowEmpty
+            docVersion={docVersion}
           />
         )}
         {dialogType === 'download' && (
@@ -90,6 +91,7 @@ const AddHostModal: React.FC<AddHostModalProps> = ({
                 infraEnv={infraEnv}
                 onReset={agentClusterInstall ? () => setDialogType('config') : undefined}
                 hasDHCP={hasDHCP}
+                docVersion={docVersion}
               />
             )}
           </>
@@ -104,11 +106,13 @@ const GeneratingIsoDownload = ({
   onClose,
   onReset,
   hasDHCP,
+  docVersion,
 }: {
   infraEnv: InfraEnvK8sResource;
   onClose: VoidFunction;
   onReset?: VoidFunction;
   hasDHCP: boolean;
+  docVersion: string;
 }) => {
   const { t } = useTranslation();
   return infraEnv.status?.isoDownloadURL ? (
@@ -117,6 +121,7 @@ const GeneratingIsoDownload = ({
       downloadUrl={infraEnv.status.isoDownloadURL}
       onReset={onReset}
       hasDHCP={hasDHCP}
+      docVersion={docVersion}
     />
   ) : (
     <EmptyState>

package/lib/cim/components/modals/CimConfiguration/CimConfigProgressAlert.tsx

@@ -84,7 +84,9 @@ export const CimConfigProgressAlert: React.FC<CimConfigProgressAlertProps> = ({
         title={t('ai:Configuration may take a few minutes.')}
         actionLinks={actionLinks}
       >
-        {t("ai:If the configuration is taking longer than 3 minutes, you'll need to troubleshoot.")}
+        {t(
+          'ai:If the configuration is taking longer than 5 minutes, you might need to troubleshoot.',
+        )}
       </Alert>
     );
   }
@@ -103,7 +105,7 @@ export const CimConfigProgressAlert: React.FC<CimConfigProgressAlertProps> = ({
   return (
     <Alert
       title={t('ai:Configuration is hanging for a long time.')}
-      variant={AlertVariant.danger}
+      variant={AlertVariant.info}
       isInline
       actionLinks={actionLinks}
     >

package/lib/cim/components/modals/CimConfiguration/constants.ts

@@ -2,4 +2,4 @@ export const MIN_DB_VOL_SIZE = 1; // In Gi
 export const MIN_FS_VOL_SIZE = 1;
 export const MIN_IMG_VOL_SIZE = 10;
 
-export const CIM_CONFIG_TIMEOUT = 3 * 60 * 1000; // in ms
+export const CIM_CONFIG_TIMEOUT = 5 * 60 * 1000; // in ms

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

@@ -23,10 +23,10 @@ import { ProxyFieldsType, StatusErrorType } from '../../types';
 import ProxyFields from './ProxyFields';
 import UploadSSH from './UploadSSH';
 import DiscoveryImageTypeControlGroup from './DiscoveryImageTypeControlGroup';
-import { OCP_STATIC_IP_DOC } from '../../config/constants';
+import { getOCPStaticIPDocLink } from '../../config/constants';
 import { useTranslation } from '../../hooks/use-translation-wrapper';
 
-export const StaticIPInfo: React.FC = () => {
+export const StaticIPInfo = ({ docVersion }: { docVersion?: string }) => {
   const { t } = useTranslation();
   return (
     <Alert
@@ -41,7 +41,7 @@ export const StaticIPInfo: React.FC = () => {
         icon={<ExternalLinkAltIcon />}
         iconPosition="right"
         isInline
-        onClick={() => window.open(OCP_STATIC_IP_DOC, '_blank', 'noopener')}
+        onClick={() => window.open(getOCPStaticIPDocLink(docVersion), '_blank', 'noopener')}
       >
         {t('ai:View documentation')}
       </Button>
@@ -73,6 +73,7 @@ type DiscoveryImageConfigFormProps = Proxy & {
   imageType?: ImageType;
   isIPXE?: boolean;
   allowEmpty?: boolean;
+  docVersion: string;
 };
 
 export const DiscoveryImageConfigForm: React.FC<DiscoveryImageConfigFormProps> = ({
@@ -87,6 +88,7 @@ export const DiscoveryImageConfigForm: React.FC<DiscoveryImageConfigFormProps> =
   hasDHCP,
   isIPXE,
   allowEmpty,
+  docVersion,
 }) => {
   const initialValues: DiscoveryImageFormValues = {
     sshPublicKey: sshPublicKey || '',
@@ -123,7 +125,7 @@ export const DiscoveryImageConfigForm: React.FC<DiscoveryImageConfigFormProps> =
                 </StackItem>
                 {hasDHCP === false && (
                   <StackItem>
-                    <StaticIPInfo />
+                    <StaticIPInfo docVersion={docVersion} />
                   </StackItem>
                 )}
                 <StackItem>

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

@@ -23,6 +23,7 @@ export type DownloadISOProps = {
   downloadUrl?: string;
   onClose: () => void;
   onReset?: () => void;
+  docVersion?: string;
 };
 
 const DownloadIso = ({
@@ -32,6 +33,7 @@ const DownloadIso = ({
   onReset,
   hasDHCP,
   isSNO = false,
+  docVersion,
 }: DownloadISOProps) => {
   const wgetCommand = `wget -O ${fileName} '${downloadUrl || ''}'`;
   const { t } = useTranslation();
@@ -53,7 +55,7 @@ const DownloadIso = ({
           </StackItem>
           {hasDHCP === false && (
             <StackItem>
-              <StaticIPInfo />
+              <StaticIPInfo docVersion={docVersion} />
             </StackItem>
           )}
           <StackItem>

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

@@ -12,6 +12,7 @@ import { OPENSHIFT_LIFE_CYCLE_DATES_LINK } from '../../config';
 import { OpenshiftVersionOptionType } from '../../types';
 import { SelectField } from '../ui';
 import { useTranslation } from '../../hooks/use-translation-wrapper';
+import { SelectFieldProps } from '../ui/formik/types';
 
 const OpenShiftLifeCycleDatesLink = () => {
   const { t } = useTranslation();
@@ -54,8 +55,9 @@ const getOpenshiftVersionHelperText =
 
 type OpenShiftVersionSelectProps = {
   versions: OpenshiftVersionOptionType[];
+  onChange?: SelectFieldProps['onChange'];
 };
-const OpenShiftVersionSelect: React.FC<OpenShiftVersionSelectProps> = ({ versions }) => {
+const OpenShiftVersionSelect: React.FC<OpenShiftVersionSelectProps> = ({ versions, onChange }) => {
   const selectOptions = React.useMemo(
     () =>
       versions
@@ -75,6 +77,7 @@ const OpenShiftVersionSelect: React.FC<OpenShiftVersionSelectProps> = ({ version
       getHelperText={getOpenshiftVersionHelperText(versions)}
       isDisabled={versions.length === 0}
       isRequired
+      onChange={onChange}
     />
   );
 };

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

@@ -65,6 +65,7 @@ const FailingValidation = <S extends string>({
   setCurrentStepId,
   wizardStepNames,
   wizardStepsValidationsMap,
+  host,
 }: FailingValidationsProps<S>) => {
   const { t } = useTranslation();
 
@@ -85,7 +86,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{' '}
@@ -193,6 +203,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/types.ts

@@ -50,6 +50,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

@@ -28,6 +28,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/SelectField.tsx

@@ -49,7 +49,7 @@ const SelectField: React.FC<SelectFieldProps> = ({
             onChange={(value, event) => {
               //customHandleChange enables calling formik change handler explicitly, useful for example to have the previous value
               callFormikOnChange && field.onChange(event);
-              onChange && onChange(event);
+              onChange && onChange(value, event);
             }}
           >
             {options.map((option, index) => (

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

@@ -5,6 +5,7 @@ import {
   SelectOptionProps,
   TooltipProps,
   RadioProps,
+  FormSelectProps,
 } from '@patternfly/react-core';
 import { FieldValidator, FieldHelperProps } from 'formik';
 import { DropzoneProps, DropFileEventHandler } from 'react-dropzone';
@@ -37,7 +38,7 @@ export interface FieldProps {
 
 export interface SelectFieldProps extends FieldProps {
   options: FormSelectOptionProps[];
-  onChange?: (event: React.FormEvent<HTMLSelectElement>) => void;
+  onChange?: FormSelectProps['onChange'];
   getHelperText?: (value: string) => React.ReactNode | undefined;
   // onBlur?: (event: React.FormEvent<HTMLSelectElement>) => void;
 }

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

@@ -0,0 +1,6 @@
+import { test } from 'vitest';
+import { noProxyValidationSchema } from './validationSchemas';
+
+test('noProxyValidationSchema runs', async () => {
+  await noProxyValidationSchema.validate('.y.com');
+});

package/lib/common/config/constants.ts

@@ -352,8 +352,8 @@ export const operatorLabels = (
   };
 };
 
-export const OCP_STATIC_IP_DOC =
-  'https://docs.openshift.com/container-platform/latest/scalability_and_performance/ztp-deploying-disconnected.html#ztp-configuring-a-static-ip_ztp-deploying-disconnected';
+export const getOCPStaticIPDocLink = (docVersion = '2.8') =>
+  `https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/${docVersion}/html-single/clusters/index#on-prem-creating-your-cluster-with-the-cli-nmstateconfig`;
 
 export const AI_UI_TAG = 'ui_ocm';
 

package/package.json

@@ -130,5 +130,5 @@
       ]
     }
   },
-  "version": "2.8.3-cim"
+  "version": "2.8.5-cim"
 }