@redneckz/wildless-cms-uni-blocks 0.14.635 → 0.14.637

package/mobile/bundle/bundle.umd.js

@@ -1331,7 +1331,7 @@
         return inputRef;
     }
 
-    const InputControl = JSX(({ className, label, value = '', placeholder, error, errors, onChange = noop, onDaDataChange, onBlur, isTextarea, type, name = '', daDataQueryPrefix, inputLength, dadata = false, }) => {
+    const InputControl = JSX(({ className, label, value = '', placeholder, error, errors, onChange = noop, onDaDataChange, onBlur, isTextarea, type, name = '', daDataQueryPrefix, inputLength, dadata = false, disabled = false, }) => {
         const [isOpen, { setFalse: close, setTrue: open }] = useBool();
         const popupRef = useOutsideClick(close);
         const handleChange = useCallback((v) => (inputLength ? v.length <= inputLength && onChange(v) : onChange(v)), [onChange]);
@@ -1343,7 +1343,7 @@
             onChange,
             onDaDataChange,
         });
-        return (jsxs("div", { className: style('shrink-0 w-full', className), ref: popupRef, onBlur: close, onFocus: open, children: [jsx("div", { ref: inputRef, children: jsx(Input, { type: type || 'text', "aria-label": label, label: getRequiredLabel({ label, errors }), valid: Boolean(!error), value: value, onChange: handleChange, onBlur: onBlur, isTextarea: isTextarea, placeholder: getPlaceholder(placeholder, errors, label) }) }), renderErrorText(error)] }));
+        return (jsxs("div", { className: style('shrink-0 w-full', className), ref: popupRef, onBlur: close, onFocus: open, children: [jsx("div", { ref: inputRef, children: jsx(Input, { disabled: disabled, type: type || 'text', "aria-label": label, label: getRequiredLabel({ label, errors }), valid: Boolean(!error), value: value, onChange: handleChange, onBlur: onBlur, isTextarea: isTextarea, placeholder: getPlaceholder(placeholder, errors, label) }) }), renderErrorText(error)] }));
     });
     const getPlaceholder = (placeholder, errors, label) => errors && !label ? `${placeholder}*` : placeholder;
 
@@ -1538,6 +1538,7 @@
         partInBusiness: defaultValidator(),
         regionRetail: defaultSelectValidator('Выберите филиал банка'),
         addressRetail: defaultSelectValidator('Выберите адрес банка'),
+        addressMatch: defaultValidator(),
     };
     const getObjectValidator = (inputs) => {
         const requiredInputs = getNamesFromInput(inputs.filter((_) => Boolean(_?.required)));
@@ -1679,6 +1680,40 @@
             })), ...getValidation(field('addressBranch'), validatorObj.addressBranch, input?.required), isSearch: true }));
     });
 
+    const AddressFactField = JSX(({ field, input }) => {
+        const fieldName = 'addressFact';
+        const fieldValue = field(fieldName).value;
+        const { value } = field('addressMatch');
+        useEffect(() => {
+            if (value) {
+                field('addressFact')?.onChange?.(field('addressRegistration').value);
+            }
+        }, [value]);
+        const onDaDataChange = useCallback((item) => {
+            field?.(fieldName)?.onChange?.({
+                apartment: item?.data?.flat,
+                city: item?.data?.city,
+                district: item?.data?.area_with_type,
+                fullAddress: item?.value,
+                fiasCode: item?.data?.fias_id,
+                house: item?.data?.house,
+                locality: item?.data?.settlement_with_type,
+                okatoRegionCode: item?.data?.okato,
+                postcode: item?.data?.postal_code,
+                region: item?.data?.region,
+                regionCode: item?.data?.region_kladr_id ? item?.data?.region_kladr_id.substring(0, 2) : '',
+                street: item?.data?.house,
+            });
+        }, []);
+        const onChange = useCallback((val) => {
+            field?.(fieldName)?.onChange?.({
+                ...field(fieldName).value,
+                fullAddress: val,
+            });
+        }, []);
+        return (jsx(InputControl, { label: "\u0410\u0434\u0440\u0435\u0441", disabled: value, ...getValidation(field(fieldName), validatorObj[fieldName], input?.required), value: fieldValue.fullAddress, onChange: onChange, ...input, onDaDataChange: onDaDataChange }));
+    });
+
     const AddressField = JSX(({ field, input }) => {
         const fieldName = input?.name || 'addressRegistration';
         const fieldValue = field(fieldName).value;
@@ -1707,6 +1742,45 @@
         return (jsx(InputControl, { label: "\u0410\u0434\u0440\u0435\u0441", ...getValidation(field(fieldName), validatorObj[fieldName], input?.required), value: fieldValue.fullAddress, onChange: onChange, ...input, onDaDataChange: onDaDataChange }));
     });
 
+    const SVG = JSX(({ className, viewBox, fill = 'none', width, height, paths, ...commonOptions }) => {
+        return (jsx("svg", { xmlns: "http://www.w3.org/2000/svg", className: className, viewBox: viewBox, fill: fill, width: width, height: height, children: paths.map(({ d, fill: pathFill, ...options }, i) => {
+                const resultOptions = { ...commonOptions, ...options };
+                return (jsx("path", { d: d, fill: pathFill || 'currentColor', stroke: resultOptions.stroke, strokeLinecap: resultOptions.strokeLinecap, strokeLinejoin: resultOptions.strokeLinejoin, strokeWidth: resultOptions.strokeWidth, strokeMiterlimit: resultOptions.strokeMiterlimit }, i));
+            }) }));
+    });
+
+    const defaultCheckStyle = 'appearance-none w-5 h-5 border-solid flex-none';
+
+    const CHECK_PATHS = [
+        {
+            d: 'M10.207.793a1 1 0 0 1 0 1.414l-6 6a1 1 0 0 1-1.414 0l-2.5-2.5a1 1 0 0 1 1.414-1.414L3.5 6.086 8.793.793a1 1 0 0 1 1.414 0Z',
+            fillRule: 'evenodd',
+            clipRule: 'evenodd',
+            fill: 'white',
+        },
+    ];
+    const Checkbox = JSX(({ className, value, text, disabled, isRadio, onChange }) => {
+        const handleChange = useCallback((e) => {
+            if (disabled) {
+                return;
+            }
+            e.preventDefault();
+            onChange && onChange(!value);
+        }, [onChange, disabled, value]);
+        const icon = isRadio ? (jsx("div", { className: "absolute left-1 w-3 h-3 rounded-full bg-primary-main" })) : (jsx(SVG, { paths: CHECK_PATHS, className: "absolute left-1 ml-px block", width: "11", height: "9", fill: "white", viewBox: "0 0 11 9" }));
+        return (jsx("div", { className: className, children: jsxs("label", { className: style('flex items-center relative group/box', getCursorStyle(disabled)), onClick: handleChange, children: [jsx("div", { className: style(defaultCheckStyle, 'm-0', isRadio ? 'rounded-full border-2' : checkboxStyle(value), !disabled && value ? 'border-primary-main' : 'border-gray', disabled ? 'bg-main-disabled' : 'group-hover/box:border-primary-hover'), role: role(isRadio), "aria-checked": Boolean(value), "aria-disabled": Boolean(disabled), "aria-label": text }), value ? icon : null, renderText$3(text)] }) }));
+    });
+    const renderText$3 = (text) => text ? (jsx("div", { className: "ml-s", children: jsx(Text, { size: "text-l", font: "font-light", children: text }) })) : null;
+    const getCursorStyle = (disabled = false) => (disabled ? 'cursor-not-allowed' : 'cursor-pointer');
+    const role = (isRadio = false) => (isRadio ? 'radio' : 'checkbox');
+    const checkboxStyle = (value = false) => style('rounded border', { 'bg-primary-main': value });
+
+    const CheckboxWithError = JSX(({ className, text, value, key, disabled, error, onChange }) => (jsxs("div", { className: style('shrink-0', className), children: [jsx(Checkbox, { text: text, value: value, disabled: disabled, onChange: onChange }, key), renderErrorText(error)] })));
+
+    const AddressMatchField = JSX(({ field }) => {
+        return (jsx(CheckboxWithError, { text: "\u0410\u0434\u0440\u0435\u0441 \u0444\u0430\u043A\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0433\u043E \u043C\u0435\u0441\u0442\u0430 \u0436\u0438\u0442\u0435\u043B\u044C\u0441\u0442\u0432\u0430 \u0441\u043E\u0432\u043F\u0430\u0434\u0430\u0435\u0442 \u0441 \u0430\u0434\u0440\u0435\u0441\u043E\u043C \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438", ...getValidation(field('addressMatch'), validatorObj.addressMatch) }));
+    });
+
     const useNormalizedInput = (props, { normalize, format }) => {
         const { value, onFocus, onBlur, onChange } = props;
         const [isFocused, setIsFocused] = useState(false);
@@ -1799,41 +1873,6 @@
 
     const AnnualRevenueField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0413\u043E\u0434\u043E\u0432\u0430\u044F \u0432\u044B\u0440\u0443\u0447\u043A\u0430, \u20BD", ...getValidation(field('annualRevenue'), validatorObj.annualRevenue, input?.required) })));
 
-    const SVG = JSX(({ className, viewBox, fill = 'none', width, height, paths, ...commonOptions }) => {
-        return (jsx("svg", { xmlns: "http://www.w3.org/2000/svg", className: className, viewBox: viewBox, fill: fill, width: width, height: height, children: paths.map(({ d, fill: pathFill, ...options }, i) => {
-                const resultOptions = { ...commonOptions, ...options };
-                return (jsx("path", { d: d, fill: pathFill || 'currentColor', stroke: resultOptions.stroke, strokeLinecap: resultOptions.strokeLinecap, strokeLinejoin: resultOptions.strokeLinejoin, strokeWidth: resultOptions.strokeWidth, strokeMiterlimit: resultOptions.strokeMiterlimit }, i));
-            }) }));
-    });
-
-    const defaultCheckStyle = 'appearance-none w-5 h-5 border-solid flex-none';
-
-    const CHECK_PATHS = [
-        {
-            d: 'M10.207.793a1 1 0 0 1 0 1.414l-6 6a1 1 0 0 1-1.414 0l-2.5-2.5a1 1 0 0 1 1.414-1.414L3.5 6.086 8.793.793a1 1 0 0 1 1.414 0Z',
-            fillRule: 'evenodd',
-            clipRule: 'evenodd',
-            fill: 'white',
-        },
-    ];
-    const Checkbox = JSX(({ className, value, text, disabled, isRadio, onChange }) => {
-        const handleChange = useCallback((e) => {
-            if (disabled) {
-                return;
-            }
-            e.preventDefault();
-            onChange && onChange(!value);
-        }, [onChange, disabled, value]);
-        const icon = isRadio ? (jsx("div", { className: "absolute left-1 w-3 h-3 rounded-full bg-primary-main" })) : (jsx(SVG, { paths: CHECK_PATHS, className: "absolute left-1 ml-px block", width: "11", height: "9", fill: "white", viewBox: "0 0 11 9" }));
-        return (jsx("div", { className: className, children: jsxs("label", { className: style('flex items-center relative group/box', getCursorStyle(disabled)), onClick: handleChange, children: [jsx("div", { className: style(defaultCheckStyle, 'm-0', isRadio ? 'rounded-full border-2' : checkboxStyle(value), !disabled && value ? 'border-primary-main' : 'border-gray', disabled ? 'bg-main-disabled' : 'group-hover/box:border-primary-hover'), role: role(isRadio), "aria-checked": Boolean(value), "aria-disabled": Boolean(disabled), "aria-label": text }), value ? icon : null, renderText$3(text)] }) }));
-    });
-    const renderText$3 = (text) => text ? (jsx("div", { className: "ml-s", children: jsx(Text, { size: "text-l", font: "font-light", children: text }) })) : null;
-    const getCursorStyle = (disabled = false) => (disabled ? 'cursor-not-allowed' : 'cursor-pointer');
-    const role = (isRadio = false) => (isRadio ? 'radio' : 'checkbox');
-    const checkboxStyle = (value = false) => style('rounded border', { 'bg-primary-main': value });
-
-    const CheckboxWithError = JSX(({ className, text, value, key, disabled, error, onChange }) => (jsxs("div", { className: style('shrink-0', className), children: [jsx(Checkbox, { text: text, value: value, disabled: disabled, onChange: onChange }, key), renderErrorText(error)] })));
-
     const ArmyIdFlgField = JSX(({ field }) => (jsx(CheckboxWithError, { text: "\u041D\u0430\u043B\u0438\u0447\u0438\u0435 \u0432\u043E\u0435\u043D\u043D\u043E\u0433\u043E \u0431\u0438\u043B\u0435\u0442\u0430", ...getValidation(field('armyIdFlg'), validatorObj.armyIdFlg) })));
 
     const BankEmpoleeCodeField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041A\u043E\u0434 \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u0438\u0442\u0435\u043B\u044F \u0411\u0430\u043D\u043A\u0430", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043A\u043E\u0434", type: "number", ...getValidation(field('bankEmployeeCode'), validatorObj.bankEmployeeCode, input?.required), ...input })));
@@ -3212,7 +3251,7 @@
             experience5Years: jsx(Experience5YearsField, { field: field, input: input }),
             jobsNumber: jsx(JobsNumberField, { field: field, input: input }),
             beginDate: jsx(BeginDateField, { field: field, input: input }),
-            addressFact: jsx(AddressField, { field: field, input: input }),
+            addressFact: jsx(AddressFactField, { field: field, input: input }),
             organizationAddress: jsx(AddressField, { field: field, input: input }),
             comment: jsx(CommentField, { field: field, input: input }),
             addressBranch: jsx(AddressBranchField, { field: field, input: input, isPremium: isPremium }),
@@ -3282,6 +3321,7 @@
             partInBusiness: jsx(PartInBusinessField, { field: field, input: input }),
             regionRetail: jsx(RetailRegionField, { field: field, input: input }),
             addressRetail: jsx(RetailAddressField, { field: field, input: input }),
+            addressMatch: jsx(AddressMatchField, { field: field, input: input }),
         };
         return isRenderField({ input, field }) ? (jsx("div", { children: InputsMap[input?.name || ''] }, String(i))) : null;
     };
@@ -4073,10 +4113,58 @@
 
     const updateProfileEsia = (body) => doRequest('/esia/updateProfileEsia', 'POST', body);
 
+    const parseEsiaProfile = (esiaProfile) => {
+        const { profile, addInfo, document, addressRegistration, addressFact } = esiaProfile;
+        return {
+            name: profile?.name,
+            surname: profile?.surname,
+            middleName: profile?.midname,
+            birthday: profile?.birthDate,
+            phone: normalizePhone(profile?.phone),
+            email: profile?.email,
+            dulIssueDateField: document?.dulIssueDate,
+            dulIssuedBy: document?.dulIssuedBy,
+            dulNumber: document?.dulNumber,
+            dulSerie: document?.dulSerie,
+            dulSubdivisionCode: document?.dulSubdivisionCode,
+            snils: addInfo?.snils,
+            birthPlace: addInfo?.birthPlace,
+            addressRegistration: buildAddress(addressRegistration),
+            addressFact: buildAddress(addressFact),
+        };
+    };
+    const concatFullAddress = (address) => {
+        return address.reduce((acc, value) => {
+            if (value) {
+                return acc ? `${acc}, ${value}` : value;
+            }
+            return acc;
+        }, '');
+    };
+    const buildAddress = (fields) => {
+        const { postcode, region, regionCode, locality, city, street, house, building, block, apartment, } = fields;
+        const place = locality || city;
+        const fullAddress = concatFullAddress([
+            postcode,
+            region,
+            place,
+            street ? `ул ${street}` : undefined,
+            house ? `д ${house}` : undefined,
+            block ? `к ${block}` : undefined,
+            building ? `стр ${building}` : undefined,
+            apartment ? `кв ${apartment}` : undefined,
+        ]);
+        return {
+            ...fields,
+            regionCode: regionCode?.key,
+            fullAddress,
+        };
+    };
+
     const useInitApplicationLead = (nextStepLink) => {
         const [isLoading, setIsLoading] = useState(false);
         const [profileId] = useLocalStorage('profileId');
-        const [, setEsiaData] = useLocalStorage('esiaData');
+        const [leadForm, setLeadForm] = useLocalStorage('leadForm');
         const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
         const code = params.get('code');
         const state = params.get('state');
@@ -4088,7 +4176,10 @@
                     state,
                     redirectUri: globalThis.location?.href,
                 });
-                setEsiaData(JSON.stringify(data));
+                setLeadForm({
+                    ...leadForm,
+                    ...parseEsiaProfile(data),
+                });
                 globalThis.location.href = nextStepLink;
             }
         }, []);
@@ -4098,7 +4189,6 @@
                 updateEsiaProfile();
             }
             else {
-                setEsiaData('');
                 sessionStorage.removeItem('accessToken');
                 sessionStorage.removeItem('refreshToken');
             }
@@ -5771,6 +5861,7 @@
                 fullAddress: '',
                 fiasCode: '',
             },
+            addressMatch: false,
             participantDateRegistration: undefined,
             addressFact: {
                 fullAddress: '',
@@ -6056,7 +6147,10 @@
                 inputs: [],
             },
             {
-                inputs: [{ fieldType: 'common', name: 'addressRegistration', required: true, dadata: true }],
+                inputs: [
+                    { fieldType: 'common', name: 'addressRegistration', required: true, dadata: true },
+                    { fieldType: 'common', name: 'addressMatch' },
+                ],
             },
             {
                 columns: 2,
@@ -6064,11 +6158,14 @@
             },
             {
                 title: 'Адрес фактического проживания (место пребывания РФ)',
+                inputs: [],
+            },
+            {
                 columns: 2,
-                inputs: [
-                    { fieldType: 'common', name: 'addressFact', required: true, dadata: true },
-                    { fieldType: 'common', name: 'housing' },
-                ],
+                inputs: [{ fieldType: 'common', name: 'housing' }],
+            },
+            {
+                inputs: [{ fieldType: 'common', name: 'addressFact', required: true, dadata: true }],
             },
         ],
         [
@@ -6153,8 +6250,11 @@
                 inputs: [{ fieldType: 'common', name: 'dependents', required: true }],
             },
             {
-                columns: 1,
-                inputs: [{ fieldType: 'common', name: 'familyMembers', required: true }],
+                columns: 2,
+                inputs: [
+                    { fieldType: 'common', name: 'familyMembers', required: true },
+                    { fieldType: 'common', name: 'children', required: true },
+                ],
             },
             {
                 title: 'Совокупный доход',
@@ -8152,7 +8252,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.634";
+    const packageVersion = "0.14.636";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;