@inseefr/lunatic 0.3.7-experimental → 0.3.8-experimental

package/src/utils/lib/controls/utils.js

@@ -62,8 +62,14 @@ const getControlsFromComponents = ({
 					}),
 				];
 			} else {
-				const { loopDependencies } = component;
-				const iterations = parseInt(bindings[loopDependencies[0]], 10);
+				const {
+					loopDependencies,
+					lines: { min },
+				} = component;
+				const iterationsStr = loopDependencies
+					? bindings[loopDependencies[0]]
+					: min;
+				const iterations = parseInt(iterationsStr, 10);
 				const ctrls = [...Array(iterations).keys()].reduce((accIt, i) => {
 					loopBindings = buildLoopBindings(i)(Object.entries(rootLoopBindings));
 					return [

package/src/utils/suggester-workers/commons-tokenizer/create-fields-tokenizer.js

@@ -7,10 +7,14 @@ function defaultTokenizeIt(string) {
 	return [prepareStringIndexation(string)];
 }
 
+function toArray(content) {
+	return Array.isArray(content) ? content : [content];
+}
+
 function tokensToArray(tokenized) {
 	return Object.entries(tokenized).reduce(function (a, [k, values]) {
 		if (k.startsWith('pattern')) {
-			return [...a, ...values];
+			return [...a, ...toArray(values)];
 		}
 		return a;
 	}, []);

package/src/utils/suggester-workers/commons-tokenizer/index.js

@@ -5,4 +5,5 @@ export { default as filterStemmer } from './filters/filter-stemmer';
 export { default as filterLength } from './filters/filter-length';
 export { default as filterDouble } from './filters/filter-double';
 export { default as filterAccents } from './filters/filter-accents';
+export { default as filterToLower } from './filters/filter-to-lower';
 export { default as getRegExpFromPattern } from './get-regexp-from-pattern';

package/src/utils/suggester-workers/searching/query-parser/query-parser-tokenized.js

@@ -4,10 +4,16 @@ import {
 	filterLength,
 	filterDouble,
 	getRegExpFromPattern,
+	filterToLower,
 } from '../../commons-tokenizer';
 import { composeFilters } from '../../commons-tokenizer/filters';
 
-const filterTokens = composeFilters(filterDouble, filterStemmer, filterLength);
+const filterTokens = composeFilters(
+	filterDouble,
+	filterStemmer,
+	filterToLower,
+	filterLength
+);
 
 function toArray(tokens) {
 	if (tokens) {

package/src/utils/to-expose/handler.js

@@ -60,7 +60,7 @@ export const updateQuestionnaire =
 	};
 
 export const updateExternals =
-	(questionnaire) => (logFunction) => (updatedValues) => {
+	(questionnaire) => (logFunction, preferences) => (updatedValues) => {
 		const { variables, ...other } = questionnaire;
 		const { EXTERNAL } = variables;
 		const newVariables = {
@@ -71,8 +71,7 @@ export const updateExternals =
 		const newVariablesWithCalculated = addCalculatedVars(
 			newVariables,
 			updatedValues
-		)(logFunction);
-
+		)(logFunction, preferences);
 		return {
 			...other,
 			variables: newVariablesWithCalculated,
@@ -94,30 +93,29 @@ export const buildNewValue =
 
 // Separate methods to avoid perf issue on collect simplest use case
 const getCollectedAndExternal = (preferences) => (variables) => {
-	const { COLLECTED } = variables;
+	const { COLLECTED, EXTERNAL } = variables;
 	if (preferences.length === 1 && preferences[0] === 'COLLECTED')
-		return getCollectedAndExternalSimple(COLLECTED);
-	return getCollectedAndExternalByPreferences(preferences)(COLLECTED);
+		return { ...getCollectedAndExternalSimple(COLLECTED), ...EXTERNAL };
+	return {
+		...getCollectedAndExternalByPreferences(preferences)(COLLECTED),
+		...EXTERNAL,
+	};
 };
 
-const getCollectedAndExternalSimple = (variables) => {
-	const collected = Object.entries(variables).reduce(
+const getCollectedAndExternalSimple = (variables) =>
+	Object.entries(variables).reduce(
 		(acc, [k, { values }]) => ({ ...acc, [k]: values.COLLECTED }),
 		{}
 	);
-	return { ...collected, ...variables.EXTERNAL };
-};
 
-const getCollectedAndExternalByPreferences = (preferences) => (variables) => {
-	const collected = Object.entries(variables).reduce((acc, [k, { values }]) => {
+const getCollectedAndExternalByPreferences = (preferences) => (variables) =>
+	Object.entries(variables).reduce((acc, [k, { values }]) => {
 		const v = preferences.reduce((acc, p) => {
 			const value = values[p];
 			return [null, ''].includes(value) ? acc : value;
 		}, null);
 		return { ...acc, [k]: v };
 	}, {});
-	return { ...collected, ...variables.EXTERNAL };
-};
 
 const addCalculatedVars =
 	(variables, updatedValues) => (logFunction, preferences) => {

package/src/utils/to-expose/hooks/lunatic-split.js

@@ -361,11 +361,14 @@ const useLunaticSplit = (
 
 	useEffect(() => {
 		if (Object.keys(todoExternals).length !== 0) {
-			const newQ = updateExternals(questionnaire)(logFunction)(todoExternals);
+			const newQ = updateExternals(questionnaire)(logFunction, preferences)(
+				todoExternals
+			);
+			setBindings(getBindings(newQ));
 			setQuestionnaire(newQ);
 			setTodoExternals({});
 		}
-	}, [todoExternals, logFunction, questionnaire]);
+	}, [todoExternals, logFunction, questionnaire, preferences]);
 
 	const cancelModal = () => {
 		setModalContent(null);

package/src/utils/to-expose/hooks/lunatic.js

@@ -216,11 +216,14 @@ const useLunatic = (
 
 	useEffect(() => {
 		if (Object.keys(todoExternals).length !== 0) {
-			const newQ = updateExternals(questionnaire)(logFunction)(todoExternals);
+			const newQ = updateExternals(questionnaire)(logFunction, preferences)(
+				todoExternals
+			);
+			setBindings(getBindings(newQ));
 			setQuestionnaire(newQ);
 			setTodoExternals({});
 		}
-	}, [todoExternals, logFunction, questionnaire]);
+	}, [todoExternals, logFunction, questionnaire, preferences]);
 
 	const cancelModal = () => {
 		setModalContent(null);