@inseefr/lunatic 3.6.14 → 3.6.15-rc.1

package/src/stories/behaviour/articulation/roundabout.json

@@ -0,0 +1,413 @@
+{
+	"$schema": "../../../../lunatic-schema.json",
+	"maxPage": "4",
+	"articulation": {
+		"source": "roundabout",
+		"items": [
+			{
+				"label": "Prénom",
+				"value": "PRENOMS"
+			},
+			{
+				"label": "Sexe",
+				"value": "if SEXE = \"H\" then \"Homme\" else \"Femme\""
+			},
+			{
+				"label": "Age",
+				"value": "cast(AGE, string) || \" ans\""
+			}
+		]
+	},
+	"multimode": {
+		"questionnaire": {
+			"rules": {
+				"IS_MOVED": {
+					"type": "VTL",
+					"value": "nvl(LIVE_HERE, false) = false"
+				}
+			}
+		},
+		"leaf": {
+			"source": "roundabout",
+			"rules": {
+				"IS_MOVED": {
+					"type": "VTL",
+					"value": "nvl(PRENOM_LIVE_HERE, false) = false"
+				}
+			}
+		}
+	},
+	"components": [
+		{
+			"id": "live",
+			"componentType": "CheckboxBoolean",
+			"mandatory": false,
+			"page": "1",
+			"label": {
+				"value": "Vous vivez encore dans ce logement ?",
+				"type": "TXT"
+			},
+			"conditionFilter": { "value": "true", "type": "VTL" },
+			"response": { "name": "LIVE_HERE" }
+		},
+		{
+			"id": "how",
+			"componentType": "InputNumber",
+			"mandatory": false,
+			"page": "2",
+			"min": 1,
+			"max": 10,
+			"decimals": 0,
+			"label": {
+				"value": "\"Combien de personnes vivent habituellement à votre adresse ?\"",
+				"type": "VTL|MD"
+			},
+			"conditionFilter": { "value": "true", "type": "VTL" },
+			"response": { "name": "NB_HAB" }
+		},
+		{
+			"id": "loop",
+			"componentType": "Loop",
+			"page": "3",
+			"depth": 1,
+			"paginatedLoop": false,
+			"conditionFilter": { "value": "true", "type": "VTL" },
+			"loopDependencies": ["NHAB"],
+			"lines": {
+				"min": { "value": "NB_HAB", "type": "VTL" },
+				"max": { "value": "NB_HAB", "type": "VTL" }
+			},
+			"components": [
+				{
+					"id": "prenom",
+					"componentType": "Input",
+					"mandatory": false,
+					"maxLength": 20,
+					"label": {
+						"value": "\"Prénom\"))",
+						"type": "VTL|MD"
+					},
+					"conditionFilter": {
+						"value": "true",
+						"type": "VTL"
+					},
+					"response": { "name": "PRENOMS" }
+				},
+				{
+					"id": "sexe",
+					"componentType": "CheckboxOne",
+					"mandatory": false,
+					"maxLength": 20,
+					"label": {
+						"value": "\"Sexe\"",
+						"type": "VTL|MD"
+					},
+					"conditionFilter": {
+						"value": "true",
+						"type": "VTL"
+					},
+					"options": [
+						{
+							"value": "H",
+							"label": { "value": "\"Homme\"", "type": "VTL|MD" }
+						},
+
+						{
+							"value": "F",
+							"label": { "value": "\"Femme\"", "type": "VTL|MD" }
+						}
+					],
+					"response": { "name": "SEXE" }
+				},
+				{
+					"id": "age",
+					"componentType": "InputNumber",
+					"maxLength": 3,
+					"label": {
+						"value": "\"Age\"",
+						"type": "VTL|MD"
+					},
+					"conditionFilter": {
+						"value": "true",
+						"type": "VTL"
+					},
+					"response": { "name": "AGE" }
+				},
+				{
+					"id": "live",
+					"componentType": "CheckboxBoolean",
+					"mandatory": false,
+					"page": "1",
+					"label": {
+						"value": "Vous vivez encore dans ce logement ?",
+						"type": "TXT"
+					},
+					"conditionFilter": { "value": "true", "type": "VTL" },
+					"response": { "name": "PRENOM_LIVE_HERE" }
+				}
+			]
+		},
+		{
+			"id": "roundabout",
+			"componentType": "Roundabout",
+			"page": "4",
+			"conditionFilter": { "value": "true", "type": "VTL" },
+			"iterations": { "value": "NB_HAB", "type": "VTL" },
+			"label": { "value": "\"Libellé du rondpoint\"", "type": "VTL" },
+			"locked": true,
+			"progressVariable": "PROGRESS",
+			"item": {
+				"label": {
+					"value": "\"Questions de \" || PRENOMS",
+					"type": "VTL"
+				},
+				"description": {
+					"value": "if AGE > 18 then \"Aller aux question destinées à \" || PRENOMS else PRENOMS || \" n'est pas majeur, il/elle n'a pas à répondre aux questions\"",
+					"type": "VTL"
+				},
+				"disabled": {
+					"value": "AGE < 18",
+					"type": "VTL"
+				}
+			},
+			"controls": [],
+			"components": [
+				{
+					"id": "radio",
+					"componentType": "Radio",
+					"mandatory": false,
+					"page": "4.1",
+					"label": {
+						"value": "\"Connaissez-vous le recensement de la population ?\"",
+						"type": "VTL|MD"
+					},
+
+					"conditionFilter": { "value": "true", "type": "VTL" },
+
+					"options": [
+						{ "value": "1", "label": { "value": "\"oui\"", "type": "VTL|MD" } },
+
+						{ "value": "2", "label": { "value": "\"non\"", "type": "VTL|MD" } }
+					],
+					"response": { "name": "KNOWREC" }
+				},
+				{
+					"id": "jsygk7m7",
+					"componentType": "Subsequence",
+					"page": "4.2",
+					"label": {
+						"value": "\"Deuxième page de questions pour \"|| PRENOMS",
+						"type": "VTL|MD"
+					},
+					"conditionFilter": { "value": "true", "type": "VTL" }
+				},
+				{
+					"id": "sexe",
+					"componentType": "Radio",
+					"page": "4.2",
+					"label": {
+						"value": "\"Sexe\"",
+						"type": "VTL"
+					},
+					"conditionFilter": {
+						"value": "true",
+						"type": "VTL"
+					},
+					"options": [
+						{
+							"value": "1",
+							"label": { "value": "\"Homme\"", "type": "VTL|MD" }
+						},
+						{
+							"value": "2",
+							"label": { "value": "\"Femme\"", "type": "VTL|MD" }
+						}
+					],
+					"response": { "name": "SEXE" }
+				},
+				{
+					"id": "jsygk7m7",
+					"componentType": "Subsequence",
+					"page": "4.3",
+					"label": {
+						"value": "\"Troisième page de questions \" || PRENOMS",
+						"type": "VTL|MD"
+					},
+					"conditionFilter": { "value": "true", "type": "VTL" }
+				},
+				{
+					"id": "kmno1n7m",
+					"componentType": "Input",
+					"maxLength": 30,
+					"page": "4.3",
+					"label": {
+						"value": "\"Dites quelque chose.\"))",
+						"type": "VTL|MD"
+					},
+					"conditionFilter": {
+						"value": "true",
+						"type": "VTL"
+					},
+					"response": { "name": "SOMETHING" }
+				}
+			]
+		},
+		{
+			"id": "seq",
+			"componentType": "Sequence",
+			"label": {
+				"value": "\"Merci !\"",
+				"type": "VTL|MD"
+			},
+			"conditionFilter": { "value": "true", "type": "VTL" },
+			"page": "5"
+		}
+	],
+	"variables": [
+		{
+			"variableType": "COLLECTED",
+			"name": "NB_HAB",
+			"values": {
+				"PREVIOUS": null,
+				"COLLECTED": 2,
+				"FORCED": null,
+				"EDITED": null,
+				"INPUTTED": null
+			}
+		},
+		{
+			"variableType": "COLLECTED",
+			"name": "LIVE_HERE",
+			"values": {
+				"PREVIOUS": null,
+				"COLLECTED": true,
+				"FORCED": null,
+				"EDITED": null,
+				"INPUTTED": null
+			}
+		},
+		{
+			"variableType": "COLLECTED",
+			"name": "PRENOM_LIVE_HERE",
+			"values": {
+				"PREVIOUS": null,
+				"COLLECTED": [true, true],
+				"FORCED": null,
+				"EDITED": null,
+				"INPUTTED": null
+			}
+		},
+		{
+			"variableType": "COLLECTED",
+			"name": "SOMETHING",
+			"values": {
+				"PREVIOUS": [],
+				"COLLECTED": [],
+				"FORCED": [],
+				"EDITED": [],
+				"INPUTTED": []
+			}
+		},
+		{
+			"variableType": "COLLECTED",
+			"name": "SEXE",
+			"values": {
+				"PREVIOUS": null,
+				"COLLECTED": ["H", "F"],
+				"FORCED": null,
+				"EDITED": null,
+				"INPUTTED": null
+			}
+		},
+		{
+			"variableType": "COLLECTED",
+			"name": "AGE",
+			"values": {
+				"PREVIOUS": null,
+				"COLLECTED": [24, 24],
+				"FORCED": null,
+				"EDITED": null,
+				"INPUTTED": null
+			}
+		},
+		{
+			"variableType": "COLLECTED",
+			"name": "SEXE",
+			"values": {
+				"PREVIOUS": [],
+				"COLLECTED": [],
+				"FORCED": [],
+				"EDITED": [],
+				"INPUTTED": []
+			}
+		},
+		{
+			"variableType": "COLLECTED",
+			"name": "PRENOMS",
+			"values": {
+				"PREVIOUS": null,
+				"COLLECTED": ["Fanny", "Ines"],
+				"FORCED": null,
+				"EDITED": null,
+				"INPUTTED": null
+			}
+		},
+		{
+			"variableType": "COLLECTED",
+			"name": "KNOWREC",
+			"values": {
+				"PREVIOUS": [],
+				"COLLECTED": [],
+				"FORCED": [],
+				"EDITED": [],
+				"INPUTTED": []
+			}
+		},
+		{
+			"variableType": "COLLECTED",
+			"name": "PROGRESS",
+			"values": {
+				"PREVIOUS": [],
+				"COLLECTED": [0, -1],
+				"FORCED": [],
+				"EDITED": [],
+				"INPUTTED": []
+			}
+		},
+		{
+			"variableType": "CALCULATED",
+			"name": "PRENOMREF",
+			"expression": { "value": "first_value(PRENOMS over())", "type": "VTL" },
+			"bindingDependencies": ["PRENOMS"],
+			"inFilter": "true"
+		},
+		{
+			"variableType": "CALCULATED",
+			"name": "COMPLETE",
+			"expression": {
+				"value": "not(isnull(KNOWREC)) and not(isnull(SEXE)) and not(isnull(SOMETHING))",
+				"type": "VTL"
+			},
+			"bindingDependencies": ["KNOWREC", "SEXE", "SOMETHING"],
+			"shapeFrom": "PRENOMS",
+			"inFilter": "true"
+		},
+		{
+			"variableType": "CALCULATED",
+			"name": "PARTIAL",
+			"expression": {
+				"value": "not(isnull(KNOWREC)) or not(isnull(SEXE)) or not(isnull(SOMETHING))",
+				"type": "VTL"
+			},
+			"bindingDependencies": ["KNOWREC", "SEXE", "SOMETHING"],
+			"shapeFrom": "PRENOMS",
+			"inFilter": "true"
+		}
+	],
+	"resizing": {
+		"NB_HAB": {
+			"size": "NB_HAB",
+			"variables": ["PRENOMS", "AGE", "SEXE", "SOMETHING", "DATNAIS"]
+		}
+	}
+}

package/src/stories/utils/Orchestrator.tsx

@@ -55,6 +55,7 @@ type Props = {
 	showOverview?: boolean;
 	disabled?: boolean;
 	extraTabs?: TabEntry[];
+	multiMode: boolean;
 };
 
 type TabEntry = { label: ReactNode; children: ReactNode };
@@ -97,6 +98,7 @@ function OrchestratorForStories(props: Readonly<Props>) {
 		getData,
 		Provider,
 		hasPageResponse,
+		getMultimode,
 	} = useLunatic(source, data, {
 		initialPage,
 		disableFilters,
@@ -247,6 +249,7 @@ function OrchestratorForStories(props: Readonly<Props>) {
 					pageTag={pageTag}
 					pager={pager}
 					hasPageResponse={hasPageResponse()}
+					getMultimode={props.multiMode ? getMultimode : null}
 					onLogData={() => console.log('Data', getData(true))}
 					onLogComponents={() => console.log('Components', components)}
 				>

package/src/stories/utils/OrchestratorSidebar.tsx

@@ -1,6 +1,7 @@
 import type { useLunatic } from '../../use-lunatic/use-lunatic';
 import { objectKeys } from '../../utils/object';
-import type { PropsWithChildren } from 'react';
+import { type PropsWithChildren, useState } from 'react';
+import type { LunaticState } from '../../use-lunatic/type';
 
 type Props = PropsWithChildren<
 	Pick<
@@ -16,6 +17,7 @@ type Props = PropsWithChildren<
 > & {
 	hasPageResponse: unknown;
 	onLogData: () => void;
+	getMultimode: LunaticState['getMultimode'] | null;
 	onLogComponents: () => void;
 };
 
@@ -28,6 +30,7 @@ export function OrchestratorSidebar({
 	pageTag,
 	pager,
 	children,
+	getMultimode,
 	hasPageResponse,
 	onLogData,
 	onLogComponents,
@@ -113,7 +116,28 @@ export function OrchestratorSidebar({
 					</li>
 				</ul>
 			</div>
+			{getMultimode && (
+				<div>
+					<MultiMode getMultimode={getMultimode} />
+				</div>
+			)}
 			{children}
 		</aside>
 	);
 }
+
+function MultiMode(props: Pick<LunaticState, 'getMultimode'>) {
+	const [state, setState] = useState<ReturnType<typeof props.getMultimode>>({});
+	const onClick = () => {
+		setState(props.getMultimode);
+	};
+	return (
+		<div className="space-y-2">
+			<h3 className="text-lg font-bold mb-2">Multimode</h3>
+			<pre>{JSON.stringify(state, null, 2)}</pre>
+			<button className="btn" onClick={onClick}>
+				Voir multimode
+			</button>
+		</div>
+	);
+}

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,
@@ -265,7 +264,7 @@ export type Variable =
 			dimension?: number;
 	  };
 export type VariableValue = VariableScalarValue | unknown[];
-export type VariableScalarValue = string | number | null;
+export type VariableScalarValue = string | number | null | boolean;
 
 /**
  * Representation of a Lunatic questionnaire.
@@ -329,6 +328,38 @@ export type LunaticSource = {
 			  };
 	};
 	maxPage?: string;
+	articulation?: {
+		/**
+		 * id du composant roundabout
+		 */
+		source: string;
+		/**
+		 * Ligne du tableau d'articulation
+		 */
+		items: {
+			/**
+			 * Libellé du champs
+			 */
+			label: string;
+			/**
+			 * Expression VTL
+			 */
+			value: string;
+		}[];
+	};
+	multimode?: {
+		questionnaire: {
+			rules: {
+				[k: string]: VTLExpression;
+			};
+		};
+		leaf: {
+			source: string;
+			rules: {
+				[k: string]: VTLExpression;
+			};
+		};
+	};
 };
 export type VTLExpression = {
 	/**

package/src/use-lunatic/reducer/reduce-go-next-page.ts

@@ -5,6 +5,7 @@ import type { LunaticReducerState } from '../type';
 import { autoExploreLoop } from './commons/auto-explore-loop';
 import { reduceHandleChanges } from './reduce-handle-changes';
 import { ActionKind } from '../actions';
+import { ArticulationState } from '../../utils/getArticulationState';
 
 export function reduceGoNextPage(
 	state: LunaticReducerState
@@ -51,7 +52,7 @@ export function reduceGoNextPage(
 					responses: [
 						{
 							name: firstComponent.progressVariable,
-							value: 1,
+							value: ArticulationState.COMPLETED,
 							iteration: [newState.previousPager.iteration],
 						},
 					],

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

@@ -38,6 +38,8 @@ const baseState = {
 	options: { disableFilters: false, disableFiltersDescription: true },
 } satisfies LunaticReducerState;
 
+const onChange = { current: () => {} };
+
 export function reducerInitializer({
 	source,
 	data,
@@ -48,8 +50,8 @@ export function reducerInitializer({
 	disableFilters = false,
 	disableFiltersDescription = true,
 	getReferentiel,
-	onVariableChange,
-	logger,
+	onVariableChange = onChange,
+	logger = console.error,
 }: {
 	source: LunaticSource;
 	data: LunaticData;
@@ -60,8 +62,8 @@ export function reducerInitializer({
 	disableFilters?: LunaticOptions['disableFilters'];
 	disableFiltersDescription?: LunaticOptions['disableFiltersDescription'];
 	getReferentiel?: LunaticOptions['getReferentiel'];
-	onVariableChange: RefObject<LunaticOptions['onVariableChange']>;
-	logger: LunaticLogger;
+	onVariableChange?: RefObject<LunaticOptions['onVariableChange']>;
+	logger?: LunaticLogger;
 }): LunaticReducerState {
 	const variables = LunaticVariablesStore.makeFromSource(
 		source,
@@ -114,11 +116,13 @@ export function reducerInitializer({
 			}
 			return result as any;
 		} catch (e) {
-			// If there is an error interpreting a variable, return the raw expression
-			logger({
-				type: 'ERROR',
-				error: e as Error,
-			});
+			if (logger) {
+				// If there is an error interpreting a variable, return the raw expression
+				logger({
+					type: 'ERROR',
+					error: e as Error,
+				});
+			}
 			return expressionString;
 		}
 	};
@@ -135,9 +139,9 @@ export function reducerInitializer({
 	const pager = {
 		page: initialPager?.page ?? 1,
 		maxPage: source.maxPage ? parseInt(source.maxPage, 10) : 1,
-		subPage: undefined,
+		subPage: initialPager?.subPage,
 		nbSubPages: undefined,
-		iteration: undefined,
+		iteration: initialPager?.iteration,
 		nbIterations: undefined,
 		lastReachedPage: lastReachedPage ?? initialPage,
 	};
@@ -147,7 +151,7 @@ export function reducerInitializer({
 		pager,
 		previousPager: pager,
 		pages,
-		isInLoop: false,
+		isInLoop: pager.subPage !== undefined,
 		updatedAt: Date.now(),
 		overview: withOverview ? buildOverview(source) : [],
 		updateBindings,
@@ -165,22 +169,29 @@ function fillPagerForLoop(state: LunaticReducerState): LunaticReducerState {
 		return state;
 	}
 	const { isLoop, subPages, iterations, loopDependencies } = pages[pager.page];
-	if (!isLoop) {
-		return state;
+
+	if (
+		// For loop, jump at the first page
+		isLoop ||
+		// For roundabout, jump at the desired iteration / subpage (only if defined)
+		(pager?.iteration !== undefined && subPages)
+	) {
+		return {
+			...state,
+			isInLoop: true,
+			pager: {
+				...pager,
+				subPage: pager?.subPage ?? 1,
+				nbSubPages: (subPages ?? []).length,
+				iteration: pager?.iteration ?? 0,
+				nbIterations: forceInt(
+					state.executeExpression(iterations, {
+						deps: loopDependencies,
+					})
+				),
+			},
+		};
 	}
-	return {
-		...state,
-		isInLoop: true,
-		pager: {
-			...pager,
-			subPage: pager?.subPage ?? 0,
-			nbSubPages: (subPages ?? []).length,
-			iteration: pager?.iteration ?? 0,
-			nbIterations: forceInt(
-				state.executeExpression(iterations, {
-					deps: loopDependencies,
-				})
-			),
-		},
-	};
+
+	return state;
 }

package/src/use-lunatic/type.ts

@@ -358,6 +358,8 @@ export type LunaticState = {
 	 * ])
 	 */
 	handleChanges: LunaticChangesHandler;
+	/** Return the multimode state **/
+	getMultimode: () => Record<string, boolean>;
 };
 
 /** Function taking as arguments the various changes the user has made. */