@legalplace/wizardx-core 2.1.0 → 2.3.0

package/CHANGELOG.md

@@ -3,6 +3,35 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.3.0](https://git.legalplace.eu/legalplace/monorepo/compare/@legalplace/wizardx-core@2.2.0...@legalplace/wizardx-core@2.3.0) (2021-11-10)
+
+
+### Features
+
+* tracking X-Source cookie api[#4377](https://git.legalplace.eu/legalplace/monorepo/issues/4377) ([0b52550](https://git.legalplace.eu/legalplace/monorepo/commits/0b52550632daa141ab241183a9cf2169e8d5fb08))
+
+
+
+
+
+# [2.2.0](https://git.legalplace.eu/legalplace/monorepo/compare/@legalplace/wizardx-core@2.1.0...@legalplace/wizardx-core@2.2.0) (2021-11-10)
+
+
+### Bug Fixes
+
+* fix config test api[#4377](https://git.legalplace.eu/legalplace/monorepo/issues/4377) ([8de0c2c](https://git.legalplace.eu/legalplace/monorepo/commits/8de0c2c8faadf18c082d372e0b9caf70d3b0d669))
+* fix styled-component issues api[#4377](https://git.legalplace.eu/legalplace/monorepo/issues/4377) ([d21227c](https://git.legalplace.eu/legalplace/monorepo/commits/d21227c278d545a6aba492b5e6b33062e31a52cd))
+* fix type errors api[#4377](https://git.legalplace.eu/legalplace/monorepo/issues/4377) ([c14a871](https://git.legalplace.eu/legalplace/monorepo/commits/c14a8717b53d023f89d09b329d2dff062b4890f0))
+
+
+### Features
+
+* upgrading wizardx-app to support wizard-params throught props and fixing notFoundUrl api[#4377](https://git.legalplace.eu/legalplace/monorepo/issues/4377) ([72709a3](https://git.legalplace.eu/legalplace/monorepo/commits/72709a374e5037ed5eb743679159459e3b7d5483))
+
+
+
+
+
 # [2.1.0](https://git.legalplace.eu/legalplace/monorepo/compare/@legalplace/wizardx-core@2.0.0...@legalplace/wizardx-core@2.1.0) (2021-11-04)
 
 

package/dist/App.js

@@ -73,7 +73,7 @@ class WizardXCore extends React.Component {
                     React.createElement(Route, { path: "/p/:path", component: PluginRoute }),
                     React.createElement(Route, { path: getConfig().router.wizardInstancePath, component: ViewComponent }),
                     React.createElement(Route, { path: getConfig().router.wizardPath, component: ViewComponent }),
-                    React.createElement(Route, { path: getConfig().router.smartscriptRoute ||
+                    React.createElement(Route, { path: getConfig().router.smartscriptPath ||
                             '/contrats/:permalink/smartscript/:uniqid?', component: SmartScriptComponent }),
                     React.createElement(Redirect, { to: {
                             pathname: getConfig().router.notFoundPath,

package/dist/config.test.js

@@ -16,12 +16,12 @@ describe('Config loader', () => {
             router: {
                 wizardPath: '/contrats/:prefix?/:permalink/creer/:page?',
                 wizardInstancePath: '/contrats/:prefix?/:permalink/continuer/:uniqid([0-9a-zA-Z]+)/:page?',
-                notFoundUrl: '/contrats/conditions-generales-de-vente/creer',
+                notFoundPath: '/contrats/conditions-generales-de-vente/creer',
                 appStatesPages: {
                     termsheet: 'resume',
                     email: 'email',
                 },
-                smartscriptRoute: '/contrats/:permalink/smartscript/:uniqid?',
+                smartscriptPath: '/contrats/:permalink/smartscript/:uniqid?',
             },
             plugins: {
                 b2c_actions: '1.0.0',

package/dist/libs/EventsTracking.d.ts

@@ -7,6 +7,7 @@ declare class _EventsTracking {
     register(props: EventsPropsType): void;
     trigger(name: string): void;
     private init;
+    private getXSource;
     private executeQueue;
     private queueTimeout;
     trackMix(eventName: string, eventProps?: EventsPropsType, doNotPushToQueue?: boolean): boolean;

package/dist/libs/EventsTracking.js

@@ -1,4 +1,6 @@
+import Cookies from 'universal-cookie';
 import Globals from '../Globals';
+const cookie = new Cookies();
 class _EventsTracking {
     constructor() {
         this.initiated = false;
@@ -26,13 +28,17 @@ class _EventsTracking {
     }
     init() {
         this.initiated = true;
-        this.register({
-            'WizardX Build Commit': process.env.REACT_APP_COMMIT || 'Unkown build commit',
-            Environement: Globals.env,
-            'Powered By': 'WizardX',
-        });
+        this.register(Object.assign({ 'WizardX Build Commit': process.env.REACT_APP_COMMIT || 'Unkown build commit', Environement: Globals.env, 'Powered By': 'WizardX' }, this.getXSource()));
         this.trigger('wizardx');
     }
+    getXSource() {
+        const xSource = cookie.get('X-Source');
+        return typeof xSource === 'string' && xSource.trim().length > 0
+            ? {
+                'X-Source': xSource,
+            }
+            : {};
+    }
     executeQueue() {
         for (let i = 0; i < this.queue.length; i += 1) {
             const currentEvent = this.queue[i];

package/dist/redux/middlewares/smartscriptMiddleware.js

@@ -14,8 +14,8 @@ const watchEnableSmartScript = (mpi, next, action) => {
     const { permalink, prefix } = mpi.getState().app.meta;
     const { uniqid } = mpi.getState().app.instance;
     const { modelVersion } = new PathReader(mpi.getState());
-    if (getConfig().router.smartscriptRoute) {
-        const path = generatePath(getConfig().router.smartscriptRoute, {
+    if (getConfig().router.smartscriptPath) {
+        const path = generatePath(getConfig().router.smartscriptPath, {
             permalink,
             prefix: prefix.trim().length > 0 ? prefix : undefined,
             uniqid: uniqid.trim().length > 0 ? uniqid : undefined,

package/dist/types/config.type.d.ts

@@ -32,10 +32,9 @@ export interface IWizardParams {
     fixedConfig?: boolean;
     router: {
         wizardPath: string;
-        smartscriptRoute: string;
         wizardInstancePath: string;
-        notFoundUrl: string;
-        notFoundPath?: string;
+        notFoundPath: string;
+        smartscriptPath: string;
         appStatesPages?: Record<string, string>;
     };
     plugins: Record<string, string>;

package/dist/wizard-params.js

@@ -4,12 +4,12 @@ const config = {
     router: {
         wizardPath: '/contrats/:prefix?/:permalink/creer/:page?',
         wizardInstancePath: '/contrats/:prefix?/:permalink/continuer/:uniqid([0-9a-zA-Z]+)/:page?',
-        notFoundUrl: '/contrats/conditions-generales-de-vente/creer',
+        notFoundPath: '/contrats/conditions-generales-de-vente/creer',
         appStatesPages: {
             termsheet: 'resume',
             email: 'email',
         },
-        smartscriptRoute: '/contrats/:permalink/smartscript/:uniqid?',
+        smartscriptPath: '/contrats/:permalink/smartscript/:uniqid?',
     },
     plugins: {
         b2c_actions: '1.0.0',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/wizardx-core",
-  "version": "2.1.0",
+  "version": "2.3.0",
   "author": "Moncef Hammou (moncef@legalplace.fr)",
   "license": "MIT",
   "main": "dist/index.js",
@@ -15,11 +15,11 @@
     "precommit": "test && lint:fix"
   },
   "dependencies": {
-    "@legalplace/lp-events": "^1.8.0",
+    "@legalplace/lp-events": "1.9.0",
     "@legalplace/lplogic": "^2.1.6",
     "@legalplace/model-healthcheck": "^1.1.5",
     "@legalplace/referencesparser": "^1.7.0",
-    "@legalplace/storybook": "1.113.2",
+    "@legalplace/storybook": "1.122.2",
     "@loadable/component": "^5.15.0",
     "@redux-saga/core": "^1.1.3",
     "awesome-phonenumber": "^2.62.1",
@@ -46,9 +46,9 @@
     "xss": "^1.0.9"
   },
   "devDependencies": {
-    "@legalplace/eslint-config": "^2.0.1",
+    "@legalplace/eslint-config": "^2.0.2",
     "@legalplace/models-v3-types": "^3.6.0",
-    "@legalplace/prettier-config": "^2.0.1",
+    "@legalplace/prettier-config": "^2.0.2",
     "@swc-node/jest": "^1.3.2",
     "@swc/core": "^1.2.93",
     "@swc/jest": "^0.2.4",
@@ -84,5 +84,5 @@
     "*.test.ts",
     "*.test.tsx"
   ],
-  "gitHead": "15f7a2a1b1b7bcbded4da4e19988b1662e5eb757"
+  "gitHead": "199c9832aa50d42e719c5008c0206a57dd57c8c4"
 }

package/src/App.tsx

@@ -134,7 +134,7 @@ class WizardXCore extends React.Component<AppProps, { loaded: boolean }> {
             {/* SmartScript Frame */}
             <Route
               path={
-                getConfig().router.smartscriptRoute ||
+                getConfig().router.smartscriptPath ||
                 '/contrats/:permalink/smartscript/:uniqid?'
               }
               component={SmartScriptComponent}

package/src/config.test.ts

@@ -14,12 +14,12 @@ describe('Config loader', () => {
         wizardPath: '/contrats/:prefix?/:permalink/creer/:page?',
         wizardInstancePath:
           '/contrats/:prefix?/:permalink/continuer/:uniqid([0-9a-zA-Z]+)/:page?',
-        notFoundUrl: '/contrats/conditions-generales-de-vente/creer',
+        notFoundPath: '/contrats/conditions-generales-de-vente/creer',
         appStatesPages: {
           termsheet: 'resume',
           email: 'email',
         },
-        smartscriptRoute: '/contrats/:permalink/smartscript/:uniqid?',
+        smartscriptPath: '/contrats/:permalink/smartscript/:uniqid?',
       },
 
       // Enabled plugins (this should move to the apiEndpoint first response)

package/src/libs/EventsTracking.ts

@@ -1,3 +1,4 @@
+import Cookies from 'universal-cookie';
 import Globals from '../Globals';
 
 export type EventsPropsType = Record<
@@ -5,6 +6,8 @@ export type EventsPropsType = Record<
   string | number | boolean | Record<string, string | number | boolean>
 >;
 
+const cookie = new Cookies();
+
 class _EventsTracking {
   private initiated = false;
 
@@ -52,10 +55,21 @@ class _EventsTracking {
         process.env.REACT_APP_COMMIT || 'Unkown build commit',
       Environement: Globals.env,
       'Powered By': 'WizardX',
+      ...this.getXSource(),
     });
     this.trigger('wizardx');
   }
 
+  private getXSource(): Record<string, string> {
+    const xSource = cookie.get('X-Source');
+
+    return typeof xSource === 'string' && xSource.trim().length > 0
+      ? {
+          'X-Source': xSource,
+        }
+      : {};
+  }
+
   /**
    * Executes events tracking queue
    */

package/src/redux/middlewares/smartscriptMiddleware.ts

@@ -34,9 +34,9 @@ const watchEnableSmartScript = (
   const { uniqid } = mpi.getState().app.instance;
   const { modelVersion } = new PathReader(mpi.getState());
 
-  if (getConfig().router.smartscriptRoute) {
+  if (getConfig().router.smartscriptPath) {
     // Generating path
-    const path = generatePath(getConfig().router.smartscriptRoute, {
+    const path = generatePath(getConfig().router.smartscriptPath, {
       permalink,
       prefix: prefix.trim().length > 0 ? prefix : undefined,
       uniqid: uniqid.trim().length > 0 ? uniqid : undefined,

package/src/types/config.type.ts

@@ -35,10 +35,9 @@ export interface IWizardParams {
   fixedConfig?: boolean;
   router: {
     wizardPath: string;
-    smartscriptRoute: string;
     wizardInstancePath: string;
-    notFoundUrl: string;
-    notFoundPath?: string;
+    notFoundPath: string;
+    smartscriptPath: string;
     appStatesPages?: Record<string, string>;
   };
   plugins: Record<string, string>;

package/src/wizard-params.ts

@@ -11,12 +11,12 @@ const config: IWizardParams = {
     wizardPath: '/contrats/:prefix?/:permalink/creer/:page?',
     wizardInstancePath:
       '/contrats/:prefix?/:permalink/continuer/:uniqid([0-9a-zA-Z]+)/:page?',
-    notFoundUrl: '/contrats/conditions-generales-de-vente/creer',
+    notFoundPath: '/contrats/conditions-generales-de-vente/creer',
     appStatesPages: {
       termsheet: 'resume',
       email: 'email',
     },
-    smartscriptRoute: '/contrats/:permalink/smartscript/:uniqid?',
+    smartscriptPath: '/contrats/:permalink/smartscript/:uniqid?',
   },
 
   // Enabled plugins (this should move to the apiEndpoint first response)