ever-co
diff --git a/‎.cspell.json‎
Lines changed: 3 additions & 0 deletions b/‎.cspell.json‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎apps/gauzy-e2e/src/support/Base/pagedata/ChangeLanguagePageData.ts‎
Lines changed: 8 additions & 7 deletions b/‎apps/gauzy-e2e/src/support/Base/pagedata/ChangeLanguagePageData.ts‎
Lines changed: 8 additions & 7 deletions
diff --git a/‎apps/gauzy-e2e/src/support/Base/pagedata/SettingsButtonPageData.ts‎
Lines changed: 13 additions & 11 deletions b/‎apps/gauzy-e2e/src/support/Base/pagedata/SettingsButtonPageData.ts‎
Lines changed: 13 additions & 11 deletions
diff --git a/‎apps/gauzy-e2e/tests/bdd/steps/change-language.steps.ts‎
Lines changed: 4 additions & 4 deletions b/‎apps/gauzy-e2e/tests/bdd/steps/change-language.steps.ts‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎apps/gauzy-e2e/tests/support/bdd.ts‎
Lines changed: 9 additions & 0 deletions b/‎apps/gauzy-e2e/tests/support/bdd.ts‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎apps/gauzy-e2e/tests/support/fixtures.ts‎
Lines changed: 11 additions & 0 deletions b/‎apps/gauzy-e2e/tests/support/fixtures.ts‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎apps/gauzy-e2e/tests/support/pages/ChangeLanguage.po.ts‎
Lines changed: 11 additions & 8 deletions b/‎apps/gauzy-e2e/tests/support/pages/ChangeLanguage.po.ts‎
Lines changed: 11 additions & 8 deletions
diff --git a/‎apps/gauzy-e2e/tests/support/pages/SettingsButton.po.ts‎
Lines changed: 14 additions & 8 deletions b/‎apps/gauzy-e2e/tests/support/pages/SettingsButton.po.ts‎
Lines changed: 14 additions & 8 deletions
diff --git a/‎apps/gauzy-e2e/tests/support/pages/SettingsFeatures.po.ts‎
Lines changed: 6 additions & 3 deletions b/‎apps/gauzy-e2e/tests/support/pages/SettingsFeatures.po.ts‎
Lines changed: 6 additions & 3 deletions
diff --git a/‎apps/gauzy-e2e/tools/serve-web.js‎
Lines changed: 4 additions & 2 deletions b/‎apps/gauzy-e2e/tools/serve-web.js‎
Lines changed: 4 additions & 2 deletions
@@ -545,6 +545,9 @@
         "lresult",
         "lyria",
         "macbook",
+        "macrotask",
+        "animatable",
+        "unhashed",
         "MAINDB",
         "MAINLOADSPLASH",
         "MAINLOADURL",
 
@@ -8,11 +8,12 @@ export const ChangeLanguagePageData = {
 	English: 'Create',
 	Russian: 'Создать',
 	Hebrew: 'צור',
-	// Language-select option prefixes. Options render as "EN (English)" / "BG (Български)" etc.
-	// (code + translated name) in a DB-driven order, so we pick options BY CODE PREFIX rather than by
-	// the Cypress index (which assumed a fixed alphabetical order that the backend does not guarantee).
-	codeEnglish: 'EN ',
-	codeBulgarian: 'BG ',
-	codeRussian: 'RU ',
-	codeHebrew: 'HE '
+	// Language-select option hooks. Options render as "[flag] Name" (flag <img> + translated name,
+	// no code prefix) in a DB-driven order, so we pick options by the flag asset in their <img src>
+	// — the only locale-invariant marker now that the code prefix is gone (language→country mapping
+	// mirrors getLanguageFlagUrl in @gauzy/ui-core/shared).
+	flagEnglish: 'flags/gb.svg',
+	flagBulgarian: 'flags/bg.svg',
+	flagRussian: 'flags/ru.svg',
+	flagHebrew: 'flags/il.svg'
 };
@@ -2,17 +2,19 @@ export const SettingsButtonData = {
 	// Light/Dark theme toggle now drives the body skin classes.
 	lightTheme: 'nb-theme-gauzy-light',
 	darkTheme: 'nb-theme-gauzy-dark',
-	// Language options are labelled with a language-invariant 2-letter code
-	// prefix (e.g. "EN (English)" / "EN (Английский)"), so we match on the code.
-	languageEnglish: 'EN ',
-	languageBulgarian: 'BG ',
-	languageHebrew: 'HE ',
-	languageRussian: 'RU ',
-	// Resulting language-button captions after selecting each language.
-	langButtonEnglish: 'EN (English)',
-	langButtonBulgarian: 'BG (Български)',
-	langButtonHebrew: 'HE (עִברִית)',
-	langButtonRussian: 'RU (Русский)',
+	// Language options render as "[flag] Name" (no code prefix); the flag <img src> is the only
+	// locale-invariant marker, so options are matched on the flag asset path (language→country
+	// mapping mirrors getLanguageFlagUrl in @gauzy/ui-core/shared).
+	languageEnglish: 'flags/gb.svg',
+	languageBulgarian: 'flags/bg.svg',
+	languageHebrew: 'flags/il.svg',
+	languageRussian: 'flags/ru.svg',
+	// Resulting language-button captions after selecting each language: the trigger shows the
+	// selected language's name translated in the just-activated locale, i.e. its native name.
+	langButtonEnglish: 'English',
+	langButtonBulgarian: 'Български',
+	langButtonHebrew: 'עִברִית',
+	langButtonRussian: 'Русский',
 	// Layout dropdown options.
 	layoutGrid: 'Cards Grid',
 	layoutTable: 'Table'
 
@@ -7,10 +7,10 @@ import { ChangeLanguagePageData } from '../../../src/support/Base/pagedata/Chang
 // "+ Create" button text the app renders once that locale is active — both come from the page data,
 // so QA can add a locale to the Examples table without touching this glue.
 const languageCode: Record<string, number> = {
-	Bulgarian: ChangeLanguagePageData.codeBulgarian,
-	Russian: ChangeLanguagePageData.codeRussian,
-	Hebrew: ChangeLanguagePageData.codeHebrew,
-	English: ChangeLanguagePageData.codeEnglish
+	Bulgarian: ChangeLanguagePageData.flagBulgarian,
+	Russian: ChangeLanguagePageData.flagRussian,
+	Hebrew: ChangeLanguagePageData.flagHebrew,
+	English: ChangeLanguagePageData.flagEnglish
 };
 const translatedCreate: Record<string, string> = {
 	Bulgarian: ChangeLanguagePageData.Bulgarian,
 
@@ -16,6 +16,15 @@ export const test = base.extend<{ _bindPage: void }>({
 	_bindPage: [
 		async ({ page }, use) => {
 			setPage(page);
+			// Same opt-in as tests/support/fixtures.ts: filter rows are collapsed
+			// by default for users, but the page objects type into them directly.
+			await page.addInitScript(() => {
+				try {
+					localStorage.setItem('gauzy.smartTable.filtersOpen', 'open');
+				} catch {
+					/* storage unavailable — the spec will surface it */
+				}
+			});
 			await use();
 		},
 		{ auto: true }
 
@@ -13,6 +13,17 @@ export const test = base.extend<{ _autoPage: void }>({
 	_autoPage: [
 		async ({ page }, use) => {
 			setPage(page);
+			// Smart-table filter rows are collapsed-by-default for users
+			// (SmartTableFilterToggleDirective); several page objects type straight
+			// into tr.angular2-smart-filters inputs, so specs opt into the
+			// always-open behavior via the directive's stored preference.
+			await page.addInitScript(() => {
+				try {
+					localStorage.setItem('gauzy.smartTable.filtersOpen', 'open');
+				} catch {
+					/* storage unavailable — the spec will surface it */
+				}
+			});
 			await use();
 		},
 		{ auto: true }
 
@@ -51,15 +51,18 @@ export const verifyLanguageOptionsVisible = async () => {
 };
 
 /**
- * Pick a language option BY CODE PREFIX ("EN " / "BG " / "RU " / "HE ").
+ * Pick a language option BY FLAG ASSET ("flags/gb.svg" / "flags/bg.svg" / …).
  *
- * The Cypress original selected by numeric index (Bulgarian=0, English=1, Hebrew=2, Russian=3),
- * assuming a fixed alphabetical order. The current app renders the option list in a DB-driven order
- * that is NOT guaranteed, so index selection is fragile — match on the language-code prefix instead
- * (the option text is "EN (English)", "BG (Български)", …). Robust and order-independent.
+ * The Cypress original selected by numeric index, then the migration matched the "EN (" code
+ * prefix. Options now render as "[flag] Name" with no code and a locale-dependent name, so the
+ * flag <img src> is the one locale-invariant, order-independent marker left (see
+ * ChangeLanguagePageData for the language→country mapping).
  */
-export const clickOnLanguageOption = async (codePrefix: string) => {
-	const option = getPage().locator(ChangeLanguage.languageOptionsCss).filter({ hasText: codePrefix }).first();
+export const clickOnLanguageOption = async (flagAsset: string) => {
+	const option = getPage()
+		.locator(ChangeLanguage.languageOptionsCss)
+		.filter({ has: getPage().locator(`img[src*="${flagAsset}"]`) })
+		.first();
 	await option.click({ force: true, timeout: defaultCommandTimeout });
 	// Selecting fires (selectedChange)->switchLanguage(), which re-renders the UI in the new locale and
 	// collapses the sidebar. Give the translation swap a beat before the caller asserts on the button.
@@ -89,7 +92,7 @@ export const resetToEnglish = async (englishWord: string) => {
 		await waitUntil(800);
 		await getPage()
 			.locator(ChangeLanguage.languageOptionsCss)
-			.filter({ hasText: 'EN ' })
+			.filter({ has: getPage().locator('img[src*="flags/gb.svg"]') })
 			.first()
 			.click({ force: true, timeout: defaultCommandTimeout });
 		await expect(createBtn).toContainText(englishWord, { timeout: defaultCommandTimeout });
 
@@ -41,19 +41,25 @@ export const clickThemesDropdown = async (index: number) => {
 	await waitUntil(1200);
 };
 
+/**
+ * Language options carry no locale-invariant text anymore (they render as "[flag] Name"), so
+ * language entries in the page data are flag asset paths ("flags/gb.svg") matched against the
+ * option's <img src>; every other dropdown (theme, layout) still matches by visible text.
+ */
+const dropdownOption = (match: string) =>
+	match.includes('flags/')
+		? getPage()
+				.locator(SettingsButton.dropdownOptionCss)
+				.filter({ has: getPage().locator(`img[src*="${match}"]`) })
+		: getPage().locator(SettingsButton.dropdownOptionCss).filter({ hasText: match });
+
 export const verifyTextExist = async (text: string) => {
 	// The option list renders many nb-option nodes; assert the one matching `text`.
-	await expect(
-		getPage().locator(SettingsButton.dropdownOptionCss).filter({ hasText: text }).first()
-	).toBeVisible({ timeout: defaultCommandTimeout });
+	await expect(dropdownOption(text).first()).toBeVisible({ timeout: defaultCommandTimeout });
 };
 
 export const clickDropdownOption = async (text: string) => {
-	await getPage()
-		.locator(SettingsButton.dropdownOptionCss)
-		.filter({ hasText: text })
-		.first()
-		.click();
+	await dropdownOption(text).first().click();
 	await waitUntil(1500);
 };
 
 
@@ -23,7 +23,9 @@ export const ensureEnglishLanguage = async () => {
 
 	// Already English? Nothing to do.
 	const langBtn = page.locator(languageButton).nth(0);
-	if (((await langBtn.textContent().catch(() => '')) || '').includes('EN ')) {
+	// Trigger renders "[flag] Name"; when English is active the app locale is English,
+	// so the caption is always the word "English".
+	if (((await langBtn.textContent().catch(() => '')) || '').includes('English')) {
 		return;
 	}
 
@@ -33,10 +35,11 @@ export const ensureEnglishLanguage = async () => {
 		await page.locator(settingsBtn).first().click({ force: true });
 		await page.waitForTimeout(1500);
 	}
-	// Open language dropdown (index 0) and pick the English option ("EN (...)").
+	// Open language dropdown (index 0) and pick the English option by its flag asset —
+	// the option text is locale-dependent now that the "EN (...)" code prefix is gone.
 	await page.locator(languageButton).nth(0).click({ force: true });
 	await page.waitForTimeout(1200);
-	await page.locator(optionCss).filter({ hasText: 'EN ' }).first().click();
+	await page.locator(optionCss).filter({ has: page.locator('img[src*="flags/gb.svg"]') }).first().click();
 	await page.waitForTimeout(2000);
 };
 
 
@@ -46,7 +46,7 @@ function sendIndex(res) {
 			res.end('index.html not found in ' + root);
 			return;
 		}
-		res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+		res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8', 'Cache-Control': 'no-store' });
 		res.end(data);
 	});
 }
@@ -70,7 +70,9 @@ const server = http.createServer((req, res) => {
 			return;
 		}
 		const ext = path.extname(filePath).toLowerCase();
-		res.writeHead(200, { 'Content-Type': MIME[ext] || 'application/octet-stream' });
+		// Dev bundles have UNHASHED chunk names; without this the browser's
+		// heuristic cache keeps serving a prior build's chunks after a rebuild.
+		res.writeHead(200, { 'Content-Type': MIME[ext] || 'application/octet-stream', 'Cache-Control': 'no-store' });
 		res.end(data);
 	});
 });
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ function sendIndex(res) {`
`46`	`46`	`res.end('index.html not found in ' + root);`
`47`	`47`	`return;`
`48`	`48`	`}`
`49`		`- res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });`
	`49`	`+ res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8', 'Cache-Control': 'no-store' });`
`50`	`50`	`res.end(data);`
`51`	`51`	`});`
`52`	`52`	`}`
`@@ -70,7 +70,9 @@ const server = http.createServer((req, res) => {`
`70`	`70`	`return;`
`71`	`71`	`}`
`72`	`72`	`const ext = path.extname(filePath).toLowerCase();`
`73`		`- res.writeHead(200, { 'Content-Type': MIME[ext] \|\| 'application/octet-stream' });`
	`73`	`+ // Dev bundles have UNHASHED chunk names; without this the browser's`
	`74`	`+ // heuristic cache keeps serving a prior build's chunks after a rebuild.`
	`75`	`+ res.writeHead(200, { 'Content-Type': MIME[ext] \|\| 'application/octet-stream', 'Cache-Control': 'no-store' });`
`74`	`76`	`res.end(data);`
`75`	`77`	`});`
`76`	`78`	`});`