@legalplace/wizardx-core 2.3.0 → 2.4.0

package/src/helpers/scriptsLoader.ts

@@ -0,0 +1,20 @@
+export const loadScripts = () => {
+  if (Array.isArray(window.wizardxLoadAfterLcp)) {
+    setTimeout(
+      () =>
+        window.wizardxLoadAfterLcp.forEach(async (script) => {
+          if (typeof script === "function") {
+            (async () => script())();
+          } else if (
+            typeof script === "object" &&
+            Object.keys(script).length === 1 &&
+            typeof script.src === "string"
+          ) {
+            const element = document.createElement("script");
+            element.src = script.src;
+          }
+        }),
+      1000
+    );
+  }
+};

package/src/helpers/sendinblueHelper.ts

@@ -1,41 +1,47 @@
-import PhoneNumber from 'awesome-phonenumber';
-import Extracts from '../libs/Extracts';
-import { pardotAttributes } from '../service/pardot.service';
+import { FRENCH_OVERSEAS_NUMBERS_REGEX } from "../constants/phoneValidation";
+import Extracts from "../libs/Extracts";
+import { pardotAttributes } from "../service/pardot.service";
 
-const formatMobilePhone = (phoneNumber: string): string => {
-  const sanitizedNumber = new PhoneNumber(phoneNumber, 'FR');
+const formatMobilePhone = async (number: string): Promise<string> => {
+  const phoneNumber = new (await (
+    await import("awesome-phonenumber")
+  ).default)(number, "FR");
+  const sanitizedNumber = phoneNumber.getNumber();
 
-  return !sanitizedNumber?.getNumber()?.length || !sanitizedNumber.isMobile()
-    ? ''
-    : sanitizedNumber.getNumber();
+  return !sanitizedNumber?.length ||
+    (!phoneNumber.isValid() &&
+      // Overseas number aren't considerate as valid mobile number by the core library whereas it should
+      !FRENCH_OVERSEAS_NUMBERS_REGEX.test(sanitizedNumber))
+    ? ""
+    : sanitizedNumber;
 };
 
-export const getSIBExtract = () => {
+export const getSIBExtract = async () => {
   let sibExtract;
   try {
     Extracts.extractData();
     sibExtract = Extracts.getSibExtractedData();
     if (sibExtract.TEL) {
       try {
-        sibExtract.SMS = formatMobilePhone(sibExtract.TEL);
+        sibExtract.SMS = await formatMobilePhone(sibExtract.TEL);
       } catch (error) {
         // the lib we use to format phone can throw exception
       }
     }
   } catch (error) {
     // eslint-disable-next-line no-console
-    console.error('Error while extracting sendiblue data', error);
+    console.error("Error while extracting sendiblue data", error);
   }
   return sibExtract;
 };
 
-export const getSendinblueIdentifyAttributes = (
+export const getSendinblueIdentifyAttributes = async (
   uniqid: string,
   documentTitle: string,
   nbFilledVars: number,
   VALIDATION_Q2 = false,
-  domain = 'www.legalplace.fr'
-): Record<string, string | number | undefined | boolean | null> => {
+  domain = "www.legalplace.fr"
+): Promise<Record<string, string | number | undefined | boolean | null>> => {
   // Identifying client into Sendinblue
   const sendinblueVars: {
     [k: string]: string | undefined | boolean | number | null;
@@ -46,13 +52,13 @@ export const getSendinblueIdentifyAttributes = (
     TELECHARGEMENT: `${domain}/rt/${uniqid}`,
     DOCUMENT: documentTitle,
     WIZZARD_FILLED_FIELDS: nbFilledVars,
-    ...getSIBExtract(),
+    ...(await getSIBExtract()),
     ...pardotAttributes(),
     VALIDATION_Q2,
   };
 
-  if (localStorage && localStorage.getItem('entranceUrl')) {
-    sendinblueVars.URL_ENTREE = localStorage.getItem('entranceUrl');
+  if (localStorage && localStorage.getItem("entranceUrl")) {
+    sendinblueVars.URL_ENTREE = localStorage.getItem("entranceUrl");
   }
 
   return sendinblueVars;

package/src/hooks/usePrevious.ts

@@ -1,4 +1,4 @@
-import { useRef, useEffect } from 'react';
+import { useRef, useEffect } from "react";
 
 export const usePrevious = <T>(value: T): T | undefined => {
   const ref = useRef<T>();

package/src/libs/ConditionsInitiator.ts

@@ -1,4 +1,4 @@
-import { StateType } from '../types/State.type';
+import { StateType } from "../types/State.type";
 
 export class ConditionsInitiator {
   private conditions: StateType.Conditions = {
@@ -44,7 +44,7 @@ export class ConditionsInitiator {
     const rootParent = parents[parents.length - 1] || optionId;
     const rootReference = this.references.options[rootParent];
     const occurenciesOptionId =
-      rootReference.meta.type === 'repeated' &&
+      rootReference.meta.type === "repeated" &&
       rootReference.meta.repeatOption !== undefined
         ? rootReference.meta.repeatOption
         : rootParent;
@@ -62,7 +62,7 @@ export class ConditionsInitiator {
     const rootParent = parents[parents.length - 1];
     const rootReference = this.references.options[rootParent];
     const occurenciesOptionId =
-      rootReference.meta.type === 'repeated' &&
+      rootReference.meta.type === "repeated" &&
       rootReference.meta.repeatOption !== undefined
         ? rootReference.meta.repeatOption
         : rootParent;

package/src/libs/ConditionsRunner/DataPopulator.ts

@@ -3,16 +3,16 @@ import {
   selectVariableParents,
   selectOptionRelations,
   selectOptionParents,
-} from '../../redux/selectors/references';
+} from "../../redux/selectors/references";
 import {
   selectVariableInput,
   selectOptionInput,
-} from '../../redux/selectors/inputs';
+} from "../../redux/selectors/inputs";
 import {
   selectVariableConditionValue,
   selectOptionConditionValue,
   selectSectionConditionValue,
-} from '../../redux/selectors/conditions';
+} from "../../redux/selectors/conditions";
 
 class DataPopulator {
   private id?: number;
@@ -140,10 +140,10 @@ class DataPopulator {
       let values = this.getVariableValues(variableId);
 
       // If variable is of type number
-      if (variableReference.type === 'number') {
+      if (variableReference.type === "number") {
         values = values
-          .map((v) => (typeof v === 'number' ? v : parseFloat(v)))
-          .map((v) => (Number.isNaN(v) ? '' : v));
+          .map((v) => (typeof v === "number" ? v : parseFloat(v)))
+          .map((v) => (Number.isNaN(v) ? "" : v));
       }
 
       // Adding variables
@@ -192,7 +192,7 @@ class DataPopulator {
   private cleanArrayFromNullValues(
     arr: (string | number | null)[]
   ): (string | number)[] {
-    return arr.map((v) => (v === null ? '' : v));
+    return arr.map((v) => (v === null ? "" : v));
   }
 
   /**

package/src/libs/ConditionsRunner.ts

@@ -1,7 +1,7 @@
 /* eslint-disable max-len */
-import { Dispatch } from 'redux';
-import LpLogic from '@legalplace/lplogic/dist/LpLogic';
-import { selectOptionInput } from '../redux/selectors/inputs';
+import { Dispatch } from "redux";
+import LpLogic from "@legalplace/lplogic/dist/LpLogic";
+import { selectOptionInput } from "../redux/selectors/inputs";
 import {
   selectOptionRelations,
   selectVariableRelations,
@@ -16,7 +16,7 @@ import {
   selectDocumentConditionsObject,
   selectOptionReference,
   selectSectionRelations,
-} from '../redux/selectors/references';
+} from "../redux/selectors/references";
 import {
   updateOptionConditionsAction,
   updateVariableConditionsAction,
@@ -25,7 +25,7 @@ import {
   updateOptionValidatorConditionsAction,
   updateVariableValidatorConditionsAction,
   updateDocumentConditionsAction,
-} from '../redux/actions/conditions';
+} from "../redux/actions/conditions";
 import {
   selectOptionConditionValue,
   selectVariableConditionValue,
@@ -34,9 +34,9 @@ import {
   selectOptionValidatorConditionValue,
   selectVariableValidatorConditionValue,
   selectDocumentConditionValue,
-} from '../redux/selectors/conditions';
-import { StateType, MAPPED_CONDITIONS } from '../types/State.type';
-import DataPopulator from './ConditionsRunner/DataPopulator';
+} from "../redux/selectors/conditions";
+import { StateType, MAPPED_CONDITIONS } from "../types/State.type";
+import DataPopulator from "./ConditionsRunner/DataPopulator";
 
 // eslint-disable-next-line max-len
 export type AllConditions =
@@ -189,13 +189,13 @@ export class ConditionsRunner {
     if (optionParents.length > 0) {
       const parentReference = selectOptionReference(optionParents[0]);
       if (
-        parentReference.meta.type === 'repeated' &&
+        parentReference.meta.type === "repeated" &&
         parentReference.meta.repeatOption !== undefined
       ) {
         inputId = parentReference.meta.repeatOption;
       }
     } else if (
-      optionReference.meta.type === 'repeated' &&
+      optionReference.meta.type === "repeated" &&
       optionReference.meta.repeatOption !== undefined
     ) {
       inputId = optionReference.meta.repeatOption;
@@ -218,7 +218,7 @@ export class ConditionsRunner {
     if (optionParents.length > 0) {
       const parentReference = selectOptionReference(optionParents[0]);
       if (
-        parentReference.meta.type === 'repeated' &&
+        parentReference.meta.type === "repeated" &&
         parentReference.meta.repeatOption !== undefined
       ) {
         inputId = parentReference.meta.repeatOption;
@@ -231,7 +231,7 @@ export class ConditionsRunner {
   }
 
   executeHooks(
-    type: 'variables' | 'options' | 'sections',
+    type: "variables" | "options" | "sections",
     id: number,
     index: number
   ) {
@@ -240,13 +240,13 @@ export class ConditionsRunner {
       | StateType.References.Relations.Variables
       | StateType.References.Relations.Sections;
     switch (type) {
-      case 'options':
+      case "options":
         hooks = selectOptionRelations(id);
         break;
-      case 'variables':
+      case "variables":
         hooks = selectVariableRelations(id);
         break;
-      case 'sections':
+      case "sections":
         hooks = selectSectionRelations(id);
         break;
       default:
@@ -254,35 +254,35 @@ export class ConditionsRunner {
     }
 
     type SubTypeTypes =
-      | 'options'
-      | 'variables'
-      | 'sections'
-      | 'prefillers'
-      | 'optionValidator'
-      | 'variableValidator'
-      | 'documents';
+      | "options"
+      | "variables"
+      | "sections"
+      | "prefillers"
+      | "optionValidator"
+      | "variableValidator"
+      | "documents";
 
     const subTypesList: SubTypeTypes[] = [
-      'options',
-      'variables',
-      'sections',
-      'prefillers',
-      'optionValidator',
-      'variableValidator',
-      'documents',
+      "options",
+      "variables",
+      "sections",
+      "prefillers",
+      "optionValidator",
+      "variableValidator",
+      "documents",
     ];
 
     subTypesList.forEach((subType) => {
-      if (subType === 'sections') {
+      if (subType === "sections") {
         return this.executeSectionsHooks(hooks, index);
       }
       let currentHooks: any[];
 
       // Validators hooks
-      if (subType === 'optionValidator' || subType === 'variableValidator') {
+      if (subType === "optionValidator" || subType === "variableValidator") {
         currentHooks =
           hooks.validators[
-            subType === 'optionValidator' ? 'options' : 'variables'
+            subType === "optionValidator" ? "options" : "variables"
           ];
       } else {
         currentHooks = hooks[subType];
@@ -290,23 +290,23 @@ export class ConditionsRunner {
 
       // Executing hooks conditions
       currentHooks.forEach((currentId: number) => {
-        const execId = subType === 'documents' ? 0 : currentId;
-        const updateId = subType === 'documents' ? currentId : currentId;
+        const execId = subType === "documents" ? 0 : currentId;
+        const updateId = subType === "documents" ? currentId : currentId;
 
         // Update indexes
         let execIndexes: number[] = [];
 
         if (
-          ['options', 'optionValidator'].includes(subType) &&
-          typeof updateId === 'number'
+          ["options", "optionValidator"].includes(subType) &&
+          typeof updateId === "number"
         ) {
           if (
-            type === 'options' &&
+            type === "options" &&
             this.isOptionRelatedToOption(updateId, id)
           ) {
             execIndexes = [index];
           } else if (
-            type === 'variables' &&
+            type === "variables" &&
             this.isVariableRelatedToOption(id, updateId)
           ) {
             execIndexes = [index];
@@ -314,16 +314,16 @@ export class ConditionsRunner {
             execIndexes = this.getInputsForOption(updateId);
           }
         } else if (
-          ['variables', 'prefillers', 'variableValidator'].includes(subType) &&
-          typeof updateId === 'number'
+          ["variables", "prefillers", "variableValidator"].includes(subType) &&
+          typeof updateId === "number"
         ) {
           if (
-            type === 'options' &&
+            type === "options" &&
             this.isVariableRelatedToOption(updateId, id)
           ) {
             execIndexes = [index];
           } else if (
-            type === 'variables' &&
+            type === "variables" &&
             this.isVariableRelatedToVariable(id, updateId)
           ) {
             execIndexes = [index];
@@ -381,7 +381,7 @@ export class ConditionsRunner {
           condition,
           parseInt(currentId, 10),
           index,
-          'sections'
+          "sections"
         );
 
         // Current condition
@@ -416,8 +416,8 @@ export class ConditionsRunner {
     // Returning true of condition is empty
     if (
       !(
-        typeof condition === 'object' &&
-        typeof condition.conditions === 'object' &&
+        typeof condition === "object" &&
+        typeof condition.conditions === "object" &&
         Object.keys(condition.conditions).length > 0
       )
     )
@@ -425,12 +425,12 @@ export class ConditionsRunner {
 
     // Populating Data
     let currentData;
-    if (conditionType === 'options' || conditionType === 'optionValidator') {
+    if (conditionType === "options" || conditionType === "optionValidator") {
       currentData = new DataPopulator(condition.dataMap, id, index).getData();
     } else if (
-      conditionType === 'variables' ||
-      conditionType === 'prefillers' ||
-      conditionType === 'variableValidator'
+      conditionType === "variables" ||
+      conditionType === "prefillers" ||
+      conditionType === "variableValidator"
     ) {
       const dataId = selectVariableParents(id)[0];
       currentData = new DataPopulator(
@@ -439,9 +439,9 @@ export class ConditionsRunner {
         index
       ).getData();
     } else if (
-      conditionType === 'sections' ||
-      conditionType === 'documents' ||
-      conditionType === 'raw'
+      conditionType === "sections" ||
+      conditionType === "documents" ||
+      conditionType === "raw"
     ) {
       currentData = new DataPopulator(condition.dataMap).getData();
     }
@@ -449,6 +449,6 @@ export class ConditionsRunner {
   }
 
   executeRawCondition(condition: MAPPED_CONDITIONS | MAPPED_CONDITIONS[]) {
-    return this.executeCondition(condition, 0, 0, 'raw');
+    return this.executeCondition(condition, 0, 0, "raw");
   }
 }

package/src/libs/DocumentsOutputs.ts

@@ -2,16 +2,16 @@ import type {
   SectionV3,
   OptionV3,
   VariableV3,
-} from '@legalplace/models-v3-types';
+} from "@legalplace/models-v3-types";
 import type {
   ReferencesSingleOutputType,
   ReferencesSectionsDocumentType,
-} from '@legalplace/referencesparser/dist/libs/References.type';
-import { NumAuto } from './NumAuto';
+} from "@legalplace/referencesparser/dist/libs/References.type";
+import { NumAuto } from "./NumAuto";
 import {
   getRelatedVariablesValues,
   parseOutputWithVariables,
-} from '../helpers/outputsParsing';
+} from "../helpers/outputsParsing";
 
 export interface GettersType {
   // References
@@ -82,10 +82,10 @@ export class DocumentsOutputs {
 
   private parseOption(id: number): void {
     const option = this.getters.optionReference(id);
-    if (!['hidden', 'repeated'].includes(option.meta.type)) return;
+    if (!["hidden", "repeated"].includes(option.meta.type)) return;
 
     // If it's a repeated
-    if (option.meta.type === 'repeated') this.parseRepeated(option);
+    if (option.meta.type === "repeated") this.parseRepeated(option);
     else this.parseHidden(option);
   }
 
@@ -150,7 +150,7 @@ export class DocumentsOutputs {
         const [type, catalog, tag] = currentAn;
 
         const currentNum =
-          type === 'numauto-pre'
+          type === "numauto-pre"
             ? NumAuto.getNumPre(catalog, index, siblingsCount)
             : NumAuto.getNum(catalog, tag);
 

package/src/libs/Eval/EvalBase.ts

@@ -1,12 +1,12 @@
 import {
   selectVariableInputByIndex,
   selectVariableInput,
-} from '../../redux/selectors/inputs';
+} from "../../redux/selectors/inputs";
 import {
   areVariablesSiblings,
   selectVariableReference,
-} from '../../redux/selectors/references';
-import { selectIsVariableDisplayed } from '../../redux/selectors/conditions';
+} from "../../redux/selectors/references";
+import { selectIsVariableDisplayed } from "../../redux/selectors/conditions";
 
 export class EvalBase {
   index: number;
@@ -33,11 +33,11 @@ export class EvalBase {
 
   getVariableValue(varRef: string | number, full = false) {
     let variableId: number;
-    if (typeof varRef === 'number' || varRef.match(/^([0-9]+)$/))
-      variableId = typeof varRef === 'number' ? varRef : parseInt(varRef, 10);
+    if (typeof varRef === "number" || varRef.match(/^([0-9]+)$/))
+      variableId = typeof varRef === "number" ? varRef : parseInt(varRef, 10);
     else {
       const matchId = varRef.match(/([0-9]+)/);
-      if (matchId === null) return full === true ? [''] : '';
+      if (matchId === null) return full === true ? [""] : "";
 
       variableId = parseInt(matchId[0], 10);
     }
@@ -47,7 +47,7 @@ export class EvalBase {
     let value;
     if (full === false) {
       value = selectVariableInputByIndex(variableId, index);
-      if (selectIsVariableDisplayed(variableId, index) === false) return '';
+      if (selectIsVariableDisplayed(variableId, index) === false) return "";
       return this.parseNumber(value);
     }
 
@@ -56,46 +56,46 @@ export class EvalBase {
     value = value.map((v, i) =>
       selectIsVariableDisplayed(variableId, i) === true
         ? this.parseNumber(v)
-        : ''
+        : ""
     );
     return value;
   }
 
   parseNumber(value: string | number) {
-    if (typeof value === 'number') return value;
+    if (typeof value === "number") return value;
 
     // If it's a display evaluation (D=) we keep values starting by 0 as strings
-    if (this.isDisplay && typeof value === 'string' && /^0/.test(value.trim()))
+    if (this.isDisplay && typeof value === "string" && /^0/.test(value.trim()))
       return value;
 
     // Otherwise we convert values to float numbers and make
     // sure to replace commas by dots
     if (/^([0-9,.]+)$/.test(value.trim()))
-      return parseFloat(value.replace(',', '.').trim());
+      return parseFloat(value.replace(",", ".").trim());
     return value;
   }
 
   setEmpty(value: string | number, replacer: string | number) {
-    return typeof value === 'string'
+    return typeof value === "string"
       ? value.replace(
           /___EMPTY___/g,
-          typeof replacer === 'string' ? replacer : replacer.toString()
+          typeof replacer === "string" ? replacer : replacer.toString()
         )
       : value;
   }
 
   setCommas(value: string | number) {
-    const stringValue = typeof value === 'number' ? value.toString() : value;
+    const stringValue = typeof value === "number" ? value.toString() : value;
 
     return /^([0-9,.]+)$/.test(stringValue.trim())
-      ? stringValue.replace('.', ',').trim()
+      ? stringValue.replace(".", ",").trim()
       : value;
   }
 
   isVariableEditable(varRef: string | number) {
     let variableId: number;
-    if (typeof varRef === 'number' || varRef.match(/^([0-9]+)$/))
-      variableId = typeof varRef === 'number' ? varRef : parseInt(varRef, 10);
+    if (typeof varRef === "number" || varRef.match(/^([0-9]+)$/))
+      variableId = typeof varRef === "number" ? varRef : parseInt(varRef, 10);
     else {
       const matchId = varRef.match(/([0-9]+)/);
       if (matchId === null) return false;