@redneckz/wildless-cms-uni-blocks 0.14.635 → 0.14.637

package/mobile/src/components/CreditForm/creditFormStepsData.tsx

@@ -44,7 +44,10 @@ export const stepsSectionsMap: SectionsProps[][] = [
       inputs: [],
     },
     {
-      inputs: [{ fieldType: 'common', name: 'addressRegistration', required: true, dadata: true }],
+      inputs: [
+        { fieldType: 'common', name: 'addressRegistration', required: true, dadata: true },
+        { fieldType: 'common', name: 'addressMatch' },
+      ],
     },
     {
       columns: 2,
@@ -52,11 +55,14 @@ export const stepsSectionsMap: SectionsProps[][] = [
     },
     {
       title: 'Адрес фактического проживания (место пребывания РФ)',
+      inputs: [],
+    },
+    {
       columns: 2,
-      inputs: [
-        { fieldType: 'common', name: 'addressFact', required: true, dadata: true },
-        { fieldType: 'common', name: 'housing' },
-      ],
+      inputs: [{ fieldType: 'common', name: 'housing' }],
+    },
+    {
+      inputs: [{ fieldType: 'common', name: 'addressFact', required: true, dadata: true }],
     },
   ],
   [
@@ -141,8 +147,11 @@ export const stepsSectionsMap: SectionsProps[][] = [
       inputs: [{ fieldType: 'common', name: 'dependents', required: true }],
     },
     {
-      columns: 1,
-      inputs: [{ fieldType: 'common', name: 'familyMembers', required: true }],
+      columns: 2,
+      inputs: [
+        { fieldType: 'common', name: 'familyMembers', required: true },
+        { fieldType: 'common', name: 'children', required: true },
+      ],
     },
     {
       title: 'Совокупный доход',

package/mobile/src/components/CreditForm/getInitialFormState.tsx

@@ -1,3 +1,4 @@
+/* eslint-disable max-len, max-lines */
 import type { Option } from '../../ui-kit/Select/Option';
 import { type Address } from '../ApplicationLeadForm/getInitialFormState';
 
@@ -17,6 +18,7 @@ export interface FormStateMap {
     dulSubdivisionCode?: string;
     dulIssuedBy?: string;
     addressRegistration?: Address;
+    addressMatch?: boolean;
     participantDateRegistration?: Date;
     addressFact?: Address;
     housing?: string;
@@ -81,6 +83,7 @@ const formStateMap: FormStateMap = {
       fullAddress: '',
       fiasCode: '',
     },
+    addressMatch: false,
     participantDateRegistration: undefined,
     addressFact: {
       fullAddress: '',

package/mobile/src/ui-kit/FormField/Fields/AddressFactField.tsx

@@ -0,0 +1,55 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useCallback, useEffect } 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';
+import { getValidation } from '../getValidation';
+
+export const AddressFactField = JSX<CustomFieldProps>(({ field, input }) => {
+  const fieldName = 'addressFact';
+  const fieldValue = field(fieldName).value;
+  const { value } = field('addressMatch');
+
+  useEffect(() => {
+    if (value) {
+      field('addressFact')?.onChange?.(field('addressRegistration').value);
+    }
+  }, [value]);
+
+  const onDaDataChange = useCallback((item: DaDataSuggestion) => {
+    field?.(fieldName)?.onChange?.({
+      apartment: item?.data?.flat,
+      city: item?.data?.city,
+      district: item?.data?.area_with_type,
+      fullAddress: item?.value,
+      fiasCode: item?.data?.fias_id,
+      house: item?.data?.house,
+      locality: item?.data?.settlement_with_type,
+      okatoRegionCode: item?.data?.okato,
+      postcode: item?.data?.postal_code,
+      region: item?.data?.region,
+      regionCode: item?.data?.region_kladr_id ? item?.data?.region_kladr_id.substring(0, 2) : '',
+      street: item?.data?.house,
+    });
+  }, []);
+
+  const onChange = useCallback((val: string) => {
+    field?.(fieldName)?.onChange?.({
+      ...field(fieldName).value,
+      fullAddress: val,
+    });
+  }, []);
+
+  return (
+    <InputControl
+      label="Адрес"
+      disabled={value}
+      {...getValidation(field(fieldName), validatorObj[fieldName], input?.required)}
+      value={fieldValue.fullAddress}
+      onChange={onChange}
+      {...input}
+      onDaDataChange={onDaDataChange}
+    />
+  );
+});

package/mobile/src/ui-kit/FormField/Fields/AddressMatchField.tsx

@@ -0,0 +1,14 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { CheckboxWithError } from '../../Checkbox/CheckboxWithError';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+
+export const AddressMatchField = JSX<CustomFieldProps>(({ field }) => {
+  return (
+    <CheckboxWithError
+      text="Адрес фактического места жительства совпадает с адресом регистрации"
+      {...getValidation(field('addressMatch'), validatorObj.addressMatch)}
+    />
+  );
+});

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

@@ -86,4 +86,5 @@ export type NameFieldDef =
   | 'bankEmployeeCode'
   | 'partInBusiness'
   | 'regionRetail'
-  | 'addressRetail';
+  | 'addressRetail'
+  | 'addressMatch';

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

@@ -5,7 +5,9 @@ import { type FormFieldRegisterer } from '../../hooks/useForm';
 import { InputControl } from '../Input/InputControl';
 import { AcquiringField } from './Fields/AcquiringField';
 import { AddressBranchField } from './Fields/AddressBranchField';
+import { AddressFactField } from './Fields/AddressFactField';
 import { AddressField } from './Fields/AddressField';
+import { AddressMatchField } from './Fields/AddressMatchField';
 import { AmountField } from './Fields/AmountField';
 import { AmountWorkersField } from './Fields/AmountWorkersField';
 import { AnnualRevenueField } from './Fields/AnnualRevenueField';
@@ -107,7 +109,7 @@ export const getField =
       experience5Years: <Experience5YearsField field={field} input={input} />,
       jobsNumber: <JobsNumberField field={field} input={input} />,
       beginDate: <BeginDateField field={field} input={input} />,
-      addressFact: <AddressField field={field} input={input} />,
+      addressFact: <AddressFactField field={field} input={input} />,
       organizationAddress: <AddressField field={field} input={input} />,
       comment: <CommentField field={field} input={input} />,
       addressBranch: <AddressBranchField field={field} input={input} isPremium={isPremium} />,
@@ -184,6 +186,7 @@ export const getField =
       partInBusiness: <PartInBusinessField field={field} input={input} />,
       regionRetail: <RetailRegionField field={field} input={input} />,
       addressRetail: <RetailAddressField field={field} input={input} />,
+      addressMatch: <AddressMatchField field={field} input={input} />,
     };
 
     return isRenderField({ input, field }) ? (

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

@@ -95,6 +95,7 @@ export const validatorObj: Record<string, Validator> = {
   partInBusiness: defaultValidator(),
   regionRetail: defaultSelectValidator('Выберите филиал банка'),
   addressRetail: defaultSelectValidator('Выберите адрес банка'),
+  addressMatch: defaultValidator(),
 };
 
 export const getObjectValidator = (inputs: FieldDef[]): Record<string, Validator> => {

package/mobile/src/ui-kit/Input/InputControl.tsx

@@ -27,6 +27,7 @@ export const InputControl = JSX<InputProps>(
     daDataQueryPrefix,
     inputLength,
     dadata = false,
+    disabled = false,
   }) => {
     const [isOpen, { setFalse: close, setTrue: open }] = useBool();
     const popupRef = useOutsideClick<HTMLDivElement>(close);
@@ -54,6 +55,7 @@ export const InputControl = JSX<InputProps>(
       >
         <div ref={inputRef}>
           <Input
+            disabled={disabled}
             type={type || 'text'}
             aria-label={label}
             label={getRequiredLabel({ label, errors })}

package/package.json

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

package/src/api/RetailAPI/updateProfileEsia.ts

@@ -14,7 +14,7 @@ export type UpdateProfileEsiaResponse = {
     surname: string;
     name: string;
     midname: string;
-    birthDate: string;
+    birthDate: Date;
     phone: string;
     email: string;
     esiaAccountType: {
@@ -42,11 +42,11 @@ export type UpdateProfileEsiaResponse = {
       value: string;
     };
     city: string;
-    locality: null;
+    locality: string;
     street: string;
     house: string;
-    building: null;
-    block: null;
+    building: string;
+    block: string;
     apartment: string;
   };
   addressFact: {
@@ -58,11 +58,11 @@ export type UpdateProfileEsiaResponse = {
       value: string;
     };
     city: string;
-    locality: null;
+    locality: string;
     street: string;
     house: string;
-    building: null;
-    block: null;
+    building: string;
+    block: string;
     apartment: string;
   };
 };

package/src/components/ApplicationLeadForm/getInitialFormState.tsx

@@ -120,6 +120,7 @@ export interface FormState extends FormConsents {
   legalEntityName?: string;
   bankEmployeeCode?: number;
   partInBusiness?: number;
+  addressMatch?: boolean;
 }
 
 const initialFormState = {

package/src/components/ApplicationLeadForm/pasreEsiaProfile.ts

@@ -0,0 +1,69 @@
+import { type UpdateProfileEsiaResponse } from '../../api/RetailAPI/updateProfileEsia';
+import { normalizePhone } from '../../ui-kit/PhoneInput/normalizePhone';
+import { type Address, type FormState } from './getInitialFormState';
+
+export const parseEsiaProfile = (esiaProfile: UpdateProfileEsiaResponse): FormState => {
+  const { profile, addInfo, document, addressRegistration, addressFact } = esiaProfile;
+
+  return {
+    name: profile?.name,
+    surname: profile?.surname,
+    middleName: profile?.midname,
+    birthday: profile?.birthDate,
+    phone: normalizePhone(profile?.phone),
+    email: profile?.email,
+    dulIssueDateField: document?.dulIssueDate,
+    dulIssuedBy: document?.dulIssuedBy,
+    dulNumber: document?.dulNumber,
+    dulSerie: document?.dulSerie,
+    dulSubdivisionCode: document?.dulSubdivisionCode,
+    snils: addInfo?.snils,
+    birthPlace: addInfo?.birthPlace,
+    addressRegistration: buildAddress(addressRegistration),
+    addressFact: buildAddress(addressFact),
+  };
+};
+
+const concatFullAddress = (address: Array<string | undefined>): string => {
+  return address.reduce((acc: string, value) => {
+    if (value) {
+      return acc ? `${acc}, ${value}` : value;
+    }
+
+    return acc;
+  }, '');
+};
+
+const buildAddress = (fields: UpdateProfileEsiaResponse['addressRegistration']): Address => {
+  const {
+    postcode,
+    region,
+    regionCode,
+    locality,
+    city,
+    street,
+    house,
+    building,
+    block,
+    apartment,
+  } = fields;
+
+  const place = locality || city;
+
+  const fullAddress = concatFullAddress([
+    postcode,
+    region,
+    place,
+    street ? `ул ${street}` : undefined,
+    house ? `д ${house}` : undefined,
+    block ? `к ${block}` : undefined,
+    building ? `стр ${building}` : undefined,
+    apartment ? `кв ${apartment}` : undefined,
+  ]);
+
+  return {
+    ...fields,
+    regionCode: regionCode?.key,
+    fullAddress,
+  };
+};

package/src/components/ApplicationLeadForm/useInitApplicationLead.ts

@@ -2,11 +2,13 @@ import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 
 import { updateProfileEsia } from '../../api/RetailAPI/updateProfileEsia';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
+import { type FormState } from './getInitialFormState';
+import { parseEsiaProfile } from './pasreEsiaProfile';
 
 export const useInitApplicationLead = (nextStepLink: string) => {
   const [isLoading, setIsLoading] = useState(false);
   const [profileId] = useLocalStorage<string>('profileId');
-  const [, setEsiaData] = useLocalStorage('esiaData');
+  const [leadForm, setLeadForm] = useLocalStorage<FormState>('leadForm');
   const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
   const code = params.get('code');
   const state = params.get('state');
@@ -20,7 +22,11 @@ export const useInitApplicationLead = (nextStepLink: string) => {
         redirectUri: globalThis.location?.href,
       });
 
-      setEsiaData(JSON.stringify(data));
+      setLeadForm({
+        ...leadForm,
+        ...parseEsiaProfile(data),
+      });
+
       globalThis.location.href = nextStepLink;
     }
   }, []);
@@ -30,7 +36,6 @@ export const useInitApplicationLead = (nextStepLink: string) => {
       setIsLoading(true);
       updateEsiaProfile();
     } else {
-      setEsiaData('');
       sessionStorage.removeItem('accessToken');
       sessionStorage.removeItem('refreshToken');
     }

package/src/components/CreditForm/creditFormStepsData.tsx

@@ -44,7 +44,10 @@ export const stepsSectionsMap: SectionsProps[][] = [
       inputs: [],
     },
     {
-      inputs: [{ fieldType: 'common', name: 'addressRegistration', required: true, dadata: true }],
+      inputs: [
+        { fieldType: 'common', name: 'addressRegistration', required: true, dadata: true },
+        { fieldType: 'common', name: 'addressMatch' },
+      ],
     },
     {
       columns: 2,
@@ -52,11 +55,14 @@ export const stepsSectionsMap: SectionsProps[][] = [
     },
     {
       title: 'Адрес фактического проживания (место пребывания РФ)',
+      inputs: [],
+    },
+    {
       columns: 2,
-      inputs: [
-        { fieldType: 'common', name: 'addressFact', required: true, dadata: true },
-        { fieldType: 'common', name: 'housing' },
-      ],
+      inputs: [{ fieldType: 'common', name: 'housing' }],
+    },
+    {
+      inputs: [{ fieldType: 'common', name: 'addressFact', required: true, dadata: true }],
     },
   ],
   [
@@ -141,8 +147,11 @@ export const stepsSectionsMap: SectionsProps[][] = [
       inputs: [{ fieldType: 'common', name: 'dependents', required: true }],
     },
     {
-      columns: 1,
-      inputs: [{ fieldType: 'common', name: 'familyMembers', required: true }],
+      columns: 2,
+      inputs: [
+        { fieldType: 'common', name: 'familyMembers', required: true },
+        { fieldType: 'common', name: 'children', required: true },
+      ],
     },
     {
       title: 'Совокупный доход',

package/src/components/CreditForm/getInitialFormState.tsx

@@ -1,3 +1,4 @@
+/* eslint-disable max-len, max-lines */
 import type { Option } from '../../ui-kit/Select/Option';
 import { type Address } from '../ApplicationLeadForm/getInitialFormState';
 
@@ -17,6 +18,7 @@ export interface FormStateMap {
     dulSubdivisionCode?: string;
     dulIssuedBy?: string;
     addressRegistration?: Address;
+    addressMatch?: boolean;
     participantDateRegistration?: Date;
     addressFact?: Address;
     housing?: string;
@@ -81,6 +83,7 @@ const formStateMap: FormStateMap = {
       fullAddress: '',
       fiasCode: '',
     },
+    addressMatch: false,
     participantDateRegistration: undefined,
     addressFact: {
       fullAddress: '',

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

@@ -0,0 +1,55 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useCallback, useEffect } 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';
+import { getValidation } from '../getValidation';
+
+export const AddressFactField = JSX<CustomFieldProps>(({ field, input }) => {
+  const fieldName = 'addressFact';
+  const fieldValue = field(fieldName).value;
+  const { value } = field('addressMatch');
+
+  useEffect(() => {
+    if (value) {
+      field('addressFact')?.onChange?.(field('addressRegistration').value);
+    }
+  }, [value]);
+
+  const onDaDataChange = useCallback((item: DaDataSuggestion) => {
+    field?.(fieldName)?.onChange?.({
+      apartment: item?.data?.flat,
+      city: item?.data?.city,
+      district: item?.data?.area_with_type,
+      fullAddress: item?.value,
+      fiasCode: item?.data?.fias_id,
+      house: item?.data?.house,
+      locality: item?.data?.settlement_with_type,
+      okatoRegionCode: item?.data?.okato,
+      postcode: item?.data?.postal_code,
+      region: item?.data?.region,
+      regionCode: item?.data?.region_kladr_id ? item?.data?.region_kladr_id.substring(0, 2) : '',
+      street: item?.data?.house,
+    });
+  }, []);
+
+  const onChange = useCallback((val: string) => {
+    field?.(fieldName)?.onChange?.({
+      ...field(fieldName).value,
+      fullAddress: val,
+    });
+  }, []);
+
+  return (
+    <InputControl
+      label="Адрес"
+      disabled={value}
+      {...getValidation(field(fieldName), validatorObj[fieldName], input?.required)}
+      value={fieldValue.fullAddress}
+      onChange={onChange}
+      {...input}
+      onDaDataChange={onDaDataChange}
+    />
+  );
+});

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

@@ -0,0 +1,14 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { CheckboxWithError } from '../../Checkbox/CheckboxWithError';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+
+export const AddressMatchField = JSX<CustomFieldProps>(({ field }) => {
+  return (
+    <CheckboxWithError
+      text="Адрес фактического места жительства совпадает с адресом регистрации"
+      {...getValidation(field('addressMatch'), validatorObj.addressMatch)}
+    />
+  );
+});

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

@@ -86,4 +86,5 @@ export type NameFieldDef =
   | 'bankEmployeeCode'
   | 'partInBusiness'
   | 'regionRetail'
-  | 'addressRetail';
+  | 'addressRetail'
+  | 'addressMatch';

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

@@ -5,7 +5,9 @@ import { type FormFieldRegisterer } from '../../hooks/useForm';
 import { InputControl } from '../Input/InputControl';
 import { AcquiringField } from './Fields/AcquiringField';
 import { AddressBranchField } from './Fields/AddressBranchField';
+import { AddressFactField } from './Fields/AddressFactField';
 import { AddressField } from './Fields/AddressField';
+import { AddressMatchField } from './Fields/AddressMatchField';
 import { AmountField } from './Fields/AmountField';
 import { AmountWorkersField } from './Fields/AmountWorkersField';
 import { AnnualRevenueField } from './Fields/AnnualRevenueField';
@@ -107,7 +109,7 @@ export const getField =
       experience5Years: <Experience5YearsField field={field} input={input} />,
       jobsNumber: <JobsNumberField field={field} input={input} />,
       beginDate: <BeginDateField field={field} input={input} />,
-      addressFact: <AddressField field={field} input={input} />,
+      addressFact: <AddressFactField field={field} input={input} />,
       organizationAddress: <AddressField field={field} input={input} />,
       comment: <CommentField field={field} input={input} />,
       addressBranch: <AddressBranchField field={field} input={input} isPremium={isPremium} />,
@@ -184,6 +186,7 @@ export const getField =
       partInBusiness: <PartInBusinessField field={field} input={input} />,
       regionRetail: <RetailRegionField field={field} input={input} />,
       addressRetail: <RetailAddressField field={field} input={input} />,
+      addressMatch: <AddressMatchField field={field} input={input} />,
     };
 
     return isRenderField({ input, field }) ? (

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

@@ -95,6 +95,7 @@ export const validatorObj: Record<string, Validator> = {
   partInBusiness: defaultValidator(),
   regionRetail: defaultSelectValidator('Выберите филиал банка'),
   addressRetail: defaultSelectValidator('Выберите адрес банка'),
+  addressMatch: defaultValidator(),
 };
 
 export const getObjectValidator = (inputs: FieldDef[]): Record<string, Validator> => {

package/src/ui-kit/Input/InputControl.tsx

@@ -27,6 +27,7 @@ export const InputControl = JSX<InputProps>(
     daDataQueryPrefix,
     inputLength,
     dadata = false,
+    disabled = false,
   }) => {
     const [isOpen, { setFalse: close, setTrue: open }] = useBool();
     const popupRef = useOutsideClick<HTMLDivElement>(close);
@@ -54,6 +55,7 @@ export const InputControl = JSX<InputProps>(
       >
         <div ref={inputRef}>
           <Input
+            disabled={disabled}
             type={type || 'text'}
             aria-label={label}
             label={getRequiredLabel({ label, errors })}