@inseefr/lunatic 3.4.13 → 3.4.15

package/src/use-lunatic/commons/variables/get-questionnaire-data.ts

@@ -13,10 +13,6 @@ export function getQuestionnaireData(
 		COLLECTED: {} as Record<
 			string,
 			{
-				EDITED: unknown;
-				FORCED: unknown;
-				INPUTTED: unknown;
-				PREVIOUS: unknown;
 				COLLECTED: unknown;
 			}
 		>,
@@ -34,10 +30,6 @@ export function getQuestionnaireData(
 				variableNames.map((name) => [
 					name,
 					{
-						EDITED: null,
-						FORCED: null,
-						INPUTTED: null,
-						PREVIOUS: null,
 						COLLECTED: store.get(name),
 					},
 				])
@@ -53,10 +45,6 @@ export function getQuestionnaireData(
 
 		if (variable.variableType === 'COLLECTED') {
 			result.COLLECTED[variable.name] = {
-				PREVIOUS: null,
-				FORCED: null,
-				EDITED: null,
-				INPUTTED: null,
 				...variable.values,
 				COLLECTED: store.get(variable.name),
 			};

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

@@ -449,10 +449,6 @@ describe('lunatic-variables-store', () => {
 						{
 							name: 'PRENOM',
 							values: {
-								EDITED: null,
-								FORCED: null,
-								INPUTTED: null,
-								PREVIOUS: null,
 								COLLECTED: 'John',
 							},
 							variableType: 'COLLECTED',
@@ -460,10 +456,6 @@ describe('lunatic-variables-store', () => {
 						{
 							name: 'NOM',
 							values: {
-								EDITED: null,
-								FORCED: null,
-								INPUTTED: null,
-								PREVIOUS: null,
 								COLLECTED: '',
 							},
 							variableType: 'COLLECTED',

package/src/use-lunatic/hooks/use-page-has-response.test.ts

@@ -0,0 +1,143 @@
+import { describe, expect, it, vi } from 'vitest';
+import { usePageHasResponse } from './use-page-has-response';
+import { type LunaticComponentProps } from '../../components/type';
+import { renderHook } from '@testing-library/react';
+
+const defaultComponentValues = {
+	id: 'a',
+	value: null,
+	handleChanges: vi.fn(),
+};
+
+describe('usePageHasResponse', () => {
+	it('should be true when there are no components', () => {
+		const components: LunaticComponentProps[] = [];
+		const { result } = renderHook(() =>
+			usePageHasResponse(components, vi.fn())
+		);
+		expect(result.current()).toBeTruthy();
+	});
+
+	it('should be false when there is no value', () => {
+		const components: LunaticComponentProps[] = [
+			{ ...defaultComponentValues, componentType: 'Text' },
+		];
+		const { result } = renderHook(() =>
+			usePageHasResponse(components, vi.fn())
+		);
+		expect(result.current()).toBeFalsy();
+	});
+
+	it('should be true when there is a value', () => {
+		const components: LunaticComponentProps[] = [
+			{
+				...defaultComponentValues,
+				componentType: 'Text',
+				value: 'my awesome value',
+			},
+		];
+		const { result } = renderHook(() =>
+			usePageHasResponse(components, vi.fn())
+		);
+		expect(result.current()).toBeTruthy();
+	});
+
+	it('should be true for a Question component', () => {
+		const components: LunaticComponentProps[] = [
+			{
+				...defaultComponentValues,
+				componentType: 'Question',
+				components: [
+					{
+						...defaultComponentValues,
+						componentType: 'Text',
+					},
+				],
+				value: { t1: 'my awesome value' },
+			},
+		];
+		const { result } = renderHook(() =>
+			usePageHasResponse(components, vi.fn())
+		);
+		expect(result.current()).toBeTruthy();
+	});
+
+	it('should be true when there is a missing response', () => {
+		const components: LunaticComponentProps[] = [
+			{
+				...defaultComponentValues,
+				componentType: 'Text',
+				missingResponse: { name: 'a_MISSING', value: 'my missing value' },
+			},
+		];
+		const { result } = renderHook(() =>
+			usePageHasResponse(components, vi.fn())
+		);
+		expect(result.current()).toBeTruthy();
+	});
+
+	it('should be true for a QCM table', () => {
+		const mockExecuteExpression = vi.fn();
+		mockExecuteExpression.mockReturnValueOnce('my value');
+		const components: LunaticComponentProps[] = [
+			{
+				...defaultComponentValues,
+				componentType: 'Table',
+				body: [
+					[
+						{
+							...defaultComponentValues,
+							id: 't1',
+							componentType: 'CheckboxBoolean',
+							response: { name: 't1' },
+						},
+					],
+				],
+				header: [{ label: 'my label' }],
+				executeExpression: vi.fn(),
+				iteration: 0,
+				value: {},
+			},
+		];
+		const { result } = renderHook(() =>
+			usePageHasResponse(components, mockExecuteExpression)
+		);
+		expect(result.current()).toBeTruthy();
+	});
+
+	it('should be true for a QCM table in a Question', () => {
+		const mockExecuteExpression = vi.fn();
+		mockExecuteExpression.mockReturnValueOnce('my value');
+		const components: LunaticComponentProps[] = [
+			{
+				...defaultComponentValues,
+				componentType: 'Question',
+				components: [
+					{
+						...defaultComponentValues,
+						componentType: 'Table',
+						body: [
+							[
+								{
+									...defaultComponentValues,
+									id: 't1',
+									componentType: 'CheckboxBoolean',
+									response: { name: 't1' },
+								},
+							],
+						],
+						header: [{ label: 'my label' }],
+						executeExpression: vi.fn(),
+						iteration: 0,
+						value: { t1: true },
+					},
+				],
+				value: {},
+			},
+		];
+		const { result } = renderHook(() =>
+			usePageHasResponse(components, mockExecuteExpression)
+		);
+		expect(result.current()).toBeTruthy();
+	});
+});

package/src/use-lunatic/hooks/use-page-has-response.ts

@@ -11,59 +11,76 @@ export function usePageHasResponse(
 	executeExpression: LunaticReducerState['executeExpression']
 ): () => boolean {
 	return useCallback(() => {
-		if (!Array.isArray(components) || components.length === 0) {
+		return hasOneResponse(components, executeExpression);
+	}, [components, executeExpression]);
+}
+
+function hasOneResponse(
+	components: LunaticComponentProps[],
+	executeExpression: LunaticReducerState['executeExpression']
+): boolean {
+	if (!Array.isArray(components) || components.length === 0) {
+		return true;
+	}
+
+	for (const component of components) {
+		// Some components are considered as "filled" by default
+		// We assume they are not in the same page has other components
+		if (
+			['PairwiseLinks', 'Roundabout', 'Sequence', 'Subsequence'].includes(
+				component.componentType ?? ''
+			)
+		) {
 			return true;
 		}
 
-		for (const component of components) {
-			// Some components are considered as "filled" by default
-			// We assume they are not in the same page has other components
-			if (
-				['PairwiseLinks', 'Roundabout', 'Sequence', 'Subsequence'].includes(
-					component.componentType ?? ''
-				)
-			) {
-				return true;
-			}
+		// We have a missing response for this component
+		if (
+			'missingResponse' in component &&
+			component.missingResponse &&
+			component.missingResponse.value
+		) {
+			return true;
+		}
 
-			// We have a missing response for this component
-			if (
-				'missingResponse' in component &&
-				component.missingResponse &&
-				component.missingResponse.value
-			) {
-				return true;
-			}
+		// For Table, we have to extract components from its body and apply isSubComponentsEmpty function
+		if (component.componentType === 'Table') {
+			// Body is array for array (row), each "cell" could be an Label or Component, so we filter array.
+			const childrenComponent = component.body.reduce((_, row) => {
+				const componentsInRow = row.filter(
+					(cell) => isObject(cell) && 'componentType' in cell
+				);
+				return [..._, ...componentsInRow];
+			}, [] as LunaticComponentProps[]);
+			return !isSubComponentsEmpty(childrenComponent, executeExpression);
+		}
 
-			// For Table, we have to extract components from its body and apply isSubComponentsEmpty function
-			if (component.componentType === 'Table') {
-				// Body is array for array (row), each "cell" could be an Label or Component, so we filter array.
-				const childrenComponent = component.body.reduce((_, row) => {
-					const componentsInRow = row.filter(
-						(cell) => isObject(cell) && 'componentType' in cell
-					);
-					return [..._, ...componentsInRow];
-				}, [] as LunaticComponentProps[]);
-				return !isSubComponentsEmpty(childrenComponent, executeExpression);
-			}
+		// We found a value in one of the root component
+		if ('value' in component && !isEmpty(component.value)) {
+			return true;
+		}
 
-			// We found a value in one of the root component
-			if ('value' in component && !isEmpty(component.value)) {
-				return true;
-			}
+		// For Question, we need to check subcomponents
+		if (
+			component.componentType === 'Question' &&
+			'components' in component &&
+			Array.isArray(component.components) &&
+			hasOneResponse(component.components, executeExpression)
+		) {
+			return true;
+		}
 
-			// For rosterForLoop we need to inspect child components
-			if (
-				'components' in component &&
-				Array.isArray(component.components) &&
-				!isSubComponentsEmpty(component.components, executeExpression)
-			) {
-				return true;
-			}
+		// For rosterForLoop we need to inspect child components
+		if (
+			'components' in component &&
+			Array.isArray(component.components) &&
+			!isSubComponentsEmpty(component.components, executeExpression)
+		) {
+			return true;
 		}
+	}
 
-		return false;
-	}, [components, executeExpression]);
+	return false;
 }
 
 /**

package/src/use-lunatic/type.ts

@@ -74,10 +74,6 @@ export type PageTag = `${number}.${number}#${number}` | `${number}`;
 export type LunaticVariable = Variable;
 export type LunaticCollectedValue = Partial<{
 	COLLECTED: unknown;
-	EDITED: unknown;
-	FORCED: unknown;
-	INPUTTED: unknown;
-	PREVIOUS: unknown;
 }>;
 
 // We need a mapped type to correlate type and variableType

package/src/use-lunatic/use-lunatic.test.ts

@@ -20,10 +20,6 @@ const dataFromObject = (o: Record<string, unknown>): LunaticData => {
 			(acc, k) => ({
 				...acc,
 				[k]: {
-					EDITED: null,
-					FORCED: null,
-					INPUTTED: null,
-					PREVIOUS: null,
 					COLLECTED: o[k],
 				},
 			}),

package/src/utils/constants/variable-status.ts

@@ -1,5 +1 @@
-export const PREVIOUS = 'PREVIOUS' as const;
 export const COLLECTED = 'COLLECTED' as const;
-export const FORCED = 'FORCED' as const;
-export const EDITED = 'EDITED' as const;
-export const INPUTTED = 'INPUTTED' as const;

package/src/utils/variables.spec.ts

@@ -15,10 +15,6 @@ const data = {
 		},
 		PRENOMS: {
 			COLLECTED: ['Paul', 'Pierre'],
-			EDITED: [],
-			INPUTTED: [],
-			FORCED: [],
-			PREVIOUS: [],
 		},
 		AGE: {},
 	},
@@ -49,10 +45,6 @@ const loopCollectedVariable = {
 	variableType: 'COLLECTED',
 	values: {
 		COLLECTED: [],
-		PREVIOUS: [],
-		FORCED: [],
-		EDITED: [],
-		INPUTTED: [],
 	},
 	name: 'PRENOMS',
 } as LunaticVariable;

package/tests/utils/lunatic.d.ts

@@ -10,10 +10,6 @@ export declare function generateVariable({ type, name }: {
     variableType: string;
     name: string;
     values: {
-        PREVIOUS: null;
         COLLECTED: null;
-        FORCED: null;
-        EDITED: null;
-        INPUTTED: null;
     };
 };

package/tests/utils/lunatic.js

@@ -24,11 +24,7 @@ function generateVariable({ type = 'COLLECTED', name = 'VARIABLE' }) {
         variableType: type,
         name: name,
         values: {
-            PREVIOUS: null,
             COLLECTED: null,
-            FORCED: null,
-            EDITED: null,
-            INPUTTED: null,
         },
     };
 }

package/tests/utils/lunatic.js.map

@@ -1 +1 @@
-{"version":3,"file":"lunatic.js","sourceRoot":"","sources":["../../src/tests/utils/lunatic.ts"],"names":[],"mappings":";;AAKA,oCAiBC;AAED,4CAYC;AAlCD;;GAEG;AACH,SAAgB,YAAY,CAC3B,IAAO;IAEP,OAAO;QACN,SAAS,EAAE,MAAM,CAAC,WAAW,CAC5B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;YAC1C,GAAG;YACH;gBACC,UAAU,EAAE,IAAI;gBAChB,QAAQ,EAAE,IAAI;gBACd,SAAS,EAAE,KAAK;aAChB;SACD,CAAC,CACqB;QACxB,UAAU,EAAE,EAAE;QACd,QAAQ,EAAE,EAAE;KACZ,CAAC;AACH,CAAC;AAED,SAAgB,gBAAgB,CAAC,EAAE,IAAI,GAAG,WAAW,EAAE,IAAI,GAAG,UAAU,EAAE;IACzE,OAAO;QACN,YAAY,EAAE,IAAI;QAClB,IAAI,EAAE,IAAI;QACV,MAAM,EAAE;YACP,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,IAAI;YACf,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,IAAI;SACd;KACD,CAAC;AACH,CAAC"}
+{"version":3,"file":"lunatic.js","sourceRoot":"","sources":["../../src/tests/utils/lunatic.ts"],"names":[],"mappings":";;AAKA,oCAiBC;AAED,4CAQC;AA9BD;;GAEG;AACH,SAAgB,YAAY,CAC3B,IAAO;IAEP,OAAO;QACN,SAAS,EAAE,MAAM,CAAC,WAAW,CAC5B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;YAC1C,GAAG;YACH;gBACC,UAAU,EAAE,IAAI;gBAChB,QAAQ,EAAE,IAAI;gBACd,SAAS,EAAE,KAAK;aAChB;SACD,CAAC,CACqB;QACxB,UAAU,EAAE,EAAE;QACd,QAAQ,EAAE,EAAE;KACZ,CAAC;AACH,CAAC;AAED,SAAgB,gBAAgB,CAAC,EAAE,IAAI,GAAG,WAAW,EAAE,IAAI,GAAG,UAAU,EAAE;IACzE,OAAO;QACN,YAAY,EAAE,IAAI;QAClB,IAAI,EAAE,IAAI;QACV,MAAM,EAAE;YACP,SAAS,EAAE,IAAI;SACf;KACD,CAAC;AACH,CAAC"}