@redneckz/wildless-cms-uni-blocks 0.14.1048 → 0.14.1050

package/bin/migration-scripts/0.14.1049.js

@@ -0,0 +1,47 @@
+import { traversePageBlocks } from '../utils.js';
+
+export const description = 'v0.14.1049';
+
+export default traversePageBlocks(adjustDeleteSizeSteps);
+
+function adjustDeleteSizeSteps(block) {
+  const content = block?.content;
+
+  if (block?.type === 'ApplicationForm' && content?.typeForm === 'KVED') {
+    content.sections = content.sections.map((_) => {
+      const nameField = _?.inputs?.find((input) => input?.name === 'name');
+
+      return nameField
+        ? {
+            ..._,
+            inputs: _.inputs.map((input) =>
+              input.name === 'name' ? { ...nameField, label: 'Имя' } : input,
+            ),
+          }
+        : _;
+    });
+  }
+
+  if (block?.type === 'ApplicationForm' && content?.typeForm === 'BROK') {
+    content.sections = content.sections.map((_) => {
+      const fullNameField = _?.inputs?.find((input) => input?.name === 'fullName');
+      const InnField = _?.inputs?.find((input) => input?.name === 'inn');
+
+      return fullNameField
+        ? {
+            ..._,
+            inputs: _.inputs.map((input) => {
+              if (input.name === 'fullName') {
+                return { ...fullNameField, name: 'dadataPartyNameSelect' };
+              }
+              if (input.name === 'inn') {
+                return { ...InnField, name: 'dadataPartyInnSelect' };
+              }
+
+              return input;
+            }),
+          }
+        : _;
+    });
+  }
+}

package/bundle/bundle.umd.js

@@ -1234,10 +1234,13 @@
         return url.toString();
     };
 
+    const URLS_WITHOUT_QUERY = ['https://private-banking.rshb.ru/'];
     const forwardQuery = async (ev) => {
         const anchor = ev.target?.closest('a');
         const navigator = locationNavigator();
-        if (isURL(anchor?.href) && !anchor?.href?.startsWith(navigator.origin)) {
+        if (isURL(anchor?.href) &&
+            !anchor?.href?.startsWith(navigator.origin) &&
+            !URLS_WITHOUT_QUERY.includes(anchor?.href ?? '')) {
             ev.preventDefault();
             ev.stopPropagation();
             const url = adjustSessionQuery(anchor?.href) || anchor?.href;
@@ -3155,7 +3158,7 @@
                 address: item.address,
             },
         })), [options]);
-        return (jsx(SelectControl, { ...input, ...FIELD_CONFIG[fieldName], options: getOptions, ...field(input.name ?? ''), isSearch: true, isManualInput: true, disableFilterOptions: true, onSearchQuery: setSearchQuery, renderOptions: renderOptions }));
+        return (jsx(SelectControl, { ...FIELD_CONFIG[fieldName], ...input, options: getOptions, ...field(input.name ?? ''), isSearch: true, isManualInput: true, disableFilterOptions: true, onSearchQuery: setSearchQuery, renderOptions: renderOptions }));
     });
     const getFieldValues = (value) => ({
         inn: value?.key,
@@ -3827,14 +3830,14 @@
             ...externalInputs,
         };
         const Component = fieldsRegister[String(input.name)];
-        return shouldRenderField({ input, field }) && Component ? (jsx(RefWrapper, { onFieldRef: field(input.name ?? '').setFieldRef, children: jsx(Component, { field: field, input: input, params: params }) }, String(i))) : null;
+        return shouldRenderField({ input, field }) && Component ? (jsx(RefWrapper, { onFieldRef: field(input.name ?? '').setFieldRef, children: jsx(Component, { field: field, input: { ...input, disabled: params?.disabled }, params: params }) }, String(i))) : null;
     };
 
     const inputColumnStyles = (column) => column === 2 ? '@xl:grid-cols-2 gap-x-m' : '@xl:grid-cols-1 gap-x-0';
 
     const renderTitle = (title) => title ? (jsx("div", { className: "@xl:text-center @xl:col-span-2 mb-m", children: jsx(Text, { size: "text-h6", children: title }) })) : null;
 
-    const renderSections = (sections, field, { typeForm, additionalParams }) => sections.map((_, i) => (jsxs("div", { className: style(inputColumnStyles(_.columns), 'grid'), children: [renderTitle(_.title), (_?.inputs || [])?.map(getField(field, { typeForm, ...additionalParams }))] }, `section-${i}`)));
+    const renderSections = (sections, field, { typeForm, additionalParams, disabled }) => sections.map((_, i) => (jsxs("div", { className: style(inputColumnStyles(_.columns), 'grid'), children: [renderTitle(_.title), (_?.inputs || [])?.map(getField(field, { typeForm, disabled, ...additionalParams }))] }, `section-${i}`)));
 
     const useInterval = (handler, period) => {
         const timer = useRef(null);
@@ -4043,7 +4046,7 @@
         });
         const fieldName = getConsentDataProcessing(inputs)?.name;
         const consentDataProcessing = fieldName ? field('consentDataProcessing') : undefined;
-        return (jsxs(ApplicationFormLayout, { className: style('container space-y-m', className), title: title, ...rest, children: [jsxs("form", { onSubmit: onSubmit, children: [renderSections(sections, field, { typeForm, additionalParams }), renderAgreementSubmit({
+        return (jsxs(ApplicationFormLayout, { className: style('container space-y-m', className), title: title, ...rest, children: [jsxs("form", { onSubmit: onSubmit, children: [renderSections(sections, field, { typeForm, additionalParams, disabled: isSending }), renderAgreementSubmit({
                             consentDataProcessing,
                             link,
                             additionalLink,
@@ -5488,10 +5491,20 @@
     const InfoCard = JSX(({ __html, icon = 'InfoCircleIcon', iconVersion = 'black', image }) => (jsxs("div", { className: "flex flex-row items-center w-full min-h-14 bg-main-gray rounded-lg gap-m p-m", children: [jsx("div", { className: "rounded-full bg-white p-xs", children: image ? (jsx(Img, { image: image, className: "block w-max" })) : (jsx(Icon, { name: icon, width: "24", height: "24", iconVersion: iconVersion })) }), jsx("div", { className: "", children: jsx(RichText, { __html: __html }) })] })));
 
     const getCardTypes = async (paymentSystemTypeCd, creditProgramId) => {
-        const data = await fetchRetailJSON('/dictionaryFiltered', 'POST', {
-            type: 'CARD_TYPE',
-            presets: { paymentSystemTypeCd, creditProgramId },
-        });
+        const isNewMicroservice = checkNewMicroservice();
+        const endpoint = isNewMicroservice
+            ? '/external/public-data/dictionaryFiltered'
+            : '/dictionaryFiltered';
+        const requestBody = isNewMicroservice
+            ? {
+                paymentSystemTypeCd,
+                dictionaryType: 'CARD_TYPE',
+            }
+            : {
+                type: 'CARD_TYPE',
+                presets: { paymentSystemTypeCd, creditProgramId },
+            };
+        const data = await fetchRetailJSON(endpoint, 'POST', requestBody);
         return Array.isArray(data) ? data : [];
     };
 
@@ -6567,7 +6580,11 @@
     });
 
     const getPaymentSystems = async (creditProgramId) => {
-        const data = await fetchRetailJSON('/public-data/creditProgramConditions', 'POST', {
+        const isNewMicroservice = checkNewMicroservice();
+        const endpoint = isNewMicroservice
+            ? '/external/user-data/getPaymentSystem'
+            : '/public-data/creditProgramConditions';
+        const data = await fetchRetailJSON(endpoint, 'POST', {
             creditProgramId,
         });
         return formatData(data?.paymentSystems || []);
@@ -14767,7 +14784,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.1047";
+    const packageVersion = "0.14.1049";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;