From ba9eeefe479c7706bed5789e3a22db3c12803cfa Mon Sep 17 00:00:00 2001 From: weeihan Date: Wed, 30 Sep 2026 19:08:18 +0800 Subject: [PATCH] refactor(design): replace status, priority and severity color maps with StatusTag and mono tokens Co-Authored-By: Claude Haiku 4.5 --- app/(protected)/capa-owner/page.tsx | 25 ++++---------- app/(protected)/hse/capa/[id]/page.tsx | 11 ++---- app/(protected)/management/page.tsx | 6 ++-- .../reporter/incidents/[id]/page.tsx | 11 ++---- app/(protected)/reporter/page.tsx | 14 ++------ app/(protected)/supervisor/page.tsx | 14 ++------ components/capa/capa-board.tsx | 34 ++++++++----------- components/dashboard/risk-flags-panel.tsx | 6 ++-- components/incidents/incident-detail.tsx | 14 ++------ components/incidents/incident-header.tsx | 14 ++------ components/incidents/incident-list.tsx | 16 +++------ ...6-09-30-modernist-design-system-restyle.md | 5 +-- 12 files changed, 45 insertions(+), 125 deletions(-) diff --git a/app/(protected)/capa-owner/page.tsx b/app/(protected)/capa-owner/page.tsx index a11f263..fe0bff4 100644 --- a/app/(protected)/capa-owner/page.tsx +++ b/app/(protected)/capa-owner/page.tsx @@ -9,6 +9,7 @@ import { eq, asc } from 'drizzle-orm' import { StatCard } from '@/components/dashboard/stat-card' import { CapaOwnerActions } from '@/components/capa/capa-owner-actions' import { CapaOwnerNotesForm } from '@/components/capa/capa-owner-notes-form' +import { StatusTag } from '@/components/ui/status-tag' const STATUS_LABELS: Record = { open: 'Open', @@ -20,16 +21,6 @@ const STATUS_LABELS: Record = { closed: 'Closed', } -const STATUS_COLORS: Record = { - open: 'bg-gray-100 text-gray-700', - in_progress: 'bg-blue-100 text-blue-700', - overdue: 'bg-red-100 text-red-700', - pending_verification: 'bg-purple-100 text-purple-700', - verified: 'bg-green-100 text-green-700', - reopened: 'bg-orange-100 text-orange-700', - closed: 'bg-gray-100 text-gray-500', -} - export default async function CapaOwnerPage() { const session = await getSession() if (!session) redirect('/login') @@ -63,9 +54,9 @@ export default async function CapaOwnerPage() { const doneCount = rows.filter(c => ['verified', 'closed'].includes(c.status)).length const PRIORITY_COLORS: Record = { - high: 'text-red-600 font-semibold', - med: 'text-orange-500 font-medium', - low: 'text-gray-400', + high: 'text-accent-700 font-extrabold', + med: 'text-accent-700 font-medium', + low: 'text-ink/50', } const activeRows = rows.filter(c => !['verified', 'closed'].includes(c.status)) @@ -101,9 +92,7 @@ export default async function CapaOwnerPage() { )}
- - {STATUS_LABELS[capa.status] ?? capa.status} - + {STATUS_LABELS[capa.status] ?? capa.status}

{capa.dueDate ? `Due ${new Date(capa.dueDate).toLocaleDateString('en-MY')}` : 'No due date'}

@@ -131,9 +120,7 @@ export default async function CapaOwnerPage() { {doneRows.map(capa => (

{capa.description}

- - {STATUS_LABELS[capa.status] ?? capa.status} - + {STATUS_LABELS[capa.status] ?? capa.status}
))}
diff --git a/app/(protected)/hse/capa/[id]/page.tsx b/app/(protected)/hse/capa/[id]/page.tsx index dd5d90f..ed78f97 100644 --- a/app/(protected)/hse/capa/[id]/page.tsx +++ b/app/(protected)/hse/capa/[id]/page.tsx @@ -10,17 +10,12 @@ import { aliasedTable } from 'drizzle-orm' import { VerifyForm } from '@/components/capa/verify-form' import { CloseCapaButton } from '@/components/capa/close-capa-button' import { CapaOwnerActions } from '@/components/capa/capa-owner-actions' +import { PriorityTag } from '@/components/ui/status-tag' interface Props { params: Promise<{ id: string }> } -const PRIORITY_BADGE: Record = { - low: 'bg-gray-100 text-gray-600', - med: 'bg-yellow-100 text-yellow-700', - high: 'bg-red-100 text-red-700', -} - export default async function CapaDetailPage({ params }: Props) { const { id } = await params const session = await getSession() @@ -70,9 +65,7 @@ export default async function CapaDetailPage({ params }: Props) {

{capa.description}

- - {capa.priority} - +
diff --git a/app/(protected)/management/page.tsx b/app/(protected)/management/page.tsx index f506439..c45ea74 100644 --- a/app/(protected)/management/page.tsx +++ b/app/(protected)/management/page.tsx @@ -88,7 +88,7 @@ export default async function ManagementPage() { const SEVERITY_LABELS: Record = { 1: 'Minor', 2: 'Low', 3: 'Moderate', 4: 'Serious', 5: 'Critical' } const SEVERITY_COLORS: Record = { - 1: 'bg-green-400', 2: 'bg-yellow-400', 3: 'bg-orange-400', 4: 'bg-red-500', 5: 'bg-red-700', + 1: 'bg-neutral-300', 2: 'bg-neutral-500', 3: 'bg-accent-300', 4: 'bg-accent', 5: 'bg-accent-700', } return ( @@ -141,9 +141,9 @@ export default async function ManagementPage() { {([5, 4, 3, 2, 1] as const).map(sev => (
{SEVERITY_LABELS[sev]} -
+
0 ? `${(severityDist[sev] / severityMax) * 100}%` : '0%' }} />
diff --git a/app/(protected)/reporter/incidents/[id]/page.tsx b/app/(protected)/reporter/incidents/[id]/page.tsx index 2ad5a05..0cac243 100644 --- a/app/(protected)/reporter/incidents/[id]/page.tsx +++ b/app/(protected)/reporter/incidents/[id]/page.tsx @@ -6,17 +6,12 @@ import { redirect, notFound } from 'next/navigation' import { getSession } from '@/lib/auth/get-session' import { incidents, sites, zones, capaActions } from '@/lib/db/schema' import { eq, and } from 'drizzle-orm' +import { StatusTag } from '@/components/ui/status-tag' const STATUS_LABELS: Record = { reported: 'Reported', triaged: 'Triaged', investigating: 'Investigating', capa_pending: 'CAPA Pending', verification: 'Verification', closed: 'Closed', } -const STATUS_COLORS: Record = { - reported: 'bg-gray-100 text-gray-600', triaged: 'bg-yellow-100 text-yellow-800', - investigating: 'bg-blue-100 text-blue-700', capa_pending: 'bg-orange-100 text-orange-700', - verification: 'bg-purple-100 text-purple-700', closed: 'bg-green-100 text-green-700', -} - export default async function ReporterIncidentDetail({ params, }: { @@ -74,9 +69,7 @@ export default async function ReporterIncidentDetail({

{inc.referenceNo ?? inc.id.slice(0, 8)}

{inc.incidentType?.replace(/_/g, ' ')}

- - {STATUS_LABELS[inc.status] ?? inc.status} - + {STATUS_LABELS[inc.status] ?? inc.status}
diff --git a/app/(protected)/reporter/page.tsx b/app/(protected)/reporter/page.tsx index 57f35ca..8994bb4 100644 --- a/app/(protected)/reporter/page.tsx +++ b/app/(protected)/reporter/page.tsx @@ -6,6 +6,7 @@ import { redirect } from 'next/navigation' import { getSession } from '@/lib/auth/get-session' import { incidents, sites } from '@/lib/db/schema' import { eq, desc } from 'drizzle-orm' +import { StatusTag } from '@/components/ui/status-tag' const STATUS_LABELS: Record = { reported: 'Reported', @@ -16,15 +17,6 @@ const STATUS_LABELS: Record = { closed: 'Closed', } -const STATUS_COLORS: Record = { - reported: 'bg-gray-100 text-gray-600', - triaged: 'bg-yellow-100 text-yellow-800', - investigating: 'bg-blue-100 text-blue-700', - capa_pending: 'bg-orange-100 text-orange-700', - verification: 'bg-purple-100 text-purple-700', - closed: 'bg-green-100 text-green-700', -} - const TYPE_LABELS: Record = { injury: 'Injury', near_miss: 'Near Miss', hazard: 'Hazard', asset_damage: 'Asset Damage', environmental: 'Environmental', security: 'Security', fire: 'Fire', @@ -110,9 +102,7 @@ export default async function ReporterPage() {

)}
- - {STATUS_LABELS[inc.status] ?? inc.status} - + {STATUS_LABELS[inc.status] ?? inc.status}
))} diff --git a/app/(protected)/supervisor/page.tsx b/app/(protected)/supervisor/page.tsx index 2b46c75..23ab252 100644 --- a/app/(protected)/supervisor/page.tsx +++ b/app/(protected)/supervisor/page.tsx @@ -8,6 +8,7 @@ import { incidents, sites, capaActions, users } from '@/lib/db/schema' import { eq, not, and, inArray, sql, desc } from 'drizzle-orm' import { aliasedTable } from 'drizzle-orm' import { StatCard } from '@/components/dashboard/stat-card' +import { StatusTag } from '@/components/ui/status-tag' const STATUS_LABELS: Record = { reported: 'Reported', @@ -18,15 +19,6 @@ const STATUS_LABELS: Record = { closed: 'Closed', } -const STATUS_COLORS: Record = { - reported: 'bg-gray-100 text-gray-700', - triaged: 'bg-yellow-100 text-yellow-800', - investigating: 'bg-blue-100 text-blue-700', - capa_pending: 'bg-orange-100 text-orange-700', - verification: 'bg-purple-100 text-purple-700', - closed: 'bg-green-100 text-green-700', -} - export default async function SupervisorPage() { const session = await getSession() if (!session) redirect('/login') @@ -149,9 +141,7 @@ export default async function SupervisorPage() {

{inc.referenceNo ?? inc.id.slice(0, 8)}

{TYPE_LABELS[inc.incidentType] ?? inc.incidentType}

- - {STATUS_LABELS[inc.status] ?? inc.status} - + {STATUS_LABELS[inc.status] ?? inc.status} ))} diff --git a/components/capa/capa-board.tsx b/components/capa/capa-board.tsx index 160e865..22320e7 100644 --- a/components/capa/capa-board.tsx +++ b/components/capa/capa-board.tsx @@ -2,6 +2,7 @@ import { useState } from 'react' import Link from 'next/link' +import { PriorityTag } from '@/components/ui/status-tag' type CapaStatus = 'open' | 'in_progress' | 'overdue' | 'pending_verification' | 'verified' | 'reopened' | 'closed' @@ -27,19 +28,14 @@ const STATUS_LABELS: Record = { reopened: 'Reopened', closed: 'Closed', } -const STATUS_COLORS: Record = { - open: 'bg-blue-50 border-blue-200', - in_progress: 'bg-yellow-50 border-yellow-200', - overdue: 'bg-red-50 border-red-200', - pending_verification: 'bg-purple-50 border-purple-200', - verified: 'bg-green-50 border-green-200', - reopened: 'bg-orange-50 border-orange-200', - closed: 'bg-gray-50 border-gray-200', -} -const PRIORITY_BADGE: Record<'low' | 'med' | 'high', string> = { - low: 'bg-gray-100 text-gray-600', - med: 'bg-yellow-100 text-yellow-700', - high: 'bg-red-100 text-red-700', +const COLUMN_BORDER: Record = { + open: 'border-divider', + in_progress: 'border-divider', + overdue: 'border-accent', + pending_verification: 'border-divider', + verified: 'border-divider', + reopened: 'border-accent', + closed: 'border-divider', } interface Props { @@ -86,9 +82,7 @@ export function CapaBoard({ capas }: Props) { {(c.owner as { name: string } | null)?.name ?? '—'} {c.due_date} - - {c.priority} - + {STATUS_LABELS[c.status]} @@ -103,12 +97,12 @@ export function CapaBoard({ capas }: Props) { return (
- +
{STATUS_ORDER.filter(s => s !== 'reopened').map(status => ( -
-

+
+

{STATUS_LABELS[status]} ({byStatus[status].length})

@@ -118,7 +112,7 @@ export function CapaBoard({ capas }: Props) {

{c.description}

{(c.owner as { name: string } | null)?.name ?? '—'} - {c.priority} +

Due {c.due_date}

diff --git a/components/dashboard/risk-flags-panel.tsx b/components/dashboard/risk-flags-panel.tsx index 2189c7f..f5de2ec 100644 --- a/components/dashboard/risk-flags-panel.tsx +++ b/components/dashboard/risk-flags-panel.tsx @@ -11,9 +11,9 @@ type RiskFlag = { } const LEVEL_COLORS: Record = { - low: 'bg-yellow-50 text-yellow-700 border-yellow-200', - medium: 'bg-orange-50 text-orange-700 border-orange-200', - high: 'bg-red-50 text-red-700 border-red-200', + low: 'bg-neutral-100 text-neutral-800 border-divider', + medium: 'bg-ground text-accent-700 border-accent', + high: 'bg-accent-100 text-accent-800 border-accent', } export function RiskFlagsPanel() { diff --git a/components/incidents/incident-detail.tsx b/components/incidents/incident-detail.tsx index 0620ac0..bbff07b 100644 --- a/components/incidents/incident-detail.tsx +++ b/components/incidents/incident-detail.tsx @@ -1,4 +1,5 @@ import { EvidenceGallery } from './evidence-gallery' +import { StatusTag } from '@/components/ui/status-tag' const TYPE_LABELS: Record = { injury: 'Injury / Medical', @@ -11,15 +12,6 @@ const TYPE_LABELS: Record = { transport: 'Transport / Vehicle', } -const STATUS_COLORS: Record = { - reported: 'bg-yellow-100 text-yellow-800', - triaged: 'bg-blue-100 text-blue-800', - investigating: 'bg-purple-100 text-purple-800', - capa_pending: 'bg-orange-100 text-orange-800', - verification: 'bg-indigo-100 text-indigo-800', - closed: 'bg-green-100 text-green-800', -} - const MEDICAL_LABELS: Record = { none: 'None', first_aid: 'First Aid', @@ -80,9 +72,7 @@ export function IncidentDetail({ incident }: Props) {

{TYPE_LABELS[incident.incident_type] ?? incident.incident_type}

- - {incident.status.replace(/_/g, ' ').toUpperCase()} - + {incident.status.replace(/_/g, ' ').toUpperCase()}
diff --git a/components/incidents/incident-header.tsx b/components/incidents/incident-header.tsx index f96b6ab..94c39ef 100644 --- a/components/incidents/incident-header.tsx +++ b/components/incidents/incident-header.tsx @@ -1,6 +1,7 @@ 'use client' import Link from 'next/link' +import { StatusTag } from '@/components/ui/status-tag' interface Props { incidentId: string @@ -12,15 +13,6 @@ interface Props { canAddCapa?: boolean } -const STATUS_COLORS: Record = { - reported: 'bg-yellow-100 text-yellow-800', - triaged: 'bg-blue-100 text-blue-800', - investigating: 'bg-purple-100 text-purple-800', - capa_pending: 'bg-orange-100 text-orange-800', - verification: 'bg-indigo-100 text-indigo-800', - closed: 'bg-green-100 text-green-800', -} - const STATUS_LABELS: Record = { reported: 'Reported', triaged: 'Triaged', @@ -45,9 +37,7 @@ export function IncidentHeader({ {referenceNo ?? 'Pending'} - - {STATUS_LABELS[status] ?? status.replace(/_/g, ' ')} - + {STATUS_LABELS[status] ?? status.replace(/_/g, ' ')}
{canTriage && ( diff --git a/components/incidents/incident-list.tsx b/components/incidents/incident-list.tsx index 51b6578..3ec3447 100644 --- a/components/incidents/incident-list.tsx +++ b/components/incidents/incident-list.tsx @@ -2,6 +2,7 @@ import { useState } from 'react' import Link from 'next/link' +import { StatusTag } from '@/components/ui/status-tag' const TYPE_LABELS: Record = { injury: 'Injury / Medical', @@ -14,14 +15,7 @@ const TYPE_LABELS: Record = { transport: 'Transport / Vehicle', } -const STATUS_COLORS: Record = { - reported: 'bg-yellow-100 text-yellow-800', - triaged: 'bg-blue-100 text-blue-800', - investigating: 'bg-purple-100 text-purple-800', - capa_pending: 'bg-orange-100 text-orange-800', - verification: 'bg-indigo-100 text-indigo-800', - closed: 'bg-green-100 text-green-800', -} +const STATUS_ORDER = ['reported', 'triaged', 'investigating', 'capa_pending', 'verification', 'closed'] as const export type Incident = { id: string @@ -86,7 +80,7 @@ export function IncidentList({ incidents, basePath }: Props) { onChange={e => setStatusFilter(e.target.value)} > - {Object.keys(STATUS_COLORS).map(s => ( + {STATUS_ORDER.map(s => ( ))} @@ -107,9 +101,7 @@ export function IncidentList({ incidents, basePath }: Props) { {inc.reference_no ?? '—'} - - {inc.status.replace(/_/g, ' ').toUpperCase()} - + {inc.status.replace(/_/g, ' ').toUpperCase()}
{TYPE_LABELS[inc.incident_type] ?? inc.incident_type} diff --git a/docs/superpowers/plans/2026-09-30-modernist-design-system-restyle.md b/docs/superpowers/plans/2026-09-30-modernist-design-system-restyle.md index ab1579e..0bdedcf 100644 --- a/docs/superpowers/plans/2026-09-30-modernist-design-system-restyle.md +++ b/docs/superpowers/plans/2026-09-30-modernist-design-system-restyle.md @@ -42,7 +42,7 @@ - `app/layout.tsx` — Archivo replaces Geist - `package.json` — `lucide-react`, `check:design` script - `components/ui/modal.tsx`, `components/layout/sidebar.tsx`, `components/notifications/bell.tsx`, `app/(protected)/layout.tsx` -- 10 files holding status, priority or severity color maps (listed in Task 6) +- 11 files holding status, priority or severity color maps (listed in Task 6) - All remaining TSX files flagged by the gate script (Task 7) - `CLAUDE.md`, plus memory file `ims-design-system.md` and `MEMORY.md` index (Task 8) @@ -1401,7 +1401,7 @@ Co-Authored-By: Claude Haiku 4.5 " ### Task 6: Replace scattered status, priority and severity color maps -**Files (10), each holds a color map to delete or replace:** +**Files (11), each holds a color map to delete or replace:** - `app/(protected)/reporter/page.tsx` (`STATUS_COLORS`, used ~line 113) - `app/(protected)/reporter/incidents/[id]/page.tsx` (`STATUS_COLORS`, ~line 77) - `app/(protected)/supervisor/page.tsx` (`STATUS_COLORS`, ~line 152) @@ -1412,6 +1412,7 @@ Co-Authored-By: Claude Haiku 4.5 " - `components/incidents/incident-header.tsx` (`STATUS_COLORS`, ~line 48) - `components/capa/capa-board.tsx` (`STATUS_COLORS`, `PRIORITY_BADGE`) - `components/dashboard/risk-flags-panel.tsx` (`LEVEL_COLORS`) +- `app/(protected)/hse/capa/[id]/page.tsx` (`PRIORITY_BADGE`, found during execution; the CAPA board table view also used `PRIORITY_BADGE`) - Test: `tests/components/incidents/incident-list.test.tsx` (existing, must keep passing) **Interfaces:**