Promote dev → uat: GRO-2513 Settings role-gate #83

Merged
Flea Flicker merged 14 commits from dev into uat 2026-06-25 02:08:52 +00:00
Member

Promote dev → uat: GRO-2513 Settings role-gate

What's in this promotion:

  • feat(GRO-2513): gate Settings nav+route to manager/super-user, eliminate groomer 403

Changes merged to dev:

  • src/App.tsx — Settings tab in admin nav now hidden for groomer/receptionist; /admin/settings route guard redirects non-managers to /admin
  • src/pages/Settings.tsxGET /api/admin/settings only fires for manager/super-user roles; groomers never trigger the 403
  • UAT_PLAYBOOK.md §5.14 — 8 new role-path test cases (TC-WEB-5.14.1–8)

PR: groombook/web#82 (feature→dev, squash merged, CI ✓)

## Promote dev → uat: GRO-2513 Settings role-gate **What's in this promotion:** - feat(GRO-2513): gate Settings nav+route to manager/super-user, eliminate groomer 403 **Changes merged to dev:** - `src/App.tsx` — Settings tab in admin nav now hidden for groomer/receptionist; `/admin/settings` route guard redirects non-managers to `/admin` - `src/pages/Settings.tsx` — `GET /api/admin/settings` only fires for manager/super-user roles; groomers never trigger the 403 - `UAT_PLAYBOOK.md` §5.14 — 8 new role-path test cases (TC-WEB-5.14.1–8) **PR:** groombook/web#82 (feature→dev, squash merged, CI ✓)
Flea Flicker added 14 commits 2026-06-25 01:58:38 +00:00
fix(portal): send preferredTime as HH:MM:SS and format booking slot labels (GRO-2211) (#51)
CI / Test (push) Successful in 18s
CI / Lint & Typecheck (push) Successful in 25s
CI / Build & Push Docker Image (push) Successful in 12s
CI / Test (pull_request) Successful in 22s
CI / Lint & Typecheck (pull_request) Successful in 28s
CI / Build & Push Docker Image (pull_request) Successful in 12s
0d52ddd9f0
docs(uat): add §5.12e Book New preferredTime test cases (GRO-2218) (#53)
CI / Test (push) Failing after 6s
CI / Lint & Typecheck (push) Successful in 21s
CI / Build & Push Docker Image (push) Has been skipped
CI / Test (pull_request) Successful in 18s
CI / Lint & Typecheck (pull_request) Successful in 27s
CI / Build & Push Docker Image (pull_request) Successful in 11s
c7417dc9e3
fix(portal): show Weight/DoB + Size Category in pet read view (GRO-2207) (#54)
CI / Test (push) Successful in 22s
CI / Test (pull_request) Successful in 18s
CI / Lint & Typecheck (pull_request) Successful in 34s
CI / Build & Push Docker Image (pull_request) Successful in 15s
CI / Lint & Typecheck (push) Failing after 12m56s
CI / Build & Push Docker Image (push) Has been skipped
3d0c3c551b
fix(GRO-2234): transparent re-mint on 401 for portal Book New submit (#55)
CI / Test (push) Successful in 23s
CI / Lint & Typecheck (push) Successful in 31s
CI / Build & Push Docker Image (push) Successful in 16s
1ceac35437
fix(GRO-2236): portal Book New service cards show price + duration (#57)
CI / Test (push) Successful in 18s
CI / Lint & Typecheck (push) Successful in 28s
CI / Build & Push Docker Image (push) Successful in 14s
CI / Test (pull_request) Successful in 24s
CI / Lint & Typecheck (pull_request) Successful in 31s
CI / Build & Push Docker Image (pull_request) Successful in 10s
98c8a7bb83
Co-authored-by: The Dogfather <20+gb_dogfather@noreply.git.farh.net>
Co-committed-by: The Dogfather <20+gb_dogfather@noreply.git.farh.net>
feat(GRO-2158): route planner page at /admin/routes (#60)
CI / Test (push) Successful in 24s
CI / Lint & Typecheck (push) Successful in 31s
CI / Build & Push Docker Image (push) Successful in 12s
c58e4e4b23
feat(GRO-2159): drag-to-reorder + re-optimize on route planner (#63)
CI / Test (push) Successful in 21s
CI / Lint & Typecheck (push) Successful in 28s
CI / Build & Push Docker Image (push) Successful in 11s
59a29a2d03
feat(GRO-2160): route nav export buttons + offline map polish (#66)
CI / Test (push) Successful in 20s
CI / Lint & Typecheck (push) Successful in 25s
CI / Build & Push Docker Image (push) Successful in 11s
044eeaae61
feat(GRO-2319): live-render full StatusBadge palette in portal (#69)
CI / Test (push) Successful in 23s
CI / Lint & Typecheck (push) Successful in 26s
CI / Build & Push Docker Image (push) Successful in 13s
66bac2c6f8
fix(GRO-2358): wire signOut() at higher layer for no-access screen (#72)
CI / Test (push) Successful in 17s
CI / Lint & Typecheck (push) Successful in 23s
CI / Build & Push Docker Image (push) Successful in 40s
dee7465190
feat(GRO-2359): route Authentik new-SSO users into OOBE (web)
CI / Test (pull_request) Successful in 25s
CI / Lint & Typecheck (pull_request) Successful in 28s
CI / Build & Push Docker Image (pull_request) Successful in 44s
250c7a5ac9
The post-auth handler in CustomerPortal previously rendered the
"Portal access not configured" card when the SSO bridge returned 404
(no client row for the user's email). That trapped first-time SSO
users on a dead-end screen with no path to portal creation.

This change routes the 404 to a new OOBE component (src/portal/OOBE.tsx)
that drives portal creation:
  * Mounts inline inside CustomerPortal so the post-auth flow stays
    inside the portal render tree (no App-level router needed).
  * Also reachable as a direct deep-link via the new /onboarding route
    in App.tsx (for grooming admins or recovery flows).
  * Submits to a new POST /api/portal/clients-from-auth endpoint in
    groombook-api (companion commit) that creates a fresh client row
    bound to the Better Auth email. 409 means the email already has a
    portal record — the OOBE shows a portal-selection message.
  * Uses the canonical shared signOut() from lib/auth-client (GRO-2358
    invariant) for the Sign out button.
  * Full window.location.href reload on submit success to reset the
    bridge's cached state and land the user in their portal.

The no-access card itself is preserved for the deep-link deleted-portal
case (a customer whose portal was disabled/deleted), signalled via
?noAccess=deleted-portal on a portal sub-route. The OOBE handles the
first-time-creation case; the no-access card handles the "had a portal
but lost it" case.

Test coverage:
  * "routes to /onboarding when session-from-auth returns 404 (GRO-2359)"
    — proves the post-auth 404 mounts the OOBE inline, not the legacy
    no-access card.
  * 6 new OOBE tests: render from direct link, name prefill, form
    submission, 409 portal-selection, required-name validation, shared
    signOut(), redirect on no-session.
  * P1 no-access tests reworked to use ?noAccess=deleted-portal so the
    GRO-2358 signOut invariant is still verified on the only surviving
    path to the no-access card.

UAT_PLAYBOOK §5.25.5–6e rewritten to cover the OOBE flow (form submit,
409, deep-link mount, deleted-portal no-access card).

Paired with the api PR on feature/2357-p2-portal-clients-from-auth.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
Merge pull request 'feat(GRO-2359): route Authentik new-SSO users into OOBE' (#75) from feature/2357-p2-sso-to-oobe-routing into dev
CI / Test (push) Successful in 21s
CI / Lint & Typecheck (push) Successful in 27s
CI / Build & Push Docker Image (push) Successful in 18s
7a8b59ab87
GRO-2359 (web): feat(GRO-2359): route Authentik new-SSO users into OOBE (#75)
fix(GRO-2373): add Sign out button to in-portal chrome sidebar (#77)
CI / Test (push) Successful in 35s
CI / Lint & Typecheck (push) Successful in 48s
CI / Build & Push Docker Image (push) Successful in 13s
ddc4e3e052
feat(GRO-2513): gate Settings nav+route to manager/super-user, eliminate groomer 403 (#82)
CI / Test (push) Successful in 38s
CI / Lint & Typecheck (push) Successful in 47s
CI / Test (pull_request) Successful in 23s
CI / Lint & Typecheck (pull_request) Successful in 30s
CI / Build & Push Docker Image (push) Successful in 17s
CI / Build & Push Docker Image (pull_request) Successful in 15s
2ce7966fe9
feat(GRO-2513): gate Settings nav+route to manager/super-user, eliminate groomer 403

Co-Authored-By: Paperclip <noreply@paperclip.ing>
Co-authored-by: Lint Roller <23+gb_lint@noreply.git.farh.net>
Co-committed-by: Lint Roller <23+gb_lint@noreply.git.farh.net>
Lint Roller approved these changes 2026-06-25 02:04:43 +00:00
Lint Roller left a comment
Member

QA code review APPROVED (dev → uat, Phase 2)

GRO-2513 (scoped review) — verified correct against spec:

  • src/App.tsx: Settings nav tab filtered via canSettings = staffUser !== null && (role === "manager" || isSuperUser); /admin/settings route renders null while staffUser === null (fail-closed during load), then <SettingsPage /> for managers/super-users or <Navigate to="/admin" replace /> for everyone else. Matches spec.
  • src/pages/Settings.tsx: effect now fetches /api/staff/me first, gates GET /api/admin/settings on manager || isSuperUser and GET /api/admin/auth-provider on isSuperUser. Groomers/receptionists fire neither admin fetch → no 403. All .catch() paths clear loaded/authLoaded, so no infinite-load on error.
  • UAT_PLAYBOOK.md §5.14 (TC-WEB-5.14.1–8): present and covers manager/super-user/groomer/receptionist paths incl. the "zero 403" assertion.

Promotion-wide checks:

  • CI fully green on head 2ce7966: Test, Lint & Typecheck, and Docker Build all (push + pull_request). PR mergeable.
  • This is a cumulative dev→uat promotion carrying 12 additional tickets (GRO-2158/2159/2160 route planner, GRO-2319, GRO-2358/2359/2373 OOBE+signout, GRO-2211/2213/2234/2236/2207). UAT_PLAYBOOK.md is updated for the user-facing bundle (§5.12e/f, §5.25.5–6f, §5.28–5.30) and new tests were added (Routes/PetProfiles/portal/Appointments). Per-ticket deep verification of those is downstream Phase 3 scope (UAT regression + security review).

Engineer is clear to self-merge.

QA code review **APPROVED** ✅ (dev → uat, Phase 2) **GRO-2513 (scoped review) — verified correct against spec:** - `src/App.tsx`: Settings nav tab filtered via `canSettings = staffUser !== null && (role === "manager" || isSuperUser)`; `/admin/settings` route renders `null` while `staffUser === null` (fail-closed during load), then `<SettingsPage />` for managers/super-users or `<Navigate to="/admin" replace />` for everyone else. Matches spec. - `src/pages/Settings.tsx`: effect now fetches `/api/staff/me` first, gates `GET /api/admin/settings` on `manager || isSuperUser` and `GET /api/admin/auth-provider` on `isSuperUser`. Groomers/receptionists fire neither admin fetch → no 403. All `.catch()` paths clear `loaded`/`authLoaded`, so no infinite-load on error. - `UAT_PLAYBOOK.md §5.14` (TC-WEB-5.14.1–8): present and covers manager/super-user/groomer/receptionist paths incl. the "zero 403" assertion. **Promotion-wide checks:** - CI fully green on head `2ce7966`: Test, Lint & Typecheck, and Docker Build all ✅ (push + pull_request). PR mergeable. - This is a cumulative dev→uat promotion carrying 12 additional tickets (GRO-2158/2159/2160 route planner, GRO-2319, GRO-2358/2359/2373 OOBE+signout, GRO-2211/2213/2234/2236/2207). UAT_PLAYBOOK.md is updated for the user-facing bundle (§5.12e/f, §5.25.5–6f, §5.28–5.30) and new tests were added (Routes/PetProfiles/portal/Appointments). Per-ticket deep verification of those is downstream Phase 3 scope (UAT regression + security review). Engineer is clear to self-merge.
Flea Flicker merged commit 8253e8a84d into uat 2026-06-25 02:08:52 +00:00
Sign in to join this conversation.