@redneckz/wildless-cms-uni-blocks 0.14.640 → 0.14.642

package/src/api/dadataHints/dadataHintsType.ts

@@ -52,6 +52,8 @@ export interface DaDataAddress {
   settlement_with_type: Nullable<string>;
   street: Nullable<string>;
   fias_code: string;
+  qc_complete: Nullable<string>;
+  qc_house: Nullable<string>;
 }
 
 type DaDataResponseItem = Partial<

package/src/components/ApplicationLeadForm/getInitialFormState.tsx

@@ -34,6 +34,9 @@ export interface Address {
   region?: string;
   regionCode?: string;
   street?: string;
+  qc?: string;
+  qcComplete?: string;
+  qcHouse?: string;
 }
 
 export interface FormState extends FormConsents {

package/src/components/CreditForm/creditFormStepsData.tsx

@@ -179,6 +179,10 @@ export const stepsSectionsMap: SectionsProps[][] = [
       columns: 1,
       inputs: [{ fieldType: 'common', name: 'snils', required: true }],
     },
+    {
+      columns: 1,
+      inputs: [{ fieldType: 'common', name: 'conscription', required: true }],
+    },
     {
       columns: 2,
       inputs: [{ fieldType: 'common', name: 'armyIdFlg' }],

package/src/components/CreditForm/getCreditFormTaskData.ts

@@ -47,13 +47,13 @@ export const getCreditFormTaskData = ({
 
 const getCurrentStepData = (step: number, formData: FormState): Partial<Participant> => {
   switch (step) {
-    case 0:
-      return getFirstStepData(formData);
     case 1:
-      return getSecondStepData(formData);
+      return getFirstStepData(formData);
     case 2:
-      return getThirdStepData(formData);
+      return getSecondStepData(formData);
     case 3:
+      return getThirdStepData(formData);
+    case 4:
       return getFourthStepData(formData);
     default:
       return getFirstStepData(formData);

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

@@ -24,6 +24,9 @@ export const AddressField = JSX<CustomFieldProps>(({ field, input }) => {
       region: item?.data?.region,
       regionCode: item?.data?.region_kladr_id ? item?.data?.region_kladr_id.substring(0, 2) : '',
       street: item?.data?.house,
+      qc: item?.data?.qc,
+      qcComplete: item?.data?.qc_complete,
+      qcHouse: item?.data?.qc_house,
     });
   }, []);
 

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

@@ -2,6 +2,7 @@ import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormC
 import { type Validator } from '../../validation/validator';
 import { getNamesFromInput } from './getNamesFromInput';
 import {
+  addressDaDataValidator,
   agreementValidator,
   defaultSelectValidator,
   defaultValidator,
@@ -51,7 +52,7 @@ export const validatorObj: Record<string, Validator> = {
   experience5Years: jobNumberValidator('Укажите общий стаж за последние 5 лет'),
   jobsNumber: jobNumberValidator('Укажите количество мест работы за последние 5 лет'),
   beginDate: defaultValidator('Укажите дату заключения трудового договора'),
-  addressFact: defaultValidator(),
+  addressFact: addressDaDataValidator(),
   partnerComments: defaultValidator(),
   collectionCount: defaultValidator(),
   comment: defaultValidator(),
@@ -80,8 +81,8 @@ export const validatorObj: Record<string, Validator> = {
   conscription: defaultValidator(),
   armyIdFlg: agreementValidator,
   sex: defaultValidator('Укажите свой пол'),
-  addressRegistration: defaultValidator('Необходимо выбрать адрес'),
-  organizationAddress: defaultValidator('Необходимо выбрать адрес'),
+  addressRegistration: addressDaDataValidator(),
+  organizationAddress: addressDaDataValidator(),
   participantDateRegistration: defaultValidator('Укажите дату регистрации'),
   retirementIncome: defaultValidator(),
   otherIncome: defaultValidator(),

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

@@ -1,3 +1,4 @@
+import { type Address } from '../../components/ApplicationLeadForm/getInitialFormState';
 import { pattern } from '../../validation/pattern';
 import { required } from '../../validation/required';
 import { validator } from '../../validation/validator';
@@ -64,3 +65,9 @@ const emailValidate = (email: string) => /^[^\s@]+@[^\s@]+\.[a-zA-Z]{2,4}$/.test
 
 export const emailValidator = (errorMsg: string) =>
   validator((_: string) => emailValidate(_))(errorMsg);
+
+const addressDaDataValidate = (address: Address) =>
+  Boolean(address.qc === '0' && address.qcComplete === '0' && address.qcHouse === '2');
+
+export const addressDaDataValidator = () =>
+  validator(addressDaDataValidate)('Укажите регион, город/населенный пункт, улицу, дом, квартиру');