@legalplace/wizardx-core 4.13.0 → 4.13.2

package/dist/redux/middlewares/prefillerWatcherMiddleware.js

@@ -185,18 +185,22 @@ const watchFetchModelSucceeded = (mpi, next, action) => {
         const variableId = parseInt(variableStrId, 10);
         const { prefillings, prioritizePrefillings } = selectVariableReference(variableId);
         if (Array.isArray(prefillings)) {
-            const firstUnconditionnedIndex = prefillings
-                .map((c) => c.conditions === undefined ||
-                ConditionsMapper.countConditions(c.conditions) === 0)
-                .indexOf(true);
-            if (firstUnconditionnedIndex > -1) {
-                variables[variableId].forEach((value, variableIndex) => {
-                    const prefillerValue = parsePrefillerValue(variableId, variableIndex, firstUnconditionnedIndex);
-                    if (value.toString().trim().length === 0 || prioritizePrefillings) {
-                        mpi.dispatch(updateVariableAction(variableId, prefillerValue, variableIndex));
-                    }
-                });
-            }
+            variables[variableId].forEach((value, variableIndex) => {
+                var _a;
+                const firstUnconditionnedIndex = prefillings
+                    .map((c) => c.conditions === undefined ||
+                    ConditionsMapper.countConditions(c.conditions) === 0)
+                    .indexOf(true);
+                const prefillingConditions = (_a = selectPrefillerConditionValue(variableId)) === null || _a === void 0 ? void 0 : _a[variableIndex];
+                const firstTruthfulPrefill = prefillingConditions === null || prefillingConditions === void 0 ? void 0 : prefillingConditions.indexOf(true);
+                const prefillIndex = typeof firstTruthfulPrefill === "number" && firstTruthfulPrefill > -1
+                    ? firstTruthfulPrefill
+                    : firstUnconditionnedIndex;
+                const prefillerValue = parsePrefillerValue(variableId, variableIndex, prefillIndex);
+                if (value.toString().trim().length === 0 || prioritizePrefillings) {
+                    mpi.dispatch(updateVariableAction(variableId, prefillerValue, variableIndex));
+                }
+            });
         }
     });
 };

package/dist/redux/sagas/saveData.js

@@ -7,7 +7,6 @@ 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"));
@@ -15,7 +14,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(trimInputs(selectInputs())), action.confirmAnswer ? 0 : 1, action.additionalProperties));
+        const response = yield call(fetch, ...updateInstanceArguments(permalink, uniqid, OvcConverter.convertToOvc(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.13.0",
+  "version": "4.13.2",
   "author": "Moncef Hammou (moncef@legalplace.fr)",
   "license": "MIT",
   "files": [
@@ -96,5 +96,5 @@
     "*.test.ts",
     "*.test.tsx"
   ],
-  "gitHead": "331e8226c0c2a9f66024621240f8485cabe874de"
+  "gitHead": "3240a0186197e2448190353665f556d64d945bf5"
 }

package/dist/helpers/trimInputs.d.ts

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

package/dist/helpers/trimInputs.js

@@ -1,7 +0,0 @@
-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 });
-};