@redneckz/wildless-cms-uni-blocks 0.14.641 → 0.14.643

package/mobile/src/components/ApplicationForm/ApplicationForm.tsx

@@ -44,6 +44,7 @@ export const ApplicationForm = JSX<ApplicationFormProps>(
     const inputs = (sections?.flatMap((_) => _?.inputs) || []) as FieldDef[];
     const initialFormState = getInitialFormState(inputs, typeForm);
     const [responseType, setResponseType] = useState<'OK' | 'Fail' | ''>('');
+    const responseTypeDialog = useResponseTypeDialog({ typeForm });
     const handleSubmit = useCallback(
       async (formData: FormState, ev: PreventableEventWithTarget) => {
         const inputsFiltered = getFilteredInputs(inputs, formData);
@@ -56,8 +57,7 @@ export const ApplicationForm = JSX<ApplicationFormProps>(
         setResponseType(status);
 
         if (status) {
-          const responseTypeDialog = useResponseTypeDialog({ responseType: status, typeForm });
-          responseTypeDialog.open();
+          responseTypeDialog.open({ responseType: status });
         }
         if (status === 'OK' && data) {
           const aspects = useAspects();

package/mobile/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/mobile/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/mobile/src/components/CreditForm/useCreditFormAPI.tsx

@@ -28,7 +28,9 @@ export const useCreditFormAPI = ({
   const [participantId] = useLocalStorage<number>('participantId');
 
   const handleSubmit = useCallback(async (formData: FormStateMap[keyof FormStateMap]) => {
-    const feedbackValidator = objectValidator(getObjectValidator(inputs));
+    const feedbackValidator = objectValidator(
+      getObjectValidator(calculateInputs(formData, inputs, step)),
+    );
     if (!isValidationSuccess(feedbackValidator(formData))) {
       return console.warn('validation fail');
     }
@@ -64,3 +66,10 @@ export const useCreditFormAPI = ({
     handleSubmit,
   };
 };
+
+const calculateInputs = (
+  formData: FormStateMap[keyof FormStateMap],
+  inputs: FieldDef[],
+  step: number,
+) =>
+  step === 2 && 'employment' in formData && formData?.employment?.key === 'RETIREE' ? [] : inputs;

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

@@ -2,6 +2,7 @@ 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';
@@ -24,6 +25,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,
     });
   }, []);
 
@@ -37,7 +41,13 @@ export const AddressField = JSX<CustomFieldProps>(({ field, input }) => {
   return (
     <InputControl
       label="Адрес"
-      {...getValidation(field(fieldName), validatorObj[fieldName], input?.required)}
+      {...getValidation(
+        field(fieldName),
+        validatorObj[fieldName],
+        input?.name === 'organizationAddress'
+          ? calculateIsRequired(field, input?.required)
+          : input?.required,
+      )}
       value={fieldValue.fullAddress}
       onChange={onChange}
       {...input}

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

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

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -10,7 +11,11 @@ export const Experience5YearsField = JSX<CustomFieldProps>(({ field, input }) =>
     placeholder="За последние 5 лет"
     type="number"
     inputLength={2}
-    {...getValidation(field('experience5Years'), validatorObj.experience5Years, input?.required)}
+    {...getValidation(
+      field('experience5Years'),
+      validatorObj.experience5Years,
+      calculateIsRequired(field, input?.required),
+    )}
     {...input}
   />
 ));

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -10,7 +11,11 @@ export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) =>
     type="number"
     inputLength={2}
     placeholder="Количество лет"
-    {...getValidation(field('generalSeniority'), validatorObj.generalSeniority, input?.required)}
+    {...getValidation(
+      field('generalSeniority'),
+      validatorObj.generalSeniority,
+      calculateIsRequired(field, input?.required),
+    )}
     {...input}
   />
 ));

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

@@ -2,6 +2,7 @@ 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';
@@ -18,7 +19,11 @@ export const InnField = JSX<CustomFieldProps>(({ field, input }) => {
       type="number"
       inputLength={12}
       {...input}
-      {...getValidation(field('inn'), validatorObj.inn, input?.required)}
+      {...getValidation(
+        field('inn'),
+        validatorObj.inn,
+        calculateIsRequired(field, input?.required),
+      )}
       onDaDataChange={onDaDataChange}
     />
   );

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -10,7 +11,11 @@ export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
     placeholder="Количество мест"
     type="number"
     inputLength={2}
-    {...getValidation(field('jobsNumber'), validatorObj.jobsNumber, input?.required)}
+    {...getValidation(
+      field('jobsNumber'),
+      validatorObj.jobsNumber,
+      calculateIsRequired(field, input?.required),
+    )}
     {...input}
   />
 ));

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -10,7 +11,11 @@ export const LastJobExperienceField = JSX<CustomFieldProps>(({ field, input }) =
     placeholder="Количество лет"
     type="number"
     inputLength={2}
-    {...getValidation(field('lastJobExperience'), validatorObj.lastJobExperience, input?.required)}
+    {...getValidation(
+      field('lastJobExperience'),
+      validatorObj.lastJobExperience,
+      calculateIsRequired(field, input?.required),
+    )}
     {...input}
   />
 ));

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -8,7 +9,11 @@ export const LegalFormField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="ОПФ"
     placeholder="ООО, ПАО  и др."
-    {...getValidation(field('legalForm'), validatorObj.legalForm, input?.required)}
+    {...getValidation(
+      field('legalForm'),
+      validatorObj.legalForm,
+      calculateIsRequired(field, input?.required),
+    )}
     {...input}
   />
 ));

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

@@ -2,6 +2,7 @@ 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';
@@ -16,7 +17,11 @@ export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) =>
     <InputControl
       label="Наименование организации"
       {...input}
-      {...getValidation(field('organizationName'), validatorObj.organizationName, input?.required)}
+      {...getValidation(
+        field('organizationName'),
+        validatorObj.organizationName,
+        calculateIsRequired(field, input?.required),
+      )}
       onDaDataChange={onDaDataChange}
     />
   );

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -8,7 +9,11 @@ const MAX_PART = 100;
 
 export const PartInBusinessField = JSX<CustomFieldProps>(({ field, input }) => {
   const partInBusinessField = {
-    ...getValidation(field('partInBusiness'), validatorObj.partInBusiness, input?.required),
+    ...getValidation(
+      field('partInBusiness'),
+      validatorObj.partInBusiness,
+      calculateIsRequired(field, input?.required),
+    ),
   };
 
   const handleChange = (value: string) =>

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputPhoneControl } from '../../Input/InputPhoneControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -7,7 +8,13 @@ import { getValidation } from '../getValidation';
 export const PhoneField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputPhoneControl
     label="Телефон"
-    {...getValidation(field(input?.name || 'phone'), validatorObj.phone, input?.required)}
+    {...getValidation(
+      field(input?.name || 'phone'),
+      validatorObj.phone,
+      input?.name === 'organizationPhone'
+        ? calculateIsRequired(field, input?.required)
+        : input?.required,
+    )}
     {...input}
   />
 ));

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

@@ -0,0 +1,6 @@
+import { type FieldProps } from '../../hooks/useForm';
+
+export const calculateIsRequired = (
+  field: (fieldName: string) => FieldProps<any>,
+  initialRequired?: boolean,
+) => (field?.('employment')?.value?.key === 'RETIREE' ? false : initialRequired);

package/mobile/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/mobile/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)('Укажите регион, город/населенный пункт, улицу, дом, квартиру');

package/mobile/src/ui-kit/ResponseTypeDialog/useResponseTypeDialog.tsx

@@ -6,11 +6,12 @@ export interface ResponseTypeDialogProps {
   typeForm?: string;
 }
 
-export const useResponseTypeDialog = (props: ResponseTypeDialogProps) => {
+export const useResponseTypeDialog = (initialProps: ResponseTypeDialogProps) => {
   const { open, close } = useDialogManager();
 
   return {
-    open: (options: DialogOptions = {}) => open(<ResponseTypeDialog {...props} />, options),
+    open: (props?: ResponseTypeDialogProps, options: DialogOptions = {}) =>
+      open(<ResponseTypeDialog {...initialProps} {...props} />, options),
     close,
   };
 };

package/package.json

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

package/src/api/RetailAPI/sendSignalToProcess.ts

@@ -16,4 +16,4 @@ interface SendSignalToProcessResponse {
 }
 
 export const sendSignalToProcess = (body: SendSignalToProcess) =>
-  doRequest<SendSignalToProcessResponse>('/public-data/sendSignalToProcess', 'POST', body);
+  doRequest<SendSignalToProcessResponse>('/user-data/sendSignalToProcess', 'POST', body);

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/ApplicationForm/ApplicationForm.tsx

@@ -44,6 +44,7 @@ export const ApplicationForm = JSX<ApplicationFormProps>(
     const inputs = (sections?.flatMap((_) => _?.inputs) || []) as FieldDef[];
     const initialFormState = getInitialFormState(inputs, typeForm);
     const [responseType, setResponseType] = useState<'OK' | 'Fail' | ''>('');
+    const responseTypeDialog = useResponseTypeDialog({ typeForm });
     const handleSubmit = useCallback(
       async (formData: FormState, ev: PreventableEventWithTarget) => {
         const inputsFiltered = getFilteredInputs(inputs, formData);
@@ -56,8 +57,7 @@ export const ApplicationForm = JSX<ApplicationFormProps>(
         setResponseType(status);
 
         if (status) {
-          const responseTypeDialog = useResponseTypeDialog({ responseType: status, typeForm });
-          responseTypeDialog.open();
+          responseTypeDialog.open({ responseType: status });
         }
         if (status === 'OK' && data) {
           const aspects = useAspects();

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/useCreditFormAPI.tsx

@@ -28,7 +28,9 @@ export const useCreditFormAPI = ({
   const [participantId] = useLocalStorage<number>('participantId');
 
   const handleSubmit = useCallback(async (formData: FormStateMap[keyof FormStateMap]) => {
-    const feedbackValidator = objectValidator(getObjectValidator(inputs));
+    const feedbackValidator = objectValidator(
+      getObjectValidator(calculateInputs(formData, inputs, step)),
+    );
     if (!isValidationSuccess(feedbackValidator(formData))) {
       return console.warn('validation fail');
     }
@@ -64,3 +66,10 @@ export const useCreditFormAPI = ({
     handleSubmit,
   };
 };
+
+const calculateInputs = (
+  formData: FormStateMap[keyof FormStateMap],
+  inputs: FieldDef[],
+  step: number,
+) =>
+  step === 2 && 'employment' in formData && formData?.employment?.key === 'RETIREE' ? [] : inputs;

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

@@ -2,6 +2,7 @@ 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';
@@ -24,6 +25,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,
     });
   }, []);
 
@@ -37,7 +41,13 @@ export const AddressField = JSX<CustomFieldProps>(({ field, input }) => {
   return (
     <InputControl
       label="Адрес"
-      {...getValidation(field(fieldName), validatorObj[fieldName], input?.required)}
+      {...getValidation(
+        field(fieldName),
+        validatorObj[fieldName],
+        input?.name === 'organizationAddress'
+          ? calculateIsRequired(field, input?.required)
+          : input?.required,
+      )}
       value={fieldValue.fullAddress}
       onChange={onChange}
       {...input}

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

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

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -10,7 +11,11 @@ export const Experience5YearsField = JSX<CustomFieldProps>(({ field, input }) =>
     placeholder="За последние 5 лет"
     type="number"
     inputLength={2}
-    {...getValidation(field('experience5Years'), validatorObj.experience5Years, input?.required)}
+    {...getValidation(
+      field('experience5Years'),
+      validatorObj.experience5Years,
+      calculateIsRequired(field, input?.required),
+    )}
     {...input}
   />
 ));

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -10,7 +11,11 @@ export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) =>
     type="number"
     inputLength={2}
     placeholder="Количество лет"
-    {...getValidation(field('generalSeniority'), validatorObj.generalSeniority, input?.required)}
+    {...getValidation(
+      field('generalSeniority'),
+      validatorObj.generalSeniority,
+      calculateIsRequired(field, input?.required),
+    )}
     {...input}
   />
 ));

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

@@ -2,6 +2,7 @@ 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';
@@ -18,7 +19,11 @@ export const InnField = JSX<CustomFieldProps>(({ field, input }) => {
       type="number"
       inputLength={12}
       {...input}
-      {...getValidation(field('inn'), validatorObj.inn, input?.required)}
+      {...getValidation(
+        field('inn'),
+        validatorObj.inn,
+        calculateIsRequired(field, input?.required),
+      )}
       onDaDataChange={onDaDataChange}
     />
   );

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -10,7 +11,11 @@ export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
     placeholder="Количество мест"
     type="number"
     inputLength={2}
-    {...getValidation(field('jobsNumber'), validatorObj.jobsNumber, input?.required)}
+    {...getValidation(
+      field('jobsNumber'),
+      validatorObj.jobsNumber,
+      calculateIsRequired(field, input?.required),
+    )}
     {...input}
   />
 ));

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -10,7 +11,11 @@ export const LastJobExperienceField = JSX<CustomFieldProps>(({ field, input }) =
     placeholder="Количество лет"
     type="number"
     inputLength={2}
-    {...getValidation(field('lastJobExperience'), validatorObj.lastJobExperience, input?.required)}
+    {...getValidation(
+      field('lastJobExperience'),
+      validatorObj.lastJobExperience,
+      calculateIsRequired(field, input?.required),
+    )}
     {...input}
   />
 ));

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
+import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -8,7 +9,11 @@ export const LegalFormField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="ОПФ"
     placeholder="ООО, ПАО  и др."
-    {...getValidation(field('legalForm'), validatorObj.legalForm, input?.required)}
+    {...getValidation(
+      field('legalForm'),
+      validatorObj.legalForm,
+      calculateIsRequired(field, input?.required),
+    )}
     {...input}
   />
 ));