@inseefr/lunatic 3.14.0-rc-delay-sequence-cleaning.0 → 4.0.0

package/src/stories/behaviour/filter/sourceActiveFilters.json

@@ -0,0 +1,275 @@
+{
+	"$schema": "../../../../lunatic-schema.json",
+	"id": "activefilters",
+	"label": {
+		"type": "VTL|MD",
+		"value": "Story filters with external condition"
+	},
+	"modele": "ACTIVEFILTERS",
+	"maxPage": "5",
+	"resizing": {},
+	"variables": [
+		{
+			"name": "CADRE",
+			"variableType": "EXTERNAL",
+			"value": "OUI"
+		},
+		{
+			"name": "CADRE_ANSWER",
+			"values": {
+				"COLLECTED": null
+			},
+			"dimension": 0,
+			"variableType": "COLLECTED"
+		},
+		{
+			"name": "NAME",
+			"values": {
+				"COLLECTED": null
+			},
+			"dimension": 0,
+			"variableType": "COLLECTED"
+		},
+		{
+			"name": "AGE",
+			"values": {
+				"COLLECTED": null
+			},
+			"dimension": 0,
+			"variableType": "COLLECTED"
+		},
+		{
+			"name": "APPLE",
+			"values": {
+				"COLLECTED": null
+			},
+			"dimension": 0,
+			"variableType": "COLLECTED"
+		},
+		{
+			"name": "HAS_NAME",
+			"dimension": 0,
+			"expression": {
+				"type": "VTL",
+				"value": "not(isnull(NAME))"
+			},
+			"variableType": "CALCULATED"
+		}
+	],
+	"components": [
+		{
+			"id": "seq-situation",
+			"page": "1",
+			"label": {
+				"type": "VTL",
+				"value": "\"I - \" || \"Votre situation\""
+			},
+			"description": {
+				"type": "VTL|MD",
+				"value": "\"The next question will be filtered if the external variable CADRE=NON, its filter is kept when activeFilters is EXTERNAL\""
+			},
+			"componentType": "Sequence"
+		},
+		{
+			"id": "question-cadre",
+			"page": "2",
+			"label": {
+				"type": "VTL|MD",
+				"value": "\"1\\. \" || \"Question filtrée si CADRE = NON \""
+			},
+			"components": [
+				{
+					"id": "radio-cadre",
+					"page": "2",
+					"options": [
+						{
+							"label": {
+								"type": "VTL|MD",
+								"value": "\"Oui\""
+							},
+							"value": "1"
+						},
+						{
+							"label": {
+								"type": "VTL|MD",
+								"value": "\"Non\""
+							},
+							"value": "2"
+						}
+					],
+					"response": {
+						"name": "CADRE_ANSWER"
+					},
+					"isMandatory": false,
+					"orientation": "vertical",
+					"componentType": "Radio"
+				}
+			],
+			"componentType": "Question",
+			"conditionFilter": {
+				"type": "VTL",
+				"value": "CADRE = \"OUI\"",
+				"variablesDependencies": {
+					"COLLECTED": [],
+					"EXTERNAL": ["CADRE"],
+					"CALCULATED": []
+				}
+			}
+		},
+		{
+			"id": "question-name",
+			"page": "3",
+			"label": {
+				"type": "VTL|MD",
+				"value": "\"2\\. \" || \"What is your name ?\""
+			},
+			"components": [
+				{
+					"id": "input-name",
+					"page": "3",
+					"response": {
+						"name": "NAME"
+					},
+					"isMandatory": false,
+					"maxLength": 249,
+					"componentType": "Input"
+				}
+			],
+			"declarations": [
+				{
+					"id": "m48q03bn",
+					"label": {
+						"type": "VTL|MD",
+						"value": "\"Age filtered if name is not Paul, modality filtered if name is null\""
+					},
+					"position": "AFTER_QUESTION_TEXT",
+					"declarationType": "HELP"
+				}
+			],
+			"componentType": "Question",
+			"conditionFilter": {
+				"type": "VTL",
+				"value": "true",
+				"variablesDependencies": {
+					"COLLECTED": [],
+					"EXTERNAL": [],
+					"CALCULATED": []
+				}
+			}
+		},
+		{
+			"id": "question-age",
+			"page": "4",
+			"label": {
+				"type": "VTL|MD",
+				"value": "\"3\\. \" || \"How old are you ?\""
+			},
+			"components": [
+				{
+					"id": "input-age",
+					"page": "4",
+					"max": 200,
+					"min": 1,
+					"response": {
+						"name": "AGE"
+					},
+					"isMandatory": false,
+					"decimals": 0,
+					"componentType": "InputNumber"
+				}
+			],
+			"declarations": [
+				{
+					"id": "declaration-age",
+					"label": {
+						"type": "VTL|MD",
+						"value": "\"Filtered is NAME is not Paul\""
+					},
+					"position": "AFTER_QUESTION_TEXT",
+					"declarationType": "HELP"
+				}
+			],
+			"componentType": "Question",
+			"conditionFilter": {
+				"type": "VTL",
+				"value": "NAME = \"Paul\"",
+				"variablesDependencies": {
+					"COLLECTED": ["NAME"],
+					"EXTERNAL": [],
+					"CALCULATED": []
+				}
+			}
+		},
+		{
+			"id": "question-apple",
+			"page": "5",
+			"label": {
+				"type": "VTL|MD",
+				"value": "\"4\\. \" || \"Do you like apple ?\""
+			},
+			"declarations": [
+				{
+					"id": "declaration-apple",
+					"label": {
+						"type": "VTL|MD",
+						"value": "\"Filtered if there is no name provided\""
+					},
+					"position": "AFTER_QUESTION_TEXT",
+					"declarationType": "HELP"
+				}
+			],
+			"components": [
+				{
+					"id": "radio-apple",
+					"page": "5",
+					"options": [
+						{
+							"label": {
+								"type": "VTL|MD",
+								"value": "\"yes\""
+							},
+							"value": "1"
+						},
+						{
+							"label": {
+								"type": "VTL|MD",
+								"value": "\"no\""
+							},
+							"value": "2",
+							"conditionFilter": {
+								"type": "VTL",
+								"value": "HAS_NAME",
+								"variablesDependencies": {
+									"COLLECTED": [],
+									"EXTERNAL": [],
+									"CALCULATED": ["HAS_NAME"]
+								}
+							}
+						}
+					],
+					"response": {
+						"name": "APPLE"
+					},
+					"isMandatory": false,
+					"orientation": "vertical",
+					"componentType": "Radio"
+				}
+			],
+			"componentType": "Question",
+			"conditionFilter": {
+				"type": "VTL",
+				"value": "true",
+				"variablesDependencies": {
+					"COLLECTED": [],
+					"EXTERNAL": [],
+					"CALCULATED": []
+				}
+			}
+		}
+	],
+	"pagination": "question",
+	"componentType": "Questionnaire",
+	"enoCoreVersion": "3.29.3-SNAPSHOT",
+	"generatingDate": "12-10-2026",
+	"lunaticModelVersion": "6.1.0"
+}

package/src/stories/utils/Orchestrator.tsx

@@ -21,7 +21,7 @@ import { Logger } from '../../utils/logger';
 import { OrchestratorOverview } from './OrchestratorOverview';
 import { SchemaValidator } from './SchemaValidator';
 import { OrchestratorData } from './OrchestratorData';
-import type { PageTag } from '../../use-lunatic/type';
+import type { ActiveFilter, PageTag } from '../../use-lunatic/type';
 import type { IndexEntry } from '../../utils/search/SearchInterface';
 import { OrchestratorSidebar } from './OrchestratorSidebar';
 import type { Meta, StoryObj } from '@storybook/react';
@@ -49,7 +49,7 @@ type Props = {
 	// Preload suggester data at the start of the form
 	autoSuggesterLoading: boolean;
 	disableFiltersDescription?: boolean;
-	disableFilters?: boolean;
+	activeFilters?: ActiveFilter;
 	management?: boolean;
 	shortcut?: boolean;
 	activeControls?: boolean;
@@ -66,8 +66,8 @@ function OrchestratorForStories(props: Readonly<Props>) {
 	const {
 		source,
 		data,
-		disableFilters,
 		disableFiltersDescription,
+		activeFilters,
 		management,
 		shortcut,
 		activeControls,
@@ -107,8 +107,8 @@ function OrchestratorForStories(props: Readonly<Props>) {
 		getMultimode,
 	} = useLunatic(source, data, {
 		initialPage,
-		disableFilters,
 		disableFiltersDescription,
+		activeFilters,
 		onChange: onLogChange,
 		getReferentiel,
 		management,
@@ -305,10 +305,11 @@ export const OrchestratorMeta: Meta<typeof Orchestrator> = {
 		autoSuggesterLoading: { table: { disable: true } },
 		missingStrategy: { table: { disable: true } },
 		extraTabs: { table: { disable: true } },
+		activeFilters: { control: 'select', options: ['ALL', 'EXTERNAL', 'NONE'] },
 	},
 	args: {
-		disableFilters: false,
 		disableFiltersDescription: false,
+		activeFilters: 'ALL',
 		management: false,
 		shortcut: false,
 		activeControls: true,

package/src/type.source.ts

@@ -390,8 +390,17 @@ export type VTLExpression = {
 	 * Variables used in the expression
 	 */
 	bindingDependencies?: string[];
+	variablesDependencies?: VariablesDependencies;
 	type: 'VTL' | 'VTL|MD' | 'TXT';
 };
+/**
+ * Variables grouped by type (collected, external and calculated)
+ */
+export type VariablesDependencies = {
+	COLLECTED?: string[];
+	EXTERNAL?: string[];
+	CALCULATED?: string[];
+};
 export type ComponentDefinitionBase = {
 	label?: VTLExpression;
 	description?: VTLExpression;
@@ -428,6 +437,7 @@ export type VTLScalarExpression = {
 	 * Variables used in the expression
 	 */
 	bindingDependencies?: string[];
+	variablesDependencies?: VariablesDependencies;
 	type: 'VTL';
 	shapeFrom?: string;
 };

package/src/use-lunatic/commons/fill-components/fill-component.spec.ts

@@ -378,7 +378,7 @@ describe('fillComponents', () => {
 		expect(filledComponents[1].componentType).toBe('Input');
 	});
 
-	it('should filter out components with conditionFilter=false when disableFilters is false or undefined', () => {
+	it('should filter out components with conditionFilter=false by default', () => {
 		const components = [
 			{
 				id: 'input1',
@@ -407,7 +407,6 @@ describe('fillComponents', () => {
 		const mockState = {
 			...defaultMockState,
 			variables: mockVariables,
-			disableFilters: false,
 		};
 
 		const filledComponents = fillComponents(
@@ -418,7 +417,7 @@ describe('fillComponents', () => {
 		expect(filledComponents).toHaveLength(0);
 	});
 
-	it('should not filter out components with conditionFilter=false when disableFilters is true', () => {
+	it('should not filter out components with conditionFilter=false when activeFilters is NONE', () => {
 		const components = [
 			{
 				id: 'input1',
@@ -447,7 +446,7 @@ describe('fillComponents', () => {
 		const mockState = {
 			...defaultMockState,
 			variables: mockVariables,
-			disableFilters: true,
+			activeFilters: 'NONE',
 		};
 
 		const filledComponents = fillComponents(
@@ -527,7 +526,7 @@ describe('fillComponents', () => {
 		expect(radio.options[1].label).toBe('"No"');
 	});
 
-	it('should never transform components into Text when disableFilters is true', () => {
+	it('should never transform components into Text when activeFilters is NONE', () => {
 		const components = [
 			{
 				id: 'input1',
@@ -562,7 +561,7 @@ describe('fillComponents', () => {
 
 		const mockState = {
 			...defaultMockState,
-			disableFilters: true,
+			activeFilters: 'NONE',
 			variables: mockVariables,
 		};
 
@@ -627,7 +626,7 @@ describe('fillComponents', () => {
 
 		const mockState = {
 			...defaultMockState,
-			disableFilters: true,
+			activeFilters: 'NONE',
 			variables: mockVariables,
 		};
 
@@ -681,7 +680,7 @@ describe('fillComponents', () => {
 
 		const mockState = {
 			...defaultMockState,
-			disableFilters: true,
+			activeFilters: 'NONE',
 			variables: mockVariables,
 		};
 
@@ -739,7 +738,6 @@ describe('fillComponents', () => {
 
 		const mockState = {
 			...defaultMockState,
-			disableFilters: true,
 			variables: mockVariables,
 		};
 

package/src/use-lunatic/commons/fill-components/fill-components.ts

@@ -1,4 +1,5 @@
 import type {
+	ActiveFilter,
 	LunaticChangesHandler,
 	LunaticComponentDefinition,
 	LunaticOptions,
@@ -16,8 +17,8 @@ import { LunaticLogger } from '../../logger/type';
 import { VTLScalarExpression } from '../../../type.source';
 
 export type FillComponentArgs = {
-	disableFilters?: boolean;
 	disableFiltersDescription?: true;
+	activeFilters?: ActiveFilter;
 	handleChanges: LunaticChangesHandler;
 	executeExpression: LunaticReducerState['executeExpression'];
 	goToPage: LunaticState['goToPage'];
@@ -86,7 +87,6 @@ export const fillComponent = (
 			pagerIteration: state.pager.iteration,
 			value,
 			logger: state.logger,
-			disableFilters: state.disableFilters,
 			shouldParentBeFiltered: shouldBeFiltered,
 		}),
 		...getComponentTypeProps(interpretedProps, state),
@@ -118,7 +118,7 @@ export function fillComponents(
 		];
 	});
 
-	if (state.disableFilters) {
+	if (state.activeFilters === 'NONE') {
 		return filledComponents;
 	}
 
@@ -128,11 +128,11 @@ export function fillComponents(
 			(filledComponent.conditionFilter ?? true)
 				? filledComponent
 				: // Replace the component by an empty text component
-					({
-						...filledComponent,
-						label: '',
-						componentType: 'Text',
-					} as LunaticComponentProps)
+				({
+					...filledComponent,
+					label: '',
+					componentType: 'Text',
+				} as LunaticComponentProps)
 		);
 	}
 

package/src/use-lunatic/commons/index.ts

@@ -1,6 +1,10 @@
 export { default as checkLoops } from './pagination/check-loops';
 export { default as createMapPages } from './pagination/create-map-pages';
 export { default as executeConditionFilter } from './execute-condition-filter';
+export {
+	removeConditionFilters,
+	shouldKeepFilter,
+} from './remove-condition-filters';
 export { default as getCompatibleVTLExpression } from './get-compatible-vtl-expression';
 export { default as isFirstLastPage } from './pagination/is-First-last-page';
 export {

package/src/use-lunatic/commons/pagination/page.ts

@@ -94,7 +94,7 @@ export function isPageEmpty(state: LunaticReducerState): boolean {
 	const components = getComponentsFromState(state, true);
 
 	const visibleComponents = components.filter((component) => {
-		if (options.disableFilters) {
+		if (options.activeFilters === 'NONE') {
 			return true;
 		}
 

package/src/use-lunatic/commons/remove-condition-filters.spec.ts

@@ -0,0 +1,131 @@
+import { describe, expect, it } from 'vitest';
+import type { LunaticSource } from '../type';
+import { removeConditionFilters } from './remove-condition-filters';
+
+const externalFilter = {
+	type: 'VTL',
+	value: 'CADRE = "OUI"',
+	variablesDependencies: { EXTERNAL: ['CADRE'], COLLECTED: [], CALCULATED: [] },
+};
+
+const collectedFilter = {
+	type: 'VTL',
+	value: 'NAME = "Paul"',
+	variablesDependencies: { EXTERNAL: [], COLLECTED: ['NAME'], CALCULATED: [] },
+};
+
+const calculatedFilter = {
+	type: 'VTL',
+	value: 'HAS_NAME',
+	variablesDependencies: {
+		EXTERNAL: [],
+		COLLECTED: [],
+		CALCULATED: ['HAS_NAME'],
+	},
+};
+
+const source = {
+	variables: [],
+	components: [
+		{
+			id: 'outside-loop',
+			page: '1',
+			componentType: 'Question',
+			conditionFilter: externalFilter,
+			components: [
+				{
+					id: 'radio',
+					componentType: 'Radio',
+					response: { name: 'ANSWER' },
+					options: [
+						{ value: 'yes', label: 'Yes', conditionFilter: externalFilter },
+						{ value: 'no', label: 'No', conditionFilter: collectedFilter },
+					],
+				},
+				{
+					id: 'checkboxes',
+					componentType: 'CheckboxGroup',
+					responses: [
+						{
+							id: 'external-response',
+							label: 'External',
+							response: { name: 'EXTERNAL_RESPONSE' },
+							conditionFilter: externalFilter,
+						},
+						{
+							id: 'calculated-response',
+							label: 'Calculated',
+							response: { name: 'CALCULATED_RESPONSE' },
+							conditionFilter: calculatedFilter,
+						},
+					],
+				},
+			],
+		},
+		{
+			id: 'loop',
+			page: '2',
+			componentType: 'Loop',
+			paginatedLoop: false,
+			iterations: { type: 'VTL', value: '2' },
+			conditionFilter: collectedFilter,
+			components: [
+				{
+					id: 'loop-occurrence',
+					componentType: 'Question',
+					conditionFilter: collectedFilter,
+					components: [],
+				},
+			],
+		},
+	],
+} as unknown as LunaticSource;
+
+describe('removeConditionFilters', () => {
+	it('keeps only external-only filters throughout components, options, and responses', () => {
+		const cleaned = removeConditionFilters(source, 'EXTERNAL') as any;
+
+		expect(cleaned.components[0].conditionFilter).toEqual(externalFilter);
+		expect(cleaned.components[0].components[0].options).toEqual([
+			{ value: 'yes', label: 'Yes', conditionFilter: externalFilter },
+			{ value: 'no', label: 'No' },
+		]);
+		expect(cleaned.components[0].components[1].responses).toEqual([
+			{
+				id: 'external-response',
+				label: 'External',
+				response: { name: 'EXTERNAL_RESPONSE' },
+				conditionFilter: externalFilter,
+			},
+			{
+				id: 'calculated-response',
+				label: 'Calculated',
+				response: { name: 'CALCULATED_RESPONSE' },
+			},
+		]);
+		expect(cleaned.components[1].conditionFilter).toBeUndefined();
+		expect(cleaned.components[1].components[0].conditionFilter).toBeUndefined();
+	});
+
+	it('removes filters recursively when activeFilters is NONE and preserves the source for ALL', () => {
+		const withoutFilters = removeConditionFilters(source, 'NONE') as any;
+
+		expect(withoutFilters.components[0].conditionFilter).toBeUndefined();
+		expect(
+			withoutFilters.components[0].components[0].options.every(
+				(option: { conditionFilter?: unknown }) =>
+					!('conditionFilter' in option)
+			)
+		).toBe(true);
+		expect(
+			withoutFilters.components[0].components[1].responses.every(
+				(response: { conditionFilter?: unknown }) =>
+					!('conditionFilter' in response)
+			)
+		).toBe(true);
+		expect(
+			withoutFilters.components[1].components[0].conditionFilter
+		).toBeUndefined();
+		expect(removeConditionFilters(source, 'ALL')).toBe(source);
+	});
+});