@redneckz/wildless-cms-uni-blocks 0.14.926 → 0.14.928

package/bundle/bundle.umd.js

@@ -3229,12 +3229,13 @@
 
     const ERROR_MESSAGE = 'Некорректно заполненное поле';
     const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
+    const codeWordPattern = /^[0-9\u0400-\u04FF-\s]+$/u;
     const retailCyrillicPattern = /^[\u0400-\u04FF-\s]+$/u;
     const retailNotCyrillicPattern = /^(?!\s*$)[^\p{Script=Cyrillic}]+$/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 codeWordValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length >= 3 && _.length <= 21 && codeWordPattern.test(_))(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, isFixLength) => validator((_) => typeof _ === 'string' &&
@@ -5351,7 +5352,7 @@
     };
     const autoTranslateToLatin = (str) => str.replace(/[А-ЯЁа-яё,. -]/g, (_) => REPLACER[_.toLowerCase()].toUpperCase() || '');
 
-    const MAX_LENGTH$1 = 21;
+    const MAX_LENGTH$1 = 20;
     const LatinNameField = JSX(({ field, input }) => {
         const latinSurname = field('latinSurname')?.value;
         const name = field('name')?.value;
@@ -5367,7 +5368,7 @@
         return (jsx(InputControl, { label: "\u0418\u043C\u044F", placeholder: "\u0418\u043C\u044F \u043B\u0430\u0442\u0438\u043D\u0441\u043A\u0438\u043C\u0438 \u0431\u0443\u043A\u0432\u0430\u043C\u0438", maxLength: Math.max(MAX_LENGTH$1 - latinSurname?.length, 1), ...field(input?.name ?? ''), onChange: onChange, ...input }));
     });
 
-    const MAX_LENGTH = 21;
+    const MAX_LENGTH = 20;
     const LatinSurnameField = JSX(({ field, input }) => {
         const latinName = field('latinName')?.value;
         const surname = field('surname')?.value;
@@ -5721,9 +5722,7 @@
 
     const updateUserTask = (body) => doRequest('/user-data/updateUserTask', 'PUT', body);
 
-    const sendCode = (body) => doRequest('/sms/sendCode', 'POST', body)
-        .then((res) => res.text())
-        .then((text) => text === 'OK');
+    const sendCode = (body) => doRequest('/sms/sendCode', 'POST', body);
 
     const ICON_SIZE = { width: '118', height: '24' };
 
@@ -5786,16 +5785,15 @@
         return (jsx(Dialog, { head: jsx(Logo, {}), onClose: onClose, children: jsxs("div", { className: "flex flex-col gap-lg items-center", children: [jsxs("div", { className: "flex", children: [jsx("img", { className: "grow", src: captcha }), jsx(Button, { className: "w-8", embedded: true, onClick: handleCreateCaptcha, children: jsx(Icon, { iconVersion: "normal", name: "RefreshIcon" }) })] }), jsx(Input, { className: "w-80", onChange: setCode, value: code, placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043A\u043E\u0434 \u0441 \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0438" }), hasError ? jsx("div", { className: "text-error", children: "\u041D\u0435\u0432\u0435\u0440\u043D\u044B\u0439 \u043A\u043E\u0434" }) : null, jsxs("div", { className: "flex w-80 justify-between", children: [jsx(Button, { version: "secondary", onClick: closeAll, children: "\u0412\u0435\u0440\u043D\u0443\u0442\u044C\u0441\u044F" }), jsx(SubmitButton$1, { version: "secondary", disabled: !code, onClick: handleCheckCaptcha, children: "\u041E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C" })] }), isLoading ? jsx(Loader, { blur: false }) : null] }) }));
     });
 
-    const checkCode = async (body) => fetchRetailJSON('/sms/checkCode', 'POST', body).then(saveToken);
+    const checkCode = async (body) => await doRequest('/sms/checkCode', 'POST', body);
+
     const saveToken = (data) => {
-        if (data?.access_token && data?.refresh_token) {
-            globalThis.sessionStorage.setItem('accessToken', data.access_token);
-            globalThis.sessionStorage.setItem('refreshToken', data.refresh_token);
-        }
+        globalThis.sessionStorage.setItem('accessToken', data.access_token);
+        globalThis.sessionStorage.setItem('refreshToken', data.refresh_token);
     };
 
     const TIME_TO_RESEND = 180;
-    const useVerifyPhoneDialogSubmit = ({ values, onSuccess, }) => {
+    const useVerifyPhoneDialogSubmit = ({ values, onSuccess, onFail, }) => {
         const sessionStore = useSessionStore();
         const attempts = sessionStore.smsCode?.attempts || 0;
         const timer = Math.max(getTimer(sessionStore.smsCode?.sendTime || Date.now()), 0);
@@ -5806,27 +5804,30 @@
         const isTimeExpired = Boolean(timeNextReq === 0 && sessionStore.smsCode?.sendTime);
         const isSubmitButtonDisabled = attempts > 2 || isTimeExpired || !values.every(Boolean);
         const handleSubmit = useCallback(async () => {
-            try {
-                sessionStore.smsCode = {
-                    ...sessionStore.smsCode,
-                    attempts: attempts + 1,
-                };
-                startLoading();
-                await checkCode({
-                    smsText: values.join(''),
-                    smsCodesSetName: { key: 'AUTHENTICATION' },
-                });
+            sessionStore.smsCode = {
+                ...sessionStore.smsCode,
+                attempts: attempts + 1,
+            };
+            startLoading();
+            const response = await checkCode({
+                smsText: values.join(''),
+                smsCodesSetName: { key: 'AUTHENTICATION' },
+            });
+            if (response.ok) {
+                const data = (await response.json());
+                saveToken(data);
                 setTimeNextReq(0);
                 resetError();
                 sessionStore.smsCode = null;
                 onSuccess?.(values.join(''));
             }
-            catch {
+            else if (response.status === 403) {
                 setErrorText(attempts > 1 ? 'Исчерпан лимит ввода смс-кода' : 'Неверный код');
             }
-            finally {
-                endLoading();
+            else {
+                onFail();
             }
+            endLoading();
         }, [values, attempts]);
         useEffect(() => {
             if (isTimeExpired) {
@@ -5849,12 +5850,13 @@
     };
 
     const CODE_LENGTH = 4;
-    const VerifyPhoneDialog = JSX(({ phone, withDescription = true, consents, onSuccess = noop, onClose = noop }) => {
+    const VerifyPhoneDialog = JSX(({ phone, withDescription = true, consents, onSuccess = noop, onClose = noop, onFail = noop, }) => {
         const [values, setValues] = useState(Array(CODE_LENGTH).fill(''));
         const sessionStore = useSessionStore();
         const { handleSubmit, hasError, errorText, isLoading, timeNextReq, isSubmitButtonDisabled, setTimeNextReq, setErrorText, } = useVerifyPhoneDialogSubmit({
             values,
             onSuccess,
+            onFail,
         });
         const captchaDialog = useDialog(CaptchaDialog);
         const phoneNumber = formatPhone(phone);
@@ -5864,7 +5866,7 @@
                 phoneNumber,
                 smsCodesSetName: { key: 'AUTHENTICATION' },
             });
-            if (response) {
+            if (response.ok) {
                 setTimeNextReq(TIME_TO_RESEND);
                 restartTimer(TIME_TO_RESEND);
                 setErrorText('');
@@ -5873,10 +5875,13 @@
                     attempts: 0,
                 };
             }
-            else {
+            else if (response.status === 429) {
                 captchaDialog.open({ phoneNumber, sendCode: handleSendCode });
             }
-        }, [phoneNumber, restartTimer, onClose]);
+            else {
+                onFail();
+            }
+        }, [phoneNumber, restartTimer]);
         useEffect(() => {
             if (!sessionStore.smsCode?.sendTime) {
                 handleSendCode();
@@ -6400,9 +6405,8 @@
 
     /* eslint-disable max-lines */
     // eslint-disable-next-line max-lines-per-function
-    const useApplicationLeadApi = ({ programId, nextStepLink, productType, data, }) => {
+    const useApplicationLeadApi = ({ programId, nextStepLink, productType, data, changeSubmitFormStatus, }) => {
         const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
-        const [ok, setOK] = useState();
         const saveUserData = useSaveUserData();
         const sessionStore = useSessionStore();
         const leadFormStore = useLeadFormStore();
@@ -6414,6 +6418,10 @@
         const consentBkiDialog = useConsentBkiDialog(goToNextStep);
         const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
         const draftDialog = useDraftDialog();
+        const handleFailSendForm = () => {
+            verifyPhoneDialog.close();
+            changeSubmitFormStatus(false);
+        };
         const handleSubmit = useCallback(async (formData) => {
             try {
                 startSending();
@@ -6464,7 +6472,7 @@
                         }
                     }
                     catch {
-                        setOK(false);
+                        handleFailSendForm();
                     }
                 };
                 const acceptedConsents = getAcceptedConsents(transformedFormData, productType);
@@ -6472,16 +6480,17 @@
                     phone: transformedFormData.phone,
                     consents: acceptedConsents,
                     onSuccess: handleSuccessVerify,
+                    onFail: handleFailSendForm,
                 });
             }
             catch {
-                setOK(false);
+                handleFailSendForm();
             }
             finally {
                 endSending();
             }
         }, []);
-        return { isSending, ok, handleSubmit };
+        return { isSending, handleSubmit };
     };
     const getAcceptedConsents = (formData, productType) => {
         const consents = productTypeToConsentsMap[productType];
@@ -6923,6 +6932,7 @@
 
     const ApplicationLeadForm = JSX(({ className, title, programId = '', nextStepLink = '/credit-lead', button, productType = 'credit', data, ...rest }) => {
         const [esiaStatus, setEsiaStatus] = useState();
+        const [ok, setOK] = useState();
         const [attemptsWithoutConsents, setAttemptsWithoutConsents] = useState(0);
         const leadForm = useRef(null);
         const applicationFormData = useMemo(() => getApplicationFormData(productType), [productType]);
@@ -6931,6 +6941,9 @@
         useIFrameMode();
         const extendedValidatorObj = useMemo(() => getExtendedValidatorObj(productType), [productType]);
         const formValidator = useMemo(() => getFormValidator(inputs, extendedValidatorObj), [inputs, extendedValidatorObj]);
+        const changeSubmitFormStatus = (status) => {
+            setOK(status);
+        };
         const initialFormState = useInitApplicationLead({
             inputs,
             nextStepLink,
@@ -6938,11 +6951,12 @@
             setEsiaStatus,
             esiaAuthSuccess: esiaStatus === EsiaStatuses.Success,
         });
-        const { isSending, ok, handleSubmit } = useApplicationLeadApi({
+        const { isSending, handleSubmit } = useApplicationLeadApi({
             programId,
             nextStepLink,
             productType,
             data,
+            changeSubmitFormStatus,
         });
         const [, { field, onSubmit, reset }] = useForm(initialFormState, {
             formValidator,
@@ -6961,7 +6975,10 @@
         const responseTypeDialog = useDialog(ResponseTypeDialog);
         useEffect(() => {
             if (ok !== undefined) {
-                responseTypeDialog.open({ ok });
+                responseTypeDialog.open({
+                    ok,
+                    onClose: () => changeSubmitFormStatus(undefined),
+                });
             }
         }, [ok]);
         useEffect(() => {
@@ -10293,7 +10310,7 @@
                     name: 'infoCard',
                     label: 
                     // eslint-disable-next-line max-len
-                    'Количество символов ограничивается 21. При этом, если фамилия и имя на карте содержит более 22 символов, то необходимо сократить имя и указывать на карте только первую букву имени и фамилию, если при таком сокращении фамилия и имя не умещается в количество символов – 21, то указывать только фамилию.',
+                    'Количество символов ограничивается 20. При этом, если фамилия и имя на карте содержит более 21 символа, то необходимо сократить имя и указывать на карте только первую букву имени и фамилию, если при таком сокращении фамилия и имя не умещается в количество символов – 20, то указывать только фамилию.',
                 },
             ],
         },
@@ -12196,7 +12213,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.925";
+    const packageVersion = "0.14.927";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;