@redneckz/wildless-cms-uni-blocks 0.14.914 → 0.14.916

package/mobile/src/ui-kit/Sitemap/SitemapProps.ts

@@ -3,4 +3,5 @@ import { type ComponentType } from '../../model/ComponentType';
 
 export interface SitemapProps extends ComponentType {
   navigationItems?: TopMenuItemProps[];
+  isSearchPanel?: boolean;
 }

package/package.json

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

package/src/api/LeadServiceAPI.ts

@@ -13,7 +13,6 @@ export type LeadRequest = Record<string, JSONRecord | JSONScalar | null> & {
   fullRegion?: string;
   secondaryPhoneNumber?: string;
   partnerSymbolCode?: string;
-  companyNameByInn?: string;
   partnerName?: string;
 };
 

package/src/api/getSubmitBody.ts

@@ -5,10 +5,7 @@ import { formatPhone } from '../utils/formatPhone';
 import { type LeadRequest } from './LeadServiceAPI';
 
 type PFFormData = {
-  innDadata?: string;
   fullRegion?: string;
-  partnerSymbolCode?: string;
-  companyNameByInn?: string;
   partnerName?: string;
 };
 
@@ -21,14 +18,11 @@ export const getSubmitBody = (body: LeadRequest, isNaturalPerson: boolean, route
     birthday,
     desiredMeetingDate,
     inn,
-    innDadata,
     fullRegion,
     addressBranch,
     secondaryPhone = '',
     bankEmpolee,
     applicationDate,
-    partnerSymbolCode,
-    companyNameByInn,
     partnerName,
     ...staticBody
   } = body;
@@ -50,10 +44,7 @@ export const getSubmitBody = (body: LeadRequest, isNaturalPerson: boolean, route
         }),
     ...addPageSlug(typeForm, router),
     ...formatPFForm(typeForm, {
-      innDadata,
       fullRegion,
-      partnerSymbolCode,
-      companyNameByInn,
       partnerName,
     }),
     ...staticBody,
@@ -87,10 +78,8 @@ const getSecondaryPhone = (secondaryPhone = '') =>
 const formatPFForm = (typeForm?: string, data?: PFFormData) =>
   typeForm === 'PF'
     ? {
-        inn: data?.innDadata,
         region: data?.fullRegion,
         partner: data?.partnerName,
-        fullName: data?.companyNameByInn,
       }
     : {};
 

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

@@ -28,12 +28,12 @@
             "columns": 2,
             "inputs": [
               {
-                "name": "fullName",
+                "name": "dadataPartyNameSelect",
                 "required": true,
                 "label": "Наименование организации"
               },
               {
-                "name": "inn",
+                "name": "dadataPartyInnSelect",
                 "required": true
               },
               {
@@ -205,7 +205,7 @@
                 "required": true
               },
               {
-                "name": "inn",
+                "name": "dadataPartyInnSelect",
                 "required": true
               },
               {
@@ -339,7 +339,7 @@
           {
             "inputs": [
               {
-                "name": "fullName",
+                "name": "companyNameDadata",
                 "required": true,
                 "label": "Наименование организации"
               }
@@ -407,7 +407,7 @@
             "columns": 2,
             "inputs": [
               {
-                "name": "fullName",
+                "name": "dadataPartyNameSelect",
                 "required": true,
                 "label": "Наименование организации"
               },
@@ -416,7 +416,7 @@
                 "required": true
               },
               {
-                "name": "inn",
+                "name": "dadataPartyInnSelect",
                 "required": true
               },
               {
@@ -659,9 +659,7 @@
                 "required": true,
                 "condition": {
                   "name": "serviceDirection",
-                  "values": [
-                    "Юридическое лицо / ИП"
-                  ]
+                  "values": ["Юридическое лицо / ИП"]
                 }
               },
               {
@@ -669,9 +667,7 @@
                 "label": "Наименование организации",
                 "condition": {
                   "name": "serviceDirection",
-                  "values": [
-                    "Юридическое лицо / ИП"
-                  ]
+                  "values": ["Юридическое лицо / ИП"]
                 }
               },
               {
@@ -926,9 +922,7 @@
                 "required": true,
                 "condition": {
                   "name": "vedTypes",
-                  "values": [
-                    "currencyControl"
-                  ]
+                  "values": ["currencyControl"]
                 }
               }
             ]
@@ -937,18 +931,15 @@
             "columns": 2,
             "inputs": [
               {
-                "name": "inn",
+                "name": "innDadata",
                 "required": true,
                 "condition": {
                   "name": "vedTypes",
-                  "values": [
-                    "currencyControl",
-                    "documentOperations"
-                  ]
+                  "values": ["currencyControl", "documentOperations"]
                 }
               },
               {
-                "name": "fullName",
+                "name": "dadataPartyNameSelect",
                 "required": true,
                 "label": "Наименование организации"
               },
@@ -966,11 +957,7 @@
                 "required": true,
                 "condition": {
                   "name": "vedTypes",
-                  "values": [
-                    "documentOperations",
-                    "conversionTransactions",
-                    "otherIssues"
-                  ]
+                  "values": ["documentOperations", "conversionTransactions", "otherIssues"]
                 }
               }
             ]
@@ -1137,7 +1124,7 @@
                 "required": true
               },
               {
-                "name": "inn",
+                "name": "dadataPartyInnSelect",
                 "required": true
               }
             ]
@@ -1181,7 +1168,7 @@
                 "required": true
               },
               {
-                "name": "inn"
+                "name": "dadataPartyInnSelect"
               }
             ]
           }
@@ -1354,9 +1341,7 @@
                 "required": true,
                 "condition": {
                   "name": "serviceDirection",
-                  "values": [
-                    "Юридическое лицо / ИП"
-                  ]
+                  "values": ["Юридическое лицо / ИП"]
                 }
               },
               {
@@ -1364,9 +1349,7 @@
                 "label": "Наименование организации",
                 "condition": {
                   "name": "serviceDirection",
-                  "values": [
-                    "Юридическое лицо / ИП"
-                  ]
+                  "values": ["Юридическое лицо / ИП"]
                 }
               },
               {
@@ -1383,9 +1366,7 @@
                 "label": "Ваше сообщение",
                 "condition": {
                   "name": "serviceDirection",
-                  "values": [
-                    "Физическое лицо"
-                  ]
+                  "values": ["Физическое лицо"]
                 }
               },
               {
@@ -1394,9 +1375,7 @@
                 "required": true,
                 "condition": {
                   "name": "serviceDirection",
-                  "values": [
-                    "Юридическое лицо / ИП"
-                  ]
+                  "values": ["Юридическое лицо / ИП"]
                 }
               }
             ]
@@ -1448,11 +1427,11 @@
             "columns": 2,
             "inputs": [
               {
-                "name": "innDadata",
+                "name": "dadataPartyNameSelect",
                 "required": true
               },
               {
-                "name": "companyNameByInn",
+                "name": "dadataPartyInnSelect",
                 "required": true
               }
             ]
@@ -1553,4 +1532,4 @@
       }
     }
   ]
-]
+]

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

@@ -74,11 +74,11 @@ export default {
             columns: 2,
             inputs: [
               {
-                name: 'fullName',
+                name: 'dadataPartyNameSelect',
                 required: true,
                 label: 'Наименование организации',
               },
-              { name: 'inn', required: true },
+              { name: 'dadataPartyInnSelect', required: true },
               { name: 'name', required: true, label: 'Контактное лицо' },
               { name: 'phone', required: true },
             ],
@@ -229,7 +229,7 @@ export default {
             inputs: [
               { name: 'name', required: true },
               { name: 'phone', required: true },
-              { name: 'inn', required: true },
+              { name: 'dadataPartyInnSelect', required: true },
               { name: 'email', required: true },
             ],
           },
@@ -252,7 +252,7 @@ export default {
           {
             inputs: [
               {
-                name: 'fullName',
+                name: 'dadataPartyNameSelect',
                 required: true,
                 label: 'Наименование организации',
               },
@@ -297,12 +297,12 @@ export default {
             columns: 2,
             inputs: [
               {
-                name: 'fullName',
+                name: 'dadataPartyNameSelect',
                 required: true,
                 label: 'Наименование организации',
               },
               { name: 'annualRevenue', required: true },
-              { name: 'inn', required: true },
+              { name: 'dadataPartyInnSelect', required: true },
               { name: 'name', required: true, label: 'Контактное лицо' },
               { name: 'phone', required: true },
               { name: 'email', required: true },
@@ -569,6 +569,7 @@ export default {
             inputs: [
               {
                 name: 'vedTypes',
+                required: true,
                 defaultValue: 'currencyControl',
               },
             ],
@@ -587,7 +588,7 @@ export default {
             columns: 2,
             inputs: [
               {
-                name: 'inn',
+                name: 'dadataPartyInnSelect',
                 required: true,
                 condition: {
                   name: 'vedTypes',
@@ -595,7 +596,7 @@ export default {
                 },
               },
               {
-                name: 'fullName',
+                name: 'dadataPartyNameSelect',
                 required: true,
                 label: 'Наименование организации',
               },
@@ -698,7 +699,7 @@ export default {
             columns: 2,
             inputs: [
               { name: 'phone', required: true },
-              { name: 'inn', required: true },
+              { name: 'dadataPartyInnSelect', required: true },
             ],
           },
         ]}
@@ -722,7 +723,7 @@ export default {
           },
           {
             columns: 2,
-            inputs: [{ name: 'phone', required: true }, { name: 'inn' }],
+            inputs: [{ name: 'phone', required: true }, { name: 'dadataPartyInnSelect' }],
           },
         ]}
         button={button}
@@ -859,14 +860,14 @@ export default {
         sections={[
           {
             title: 'Информация о партнере',
-            inputs: [{ name: 'partnerSymbolCode', required: true }],
+            inputs: [{ name: 'partnerSymbolCode', required: true }, { name: 'partnerName' }],
           },
           {
             title: 'Информация о компании',
             columns: 2,
             inputs: [
-              { name: 'innDadata', required: true },
-              { name: 'companyNameByInn', required: true },
+              { name: 'dadataPartyInnSelect', required: true },
+              { name: 'dadataPartyNameSelect', required: true },
             ],
           },
           {
@@ -896,6 +897,28 @@ export default {
       <DialogManager />
     </div>
   ),
+  withSms: (
+    <div className="container grid grid-cols-12">
+      <ApplicationForm
+        className="col-span-12"
+        title="Онлайн-заявка от партнера"
+        typeForm="PF"
+        endpoint="initcorporatelead"
+        sections={[
+          {
+            inputs: [
+              { name: 'name', required: true },
+              { name: 'phone', required: true },
+            ],
+          },
+        ]}
+        button={button}
+        link={linkCorp}
+      />
+      <PopupManager />
+      <DialogManager />
+    </div>
+  ),
   rkoApk: (
     <div className="container grid grid-cols-12">
       <ApplicationForm

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

@@ -74,11 +74,11 @@ export default {
             columns: 2,
             inputs: [
               {
-                name: 'fullName',
+                name: 'dadataPartyNameSelect',
                 required: true,
                 label: 'Наименование организации',
               },
-              { name: 'inn', required: true },
+              { name: 'dadataPartyInnSelect', required: true },
               { name: 'name', required: true, label: 'Контактное лицо' },
               { name: 'phone', required: true },
             ],
@@ -225,7 +225,7 @@ export default {
             inputs: [
               { name: 'name', required: true },
               { name: 'phone', required: true },
-              { name: 'inn', required: true },
+              { name: 'dadataPartyInnSelect', required: true },
               { name: 'email', required: true },
             ],
           },
@@ -248,7 +248,7 @@ export default {
           {
             inputs: [
               {
-                name: 'fullName',
+                name: 'dadataPartyNameSelect',
                 required: true,
                 label: 'Наименование организации',
               },
@@ -293,12 +293,12 @@ export default {
             columns: 2,
             inputs: [
               {
-                name: 'fullName',
+                name: 'dadataPartyNameSelect',
                 required: true,
                 label: 'Наименование организации',
               },
               { name: 'annualRevenue', required: true },
-              { name: 'inn', required: true },
+              { name: 'dadataPartyInnSelect', required: true },
               { name: 'name', required: true, label: 'Контактное лицо' },
               { name: 'phone', required: true },
               { name: 'email', required: true },
@@ -358,6 +358,7 @@ export default {
         sections={[
           {
             title: 'Оставьте заявку и мы ответим на любые вопросы по депозитам',
+            columns: 1,
             inputs: [
               { name: 'name', required: true },
               { name: 'phone', required: true },
@@ -582,7 +583,7 @@ export default {
             columns: 2,
             inputs: [
               {
-                name: 'inn',
+                name: 'dadataPartyInnSelect',
                 required: true,
                 condition: {
                   name: 'vedTypes',
@@ -590,7 +591,7 @@ export default {
                 },
               },
               {
-                name: 'fullName',
+                name: 'dadataPartyNameSelect',
                 required: true,
                 label: 'Наименование организации',
               },
@@ -693,7 +694,7 @@ export default {
             columns: 2,
             inputs: [
               { name: 'phone', required: true },
-              { name: 'inn', required: true },
+              { name: 'dadataPartyInnSelect', required: true },
             ],
           },
         ]}
@@ -717,7 +718,7 @@ export default {
           },
           {
             columns: 2,
-            inputs: [{ name: 'phone', required: true }, { name: 'inn' }],
+            inputs: [{ name: 'phone', required: true }, { name: 'dadataPartyInnSelect' }],
           },
         ]}
         button={button}
@@ -860,8 +861,8 @@ export default {
             title: 'Информация о компании',
             columns: 2,
             inputs: [
-              { name: 'innDadata', required: true },
-              { name: 'companyNameByInn', required: true },
+              { name: 'dadataPartyInnSelect', required: true, dadataValue: 'DaDataInn' },
+              { name: 'dadataPartyNameSelect', required: true, dadataValue: 'DaDataPartyName' },
             ],
           },
           {

package/src/components/ApplicationForm/getFormatData.tsx

@@ -22,6 +22,9 @@ export const getFormatData = (data: FormState): Record<string, any> => {
     situationDescription,
     applierType,
     isPremium,
+    dadataPartyNameSelect,
+    partnerSymbolCode,
+    dadataPartyInnSelect,
     ...usedData
   } = data;
   const partnerComments = acquiringType || annualRevenue ? getPartnerComments(data) : null;
@@ -34,6 +37,10 @@ export const getFormatData = (data: FormState): Record<string, any> => {
     ...(serviceType ? { typeForm: serviceType } : {}),
     ...getIncidentComment(sufferedFrom?.text, situationDescription),
     ...getIsClient(applierType),
+    ...getDadataValues([
+      [dadataPartyInnSelect, 'inn'],
+      [dadataPartyNameSelect, 'fullName'],
+    ]),
   };
 
   return Object.fromEntries(
@@ -58,3 +65,12 @@ const getVedTypes = (vedTypes?: string): { vedTypes?: Record<string, boolean> }
         vedTypes: Object.fromEntries(VED_TYPES.map(({ id }) => [id, id === vedTypes])),
       }
     : {};
+
+const getDadataValues = (fields: [Option | undefined, string][]): Record<string, string> =>
+  fields.reduce((acc, [field, name]) => {
+    if (field?.text && name) {
+      acc[name] = field.text;
+    }
+
+    return acc;
+  }, {});

package/src/components/ApplicationForm/getInitialFormState.tsx

@@ -34,6 +34,9 @@ export interface FormState {
   situationDescription?: string;
   applierType?: ApplierType;
   isPremium?: boolean;
+  partnerSymbolCode?: string;
+  dadataPartyInnSelect?: Option;
+  dadataPartyNameSelect?: Option;
 }
 
 const initialFormState = {

package/src/components/Footer/LinkList.tsx

@@ -8,17 +8,12 @@ import { style } from '../../utils/style';
 
 interface LinkListProps extends ComponentType {
   items?: LinkProps[];
-  isFlex?: boolean;
 }
 
-export const LinkList = JSX<LinkListProps>(({ className = '', items, isFlex = true }) => {
+export const LinkList = JSX<LinkListProps>(({ className, items }) => {
   const link = useLink();
 
-  return (
-    <ul className={style(isFlex ? 'flex flex-col gap-s' : 'block', 'w-full', className)}>
-      {items?.map(renderLinkListItem(link))}
-    </ul>
-  );
+  return <ul className={style('w-full', className)}>{items?.map(renderLinkListItem(link))}</ul>;
 });
 
 const renderLinkListItem =

package/src/hooks/{useInn.ts → useDadataParty.ts}

@@ -2,13 +2,13 @@ import { getDaDataHints } from '../retail/api/dadataHints/dadataHints';
 
 const INN_DADATA_URL = 'suggest/party';
 
-interface InnHint {
+export interface DaDataPartyHint {
   fullName?: string;
   address?: string;
   inn?: string;
 }
 
-export const useInn = async (searchQuery: string): Promise<InnHint[]> =>
+export const useDadataParty = async (searchQuery: string): Promise<DaDataPartyHint[]> =>
   (await getDaDataHints({ url: INN_DADATA_URL, query: searchQuery })).map((_) => ({
     fullName: _?.value,
     address: _?.data?.address?.value,

package/src/model/AspectsProps.ts

@@ -35,6 +35,15 @@ export type ChatBotAspect = {
   aspectName: 'openChatBot';
 };
 
+/**
+ * @title Отправить событие партнёру
+ * @default {"aspectName": "partnersEvent", "params": {"partner": "", "typeAction": "targetaction"}}
+ */
+export type PartnersEventAspect = {
+  aspectName: 'partnersEvent';
+  params?: AspectData;
+};
+
 /**
  * @title Не выбрано
  */
@@ -52,7 +61,8 @@ export type AspectsDef =
   | ChatBotAspect
   | YandexReachGoalAspect
   | MindboxEventAspect
-  | SnowplowEventAspect;
+  | SnowplowEventAspect
+  | PartnersEventAspect;
 
 export type AspectsProps = {
   /** @title Дополнительные атрибуты */