@redneckz/wildless-cms-uni-blocks 0.14.821 → 0.14.823

package/src/retail/components/Fields/MiddleNameField.tsx

@@ -1,14 +1,28 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
+import { retailCyrillicPattern } from '../../validator/validators';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
-export const MiddleNameField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DaDataInputControl
-    label="Отчество (Обязательно, при наличии)"
-    maxLength={60}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
-    {...field(input?.name ?? '')}
-    {...input}
-  />
-));
+export const MiddleNameField = JSX<CustomFieldProps>(({ field, input }) => {
+  const onChange = useCallback(
+    (value: string) => {
+      if (retailCyrillicPattern.test(value) || value.length === 0) {
+        field('middleName')?.onChange?.(value);
+      }
+    },
+    [field],
+  );
+
+  return (
+    <DaDataInputControl
+      label="Отчество (Обязательно, при наличии)"
+      maxLength={60}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
+      {...field(input?.name ?? '')}
+      {...input}
+      onChange={onChange}
+    />
+  );
+});

package/src/retail/components/Fields/NameField.tsx

@@ -1,14 +1,28 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
+import { retailCyrillicPattern } from '../../validator/validators';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
-export const NameField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DaDataInputControl
-    label="Имя"
-    maxLength={60}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
-    {...field(input?.name ?? '')}
-    {...input}
-  />
-));
+export const NameField = JSX<CustomFieldProps>(({ field, input }) => {
+  const onChange = useCallback(
+    (value: string) => {
+      if (retailCyrillicPattern.test(value) || value.length === 0) {
+        field('name')?.onChange?.(value);
+      }
+    },
+    [field],
+  );
+
+  return (
+    <DaDataInputControl
+      label="Имя"
+      maxLength={60}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
+      {...field(input?.name ?? '')}
+      {...input}
+      onChange={onChange}
+    />
+  );
+});

package/src/retail/components/Fields/SurnameField.tsx

@@ -1,16 +1,30 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
+import { retailCyrillicPattern } from '../../validator/validators';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 const FIELD_NAME = 'surname';
 
-export const SurnameField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DaDataInputControl
-    label="Фамилия"
-    maxLength={60}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
-    {...field(input?.name ?? '')}
-    {...input}
-  />
-));
+export const SurnameField = JSX<CustomFieldProps>(({ field, input }) => {
+  const onChange = useCallback(
+    (value: string) => {
+      if (retailCyrillicPattern.test(value) || value.length === 0) {
+        field('surname')?.onChange?.(value);
+      }
+    },
+    [field],
+  );
+
+  return (
+    <DaDataInputControl
+      label="Фамилия"
+      maxLength={60}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
+      {...field(input?.name ?? '')}
+      {...input}
+      onChange={onChange}
+    />
+  );
+});

package/src/retail/validator/getLimitedBirthdayValidation.ts

@@ -0,0 +1,21 @@
+import { type ProductType } from '../../components/ApplicationLeadForm/ApplicationLeadFormContent';
+import { limitedBirthdayValidator, type LimitedBirthdayValidationParams } from './validators';
+
+const limitedBirthdayValidationData: Record<ProductType, LimitedBirthdayValidationParams> = {
+  credit: {
+    minAge: 23,
+    maxAge: 75,
+    errorMessage: 'Допустимый возраст заёмщика - от 23 до 75 лет',
+  },
+  creditCard: {
+    minAge: 21,
+    errorMessage: 'Допустимый возраст заёмщика - от 21 года',
+  },
+  debitCard: {
+    minAge: 18,
+    errorMessage: 'Допустимый возраст - от 18 лет',
+  },
+};
+
+export const getLimitedBirthdayValidation = (productType: ProductType) =>
+  limitedBirthdayValidator(limitedBirthdayValidationData[productType]);

package/src/retail/validator/validatorObj.ts

@@ -11,7 +11,7 @@ import {
   codeWordValidator,
   jobNumberValidator,
   lengthStringValidator,
-  limitedBirthdayValidator,
+  nameRetailValidator,
   numberValidator,
   serieValidator,
   snilsValidator,
@@ -53,7 +53,6 @@ const validatorRetailObj: Record<string, Validator> = {
   addressRetail: defaultSelectValidator('Выберите адрес банка'),
   addressMatch: defaultValidator(),
   sex: defaultValidator('Укажите свой пол'),
-  limitedBirthday: limitedBirthdayValidator(),
   birthPlace: defaultValidator('Укажите место рождения'),
   education: defaultSelectValidator('Выберите ваше образование'),
   housing: defaultSelectValidator('Выберите тип жилья'),
@@ -88,6 +87,9 @@ const validatorRetailObj: Record<string, Validator> = {
   partInBusiness: defaultValidator(),
   regionRetail: defaultSelectValidator('Выберите регион'),
   latinSurname: defaultValidator('Укажите фамилию'),
+  surname: nameRetailValidator('Укажите свою фамилию на кириллице'),
+  name: nameRetailValidator('Укажите своё имя на кириллице'),
+  middleName: nameRetailValidator('Укажите своё отчество на кириллице'),
 };
 
 export const validatorObj = {

package/src/retail/validator/validators.ts

@@ -6,9 +6,13 @@ const ERROR_MESSAGE = 'Некорректно заполненное поле';
 
 const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
 
-const MIN_AGE = 23;
-const MAX_AGE = 75;
-const AGE_ERROR_MESSAGE = 'Допустимый возраст заёмщика - от 23 до 75 лет';
+export interface LimitedBirthdayValidationParams {
+  minAge: number;
+  maxAge?: number;
+  errorMessage: string;
+}
+
+export const retailCyrillicPattern = /^[\u0400-\u04FF-\s]+$/u;
 
 const addressDaDataValidate = (address: Address) =>
   Boolean(address.region && (address.city || address.locality) && address.house);
@@ -25,6 +29,11 @@ export const codeWordValidator = (errorMsg?: string) =>
     errorMsg ?? ERROR_MESSAGE,
   );
 
+export const nameRetailValidator = (errorMsg?: string) =>
+  validator((_) => typeof _ === 'string' && _.length > 1 && retailCyrillicPattern.test(_))(
+    errorMsg ?? ERROR_MESSAGE,
+  );
+
 export const jobNumberValidator = (errorMsg?: string) =>
   validator((_) => typeof _ === 'string' && /^[0-9]{1,2}$/g.test(_))(errorMsg ?? ERROR_MESSAGE);
 
@@ -33,20 +42,29 @@ export const lengthStringValidator = (inputLength: number, errorMsg?: string) =>
     errorMsg ?? ERROR_MESSAGE,
   );
 
-const limitedBirthdayValidate = (date?: Date) => {
-  const today = new Date();
+const limitedBirthdayValidate =
+  ({ minAge, maxAge }: LimitedBirthdayValidationParams) =>
+  (date?: Date) => {
+    const today = new Date();
 
-  const minDate = new Date(today.getFullYear() - MIN_AGE, today.getMonth(), today.getDate());
-  const maxDate = new Date(today.getFullYear() - MAX_AGE, today.getMonth(), today.getDate());
+    const minDate = new Date(today.getFullYear() - minAge, today.getMonth(), today.getDate());
+    const maxDate = maxAge
+      ? new Date(today.getFullYear() - maxAge, today.getMonth(), today.getDate())
+      : null;
 
-  if (!date || date > minDate || date < maxDate) {
-    return false;
-  }
+    if (!date || date > minDate) {
+      return false;
+    }
 
-  return true;
-};
+    if (maxDate && date < maxDate) {
+      return false;
+    }
+
+    return true;
+  };
 
-export const limitedBirthdayValidator = () => validator(limitedBirthdayValidate)(AGE_ERROR_MESSAGE);
+export const limitedBirthdayValidator = (params: LimitedBirthdayValidationParams) =>
+  validator(limitedBirthdayValidate(params))(params.errorMessage);
 
 export const numberValidator = (errorMsg: string) =>
   validator((_) => typeof _ === 'string' && _.length === 6)(errorMsg);

package/src/ui-kit/DatePicker/DatePickerControl.tsx

@@ -6,7 +6,9 @@ import { type ControlProps } from '../ControlProps';
 import { renderErrorText } from '../Input/renderErrorText';
 import { DatePicker } from './DatePicker';
 
-export interface DatePickerControlProps extends DefaultControlType, ControlProps<Date> {}
+export interface DatePickerControlProps extends DefaultControlType, ControlProps<Date> {
+  minDate?: Date;
+}
 
 export const DatePickerControl = JSX<DatePickerControlProps>(
   ({ className, label, error, errors, ...rest }) => (