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

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

UAT_PLAYBOOK.md

@@ -195,17 +195,6 @@ export const { signIn, signOut, useSession, changePassword } = authClient;
 | TC-WEB-5.12.10 | RescheduleFlow error state | Mock API failure on availability fetch | "Failed to load time slots" error shown |
 | TC-WEB-5.12.11 | RescheduleFlow no slots | Select date with no availability | "No available slots on this date" shown |
 
-#### 5.12c Waitlist/Booking Status Badges (GRO-1795)
-
-| # | Scenario | Steps | Expected |
-|---|----------|-------|----------|
-| TC-WEB-5.12.12 | Confirmed badge | View appointment card with confirmed status | Green "Confirmed" badge displayed |
-| TC-WEB-5.12.13 | Pending badge | View appointment card with pending status | Amber "Pending" badge displayed |
-| TC-WEB-5.12.14 | Waitlisted badge | View appointment card with waitlisted status | Blue "Waitlisted" badge displayed |
-| TC-WEB-5.12.15 | Badge uses CSS classes | Inspect badge element | Badge uses CSS variable-based classes (e.g., bg-green-100, text-amber-600), not hardcoded colors |
-| TC-WEB-5.12.16 | Badge status from data | Compare badge label to appointment.status field | Badge label matches the API appointment status exactly |
-| TC-WEB-5.12.17 | Unknown status fallback | Render badge with unknown status value | Badge renders with the raw status string as label and fallback CSS class |
-
 ### 5.13 Reports UI
 
 | # | Scenario | Steps | Expected |

src/__tests__/Appointments.test.tsx

@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
 import { render, screen, fireEvent, waitFor } from "@testing-library/react";
-import { parseTimeTo24Hour, isUpcoming, CustomerNotesSection, ConfirmationSection, StatusBadge } from "../portal/sections/Appointments.tsx";
+import { parseTimeTo24Hour, isUpcoming, CustomerNotesSection, ConfirmationSection } from "../portal/sections/Appointments.tsx";
 
 const UPCOMING_APPT = {
   id: "appt-1",
@@ -381,66 +381,6 @@ describe("ConfirmationSection", () => {
   });
 });
 
-describe("StatusBadge", () => {
-  it("renders Confirmed for confirmed status", () => {
-    render(<StatusBadge status="confirmed" />);
-    expect(screen.getByText("Confirmed")).toBeInTheDocument();
-  });
-
-  it("renders Pending for pending status", () => {
-    render(<StatusBadge status="pending" />);
-    expect(screen.getByText("Pending")).toBeInTheDocument();
-  });
-
-  it("renders Waitlisted for waitlisted status", () => {
-    render(<StatusBadge status="waitlisted" />);
-    expect(screen.getByText("Waitlisted")).toBeInTheDocument();
-  });
-
-  it("renders Completed for completed status", () => {
-    render(<StatusBadge status="completed" />);
-    expect(screen.getByText("Completed")).toBeInTheDocument();
-  });
-
-  it("renders Cancelled for cancelled status", () => {
-    render(<StatusBadge status="cancelled" />);
-    expect(screen.getByText("Cancelled")).toBeInTheDocument();
-  });
-
-  it("falls back to status string for unknown status", () => {
-    render(<StatusBadge status="custom-status" />);
-    expect(screen.getByText("custom-status")).toBeInTheDocument();
-  });
-
-  it("uses correct CSS class for confirmed status", () => {
-    render(<StatusBadge status="confirmed" />);
-    const badge = screen.getByText("Confirmed").closest('span');
-    expect(badge?.className).toContain("bg-green-100");
-    expect(badge?.className).toContain("text-green-700");
-  });
-
-  it("uses correct CSS class for waitlisted status", () => {
-    render(<StatusBadge status="waitlisted" />);
-    const badge = screen.getByText("Waitlisted").closest('span');
-    expect(badge?.className).toContain("bg-blue-100");
-    expect(badge?.className).toContain("text-blue-600");
-  });
-
-  it("uses correct CSS class for pending status", () => {
-    render(<StatusBadge status="pending" />);
-    const badge = screen.getByText("Pending").closest('span');
-    expect(badge?.className).toContain("bg-amber-100");
-    expect(badge?.className).toContain("text-amber-600");
-  });
-
-  it("uses fallback styling for unknown status", () => {
-    render(<StatusBadge status="unknown" />);
-    const badge = screen.getByText("unknown").closest('span');
-    expect(badge?.className).toContain("bg-stone-100");
-    expect(badge?.className).toContain("text-stone-600");
-  });
-});
-
 describe("RescheduleFlow dynamic time slots", () => {
   beforeEach(() => {
     vi.clearAllMocks();

src/portal/sections/Appointments.tsx

@@ -82,34 +82,14 @@ export function isUpcoming(appt: Appointment): boolean {
 
 const STATUS_COLORS: Record<string, string> = {
   confirmed: 'bg-green-100 text-green-700',
-  pending: 'bg-amber-100 text-amber-600',
-  waitlisted: 'bg-blue-100 text-blue-600',
+  pending: 'bg-amber-100 text-amber-700',
+  waitlisted: 'bg-blue-100 text-blue-700',
   completed: 'bg-stone-100 text-stone-600',
   cancelled: 'bg-red-100 text-red-600',
   'no-show': 'bg-yellow-100 text-yellow-700',
-  scheduled: 'bg-blue-100 text-blue-600',
+  scheduled: 'bg-blue-100 text-blue-700',
 };
 
-const STATUS_LABELS: Record<string, string> = {
-  confirmed: 'Confirmed',
-  pending: 'Pending',
-  waitlisted: 'Waitlisted',
-  completed: 'Completed',
-  cancelled: 'Cancelled',
-  'no-show': 'No-show',
-  scheduled: 'Scheduled',
-};
-
-export function StatusBadge({ status }: { status: string }) {
-  const label = STATUS_LABELS[status] ?? status;
-  const colorClass = STATUS_COLORS[status] ?? 'bg-stone-100 text-stone-600';
-  return (
-    <span className={`px-2 py-0.5 rounded-full text-xs font-medium ${colorClass}`}>
-      {label}
-    </span>
-  );
-}
-
 const CONFIRMATION_STATUS_COLORS: Record<string, string> = {
   confirmed: 'bg-green-100 text-green-700',
   pending: 'bg-amber-100 text-amber-700',
@@ -317,7 +297,13 @@ function AppointmentCard({
             <span>with {appt.groomerName || 'First Available'}</span>
           </div>
         </div>
-        <StatusBadge status={appt.status} />
+        <span
+          className={`px-2 py-0.5 rounded-full text-xs font-medium ${
+            STATUS_COLORS[appt.status] || ''
+          }`}
+        >
+          {appt.status}
+        </span>
         {expanded ? (
           <ChevronDown size={16} className="text-stone-400" />
         ) : (