@inseefr/lunatic 3.4.20 → 3.4.21

package/src/components/Loop/Loop.spec.tsx

@@ -0,0 +1,77 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import { Loop } from './Loop';
+import type { LunaticComponentProps } from '../type';
+
+describe('Loop', () => {
+	const mockOnChange = vi.fn();
+
+	beforeEach(() => {
+		mockOnChange.mockClear();
+	});
+
+	const getComponents = (iteration: number) => [
+		{
+			componentType: 'Input',
+			maxLength: 249,
+			id: 'nameId',
+			response: {
+				name: 'name',
+			},
+			iteration: iteration,
+			value: 'Jonathan Doe',
+		} as LunaticComponentProps<'Input'>,
+	];
+
+	it('render the right number of lines by default', () => {
+		render(
+			<Loop
+				value={{ name: ['John Doe', 'Jane Doe'] }}
+				handleChanges={mockOnChange}
+				label="Ceci est un test"
+				id="table"
+				lines={{ min: 4, max: 10 }}
+				iterations={2}
+				getComponents={getComponents}
+				executeExpression={() => null as any}
+			/>
+		);
+		expect(screen.getAllByRole('textbox')).toHaveLength(4);
+	});
+
+	it('disables the remove row button when the minimum number of rows is reached', () => {
+		render(
+			<Loop
+				value={{ name: ['John Doe', 'Jane Doe', 'Alice', 'Bob'] }}
+				handleChanges={mockOnChange}
+				label="Ceci est un test"
+				id="table"
+				lines={{ min: 4, max: 10 }}
+				iterations={4}
+				getComponents={getComponents}
+				executeExpression={() => null as any}
+			/>
+		);
+
+		const Button = screen.getByRole('button', { name: /remove/i });
+		expect(Button).toBeDisabled();
+	});
+
+	it('enables the add row button when the maximum number of rows is not reached', () => {
+		render(
+			<Loop
+				value={{ name: ['John Doe', 'Jane Doe', 'Alice'] }}
+				handleChanges={mockOnChange}
+				label="Ceci est un test"
+				id="table"
+				lines={{ min: 2, max: 10 }}
+				iterations={3}
+				getComponents={getComponents}
+				executeExpression={() => null as any}
+			/>
+		);
+
+		const Button = screen.getByRole('button', { name: /add/i });
+		expect(Button).not.toBeDisabled();
+	});
+});

package/src/components/Loop/Loop.tsx

@@ -60,7 +60,7 @@ export function Loop({
 			{...props}
 			errors={getComponentErrors(errors, props.id)}
 			addRow={nbRows === max ? undefined : addRow}
-			removeRow={nbRows === 1 ? undefined : removeRow}
+			removeRow={nbRows === 1 || nbRows === min ? undefined : removeRow}
 			canControlRows={min !== max && Number.isFinite(max)}
 		>
 			{times(nbRows, (n) => (

package/src/type.source.ts

@@ -1,4 +1,3 @@
-/* eslint-disable */
 /**
  * This file was automatically generated by json-schema-to-typescript.
  * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,

package/src/use-lunatic/commons/variables/lunatic-variables-store.spec.ts

@@ -1,5 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { cleaningBehaviour } from './behaviours/cleaning-behaviour';
+import * as cleaningModule from './behaviours/cleaning-behaviour';
 import { missingBehaviour } from './behaviours/missing-behaviour';
 import { resizingBehaviour } from './behaviours/resizing-behaviour';
 import { LunaticVariablesStore } from './lunatic-variables-store';
@@ -480,5 +481,83 @@ describe('lunatic-variables-store', () => {
 			store.set('NOM', 'Doe');
 			expect(store.get('PRENOM')).toEqual('John');
 		});
+		it('should enable cleaning when disableCleaning = false', () => {
+			const cleaningSpy = vi.spyOn(cleaningModule, 'cleaningBehaviour');
+			LunaticVariablesStore.makeFromSource(
+				{
+					components: [],
+					variables: [
+						{
+							name: 'PRENOM',
+							values: {
+								COLLECTED: 'John',
+							},
+							variableType: 'COLLECTED',
+						},
+						{
+							name: 'NOM',
+							values: {
+								COLLECTED: '',
+							},
+							variableType: 'COLLECTED',
+						},
+					],
+					cleaning: {
+						NOM: {
+							PRENOM: 'false',
+						},
+					},
+				},
+				{
+					COLLECTED: {
+						PRENOM: {
+							COLLECTED: 'Jane',
+						},
+					},
+				},
+				{ current: () => {} },
+				false // enable cleaning
+			);
+			expect(cleaningSpy).toHaveBeenCalled();
+		});
+		it('should disable cleaning when disableCleaning = true', () => {
+			const cleaningSpy = vi.spyOn(cleaningModule, 'cleaningBehaviour');
+			LunaticVariablesStore.makeFromSource(
+				{
+					components: [],
+					variables: [
+						{
+							name: 'PRENOM',
+							values: {
+								COLLECTED: 'John',
+							},
+							variableType: 'COLLECTED',
+						},
+						{
+							name: 'NOM',
+							values: {
+								COLLECTED: '',
+							},
+							variableType: 'COLLECTED',
+						},
+					],
+					cleaning: {
+						NOM: {
+							PRENOM: 'false',
+						},
+					},
+				},
+				{
+					COLLECTED: {
+						PRENOM: {
+							COLLECTED: 'Jane',
+						},
+					},
+				},
+				{ current: () => {} },
+				true // disable cleaning
+			);
+			expect(cleaningSpy).not.toHaveBeenCalled();
+		});
 	});
 });

package/src/use-lunatic/commons/variables/lunatic-variables-store.ts

@@ -54,7 +54,8 @@ export class LunaticVariablesStore {
 	public static makeFromSource(
 		source: LunaticSource,
 		data: LunaticData,
-		changeHandler: RefObject<LunaticOptions['onVariableChange']>
+		changeHandler: RefObject<LunaticOptions['onVariableChange']>,
+		disableCleaning?: boolean
 	) {
 		const store = new LunaticVariablesStore();
 		if (!source.variables) {
@@ -90,7 +91,9 @@ export class LunaticVariablesStore {
 			}
 		}
 		store.on('change', (e) => changeHandler?.current?.(e.detail));
-		cleaningBehaviour(store, source.cleaning, sourceValues);
+		if (!disableCleaning) {
+			cleaningBehaviour(store, source.cleaning, sourceValues);
+		}
 		resizingBehaviour(store, source.resizing);
 		missingBehaviour(store, source.missingBlock);
 		return store;

package/src/use-lunatic/props/propValue.spec.ts

@@ -115,4 +115,56 @@ describe('fillComponentValue', () => {
 			});
 		});
 	});
+
+	describe('RosterForLoop', () => {
+		const rosterForLoopComponent = {
+			id: 'loop-prenom',
+			componentType: 'RosterForLoop',
+			bindingDependencies: ['PRENOM'],
+			lines: {
+				min: {
+					value: '1',
+					type: 'VTL',
+				},
+				max: {
+					value: '10',
+					type: 'VTL',
+				},
+			},
+			page: '1',
+			components: [
+				{
+					componentType: 'Input',
+					label: {
+						value: '"Prénom"',
+						type: 'VTL|MD',
+					},
+					conditionFilter: {
+						value: 'true',
+						type: 'VTL',
+					},
+					maxLength: 30,
+					bindingDependencies: ['PRENOM'],
+					id: 'prenom',
+					response: {
+						name: 'PRENOM',
+					},
+				},
+			],
+		} as any as LunaticComponentDefinition<'RosterForLoop'>;
+
+		it('should correctly extract values from nested responses as arrays', () => {
+			const values = {
+				PRENOM: ['Alice', 'Bob', 'Charlie'],
+			};
+
+			expectFilledComponent(rosterForLoopComponent, values).toEqual(values);
+		});
+
+		it('should return null for missing responses', () => {
+			expectFilledComponent(rosterForLoopComponent).toEqual({
+				PRENOM: null,
+			});
+		});
+	});
 });

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

@@ -27,8 +27,11 @@ export function getValueProp(
 	if (hasResponse(component)) {
 		return args.variables.get(component.response.name, iteration);
 	}
-	// For loop, value will be a map of child component values
-	if (component.componentType === 'Loop') {
+	// For Loop and RosterForLoop, value will be a map of child component values
+	if (
+		component.componentType === 'Loop' ||
+		component.componentType === 'RosterForLoop'
+	) {
 		return getChildResponseValues(component.components, args.variables);
 	}
 	return null;

package/src/use-lunatic/reducer/reducerInitializer.tsx

@@ -64,7 +64,8 @@ export function reducerInitializer({
 	const variables = LunaticVariablesStore.makeFromSource(
 		source,
 		data,
-		onVariableChange
+		onVariableChange,
+		disableFilters
 	);
 	const pages = checkLoops(createMapPages(source));