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

package/mobile/bundle/bundle.umd.js

@@ -718,13 +718,11 @@
         const [currentLink, setCurrentLink] = useState();
         const handleFormSubmit = useFormSubmit({ method, href });
         const linksStore = useLocalStore();
-        saveLinksToStore({ linksStore, href, id, additionalHrefs });
-        const adjustedHref = additionalHrefs
-            ? (linksStore.links || []).find((store) => store.id === id)?.lastLink
-            : href;
         useEffect(() => {
-            setCurrentLink(adjustedHref);
-        }, [adjustedHref]);
+            additionalHrefs && saveLinksToStore({ linksStore, href, id, additionalHrefs });
+            const adjustedHref = (linksStore.links || []).find((store) => store.id === id)?.lastLink;
+            setCurrentLink(adjustedHref ?? href);
+        }, [additionalHrefs, href]);
         const link = useLink();
         const adjustedProps = link({ onClick: handleFormSubmit, href: currentLink, ...rest });
         const buttonInner = children ?? jsx(ButtonInner, { ...adjustedProps });
@@ -1539,14 +1537,14 @@
     const CloseButton = JSX(({ className, onClose }) => (jsx("button", { className: style('flex justify-center items-center w-12 h-12 p-2xs bg-transparent border-none', className), onClick: onClose, title: "\u0417\u0430\u043A\u0440\u044B\u0442\u044C", type: "button", children: jsx(Icon, { name: "CloseIcon", width: "20", height: "20", iconVersion: "gray" }) })));
 
     const DIALOG_STYLE = {
-        sm: 'max-w-sm top-1/3',
+        sm: 'max-w-sm',
         lg: 'max-w-lg',
         xl: 'max-w-xl',
         '4xl': 'max-w-4xl',
         none: 'mt-0',
     };
     const DIALOG_POSITION = {
-        center: 'relative mx-auto',
+        center: 'relative mx-auto top-1/2 -translate-y-1/2',
         corner: 'absolute bottom-0 right-0',
     };
     const Dialog = JSX(({ head, maxWidth = '4xl', children, onClose, onClick, position = 'center' }) => {
@@ -4900,7 +4898,7 @@
 
     const DefaultFoldButton = JSX(({ className, isUnfolded, short, label = isUnfolded ? 'Скрыть' : 'Развернуть', embedded, labelColorStyle, ...rest }) => {
         const iconColor = labelColorStyle === 'white' ? '' : 'color';
-        return (jsxs(Button, { className: style({ 'w-full': !short }, className), embedded: embedded, shape: short ? 'default' : 'square', role: "tab", "aria-label": "\u041A\u043D\u043E\u043F\u043A\u0430 \u0441\u0432\u043E\u0440\u0430\u0447\u0438\u0432\u0430\u044E\u0449\u0435\u0439\u0441\u044F \u0441\u0435\u043A\u0446\u0438\u0438", ...rest, children: [jsx(ButtonTitle, { labelColor: labelColorStyle, children: label }), jsx(ToggleIcon, { isUnfolded: isUnfolded, iconVersion: embedded ? iconColor : '' })] }));
+        return (jsxs(Button, { className: style({ 'w-full': !short }, className), embedded: embedded, shape: short ? 'default' : 'square', role: "tab", "aria-label": "\u041A\u043D\u043E\u043F\u043A\u0430 \u0441\u0432\u043E\u0440\u0430\u0447\u0438\u0432\u0430\u044E\u0449\u0435\u0439\u0441\u044F \u0441\u0435\u043A\u0446\u0438\u0438", ...rest, children: [jsx(ButtonTitle, { labelColor: labelColorStyle, children: label }), jsx(ToggleIcon, { isUnfolded: isUnfolded, iconVersion: embedded ? iconColor : '', className: "flex-grow-0 flex-shrink-0 basis-auto" })] }));
     });
 
     // TODO Не особо полезно, в итоге
@@ -7199,6 +7197,10 @@
         };
     };
 
+    const sendMessage = async (body) => {
+        await doRequest('/camunda/send/message', 'POST', body);
+    };
+
     /* eslint-disable camelcase */
     const creditCodesToProgrammIdMap = {
         credit_cash: '10',
@@ -7390,15 +7392,15 @@
             }
             : undefined;
     };
-    const getProductData = (isDebit = false, isCredit = false) => {
-        if (isDebit) {
+    const getProductData = (taskType) => {
+        if (taskType === 'debit') {
             return {
                 nextStepLink: '/debit-card-lead',
                 newTaskLink: '/natural/debetcards',
                 description: 'На дебетовую карту',
             };
         }
-        else if (isCredit) {
+        else if (taskType === 'credit') {
             return {
                 nextStepLink: '/credit-lead',
                 newTaskLink: '/natural/loans/all-goals',
@@ -7478,13 +7480,16 @@
         };
     };
 
-    const DraftDialog = JSX(function ({ task, isFromLead = false, isDebit = false, sendAspects = noop, onClose = noop, }) {
+    const getTaskTypeOrDebit = (taskType, isDebit) => {
+        return taskType || (isDebit ? 'debit' : undefined);
+    };
+    const DraftDialog = JSX(function ({ task, taskType, isDebit, isFromLead = false, sendAspects = noop, onClose = noop, }) {
         const retailFormStore = useRetailFormStore();
         const navigator = locationNavigator();
+        const isNewMicroservice = checkNewMicroservice();
         const { participants, participant, creditProgram, createdDate = '', id: taskId } = task;
         const programmId = creditProgramCodeToProductIdMap[creditProgram.code];
-        const isCredit = Boolean(creditCodesToProgrammIdMap[creditProgram.code]);
-        const productData = getProductData(isDebit, isCredit);
+        const productData = getProductData(getTaskTypeOrDebit(taskType, isDebit));
         const currentParticipant = participant || participants?.[0];
         const { id: participantId, profile } = currentParticipant || {};
         const handleGoToDraft = useCallback(() => {
@@ -7500,15 +7505,26 @@
             }
             navigator.assign(productData.nextStepLink);
         }, []);
-        const handleGoToNewTask = useCallback(() => {
+        const handleGoToNewTask = useCallback(async () => {
+            if (isNewMicroservice) {
+                try {
+                    await sendMessage({
+                        messageName: 'KILL_DRAFT_PROCESS_MESSAGE',
+                        taskId: task.id,
+                    });
+                }
+                catch (ex) {
+                    console.error(ex);
+                }
+            }
             navigator.assign(productData.newTaskLink);
-        }, []);
+        }, [task.id, productData.newTaskLink, isNewMicroservice]);
         return (jsx(Dialog, { onClose: onClose, children: jsxs("div", { className: "flex flex-col gap-lg items-center mt-xs mx-6xl", children: [jsx(Heading, { className: "whitespace-pre-wrap text-center", title: "\u041D\u0430\u0448\u043B\u0438 \u0447\u0435\u0440\u043D\u043E\u0432\u0438\u043A \u0432\u0430\u0448\u0435\u0439 \u0437\u0430\u044F\u0432\u043A\u0438", headingType: "h5" }), jsxs("div", { className: "flex flex-col gap-m max-w-lg", children: [jsx(DraftActionButton, { title: "\u041F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u044C \u0437\u0430\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435 \u0447\u0435\u0440\u043D\u043E\u0432\u0438\u043A\u0430", icon: "BankColorIcon", description: createdDate ? `Черновик от ${formatDate(new Date(createdDate))}` : '', onClick: handleGoToDraft, name: "go-to-draft-button" }), jsx(DraftActionButton, { title: isFromLead ? 'Продолжить заполнение текущей заявки' : 'Создать новую заявку', icon: "NewLoanIcon", description: productData.description, onClick: isFromLead ? onClose : handleGoToNewTask, name: "go-to-current-task-button" })] })] }) }));
     });
 
-    const EmptyDraftDialog = JSX(function ({ isDebit, onClose = noop }) {
+    const EmptyDraftDialog = JSX(function ({ taskType, isDebit, onClose = noop, }) {
         const navigator = locationNavigator();
-        const productData = getProductData(isDebit);
+        const productData = getProductData(taskType || (isDebit ? 'debit' : undefined));
         const handleGoNewTask = useCallback(() => {
             navigator.assign(productData.newTaskLink);
         }, []);
@@ -7522,14 +7538,67 @@
         const { open: openDraftDialog } = useDialog(DraftDialog);
         const { open: openEmptyDraftDialog } = useDialog(EmptyDraftDialog);
         return {
-            open: ({ task, isFromLead, isDebit, onClose, sendAspects }) => {
+            open: ({ task, isFromLead, taskType, isDebit, onClose, sendAspects, }) => {
                 task
-                    ? openDraftDialog({ task, isFromLead, isDebit, onClose, sendAspects })
-                    : openEmptyDraftDialog({ isDebit });
+                    ? openDraftDialog({ task, isFromLead, taskType, isDebit, onClose, sendAspects })
+                    : openEmptyDraftDialog({ taskType, isDebit });
             },
         };
     };
 
+    const draftTaskCard = async () => {
+        // TODO: Заглушка - бэкенд в разработке
+        return [];
+    };
+
+    const draftTaskCredit = async () => {
+        const res = await fetchRetailJSON('/public-data/draftTaskCredit', 'GET');
+        return res ? [res] : [];
+    };
+
+    const draftTaskDebit = async () => {
+        // TODO: Заглушка - бэкенд в разработке
+        return [];
+    };
+
+    const collectDrafts = (creditResults, cardResults, debitResults) => {
+        const drafts = [];
+        const results = [
+            { result: creditResults, type: 'credit' },
+            { result: cardResults, type: 'card' },
+            { result: debitResults, type: 'debit' },
+        ];
+        results.forEach(({ result, type }) => {
+            if (result.status === 'fulfilled' && result.value.length > 0) {
+                drafts.push({ task: result.value[0], type });
+            }
+        });
+        return drafts;
+    };
+    const findLatestDraft = (drafts) => {
+        return drafts.reduce((latest, current) => {
+            const latestDate = new Date(latest.task.createdDate || 0);
+            const currentDate = new Date(current.task.createdDate || 0);
+            return currentDate > latestDate ? current : latest;
+        });
+    };
+    const useDraftSearch = () => {
+        const searchDrafts = useCallback(async () => {
+            const [creditResults, cardResults, debitResults] = await Promise.allSettled([
+                draftTaskCredit(),
+                draftTaskCard(),
+                draftTaskDebit(),
+            ]);
+            const drafts = collectDrafts(creditResults, cardResults, debitResults);
+            if (drafts.length === 0) {
+                return { draft: null, taskType: undefined };
+            }
+            const latestDraft = findLatestDraft(drafts);
+            return { draft: latestDraft.task, taskType: latestDraft.type };
+        }, []);
+        return { searchDrafts };
+    };
+
     // TODO Не должно быть импортов из бизнес-слоя в API слой. Только наоборот.
     const getUpdateUserProfileData = (profileId, formData, consents) => {
         const { name = '', surname = '', middleName = '', limitedBirthday = '', phone = '', email = '', } = formData;
@@ -7678,6 +7747,7 @@
         const consentBkiDialog = useConsentBkiDialog(goToNextStep);
         const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
         const draftDialog = useDraftDialog();
+        const { searchDrafts } = useDraftSearch();
         const handleFailSendForm = () => {
             verifyPhoneDialog.close();
             changeSubmitFormStatus(false);
@@ -7726,7 +7796,7 @@
                             draftDialog.open({
                                 task,
                                 isFromLead: true,
-                                isDebit: productType === 'debitCard',
+                                taskType: productType === 'debitCard' ? 'debit' : 'credit',
                                 sendAspects,
                                 onClose: sendCurrentTask,
                             });
@@ -7771,29 +7841,31 @@
                 if (!participantId) {
                     throw new Error();
                 }
-                const sendCurrentTask = createSendCurrentTaskNew({
+                const common = {
                     programId,
-                    participantId,
                     userId,
+                    productType,
+                    sendAspects,
+                    verifyPhoneDialog,
+                    handleFailSendForm,
+                };
+                const taskData = {
+                    participantId,
                     formData: transformedFormData,
                     referalData,
-                    productType,
                     marketingInfo,
                     saveUserData,
-                    sendAspects,
-                    verifyPhoneDialog,
+                };
+                const sendCurrentTask = createSendCurrentTaskNew({
+                    common,
+                    taskData,
                     consentBkiDialog,
-                    handleFailSendForm,
                 });
                 const handleSuccessVerify = createHandleSuccessVerifyNew({
-                    userId,
-                    programId,
-                    productType,
-                    verifyPhoneDialog,
+                    common,
                     draftDialog,
-                    sendAspects,
                     sendCurrentTask,
-                    handleFailSendForm,
+                    searchDrafts,
                 });
                 const acceptedConsents = getAcceptedConsents(transformedFormData, productType);
                 verifyPhoneDialog.open({
@@ -7815,7 +7887,9 @@
             handleSubmit: isNewMicroservice ? handleSubmitNewMicroservice : handleSubmitOldMicroservice,
         };
     };
-    const createSendCurrentTaskNew = ({ programId, participantId, userId, formData, referalData, productType, marketingInfo, saveUserData, sendAspects, verifyPhoneDialog, consentBkiDialog, handleFailSendForm, }) => async () => {
+    const createSendCurrentTaskNew = ({ common, taskData, consentBkiDialog, }) => async () => {
+        const { programId, userId, productType, sendAspects, verifyPhoneDialog, handleFailSendForm } = common;
+        const { participantId, formData, referalData, marketingInfo, saveUserData } = taskData;
         const taskId = await updateUserDataNewMicroservice({
             programId,
             participantId,
@@ -7831,32 +7905,29 @@
         consentBkiDialog.open({
             phone: formData.phone,
             taskId,
-            userId,
             participantId,
             onFail: handleFailSendForm,
         });
     };
-    const createHandleSuccessVerifyNew = ({ userId, programId, productType, verifyPhoneDialog, draftDialog, sendAspects, sendCurrentTask, handleFailSendForm, }) => async () => {
+    const createHandleSuccessVerifyNew = ({ common, draftDialog, sendCurrentTask, searchDrafts, }) => async () => {
+        const { verifyPhoneDialog, sendAspects, handleFailSendForm } = common;
         try {
-            const lastTaskId = await getLastTaskStatus({
-                userId,
-                programId,
-            });
-            if (lastTaskId) {
-                const task = await getTaskById({ taskId: lastTaskId });
-                if (task) {
-                    verifyPhoneDialog.close();
-                    draftDialog.open({
-                        task,
-                        isFromLead: true,
-                        isDebit: productType === 'debitCard',
-                        sendAspects,
-                        onClose: sendCurrentTask,
-                    });
-                    return;
-                }
+            const { draft, taskType } = await searchDrafts();
+            verifyPhoneDialog.close();
+            if (!draft) {
+                draftDialog.open({
+                    task: undefined,
+                    taskType: null,
+                });
+                return;
             }
-            await sendCurrentTask();
+            draftDialog.open({
+                task: draft,
+                taskType,
+                isFromLead: true,
+                sendAspects,
+                onClose: sendCurrentTask,
+            });
         }
         catch {
             handleFailSendForm();
@@ -11360,10 +11431,6 @@
         return (jsx("div", { className: "py-lg px-5xl bg-white col-span-12", children: jsxs("div", { children: [jsxs("span", { className: "font-bold mr-s", children: ["\u0428\u0430\u0433 ", step, " \u0438\u0437 ", totalSteps, "."] }), stepsTitles[step] || null, jsx(ProgressBar, { step: progress, showPercentage: false })] }) }));
     });
 
-    const sendMessage = async (body) => {
-        await doRequest('/camunda/send/message', 'POST', body);
-    };
-
     const FailedStatusContent$1 = JSX(() => (jsx(FormStatus, { title: "\u0411\u043B\u0430\u0433\u043E\u0434\u0430\u0440\u0438\u043C \u0412\u0430\u0441 \u0437\u0430 \u043E\u0436\u0438\u0434\u0430\u043D\u0438\u0435", description: "\u0412 \u043D\u0430\u0441\u0442\u043E\u044F\u0449\u0438\u0439 \u043C\u043E\u043C\u0435\u043D\u0442 \u0411\u0430\u043D\u043A \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u043E\u0434\u043E\u0431\u0440\u0438\u0442\u044C \u0412\u0430\u0448\u0443 \u0437\u0430\u044F\u0432\u043A\u0443 \u043D\u0430 \u043A\u0440\u0435\u0434\u0438\u0442. \u041F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u043F\u043E\u0434\u0430\u0442\u044C \u0437\u0430\u044F\u0432\u043A\u0443 \u043F\u043E\u0437\u0436\u0435. \u0421\u043F\u0430\u0441\u0438\u0431\u043E \u0437\u0430 \u043E\u0431\u0440\u0430\u0449\u0435\u043D\u0438\u0435 \u0432 \u0410\u041E \u00AB\u0420\u043E\u0441\u0441\u0435\u043B\u044C\u0445\u043E\u0437\u0431\u0430\u043D\u043A\u00BB.", buttonText: "\u0412\u0435\u0440\u043D\u0443\u0442\u044C\u0441\u044F \u043D\u0430 \u0433\u043B\u0430\u0432\u043D\u0443\u044E" })));
 
     const getCreditInfo = (programmId) => {
@@ -14394,7 +14461,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.1034";
+    const packageVersion = "0.14.1036";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;