@inseefr/lunatic 3.11.0 → 3.11.2

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

@@ -680,6 +680,89 @@ describe('lunatic-variables-store', () => {
 			variables.commit();
 			expect(variables.get('PRENOM')).toEqual('John');
 		});
+
+		it('should clean pairwise in two directions with a queue', () => {
+			variables.set('LINKS', [
+				[null, '1', '3'],
+				['1', null, '3'],
+				['2', '2', null],
+			]);
+			variables.set('PRENOM', ['Dad', 'Mom', 'Unknow']);
+			cleaningBehaviour(
+				variables,
+				{
+					PRENOM: {
+						LINKS: [
+							{
+								expression: 'PRENOM <> ""',
+								shapeFrom: 'PRENOM',
+								isAggregatorUsed: false,
+							},
+						],
+					},
+				},
+				{
+					PRENOM: [],
+					LINKS: [],
+				}
+			);
+
+			// when
+			variables.set('PRENOM', '', { iteration: [1] });
+			variables.set('PRENOM', '', { iteration: [2] });
+
+			expect(variables.get('PRENOM')).toEqual(['Dad', '', '']);
+			variables.commit();
+			// then
+			expect(variables.get('LINKS')).toEqual([
+				[null, null, null],
+				[null, null, null],
+				[null, null, null],
+			]);
+		});
+
+		it('should clean pairwise in two directions with a queue with canceling', () => {
+			variables.set('LINKS', [
+				[null, '1', '3'],
+				['1', null, '3'],
+				['2', '2', null],
+			]);
+			variables.set('PRENOM', ['Dad', 'Mom', 'Unknow']);
+			cleaningBehaviour(
+				variables,
+				{
+					PRENOM: {
+						LINKS: [
+							{
+								expression: 'PRENOM <> ""',
+								shapeFrom: 'PRENOM',
+								isAggregatorUsed: false,
+							},
+						],
+					},
+				},
+				{
+					PRENOM: [],
+					LINKS: [],
+				}
+			);
+
+			// when
+			variables.set('PRENOM', '', { iteration: [1] });
+			variables.set('PRENOM', '', { iteration: [2] });
+
+			expect(variables.get('PRENOM')).toEqual(['Dad', '', '']);
+
+			variables.set('PRENOM', 'Not Unknow', { iteration: [2] });
+			expect(variables.get('PRENOM')).toEqual(['Dad', '', 'Not Unknow']);
+			variables.commit();
+			// then
+			expect(variables.get('LINKS')).toEqual([
+				[null, null, '3'],
+				[null, null, null],
+				['2', null, null],
+			]);
+		});
 	});
 
 	describe('missing', () => {

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

@@ -66,6 +66,13 @@ class Timekey {
 	}
 }
 
+export function getChangedKey(
+	variableName: string,
+	iteration?: IterationLevel
+) {
+	return `${variableName} | ${JSON.stringify(iteration)}`;
+}
+
 export class LunaticVariablesStore {
 	private readonly dictionary = new Map<string, LunaticVariable>();
 	private readonly eventTarget = new EventTarget();
@@ -95,7 +102,7 @@ export class LunaticVariablesStore {
 		const { changeHandler, disableCleaning, autoCommit } = options;
 
 		const store = new LunaticVariablesStore();
-		if (globalThis.window === undefined) {
+		if (globalThis.window !== undefined) {
 			(globalThis.window as any).lunaticStore = store; // Allow access to the store from the console
 		}
 		if (!source.variables) {
@@ -183,23 +190,25 @@ export class LunaticVariablesStore {
 	public enqueueSet(
 		name: string,
 		value: unknown,
-		args: Pick<EventArgs['change'], 'iteration' | 'cause'> = {}
+		args: Pick<EventArgs['change'], 'iteration' | 'cause'> = {},
+		// usefull for pairwise, iteration is used but we need to change all variable even if we touch to only one iteration
+		forcedChangedKey?: string
 	) {
 		if (this.autoCommit) {
 			this.set(name, typeof value === 'function' ? value() : value, args);
 			return;
 		}
-		this.queue[args.cause ?? 'default'].set(
-			`${name} | ${args.iteration}`,
-			() => {
-				// A function can be enqueued, we need to evaluate it to retrieve the value to set
-				// This is used for the resizing, where we want to resize the last version of the variable
-				if (typeof value === 'function') {
-					value = value();
-				}
-				this.set(name, value, args);
+
+		const changeKey = forcedChangedKey ?? getChangedKey(name, args.iteration);
+
+		this.queue[args.cause ?? 'default'].set(changeKey, () => {
+			// A function can be enqueued, we need to evaluate it to retrieve the value to set
+			// This is used for the resizing & cleaning, where we want to resize the last version of the variable
+			if (typeof value === 'function') {
+				value = value();
 			}
-		);
+			this.set(name, value, args);
+		});
 	}
 
 	public unqueueSet(
@@ -209,7 +218,9 @@ export class LunaticVariablesStore {
 		if (this.autoCommit) {
 			return;
 		}
-		this.queue[args.cause ?? 'default'].delete(`${name} | ${args.iteration}`);
+		this.queue[args.cause ?? 'default'].delete(
+			getChangedKey(name, args.iteration)
+		);
 	}
 
 	/**