@inseefr/lunatic 3.8.1-rc.0 → 3.9.0

package/src/components/Suggester/Suggester.tsx

@@ -44,7 +44,7 @@ export function WrappedSuggester({
 	// so we can break the rule of hooks here
 	const computeSelectedOptions = (): [SuggesterOptionType] | [] => {
 		if (arbitraryValue) {
-			return [{ id: 'OTHER', label: arbitraryValue, value: 'OTHER' }];
+			return [{ id: OTHER_VALUE, label: arbitraryValue, value: OTHER_VALUE }];
 		}
 		if (!value) {
 			return [];
@@ -62,13 +62,7 @@ export function WrappedSuggester({
 		if (typeof label !== 'string') {
 			return [{ id: value, label: value, value: value }];
 		}
-		return [
-			{
-				id: value,
-				label: label,
-				value: value,
-			},
-		];
+		return [{ id: value, label: label, value: value }];
 	};
 
 	const [selectedOptions, setSelectedOptions] = useState<
@@ -153,15 +147,16 @@ export function WrappedSuggester({
 
 	useEffect(() => {
 		// Fix display issue (when handleChanges is called outside this component (in management mode, return to FORCED value by example)
-		// "value" does'nt match selectedOption's "id"
-		if (value && selectedOptions[0]?.id !== value) {
+		// "value" doesn't match selectedOption's "id"
+		if (selectedOptions[0]?.id !== value) {
 			const actualSelection = computeSelectedOptions();
-			const selectedOptionsWithLabel = [
-				{
-					...actualSelection[0],
-					label: getLabelById(actualSelection[0]?.id),
-				},
-			] as [SuggesterOptionType];
+			const selectedOptionsWithLabel = actualSelection.map((selection) => {
+				if (selection.id === OTHER_VALUE) return selection;
+				return {
+					...selection,
+					label: getLabelById(selection.id),
+				};
+			}) as [SuggesterOptionType];
 			setSelectedOptions(selectedOptionsWithLabel);
 		}
 		// eslint-disable-next-line react-hooks/exhaustive-deps

package/src/components/Suggester/useSuggestions.ts

@@ -25,7 +25,7 @@ export function useStore({ storeName }: { storeName: string }) {
 	const [state, setState] = useState<State>(
 		store.error !== null
 			? 'error'
-			: store?.search.isIndexed()
+			: store.search.isIndexed()
 				? 'success'
 				: 'loading'
 	);
@@ -51,7 +51,7 @@ export function useStore({ storeName }: { storeName: string }) {
 		setStoreState: setState,
 		getLabelById: (id: any) => {
 			if (!id) return '';
-			return store.search?.getFieldsById(id).label ?? '';
+			return store.search?.getFieldsById(id)?.label ?? '';
 		},
 	};
 }

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

@@ -984,5 +984,111 @@ describe('lunatic-variables-store', () => {
 
 			expect(store.get('GLOBAL_ENFANTS_PRENOMS', [4])).toBe(undefined);
 		});
+
+		it('should compute correctly GLOBAL array variable across calculated variables, even if not intialize', () => {
+			// Given a source with a pairwise component
+			const pairwiseComponent = {
+				id: 'm8ob5u9l',
+				page: '3',
+				symLinks: {
+					LINKS: {
+						'1': '1',
+						'2': '3',
+						'3': '2',
+					},
+				},
+				components: [
+					{
+						id: 'm8ob5u9l-pairwise-dropdown',
+						label: {
+							type: 'VTL|MD',
+							value: '"Qui est " || yAxis || " pour " || xAxis || " ?"',
+						},
+						options: [
+							{
+								label: {
+									type: 'VTL',
+									value: '"Son conjoint, sa conjointe"',
+								},
+								value: '1',
+							},
+							{
+								label: { type: 'VTL', value: '"Sa mère, son père"' },
+								value: '2',
+							},
+							{
+								label: { type: 'VTL', value: '"Sa fille, son fils"' },
+								value: '3',
+							},
+						],
+						response: { name: 'LINKS' },
+						isMandatory: false,
+						componentType: 'Dropdown',
+						conditionFilter: {
+							type: 'VTL',
+							value: '(nvl(xAxis, "") <> "") and (nvl(yAxis, "") <> "")',
+						},
+					},
+				],
+				sourceVariables: {
+					name: 'PRENOM',
+					gender: 'SEXE',
+				},
+				componentType: 'PairwiseLinks',
+				xAxisIterations: { type: 'VTL', value: 'count(PRENOM)' },
+				yAxisIterations: { type: 'VTL', value: 'count(PRENOM)' },
+			} as ComponentDefinitionWithPage;
+
+			// When we create the store
+			const store = LunaticVariablesStore.makeFromSource(
+				{
+					components: [pairwiseComponent],
+					variables: [
+						{
+							name: 'PRENOM',
+							values: { COLLECTED: [] },
+							dimension: 1,
+							variableType: 'COLLECTED',
+							iterationReference: 'm8ob7c76',
+						},
+						{
+							name: 'SEXE',
+							values: { COLLECTED: [] },
+							dimension: 1,
+							variableType: 'COLLECTED',
+							iterationReference: 'm8ob7c76',
+						},
+						{
+							name: 'LINKS',
+							values: { COLLECTED: [[]] },
+							dimension: 2,
+							variableType: 'COLLECTED',
+							iterationReference: 'm8ob7c76',
+						},
+					],
+				},
+				{},
+				{ changeHandler: { current: () => {} } }
+			);
+
+			// When pairwise link is updated
+			store.set('PRENOM', ['Child', 'Dad']);
+			store.set('SEXE', ['1', '1']);
+			store.set('LINKS', [
+				[null, '2'],
+				['3', null],
+			]);
+			store.commit();
+			expect(
+				store.run('"Your children are : " || GLOBAL_ENFANTS_PRENOMS', {
+					iteration: [0],
+				})
+			).toBe('Your children are : null');
+			expect(
+				store.run('"Your children are : " || GLOBAL_ENFANTS_PRENOMS', {
+					iteration: [1],
+				})
+			).toBe('Your children are : Child');
+		});
 	});
 });

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

@@ -540,21 +540,28 @@ export class LunaticVariable {
 		opts: { iteration?: IterationLevel; ignoreIterationOnScalar?: boolean }
 	): boolean {
 		const { iteration, ignoreIterationOnScalar } = opts;
-		if (value === this.getSavedValue(iteration)) {
-			return false;
-		}
-		// Decompose arrays, to only update items that changed
-		if (Array.isArray(value) && !Array.isArray(iteration)) {
-			return this.setValueForArray(value);
-		}
-		// We want to save a value at a specific iteration, but the value is not an array yet
+
+		// We want to save a value at a specific iteration
+		// but the value is not an array yet
+		// we have to initialize the array even if we want to set an `null` or `undefined` value
+		// (if no, issue with getCalculatedAt that check if this.value is an array, it return global updatedValue instead of the iteration one)
 		if (iteration !== undefined && !Array.isArray(this.value)) {
 			// Ignore the iteration since the value is not an array
 			if (ignoreIterationOnScalar) {
 				return this.setValue(value, {});
 			}
+			// we have to set empty array at first before compare the with the SavedValue
 			this.value = [];
 		}
+
+		if (value === this.getSavedValue(iteration)) {
+			return false;
+		}
+		// Decompose arrays, to only update items that changed
+		if (Array.isArray(value) && !Array.isArray(iteration)) {
+			return this.setValueForArray(value);
+		}
+
 		this.value = !Array.isArray(iteration)
 			? value
 			: setAtIndex(this.value, iteration, value);
@@ -680,33 +687,21 @@ export class LunaticVariable {
 	}
 
 	public getUpdatedAt(iteration?: IterationLevel): number {
-		if (this.dimension === 0) {
-			return this.updatedAt.get(undefined) ?? 0;
-		}
 		// The value is an array, do not look at the root updatedAt if an iteration is provided
-		if (Array.isArray(this.value)) {
-			return this.updatedAt.get(iteration?.join('.')) ?? 0;
+		if (iteration !== undefined && Array.isArray(this.value)) {
+			return this.updatedAt.get(iteration.join('.')) ?? 0;
 		}
-		return (
-			this.updatedAt.get(iteration?.join('.')) ??
-			this.updatedAt.get(undefined) ??
-			0
-		);
+		// undefined key is for root level
+		return this.updatedAt.get(undefined) ?? 0;
 	}
 
 	public getCalculatedAt(iteration?: IterationLevel): number {
-		if (this.dimension === 0) {
-			return this.calculatedAt.get(undefined) ?? 0;
+		// The value is an array, do not look at the root calculatedAt if an iteration is provided
+		if (iteration !== undefined && Array.isArray(this.value)) {
+			return this.calculatedAt.get(iteration.join('.')) ?? 0;
 		}
-		// The value is an array, do not look at the root updatedAt if an iteration is provided
-		if (Array.isArray(this.value)) {
-			return this.calculatedAt.get(iteration?.join('.')) ?? 0;
-		}
-		return (
-			this.calculatedAt.get(iteration?.join('.')) ??
-			this.calculatedAt.get(undefined) ??
-			0
-		);
+		// undefined key is for root level
+		return this.calculatedAt.get(undefined) ?? 0;
 	}
 }