@inseefr/lunatic 3.6.5 → 3.6.7

package/src/components/RosterForLoop/RosterForLoop.tsx

@@ -1,4 +1,4 @@
-import { Fragment, useCallback, useState } from 'react';
+import { Fragment } from 'react';
 import type { LunaticComponentProps } from '../type';
 import { Table, Tbody, Td, Tr, TableHeader } from '../shared/Table';
 import { times } from '../../utils/array';
@@ -9,9 +9,7 @@ import {
 	getComponentErrors,
 } from '../shared/ComponentErrors/ComponentErrors';
 import { CustomLoop } from '../Loop/Loop';
-
-const DEFAULT_MIN_ROWS = 1;
-const DEFAULT_MAX_ROWS = 12;
+import { useLoopUtils } from '../Loop/utils';
 
 /**
  * Loop displayed as a table
@@ -19,46 +17,18 @@ const DEFAULT_MAX_ROWS = 12;
 export const RosterForLoop = (
 	props: LunaticComponentProps<'RosterForLoop'>
 ) => {
+	const { min, max, nbRows, addRow, removeRow } = useLoopUtils(props);
 	const {
-		value: valueMap,
-		lines,
 		errors,
-		handleChanges,
 		// eslint-disable-next-line @typescript-eslint/no-unused-vars
 		declarations,
 		header,
-		iterations,
 		id,
 		getComponents,
 		// eslint-disable-next-line @typescript-eslint/no-unused-vars
 		label,
 		...otherProps // These props will be passed down to the child components
 	} = props;
-	const min = lines?.min ?? DEFAULT_MIN_ROWS;
-	const max = lines?.max ?? DEFAULT_MAX_ROWS;
-	const [nbRows, setNbRows] = useState(Math.max(min, iterations));
-
-	const addRow = useCallback(() => {
-		if (nbRows < max) {
-			setNbRows(nbRows + 1);
-		}
-	}, [max, nbRows]);
-
-	const removeRow = useCallback(() => {
-		if (nbRows <= min) {
-			return;
-		}
-		const newNbRows = nbRows - 1;
-		setNbRows(newNbRows);
-		// Downsize all variables by 1
-		const newResponses = Object.entries(valueMap).map(([k, v]) => {
-			return {
-				name: k,
-				value: v?.filter((_, i) => i < newNbRows),
-			};
-		});
-		handleChanges(newResponses);
-	}, [nbRows, min, valueMap, handleChanges]);
 
 	if (nbRows === 0) {
 		return null;

package/src/components/Roundabout/CustomRoundabout.tsx

@@ -76,7 +76,16 @@ type Props = Pick<
 
 export const CustomRoundabout = slottableComponent<Props>(
 	'Roundabout',
-	({ declarations, description, id, items, goToIteration, label, locked }) => {
+	({
+		declarations,
+		description,
+		id,
+		items,
+		goToIteration,
+		label,
+		locked,
+		errors,
+	}) => {
 		return (
 			<div className="lunatic-roundabout">
 				<div id={`roundabout-${id}`} className="lunatic-roundabout__label">
@@ -88,6 +97,7 @@ export const CustomRoundabout = slottableComponent<Props>(
 					declarations={declarations}
 					id={id}
 				/>
+				<ComponentErrors errors={errors} />
 				<div className="lunatic-roundabout__items">
 					{items.map((item, k) => (
 						<RoundaboutItem

package/src/components/Roundabout/roundabout.spec.tsx

@@ -1,6 +1,12 @@
 import { render, fireEvent } from '@testing-library/react';
 import { CustomRoundabout } from './CustomRoundabout';
 import { describe, it, expect, vi, afterEach } from 'vitest';
+import { LunaticError } from '../../use-lunatic/type';
+import { ComponentErrors } from '../shared/ComponentErrors/ComponentErrors';
+
+vi.mock('../shared/ComponentErrors/ComponentErrors', () => ({
+	ComponentErrors: vi.fn(),
+}));
 
 describe('Roundabout', () => {
 	const mockGoToIteration = vi.fn();
@@ -77,4 +83,36 @@ describe('Roundabout', () => {
 		const completeButton = getByText('Complété');
 		expect(completeButton).toBeDisabled();
 	});
+
+	it('displays roundabout errors', () => {
+		const errors: LunaticError[] = [
+			{
+				id: 'error1',
+				errorMessage: 'Error 1 message',
+				criticality: 'ERROR',
+				typeOfControl: 'CONSISTENCY',
+			},
+			{
+				id: 'error2',
+				errorMessage: 'Error 2 message',
+				criticality: 'WARN',
+				typeOfControl: 'CONSISTENCY',
+			},
+		];
+
+		render(
+			<CustomRoundabout
+				id="r1"
+				items={items}
+				goToIteration={mockGoToIteration}
+				locked={true}
+				errors={errors}
+			/>
+		);
+
+		expect(ComponentErrors).toHaveBeenCalledWith(
+			expect.objectContaining({ errors }),
+			expect.anything()
+		);
+	});
 });

package/src/components/shared/Checkbox/CheckboxOption.tsx

@@ -5,7 +5,7 @@ import { Label } from '../Label/Label';
 import { useKeyboardKey } from '../../../hooks/useKeyboardKey';
 import { CustomInput } from '../../Input/Input';
 
-export type CheckboxOptionProps = {
+type CheckboxOptionProps = {
 	disabled?: boolean;
 	readOnly?: boolean;
 	checked?: boolean;
@@ -21,6 +21,7 @@ export type CheckboxOptionProps = {
 	detailMaxLength?: number;
 	detailValue?: string | null;
 	onDetailChange?: (value: string) => void;
+	shouldBeFiltered?: boolean;
 };
 
 function LunaticCheckboxOption({
@@ -39,7 +40,7 @@ function LunaticCheckboxOption({
 	codeModality,
 	shortcut,
 	invalid,
-}: CheckboxOptionProps) {
+}: Readonly<CheckboxOptionProps>) {
 	const isEnabled = !readOnly && !disabled;
 	const hasDetail = !!onDetailChange;
 	const hasKeyboardShortcut = Boolean(shortcut && codeModality && isEnabled);

package/src/components/shared/Radio/RadioGroup.tsx

@@ -23,6 +23,7 @@ export type RadioGroupProps = Pick<
 	| 'declarations'
 	| 'orientation'
 	| 'detailAlwaysDisplayed'
+	| 'shouldBeFiltered'
 > & {
 	errors?: LunaticError[];
 	clearable?: boolean;

package/src/stories/behaviour/controls/controls.stories.tsx

@@ -5,7 +5,9 @@ import {
 } from '../../utils/Orchestrator';
 import simple from './source-simple.json';
 import simpleNum from './source-simple-numeric.json';
-import sourceLoop from './source-loop.json';
+import sourceRosterForLoop from './source-roster-for-loop.json';
+import sourceStandaloneLoop from './source-standalone-loop.json';
+import dataStandaloneLoop from './data-standalone-loop.json';
 import sourceRoundabout from './source-roundabout.json';
 import boucleNTabDynamique from './source-boucles-n.json';
 
@@ -38,9 +40,16 @@ export const SimpleNum: OrchestratorStory = {
 
 export const LinkedLoop: OrchestratorStory = {};
 
-export const Loop: OrchestratorStory = {
+export const RosterForLoop: OrchestratorStory = {
 	args: {
-		source: sourceLoop,
+		source: sourceRosterForLoop,
+	},
+};
+
+export const StandaloneLoop: OrchestratorStory = {
+	args: {
+		source: sourceStandaloneLoop,
+		data: dataStandaloneLoop,
 	},
 };
 

package/src/stories/behaviour/controls/data-standalone-loop.json

@@ -0,0 +1,17 @@
+{
+	"EXTERNAL": {
+		"NIR": ["23456", "23456", "23456", "23456", "23456", "12345"],
+		"CODE_CC": ["CODE", "CODE", "CODE", "CODE", "CODE", "CODE"],
+		"NBSAL_INT": "6",
+		"LIBELLE_CC": ["LIB CC", "LIB CC", "LIB CC", "LIB CC", "LIB CC", "LIB CC"],
+		"NUM_ORDRE_SALARIE": ["1", "2", "3", "4", "5", "6"],
+		"NOM_COMPLET_SALARIE": [
+			"THREEPWOOD GUYBRUSH",
+			"LINK",
+			"JANE DOE",
+			"JOHN DOE",
+			"IL FAIT CHAUD",
+			"POISSON STEVE"
+		]
+	}
+}