@redneckz/wildless-cms-uni-blocks 0.14.815 → 0.14.817

package/mobile/src/components/GalleryLayout/GalleryLayout.tsx

@@ -33,7 +33,7 @@ const LINK_SCHEMA: Record<string, JSONSchema7Definition> = {
         },
       },
     ],
-    title: 'Ссылка',
+    title: 'Ссылка (если заполнено, то кнопка скрывается)',
     required: ['href'],
   },
 };
@@ -109,15 +109,18 @@ const blockDecoratorWrapper =
 
 const productBlockDecorator =
   (idx: number): BlockDecorator =>
-  ({ blockClassName, block, render }, i) =>
-    (
-      <LinkWrapper key={i} {...block.content?.link} className={getChildStyle(idx)}>
+  ({ blockClassName, block, render }, i) => {
+    const modifiedBlock = modifyBlock(block, idx);
+
+    return (
+      <LinkWrapper key={String(i)} {...modifiedBlock.content?.link} className={getChildStyle(idx)}>
         {render({
           blockClassName: style(blockClassName, 'h-full'),
-          block: modifyBlock(block, idx),
+          block: modifiedBlock,
         })}
       </LinkWrapper>
     );
+  };
 
 const getChildStyle = (index: number) =>
   SHORT_TILE_INDEXES.includes(index)
@@ -127,13 +130,21 @@ const getChildStyle = (index: number) =>
 const modifyBlock = (block: BlockDef, i: number) => {
   const content: ProductBlockContent & { link?: LinkProps } = { ...block.content };
 
-  if (SHORT_TILE_INDEXES.includes(i)) {
+  const isSmallTile = SHORT_TILE_INDEXES.includes(i);
+
+  if (isSmallTile) {
     delete content.description;
     delete content.benefits;
-  }
 
-  if (content.link?.href) {
-    delete content.buttons;
+    if (content.link?.href) {
+      delete content.buttons;
+    }
+
+    content.imageOptions = { ...content.imageOptions, className: 'max-w-max !h-auto' };
+  } else {
+    if ((content.buttons ?? []).length) {
+      delete content.link;
+    }
   }
 
   return { ...block, content };

package/mobile/src/model/FormTypeFieldDef.ts

@@ -20,4 +20,5 @@ export type FormTypeFieldDef =
   | 'OUTSERVICE'
   | 'RFB'
   | 'SUPPORT'
-  | 'INVESTADVISER';
+  | 'INVESTADVISER'
+  | 'FINOMBUDSMAN';

package/mobile/src/ui-kit/BaseProductTile/BaseProductTile.tsx

@@ -54,12 +54,13 @@ export const BaseProductTile = JSX<BaseProductTileProps>(
       directionRight = true,
       isImageAlwaysOnRight,
       isImageSecondary = false,
+      className: imageClassName,
     } = {},
     backwardButton,
     children,
     ...rest
   }) => {
-    const img = image?.src ? <Img image={image} /> : null;
+    const img = image?.src ? <Img image={image} imageClassName={imageClassName} /> : null;
     const headline = (
       <Headline
         title={title}

package/mobile/src/ui-kit/BaseProductTile/BaseProductTileContent.ts

@@ -19,6 +19,8 @@ export interface TileImageOptions {
   isImageSecondary?: boolean;
   /** @title Изображение всегда справа */
   isImageAlwaysOnRight?: boolean;
+  /** @hidden */
+  className?: string;
 }
 
 /** @title Цены */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.815",
+  "version": "0.14.817",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/ApplicationForm/ApplicationForm.example.json

@@ -1222,5 +1222,92 @@
         }
       }
     }
+  ],
+  [
+    "Финансовый омбудсмен",
+    {
+      "content": {
+        "version": "primary",
+        "title": "Финансовый омбудсмен",
+        "typeForm": "FINOMBUDSMAN",
+        "endpoint": "lead",
+        "sections": [
+          {
+            "inputs": [
+              {
+                "name": "serviceDirection"
+              },
+              {
+                "name": "surname",
+                "required": true
+              },
+              {
+                "name": "name",
+                "required": true
+              },
+              {
+                "name": "inn",
+                "required": true,
+                "condition": {
+                  "name": "serviceDirection",
+                  "values": ["Юридическое лицо / ИП"]
+                }
+              },
+              {
+                "name": "fullName",
+                "label": "Наименование организации",
+                "condition": {
+                  "name": "serviceDirection",
+                  "values": ["Юридическое лицо / ИП"]
+                }
+              },
+              {
+                "name": "phone",
+                "required": true
+              },
+              {
+                "name": "email",
+                "required": true
+              },
+              {
+                "name": "comment",
+                "required": true,
+                "label": "Ваше сообщение",
+                "condition": {
+                  "name": "serviceDirection",
+                  "values": ["Физическое лицо"]
+                }
+              },
+              {
+                "name": "partnerComments",
+                "label": "Ваше сообщение",
+                "required": true,
+                "condition": {
+                  "name": "serviceDirection",
+                  "values": ["Юридическое лицо / ИП"]
+                }
+              }
+            ]
+          },
+          {
+            "inputs": [
+              {
+                "name": "consentDataProcessing",
+                "required": true
+              }
+            ]
+          }
+        ],
+        "button": {
+          "text": "Отправить заявку",
+          "version": "primary"
+        },
+        "link": {
+          "text": "Согласен на обработку персональных данных",
+          "href": "/privacy-policy",
+          "target": "_blank"
+        }
+      }
+    }
   ]
 ]

package/src/components/ApplicationForm/ApplicationForm.fixture.mobile.tsx

@@ -735,4 +735,64 @@ export default {
       <DialogManager />
     </div>
   ),
+  finOmbudsman: (
+    <div className="container grid grid-cols-12">
+      <ApplicationForm
+        className="col-span-12"
+        title="Финансовый омбудсмен"
+        typeForm="FINOMBUDSMAN"
+        endpoint="lead"
+        sections={[
+          {
+            inputs: [
+              { name: 'serviceDirection' },
+              { name: 'surname', required: true },
+              { name: 'name', required: true },
+              {
+                name: 'inn',
+                required: true,
+                condition: {
+                  name: 'serviceDirection',
+                  values: ['Юридическое лицо / ИП'],
+                },
+              },
+              {
+                name: 'fullName',
+                label: 'Наименование организации',
+                condition: {
+                  name: 'serviceDirection',
+                  values: ['Юридическое лицо / ИП'],
+                },
+              },
+              { name: 'phone', required: true },
+              { name: 'email', required: true },
+              {
+                name: 'comment',
+                required: true,
+                label: 'Ваше сообщение',
+                condition: {
+                  name: 'serviceDirection',
+                  values: ['Физическое лицо'],
+                },
+              },
+              {
+                name: 'partnerComments',
+                required: true,
+                label: 'Ваше сообщение',
+                condition: {
+                  name: 'serviceDirection',
+                  values: ['Юридическое лицо / ИП'],
+                },
+              },
+            ],
+          },
+          { inputs: [{ name: 'consentDataProcessing', required: true }] },
+        ]}
+        button={button}
+        link={link}
+      />
+      <PopupManager />
+      <DialogManager />
+    </div>
+  ),
 };

package/src/components/ApplicationForm/ApplicationForm.fixture.tsx

@@ -730,4 +730,64 @@ export default {
       <DialogManager />
     </div>
   ),
+  finOmbudsman: (
+    <div className="container grid grid-cols-12">
+      <ApplicationForm
+        className="col-span-12"
+        title="Финансовый омбудсмен"
+        typeForm="FINOMBUDSMAN"
+        endpoint="lead"
+        sections={[
+          {
+            inputs: [
+              { name: 'serviceDirection' },
+              { name: 'surname', required: true },
+              { name: 'name', required: true },
+              {
+                name: 'inn',
+                required: true,
+                condition: {
+                  name: 'serviceDirection',
+                  values: ['Юридическое лицо / ИП'],
+                },
+              },
+              {
+                name: 'fullName',
+                label: 'Наименование организации',
+                condition: {
+                  name: 'serviceDirection',
+                  values: ['Юридическое лицо / ИП'],
+                },
+              },
+              { name: 'phone', required: true },
+              { name: 'email', required: true },
+              {
+                name: 'comment',
+                required: true,
+                label: 'Ваше сообщение',
+                condition: {
+                  name: 'serviceDirection',
+                  values: ['Физическое лицо'],
+                },
+              },
+              {
+                name: 'partnerComments',
+                required: true,
+                label: 'Ваше сообщение',
+                condition: {
+                  name: 'serviceDirection',
+                  values: ['Юридическое лицо / ИП'],
+                },
+              },
+            ],
+          },
+          { inputs: [{ name: 'consentDataProcessing', required: true }] },
+        ]}
+        button={button}
+        link={link}
+      />
+      <PopupManager />
+      <DialogManager />
+    </div>
+  ),
 };

package/src/components/GalleryLayout/GalleryLayout.fixture.tsx

@@ -26,17 +26,6 @@ const CONTENT: ProductBlockContent & UniBlockProps & { link?: LinkProps } = {
   },
 };
 
-const SHORT_TILE_CONTENT: ProductBlockContent & UniBlockProps = {
-  ...CONTENT,
-  image: {
-    ...CONTENT.image,
-    size: {
-      width: 130,
-      height: 130,
-    },
-  },
-};
-
 export default {
   default: (
     <div className="container grid grid-cols-12">
@@ -48,10 +37,10 @@ export default {
           type: 'GalleryLayout',
           blocks: [
             { type: PRODUCT_BLOCK_TYPE, content: CONTENT },
-            { type: PRODUCT_BLOCK_TYPE, content: SHORT_TILE_CONTENT },
-            { type: PRODUCT_BLOCK_TYPE, content: SHORT_TILE_CONTENT },
-            { type: PRODUCT_BLOCK_TYPE, content: SHORT_TILE_CONTENT },
-            { type: PRODUCT_BLOCK_TYPE, content: SHORT_TILE_CONTENT },
+            { type: PRODUCT_BLOCK_TYPE, content: CONTENT },
+            { type: PRODUCT_BLOCK_TYPE, content: CONTENT },
+            { type: PRODUCT_BLOCK_TYPE, content: CONTENT },
+            { type: PRODUCT_BLOCK_TYPE, content: CONTENT },
           ],
         }}
         options={options}

package/src/components/GalleryLayout/GalleryLayout.tsx

@@ -33,7 +33,7 @@ const LINK_SCHEMA: Record<string, JSONSchema7Definition> = {
         },
       },
     ],
-    title: 'Ссылка',
+    title: 'Ссылка (если заполнено, то кнопка скрывается)',
     required: ['href'],
   },
 };
@@ -109,15 +109,18 @@ const blockDecoratorWrapper =
 
 const productBlockDecorator =
   (idx: number): BlockDecorator =>
-  ({ blockClassName, block, render }, i) =>
-    (
-      <LinkWrapper key={i} {...block.content?.link} className={getChildStyle(idx)}>
+  ({ blockClassName, block, render }, i) => {
+    const modifiedBlock = modifyBlock(block, idx);
+
+    return (
+      <LinkWrapper key={String(i)} {...modifiedBlock.content?.link} className={getChildStyle(idx)}>
         {render({
           blockClassName: style(blockClassName, 'h-full'),
-          block: modifyBlock(block, idx),
+          block: modifiedBlock,
         })}
       </LinkWrapper>
     );
+  };
 
 const getChildStyle = (index: number) =>
   SHORT_TILE_INDEXES.includes(index)
@@ -127,13 +130,21 @@ const getChildStyle = (index: number) =>
 const modifyBlock = (block: BlockDef, i: number) => {
   const content: ProductBlockContent & { link?: LinkProps } = { ...block.content };
 
-  if (SHORT_TILE_INDEXES.includes(i)) {
+  const isSmallTile = SHORT_TILE_INDEXES.includes(i);
+
+  if (isSmallTile) {
     delete content.description;
     delete content.benefits;
-  }
 
-  if (content.link?.href) {
-    delete content.buttons;
+    if (content.link?.href) {
+      delete content.buttons;
+    }
+
+    content.imageOptions = { ...content.imageOptions, className: 'max-w-max !h-auto' };
+  } else {
+    if ((content.buttons ?? []).length) {
+      delete content.link;
+    }
   }
 
   return { ...block, content };

package/src/model/FormTypeFieldDef.ts

@@ -20,4 +20,5 @@ export type FormTypeFieldDef =
   | 'OUTSERVICE'
   | 'RFB'
   | 'SUPPORT'
-  | 'INVESTADVISER';
+  | 'INVESTADVISER'
+  | 'FINOMBUDSMAN';

package/src/ui-kit/BaseProductTile/BaseProductTile.tsx

@@ -54,12 +54,13 @@ export const BaseProductTile = JSX<BaseProductTileProps>(
       directionRight = true,
       isImageAlwaysOnRight,
       isImageSecondary = false,
+      className: imageClassName,
     } = {},
     backwardButton,
     children,
     ...rest
   }) => {
-    const img = image?.src ? <Img image={image} /> : null;
+    const img = image?.src ? <Img image={image} imageClassName={imageClassName} /> : null;
     const headline = (
       <Headline
         title={title}

package/src/ui-kit/BaseProductTile/BaseProductTileContent.ts

@@ -19,6 +19,8 @@ export interface TileImageOptions {
   isImageSecondary?: boolean;
   /** @title Изображение всегда справа */
   isImageAlwaysOnRight?: boolean;
+  /** @hidden */
+  className?: string;
 }
 
 /** @title Цены */