@redneckz/wildless-cms-uni-blocks 0.14.791 → 0.14.793

package/mobile/src/components/ApplicationLeadForm/useApplicationLeadApi.tsx

@@ -1,8 +1,6 @@
 /* eslint-disable max-lines */
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
-import { handleAspects } from '../../hooks/useAspects/handleAspects';
-import { useAspects } from '../../hooks/useAspects/useAspects';
 import { type AspectsProps } from '../../model/AspectsProps';
 import { createDraftTask } from '../../retail/api/createDraftTask';
 import { createUserProfile } from '../../retail/api/createUserProfile';
@@ -18,12 +16,12 @@ import { VerifyPhoneDialog } from '../../retail/components/VerifyPhoneDialog/Ver
 import { type FormRetailConsents, type LeadFormState } from '../../retail/model/LeadFormState';
 import { getUpdateUserProfileData } from '../../retail/utils/getUpdateUserProfile';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog';
-import { type PreventableEventWithTarget } from '../../ui-kit/PreventableEvent';
 import { formatPhone } from '../../utils/formatPhone';
 import { type ProductType } from './ApplicationLeadFormContent';
 import { productTypeToConsentsMap } from './consents';
 import { getCreditLeadFormTaskData, getDebitLeadFormTaskData } from './getLeadFormTaskData';
 import { useSaveUserData, type UserData } from './useSaveUserData';
+import { useSendLeadFormAspects } from './useSendLeadFormAspects';
 
 interface ApplicationLeadApiProps extends AspectsProps {
   programId: string;
@@ -41,7 +39,7 @@ export const useApplicationLeadApi = ({
   const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
   const [ok, setOK] = useState<boolean | undefined>();
   const saveUserData = useSaveUserData();
-  const aspects = useAspects();
+  const sendAspects = useSendLeadFormAspects({ data });
 
   const openEsiaLoginDialog = useEsiaLoginDialog(nextStepLink);
   const consentBkiDialog = useConsentBkiDialog(openEsiaLoginDialog);
@@ -63,11 +61,7 @@ export const useApplicationLeadApi = ({
             formData,
             productType,
             saveUserData,
-          });
-          handleAspects({
-            aspectsAttributes: data,
-            aspects,
-            ev: {} as PreventableEventWithTarget,
+            sendAspects,
           });
           verifyPhoneDialog.close();
           if (productType === 'debitCard') {
@@ -86,6 +80,7 @@ export const useApplicationLeadApi = ({
               draftDialog.open({
                 task,
                 isFromLead: true,
+                sendAspects,
                 onClose: sendCurrentTask,
               });
             } else {
@@ -127,12 +122,14 @@ const updateUserData = async ({
   formData,
   productType,
   saveUserData,
+  sendAspects,
 }: {
   programId: string;
   profileId: number;
   formData: LeadFormState;
   productType: ProductType;
   saveUserData: (userData: UserData) => void;
+  sendAspects: (profileId: number, taskId: number) => void;
 }) => {
   let taskId: number;
   let participantId: number;
@@ -164,6 +161,7 @@ const updateUserData = async ({
       );
     }
 
+    sendAspects(profileId, taskId);
     saveUserData({ participantId, taskId, profileId, programId, formData });
   } catch (ex) {
     console.log(ex);

package/mobile/src/components/ApplicationLeadForm/useSendLeadFormAspects.tsx

@@ -0,0 +1,28 @@
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { getAspectsWithInclude } from '../../hooks/useAspects/aspects/getAspectsWithInclude';
+import { handleAspects } from '../../hooks/useAspects/handleAspects';
+import { useAspects } from '../../hooks/useAspects/useAspects';
+import { type AspectsProps } from '../../model/AspectsProps';
+import { type PreventableEventWithTarget } from '../../ui-kit/PreventableEvent';
+
+export const useSendLeadFormAspects = ({ data }: AspectsProps) => {
+  const aspects = useAspects();
+
+  const sendAspects = useCallback(
+    (ProfileId: number, TaskId: number) => {
+      const snowplowParams = JSON.stringify({
+        ProfileId,
+        TaskId,
+      });
+
+      handleAspects({
+        aspectsAttributes: getAspectsWithInclude(data, snowplowParams),
+        aspects,
+        ev: {} as PreventableEventWithTarget,
+      });
+    },
+    [data],
+  );
+
+  return sendAspects;
+};

package/mobile/src/components/Header/HeaderChatBotButton.tsx

@@ -28,6 +28,7 @@ export const HeaderChatBotButton = JSX<HeaderChatBotButtonProps>(
         isGrayBg={true}
         version={version}
         isLoading={isLoading}
+        dataTestId="chat icon"
       />
     );
   },

package/mobile/src/components/Header/HeaderSecondaryMenuButton.tsx

@@ -17,6 +17,8 @@ export interface HeaderSecondaryMenuButtonProps extends ImageContent, AspectsPro
   onClick?: (ev: PreventableEventWithTarget) => void;
   version?: BlockVersion;
   isLoading?: boolean;
+  // Made special for chatBot, temporary
+  dataTestId?: string;
 }
 
 const BUTTON_SIZE_STYLE = {
@@ -37,6 +39,7 @@ export const HeaderSecondaryMenuButton = JSX<HeaderSecondaryMenuButtonProps>(
     onClick,
     version,
     isLoading,
+    dataTestId = '',
   }) => {
     const grayBg = isGrayBg && !isRounded ? 'bg-main-divider' : '';
     const bgColor = version === 'transparent' ? 'backdrop-opacity-30 bg-white/30' : grayBg;
@@ -58,6 +61,8 @@ export const HeaderSecondaryMenuButton = JSX<HeaderSecondaryMenuButtonProps>(
         aria-label={ariaLabel}
         onClick={onClick}
         // eslint-disable-next-line react/jsx-props-no-spreading
+        {...getDataTestIdAttribute(dataTestId)}
+        // eslint-disable-next-line react/jsx-props-no-spreading
         {...getAspectsAttributes(data)}
       >
         {isLoading ? (
@@ -75,3 +80,6 @@ export const HeaderSecondaryMenuButton = JSX<HeaderSecondaryMenuButtonProps>(
     );
   },
 );
+
+const getDataTestIdAttribute = (dataTestId?: string) =>
+  dataTestId ? { 'data-test-id': dataTestId } : null;

package/mobile/src/hooks/useAspects/aspects/getAspectsWithInclude.tsx

@@ -4,5 +4,8 @@ import { type AspectsAttribute } from '../useAspects';
 export const getAspectsWithInclude = (data?: AspectsDef[], include?: string): AspectsDef[] =>
   data?.map(({ aspectName, params }: AspectsAttribute) => ({
     aspectName,
-    params: aspectName === 'mindboxEvent' ? { ...params, eventJson: include } : params,
+    params:
+      aspectName === 'mindboxEvent' || aspectName === 'snowplowEvent'
+        ? { ...params, eventJson: include }
+        : params,
   })) as AspectsDef[];

package/mobile/src/retail/components/DraftDialog/DraftDialog.tsx

@@ -14,12 +14,14 @@ import { creditCodesToProgrammIdMap, creditProgramCodeToProductIdMap } from './u
 export interface DraftDialogProps {
   task: Task;
   isFromLead?: boolean;
+  sendAspects?: (profileId: number, taskId: number) => void;
   onClose?: () => void;
 }
 
 export const DraftDialog = JSX<DraftDialogProps>(function ({
   task,
   isFromLead = false,
+  sendAspects = noop,
   onClose = noop,
 }) {
   const retailFormStore = useRetailFormStore();
@@ -40,6 +42,9 @@ export const DraftDialog = JSX<DraftDialogProps>(function ({
     retailFormStore.profileId = profile?.id ?? null;
     retailFormStore.programId = programmId;
     retailFormStore.leadForm = taskFromDraft;
+    if (profile?.id) {
+      sendAspects(profile.id, taskId);
+    }
     navigator.assign(nextStepLink);
   }, []);
 

package/mobile/src/retail/components/DraftDialog/useDraftDialog.tsx

@@ -6,6 +6,7 @@ import { EmptyDraftDialog } from './EmptyDraftDialog';
 type useDraftDialogOpenProps = {
   task?: Task;
   isFromLead?: boolean;
+  sendAspects?: (profileId: number, taskId: number) => void;
   onClose?: () => void;
 };
 
@@ -14,8 +15,8 @@ export const useDraftDialog = () => {
   const { open: openEmptyDraftDialog } = useDialog(EmptyDraftDialog);
 
   return {
-    open: ({ task, isFromLead, onClose }: useDraftDialogOpenProps) => {
-      task ? openDraftDialog({ task, isFromLead, onClose }) : openEmptyDraftDialog({});
+    open: ({ task, isFromLead, onClose, sendAspects }: useDraftDialogOpenProps) => {
+      task ? openDraftDialog({ task, isFromLead, onClose, sendAspects }) : openEmptyDraftDialog({});
     },
   };
 };

package/package.json

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

package/src/components/ApplicationLeadForm/useApplicationLeadApi.tsx

@@ -1,8 +1,6 @@
 /* eslint-disable max-lines */
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
-import { handleAspects } from '../../hooks/useAspects/handleAspects';
-import { useAspects } from '../../hooks/useAspects/useAspects';
 import { type AspectsProps } from '../../model/AspectsProps';
 import { createDraftTask } from '../../retail/api/createDraftTask';
 import { createUserProfile } from '../../retail/api/createUserProfile';
@@ -18,12 +16,12 @@ import { VerifyPhoneDialog } from '../../retail/components/VerifyPhoneDialog/Ver
 import { type FormRetailConsents, type LeadFormState } from '../../retail/model/LeadFormState';
 import { getUpdateUserProfileData } from '../../retail/utils/getUpdateUserProfile';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog';
-import { type PreventableEventWithTarget } from '../../ui-kit/PreventableEvent';
 import { formatPhone } from '../../utils/formatPhone';
 import { type ProductType } from './ApplicationLeadFormContent';
 import { productTypeToConsentsMap } from './consents';
 import { getCreditLeadFormTaskData, getDebitLeadFormTaskData } from './getLeadFormTaskData';
 import { useSaveUserData, type UserData } from './useSaveUserData';
+import { useSendLeadFormAspects } from './useSendLeadFormAspects';
 
 interface ApplicationLeadApiProps extends AspectsProps {
   programId: string;
@@ -41,7 +39,7 @@ export const useApplicationLeadApi = ({
   const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
   const [ok, setOK] = useState<boolean | undefined>();
   const saveUserData = useSaveUserData();
-  const aspects = useAspects();
+  const sendAspects = useSendLeadFormAspects({ data });
 
   const openEsiaLoginDialog = useEsiaLoginDialog(nextStepLink);
   const consentBkiDialog = useConsentBkiDialog(openEsiaLoginDialog);
@@ -63,11 +61,7 @@ export const useApplicationLeadApi = ({
             formData,
             productType,
             saveUserData,
-          });
-          handleAspects({
-            aspectsAttributes: data,
-            aspects,
-            ev: {} as PreventableEventWithTarget,
+            sendAspects,
           });
           verifyPhoneDialog.close();
           if (productType === 'debitCard') {
@@ -86,6 +80,7 @@ export const useApplicationLeadApi = ({
               draftDialog.open({
                 task,
                 isFromLead: true,
+                sendAspects,
                 onClose: sendCurrentTask,
               });
             } else {
@@ -127,12 +122,14 @@ const updateUserData = async ({
   formData,
   productType,
   saveUserData,
+  sendAspects,
 }: {
   programId: string;
   profileId: number;
   formData: LeadFormState;
   productType: ProductType;
   saveUserData: (userData: UserData) => void;
+  sendAspects: (profileId: number, taskId: number) => void;
 }) => {
   let taskId: number;
   let participantId: number;
@@ -164,6 +161,7 @@ const updateUserData = async ({
       );
     }
 
+    sendAspects(profileId, taskId);
     saveUserData({ participantId, taskId, profileId, programId, formData });
   } catch (ex) {
     console.log(ex);

package/src/components/ApplicationLeadForm/useSendLeadFormAspects.tsx

@@ -0,0 +1,28 @@
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { getAspectsWithInclude } from '../../hooks/useAspects/aspects/getAspectsWithInclude';
+import { handleAspects } from '../../hooks/useAspects/handleAspects';
+import { useAspects } from '../../hooks/useAspects/useAspects';
+import { type AspectsProps } from '../../model/AspectsProps';
+import { type PreventableEventWithTarget } from '../../ui-kit/PreventableEvent';
+
+export const useSendLeadFormAspects = ({ data }: AspectsProps) => {
+  const aspects = useAspects();
+
+  const sendAspects = useCallback(
+    (ProfileId: number, TaskId: number) => {
+      const snowplowParams = JSON.stringify({
+        ProfileId,
+        TaskId,
+      });
+
+      handleAspects({
+        aspectsAttributes: getAspectsWithInclude(data, snowplowParams),
+        aspects,
+        ev: {} as PreventableEventWithTarget,
+      });
+    },
+    [data],
+  );
+
+  return sendAspects;
+};

package/src/components/Header/HeaderChatBotButton.tsx

@@ -28,6 +28,7 @@ export const HeaderChatBotButton = JSX<HeaderChatBotButtonProps>(
         isGrayBg={true}
         version={version}
         isLoading={isLoading}
+        dataTestId="chat icon"
       />
     );
   },

package/src/components/Header/HeaderSecondaryMenuButton.tsx

@@ -17,6 +17,8 @@ export interface HeaderSecondaryMenuButtonProps extends ImageContent, AspectsPro
   onClick?: (ev: PreventableEventWithTarget) => void;
   version?: BlockVersion;
   isLoading?: boolean;
+  // Made special for chatBot, temporary
+  dataTestId?: string;
 }
 
 const BUTTON_SIZE_STYLE = {
@@ -37,6 +39,7 @@ export const HeaderSecondaryMenuButton = JSX<HeaderSecondaryMenuButtonProps>(
     onClick,
     version,
     isLoading,
+    dataTestId = '',
   }) => {
     const grayBg = isGrayBg && !isRounded ? 'bg-main-divider' : '';
     const bgColor = version === 'transparent' ? 'backdrop-opacity-30 bg-white/30' : grayBg;
@@ -58,6 +61,8 @@ export const HeaderSecondaryMenuButton = JSX<HeaderSecondaryMenuButtonProps>(
         aria-label={ariaLabel}
         onClick={onClick}
         // eslint-disable-next-line react/jsx-props-no-spreading
+        {...getDataTestIdAttribute(dataTestId)}
+        // eslint-disable-next-line react/jsx-props-no-spreading
         {...getAspectsAttributes(data)}
       >
         {isLoading ? (
@@ -75,3 +80,6 @@ export const HeaderSecondaryMenuButton = JSX<HeaderSecondaryMenuButtonProps>(
     );
   },
 );
+
+const getDataTestIdAttribute = (dataTestId?: string) =>
+  dataTestId ? { 'data-test-id': dataTestId } : null;

package/src/hooks/useAspects/aspects/getAspectsWithInclude.tsx

@@ -4,5 +4,8 @@ import { type AspectsAttribute } from '../useAspects';
 export const getAspectsWithInclude = (data?: AspectsDef[], include?: string): AspectsDef[] =>
   data?.map(({ aspectName, params }: AspectsAttribute) => ({
     aspectName,
-    params: aspectName === 'mindboxEvent' ? { ...params, eventJson: include } : params,
+    params:
+      aspectName === 'mindboxEvent' || aspectName === 'snowplowEvent'
+        ? { ...params, eventJson: include }
+        : params,
   })) as AspectsDef[];

package/src/retail/components/DraftDialog/DraftDialog.tsx

@@ -14,12 +14,14 @@ import { creditCodesToProgrammIdMap, creditProgramCodeToProductIdMap } from './u
 export interface DraftDialogProps {
   task: Task;
   isFromLead?: boolean;
+  sendAspects?: (profileId: number, taskId: number) => void;
   onClose?: () => void;
 }
 
 export const DraftDialog = JSX<DraftDialogProps>(function ({
   task,
   isFromLead = false,
+  sendAspects = noop,
   onClose = noop,
 }) {
   const retailFormStore = useRetailFormStore();
@@ -40,6 +42,9 @@ export const DraftDialog = JSX<DraftDialogProps>(function ({
     retailFormStore.profileId = profile?.id ?? null;
     retailFormStore.programId = programmId;
     retailFormStore.leadForm = taskFromDraft;
+    if (profile?.id) {
+      sendAspects(profile.id, taskId);
+    }
     navigator.assign(nextStepLink);
   }, []);
 

package/src/retail/components/DraftDialog/useDraftDialog.tsx

@@ -6,6 +6,7 @@ import { EmptyDraftDialog } from './EmptyDraftDialog';
 type useDraftDialogOpenProps = {
   task?: Task;
   isFromLead?: boolean;
+  sendAspects?: (profileId: number, taskId: number) => void;
   onClose?: () => void;
 };
 
@@ -14,8 +15,8 @@ export const useDraftDialog = () => {
   const { open: openEmptyDraftDialog } = useDialog(EmptyDraftDialog);
 
   return {
-    open: ({ task, isFromLead, onClose }: useDraftDialogOpenProps) => {
-      task ? openDraftDialog({ task, isFromLead, onClose }) : openEmptyDraftDialog({});
+    open: ({ task, isFromLead, onClose, sendAspects }: useDraftDialogOpenProps) => {
+      task ? openDraftDialog({ task, isFromLead, onClose, sendAspects }) : openEmptyDraftDialog({});
     },
   };
 };