@legalplace/wizardx-core 2.10.0 → 2.11.0

package/CHANGELOG.md

@@ -3,6 +3,31 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.11.0](https://git.legalplace.eu/legalplace/monorepo/compare/@legalplace/wizardx-core@2.10.1...@legalplace/wizardx-core@2.11.0) (2022-04-20)
+
+
+### Bug Fixes
+
+* use getUserInfo from lp-events ([02b2012](https://git.legalplace.eu/legalplace/monorepo/commits/02b201209e5b6b6e2c2aa9aa4ee1bb7562949db3)), closes [api#5171](https://git.legalplace.eu/legalplace/monorepo/issues/5171)
+
+
+### Features
+
+* adding userInfos to all funnelGA datalayer events ([973ff37](https://git.legalplace.eu/legalplace/monorepo/commits/973ff37ffe15d7b3d262c3250be36c8d09915fcb)), closes [api#5171](https://git.legalplace.eu/legalplace/monorepo/issues/5171)
+* update version lp-events ([1214891](https://git.legalplace.eu/legalplace/monorepo/commits/1214891d08f2033ac24850ee80760c059b5cce13)), closes [api#5171](https://git.legalplace.eu/legalplace/monorepo/issues/5171)
+
+
+
+
+
+## [2.10.1](https://git.legalplace.eu/legalplace/monorepo/compare/@legalplace/wizardx-core@2.10.0...@legalplace/wizardx-core@2.10.1) (2022-04-14)
+
+**Note:** Version bump only for package @legalplace/wizardx-core
+
+
+
+
+
 # [2.10.0](https://git.legalplace.eu/legalplace/monorepo/compare/@legalplace/wizardx-core@2.9.0...@legalplace/wizardx-core@2.10.0) (2022-04-11)
 
 

package/dist/Globals.d.ts

@@ -3,11 +3,6 @@ declare global {
         dataLayer: any;
         google_trackConversion: (...args: any[]) => any;
         uetq: any;
-        fbq: (...args: any[]) => any;
-        mixpanel: any;
-        sendinblue: any;
-        ga: any;
-        hj: any;
         wizardxLoadAfterLcp: ({
             src: string;
         } | Function)[];

package/dist/PluginLoader.js

@@ -13,7 +13,6 @@ import PropTypes from "prop-types";
 import { getConfig } from "./config";
 import { getStore } from "./redux/store";
 import { getHistory } from "./redux/routerHistory";
-import { EventsTracking } from "./libs/EventsTracking";
 import Globals from "./Globals";
 import { INIT_PLUGINS } from "./redux/constants/app";
 let globalAnchors = {};
@@ -78,7 +77,7 @@ const loadPluginFiles = (pluginsList) => __awaiter(void 0, void 0, void 0, funct
         const anchors = pluginModule.default;
         const { loader } = pluginModule;
         if (loader !== undefined) {
-            loader(getStore().dispatch, getHistory(), getConfig(), EventsTracking);
+            loader(getStore().dispatch, getHistory(), getConfig());
         }
         Object.keys(anchors).forEach((anchor) => {
             if (anchor === "replace") {

package/dist/libs/index.d.ts

@@ -1,5 +1,4 @@
 export * from "./OvcConverter";
-export * from "./EventsTracking";
 export * from "./InputsInitiator";
 export * from "./PathReader";
 export * from "./SectionValidity";

package/dist/libs/index.js

@@ -1,5 +1,4 @@
 export * from "./OvcConverter";
-export * from "./EventsTracking";
 export * from "./InputsInitiator";
 export * from "./PathReader";
 export * from "./SectionValidity";

package/dist/redux/sagas/setUserEmail.js

@@ -1,5 +1,5 @@
 import { call, put, takeLatest } from "redux-saga/effects";
-import { getContractFunnelGAEvent } from "@legalplace/lp-events";
+import { getContractFunnelGAEvent, getUserInfos } from "@legalplace/lp-events";
 import { getConfig } from "../../config";
 import { selectPermalink, selectInstanceUniqid, selectDocumentTitle, selectAvailableAppStates, selectDocumentModelVersion, } from "../selectors/app";
 import { selectInputs } from "../selectors/inputs";
@@ -9,6 +9,7 @@ import { updateAvailableAppStatesAction, initInstanceAction, goNextPageAction, }
 import { OvcConverter } from "../../libs/OvcConverter";
 import { setUserEmailSucceeded } from "../actions/sagas/user";
 import { EMAIL_REGEX } from "../../constants/emailValidation";
+import { selectUserStatus, selectUserEmail } from "../selectors/user";
 const canalHeaders = {
     "lp-referrer": window.document.referrer,
     "lp-origin": window.location.href,
@@ -74,13 +75,17 @@ function* setUserEmailDecorator(action) {
             }
         }
         try {
-            if (redirectTo && redirectTo.includes("generation"))
+            if (redirectTo === null || redirectTo === void 0 ? void 0 : redirectTo.includes("generation")) {
+                const userStatus = selectUserStatus();
+                const userEmail = selectUserEmail();
                 window.dataLayer.push(getContractFunnelGAEvent({
                     currentStep: 1,
                     contractName: selectDocumentTitle(),
                     sectionTitle: "Choississez votre pack",
                     pageAction: "Confirmation avant paiement 1 | 2",
+                    user: getUserInfos({ userStatus, userEmail }),
                 }));
+            }
         }
         catch (error) {
             console.error(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/wizardx-core",
-  "version": "2.10.0",
+  "version": "2.11.0",
   "author": "Moncef Hammou (moncef@legalplace.fr)",
   "license": "MIT",
   "files": [
@@ -21,7 +21,7 @@
   "dependencies": {
     "@appnest/masonry-layout": "^2.0.8",
     "@cryptography/sha1": "^0.2.0",
-    "@legalplace/lp-events": "1.9.0",
+    "@legalplace/lp-events": "1.13.0",
     "@legalplace/lplogic": "^2.1.6",
     "@legalplace/model-healthcheck": "^1.1.5",
     "@legalplace/referencesparser": "1.7.0",
@@ -92,5 +92,5 @@
     "*.test.ts",
     "*.test.tsx"
   ],
-  "gitHead": "edcdffc91089957236baed872a7dd42e826f0067"
+  "gitHead": "91c2fbffa238edebf2874a844920628bebebd006"
 }

package/dist/libs/EventsTracking.d.ts

@@ -1,22 +0,0 @@
-export declare type EventsPropsType = Record<string, string | number | boolean | Record<string, string | number | boolean>>;
-declare class _EventsTracking {
-    private initiated;
-    private queue;
-    private queueTimer;
-    track(eventName: string, eventProps?: EventsPropsType): void;
-    register(props: EventsPropsType): void;
-    trigger(name: string): void;
-    private init;
-    private getXSource;
-    private getXAbTests;
-    private executeQueue;
-    private queueTimeout;
-    trackMix(eventName: string, eventProps?: EventsPropsType, doNotPushToQueue?: boolean): boolean;
-    private trackFB;
-    private trackGA;
-    private registerMix;
-    private registerFB;
-    private triggerHj;
-}
-export declare const EventsTracking: _EventsTracking;
-export {};

package/dist/libs/EventsTracking.js

@@ -1,177 +0,0 @@
-import Cookies from "universal-cookie";
-import Globals from "../Globals";
-const cookie = new Cookies();
-class _EventsTracking {
-    constructor() {
-        this.initiated = false;
-        this.queue = [];
-        this.queueTimer = null;
-    }
-    track(eventName, eventProps) {
-        if (!this.initiated)
-            this.init();
-        this.trackMix(eventName, Object.assign({}, eventProps));
-        this.trackFB(eventName, Object.assign({}, eventProps));
-        this.trackGA(eventName, Object.assign({}, eventProps));
-    }
-    register(props) {
-        if (!this.initiated)
-            this.init();
-        this.registerMix(props);
-        this.registerFB(props);
-    }
-    trigger(name) {
-        if (!this.initiated)
-            this.init();
-        this.triggerHj(name);
-    }
-    init() {
-        this.initiated = true;
-        this.register(Object.assign(Object.assign({ "WizardX Build Commit": process.env.REACT_APP_COMMIT || "Unkown build commit", Environement: Globals.appEnv, "Powered By": "WizardX" }, this.getXSource()), this.getXAbTests()));
-        this.trigger("wizardx");
-    }
-    getXSource() {
-        const xSource = cookie.get("X-Source");
-        return typeof xSource === "string" && xSource.trim().length > 0
-            ? {
-                "X-Source": xSource,
-            }
-            : {};
-    }
-    getXAbTests() {
-        const xAbTests = cookie.get("X-AbTests");
-        if (typeof xAbTests === "object") {
-            const xAbTestsFlattened = {};
-            Object.keys(xAbTests).forEach((abTestName) => {
-                xAbTestsFlattened[`X-AbTests[${abTestName}]`] = xAbTests[abTestName];
-            });
-            return xAbTestsFlattened;
-        }
-        return typeof xAbTests === "string" && xAbTests.trim().length > 0
-            ? {
-                "X-AbTests": xAbTests,
-            }
-            : {};
-    }
-    executeQueue() {
-        for (let i = 0; i < this.queue.length; i += 1) {
-            const currentEvent = this.queue[i];
-            const args = [];
-            const [fnName] = currentEvent;
-            if (currentEvent.length > 1) {
-                for (let x = 0; x < currentEvent[1].length; x += 1)
-                    args.push(currentEvent[1][x]);
-                args.push(true);
-                let fn;
-                switch (fnName) {
-                    case "trackMix":
-                        fn = this.trackMix.bind(this);
-                        break;
-                    case "trackFB":
-                        fn = this.trackFB.bind(this);
-                        break;
-                    case "trackGA":
-                        fn = this.trackGA.bind(this);
-                        break;
-                    case "registerMix":
-                        fn = this.registerMix.bind(this);
-                        break;
-                    case "registerFB":
-                        fn = this.registerFB.bind(this);
-                        break;
-                    case "triggerHj":
-                        fn = this.triggerHj.bind(this);
-                        break;
-                    default:
-                        throw new Error(`Unkown function "${fnName}" found on events tracking queue`);
-                }
-                const result = fn(...args);
-                if (result === true) {
-                    this.queue.splice(i, 1);
-                }
-            }
-        }
-    }
-    queueTimeout() {
-        if (this.queueTimer !== null)
-            clearTimeout(this.queueTimer);
-        this.queueTimer = setTimeout(() => {
-            this.executeQueue();
-        }, 50);
-    }
-    trackMix(eventName, eventProps, doNotPushToQueue = false) {
-        if (!this.initiated)
-            this.init();
-        if (typeof window.mixpanel !== "undefined") {
-            if (this.queue.length > 0 && !doNotPushToQueue)
-                this.executeQueue();
-            window.mixpanel.track(eventName, eventProps);
-            return true;
-        }
-        if (doNotPushToQueue === false)
-            this.queue.push(["trackMix", [eventName, eventProps]]);
-        this.queueTimeout();
-        return false;
-    }
-    trackFB(eventName, eventProps, doNotPushToQueue = false) {
-        if (typeof window.fbq !== "undefined") {
-            if (this.queue.length > 0 && !doNotPushToQueue)
-                this.executeQueue();
-            window.fbq("trackCustom", eventName, eventProps);
-            return true;
-        }
-        if (doNotPushToQueue === false)
-            this.queue.push(["trackFB", [eventName, eventProps]]);
-        this.queueTimeout();
-        return false;
-    }
-    trackGA(eventName, eventProps, doNotPushToQueue = false) {
-        if (typeof window.ga !== "undefined") {
-            if (this.queue.length > 0 && !doNotPushToQueue)
-                this.executeQueue();
-            window.ga("send", "event", "lpTracking", "track", eventName, 1, eventProps);
-            return true;
-        }
-        if (doNotPushToQueue === false)
-            this.queue.push(["trackGA", [eventName, eventProps]]);
-        this.queueTimeout();
-        return false;
-    }
-    registerMix(props, doNotPushToQueue = false) {
-        if (typeof window.mixpanel !== "undefined") {
-            if (this.queue.length > 0 && !doNotPushToQueue)
-                this.executeQueue();
-            window.mixpanel.register(props);
-            return true;
-        }
-        if (doNotPushToQueue === false)
-            this.queue.push(["registerMix", [props]]);
-        this.queueTimeout();
-        return false;
-    }
-    registerFB(props, doNotPushToQueue = false) {
-        if (typeof window.fbq !== "undefined") {
-            if (this.queue.length > 0 && !doNotPushToQueue)
-                this.executeQueue();
-            window.fbq("trackCustom", "GeneralProps", props);
-            return true;
-        }
-        if (doNotPushToQueue === false)
-            this.queue.push(["registerFB", [props]]);
-        this.queueTimeout();
-        return false;
-    }
-    triggerHj(name, doNotPushToQueue = false) {
-        if (typeof window.hj !== "undefined") {
-            if (this.queue.length > 0 && !doNotPushToQueue)
-                this.executeQueue();
-            window.hj("trigger", name);
-            return true;
-        }
-        if (doNotPushToQueue === false)
-            this.queue.push(["triggerHj", [name]]);
-        this.queueTimeout();
-        return false;
-    }
-}
-export const EventsTracking = new _EventsTracking();