Incorrect initial value for cleaning (#1066)

InseeFr · Jul 24, 2024 · 0ce5e52 · 0ce5e52
1 parent 7921b2c
commit 0ce5e52
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 7 deletions.
diff --git a/src/use-lunatic/commons/variables/behaviours/cleaning-behaviour.ts b/src/use-lunatic/commons/variables/behaviours/cleaning-behaviour.ts
@@ -9,6 +9,7 @@ import { depth } from '../../../../utils/array';
 export function cleaningBehaviour(
 	store: LunaticVariablesStore,
 	cleaning: LunaticSource['cleaning'],
+	// Value used as default when cleaning a variable
 	initialValues: Record<string, unknown> = {}
 ) {
 	if (!cleaning) {

diff --git a/src/use-lunatic/commons/variables/lunatic-variables-store.spec.ts b/src/use-lunatic/commons/variables/lunatic-variables-store.spec.ts
@@ -426,4 +426,54 @@ describe('lunatic-variables-store', () => {
 			expect(variables.get('PRENOM_MISSING', [1])).toEqual('DK');
 		});
 	});
+
+	describe('makeFromSource', () => {
+		it('should handle initial data correctly', () => {
+			const store = LunaticVariablesStore.makeFromSource(
+				{
+					components: [],
+					variables: [
+						{
+							name: 'PRENOM',
+							values: {
+								EDITED: null,
+								FORCED: null,
+								INPUTTED: null,
+								PREVIOUS: null,
+								COLLECTED: 'John',
+							},
+							variableType: 'COLLECTED',
+						},
+						{
+							name: 'NOM',
+							values: {
+								EDITED: null,
+								FORCED: null,
+								INPUTTED: null,
+								PREVIOUS: null,
+								COLLECTED: '',
+							},
+							variableType: 'COLLECTED',
+						},
+					],
+					cleaning: {
+						NOM: {
+							PRENOM: 'false',
+						},
+					},
+				},
+				{
+					COLLECTED: {
+						PRENOM: {
+							COLLECTED: 'Jane',
+						},
+					},
+				},
+				{ current: () => {} }
+			);
+			expect(store.get('PRENOM')).toEqual('Jane');
+			store.set('NOM', 'Doe');
+			expect(store.get('PRENOM')).toEqual('John');
+		});
+	});
 });
diff --git a/src/use-lunatic/commons/variables/lunatic-variables-store.ts b/src/use-lunatic/commons/variables/lunatic-variables-store.ts
@@ -55,12 +55,14 @@ export class LunaticVariablesStore {
 		if (!source.variables) {
 			return store;
 		}
-		const initialValues = Object.fromEntries(
-			source.variables.map((variable) => [
-				variable.name,
-				getInitialVariableValue(variable, data),
-			])
-		);
+		// Source data (picked from "variables" in the source.json)s
+		const sourceValues: Record<string, unknown> = {};
+		// Starting data for the form (merged with data.json or injected data)
+		const initialValues: Record<string, unknown> = {};
+		for (const variable of source.variables) {
+			sourceValues[variable.name] = getInitialVariableValue(variable);
+			initialValues[variable.name] = getInitialVariableValue(variable, data);
+		}
 		const getIterationDepth = (name: string) => {
 			if (name === 'xAxis') return 0;
 			if (name === 'yAxis') return 1;
@@ -83,7 +85,7 @@ export class LunaticVariablesStore {
 			}
 		}
 		store.on('change', (e) => changeHandler?.current?.(e.detail));
-		cleaningBehaviour(store, source.cleaning, initialValues);
+		cleaningBehaviour(store, source.cleaning, sourceValues);
 		resizingBehaviour(store, source.resizing);
 		missingBehaviour(store, source.missingBlock);
 		return store;