@redneckz/wildless-cms-uni-blocks 0.14.1007 → 0.14.1013

package/bin/migration-scripts/0.14.1013.js

@@ -0,0 +1,34 @@
+export const description = 'v0.14.1013';
+
+export default (uniPath, content) => {
+  modifyBlock(content, uniPath);
+
+  return content;
+};
+
+function modifyBlock(data, uniPath) {
+  if (!uniPath.includes('.page.json')) return;
+
+  const slug = data?.slug;
+  const canonical = data?.main?.canonical || '';
+  const ogUrl = data?.og?.url || '';
+
+  if (slug && !canonical.includes(slug) && !ogUrl.includes(slug)) {
+    const relativePath = uniPath;
+    const cleanPath = relativePath.replace('content/', '').replace(/\.page\.json$/, ''); // убираем расширение на всякий случай
+    const isSubFolder = cleanPath.includes('/');
+    const newValue = (isSubFolder ? '/' : '') + cleanPath;
+
+    if (data.main) {
+      data.main.canonical = newValue;
+    } else {
+      data.main = { canonical: newValue };
+    }
+
+    if (data.og) {
+      data.og.url = newValue;
+    } else {
+      data.og = { url: newValue };
+    }
+  }
+}

package/bundle/bundle.umd.js

@@ -3922,7 +3922,7 @@
 
     const ERROR_MESSAGE = 'Некорректно заполненное поле';
     const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
-    const codeWordPattern = /^[0-9а-яё]*$/i;
+    const codeWordPattern = /^[а-яёА-ЯЁ\d]+$/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);
@@ -5282,7 +5282,66 @@
 
     const ChildrenField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0434\u0435\u0442\u0435\u0439 \u0434\u043E 18 \u043B\u0435\u0442", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", isInteger: true, type: "number", ...field(input?.name ?? ''), ...input })));
 
-    const CodeWordField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u041A\u043E\u0434\u043E\u0432\u043E\u0435 \u0441\u043B\u043E\u0432\u043E", maxLength: 20, ...field(input?.name ?? ''), ...input })));
+    const autoLayoutKeyboard = (str) => {
+        const replacer = {
+            q: 'й',
+            w: 'ц',
+            e: 'у',
+            r: 'к',
+            t: 'е',
+            y: 'н',
+            u: 'г',
+            i: 'ш',
+            o: 'щ',
+            p: 'з',
+            '[': 'х',
+            ']': 'ъ',
+            a: 'ф',
+            s: 'ы',
+            d: 'в',
+            f: 'а',
+            g: 'п',
+            h: 'р',
+            j: 'о',
+            k: 'л',
+            l: 'д',
+            ';': 'ж',
+            "'": 'э',
+            z: 'я',
+            x: 'ч',
+            c: 'с',
+            v: 'м',
+            b: 'и',
+            n: 'т',
+            m: 'ь',
+            ',': 'б',
+            '.': 'ю',
+            '`': 'ё',
+            '{': 'Х',
+            '}': 'Ъ',
+            ':': 'Ж',
+            '~': 'Ё',
+            '"': 'Э',
+            '<': 'Б',
+            '>': 'Ю',
+            '\\': '\\',
+            '^': '^',
+            _: '_',
+        };
+        return str.replace(/[A-z,`~<.>;:\\'"[{\]}]/g, (x) => {
+            return x === x.toLowerCase() ? replacer[x] : replacer[x.toLowerCase()].toUpperCase();
+        });
+    };
+
+    const CodeWordField = JSX(({ field, input }) => {
+        const onChange = useCallback((value) => {
+            const translatedValue = autoLayoutKeyboard(value);
+            if (codeWordPattern.test(translatedValue) || translatedValue.length === 0) {
+                field(input?.name ?? '')?.onChange?.(translatedValue);
+            }
+        }, [field, input]);
+        return (jsx(DaDataInputControl, { label: "\u041A\u043E\u0434\u043E\u0432\u043E\u0435 \u0441\u043B\u043E\u0432\u043E", maxLength: 20, ...field(input?.name ?? ''), ...input, onChange: onChange }));
+    });
 
     const ConfirmationIncomeField = JSX(({ field, input }) => {
         const { data: confirmationIncome } = useLeadFormData('INCOME_CERT_UNITED');
@@ -6191,57 +6250,6 @@
     ];
     const MethodObtainField = JSX(({ field, input }) => (jsx(RadioButtonGroupControl, { orientation: "horizontal", items: METHODS_OF_OBTAIN, ...field(input?.name ?? '') })));
 
-    const autoLayoutKeyboard = (str) => {
-        const replacer = {
-            q: 'й',
-            w: 'ц',
-            e: 'у',
-            r: 'к',
-            t: 'е',
-            y: 'н',
-            u: 'г',
-            i: 'ш',
-            o: 'щ',
-            p: 'з',
-            '[': 'х',
-            ']': 'ъ',
-            a: 'ф',
-            s: 'ы',
-            d: 'в',
-            f: 'а',
-            g: 'п',
-            h: 'р',
-            j: 'о',
-            k: 'л',
-            l: 'д',
-            ';': 'ж',
-            "'": 'э',
-            z: 'я',
-            x: 'ч',
-            c: 'с',
-            v: 'м',
-            b: 'и',
-            n: 'т',
-            m: 'ь',
-            ',': 'б',
-            '.': 'ю',
-            '`': 'ё',
-            '{': 'Х',
-            '}': 'Ъ',
-            ':': 'Ж',
-            '~': 'Ё',
-            '"': 'Э',
-            '<': 'Б',
-            '>': 'Ю',
-            '\\': '\\',
-            '^': '^',
-            _: '_',
-        };
-        return str.replace(/[A-z,`~<.>;:\\'"[{\]}]/g, (x) => {
-            return x === x.toLowerCase() ? replacer[x] : replacer[x.toLowerCase()].toUpperCase();
-        });
-    };
-
     const MiddleNameField = JSX(({ field, input }) => {
         const onChange = useCallback((value) => {
             const translatedValue = autoLayoutKeyboard(value);
@@ -9221,7 +9229,7 @@
 
     const RKO_COMMISSIONS_TITLE_MAP = {
         tariffName: 'Название тарифа',
-        accountServiceFee: 'Обслуживание счета',
+        accountServiceFee: 'Обслуживание счёта',
         transferLegalCountCommission: 'Переводы Юрлицам и ИП',
         flTransferSumCommission: 'Переводы физлицам',
         cashOutSumCommission: 'Снятие наличных',
@@ -9282,7 +9290,7 @@
         const commissions = RKO_COLUMNS_ORDER.map((key) => tariffData[key]);
         const isMobileMode = useMobileMode();
         const handleOpenDepositClick = () => globalThis?.sessionStorage.setItem('rkoTariffName', tariffName);
-        return (jsxs("div", { className: style(className, 'rounded-xl min-h-24 items-center min-w-0 lg:p-xl p-3xl', isBest
+        return (jsxs("div", { className: style(className, 'rounded-xl min-h-24 items-center min-w-0 lg:p-xl p-3xl lg:mb-m mb-xl', isBest
                 ? 'bg-primary-main text-white relative'
                 : 'bg-white text-primary-text border border-solid border-gray'), children: [jsxs("div", { className: "col-span-2", children: [jsx(Heading, { headingType: isMobileMode ? 'h2' : 'h6', title: tariffName }), jsx(Text, { size: "text-xs", children: tariffDesc })] }), isMobileMode
                     ? renderMobileCard({
@@ -9300,13 +9308,13 @@
         const isMobileMode = useMobileMode();
         const commissionTypes = getSortedCommissionTypes(items) ?? [];
         const columnsCount = commissionTypes.length + 4; // 2 на "Название тарифа" и 2 на кнопку
-        const tableLayoutStyle = `lg:grid lg:grid-cols-${String(columnsCount)} gap-m lg:px-xl px-3xl`;
-        return (jsxs("div", { className: "lg:space-y-m space-y-xl w-full", children: [isMobileMode
+        const tableLayoutStyle = `lg:grid lg:grid-cols-${String(columnsCount)} gap-m lg:px-xl px-3xl order-first lg:mb-m mb-xl`;
+        return (jsxs("div", { className: "w-full flex flex-col mt-s", children: [isMobileMode
                     ? null
                     : renderRkoTariffsTableHeader({
                         params: commissionTypes,
                         className: tableLayoutStyle,
-                    }), items.map((item, index) => (jsx("div", { children: jsx(RkoTariffCard, { ...item, className: tableLayoutStyle, currency: currency, openDepositBtnLink: openDepositBtnLink, commissionTypes: commissionTypes }) }, index)))] }));
+                    }), items.map((item, index) => (jsx("div", { className: item?.isBest ? 'order-first' : '', children: jsx(RkoTariffCard, { ...item, className: tableLayoutStyle, currency: currency, openDepositBtnLink: openDepositBtnLink, commissionTypes: commissionTypes }) }, index)))] }));
     });
 
     const filterByClientType = (data, clientType) => {
@@ -9535,23 +9543,23 @@
             const result = markBestTariff(mergedTariffs);
             setTariffs(result);
         }, [userInputParams, calcTariffs]);
-        return (jsxs("div", { className: style(className, 'bg-white'), children: [jsx(CalculatorLayout, { className: className, title: title, ...rest, children: jsxs("section", { className: style(CalculatorStyle.wrapperMax, className), children: [jsxs("div", { className: CalculatorStyle.inputMax, children: [renderCountInput({
-                                        title: 'Количество внешних переводов на счета ЮЛ и ИП в месяц, шт',
-                                        step: 1,
-                                        min: calcParams.minTransferLegalCount,
-                                        max: calcParams.maxTransferLegalCount,
-                                        ...field('transferLegalCount'),
-                                        value: calcParams.transferLegalCount,
-                                    }), INPUTS_CONFIG.map((config, index) => (jsx("div", { children: renderWantedSumInput({
-                                            title: config.title,
-                                            step: config.step,
-                                            min: calcParams[`min${capitalize(config.key)}`],
-                                            max: calcParams[`max${capitalize(config.key)}`],
-                                            ...field(config.key),
-                                            value: calcParams[config.key],
-                                        }) }, index)))] }), jsx("div", { className: style(CalculatorStyle.result), children: renderFootnote(footnote) })] }) }), jsxs(BlockWrapper, { className: style('flex flex-col gap-4xl items-center', className), defaultPadding: "p-4xl pt-0", ...rest, children: [renderHeading$1(), tariffs ? (jsx(RkoTariffCardsTable, { items: tariffs, currency: RKO_DEFAULT_CURRENCY, openDepositBtnLink: openDepositBtnLink })) : (jsx(Loader, { position: "static" }))] })] }));
-    });
-    const renderHeading$1 = () => (jsx(Text, { size: "text-h6", font: "font-medium", align: "text-center", className: "block lg:mb-0 mb-m", children: "\u0420\u0430\u0441\u0447\u0435\u0442\u044B \u0437\u0430 \u043E\u0434\u0438\u043D \u043C\u0435\u0441\u044F\u0446 \u043F\u043E \u0432\u0432\u0435\u0434\u0435\u043D\u043D\u044B\u043C \u0432\u044B\u0448\u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0430\u043C" }));
+        return (jsxs("div", { className: style(className, 'bg-white'), children: [jsx(CalculatorLayout, { className: className, title: title, ...rest, children: jsx("section", { className: style(CalculatorStyle.wrapperMax, className), children: jsxs("div", { className: CalculatorStyle.inputMax, children: [renderCountInput({
+                                    title: 'Количество внешних переводов на счета ЮЛ и ИП в месяц, шт',
+                                    step: 1,
+                                    min: calcParams.minTransferLegalCount,
+                                    max: calcParams.maxTransferLegalCount,
+                                    ...field('transferLegalCount'),
+                                    value: calcParams.transferLegalCount,
+                                }), INPUTS_CONFIG.map((config, index) => (jsx("div", { children: renderWantedSumInput({
+                                        title: config.title,
+                                        step: config.step,
+                                        min: calcParams[`min${capitalize(config.key)}`],
+                                        max: calcParams[`max${capitalize(config.key)}`],
+                                        ...field(config.key),
+                                        value: calcParams[config.key],
+                                    }) }, index)))] }) }) }), jsxs(BlockWrapper, { className: style('flex flex-col items-center', className), defaultPadding: "p-4xl pt-0", ...rest, children: [renderHeading$1(), tariffs ? (jsx(RkoTariffCardsTable, { items: tariffs, currency: RKO_DEFAULT_CURRENCY, openDepositBtnLink: openDepositBtnLink })) : (jsx(Loader, { position: "static" })), jsx("div", { className: style(CalculatorStyle.result), children: renderFootnote(footnote) })] })] }));
+    });
+    const renderHeading$1 = () => (jsx(Text, { size: "text-h6", font: "font-medium", align: "text-center", className: "block lg:mb-xl mb-m", children: "\u0420\u0430\u0441\u0447\u0451\u0442\u044B \u0437\u0430 \u043E\u0434\u0438\u043D \u043C\u0435\u0441\u044F\u0446 \u043F\u043E \u0432\u0432\u0435\u0434\u0435\u043D\u043D\u044B\u043C \u0432\u044B\u0448\u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0430\u043C" }));
 
     const NumberInput = JSX((props) => {
         const { onChange, min, max, defaultValue = '0', fractionDigits = 0, ...inputProps } = props;
@@ -11633,9 +11641,9 @@
         return (jsxs("div", { className: "py-lg px-5xl bg-white col-span-12", children: [stepsTitles[step] || null, jsx(ProgressBar, { step: progress, showPercentage: false })] }));
     });
 
-    const INTERNET_BANK_LINK = 'https://online.rshb.ru/ib6/wf2/retail/ib/loginretaildefault';
+    const INTERNET_BANK_LINK = 'https://online.rshb.ru/d?l=dcNqSvOE';
     const DebitFormStatus = JSX(({ title, description: dsc, sectionInfo, buttonText, isDboClient, ...props }) => {
-        return (jsxs(BlockWrapper, { ...props, children: [jsx("div", { className: "flex flex-col md:flex-row items-center", children: jsx(Headline, { headlineVersion: "M", title: title, description: dsc, align: "text-left", padding: "p-xl", className: "w-full" }) }), jsx(SectionInfo, { items: sectionInfo }), buttonText ? (jsx(LinkButton, { href: "/natural", text: buttonText, version: "primary", className: "w-full mt-lg" })) : null, isDboClient ? (jsxs("div", { className: "flex flex-col md:flex-row md:gap-lg", children: [jsx(LinkButton, { href: "/natural/debetcards", text: "\u0417\u0430\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0437\u0430\u043D\u043E\u0432\u043E", version: "primary", className: "w-full mt-lg" }), jsx(LinkButton, { href: INTERNET_BANK_LINK, text: "\u041F\u0435\u0440\u0435\u0439\u0442\u0438 \u0432 \u0438\u043D\u0442\u0435\u0440\u043D\u0435\u0442 \u0431\u0430\u043D\u043A", version: "primary", className: "w-full mt-lg" })] })) : null] }));
+        return (jsxs(BlockWrapper, { ...props, children: [jsx("div", { className: "flex flex-col md:flex-row items-center", children: jsx(Headline, { headlineVersion: "M", title: title, description: dsc, align: "text-left", padding: "p-xl", className: "w-full" }) }), jsx(SectionInfo, { items: sectionInfo }), buttonText ? (jsx(LinkButton, { href: "/natural", text: buttonText, version: "primary", className: "w-full mt-lg" })) : null, isDboClient ? (jsxs("div", { className: "flex flex-col md:flex-row md:gap-lg", children: [jsx(LinkButton, { href: "/natural/debetcards", text: "\u0417\u0430\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0437\u0430\u043D\u043E\u0432\u043E", version: "primary", className: "w-full mt-lg" }), jsx(LinkButton, { href: INTERNET_BANK_LINK, text: "\u0412\u044B\u043F\u0443\u0441\u0442\u0438\u0442\u044C \u043A\u0430\u0440\u0442\u0443 \u0432 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0438", version: "primary", className: "w-full mt-lg" })] })) : null] }));
     });
     const SectionInfo = ({ title, items, }) => {
         if (!items) {
@@ -14155,7 +14163,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.1006";
+    const packageVersion = "0.14.1012";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;