@redneckz/wildless-cms-uni-blocks 0.14.670 → 0.14.671

package/mobile/bundle/bundle.umd.js

@@ -2024,8 +2024,18 @@
     const mapByIndex = (points, index) => points.map((_) => _.coords?.[index]);
     const getArraySumAndAverage = (arr) => arr.length && arr.reduce((a, b) => a + b) / arr.length;
 
+    const fetchRetailJSON = async (url, method, body) => {
+        try {
+            const response = await doRequest(url, method, body);
+            return response.json();
+        }
+        catch (err) {
+            console.error(err);
+            return null;
+        }
+    };
     async function doRequest(url, method, body) {
-        const response = await fetch(`${API_BASE_URI}${url}`, {
+        return await fetch(`${API_BASE_URI}${url}`, {
             method,
             headers: {
                 'Content-Type': 'application/json',
@@ -2034,29 +2044,26 @@
             credentials: 'include',
             body: body ? JSON.stringify(body) : null,
         });
-        // TODO: add error handling
-        return isJSON(response) ? response.json() : response;
     }
-    // TODO: Need delete isJSON
-    const isJSON = (response) => response.headers.get('Content-Type') === 'application/json';
     const getAuthorizationHeaders = () => {
         const token = sessionStorage.getItem('accessToken');
         return token ? { Authorization: `Bearer ${token}` } : null;
     };
 
-    const regionOffices = async (regionKey) => {
-        const response = await doRequest('/public-data/regionOffices', 'POST', {
+    const fetchRegionOffices = async (regionKey) => {
+        const response = await fetchRetailJSON('/public-data/regionOffices', 'POST', {
             regionRfCd: {
                 key: regionKey,
             },
             cashCardFlg: true,
         });
-        return await response.json().then((_) => _?.offices?.map((office) => ({
+        return (response?.offices?.map((office) => ({
             ...office,
-            gpsLatitude: (office.latitude ?? DEFAULT_CENTER_COORDS[0]).toString().replace(',', '.'),
-            gpsLongitude: (office.longitude ?? DEFAULT_CENTER_COORDS[1]).toString().replace(',', '.'),
-        })));
+            gpsLatitude: formatCoordinate(office.latitude ?? DEFAULT_CENTER_COORDS[0]),
+            gpsLongitude: formatCoordinate(office.longitude ?? DEFAULT_CENTER_COORDS[1]),
+        })) || []);
     };
+    const formatCoordinate = (coordinate) => Number(coordinate.toString().replace(',', '.'));
 
     const Foldable = JSX(({ className = '', isFoldButtonOnTop = false, unfoldedByDefault = false, renderFoldableSection, renderFoldButton, }) => {
         const [isUnfolded, setIsUnfolded] = useState(unfoldedByDefault);
@@ -2479,9 +2486,8 @@
         field('addressRetail');
         useEffect(() => {
             (async () => {
-                const officesList = await regionOffices(regionValue?.key ?? '');
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-                setOffices(officesList || []);
+                const officesList = await fetchRegionOffices(regionValue?.key ?? '');
+                setOffices(officesList);
             })();
             if (regionValue?.key) {
                 field?.('addressRetail')?.onChange?.('');
@@ -2938,7 +2944,7 @@
 
     const feedbackById = async (id, convertToPng = false) => {
         const response = await doRequest(`/feedback/file?id=${encodeURIComponent(id)}&convertToPngFlg=${convertToPng}`, 'GET');
-        return await response.blob();
+        return response ? await response.blob() : new Blob();
     };
 
     const getDocument = async (id, convertToPng = false) => {
@@ -3702,13 +3708,16 @@
 
     const renderSubmitButton = (button, className) => (jsx(Button, { className: style('w-full @xl:w-auto', className), type: "submit", children: button?.text ? button.text : 'Отправить заявку' }));
 
-    const createDraftTask = (body) => doRequest('/user-data/createDraftTask', 'POST', body);
+    const createDraftTask = async (body) => {
+        const res = await fetchRetailJSON('/user-data/createDraftTask', 'POST', body);
+        return res || {};
+    };
 
-    const createUserProfile = (body) => doRequest('/public-data/createUserProfile', 'POST', body);
+    const createUserProfile = (body) => fetchRetailJSON('/public-data/createUserProfile', 'POST', body).then((res) => res?.profile?.id || null);
 
-    const updateUserProfile = (body) => doRequest('/user-data/updateUserProfile', 'PUT', body);
+    const updateUserProfile = (body) => fetchRetailJSON('/user-data/updateUserProfile', 'PUT', body);
 
-    const updateUserTask = (body) => doRequest('/user-data/updateUserTask', 'PUT', body);
+    const updateUserTask = (body) => fetchRetailJSON('/user-data/updateUserTask', 'PUT', body);
 
     const getUpdateUserProfileData = (profileId, formData) => {
         const { name = '', surname = '', middleName = '', birthday = '', phone = '', email = '', processPersonalDataFlg, consentProviderFlg, consentPfrFlg, consentPhotoFlg, consentAssignmentClaimsFlg, consentCollectionFlg, consentInformFlg, } = formData;
@@ -3732,6 +3741,17 @@
         };
     };
 
+    const sendCode = (body) => fetchRetailJSON('/sms/sendCode', 'POST', body).then((res) => !isErrorResult(res, body.phoneNumber));
+    const isErrorResult = (res, phoneNumber) => Boolean(res) &&
+        typeof res !== 'string' &&
+        Boolean(res?.errorMessage.startsWith(`Too many request for phoneNumber [${phoneNumber}]`));
+
+    const checkCaptcha = (body) => doRequest('/sms/checkCaptcha', 'POST', body)
+        .then((res) => res.text())
+        .then((text) => text !== 'ERROR');
+
+    const createCaptcha = (phoneNumber) => doRequest(`/sms/createCaptcha?phoneNumber=${encodeURIComponent(phoneNumber)}`, 'GET').then(async (res) => (res ? await res.blob() : new Blob()));
+
     const ICON_SIZE$1 = { width: '103', height: '21' };
 
     const logoTitleSizeStyle = 'text-s';
@@ -3762,34 +3782,25 @@
                 ? children ?? (jsx("div", { className: "ml-s", children: jsx(Text, { font: "font-medium", color: TEXT_COLOR[bgColor], size: logoTitleSizeStyle, children: logo?.title ?? 'Россельхозбанк' }) }))
                 : null] })));
 
-    const checkCaptcha = (body) => doRequest('/sms/checkCaptcha', 'POST', body);
-
-    const handleCheckCaptcha = async ({ code, setHasError, close, sendCode = noop, }) => {
-        const response = await checkCaptcha({ captchaText: code });
-        if ((await response.text()) === 'ERROR') {
-            setHasError(true);
-        }
-        else {
-            sendCode();
-            close?.();
-        }
-    };
-
-    const createCaptcha = (phoneNumber) => doRequest(`/sms/createCaptcha?phoneNumber=${encodeURIComponent(phoneNumber)}`, 'GET');
-
-    const handleCreateCaptcha = async (setCaptcha, phoneNumber) => {
-        const response = await createCaptcha(phoneNumber);
-        setCaptcha(URL.createObjectURL(await response.blob()));
-    };
-
     const CaptchaDialog = JSX(({ phoneNumber, close, sendCode, onClose }) => {
         const [captcha, setCaptcha] = useState('');
         const [code, setCode] = useState('');
         const [hasError, setHasError] = useState(false);
-        useEffect(() => {
-            handleCreateCaptcha(setCaptcha, phoneNumber);
+        const handleCheckCaptcha = useCallback(async () => {
+            const isValidCode = await checkCaptcha({ captchaText: code });
+            if (isValidCode) {
+                sendCode?.();
+                close?.();
+            }
+            else {
+                setHasError(isValidCode);
+            }
+        }, []);
+        const handleCreateCaptcha = useCallback(() => {
+            (async () => setCaptcha(URL.createObjectURL(await createCaptcha(phoneNumber))))();
         }, []);
-        return (jsx(Dialog, { head: jsx(Logo, {}), onClose: onClose, className: "my-6xl max-w-lg w-full min-h-fit mx-auto rounded-lg", children: jsxs("div", { className: "flex flex-col gap-lg items-center rounded-md", children: [jsxs("div", { className: "flex h-36 w-72", children: [jsx("img", { className: "grow", src: captcha }), jsx("div", { onClick: () => handleCreateCaptcha(setCaptcha, phoneNumber), className: "flex w-8 items-center justify-center cursor-pointer", children: jsx(Icon, { iconVersion: "normal", name: "RefreshIcon" }) })] }), jsx(Input, { className: "w-[300px]", 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-[310px] justify-between", children: [jsx(Button, { onClick: close, version: "secondary", children: "\u0412\u0435\u0440\u043D\u0443\u0442\u044C\u0441\u044F" }), jsx(Button, { type: "submit", disabled: !code, onClick: () => handleCheckCaptcha({ code, setHasError, close, sendCode }), version: "secondary", children: "\u041E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C" })] })] }) }));
+        useEffect(handleCreateCaptcha, []);
+        return (jsx(Dialog, { head: jsx(Logo, {}), onClose: onClose, className: "my-6xl max-w-lg w-full min-h-fit mx-auto rounded-lg", children: jsxs("div", { className: "flex flex-col gap-lg items-center rounded-md", children: [jsxs("div", { className: "flex h-36 w-72", children: [jsx("img", { className: "grow", src: captcha }), jsx("div", { onClick: handleCreateCaptcha, className: "flex w-8 items-center justify-center cursor-pointer", children: jsx(Icon, { iconVersion: "normal", name: "RefreshIcon" }) })] }), jsx(Input, { className: "w-[300px]", 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-[310px] justify-between", children: [jsx(Button, { onClick: close, version: "secondary", children: "\u0412\u0435\u0440\u043D\u0443\u0442\u044C\u0441\u044F" }), jsx(Button, { type: "submit", disabled: !code, onClick: handleCheckCaptcha, version: "secondary", children: "\u041E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C" })] })] }) }));
     });
 
     const useCaptchaDialog = (initialProps, onClose) => {
@@ -3821,29 +3832,6 @@
         return `${minutes}:${seconds}`;
     };
 
-    const sendCode = (body) => doRequest('/sms/sendCode', 'POST', body);
-
-    const handleSendCode = async ({ phoneNumber, captchaDialog, setTimeNextReq, setIsTimerStarted, setAttemps, }) => {
-        try {
-            await sendCode({
-                phoneNumber: phoneNumber,
-                smsCodesSetName: { key: 'AUTHENTICATION' },
-            }).then((res) => {
-                if (typeof res !== 'string' &&
-                    res.errorMessage &&
-                    res.errorMessage.startsWith(`Too many request for phoneNumber [${phoneNumber}]`)) {
-                    throw res;
-                }
-            });
-            setAttemps(0);
-            setTimeNextReq(180);
-            setIsTimerStarted(true);
-        }
-        catch (e) {
-            captchaDialog.open();
-        }
-    };
-
     const InputCode = JSX(({ values, setValues, hasError, errorText }) => {
         const [activeIndex, setActiveIndex] = useState(0);
         const inputRefs = useRef([]);
@@ -3888,10 +3876,12 @@
         return (jsx(Button, { type: "button", onClick: onClick, disabled: isDisabled, children: jsx(Text, { font: "font-normal", children: text }) }));
     });
 
-    const checkCode = async (body) => doRequest('/sms/checkCode', 'POST', body).then(saveToken);
+    const checkCode = async (body) => fetchRetailJSON('/sms/checkCode', 'POST', body).then(saveToken);
     const saveToken = (data) => {
-        globalThis.sessionStorage.setItem('accessToken', data.access_token);
-        globalThis.sessionStorage.setItem('refreshToken', data.refresh_token);
+        if (data) {
+            globalThis.sessionStorage.setItem('accessToken', data.access_token);
+            globalThis.sessionStorage.setItem('refreshToken', data.refresh_token);
+        }
     };
 
     const useVerifyPhoneDialogSubmit = ({ close, values }) => {
@@ -3951,23 +3941,28 @@
     const VerifyPhoneDialog = JSX(({ close = noop, onClose = noop, title, description, __html, code = true, codeLength = 4, textButton = '', phoneNumber = '+79999999999', }) => {
         const [values, setValues] = useState(Array(codeLength).fill(''));
         const { handleSubmit, hasError, errorText, isLoading, timeNextReq, isSubmitButtonDisabled, setTimeNextReq, setIsTimerStarted, setAttemps, } = useVerifyPhoneDialogSubmit({ values, close });
-        const sendCode = useCallback(() => {
-            handleSendCode({
-                phoneNumber,
-                captchaDialog,
-                setTimeNextReq,
-                setIsTimerStarted,
-                setAttemps,
+        const handleSendCode = useCallback(async () => {
+            const isSuccessSendCode = await sendCode({
+                phoneNumber: phoneNumber,
+                smsCodesSetName: { key: 'AUTHENTICATION' },
             });
+            if (isSuccessSendCode) {
+                setAttemps(0);
+                setTimeNextReq(180);
+                setIsTimerStarted(true);
+            }
+            else {
+                captchaDialog.open();
+            }
         }, []);
-        const captchaDialog = useCaptchaDialog({ phoneNumber, sendCode }, onClose);
+        const captchaDialog = useCaptchaDialog({ phoneNumber, sendCode: handleSendCode }, onClose);
         useEffect(() => {
-            sendCode();
+            handleSendCode();
         }, []);
-        return (jsx(Dialog, { className: "my-6xl max-w-3xl w-full min-h-fit mx-auto rounded-xl px-5xl py-0", children: jsxs("div", { className: "flex flex-col gap-xl items-center rounded-md", children: [jsx(Headline, { className: "w-full", title: title, description: description, headlineVersion: "XS", isEmbedded: true, as: "h6" }), code ? (jsx(InputCode, { values: values, setValues: setValues, errorText: errorText, hasError: hasError })) : null, renderText$2(timeNextReq, setTimeNextReq, sendCode), jsx(RichText, { itemSize: "list-s", __html: __html }), renderTextButton(textButton, isSubmitButtonDisabled, handleSubmit), isLoading ? jsx(Loader, { blur: false }) : null] }) }));
+        return (jsx(Dialog, { className: "my-6xl max-w-3xl w-full min-h-fit mx-auto rounded-xl px-5xl py-0", children: jsxs("div", { className: "flex flex-col gap-xl items-center rounded-md", children: [jsx(Headline, { className: "w-full", title: title, description: description, headlineVersion: "XS", isEmbedded: true, as: "h6" }), code ? (jsx(InputCode, { values: values, setValues: setValues, errorText: errorText, hasError: hasError })) : null, renderText$2(timeNextReq, setTimeNextReq, handleSendCode), jsx(RichText, { itemSize: "list-s", __html: __html }), renderTextButton(textButton, isSubmitButtonDisabled, handleSubmit), isLoading ? jsx(Loader, { blur: false }) : null] }) }));
     });
     const renderTextButton = (textButton, isDisabled, handleSubmit) => textButton ? (jsx(SubmitButton, { isDisabled: isDisabled, onClick: handleSubmit, text: textButton })) : null;
-    const renderText$2 = (timeNextReq, setTimeNextReq, sendCode) => timeNextReq ? (jsxs("div", { className: "flex flex-row text-l font-light text-base", children: ["\u041F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u043D\u043E\u0432\u044B\u0439 \u043A\u043E\u0434 \u043C\u043E\u0436\u043D\u043E \u0447\u0435\u0440\u0435\u0437", jsx(Timer, { className: "text-base ml-1", time: timeNextReq, setTime: setTimeNextReq })] })) : (jsx(LinkButton, { onClick: sendCode, className: "text-primary-main", children: "\u041F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u043D\u043E\u0432\u044B\u0439 \u043A\u043E\u0434" }));
+    const renderText$2 = (timeNextReq, setTimeNextReq, handleSendCode) => timeNextReq ? (jsxs("div", { className: "flex flex-row text-l font-light text-base", children: ["\u041F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u043D\u043E\u0432\u044B\u0439 \u043A\u043E\u0434 \u043C\u043E\u0436\u043D\u043E \u0447\u0435\u0440\u0435\u0437", jsx(Timer, { className: "text-base ml-1", time: timeNextReq, setTime: setTimeNextReq })] })) : (jsx(LinkButton, { onClick: handleSendCode, className: "text-primary-main", children: "\u041F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u043D\u043E\u0432\u044B\u0439 \u043A\u043E\u0434" }));
 
     const useVerifyPhoneDialog = () => {
         const { open, close } = useDialogManager();
@@ -4046,7 +4041,7 @@
               <ul><li>согласие на запрос информации в БКИ</li></ul>`,
     });
 
-    const getLink = (body) => doRequest('/esia/getLink', 'POST', body);
+    const getLink = (body) => fetchRetailJSON('/esia/getLink', 'POST', body);
 
     const EsiaLoginDialog = JSX(function ({ handleClose }) {
         const handleAuth = useCallback(async () => {
@@ -4190,7 +4185,7 @@
                 return console.warn('validation fail');
             }
             try {
-                const { profile: { id: profileId }, } = await createUserProfile({
+                const profileId = await createUserProfile({
                     profile: { phone: formatPhone(formData.phone) },
                 });
                 if (profileId && formData?.phone) {
@@ -4259,7 +4254,7 @@
         };
     };
 
-    const updateProfileEsia = (body) => doRequest('/esia/updateProfileEsia', 'POST', body);
+    const updateProfileEsia = (body) => fetchRetailJSON('/esia/updateProfileEsia', 'POST', body);
 
     const parseEsiaProfile = (esiaProfile) => {
         const { profile, addInfo, document, addressRegistration, addressFact } = esiaProfile;
@@ -4325,10 +4320,11 @@
                     state,
                     redirectUri: globalThis.location?.href,
                 });
-                setLeadForm({
-                    ...leadForm,
-                    ...parseEsiaProfile(data),
-                });
+                data &&
+                    setLeadForm({
+                        ...leadForm,
+                        ...parseEsiaProfile(data),
+                    });
                 globalThis.location.href = nextStepLink;
             }
         }, []);
@@ -6000,12 +5996,12 @@
                 // eslint-disable-next-line camelcase
                 access_token: accessToken,
             });
-            if (res instanceof Response) {
+            if (res) {
                 handleStatus(res.status);
-                return;
+                const data = await res.json();
+                globalThis.sessionStorage.setItem('refreshToken', data.refresh_token);
+                globalThis.sessionStorage.setItem('accessToken', data.access_token);
             }
-            globalThis.sessionStorage.setItem('refreshToken', res.refresh_token);
-            globalThis.sessionStorage.setItem('accessToken', res.access_token);
         };
         updateTokenRequest();
         const timer = setInterval(updateTokenRequest, UPDATING_INTERVAL);
@@ -6031,7 +6027,7 @@
         STATUS_TYPE["fail"] = "CANCELLED";
         STATUS_TYPE["rework"] = "REVISION";
     })(STATUS_TYPE || (STATUS_TYPE = {}));
-    const getTaskStatus = (body) => doRequest('/user-data/getTaskStatus', 'POST', body);
+    const getTaskStatus = (body) => fetchRetailJSON('/user-data/getTaskStatus', 'POST', body);
 
     const sendSignalToProcess = (body) => doRequest('/user-data/sendSignalToProcess', 'POST', body);
 
@@ -6137,12 +6133,13 @@
                     await sendSignalToProcess({ signalType, taskId });
                 }
             })();
-            const trackStatus = () => getTaskStatus({ taskId }).then((res) => {
-                if (res.statusCd && res.statusCd !== STATUS_TYPE.process) {
+            const trackStatus = useCallback(async () => {
+                const res = await getTaskStatus({ taskId });
+                if (res && res?.statusCd !== STATUS_TYPE.process) {
                     clearInterval(pullingInterval);
                     setStatus(res.statusCd);
                 }
-            });
+            }, []);
             const pullingInterval = setInterval(trackStatus, 30000);
         }, []);
         return renderStatus$1(status);
@@ -7015,7 +7012,7 @@
             })();
             const trackStatus = () => taskId &&
                 getTaskStatus({ taskId }).then((res) => {
-                    if (res.statusCd && res.statusCd !== STATUS_TYPE.process) {
+                    if (res?.statusCd && res.statusCd !== STATUS_TYPE.process) {
                         clearInterval(pullingInterval);
                         setStatus(res.statusCd);
                     }
@@ -9599,7 +9596,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.669";
+    const packageVersion = "0.14.670";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;