@redneckz/wildless-cms-uni-blocks 0.14.677 → 0.14.678

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.677",
+  "version": "0.14.678",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/ApplicationForm/renderInputs.tsx

@@ -6,25 +6,16 @@ import type {
 import { CONSENTS } from '../ApplicationLeadForm/consents';
 import { GroupedConsents } from '../ApplicationLeadForm/GroupedConsents';
 
-type RenderInputsProps = GroupedConsentsProps & {
-  isRetailForm?: boolean;
-};
-
-export const renderInputs = ({
-  field,
-  typeForm = '',
-  inputs,
-  isRetailForm = false,
-}: RenderInputsProps) => {
+export const renderInputs = ({ field, typeForm = '', inputs }: GroupedConsentsProps) => {
   const { consentInputs, restInputs } = splitInputs(inputs || []);
 
   return consentInputs.length > 2 ? (
     <div>
-      {restInputs.map(getField(field, typeForm, isRetailForm))}
+      {restInputs.map(getField(field, typeForm))}
       <GroupedConsents inputs={consentInputs} field={field} />
     </div>
   ) : (
-    (inputs || [])?.map(getField(field, typeForm, isRetailForm))
+    (inputs || [])?.map(getField(field, typeForm))
   );
 };
 

package/src/components/ApplicationLeadForm/ApplicationLeadForm.example.json

@@ -28,7 +28,7 @@
               },
               {
                 "fieldType": "common",
-                "name": "birthday",
+                "name": "limitedBirthday",
                 "required": true
               },
               {

package/src/components/ApplicationLeadForm/ApplicationLeadForm.fixture.mobile.tsx

@@ -22,7 +22,7 @@ export default {
               { fieldType: 'common', name: 'surname', required: true },
               { fieldType: 'common', name: 'name', required: true },
               { fieldType: 'common', name: 'middleName' },
-              { fieldType: 'common', name: 'birthday', required: true },
+              { fieldType: 'common', name: 'limitedBirthday', required: true },
               { fieldType: 'common', name: 'phone', required: true },
               { fieldType: 'common', name: 'email', required: true },
             ],

package/src/components/ApplicationLeadForm/ApplicationLeadForm.fixture.tsx

@@ -24,7 +24,7 @@ export default {
               { fieldType: 'common', name: 'surname', required: true, dadata: true },
               { fieldType: 'common', name: 'name', required: true, dadata: true },
               { fieldType: 'common', name: 'middleName', dadata: true },
-              { fieldType: 'common', name: 'birthday', required: true },
+              { fieldType: 'common', name: 'limitedBirthday', required: true },
               { fieldType: 'common', name: 'phone', required: true },
               { fieldType: 'common', name: 'email', required: true, dadata: true },
             ],

package/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx

@@ -69,7 +69,7 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
               className={style(inputColumnStyles(_.columns), 'grid gap-x-m')}
             >
               {renderTitle(_.title)}
-              {renderInputs({ field, inputs: _?.inputs, isRetailForm: true })}
+              {renderInputs({ field, inputs: _?.inputs })}
             </div>
           ))}
           {renderSubmitButton(button)}

package/src/components/ApplicationLeadForm/getInitialFormState.tsx

@@ -56,6 +56,7 @@ export interface FormState extends FormConsents, FormStateDeliveryType {
   fullName?: string;
   registrationDate?: Date | string;
   birthday?: Date | string;
+  limitedBirthday?: Date | string;
   birthPlace?: string;
   sex?: string;
   phone?: string;
@@ -173,6 +174,7 @@ const initialFormState = {
   serviceDirection: SERVICE_DIRECTIONS[0],
   vedTypes: VED_TYPES[0],
   birthday: undefined,
+  limitedBirthday: undefined,
   isClient: false,
   onlineCheckout: false,
   posTerminal: false,
@@ -198,7 +200,7 @@ export const getInitialFormState = (
 ): FormState => {
   if (savedForm) {
     const formStateCopy = { ...savedForm };
-    formStateCopy.birthday = new Date(formStateCopy?.birthday || 0);
+    formStateCopy.limitedBirthday = new Date(formStateCopy?.limitedBirthday || 0);
 
     return formStateCopy;
   }

package/src/components/ApplicationLeadForm/getLeadFormTaskData.ts

@@ -17,7 +17,7 @@ export const getLeadFormTaskData = ({
   profileId,
   formData,
 }: getLeadFormTaskDataProps): UpdateUserTaskBody => {
-  const { name, surname, middleName, birthday, phone, email } = formData;
+  const { name, surname, middleName, limitedBirthday, phone, email } = formData;
 
   return {
     sendToBank: true,
@@ -27,7 +27,7 @@ export const getLeadFormTaskData = ({
       id: taskId,
       participants: [
         {
-          birthDate: birthday && formatDate(birthday, true),
+          birthDate: limitedBirthday && formatDate(limitedBirthday, true),
           id: participantId,
           midname: middleName,
           name,

package/src/components/ApplicationLeadForm/pasreEsiaProfile.ts

@@ -9,7 +9,7 @@ export const parseEsiaProfile = (esiaProfile: UpdateProfileEsiaResponse): FormSt
     name: profile?.name,
     surname: profile?.surname,
     middleName: profile?.midname,
-    birthday: profile?.birthDate,
+    limitedBirthday: profile?.birthDate,
     phone: normalizePhone(profile?.phone),
     email: profile?.email,
     dulIssueDateField: document?.dulIssueDate,

package/src/components/CreditCardForm/creditCardFormStepsData.tsx

@@ -33,7 +33,7 @@ export const stepsSectionsMap: CreditCardSectionsProps[][] = [
         { fieldType: 'common', name: 'name', required: true, dadata: true, filledByEsia: true },
         { fieldType: 'common', name: 'middleName', dadata: true, filledByEsia: true },
         { fieldType: 'common', name: 'sex', required: true },
-        { fieldType: 'common', name: 'birthday', required: true, filledByEsia: true },
+        { fieldType: 'common', name: 'limitedBirthday', required: true, filledByEsia: true },
         { fieldType: 'common', name: 'birthPlace', required: true },
         { fieldType: 'common', name: 'phone', required: true },
         { fieldType: 'common', name: 'email', required: true, dadata: true },

package/src/components/CreditCardForm/formStateMap.tsx

@@ -11,7 +11,7 @@ export const formStateMap: Partial<FormState>[] = [
     name: '',
     middleName: '',
     sex: '',
-    birthday: undefined,
+    limitedBirthday: undefined,
     birthPlace: '',
     phone: '',
     email: '',

package/src/components/CreditCardForm/getInitialFormState.tsx

@@ -7,7 +7,7 @@ export const getInitialFormState = (
 ): FormState => ({
   ...formStateMap[step],
   ...localStorageData,
-  birthday: transformStringToData(localStorageData?.birthday as string),
+  limitedBirthday: transformStringToData(localStorageData?.limitedBirthday as string),
   dulIssueDateField: transformStringToData(localStorageData?.dulIssueDateField as string),
   participantDateRegistration: transformStringToData(
     localStorageData?.participantDateRegistration as string,

package/src/components/CreditCardForm/getSecondStepData.tsx

@@ -9,7 +9,7 @@ export const getSecondStepData = (formData: FormState): Partial<Participant> =>
     name,
     surname,
     middleName,
-    birthday = '',
+    limitedBirthday = '',
     phone = '',
     email,
     sex,
@@ -27,7 +27,7 @@ export const getSecondStepData = (formData: FormState): Partial<Participant> =>
   } = formData;
 
   return {
-    birthDate: formatDate(birthday, true),
+    birthDate: formatDate(limitedBirthday, true),
     midname: middleName,
     name,
     surname,

package/src/components/CreditForm/creditFormStepsData.tsx

@@ -22,7 +22,7 @@ export const stepsSectionsMap: SectionsProps[][] = [
         { fieldType: 'common', name: 'name', required: true, dadata: true, filledByEsia: true },
         { fieldType: 'common', name: 'middleName', dadata: true, filledByEsia: true },
         { fieldType: 'common', name: 'sex', required: true },
-        { fieldType: 'common', name: 'birthday', required: true, filledByEsia: true },
+        { fieldType: 'common', name: 'limitedBirthday', required: true, filledByEsia: true },
         { fieldType: 'common', name: 'birthPlace', required: true, filledByEsia: true },
         { fieldType: 'common', name: 'phone', required: true, filledByEsia: true },
         { fieldType: 'common', name: 'email', required: true, dadata: true },

package/src/components/CreditForm/formStateMap.tsx

@@ -15,7 +15,7 @@ export const formStateMap: Partial<FormState>[] = [
     name: '',
     middleName: '',
     sex: '',
-    birthday: undefined,
+    limitedBirthday: undefined,
     birthPlace: '',
     phone: '',
     email: '',

package/src/components/CreditForm/getFirstStepData.tsx

@@ -9,7 +9,7 @@ export const getFirstStepData = (formData: FormState): Partial<Participant> => {
     name,
     surname,
     middleName,
-    birthday = '',
+    limitedBirthday = '',
     phone = '',
     email,
     sex,
@@ -27,7 +27,7 @@ export const getFirstStepData = (formData: FormState): Partial<Participant> => {
   } = formData;
 
   return {
-    birthDate: formatDate(birthday, true),
+    birthDate: formatDate(limitedBirthday, true),
     midname: middleName,
     name,
     surname,

package/src/components/CreditForm/getInitialFormState.tsx

@@ -7,7 +7,7 @@ export const getInitialFormState = (
 ): FormState => ({
   ...formStateMap[step],
   ...localStorageData,
-  birthday: transformStringToData(localStorageData?.birthday as string),
+  limitedBirthday: transformStringToData(localStorageData?.limitedBirthday as string),
   dulIssueDateField: transformStringToData(localStorageData?.dulIssueDateField as string),
   participantDateRegistration: transformStringToData(
     localStorageData?.participantDateRegistration as string,

package/src/ui-kit/FormField/Fields/BirthdayField.tsx

@@ -3,40 +3,10 @@ import { DatePickerControl } from '../../DatePicker/DatePickerControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
-import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
-const MIN_AGE = 23;
-const MAX_AGE = 75;
-const AGE_ERROR_MESSAGE = 'Допустимый возраст заёмщика - от 23 до 75 лет';
-
-interface BirthdayFieldProps extends CustomFieldProps {
-  isRetailForm?: boolean;
-}
-
-const FIELD_NAME = 'birthday';
-
-export const BirthdayField = JSX<BirthdayFieldProps>(({ field, input, isRetailForm = false }) => {
-  const { value } = field(FIELD_NAME);
-
-  return (
-    <DatePickerControl
-      label="Дата рождения"
-      {...getValidation(field(FIELD_NAME), validatorObj.birthday, input?.required)}
-      error={isRetailForm && value && !birthdayValidate(value as Date) ? AGE_ERROR_MESSAGE : ''}
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
-    />
-  );
-});
-
-const birthdayValidate = (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());
-
-  if (!date || date > minDate || date < maxDate) {
-    return false;
-  }
-
-  return true;
-};
+export const BirthdayField = JSX<CustomFieldProps>(({ field, input }) => (
+  <DatePickerControl
+    label="Дата рождения"
+    {...getValidation(field('birthday'), validatorObj.birthday, input?.required)}
+  />
+));

package/src/ui-kit/FormField/Fields/LimitedBirthdayField.tsx

@@ -0,0 +1,16 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { DatePickerControl } from '../../DatePicker/DatePickerControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+import { isEsiaAuthorize } from '../isEsiaAuthorize';
+
+const FIELD_NAME = 'limitedBirthday';
+
+export const LimitedBirthdayField = JSX<CustomFieldProps>(({ field, input }) => (
+  <DatePickerControl
+    label="Дата рождения"
+    {...getValidation(field(FIELD_NAME), validatorObj.limitedBirthday, input?.required)}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
+  />
+));

package/src/ui-kit/FormField/Fields/MiddleNameField.tsx

@@ -1,4 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
@@ -7,12 +9,23 @@ import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
 const FIELD_NAME = 'middleName';
 
-export const MiddleNameField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputControl
-    label="Отчество (Обязательно, при наличии)"
-    maxLength={60}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
-    {...getValidation(field(FIELD_NAME), validatorObj.middleName, input?.required)}
-    {...input}
-  />
-));
+export const MiddleNameField = JSX<CustomFieldProps>(({ field, input }) => {
+  const onDaDataChange = useCallback((item: DaDataSuggestion) => {
+    const dadataGender = item?.data?.gender;
+
+    if (dadataGender && dadataGender !== 'UNKNOWN') {
+      field('sex')?.onChange?.(dadataGender.toLowerCase());
+    }
+  }, []);
+
+  return (
+    <InputControl
+      label="Отчество (Обязательно, при наличии)"
+      maxLength={60}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
+      {...getValidation(field(FIELD_NAME), validatorObj.middleName, input?.required)}
+      {...input}
+      onDaDataChange={onDaDataChange}
+    />
+  );
+});

package/src/ui-kit/FormField/NameFieldDef.ts

@@ -27,6 +27,7 @@ export type NameFieldDef =
   | 'typeForm'
   | 'registrationDate'
   | 'birthday'
+  | 'limitedBirthday'
   | 'birthPlace'
   | 'sex'
   | 'isClient'

package/src/ui-kit/FormField/getField.tsx

@@ -59,6 +59,7 @@ import { JobsNumberField } from './Fields/JobsNumberField';
 import { LastJobExperienceField } from './Fields/LastJobExperienceField';
 import { LegalEntityNameField } from './Fields/LegalEntityNameField';
 import { LegalFormField } from './Fields/LegalFormField';
+import { LimitedBirthdayField } from './Fields/LimitedBirthdayField';
 import { LocalitiesField } from './Fields/LocalitiesField';
 import { MandatoryPaymentsField } from './Fields/MandatoryPaymentsField';
 import { MethodObtainField } from './Fields/MethodObtainField';
@@ -98,8 +99,7 @@ const PRODUCT_REF = {
 };
 
 export const getField =
-  (field: FormFieldRegisterer<any>, typeForm: string, isRetailForm = false) =>
-  (input: FieldDef, i: number) => {
+  (field: FormFieldRegisterer<any>, typeForm: string) => (input: FieldDef, i: number) => {
     const isPremium = typeForm === 'ULTRASERVICE' || typeForm === 'PREMIUMSERVICE';
 
     const InputsMap = {
@@ -123,7 +123,8 @@ export const getField =
       comment: <CommentField field={field} input={input} />,
       addressBranch: <AddressBranchField field={field} input={input} isPremium={isPremium} />,
       sex: <SexField field={field} input={input} />,
-      birthday: <BirthdayField field={field} input={input} isRetailForm={isRetailForm} />,
+      birthday: <BirthdayField field={field} input={input} />,
+      limitedBirthday: <LimitedBirthdayField field={field} input={input} />,
       birthPlace: <BirthPlaceField field={field} input={input} />,
       desiredMeetingDate: <DesiredMeetingDateField field={field} input={input} />,
       product: <ProductField field={field} source={PRODUCT_REF} />,

package/src/ui-kit/FormField/getObjectValidator.tsx

@@ -12,6 +12,7 @@ import {
   innValidator,
   jobNumberValidator,
   lengthStringValidator,
+  limitedBirthdayValidator,
   nameValidator,
   numberValidator,
   phoneValidator,
@@ -30,6 +31,7 @@ export const validatorObj: Record<string, Validator> = {
   secondaryPhone: phoneValidator('Укажите номер телефона'),
   organizationPhone: phoneValidator('Укажите номер телефона'),
   birthday: defaultValidator('Укажите дату рождения'),
+  limitedBirthday: limitedBirthdayValidator(),
   birthPlace: defaultValidator('Укажите место рождения'),
   education: defaultValidator('Выберите ваше образование'),
   housing: defaultValidator('Выберите тип жилья'),

package/src/ui-kit/FormField/validators.ts

@@ -7,6 +7,10 @@ const ERROR_MESSAGE = 'Некорректно заполненное поле';
 
 const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
 
+const MIN_AGE = 23;
+const MAX_AGE = 75;
+const AGE_ERROR_MESSAGE = 'Допустимый возраст заёмщика - от 23 до 75 лет';
+
 export const defaultValidator = (errorMsg?: string) => required(errorMsg ?? ERROR_MESSAGE);
 
 export const defaultSelectValidator = (errorMsg?: string) =>
@@ -88,3 +92,18 @@ export const codeWordValidator = (errorMsg?: string) =>
 const cyrillicPattern = /^[\u0400-\u04FF\d]+$/u;
 
 const isCyrillic = (_ = '') => cyrillicPattern.test(_);
+
+const limitedBirthdayValidate = (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());
+
+  if (!date || date > minDate || date < maxDate) {
+    return false;
+  }
+
+  return true;
+};
+
+export const limitedBirthdayValidator = () => validator(limitedBirthdayValidate)(AGE_ERROR_MESSAGE);