@redneckz/wildless-cms-uni-blocks 0.14.656 → 0.14.658

package/src/components/CreditForm/CreditFormStep.tsx

@@ -4,8 +4,8 @@ import { useForm } from '../../hooks/useForm';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { type SectionsProps } from '../../model/InputSectionsType';
 import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
 import { CreditFormStatusTracker } from './CreditFormStatusTracker';
-import { type FormStateMap } from './formStateMap';
 import { getInitialFormState } from './getInitialFormState';
 import { renderStep as defaultRenderStep, type CustomSubmit, type StepProps } from './renderStep';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
@@ -14,7 +14,6 @@ import { useCreditFormAPI } from './useCreditFormAPI';
 export interface CreditFormStepProps {
   step: number;
   sections: SectionsProps[];
-  inputs: FieldDef[];
   onNextStep: () => void;
   onPrevStep: () => void;
   renderStep?: (props: StepProps) => JSX.Element | JSX.Element[] | undefined;
@@ -28,16 +27,17 @@ export const CreditFormStep = JSX<CreditFormStepProps>(
     sections,
     onPrevStep,
     onNextStep,
-    inputs,
     renderStep = defaultRenderStep,
     isFormFinished,
     finishForm,
   }) => {
     const [localStorageData, saveStep] = useLocalStorage<Record<string, any>>('leadForm');
-    const initialState = getInitialFormState(step as keyof FormStateMap, localStorageData);
+    const initialState = getInitialFormState(step, localStorageData);
 
     const customSubmit = useRef<CustomSubmit | undefined>(undefined);
 
+    const inputs = (sections?.flatMap((_: SectionsProps) => _?.inputs) || []) as FieldDef[];
+
     const registerSubmit = useCallback((submit?: CustomSubmit) => {
       customSubmit.current = submit;
     }, []);
@@ -52,7 +52,7 @@ export const CreditFormStep = JSX<CreditFormStepProps>(
 
     const [, { field, onSubmit }] = useForm(initialState, {
       onSubmit: (formData, ev) => {
-        handleSubmit({ ...formData, ...customSubmit.current?.(ev) });
+        handleSubmit({ ...formData, ...customSubmit.current?.(ev) } as FormState);
       },
     });
 
@@ -60,7 +60,7 @@ export const CreditFormStep = JSX<CreditFormStepProps>(
       <CreditFormStatusTracker />
     ) : (
       <form onSubmit={onSubmit} className="space-y-m">
-        {renderStep({ sections, field, registerSubmit })}
+        {renderStep({ sections, field, step, registerSubmit })}
         <StepsNavigationButtons step={step} onPrevStep={onPrevStep} />
       </form>
     );

package/src/components/CreditForm/calculateInputs.ts

@@ -0,0 +1,44 @@
+import { type Option } from '../../ui-kit/Select/Option';
+import { type FieldDef } from '../ApplicationForm/ApplicationFormContent';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+
+export type GetValue = <K extends keyof FormState>(name: K) => FormState[K];
+
+export const calculateInputs = (getValue: GetValue) => (inputs: FieldDef[], step: number) =>
+  inputs
+    .filter((_) => _)
+    .map((_) => {
+      if (
+        [
+          checkIsRetiree(step, getValue),
+          checkBusinessOwner(_, getValue),
+          checkConsentPfrFlg(_, getValue),
+          checkAddressFillFromESIA(_, getValue),
+          checkCondition(_, getValue),
+        ].some(Boolean)
+      ) {
+        return { ..._, required: false };
+      }
+
+      return _;
+    });
+
+const checkIsRetiree = (step: number, getValue: GetValue) =>
+  step === 2 && getValue('employment')?.key === 'RETIREE';
+
+const checkBusinessOwner = ({ name }: FieldDef, getValue: GetValue) =>
+  name === 'partInBusiness' && getValue('positionOrganization')?.key !== 'BUSINESS_OWNER';
+
+const checkConsentPfrFlg = ({ name }: FieldDef, getValue: GetValue) =>
+  name === 'snils' && !getValue('consentPfrFlg');
+
+const checkAddressFillFromESIA = ({ name, filledByEsia }: FieldDef, getValue: GetValue) =>
+  name?.startsWith('address') && getValue('esiaAccountTypeCd')?.key && filledByEsia;
+
+export const checkCondition = ({ condition }: FieldDef, getValue: GetValue) =>
+  condition?.name &&
+  condition?.values?.some((_) => {
+    const dataValue = getValue(condition?.name);
+
+    return _ !== ((dataValue as Option)?.key ?? dataValue);
+  });

package/src/components/CreditForm/creditFormStepsData.tsx

@@ -23,8 +23,8 @@ export const stepsSectionsMap: SectionsProps[][] = [
         { 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: 'birthPlace', required: true },
-        { fieldType: 'common', name: 'phone', required: 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

@@ -1,80 +1,7 @@
-/* eslint-disable max-lines */
-import type { Option } from '../../ui-kit/Select/Option';
-import { type Address } from '../ApplicationLeadForm/getInitialFormState';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
 
-export interface FormStateMap {
-  0: {
-    moneyValue?: number;
-    monthsValue?: number;
-    isAnnuity?: boolean;
-    isInsurance?: boolean;
-    isSalaryClient?: boolean;
-    isPensionClient?: boolean;
-    isStateEmployee?: boolean;
-  };
-  1: {
-    surname?: string;
-    name?: string;
-    middleName?: string;
-    sex?: string;
-    birthday?: Date;
-    birthPlace?: string;
-    phone?: string;
-    email?: string;
-    dulSerie?: number;
-    dulNumber?: number;
-    dulIssueDateField?: Date;
-    dulSubdivisionCode?: string;
-    dulIssuedBy?: string;
-    addressRegistration?: Address;
-    participantDateRegistration?: Date;
-    addressFact?: Address;
-    housing?: string;
-  };
-  2: {
-    amountWorkers?: Option;
-    beginDate?: Date;
-    employerActivities?: Option;
-    employerOrganization?: Option;
-    employment?: Option;
-    experience5Years?: string;
-    inn?: number;
-    jobsNumber?: string;
-    lastJobExperience?: string;
-    legalForm?: string;
-    organization?: Option;
-    organizationAddress?: Address;
-    organizationName?: string;
-    organizationPhone?: string;
-    partInBusiness?: number;
-    positionOrganization?: Option;
-  };
-  3: {
-    familyStatus?: Option;
-    dependents?: number;
-    familyMembers?: number;
-    confirmationIncome?: Option;
-    mandatoryIncome?: number;
-    otherPayments?: number;
-    snils?: string;
-    armyIdFlg?: boolean;
-  };
-  4: {
-    disablePeopleFlg?: boolean;
-    bankruptcyFlg?: boolean;
-    shareholderFlg?: boolean;
-    legalEntityName?: string;
-    creditInRshbCd?: Option;
-  };
-  5: {
-    regionRetail?: string;
-    addressRetail?: string;
-    bankEmployeeCode?: string;
-  };
-}
-
-export const formStateMap: FormStateMap = {
-  0: {
+export const formStateMap: Partial<FormState>[] = [
+  {
     moneyValue: 0,
     monthsValue: 0,
     isAnnuity: false,
@@ -83,7 +10,7 @@ export const formStateMap: FormStateMap = {
     isPensionClient: false,
     isStateEmployee: false,
   },
-  1: {
+  {
     surname: '',
     name: '',
     middleName: '',
@@ -106,18 +33,18 @@ export const formStateMap: FormStateMap = {
       fullAddress: '',
       fiasCode: '',
     },
-    housing: '',
+    housing: undefined,
   },
-  2: {
+  {
     amountWorkers: { key: '', text: '' },
     beginDate: undefined,
     employerActivities: { key: '', text: '' },
     employerOrganization: { key: '', text: '' },
     employment: { key: '', text: '' },
-    experience5Years: '',
+    experience5Years: undefined,
     inn: undefined,
-    jobsNumber: '',
-    lastJobExperience: '',
+    jobsNumber: undefined,
+    lastJobExperience: undefined,
     legalForm: '',
     organization: { key: '', text: '' },
     organizationAddress: {
@@ -129,7 +56,7 @@ export const formStateMap: FormStateMap = {
     partInBusiness: undefined,
     positionOrganization: { key: '', text: '' },
   },
-  3: {
+  {
     familyStatus: { key: '', text: '' },
     dependents: undefined,
     familyMembers: undefined,
@@ -139,16 +66,16 @@ export const formStateMap: FormStateMap = {
     snils: '',
     armyIdFlg: false,
   },
-  4: {
+  {
     disablePeopleFlg: false,
     bankruptcyFlg: false,
     shareholderFlg: false,
     legalEntityName: '',
     creditInRshbCd: undefined,
   },
-  5: {
+  {
     regionRetail: '',
-    addressRetail: '',
-    bankEmployeeCode: '',
+    addressRetail: undefined,
+    bankEmployeeCode: undefined,
   },
-};
+];

package/src/components/CreditForm/getCreditFormTaskData.ts

@@ -26,7 +26,9 @@ export const getCreditFormTaskData = ({
   task: {
     taskSource: globalThis.location.origin,
     id: taskId,
-    //TODO: Добавить id офиса
+    office: {
+      id: '650',
+    },
     authorizedAgentId: formData?.bankEmployeeCode,
     participants: [
       {

package/src/components/CreditForm/getInitialFormState.tsx

@@ -1,28 +1,29 @@
-import { formStateMap, type FormStateMap } from './formStateMap';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { formStateMap } from './formStateMap';
 
-export const getInitialFormState = <Step extends keyof FormStateMap>(
-  step: Step,
+export const getInitialFormState = (
+  step: number,
   localStorageData: Record<string, any> | null,
-): FormStateMap[Step] => {
-  if (localStorageData) {
-    // TODO: Fill in for other fields with type Date
-    // TODO: Take it out to the helper
-    localStorageData.birthday = localStorageData.birthday
-      ? new Date(localStorageData.birthday as string)
-      : undefined;
-    localStorageData.dulIssueDateField = localStorageData.dulIssueDateField
-      ? new Date(localStorageData.dulIssueDateField as string)
-      : undefined;
-    localStorageData.participantDateRegistration = localStorageData.participantDateRegistration
-      ? new Date(localStorageData.participantDateRegistration as string)
-      : undefined;
-    localStorageData.beginDate = localStorageData?.beginDate
-      ? new Date(localStorageData.beginDate as string)
-      : undefined;
+): FormState => ({
+  ...formStateMap[step],
+  ...localStorageData,
+  birthday: transformStringToData(localStorageData?.birthday as string),
+  dulIssueDateField: transformStringToData(localStorageData?.dulIssueDateField as string),
+  participantDateRegistration: transformStringToData(
+    localStorageData?.participantDateRegistration as string,
+  ),
+  beginDate: transformStringToData(localStorageData?.beginDate as string),
+  deliveryDate: transformStringToData(localStorageData?.deliveryDate as string),
+});
+
+const transformStringToData = (text?: string) => {
+  if (!text) {
+    return undefined;
   }
 
-  return {
-    ...formStateMap[step],
-    ...localStorageData,
-  };
+  try {
+    return new Date(text);
+  } catch (_) {
+    return undefined;
+  }
 };

package/src/components/CreditForm/renderInputs.tsx

@@ -1,5 +1,12 @@
+import { type FormFieldRegisterer } from '../../hooks/useForm';
 import { getField } from '../../ui-kit/FormField/getField';
-import { type RenderInputsProps } from './CreditFormContent';
+import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+
+export interface RenderInputsProps {
+  inputs: FieldDef[];
+  field: FormFieldRegisterer<FormState>;
+}
 
 export const renderInputs = ({ field, inputs }: RenderInputsProps) =>
-  (inputs || [])?.map(getField(field, ''));
+  inputs.map(getField(field, ''));

package/src/components/CreditForm/renderStep.tsx

@@ -3,23 +3,34 @@ import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
 import { renderTitle } from '../../ui-kit/FormField/renderTitle';
 import { style } from '../../utils/style';
 import { type SectionsProps } from '../ApplicationForm/ApplicationFormContent';
-import { type FormStateMap } from './formStateMap';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { calculateInputs, type GetValue } from './calculateInputs';
 import { renderInfo } from './renderInfo';
 import { renderInputs } from './renderInputs';
 
-export type CustomSubmit = FormOperatorProps<FormStateMap[keyof FormStateMap]>['onSubmit'];
+export type CustomSubmit = FormOperatorProps<FormState>['onSubmit'];
 
 export interface StepProps {
   sections?: SectionsProps[];
-  field: FormFieldRegisterer<FormStateMap[keyof FormStateMap]>;
+  field: FormFieldRegisterer<FormState>;
   registerSubmit?: (submit: CustomSubmit) => void;
+  step: number;
 }
 
-export const renderStep = ({ sections, field }: StepProps) =>
-  sections?.map(({ inputs, columns, title }, i) => (
-    <div key={`section-${i}`} className={style(inputColumnStyles(columns), 'grid gap-x-m')}>
-      {renderInfo(inputs)}
-      {renderTitle(title)}
-      {renderInputs({ field, inputs })}
-    </div>
-  ));
+export const renderStep = ({ sections, field, step }: StepProps) =>
+  sections?.map(({ inputs: origInputs = [], columns, title }, i) => {
+    const inputs = calculateInputs(getValue(field))(origInputs, step);
+
+    return (
+      <div key={`section-${i}`} className={style(inputColumnStyles(columns), 'grid gap-x-m')}>
+        {renderInfo(inputs)}
+        {renderTitle(title)}
+        {renderInputs({ field, inputs })}
+      </div>
+    );
+  });
+
+const getValue =
+  (field: FormFieldRegisterer<FormState>): GetValue =>
+  (name) =>
+    field(name)?.value;

package/src/components/CreditForm/useCreditFormAPI.tsx

@@ -5,7 +5,8 @@ import { getObjectValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { objectValidator } from '../../validation/objectValidator';
 import { isValidationSuccess } from '../../validation/validator';
 import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
-import { type FormStateMap } from './formStateMap';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { calculateInputs, type GetValue } from './calculateInputs';
 import { getCreditFormTaskData } from './getCreditFormTaskData';
 
 type CreditFormApiProps = {
@@ -27,10 +28,11 @@ export const useCreditFormAPI = ({
   const [profileId] = useLocalStorage<number>('profileId');
   const [participantId] = useLocalStorage<number>('participantId');
 
-  const handleSubmit = useCallback(async (formData: FormStateMap[keyof FormStateMap]) => {
+  const handleSubmit = useCallback(async (formData: FormState) => {
     const feedbackValidator = objectValidator(
-      getObjectValidator(calculateInputs(formData, inputs, step)),
+      getObjectValidator(calculateInputs(getValue(formData))(inputs, step)),
     );
+    console.log(feedbackValidator(formData), inputs);
     if (!isValidationSuccess(feedbackValidator(formData))) {
       return console.warn('validation fail');
     }
@@ -67,22 +69,7 @@ export const useCreditFormAPI = ({
   };
 };
 
-const calculateInputs = (
-  formData: FormStateMap[keyof FormStateMap],
-  inputs: FieldDef[],
-  step: number,
-) => {
-  if (formData['positionOrganization']?.key !== 'BUSINESS_OWNER') {
-    return inputs.map((_) => (_?.name === 'partInBusiness' ? { ..._, required: false } : _));
-  }
-
-  if (!formData['consentPfrFlg']) {
-    return inputs.map((_) => (_?.name === 'snils' ? { ..._, required: false } : _));
-  }
-
-  if (step === 2 && formData['employment']?.key === 'RETIREE') {
-    return [];
-  }
-
-  return inputs;
-};
+const getValue =
+  (formData: FormState): GetValue =>
+  (name) =>
+    formData[name];

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

@@ -31,6 +31,9 @@ export const AddressFactField = 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/Fields/AddressField.tsx

@@ -2,7 +2,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 { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -39,23 +38,11 @@ export const AddressField = JSX<CustomFieldProps>(({ field, input }) => {
     });
   }, []);
 
-  const isDisabled = [
-    fieldName === 'addressRegistration',
-    input?.filledByEsia,
-    isEsiaAuthorize(field),
-  ].every(Boolean);
-
   return (
     <InputControl
-      disabled={isDisabled}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, fieldName)}
       label="Адрес"
-      {...getValidation(
-        field(fieldName),
-        validatorObj[fieldName],
-        input?.name === 'organizationAddress'
-          ? calculateIsRequired(field, input?.required)
-          : input?.required,
-      )}
+      {...getValidation(field(fieldName), validatorObj[fieldName], input?.required)}
       value={fieldValue.fullAddress}
       onChange={onChange}
       {...input}

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

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

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

@@ -4,9 +4,9 @@ import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const ArmyIdFlgField = JSX<CustomFieldProps>(({ field }) => (
+export const ArmyIdFlgField = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="Наличие военного билета"
-    {...getValidation(field('armyIdFlg'), validatorObj.armyIdFlg)}
+    {...getValidation(field('armyIdFlg'), validatorObj.armyIdFlg, input?.required)}
   />
 ));

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

@@ -4,9 +4,9 @@ import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const BankruptcyFlgField = JSX<CustomFieldProps>(({ field }) => (
+export const BankruptcyFlgField = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="В отношении меня ведётся производство по делу о банкротстве"
-    {...getValidation(field('bankruptcyFlg'), validatorObj.bankruptcyFlg)}
+    {...getValidation(field('bankruptcyFlg'), validatorObj.bankruptcyFlg, input?.required)}
   />
 ));

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

@@ -1,6 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { DatePickerControl } from '../../DatePicker/DatePickerControl';
-import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -8,11 +7,7 @@ import { getValidation } from '../getValidation';
 export const BeginDateField = JSX<CustomFieldProps>(({ field, input }) => (
   <DatePickerControl
     label="Дата начала работы на текущем месте"
-    {...getValidation(
-      field('beginDate'),
-      validatorObj.beginDate,
-      calculateIsRequired(field, input?.required),
-    )}
+    {...getValidation(field('beginDate'), validatorObj.beginDate, input?.required)}
     {...input}
   />
 ));

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

@@ -3,11 +3,15 @@ import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
+import { isEsiaAuthorize } from '../isEsiaAuthorize';
+
+const FIELD_NAME = 'birthPlace';
 
 export const BirthPlaceField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="Место рождения"
     {...getValidation(field('birthPlace'), validatorObj.birthPlace, input?.required)}
     {...input}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
   />
 ));

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

@@ -3,6 +3,7 @@ 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;
@@ -12,14 +13,17 @@ interface BirthdayFieldProps extends CustomFieldProps {
   isRetailForm?: boolean;
 }
 
+const FIELD_NAME = 'birthday';
+
 export const BirthdayField = JSX<BirthdayFieldProps>(({ field, input, isRetailForm = false }) => {
-  const { value } = field('birthday');
+  const { value } = field(FIELD_NAME);
 
   return (
     <DatePickerControl
       label="Дата рождения"
-      {...getValidation(field('birthday'), validatorObj.birthday, input?.required)}
+      {...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)}
     />
   );
 });

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

@@ -9,7 +9,7 @@ export const DependentsField = JSX<CustomFieldProps>(({ field, input }) => (
     label="Количество иждивенцев"
     placeholder="За исключение детей до 18 лет"
     type="number"
-    inputLength={2}
+    maxLength={2}
     {...getValidation(field('dependents'), validatorObj.dependents, input?.required)}
     {...input}
   />

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

@@ -4,9 +4,9 @@ import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const DisablePeopleFlgField = JSX<CustomFieldProps>(({ field }) => (
+export const DisablePeopleFlgField = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="Являюсь инвалидом"
-    {...getValidation(field('disablePeopleFlg'), validatorObj.disablePeopleFlg)}
+    {...getValidation(field('disablePeopleFlg'), validatorObj.disablePeopleFlg, input?.required)}
   />
 ));

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

@@ -5,10 +5,12 @@ import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
+const FIELD_NAME = 'dulIssueDateField';
+
 export const DulIssueDateField = JSX<CustomFieldProps>(({ field, input }) => (
   <DatePickerControl
     label="Дата выдачи"
-    {...getValidation(field('dulIssueDateField'), validatorObj.dulIssueDateField, input?.required)}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field)}
+    {...getValidation(field(FIELD_NAME), validatorObj.dulIssueDateField, input?.required)}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
   />
 ));

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

@@ -7,6 +7,8 @@ import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
+const FIELD_NAME = 'dulIssuedBy';
+
 export const DulIssuedByField = JSX<CustomFieldProps>(({ field, input }) => {
   const { value: dulSubdivisionCode, onChange: changeDulSubdivisionCode } =
     field('dulSubdivisionCode');
@@ -17,10 +19,10 @@ export const DulIssuedByField = JSX<CustomFieldProps>(({ field, input }) => {
 
   return (
     <InputControl
-      disabled={input?.filledByEsia && isEsiaAuthorize(field)}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
       label="Кем выдан"
       {...input}
-      {...getValidation(field('dulIssuedBy'), validatorObj.dulIssuedBy, input?.required)}
+      {...getValidation(field(FIELD_NAME), validatorObj.dulIssuedBy, input?.required)}
       onDaDataChange={onDaDataChange}
       daDataQueryPrefix={dulSubdivisionCode}
     />