@inseefr/lunatic 3.4.10 → 3.4.11-rc.0

package/src/i18n/dictionary.ts

@@ -1,6 +1,11 @@
 const dictionary = {
 	DEFAULT_BUTTON_ADD: { fr: 'Ajouter une ligne', en: 'Add row' },
 	DEFAULT_BUTTON_REMOVE: { fr: 'Supprimer une ligne', en: 'Remove row' },
+	DEFAULT_BUTTON_REMOVE_THAT_ROW: {
+		fr: 'Supprimer cette ligne',
+		en: 'Remove that row',
+	},
+	ACTION_HEADER: { fr: 'Action', en: 'Action' },
 	MODAL_IGNORE: { fr: 'Poursuivre', en: 'Ignore' },
 	MODAL_CORRECT: { fr: 'Corriger ma réponse', en: 'Correct' },
 	DK: { fr: 'Ne sais pas', en: "Don't know" },

package/src/stories/pairwise/data.json

@@ -1,6 +1,6 @@
 {
 	"COLLECTED": {
-		"PRENOM": { "COLLECTED": ["Dad", "Mom", "Unknow"] },
+		"PRENOM": { "COLLECTED": ["Dad", "Mom", "Daughter"] },
 		"AGE": { "COLLECTED": [30, 29, 5] },
 		"LINKS": {
 			"COLLECTED": [[null]]

package/src/stories/pairwise/source.json

@@ -341,7 +341,9 @@
 	"resizing": {
 		"PRENOM": {
 			"sizeForLinksVariables": ["count(PRENOM)", "count(PRENOM)"],
-			"linksVariables": ["LINKS"]
+			"linksVariables": ["LINKS"],
+			"size": "count(PRENOM)",
+			"variables": ["AGE"]
 		}
 	}
 }

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,

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

@@ -1855,329 +1855,6 @@ exports[`use-lunatic() > overview > with loop > should handle initialPage 1`] =
 ]
 `;
 
-exports[`use-lunatic() > overview > with loop > should handle lastReachedPage 1`] = `
-[
-  {
-    "children": [
-      {
-        "children": [],
-        "current": false,
-        "description": undefined,
-        "id": "lujqeci5",
-        "label": <MDLabel
-          expression="Votre santé"
-        />,
-        "page": "2",
-        "reached": true,
-        "type": "Subsequence",
-      },
-      {
-        "children": [],
-        "current": false,
-        "description": undefined,
-        "id": "lujqbyzl",
-        "label": <MDLabel
-          expression="Votre logement"
-        />,
-        "page": "3",
-        "reached": true,
-        "type": "Subsequence",
-      },
-    ],
-    "current": true,
-    "description": undefined,
-    "id": "lujqfpva",
-    "label": <MDLabel
-      expression="I - Séquence 1"
-    />,
-    "page": "1",
-    "reached": true,
-    "type": "Sequence",
-  },
-  {
-    "children": [
-      {
-        "children": [],
-        "current": false,
-        "description": undefined,
-        "id": "lulbmyhr",
-        "label": <MDLabel
-          expression="Commentaire sur composition du logement"
-        />,
-        "page": "8",
-        "reached": true,
-        "type": "Subsequence",
-      },
-    ],
-    "current": false,
-    "description": undefined,
-    "id": "lujqrqmp",
-    "label": <MDLabel
-      expression="II - Habitants du logement"
-    />,
-    "page": "5",
-    "reached": true,
-    "type": "Sequence",
-  },
-  {
-    "children": [
-      {
-        "children": [],
-        "current": false,
-        "description": undefined,
-        "id": "lujykwaz",
-        "label": <MDLabel
-          expression="Caractéristiques de Quentin"
-        />,
-        "page": "10.1#1",
-        "reached": true,
-        "type": "Subsequence",
-      },
-      {
-        "children": [],
-        "current": false,
-        "description": undefined,
-        "id": "lujykwaz",
-        "label": <MDLabel
-          expression="Caractéristiques de Luna"
-        />,
-        "page": "10.1#2",
-        "reached": true,
-        "type": "Subsequence",
-      },
-      {
-        "children": [],
-        "current": false,
-        "description": undefined,
-        "id": "lujykwaz",
-        "label": <MDLabel
-          expression="Caractéristiques de Paul"
-        />,
-        "page": "10.1#3",
-        "reached": true,
-        "type": "Subsequence",
-      },
-      {
-        "children": [],
-        "current": false,
-        "description": undefined,
-        "id": "lujyik5q",
-        "label": <MDLabel
-          expression="Autres caractéristiques de Luna : filtrée pour le premier individu"
-        />,
-        "page": "11.1#2",
-        "reached": true,
-        "type": "Subsequence",
-      },
-      {
-        "children": [],
-        "current": false,
-        "description": undefined,
-        "id": "luk0swcz",
-        "label": <MDLabel
-          expression="Encore d'autres caractéristiques de Luna : filtrée pour le premier individu"
-        />,
-        "page": "11.2#2",
-        "reached": true,
-        "type": "Subsequence",
-      },
-      {
-        "children": [],
-        "current": false,
-        "description": undefined,
-        "id": "lujyik5q",
-        "label": <MDLabel
-          expression="Autres caractéristiques de Paul : filtrée pour le premier individu"
-        />,
-        "page": "11.1#3",
-        "reached": false,
-        "type": "Subsequence",
-      },
-      {
-        "children": [],
-        "current": false,
-        "description": undefined,
-        "id": "luk0swcz",
-        "label": <MDLabel
-          expression="Encore d'autres caractéristiques de Paul : filtrée pour le premier individu"
-        />,
-        "page": "11.2#3",
-        "reached": false,
-        "type": "Subsequence",
-      },
-    ],
-    "current": false,
-    "description": undefined,
-    "id": "lujyi4pe",
-    "label": <MDLabel
-      expression="III - Détail des individus"
-    />,
-    "page": "9",
-    "reached": true,
-    "type": "Sequence",
-  },
-  {
-    "children": [
-      {
-        "children": [],
-        "current": false,
-        "description": undefined,
-        "id": "lumfc98o",
-        "label": <MDLabel
-          expression="Belle sous-séquence pour Quentin"
-        />,
-        "page": "12.2#1",
-        "reached": false,
-        "type": "Subsequence",
-      },
-      {
-        "children": [],
-        "current": false,
-        "description": undefined,
-        "id": "lumfe3bj",
-        "label": <MDLabel
-          expression="Autre belle sous-seq"
-        />,
-        "page": "12.3#1",
-        "reached": false,
-        "type": "Subsequence",
-      },
-    ],
-    "current": false,
-    "description": undefined,
-    "id": "luk1ojt5",
-    "label": <MDLabel
-      expression="IV - Belle séquence pour Quentin"
-    />,
-    "page": "12.1#1",
-    "reached": false,
-    "type": "Sequence",
-  },
-  {
-    "children": [],
-    "current": false,
-    "description": undefined,
-    "id": "lulbelgr",
-    "label": <MDLabel
-      expression="V - Autre séquence pour Quentin"
-    />,
-    "page": "12.4#1",
-    "reached": false,
-    "type": "Sequence",
-  },
-  {
-    "children": [
-      {
-        "children": [],
-        "current": false,
-        "description": undefined,
-        "id": "lumfc98o",
-        "label": <MDLabel
-          expression="Belle sous-séquence pour Luna"
-        />,
-        "page": "12.2#2",
-        "reached": false,
-        "type": "Subsequence",
-      },
-      {
-        "children": [],
-        "current": false,
-        "description": undefined,
-        "id": "lumfe3bj",
-        "label": <MDLabel
-          expression="Autre belle sous-seq"
-        />,
-        "page": "12.3#2",
-        "reached": false,
-        "type": "Subsequence",
-      },
-    ],
-    "current": false,
-    "description": undefined,
-    "id": "luk1ojt5",
-    "label": <MDLabel
-      expression="IV - Belle séquence pour Luna"
-    />,
-    "page": "12.1#2",
-    "reached": false,
-    "type": "Sequence",
-  },
-  {
-    "children": [],
-    "current": false,
-    "description": undefined,
-    "id": "lulbelgr",
-    "label": <MDLabel
-      expression="V - Autre séquence pour Luna"
-    />,
-    "page": "12.4#2",
-    "reached": false,
-    "type": "Sequence",
-  },
-  {
-    "children": [
-      {
-        "children": [],
-        "current": false,
-        "description": undefined,
-        "id": "lumfc98o",
-        "label": <MDLabel
-          expression="Belle sous-séquence pour Paul"
-        />,
-        "page": "12.2#3",
-        "reached": false,
-        "type": "Subsequence",
-      },
-      {
-        "children": [],
-        "current": false,
-        "description": undefined,
-        "id": "lumfe3bj",
-        "label": <MDLabel
-          expression="Autre belle sous-seq"
-        />,
-        "page": "12.3#3",
-        "reached": false,
-        "type": "Subsequence",
-      },
-    ],
-    "current": false,
-    "description": undefined,
-    "id": "luk1ojt5",
-    "label": <MDLabel
-      expression="IV - Belle séquence pour Paul"
-    />,
-    "page": "12.1#3",
-    "reached": false,
-    "type": "Sequence",
-  },
-  {
-    "children": [],
-    "current": false,
-    "description": undefined,
-    "id": "lulbelgr",
-    "label": <MDLabel
-      expression="V - Autre séquence pour Paul"
-    />,
-    "page": "12.4#3",
-    "reached": false,
-    "type": "Sequence",
-  },
-  {
-    "children": [],
-    "current": false,
-    "description": undefined,
-    "id": "COMMENT-SEQ",
-    "label": <MDLabel
-      expression="Commentaire"
-    />,
-    "page": "13",
-    "reached": false,
-    "type": "Sequence",
-  },
-]
-`;
-
 exports[`use-lunatic() > overview > with loop > should work with loop 1`] = `
 [
   {

package/src/use-lunatic/commons/variables/behaviours/resizing-behaviour.ts

@@ -1,9 +1,8 @@
 import type { LunaticVariablesStore } from '../lunatic-variables-store';
 import type { LunaticSource } from '../../../type';
 import { forceInt } from '../../../../utils/number';
-import { resizeArrayVariable } from '../../../reducer/commons';
 import { getExpressionAsString } from '../../../../utils/vtl';
-import { resizeArray } from '../../../../utils/array';
+import { resizeArray, resizeDownArrayWithIndex } from '../../../../utils/array';
 
 /**
  * Resizing behaviour for the store
@@ -42,8 +41,20 @@ export function resizingBehaviour(
 		const newSize = forceInt(store.run(resizingInfo.size));
 		for (const variableName of resizingInfo.variables) {
 			const value = store.get(variableName);
-			if (!Array.isArray(value) || value.length !== newSize) {
-				store.set(variableName, resizeArrayVariable(value, newSize, null), {
+			if (Array.isArray(value) && e.detail.removedIndex) {
+				store.set(
+					variableName,
+					resizeDownArrayWithIndex(value, e.detail.removedIndex),
+					{
+						cause: 'resizing',
+					}
+				);
+			}
+			if (
+				!e.detail.removedIndex &&
+				(!Array.isArray(value) || value.length !== newSize)
+			) {
+				store.set(variableName, resizeArray(value, newSize, null), {
 					cause: 'resizing',
 				});
 			}
@@ -61,6 +72,7 @@ function resizePairwise(
 	},
 	args: {
 		iteration?: number[];
+		removedIndex?: number;
 	}
 ) {
 	// Handle expression being sent as an array or an object (ensure backward compatibility)
@@ -78,12 +90,25 @@ function resizePairwise(
 	});
 	resizingInfo.linksVariables.forEach((variable) => {
 		const value = store.get(variable, args.iteration);
-		const resizedValue = resizeArray(
-			// The value is not an array, force an array
-			Array.isArray(value) ? value.map((i) => resizeArray(i, ySize, null)) : [],
-			xSize,
-			new Array(ySize).fill(null)
-		);
+		let resizedValue;
+		if (args.removedIndex) {
+			const removedIndex = args.removedIndex;
+			resizedValue = resizeDownArrayWithIndex(
+				Array.isArray(value)
+					? value.map((i) => resizeDownArrayWithIndex(i, removedIndex))
+					: [],
+				removedIndex
+			);
+		} else {
+			resizedValue = resizeArray(
+				// The value is not an array, force an array
+				Array.isArray(value)
+					? value.map((i) => resizeArray(i, ySize, null))
+					: [],
+				xSize,
+				new Array(ySize).fill(null)
+			);
+		}
 		store.set(variable, resizedValue);
 	});
 }

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

@@ -281,6 +281,28 @@ describe('lunatic-variables-store', () => {
 				cause: 'resizing',
 			});
 		});
+
+		it('should resize variables with Index', () => {
+			variables.set('PRENOM', ['John', 'Jane', 'Marc']);
+			variables.set('AGE', [20, 30, 40]);
+			const spy = vi.fn();
+			variables.on('change', (e) => spy(e.detail));
+			resizingBehaviour(variables, {
+				PRENOM: {
+					size: 'count(PRENOM)',
+					variables: ['AGE'],
+				},
+			});
+			variables.set('PRENOM', ['John', 'Marc'], { removedIndex: 1 });
+			expect((variables.get('PRENOM') as string[]).length).toEqual(2);
+			expect((variables.get('AGE') as string[]).length).toEqual(2);
+			expect(spy).toHaveBeenLastCalledWith({
+				name: 'AGE',
+				value: [20, 40],
+				cause: 'resizing',
+			});
+		});
+
 		it('should resize pairwise with the array syntax', () => {
 			variables.set('PRENOM', []);
 			variables.set('LINKS', [[]]);
@@ -316,7 +338,29 @@ describe('lunatic-variables-store', () => {
 				[null, null, null],
 			]);
 		});
-		it('should handle both pairwise and normal resize', () => {
+		it('should resize pairwise with the object syntax with index', () => {
+			variables.set('PRENOM', ['John', 'Jane', 'Marc']);
+			variables.set('LINKS', [
+				[null, 2, 4],
+				[1, null, 2],
+				[3, 2, null],
+			]);
+			resizingBehaviour(variables, {
+				PRENOM: {
+					sizeForLinksVariables: {
+						xAxisSize: 'count(PRENOM)',
+						yAxisSize: 'count(PRENOM)',
+					},
+					linksVariables: ['LINKS'],
+				},
+			});
+			variables.set('PRENOM', ['John', 'Marc'], { removedIndex: 1 });
+			expect(variables.get('LINKS') as string[][]).toEqual([
+				[null, 4],
+				[3, null],
+			]);
+		});
+		it('should handle both: pairwise and normal resize', () => {
 			variables.set('PRENOM', []);
 			variables.set('NOM', []);
 			variables.set('LINKS', [[]]);
@@ -336,6 +380,29 @@ describe('lunatic-variables-store', () => {
 			]);
 			expect(variables.get('NOM') as string[]).toEqual([null, null, null]);
 		});
+		it('should handle both: pairwise and normal resize with index', () => {
+			variables.set('PRENOM', ['John', 'Jane', 'Marc']);
+			variables.set('AGE', [40, 30, 20]);
+			variables.set('LINKS', [
+				[null, 2, 4],
+				[1, null, 2],
+				[3, 2, null],
+			]);
+			resizingBehaviour(variables, {
+				PRENOM: {
+					sizeForLinksVariables: ['count(PRENOM)', 'count(PRENOM)'],
+					linksVariables: ['LINKS'],
+					size: 'count(PRENOM)',
+					variables: ['AGE'],
+				},
+			});
+			variables.set('PRENOM', ['John', 'Marc'], { removedIndex: 1 });
+			expect(variables.get('LINKS') as string[][]).toEqual([
+				[null, 4],
+				[3, null],
+			]);
+			expect(variables.get('AGE') as string[]).toEqual([40, 20]);
+		});
 	});
 
 	describe('cleaning', () => {

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

@@ -33,6 +33,8 @@ export type EventArgs = {
 		value: unknown;
 		/** Iteration changed (for array). */
 		iteration?: IterationLevel | undefined;
+		/** removedIndex: when resize an array directly with only one handleChange (remove one line in tableLoop) */
+		removedIndex?: number;
 		/** What triggered this change. */
 		cause?: 'resizing' | 'cleaning';
 		/** Extra sent when setting the variable. */
@@ -123,7 +125,7 @@ export class LunaticVariablesStore {
 	public set(
 		name: string,
 		value: unknown,
-		args: Pick<EventArgs['change'], 'iteration' | 'cause'> = {}
+		args: Pick<EventArgs['change'], 'iteration' | 'cause' | 'removedIndex'> = {}
 	): LunaticVariable {
 		if (!this.dictionary.has(name)) {
 			this.dictionary.set(

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

@@ -1,2 +1 @@
-export { default as resizeArrayVariable } from './resize-array-variable';
 export * from './validate-condition-filter';

package/src/use-lunatic/type.ts

@@ -349,5 +349,6 @@ export type LunaticChangesHandler = (
 		name: string;
 		value: any;
 		iteration?: number[];
+		removedIndex?: number;
 	}[]
 ) => void;

package/src/utils/array.spec.ts

@@ -1,5 +1,10 @@
 import { describe, it, expect } from 'vitest';
-import { firstValueItem, resizeArray, setAtIndex } from './array';
+import {
+	firstValueItem,
+	resizeArray,
+	resizeDownArrayWithIndex,
+	setAtIndex,
+} from './array';
 
 describe('array', () => {
 	describe('resizeArray()', () => {
@@ -45,4 +50,16 @@ describe('array', () => {
 		expect(firstValueItem([null, 1, 2])).toBe(1);
 		expect(firstValueItem([null, undefined, false])).toBe(false);
 	});
+	describe('resizeDownArrayWithIndex()', () => {
+		it('should remove an element of array', () => {
+			expect(resizeDownArrayWithIndex([1, 2, 3, 4], 2)).toEqual([1, 2, 4]);
+			expect(resizeDownArrayWithIndex([1, 2, 3, 4], 0)).toEqual([2, 3, 4]);
+			expect(resizeDownArrayWithIndex([1, 2, 3, 4], 3)).toEqual([1, 2, 3]);
+		});
+
+		it('should not remove element (out of index)', () => {
+			expect(resizeDownArrayWithIndex([1, 2, 3, 4], -1)).toEqual([1, 2, 3, 4]);
+			expect(resizeDownArrayWithIndex([1, 2, 3, 4], 4)).toEqual([1, 2, 3, 4]);
+		});
+	});
 });

package/src/utils/array.ts

@@ -51,6 +51,9 @@ export function getAtIndex(arr: unknown, indexes: number[]): unknown {
 	return current;
 }
 
+/**
+ * Cast the variable into an array and adjust the length if necessary
+ */
 export function resizeArray<T = unknown>(
 	array: unknown,
 	newLength: number,
@@ -63,14 +66,29 @@ export function resizeArray<T = unknown>(
 	if (array.length === newLength) {
 		return array;
 	}
-	return new Array(newLength).fill(defaultValue ?? null).map(function (
-		value,
+	return new Array(newLength).fill(defaultValue ?? null).reduce(function (
+		step,
+		current,
 		index
 	) {
-		return index < array.length ? array[index] : value;
+		if (index < array.length) {
+			return [...step, array[index]];
+		}
+		return [...step, current];
 	}, []);
 }
 
+export function resizeDownArrayWithIndex<T = unknown>(
+	array: T[],
+	removedIndex: number
+): T[] {
+	// the removedIndex is not in array
+	if (0 > removedIndex || array.length <= removedIndex) {
+		return array;
+	}
+	return [...array].filter((_, i) => i !== removedIndex);
+}
+
 /**
  * Return the first non-null/undefined value of an array
  */