@redneckz/wildless-cms-uni-blocks 0.14.665 → 0.14.666

package/bundle/bundle.umd.js

@@ -1530,8 +1530,8 @@
         participantDateRegistration: defaultValidator('Укажите дату регистрации'),
         retirementIncome: defaultValidator(),
         otherIncome: defaultValidator(),
-        mandatoryIncome: defaultValidator(),
-        otherPayments: defaultValidator(),
+        wages: defaultValidator(),
+        mandatoryPayments: defaultValidator(),
         disablePeopleFlg: defaultValidator(),
         bankruptcyFlg: defaultValidator(),
         shareholderFlg: defaultValidator(),
@@ -2469,7 +2469,7 @@
         return (jsx(SelectControl, { label: "\u041D\u0430\u0441\u0435\u043B\u0435\u043D\u043D\u044B\u0439 \u043F\u0443\u043D\u043A\u0442", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0433\u043E\u0440\u043E\u0434, \u0433\u0434\u0435 \u0434\u043E\u0441\u0442\u0443\u043F\u0435\u043D \u0441\u0435\u0440\u0432\u0438\u0441", options: localities, ...getValidation(field('localities'), validatorObj.localities, input?.required), isSearch: true }));
     });
 
-    const MandatoryIncomeField = 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", type: "number", ...getValidation(field('mandatoryIncome'), validatorObj.mandatoryIncome, input?.required), ...input })));
+    const MandatoryPaymentsField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u044B\u0435 \u0432\u044B\u043F\u043B\u0430\u0442\u044B", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", type: "number", ...getValidation(field('mandatoryPayments'), validatorObj.mandatoryPayments, input?.required), ...input })));
 
     const METHODS_OF_OBTAIN = [
         { id: 'office', text: 'В отделении Банка' },
@@ -2501,8 +2501,6 @@
 
     const OtherIncomeField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0418\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", type: "number", ...getValidation(field('otherIncome'), validatorObj.otherIncome, input?.required), ...input })));
 
-    const OtherPaymentsField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u044B\u0435 \u0432\u044B\u043F\u043B\u0430\u0442\u044B", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", type: "number", ...getValidation(field('otherPayments'), validatorObj.otherPayments, input?.required), ...input })));
-
     const ParticipantDateRegistrationField = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u043F\u043E \u043C\u0435\u0441\u0442\u0443 \u0436\u0438\u0442\u0435\u043B\u044C\u0441\u0442\u0432\u0430", ...getValidation(field('participantDateRegistration'), validatorObj.participantDateRegistration, input?.required) })));
 
     const MAX_PART = 100;
@@ -3252,7 +3250,15 @@
         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: useMemo(() => regions?.map(({ region = '' }) => ({ key: region, text: region })), [regions]), ...getValidation(field('regionRetail'), validatorObj.regionRetail, input?.required) }));
     });
 
-    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", type: "number", ...getValidation(field('retirementIncome'), validatorObj.retirementIncome, input?.required), ...input })));
+    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", type: "number", ...getValidation(field('retirementIncome'), validatorObj.retirementIncome, input?.required), ...input, onChange: onChange }));
+    });
 
     const SecondaryPhoneField = JSX(({ field }) => {
         const fieldPhone = field('secondaryPhone');
@@ -3317,6 +3323,16 @@
         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", type: "number", ...getValidation(field('wages'), validatorObj.wages, input?.required), ...input, onChange: onChange }));
+    });
+
     function isRenderField({ input, field, }) {
         const { condition } = input;
         const { value } = field(condition?.name || '');
@@ -3404,8 +3420,8 @@
             participantDateRegistration: jsx(ParticipantDateRegistrationField, { field: field, input: input }),
             retirementIncome: jsx(RetirementIncomeField, { field: field, input: input }),
             otherIncome: jsx(OtherIncomeField, { field: field, input: input }),
-            mandatoryIncome: jsx(MandatoryIncomeField, { field: field, input: input }),
-            otherPayments: jsx(OtherPaymentsField, { field: field, input: input }),
+            wages: jsx(WagesField, { field: field, input: input }),
+            mandatoryPayments: jsx(MandatoryPaymentsField, { field: field, input: input }),
             disablePeopleFlg: jsx(DisablePeopleFlgField, { field: field, input: input }),
             bankruptcyFlg: jsx(BankruptcyFlgField, { field: field, input: input }),
             shareholderFlg: jsx(ShareholderFlgField, { field: field, input: input }),
@@ -4049,8 +4065,14 @@
         organizationAddress: 'WORK',
     };
     const fieldsNamesToIncomeKeysMap = {
-        mandatoryIncome: 'INCOME_AVERAGE',
-        otherPayments: 'MANDATORY_PAYMENTS',
+        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) {
@@ -4091,7 +4113,7 @@
                     incomeTypeCd: {
                         key: fieldsNamesToIncomeKeysMap[key],
                     },
-                    value,
+                    value: Number(value || 0),
                 },
             ];
         }
@@ -5987,6 +6009,40 @@
     const renderBlocks = (info) => (jsx("div", { className: "flex gap-5xl grow basis-0", children: info.map((column, i) => renderBlocksColumn({ column, i })) }));
     const renderBlocksColumn = ({ column, i }) => column ? (jsx("div", { className: "flex flex-col gap-xl grow basis-0", children: column.map(({ title = '', description, additionalDescription, button }, key) => (jsxs("div", { children: [jsx(Headline, { title: title, description: description, headlineVersion: "XS", align: "text-left", isEmbedded: true }), additionalDescription ? (jsx("div", { className: "mt-xs opacity-80", children: jsx(Paragraph, { size: "text-m", font: "font-light", children: additionalDescription }) })) : null, jsx("div", { className: style({ 'mt-xl': Boolean(button?.text) }), children: renderButtonsSection([button]) })] }, String(key)))) }, `col-${String(i)}`)) : null;
 
+    const PORTAL_NATURAL_URL = '/';
+    const UPDATING_INTERVAL = 60000 * 4;
+    const updateRefreshToken = () => {
+        const refreshToken = globalThis.sessionStorage?.getItem('refreshToken');
+        const accessToken = globalThis.sessionStorage?.getItem('accessToken');
+        const taskId = globalThis.localStorage.getItem('taskId');
+        if (!accessToken || !refreshToken || !taskId) {
+            globalThis.location.href = PORTAL_NATURAL_URL;
+            return () => null;
+        }
+        const updateTokenRequest = async () => {
+            const res = await doRequest('/auth/refresh', 'POST', {
+                // eslint-disable-next-line camelcase
+                refresh_token: refreshToken,
+                // eslint-disable-next-line camelcase
+                access_token: accessToken,
+            });
+            if (res instanceof Response) {
+                handleStatus(res.status);
+                return;
+            }
+            globalThis.sessionStorage.setItem('refreshToken', res.refresh_token);
+            globalThis.sessionStorage.setItem('accessToken', res.access_token);
+        };
+        updateTokenRequest();
+        const timer = setInterval(updateTokenRequest, UPDATING_INTERVAL);
+        return () => clearInterval(timer);
+    };
+    const handleStatus = (status) => {
+        if (status == 401) {
+            globalThis.location.href = PORTAL_NATURAL_URL;
+        }
+    };
+
     const ProgressBar = JSX(({ step = 10, description, showPercentage = true }) => (jsxs("div", { children: [jsx("div", { className: "h-4 w-full bg-gray relative", children: jsx("div", { className: "h-4 bg-green", style: { width: `${step}%` } }) }), jsxs("div", { className: "relative", children: [showPercentage ? jsxs("div", { className: "absolute left-2/4 text-green", children: [step, "%"] }) : null, description ? jsx("div", { className: "text-right mr-4 text-gray", children: description }) : null] })] })));
 
     const CreditCardFormProgress = JSX(({ step = 1, totalSteps = 6, stepsTitles = [] }) => {
@@ -6173,8 +6229,8 @@
             dependents: undefined,
             familyMembers: undefined,
             confirmationIncome: { key: '', text: '' },
-            mandatoryIncome: undefined,
-            otherPayments: undefined,
+            wages: undefined,
+            mandatoryPayments: undefined,
             snils: '',
             armyIdFlg: false,
         },
@@ -6290,14 +6346,20 @@
     };
 
     const getFourthStepData$1 = (formData) => {
-        const { familyStatus, dependents, familyMembers, mandatoryIncome, otherPayments, snils, armyIdFlg, } = formData;
+        const { familyStatus, dependents, familyMembers, wages, mandatoryPayments, incomeAverage, additionalIncome, otherIncome, otherPayments, rentalIncome, retirementIncome, snils, armyIdFlg, } = formData;
         return {
             maritalStatusCd: familyStatus,
             totalDependents: familyMembers,
             otherDependents: dependents,
             participantIncomes: getParticipantIncomes({
-                mandatoryIncome,
+                wages,
+                mandatoryPayments,
+                incomeAverage,
+                additionalIncome,
+                otherIncome,
                 otherPayments,
+                rentalIncome,
+                retirementIncome,
             }),
             snils: snils?.replaceAll(' ', ''),
             armyIdFlg,
@@ -6688,11 +6750,11 @@
             },
             {
                 columns: 1,
-                inputs: [{ fieldType: 'common', name: 'mandatoryIncome', required: true }],
+                inputs: [{ fieldType: 'common', name: 'wages', required: true }],
             },
             {
                 columns: 1,
-                inputs: [{ fieldType: 'common', name: 'otherPayments', required: true }],
+                inputs: [{ fieldType: 'common', name: 'mandatoryPayments', required: true }],
             },
             {
                 columns: 1,
@@ -6830,6 +6892,7 @@
     ];
     const CreditCardForm = JSX(({ className, ...rest }) => {
         const [step, setStep] = useState(0);
+        useEffect(updateRefreshToken, []);
         const handleNextStep = useCallback(() => {
             setStep((_) => Math.min(_ + 1, WIZARD_STEPS$1));
         }, []);
@@ -6842,40 +6905,6 @@
         return (jsx(BlockWrapper, { className: style('bg-transparent', className), defaultPadding: "p-0", ...rest, children: jsxs("div", { className: "container grid grid-cols-12", children: [isFormFinished ? null : (jsx(CreditCardFormProgress, { stepsTitles: WIZARD_TITLES$1, step: step, totalSteps: WIZARD_STEPS$1 })), jsx("div", { className: "py-lg px-5xl mt-2xs bg-white col-span-12", children: jsx(CreditCardFormStep, { step: step, sections: sections, onNextStep: handleNextStep, onPrevStep: handlePrevStep, isFormFinished: isFormFinished, finishForm: setIsFormFinished }, String(step)) })] }) }));
     });
 
-    const PORTAL_NATURAL_URL = '/';
-    const UPDATING_INTERVAL = 60000 * 4;
-    const updateRefreshToken = () => {
-        const refreshToken = globalThis.sessionStorage?.getItem('refreshToken');
-        const accessToken = globalThis.sessionStorage?.getItem('accessToken');
-        const taskId = globalThis.localStorage.getItem('taskId');
-        if (!accessToken || !refreshToken || !taskId) {
-            globalThis.location.href = PORTAL_NATURAL_URL;
-            return () => null;
-        }
-        const updateTokenRequest = async () => {
-            const res = await doRequest('/auth/refresh', 'POST', {
-                // eslint-disable-next-line camelcase
-                refresh_token: refreshToken,
-                // eslint-disable-next-line camelcase
-                access_token: accessToken,
-            });
-            if (res instanceof Response) {
-                handleStatus(res.status);
-                return;
-            }
-            globalThis.sessionStorage.setItem('refreshToken', res.refresh_token);
-            globalThis.sessionStorage.setItem('accessToken', res.access_token);
-        };
-        updateTokenRequest();
-        const timer = setInterval(updateTokenRequest, UPDATING_INTERVAL);
-        return () => clearInterval(timer);
-    };
-    const handleStatus = (status) => {
-        if (status == 401) {
-            globalThis.location.href = PORTAL_NATURAL_URL;
-        }
-    };
-
     const CreditFormProgress = JSX(({ step = 1, totalSteps = 5, stepsTitles = [] }) => {
         const progress = useMemo(() => (step / totalSteps) * 100, [step, totalSteps]);
         return (jsx("div", { className: "py-lg px-5xl bg-white col-span-12", children: jsxs("div", { children: [jsxs("span", { className: "font-bold mr-s", children: ["\u0428\u0430\u0433 ", step, " \u0438\u0437 ", totalSteps, "."] }), stepsTitles[step] || null, jsx(ProgressBar, { step: progress, showPercentage: false })] }) }));
@@ -7067,8 +7096,8 @@
             dependents: undefined,
             familyMembers: undefined,
             confirmationIncome: { key: '', text: '' },
-            mandatoryIncome: undefined,
-            otherPayments: undefined,
+            wages: undefined,
+            mandatoryPayments: undefined,
             snils: '',
             armyIdFlg: false,
         },
@@ -7217,15 +7246,21 @@
     };
 
     const getThirdStepData = (formData) => {
-        const { familyStatus, dependents, familyMembers, confirmationIncome, mandatoryIncome, otherPayments, snils, armyIdFlg, } = formData;
+        const { familyStatus, dependents, familyMembers, confirmationIncome, wages, mandatoryPayments, incomeAverage, additionalIncome, otherIncome, otherPayments, rentalIncome, retirementIncome, snils, armyIdFlg, } = formData;
         return {
             maritalStatusCd: familyStatus,
             totalDependents: familyMembers,
             incomeCertificateCd: confirmationIncome,
             otherDependents: dependents,
             participantIncomes: getParticipantIncomes({
-                mandatoryIncome,
+                wages,
+                mandatoryPayments,
+                incomeAverage,
+                additionalIncome,
+                otherIncome,
                 otherPayments,
+                rentalIncome,
+                retirementIncome,
             }),
             snils: snils?.replaceAll(' ', ''),
             armyIdFlg,
@@ -7547,11 +7582,11 @@
             },
             {
                 columns: 1,
-                inputs: [{ fieldType: 'common', name: 'mandatoryIncome', required: true }],
+                inputs: [{ fieldType: 'common', name: 'wages', required: true }],
             },
             {
                 columns: 1,
-                inputs: [{ fieldType: 'common', name: 'otherPayments', required: true }],
+                inputs: [{ fieldType: 'common', name: 'mandatoryPayments', required: true }],
             },
             {
                 columns: 1,
@@ -9917,7 +9952,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.664";
+    const packageVersion = "0.14.665";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;