@redneckz/wildless-cms-uni-blocks 0.14.915 → 0.14.917

package/mobile/src/components/ApplicationLeadForm/useInitApplicationLead.ts

@@ -4,8 +4,8 @@ import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
 import { useSetter } from '../../hooks/useSetter';
 import { esiaRequestProfile } from '../../retail/api/esiaRequestProfile';
 import { type MarketingInfo } from '../../retail/api/updateUserTask';
+import { useReferalProgramm } from '../../retail/hooks/useReferalProgramm';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
-import { type ReferalData } from '../../retail/model/ReferalData';
 import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
 import { QUERY_STORAGE_KEY } from '../../utils/getSessionQuery';
 import { EsiaStatuses, type ProductType } from './ApplicationLeadFormContent';
@@ -23,7 +23,6 @@ type InitApplicationLeadProps = {
 
 export interface ApplicationLeadStore {
   marketingInfo: MarketingInfo | null;
-  referalData: ReferalData | null;
 }
 
 export const useInitApplicationLead = ({
@@ -36,6 +35,7 @@ export const useInitApplicationLead = ({
   const saveForm = useSetter(leadFormStore, 'leadForm');
   const sessionStore = useSessionStore<ApplicationLeadStore>();
   const queryFromStorage = globalThis.sessionStorage?.getItem(QUERY_STORAGE_KEY);
+  useReferalProgramm();
 
   const initialFormState = useMemo(
     () => getInitialFormState(inputs, leadFormStore.leadForm, esiaAuthSuccess),
@@ -69,20 +69,7 @@ export const useInitApplicationLead = ({
   useEffect(() => {
     leadFormStore.productType = productType;
 
-    const { referalCode, refererCode, productId, marketingInfo } = getLeadQueryParams(
-      queryFromStorage,
-      sessionStore,
-    );
-
-    if (referalCode) {
-      sessionStore.referalData = {
-        refererCode,
-        referalCode,
-        productId,
-      };
-    }
-
-    sessionStore.marketingInfo = marketingInfo;
+    sessionStore.marketingInfo = getMarketingInfo(queryFromStorage, sessionStore);
   }, [queryFromStorage]);
 
   useEffect(() => {
@@ -102,19 +89,13 @@ export const useInitApplicationLead = ({
   return initialFormState;
 };
 
-const getLeadQueryParams = (
-  queryFromStorage: string | null,
-  sessionStore: ApplicationLeadStore,
-) => {
-  const referalData = sessionStore.referalData;
+const getMarketingInfo = (queryFromStorage: string | null, sessionStore: ApplicationLeadStore) => {
   const marketingInfoFromStorage = sessionStore.marketingInfo;
   const queryStorage = new URLSearchParams(decodeURIComponent(queryFromStorage || ''));
 
   const code = queryStorage.get('code');
-  const referalCode = code ? referalData?.referalCode : queryStorage.get('referalCode');
-  const refererCode = code ? referalData?.refererCode : queryStorage.get('refererCode');
-  const productId = code ? referalData?.productId : queryStorage.get('productId');
-  const marketingInfo = code
+
+  return code
     ? marketingInfoFromStorage
     : {
         utm_campaign: queryStorage.get('utm_campaign'),
@@ -125,11 +106,4 @@ const getLeadQueryParams = (
         bannerId: queryStorage.get('bannerId'),
         userId: queryStorage.get('userId'),
       };
-
-  return {
-    referalCode,
-    refererCode,
-    productId,
-    marketingInfo,
-  };
 };

package/mobile/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/mobile/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 Дополнительные атрибуты */

package/mobile/src/retail/hooks/useReferalProgramm.ts

@@ -0,0 +1,45 @@
+import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useLeadFormStore } from '../../components/ApplicationLeadForm/useLeadFormStore';
+import { handleAspects } from '../../hooks/useAspects/handleAspects';
+import { useAspects } from '../../hooks/useAspects/useAspects';
+import { type PreventableEventWithTarget } from '../../ui-kit/PreventableEvent';
+
+export const useReferalProgramm = () => {
+  const leadFormStore = useLeadFormStore();
+  const aspects = useAspects();
+
+  useEffect(() => {
+    const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
+
+    const referalCode = params.get('referalCode');
+    const refererCode = params.get('refererCode');
+    const productId = params.get('productId');
+
+    if (referalCode) {
+      leadFormStore.referalData = {
+        refererCode,
+        referalCode,
+        productId,
+      };
+      const eventJSON = JSON.stringify({
+        refererCode,
+        referalCode,
+        productId,
+      });
+
+      handleAspects({
+        aspectsAttributes: [
+          {
+            aspectName: 'snowplowEvent',
+            params: {
+              eventName: 'ownfin_referal_link_attributes',
+              eventJSON,
+            },
+          },
+        ],
+        aspects,
+        ev: {} as PreventableEventWithTarget,
+      });
+    }
+  }, []);
+};

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.915",
+  "version": "0.14.917",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/ApplicationLeadForm/useApplicationLeadApi.tsx

@@ -24,6 +24,7 @@ import { type ProductType } from './ApplicationLeadFormContent';
 import { productTypeToConsentsMap } from './consents';
 import { getCreditLeadFormTaskData, getDebitLeadFormTaskData } from './getLeadFormTaskData';
 import { type ApplicationLeadStore } from './useInitApplicationLead';
+import { useLeadFormStore } from './useLeadFormStore';
 import { useSaveUserData, type UserData } from './useSaveUserData';
 import { useSendLeadFormAspects } from './useSendLeadFormAspects';
 
@@ -44,6 +45,7 @@ export const useApplicationLeadApi = ({
   const [ok, setOK] = useState<boolean | undefined>();
   const saveUserData = useSaveUserData();
   const sessionStore = useSessionStore<ApplicationLeadStore>();
+  const leadFormStore = useLeadFormStore();
 
   const sendAspects = useSendLeadFormAspects({ data });
   const navigator = locationNavigator();
@@ -64,7 +66,7 @@ export const useApplicationLeadApi = ({
         profile: { phone: formatPhone(transformedFormData.phone as string) },
       });
 
-      const referalData = sessionStore.referalData;
+      const referalData = leadFormStore.referalData;
       const marketingInfo = sessionStore.marketingInfo;
 
       if (!profileId) {

package/src/components/ApplicationLeadForm/useInitApplicationLead.ts

@@ -4,8 +4,8 @@ import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
 import { useSetter } from '../../hooks/useSetter';
 import { esiaRequestProfile } from '../../retail/api/esiaRequestProfile';
 import { type MarketingInfo } from '../../retail/api/updateUserTask';
+import { useReferalProgramm } from '../../retail/hooks/useReferalProgramm';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
-import { type ReferalData } from '../../retail/model/ReferalData';
 import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
 import { QUERY_STORAGE_KEY } from '../../utils/getSessionQuery';
 import { EsiaStatuses, type ProductType } from './ApplicationLeadFormContent';
@@ -23,7 +23,6 @@ type InitApplicationLeadProps = {
 
 export interface ApplicationLeadStore {
   marketingInfo: MarketingInfo | null;
-  referalData: ReferalData | null;
 }
 
 export const useInitApplicationLead = ({
@@ -36,6 +35,7 @@ export const useInitApplicationLead = ({
   const saveForm = useSetter(leadFormStore, 'leadForm');
   const sessionStore = useSessionStore<ApplicationLeadStore>();
   const queryFromStorage = globalThis.sessionStorage?.getItem(QUERY_STORAGE_KEY);
+  useReferalProgramm();
 
   const initialFormState = useMemo(
     () => getInitialFormState(inputs, leadFormStore.leadForm, esiaAuthSuccess),
@@ -69,20 +69,7 @@ export const useInitApplicationLead = ({
   useEffect(() => {
     leadFormStore.productType = productType;
 
-    const { referalCode, refererCode, productId, marketingInfo } = getLeadQueryParams(
-      queryFromStorage,
-      sessionStore,
-    );
-
-    if (referalCode) {
-      sessionStore.referalData = {
-        refererCode,
-        referalCode,
-        productId,
-      };
-    }
-
-    sessionStore.marketingInfo = marketingInfo;
+    sessionStore.marketingInfo = getMarketingInfo(queryFromStorage, sessionStore);
   }, [queryFromStorage]);
 
   useEffect(() => {
@@ -102,19 +89,13 @@ export const useInitApplicationLead = ({
   return initialFormState;
 };
 
-const getLeadQueryParams = (
-  queryFromStorage: string | null,
-  sessionStore: ApplicationLeadStore,
-) => {
-  const referalData = sessionStore.referalData;
+const getMarketingInfo = (queryFromStorage: string | null, sessionStore: ApplicationLeadStore) => {
   const marketingInfoFromStorage = sessionStore.marketingInfo;
   const queryStorage = new URLSearchParams(decodeURIComponent(queryFromStorage || ''));
 
   const code = queryStorage.get('code');
-  const referalCode = code ? referalData?.referalCode : queryStorage.get('referalCode');
-  const refererCode = code ? referalData?.refererCode : queryStorage.get('refererCode');
-  const productId = code ? referalData?.productId : queryStorage.get('productId');
-  const marketingInfo = code
+
+  return code
     ? marketingInfoFromStorage
     : {
         utm_campaign: queryStorage.get('utm_campaign'),
@@ -125,11 +106,4 @@ const getLeadQueryParams = (
         bannerId: queryStorage.get('bannerId'),
         userId: queryStorage.get('userId'),
       };
-
-  return {
-    referalCode,
-    refererCode,
-    productId,
-    marketingInfo,
-  };
 };

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/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 Дополнительные атрибуты */

package/src/retail/hooks/useReferalProgramm.ts

@@ -0,0 +1,45 @@
+import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useLeadFormStore } from '../../components/ApplicationLeadForm/useLeadFormStore';
+import { handleAspects } from '../../hooks/useAspects/handleAspects';
+import { useAspects } from '../../hooks/useAspects/useAspects';
+import { type PreventableEventWithTarget } from '../../ui-kit/PreventableEvent';
+
+export const useReferalProgramm = () => {
+  const leadFormStore = useLeadFormStore();
+  const aspects = useAspects();
+
+  useEffect(() => {
+    const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
+
+    const referalCode = params.get('referalCode');
+    const refererCode = params.get('refererCode');
+    const productId = params.get('productId');
+
+    if (referalCode) {
+      leadFormStore.referalData = {
+        refererCode,
+        referalCode,
+        productId,
+      };
+      const eventJSON = JSON.stringify({
+        refererCode,
+        referalCode,
+        productId,
+      });
+
+      handleAspects({
+        aspectsAttributes: [
+          {
+            aspectName: 'snowplowEvent',
+            params: {
+              eventName: 'ownfin_referal_link_attributes',
+              eventJSON,
+            },
+          },
+        ],
+        aspects,
+        ev: {} as PreventableEventWithTarget,
+      });
+    }
+  }, []);
+};

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

@@ -11,37 +11,35 @@ import { type SitemapProps } from './SitemapProps';
 const FOOTER_AREA_KEYS = ['all', 'footer'];
 const IS_SINGLE_SEARCH_INDEX = Boolean(env.SINGLE_SEARCH_INDEX);
 
-export const Sitemap = JSX<SitemapProps>(({ className, navigationItems }) => {
-  const link = useLink();
+export const Sitemap = JSX<SitemapProps>(
+  ({ className, navigationItems, isSearchPanel = false }) => {
+    const link = useLink();
 
-  const filteredItems = navigationItems?.filter(isVisibleItem(FOOTER_AREA_KEYS))?.map(link) ?? [];
+    const filteredItems = navigationItems?.filter(isVisibleItem(FOOTER_AREA_KEYS))?.map(link) ?? [];
 
-  const [firstItem] = filteredItems;
+    const [firstItem] = filteredItems;
 
-  return (
-    <div className="space-y-2">
-      {IS_SINGLE_SEARCH_INDEX ? (
-        <div>
-          <LinkList
-            className="columns-3 space-y-3 gap-x-6xl"
-            items={firstItem?.items}
-            isFlex={false}
-          />
-        </div>
-      ) : (
-        <div
-          role="menu"
-          className={style(
-            'w-full flex items-start justify-between flex-col md:flex-row gap-y-m lg:order-2',
-            className,
-          )}
-        >
-          {filteredItems?.map(renderColumn)}
-        </div>
-      )}
-    </div>
-  );
-});
+    return (
+      <div className="space-y-2">
+        {IS_SINGLE_SEARCH_INDEX && isSearchPanel ? (
+          <div>
+            <LinkList className="block columns-3 space-y-3 gap-x-6xl" items={firstItem?.items} />
+          </div>
+        ) : (
+          <div
+            role="menu"
+            className={style(
+              'w-full flex items-start justify-between flex-col md:flex-row gap-m lg:order-2',
+              className,
+            )}
+          >
+            {filteredItems?.map(renderColumn)}
+          </div>
+        )}
+      </div>
+    );
+  },
+);
 
 const renderColumn = (menuItem: TopMenuItemProps & { onClick: () => void }, index: number) => {
   const { text, items = [], href, target = '_self', onClick, dataFooter } = menuItem;
@@ -60,7 +58,9 @@ const renderColumn = (menuItem: TopMenuItemProps & { onClick: () => void }, inde
       >
         {text}
       </a>
-      {visibleSubItems ? <LinkList items={visibleSubItems} /> : null}
+      {visibleSubItems ? (
+        <LinkList className="flex flex-col gap-s" items={visibleSubItems} />
+      ) : null}
     </div>
   );
 };

package/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;
 }