@redneckz/wildless-cms-uni-blocks 0.15.341 → 0.16.1

package/mobile/src/utils/style.ts

@@ -1,8 +1,21 @@
-type Falsy = null | undefined | false | 0;
+type Falsy = null | undefined | false | 0 | '';
 type Atom = string | Falsy;
 
-export const style = (...atoms: Array<Atom | Atom[]>): string =>
+type StyleRecord = Record<string, boolean | Falsy>;
+type StyleElement = Atom | Atom[] | StyleRecord;
+
+export const style = (...atoms: StyleElement[]): string =>
   atoms
+    .map((_) =>
+      isStyleRecord(_)
+        ? Object.entries(_)
+            .filter(([, v]) => v)
+            .map(([k]) => k)
+        : _,
+    )
     .flatMap((_) => _)
     .filter(Boolean)
     .join(' ');
+
+const isStyleRecord = (_: StyleElement): _ is StyleRecord =>
+  Boolean(_ && typeof _ === 'object' && !Array.isArray(_));

package/mobile/src/utils/url.ts

@@ -11,4 +11,16 @@ export const withoutQuery = (href?: string): string =>
   (href || '').replace(/\?.*/, '').replace(/\/$/, '');
 
 export const joinPath = (...path: (string | undefined | null)[]): string =>
-  path.filter(Boolean).join('/').replace(/\/+/g, '/');
+  path
+    .filter(Boolean)
+    .join('/')
+    .replace(/\/+/g, '/')
+    .replace(/^(.+):\//, '$1://');
+
+export const hasPrefix = (href?: string, prefix?: string | undefined) =>
+  Boolean(
+    prefix &&
+      href &&
+      href.startsWith(prefix) &&
+      [prefix === '/', href === prefix, href[prefix.length] === '/'].some(Boolean), //? consider case with url "/natural_index_mortgage_0_1.svg"
+  );

package/mobile/tailwind.config.cjs

@@ -1,6 +1,6 @@
 const config = require('../tailwind.config.cjs');
 
-// Use this value only when you need padding on the all sides  - p-6xl, 
+// Use this value only when you need padding on the all sides  - p-6xl,
 // in other cases it doesn't work - for example, in case py-6xl or pr-6xl
 
 const quadXL = '1.5rem 1.25rem'; // 24px 20px
@@ -18,7 +18,7 @@ module.exports = {
         '6xl': '1.5rem', // 24px
         '5xl': '1.5rem', // 24px
         '4xl': '1.5rem', // 24px
-        '3xl': '1rem', // 16px
+        '3xl': '1.25rem', // 20px
         '2xl': '1rem', // 16px
         xl: '1rem', // 16px
         lg: '1rem', // 16px

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.15.341",
+  "version": "0.16.1",
   "private": false,
   "license": "MIT",
   "author": "ЦК",
@@ -39,26 +39,6 @@
     "./lib/common.css": "./lib/common.css",
     "./mobile/lib/common.css": "./mobile/lib/common.css",
     "./fonts/ubuntu/*": "./fonts/ubuntu/*",
-    "./lib/content-page-repository": {
-      "import": "./lib/content-page-repository/index.js",
-      "require": "./dist/content-page-repository/index.js",
-      "types": "./lib/content-page-repository/index.d.ts"
-    },
-    "./lib/content-page-repository/*": {
-      "import": "./lib/content-page-repository/*.js",
-      "require": "./dist/content-page-repository/*.js",
-      "types": "./lib/content-page-repository/*.d.ts"
-    },
-    "./mobile/lib/content-page-repository": {
-      "import": "./mobile/lib/content-page-repository/index.js",
-      "require": "./mobile/dist/content-page-repository/index.js",
-      "types": "./mobile/lib/content-page-repository/index.d.ts"
-    },
-    "./mobile/lib/content-page-repository/*": {
-      "import": "./mobile/lib/content-page-repository/*.js",
-      "require": "./mobile/dist/content-page-repository/*.js",
-      "types": "./mobile/lib/content-page-repository/*.d.ts"
-    },
     "./bundle/*.js": "./bundle/*.js",
     "./bundle/*.json": "./bundle/*.json",
     "./*.json": "./*.json",
@@ -136,18 +116,11 @@
     "react-dom": ">=16.8.0"
   },
   "dependencies": {
-    "@redneckz/json-ref": "^0.0.7",
+    "@redneckz/json-op": "^0.0.12",
+    "@redneckz/json-ref": "^0.0.14",
     "@redneckz/uni-jsx": "^2.6.2",
     "@tailwindcss/container-queries": "^0.1.0",
-    "@types/json-schema": "^7.0.11",
-    "glob": "^8.0.3",
-    "rehype-parse": "^8.0.4",
-    "rehype-sanitize": "^5.0.1",
-    "rehype-stringify": "^9.0.3",
-    "remark-html": "^15.0.1",
-    "remark-parse": "^10.0.1",
-    "sharp": "^0.30.6",
-    "unified": "^10.1.2"
+    "@types/json-schema": "^7.0.11"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.19.4",
@@ -158,9 +131,7 @@
     "@rollup/plugin-typescript": "^8.3.3",
     "@size-limit/file": "^7.0.8",
     "@testing-library/react": "^12.1.5",
-    "@types/glob": "^8.0.0",
     "@types/jest": "^28.1.5",
-    "@types/sharp": "^0.31.0",
     "@types/yandex-maps": "^2.1.27",
     "@typescript-eslint/eslint-plugin": "^5.59.6",
     "@typescript-eslint/experimental-utils": "^5.59.6",
@@ -209,7 +180,7 @@
       "path": "lib/common.css"
     },
     {
-      "limit": "66 kB",
+      "limit": "70 kB",
       "path": "bundle/bundle.umd.min.js"
     }
   ],

package/src/EventBus/defaultEventBus.ts

@@ -1,10 +1,16 @@
 import { type CarouselTariffsCardAction } from '../components/CarouselTariffsCard/CarouselTariffsCardAction';
-import { type TabActivationEvent } from '../components/Tabs/TabActivationEvent';
+import { type Tab } from '../components/TabsLayout/TabsLayoutContent';
 import { type Region } from '../hooks/useRegions';
 import { type DialogAction } from '../ui-kit/DialogManager/DialogAction';
 import { type PopupAction } from '../ui-kit/PopupManager/PopupAction';
 import { EventBus } from './EventBus';
 
+interface TabActivationEvent {
+  type?: Tab['type'];
+  groupName?: string;
+  label?: string;
+}
+
 interface GlobalEventMap {
   location: Region;
   dialog: DialogAction;

package/src/ProjectSettings.ts

@@ -4,6 +4,7 @@ export interface ProjectSettings {
   ASSIST_PROJECT_ID?: string;
   CHAT_BOT?: string; // "personal" or "business"
   CDN?: string; // Should ends with "/"
+  /** @deprecated */
   BASE_PATH?: string; // Should ends with "/"
   YANDEX_MAP_API_KEY?: string;
   YANDEX_METRIKA_ID?: string;

package/src/UniBlock/UniBlockProps.ts

@@ -24,4 +24,5 @@ export interface UniBlockProps extends UniBlockContent {
   defaultPadding?: string;
   block?: BlockDef;
   options?: BlockRendererOptions;
+  suppressHydrationWarning?: boolean;
 }

package/src/UniBlock/extractContent.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { type JSONRecord } from '@redneckz/json-ref';
+import { type JSONRecord } from '@redneckz/json-op';
 import { type VNode } from '../model/VNode';
 import { type UniBlockProps } from './UniBlockProps';
 

package/src/api/FileStorage.ts

@@ -0,0 +1,98 @@
+const API_BASE_URI = '/api/v1';
+const WCMS_FILE_STORAGE_API_URI = '/wcms-file-storage';
+
+export type FileId = string;
+export type ProjectId = string | number;
+export type SearchParams = Record<string, string>;
+
+export interface FileMeta {
+  id?: FileId;
+  path?: string;
+  timestamp?: Date;
+  size?: number;
+}
+
+interface Meta {
+  publicId: string;
+  revision?: string | number;
+  projectId?: string;
+  name?: string;
+  description?: string;
+  size?: number;
+  responsible?: string;
+  timestamp?: string;
+}
+
+export interface SearchResult {
+  rows: FileMeta[];
+  total: number;
+}
+
+const fileStorageApi = process?.env?.NEXT_PUBLIC_FILE_STORAGE_URL
+  ? `${process.env.NEXT_PUBLIC_FILE_STORAGE_URL}/${API_BASE_URI}${WCMS_FILE_STORAGE_API_URI}`
+  : `${API_BASE_URI}${WCMS_FILE_STORAGE_API_URI}`;
+
+const toFileMeta = (meta: Meta): FileMeta => ({
+  id: meta.publicId,
+  path: meta.name || 'blank',
+  timestamp: meta.timestamp ? new Date(meta.timestamp) : undefined,
+  size: meta.size,
+});
+
+const parseNDJson = async <T>(response: Response): Promise<T[]> => {
+  return (await response.text())
+    .split('\n')
+    .filter(Boolean)
+    .map((_) => JSON.parse(_));
+};
+
+const parseTotalCount = (response: Response): number =>
+  parseInt(response.headers.get('x-total-count') || '0');
+
+const getById = async <T>(id: FileId): Promise<T | null> => {
+  try {
+    return fetch(`${fileStorageApi}/${id}/file`).then(async (response) => response.json());
+  } catch (e) {
+    console.error(e);
+
+    return null;
+  }
+};
+
+const getByName = async (projectId: ProjectId, name: string) => {
+  try {
+    return fetch(`${fileStorageApi}/project/${projectId}/file/${encodeURIComponent(name)}`).then(
+      async (response) => response.json(),
+    );
+  } catch (e) {
+    console.error(e);
+
+    return {};
+  }
+};
+
+const find = async (projectId: ProjectId, params?: SearchParams): Promise<SearchResult> => {
+  const response = await fetch(
+    `${fileStorageApi}/project/${projectId}/doc?${new URLSearchParams(params)}`,
+  );
+
+  try {
+    return {
+      rows: (await parseNDJson<Meta>(response)).map(toFileMeta),
+      total: parseTotalCount(response),
+    };
+  } catch (e) {
+    console.error(e);
+
+    return {
+      rows: [],
+      total: 0,
+    };
+  }
+};
+
+export const FileStorage = {
+  getById,
+  getByName,
+  find,
+};

package/src/api/LeadServiceAPI.ts

@@ -1,4 +1,4 @@
-import { type JSONRecord, type JSONScalar } from '@redneckz/json-ref/lib/JSONNode';
+import { type JSONRecord, type JSONScalar } from '@redneckz/json-op';
 import { formatDate } from '../utils/formatDate';
 import { formatPhone } from '../utils/formatPhone';
 
@@ -33,8 +33,8 @@ export function LeadServiceAPI() {
       phone = '',
       email,
       birthday,
+      desiredMeetingDate,
       inn,
-      fullName,
       addressBranch,
       secondaryPhone = '',
       bankEmpolee,
@@ -49,7 +49,8 @@ export function LeadServiceAPI() {
       ...getRegion(region, isNaturalPerson),
       ...getEmail(email, isNaturalPerson),
       ...getPhone(phone),
-      ...(isNaturalPerson ? getBirthday(birthday as string) : { inn, fullName }),
+      ...getFormatDate(desiredMeetingDate as string, 'desiredMeetingDate'),
+      ...(isNaturalPerson ? getFormatDate(birthday as string) : { inn }),
       ...(typeForm === 'FEEDBACK'
         ? {}
         : {
@@ -88,7 +89,8 @@ export function LeadServiceAPI() {
 
 const getPhone = (phone?: string) => (phone ? { phone: formatPhone(phone) } : {});
 
-const getBirthday = (birthday?: string) => (birthday ? { birthday: formatDate(birthday) } : {});
+const getFormatDate = (date?: string, key = 'birthday') =>
+  date ? { [key]: formatDate(date) } : {};
 
 const getRegion = (region: JSONRecord | JSONScalar | null, isNaturalPerson = true) => ({
   [isNaturalPerson ? 'regionBranch' : 'region']: region,

package/src/common.css

@@ -271,6 +271,29 @@ html {
 
   .md-container li {
     @apply text-l font-light;
+    list-style-position: initial;
+    margin-left: 20px;
+    padding-left: 0;
+    padding-bottom: 6px;
+  }
+
+  .list-s.md-container li {
+    @apply text-l font-light;
+  }
+
+  .list-m.md-container li {
+    @apply text-h6;
+  }
+
+  .list-l.md-container li {
+    @apply text-h5;
+    margin-left: 23px;
+  }
+
+  .without-dots.md-container li,
+  list-l.without-dots.md-container li {
+    @apply list-outside list-none;
+    margin-left: 0;
   }
 
   .md-container li > p {
@@ -282,6 +305,11 @@ html {
     font-weight: 400;
   }
 
+  .md-container a {
+    @apply group-data-secondary:text-white;
+    font-weight: 400;
+  }
+
   .md-container strong {
     @apply font-normal;
   }
@@ -305,10 +333,16 @@ html {
     background-color: rgb(var(--color-secondary-light));
   }
 
-  .secondary.md-container ul li {
+  .secondary.md-container ul li,
+  .secondary.md-container ol li {
     color: rgb(125, 126, 127);
   }
 
+  .primary.md-container ul li,
+  .primary.md-container ol li {
+    color: rgb(66, 171, 68);
+  }
+
   .md-container table {
     width: 100%;
     text-align: left;

package/src/components/AdTile/AdTile.tsx

@@ -1,7 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
-import { ClientOnly } from '../../ui-kit/ClientOnly';
 import { Shimmer } from '../../ui-kit/Shimmer/Shimmer';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { ProductBlock } from '../ProductBlock/ProductBlock';
@@ -21,9 +20,7 @@ export const AdTile = JSX<AdTileProps>((props) => {
   const content = items?.[tileIndex];
 
   return content ? (
-    <ClientOnly>
-      <ProductBlock {...content} {...props} />
-    </ClientOnly>
+    <ProductBlock suppressHydrationWarning={true} {...content} {...props} />
   ) : (
     <BlockWrapper {...props}>
       <Shimmer />

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

@@ -21,9 +21,19 @@
             "title": "Данные организации",
             "columns": 2,
             "inputs": [
-              { "fieldType": "common", "name": "fullName", "required": true },
+              {
+                "fieldType": "common",
+                "name": "fullName",
+                "required": true,
+                "label": "Наименование организации"
+              },
               { "fieldType": "common", "name": "inn", "required": true },
-              { "fieldType": "common", "name": "name", "required": true },
+              {
+                "fieldType": "common",
+                "name": "name",
+                "required": true,
+                "label": "Контактное лицо"
+              },
               { "fieldType": "common", "name": "phone", "required": true }
             ]
           },
@@ -108,6 +118,11 @@
                 "name": "phone",
                 "required": true
               },
+              {
+                "fieldType": "common",
+                "name": "email",
+                "label": "Электронная почта (для уведомлений от Банка по Вашему сообщению)"
+              },
               {
                 "fieldType": "common",
                 "name": "birthday",
@@ -159,7 +174,8 @@
               {
                 "fieldType": "common",
                 "name": "name",
-                "required": true
+                "required": true,
+                "label": "Контактное лицо"
               },
               {
                 "fieldType": "common",
@@ -211,7 +227,12 @@
                 "label": "Наименование организации"
               },
               { "fieldType": "common", "name": "inn", "required": true },
-              { "fieldType": "common", "name": "name", "required": true },
+              {
+                "fieldType": "common",
+                "name": "name",
+                "required": true,
+                "label": "Контактное лицо"
+              },
               { "fieldType": "common", "name": "phone", "required": true }
             ]
           },
@@ -469,7 +490,8 @@
               {
                 "fieldType": "common",
                 "name": "name",
-                "required": true
+                "required": true,
+                "label": "Контактное лицо"
               },
               {
                 "fieldType": "common",
@@ -652,6 +674,10 @@
         "title": "Заполните форму",
         "typeForm": "PRODUCT",
         "endpoint": "lead",
+        "additionalParams": {
+          "product": "product",
+          "showProduct": "show"
+        },
         "sections": [
           {
             "columns": 2,
@@ -760,7 +786,7 @@
                 "required": true,
                 "condition": {
                   "name": "vedTypes",
-                  "values": ["currencyControl"]
+                  "values": ["currencyControl", "documentOperations"]
                 }
               },
               {
@@ -783,7 +809,14 @@
             ]
           },
           {
-            "inputs": [{ "fieldType": "common", "name": "partnerComments", "label": "Обращение" }]
+            "inputs": [
+              {
+                "fieldType": "common",
+                "name": "partnerComments",
+                "label": "Обращение",
+                "required": true
+              }
+            ]
           }
         ],
         "button": {
@@ -797,5 +830,84 @@
         }
       }
     }
+  ],
+  [
+    "Выездной сервис ФЛ",
+    {
+      "content": {
+        "version": "primary",
+        "padding": "",
+        "title": "Заявка на консультацию",
+        "typeForm": "OUTSERVICE",
+        "endpoint": "lead",
+        "sections": [
+          {
+            "inputs": [
+              {
+                "fieldType": "common",
+                "name": "product",
+                "required": true
+              },
+              {
+                "fieldType": "common",
+                "name": "region",
+                "required": true
+              },
+              {
+                "fieldType": "common",
+                "name": "localities",
+                "required": true
+              },
+              {
+                "fieldType": "common",
+                "name": "fullName",
+                "required": true
+              }
+            ]
+          },
+          {
+            "columns": 2,
+            "inputs": [
+              {
+                "fieldType": "common",
+                "name": "birthday",
+                "required": true
+              },
+              {
+                "fieldType": "common",
+                "name": "phone",
+                "required": true
+              },
+              {
+                "fieldType": "common",
+                "name": "email"
+              },
+              {
+                "fieldType": "common",
+                "name": "desiredMeetingDate"
+              }
+            ]
+          },
+          {
+            "inputs": [
+              {
+                "fieldType": "common",
+                "name": "consentDataProcessing",
+                "required": true
+              }
+            ]
+          }
+        ],
+        "button": {
+          "text": "Отправить заявку",
+          "version": "primary"
+        },
+        "link": {
+          "text": "Согласен на обработку персональных данных",
+          "href": "/privacy-policy",
+          "target": "_blank"
+        }
+      }
+    }
   ]
 ]

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

@@ -65,9 +65,14 @@ export default {
             title: 'Данные организации',
             columns: 2,
             inputs: [
-              { fieldType: 'common', name: 'fullName', required: true },
+              {
+                fieldType: 'common',
+                name: 'fullName',
+                required: true,
+                label: 'Наименование организации',
+              },
               { fieldType: 'common', name: 'inn', required: true },
-              { fieldType: 'common', name: 'name', required: true },
+              { fieldType: 'common', name: 'name', required: true, label: 'Контактное лицо' },
               { fieldType: 'common', name: 'phone', required: true },
             ],
           },
@@ -122,6 +127,11 @@ export default {
               { fieldType: 'common', name: 'name', required: true },
               { fieldType: 'common', name: 'middleName' },
               { fieldType: 'common', name: 'phone', required: true },
+              {
+                fieldType: 'common',
+                name: 'email',
+                label: 'Электронная почта (для уведомлений от Банка по Вашему сообщению)',
+              },
               { fieldType: 'common', name: 'birthday', required: true },
               { fieldType: 'common', name: 'isClient' },
               { fieldType: 'common', name: 'comment', required: true },
@@ -484,6 +494,7 @@ export default {
         ]}
         additionalParams={{
           product: 'product',
+          showProduct: 'show',
         }}
         button={button}
         link={link}
@@ -612,7 +623,9 @@ export default {
             ],
           },
           {
-            inputs: [{ fieldType: 'common', name: 'partnerComments', label: 'Обращение' }],
+            inputs: [
+              { fieldType: 'common', name: 'partnerComments', label: 'Обращение', required: true },
+            ],
           },
         ]}
         button={button}