@legalplace/wizardx-core 4.23.3 → 4.23.5

package/dist/componentsConnectors/connectVariable.js

@@ -1,6 +1,7 @@
 import { componentConnector } from "./connector/componentConnector";
 import { isStepAvailable } from "../redux/selectors/app";
-import { parseRawWithVariables, parseVariableLabel, } from "../helpers/outputsParsing";
+import { selectVariableParents } from "../redux/selectors/references";
+import { parseRawWithRelatedVariables, parseVariableLabel, } from "../helpers/outputsParsing";
 import { selectAutocompleteDataset, selectIsVariableDisabledByIndex, selectLinkedVariables, selectVariableDisabledTooltipByIndex, } from "../redux";
 export const canVariableDisplay = (id, index, selectors) => {
     const { selectVariableReference, isLevelAccessibleForUser } = selectors;
@@ -33,14 +34,15 @@ const stateToProps = (selectors) => (state, ownProps) => {
     }
     const mandatoryValidated = selectMandatoryVariableByIndex(id, index);
     const mandatoryIgnore = selectors.selectMandatoryIgnore();
+    const parentOptionId = selectVariableParents(id)[0];
     const validatorMessage = typeof ((_a = variable.validator) === null || _a === void 0 ? void 0 : _a.message) === "string"
-        ? parseRawWithVariables(variable.validator.message)
+        ? parseRawWithRelatedVariables(variable.validator.message, parentOptionId, index)
         : "";
     const helper = variable.helper
-        ? parseRawWithVariables(variable.helper, undefined, "________________")
+        ? parseRawWithRelatedVariables(variable.helper, parentOptionId, index, undefined, "________________")
         : undefined;
     const warning = variable.warning
-        ? parseRawWithVariables(variable.warning, undefined, "________________")
+        ? parseRawWithRelatedVariables(variable.warning, parentOptionId, index, undefined, "________________")
         : undefined;
     return {
         id,

package/dist/helpers/outputsParsing.d.ts

@@ -13,4 +13,6 @@ export declare type parseOptionLabelT = (id: number, index: number) => string;
 export declare const parseOptionLabel: parseOptionLabelT;
 export declare type parseRawT = (text: string, inputs?: OptionsVariablesType, placeholder?: string) => string;
 export declare const parseRawWithVariables: parseRawT;
+export declare type parseRawWithRelatedVariablesT = (text: string, optionId: number, index: number, inputs?: OptionsVariablesType, placeholder?: string) => string;
+export declare const parseRawWithRelatedVariables: parseRawWithRelatedVariablesT;
 export declare const parsePrefillerValue: (variableId: number, inputIndex: number, prefillerIndex: number) => string;

package/dist/helpers/outputsParsing.js

@@ -181,6 +181,46 @@ export const parseRawWithVariables = (text, inputs, placeholder) => {
     });
     return parsedText;
 };
+export const parseRawWithRelatedVariables = (text, optionId, index, inputs, placeholder = "") => {
+    const tagsMatch = text.match(/\[var:([0-9]+)\]/gi);
+    let variables = [];
+    if (tagsMatch !== null) {
+        const variablesTags = [...tagsMatch];
+        variables = variablesTags.map((current) => {
+            const outputVariableMatch = current.match(/([0-9]+)/);
+            if (outputVariableMatch === null)
+                return 0;
+            return parseInt(outputVariableMatch[0], 10);
+        });
+    }
+    variables = variables.filter((c, i) => variables.indexOf(c) === i);
+    const relatedVariables = {};
+    variables.forEach((variableId) => {
+        var _a;
+        let value;
+        if (inputs) {
+            value = (_a = inputs.variables[variableId]) === null || _a === void 0 ? void 0 : _a[0];
+        }
+        else {
+            const values = getRelatedVariablesValues(optionId, index, variables);
+            value = values[variableId];
+        }
+        if (value === undefined ||
+            value === null ||
+            (typeof value === "string" && value.trim().length === 0)) {
+            relatedVariables[variableId] = placeholder;
+        }
+        else {
+            relatedVariables[variableId] = value.toString();
+        }
+    });
+    let parsedText = `${text}`;
+    Object.keys(relatedVariables).forEach((variableId) => {
+        const value = relatedVariables[variableId];
+        parsedText = parsedText.replace(new RegExp(new RegExp(`\\[var:${variableId}\\]`, "gi"), "gi"), filterXSS(value));
+    });
+    return parsedText;
+};
 export const parsePrefillerValue = (variableId, inputIndex, prefillerIndex) => {
     var _a, _b, _c;
     const prefillerValue = (_c = (_b = (_a = selectVariableReference(variableId)) === null || _a === void 0 ? void 0 : _a.prefillings) === null || _b === void 0 ? void 0 : _b[prefillerIndex]) === null || _c === void 0 ? void 0 : _c.value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/wizardx-core",
-  "version": "4.23.3",
+  "version": "4.23.5",
   "author": "Moncef Hammou (moncef@legalplace.fr)",
   "license": "MIT",
   "files": [
@@ -54,11 +54,11 @@
     "xss": "^1.0.9"
   },
   "devDependencies": {
-    "@legalplace/data-gouv": "^1.5.35",
+    "@legalplace/data-gouv": "^1.5.36",
     "@legalplace/eslint-config": "^2.2.0",
     "@legalplace/models-v3-types": "^5.12.3",
     "@legalplace/prettier-config": "^2.1.3",
-    "@legalplace/typeorm-entities": "^5.35.2",
+    "@legalplace/typeorm-entities": "^5.36.0",
     "@swc-node/jest": "^1.3.2",
     "@swc/core": "^1.2.93",
     "@swc/jest": "^0.2.4",
@@ -96,5 +96,5 @@
     "*.test.ts",
     "*.test.tsx"
   ],
-  "gitHead": "0cceae76a18a7d91de41a0f041ebf83b83b77ec1"
+  "gitHead": "b6228c8694fb988b34e5e07721cf28130178f418"
 }