@redneckz/wildless-cms-uni-blocks 0.14.1033 → 0.14.1035

package/mobile/bundle/bundle.umd.js

@@ -1206,6 +1206,14 @@
     });
     const randomNumber = (min = 0, max = 0) => Math.floor(Math.random() * (max - min) + min);
 
+    function useBool(defaultValue = false) {
+        const [value, setValue] = useState(defaultValue);
+        const setTrue = useCallback(() => setValue(true), []);
+        const setFalse = useCallback(() => setValue(false), []);
+        const toggle = useCallback(() => setValue(_ => !_), []);
+        return [value, { setValue, setTrue, setFalse, toggle }];
+    }
+
     function locationNavigator() {
         return locationNavigator._impl();
     }
@@ -1259,14 +1267,6 @@
         useAspects._impl = impl;
     };
 
-    function useBool(defaultValue = false) {
-        const [value, setValue] = useState(defaultValue);
-        const setTrue = useCallback(() => setValue(true), []);
-        const setFalse = useCallback(() => setValue(false), []);
-        const toggle = useCallback(() => setValue(_ => !_), []);
-        return [value, { setValue, setTrue, setFalse, toggle }];
-    }
-
     const objectValidator = (validatorsMap) => (o) => (o &&
         Object.entries(validatorsMap ?? {}).flatMap(([key, validator]) => validator ? validator(o[key]) : [])) ||
         [];
@@ -1347,11 +1347,11 @@
             markAsClean();
             setFormState(initialState);
         }, [initialState, setFormState]);
-        const handleSubmit = useCallback((ev) => {
+        const handleSubmit = useCallback(async (ev) => {
             ev.preventDefault();
             if (isValid) {
+                await onSubmit?.(formState, ev);
                 resetOnSubmit && reset();
-                onSubmit?.(formState, ev);
             }
             else {
                 const errorFieldName = getErrorFieldName(formState, fieldValidatorsMap);
@@ -2552,7 +2552,7 @@
 
     const agreementText = 'Нажимая кнопку, вы подтверждаете согласие с ';
     const agreementTextPF = 'Нажимая на кнопку, вы подтверждаете, что клиент дал согласие на ';
-    const renderAgreementSubmit = ({ consentDataProcessing, link, additionalLink, button, typeForm, }) => (jsxs("div", { className: "flex col-span-2 gap-xs flex-col w-full items-baseline", children: [consentDataProcessing ? (jsxs("div", { children: [jsxs("div", { className: "flex gap-3 items-center", children: [jsx(Checkbox, { ...consentDataProcessing }), jsx(Footnote, { link: link })] }), renderErrorText(withValidator(consentDataProcessing, agreementValidator).error)] })) : (jsx(Footnote, { text: typeForm === 'PF' ? agreementTextPF : agreementText, link: link, additionalLink: additionalLink })), jsx(SubmitButton$1, { className: "w-full @xl:w-auto", children: button?.text ? button.text : 'Отправить заявку' })] }));
+    const renderAgreementSubmit = ({ consentDataProcessing, link, additionalLink, button, typeForm, isSending = false, }) => (jsxs("div", { className: "flex col-span-2 gap-xs flex-col w-full items-baseline", children: [consentDataProcessing ? (jsxs("div", { children: [jsxs("div", { className: "flex gap-3 items-center", children: [jsx(Checkbox, { ...consentDataProcessing }), jsx(Footnote, { link: link })] }), renderErrorText(withValidator(consentDataProcessing, agreementValidator).error)] })) : (jsx(Footnote, { text: typeForm === 'PF' ? agreementTextPF : agreementText, link: link, additionalLink: additionalLink })), jsx(SubmitButton$1, { className: "w-full @xl:w-auto", isLoading: isSending, children: button?.text ? button.text : 'Отправить заявку' })] }));
 
     const renderContacts = () => (jsxs("div", { className: "space-y-m", children: [jsx(Heading, { headingType: "h6", title: "\u0418\u043B\u0438 \u0441\u0432\u044F\u0436\u0438\u0442\u0435\u0441\u044C \u0441 \u043D\u0430\u043C\u0438 \u0443\u0434\u043E\u0431\u043D\u044B\u043C \u0441\u043F\u043E\u0441\u043E\u0431\u043E\u043C", className: "@xl:text-center" }), jsxs("div", { className: "flex sm:justify-center gap-xl", children: [jsxs("a", { className: "flex gap-s items-center text-primary-text no-underline", href: `tel:8 (800) 200-78-70`, "aria-label": "\u0442\u0435\u043B\u0435\u0444\u043E\u043D 8 (800) 200-78-70", children: [jsx(Img, { image: { icon: 'PhoneIcon' }, width: "24", height: "24" }), jsx("span", { children: "8 (800) 200-78-70" })] }), jsxs("a", { className: "flex gap-s items-center text-primary-text no-underline", "aria-label": "\u043F\u043E\u0447\u0442\u0430 ved@rshb.ru", href: `mailto:ved@rshb.ru`, children: [jsx(Img, { image: { icon: 'MailIcon' }, width: "24", height: "24" }), jsx("span", { children: "ved@rshb.ru" })] })] })] }));
 
@@ -4026,7 +4026,9 @@
         const responseTypeDialog = useDialog(ResponseTypeDialog);
         const verifyPhoneDialog = useDialog(VerifyPhoneDialog$1);
         const openUserSurvey = useUserSurveyDialog(true);
+        const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
         const handleSubmit = useCallback(async (formData, ev) => {
+            startSending();
             const formatData = getFormatData({ ...formData, ...additionalParams });
             await executeHandler({
                 formatData,
@@ -4041,6 +4043,7 @@
                 withSnowplow,
                 openUserSurvey,
             }, endpoint);
+            endSending();
         }, [typeForm]);
         const [, { field, onSubmit }] = useForm(initialFormState, {
             resetOnSubmit: true,
@@ -4055,6 +4058,7 @@
                             additionalLink,
                             button,
                             typeForm,
+                            isSending,
                         })] }), isContacts ? renderContacts() : null] }));
     });
     const executeHandler = async (context, endpoint) => {
@@ -6894,7 +6898,9 @@
     };
 
     const getLastTaskStatus = async (body) => {
-        const res = await fetchRetailJSON('/user-data/getLastStatus', 'POST', body);
+        const isNewMicroservice = checkNewMicroservice();
+        const endpoint = isNewMicroservice ? '/public-data/getLastStatus' : '/user-data/getLastStatus';
+        const res = await fetchRetailJSON(endpoint, 'POST', body);
         return res?.statusCd === 'DRAFT' ? res?.taskId : null;
     };
 
@@ -7180,11 +7186,10 @@
             }
         };
         return {
-            open: ({ phone, profileId, userId, onFail, taskId, participantId }) => open({
+            open: ({ phone, profileId, onFail, taskId, participantId }) => open({
                 onSubmit: handleSubmitBkiConsent({
                     phone,
                     profileId,
-                    userId,
                     onFail,
                     taskId,
                     participantId,
@@ -7835,7 +7840,6 @@
         try {
             const lastTaskId = await getLastTaskStatus({
                 userId,
-                profileId: userId,
                 programId,
             });
             if (lastTaskId) {
@@ -14390,7 +14394,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.1032";
+    const packageVersion = "0.14.1034";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;