feat: add persisting answers (price + PMR)

mquandalle · Dec 6, 2024 · e9ec978 · e9ec978
1 parent b714ba8
commit e9ec978
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 5 deletions.
diff --git a/src/lib/components/Questions.svelte b/src/lib/components/Questions.svelte
@@ -76,7 +76,7 @@
 			:
 		</p>
 		{#each questions as question}
-			{#if $publicodeSituation['demandeur . en situation de handicap'] !== 'oui' && question === 'revenu fiscal de référence par part'}
+			{#if question === 'revenu fiscal de référence par part'}
 				<RevenuSelector {goals} />
 			{:else if question !== 'revenu fiscal de référence par part'}
 				<!-- NOTE: needed to avoid dissociated question and values -->

diff --git a/src/lib/stores.ts b/src/lib/stores.ts
@@ -1,14 +1,24 @@
-import type { Questions, Situation } from '@betagouv/aides-velo';
-import { derived, get, writable, type Readable } from 'svelte/store';
+import type { Questions, RuleName, Situation } from '@betagouv/aides-velo';
+import { derived, get, writable } from 'svelte/store';
 
-export const localisation = writable(null);
+export const localisation = writable<any | null>(null);
 export const answers = writable({});
+// NOTE: maybe should be added to persisting answers
 export const revenuFiscal = writable(undefined);
 export const veloCat = writable<Questions['vélo . type']>();
 
+export const PERSISTING_ANSWSERS: RuleName[] = [
+	'demandeur . en situation de handicap',
+	'vélo . prix',
+];
+
+/** resetAnswers() will remove all answers from the store except the ones listed in {@link PERSISTING_ANSWSERS} */
 export const resetAnswers = () => {
 	if (Object.keys(get(answers)).length > 0) {
-		answers.set({});
+		const persistingAnswers = Object.fromEntries(
+			Object.entries(get(answers)).filter(([key]) => PERSISTING_ANSWSERS.includes(key as RuleName)),
+		);
+		answers.set(persistingAnswers);
 	}
 };
 

diff --git a/tests/navigation.spec.js b/tests/navigation.spec.js
@@ -131,6 +131,32 @@ test('Revenu selector', async ({ page }) => {
 	await expect(page.locator('.playwright-revenuoptions input[type=radio]')).toHaveCount(3);
 });
 
+test('Persisting answers', async ({ page }) => {
+	await page.goto(baseUrl + '/ville/lyon');
+	await page.waitForTimeout(100);
+	await expect(page.locator('text=aide non disponible')).toHaveCount(0);
+
+	await page.click('text=plus de 2 076 €');
+	await expect(page.locator('text=aide non disponible')).toHaveCount(8);
+
+	await page.getByLabel('Oui').click();
+	await expect(page.locator('text=aide non disponible')).toHaveCount(1);
+
+	await page.click("text=Achat d'un vélo électrique");
+	await page.waitForTimeout(100);
+	await expect(page.locator('text=total des aides >> ..')).toHaveText('Total des aides 400 €');
+
+	await page.fill('input:below(label:text("Quel est le prix du vélo  ?"))', '100');
+
+	await page.goBack();
+	await page.waitForTimeout(100);
+
+	await page.click("text=Achat d'un vélo mécanique simple");
+	await page.waitForTimeout(100);
+	await expect(page.locator('text=aide non disponible')).toHaveCount(0);
+	expect(page.getByTestId('question-velo-prix-value-100')).toBeTruthy();
+});
+
 test('New or second hand bike', async ({ page }) => {
 	await page.goto(baseUrl + '/ville/toulouse?velo=électrique');
 	expect(page.locator("text=neuf ou d'occasion ?")).toBeTruthy();