@legalplace/wizardx-core 4.12.0 → 4.13.0

package/dist/componentsConnectors/connectBox.js

@@ -1,18 +1,15 @@
 import { componentConnector } from "./connector/componentConnector";
 import { getRelatedVariablesValues, parseContentWithVariables, } from "../helpers/outputsParsing";
-import HtmlSanitizer from "../service/htmlSanitizer";
 const stateToProps = (selectors) => (state, ownProps) => {
     const { id, index } = ownProps;
     const option = selectors.selectOptionReference(id);
     const boxReference = selectors.selectBoxReference(id);
     const variables = getRelatedVariablesValues(id, index, boxReference.variables);
-    const htmlSanitizer = new HtmlSanitizer();
     const condition = selectors.selectOptionConditionValue(id, index);
     let content = condition === false
         ? ""
         : parseContentWithVariables(boxReference.raw, id, index, variables);
     content = content.replace(/&lt;/g, "<").replace(/&gt;/g, ">");
-    content = htmlSanitizer.sanitize(content);
     const { options, meta } = option;
     const { tags, type, box } = meta;
     return {

package/dist/helpers/outputsParsing.js

@@ -1,6 +1,6 @@
-import { filterXSS } from "xss";
 import { selectVariableParents, selectOptionRelations, selectVariableReference, selectOptionReference, selectVariableRelations, areVariablesSiblings, } from "../redux/selectors/references";
 import { selectVariableInput, selectVariableInputByIndex, } from "../redux/selectors/inputs";
+import HtmlSanitizer from "../service/htmlSanitizer";
 const frenchNumber = (value) => {
     let result = typeof value === "number" ? value.toString() : value;
     if (/^([0-9]+)\.([0-9]+)$/.test(result.trim()))
@@ -42,17 +42,14 @@ export const parseContentWithVariables = (content, id, index, variables) => {
     if (Object.prototype.hasOwnProperty.call(contentParsingCache, cacheKey)) {
         return contentParsingCache[cacheKey];
     }
+    const htmlSanitizer = new HtmlSanitizer();
     let parsedContent = `${content}`;
     Object.keys(variables).forEach((variableId) => {
         let value = variables[variableId].toString();
         if (value.trim().length === 0) {
             value = new Array(16).join("_");
         }
-        parsedContent = parsedContent.replace(new RegExp(`\\[var:${variableId}\\]`, "gi"), filterXSS(value, {
-            whiteList: {
-                a: [],
-            },
-        }));
+        parsedContent = parsedContent.replace(new RegExp(`\\[var:${variableId}\\]`, "gi"), htmlSanitizer.sanitize(value));
     });
     contentParsingCache[cacheKey] = parsedContent;
     return contentParsingCache[cacheKey];

package/dist/helpers/trimInputs.d.ts

@@ -0,0 +1,2 @@
+import type { StateType } from "../types/State.type";
+export declare const trimInputs: (inputs: StateType.Inputs) => StateType.Inputs;

package/dist/helpers/trimInputs.js

@@ -0,0 +1,7 @@
+export const trimInputs = (inputs) => {
+    const trimmedVariables = Object.keys(inputs.variables).reduce((acc, key) => {
+        acc[key] = inputs.variables[key].map((value) => typeof value === "string" ? value.trim() : value);
+        return acc;
+    }, {});
+    return Object.assign(Object.assign({}, inputs), { variables: trimmedVariables });
+};

package/dist/redux/sagas/saveData.js

@@ -7,6 +7,7 @@ import { selectInputs } from "../selectors/inputs";
 import { OvcConverter } from "../../libs/OvcConverter";
 import { updateInstanceArguments } from "../../service/api.manager";
 import { cancelOnResetState } from "../../helpers/sagaCancelOnResetState";
+import { trimInputs } from "../../helpers/trimInputs";
 function* saveDataDecorator(action) {
     try {
         yield put(setDataStatus("saving"));
@@ -14,7 +15,7 @@ function* saveDataDecorator(action) {
         const uniqid = selectInstanceUniqid();
         if (uniqid === undefined)
             throw new Error("Cannot save data, uniqid is not defined");
-        const response = yield call(fetch, ...updateInstanceArguments(permalink, uniqid, OvcConverter.convertToOvc(selectInputs()), action.confirmAnswer ? 0 : 1, action.additionalProperties));
+        const response = yield call(fetch, ...updateInstanceArguments(permalink, uniqid, OvcConverter.convertToOvc(trimInputs(selectInputs())), action.confirmAnswer ? 0 : 1, action.additionalProperties));
         const responseData = yield call([response, "json"]);
         if (action.redirect === true) {
             const searchParams = new URLSearchParams(window.location.search);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/wizardx-core",
-  "version": "4.12.0",
+  "version": "4.13.0",
   "author": "Moncef Hammou (moncef@legalplace.fr)",
   "license": "MIT",
   "files": [
@@ -26,7 +26,7 @@
     "@legalplace/model-healthcheck": "^1.1.5",
     "@legalplace/referencesparser": "^3.1.16",
     "@legalplace/storybook": "^2.171.0",
-    "@legalplace/typeorm-constants": "^3.31.0",
+    "@legalplace/typeorm-constants": "^3.32.0",
     "@loadable/component": "^5.15.0",
     "@redux-saga/core": "^1.1.3",
     "connected-react-router": "^6.8.0",
@@ -54,11 +54,11 @@
     "xss": "^1.0.9"
   },
   "devDependencies": {
-    "@legalplace/data-gouv": "^1.5.9",
+    "@legalplace/data-gouv": "^1.5.10",
     "@legalplace/eslint-config": "^2.2.0",
-    "@legalplace/models-v3-types": "^5.11.3",
+    "@legalplace/models-v3-types": "^5.11.4",
     "@legalplace/prettier-config": "^2.1.3",
-    "@legalplace/typeorm-entities": "^5.29.5",
+    "@legalplace/typeorm-entities": "^5.29.6",
     "@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": "2093b083375c01f6593ba357465ebded937b7b86"
+  "gitHead": "331e8226c0c2a9f66024621240f8485cabe874de"
 }