@redneckz/wildless-cms-uni-blocks 0.14.679 → 0.14.681

package/mobile/bundle/bundle.umd.js

@@ -414,6 +414,15 @@
         className,
     ].join(' ');
 
+    /* eslint-disable @typescript-eslint/ban-types */
+    const handlerDecorator = (handler) => {
+        return handlerDecorator._impl(handler);
+    };
+    handlerDecorator._impl = (handler) => handler;
+    handlerDecorator.setup = (impl) => {
+        handlerDecorator._impl = impl;
+    };
+
     class EventBus {
         watchers = new Set();
         subscribersMap = {};
@@ -473,15 +482,6 @@
 
     const adjustBase = (href, basePath = '') => href?.replace(basePath, '') || '/';
 
-    /* eslint-disable @typescript-eslint/ban-types */
-    const handlerDecorator = (handler) => {
-        return handlerDecorator._impl(handler);
-    };
-    handlerDecorator._impl = (handler) => handler;
-    handlerDecorator.setup = (impl) => {
-        handlerDecorator._impl = impl;
-    };
-
     function useLink() {
         const basePath = getBasePath(env.SITE_URL);
         const router = useRouter();
@@ -1073,6 +1073,24 @@
         }
     };
 
+    function locationNavigator() {
+        return locationNavigator._impl();
+    }
+    locationNavigator._impl = () => ({
+        assign: (url, target) => {
+            globalThis.open(url, target || '_self');
+        },
+        get origin() {
+            return globalThis.location.origin;
+        },
+        get href() {
+            return globalThis.location.href;
+        },
+    });
+    locationNavigator.setup = (impl) => {
+        locationNavigator._impl = impl;
+    };
+
     const QUERY_STORAGE_KEY = 'rshb-query-params';
     function saveSessionQuery() {
         const result = globalThis.location?.search || globalThis.sessionStorage?.getItem(QUERY_STORAGE_KEY) || '';
@@ -1094,69 +1112,18 @@
         return url.toString();
     };
 
-    function assertNonEmpty(value) {
-        if (!value) {
-            throw new Error('Value should be fulfilled');
-        }
-        return value;
-    }
-
-    const baseTableFunc = (table) => (input) => {
-        const [, unit] = assertNonEmpty(table.find(([predicate]) => predicate(input)));
-        return unit(input);
-    };
-    const tableFunc = (table) => baseTableFunc(table.map(([p, o]) => [p, () => o]));
-    tableFunc.if = (predicate) => new TableFuncBuilder(undefined, predicate);
-    class TableFuncBuilder {
-        parent;
-        predicate;
-        unit;
-        get entry() {
-            return [assertNonEmpty(this.predicate), assertNonEmpty(this.unit)];
-        }
-        constructor(parent, predicate, unit) {
-            this.parent = parent;
-            this.predicate = predicate;
-            this.unit = unit;
-        }
-        if(predicate) {
-            return new TableFuncBuilder(this, predicate);
-        }
-        then(unit) {
-            return new TableFuncBuilder(this.parent, this.predicate, unit);
-        }
-        else(unit) {
-            return baseTableFunc([...buildTable(this), [() => true, unit]]);
-        }
-    }
-    const buildTable = (builder) => [
-        ...(builder?.parent ? buildTable(builder.parent) : []),
-        builder.entry,
-    ];
-
     const forwardQuery = (ev) => {
         const anchor = ev.target?.closest('a');
-        if (isURL(anchor?.href) && !anchor?.href?.startsWith(globalThis.location?.origin)) {
+        const navigator = locationNavigator();
+        if (isURL(anchor?.href) && !anchor?.href?.startsWith(navigator.origin)) {
             ev.preventDefault();
             ev.stopPropagation();
             const url = adjustSessionQuery(anchor?.href) || anchor?.href;
             if (url) {
-                const transition = getTransition(anchor?.target);
-                transition?.(url);
+                navigator.assign(url, anchor?.target);
             }
         }
     };
-    const getTransition = tableFunc([
-        [(_) => _ === '_blank', (url) => globalThis.open(url, '_blank')],
-        [(_) => _ === '_parent', (url) => globalThis.parent && (globalThis.parent.location.href = url)],
-        [
-            (_) => _ === '_top',
-            (url) => {
-                globalThis.top && (globalThis.top.location.href = url);
-            },
-        ],
-        [() => true, (url) => globalThis.location && (globalThis.location.href = url)],
-    ]);
 
     function useAspects() {
         return useAspects._impl();
@@ -3371,10 +3338,10 @@
             creditProgramId: 13,
         });
         const data = await response?.json();
-        return data?.paymentSystems?.map((paymentSystem) => ({
+        return (data?.paymentSystems?.map((paymentSystem) => ({
             id: paymentSystem.type,
             text: paymentSystem.name,
-        }));
+        })) ?? []);
     };
 
     const PaymentSystemField = JSX(({ field, input }) => {
@@ -3427,7 +3394,7 @@
 
     const PosTerminalField = JSX(({ field }) => isAcquiringTrade(field('acquiringType')?.value?.key) ? (jsx(SlideCheckbox, { type: "radio", text: "\u0425\u043E\u0447\u0443 POS-\u0442\u0435\u0440\u043C\u0438\u043D\u0430\u043B", ...field('posTerminal') })) : null);
 
-    const ProductField = UniBlock(({ field, source }) => (jsx(SelectControl, { placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043F\u0440\u043E\u0434\u0443\u043A\u0442", label: "\u041F\u0440\u043E\u0434\u0443\u043A\u0442", options: arrayToOptions(source?.productList), ...withValidator(field('product'), validatorObj.product) })));
+    const ProductField = JSX(({ field, source }) => (jsx(SelectControl, { placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043F\u0440\u043E\u0434\u0443\u043A\u0442", label: "\u041F\u0440\u043E\u0434\u0443\u043A\u0442", options: arrayToOptions(source?.productList), ...withValidator(field('product'), validatorObj.product) })));
     const arrayToOptions = (array) => (array ?? []).map((_) => ({ key: _, value: _ }));
 
     const REGIONS_URL = `${API_BASE_URI}/regions`;
@@ -3983,7 +3950,7 @@
             else {
                 setHasError(isValidCode);
             }
-        }, []);
+        }, [code]);
         const handleCreateCaptcha = useCallback(() => {
             (async () => setCaptcha(URL.createObjectURL(await createCaptcha(phoneNumber))))();
         }, []);
@@ -4232,12 +4199,13 @@
     const getLink = (body) => fetchRetailJSON('/esia/getLink', 'POST', body);
 
     const EsiaLoginDialog = JSX(function ({ handleClose }) {
+        const navigator = locationNavigator();
         const handleAuth = useCallback(async () => {
             const resp = await getLink({
-                redirectUri: globalThis.location.href,
+                redirectUri: navigator.href,
             });
             if (resp) {
-                globalThis.location.href = resp.link;
+                navigator.assign(resp.link);
             }
         }, []);
         return (jsx(Dialog, { className: "my-6xl max-w-lg w-full min-h-fit mx-auto rounded-lg", onClose: handleClose, children: jsxs("div", { className: "flex flex-col gap-lg items-center rounded-md", children: [jsxs("div", { className: "flex items-center justify-around w-full", children: [jsxs("ul", { className: "list-disc", children: [jsx("li", { children: "\u0412\u0435\u0440\u043E\u044F\u0442\u043D\u043E\u0441\u0442\u044C \u043E\u0434\u043E\u0431\u0440\u0435\u043D\u0438\u044F \u0432\u044B\u0448\u0435" }), jsx("li", { children: "\u0411\u0435\u0437 \u0441\u043F\u0440\u0430\u0432\u043E\u043A \u043E \u0434\u043E\u0445\u043E\u0434\u0430\u0445 \u0438 \u0442\u0440\u0443\u0434\u043E\u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0435" }), jsx("li", { children: "\u0421 \u0437\u0430\u0449\u0438\u0442\u043E\u0439 \u0412\u0430\u0448\u0438\u0445 \u0434\u0430\u043D\u043D\u044B\u0445" })] }), jsx(Img, { image: { icon: 'GosUslugiIcon', iconVersion: 'normal' }, height: "70" })] }), jsxs("div", { className: "flex items-center justify-between w-full m-0", children: [jsx(Button, { type: "button", onClick: handleAuth, children: "\u0417\u0430\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0447\u0435\u0440\u0435\u0437 \u0413\u043E\u0441\u0443\u0441\u043B\u0443\u0433\u0438" }), jsx(Button, { type: "button", version: "secondary", onClick: handleClose, children: "\u041F\u0440\u043E\u043F\u0443\u0441\u0442\u0438\u0442\u044C" })] })] }) }));
@@ -4245,9 +4213,10 @@
 
     const useEsiaLoginDialog = (nextStepLink) => {
         const { open, close } = useDialogManager();
+        const navigator = locationNavigator();
         const handleClose = useCallback(() => {
             close();
-            globalThis.location.href = nextStepLink;
+            navigator.assign(nextStepLink);
         }, []);
         return {
             open: (options = {}) => open(jsx(EsiaLoginDialog, { handleClose: handleClose }), options),
@@ -4323,11 +4292,12 @@
 
     const getLeadFormTaskData = ({ participantId, taskId, profileId, formData, }) => {
         const { name, surname, middleName, limitedBirthday, phone, email } = formData;
+        const navigator = locationNavigator();
         return {
             sendToBank: true,
             taskKind: 'SHORT',
             task: {
-                taskSource: globalThis.location.origin,
+                taskSource: navigator.origin,
                 id: taskId,
                 participants: [
                     {
@@ -4494,6 +4464,7 @@
     };
 
     const useInitApplicationLead = (nextStepLink) => {
+        const navigator = locationNavigator();
         const [isLoading, setIsLoading] = useState(false);
         const [profileId] = useLocalStorage('profileId');
         const [leadForm, setLeadForm] = useLocalStorage('leadForm');
@@ -4506,14 +4477,14 @@
                     profileId: profileId,
                     code,
                     state,
-                    redirectUri: globalThis.location?.href,
+                    redirectUri: navigator.href,
                 });
                 data &&
                     setLeadForm({
                         ...leadForm,
                         ...parseEsiaProfile(data),
                     });
-                globalThis.location.href = nextStepLink;
+                navigator.assign(nextStepLink);
             }
         }, []);
         useEffect(() => {
@@ -6167,14 +6138,18 @@
             }
         }, type: "button", ...(isUnfolded ? getAspectsAttributes(data) : {}), children: [jsx("div", { children: isUnfolded ? 'Скрыть' : 'Подробнее о тарифе' }), jsx(Icon, { className: "text-primary-text", name: isUnfolded ? 'ArrowUpIcon' : 'ArrowDownIcon', width: "16", height: "16" })] }));
 
+    const PORTAL_NATURAL_URL = '/';
     const UPDATING_INTERVAL = 60000 * 4;
-    const updateRefreshToken = (failCallback) => {
+    const updateRefreshToken = () => {
         const refreshToken = globalThis.sessionStorage?.getItem('refreshToken');
         const accessToken = globalThis.sessionStorage?.getItem('accessToken');
         const taskId = globalThis.localStorage.getItem('taskId');
+        const navigator = locationNavigator();
         if (!accessToken || !refreshToken || !taskId) {
-            failCallback();
-            return () => null;
+            navigator.assign(PORTAL_NATURAL_URL);
+            return () => {
+                // do nothing
+            };
         }
         const updateTokenRequest = async () => {
             const res = await doRequest('/auth/refresh', 'POST', {
@@ -6184,7 +6159,7 @@
                 access_token: accessToken,
             });
             if (res?.status == 401) {
-                failCallback();
+                navigator.assign(PORTAL_NATURAL_URL);
             }
             if (res?.ok) {
                 const data = await res.json();
@@ -6197,16 +6172,6 @@
         return () => clearInterval(timer);
     };
 
-    function useNavigator() {
-        return useNavigator._impl();
-    }
-    useNavigator._impl = () => ({
-        assign: (url) => globalThis.location.assign(url),
-    });
-    useNavigator.setup = (impl) => {
-        useNavigator._impl = impl;
-    };
-
     const ProgressBar = JSX(({ step = 10, description, showPercentage = true }) => (jsxs("div", { children: [jsx("div", { className: "h-4 w-full bg-gray relative", children: jsx("div", { className: "h-4 bg-green", style: { width: `${step}%` } }) }), jsxs("div", { className: "relative", children: [showPercentage ? jsxs("div", { className: "absolute left-2/4 text-green", children: [step, "%"] }) : null, description ? jsx("div", { className: "text-right mr-4 text-gray", children: description }) : null] })] })));
 
     const CreditCardFormProgress = JSX(({ step = 1, totalSteps = 6, stepsTitles = [] }) => {
@@ -6624,11 +6589,12 @@
     };
 
     const getCreditCardFormTaskData = ({ participantId, taskId, profileId, formData, step = 0, }) => {
+        const navigator = locationNavigator();
         return {
             sendToBank: true,
             taskKind: 'UNITED',
             task: {
-                taskSource: globalThis.location.origin,
+                taskSource: navigator.origin,
                 id: taskId,
                 office: {
                     id: '650', // TODO: Remove hardcode
@@ -7075,7 +7041,6 @@
         ],
     ];
 
-    const PORTAL_NATURAL_URL$1 = '/';
     const WIZARD_STEPS$1 = 6;
     const WIZARD_TITLES$1 = [
         'Параметры карты',
@@ -7089,8 +7054,7 @@
         const [step, setStep] = useState(0);
         const formContainerRef = useRef(null);
         const scrollToTop = useCallback(() => formContainerRef?.current?.scrollIntoView({ behavior: 'smooth' }), [formContainerRef]);
-        const navigator = useNavigator();
-        useEffect(() => updateRefreshToken(() => navigator.assign(PORTAL_NATURAL_URL$1)), []);
+        useEffect(updateRefreshToken, []);
         const handleNextStep = useCallback(() => {
             setStep((_) => Math.min(_ + 1, WIZARD_STEPS$1));
             scrollToTop();
@@ -7488,36 +7452,39 @@
         };
     };
 
-    const getCreditFormTaskData = ({ participantId, taskId, profileId, formData, step = 0, }) => ({
-        sendToBank: true,
-        taskKind: 'UNITED',
-        task: {
-            taskSource: globalThis.location.origin,
-            id: taskId,
-            office: {
-                id: '',
-            },
-            authorizedAgentId: formData?.bankEmployeeCode,
-            participants: [
-                {
-                    id: participantId,
-                    profile: {
-                        id: profileId,
-                    },
-                    roleCd: {
-                        key: 'BORROWER',
-                        value: 'Заемщик',
+    const getCreditFormTaskData = ({ participantId, taskId, profileId, formData, step = 0, }) => {
+        const navigator = locationNavigator();
+        return {
+            sendToBank: true,
+            taskKind: 'UNITED',
+            task: {
+                taskSource: navigator.origin,
+                id: taskId,
+                office: {
+                    id: '',
+                },
+                authorizedAgentId: formData?.bankEmployeeCode,
+                participants: [
+                    {
+                        id: participantId,
+                        profile: {
+                            id: profileId,
+                        },
+                        roleCd: {
+                            key: 'BORROWER',
+                            value: 'Заемщик',
+                        },
+                        ...getCurrentStepData(step, formData),
                     },
-                    ...getCurrentStepData(step, formData),
+                ],
+                ...getZeroStepData(formData),
+                ...getFifthStepData(formData),
+                esiaAccountTypeCd: {
+                    key: formData?.esiaAccountTypeCd?.key,
                 },
-            ],
-            ...getZeroStepData(formData),
-            ...getFifthStepData(formData),
-            esiaAccountTypeCd: {
-                key: formData?.esiaAccountTypeCd?.key,
             },
-        },
-    });
+        };
+    };
     const getCurrentStepData = (step, formData) => {
         switch (step) {
             case 0:
@@ -7868,7 +7835,6 @@
         ],
     ];
 
-    const PORTAL_NATURAL_URL = '/';
     const WIZARD_STEPS = 5;
     const WIZARD_TITLES = [
         '',
@@ -7882,8 +7848,7 @@
         const [step, setStep] = useState(0);
         const formContainerRef = useRef(null);
         const scrollToTop = useCallback(() => formContainerRef?.current?.scrollIntoView({ behavior: 'smooth' }), [formContainerRef]);
-        const navigator = useNavigator();
-        useEffect(() => updateRefreshToken(() => navigator.assign(PORTAL_NATURAL_URL)), []);
+        useEffect(updateRefreshToken, []);
         const handleNextStep = useCallback(() => {
             setStep((_) => Math.min(_ + 1, WIZARD_STEPS));
             scrollToTop();
@@ -8281,6 +8246,46 @@
     };
     const formatValue = (value) => value.replace(/[^\d.,]/g, '').replace(',', '.');
 
+    function assertNonEmpty(value) {
+        if (!value) {
+            throw new Error('Value should be fulfilled');
+        }
+        return value;
+    }
+
+    const baseTableFunc = (table) => (input) => {
+        const [, unit] = assertNonEmpty(table.find(([predicate]) => predicate(input)));
+        return unit(input);
+    };
+    const tableFunc = (table) => baseTableFunc(table.map(([p, o]) => [p, () => o]));
+    tableFunc.if = (predicate) => new TableFuncBuilder(undefined, predicate);
+    class TableFuncBuilder {
+        parent;
+        predicate;
+        unit;
+        get entry() {
+            return [assertNonEmpty(this.predicate), assertNonEmpty(this.unit)];
+        }
+        constructor(parent, predicate, unit) {
+            this.parent = parent;
+            this.predicate = predicate;
+            this.unit = unit;
+        }
+        if(predicate) {
+            return new TableFuncBuilder(this, predicate);
+        }
+        then(unit) {
+            return new TableFuncBuilder(this.parent, this.predicate, unit);
+        }
+        else(unit) {
+            return baseTableFunc([...buildTable(this), [() => true, unit]]);
+        }
+    }
+    const buildTable = (builder) => [
+        ...(builder?.parent ? buildTable(builder.parent) : []),
+        builder.entry,
+    ];
+
     const callbackCurrencySelect = (props) => tableFunc([
         [
             (_) => _.value !== Currency.RUB && _.oppositeValue !== Currency.RUB,
@@ -9938,18 +9943,18 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.678";
+    const packageVersion = "0.14.680";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;
     exports.handlerDecorator = handlerDecorator;
     exports.joinList = joinList;
+    exports.locationNavigator = locationNavigator;
     exports.packageVersion = packageVersion;
     exports.projectSettings = projectSettings;
     exports.setup = setup;
     exports.setupHooks = setupHooks;
     exports.url = url;
-    exports.useNavigator = useNavigator;
     exports.useRouter = useRouter;
 
     Object.defineProperty(exports, '__esModule', { value: true });