@inseefr/lunatic 3.5.5 → 3.5.7

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

@@ -208,6 +208,7 @@ describe('getOptionsProp()', () => {
 
 			// Ensure the option is not filtered
 			expect(options).toHaveLength(1);
+			expect(options[0].shouldBeFiltered).toBe(false);
 		});
 		it('should not filter option (radio) when its conditionFilter evaluation fails', () => {
 			const definition = {
@@ -237,6 +238,7 @@ describe('getOptionsProp()', () => {
 
 			// Ensure the option is not filtered
 			expect(options).toHaveLength(1);
+			expect(options[0].shouldBeFiltered).toBe(false);
 		});
 		it('should not filter any response (CheckboxGroup) when disableFilters is true', () => {
 			const definition = {
@@ -268,6 +270,8 @@ describe('getOptionsProp()', () => {
 
 			// Ensure the option is not filtered
 			expect(options).toHaveLength(1);
+			// the option should would have been filtered if we did not disable filters
+			expect(options[0].shouldBeFiltered).toBe(true);
 		});
 		it('should not filter any option (Radio) when disableFilters is true', () => {
 			const definition = {
@@ -296,7 +300,67 @@ describe('getOptionsProp()', () => {
 				true // disableFilters = true
 			);
 
+			// Ensure the option is not filtered
+			expect(options).toHaveLength(1);
+			// the option should would have been filtered if we did not disable filters
+			expect(options[0].shouldBeFiltered).toBe(true);
+		});
+		it('should set the response (CheckboxGroup) shouldBeFiltered=true when the parent component should be filtered', () => {
+			const definition = {
+				...checkboxGroupDefinition,
+				responses: [
+					{
+						label: 'Option 1',
+						response: { name: 'O1' },
+						id: 'id1',
+						conditionFilter: { type: 'VTL', value: 'expression' },
+					},
+				],
+			} satisfies DeepTranslateExpression<LunaticComponentDefinition>;
+
+			const options = getOptionsProp(
+				definition,
+				variables,
+				mockChange,
+				undefined,
+				undefined,
+				mockLogger,
+				true, // disableFilters = true
+				true // parent component should be filtered
+			);
+
+			// Ensure the option is not filtered
+			expect(options).toHaveLength(1);
+			// the option would have been filtered if we did not disable filters because its parent would
+			expect(options[0].shouldBeFiltered).toBe(true);
+		});
+		it('should set the option (Radio) shouldBeFiltered=true when the parent component should be filtered', () => {
+			const definition = {
+				...radioDefinition,
+				options: [
+					{
+						label: 'Option 1',
+						value: 'id1',
+						conditionFilter: { type: 'VTL', value: 'expression' },
+					},
+				],
+			} as any as DeepTranslateExpression<LunaticComponentDefinition>;
+
+			const options = getOptionsProp(
+				definition,
+				variables,
+				mockChange,
+				undefined,
+				undefined,
+				mockLogger,
+				true, // disableFilters = true
+				true // parent component should be filtered
+			);
+
+			// Ensure the option is not filtered
 			expect(options).toHaveLength(1);
+			// the option would have been filtered if we did not disable filters because its parent would
+			expect(options[0].shouldBeFiltered).toBe(true);
 		});
 	});
 });

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

@@ -8,6 +8,7 @@ import type { DeepTranslateExpression } from '../commons/fill-components/fill-co
 import { isNumber } from '../../utils/number';
 import type { LunaticVariablesStore } from '../commons/variables/lunatic-variables-store';
 import { LunaticLogger } from '../logger/type';
+import { VtlExpression } from '../../components/type';
 
 /* Used for radio option and checkbox one option */
 export type InterpretedOption = {
@@ -32,10 +33,10 @@ export function getOptionsProp(
 	pagerIteration: LunaticState['pager']['iteration'],
 	value: unknown,
 	logger: LunaticLogger,
-	disableFilters?: boolean
+	disableFilters?: boolean,
+	shouldParentBeFiltered?: boolean
 ) {
 	const iteration = isNumber(pagerIteration) ? [pagerIteration] : undefined;
-	//const iteration = pagerIteration ? [pagerIteration] : undefined;
 
 	if (definition.componentType === 'CheckboxGroup') {
 		return definition.responses
@@ -43,16 +44,12 @@ export function getOptionsProp(
 				if (disableFilters || !response.conditionFilter) {
 					return true;
 				}
-				try {
-					return variables.run(response.conditionFilter.value, { iteration });
-				} catch (e) {
-					// If there is an error interpreting a variable, we do not filter
-					logger({
-						type: 'ERROR',
-						error: e as Error,
-					});
-					return true;
-				}
+				return !isFilteredOutOption(
+					variables,
+					iteration,
+					logger,
+					response.conditionFilter
+				);
 			})
 			.map((response) => ({
 				label: response.label,
@@ -74,6 +71,14 @@ export function getOptionsProp(
 							]);
 						}
 					: undefined,
+				shouldBeFiltered:
+					shouldParentBeFiltered ||
+					isFilteredOutOption(
+						variables,
+						iteration,
+						logger,
+						response.conditionFilter
+					),
 			}));
 	}
 
@@ -90,16 +95,12 @@ export function getOptionsProp(
 			) {
 				return true;
 			}
-			try {
-				return variables.run(option.conditionFilter.value, { iteration });
-			} catch (e) {
-				// If there is an error interpreting a variable, we do not filter
-				logger({
-					type: 'ERROR',
-					error: e as Error,
-				});
-				return true;
-			}
+			return !isFilteredOutOption(
+				variables,
+				iteration,
+				logger,
+				option.conditionFilter
+			);
 		})
 		.map((option) => ({
 			label: option.label,
@@ -126,5 +127,32 @@ export function getOptionsProp(
 							handleChanges([{ name: option.detail!.response.name, value }]);
 						}
 					: null,
+			shouldBeFiltered:
+				shouldParentBeFiltered ||
+				('conditionFilter' in option &&
+					isFilteredOutOption(
+						variables,
+						iteration,
+						logger,
+						option.conditionFilter
+					)),
 		}));
 }
+
+/**
+ * Check if an option should be filtered, depending on its conditionFilter.
+ */
+function isFilteredOutOption(
+	variables: LunaticVariablesStore,
+	iteration: number[] | undefined,
+	logger: LunaticLogger,
+	conditionFilter?: VtlExpression
+): boolean {
+	if (!conditionFilter) return false;
+	try {
+		return !variables.run(conditionFilter.value, { iteration });
+	} catch (e) {
+		logger({ type: 'ERROR', error: e as Error });
+		return false;
+	}
+}