@inseefr/lunatic 3.6.5 → 3.6.7

package/src/use-lunatic/commons/compile-controls.ts

@@ -24,13 +24,28 @@ type InterpretedLoopComponent = DeepTranslateExpression<
 		componentType: 'Loop' | 'RosterForLoop';
 	}
 >;
+type InterpretedRoundaboutComponent = DeepTranslateExpression<
+	ComponentDefinition & {
+		componentType: 'Roundabout';
+	}
+>;
 
+/**
+ * Check if the component is a Loop or a RosterForLoop
+ */
 const isLoopComponent = (
 	component: ComponentDefinition | InterpretedComponent
 ): component is InterpretedLoopComponent => {
-	return ['Loop', 'RosterForLoop', 'Roundabout'].includes(
-		component.componentType
-	);
+	return ['Loop', 'RosterForLoop'].includes(component.componentType);
+};
+
+/**
+ * Check if the component is a Roundabout
+ */
+const isRoundaboutComponent = (
+	component: ComponentDefinition | InterpretedComponent
+): component is InterpretedRoundaboutComponent => {
+	return component.componentType === 'Roundabout';
 };
 
 const isQuestionComponent = (
@@ -63,7 +78,11 @@ function checkComponents(
 			}
 		}
 
-		// For loop, inspect children
+		// For Loop and RosterForLoop, inspect iterations for row controls
+		if (isRoundaboutComponent(component))
+			errors = checkRoundabout(state, component, errors);
+
+		// For Loop and RosterForLoop, inspect children
 		if (isLoopComponent(component))
 			errors = checkLoop(state, component, errors);
 
@@ -75,6 +94,22 @@ function checkComponents(
 	return errors;
 }
 
+function checkRoundabout(
+	state: StateForControls,
+	component: InterpretedRoundaboutComponent,
+	errors: Record<string, LunaticError[]>
+) {
+	const rowControls = component.controls?.filter((c) => c.type === 'ROW');
+	if (rowControls?.length) {
+		errors = checkComponentInLoop(
+			state,
+			{ ...component, controls: rowControls },
+			errors
+		);
+	}
+	return errors;
+}
+
 function checkLoop(
 	state: StateForControls,
 	component: InterpretedLoopComponent,
@@ -101,14 +136,12 @@ function checkControls(
 ): LunaticError[] {
 	return controls
 		.map((control) => {
-			switch (control.type) {
-				case 'roundabout':
-					return checkRoundaboutControl(control, executeExpression);
-				default:
-					return checkBaseControl(control, executeExpression, pager);
+			if (control.type === 'roundabout') {
+				return checkRoundaboutControl(control, executeExpression);
 			}
+			return checkBaseControl(control, executeExpression, pager);
 		})
-		.filter((error) => error !== undefined) as LunaticError[];
+		.filter((error) => error !== undefined);
 }
 
 /**
@@ -152,7 +185,10 @@ function computeIterations(
  */
 function checkComponentInLoop(
 	state: StateForControls,
-	component: ComponentDefinition | InterpretedLoopComponent,
+	component:
+		| ComponentDefinition
+		| InterpretedLoopComponent
+		| InterpretedRoundaboutComponent,
 	errors: Record<string, LunaticError[]>
 ): Record<string, LunaticError[]> {
 	// For Question, loop over children
@@ -181,6 +217,19 @@ function checkComponentInLoop(
 		if (!('controls' in component) || !component.controls) {
 			continue;
 		}
+
+		// For Roundabout, we don't check controls for iterations that are disabled
+		if (component.componentType === 'Roundabout' && component.item.disabled) {
+			const isIterationDisabled = state.executeExpression(
+				{ value: component.item.disabled?.value, type: 'VTL' },
+				iterationPager
+			);
+
+			if (isIterationDisabled) {
+				continue;
+			}
+		}
+
 		// The component is filtered on this iteration, skip it
 		if (
 			// conditionFilter can be the interpreted expression, or the object representing the expression

package/src/use-lunatic/props/propIterations.ts

@@ -32,20 +32,35 @@ export function getIterationsProp(
 
 	// Iterations expression is not present on the component definition
 	// infer it from the value of child components
-	return (definition.components as LunaticComponentDefinition[]).reduce(
-		(acc, component) => {
-			if (!hasResponse(component)) {
-				return acc;
-			}
-			const value = state.variables.get(
-				component.response.name,
-				isNumber(state.pager.iteration) ? [state.pager.iteration] : undefined
-			);
-			if (Array.isArray(value) && value.length > acc) {
-				return value.length;
-			}
+
+	return getFlatComponentsInLoop(definition).reduce((acc, component) => {
+		if (!hasResponse(component)) {
 			return acc;
-		},
-		0
-	);
+		}
+		const value = state.variables.get(
+			component.response.name,
+			isNumber(state.pager.iteration) ? [state.pager.iteration] : undefined
+		);
+		if (Array.isArray(value) && value.length > acc) {
+			return value.length;
+		}
+		return acc;
+	}, 0);
+}
+
+function getFlatComponentsInLoop(
+	definition: LunaticComponentDefinition
+): LunaticComponentDefinition[] {
+	if (
+		definition.componentType !== 'RosterForLoop' &&
+		definition.componentType !== 'Loop'
+	) {
+		return [definition];
+	}
+
+	return definition.components.reduce((acc, component) => {
+		if (component.componentType === 'Question')
+			return [...acc, ...component.components];
+		return [...acc, component];
+	}, [] as LunaticComponentDefinition[]);
 }

package/src/use-lunatic/reducer/controls/check-base-control.ts

@@ -21,7 +21,6 @@ export function checkBaseControl(
 	const result = executeExpression(control, {
 		iteration: linksIterations ?? iteration,
 	});
-
 	try {
 		/**
 		 * Currently, the controls are lifted when the condition is false.

package/src/use-lunatic/use-lunatic-bug.test.ts

@@ -0,0 +1,42 @@
+import { act, renderHook } from '@testing-library/react';
+import { describe, expect, it } from 'vitest';
+
+import loopControlSource from '../stories/behaviour/controls/source-standalone-loop.json';
+import surveyUnit from '../stories/behaviour/controls/data-standalone-loop.json';
+import { useLunatic } from './use-lunatic';
+
+describe('use-lunatic()', () => {
+	/**
+	 * This test should be succeded after make some improvment
+	 * See: comment above useEffect of src/components/Loop/utils.ts > useLoopUtils
+	 */
+	it.skip('should compile errors correctly', () => {
+		const { result } = renderHook(() =>
+			useLunatic(loopControlSource, surveyUnit.data)
+		);
+		act(() => {
+			result.current.goToPage({ page: '3' });
+		});
+		const { currentErrors } = result.current.compileControls();
+		expect(currentErrors).not.toBeUndefined();
+		expect(Object.keys(currentErrors!).length).toEqual(6);
+	});
+	it('should compile errors correctly 2', () => {
+		const { result } = renderHook(() =>
+			useLunatic(loopControlSource, {
+				COLLECTED: {
+					PRES_SAL: { COLLECTED: ['1', null, '2', null, null, null] },
+				},
+				...surveyUnit.data,
+			})
+		);
+		act(() => {
+			result.current.goToPage({ page: '3' });
+		});
+		act(() => {
+			const { currentErrors } = result.current.compileControls();
+			expect(currentErrors).not.toBeUndefined();
+			expect(Object.keys(currentErrors!).length).toEqual(4);
+		});
+	});
+});