fix: fill iterations for loop

InseeFr · Sep 25, 2023 · be953e3 · be953e3
1 parent a7cafc8
commit be953e3
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 12 deletions.
diff --git a/src/components/loop/roster-for-loop/roster-for-loop.tsx b/src/components/loop/roster-for-loop/roster-for-loop.tsx
@@ -7,7 +7,6 @@ import {
 import { createCustomizableLunaticField } from '../../commons';
 import { LoopButton } from '../loop-button';
 import D from '../../../i18n';
-import { getInitialNbRows } from '../utils/get-initial-nb-rows';
 import type { LunaticComponentProps } from '../../type';
 import { Table, Tbody, Td, Tr } from '../../commons/components/html-table';
 import Header from '../../table/header';
@@ -30,11 +29,12 @@ export const RosterForLoop = createCustomizableLunaticField<
 		declarations,
 		label,
 		headers,
+		iterations,
 		id,
 	} = props;
 	const min = lines?.min || DEFAULT_MIN_ROWS;
 	const max = lines?.max || DEFAULT_MAX_ROWS;
-	const [nbRows, setNbRows] = useState(() => getInitialNbRows(valueMap));
+	const [nbRows, setNbRows] = useState(iterations);
 	const showButtons = min && max && min !== max;
 
 	const addRow = useCallback(() => {

diff --git a/src/components/type.ts b/src/components/type.ts
@@ -91,7 +91,7 @@ type ComponentPropsByType = {
 	};
 	RosterForLoop: LunaticBaseProps<unknown> & {
 		lines: { min: number; max: number };
-		iterations?: number;
+		iterations: number;
 		getComponents: (n: number) => FilledLunaticComponentProps[];
 		executeExpression: LunaticState['executeExpression'];
 		value: Record<string, unknown[]>;

diff --git a/src/use-lunatic/commons/fill-components/fill-component-expressions.ts b/src/use-lunatic/commons/fill-components/fill-component-expressions.ts
@@ -23,7 +23,6 @@ const VTL_ATTRIBUTES = [
 	'controls.iterations',
 	'lines.min',
 	'lines.max',
-	'iterations',
 	'xAxisIterations',
 	'yAxisIterations',
 	'conditionFilter',
@@ -45,11 +44,7 @@ export type DeepTranslateExpression<T> = T extends LunaticExpression
 	  }
 	: T;
 
-function createCrawl({
-	executeExpression,
-	iteration,
-	linksIterations,
-}: CrawlArgs) {
+function createCrawl({ executeExpression, iteration }: CrawlArgs) {
 	/**
 	 * Translate the expression for the property
 	 */

diff --git a/src/use-lunatic/commons/fill-components/fill-iterations.ts b/src/use-lunatic/commons/fill-components/fill-iterations.ts
@@ -1,5 +1,6 @@
 import type { LunaticComponentDefinition, LunaticState } from '../../type';
 import { hasResponse } from '../component';
+import { forceInt } from '../../../utils/number';
 
 /**
  * Fill the number of iterations for loop components without "iterations" expression
@@ -8,11 +9,26 @@ export function fillIterations(
 	component: LunaticComponentDefinition,
 	state: LunaticState
 ) {
-	// Iterations expression is not present on the component definition
-	if (!('components' in component && !('iterations' in component))) {
+	if ('iterations' in component && component.iterations) {
+		return {
+			...component,
+			iterations: forceInt(
+				state.executeExpression(component.iterations, {
+					iteration: state.pager.iteration,
+				})
+			),
+		};
+	}
+
+	if (
+		component.componentType !== 'RosterForLoop' &&
+		component.componentType !== 'Loop'
+	) {
 		return component;
 	}
-	// Infer the number of iterations from the value of child components
+
+	// Iterations expression is not present on the component definition
+	// infer it from the value of child components
 	const iterations = component.components.reduce((acc, component) => {
 		if (!hasResponse(component)) {
 			return acc;