Promote uat → main: GRO-2012 RescheduleFlow portalSessionId fallback #40

Merged

Scrubs McBarkley merged 26 commits from uat into main 2026-06-01 19:10:08 +00:00

Conversation 0 Commits 26 Files Changed 18

+1123 -88

Scrubs McBarkley commented 2026-06-01 19:06:17 +00:00

Owner

Copy Link

Copy Source

Production Promotion — GRO-2012

Promotes the RescheduleFlow portalSessionId fallback fix to production.

Gate checks

• ✅ UAT: GRO-2023 — done (CTO verified, deployed ec29f719)
• ✅ Security: GRO-2032 — Barkley PASS (2026-06-01)
• ✅ UAT_PLAYBOOK.md: TC-WEB-5.26 (4 cases) present

Change

src/portal/CustomerPortal.tsx:329 — sessionId={session?.id ?? portalSessionId} (was ?? null)

Fix commit: f29f1828c8aad98f54d03173e56cda29ac1f41b9

## Production Promotion — GRO-2012 Promotes the RescheduleFlow `portalSessionId` fallback fix to production. ### Gate checks - ✅ **UAT**: [GRO-2023](/GRO/issues/GRO-2023) — done (CTO verified, deployed ec29f719) - ✅ **Security**: [GRO-2032](/GRO/issues/GRO-2032) — Barkley PASS (2026-06-01) - ✅ **UAT_PLAYBOOK.md**: TC-WEB-5.26 (4 cases) present ### Change `src/portal/CustomerPortal.tsx:329` — `sessionId={session?.id ?? portalSessionId}` (was `?? null`) Fix commit: `f29f1828c8aad98f54d03173e56cda29ac1f41b9`

Scrubs McBarkley added 26 commits 2026-06-01 19:06:18 +00:00

feat(GRO-1792): add recovery paths to booking error and cancellation pages ... 344a32e3e4

- Add "Start a new booking" button to BookingError linking to /admin/book
- Add "Book again" button to BookingCancelled linking to /admin/book
- Add business contact info section to BookingError (from BUSINESS_CONTACT_INFO constant)
- Replace hardcoded colors with CSS variables (--color-error, --color-cancelled, etc.)
- Add page-level string constants to eliminate hardcoded strings
- Add unit tests for both pages (9 tests passing)

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

Replace hardcoded time slots with dynamic API availability ... d78c859c2b

Both BookingFlow and RescheduleFlow in Appointments.tsx now fetch
from /api/book/availability when a date is selected, matching the
public booking wizard behavior. Loading and error states shown.

- Removed hardcoded availableTimes arrays from both flows
- Added useEffect that fetches availability on date change
- Shows "Checking availability…" while loading
- Shows error message on fetch failure
- Shows "No available slots" when API returns empty

Added tests for RescheduleFlow dynamic slot fetching covering:
loading, fetched slots, error, empty, API params, and re-fetch on
date change.

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

GRO-1793: Update UAT_PLAYBOOK.md §5.12b — new dynamic time slots tests ... a873369a9b

Added TC-WEB-5.12.5 through TC-WEB-5.12.11 covering BookingFlow and
RescheduleFlow dynamic slot fetching, loading state, error state, and
empty state scenarios.

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

feat(GRO-1794): add booking funnel analytics events ... 2e99ed520f

- New analytics utility (src/lib/analytics.ts) with ANALYTICS_EVENTS constants
  and fireAnalyticsEvent() – thin wrapper over window.dispatchEvent, no-op safe
  Built for Plausible/GTM integration later.

- Public booking wizard (Book.tsx): fires step-transition events at each step
  (service → time → contact → submit) plus booking_confirmed on the dedicated
  confirmation page.

- Portal BookingFlow (Appointments.tsx): fires equivalent events for the
  portal booking flow. booking_confirmed fires via useEffect when the inline
  success state is shown.

- BookingErrorPage: fires booking_error on mount (no PII in payload).

Events include step name and flow type (public/portal) but contain no PII:
no names, emails, phone numbers, or pet names in any payload.

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

docs(UAT_PLAYBOOK.md): add §5.24 booking funnel analytics test cases ... 3bccb1ac01

Gro-1794 required UAT test cases for the booking funnel analytics events.
Covers all 6 events × both flows (public/portal), plus PII audit and
no-op-safety checks.

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

fix(GRO-1793): remove unused act import and add aria-label to date inputs ... 26cdd69a49

QA review pointed out:
- Lint error: 'act' imported but never used in test file
- 6 test failures: date input lacked accessible label

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Merge pull request 'GRO-1793: Dynamic portal time slots (replace hardcoded)' (#23) from feature/gro-1165c-dynamic-timeslots into dev ... 88ba9915c6

GRO-1793: Dynamic portal time slots (replace hardcoded) (#23)

Replaces hardcoded time slot arrays in portal BookingFlow and RescheduleFlow with API-fetched dynamic availability.

fix: add missing vi import and fix getByText exact match assertions ... 7e5a851d9c

- analytics.test.ts: add vi to vitest import (was used at lines 24, 37, 66)
- BookingError.test.tsx: use regex matchers so phone/email assertions
  match partial text in combined <p> element

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

Merge pull request 'Promote dev → uat (GRO-1793: dynamic time slots)' (#25) from dev into uat ... 4e3a038bf3

Promote dev → uat: GRO-1793 dynamic portal time slots (#25)

feat(portal): add StatusBadge to appointment cards ... 106d31a95e

Add a StatusBadge component that renders human-readable labels
(Confirmed, Pending, Waitlisted, etc.) with semantic color classes
for appointment cards in the portal. Replaces raw status strings.

- Added STATUS_LABELS map for human-readable status labels
- Updated STATUS_COLORS to use accessible amber/blue tones
- Exported StatusBadge for testing
- Added unit tests for all 7 badge states plus fallback
- Updated UAT_PLAYBOOK.md §5.12c with status badge test cases

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

fix: add non-null assertion on listener.mock.calls[0] (TS strict mode) ... 112c61ab1c

Lines 28 and 40 access mock.calls[0] which is possibly undefined under
strict TypeScript. Adding ! to satisfy TS2532.

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

fix(GRO-1795): restore fireEvent and waitFor imports ... 65686c8563

QA regression: PR #26 removed fireEvent and waitFor from the
@testing-library/react import, breaking 21 test cases and typecheck.

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

Merge pull request 'feat(GRO-1794): booking funnel analytics events' (#24) from feature/gro-1165d-booking-analytics into dev ... 33a1b3ed7a

Merge PR #24: feat(GRO-1794): booking funnel analytics events

CTO-approved. QA passed. All CI green.

Merge pull request 'chore: promote dev → uat (GRO-1794 booking analytics)' (#27) from dev into uat ... 87939e5413

Merge dev → uat: GRO-1794 booking funnel analytics events

Merge pull request 'feat(portal): add StatusBadge to appointment cards (GRO-1795)' (#26) from feature/gro-1165e-booking-status-badge into dev ... 736535a24c

Merge PR #26: feat(portal): add StatusBadge to appointment cards (GRO-1795)

Merge pull request 'chore: promote dev → uat (GRO-1795 StatusBadge)' (#28) from dev into uat ... 3b4d0f15f6

Merge PR #28: promote dev → uat (GRO-1795 StatusBadge)

fix(GRO-1822): add role check before /admin redirect — customers access portal ... 4e487db6f1

App.tsx lines 389-393 redirected ALL authenticated users to /admin,
breaking customer portal access after SSO login.

Now checks `session.user.role === "staff"` before redirecting.
Customers (role !== "staff") can access the portal at /.

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

Merge pull request 'fix(GRO-1822): add role check before /admin redirect — customers access portal' (#30) from fix/gro-1822-role-based-redirect into dev 9a3b5d88c8

fix: add skipWaiting/clientsClaim to VitePWA workbox config ... ad9a178c89

Root cause: SW remained in waiting phase after redeploy, serving stale
precached assets. Without skipWaiting/clientsClaim the old SW persisted
and controlled the page even after a new SW was installed.

Fixes blank-page regression where React never mounted on login.

Merge pull request 'fix(GRO-1829): add skipWaiting/clientsClaim to VitePWA workbox config' (#31) from gro-1829-swpwa-fix into dev 228a3d746c

Merge pull request 'chore: promote dev → uat (GRO-1829 SW fix)' (#32) from dev into uat ... 0e5e9d1f16

Merge: promote dev → uat (GRO-1829 SW fix)

feat(GRO-1867): bridge Better Auth session to CustomerPortal (#34) 198053fa31

fix(GRO-2011): /login renders blank — always fetch setup/status for unauth users (#36) ... 3d7b247562

Co-authored-by: Lint Roller <23+gb_lint@noreply.git.farh.net>
Co-committed-by: Lint Roller <23+gb_lint@noreply.git.farh.net>

Merge pull request 'Promote dev -> uat: GRO-2011 login-blank fix (+ GRO-1867)' (#37) from dev into uat bd2a0d9516

fix(GRO-2012): pass portalSessionId to RescheduleFlow for SSO bridge customers (#38) ... f29f1828c8

fix(GRO-2012): pass portalSessionId to RescheduleFlow for SSO bridge customers (closes #38)

- src/portal/CustomerPortal.tsx:329 - use portalSessionId fallback for RescheduleFlow
- src/__tests__/portal.test.tsx - new regression test
- UAT_PLAYBOOK.md §5.26 - new test cases

cc @cpfarhood

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

Merge pull request 'Promote to UAT: GRO-2012 RescheduleFlow portalSessionId fallback' (#39) from dev into uat ec29f71974

Scrubs McBarkley merged commit fdff0977ad into main 2026-06-01 19:10:08 +00:00

Sign in to join this conversation.

Reviewers

No Reviewers

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

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: groombook/web#40