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

package/bundle/bundle.umd.js

@@ -1555,8 +1555,6 @@
     const isValidationSuccess = (info) => !info?.length;
     const validator = (predicate) => (message) => (_) => predicate(_) ? [] : [message];
 
-    const pattern = (regexp) => validator((_) => typeof _ === 'string' && regexp.test(_));
-
     const required = validator((_) => _ !== null && _ !== undefined && _ !== '');
 
     const ERROR_MESSAGE = 'Некорректно заполненное поле';
@@ -1572,7 +1570,9 @@
     const serieValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 4)(errorMsg);
     const numberValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 6)(errorMsg);
     const innValidator = (errorMsg) => validator((_) => typeof _ === 'string' && (_.length === 10 || _.length === 12))(errorMsg);
-    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);
+    const phoneValidator = (errorMsg) => validator(phoneValidate)(errorMsg);
+    const phoneOptionalValidator = (errorMsg) => validator((_) => !_ || phoneValidate(_))(errorMsg);
     const agreementValidator = validator((_) => typeof _ === 'boolean' && _)('Согласие обязательно');
     const snilsValidate = (snils) => {
         const snl = String(snils).replace(/[^0-9]+/g, '');
@@ -1619,7 +1619,7 @@
         region: defaultSelectValidator(),
         addressBranch: defaultSelectValidator(),
         phone: phoneValidator('Укажите номер телефона'),
-        secondaryPhone: phoneValidator('Укажите номер телефона'),
+        secondaryPhone: phoneOptionalValidator('Укажите номер телефона'),
         organizationPhone: phoneValidator('Укажите номер телефона'),
         birthday: defaultValidator('Укажите дату рождения'),
         limitedBirthday: limitedBirthdayValidator(),
@@ -4057,15 +4057,7 @@
         return (jsx(SelectControl, { label: "\u0420\u0435\u0433\u0438\u043E\u043D", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0440\u0435\u0433\u0438\u043E\u043D", isSearch: true, options: formatRegions, ...getValidation(field('regionRetail'), validatorObj.regionRetail, input?.required) }));
     });
 
-    const RetirementIncomeField = JSX(({ field, input }) => {
-        const currentWages = field('wages')?.value;
-        const onChange = useCallback((_) => {
-            const incomesSum = Number(_) + Number(currentWages || 0);
-            field('retirementIncome')?.onChange?.(_);
-            field('incomeAverage')?.onChange?.(String(incomesSum));
-        }, [currentWages]);
-        return (jsx(InputControl, { label: "\u041F\u0435\u043D\u0441\u0438\u043E\u043D\u043D\u044B\u0435 \u0434\u043E\u0445\u043E\u0434\u044B", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", isInteger: true, ...getValidation(field('retirementIncome'), validatorObj.retirementIncome, input?.required), ...input, onChange: onChange }));
-    });
+    const RetirementIncomeField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041F\u0435\u043D\u0441\u0438\u043E\u043D\u043D\u044B\u0435 \u0434\u043E\u0445\u043E\u0434\u044B", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", isInteger: true, ...getValidation(field('retirementIncome'), validatorObj.retirementIncome, input?.required), ...input })));
 
     const SecondaryPhoneField = JSX(({ field }) => {
         const fieldPhone = field('secondaryPhone');
@@ -4154,15 +4146,7 @@
         return (jsx("div", { className: "py-m gap-m grid @xl:flex @xl:items-center", children: jsx(RadioButtonGroup, { className: "whitespace-normal", orientation: "horizontal", items: VED_TYPES, value: value, onChange: (_) => onChange && onChange(_) }) }));
     });
 
-    const WagesField = JSX(({ field, input }) => {
-        const currentRetirementIncome = field('retirementIncome')?.value;
-        const onChange = useCallback((_) => {
-            const incomesSum = Number(_) + Number(currentRetirementIncome || 0);
-            field('wages')?.onChange?.(_);
-            field('incomeAverage')?.onChange?.(String(incomesSum));
-        }, [currentRetirementIncome]);
-        return (jsx(InputControl, { label: "\u0421\u043E\u0432\u043E\u043A\u0443\u043F\u043D\u044B\u0439 \u0434\u043E\u0445\u043E\u0434 \u0432 \u043C\u0435\u0441\u044F\u0446 \u043F\u043E\u0441\u043B\u0435 \u0432\u044B\u0447\u0435\u0442\u0430 \u043D\u0430\u043B\u043E\u0433\u043E\u0432 (\u0437\u0430\u0440\u043F\u043B\u0430\u0442\u0430, \u043F\u0440\u0435\u043C\u0438\u0438)", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", isInteger: true, ...getValidation(field('wages'), validatorObj.wages, input?.required), ...input, onChange: onChange }));
-    });
+    const WagesField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0421\u043E\u0432\u043E\u043A\u0443\u043F\u043D\u044B\u0439 \u0434\u043E\u0445\u043E\u0434 \u0432 \u043C\u0435\u0441\u044F\u0446 \u043F\u043E\u0441\u043B\u0435 \u0432\u044B\u0447\u0435\u0442\u0430 \u043D\u0430\u043B\u043E\u0433\u043E\u0432 (\u0437\u0430\u0440\u043F\u043B\u0430\u0442\u0430, \u043F\u0440\u0435\u043C\u0438\u0438)", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", isInteger: true, ...getValidation(field('wages'), validatorObj.wages, input?.required), ...input })));
 
     function isRenderField({ input, field, }) {
         const { condition } = input;
@@ -4415,9 +4399,7 @@
         }, [responseType]);
         return (jsxs(ApplicationFormLayout, { className: style('container space-y-m', className), title: title, ...rest, children: [jsxs("form", { onSubmit: onSubmit, children: [sections.map((_, i) => (jsxs("div", { className: style(inputColumnStyles(_.columns), 'grid gap-x-m'), children: [renderTitle(_.title), (_?.inputs || [])?.map(getField(field, { typeForm }))] }, `section-${i}`))), renderAgreementSubmit(fieldName ? field('consentDataProcessing') : undefined, link, button)] }), isContacts ? renderContacts() : null] }));
     });
-    const getFilteredInputs = (inputs, data) => inputs
-        .filter((_) => (_?.name === 'secondaryPhone' ? Boolean(data.secondaryPhone) : _))
-        .filter((input) => !input?.condition ||
+    const getFilteredInputs = (inputs, data) => inputs.filter((input) => !input?.condition ||
         input?.condition.values.find((_) => {
             const dataValue = data?.[input?.condition?.name ?? ''];
             return _ === (dataValue?.key ?? dataValue);
@@ -4792,6 +4774,98 @@
 
     const DraftActionButton = JSX(({ title, icon, description, onClick = noop }) => (jsxs("button", { className: "flex gap-lg items-center border border-gray rounded-md cursor-pointer p-4 hover:border-green", type: "button", onClick: onClick, children: [jsx(Img, { image: { icon: icon, iconVersion: 'black' }, width: "78", height: "78" }), jsxs("div", { className: "w-full md:w-auto", children: [jsx(Heading, { className: "text-center md:text-left", title: title, headingType: "h5" }), description ? (jsx(Paragraph, { color: "text-secondary-text", size: "text-m", children: description })) : null] })] })));
 
+    const fieldsNamesToContactKeysMap = {
+        email: 'EMAIL',
+        phone: 'MAIN_PHONE',
+        organizationPhone: 'ORGANIZATION_PHONE',
+    };
+    const fieldsNamesToAddressKeysMap = {
+        addressRegistration: 'REGISTRATION',
+        addressFact: 'RESIDENTAL',
+        organizationAddress: 'WORK',
+        addressCourier: 'DELIVERY',
+    };
+    const fieldsNamesToIncomeKeysMap = {
+        incomeAverage: 'INCOME_AVERAGE',
+        mandatoryPayments: 'MANDATORY_PAYMENTS',
+        additionalIncome: 'ADDITIONAL_INCOME',
+        otherIncome: 'OTHER_INCOME',
+        otherPayments: 'OTHER_PAYMENTS',
+        rentalIncome: 'RENTAL_INCOME',
+        wages: 'WAGES',
+        retirementIncome: 'RETIREMENT_INCOME',
+    };
+    const getParticipantContacts$1 = (fields) => Object.entries(fields).reduce((acc, [key, value]) => {
+        if (key in fieldsNamesToContactKeysMap) {
+            return [
+                ...acc,
+                {
+                    contactTypeCd: {
+                        key: fieldsNamesToContactKeysMap[key],
+                    },
+                    value,
+                },
+            ];
+        }
+        return acc;
+    }, []);
+    const getParticipantAddresses$1 = (fields) => Object.entries(fields).reduce((acc, [key, value]) => {
+        if (key in fieldsNamesToAddressKeysMap) {
+            const address = Object.fromEntries(Object.entries(value ?? {})
+                .filter(([k]) => !k.startsWith('qc')) // exclude dadata fields
+                .map(([k, v]) => [k, v ?? '']));
+            return [
+                ...acc,
+                {
+                    addressType: {
+                        key: fieldsNamesToAddressKeysMap[key],
+                    },
+                    ...address,
+                },
+            ];
+        }
+        return acc;
+    }, []);
+    const getParticipantIncomes$1 = (fields) => Object.entries(fields).reduce((acc, [key, value]) => {
+        if (key in fieldsNamesToIncomeKeysMap) {
+            return [
+                ...acc,
+                {
+                    incomeTypeCd: {
+                        key: fieldsNamesToIncomeKeysMap[key],
+                    },
+                    value: Number(value || 0),
+                },
+            ];
+        }
+        return acc;
+    }, []);
+
+    const getFamilyStatusAndIncomeData = (formData) => {
+        const { familyStatus, dependents, familyMembers, children, confirmationIncome, wages, mandatoryPayments, additionalIncome, otherIncome, otherPayments, rentalIncome, retirementIncome, snils, armyIdFlg, conscription, } = formData;
+        return {
+            maritalStatusCd: familyStatus,
+            totalDependents: familyMembers,
+            incomeCertificateCd: confirmationIncome,
+            otherDependents: dependents,
+            childrenDependents: children,
+            militaryStatusCd: conscription,
+            participantIncomes: getParticipantIncomes$1({
+                wages,
+                mandatoryPayments,
+                incomeAverage: countIncomeAverage(wages, retirementIncome),
+                additionalIncome,
+                otherIncome,
+                otherPayments,
+                rentalIncome,
+                retirementIncome,
+            }),
+            snils: snils?.replaceAll(' ', '').replaceAll('-', ''),
+            armyIdFlg,
+        };
+    };
+    const countIncomeAverage = (wages, retirementIncome) => Number(wages) + Number(retirementIncome);
+
     const creditCodesToProgrammIdMap = {
         credit_cash: '10',
         credit_cash_single_doc: '28',
@@ -4814,15 +4888,15 @@
         ...creditCodesToProgrammIdMap,
         ...cardCodesToProgrammIdMap,
     };
-    const getParticipantIncomes$1 = (participantIncomes) => {
+    const getParticipantIncomes = (participantIncomes) => {
         const wages = participantIncomes?.find((contact) => contact.incomeTypeCd.key === "WAGES" /* EIncomesType.WAGES */)?.value;
         const mandatoryPayments = participantIncomes?.find((contact) => contact.incomeTypeCd.key === "MANDATORY_PAYMENTS" /* EIncomesType.MANDATORY_PAYMENTS */)?.value;
-        const incomeAverage = participantIncomes?.find((contact) => contact.incomeTypeCd.key === "INCOME_AVERAGE" /* EIncomesType.INCOME_AVERAGE */)?.value;
         const additionalIncome = participantIncomes?.find((contact) => contact.incomeTypeCd.key === "ADDITIONAL_INCOME" /* EIncomesType.ADDITIONAL_INCOME */)?.value;
         const otherIncome = participantIncomes?.find((contact) => contact.incomeTypeCd.key === "OTHER_INCOME" /* EIncomesType.OTHER_INCOME */)?.value;
         const otherPayments = participantIncomes?.find((contact) => contact.incomeTypeCd.key === "OTHER_PAYMENTS" /* EIncomesType.OTHER_PAYMENTS */)?.value;
         const rentalIncome = participantIncomes?.find((contact) => contact.incomeTypeCd.key === "RENTAL_INCOME" /* EIncomesType.RENTAL_INCOME */)?.value;
         const retirementIncome = participantIncomes?.find((contact) => contact.incomeTypeCd.key === "RETIREMENT_INCOME" /* EIncomesType.RETIREMENT_INCOME */)?.value;
+        const incomeAverage = countIncomeAverage(wages, retirementIncome);
         return {
             wages,
             mandatoryPayments,
@@ -4834,7 +4908,7 @@
             retirementIncome,
         };
     };
-    const getParticipantAddresses$1 = (participantAddresses) => {
+    const getParticipantAddresses = (participantAddresses) => {
         const addressRegistration = participantAddresses?.find((address) => address.addressType.key === "REGISTRATION" /* EAddressType.REGISTRATION */);
         const addressFact = participantAddresses?.find((address) => address.addressType.key === "RESIDENTAL" /* EAddressType.RESIDENTAL */);
         const organizationAddress = participantAddresses?.find((address) => address.addressType.key === "WORK" /* EAddressType.WORK */);
@@ -4844,7 +4918,7 @@
             organizationAddress,
         };
     };
-    const getParticipantContacts$1 = (participantContacts) => {
+    const getParticipantContacts = (participantContacts) => {
         const email = participantContacts?.find((contact) => contact.contactTypeCd.key === "EMAIL" /* EContactType.EMail */)?.value;
         const phone = participantContacts?.find((contact) => contact.contactTypeCd.key === "MAIN_PHONE" /* EContactType.MainPhone */)?.value;
         const organizationPhone = participantContacts?.find((contact) => contact.contactTypeCd.key === "ORGANIZATION_PHONE" /* EContactType.OrganizationPhone */)?.value;
@@ -4926,9 +5000,9 @@
                 monthsValue,
                 isAnnuity: paymentTypeCd?.key === 'ANNUITY',
             },
-            ...getParticipantIncomes$1(participantIncomes),
-            ...getParticipantAddresses$1(participantAddresses),
-            ...getParticipantContacts$1(participantContacts),
+            ...getParticipantIncomes(participantIncomes),
+            ...getParticipantAddresses(participantAddresses),
+            ...getParticipantContacts(participantContacts),
             ...getParticipantGender(genderCd),
         };
     };
@@ -5013,73 +5087,6 @@
         }, [open, nextStepLink]);
     };
 
-    const fieldsNamesToContactKeysMap = {
-        email: 'EMAIL',
-        phone: 'MAIN_PHONE',
-        organizationPhone: 'ORGANIZATION_PHONE',
-    };
-    const fieldsNamesToAddressKeysMap = {
-        addressRegistration: 'REGISTRATION',
-        addressFact: 'RESIDENTAL',
-        organizationAddress: 'WORK',
-        addressCourier: 'DELIVERY',
-    };
-    const fieldsNamesToIncomeKeysMap = {
-        incomeAverage: 'INCOME_AVERAGE',
-        mandatoryPayments: 'MANDATORY_PAYMENTS',
-        additionalIncome: 'ADDITIONAL_INCOME',
-        otherIncome: 'OTHER_INCOME',
-        otherPayments: 'OTHER_PAYMENTS',
-        rentalIncome: 'RENTAL_INCOME',
-        wages: 'WAGES',
-        retirementIncome: 'RETIREMENT_INCOME',
-    };
-    const getParticipantContacts = (fields) => Object.entries(fields).reduce((acc, [key, value]) => {
-        if (key in fieldsNamesToContactKeysMap) {
-            return [
-                ...acc,
-                {
-                    contactTypeCd: {
-                        key: fieldsNamesToContactKeysMap[key],
-                    },
-                    value,
-                },
-            ];
-        }
-        return acc;
-    }, []);
-    const getParticipantAddresses = (fields) => Object.entries(fields).reduce((acc, [key, value]) => {
-        if (key in fieldsNamesToAddressKeysMap) {
-            const address = Object.fromEntries(Object.entries(value ?? {})
-                .filter(([k]) => !k.startsWith('qc')) // exclude dadata fields
-                .map(([k, v]) => [k, v ?? '']));
-            return [
-                ...acc,
-                {
-                    addressType: {
-                        key: fieldsNamesToAddressKeysMap[key],
-                    },
-                    ...address,
-                },
-            ];
-        }
-        return acc;
-    }, []);
-    const getParticipantIncomes = (fields) => Object.entries(fields).reduce((acc, [key, value]) => {
-        if (key in fieldsNamesToIncomeKeysMap) {
-            return [
-                ...acc,
-                {
-                    incomeTypeCd: {
-                        key: fieldsNamesToIncomeKeysMap[key],
-                    },
-                    value: Number(value || 0),
-                },
-            ];
-        }
-        return acc;
-    }, []);
-
     const getLeadFormTaskData = ({ participantId, taskId, profileId, formData, }) => {
         const { name, surname, middleName, limitedBirthday, phone, email } = formData;
         const navigator = locationNavigator();
@@ -5099,7 +5106,7 @@
                         profile: {
                             id: profileId,
                         },
-                        participantContacts: getParticipantContacts({
+                        participantContacts: getParticipantContacts$1({
                             phone: phone && formatPhone(phone),
                             email,
                         }),
@@ -7041,38 +7048,14 @@
             jobsNumber,
             lastWorkDuration: lastJobExperience,
             positionCd: positionOrganization,
-            participantContacts: getParticipantContacts({
+            participantContacts: getParticipantContacts$1({
                 organizationPhone: organizationPhone && formatPhone(organizationPhone),
             }),
-            participantAddresses: getParticipantAddresses({ organizationAddress }),
+            participantAddresses: getParticipantAddresses$1({ organizationAddress }),
             ownershipShare: positionOrganization?.key === 'BUSINESS_OWNER' ? partInBusiness : '',
         };
     };
 
-    const getFamilyStatusAndIncomeData = (formData) => {
-        const { familyStatus, dependents, familyMembers, children, confirmationIncome, wages, mandatoryPayments, incomeAverage, additionalIncome, otherIncome, otherPayments, rentalIncome, retirementIncome, snils, armyIdFlg, conscription, } = formData;
-        return {
-            maritalStatusCd: familyStatus,
-            totalDependents: familyMembers,
-            incomeCertificateCd: confirmationIncome,
-            otherDependents: dependents,
-            childrenDependents: children,
-            militaryStatusCd: conscription,
-            participantIncomes: getParticipantIncomes({
-                wages,
-                mandatoryPayments,
-                incomeAverage,
-                additionalIncome,
-                otherIncome,
-                otherPayments,
-                rentalIncome,
-                retirementIncome,
-            }),
-            snils: snils?.replaceAll(' ', '').replaceAll('-', ''),
-            armyIdFlg,
-        };
-    };
-
     const getPersonalInfoData = (formData) => {
         const { name, surname, middleName, limitedBirthday = '', phone = '', email, sex, birthPlace, dulIssueDateField = '', dulIssuedBy, dulNumber, dulSerie, dulSubdivisionCode, education, participantDateRegistration = '', housing, addressRegistration, addressFact, } = formData;
         return {
@@ -7089,11 +7072,11 @@
             educationLevelCd: education,
             registrationDate: formatDate(participantDateRegistration, true),
             houseTypeCd: housing,
-            participantContacts: getParticipantContacts({
+            participantContacts: getParticipantContacts$1({
                 phone: formatPhone(phone),
                 email,
             }),
-            participantAddresses: getParticipantAddresses({ addressRegistration, addressFact }),
+            participantAddresses: getParticipantAddresses$1({ addressRegistration, addressFact }),
             genderCd: sex
                 ? {
                     key: sex === 'male' ? 'MAN' : 'WOMAN',
@@ -7134,7 +7117,7 @@
         const isCourierDelivery = methodObtain === 'courier';
         return isCourierDelivery
             ? {
-                participantAddresses: getParticipantAddresses({ addressCourier }),
+                participantAddresses: getParticipantAddresses$1({ addressCourier }),
             }
             : {};
     };
@@ -10510,7 +10493,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.722";
+    const packageVersion = "0.14.724";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;