@redneckz/wildless-cms-uni-blocks 0.14.821 → 0.14.823

package/mobile/bundle/bundle.umd.js

@@ -2437,25 +2437,29 @@
 
     const ERROR_MESSAGE = 'Некорректно заполненное поле';
     const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
-    const MIN_AGE = 23;
-    const MAX_AGE = 75;
-    const AGE_ERROR_MESSAGE = 'Допустимый возраст заёмщика - от 23 до 75 лет';
+    const retailCyrillicPattern = /^[\u0400-\u04FF-\s]+$/u;
     const addressDaDataValidate = (address) => Boolean(address.region && (address.city || address.locality) && address.house);
     const addressDaDataValidator = () => validator(addressDaDataValidate)(ADDRESS_ERROR_MESSAGE);
     const addressOrganizationValidator = () => validator((address) => Boolean(address.fiasCode && (address.city || address.locality) && address.house))(ADDRESS_ERROR_MESSAGE);
     const codeWordValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length >= 3 && _.length <= 21 && isCyrillic(_))(errorMsg ?? ERROR_MESSAGE);
+    const nameRetailValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length > 1 && retailCyrillicPattern.test(_))(errorMsg ?? ERROR_MESSAGE);
     const jobNumberValidator = (errorMsg) => validator((_) => typeof _ === 'string' && /^[0-9]{1,2}$/g.test(_))(errorMsg ?? ERROR_MESSAGE);
     const lengthStringValidator = (inputLength, errorMsg) => validator((_) => typeof _ === 'string' && _.length >= 1 && _.length <= inputLength)(errorMsg ?? ERROR_MESSAGE);
-    const limitedBirthdayValidate = (date) => {
+    const limitedBirthdayValidate = ({ minAge, maxAge }) => (date) => {
         const today = new Date();
-        const minDate = new Date(today.getFullYear() - MIN_AGE, today.getMonth(), today.getDate());
-        const maxDate = new Date(today.getFullYear() - MAX_AGE, today.getMonth(), today.getDate());
-        if (!date || date > minDate || date < maxDate) {
+        const minDate = new Date(today.getFullYear() - minAge, today.getMonth(), today.getDate());
+        const maxDate = maxAge
+            ? new Date(today.getFullYear() - maxAge, today.getMonth(), today.getDate())
+            : null;
+        if (!date || date > minDate) {
+            return false;
+        }
+        if (maxDate && date < maxDate) {
             return false;
         }
         return true;
     };
-    const limitedBirthdayValidator = () => validator(limitedBirthdayValidate)(AGE_ERROR_MESSAGE);
+    const limitedBirthdayValidator = (params) => validator(limitedBirthdayValidate(params))(params.errorMessage);
     const numberValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 6)(errorMsg);
     const serieValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 4)(errorMsg);
     const snilsValidate = (snils) => {
@@ -2477,6 +2481,23 @@
     };
     const snilsValidator = (errorMsg) => validator(snilsValidate)(errorMsg);
 
+    const limitedBirthdayValidationData = {
+        credit: {
+            minAge: 23,
+            maxAge: 75,
+            errorMessage: 'Допустимый возраст заёмщика - от 23 до 75 лет',
+        },
+        creditCard: {
+            minAge: 21,
+            errorMessage: 'Допустимый возраст заёмщика - от 21 года',
+        },
+        debitCard: {
+            minAge: 18,
+            errorMessage: 'Допустимый возраст - от 18 лет',
+        },
+    };
+    const getLimitedBirthdayValidation = (productType) => limitedBirthdayValidator(limitedBirthdayValidationData[productType]);
+
     const validatorConsentsObj = {
         processPersonalDataFlg: agreementValidator,
         consentProviderFlg: agreementValidator,
@@ -2511,7 +2532,6 @@
         addressRetail: defaultSelectValidator('Выберите адрес банка'),
         addressMatch: defaultValidator(),
         sex: defaultValidator('Укажите свой пол'),
-        limitedBirthday: limitedBirthdayValidator(),
         birthPlace: defaultValidator('Укажите место рождения'),
         education: defaultSelectValidator('Выберите ваше образование'),
         housing: defaultSelectValidator('Выберите тип жилья'),
@@ -2546,6 +2566,9 @@
         partInBusiness: defaultValidator(),
         regionRetail: defaultSelectValidator('Выберите регион'),
         latinSurname: defaultValidator('Укажите фамилию'),
+        surname: nameRetailValidator('Укажите свою фамилию на кириллице'),
+        name: nameRetailValidator('Укажите своё имя на кириллице'),
+        middleName: nameRetailValidator('Укажите своё отчество на кириллице'),
     };
     const validatorObj = {
         ...validatorRetailObj,
@@ -4421,7 +4444,7 @@
         return (jsx(DaDataInputControl, { label: "\u0418\u041D\u041D", isInteger: true, maxLength: 12, ...input, ...field(input?.name ?? ''), onDaDataChange: onDaDataChange }));
     });
 
-    const DeliveryDateFiels = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0434\u043E\u0441\u0442\u0430\u0432\u043A\u0438", ...field(input?.name ?? '') })));
+    const DeliveryDateFiels = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0434\u043E\u0441\u0442\u0430\u0432\u043A\u0438", ...field(input?.name ?? ''), minDate: new Date() })));
 
     const DeliveryTimeField = JSX(({ field, input }) => {
         const { data } = useLeadFormData('COURIER_DELIVERY_TIME');
@@ -4434,7 +4457,11 @@
 
     const DependentsField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0438\u043D\u044B\u0445 \u0438\u0436\u0434\u0438\u0432\u0435\u043D\u0446\u0435\u0432", placeholder: "\u0417\u0430 \u0438\u0441\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0435\u043C \u0434\u0435\u0442\u0435\u0439 \u0434\u043E 18 \u043B\u0435\u0442", isInteger: true, maxLength: 2, ...field(input?.name ?? ''), ...input })));
 
-    const DulIssueDateField = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0432\u044B\u0434\u0430\u0447\u0438", ...field(input?.name ?? ''), disabled: input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '') })));
+    const DulIssueDateField = JSX(({ field, input }) => {
+        const birthDate = field('limitedBirthday')?.value;
+        const startDulIssueDate = useMemo(() => new Date(birthDate.getFullYear() + 14, birthDate.getMonth(), birthDate.getDate()), [birthDate]);
+        return (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0432\u044B\u0434\u0430\u0447\u0438", ...field(input?.name ?? ''), disabled: input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? ''), minDate: startDulIssueDate }));
+    });
 
     const DulIssuedByField = JSX(({ field, input }) => {
         const { value: dulSubdivisionCode, onChange: changeDulSubdivisionCode } = field('dulSubdivisionCode');
@@ -4660,9 +4687,23 @@
     ];
     const MethodObtainField = JSX(({ field, input }) => (jsx(RadioButtonGroupControl, { orientation: "horizontal", items: METHODS_OF_OBTAIN, ...field(input?.name ?? '') })));
 
-    const MiddleNameField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u041E\u0442\u0447\u0435\u0441\u0442\u0432\u043E (\u041E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u043E, \u043F\u0440\u0438 \u043D\u0430\u043B\u0438\u0447\u0438\u0438)", maxLength: 60, disabled: input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? ''), ...field(input?.name ?? ''), ...input })));
+    const MiddleNameField = JSX(({ field, input }) => {
+        const onChange = useCallback((value) => {
+            if (retailCyrillicPattern.test(value) || value.length === 0) {
+                field('middleName')?.onChange?.(value);
+            }
+        }, [field]);
+        return (jsx(DaDataInputControl, { label: "\u041E\u0442\u0447\u0435\u0441\u0442\u0432\u043E (\u041E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u043E, \u043F\u0440\u0438 \u043D\u0430\u043B\u0438\u0447\u0438\u0438)", maxLength: 60, disabled: input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? ''), ...field(input?.name ?? ''), ...input, onChange: onChange }));
+    });
 
-    const NameField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u0418\u043C\u044F", maxLength: 60, disabled: input?.filledByEsia && isEsiaAuthorize(field, input.name ?? ''), ...field(input?.name ?? ''), ...input })));
+    const NameField = JSX(({ field, input }) => {
+        const onChange = useCallback((value) => {
+            if (retailCyrillicPattern.test(value) || value.length === 0) {
+                field('name')?.onChange?.(value);
+            }
+        }, [field]);
+        return (jsx(DaDataInputControl, { label: "\u0418\u043C\u044F", maxLength: 60, disabled: input?.filledByEsia && isEsiaAuthorize(field, input.name ?? ''), ...field(input?.name ?? ''), ...input, onChange: onChange }));
+    });
 
     const OrganizationField = JSX(({ field, input }) => {
         const { data } = useLeadFormData('ORGANIZATION_TYPE');
@@ -4817,7 +4858,14 @@
     const SnilsField = JSX(({ field, input }) => (jsx(InputSnilsControl, { label: "\u0421\u041D\u0418\u041B\u0421", maxLength: 14, ...field(input?.name ?? ''), ...input })));
 
     const FIELD_NAME = 'surname';
-    const SurnameField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u0424\u0430\u043C\u0438\u043B\u0438\u044F", maxLength: 60, disabled: input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME), ...field(input?.name ?? ''), ...input })));
+    const SurnameField = JSX(({ field, input }) => {
+        const onChange = useCallback((value) => {
+            if (retailCyrillicPattern.test(value) || value.length === 0) {
+                field('surname')?.onChange?.(value);
+            }
+        }, [field]);
+        return (jsx(DaDataInputControl, { label: "\u0424\u0430\u043C\u0438\u043B\u0438\u044F", maxLength: 60, disabled: input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME), ...field(input?.name ?? ''), ...input, onChange: onChange }));
+    });
 
     const TotalIncomeField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u0421\u043E\u0432\u043E\u043A\u0443\u043F\u043D\u044B\u0439 \u043E\u0444\u0438\u0446\u0438\u0430\u043B\u044C\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, ...field(input?.name ?? ''), ...input })));
 
@@ -5728,15 +5776,16 @@
             }
             try {
                 startSending();
+                const transformedFormData = transformFormData(formData);
                 const profileId = await createUserProfile({
-                    profile: { phone: formatPhone(formData.phone) },
+                    profile: { phone: formatPhone(transformedFormData.phone) },
                 });
-                if (profileId && formData?.phone) {
+                if (profileId && transformedFormData?.phone) {
                     const sendCurrentTask = async () => {
                         await updateUserData({
                             programId,
                             profileId,
-                            formData,
+                            formData: transformedFormData,
                             productType,
                             saveUserData,
                             sendAspects,
@@ -5746,7 +5795,7 @@
                             openEsiaLoginDialog();
                         }
                         else {
-                            consentBkiDialog.open(formData.phone, profileId);
+                            consentBkiDialog.open(transformedFormData.phone, profileId);
                         }
                     };
                     const handleSuccessVerify = async () => {
@@ -5772,7 +5821,7 @@
                     };
                     const acceptedConsents = getAcceptedConsents(formData, productType);
                     verifyPhoneDialog.open({
-                        phone: formData?.phone,
+                        phone: transformedFormData?.phone,
                         consents: acceptedConsents,
                         onSuccess: handleSuccessVerify,
                     });
@@ -5854,6 +5903,12 @@
             consentAssignmentClaimsFlg: consentOthersFlg,
         };
     };
+    const transformFormData = (formData) => ({
+        ...formData,
+        surname: formData.surname?.trim(),
+        name: formData.name?.trim(),
+        middleName: formData.middleName?.trim(),
+    });
 
     const useSetter = (target, key) => useCallback((value) => {
         const newValue = value instanceof Function ? value(target[key]) : value;
@@ -6096,8 +6151,9 @@
     const ApplicationLeadForm = JSX(({ className, title, programId = '', nextStepLink = '/credit-lead', button, productType = 'credit', data, ...rest }) => {
         const [esiaError, { setTrue: setEsiaError }] = useBool(false);
         const applicationFormData = useMemo(() => getApplicationFormData(productType), [productType]);
-        const inputs = useMemo(() => (applicationFormData?.flatMap((_) => _?.inputs) || []), [applicationFormData]);
-        const formValidator = useMemo(() => getFormValidator(inputs, validatorObj), [inputs]);
+        const inputs = useMemo(() => getInputs(applicationFormData), [applicationFormData]);
+        const extendedValidatorObj = useMemo(() => getExtendedValidatorObj(productType), [productType]);
+        const formValidator = useMemo(() => getFormValidator(inputs, extendedValidatorObj), [inputs, extendedValidatorObj]);
         const [initialFormState, { isLoading }] = useInitApplicationLead({
             inputs,
             nextStepLink,
@@ -6123,6 +6179,11 @@
         }, [ok]);
         return (jsx(ApplicationFormLayout, { className: style('container space-y-m', className), title: title, ...rest, children: jsxs("form", { onSubmit: onSubmit, className: "space-y-m relative", children: [isLoading ? jsx(Loader, { blur: false }) : null, applicationFormData.map((_, i) => (jsxs("div", { className: style(inputColumnStyles(_.columns), 'grid gap-x-m'), children: [renderTitle(_.title), renderInputs$1({ field, inputs: _?.inputs }, productType)] }, `section-${i}`))), renderSubmitButton(button, isSending), esiaError ? (jsx(Text, { size: "text-m", font: "font-medium", color: "text-error", children: "\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0413\u043E\u0441\u0443\u0441\u043B\u0443\u0433\u0438 \u0434\u043B\u044F \u043E\u0444\u043E\u0440\u043C\u043B\u0435\u043D\u0438\u044F \u0437\u0430\u044F\u0432\u043A\u0438 \u043D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E, \u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u043E \u0437\u0430\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u043F\u043E\u043B\u044F \u0432\u0440\u0443\u0447\u043D\u0443\u044E." })) : null] }) }));
     });
+    const getInputs = (applicationFormData) => (applicationFormData?.flatMap((_) => _?.inputs) || []);
+    const getExtendedValidatorObj = (productType) => ({
+        ...validatorObj,
+        limitedBirthday: getLimitedBirthdayValidation(productType),
+    });
 
     const NotFound = JSX(({ title, description }) => {
         const isMobileMode = useMobileMode();
@@ -8051,11 +8112,16 @@
         return [initialState, handleSubmit, isSending];
     };
 
+    const PRODUCT_TYPE$1 = 'creditCard';
+    const extendedValidatorObj$1 = {
+        ...validatorObj,
+        limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE$1),
+    };
     const CreditCardFormStep = JSX(({ step, sections, onPrevStep, onNextStep, onFinish }) => {
         const inputs = useMemo(() => sections?.flatMap((_) => _?.inputs || []), [sections]);
         const formValidator = useCallback((formState) => 
         // TODO Слишком сложно
-        getFormValidator(calculateInputs((_) => formState[_])(inputs, step), validatorObj)(formState), [inputs]);
+        getFormValidator(calculateInputs((_) => formState[_])(inputs, step), extendedValidatorObj$1)(formState), [inputs]);
         const [initialState, onSubmit, isSending] = useCreditCardFormAPI({
             step,
             onNextStep,
@@ -8791,13 +8857,18 @@
         return [initialState, handleSubmit, isSending];
     };
 
+    const PRODUCT_TYPE = 'credit';
+    const extendedValidatorObj = {
+        ...validatorObj,
+        limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
+    };
     const CreditFormStep = JSX(({ step, sections, programsSource, onPrevStep, onNextStep, onFinish }) => {
         const { programId } = useRetailFormStore();
         const calcData = programsSource?.[programId ?? '']; // Need normalizator useForm, to be save defaultParams
         const inputs = useMemo(() => sections?.flatMap((_) => _?.inputs ?? []), [sections]);
         const formValidator = useCallback((formState) => 
         // TODO Слишком сложно
-        getFormValidator(calculateInputs((_) => formState[_])(inputs, step), validatorObj)(formState), [inputs]);
+        getFormValidator(calculateInputs((_) => formState[_])(inputs, step), extendedValidatorObj)(formState), [inputs]);
         const [initialState, onSubmit, isSending] = useCreditFormAPI({
             step,
             onNextStep,
@@ -10847,7 +10918,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.820";
+    const packageVersion = "0.14.822";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;