@openshift-assisted/ui-lib 2.17.1-cim → 2.17.3-cim

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

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import * as Yup from 'yup';
+import { TFunction } from 'i18next';
 import {
   Alert,
   Button,
@@ -20,11 +21,12 @@ import { EditSSHKeyFormikValues } from './types';
 import { getWarningMessage } from './utils';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 
-const validationSchema = Yup.object({
-  sshPublicKey: sshPublicKeyValidationSchema.required(
-    'An SSH key is required to debug hosts as they register.',
-  ),
-});
+const validationSchema = (t: TFunction) =>
+  Yup.object({
+    sshPublicKey: sshPublicKeyValidationSchema(t).required(
+      t('ai:An SSH key is required to debug hosts as they register.'),
+    ),
+  });
 
 export type EditSSHKeyModalProps = {
   isOpen: boolean;
@@ -61,7 +63,7 @@ const EditSSHKeyModal: React.FC<EditSSHKeyModalProps> = ({
         initialValues={{
           sshPublicKey: infraEnv.spec?.sshAuthorizedKey || '',
         }}
-        validationSchema={validationSchema}
+        validationSchema={validationSchema(t)}
         onSubmit={async (values) => {
           try {
             await onSubmit(values, infraEnv);

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

@@ -1,5 +1,6 @@
 import React from 'react';
 import * as Yup from 'yup';
+import { TFunction } from 'i18next';
 import {
   Button,
   Form,
@@ -17,12 +18,12 @@ import {
   ImageType,
   Proxy,
 } from '@openshift-assisted/types/assisted-installer-service';
+import { AlertFormikError } from '../../../common/components/ui';
 import {
-  AlertFormikError,
   httpProxyValidationSchema,
   noProxyValidationSchema,
   sshPublicKeyValidationSchema,
-} from '../../../common/components/ui';
+} from '../../validationSchemas';
 import { ProxyFieldsType, StatusErrorType } from '../../types';
 import ProxyFields from './ProxyFields';
 import UploadSSH from './UploadSSH';
@@ -55,13 +56,13 @@ export const StaticIPInfo = ({ docVersion }: { docVersion?: string }) => {
 
 export type DiscoveryImageFormValues = ImageCreateParams & ProxyFieldsType;
 
-const getValidationSchema = (allowEmpty: boolean) =>
+const getValidationSchema = (allowEmpty: boolean, t: TFunction) =>
   Yup.lazy((values: DiscoveryImageFormValues) =>
     Yup.object<DiscoveryImageFormValues>().shape({
-      sshPublicKey: sshPublicKeyValidationSchema,
-      httpProxy: httpProxyValidationSchema({ values, pairValueName: 'httpsProxy', allowEmpty }),
-      httpsProxy: httpProxyValidationSchema({ values, pairValueName: 'httpProxy', allowEmpty }), // share the schema, httpS is currently not supported
-      noProxy: noProxyValidationSchema,
+      sshPublicKey: sshPublicKeyValidationSchema(t),
+      httpProxy: httpProxyValidationSchema({ values, pairValueName: 'httpsProxy', allowEmpty, t }),
+      httpsProxy: httpProxyValidationSchema({ values, pairValueName: 'httpProxy', allowEmpty, t }), // share the schema, httpS is currently not supported
+      noProxy: noProxyValidationSchema(t),
     }),
   );
 
@@ -108,7 +109,7 @@ export const DiscoveryImageConfigForm: React.FC<DiscoveryImageConfigFormProps> =
     <Formik
       initialValues={initialValues}
       initialStatus={{ error: null }}
-      validationSchema={getValidationSchema(!!allowEmpty)}
+      validationSchema={getValidationSchema(!!allowEmpty, t)}
       onSubmit={handleSubmit}
     >
       {({ submitForm, isSubmitting, status }) => {

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

@@ -7,13 +7,13 @@ import {
 } from '@openshift-assisted/types/assisted-installer-service';
 import { getDefaultCpuArchitecture, OpenshiftVersionOptionType } from '../../types';
 import { TangServer } from '../clusterConfiguration/DiskEncryptionFields/DiskEncryptionValues';
+import { getDefaultOpenShiftVersion } from '../ui';
 import {
   baseDomainValidationSchema,
   dnsNameValidationSchema,
-  getDefaultOpenShiftVersion,
   nameValidationSchema,
   pullSecretValidationSchema,
-} from '../ui';
+} from '../../validationSchemas';
 import { ClusterDetailsValues } from './types';
 
 const emptyTangServers = (): TangServer[] => {
@@ -98,22 +98,32 @@ export const getClusterDetailsValidationSchema = ({
   t: TFunction;
 }) =>
   Yup.lazy((values: { baseDnsDomain: string; isSNODevPreview: boolean }) => {
-    const validateName = () =>
-      nameValidationSchema(t, usedClusterNames, values.baseDnsDomain, validateUniqueName, isOcm);
     if (pullSecretSet) {
       return Yup.object({
-        name: validateName(),
+        name: nameValidationSchema(
+          t,
+          usedClusterNames,
+          values.baseDnsDomain,
+          validateUniqueName,
+          isOcm,
+        ),
         baseDnsDomain: isOcm
-          ? baseDomainValidationSchema.required(t('ai:Required field'))
-          : dnsNameValidationSchema.required(t('ai:Required field')),
+          ? baseDomainValidationSchema(t).required(t('ai:Required field'))
+          : dnsNameValidationSchema(t).required(t('ai:Required field')),
       });
     }
     return Yup.object({
-      name: validateName(),
+      name: nameValidationSchema(
+        t,
+        usedClusterNames,
+        values.baseDnsDomain,
+        validateUniqueName,
+        isOcm,
+      ),
       baseDnsDomain: isOcm
-        ? baseDomainValidationSchema.required(t('ai:Required field'))
-        : dnsNameValidationSchema.required(t('ai:Required field')),
-      pullSecret: pullSecretValidationSchema.required(t('ai:Required field')),
+        ? baseDomainValidationSchema(t).required(t('ai:Required field'))
+        : dnsNameValidationSchema(t).required(t('ai:Required field')),
+      pullSecret: pullSecretValidationSchema(t).required(t('ai:Required field')),
       diskEncryptionTangServers: Yup.array().when('diskEncryptionMode', {
         is: (diskEncryptionMode: DiskEncryption['mode']) => {
           return diskEncryptionMode === 'tang';

package/lib/common/components/hosts/AdditionalNTPSourcesDialog.tsx

@@ -11,11 +11,8 @@ import {
   ModalVariant,
   ModalHeader,
 } from '@patternfly/react-core';
-import {
-  ntpSourceValidationSchema,
-  AdditionalNTPSourcesField,
-  StatusErrorType,
-} from '../../../common';
+import { AdditionalNTPSourcesField, StatusErrorType } from '../../../common';
+import { ntpSourceValidationSchema } from '../../validationSchemas/ntpValidation';
 import { AlertFormikError } from '../../../common/components/ui';
 import { useTranslation } from '../../hooks/use-translation-wrapper';
 import {
@@ -43,7 +40,7 @@ const AdditionalNTPSourcesForm = ({
 
   const getValidationSchema = (t: TFunction) =>
     Yup.object().shape({
-      additionalNtpSource: ntpSourceValidationSchema.required(t('ai:Required field')),
+      additionalNtpSource: ntpSourceValidationSchema(t).required(t('ai:Required field')),
     });
 
   const { t } = useTranslation();

package/lib/common/components/hosts/EditHostForm.tsx

@@ -14,14 +14,8 @@ import {
 import { Formik } from 'formik';
 import { TFunction } from 'i18next';
 import { Host, Inventory } from '@openshift-assisted/types/assisted-installer-service';
-import {
-  richHostnameValidationSchema,
-  RichInputField,
-  StaticTextField,
-  hostnameValidationMessages,
-  getRichTextValidation,
-  AlertFormikError,
-} from '../ui';
+import { RichInputField, StaticTextField, getRichTextValidation, AlertFormikError } from '../ui';
+import { richHostnameValidationSchema, hostnameValidationMessages } from '../../validationSchemas';
 import { canHostnameBeChanged } from './utils';
 import GridGap from '../ui/GridGap';
 import { EditHostFormValues } from './types';

package/lib/common/components/hosts/MassChangeHostnameModal.tsx

@@ -23,14 +23,12 @@ import { t_global_icon_color_status_info_default as blueInfoColor } from '@patte
 import { InfoCircleIcon } from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
 import { TFunction } from 'i18next';
 
+import { RichInputField, getRichTextValidation, ModalProgress } from '../ui';
 import {
-  RichInputField,
-  getRichTextValidation,
-  richHostnameValidationSchema,
-  hostnameValidationMessages,
-  ModalProgress,
   FORBIDDEN_HOSTNAMES,
-} from '../ui';
+  hostnameValidationMessages,
+  richHostnameValidationSchema,
+} from '../../validationSchemas';
 import { Host } from '@openshift-assisted/types/assisted-installer-service';
 import { getHostname as getHostnameUtils, getInventory } from './utils';
 import { ActionCheck } from './types';

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

@@ -21,6 +21,4 @@ export { default as SelectFieldWithSearch } from './SelectFieldWithSearch';
 
 export * from './utils';
 export * from './PullSecretField';
-export * from './validationSchemas';
 export * from './LabelField';
-export * from './constants';

package/lib/common/config/docs_links.ts

@@ -1,6 +1,6 @@
 import { isMajorMinorVersionEqualOrGreater } from '../utils';
 
-const LATEST_OPENSHIFT_DOCS_VERSION = '4.19';
+const LATEST_OPENSHIFT_DOCS_VERSION = '4.21';
 const MIN_OPENSHIFT_DOCS_VERSION = '4.14';
 
 const getDocsOpenshiftVersion = (ocpVersion?: string): string => {

package/lib/common/index.ts

@@ -7,4 +7,6 @@ export * from './reducers';
 export * from './selectors';
 export * from './hooks';
 export * from './utils';
+export * from './validationSchemas';
+
 export { ResourceUIState } from './types/resource-ui-state';

package/lib/common/utils.ts

@@ -2,13 +2,12 @@ import filesize from 'filesize.js';
 import camelCase from 'lodash-es/camelCase.js';
 import isString from 'lodash-es/isString.js';
 import { loadAll } from 'js-yaml';
+import { TFunction } from 'i18next';
 import { MAX_FILE_SIZE_BYTES, MAX_FILE_SIZE_OFFSET_FACTOR } from './configurations';
 
 export const FILENAME_REGEX = /^[^\/]*\.(json|ya?ml(\.patch_?[a-zA-Z0-9_]*)?)$/;
 
 export const FILE_TYPE_MESSAGE = 'Unsupported file type. Please provide a valid YAML file.';
-export const INCORRECT_TYPE_FILE_MESSAGE =
-  'File type is not supported. File type must be yaml, yml ,json , yaml.patch. or yml.patch.';
 
 export const getErrorMessage = (error: unknown): string => {
   if (error instanceof Error) {
@@ -60,11 +59,10 @@ export const fileSize: typeof filesize = (...args) =>
     .toUpperCase()
     .replace(/I/, 'i');
 
-export const getMaxFileSizeMessage = `File size is too big. The file size must be less than ${fileSize(
-  MAX_FILE_SIZE_BYTES,
-  0,
-  'si',
-)}.`;
+export const getMaxFileSizeMessage = (t: TFunction) =>
+  t('ai:File size is too big. The file size must be less than {{value}}.', {
+    value: fileSize(MAX_FILE_SIZE_BYTES, 0, 'si'),
+  });
 
 export const validateFileName = (fileName: string) => {
   return new RegExp(FILENAME_REGEX).test(fileName || '');

package/lib/common/{components/ui/formik → validationSchemas}/_validationSchemas.test.ts

@@ -10,7 +10,7 @@ import {
   nameValidationSchema,
   noProxyValidationSchema,
   pullSecretValidationSchema,
-} from './validationSchemas';
+} from './..';
 import { TFunction } from 'react-i18next';
 import { CLUSTER_NAME_MAX_LENGTH } from './constants';
 
@@ -32,7 +32,7 @@ describe('validationSchemas', () => {
 
     await Promise.all(
       valid.map((value) =>
-        noProxyValidationSchema
+        noProxyValidationSchema(t)
           .validate(value)
           .catch(() => expect(value).toBe('was rejected but is valid')),
       ),
@@ -45,10 +45,12 @@ describe('validationSchemas', () => {
     let counter = 0;
     await Promise.all(
       invalid.map((value) =>
-        noProxyValidationSchema.validate(value).then(
-          () => expect(value).toBe('should be rejected since it is invalid'),
-          () => counter++,
-        ),
+        noProxyValidationSchema(t)
+          .validate(value)
+          .then(
+            () => expect(value).toBe('should be rejected since it is invalid'),
+            () => counter++,
+          ),
       ),
     );
 
@@ -106,7 +108,7 @@ describe('validationSchemas', () => {
 
     await Promise.all(
       valid.map((value) =>
-        pullSecretValidationSchema
+        pullSecretValidationSchema(t)
           .validate(value)
           .catch((msg: string) => expect(value).toBe(`was rejected but is valid: ${msg}`)),
       ),
@@ -115,10 +117,12 @@ describe('validationSchemas', () => {
     let counter = 0;
     await Promise.all(
       invalid.map((value) =>
-        pullSecretValidationSchema.validate(value).then(
-          () => expect(value).toBe('should be rejected since it is invalid'),
-          () => counter++,
-        ),
+        pullSecretValidationSchema(t)
+          .validate(value)
+          .then(
+            () => expect(value).toBe('should be rejected since it is invalid'),
+            () => counter++,
+          ),
       ),
     );
 
@@ -147,7 +151,7 @@ describe('validationSchemas', () => {
 
     await Promise.all(
       valid.map((value) =>
-        ipValidationSchema
+        ipValidationSchema(t)
           .validate(value)
           .catch((msg: string) => expect(value).toBe(`was rejected but is valid: ${msg}`)),
       ),
@@ -156,10 +160,12 @@ describe('validationSchemas', () => {
     let counter = 0;
     await Promise.all(
       invalid.map((value) =>
-        ipValidationSchema.validate(value).then(
-          () => expect(value).toBe('should be rejected since it is invalid'),
-          () => counter++,
-        ),
+        ipValidationSchema(t)
+          .validate(value)
+          .then(
+            () => expect(value).toBe('should be rejected since it is invalid'),
+            () => counter++,
+          ),
       ),
     );
 
@@ -182,7 +188,7 @@ describe('validationSchemas', () => {
 
     await Promise.all(
       valid.map((value) =>
-        macAddressValidationSchema
+        macAddressValidationSchema(t)
           .validate(value)
           .catch((msg: string) => expect(value).toBe(`was rejected but is valid: ${msg}`)),
       ),
@@ -191,10 +197,12 @@ describe('validationSchemas', () => {
     let counter = 0;
     await Promise.all(
       invalid.map((value) =>
-        macAddressValidationSchema.validate(value).then(
-          () => expect(value).toBe('should be rejected since it is invalid'),
-          () => counter++,
-        ),
+        macAddressValidationSchema(t)
+          .validate(value)
+          .then(
+            () => expect(value).toBe('should be rejected since it is invalid'),
+            () => counter++,
+          ),
       ),
     );
 
@@ -211,7 +219,7 @@ describe('validationSchemas', () => {
       '192.0.0.0/8' /* Overlap */,
     ];
 
-    const validationSchema = ipBlockValidationSchema(['192.168.1.0']);
+    const validationSchema = ipBlockValidationSchema(['192.168.1.0'], t);
     await Promise.all(
       valid.map((value) =>
         validationSchema
@@ -249,7 +257,7 @@ describe('validationSchemas', () => {
 
     await Promise.all(
       valid.map((value) =>
-        dnsNameValidationSchema
+        dnsNameValidationSchema(t)
           .validate(value)
           .catch((msg: string) => expect(value).toBe(`was rejected but is valid: ${msg}`)),
       ),
@@ -258,10 +266,12 @@ describe('validationSchemas', () => {
     let counter = 0;
     await Promise.all(
       invalid.map((value) =>
-        dnsNameValidationSchema.validate(value).then(
-          () => expect(value).toBe('should be rejected since it is invalid'),
-          () => counter++,
-        ),
+        dnsNameValidationSchema(t)
+          .validate(value)
+          .then(
+            () => expect(value).toBe('should be rejected since it is invalid'),
+            () => counter++,
+          ),
       ),
     );
 
@@ -272,7 +282,7 @@ describe('validationSchemas', () => {
     const valid = [16, 25];
     const invalid = ['', 'a', 0, 1, 33, 15, 26];
 
-    const validationSchema = hostPrefixValidationSchema('192.168.0.0/16');
+    const validationSchema = hostPrefixValidationSchema('192.168.0.0/16', t);
     await Promise.all(
       valid.map((value) =>
         validationSchema
@@ -298,7 +308,7 @@ describe('validationSchemas', () => {
     const valid = [8, 32, 128];
     const invalid = ['', 'a', 0, 1, 7, 129];
 
-    const validationSchema = hostPrefixValidationSchema('2002::1234:abcd:ffff:c0a8:101/64');
+    const validationSchema = hostPrefixValidationSchema('2002::1234:abcd:ffff:c0a8:101/64', t);
     await Promise.all(
       valid.map((value) =>
         validationSchema
@@ -330,7 +340,7 @@ describe('validationSchemas', () => {
 
     await Promise.all(
       valid.map((value) =>
-        baseDomainValidationSchema
+        baseDomainValidationSchema(t)
           .validate(value)
           .catch(() => expect(value).toBe(`was rejected but is valid`)),
       ),
@@ -339,10 +349,12 @@ describe('validationSchemas', () => {
     let counter = 0;
     await Promise.all(
       invalid.map((value) =>
-        baseDomainValidationSchema.validate(value).then(
-          () => expect(value).toBe('should be rejected since it is invalid'),
-          () => counter++,
-        ),
+        baseDomainValidationSchema(t)
+          .validate(value)
+          .then(
+            () => expect(value).toBe('should be rejected since it is invalid'),
+            () => counter++,
+          ),
       ),
     );
 
@@ -351,7 +363,7 @@ describe('validationSchemas', () => {
 
   describe('dualStackValidationSchema', () => {
     describe('OCP < 4.12 (legacy behavior)', () => {
-      const schema = dualStackValidationSchema('machine networks', '4.11');
+      const schema = dualStackValidationSchema('machine networks', t, '4.11');
 
       test('validates IPv4 as primary and IPv6 as secondary', async () => {
         const validValues = [[{ cidr: '192.168.1.0/24' }, { cidr: '2001:db8::/64' }]];
@@ -373,7 +385,7 @@ describe('validationSchemas', () => {
     });
 
     describe('OCP >= 4.12 (new behavior)', () => {
-      const schema = dualStackValidationSchema('machine networks', '4.12');
+      const schema = dualStackValidationSchema('machine networks', t, '4.12');
 
       test('validates IPv4 as primary and IPv6 as secondary', async () => {
         const validValues = [[{ cidr: '192.168.1.0/24' }, { cidr: '2001:db8::/64' }]];
@@ -393,7 +405,7 @@ describe('validationSchemas', () => {
     });
 
     describe('no version specified (defaults to legacy behavior)', () => {
-      const schema = dualStackValidationSchema('machine networks');
+      const schema = dualStackValidationSchema('machine networks', t);
 
       test('validates IPv4 as primary and IPv6 as secondary', async () => {
         const validValues = [[{ cidr: '192.168.1.0/24' }, { cidr: '2001:db8::/64' }]];
@@ -416,7 +428,7 @@ describe('validationSchemas', () => {
 
     describe('edge cases', () => {
       test('validates maximum 2 networks', async () => {
-        const schema = dualStackValidationSchema('machine networks', '4.12');
+        const schema = dualStackValidationSchema('machine networks', t, '4.12');
         const invalidValue = [
           { cidr: '192.168.1.0/24' },
           { cidr: '2001:db8::/64' },
@@ -424,7 +436,7 @@ describe('validationSchemas', () => {
         ];
 
         await expect(schema.validate(invalidValue)).rejects.toThrow(
-          'Maximum number of machine networks subnets in dual stack is 2',
+          'ai:Maximum number of {{field}} subnets in dual stack is 2',
         );
       });
     });