@redneckz/wildless-cms-uni-blocks 0.14.723 → 0.14.725

package/mobile/lib/ui-kit/FormField/getObjectValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"getObjectValidator.js","sourceRoot":"","sources":["../../../src/ui-kit/FormField/getObjectValidator.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"getObjectValidator.js","sourceRoot":"","sources":["../../../src/ui-kit/FormField/getObjectValidator.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EACL,sBAAsB,EACtB,4BAA4B,EAC5B,kBAAkB,EAClB,iBAAiB,EACjB,sBAAsB,EACtB,gBAAgB,EAChB,cAAc,EACd,YAAY,EACZ,kBAAkB,EAClB,qBAAqB,EACrB,wBAAwB,EACxB,aAAa,EACb,eAAe,EACf,sBAAsB,EACtB,cAAc,EACd,cAAc,EACd,cAAc,GACf,MAAM,cAAc,CAAC;AAEtB,MAAM,CAAC,MAAM,YAAY,GAA8B;IACrD,QAAQ,EAAE,gBAAgB,EAAE;IAC5B,OAAO,EAAE,aAAa,CAAC,sBAAsB,CAAC;IAC9C,IAAI,EAAE,aAAa,CAAC,kBAAkB,CAAC;IACvC,UAAU,EAAE,aAAa,CAAC,uBAAuB,CAAC;IAClD,MAAM,EAAE,sBAAsB,EAAE;IAChC,aAAa,EAAE,sBAAsB,EAAE;IACvC,KAAK,EAAE,cAAc,CAAC,wBAAwB,CAAC;IAC/C,cAAc,EAAE,sBAAsB,CAAC,wBAAwB,CAAC;IAChE,iBAAiB,EAAE,cAAc,CAAC,wBAAwB,CAAC;IAC3D,QAAQ,EAAE,gBAAgB,CAAC,uBAAuB,CAAC;IACnD,eAAe,EAAE,wBAAwB,EAAE;IAC3C,UAAU,EAAE,gBAAgB,CAAC,wBAAwB,CAAC;IACtD,SAAS,EAAE,sBAAsB,CAAC,2BAA2B,CAAC;IAC9D,OAAO,EAAE,sBAAsB,CAAC,oBAAoB,CAAC;IACrD,UAAU,EAAE,sBAAsB,CAAC,uCAAuC,CAAC;IAC3E,YAAY,EAAE,sBAAsB,CAAC,0BAA0B,CAAC;IAChE,aAAa,EAAE,sBAAsB,CAAC,8CAA8C,CAAC;IACrF,kBAAkB,EAAE,sBAAsB,CAAC,uCAAuC,CAAC;IACnF,oBAAoB,EAAE,sBAAsB,CAAC,0BAA0B,CAAC;IACxE,oBAAoB,EAAE,sBAAsB,CAAC,yBAAyB,CAAC;IACvE,QAAQ,EAAE,cAAc,CAAC,wBAAwB,CAAC;IAClD,SAAS,EAAE,eAAe,CAAC,wBAAwB,CAAC;IACpD,iBAAiB,EAAE,gBAAgB,CAAC,8BAA8B,CAAC;IACnE,kBAAkB,EAAE,eAAe,CAAC,2BAA2B,CAAC;IAChE,WAAW,EAAE,gBAAgB,CAAC,uCAAuC,CAAC;IACtE,KAAK,EAAE,cAAc,CAAC,2BAA2B,CAAC;IAClD,QAAQ,EAAE,gBAAgB,EAAE;IAC5B,GAAG,EAAE,YAAY,CAAC,aAAa,CAAC;IAChC,SAAS,EAAE,gBAAgB,CAAC,aAAa,CAAC;IAC1C,gBAAgB,EAAE,gBAAgB,CAAC,kCAAkC,CAAC;IACtE,gBAAgB,EAAE,kBAAkB,CAAC,8BAA8B,CAAC;IACpE,iBAAiB,EAAE,kBAAkB,CAAC,wCAAwC,CAAC;IAC/E,gBAAgB,EAAE,kBAAkB,CAAC,uCAAuC,CAAC;IAC7E,UAAU,EAAE,kBAAkB,CAAC,mDAAmD,CAAC;IACnF,SAAS,EAAE,gBAAgB,CAAC,4CAA4C,CAAC;IACzE,WAAW,EAAE,sBAAsB,EAAE;IACrC,eAAe,EAAE,gBAAgB,EAAE;IACnC,eAAe,EAAE,gBAAgB,EAAE;IACnC,OAAO,EAAE,gBAAgB,EAAE;IAC3B,aAAa,EAAE,sBAAsB,EAAE;IACvC,cAAc,EAAE,sBAAsB,EAAE;IACxC,WAAW,EAAE,sBAAsB,EAAE;IACrC,gBAAgB,EAAE,sBAAsB,EAAE;IAC1C,YAAY,EAAE,sBAAsB,CAAC,iBAAiB,CAAC;IACvD,UAAU,EAAE,gBAAgB,EAAE;IAC9B,OAAO,EAAE,gBAAgB,EAAE;IAC3B,UAAU,EAAE,gBAAgB,EAAE;IAC9B,qBAAqB,EAAE,kBAAkB;IACzC,aAAa,EAAE,gBAAgB,EAAE;IACjC,yBAAyB,EAAE,kBAAkB;IAC7C,sBAAsB,EAAE,kBAAkB;IAC1C,kBAAkB,EAAE,kBAAkB;IACtC,aAAa,EAAE,kBAAkB;IACjC,gBAAgB,EAAE,kBAAkB;IACpC,gBAAgB,EAAE,kBAAkB;IACpC,YAAY,EAAE,sBAAsB,CAAC,6BAA6B,CAAC;IACnE,QAAQ,EAAE,qBAAqB,CAAC,CAAC,EAAE,0BAA0B,CAAC;IAC9D,aAAa,EAAE,qBAAqB,CAAC,CAAC,EAAE,iCAAiC,CAAC;IAC1E,UAAU,EAAE,qBAAqB,CAAC,CAAC,EAAE,+BAA+B,CAAC;IACrE,WAAW,EAAE,qBAAqB,CAAC,EAAE,EAAE,mDAAmD,CAAC;IAC3F,QAAQ,EAAE,qBAAqB,CAAC,EAAE,EAAE,mCAAmC,CAAC;IACxE,KAAK,EAAE,cAAc,CAAC,0BAA0B,CAAC;IACjD,YAAY,EAAE,gBAAgB,EAAE;IAChC,SAAS,EAAE,kBAAkB;IAC7B,GAAG,EAAE,gBAAgB,CAAC,kBAAkB,CAAC;IACzC,mBAAmB,EAAE,sBAAsB,EAAE;IAC7C,mBAAmB,EAAE,4BAA4B,EAAE;IACnD,2BAA2B,EAAE,gBAAgB,CAAC,0BAA0B,CAAC;IACzE,gBAAgB,EAAE,gBAAgB,EAAE;IACpC,WAAW,EAAE,gBAAgB,EAAE;IAC/B,KAAK,EAAE,gBAAgB,EAAE;IACzB,iBAAiB,EAAE,gBAAgB,EAAE;IACrC,gBAAgB,EAAE,gBAAgB,EAAE;IACpC,aAAa,EAAE,gBAAgB,EAAE;IACjC,cAAc,EAAE,gBAAgB,EAAE;IAClC,eAAe,EAAE,gBAAgB,EAAE;IACnC,gBAAgB,EAAE,gBAAgB,EAAE;IACpC,cAAc,EAAE,gBAAgB,EAAE;IAClC,aAAa,EAAE,sBAAsB,CAAC,sBAAsB,CAAC;IAC7D,YAAY,EAAE,gBAAgB,EAAE;IAChC,QAAQ,EAAE,iBAAiB,CAAC,iCAAiC,CAAC;IAC9D,kBAAkB,EAAE,sBAAsB,EAAE;IAC5C,YAAY,EAAE,gBAAgB,CAAC,uBAAuB,CAAC;IACvD,cAAc,EAAE,sBAAsB,EAAE;IACxC,YAAY,EAAE,gBAAgB,CAAC,yBAAyB,CAAC;IACzD,aAAa,EAAE,gBAAgB,CAAC,+BAA+B,CAAC;IAChE,QAAQ,EAAE,gBAAgB,CAAC,gBAAgB,CAAC;CAC7C,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,MAAkB,EAA6B,EAAE;IAClF,MAAM,cAAc,GAAG,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAW,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IAE/F,OAAO,MAAM,CAAC,WAAW,CACvB,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAC7F,CAAC;AACJ,CAAC,CAAC"}

package/mobile/lib/ui-kit/FormField/validators.d.ts

@@ -7,7 +7,8 @@ export declare const lengthStringValidator: (inputLength: number, errorMsg?: str
 export declare const serieValidator: (errorMsg: string) => import("../../validation/validator").Validator<any>;
 export declare const numberValidator: (errorMsg: string) => import("../../validation/validator").Validator<any>;
 export declare const innValidator: (errorMsg: string) => import("../../validation/validator").Validator<any>;
-export declare const phoneValidator: (errorMsg: string) => import("../../validation/validator").Validator<any>;
+export declare const phoneValidator: (errorMsg: string) => import("../../validation/validator").Validator<string>;
+export declare const phoneOptionalValidator: (errorMsg: string) => import("../../validation/validator").Validator<string>;
 export declare const agreementValidator: import("../../validation/validator").Validator<any>;
 export declare const snilsValidator: (errorMsg: string) => import("../../validation/validator").Validator<string>;
 export declare const emailValidator: (errorMsg: string) => import("../../validation/validator").Validator<string>;

package/mobile/lib/ui-kit/FormField/validators.js

@@ -1,4 +1,3 @@
-import { pattern } from '../../validation/pattern.js';
 import { required } from '../../validation/required.js';
 import { validator } from '../../validation/validator.js';
 const ERROR_MESSAGE = 'Некорректно заполненное поле';
@@ -14,7 +13,9 @@ export const lengthStringValidator = (inputLength, errorMsg) => validator((_) =>
 export const serieValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 4)(errorMsg);
 export const numberValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 6)(errorMsg);
 export const innValidator = (errorMsg) => validator((_) => typeof _ === 'string' && (_.length === 10 || _.length === 12))(errorMsg);
-export const phoneValidator = (errorMsg) => pattern(/^(\+7)?[\s-]?\(?[0-9]{3}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/)(errorMsg);
+const phoneValidate = (email) => /^(\+7)?[\s-]?\(?[0-9]{3}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/.test(email);
+export const phoneValidator = (errorMsg) => validator(phoneValidate)(errorMsg);
+export const phoneOptionalValidator = (errorMsg) => validator((_) => !_ || phoneValidate(_))(errorMsg);
 export const agreementValidator = validator((_) => typeof _ === 'boolean' && _)('Согласие обязательно');
 const snilsValidate = (snils) => {
     const snl = String(snils).replace(/[^0-9]+/g, '');

package/mobile/lib/ui-kit/FormField/validators.js.map

@@ -1 +1 @@
-{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/ui-kit/FormField/validators.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/ui-kit/FormField/validators.ts"],"names":[],"mappings":"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"}

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

@@ -111,14 +111,12 @@ export const ApplicationForm = JSX<ApplicationFormProps>(
 );
 
 const getFilteredInputs = (inputs: FieldDef[], data: FormState) =>
-  inputs
-    .filter((_) => (_?.name === 'secondaryPhone' ? Boolean(data.secondaryPhone) : _))
-    .filter(
-      (input) =>
-        !input?.condition ||
-        input?.condition.values.find((_) => {
-          const dataValue = data?.[input?.condition?.name ?? ''];
+  inputs.filter(
+    (input) =>
+      !input?.condition ||
+      input?.condition.values.find((_) => {
+        const dataValue = data?.[input?.condition?.name ?? ''];
 
-          return _ === (dataValue?.key ?? dataValue);
-        }),
-    );
+        return _ === (dataValue?.key ?? dataValue);
+      }),
+  );

package/mobile/src/components/ApplicationLeadForm/LeadFormState.ts

@@ -117,7 +117,6 @@ export interface LeadFormState extends FormConsents, FormStateDeliveryType {
   participantDateRegistration?: Date | string;
   retirementIncome?: number;
   otherIncome?: number;
-  incomeAverage?: number;
   mandatoryPayments?: number;
   additionalIncome?: number;
   otherPayments?: number;

package/mobile/src/services/retail/adaptors/getFamilyStatusAndIncomeData.ts

@@ -11,7 +11,6 @@ export const getFamilyStatusAndIncomeData = (formData: LeadFormState): Partial<P
     confirmationIncome,
     wages,
     mandatoryPayments,
-    incomeAverage,
     additionalIncome,
     otherIncome,
     otherPayments,
@@ -32,7 +31,7 @@ export const getFamilyStatusAndIncomeData = (formData: LeadFormState): Partial<P
     participantIncomes: getParticipantIncomes({
       wages,
       mandatoryPayments,
-      incomeAverage,
+      incomeAverage: countIncomeAverage(wages, retirementIncome),
       additionalIncome,
       otherIncome,
       otherPayments,
@@ -43,3 +42,6 @@ export const getFamilyStatusAndIncomeData = (formData: LeadFormState): Partial<P
     armyIdFlg,
   };
 };
+
+export const countIncomeAverage = (wages?: number, retirementIncome?: number) =>
+  Number(wages) + Number(retirementIncome);

package/mobile/src/ui-kit/DraftDialog/utils.ts

@@ -1,6 +1,7 @@
 /* eslint-disable camelcase */
 import { type LeadProps } from '../../api/RetailAPI/model/LeadFormData';
 import { type Participant } from '../../api/RetailAPI/updateUserTask';
+import { countIncomeAverage } from '../../services/retail/adaptors/getFamilyStatusAndIncomeData';
 import { type Option } from '../Select/Option';
 
 export const enum EContactType {
@@ -61,9 +62,6 @@ export const getParticipantIncomes = (participantIncomes: Participant['participa
   const mandatoryPayments = participantIncomes?.find(
     (contact) => contact.incomeTypeCd.key === EIncomesType.MANDATORY_PAYMENTS,
   )?.value;
-  const incomeAverage = participantIncomes?.find(
-    (contact) => contact.incomeTypeCd.key === EIncomesType.INCOME_AVERAGE,
-  )?.value;
   const additionalIncome = participantIncomes?.find(
     (contact) => contact.incomeTypeCd.key === EIncomesType.ADDITIONAL_INCOME,
   )?.value;
@@ -79,6 +77,7 @@ export const getParticipantIncomes = (participantIncomes: Participant['participa
   const retirementIncome = participantIncomes?.find(
     (contact) => contact.incomeTypeCd.key === EIncomesType.RETIREMENT_INCOME,
   )?.value;
+  const incomeAverage = countIncomeAverage(wages, retirementIncome);
 
   return {
     wages,

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

@@ -1,31 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { InputControl } from '../../Input/InputControl';
 import type { CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const RetirementIncomeField = JSX<CustomFieldProps>(({ field, input }) => {
-  const currentWages = field('wages')?.value;
-
-  const onChange = useCallback(
-    (_: string) => {
-      const incomesSum = Number(_) + Number(currentWages || 0);
-
-      field('retirementIncome')?.onChange?.(_);
-      field('incomeAverage')?.onChange?.(String(incomesSum));
-    },
-    [currentWages],
-  );
-
-  return (
-    <InputControl
-      label="Пенсионные доходы"
-      placeholder="Введите значение"
-      isInteger={true}
-      {...getValidation(field('retirementIncome'), validatorObj.retirementIncome, input?.required)}
-      {...input}
-      onChange={onChange}
-    />
-  );
-});
+export const RetirementIncomeField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="Пенсионные доходы"
+    placeholder="Введите значение"
+    isInteger={true}
+    {...getValidation(field('retirementIncome'), validatorObj.retirementIncome, input?.required)}
+    {...input}
+  />
+));

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

@@ -1,31 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { InputControl } from '../../Input/InputControl';
 import type { CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const WagesField = JSX<CustomFieldProps>(({ field, input }) => {
-  const currentRetirementIncome = field('retirementIncome')?.value;
-
-  const onChange = useCallback(
-    (_: string) => {
-      const incomesSum = Number(_) + Number(currentRetirementIncome || 0);
-
-      field('wages')?.onChange?.(_);
-      field('incomeAverage')?.onChange?.(String(incomesSum));
-    },
-    [currentRetirementIncome],
-  );
-
-  return (
-    <InputControl
-      label="Совокупный доход в месяц после вычета налогов (зарплата, премии)"
-      placeholder="Введите значение"
-      isInteger={true}
-      {...getValidation(field('wages'), validatorObj.wages, input?.required)}
-      {...input}
-      onChange={onChange}
-    />
-  );
-});
+export const WagesField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="Совокупный доход в месяц после вычета налогов (зарплата, премии)"
+    placeholder="Введите значение"
+    isInteger={true}
+    {...getValidation(field('wages'), validatorObj.wages, input?.required)}
+    {...input}
+  />
+));

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

@@ -77,7 +77,6 @@ export type NameFieldDef =
   | 'participantDateRegistration'
   | 'retirementIncome'
   | 'otherIncome'
-  | 'incomeAverage'
   | 'mandatoryPayments'
   | 'additionalIncome'
   | 'otherPayments'

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

@@ -15,6 +15,7 @@ import {
   limitedBirthdayValidator,
   nameValidator,
   numberValidator,
+  phoneOptionalValidator,
   phoneValidator,
   serieValidator,
   snilsValidator,
@@ -28,7 +29,7 @@ export const validatorObj: Record<string, Validator> = {
   region: defaultSelectValidator(),
   addressBranch: defaultSelectValidator(),
   phone: phoneValidator('Укажите номер телефона'),
-  secondaryPhone: phoneValidator('Укажите номер телефона'),
+  secondaryPhone: phoneOptionalValidator('Укажите номер телефона'),
   organizationPhone: phoneValidator('Укажите номер телефона'),
   birthday: defaultValidator('Укажите дату рождения'),
   limitedBirthday: limitedBirthdayValidator(),

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

@@ -1,5 +1,4 @@
 import { type Address } from '../../components/ApplicationLeadForm/LeadFormState';
-import { pattern } from '../../validation/pattern';
 import { required } from '../../validation/required';
 import { validator } from '../../validation/validator';
 
@@ -40,8 +39,13 @@ export const numberValidator = (errorMsg: string) =>
 export const innValidator = (errorMsg: string) =>
   validator((_) => typeof _ === 'string' && (_.length === 10 || _.length === 12))(errorMsg);
 
-export const phoneValidator = (errorMsg: string) =>
-  pattern(/^(\+7)?[\s-]?\(?[0-9]{3}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/)(errorMsg);
+const phoneValidate = (email: string) =>
+  /^(\+7)?[\s-]?\(?[0-9]{3}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/.test(email);
+
+export const phoneValidator = (errorMsg: string) => validator(phoneValidate)(errorMsg);
+
+export const phoneOptionalValidator = (errorMsg: string) =>
+  validator((_: string) => !_ || phoneValidate(_))(errorMsg);
 
 export const agreementValidator = validator((_) => typeof _ === 'boolean' && _)(
   'Согласие обязательно',

package/package.json

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

package/src/components/ApplicationForm/ApplicationForm.tsx

@@ -111,14 +111,12 @@ export const ApplicationForm = JSX<ApplicationFormProps>(
 );
 
 const getFilteredInputs = (inputs: FieldDef[], data: FormState) =>
-  inputs
-    .filter((_) => (_?.name === 'secondaryPhone' ? Boolean(data.secondaryPhone) : _))
-    .filter(
-      (input) =>
-        !input?.condition ||
-        input?.condition.values.find((_) => {
-          const dataValue = data?.[input?.condition?.name ?? ''];
+  inputs.filter(
+    (input) =>
+      !input?.condition ||
+      input?.condition.values.find((_) => {
+        const dataValue = data?.[input?.condition?.name ?? ''];
 
-          return _ === (dataValue?.key ?? dataValue);
-        }),
-    );
+        return _ === (dataValue?.key ?? dataValue);
+      }),
+  );

package/src/components/ApplicationLeadForm/LeadFormState.ts

@@ -117,7 +117,6 @@ export interface LeadFormState extends FormConsents, FormStateDeliveryType {
   participantDateRegistration?: Date | string;
   retirementIncome?: number;
   otherIncome?: number;
-  incomeAverage?: number;
   mandatoryPayments?: number;
   additionalIncome?: number;
   otherPayments?: number;

package/src/services/retail/adaptors/getFamilyStatusAndIncomeData.ts

@@ -11,7 +11,6 @@ export const getFamilyStatusAndIncomeData = (formData: LeadFormState): Partial<P
     confirmationIncome,
     wages,
     mandatoryPayments,
-    incomeAverage,
     additionalIncome,
     otherIncome,
     otherPayments,
@@ -32,7 +31,7 @@ export const getFamilyStatusAndIncomeData = (formData: LeadFormState): Partial<P
     participantIncomes: getParticipantIncomes({
       wages,
       mandatoryPayments,
-      incomeAverage,
+      incomeAverage: countIncomeAverage(wages, retirementIncome),
       additionalIncome,
       otherIncome,
       otherPayments,
@@ -43,3 +42,6 @@ export const getFamilyStatusAndIncomeData = (formData: LeadFormState): Partial<P
     armyIdFlg,
   };
 };
+
+export const countIncomeAverage = (wages?: number, retirementIncome?: number) =>
+  Number(wages) + Number(retirementIncome);

package/src/ui-kit/DraftDialog/utils.ts

@@ -1,6 +1,7 @@
 /* eslint-disable camelcase */
 import { type LeadProps } from '../../api/RetailAPI/model/LeadFormData';
 import { type Participant } from '../../api/RetailAPI/updateUserTask';
+import { countIncomeAverage } from '../../services/retail/adaptors/getFamilyStatusAndIncomeData';
 import { type Option } from '../Select/Option';
 
 export const enum EContactType {
@@ -61,9 +62,6 @@ export const getParticipantIncomes = (participantIncomes: Participant['participa
   const mandatoryPayments = participantIncomes?.find(
     (contact) => contact.incomeTypeCd.key === EIncomesType.MANDATORY_PAYMENTS,
   )?.value;
-  const incomeAverage = participantIncomes?.find(
-    (contact) => contact.incomeTypeCd.key === EIncomesType.INCOME_AVERAGE,
-  )?.value;
   const additionalIncome = participantIncomes?.find(
     (contact) => contact.incomeTypeCd.key === EIncomesType.ADDITIONAL_INCOME,
   )?.value;
@@ -79,6 +77,7 @@ export const getParticipantIncomes = (participantIncomes: Participant['participa
   const retirementIncome = participantIncomes?.find(
     (contact) => contact.incomeTypeCd.key === EIncomesType.RETIREMENT_INCOME,
   )?.value;
+  const incomeAverage = countIncomeAverage(wages, retirementIncome);
 
   return {
     wages,

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

@@ -1,31 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { InputControl } from '../../Input/InputControl';
 import type { CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const RetirementIncomeField = JSX<CustomFieldProps>(({ field, input }) => {
-  const currentWages = field('wages')?.value;
-
-  const onChange = useCallback(
-    (_: string) => {
-      const incomesSum = Number(_) + Number(currentWages || 0);
-
-      field('retirementIncome')?.onChange?.(_);
-      field('incomeAverage')?.onChange?.(String(incomesSum));
-    },
-    [currentWages],
-  );
-
-  return (
-    <InputControl
-      label="Пенсионные доходы"
-      placeholder="Введите значение"
-      isInteger={true}
-      {...getValidation(field('retirementIncome'), validatorObj.retirementIncome, input?.required)}
-      {...input}
-      onChange={onChange}
-    />
-  );
-});
+export const RetirementIncomeField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="Пенсионные доходы"
+    placeholder="Введите значение"
+    isInteger={true}
+    {...getValidation(field('retirementIncome'), validatorObj.retirementIncome, input?.required)}
+    {...input}
+  />
+));

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

@@ -1,31 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { InputControl } from '../../Input/InputControl';
 import type { CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const WagesField = JSX<CustomFieldProps>(({ field, input }) => {
-  const currentRetirementIncome = field('retirementIncome')?.value;
-
-  const onChange = useCallback(
-    (_: string) => {
-      const incomesSum = Number(_) + Number(currentRetirementIncome || 0);
-
-      field('wages')?.onChange?.(_);
-      field('incomeAverage')?.onChange?.(String(incomesSum));
-    },
-    [currentRetirementIncome],
-  );
-
-  return (
-    <InputControl
-      label="Совокупный доход в месяц после вычета налогов (зарплата, премии)"
-      placeholder="Введите значение"
-      isInteger={true}
-      {...getValidation(field('wages'), validatorObj.wages, input?.required)}
-      {...input}
-      onChange={onChange}
-    />
-  );
-});
+export const WagesField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="Совокупный доход в месяц после вычета налогов (зарплата, премии)"
+    placeholder="Введите значение"
+    isInteger={true}
+    {...getValidation(field('wages'), validatorObj.wages, input?.required)}
+    {...input}
+  />
+));

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

@@ -77,7 +77,6 @@ export type NameFieldDef =
   | 'participantDateRegistration'
   | 'retirementIncome'
   | 'otherIncome'
-  | 'incomeAverage'
   | 'mandatoryPayments'
   | 'additionalIncome'
   | 'otherPayments'

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

@@ -15,6 +15,7 @@ import {
   limitedBirthdayValidator,
   nameValidator,
   numberValidator,
+  phoneOptionalValidator,
   phoneValidator,
   serieValidator,
   snilsValidator,
@@ -28,7 +29,7 @@ export const validatorObj: Record<string, Validator> = {
   region: defaultSelectValidator(),
   addressBranch: defaultSelectValidator(),
   phone: phoneValidator('Укажите номер телефона'),
-  secondaryPhone: phoneValidator('Укажите номер телефона'),
+  secondaryPhone: phoneOptionalValidator('Укажите номер телефона'),
   organizationPhone: phoneValidator('Укажите номер телефона'),
   birthday: defaultValidator('Укажите дату рождения'),
   limitedBirthday: limitedBirthdayValidator(),

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

@@ -1,5 +1,4 @@
 import { type Address } from '../../components/ApplicationLeadForm/LeadFormState';
-import { pattern } from '../../validation/pattern';
 import { required } from '../../validation/required';
 import { validator } from '../../validation/validator';
 
@@ -40,8 +39,13 @@ export const numberValidator = (errorMsg: string) =>
 export const innValidator = (errorMsg: string) =>
   validator((_) => typeof _ === 'string' && (_.length === 10 || _.length === 12))(errorMsg);
 
-export const phoneValidator = (errorMsg: string) =>
-  pattern(/^(\+7)?[\s-]?\(?[0-9]{3}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/)(errorMsg);
+const phoneValidate = (email: string) =>
+  /^(\+7)?[\s-]?\(?[0-9]{3}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/.test(email);
+
+export const phoneValidator = (errorMsg: string) => validator(phoneValidate)(errorMsg);
+
+export const phoneOptionalValidator = (errorMsg: string) =>
+  validator((_: string) => !_ || phoneValidate(_))(errorMsg);
 
 export const agreementValidator = validator((_) => typeof _ === 'boolean' && _)(
   'Согласие обязательно',