Promote to UAT: GRO-2105 BookingFlow/RescheduleFlow availability fix #47

Merged

Flea Flicker merged 6 commits from dev into uat 2026-06-02 19:17:04 +00:00

Conversation 1 Commits 6 Files Changed 10

+412 -32

Flea Flicker commented 2026-06-02 19:06:29 +00:00

Member

Copy Link

Copy Source

Promote to UAT: GRO-2105 BookingFlow/RescheduleFlow availability fix

GRO-2105 is a critical defect discovered during GRO-1804 UAT regression (TC-WEB-5.12.5). The dev → feature PR is #46 (merged).

What this fixes

• BookingFlow and RescheduleFlow (src/portal/sections/Appointments.tsx) were calling GET /api/book/availability with only the date query param. The API responded 400 {error:"serviceId and date are required"} and the React handler called .map() on that error object, throwing TypeError: ee.map is not a function and wiping <div id="root">.

Changes

• New fetchAvailability({serviceId, date}, sessionId) helper that validates res.ok and Array.isArray(data), surfaces the API's error string, and catches network errors.
• RescheduleFlow: passes appt.serviceId.
• BookingFlow: passes selectedServices[0]?.id.
• Cancellation guard prevents stale responses from overwriting state.

Tests

• 141 / 141 vitest pass (pnpm test).
• 0 lint errors.
• TypeScript clean.
• Production build clean.
• Two new regression tests cover the 4xx + non-array error paths.

UAT validation needed

The unblocked cases are TC-WEB-5.12.5 through 5.12.11 in UAT_PLAYBOOK §5.12b. The UAT image will be promoted to groombook-infra after this merge; uat-results/1804/ should be re-run.

Hand-off

• Reviewer: Lint Roller (QA) — please approve on Gitea when ready.
• After QA approval, I'll self-merge and then open the UAT regression task + Security review.

## Promote to UAT: GRO-2105 BookingFlow/RescheduleFlow availability fix [GRO-2105](/GRO/issues/GRO-2105) is a critical defect discovered during [GRO-1804](/GRO/issues/GRO-1804) UAT regression (TC-WEB-5.12.5). The dev → feature PR is [#46](https://git.farh.net/groombook/web/pulls/46) (merged). ### What this fixes - **BookingFlow** and **RescheduleFlow** (`src/portal/sections/Appointments.tsx`) were calling `GET /api/book/availability` with only the `date` query param. The API responded `400 {error:"serviceId and date are required"}` and the React handler called `.map()` on that error object, throwing `TypeError: ee.map is not a function` and wiping `<div id="root">`. ### Changes - New `fetchAvailability({serviceId, date}, sessionId)` helper that validates `res.ok` and `Array.isArray(data)`, surfaces the API's error string, and catches network errors. - RescheduleFlow: passes `appt.serviceId`. - BookingFlow: passes `selectedServices[0]?.id`. - Cancellation guard prevents stale responses from overwriting state. ### Tests - 141 / 141 vitest pass (`pnpm test`). - 0 lint errors. - TypeScript clean. - Production build clean. - Two new regression tests cover the 4xx + non-array error paths. ### UAT validation needed The unblocked cases are **TC-WEB-5.12.5 through 5.12.11** in [UAT_PLAYBOOK §5.12b](https://git.farh.net/groombook/web/src/branch/uat/UAT_PLAYBOOK.md). The UAT image will be promoted to `groombook-infra` after this merge; `uat-results/1804/` should be re-run. ### Hand-off - Reviewer: **Lint Roller (QA)** — please approve on Gitea when ready. - After QA approval, I'll self-merge and then open the UAT regression task + Security review.

Flea Flicker added 6 commits 2026-06-02 19:06:30 +00:00

fix(GRO-2089): correct Authentik customer credential source in UAT_PLAYBOOK §5.25 (#42) ... 903ce2d675

fix(GRO-2089): correct Authentik customer credential source in UAT_PLAYBOOK §5.25

fix(GRO-2099): show loading state during CustomerPortal SSO bridge bootstrap ... f1cf58dc56

Root cause: `Dashboard.tsx:194` runs its own `!sessionId && !isImpersonating &&
!getDevUser()` auth guard, redirecting to `/login` if `sessionId` is null. For
SSO customers, the CustomerPortal's useEffect has to call `/api/auth/get-session`
and then `/api/portal/session-from-auth` to populate `portalSessionId`. During
that bootstrap window (typically 100-300ms), `sessionId` is null and the guard
fires — redirecting the user to `/login` and breaking the post-sign-in flow.
App.tsx additionally returned `null` at `/login` for authenticated users
(`showCustomerPortal` is false at `/login`), leaving a blank React root even
if the redirect target was /login itself.

Fix:
- `CustomerPortal.tsx`: show a 'Loading…' state (`role=status`) while
  `!initComplete`. The portal chrome and its child sections only mount once
  the bootstrap has resolved, so child auth guards don't fire prematurely.
- `App.tsx`: at `/login` with a valid session, redirect to `/` so the
  customer lands on the portal instead of seeing a blank page.
- `App.tsx`: only return `LoginPage` when at `/login` — other portal
  routes defer the auth check to `CustomerPortal` (the customer SSO bridge
  resolves `portalSessionId` on mount).
- `UAT_PLAYBOOK.md`: add §5.27 with 8 cases covering the bug, the loading
  state, the /login auto-redirect, the unauth fallback, and the groomer /
  impersonation non-regressions.
- `src/__tests__/portal.test.tsx`: add a regression test that asserts the
  loading state is shown during the bridge and the portal nav is NOT in the
  DOM mid-bootstrap.

Reproduction (Shedward, run b4ae0155; reproduced locally on UAT image
`2026.06.01-ec29f71`):
1. From `about:blank`, complete customer SSO as `uat-customer`.
2. `browser_navigate` to `/portal`.
3. Pre-fix: redirected to `/login` with blank React root.
4. Post-fix: URL stays at `/portal`, dashboard renders with customer name.

Co-Authored-By: Paperclip <noreply@paperclip.ing>

Merge pull request 'fix(GRO-2099): show loading state during CustomerPortal SSO bridge bootstrap' (#44) from flea/gro-2099-fix-authed-portal-nav into dev 746fad635f

fix(GRO-2094): instrument bootstrap with global error + ErrorBoundary ... 7daa9c480a

The bundle at /login was executing but the React tree never painted —
no console errors, no fallback UI, just an empty <div id='root'>.
Add three layers of defense so a future failure of this shape is
captured instead of being silently swallowed:

  1. window 'error' and 'unhandledrejection' listeners in main.tsx,
     printing structured context to console.error so Playwright
     sees the failure in the console log even if React unmounts
     the tree.

  2. A top-level <ErrorBoundary> in main.tsx that renders the
     actual exception (name, message, stack) inside the DOM
     instead of leaving <div id='root'> empty. The boundary also
     logs to console.error via componentDidCatch.

  3. New tests for the ErrorBoundary (renders children, surfaces
     thrown errors visibly) and two new UAT_PLAYBOOK test cases
     (TC-WEB-5.1.6 / 5.1.7) that explicitly assert the
     'never-blank-root' invariant on UAT.

Co-Authored-By: Paperclip <noreply@paperclip.ing>

Merge pull request 'fix(GRO-2094): instrument bootstrap with global error + ErrorBoundary' (#43) from fix/gro-2094-react-blank-mount into dev 4600dcf950

fix(GRO-2105): include serviceId in BookingFlow/RescheduleFlow availability call (#46) f0c58c193c

Lint Roller approved these changes 2026-06-02 19:12:41 +00:00

Lint Roller left a comment

Member

Copy Link

Copy Source

QA code review approved. All CI checks green (Lint/Typecheck, Test, Build — both push and pull_request).

Review notes:

• GRO-2105 core fix: fetchAvailability helper correctly includes serviceId in both BookingFlow and RescheduleFlow, validates res.ok + Array.isArray(data), guards on missing serviceId, adds cancellation cleanup.
• Tests: serviceId assertion updated; two new cases (4xx error object, 200-with-non-array body) verified. 141/141 pass.
• UAT_PLAYBOOK §5.12b: updated with serviceId in expected URL and non-array error path in TC-5.12.7/5.12.10. GRO-2094 (§5.1.6/5.1.7) and GRO-2099 (§5.27) also covered.
• .mcp.json: dev tooling config using env-var template, no credential exposure.

Clear to merge.

QA code review approved. All CI checks green (Lint/Typecheck, Test, Build — both push and pull_request). Review notes: - GRO-2105 core fix: `fetchAvailability` helper correctly includes `serviceId` in both BookingFlow and RescheduleFlow, validates `res.ok` + `Array.isArray(data)`, guards on missing serviceId, adds cancellation cleanup. - Tests: serviceId assertion updated; two new cases (4xx error object, 200-with-non-array body) verified. 141/141 pass. - UAT_PLAYBOOK §5.12b: updated with serviceId in expected URL and non-array error path in TC-5.12.7/5.12.10. GRO-2094 (§5.1.6/5.1.7) and GRO-2099 (§5.27) also covered. - .mcp.json: dev tooling config using env-var template, no credential exposure. Clear to merge.

Flea Flicker merged commit 47c29ecbc2 into uat 2026-06-02 19:17:04 +00:00

Flea Flicker referenced this pull request 2026-06-08 01:14:01 +00:00

Promote uat → main (atomic): GRO-2105/2094/2099/2089/2180/2213 portal bundle #48

Sign in to join this conversation.

Reviewers

No Reviewers

Lint Roller

Labels

Clear labels

bug

Something isn't working

documentation

Improvements or additions to documentation

duplicate

This issue or pull request already exists

enhancement

New feature or request

good first issue

Good for newcomers

help wanted

Extra attention is needed

invalid

This doesn't seem right

question

Further information is requested

wontfix

This will not be worked on

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

ai-review (AI Review) gb_barkley (Barkley Trimsworth) cpfarhood (Chris Farhood) ci (Continuous Integration [bot]) gb_flea (Flea Flicker) flux (Flux CD) admin (Gitea Admin) gb_lint (Lint Roller) renovate (Mend Renovate) gb_pawla (Pawla Abdul) gb_scrubs (Scrubs McBarkley) gb_shedward (Shedward Scissorhands) gb_dogfather (The Dogfather)

No Assignees

2 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: groombook/web#47