refactor: restructure navigation into 5 grouped hubs, off the 22-item flat strip
Implements the researched IA fix: mobile nav UX consensus caps primary destinations at 4-5 (uxpin.com, fintech/banking 2026 UX research), and this app had grown to 22 tabs in one horizontally-scrolling row — exactly the anti-pattern that research flags for choice paralysis and slower task completion. New structure — 5 bottom-nav hubs, grouped by what the user is actually trying to do, not build order: - Home: Coverage (unchanged, still the landing screen) - Estate: Assets, Faraid, Insurance, Wassiyah, Hibah, Family Waqf, Nominate, Claims (H2) - Giving: Zakat, Sadaqah, Khairat - Family: Tree, Trigger, Mutawalli, Manage (was 'Family', renamed to avoid colliding with the hub's own label), Neighbourhood - Daily: Prayer Times, Qibla, Quran, Locate Each hub reveals its own sub-nav one tap in, instead of every tab competing for space in a single row. Settings moved out of the tab strip entirely into a header gear icon, matching the banking-app pattern of keeping settings out of primary thumb-reach real estate. The bottom nav is now fixed (thumb-zone), sub-nav keeps the old sticky-top position. Cross-component navigation (nav.js requestedTab, used by the Family Tree's 'give sadaqah in memory' link) now resolves a tab label to its owning (hub, sub-tab) pair instead of a flat index — verified live. This touches every E2E suite: a single click on a tab's old selector no longer reaches it (hub, then sub-tab). Added a shared gotoTab(page, label) helper to e2e-auth-helper.cjs encapsulating the two-step navigation, and migrated all ~22 affected test files off direct nav-button selectors — mechanical substitution followed by manual fixes for local clickTab wrappers, template-literal selectors, and active-state assertions that needed to target the new .hub-tab/.subnav structure specifically. Full regression after migration: every suite passes (one isolated Family Tree flake confirmed clean on rerun, unrelated to navigation).
This commit is contained in:
+8
-7
@@ -5,6 +5,7 @@
|
||||
// own trigger; the owner's own separate Wassiyah is not visible to the
|
||||
// member as "theirs" (proves per-author isolation, not just per-family).
|
||||
const { chromium } = require('playwright');
|
||||
const { gotoTab } = require('./e2e-auth-helper.cjs');
|
||||
const BASE = 'https://moslem04.falahos.my/';
|
||||
const results = [];
|
||||
function record(name, pass, detail = '') { results.push({ name, pass, detail }); console.log(`${pass ? 'PASS' : 'FAIL'} ${name}${detail ? ' — ' + detail : ''}`); }
|
||||
@@ -34,7 +35,7 @@ async function main() {
|
||||
await ownerPage.locator('button.btn-primary', { hasText: 'Create family' }).click();
|
||||
await ownerPage.waitForTimeout(1200);
|
||||
|
||||
await ownerPage.locator('nav button[aria-label="Family"]').click();
|
||||
await gotoTab(ownerPage, 'Manage');
|
||||
await ownerPage.waitForTimeout(500);
|
||||
await ownerPage.locator('.field:has-text("Invite by email") input').fill(MEMBER);
|
||||
await ownerPage.locator('.field:has-text("Role") select').selectOption('member');
|
||||
@@ -47,7 +48,7 @@ async function main() {
|
||||
record('Owner: invites both a member and an agent', bothInvited);
|
||||
|
||||
// Owner writes their OWN wassiyah bequest (should stay private to owner)
|
||||
await ownerPage.locator('nav button[aria-label="Wassiyah"]').click();
|
||||
await gotoTab(ownerPage, 'Wassiyah');
|
||||
await ownerPage.waitForTimeout(600);
|
||||
await ownerPage.locator('.form-card .field:has-text("Recipient name") input').fill('Owner Charity');
|
||||
await ownerPage.locator('.form-card .field:has-text("Relation to you") input').fill('charity');
|
||||
@@ -64,9 +65,9 @@ async function main() {
|
||||
const inviteVisible = await inviteRow.waitFor({ state: 'visible', timeout: 10000 }).then(() => true).catch(() => false);
|
||||
record('Member: sees pending invite', inviteVisible);
|
||||
await inviteRow.locator('.btn-small', { hasText: 'Accept' }).click();
|
||||
await memberPage.locator('nav button[aria-label="Coverage"]').waitFor({ state: 'visible', timeout: 10000 });
|
||||
await memberPage.locator('.hub-tab[aria-label="Home"]').waitFor({ state: 'visible', timeout: 10000 });
|
||||
|
||||
await memberPage.locator('nav button[aria-label="Wassiyah"]').click();
|
||||
await gotoTab(memberPage, 'Wassiyah');
|
||||
await memberPage.waitForTimeout(600);
|
||||
const ownerBequestVisibleToMember = await memberPage.locator('.bequest-row', { hasText: 'Owner Charity' }).isVisible().catch(() => false);
|
||||
record('Member: does NOT see owner\'s private bequest (per-author isolation)', !ownerBequestVisibleToMember);
|
||||
@@ -88,14 +89,14 @@ async function main() {
|
||||
const agentInviteVisible = await agentInviteRow.waitFor({ state: 'visible', timeout: 10000 }).then(() => true).catch(() => false);
|
||||
if (agentInviteVisible) {
|
||||
await agentInviteRow.locator('.btn-small', { hasText: 'Accept' }).click();
|
||||
await agentPage.locator('nav button[aria-label="Coverage"]').waitFor({ state: 'visible', timeout: 10000 });
|
||||
await agentPage.locator('.hub-tab[aria-label="Home"]').waitFor({ state: 'visible', timeout: 10000 });
|
||||
} else {
|
||||
// Agent may already belong to many families from prior test runs — switch to this one via Family tab
|
||||
await agentPage.locator('nav button[aria-label="Family"]').click().catch(() => {});
|
||||
await gotoTab(agentPage, 'Manage').catch(() => {});
|
||||
}
|
||||
record('Agent: accepts mutawalli invite', agentInviteVisible);
|
||||
|
||||
await agentPage.locator('nav button[aria-label="Mutawalli"]').click();
|
||||
await gotoTab(agentPage, 'Mutawalli');
|
||||
await agentPage.waitForTimeout(800);
|
||||
const memberChipVisible = await agentPage.locator('.member-chip', { hasText: MEMBER }).isVisible().catch(() => false);
|
||||
record('Mutawalli dashboard: shows the member in the chip list', memberChipVisible);
|
||||
|
||||
Reference in New Issue
Block a user