Compare commits
52
Commits
137780d013
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a1f5f3126a | ||
|
|
2fed177fdc | ||
|
|
e130b039d4 | ||
|
|
1a2f9fbd47 | ||
|
|
2bda9d06a7 | ||
|
|
f32c6e8c60 | ||
|
|
4ec37bd078 | ||
|
|
f52e63ad09 | ||
|
|
813395700f | ||
|
|
701fefd286 | ||
|
|
f3c62d9225 | ||
|
|
17c32ecd04 | ||
|
|
5f1d7a6ed4 | ||
|
|
149704898d | ||
|
|
f3f3aec59f | ||
|
|
867b725262 | ||
|
|
fd7a55337f | ||
|
|
2a9d32d1d0 | ||
|
|
c4377fb705 | ||
|
|
275a1ef3e9 | ||
|
|
10f22b5cd5 | ||
|
|
1b84ed8625 | ||
|
|
550a61cedc | ||
|
|
de7fb298f7 | ||
|
|
51986b7ae5 | ||
|
|
cf5719883c | ||
|
|
98cc7c4ac9 | ||
|
|
29bdb39506 | ||
|
|
99eca7d242 | ||
|
|
e89ecdd5c4 | ||
|
|
7424fe4f9b | ||
|
|
0ca92182ff | ||
|
|
aac988010a | ||
|
|
4f9ca6e37f | ||
|
|
48b77458dd | ||
|
|
7e129b2781 | ||
|
|
4f75dd5887 | ||
|
|
69e510af74 | ||
|
|
04437926c2 | ||
|
|
9dca2a51d2 | ||
|
|
9f0331d190 | ||
|
|
87f553321b | ||
|
|
582504c24b | ||
|
|
a64b951922 | ||
|
|
9ba708ecb7 | ||
|
|
32dd42ac79 | ||
|
|
2a5b9332c7 | ||
|
|
01343d732e | ||
|
|
9ed8c97c24 | ||
|
|
f117605775 | ||
|
|
86d907afda | ||
|
|
bbe038e3aa |
@@ -5,53 +5,66 @@ HSE Incident Management System for Setia Corporation (3PL warehouse).
|
||||
Replaces WhatsApp/Excel safety reporting. Client: Ms. Agnes, Mr. Terence, Mr. Yap, Mr. Jensen.
|
||||
|
||||
## Stack
|
||||
- **Frontend + API routes:** Next.js (App Router)
|
||||
- **DB + Auth + Storage:** Supabase (Postgres + RLS + pgvector)
|
||||
- **Hosting:** VPS at `http://64.176.82.100/ims/` + Supabase cloud
|
||||
- **AI:** Claude API — server-side only, never client-side
|
||||
- **Email:** Resend
|
||||
- **Frontend + API routes:** Next.js 16 (App Router)
|
||||
- **Database:** self-hosted PostgreSQL on the production server (`127.0.0.1:5433`, db `ims`) with RLS and pgvector. Access through Drizzle ORM + `pg`. Supabase is no longer used (migrated 2026-09-30).
|
||||
- **Auth:** own email + password. `bcryptjs` hashes, `jose` JWT in the `ims_session` cookie (8h), checked in `middleware.ts`. No Supabase GoTrue.
|
||||
- **Storage:** evidence files on the server filesystem (`EVIDENCE_DIR`, `/var/lib/ims-evidence`), served through `/api/evidence/...` with HMAC-signed URLs (`EVIDENCE_URL_SECRET`). Backed up nightly.
|
||||
- **Hosting:** own server `175.136.239.121` (SSH port 9321), nginx → systemd service `ims` on port 3003 at https://ims.setia.com.my
|
||||
- **AI:** DeepSeek via the OpenAI-compatible client (`lib/claude/client.ts`; key set in Settings or `DEEPSEEK_API_KEY`) for quality check, triage, RCA, risk flags and bulk import. Embeddings (similar incidents) use Google `text-embedding-004` (`GOOGLE_AI_API_KEY`). Server-side only, never client-side.
|
||||
- **Email:** Brevo (`BREVO_API_KEY`, `BREVO_FROM_EMAIL`, `BREVO_FROM_NAME`). Resend is no longer used.
|
||||
- **WhatsApp:** Meta WhatsApp Business Cloud API
|
||||
- **PDF:** pdf-lib (JKKP form fill)
|
||||
- **PDF:** pdf-lib (JKKP form fill, incident report)
|
||||
- **QR:** qrcode npm package
|
||||
|
||||
## Current Phase
|
||||
**All phases (0–6) complete as of 2026-07-12.** Remaining work is ops: production env vars (`SUPABASE_SERVICE_ROLE_KEY`, Meta WhatsApp, Resend, `CRON_SECRET`), VPS cron registration (`docs/vps-cron.md`), optional Supabase Pro for image thumbnails.
|
||||
**All phases (0–6) complete as of 2026-07-12.** Supabase to local PostgreSQL migration completed and live 2026-09-30.
|
||||
**UI refresh in progress:** follow `design-system/design.md` §8 build order (tokens → ui primitives → TableCard → shells → migrate Incidents list → remaining screens).
|
||||
Legacy Supabase code (`lib/supabase/*`, `@supabase/*` deps, `supabase/` folder) was removed 2026-11-06; `db/schema.sql` + `db/rls.sql` are the schema source of truth.
|
||||
**Roles (since 2026-11-06):** `ssa` (Site Safety Assistant, replaces reporter + supervisor + capa_owner), `hse`, `management`, `admin`. SSA pages live under `app/(protected)/ssa/`.
|
||||
See `[[phases]]` memory for full phase breakdown and deliverables.
|
||||
|
||||
## Deployment (Production)
|
||||
|
||||
**Deploy path for ims.setia.com.my is `/var/www/ims` on 175.136.239.121:9321.**
|
||||
Host `ims.setia.com.my` (175.136.239.121), SSH port 9321, user `setia`. The server holds **build output only, no source**.
|
||||
|
||||
```bash
|
||||
# Correct deployment:
|
||||
tar -czf - package.json package-lock.json .next | \
|
||||
ssh -p 9321 setia@175.136.239.121 "cd /var/www/ims && tar -xzf -"
|
||||
pm2 restart wsims
|
||||
```
|
||||
- **NEVER run `next build`, `pnpm build` or `npm ci` on the server.** A build without source deletes the working `.next` (took production down on 2026-09-30).
|
||||
- App files: `/srv/apps/ims/app` (`/var/www/ims` is a symlink to it). Service: systemd `ims` (`node server.js`, port 3003). Restart: `sudo systemctl restart ims`.
|
||||
- Env files live in `/srv/apps/ims/shared/` (`.env`, `.env.production`); `app/.env*` are links to them. Never overwrite, delete or ship `.env*`.
|
||||
- Evidence files: `/var/lib/ims-evidence` (do not touch). A deploy never runs DB migrations; ask before changing the DB.
|
||||
- Cron: two daily jobs call `http://127.0.0.1:3003/api/cron/...` with `CRON_SECRET` from `shared/.env` (`docs/vps-cron.md`).
|
||||
|
||||
PM2 process `wsims` runs from `/var/www/ims`. Nginx proxies `ims.setia.com.my` → `http://127.0.0.1:3003`.
|
||||
Deploy steps:
|
||||
1. Build locally: `npm run build` (`output: 'standalone'`).
|
||||
2. Stage and upload without any `.env*` or macOS `._*` files (use `COPYFILE_DISABLE=1 tar --exclude='.env*' --exclude='._*'`). Only `server.js`, `package.json`, `node_modules`, `.next` (standalone `.next` plus `.next/static`) and `public` are needed, since the standalone output otherwise drags in the whole project.
|
||||
3. On the server confirm `/srv/apps/ims/app/.next/BUILD_ID` exists, then `sudo systemctl restart ims`. Never restart if `BUILD_ID` is missing.
|
||||
4. Verify https://ims.setia.com.my/login returns 200 and `systemctl is-active ims` is `active`. Keep a rollback copy first: `tar -czf /srv/apps/ims/next-backup-<date>.tgz .next`.
|
||||
|
||||
## Dev Conventions
|
||||
- Never commit `.env` or API keys. All secrets in env vars only.
|
||||
- RLS enforced at DB level for every table — never rely on UI-only hiding.
|
||||
- Claude API calls: server-side API routes only (`/app/api/...`).
|
||||
- RLS enforced at DB level for every table (`db/rls.sql`) — never rely on UI-only hiding. Query through `withUser` (RLS as the signed-in user) or `asAdmin` from `lib/db/with-user.ts`; do the write and its `audit_log` entry in one transaction.
|
||||
- AI calls: server-side API routes only (`/app/api/...`).
|
||||
- Incident reference format: `SITE-YYYYMM-####`
|
||||
- Every DB mutation writes to `audit_log` (table, record_id, action, changed_by, changed_at, old/new value).
|
||||
- Evidence files: never hard-delete; retain minimum 5 years (DOSH JKKP 8 requirement).
|
||||
- AI suggestions logged to `audit_log` — capture what Claude suggested + what human chose.
|
||||
- AI suggestions logged to `audit_log` — capture what the AI suggested + what the human chose.
|
||||
- Schema changes: edit `db/schema.sql` / `db/rls.sql` and apply by hand to the server database with the owner's go-ahead.
|
||||
|
||||
## File Structure (target)
|
||||
## File Structure
|
||||
```
|
||||
IMS/
|
||||
├── docs/ # PRD, tech spec, roadmap, specs — source of truth
|
||||
├── design-system/ # design.md (UI source of truth) + .dc.html references
|
||||
├── app/ # Next.js App Router pages + API routes
|
||||
├── components/ # Shared UI components
|
||||
├── components/
|
||||
│ ├── ui/ # Button, StatusTag, TableCard, … (design.md §4)
|
||||
│ └── layout/ # AppShell, MobileShell
|
||||
├── lib/
|
||||
│ ├── supabase/ # Supabase client + server helpers
|
||||
│ ├── claude/ # Claude API wrappers (server-side)
|
||||
│ └── notifications/ # Resend + WhatsApp senders
|
||||
├── supabase/
|
||||
│ └── migrations/ # SQL migration files
|
||||
│ ├── db/ # Drizzle schema, withUser/asAdmin, audit helper
|
||||
│ ├── auth/ # bcryptjs passwords, jose sessions, roles
|
||||
│ ├── storage/ # evidence files on disk + signed URLs
|
||||
│ ├── claude/ # AI client (DeepSeek) + Google embeddings
|
||||
│ └── notifications/ # Brevo email + WhatsApp senders, in-app
|
||||
├── db/ # schema.sql, rls.sql, migration/ops scripts
|
||||
└── public/
|
||||
```
|
||||
|
||||
@@ -62,20 +75,22 @@ IMS/
|
||||
- `[[phases]]` — 4 phases + deliverables, current phase
|
||||
- `[[compliance]]` — NADOPOD 2004, JKKP 6/7/8 rules
|
||||
|
||||
## Design system (Modernist)
|
||||
## Design system (IMS Admin refresh)
|
||||
|
||||
Source of truth: the Modernist `readme.md` and `styles.css` under `design-system/_ds/`. Tokens live in `app/globals.css` (`@theme static`). Do not use `design-system/IMS Admin.dc.html` as a style reference.
|
||||
Source of truth: `design-system/design.md`. Visual references: `design-system/IMS Admin.dc.html` (screens) and `design-system/IMS Admin Spec.dc.html` (patterns). Tokens live in `app/globals.css` (`@theme static`) and mirror design.md §2. The Modernist files under `design-system/_ds/` are retired; do not use them as a style reference.
|
||||
|
||||
- Flat and architectural: Archivo, ink on a `#f3f2f2` ground, one accent `#ec3013`. Zero corner radius, visible grid, strong 2px rules between major sections (`border-divider`, `border-b-2`).
|
||||
- Use tokens, never hard-coded hex, font names or px values the tokens carry: `bg-ground`, `bg-surface`, `text-ink`, `bg-accent`, `border-divider`, `accent-100…900`, `neutral-100…900`. `gray-*`, `blue-*` and `red-*` are remapped onto the neutral and accent ramps.
|
||||
- No `rounded-*` (except circular avatars, allowlisted in `scripts/check-design-gates.mjs`). Labels and headings are flush left, including button labels. No centered hero copy.
|
||||
- Body-size accent text uses `accent-700`; the accent itself is for buttons, icons and large text.
|
||||
- Icons: Lucide (`lucide-react`). Interaction: hover tint, pressed step from the accent ramp, `:focus-visible` 2px accent ring (global), disabled at 45% opacity.
|
||||
- Build UI with `components/ui/*`: `Button`, `Tag`, `StatusTag`, `PriorityTag`, `Field`/`Input`/`Select`/`Textarea`, `Card`, `Modal`, and the `TABLE/TH/TR/TD` class constants.
|
||||
- Status is never color alone. Needs attention, open, overdue, reported or severity 4-5 = accent tag; in progress = outline tag; done, closed, verified, low = neutral tag. Always keep the text label and an icon. Add new statuses in `components/ui/status-tag.tsx`, not per page.
|
||||
- Incident evidence photos stay full color. `.grayscale` is for decorative photography only.
|
||||
- Gotcha: never write `*/` inside a CSS comment in `globals.css` (for example a glob like `modernist-*/`); it ends the comment and silently swallows the `@theme` block.
|
||||
- Run `npm run check:design` before committing UI changes; it must print `design gates: clean`.
|
||||
- Neutral commerce-admin style: Geist (`--font-geist`, `--font-geist-mono`), ink `#1f1f1f` on `#f1f1f1` ground, white cards radius 12 with the `shadow-card` ring, one teal accent `#0f766e`. Rules are 1px (`border-rule`), never 2px.
|
||||
- Use tokens, never hard-coded hex, font names or px values the tokens carry: `bg-ground`, `bg-surface`, `bg-surface-2`, `text-ink`, `text-muted`, `text-faint`, `border-rule`, `border-ring`, `bg-accent`, `bg-accent-tint`, `text-danger`, and the `st-*` status pairs. `gray-*`/`blue-*`/`red-*` remaps stay only until legacy pages are migrated.
|
||||
- Radius comes from the scale: `rounded-md` (8) buttons, chips, inputs, pills; `rounded-xl` (12) cards and mobile controls; `rounded-[5px]` checkbox. Headings and labels are flush left.
|
||||
- Status and priority colours only via `StatusTag` / `PriorityTag` (design.md §4.2): dark text on a light tint, text label always present, no icon required. Add new statuses in `components/ui/status-tag.tsx`, not per page.
|
||||
- Every list is a `TableCard` (design.md §4.9): saved views, toolbar, sortable header, row hover quick actions, selected tint, footer pager, floating bulk bar, empty state, mobile stacked variant. Do not hand-build tables.
|
||||
- Build UI with `components/ui/*`: `Button`, `StatusTag`, `PriorityTag`, `Checkbox`, `Field`/`Input`/`Select`/`Textarea`, `FilterChip`, `Segmented`, `Avatar`, `Card`, `Drawer`, `TableCard`; pages sit in `AppShell` (desktop) or `MobileShell` (SSA).
|
||||
- Icons: Lucide (`lucide-react`), 16px stroke 2 in UI, 12px stroke 2.5 inside chips and checks, 22px stroke 1.8 in the mobile tab bar.
|
||||
- Interaction: hover/active values per component in design.md §4; `:focus-visible` 2px accent ring is global; transitions 120ms on bg/shadow only; mobile hit targets ≥ 44px.
|
||||
- Incident evidence photos stay full colour.
|
||||
- New pattern needed? Check design.md first. If it isn't there, design it in the design tool, then add it to design.md in the same PR as the component.
|
||||
- Gotcha: never write `*/` inside a CSS comment in `globals.css`; it ends the comment and silently swallows the `@theme` block.
|
||||
- Run `npm run check:design` before committing UI changes; it must print `design gates: clean`. The gate flags 2px borders, `Archivo`, hard-coded hex, `bg-white`, `shadow-xl/2xl`, centered button labels and off-palette hues; rounded corners are allowed. Extend `scripts/check-design-gates.mjs` when design.md adds a rule.
|
||||
|
||||
## graphify
|
||||
When graphify-out/graph.json exists:
|
||||
|
||||
@@ -3,22 +3,14 @@ import { describe, it, expect } from 'vitest'
|
||||
import { getRoleHome, ROLE_HOME, ALL_ROLES } from '@/lib/auth/roles'
|
||||
|
||||
describe('getRoleHome', () => {
|
||||
it('returns /reporter for reporter role', () => {
|
||||
expect(getRoleHome('reporter')).toBe('/reporter')
|
||||
})
|
||||
|
||||
it('returns /supervisor for supervisor role', () => {
|
||||
expect(getRoleHome('supervisor')).toBe('/supervisor')
|
||||
it('returns /ssa for ssa role', () => {
|
||||
expect(getRoleHome('ssa')).toBe('/ssa')
|
||||
})
|
||||
|
||||
it('returns /hse for hse role', () => {
|
||||
expect(getRoleHome('hse')).toBe('/hse')
|
||||
})
|
||||
|
||||
it('returns /capa-owner for capa_owner role', () => {
|
||||
expect(getRoleHome('capa_owner')).toBe('/capa-owner')
|
||||
})
|
||||
|
||||
it('returns /management for management role', () => {
|
||||
expect(getRoleHome('management')).toBe('/management')
|
||||
})
|
||||
@@ -27,11 +19,11 @@ describe('getRoleHome', () => {
|
||||
expect(getRoleHome('admin')).toBe('/admin')
|
||||
})
|
||||
|
||||
it('ROLE_HOME covers exactly 6 roles', () => {
|
||||
expect(Object.keys(ROLE_HOME)).toHaveLength(6)
|
||||
it('ROLE_HOME covers exactly 4 roles', () => {
|
||||
expect(Object.keys(ROLE_HOME)).toHaveLength(4)
|
||||
})
|
||||
|
||||
it('ALL_ROLES lists exactly 6 roles', () => {
|
||||
expect(ALL_ROLES).toHaveLength(6)
|
||||
it('ALL_ROLES lists exactly 4 roles', () => {
|
||||
expect(ALL_ROLES).toHaveLength(4)
|
||||
})
|
||||
})
|
||||
|
||||
@@ -10,11 +10,11 @@ export default async function LoginPage({ searchParams }: Props) {
|
||||
return (
|
||||
<main className="min-h-screen flex items-center justify-center bg-ground p-4">
|
||||
{message === 'password_reset' && (
|
||||
<div className="fixed top-4 left-1/2 -translate-x-1/2 bg-neutral-100 border border-divider text-ink text-sm px-4 py-2 shadow">
|
||||
<div className="fixed top-4 left-1/2 -translate-x-1/2 bg-st-green-bg text-st-green-fg text-[13px] px-4 py-2 rounded-md shadow-float">
|
||||
Password updated — sign in with your new password.
|
||||
</div>
|
||||
)}
|
||||
<div className="bg-surface border-2 border-divider p-8 w-full max-w-sm">
|
||||
<div className="bg-surface rounded-xl shadow-card p-8 w-full max-w-sm">
|
||||
<LoginForm />
|
||||
</div>
|
||||
</main>
|
||||
|
||||
@@ -29,7 +29,7 @@ export default async function AdminHome() {
|
||||
qrCodeToken: zones.qrCodeToken, active: zones.active,
|
||||
}).from(zones)),
|
||||
asAdmin(db => db.select({
|
||||
id: trucks.id, truckNo: trucks.truckNo, carrier: trucks.carrier, active: trucks.active,
|
||||
id: trucks.id, truckNo: trucks.truckNo, carrier: trucks.carrier, siteId: trucks.siteId, active: trucks.active,
|
||||
}).from(trucks).orderBy(asc(trucks.truckNo))),
|
||||
])
|
||||
|
||||
@@ -46,8 +46,10 @@ export default async function AdminHome() {
|
||||
|
||||
const siteOptions: SiteOption[] = siteRows.map(s => ({ id: s.id, name: s.name }))
|
||||
|
||||
const truckSites = siteRows.map(s => ({ id: s.id, name: s.name, active: s.active }))
|
||||
|
||||
const truckList: Truck[] = truckRows.map(t => ({
|
||||
id: t.id, truck_no: t.truckNo, carrier: t.carrier ?? null, active: t.active,
|
||||
id: t.id, truck_no: t.truckNo, carrier: t.carrier ?? null, site_id: t.siteId ?? null, active: t.active,
|
||||
}))
|
||||
|
||||
return (
|
||||
@@ -66,6 +68,7 @@ export default async function AdminHome() {
|
||||
sites={sitesWithZones}
|
||||
siteOptions={siteOptions}
|
||||
trucks={truckList}
|
||||
truckSites={truckSites}
|
||||
/>
|
||||
</main>
|
||||
)
|
||||
|
||||
@@ -2,20 +2,32 @@ export const dynamic = 'force-dynamic'
|
||||
|
||||
import { notFound, redirect } from 'next/navigation'
|
||||
import Link from 'next/link'
|
||||
import { ArrowLeft } from 'lucide-react'
|
||||
import { asAdmin } from '@/lib/db/with-user'
|
||||
import { getSession } from '@/lib/auth/get-session'
|
||||
import { capaActions, incidents, users } from '@/lib/db/schema'
|
||||
import { eq } from 'drizzle-orm'
|
||||
import { capaActions, evidenceFiles, incidents, users } from '@/lib/db/schema'
|
||||
import { eq, and, asc } from 'drizzle-orm'
|
||||
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'
|
||||
import { Avatar } from '@/components/ui/avatar'
|
||||
import { PriorityTag, StatusTag } from '@/components/ui/status-tag'
|
||||
import { daysLate } from '@/lib/capa/list'
|
||||
|
||||
interface Props {
|
||||
params: Promise<{ id: string }>
|
||||
}
|
||||
|
||||
function Row({ label, children }: { label: string; children: React.ReactNode }) {
|
||||
return (
|
||||
<div className="flex items-center justify-between gap-3 border-b border-rule py-2.5 last:border-0">
|
||||
<dt className="text-xs text-muted">{label}</dt>
|
||||
<dd className="text-right text-[13px]">{children}</dd>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default async function CapaDetailPage({ params }: Props) {
|
||||
const { id } = await params
|
||||
const session = await getSession()
|
||||
@@ -48,77 +60,111 @@ export default async function CapaDetailPage({ params }: Props) {
|
||||
|
||||
if (!capa) notFound()
|
||||
|
||||
const photos = await asAdmin(db =>
|
||||
db.select({ id: evidenceFiles.id, fileUrl: evidenceFiles.fileUrl })
|
||||
.from(evidenceFiles)
|
||||
.where(and(eq(evidenceFiles.capaId, id), eq(evidenceFiles.deleted, false)))
|
||||
.orderBy(asc(evidenceFiles.uploadedAt))
|
||||
)
|
||||
|
||||
const isHse = session && ['hse', 'admin'].includes(session.role)
|
||||
const status = capa.status
|
||||
const today = new Date().toISOString().slice(0, 10)
|
||||
const pastDue = (status === 'open' || status === 'in_progress') && Boolean(capa.dueDate) && capa.dueDate < today
|
||||
const shownStatus = pastDue ? 'overdue' : status
|
||||
const late = shownStatus === 'overdue' ? daysLate(capa.dueDate, today) : 0
|
||||
const canAct = ['open', 'in_progress', 'overdue', 'reopened'].includes(status) &&
|
||||
(isHse || session?.sub === capa.ownerUserId)
|
||||
|
||||
return (
|
||||
<main className="max-w-2xl mx-auto px-4 py-6">
|
||||
<Link href="/hse/capa" className="text-sm text-accent-700 hover:underline mb-4 inline-block">
|
||||
← CAPA Board
|
||||
<div className="space-y-4 px-4 py-5 md:px-8 md:py-6">
|
||||
<Link href="/hse/capa" className="inline-flex items-center gap-1 text-[13px] text-accent hover:underline">
|
||||
<ArrowLeft size={14} strokeWidth={2} aria-hidden />
|
||||
CAPA
|
||||
</Link>
|
||||
|
||||
<div className="bg-surface shadow-sm p-5 mb-4 space-y-4">
|
||||
<div className="flex items-start justify-between">
|
||||
<div>
|
||||
<p className="text-xs text-gray-500 mb-1">
|
||||
Incident: {capa.incidentRefNo ?? '—'}
|
||||
</p>
|
||||
<p className="text-gray-900 font-medium">{capa.description}</p>
|
||||
</div>
|
||||
<div className="space-y-2">
|
||||
<h1 className="text-xl font-[650]">{capa.description}</h1>
|
||||
<div className="flex flex-wrap items-center gap-2">
|
||||
<StatusTag status={shownStatus} />
|
||||
<PriorityTag priority={capa.priority} />
|
||||
<span className="text-[13px] text-muted">
|
||||
From{' '}
|
||||
<Link href={`/hse/incidents/${capa.incidentId}`} className="font-mono text-[12.5px] text-accent hover:underline">
|
||||
{capa.incidentRefNo ?? '—'}
|
||||
</Link>
|
||||
</span>
|
||||
</div>
|
||||
{capa.rootCauseRef && <p className="text-[13px] text-muted">Root cause: {capa.rootCauseRef}</p>}
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-2 gap-3 text-sm">
|
||||
<div className="grid gap-4 lg:grid-cols-[1fr_320px]">
|
||||
<div className="space-y-4">
|
||||
{canAct && (
|
||||
<div>
|
||||
<p className="text-xs text-gray-500">Owner</p>
|
||||
<p className="text-gray-800">{capa.ownerName ?? '—'}</p>
|
||||
</div>
|
||||
<div>
|
||||
<p className="text-xs text-gray-500">Department</p>
|
||||
<p className="text-gray-800">{capa.department}</p>
|
||||
</div>
|
||||
<div>
|
||||
<p className="text-xs text-gray-500">Due Date</p>
|
||||
<p className="text-gray-800">{capa.dueDate}</p>
|
||||
</div>
|
||||
<div>
|
||||
<p className="text-xs text-gray-500">Status</p>
|
||||
<p className="text-gray-800 capitalize">{status.replace(/_/g, ' ')}</p>
|
||||
</div>
|
||||
{capa.ownerNotes && (
|
||||
<div className="col-span-2">
|
||||
<p className="text-xs text-gray-500">Owner Notes</p>
|
||||
<p className="text-sm text-gray-800 whitespace-pre-wrap">{capa.ownerNotes}</p>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{capa.rootCauseRef && (
|
||||
<div>
|
||||
<p className="text-xs text-gray-500">Root Cause Reference</p>
|
||||
<p className="text-sm text-gray-800">{capa.rootCauseRef}</p>
|
||||
<CapaOwnerActions capaId={id} currentStatus={status} />
|
||||
</div>
|
||||
)}
|
||||
|
||||
{isHse && status === 'pending_verification' && <VerifyForm capaId={id} />}
|
||||
{isHse && status === 'verified' && <CloseCapaButton capaId={id} />}
|
||||
|
||||
{(capa.ownerNotes || capa.completedAt || photos.length > 0) && (
|
||||
<section className="space-y-2 rounded-xl bg-surface p-5 shadow-card">
|
||||
<h2 className="text-sm font-semibold">Completion report</h2>
|
||||
{capa.completedAt && (
|
||||
<p className="text-xs text-gray-500">
|
||||
Completed: {new Date(capa.completedAt).toLocaleString('en-MY', { timeZone: 'Asia/Kuala_Lumpur' })}
|
||||
<p className="text-xs text-muted">
|
||||
Completed {new Date(capa.completedAt).toLocaleString('en-MY', { timeZone: 'Asia/Kuala_Lumpur' })}
|
||||
</p>
|
||||
)}
|
||||
{capa.ownerNotes && (
|
||||
<p className="whitespace-pre-wrap text-[13px] text-ink-3">{capa.ownerNotes}</p>
|
||||
)}
|
||||
{photos.length > 0 && (
|
||||
<ul className="grid grid-cols-2 gap-2 sm:grid-cols-3">
|
||||
{photos.map((p, i) => (
|
||||
<li key={p.id}>
|
||||
<a href={p.fileUrl} target="_blank" rel="noreferrer" className="block overflow-hidden rounded-md shadow-card">
|
||||
{/* eslint-disable-next-line @next/next/no-img-element */}
|
||||
<img src={p.fileUrl} alt={`CAPA completion evidence ${i + 1} of ${photos.length}`} className="aspect-square w-full object-cover" />
|
||||
</a>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
)}
|
||||
</section>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{['open', 'in_progress', 'overdue', 'reopened'].includes(status) &&
|
||||
(isHse || session?.sub === capa.ownerUserId) && (
|
||||
<CapaOwnerActions capaId={id} currentStatus={status} />
|
||||
<aside>
|
||||
<section className="rounded-xl bg-surface p-5 shadow-card">
|
||||
<h2 className="mb-1 text-sm font-semibold">Details</h2>
|
||||
<dl>
|
||||
<Row label="Owner">
|
||||
{capa.ownerName ? (
|
||||
<span className="inline-flex items-center gap-2">
|
||||
<Avatar name={capa.ownerName} />
|
||||
{capa.ownerName}
|
||||
</span>
|
||||
) : (
|
||||
'—'
|
||||
)}
|
||||
|
||||
{isHse && status === 'pending_verification' && (
|
||||
<VerifyForm capaId={id} />
|
||||
</Row>
|
||||
<Row label="Department">{capa.department}</Row>
|
||||
<Row label="Priority"><PriorityTag priority={capa.priority} /></Row>
|
||||
<Row label="Due">
|
||||
{capa.dueDate}
|
||||
{late > 0 && <span className="ml-1.5 text-xs text-danger">{`${late} day${late === 1 ? '' : 's'} late`}</span>}
|
||||
</Row>
|
||||
{capa.completedAt && (
|
||||
<Row label="Completed">
|
||||
{new Date(capa.completedAt).toLocaleDateString('en-MY', { timeZone: 'Asia/Kuala_Lumpur' })}
|
||||
</Row>
|
||||
)}
|
||||
|
||||
{isHse && status === 'verified' && (
|
||||
<CloseCapaButton capaId={id} />
|
||||
)}
|
||||
</main>
|
||||
</dl>
|
||||
</section>
|
||||
</aside>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
export const dynamic = 'force-dynamic'
|
||||
|
||||
import { redirect } from 'next/navigation'
|
||||
import Link from 'next/link'
|
||||
import { asAdmin } from '@/lib/db/with-user'
|
||||
import { getSession } from '@/lib/auth/get-session'
|
||||
import { capaActions, incidents, users } from '@/lib/db/schema'
|
||||
import { eq, asc } from 'drizzle-orm'
|
||||
import { aliasedTable } from 'drizzle-orm'
|
||||
import { CapaBoard } from '@/components/capa/capa-board'
|
||||
import { CapaWorkspace } from '@/components/capa/capa-workspace'
|
||||
import type { CapaRow, CapaStatus } from '@/lib/capa/list'
|
||||
|
||||
export default async function CapaListPage() {
|
||||
const session = await getSession()
|
||||
@@ -34,29 +34,23 @@ export default async function CapaListPage() {
|
||||
)
|
||||
|
||||
const today = new Date().toISOString().slice(0, 10)
|
||||
const capas = rows.map(r => ({
|
||||
const capas: CapaRow[] = rows.map(r => ({
|
||||
id: r.id,
|
||||
incident_id: r.incidentId,
|
||||
description: r.description,
|
||||
department: r.department,
|
||||
due_date: r.dueDate,
|
||||
priority: r.priority,
|
||||
status: (r.status === 'open' || r.status === 'in_progress') && r.dueDate && r.dueDate < today
|
||||
? 'overdue' as const
|
||||
: r.status,
|
||||
incidents: { reference_no: r.incidentRefNo ?? null },
|
||||
owner: r.ownerName ? { name: r.ownerName } : null,
|
||||
status: ((r.status === 'open' || r.status === 'in_progress') && r.dueDate && r.dueDate < today
|
||||
? 'overdue'
|
||||
: r.status) as CapaStatus,
|
||||
incident_ref: r.incidentRefNo ?? null,
|
||||
owner_name: r.ownerName ?? null,
|
||||
}))
|
||||
|
||||
return (
|
||||
<main className="max-w-6xl mx-auto px-4 py-6">
|
||||
<div className="flex items-center justify-between mb-6">
|
||||
<h1 className="text-2xl font-bold text-gray-900">CAPA Board</h1>
|
||||
<Link href="/hse/incidents" className="text-sm text-accent-700 hover:underline">
|
||||
← Incidents
|
||||
</Link>
|
||||
<div className="px-4 py-5 md:px-8 md:py-6">
|
||||
<CapaWorkspace capas={capas} today={today} />
|
||||
</div>
|
||||
<CapaBoard capas={capas} />
|
||||
</main>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -187,8 +187,8 @@ export default async function HseDashboardPage({
|
||||
{(tab === 'overview') && (
|
||||
<>
|
||||
{now.getMonth() === 0 && (
|
||||
<div className="bg-accent-100 border border-accent-300 p-4 mb-6">
|
||||
<p className="text-sm text-accent-700">
|
||||
<div className="bg-st-amber-bg rounded-xl p-4 mb-6">
|
||||
<p className="text-sm text-st-amber-fg">
|
||||
<strong>JKKP 8 annual register due:</strong> the {now.getFullYear() - 1} register must be
|
||||
submitted to DOSH before 31 January {now.getFullYear()}.{' '}
|
||||
<a href={`/api/reports/jkkp8?year=${now.getFullYear() - 1}`} className="underline font-medium">
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { notFound, redirect } from 'next/navigation'
|
||||
import Link from 'next/link'
|
||||
import { ArrowLeft } from 'lucide-react'
|
||||
import { asAdmin } from '@/lib/db/with-user'
|
||||
import { getSession } from '@/lib/auth/get-session'
|
||||
import { incidents } from '@/lib/db/schema'
|
||||
@@ -30,15 +31,18 @@ export default async function NewCapaPage({ params }: Props) {
|
||||
if (!incident) notFound()
|
||||
|
||||
return (
|
||||
<main className="max-w-lg mx-auto px-4 py-6">
|
||||
<Link href={`/hse/incidents/${id}`} className="text-sm text-accent-700 hover:underline mb-4 inline-block">
|
||||
← Back to incident
|
||||
<div className="max-w-xl space-y-4 px-4 py-5 md:px-8 md:py-6">
|
||||
<Link href={`/hse/incidents/${id}`} className="inline-flex items-center gap-1 text-[13px] text-accent hover:underline">
|
||||
<ArrowLeft size={14} strokeWidth={2} aria-hidden />
|
||||
Back to incident
|
||||
</Link>
|
||||
<h1 className="text-xl font-bold text-gray-900 mb-1">Add CAPA Action</h1>
|
||||
<p className="text-sm text-gray-500 mb-6">
|
||||
{incident.referenceNo ?? id}
|
||||
</p>
|
||||
<div>
|
||||
<h1 className="text-xl font-[650]">Add CAPA action</h1>
|
||||
<p className="mt-0.5 font-mono text-[12.5px] text-muted">{incident.referenceNo ?? id}</p>
|
||||
</div>
|
||||
<div className="rounded-xl bg-surface p-5 shadow-card">
|
||||
<CapaForm incidentId={id} />
|
||||
</main>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,106 +1,39 @@
|
||||
export const dynamic = 'force-dynamic'
|
||||
|
||||
import Link from 'next/link'
|
||||
import { redirect } from 'next/navigation'
|
||||
import { asAdmin } from '@/lib/db/with-user'
|
||||
import { getSession } from '@/lib/auth/get-session'
|
||||
import { incidents, sites, zones, trucks, users } from '@/lib/db/schema'
|
||||
import { eq, and, or, ilike, desc, asc, sql } from 'drizzle-orm'
|
||||
import { aliasedTable } from 'drizzle-orm'
|
||||
import { IncidentList, type Incident } from '@/components/incidents/incident-list'
|
||||
import { Pagination } from '@/components/incidents/pagination'
|
||||
import { IncidentFilters, type SiteOption, type TruckOption } from '@/components/incidents/incident-filters'
|
||||
|
||||
const PAGE_SIZE = 25
|
||||
import { buttonClass } from '@/components/ui/button'
|
||||
import { IncidentTable } from '@/components/incidents/incident-table'
|
||||
import { loadIncidentList } from '@/lib/incidents/list-query'
|
||||
import { parseListParams } from '@/lib/incidents/list-params'
|
||||
|
||||
export default async function HseInboxPage({
|
||||
searchParams,
|
||||
}: {
|
||||
searchParams: Promise<{ page?: string; q?: string; status?: string; type?: string; site_id?: string; truck_id?: string }>
|
||||
searchParams: Promise<Record<string, string | undefined>>
|
||||
}) {
|
||||
const session = await getSession()
|
||||
if (!session) redirect('/login')
|
||||
|
||||
const params = await searchParams
|
||||
const page = Math.max(1, Number.parseInt(params.page ?? '1', 10) || 1)
|
||||
const from = (page - 1) * PAGE_SIZE
|
||||
|
||||
const reporterAlias = aliasedTable(users, 'reporter')
|
||||
|
||||
const conditions = []
|
||||
if (params.q) conditions.push(or(ilike(incidents.referenceNo, `%${params.q}%`), ilike(incidents.description, `%${params.q}%`)))
|
||||
if (params.status) conditions.push(eq(incidents.status, params.status as never))
|
||||
if (params.type) conditions.push(eq(incidents.incidentType, params.type as never))
|
||||
if (params.site_id) conditions.push(eq(incidents.siteId, params.site_id))
|
||||
if (params.truck_id) conditions.push(eq(incidents.truckId, params.truck_id))
|
||||
const where = conditions.length ? and(...conditions) : undefined
|
||||
|
||||
const [[countRow], incidentRows, siteRows, truckRows] = await Promise.all([
|
||||
asAdmin(db =>
|
||||
db.select({ count: sql<number>`count(*)` })
|
||||
.from(incidents)
|
||||
.where(where)
|
||||
),
|
||||
asAdmin(db =>
|
||||
db.select({
|
||||
id: incidents.id,
|
||||
referenceNo: incidents.referenceNo,
|
||||
incidentType: incidents.incidentType,
|
||||
status: incidents.status,
|
||||
severity: incidents.severity,
|
||||
reportedAt: incidents.reportedAt,
|
||||
siteName: sites.name,
|
||||
zoneName: zones.name,
|
||||
reporterName: reporterAlias.name,
|
||||
truckNo: trucks.truckNo,
|
||||
})
|
||||
.from(incidents)
|
||||
.leftJoin(sites, eq(incidents.siteId, sites.id))
|
||||
.leftJoin(zones, eq(incidents.zoneId, zones.id))
|
||||
.leftJoin(reporterAlias, eq(incidents.reportedBy, reporterAlias.id))
|
||||
.leftJoin(trucks, eq(incidents.truckId, trucks.id))
|
||||
.where(where)
|
||||
.orderBy(desc(incidents.reportedAt))
|
||||
.limit(PAGE_SIZE)
|
||||
.offset(from)
|
||||
),
|
||||
asAdmin(db =>
|
||||
db.select({ id: sites.id, name: sites.name }).from(sites).orderBy(asc(sites.name))
|
||||
),
|
||||
asAdmin(db =>
|
||||
db.select({ id: trucks.id, truckNo: trucks.truckNo })
|
||||
.from(trucks)
|
||||
.where(eq(trucks.active, true))
|
||||
.orderBy(asc(trucks.truckNo))
|
||||
),
|
||||
])
|
||||
|
||||
const total = Number(countRow?.count ?? 0)
|
||||
|
||||
const incidentList: Incident[] = incidentRows.map(r => ({
|
||||
id: r.id,
|
||||
reference_no: r.referenceNo,
|
||||
incident_type: r.incidentType,
|
||||
status: r.status,
|
||||
severity: r.severity,
|
||||
reported_at: r.reportedAt.toISOString(),
|
||||
sites: r.siteName ? { name: r.siteName } : null,
|
||||
zones: r.zoneName ? { name: r.zoneName } : null,
|
||||
trucks: r.truckNo ? { truck_no: r.truckNo } : null,
|
||||
reporter: r.reporterName ? { name: r.reporterName } : null,
|
||||
}))
|
||||
|
||||
const siteOptions: SiteOption[] = siteRows.map(s => ({ id: s.id, name: s.name }))
|
||||
const truckOptions: TruckOption[] = truckRows.map(t => ({ id: t.id, truck_no: t.truckNo }))
|
||||
const params = parseListParams(await searchParams)
|
||||
const data = await loadIncidentList(params)
|
||||
|
||||
return (
|
||||
<main className="max-w-4xl mx-auto px-4 py-6">
|
||||
<div className="flex items-center justify-between mb-4">
|
||||
<h1 className="text-2xl font-bold text-gray-900">Incident Inbox</h1>
|
||||
<span className="text-sm text-gray-500">{total} incidents</span>
|
||||
<div className="px-4 py-5 md:px-8 md:py-6 space-y-4">
|
||||
<div className="flex items-center justify-between">
|
||||
<h1 className="text-[22px] md:text-xl font-[650]">Incidents</h1>
|
||||
<Link href="/report" className={buttonClass('primary')}>Report incident</Link>
|
||||
</div>
|
||||
<IncidentTable
|
||||
incidents={data.incidents}
|
||||
basePath="/hse"
|
||||
total={data.total}
|
||||
counts={data.counts}
|
||||
params={params}
|
||||
sites={data.sites}
|
||||
trucks={data.trucks}
|
||||
/>
|
||||
</div>
|
||||
<IncidentFilters sites={siteOptions} trucks={truckOptions} />
|
||||
<IncidentList incidents={incidentList} basePath="/hse" />
|
||||
<Pagination page={page} pageSize={PAGE_SIZE} total={total} href="/hse/incidents" />
|
||||
</main>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ export const dynamic = 'force-dynamic'
|
||||
|
||||
import { redirect } from 'next/navigation'
|
||||
import { getSession } from '@/lib/auth/get-session'
|
||||
import { Sidebar } from '@/components/layout/sidebar'
|
||||
import { AppShell } from '@/components/layout/app-shell'
|
||||
|
||||
export default async function ProtectedLayout({
|
||||
children,
|
||||
@@ -13,15 +13,8 @@ export default async function ProtectedLayout({
|
||||
if (!session) redirect('/login')
|
||||
|
||||
return (
|
||||
<div className="min-h-screen bg-ground">
|
||||
<Sidebar
|
||||
role={session.role}
|
||||
userName={session.name}
|
||||
userEmail=""
|
||||
/>
|
||||
<div className="sm:ml-60 pb-16 sm:pb-0">
|
||||
<AppShell role={session.role} userName={session.name}>
|
||||
{children}
|
||||
</div>
|
||||
</div>
|
||||
</AppShell>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -21,10 +21,10 @@ const STATUS_LABELS: Record<string, string> = {
|
||||
closed: 'Closed',
|
||||
}
|
||||
|
||||
export default async function CapaOwnerPage() {
|
||||
export default async function MyCapasPage() {
|
||||
const session = await getSession()
|
||||
if (!session) redirect('/login')
|
||||
if (!['capa_owner', 'admin', 'hse', 'supervisor'].includes(session.role)) redirect('/')
|
||||
if (!['ssa', 'admin', 'hse'].includes(session.role)) redirect('/')
|
||||
|
||||
const rows = await asAdmin(db =>
|
||||
db.select({
|
||||
+2
-2
@@ -14,7 +14,7 @@ interface Props {
|
||||
params: Promise<{ id: string }>
|
||||
}
|
||||
|
||||
export default async function SupervisorIncidentDetailPage({ params }: Props) {
|
||||
export default async function SsaIncidentDetailPage({ params }: Props) {
|
||||
const { id } = await params
|
||||
|
||||
const session = await getSession()
|
||||
@@ -136,7 +136,7 @@ export default async function SupervisorIncidentDetailPage({ params }: Props) {
|
||||
|
||||
return (
|
||||
<main className="max-w-3xl mx-auto px-4 py-6">
|
||||
<Link href="/supervisor/incidents" className="text-sm text-accent-700 hover:underline mb-4 inline-block">
|
||||
<Link href="/ssa/incidents" className="text-sm text-accent-700 hover:underline mb-4 inline-block">
|
||||
← Back to inbox
|
||||
</Link>
|
||||
<IncidentDetail incident={incidentProp} />
|
||||
@@ -0,0 +1,39 @@
|
||||
export const dynamic = 'force-dynamic'
|
||||
|
||||
import Link from 'next/link'
|
||||
import { redirect } from 'next/navigation'
|
||||
import { getSession } from '@/lib/auth/get-session'
|
||||
import { buttonClass } from '@/components/ui/button'
|
||||
import { IncidentTable } from '@/components/incidents/incident-table'
|
||||
import { loadIncidentList } from '@/lib/incidents/list-query'
|
||||
import { parseListParams } from '@/lib/incidents/list-params'
|
||||
|
||||
export default async function SsaInboxPage({
|
||||
searchParams,
|
||||
}: {
|
||||
searchParams: Promise<Record<string, string | undefined>>
|
||||
}) {
|
||||
const session = await getSession()
|
||||
if (!session) redirect('/login')
|
||||
|
||||
const params = parseListParams(await searchParams)
|
||||
const data = await loadIncidentList(params)
|
||||
|
||||
return (
|
||||
<div className="px-4 py-5 md:px-8 md:py-6 space-y-4">
|
||||
<div className="flex items-center justify-between">
|
||||
<h1 className="text-[22px] md:text-xl font-[650]">Incidents</h1>
|
||||
<Link href="/report" className={buttonClass('primary')}>Report incident</Link>
|
||||
</div>
|
||||
<IncidentTable
|
||||
incidents={data.incidents}
|
||||
basePath="/ssa"
|
||||
total={data.total}
|
||||
counts={data.counts}
|
||||
params={params}
|
||||
sites={data.sites}
|
||||
trucks={data.trucks}
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
+5
-5
@@ -12,7 +12,7 @@ const STATUS_LABELS: Record<string, string> = {
|
||||
reported: 'Reported', triaged: 'Triaged', investigating: 'Investigating',
|
||||
capa_pending: 'CAPA Pending', verification: 'Verification', closed: 'Closed',
|
||||
}
|
||||
export default async function ReporterIncidentDetail({
|
||||
export default async function MyReportDetail({
|
||||
params,
|
||||
}: {
|
||||
params: Promise<{ id: string }>
|
||||
@@ -60,7 +60,7 @@ export default async function ReporterIncidentDetail({
|
||||
return (
|
||||
<main className="max-w-2xl mx-auto px-4 py-6 space-y-4">
|
||||
<div className="flex items-center gap-2 mb-2">
|
||||
<Link href="/reporter" className="text-sm text-accent-700 hover:underline">← My Reports</Link>
|
||||
<Link href="/ssa/my-reports" className="text-sm text-accent-700 hover:underline">← My Reports</Link>
|
||||
</div>
|
||||
|
||||
<div className="bg-surface shadow-sm p-5">
|
||||
@@ -106,9 +106,9 @@ export default async function ReporterIncidentDetail({
|
||||
<div key={c.id} className="flex items-start justify-between gap-3 text-sm">
|
||||
<p className="text-gray-700 flex-1">{c.description}</p>
|
||||
<span className={`text-xs px-2 py-0.5 shrink-0 ${
|
||||
c.status === 'verified' ? 'bg-neutral-100 text-ink' :
|
||||
c.status === 'pending_verification' ? 'bg-accent-100 text-accent-700' :
|
||||
'bg-gray-100 text-gray-600'
|
||||
c.status === 'verified' ? 'bg-st-green-bg text-st-green-fg' :
|
||||
c.status === 'pending_verification' ? 'bg-st-indigo-bg text-st-indigo-fg' :
|
||||
'bg-st-grey-bg text-st-grey-fg'
|
||||
}`}>{c.status.replace(/_/g, ' ')}</span>
|
||||
</div>
|
||||
))}
|
||||
@@ -22,7 +22,7 @@ const TYPE_LABELS: Record<string, string> = {
|
||||
asset_damage: 'Asset Damage', environmental: 'Environmental', security: 'Security', fire: 'Fire',
|
||||
}
|
||||
|
||||
export default async function ReporterPage() {
|
||||
export default async function MyReportsPage() {
|
||||
const session = await getSession()
|
||||
if (!session) redirect('/login')
|
||||
|
||||
@@ -83,7 +83,7 @@ export default async function ReporterPage() {
|
||||
) : (
|
||||
<div className="bg-surface shadow-sm divide-y divide-gray-50">
|
||||
{rows.map(inc => (
|
||||
<Link key={inc.id} href={`/reporter/incidents/${inc.id}`} className="block p-4 cursor-pointer hover:bg-gray-50 transition-colors">
|
||||
<Link key={inc.id} href={`/ssa/my-reports/${inc.id}`} className="block p-4 cursor-pointer hover:bg-gray-50 transition-colors">
|
||||
<div className="flex items-start justify-between gap-3">
|
||||
<div className="flex-1 min-w-0">
|
||||
<p className="text-sm font-semibold text-gray-900">
|
||||
@@ -19,15 +19,15 @@ const STATUS_LABELS: Record<string, string> = {
|
||||
closed: 'Closed',
|
||||
}
|
||||
|
||||
export default async function SupervisorPage() {
|
||||
export default async function SsaPage() {
|
||||
const session = await getSession()
|
||||
if (!session) redirect('/login')
|
||||
if (!['supervisor', 'admin'].includes(session.role)) redirect('/')
|
||||
if (!['ssa', 'admin'].includes(session.role)) redirect('/')
|
||||
|
||||
if (!session.siteId) {
|
||||
return (
|
||||
<main className="max-w-4xl mx-auto px-4 py-6">
|
||||
<h1 className="text-2xl font-bold text-gray-900 mb-4">Supervisor Portal</h1>
|
||||
<h1 className="text-2xl font-bold text-gray-900 mb-4">Site Safety Assistant Portal</h1>
|
||||
<p className="text-sm text-gray-500">No site assigned — contact your administrator.</p>
|
||||
</main>
|
||||
)
|
||||
@@ -108,10 +108,10 @@ export default async function SupervisorPage() {
|
||||
<main className="max-w-4xl mx-auto px-4 py-6">
|
||||
<div className="flex items-center justify-between mb-6">
|
||||
<div>
|
||||
<h1 className="text-2xl font-bold text-gray-900">Supervisor Portal</h1>
|
||||
<h1 className="text-2xl font-bold text-gray-900">Site Safety Assistant Portal</h1>
|
||||
<p className="text-sm text-gray-500 mt-1">{siteName}</p>
|
||||
</div>
|
||||
<Link href="/supervisor/incidents" className="text-sm text-accent-700 hover:underline">
|
||||
<Link href="/ssa/incidents" className="text-sm text-accent-700 hover:underline">
|
||||
All incidents →
|
||||
</Link>
|
||||
</div>
|
||||
@@ -134,7 +134,7 @@ export default async function SupervisorPage() {
|
||||
{openIncidents.map(inc => (
|
||||
<Link
|
||||
key={inc.id}
|
||||
href={`/supervisor/incidents/${inc.id}`}
|
||||
href={`/ssa/incidents/${inc.id}`}
|
||||
className="flex items-center justify-between py-2 border-b border-gray-50 last:border-0 hover:bg-gray-50 -mx-2 px-2"
|
||||
>
|
||||
<div>
|
||||
@@ -1,106 +0,0 @@
|
||||
export const dynamic = 'force-dynamic'
|
||||
|
||||
import { redirect } from 'next/navigation'
|
||||
import { asAdmin } from '@/lib/db/with-user'
|
||||
import { getSession } from '@/lib/auth/get-session'
|
||||
import { incidents, sites, zones, trucks, users } from '@/lib/db/schema'
|
||||
import { eq, and, or, ilike, desc, asc, sql } from 'drizzle-orm'
|
||||
import { aliasedTable } from 'drizzle-orm'
|
||||
import { IncidentList, type Incident } from '@/components/incidents/incident-list'
|
||||
import { Pagination } from '@/components/incidents/pagination'
|
||||
import { IncidentFilters, type SiteOption, type TruckOption } from '@/components/incidents/incident-filters'
|
||||
|
||||
const PAGE_SIZE = 25
|
||||
|
||||
export default async function SupervisorInboxPage({
|
||||
searchParams,
|
||||
}: {
|
||||
searchParams: Promise<{ page?: string; q?: string; status?: string; type?: string; site_id?: string; truck_id?: string }>
|
||||
}) {
|
||||
const session = await getSession()
|
||||
if (!session) redirect('/login')
|
||||
|
||||
const params = await searchParams
|
||||
const page = Math.max(1, Number.parseInt(params.page ?? '1', 10) || 1)
|
||||
const from = (page - 1) * PAGE_SIZE
|
||||
|
||||
const reporterAlias = aliasedTable(users, 'reporter')
|
||||
|
||||
const conditions = []
|
||||
if (params.q) conditions.push(or(ilike(incidents.referenceNo, `%${params.q}%`), ilike(incidents.description, `%${params.q}%`)))
|
||||
if (params.status) conditions.push(eq(incidents.status, params.status as never))
|
||||
if (params.type) conditions.push(eq(incidents.incidentType, params.type as never))
|
||||
if (params.site_id) conditions.push(eq(incidents.siteId, params.site_id))
|
||||
if (params.truck_id) conditions.push(eq(incidents.truckId, params.truck_id))
|
||||
const where = conditions.length ? and(...conditions) : undefined
|
||||
|
||||
const [[countRow], incidentRows, siteRows, truckRows] = await Promise.all([
|
||||
asAdmin(db =>
|
||||
db.select({ count: sql<number>`count(*)` })
|
||||
.from(incidents)
|
||||
.where(where)
|
||||
),
|
||||
asAdmin(db =>
|
||||
db.select({
|
||||
id: incidents.id,
|
||||
referenceNo: incidents.referenceNo,
|
||||
incidentType: incidents.incidentType,
|
||||
status: incidents.status,
|
||||
severity: incidents.severity,
|
||||
reportedAt: incidents.reportedAt,
|
||||
siteName: sites.name,
|
||||
zoneName: zones.name,
|
||||
reporterName: reporterAlias.name,
|
||||
truckNo: trucks.truckNo,
|
||||
})
|
||||
.from(incidents)
|
||||
.leftJoin(sites, eq(incidents.siteId, sites.id))
|
||||
.leftJoin(zones, eq(incidents.zoneId, zones.id))
|
||||
.leftJoin(reporterAlias, eq(incidents.reportedBy, reporterAlias.id))
|
||||
.leftJoin(trucks, eq(incidents.truckId, trucks.id))
|
||||
.where(where)
|
||||
.orderBy(desc(incidents.reportedAt))
|
||||
.limit(PAGE_SIZE)
|
||||
.offset(from)
|
||||
),
|
||||
asAdmin(db =>
|
||||
db.select({ id: sites.id, name: sites.name }).from(sites).orderBy(asc(sites.name))
|
||||
),
|
||||
asAdmin(db =>
|
||||
db.select({ id: trucks.id, truckNo: trucks.truckNo })
|
||||
.from(trucks)
|
||||
.where(eq(trucks.active, true))
|
||||
.orderBy(asc(trucks.truckNo))
|
||||
),
|
||||
])
|
||||
|
||||
const total = Number(countRow?.count ?? 0)
|
||||
|
||||
const incidentList: Incident[] = incidentRows.map(r => ({
|
||||
id: r.id,
|
||||
reference_no: r.referenceNo,
|
||||
incident_type: r.incidentType,
|
||||
status: r.status,
|
||||
severity: r.severity,
|
||||
reported_at: r.reportedAt.toISOString(),
|
||||
sites: r.siteName ? { name: r.siteName } : null,
|
||||
zones: r.zoneName ? { name: r.zoneName } : null,
|
||||
trucks: r.truckNo ? { truck_no: r.truckNo } : null,
|
||||
reporter: r.reporterName ? { name: r.reporterName } : null,
|
||||
}))
|
||||
|
||||
const siteOptions: SiteOption[] = siteRows.map(s => ({ id: s.id, name: s.name }))
|
||||
const truckOptions: TruckOption[] = truckRows.map(t => ({ id: t.id, truck_no: t.truckNo }))
|
||||
|
||||
return (
|
||||
<main className="max-w-4xl mx-auto px-4 py-6">
|
||||
<div className="flex items-center justify-between mb-4">
|
||||
<h1 className="text-2xl font-bold text-gray-900">Incident Inbox</h1>
|
||||
<span className="text-sm text-gray-500">{total} incidents</span>
|
||||
</div>
|
||||
<IncidentFilters sites={siteOptions} trucks={truckOptions} />
|
||||
<IncidentList incidents={incidentList} basePath="/supervisor" />
|
||||
<Pagination page={page} pageSize={PAGE_SIZE} total={total} href="/supervisor/incidents" />
|
||||
</main>
|
||||
)
|
||||
}
|
||||
@@ -3,27 +3,43 @@ export const dynamic = 'force-dynamic'
|
||||
import { NextRequest, NextResponse } from 'next/server'
|
||||
import { requireAdmin } from '@/lib/auth/require-admin'
|
||||
import { asAdmin } from '@/lib/db/with-user'
|
||||
import { trucks, incidents } from '@/lib/db/schema'
|
||||
import { trucks, incidents, sites } from '@/lib/db/schema'
|
||||
import { parseSiteId } from '@/lib/admin/truck-input'
|
||||
import { writeAuditLog } from '@/lib/db/audit'
|
||||
import { eq, sql } from 'drizzle-orm'
|
||||
import { and, eq, sql } from 'drizzle-orm'
|
||||
|
||||
async function activeSiteExists(id: string): Promise<boolean> {
|
||||
const [row] = await asAdmin(db =>
|
||||
db.select({ id: sites.id }).from(sites).where(and(eq(sites.id, id), eq(sites.active, true))).limit(1)
|
||||
)
|
||||
return !!row
|
||||
}
|
||||
|
||||
export async function POST(request: NextRequest) {
|
||||
const { session } = await requireAdmin()
|
||||
if (!session) return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||
|
||||
const body: { truck_no?: string; carrier?: string } = await request.json().catch(() => ({}))
|
||||
const body: { truck_no?: string; carrier?: string; site_id?: unknown } = await request.json().catch(() => ({}))
|
||||
const truck_no = (body.truck_no ?? '').trim()
|
||||
if (!truck_no) return NextResponse.json({ error: 'truck_no required' }, { status: 422 })
|
||||
|
||||
const parsedSite = parseSiteId(body.site_id)
|
||||
if (!parsedSite.ok) return NextResponse.json({ error: 'site_id invalid' }, { status: 422 })
|
||||
const siteId = parsedSite.value ?? null
|
||||
if (siteId && !(await activeSiteExists(siteId)))
|
||||
return NextResponse.json({ error: 'Site not found or inactive' }, { status: 422 })
|
||||
|
||||
const carrier = (body.carrier ?? '').trim() || null
|
||||
|
||||
try {
|
||||
let truckId: string | undefined
|
||||
await asAdmin(async db => {
|
||||
await db.transaction(async tx => {
|
||||
await tx.execute(sql`SELECT set_config('app.user_id', ${session.sub}, true)`)
|
||||
const [truck] = await tx.insert(trucks).values({ truckNo: truck_no, carrier: (body.carrier ?? '').trim() || null }).returning({ id: trucks.id })
|
||||
const [truck] = await tx.insert(trucks).values({ truckNo: truck_no, carrier, siteId }).returning({ id: trucks.id })
|
||||
if (!truck) throw new Error('Insert failed')
|
||||
truckId = truck.id
|
||||
await writeAuditLog(tx, 'trucks', truck.id, 'INSERT', { truck_no, carrier: (body.carrier ?? '').trim() || null })
|
||||
await writeAuditLog(tx, 'trucks', truck.id, 'INSERT', { truck_no, carrier, site_id: siteId })
|
||||
})
|
||||
})
|
||||
if (!truckId) return NextResponse.json({ error: 'Insert failed' }, { status: 400 })
|
||||
@@ -41,21 +57,46 @@ export async function PATCH(request: NextRequest) {
|
||||
const { session } = await requireAdmin()
|
||||
if (!session) return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||
|
||||
const body: { id?: string; active?: boolean } = await request.json().catch(() => ({}))
|
||||
const body: {
|
||||
id?: string
|
||||
active?: boolean
|
||||
truck_no?: string
|
||||
carrier?: string | null
|
||||
site_id?: unknown
|
||||
} = await request.json().catch(() => ({}))
|
||||
if (!body.id) return NextResponse.json({ error: 'id required' }, { status: 422 })
|
||||
|
||||
const set: { active?: boolean; truckNo?: string; carrier?: string | null; siteId?: string | null } = {}
|
||||
if (typeof body.active === 'boolean') set.active = body.active
|
||||
if (body.truck_no !== undefined) {
|
||||
const no = String(body.truck_no).trim()
|
||||
if (!no) return NextResponse.json({ error: 'truck_no required' }, { status: 422 })
|
||||
set.truckNo = no
|
||||
}
|
||||
if (body.carrier !== undefined) set.carrier = (body.carrier ?? '').trim() || null
|
||||
const parsedSite = parseSiteId(body.site_id)
|
||||
if (!parsedSite.ok) return NextResponse.json({ error: 'site_id invalid' }, { status: 422 })
|
||||
if (parsedSite.value !== undefined) set.siteId = parsedSite.value
|
||||
if (Object.keys(set).length === 0)
|
||||
return NextResponse.json({ error: 'nothing to update' }, { status: 422 })
|
||||
|
||||
const [before] = await asAdmin(db =>
|
||||
db.select().from(trucks).where(eq(trucks.id, body.id!)).limit(1)
|
||||
)
|
||||
if (set.siteId && set.siteId !== before?.siteId && !(await activeSiteExists(set.siteId)))
|
||||
return NextResponse.json({ error: 'Site not found or inactive' }, { status: 422 })
|
||||
|
||||
try {
|
||||
await asAdmin(async db => {
|
||||
await db.transaction(async tx => {
|
||||
await tx.execute(sql`SELECT set_config('app.user_id', ${session.sub}, true)`)
|
||||
await tx.update(trucks).set({ active: body.active }).where(eq(trucks.id, body.id!))
|
||||
await writeAuditLog(tx, 'trucks', body.id!, 'admin_update', { active: body.active }, before ?? null)
|
||||
await tx.update(trucks).set(set).where(eq(trucks.id, body.id!))
|
||||
await writeAuditLog(tx, 'trucks', body.id!, 'admin_update', set, before ?? null)
|
||||
})
|
||||
})
|
||||
} catch {
|
||||
} catch (e) {
|
||||
const code = (e as { code?: string }).code
|
||||
if (code === '23505') return NextResponse.json({ error: 'Truck number already exists' }, { status: 409 })
|
||||
return NextResponse.json({ error: 'Update failed' }, { status: 500 })
|
||||
}
|
||||
return NextResponse.json({ ok: true })
|
||||
|
||||
@@ -69,7 +69,7 @@ export async function POST(request: NextRequest) {
|
||||
name: body.name ?? '',
|
||||
email,
|
||||
phone: (body.phone ?? '').trim() || null,
|
||||
role: (body.role as typeof users.$inferInsert['role']) ?? 'reporter',
|
||||
role: (body.role as typeof users.$inferInsert['role']) ?? 'ssa',
|
||||
siteId: body.site_id ?? null,
|
||||
department: body.department ?? null,
|
||||
passwordHash,
|
||||
@@ -78,7 +78,7 @@ export async function POST(request: NextRequest) {
|
||||
if (!created) throw new Error('User creation failed')
|
||||
createdId = created.id
|
||||
await writeAuditLog(tx, 'users', created.id, 'created', {
|
||||
email, role: body.role ?? 'reporter', site_id: body.site_id ?? null,
|
||||
email, role: body.role ?? 'ssa', site_id: body.site_id ?? null,
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
@@ -50,7 +50,7 @@ export async function GET(
|
||||
|
||||
const role = session.role
|
||||
const isOwner = row.ownerUserId === session.sub
|
||||
const canRead = ['hse', 'admin', 'supervisor'].includes(role) || isOwner
|
||||
const canRead = ['hse', 'admin', 'ssa'].includes(role) || isOwner
|
||||
if (!canRead) return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||
|
||||
const ownerField = ['hse', 'admin'].includes(role)
|
||||
@@ -105,6 +105,13 @@ export async function PATCH(
|
||||
|
||||
const body = await request.json()
|
||||
|
||||
if (body.status === 'pending_verification') {
|
||||
return NextResponse.json(
|
||||
{ error: 'Use POST /api/capa/[id]/submit to submit for verification' },
|
||||
{ status: 403 },
|
||||
)
|
||||
}
|
||||
|
||||
const privilegedStatuses = ['verified', 'reopened', 'closed']
|
||||
if (body.status && privilegedStatuses.includes(body.status) && !['hse', 'admin'].includes(role)) {
|
||||
return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||
@@ -122,14 +129,12 @@ export async function PATCH(
|
||||
if ('department' in body && allowed.includes('department')) updateSet.department = body.department
|
||||
if ('root_cause_ref' in body && allowed.includes('root_cause_ref')) updateSet.rootCauseRef = body.root_cause_ref
|
||||
if ('owner_notes' in body && allowed.includes('owner_notes')) updateSet.ownerNotes = body.owner_notes
|
||||
if (body.status === 'pending_verification') updateSet.completedAt = new Date()
|
||||
|
||||
// Build audit new/old value from original snake_case body keys for consistency
|
||||
const auditNew: Record<string, unknown> = {}
|
||||
for (const key of allowed) {
|
||||
if (key in body) auditNew[key] = body[key]
|
||||
}
|
||||
if (body.status === 'pending_verification') auditNew.completed_at = updateSet.completedAt?.toISOString()
|
||||
|
||||
await withUser(session.sub, async tx => {
|
||||
let oldNotes: string | null = null
|
||||
|
||||
@@ -0,0 +1,98 @@
|
||||
export const dynamic = 'force-dynamic'
|
||||
|
||||
import { NextRequest, NextResponse } from 'next/server'
|
||||
import { and, eq } from 'drizzle-orm'
|
||||
import { getSession } from '@/lib/auth/get-session'
|
||||
import { withUser } from '@/lib/db/with-user'
|
||||
import { writeAuditLog } from '@/lib/db/audit'
|
||||
import { capaActions, evidenceFiles } from '@/lib/db/schema'
|
||||
import { uploadEvidenceFile } from '@/lib/storage/evidence'
|
||||
import { validateCapaSubmission } from '@/lib/capa/submit-validation'
|
||||
|
||||
class StatusConflict extends Error {}
|
||||
|
||||
export async function POST(
|
||||
request: NextRequest,
|
||||
{ params }: { params: Promise<{ id: string }> }
|
||||
) {
|
||||
const { id } = await params
|
||||
const session = await getSession()
|
||||
if (!session) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
|
||||
|
||||
const [capa] = await withUser(session.sub, async tx =>
|
||||
tx.select({
|
||||
incidentId: capaActions.incidentId,
|
||||
ownerUserId: capaActions.ownerUserId,
|
||||
status: capaActions.status,
|
||||
}).from(capaActions).where(eq(capaActions.id, id)).limit(1)
|
||||
)
|
||||
if (!capa) return NextResponse.json({ error: 'Not found' }, { status: 404 })
|
||||
|
||||
const isElevated = ['hse', 'admin'].includes(session.role)
|
||||
if (capa.ownerUserId !== session.sub && !isElevated)
|
||||
return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||
|
||||
if (capa.status !== 'in_progress')
|
||||
return NextResponse.json({ error: 'CAPA must be in_progress' }, { status: 409 })
|
||||
|
||||
const form = await request.formData()
|
||||
const files = form.getAll('files').filter((f): f is File => f instanceof File)
|
||||
const check = validateCapaSubmission(String(form.get('note') ?? ''), files)
|
||||
if (!check.ok)
|
||||
return NextResponse.json({ error: 'Validation failed', details: check.errors }, { status: 422 })
|
||||
|
||||
const uploaded: Array<{ publicUrl: string; hash: string; type: string }> = []
|
||||
try {
|
||||
for (const file of files) {
|
||||
const { publicUrl, hash } = await uploadEvidenceFile(file, capa.incidentId, 'capa', session.sub)
|
||||
uploaded.push({ publicUrl, hash, type: file.type })
|
||||
}
|
||||
} catch (err) {
|
||||
return NextResponse.json(
|
||||
{ error: 'Photo upload failed', details: [err instanceof Error ? err.message : 'unknown error'] },
|
||||
{ status: 422 },
|
||||
)
|
||||
}
|
||||
|
||||
const completedAt = new Date()
|
||||
try {
|
||||
await withUser(session.sub, async tx => {
|
||||
const updated = await tx.update(capaActions).set({
|
||||
status: 'pending_verification',
|
||||
ownerNotes: check.note,
|
||||
completedAt,
|
||||
}).where(and(eq(capaActions.id, id), eq(capaActions.status, 'in_progress')))
|
||||
.returning({ id: capaActions.id })
|
||||
if (updated.length === 0) throw new StatusConflict()
|
||||
|
||||
const rows = await tx.insert(evidenceFiles).values(
|
||||
uploaded.map(u => ({
|
||||
incidentId: capa.incidentId,
|
||||
capaId: id,
|
||||
stage: 'capa' as const,
|
||||
fileUrl: u.publicUrl,
|
||||
fileType: u.type,
|
||||
fileHash: u.hash,
|
||||
uploadedBy: session.sub,
|
||||
}))
|
||||
).returning({ id: evidenceFiles.id })
|
||||
|
||||
await writeAuditLog(
|
||||
tx, 'capa_actions', id, 'submitted_for_verification',
|
||||
{
|
||||
status: 'pending_verification',
|
||||
owner_notes: check.note,
|
||||
completed_at: completedAt.toISOString(),
|
||||
evidence_file_ids: rows.map(r => r.id),
|
||||
},
|
||||
{ status: 'in_progress' },
|
||||
)
|
||||
})
|
||||
} catch (err) {
|
||||
if (err instanceof StatusConflict)
|
||||
return NextResponse.json({ error: 'CAPA must be in_progress' }, { status: 409 })
|
||||
throw err
|
||||
}
|
||||
|
||||
return NextResponse.json({ ok: true })
|
||||
}
|
||||
@@ -40,7 +40,7 @@ export async function GET() {
|
||||
.leftJoin(incidents, eq(capaActions.incidentId, incidents.id))
|
||||
.orderBy(asc(capaActions.dueDate))
|
||||
|
||||
if (session.role === 'supervisor' || session.role === 'worker') {
|
||||
if (session.role === 'ssa') {
|
||||
q = q.where(eq(capaActions.ownerUserId, session.sub)) as typeof q
|
||||
}
|
||||
|
||||
|
||||
@@ -6,8 +6,7 @@ import { withUser, asAdmin } from '@/lib/db/with-user'
|
||||
import { writeAuditLog } from '@/lib/db/audit'
|
||||
import { incidents, sites, zones, auditLog } from '@/lib/db/schema'
|
||||
import { eq, and, gte, desc } from 'drizzle-orm'
|
||||
import { createDeepSeekClient } from '@/lib/claude/client'
|
||||
import { getApiKey } from '@/lib/settings'
|
||||
import { createLocalLLMClient } from '@/lib/claude/client'
|
||||
|
||||
type ZoneAggregate = {
|
||||
zone: string
|
||||
@@ -103,13 +102,12 @@ export async function POST() {
|
||||
return NextResponse.json({ error: 'Rate limit: wait 60 seconds between AI requests' }, { status: 429 })
|
||||
}
|
||||
|
||||
const deepseekKey = await getApiKey('DEEPSEEK_API_KEY')
|
||||
const client = createDeepSeekClient(deepseekKey)
|
||||
const client = createLocalLLMClient()
|
||||
|
||||
let res: Awaited<ReturnType<typeof client.chat.completions.create>>
|
||||
try {
|
||||
res = await client.chat.completions.create({
|
||||
model: 'deepseek-v4-pro',
|
||||
model: 'qwen2.5-coder-32b-instruct-Q4_K_M',
|
||||
max_tokens: 2048,
|
||||
messages: [
|
||||
{
|
||||
@@ -168,7 +166,7 @@ Flag only zones with rising or elevated risk (at most 5 flags; do not flag healt
|
||||
|
||||
await withUser(session.sub, async tx =>
|
||||
writeAuditLog(tx, 'incidents', session.sub, 'ai_risk_flags',
|
||||
{ flags, summary: input.summary, model: 'deepseek-v4-pro' })
|
||||
{ flags, summary: input.summary, model: 'qwen2.5-coder-32b-instruct-Q4_K_M' })
|
||||
)
|
||||
|
||||
return NextResponse.json({ flags, summary: input.summary })
|
||||
|
||||
@@ -15,7 +15,7 @@ export async function GET(
|
||||
const { id } = await params
|
||||
const session = await getSession()
|
||||
if (!session) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
|
||||
if (!['hse', 'admin', 'supervisor'].includes(session.role))
|
||||
if (!['hse', 'admin', 'ssa'].includes(session.role))
|
||||
return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||
|
||||
const authorAlias = aliasedTable(users, 'author_user')
|
||||
@@ -45,7 +45,7 @@ export async function POST(
|
||||
const { id } = await params
|
||||
const session = await getSession()
|
||||
if (!session) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
|
||||
if (!['hse', 'admin', 'supervisor'].includes(session.role))
|
||||
if (!['hse', 'admin', 'ssa'].includes(session.role))
|
||||
return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||
|
||||
const body: { body?: string } = await request.json().catch(() => ({}))
|
||||
|
||||
@@ -6,8 +6,7 @@ import { withUser, asAdmin } from '@/lib/db/with-user'
|
||||
import { writeAuditLog } from '@/lib/db/audit'
|
||||
import { incidents, auditLog, sites, zones } from '@/lib/db/schema'
|
||||
import { eq, and, gte, sql } from 'drizzle-orm'
|
||||
import { createDeepSeekClient } from '@/lib/claude/client'
|
||||
import { getApiKey } from '@/lib/settings'
|
||||
import { createLocalLLMClient } from '@/lib/claude/client'
|
||||
|
||||
export async function POST(
|
||||
_request: NextRequest,
|
||||
@@ -32,8 +31,7 @@ export async function POST(
|
||||
if (Number(rateRow?.cnt ?? 0) > 0)
|
||||
return NextResponse.json({ error: 'Rate limited — please wait 60 seconds' }, { status: 429 })
|
||||
|
||||
const deepseekKey = await getApiKey('DEEPSEEK_API_KEY')
|
||||
const client = createDeepSeekClient(deepseekKey)
|
||||
const client = createLocalLLMClient()
|
||||
|
||||
const [incident] = await withUser(session.sub, async tx =>
|
||||
tx.select({
|
||||
@@ -59,7 +57,7 @@ export async function POST(
|
||||
let res: Awaited<ReturnType<typeof client.chat.completions.create>>
|
||||
try {
|
||||
res = await client.chat.completions.create({
|
||||
model: 'deepseek-v4-pro',
|
||||
model: 'qwen2.5-coder-32b-instruct-Q4_K_M',
|
||||
max_tokens: 2048,
|
||||
messages: [
|
||||
{
|
||||
@@ -107,7 +105,7 @@ Provide 3–5 Why steps drilling from immediate cause to root cause. Frame CAPA
|
||||
await withUser(session.sub, async tx => {
|
||||
await writeAuditLog(tx, 'incidents', id, 'ai_rca_draft', {
|
||||
root_cause_summary: draft.root_cause_summary as string,
|
||||
model: 'deepseek-v4-pro',
|
||||
model: 'qwen2.5-coder-32b-instruct-Q4_K_M',
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
@@ -6,8 +6,7 @@ import { withUser, asAdmin } from '@/lib/db/with-user'
|
||||
import { writeAuditLog } from '@/lib/db/audit'
|
||||
import { incidents, auditLog } from '@/lib/db/schema'
|
||||
import { eq, and, gte, sql } from 'drizzle-orm'
|
||||
import { createDeepSeekClient } from '@/lib/claude/client'
|
||||
import { getApiKey } from '@/lib/settings'
|
||||
import { createLocalLLMClient } from '@/lib/claude/client'
|
||||
|
||||
export async function POST(
|
||||
_request: NextRequest,
|
||||
@@ -32,8 +31,7 @@ export async function POST(
|
||||
if (Number(rateRow?.cnt ?? 0) > 0)
|
||||
return NextResponse.json({ error: 'Rate limited — please wait 60 seconds' }, { status: 429 })
|
||||
|
||||
const deepseekKey = await getApiKey('DEEPSEEK_API_KEY')
|
||||
const client = createDeepSeekClient(deepseekKey)
|
||||
const client = createLocalLLMClient()
|
||||
|
||||
const [incident] = await withUser(session.sub, async tx =>
|
||||
tx.select({
|
||||
@@ -50,7 +48,7 @@ export async function POST(
|
||||
let res: Awaited<ReturnType<typeof client.chat.completions.create>>
|
||||
try {
|
||||
res = await client.chat.completions.create({
|
||||
model: 'deepseek-v4-pro',
|
||||
model: 'qwen2.5-coder-32b-instruct-Q4_K_M',
|
||||
max_tokens: 1024,
|
||||
messages: [
|
||||
{
|
||||
@@ -105,7 +103,7 @@ Output exactly this JSON structure:
|
||||
}
|
||||
|
||||
await withUser(session.sub, async tx => {
|
||||
await writeAuditLog(tx, 'incidents', id, 'ai_triage_suggest', { suggestion: input, model: 'deepseek-v4-pro' })
|
||||
await writeAuditLog(tx, 'incidents', id, 'ai_triage_suggest', { suggestion: input, model: 'qwen2.5-coder-32b-instruct-Q4_K_M' })
|
||||
})
|
||||
|
||||
return NextResponse.json(input)
|
||||
|
||||
@@ -51,7 +51,7 @@ export async function POST(
|
||||
await createInAppNotifications([{
|
||||
userId: incident.reportedBy,
|
||||
title: `Your incident report ${incident.referenceNo ?? ''} has been closed`,
|
||||
link: '/reporter',
|
||||
link: '/ssa/my-reports',
|
||||
incidentId: id,
|
||||
}])
|
||||
}
|
||||
|
||||
@@ -46,7 +46,7 @@ export async function GET(_req: Request, { params }: { params: Promise<{ id: str
|
||||
if (!incident) return NextResponse.json({ error: 'Not found' }, { status: 404 })
|
||||
|
||||
const isOwner = incident.reporterId === session.sub
|
||||
const isSiteStaff = ['hse', 'supervisor', 'admin'].includes(session.role)
|
||||
const isSiteStaff = ['hse', 'ssa', 'admin'].includes(session.role)
|
||||
if (!isOwner && !isSiteStaff) return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||
|
||||
const evidenceFileRows = await withUser(session.sub, async tx =>
|
||||
|
||||
@@ -6,8 +6,7 @@ import { withUser, asAdmin } from '@/lib/db/with-user'
|
||||
import { writeAuditLog } from '@/lib/db/audit'
|
||||
import { auditLog } from '@/lib/db/schema'
|
||||
import { eq, and, gte, sql } from 'drizzle-orm'
|
||||
import { createDeepSeekClient } from '@/lib/claude/client'
|
||||
import { getApiKey } from '@/lib/settings'
|
||||
import { createLocalLLMClient } from '@/lib/claude/client'
|
||||
|
||||
export async function POST(request: NextRequest) {
|
||||
const session = await getSession()
|
||||
@@ -26,8 +25,7 @@ export async function POST(request: NextRequest) {
|
||||
if (Number(rateRow?.cnt ?? 0) > 0)
|
||||
return NextResponse.json({ error: 'Rate limited — please wait 60 seconds' }, { status: 429 })
|
||||
|
||||
const deepseekKey = await getApiKey('DEEPSEEK_API_KEY')
|
||||
const client = createDeepSeekClient(deepseekKey)
|
||||
const client = createLocalLLMClient()
|
||||
|
||||
let body: { description?: string; incident_type?: string }
|
||||
try {
|
||||
@@ -42,7 +40,7 @@ export async function POST(request: NextRequest) {
|
||||
let res: Awaited<ReturnType<typeof client.chat.completions.create>>
|
||||
try {
|
||||
res = await client.chat.completions.create({
|
||||
model: 'deepseek-v4-pro',
|
||||
model: 'qwen2.5-coder-32b-instruct-Q4_K_M',
|
||||
max_tokens: 1024,
|
||||
messages: [
|
||||
{
|
||||
@@ -89,7 +87,7 @@ Scoring criteria: specificity (location, time, persons involved), completeness (
|
||||
|
||||
await withUser(session.sub, async tx => {
|
||||
await writeAuditLog(tx, 'incidents', session.sub, 'ai_quality_check', {
|
||||
score: input.score, passes: input.passes, model: 'deepseek-v4-pro',
|
||||
score: input.score, passes: input.passes, model: 'qwen2.5-coder-32b-instruct-Q4_K_M',
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
@@ -188,7 +188,7 @@ async function handlePost(request: Request) {
|
||||
db.select({ id: users.id, phone: users.phone })
|
||||
.from(users)
|
||||
.where(and(
|
||||
inArray(users.role, ['supervisor', 'hse']),
|
||||
inArray(users.role, ['ssa', 'hse']),
|
||||
eq(users.siteId, zone.siteId),
|
||||
))
|
||||
)
|
||||
@@ -212,8 +212,9 @@ async function handlePost(request: Request) {
|
||||
}
|
||||
})()
|
||||
|
||||
// Embed description asynchronously
|
||||
getApiKey('GOOGLE_AI_API_KEY').then(googleAiKey =>
|
||||
// Embed description asynchronously (disabled if no GOOGLE_AI_API_KEY)
|
||||
getApiKey('GOOGLE_AI_API_KEY')
|
||||
.then(googleAiKey =>
|
||||
import('@/lib/claude/embed').then(({ embedText }) =>
|
||||
embedText(input.description.trim(), googleAiKey).then(embeddingVec => {
|
||||
const embStr = `[${(embeddingVec as number[]).join(',')}]`
|
||||
@@ -222,7 +223,14 @@ async function handlePost(request: Request) {
|
||||
)
|
||||
})
|
||||
)
|
||||
).catch(err => console.error('embed error:', err))
|
||||
)
|
||||
.catch(err => {
|
||||
if (String(err).includes('GOOGLE_AI_API_KEY')) {
|
||||
console.debug('Embeddings disabled: GOOGLE_AI_API_KEY not configured')
|
||||
} else {
|
||||
console.error('Embed error:', err)
|
||||
}
|
||||
})
|
||||
|
||||
return NextResponse.json({ id: incidentId, reference_no: referenceNo }, { status: 201 })
|
||||
}
|
||||
|
||||
+102
-89
@@ -1,50 +1,65 @@
|
||||
@import "tailwindcss";
|
||||
|
||||
/* Modernist tokens. Source of truth: the Modernist styles.css under design-system/_ds.
|
||||
/* IMS Admin refresh tokens. Source of truth: design-system/design.md section 2.
|
||||
Static emits every variable so plain CSS can use var(--color-*) too. */
|
||||
@theme static {
|
||||
--color-bg: #f3f2f2;
|
||||
--color-surface: #eae9e9;
|
||||
--color-text: #201e1d;
|
||||
--color-accent: #ec3013;
|
||||
--color-accent-2: #e15b47;
|
||||
--color-divider: color-mix(in srgb, #201e1d 40%, transparent);
|
||||
--color-ink: #1f1f1f;
|
||||
--color-ink-2: #303030;
|
||||
--color-ink-3: #4a4a4a;
|
||||
--color-muted: #616161;
|
||||
--color-faint: #8a8a8a;
|
||||
--color-rule: #ebebeb;
|
||||
--color-rule-2: #e3e3e3;
|
||||
--color-ring: #d4d4d4;
|
||||
--color-surface: #ffffff;
|
||||
--color-surface-2: #f7f7f7;
|
||||
--color-ground: #f1f1f1;
|
||||
--color-accent: #0f766e;
|
||||
--color-accent-tint: #f2f7f6;
|
||||
--color-accent-tint-2: #e6f4f1;
|
||||
--color-danger: #b3261e;
|
||||
--color-topbar: #1a1a1a;
|
||||
|
||||
/* Utility-friendly aliases: bg-ground, text-ink */
|
||||
--color-ground: var(--color-bg);
|
||||
--color-ink: var(--color-text);
|
||||
/* Status pills: a dark step on a light tint, one pair per hue. */
|
||||
--color-st-amber-bg: #fff1c2;
|
||||
--color-st-amber-fg: #6b4a00;
|
||||
--color-st-blue-bg: #e0efff;
|
||||
--color-st-blue-fg: #00527c;
|
||||
--color-st-violet-bg: #ede7ff;
|
||||
--color-st-violet-fg: #4b2e99;
|
||||
--color-st-orange-bg: #ffe6cf;
|
||||
--color-st-orange-fg: #7a3a00;
|
||||
--color-st-indigo-bg: #e3e8ff;
|
||||
--color-st-indigo-fg: #2c3e8f;
|
||||
--color-st-green-bg: #d7f4e3;
|
||||
--color-st-green-fg: #0c5132;
|
||||
--color-st-grey-bg: #ebebeb;
|
||||
--color-st-grey-fg: #4a4a4a;
|
||||
--color-st-red-bg: #fee3e0;
|
||||
--color-st-red-fg: #8e1f0b;
|
||||
|
||||
--color-neutral-100: #f8f4f4;
|
||||
--color-neutral-200: #eae7e7;
|
||||
--color-neutral-300: #d7d3d3;
|
||||
--color-neutral-400: #bab6b6;
|
||||
--color-neutral-500: #9b9797;
|
||||
--color-neutral-600: #7d7979;
|
||||
--color-neutral-700: #605d5d;
|
||||
--color-neutral-800: #444141;
|
||||
--color-neutral-900: #2d2b2b;
|
||||
/* Legacy names kept, re-valued, until every page is migrated. */
|
||||
--color-divider: #e3e3e3;
|
||||
--color-neutral-100: #f7f7f7;
|
||||
--color-neutral-200: #ebebeb;
|
||||
--color-neutral-300: #d4d4d4;
|
||||
--color-neutral-400: #c4c4c4;
|
||||
--color-neutral-500: #8a8a8a;
|
||||
--color-neutral-600: #616161;
|
||||
--color-neutral-700: #4a4a4a;
|
||||
--color-neutral-800: #303030;
|
||||
--color-neutral-900: #1f1f1f;
|
||||
|
||||
--color-accent-100: #fff2ef;
|
||||
--color-accent-200: #ffe0d9;
|
||||
--color-accent-300: #ffc4b8;
|
||||
--color-accent-400: #ff9783;
|
||||
--color-accent-500: #ff563c;
|
||||
--color-accent-600: #dd2b0f;
|
||||
--color-accent-700: #ae1800;
|
||||
--color-accent-800: #7c1405;
|
||||
--color-accent-900: #4d170e;
|
||||
--color-accent-100: #e6f4f1;
|
||||
--color-accent-200: #c5e8e0;
|
||||
--color-accent-300: #9fd3c7;
|
||||
--color-accent-400: #5fb3a5;
|
||||
--color-accent-500: #2b9488;
|
||||
--color-accent-600: #0c615a;
|
||||
--color-accent-700: #0b4f47;
|
||||
--color-accent-800: #083b36;
|
||||
--color-accent-900: #052a26;
|
||||
|
||||
--color-accent-2-100: #fff2ef;
|
||||
--color-accent-2-200: #ffe0da;
|
||||
--color-accent-2-300: #ffc4b9;
|
||||
--color-accent-2-400: #ff9784;
|
||||
--color-accent-2-500: #ef6853;
|
||||
--color-accent-2-600: #c94b39;
|
||||
--color-accent-2-700: #9e3526;
|
||||
--color-accent-2-800: #71261b;
|
||||
--color-accent-2-900: #471d16;
|
||||
|
||||
/* Existing gray-* utilities render on the neutral ramp. */
|
||||
--color-gray-50: var(--color-neutral-100);
|
||||
--color-gray-100: var(--color-neutral-200);
|
||||
--color-gray-200: var(--color-neutral-300);
|
||||
@@ -54,11 +69,9 @@
|
||||
--color-gray-600: var(--color-neutral-700);
|
||||
--color-gray-700: var(--color-neutral-800);
|
||||
--color-gray-800: var(--color-neutral-900);
|
||||
--color-gray-900: var(--color-text);
|
||||
--color-gray-950: var(--color-text);
|
||||
--color-gray-900: var(--color-ink);
|
||||
--color-gray-950: var(--color-ink);
|
||||
|
||||
/* Existing blue-* utilities render on the accent ramp. 600 is the canonical
|
||||
accent; 700 and darker are safe for body-size text. */
|
||||
--color-blue-50: var(--color-accent-100);
|
||||
--color-blue-100: var(--color-accent-100);
|
||||
--color-blue-200: var(--color-accent-200);
|
||||
@@ -71,59 +84,63 @@
|
||||
--color-blue-900: var(--color-accent-900);
|
||||
--color-blue-950: var(--color-accent-900);
|
||||
|
||||
/* Existing red-* utilities (errors, destructive) render on the accent ramp;
|
||||
600 and 700 map to accent-700 so body-size text clears contrast. */
|
||||
--color-red-50: var(--color-accent-100);
|
||||
--color-red-100: var(--color-accent-100);
|
||||
--color-red-200: var(--color-accent-200);
|
||||
--color-red-300: var(--color-accent-300);
|
||||
--color-red-400: var(--color-accent-400);
|
||||
--color-red-500: var(--color-accent-600);
|
||||
--color-red-600: var(--color-accent-700);
|
||||
--color-red-700: var(--color-accent-700);
|
||||
--color-red-800: var(--color-accent-800);
|
||||
--color-red-900: var(--color-accent-900);
|
||||
--color-red-50: #fee3e0;
|
||||
--color-red-100: #fee3e0;
|
||||
--color-red-200: #f9c4bd;
|
||||
--color-red-300: #f2a198;
|
||||
--color-red-400: #e06a5a;
|
||||
--color-red-500: #c9382a;
|
||||
--color-red-600: var(--color-danger);
|
||||
--color-red-700: #8e1f0b;
|
||||
--color-red-800: #6b1708;
|
||||
--color-red-900: #4a1005;
|
||||
|
||||
/* Zero corner radius, everywhere. */
|
||||
--radius: 0px;
|
||||
--radius-xs: 0px;
|
||||
--radius-sm: 0px;
|
||||
--radius-md: 0px;
|
||||
--radius-lg: 0px;
|
||||
--radius-xl: 0px;
|
||||
--radius-2xl: 0px;
|
||||
--radius-3xl: 0px;
|
||||
--radius-4xl: 0px;
|
||||
/* Radius scale: 8 buttons, chips, inputs, pills; 12 cards; 14 drawer. */
|
||||
--radius: 8px;
|
||||
--radius-xs: 4px;
|
||||
--radius-sm: 6px;
|
||||
--radius-md: 8px;
|
||||
--radius-lg: 8px;
|
||||
--radius-xl: 12px;
|
||||
--radius-2xl: 14px;
|
||||
--radius-3xl: 14px;
|
||||
--radius-4xl: 14px;
|
||||
|
||||
/* Elevation, tuned to the ground. */
|
||||
--shadow-sm: 0 1px 2px color-mix(in srgb, #2d2b2b 14%, transparent);
|
||||
--shadow-md: 0 3px 10px color-mix(in srgb, #2d2b2b 16%, transparent);
|
||||
--shadow-lg: 0 12px 32px color-mix(in srgb, #2d2b2b 22%, transparent);
|
||||
--shadow-xl: var(--shadow-lg);
|
||||
--shadow-2xl: var(--shadow-lg);
|
||||
--shadow-card: 0 0 0 1px rgba(0,0,0,.08), 0 1px 2px rgba(0,0,0,.06);
|
||||
--shadow-float: 0 0 0 1px rgba(0,0,0,.1), 0 12px 32px rgba(0,0,0,.18);
|
||||
--shadow-drawer: 0 0 0 1px rgba(0,0,0,.1), 0 24px 60px rgba(0,0,0,.24);
|
||||
--shadow-primary: inset 0 -1px 0 #000, inset 0 1px 0 rgba(255,255,255,.18), 0 1px 2px rgba(0,0,0,.2);
|
||||
--shadow-secondary: inset 0 0 0 1px var(--color-ring), 0 1px 0 rgba(0,0,0,.05);
|
||||
--shadow-input: inset 0 0 0 1px var(--color-faint);
|
||||
--shadow-chip: inset 0 0 0 1px var(--color-ring);
|
||||
--shadow-chip-set: inset 0 0 0 1px var(--color-accent-300);
|
||||
--shadow-sm: 0 1px 2px rgba(0,0,0,.06);
|
||||
--shadow-md: 0 3px 10px rgba(0,0,0,.12);
|
||||
--shadow-lg: var(--shadow-float);
|
||||
--shadow-xl: var(--shadow-float);
|
||||
--shadow-2xl: var(--shadow-float);
|
||||
|
||||
--font-sans: var(--font-archivo), system-ui, sans-serif;
|
||||
--font-heading: var(--font-archivo), system-ui, sans-serif;
|
||||
--font-sans: var(--font-geist), system-ui, sans-serif;
|
||||
--font-mono: var(--font-geist-mono), ui-monospace, SFMono-Regular, Menlo, monospace;
|
||||
}
|
||||
|
||||
@layer base {
|
||||
html {
|
||||
background: var(--color-bg);
|
||||
background: var(--color-ground);
|
||||
}
|
||||
|
||||
body {
|
||||
background: var(--color-bg);
|
||||
color: var(--color-text);
|
||||
background: var(--color-ground);
|
||||
color: var(--color-ink);
|
||||
font-family: var(--font-sans);
|
||||
font-size: 15px;
|
||||
line-height: 1.55;
|
||||
font-size: 13px;
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
font-family: var(--font-heading);
|
||||
font-weight: 800;
|
||||
line-height: 1.12;
|
||||
letter-spacing: -0.015em;
|
||||
font-weight: 650;
|
||||
line-height: 1.25;
|
||||
letter-spacing: -0.01em;
|
||||
}
|
||||
|
||||
:focus {
|
||||
@@ -136,18 +153,18 @@
|
||||
}
|
||||
|
||||
::selection {
|
||||
background: color-mix(in srgb, var(--color-accent) 30%, transparent);
|
||||
background: color-mix(in srgb, var(--color-accent) 25%, transparent);
|
||||
}
|
||||
|
||||
input,
|
||||
textarea,
|
||||
select {
|
||||
color: var(--color-text);
|
||||
color: var(--color-ink);
|
||||
}
|
||||
|
||||
input::placeholder,
|
||||
textarea::placeholder {
|
||||
color: color-mix(in srgb, var(--color-text) 55%, transparent);
|
||||
color: var(--color-faint);
|
||||
}
|
||||
|
||||
button:disabled,
|
||||
@@ -158,7 +175,3 @@
|
||||
cursor: not-allowed;
|
||||
}
|
||||
}
|
||||
|
||||
.grayscale {
|
||||
filter: grayscale(1) contrast(1.08);
|
||||
}
|
||||
|
||||
+12
-4
@@ -1,17 +1,25 @@
|
||||
import type { Metadata } from 'next'
|
||||
import { Archivo } from 'next/font/google'
|
||||
import { Geist, Geist_Mono } from 'next/font/google'
|
||||
import './globals.css'
|
||||
import { I18nProvider } from '@/lib/i18n/context'
|
||||
import { getLocale, loadMessages } from '@/lib/i18n/server'
|
||||
|
||||
const archivo = Archivo({
|
||||
variable: '--font-archivo',
|
||||
const geist = Geist({
|
||||
variable: '--font-geist',
|
||||
subsets: ['latin'],
|
||||
})
|
||||
|
||||
const geistMono = Geist_Mono({
|
||||
variable: '--font-geist-mono',
|
||||
subsets: ['latin'],
|
||||
})
|
||||
|
||||
export const metadata: Metadata = {
|
||||
title: 'IMS — HSE Incident Management',
|
||||
description: 'Setia Corporation HSE Incident Management System',
|
||||
icons: {
|
||||
icon: '/favicon.ico',
|
||||
},
|
||||
}
|
||||
|
||||
export default async function RootLayout({
|
||||
@@ -25,7 +33,7 @@ export default async function RootLayout({
|
||||
return (
|
||||
<html
|
||||
lang={locale}
|
||||
className={`${archivo.variable} h-full antialiased`}
|
||||
className={`${geist.variable} ${geistMono.variable} h-full antialiased`}
|
||||
>
|
||||
<head>
|
||||
<link rel="manifest" href="/manifest.json" />
|
||||
|
||||
+29
-6
@@ -3,8 +3,9 @@ export const dynamic = 'force-dynamic'
|
||||
import { redirect } from 'next/navigation'
|
||||
import { asAdmin } from '@/lib/db/with-user'
|
||||
import { getSession } from '@/lib/auth/get-session'
|
||||
import { zones, sites, trucks } from '@/lib/db/schema'
|
||||
import { eq, asc } from 'drizzle-orm'
|
||||
import { zones, sites, trucks, users } from '@/lib/db/schema'
|
||||
import { eq, asc, and } from 'drizzle-orm'
|
||||
import { groupSites } from '@/lib/report/zones'
|
||||
import { ReportForm } from '@/components/incidents/report-form'
|
||||
import { LanguageSwitcher } from '@/components/language-switcher'
|
||||
import { OfflineSync } from '@/components/incidents/offline-sync'
|
||||
@@ -43,6 +44,7 @@ export default async function ReportPage({ searchParams }: Props) {
|
||||
id: trucks.id,
|
||||
truckNo: trucks.truckNo,
|
||||
carrier: trucks.carrier,
|
||||
siteId: trucks.siteId,
|
||||
})
|
||||
.from(trucks)
|
||||
.where(eq(trucks.active, true))
|
||||
@@ -53,8 +55,29 @@ export default async function ReportPage({ searchParams }: Props) {
|
||||
id: t.id,
|
||||
truck_no: t.truckNo,
|
||||
carrier: t.carrier ?? null,
|
||||
site_id: t.siteId ?? null,
|
||||
}))
|
||||
|
||||
const zoneRows = await asAdmin(db =>
|
||||
db.select({
|
||||
siteId: sites.id,
|
||||
siteName: sites.name,
|
||||
zoneId: zones.id,
|
||||
zoneName: zones.name,
|
||||
token: zones.qrCodeToken,
|
||||
})
|
||||
.from(zones)
|
||||
.innerJoin(sites, eq(zones.siteId, sites.id))
|
||||
.where(and(eq(zones.active, true), eq(sites.active, true)))
|
||||
.orderBy(asc(sites.name), asc(zones.name))
|
||||
)
|
||||
const siteOptions = groupSites(zoneRows)
|
||||
|
||||
const [me] = await asAdmin(db =>
|
||||
db.select({ siteId: users.siteId }).from(users).where(eq(users.id, session.sub)).limit(1)
|
||||
)
|
||||
const defaultSiteId = me?.siteId ?? ''
|
||||
|
||||
return (
|
||||
<main className="min-h-screen bg-gray-50 py-6 px-4 max-w-lg mx-auto">
|
||||
<div className="mb-6">
|
||||
@@ -62,18 +85,18 @@ export default async function ReportPage({ searchParams }: Props) {
|
||||
<h1 className="text-2xl font-bold text-gray-900">{/* will be translated via ReportForm */}Report an Incident</h1>
|
||||
<LanguageSwitcher />
|
||||
</div>
|
||||
{zoneName ? (
|
||||
{zoneName && (
|
||||
<p className="text-sm text-gray-600 mt-1">
|
||||
{siteName ?? 'Unknown Site'} — {zoneName}
|
||||
</p>
|
||||
) : (
|
||||
<p className="text-sm text-accent-700 mt-1">No zone detected — zone will not be recorded</p>
|
||||
)}
|
||||
</div>
|
||||
<ReportForm
|
||||
zoneToken={zone ?? null}
|
||||
zoneToken={zoneName ? (zone ?? null) : null}
|
||||
zoneName={zoneName}
|
||||
siteName={siteName}
|
||||
sites={siteOptions}
|
||||
defaultSiteId={defaultSiteId}
|
||||
trucks={truckList}
|
||||
initialTruckId={truck_id ?? null}
|
||||
/>
|
||||
|
||||
@@ -19,7 +19,7 @@ export default async function ReportSuccessPage({ searchParams }: Props) {
|
||||
</p>
|
||||
)}
|
||||
<p className="text-sm text-gray-500 mb-6">
|
||||
The supervisor and HSE officer have been notified.
|
||||
The Site Safety Assistants and HSE officer have been notified.
|
||||
</p>
|
||||
<Link href="/report" className="text-sm text-accent-700 hover:underline">
|
||||
Submit another report
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
import { useState } from 'react'
|
||||
import { UserManager, type AdminUser, type SiteOption } from './user-manager'
|
||||
import { SiteZoneManager, type SiteWithZones } from './site-zone-manager'
|
||||
import { TruckManager, type Truck } from './truck-manager'
|
||||
import { TruckManager, type Truck, type TruckSite } from './truck-manager'
|
||||
|
||||
type Tab = 'users' | 'sites' | 'trucks'
|
||||
|
||||
@@ -12,9 +12,10 @@ interface Props {
|
||||
sites: SiteWithZones[]
|
||||
siteOptions: SiteOption[]
|
||||
trucks: Truck[]
|
||||
truckSites: TruckSite[]
|
||||
}
|
||||
|
||||
export function AdminPanel({ users, sites, siteOptions, trucks }: Props) {
|
||||
export function AdminPanel({ users, sites, siteOptions, trucks, truckSites }: Props) {
|
||||
const [tab, setTab] = useState<Tab>('users')
|
||||
|
||||
const tabs: { id: Tab; label: string; count: number }[] = [
|
||||
@@ -30,7 +31,7 @@ export function AdminPanel({ users, sites, siteOptions, trucks }: Props) {
|
||||
<button
|
||||
key={t.id}
|
||||
onClick={() => setTab(t.id)}
|
||||
className={`px-4 py-2.5 text-sm font-medium border-b-2 -mb-px transition-colors cursor-pointer ${
|
||||
className={`px-4 py-2.5 text-sm font-medium border-b -mb-px transition-colors cursor-pointer ${
|
||||
tab === t.id
|
||||
? 'border-accent text-ink'
|
||||
: 'border-transparent text-gray-500 hover:text-gray-700'
|
||||
@@ -45,7 +46,7 @@ export function AdminPanel({ users, sites, siteOptions, trucks }: Props) {
|
||||
</div>
|
||||
{tab === 'users' && <UserManager users={users} sites={siteOptions} />}
|
||||
{tab === 'sites' && <SiteZoneManager sites={sites} />}
|
||||
{tab === 'trucks' && <TruckManager trucks={trucks} />}
|
||||
{tab === 'trucks' && <TruckManager trucks={trucks} sites={truckSites} />}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -83,7 +83,7 @@ export function BulkImportForm() {
|
||||
if (stage === 'upload') {
|
||||
return (
|
||||
<div className="space-y-4">
|
||||
<label className="block cursor-pointer border-2 border-dashed border-divider p-6 text-center hover:bg-gray-50">
|
||||
<label className="block cursor-pointer border border-dashed border-divider p-6 text-center hover:bg-gray-50">
|
||||
<input
|
||||
type="file"
|
||||
onChange={handleUpload}
|
||||
|
||||
@@ -134,7 +134,7 @@ export function SiteZoneManager({ sites }: Props) {
|
||||
</div>
|
||||
|
||||
{site.zones.length > 0 && (
|
||||
<ul className="mt-3 space-y-1.5 pl-3 border-l-2 border-divider">
|
||||
<ul className="mt-3 space-y-1.5 pl-3 border-l border-divider">
|
||||
{site.zones.map(z => (
|
||||
<li key={z.id} className={`flex items-center justify-between ${!z.active ? 'opacity-50' : ''}`}>
|
||||
<span className="text-xs text-gray-700 font-medium">{z.name}</span>
|
||||
|
||||
@@ -9,16 +9,20 @@ export type Truck = {
|
||||
id: string
|
||||
truck_no: string
|
||||
carrier: string | null
|
||||
site_id: string | null
|
||||
active: boolean
|
||||
}
|
||||
|
||||
export type TruckSite = { id: string; name: string; active: boolean }
|
||||
|
||||
interface Props {
|
||||
trucks: Truck[]
|
||||
sites: TruckSite[]
|
||||
}
|
||||
|
||||
const lbl = 'block text-xs font-medium text-gray-600 mb-1'
|
||||
|
||||
export function TruckManager({ trucks }: Props) {
|
||||
export function TruckManager({ trucks, sites }: Props) {
|
||||
const router = useRouter()
|
||||
const [truckNo, setTruckNo] = useState('')
|
||||
const [carrier, setCarrier] = useState('')
|
||||
@@ -27,6 +31,22 @@ export function TruckManager({ trucks }: Props) {
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const [showAdd, setShowAdd] = useState(false)
|
||||
const [confirmDelete, setConfirmDelete] = useState<Truck | null>(null)
|
||||
const [siteId, setSiteId] = useState('')
|
||||
const [editing, setEditing] = useState<Truck | null>(null)
|
||||
const [editNo, setEditNo] = useState('')
|
||||
const [editCarrier, setEditCarrier] = useState('')
|
||||
const [editSiteId, setEditSiteId] = useState('')
|
||||
|
||||
const siteName = (id: string | null) => sites.find(s => s.id === id)?.name ?? null
|
||||
const siteChoices = (currentId: string) => sites.filter(s => s.active || s.id === currentId)
|
||||
|
||||
const openEdit = (tk: Truck) => {
|
||||
setEditing(tk)
|
||||
setEditNo(tk.truck_no)
|
||||
setEditCarrier(tk.carrier ?? '')
|
||||
setEditSiteId(tk.site_id ?? '')
|
||||
setError(null)
|
||||
}
|
||||
|
||||
const handleAdd = async () => {
|
||||
const no = truckNo.trim()
|
||||
@@ -37,12 +57,13 @@ export function TruckManager({ trucks }: Props) {
|
||||
const res = await fetch('/api/admin/trucks', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ truck_no: no, carrier: carrier.trim() || null }),
|
||||
body: JSON.stringify({ truck_no: no, carrier: carrier.trim() || null, site_id: siteId || null }),
|
||||
})
|
||||
const data = await res.json()
|
||||
if (!res.ok) { setError(data.error ?? 'Failed to add truck'); return }
|
||||
setTruckNo('')
|
||||
setCarrier('')
|
||||
setSiteId('')
|
||||
setShowAdd(false)
|
||||
router.refresh()
|
||||
} catch {
|
||||
@@ -82,6 +103,19 @@ export function TruckManager({ trucks }: Props) {
|
||||
setConfirmDelete(null)
|
||||
}
|
||||
|
||||
const handleSaveEdit = async () => {
|
||||
if (!editing) return
|
||||
const no = editNo.trim()
|
||||
if (!no) return
|
||||
const ok = await send('PATCH', {
|
||||
id: editing.id,
|
||||
truck_no: no,
|
||||
carrier: editCarrier.trim() || null,
|
||||
site_id: editSiteId || null,
|
||||
})
|
||||
if (ok) setEditing(null)
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="bg-surface border border-divider shadow-sm overflow-hidden">
|
||||
<div className="flex items-center justify-between px-5 py-4 border-b border-divider">
|
||||
@@ -106,8 +140,15 @@ export function TruckManager({ trucks }: Props) {
|
||||
<div className="flex items-center gap-3">
|
||||
<span className="text-sm font-semibold text-gray-900">{tk.truck_no}</span>
|
||||
{tk.carrier && <span className="text-xs text-gray-400">{tk.carrier}</span>}
|
||||
<span className={`text-xs px-2 py-0.5 ${tk.site_id ? 'bg-neutral-100 text-ink' : 'bg-gray-100 text-gray-500'}`}>
|
||||
{siteName(tk.site_id) ?? 'Unassigned'}
|
||||
</span>
|
||||
</div>
|
||||
<div className="flex items-center gap-3">
|
||||
<button disabled={busyId === tk.id} onClick={() => openEdit(tk)}
|
||||
className="text-xs text-accent-700 hover:underline cursor-pointer disabled:opacity-50">
|
||||
Edit
|
||||
</button>
|
||||
<a href={`/report?truck_id=${tk.id}`} target="_blank"
|
||||
className="text-xs text-accent-700 hover:underline cursor-pointer">
|
||||
Report link
|
||||
@@ -134,11 +175,11 @@ export function TruckManager({ trucks }: Props) {
|
||||
</div>
|
||||
|
||||
{/* Add Truck Modal */}
|
||||
<Modal open={showAdd} onClose={() => { setShowAdd(false); setTruckNo(''); setCarrier(''); setError(null) }}
|
||||
<Modal open={showAdd} onClose={() => { setShowAdd(false); setTruckNo(''); setCarrier(''); setSiteId(''); setError(null) }}
|
||||
title="Add Truck" width="sm"
|
||||
footer={
|
||||
<>
|
||||
<button onClick={() => { setShowAdd(false); setTruckNo(''); setCarrier(''); setError(null) }}
|
||||
<button onClick={() => { setShowAdd(false); setTruckNo(''); setCarrier(''); setSiteId(''); setError(null) }}
|
||||
className="px-4 py-2 text-sm font-medium border border-divider text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
|
||||
Cancel
|
||||
</button>
|
||||
@@ -165,6 +206,49 @@ export function TruckManager({ trucks }: Props) {
|
||||
onKeyDown={e => e.key === 'Enter' && handleAdd()}
|
||||
className={inp} />
|
||||
</div>
|
||||
<div>
|
||||
<label className={lbl} htmlFor="add-truck-site">Site</label>
|
||||
<select id="add-truck-site" value={siteId} onChange={e => setSiteId(e.target.value)} className={inp}>
|
||||
<option value="">No site</option>
|
||||
{siteChoices('').map(s => <option key={s.id} value={s.id}>{s.name}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</Modal>
|
||||
|
||||
{/* Edit Truck Modal */}
|
||||
<Modal open={!!editing} onClose={() => { setEditing(null); setError(null) }}
|
||||
title="Edit Truck" width="sm"
|
||||
footer={
|
||||
<>
|
||||
<button onClick={() => { setEditing(null); setError(null) }}
|
||||
className="px-4 py-2 text-sm font-medium border border-divider text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
|
||||
Cancel
|
||||
</button>
|
||||
<button disabled={busyId === editing?.id || !editNo.trim()} onClick={handleSaveEdit}
|
||||
className="px-4 py-2 bg-accent text-white text-sm font-semibold hover:bg-accent-600 disabled:opacity-50 cursor-pointer transition-colors">
|
||||
{busyId === editing?.id ? 'Saving…' : 'Save'}
|
||||
</button>
|
||||
</>
|
||||
}
|
||||
>
|
||||
{error && <p className="text-xs text-red-600 bg-red-50 px-3 py-2 mb-3">{error}</p>}
|
||||
<div className="space-y-4">
|
||||
<div>
|
||||
<label className={lbl} htmlFor="edit-truck-no">Truck Number *</label>
|
||||
<input id="edit-truck-no" type="text" value={editNo} onChange={e => setEditNo(e.target.value)} className={inp} />
|
||||
</div>
|
||||
<div>
|
||||
<label className={lbl} htmlFor="edit-truck-carrier">Carrier (optional)</label>
|
||||
<input id="edit-truck-carrier" type="text" value={editCarrier} onChange={e => setEditCarrier(e.target.value)} className={inp} />
|
||||
</div>
|
||||
<div>
|
||||
<label className={lbl} htmlFor="edit-truck-site">Site</label>
|
||||
<select id="edit-truck-site" value={editSiteId} onChange={e => setEditSiteId(e.target.value)} className={inp}>
|
||||
<option value="">No site</option>
|
||||
{siteChoices(editing?.site_id ?? '').map(s => <option key={s.id} value={s.id}>{s.name}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</Modal>
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
import { useState } from 'react'
|
||||
import { useRouter } from 'next/navigation'
|
||||
import { ALL_ROLES, type UserRole } from '@/lib/auth/roles'
|
||||
import { ALL_ROLES, ROLE_LABELS, type UserRole } from '@/lib/auth/roles'
|
||||
import { Modal } from '@/components/ui/modal'
|
||||
import { INPUT_CLASS as inp } from '@/components/ui/field'
|
||||
|
||||
@@ -23,7 +23,7 @@ interface Props {
|
||||
sites: SiteOption[]
|
||||
}
|
||||
|
||||
const EMPTY = { email: '', name: '', phone: '', role: 'reporter' as UserRole, site_id: '', password: '' }
|
||||
const EMPTY = { email: '', name: '', phone: '', role: 'ssa' as UserRole, site_id: '', password: '' }
|
||||
|
||||
const lbl = 'block text-xs font-medium text-gray-600 mb-1'
|
||||
|
||||
@@ -135,7 +135,7 @@ export function UserManager({ users, sites }: Props) {
|
||||
<select value={u.role} disabled={busyId === u.id}
|
||||
onChange={e => patchUser(u.id, { role: e.target.value })}
|
||||
className="border border-divider px-2 py-1 text-xs focus:outline-none focus:ring-1 focus:ring-accent cursor-pointer">
|
||||
{ALL_ROLES.map(r => <option key={r} value={r}>{r.replace(/_/g, ' ')}</option>)}
|
||||
{ALL_ROLES.map(r => <option key={r} value={r}>{ROLE_LABELS[r]}</option>)}
|
||||
</select>
|
||||
</td>
|
||||
<td className="px-5 py-3">
|
||||
@@ -224,7 +224,7 @@ export function UserManager({ users, sites }: Props) {
|
||||
<select id="au-role" value={form.role}
|
||||
onChange={e => setForm(v => ({ ...v, role: e.target.value as UserRole }))}
|
||||
className={inp}>
|
||||
{ALL_ROLES.map(r => <option key={r} value={r}>{r.replace(/_/g, ' ')}</option>)}
|
||||
{ALL_ROLES.map(r => <option key={r} value={r}>{ROLE_LABELS[r]}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
|
||||
@@ -39,13 +39,13 @@ export function LoginForm() {
|
||||
|
||||
return (
|
||||
<form onSubmit={handleSubmit} className="flex flex-col gap-4 w-full max-w-sm">
|
||||
<div className="pb-3 border-b-2 border-divider">
|
||||
<h1 className="text-3xl font-extrabold">IMS</h1>
|
||||
<div className="pb-3 border-b border-rule">
|
||||
<h1 className="text-[22px] font-[650]">IMS</h1>
|
||||
<p className="text-sm text-ink/60 mt-1">HSE Incident Management</p>
|
||||
</div>
|
||||
|
||||
{error && (
|
||||
<p className="bg-accent-100 border border-accent text-accent-800 text-sm px-3 py-2">
|
||||
<p className="bg-st-red-bg text-st-red-fg text-[13px] px-3 py-2 rounded-md">
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
import Link from 'next/link'
|
||||
import { Avatar } from '@/components/ui/avatar'
|
||||
import { PriorityTag, StatusTag } from '@/components/ui/status-tag'
|
||||
import { STATUS_ORDER, type CapaRow } from '@/lib/capa/list'
|
||||
|
||||
export function CapaBoardView({ capas }: { capas: CapaRow[] }) {
|
||||
return (
|
||||
<div className="flex gap-3 overflow-x-auto pb-2">
|
||||
{STATUS_ORDER.map(status => {
|
||||
const items = capas.filter(c => c.status === status)
|
||||
return (
|
||||
<section
|
||||
key={status}
|
||||
aria-label={`${status.replace(/_/g, ' ')} column`}
|
||||
className="w-72 shrink-0 rounded-xl bg-surface-2 p-2"
|
||||
>
|
||||
<header className="flex items-center gap-2 px-1.5 pb-2">
|
||||
<StatusTag status={status} />
|
||||
<span className="text-xs text-faint">{items.length}</span>
|
||||
</header>
|
||||
<div className="space-y-2 max-h-[70vh] overflow-y-auto">
|
||||
{items.map(c => (
|
||||
<Link
|
||||
key={c.id}
|
||||
href={`/hse/capa/${c.id}`}
|
||||
className="block rounded-md bg-surface p-3 shadow-card transition-shadow hover:shadow-float"
|
||||
>
|
||||
<p className="text-[13px] font-medium line-clamp-2">{c.description}</p>
|
||||
<p className="mt-1 font-mono text-[12px] text-accent">{c.incident_ref ?? '—'}</p>
|
||||
<div className="mt-2 flex items-center justify-between gap-2">
|
||||
<span className="flex min-w-0 items-center gap-1.5 text-xs text-muted">
|
||||
{c.owner_name && <Avatar name={c.owner_name} />}
|
||||
<span className="truncate">{c.owner_name ?? '—'}</span>
|
||||
</span>
|
||||
<PriorityTag priority={c.priority} />
|
||||
</div>
|
||||
<p className="mt-1.5 text-xs text-faint">Due {c.due_date}</p>
|
||||
</Link>
|
||||
))}
|
||||
{items.length === 0 && <p className="px-1.5 py-3 text-xs text-faint">Empty</p>}
|
||||
</div>
|
||||
</section>
|
||||
)
|
||||
})}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -1,129 +0,0 @@
|
||||
'use client'
|
||||
|
||||
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'
|
||||
|
||||
type CapaAction = {
|
||||
id: string
|
||||
incident_id: string
|
||||
description: string
|
||||
department: string
|
||||
due_date: string
|
||||
priority: 'low' | 'med' | 'high'
|
||||
status: CapaStatus
|
||||
incidents: { reference_no: string | null } | null
|
||||
owner: { name: string } | null
|
||||
}
|
||||
|
||||
const STATUS_ORDER: CapaStatus[] = ['open', 'in_progress', 'overdue', 'pending_verification', 'verified', 'closed']
|
||||
const STATUS_LABELS: Record<CapaStatus, string> = {
|
||||
open: 'Open',
|
||||
in_progress: 'In Progress',
|
||||
overdue: 'Overdue',
|
||||
pending_verification: 'Pending Verification',
|
||||
verified: 'Verified',
|
||||
reopened: 'Reopened',
|
||||
closed: 'Closed',
|
||||
}
|
||||
const COLUMN_BORDER: Record<CapaStatus, string> = {
|
||||
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 {
|
||||
capas: CapaAction[]
|
||||
}
|
||||
|
||||
export function CapaBoard({ capas }: Props) {
|
||||
const [view, setView] = useState<'board' | 'table'>('board')
|
||||
|
||||
const byStatus = STATUS_ORDER.reduce<Record<CapaStatus, CapaAction[]>>((acc, s) => {
|
||||
acc[s] = capas.filter(c => c.status === s)
|
||||
return acc
|
||||
}, {} as Record<CapaStatus, CapaAction[]>)
|
||||
|
||||
if (view === 'table') {
|
||||
return (
|
||||
<div>
|
||||
<div className="flex justify-end mb-3">
|
||||
<button onClick={() => setView('board')} className="text-sm text-accent-700 hover:underline">Board view</button>
|
||||
</div>
|
||||
<div className="overflow-x-auto">
|
||||
<table className="w-full text-sm">
|
||||
<thead>
|
||||
<tr className="text-left text-xs text-gray-500 uppercase border-b">
|
||||
<th className="pb-2 pr-4">Ref</th>
|
||||
<th className="pb-2 pr-4">Action</th>
|
||||
<th className="pb-2 pr-4">Owner</th>
|
||||
<th className="pb-2 pr-4">Due</th>
|
||||
<th className="pb-2 pr-4">Priority</th>
|
||||
<th className="pb-2">Status</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody className="divide-y divide-divider">
|
||||
{capas.map(c => (
|
||||
<tr key={c.id}>
|
||||
<td className="py-2 pr-4 text-gray-500 text-xs">
|
||||
{(c.incidents as { reference_no: string | null } | null)?.reference_no ?? '—'}
|
||||
</td>
|
||||
<td className="py-2 pr-4">
|
||||
<Link href={`/hse/capa/${c.id}`} className="text-accent-700 hover:underline line-clamp-2">
|
||||
{c.description}
|
||||
</Link>
|
||||
</td>
|
||||
<td className="py-2 pr-4 text-gray-600">{(c.owner as { name: string } | null)?.name ?? '—'}</td>
|
||||
<td className="py-2 pr-4 text-gray-600">{c.due_date}</td>
|
||||
<td className="py-2 pr-4">
|
||||
<PriorityTag priority={c.priority} />
|
||||
</td>
|
||||
<td className="py-2 text-gray-600 text-xs">{STATUS_LABELS[c.status]}</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<div>
|
||||
<div className="flex justify-end mb-3">
|
||||
<button onClick={() => setView('table')} className="text-sm text-accent-700 hover:underline">Table view</button>
|
||||
</div>
|
||||
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4">
|
||||
{STATUS_ORDER.filter(s => s !== 'reopened').map(status => (
|
||||
<div key={status} className={`border-2 p-4 bg-ground ${COLUMN_BORDER[status]}`}>
|
||||
<h3 className="text-xs font-extrabold uppercase tracking-wide text-ink/70 mb-3 pb-2 border-b-2 border-divider">
|
||||
{STATUS_LABELS[status]} ({byStatus[status].length})
|
||||
</h3>
|
||||
<div className="space-y-2 max-h-96 overflow-y-auto pr-2">
|
||||
{byStatus[status].map(c => (
|
||||
<Link key={c.id} href={`/hse/capa/${c.id}`}
|
||||
className="block bg-surface p-3 shadow-sm hover:shadow-md transition-shadow border border-divider">
|
||||
<p className="text-sm text-gray-800 line-clamp-2 mb-1">{c.description}</p>
|
||||
<div className="flex items-center justify-between text-xs text-gray-500">
|
||||
<span>{(c.owner as { name: string } | null)?.name ?? '—'}</span>
|
||||
<PriorityTag priority={c.priority} />
|
||||
</div>
|
||||
<p className="text-xs text-gray-400 mt-1">Due {c.due_date}</p>
|
||||
</Link>
|
||||
))}
|
||||
{byStatus[status].length === 0 && (
|
||||
<p className="text-xs text-gray-400 text-center py-3">Empty</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -2,6 +2,8 @@
|
||||
|
||||
import { useState, useEffect } from 'react'
|
||||
import { useRouter } from 'next/navigation'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { Field, Input, Select, Textarea } from '@/components/ui/field'
|
||||
|
||||
interface User {
|
||||
id: string
|
||||
@@ -71,59 +73,62 @@ export function CapaForm({ incidentId }: Props) {
|
||||
|
||||
return (
|
||||
<form onSubmit={handleSubmit} className="space-y-4">
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 mb-1">Action Description *</label>
|
||||
<textarea
|
||||
<Field label="Action Description *" htmlFor="capa-description">
|
||||
<Textarea
|
||||
id="capa-description"
|
||||
value={description}
|
||||
onChange={e => setDescription(e.target.value)}
|
||||
rows={3} required
|
||||
className="w-full border border-divider px-3 py-2 text-sm"
|
||||
rows={3}
|
||||
required
|
||||
placeholder="What corrective action will be taken?"
|
||||
/>
|
||||
</div>
|
||||
</Field>
|
||||
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 mb-1">Root Cause Reference</label>
|
||||
<input type="text" value={rootCauseRef}
|
||||
<Field label="Root Cause Reference" htmlFor="capa-root-cause">
|
||||
<Input
|
||||
id="capa-root-cause"
|
||||
type="text"
|
||||
value={rootCauseRef}
|
||||
onChange={e => setRootCauseRef(e.target.value)}
|
||||
className="w-full border border-divider px-3 py-2 text-sm"
|
||||
placeholder="e.g. Why #3 — inadequate training" />
|
||||
</div>
|
||||
placeholder="e.g. Why #3 — inadequate training"
|
||||
/>
|
||||
</Field>
|
||||
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 mb-1">Assigned To *</label>
|
||||
<select value={ownerId} onChange={e => handleOwnerChange(e.target.value)} required
|
||||
className="w-full border border-divider px-3 py-2 text-sm">
|
||||
<Field label="Assigned To *" htmlFor="capa-owner">
|
||||
<Select id="capa-owner" value={ownerId} onChange={e => handleOwnerChange(e.target.value)} required>
|
||||
<option value="">Select owner…</option>
|
||||
{users.map(u => (
|
||||
<option key={u.id} value={u.id}>{u.name} ({u.department})</option>
|
||||
))}
|
||||
</select>
|
||||
</div>
|
||||
</Select>
|
||||
</Field>
|
||||
|
||||
<div className="grid grid-cols-2 gap-3">
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 mb-1">Due Date *</label>
|
||||
<input type="date" value={dueDate} onChange={e => setDueDate(e.target.value)} required
|
||||
className="w-full border border-divider px-3 py-2 text-sm" />
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 mb-1">Priority</label>
|
||||
<select value={priority} onChange={e => setPriority(e.target.value as 'low' | 'med' | 'high')}
|
||||
className="w-full border border-divider px-3 py-2 text-sm">
|
||||
<Field label="Due Date *" htmlFor="capa-due">
|
||||
<Input id="capa-due" type="date" value={dueDate} onChange={e => setDueDate(e.target.value)} required />
|
||||
</Field>
|
||||
<Field label="Priority" htmlFor="capa-priority">
|
||||
<Select
|
||||
id="capa-priority"
|
||||
value={priority}
|
||||
onChange={e => setPriority(e.target.value as 'low' | 'med' | 'high')}
|
||||
>
|
||||
<option value="low">Low</option>
|
||||
<option value="med">Medium</option>
|
||||
<option value="high">High</option>
|
||||
</select>
|
||||
</div>
|
||||
</Select>
|
||||
</Field>
|
||||
</div>
|
||||
|
||||
{error && <p className="text-sm text-red-600">{error}</p>}
|
||||
{error && (
|
||||
<p role="alert" className="rounded-md bg-st-red-bg px-3 py-2 text-[13px] text-st-red-fg">
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
|
||||
<button type="submit" disabled={saving}
|
||||
className="w-full bg-accent text-white py-2 text-sm font-semibold disabled:opacity-50">
|
||||
<Button type="submit" block disabled={saving}>
|
||||
{saving ? 'Creating…' : 'Create CAPA Action'}
|
||||
</button>
|
||||
</Button>
|
||||
</form>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
|
||||
import { useState } from 'react'
|
||||
import { useRouter } from 'next/navigation'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { SubmitVerificationForm } from '@/components/capa/submit-verification-form'
|
||||
|
||||
interface Props {
|
||||
capaId: string
|
||||
@@ -33,26 +35,14 @@ export function CapaOwnerActions({ capaId, currentStatus }: Props) {
|
||||
|
||||
if (currentStatus === 'open' || currentStatus === 'reopened' || currentStatus === 'overdue') {
|
||||
return (
|
||||
<button
|
||||
onClick={() => updateStatus('in_progress')}
|
||||
disabled={loading}
|
||||
className="text-sm px-3 py-1.5 border border-divider hover:bg-gray-50 disabled:opacity-50"
|
||||
>
|
||||
<Button variant="secondary" onClick={() => updateStatus('in_progress')} disabled={loading}>
|
||||
{loading ? '…' : 'Mark In Progress'}
|
||||
</button>
|
||||
</Button>
|
||||
)
|
||||
}
|
||||
|
||||
if (currentStatus === 'in_progress') {
|
||||
return (
|
||||
<button
|
||||
onClick={() => updateStatus('pending_verification')}
|
||||
disabled={loading}
|
||||
className="text-sm px-3 py-1.5 bg-accent text-white hover:bg-accent-600 disabled:opacity-50"
|
||||
>
|
||||
{loading ? '…' : 'Submit for Verification'}
|
||||
</button>
|
||||
)
|
||||
return <SubmitVerificationForm capaId={capaId} />
|
||||
}
|
||||
|
||||
return null
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
'use client'
|
||||
|
||||
import { useState } from 'react'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { Field, Textarea } from '@/components/ui/field'
|
||||
|
||||
interface Props {
|
||||
capaId: string
|
||||
@@ -32,25 +34,22 @@ export function CapaOwnerNotesForm({ capaId, initialNotes }: Props) {
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="mt-3 space-y-1">
|
||||
<label className="text-xs text-gray-500 font-medium">Remarks / Notes</label>
|
||||
<textarea
|
||||
<div className="mt-3 space-y-2">
|
||||
<Field label="Remarks / Notes" htmlFor={`notes-${capaId}`}>
|
||||
<Textarea
|
||||
id={`notes-${capaId}`}
|
||||
value={notes}
|
||||
onChange={e => { setNotes(e.target.value); setSaved(false) }}
|
||||
rows={2}
|
||||
placeholder="Add any notes or updates for this action…"
|
||||
className="w-full border border-divider px-3 py-2 text-sm text-gray-800 resize-none focus:outline-none focus:ring-2 focus:ring-accent"
|
||||
/>
|
||||
{error && <p className="text-xs text-red-600">{error}</p>}
|
||||
</Field>
|
||||
{error && <p role="alert" className="text-xs text-danger">{error}</p>}
|
||||
<div className="flex items-center gap-2">
|
||||
<button
|
||||
onClick={handleSave}
|
||||
disabled={saving}
|
||||
className="text-xs px-3 py-1 bg-gray-800 text-white hover:bg-gray-700 disabled:opacity-50"
|
||||
>
|
||||
<Button variant="secondary" onClick={handleSave} disabled={saving}>
|
||||
{saving ? 'Saving…' : 'Save Notes'}
|
||||
</button>
|
||||
{saved && <span className="text-xs text-ink">Saved</span>}
|
||||
</Button>
|
||||
{saved && <span className="text-xs text-st-green-fg">Saved</span>}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
|
||||
@@ -0,0 +1,167 @@
|
||||
'use client'
|
||||
|
||||
import { useMemo, useState } from 'react'
|
||||
import { useRouter } from 'next/navigation'
|
||||
import { ChevronRight, Columns3, List, Search } from 'lucide-react'
|
||||
import { Avatar } from '@/components/ui/avatar'
|
||||
import { FilterChip } from '@/components/ui/filter-chip'
|
||||
import { Segmented } from '@/components/ui/segmented'
|
||||
import { PriorityTag, StatusTag } from '@/components/ui/status-tag'
|
||||
import { TableCard, type Column } from '@/components/ui/table-card'
|
||||
import {
|
||||
EMPTY_FILTERS, PAGE_SIZE, VIEWS, daysLate, distinct, filterCapas, nextSort, paginate, sortCapas, viewCounts,
|
||||
type CapaFilters, type CapaRow, type CapaSort, type CapaSortKey, type CapaViewKey,
|
||||
} from '@/lib/capa/list'
|
||||
import { CapaBoardView } from './capa-board-view'
|
||||
|
||||
const PRIORITY_OPTIONS = [
|
||||
{ value: 'high', label: 'High' },
|
||||
{ value: 'med', label: 'Medium' },
|
||||
{ value: 'low', label: 'Low' },
|
||||
]
|
||||
|
||||
const toOptions = (values: string[]) => values.map(v => ({ value: v, label: v }))
|
||||
|
||||
function Owner({ name }: { name: string | null }) {
|
||||
if (!name) return <span className="text-faint">—</span>
|
||||
return (
|
||||
<span className="inline-flex items-center gap-2">
|
||||
<Avatar name={name} />
|
||||
{name}
|
||||
</span>
|
||||
)
|
||||
}
|
||||
|
||||
function Due({ row, today }: { row: CapaRow; today: string }) {
|
||||
const late = row.status === 'overdue' ? daysLate(row.due_date, today) : 0
|
||||
return (
|
||||
<span className="whitespace-nowrap">
|
||||
{row.due_date}
|
||||
{late > 0 && <span className="ml-1.5 text-xs text-danger">{`${late} day${late === 1 ? '' : 's'} late`}</span>}
|
||||
</span>
|
||||
)
|
||||
}
|
||||
|
||||
export function CapaWorkspace({ capas, today }: { capas: CapaRow[]; today: string }) {
|
||||
const router = useRouter()
|
||||
const [mode, setMode] = useState<'list' | 'board'>('list')
|
||||
const [filters, setFilters] = useState<CapaFilters>(EMPTY_FILTERS)
|
||||
const [sort, setSort] = useState<CapaSort>({ key: 'due_date', dir: 'asc' })
|
||||
const [page, setPage] = useState(1)
|
||||
|
||||
const patch = (next: Partial<CapaFilters>) => {
|
||||
setFilters(f => ({ ...f, ...next }))
|
||||
setPage(1)
|
||||
}
|
||||
|
||||
const owners = useMemo(() => distinct(capas.map(c => c.owner_name)), [capas])
|
||||
const departments = useMemo(() => distinct(capas.map(c => c.department)), [capas])
|
||||
const counts = useMemo(() => viewCounts(capas, filters), [capas, filters])
|
||||
const sorted = useMemo(() => sortCapas(filterCapas(capas, filters), sort), [capas, filters, sort])
|
||||
const boardRows = useMemo(
|
||||
() => sortCapas(filterCapas(capas, { ...filters, view: 'all' }), { key: 'due_date', dir: 'asc' }),
|
||||
[capas, filters],
|
||||
)
|
||||
const pageData = paginate(sorted, page, PAGE_SIZE)
|
||||
const clearable = Boolean(filters.q || filters.owner || filters.department || filters.priority)
|
||||
|
||||
const columns: Column<CapaRow>[] = [
|
||||
{ key: 'action', header: 'Action', cell: r => <span className="line-clamp-2 font-medium">{r.description}</span> },
|
||||
{ key: 'incident', header: 'Incident', cell: r => <span className="font-mono text-[12.5px] text-accent">{r.incident_ref ?? '—'}</span> },
|
||||
{ key: 'owner', header: 'Owner', cell: r => <Owner name={r.owner_name} /> },
|
||||
{ key: 'department', header: 'Department', cell: r => r.department },
|
||||
{ key: 'priority', header: 'Priority', sortKey: 'priority', cell: r => <PriorityTag priority={r.priority} /> },
|
||||
{ key: 'due', header: 'Due', sortKey: 'due_date', cell: r => <Due row={r} today={today} /> },
|
||||
{ key: 'status', header: 'Status', sortKey: 'status', cell: r => <StatusTag status={r.status} /> },
|
||||
]
|
||||
|
||||
const toolbar = (
|
||||
<>
|
||||
<label className="flex h-8 min-w-[260px] items-center gap-2 rounded-md bg-surface px-2.5 text-[13px] shadow-input">
|
||||
<Search size={16} strokeWidth={2} className="text-muted" aria-hidden />
|
||||
<input
|
||||
type="search"
|
||||
aria-label="Search actions"
|
||||
placeholder="Search action, incident or owner"
|
||||
value={filters.q}
|
||||
onChange={e => patch({ q: e.target.value })}
|
||||
className="flex-1 bg-transparent outline-none placeholder:text-faint"
|
||||
/>
|
||||
</label>
|
||||
<FilterChip label="Owner" value={filters.owner} options={toOptions(owners)} onChange={v => patch({ owner: v })} />
|
||||
<FilterChip label="Department" value={filters.department} options={toOptions(departments)} onChange={v => patch({ department: v })} />
|
||||
<FilterChip label="Priority" value={filters.priority} options={PRIORITY_OPTIONS} onChange={v => patch({ priority: v })} />
|
||||
{clearable && (
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => patch({ q: '', owner: '', department: '', priority: '' })}
|
||||
className="cursor-pointer text-[12.5px] text-muted hover:text-ink"
|
||||
>
|
||||
Clear filters
|
||||
</button>
|
||||
)}
|
||||
</>
|
||||
)
|
||||
|
||||
return (
|
||||
<div className="space-y-4">
|
||||
<div className="flex items-center justify-between">
|
||||
<h1 className="text-[22px] font-[650] md:text-xl">CAPA</h1>
|
||||
<Segmented
|
||||
value={mode}
|
||||
onChange={v => setMode(v as 'list' | 'board')}
|
||||
options={[
|
||||
{ value: 'list', label: <><List size={14} strokeWidth={2} aria-hidden />List</> },
|
||||
{ value: 'board', label: <><Columns3 size={14} strokeWidth={2} aria-hidden />Board</> },
|
||||
]}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{mode === 'list' ? (
|
||||
<TableCard
|
||||
columns={columns}
|
||||
rows={pageData.items}
|
||||
rowKey={r => r.id}
|
||||
onRowOpen={r => router.push(`/hse/capa/${r.id}`)}
|
||||
views={{
|
||||
items: VIEWS.map(v => ({ key: v.key, label: v.label, count: counts[v.key] })),
|
||||
active: filters.view,
|
||||
onChange: key => patch({ view: key as CapaViewKey }),
|
||||
}}
|
||||
toolbar={toolbar}
|
||||
sort={sort}
|
||||
onSortChange={key => {
|
||||
setSort(nextSort(sort, key as CapaSortKey))
|
||||
setPage(1)
|
||||
}}
|
||||
footer={
|
||||
pageData.total > 0
|
||||
? { from: pageData.from, to: pageData.to, total: pageData.total, page: pageData.page, pageCount: pageData.pageCount, onPage: setPage }
|
||||
: undefined
|
||||
}
|
||||
empty={{ title: 'No CAPA actions match' }}
|
||||
mobileRow={r => (
|
||||
<div className="flex items-start gap-3">
|
||||
<div className="min-w-0 flex-1 space-y-1">
|
||||
<p className="line-clamp-2 text-[13px] font-medium">{r.description}</p>
|
||||
<div className="flex items-center gap-2">
|
||||
<StatusTag status={r.status} />
|
||||
<PriorityTag priority={r.priority} />
|
||||
</div>
|
||||
<p className="text-xs text-faint">
|
||||
{[r.incident_ref, r.owner_name, `Due ${r.due_date}`].filter(Boolean).join(' · ')}
|
||||
</p>
|
||||
</div>
|
||||
<ChevronRight size={16} strokeWidth={2} className="mt-1 text-faint" aria-hidden />
|
||||
</div>
|
||||
)}
|
||||
/>
|
||||
) : (
|
||||
<div className="space-y-3">
|
||||
<div className="flex flex-wrap items-center gap-2">{toolbar}</div>
|
||||
<CapaBoardView capas={boardRows} />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
import { useState } from 'react'
|
||||
import { useRouter } from 'next/navigation'
|
||||
import { Button } from '@/components/ui/button'
|
||||
|
||||
interface Props {
|
||||
capaId: string
|
||||
@@ -31,19 +32,21 @@ export function CloseCapaButton({ capaId }: Props) {
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="border border-divider p-5 space-y-3 bg-neutral-100">
|
||||
<h3 className="text-sm font-semibold text-gray-800">Close CAPA</h3>
|
||||
<p className="text-sm text-gray-600">
|
||||
<div className="space-y-3 rounded-xl bg-surface p-5 shadow-card">
|
||||
<div>
|
||||
<h3 className="text-sm font-semibold">Close CAPA</h3>
|
||||
<p className="mt-0.5 text-xs text-muted">
|
||||
This CAPA has been verified as effective. Close it to mark it fully resolved.
|
||||
</p>
|
||||
{error && <p className="text-sm text-red-600">{error}</p>}
|
||||
<button
|
||||
onClick={handleClose}
|
||||
disabled={loading}
|
||||
className="w-full bg-accent text-white py-2 text-sm font-semibold hover:bg-accent-700 disabled:opacity-50"
|
||||
>
|
||||
</div>
|
||||
{error && (
|
||||
<p role="alert" className="rounded-md bg-st-red-bg px-3 py-2 text-[13px] text-st-red-fg">
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
<Button onClick={handleClose} disabled={loading}>
|
||||
{loading ? 'Closing…' : 'Close CAPA'}
|
||||
</button>
|
||||
</Button>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,108 @@
|
||||
'use client'
|
||||
|
||||
import { useState } from 'react'
|
||||
import { useRouter } from 'next/navigation'
|
||||
import { X } from 'lucide-react'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { Field, Textarea } from '@/components/ui/field'
|
||||
import { MAX_CAPA_PHOTOS, validateCapaSubmission } from '@/lib/capa/submit-validation'
|
||||
|
||||
interface Props {
|
||||
capaId: string
|
||||
}
|
||||
|
||||
export function SubmitVerificationForm({ capaId }: Props) {
|
||||
const router = useRouter()
|
||||
const [note, setNote] = useState('')
|
||||
const [files, setFiles] = useState<File[]>([])
|
||||
const [loading, setLoading] = useState(false)
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
|
||||
const check = validateCapaSubmission(note, files)
|
||||
|
||||
function addFiles(list: FileList | null) {
|
||||
if (!list) return
|
||||
setFiles(prev => [...prev, ...Array.from(list)].slice(0, MAX_CAPA_PHOTOS))
|
||||
}
|
||||
|
||||
async function handleSubmit(e: React.FormEvent) {
|
||||
e.preventDefault()
|
||||
if (!check.ok) return
|
||||
setLoading(true)
|
||||
setError(null)
|
||||
try {
|
||||
const fd = new FormData()
|
||||
fd.append('note', check.note)
|
||||
files.forEach(f => fd.append('files', f))
|
||||
const res = await fetch(`/api/capa/${capaId}/submit`, { method: 'POST', body: fd })
|
||||
if (!res.ok) {
|
||||
const data = await res.json().catch(() => ({}))
|
||||
setError(Array.isArray(data.details) ? data.details.join('. ') : (data.error ?? 'Submit failed. Please try again.'))
|
||||
setLoading(false)
|
||||
return
|
||||
}
|
||||
router.refresh()
|
||||
return
|
||||
} catch {
|
||||
setError('Network error. Please try again.')
|
||||
}
|
||||
setLoading(false)
|
||||
}
|
||||
|
||||
return (
|
||||
<form onSubmit={handleSubmit} className="space-y-3 rounded-xl bg-surface p-5 shadow-card">
|
||||
<div>
|
||||
<h2 className="text-sm font-semibold">Proof of completion</h2>
|
||||
<p className="text-xs text-muted">Describe what was done and attach 1 to {MAX_CAPA_PHOTOS} photos as evidence.</p>
|
||||
</div>
|
||||
|
||||
<Field label="Completion note" htmlFor={`note-${capaId}`}>
|
||||
<Textarea
|
||||
id={`note-${capaId}`}
|
||||
value={note}
|
||||
onChange={e => setNote(e.target.value)}
|
||||
rows={3}
|
||||
placeholder="What action was carried out?"
|
||||
disabled={loading}
|
||||
/>
|
||||
</Field>
|
||||
|
||||
<Field label="Photos" htmlFor={`photos-${capaId}`}>
|
||||
<input
|
||||
id={`photos-${capaId}`}
|
||||
type="file"
|
||||
accept="image/*"
|
||||
multiple
|
||||
disabled={loading || files.length >= MAX_CAPA_PHOTOS}
|
||||
onChange={e => { addFiles(e.target.files); e.target.value = '' }}
|
||||
className="block w-full text-[13px] text-ink"
|
||||
/>
|
||||
</Field>
|
||||
|
||||
{files.length > 0 && (
|
||||
<ul className="space-y-1">
|
||||
{files.map((f, i) => (
|
||||
<li key={`${f.name}-${i}`} className="flex items-center justify-between gap-2 text-[13px]">
|
||||
<span className="truncate">{f.name}</span>
|
||||
<button
|
||||
type="button"
|
||||
aria-label={`Remove ${f.name}`}
|
||||
onClick={() => setFiles(prev => prev.filter((_, j) => j !== i))}
|
||||
disabled={loading}
|
||||
className="text-muted hover:text-ink"
|
||||
>
|
||||
<X size={14} strokeWidth={2} aria-hidden />
|
||||
</button>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
)}
|
||||
|
||||
{error && <p role="alert" className="text-xs text-danger">{error}</p>}
|
||||
|
||||
<Button type="submit" disabled={!check.ok || loading}>
|
||||
{loading ? 'Submitting…' : 'Submit for Verification'}
|
||||
</Button>
|
||||
</form>
|
||||
)
|
||||
}
|
||||
@@ -2,14 +2,47 @@
|
||||
|
||||
import { useState } from 'react'
|
||||
import { useRouter } from 'next/navigation'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { Field, Textarea } from '@/components/ui/field'
|
||||
import { cx } from '@/components/ui/cx'
|
||||
|
||||
interface Props {
|
||||
capaId: string
|
||||
}
|
||||
|
||||
type Verdict = 'verified' | 'reopened'
|
||||
|
||||
function Choice({
|
||||
selected,
|
||||
onSelect,
|
||||
title,
|
||||
hint,
|
||||
}: {
|
||||
selected: boolean
|
||||
onSelect: () => void
|
||||
title: string
|
||||
hint: string
|
||||
}) {
|
||||
return (
|
||||
<button
|
||||
type="button"
|
||||
role="radio"
|
||||
aria-checked={selected}
|
||||
onClick={onSelect}
|
||||
className={cx(
|
||||
'cursor-pointer rounded-xl p-3 text-left transition-colors',
|
||||
selected ? 'bg-accent-tint shadow-chip-set' : 'bg-surface shadow-chip hover:bg-surface-2',
|
||||
)}
|
||||
>
|
||||
<span className="block text-[13px] font-semibold">{title}</span>
|
||||
<span className="mt-0.5 block text-xs text-muted">{hint}</span>
|
||||
</button>
|
||||
)
|
||||
}
|
||||
|
||||
export function VerifyForm({ capaId }: Props) {
|
||||
const router = useRouter()
|
||||
const [verdict, setVerdict] = useState<'verified' | 'reopened' | null>(null)
|
||||
const [verdict, setVerdict] = useState<Verdict | null>(null)
|
||||
const [reopenReason, setReopenReason] = useState('')
|
||||
const [saving, setSaving] = useState(false)
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
@@ -39,50 +72,50 @@ export function VerifyForm({ capaId }: Props) {
|
||||
}
|
||||
|
||||
return (
|
||||
<form onSubmit={handleSubmit} className="border border-divider p-5 space-y-4 bg-accent-100">
|
||||
<h3 className="text-sm font-semibold text-gray-800">HSE Verification</h3>
|
||||
<div className="flex gap-3">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setVerdict('verified')}
|
||||
className={`flex-1 py-2 text-sm font-medium border ${
|
||||
verdict === 'verified'
|
||||
? 'bg-accent text-white border-accent'
|
||||
: 'bg-surface text-gray-700 border-divider hover:border-accent'
|
||||
}`}
|
||||
>
|
||||
Verified — Effective
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setVerdict('reopened')}
|
||||
className={`flex-1 py-2 text-sm font-medium border ${
|
||||
verdict === 'reopened'
|
||||
? 'bg-accent text-white border-accent'
|
||||
: 'bg-surface text-gray-700 border-divider hover:border-accent'
|
||||
}`}
|
||||
>
|
||||
Reopen — Ineffective
|
||||
</button>
|
||||
</div>
|
||||
{verdict === 'reopened' && (
|
||||
<form onSubmit={handleSubmit} className="space-y-4 rounded-xl bg-surface p-5 shadow-card">
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 mb-1">Why is the action ineffective? *</label>
|
||||
<textarea
|
||||
value={reopenReason}
|
||||
onChange={e => setReopenReason(e.target.value)}
|
||||
rows={2} required
|
||||
className="w-full border border-divider px-3 py-2 text-sm"
|
||||
placeholder="Describe why the corrective action did not resolve the root cause…"
|
||||
<h3 className="text-sm font-semibold">Verify this action</h3>
|
||||
<p className="mt-0.5 text-xs text-muted">Confirm the corrective action fixed the root cause, or send it back.</p>
|
||||
</div>
|
||||
|
||||
<div role="radiogroup" aria-label="Verification verdict" className="grid gap-3 sm:grid-cols-2">
|
||||
<Choice
|
||||
selected={verdict === 'verified'}
|
||||
onSelect={() => setVerdict('verified')}
|
||||
title="Verified, effective"
|
||||
hint="Root cause addressed. The action is marked verified."
|
||||
/>
|
||||
<Choice
|
||||
selected={verdict === 'reopened'}
|
||||
onSelect={() => setVerdict('reopened')}
|
||||
title="Reopen, ineffective"
|
||||
hint="Returns to the owner with a required reason."
|
||||
/>
|
||||
</div>
|
||||
|
||||
{verdict === 'reopened' && (
|
||||
<Field label="Why is the action ineffective? *" htmlFor="reopen-reason">
|
||||
<Textarea
|
||||
id="reopen-reason"
|
||||
value={reopenReason}
|
||||
onChange={e => setReopenReason(e.target.value)}
|
||||
rows={2}
|
||||
required
|
||||
placeholder="Describe why the corrective action did not resolve the root cause…"
|
||||
/>
|
||||
</Field>
|
||||
)}
|
||||
{error && <p className="text-sm text-red-600">{error}</p>}
|
||||
|
||||
{error && (
|
||||
<p role="alert" className="rounded-md bg-st-red-bg px-3 py-2 text-[13px] text-st-red-fg">
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
|
||||
{verdict && (
|
||||
<button type="submit" disabled={saving}
|
||||
className="w-full bg-gray-900 text-white py-2 text-sm font-semibold disabled:opacity-50">
|
||||
{saving ? 'Saving…' : 'Submit Verification'}
|
||||
</button>
|
||||
<Button type="submit" disabled={saving}>
|
||||
{saving ? 'Saving…' : verdict === 'verified' ? 'Confirm verification' : 'Reopen action'}
|
||||
</Button>
|
||||
)}
|
||||
</form>
|
||||
)
|
||||
|
||||
@@ -20,7 +20,7 @@ function TabsInner({ activeTab }: { activeTab: string }) {
|
||||
<button
|
||||
key={tab.key}
|
||||
onClick={() => router.replace(`${pathname}?tab=${tab.key}`)}
|
||||
className={`px-4 py-2.5 text-sm font-medium whitespace-nowrap border-b-2 transition-colors ${
|
||||
className={`px-4 py-2.5 text-sm font-medium whitespace-nowrap border-b transition-colors ${
|
||||
activeTab === tab.key
|
||||
? 'border-accent text-accent-700'
|
||||
: 'border-transparent text-gray-500 hover:text-gray-700 hover:border-divider'
|
||||
|
||||
@@ -11,9 +11,9 @@ type RiskFlag = {
|
||||
}
|
||||
|
||||
const LEVEL_COLORS: Record<RiskFlag['risk_level'], string> = {
|
||||
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',
|
||||
low: 'bg-st-grey-bg text-st-grey-fg border-transparent',
|
||||
medium: 'bg-st-amber-bg text-st-amber-fg border-transparent',
|
||||
high: 'bg-st-red-bg text-st-red-fg border-transparent',
|
||||
}
|
||||
|
||||
export function RiskFlagsPanel() {
|
||||
@@ -71,7 +71,7 @@ export function RiskFlagsPanel() {
|
||||
<p className="text-sm text-gray-700 mb-3">{summary}</p>
|
||||
<div className="space-y-2">
|
||||
{flags.map(f => (
|
||||
<div key={`${f.site}-${f.zone}`} className={`border p-3 ${LEVEL_COLORS[f.risk_level]}`}>
|
||||
<div key={`${f.site}-${f.zone}`} className={`border rounded-md p-3 ${LEVEL_COLORS[f.risk_level]}`}>
|
||||
<div className="flex items-center justify-between mb-1">
|
||||
<span className="text-sm font-semibold">{f.zone} · {f.site}</span>
|
||||
<span className="text-xs font-bold uppercase">{f.risk_level}</span>
|
||||
|
||||
@@ -57,7 +57,7 @@ export function FileUpload({ onFilesChange, disabled = false }: Props) {
|
||||
return (
|
||||
<div className="space-y-2">
|
||||
<div
|
||||
className={`border-2 border-dashed p-6 text-center cursor-pointer transition-colors
|
||||
className={`border border-dashed p-6 text-center cursor-pointer transition-colors
|
||||
${dragging ? 'border-accent bg-accent-100' : 'border-divider hover:border-gray-400'}
|
||||
${disabled ? 'opacity-50 pointer-events-none' : ''}`}
|
||||
onClick={() => inputRef.current?.click()}
|
||||
|
||||
@@ -1,138 +0,0 @@
|
||||
'use client'
|
||||
|
||||
import { useRouter, useSearchParams, usePathname } from 'next/navigation'
|
||||
import { useCallback, useState, useTransition, Suspense } from 'react'
|
||||
|
||||
const STATUS_OPTIONS = [
|
||||
{ value: '', label: 'All Statuses' },
|
||||
{ value: 'reported', label: 'Reported' },
|
||||
{ value: 'triaged', label: 'Triaged' },
|
||||
{ value: 'investigating', label: 'Investigating' },
|
||||
{ value: 'capa_pending', label: 'CAPA Pending' },
|
||||
{ value: 'verification', label: 'Pending Verification' },
|
||||
{ value: 'closed', label: 'Closed' },
|
||||
]
|
||||
|
||||
const TYPE_OPTIONS = [
|
||||
{ value: '', label: 'All Types' },
|
||||
{ value: 'injury', label: 'Injury' },
|
||||
{ value: 'near_miss', label: 'Near Miss' },
|
||||
{ value: 'hazard', label: 'Hazard' },
|
||||
{ value: 'asset_damage', label: 'Asset Damage' },
|
||||
{ value: 'environmental', label: 'Environmental' },
|
||||
{ value: 'security', label: 'Security' },
|
||||
{ value: 'fire', label: 'Fire' },
|
||||
{ value: 'transport', label: 'Transport' },
|
||||
]
|
||||
|
||||
export interface SiteOption { id: string; name: string }
|
||||
export interface TruckOption { id: string; truck_no: string }
|
||||
|
||||
interface FiltersProps {
|
||||
sites: SiteOption[]
|
||||
trucks: TruckOption[]
|
||||
}
|
||||
|
||||
function FiltersInner({ sites, trucks }: FiltersProps) {
|
||||
const router = useRouter()
|
||||
const pathname = usePathname()
|
||||
const searchParams = useSearchParams()
|
||||
const [, startTransition] = useTransition()
|
||||
const [search, setSearch] = useState(searchParams.get('q') ?? '')
|
||||
|
||||
const updateParam = useCallback((key: string, value: string) => {
|
||||
const params = new URLSearchParams(searchParams.toString())
|
||||
if (value) {
|
||||
params.set(key, value)
|
||||
} else {
|
||||
params.delete(key)
|
||||
}
|
||||
params.delete('page')
|
||||
startTransition(() => {
|
||||
router.replace(`${pathname}?${params.toString()}`)
|
||||
})
|
||||
}, [router, pathname, searchParams])
|
||||
|
||||
const handleSearch = useCallback((value: string) => {
|
||||
setSearch(value)
|
||||
const timer = setTimeout(() => updateParam('q', value), 300)
|
||||
return () => clearTimeout(timer)
|
||||
}, [updateParam])
|
||||
|
||||
const hasFilters = searchParams.get('q') || searchParams.get('status') ||
|
||||
searchParams.get('type') || searchParams.get('site_id') || searchParams.get('truck_id')
|
||||
|
||||
return (
|
||||
<div className="flex flex-wrap gap-2 mb-4">
|
||||
<div className="relative flex-1 min-w-48">
|
||||
<svg
|
||||
className="absolute left-2.5 top-2 h-4 w-4 text-gray-400 pointer-events-none"
|
||||
fill="none" stroke="currentColor" viewBox="0 0 24 24"
|
||||
>
|
||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2}
|
||||
d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
|
||||
</svg>
|
||||
<input
|
||||
type="search"
|
||||
placeholder="Search reference or description..."
|
||||
value={search}
|
||||
onChange={e => handleSearch(e.target.value)}
|
||||
className="w-full pl-8 pr-3 py-1.5 text-sm border border-divider focus:outline-none focus:ring-2 focus:ring-accent"
|
||||
/>
|
||||
</div>
|
||||
<select
|
||||
value={searchParams.get('status') ?? ''}
|
||||
onChange={e => updateParam('status', e.target.value)}
|
||||
className="text-sm border border-divider px-2 py-1.5 focus:outline-none focus:ring-2 focus:ring-accent bg-surface"
|
||||
>
|
||||
{STATUS_OPTIONS.map(o => <option key={o.value} value={o.value}>{o.label}</option>)}
|
||||
</select>
|
||||
<select
|
||||
value={searchParams.get('type') ?? ''}
|
||||
onChange={e => updateParam('type', e.target.value)}
|
||||
className="text-sm border border-divider px-2 py-1.5 focus:outline-none focus:ring-2 focus:ring-accent bg-surface"
|
||||
>
|
||||
{TYPE_OPTIONS.map(o => <option key={o.value} value={o.value}>{o.label}</option>)}
|
||||
</select>
|
||||
{sites.length > 0 && (
|
||||
<select
|
||||
value={searchParams.get('site_id') ?? ''}
|
||||
onChange={e => updateParam('site_id', e.target.value)}
|
||||
className="text-sm border border-divider px-2 py-1.5 focus:outline-none focus:ring-2 focus:ring-accent bg-surface"
|
||||
>
|
||||
<option value="">All Sites</option>
|
||||
{sites.map(s => <option key={s.id} value={s.id}>{s.name}</option>)}
|
||||
</select>
|
||||
)}
|
||||
{trucks.length > 0 && (
|
||||
<select
|
||||
value={searchParams.get('truck_id') ?? ''}
|
||||
onChange={e => updateParam('truck_id', e.target.value)}
|
||||
className="text-sm border border-divider px-2 py-1.5 focus:outline-none focus:ring-2 focus:ring-accent bg-surface"
|
||||
>
|
||||
<option value="">All Trucks</option>
|
||||
{trucks.map(tk => <option key={tk.id} value={tk.id}>{tk.truck_no}</option>)}
|
||||
</select>
|
||||
)}
|
||||
{hasFilters && (
|
||||
<button
|
||||
onClick={() => {
|
||||
setSearch('')
|
||||
router.replace(pathname)
|
||||
}}
|
||||
className="text-sm text-gray-500 hover:text-gray-700 px-2 py-1.5 underline"
|
||||
>
|
||||
Clear filters
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export function IncidentFilters({ sites, trucks }: FiltersProps) {
|
||||
return (
|
||||
<Suspense fallback={<div className="h-10 mb-4" />}>
|
||||
<FiltersInner sites={sites} trucks={trucks} />
|
||||
</Suspense>
|
||||
)
|
||||
}
|
||||
@@ -1,129 +0,0 @@
|
||||
'use client'
|
||||
|
||||
import { useState } from 'react'
|
||||
import Link from 'next/link'
|
||||
import { StatusTag } from '@/components/ui/status-tag'
|
||||
|
||||
const TYPE_LABELS: Record<string, string> = {
|
||||
injury: 'Injury / Medical',
|
||||
near_miss: 'Near Miss',
|
||||
hazard: 'Hazard',
|
||||
asset_damage: 'Asset Damage',
|
||||
environmental: 'Environmental',
|
||||
security: 'Security',
|
||||
fire: 'Fire / Emergency',
|
||||
transport: 'Transport / Vehicle',
|
||||
}
|
||||
|
||||
const STATUS_ORDER = ['reported', 'triaged', 'investigating', 'capa_pending', 'verification', 'closed'] as const
|
||||
|
||||
export type Incident = {
|
||||
id: string
|
||||
reference_no: string | null
|
||||
incident_type: string
|
||||
status: string
|
||||
severity: number | null
|
||||
reported_at: string
|
||||
sites: { name: string } | null
|
||||
zones: { name: string } | null
|
||||
trucks: { truck_no: string } | null
|
||||
reporter: { name: string } | null
|
||||
}
|
||||
|
||||
interface Props {
|
||||
incidents: Incident[]
|
||||
basePath: string
|
||||
}
|
||||
|
||||
export function IncidentList({ incidents, basePath }: Props) {
|
||||
const [typeFilter, setTypeFilter] = useState('')
|
||||
const [statusFilter, setStatusFilter] = useState('')
|
||||
const [search, setSearch] = useState('')
|
||||
|
||||
const filtered = incidents.filter(inc => {
|
||||
if (typeFilter && inc.incident_type !== typeFilter) return false
|
||||
if (statusFilter && inc.status !== statusFilter) return false
|
||||
if (search) {
|
||||
const q = search.toLowerCase()
|
||||
return (
|
||||
inc.reference_no?.toLowerCase().includes(q) ||
|
||||
inc.incident_type.includes(q) ||
|
||||
(inc.sites?.name ?? '').toLowerCase().includes(q)
|
||||
)
|
||||
}
|
||||
return true
|
||||
})
|
||||
|
||||
return (
|
||||
<div className="space-y-4">
|
||||
<div className="flex flex-wrap gap-2">
|
||||
<input
|
||||
type="search"
|
||||
placeholder="Search ref, type, site…"
|
||||
className="border border-divider px-3 py-2 text-sm w-48 focus:outline-none focus:ring-2 focus:ring-accent"
|
||||
value={search}
|
||||
onChange={e => setSearch(e.target.value)}
|
||||
/>
|
||||
<select
|
||||
className="border border-divider px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-accent"
|
||||
value={typeFilter}
|
||||
onChange={e => setTypeFilter(e.target.value)}
|
||||
>
|
||||
<option value="">All types</option>
|
||||
{Object.entries(TYPE_LABELS).map(([v, l]) => (
|
||||
<option key={v} value={v}>{l}</option>
|
||||
))}
|
||||
</select>
|
||||
<select
|
||||
className="border border-divider px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-accent"
|
||||
value={statusFilter}
|
||||
onChange={e => setStatusFilter(e.target.value)}
|
||||
>
|
||||
<option value="">All statuses</option>
|
||||
{STATUS_ORDER.map(s => (
|
||||
<option key={s} value={s}>{s.replace(/_/g, ' ')}</option>
|
||||
))}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
{filtered.length === 0 ? (
|
||||
<div className="text-center py-12 text-gray-500 text-sm">No incidents found</div>
|
||||
) : (
|
||||
<div className="divide-y divide-divider bg-surface shadow-sm overflow-hidden">
|
||||
{filtered.map(inc => (
|
||||
<Link
|
||||
key={inc.id}
|
||||
href={`${basePath}/incidents/${inc.id}`}
|
||||
className="flex items-center justify-between px-4 py-3 hover:bg-gray-50 transition-colors"
|
||||
>
|
||||
<div className="min-w-0 flex-1">
|
||||
<div className="flex items-center gap-2 mb-0.5">
|
||||
<span className="font-mono text-sm font-semibold text-gray-900">
|
||||
{inc.reference_no ?? '—'}
|
||||
</span>
|
||||
<StatusTag status={inc.status}>{inc.status.replace(/_/g, ' ').toUpperCase()}</StatusTag>
|
||||
</div>
|
||||
<div className="text-sm text-gray-600">
|
||||
{TYPE_LABELS[inc.incident_type] ?? inc.incident_type}
|
||||
{inc.zones?.name && ` · ${inc.zones.name}`}
|
||||
{inc.sites?.name && ` · ${inc.sites.name}`}
|
||||
{inc.trucks?.truck_no && (
|
||||
<span className="ml-1 text-xs text-gray-400">· {inc.trucks.truck_no}</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<div className="ml-4 text-right">
|
||||
<div className="text-xs text-gray-400">
|
||||
{new Date(inc.reported_at).toLocaleDateString('en-MY')}
|
||||
</div>
|
||||
{inc.severity && (
|
||||
<div className="text-xs text-gray-500 mt-0.5">Sev {inc.severity}</div>
|
||||
)}
|
||||
</div>
|
||||
</Link>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,186 @@
|
||||
'use client'
|
||||
|
||||
import { useEffect, useState } from 'react'
|
||||
import Link from 'next/link'
|
||||
import { usePathname, useRouter, useSearchParams } from 'next/navigation'
|
||||
import { ChevronRight, Eye, Search } from 'lucide-react'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { FilterChip } from '@/components/ui/filter-chip'
|
||||
import { StatusTag } from '@/components/ui/status-tag'
|
||||
import { TableCard, type Column } from '@/components/ui/table-card'
|
||||
import { PAGE_SIZE, nextSort, withParams, type ListParams, type SortKey } from '@/lib/incidents/list-params'
|
||||
import type { Incident, SiteOption, TruckOption } from '@/lib/incidents/types'
|
||||
|
||||
const TYPE_LABELS: Record<string, string> = {
|
||||
injury: 'Injury / Medical',
|
||||
near_miss: 'Near Miss',
|
||||
hazard: 'Hazard',
|
||||
asset_damage: 'Asset Damage',
|
||||
environmental: 'Environmental',
|
||||
security: 'Security',
|
||||
fire: 'Fire / Emergency',
|
||||
transport: 'Transport / Vehicle',
|
||||
}
|
||||
|
||||
const STATUS_OPTIONS = [
|
||||
{ value: 'reported', label: 'Reported' },
|
||||
{ value: 'triaged', label: 'Triaged' },
|
||||
{ value: 'investigating', label: 'Investigating' },
|
||||
{ value: 'capa_pending', label: 'CAPA pending' },
|
||||
{ value: 'verification', label: 'Verification' },
|
||||
{ value: 'closed', label: 'Closed' },
|
||||
]
|
||||
|
||||
const TYPE_OPTIONS = Object.entries(TYPE_LABELS).map(([value, label]) => ({ value, label }))
|
||||
|
||||
interface Props {
|
||||
incidents: Incident[]
|
||||
basePath: string
|
||||
total: number
|
||||
counts: { all: number; open: number; closed: number }
|
||||
params: ListParams
|
||||
sites: SiteOption[]
|
||||
trucks: TruckOption[]
|
||||
}
|
||||
|
||||
const fmtDate = (iso: string) => new Date(iso).toLocaleDateString('en-MY')
|
||||
|
||||
export function IncidentTable({ incidents, basePath, total, counts, params, sites, trucks }: Props) {
|
||||
const router = useRouter()
|
||||
const pathname = usePathname()
|
||||
const searchParams = useSearchParams()
|
||||
const search = searchParams.toString() ? `?${searchParams.toString()}` : ''
|
||||
const [q, setQ] = useState(params.q)
|
||||
|
||||
const update = (updates: Record<string, string | null>) =>
|
||||
router.replace(`${pathname}${withParams(search, updates)}`)
|
||||
|
||||
useEffect(() => {
|
||||
if (q === params.q) return
|
||||
const timer = setTimeout(() => update({ q: q || null }), 300)
|
||||
return () => clearTimeout(timer)
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [q])
|
||||
|
||||
const columns: Column<Incident>[] = [
|
||||
{
|
||||
key: 'reference',
|
||||
header: 'Reference',
|
||||
sortKey: 'reference_no',
|
||||
cell: r => <span className="font-mono text-[12.5px] text-accent">{r.reference_no ?? '—'}</span>,
|
||||
},
|
||||
{ key: 'status', header: 'Status', sortKey: 'status', cell: r => <StatusTag status={r.status} /> },
|
||||
{ key: 'type', header: 'Type', cell: r => TYPE_LABELS[r.incident_type] ?? r.incident_type },
|
||||
{
|
||||
key: 'location',
|
||||
header: 'Location',
|
||||
cell: r => [r.zones?.name, r.sites?.name, r.trucks?.truck_no].filter(Boolean).join(' · ') || '—',
|
||||
},
|
||||
{ key: 'severity', header: 'Severity', cell: r => (r.severity ? `Sev ${r.severity}` : '—') },
|
||||
{ key: 'reported', header: 'Reported', sortKey: 'reported_at', cell: r => fmtDate(r.reported_at) },
|
||||
]
|
||||
|
||||
const clearable = Boolean(params.q || params.status || params.type || params.siteId || params.truckId)
|
||||
const pageCount = Math.max(1, Math.ceil(total / PAGE_SIZE))
|
||||
const from = incidents.length === 0 ? 0 : (params.page - 1) * PAGE_SIZE + 1
|
||||
const to = incidents.length === 0 ? 0 : from + incidents.length - 1
|
||||
|
||||
const toolbar = (
|
||||
<>
|
||||
<label className="flex items-center gap-2 h-8 px-2.5 rounded-md bg-surface shadow-input text-[13px] min-w-[260px]">
|
||||
<Search size={16} strokeWidth={2} className="text-muted" aria-hidden />
|
||||
<input
|
||||
type="search"
|
||||
aria-label="Search incidents"
|
||||
placeholder="Search reference or description"
|
||||
value={q}
|
||||
onChange={e => setQ(e.target.value)}
|
||||
className="flex-1 bg-transparent outline-none placeholder:text-faint"
|
||||
/>
|
||||
</label>
|
||||
<FilterChip label="Status" value={params.status} options={STATUS_OPTIONS} onChange={v => update({ status: v || null })} />
|
||||
<FilterChip label="Type" value={params.type} options={TYPE_OPTIONS} onChange={v => update({ type: v || null })} />
|
||||
{sites.length > 0 && (
|
||||
<FilterChip
|
||||
label="Site"
|
||||
value={params.siteId}
|
||||
options={sites.map(s => ({ value: s.id, label: s.name }))}
|
||||
onChange={v => update({ site_id: v || null })}
|
||||
/>
|
||||
)}
|
||||
{trucks.length > 0 && (
|
||||
<FilterChip
|
||||
label="Truck"
|
||||
value={params.truckId}
|
||||
options={trucks.map(t => ({ value: t.id, label: t.truck_no }))}
|
||||
onChange={v => update({ truck_id: v || null })}
|
||||
/>
|
||||
)}
|
||||
{clearable && (
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
setQ('')
|
||||
router.replace(pathname)
|
||||
}}
|
||||
className="text-[12.5px] text-muted hover:text-ink cursor-pointer"
|
||||
>
|
||||
Clear filters
|
||||
</button>
|
||||
)}
|
||||
</>
|
||||
)
|
||||
|
||||
return (
|
||||
<TableCard
|
||||
columns={columns}
|
||||
rows={incidents}
|
||||
rowKey={r => r.id}
|
||||
onRowOpen={r => router.push(`${basePath}/incidents/${r.id}`)}
|
||||
rowActions={r => (
|
||||
<Link
|
||||
href={`${basePath}/incidents/${r.id}`}
|
||||
aria-label="Open incident"
|
||||
className="inline-grid place-items-center w-7 h-7 rounded-md text-ink-3 hover:bg-rule"
|
||||
>
|
||||
<Eye size={16} strokeWidth={2} aria-hidden />
|
||||
</Link>
|
||||
)}
|
||||
views={{
|
||||
items: [
|
||||
{ key: 'all', label: 'All', count: counts.all },
|
||||
{ key: 'open', label: 'Open', count: counts.open },
|
||||
{ key: 'closed', label: 'Closed', count: counts.closed },
|
||||
],
|
||||
active: params.view,
|
||||
onChange: key => update({ view: key === 'all' ? null : key }),
|
||||
}}
|
||||
toolbar={toolbar}
|
||||
sort={{ key: params.sort, dir: params.dir }}
|
||||
onSortChange={key => {
|
||||
const next = nextSort({ key: params.sort, dir: params.dir }, key as SortKey)
|
||||
update({ sort: next.key, dir: next.dir })
|
||||
}}
|
||||
footer={total > 0 ? { from, to, total, page: params.page, pageCount, onPage: p => update({ page: String(p) }) } : undefined}
|
||||
empty={{
|
||||
title: 'No incidents found',
|
||||
action: <Button onClick={() => router.push('/report')}>Report incident</Button>,
|
||||
}}
|
||||
mobileRow={r => (
|
||||
<div className="flex items-start gap-3">
|
||||
<div className="min-w-0 flex-1 space-y-1">
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="font-mono text-[12.5px] text-accent">{r.reference_no ?? '—'}</span>
|
||||
<StatusTag status={r.status} />
|
||||
</div>
|
||||
<p className="text-[13px] text-ink-3">
|
||||
{[TYPE_LABELS[r.incident_type] ?? r.incident_type, r.zones?.name].filter(Boolean).join(' · ')}
|
||||
</p>
|
||||
<p className="text-xs text-faint">{fmtDate(r.reported_at)}</p>
|
||||
</div>
|
||||
<ChevronRight size={16} strokeWidth={2} className="mt-1 text-faint" aria-hidden />
|
||||
</div>
|
||||
)}
|
||||
/>
|
||||
)
|
||||
}
|
||||
@@ -42,8 +42,8 @@ export function InvestigationPanel({ investigation: inv }: Props) {
|
||||
<span className="text-xs text-gray-500">{METHOD_LABELS[inv.method] ?? inv.method}</span>
|
||||
<span className={`text-xs font-medium px-2 py-0.5 ${
|
||||
inv.completed_at
|
||||
? 'bg-neutral-100 text-ink'
|
||||
: 'bg-accent-100 text-accent-700'
|
||||
? 'bg-st-green-bg text-st-green-fg'
|
||||
: 'bg-st-blue-bg text-st-blue-fg'
|
||||
}`}>
|
||||
{inv.completed_at ? 'Completed' : 'In Progress'}
|
||||
</span>
|
||||
|
||||
@@ -56,8 +56,8 @@ export function OfflineSync() {
|
||||
if (pendingCount === 0) return null
|
||||
|
||||
return (
|
||||
<div className="fixed bottom-4 left-4 right-4 bg-accent-100 border border-accent-300 p-3 flex items-center justify-between shadow-md z-50">
|
||||
<span className="text-sm text-accent-700 font-medium">
|
||||
<div className="fixed bottom-4 left-4 right-4 bg-st-amber-bg rounded-xl p-3 flex items-center justify-between shadow-float z-50">
|
||||
<span className="text-sm text-st-amber-fg font-medium">
|
||||
{pendingCount} report{pendingCount > 1 ? 's' : ''} saved offline
|
||||
</span>
|
||||
<button
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
import Link from 'next/link'
|
||||
|
||||
interface Props {
|
||||
page: number
|
||||
pageSize: number
|
||||
total: number
|
||||
href: string
|
||||
}
|
||||
|
||||
export function Pagination({ page, pageSize, total, href }: Props) {
|
||||
const totalPages = Math.max(1, Math.ceil(total / pageSize))
|
||||
if (totalPages <= 1) return null
|
||||
|
||||
const link = (p: number, label: string, disabled: boolean) =>
|
||||
disabled ? (
|
||||
<span className="px-3 py-1.5 text-sm text-gray-300">{label}</span>
|
||||
) : (
|
||||
<Link href={`${href}?page=${p}`} className="px-3 py-1.5 text-sm text-accent-700 hover:underline">
|
||||
{label}
|
||||
</Link>
|
||||
)
|
||||
|
||||
return (
|
||||
<nav className="flex items-center justify-between mt-4" aria-label="Pagination">
|
||||
{link(page - 1, '← Previous', page <= 1)}
|
||||
<span className="text-sm text-gray-500">
|
||||
Page {page} of {totalPages}
|
||||
</span>
|
||||
{link(page + 1, 'Next →', page >= totalPages)}
|
||||
</nav>
|
||||
)
|
||||
}
|
||||
@@ -5,16 +5,20 @@ import { useRouter } from 'next/navigation'
|
||||
import { FileUpload } from '@/components/incidents/file-upload'
|
||||
import type { IncidentType, MedicalStatus } from '@/lib/incidents/validate'
|
||||
import { useTranslations } from '@/lib/i18n/context'
|
||||
import { zonesForSite, resolveZoneToken, type SiteOption } from '@/lib/report/zones'
|
||||
import { siteForTruck } from '@/lib/report/trucks'
|
||||
|
||||
interface Props {
|
||||
zoneToken: string | null
|
||||
zoneName: string | null
|
||||
siteName: string | null
|
||||
trucks: Array<{ id: string; truck_no: string; carrier: string | null }>
|
||||
sites: SiteOption[]
|
||||
defaultSiteId: string
|
||||
trucks: Array<{ id: string; truck_no: string; carrier: string | null; site_id: string | null }>
|
||||
initialTruckId?: string | null
|
||||
}
|
||||
|
||||
export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
||||
export function ReportForm({ zoneToken, sites, defaultSiteId, trucks, initialTruckId }: Props) {
|
||||
const router = useRouter()
|
||||
const t = useTranslations('ReportForm')
|
||||
const itLabels = useTranslations('IncidentType')
|
||||
@@ -52,6 +56,15 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
||||
} | null>(null)
|
||||
const [overrideQuality, setOverrideQuality] = useState(false)
|
||||
|
||||
const truckSite = !zoneToken ? siteForTruck(trucks, initialTruckId) : null
|
||||
const [siteId, setSiteId] = useState(
|
||||
truckSite && sites.some(s => s.id === truckSite)
|
||||
? truckSite
|
||||
: sites.some(s => s.id === defaultSiteId) ? defaultSiteId : (sites.length === 1 ? sites[0].id : '')
|
||||
)
|
||||
const [zoneId, setZoneId] = useState('')
|
||||
const effectiveZoneToken = resolveZoneToken({ zoneToken, sites, zoneId })
|
||||
|
||||
const [form, setForm] = useState({
|
||||
incident_type: (initialTruckId ? 'transport' : '') as IncidentType | '',
|
||||
description: '',
|
||||
@@ -113,7 +126,7 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
||||
try {
|
||||
const { addPendingReport } = await import('@/lib/offline/db')
|
||||
await addPendingReport({
|
||||
zone_token: zoneToken ?? '',
|
||||
zone_token: effectiveZoneToken ?? '',
|
||||
incident_type: form.incident_type as IncidentType,
|
||||
description: form.description,
|
||||
injury_involved: form.injury_involved,
|
||||
@@ -162,7 +175,7 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
||||
|
||||
try {
|
||||
const fd = new FormData()
|
||||
if (zoneToken) fd.append('zone_token', zoneToken)
|
||||
if (effectiveZoneToken) fd.append('zone_token', effectiveZoneToken)
|
||||
fd.append('incident_type', form.incident_type)
|
||||
fd.append('description', form.description)
|
||||
fd.append('injury_involved', String(form.injury_involved))
|
||||
@@ -214,7 +227,7 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
||||
return (
|
||||
<form onSubmit={handleSubmit} className="space-y-5 bg-surface shadow-sm p-5">
|
||||
{!isOnline && (
|
||||
<div className="bg-accent-100 border border-accent-300 p-3 text-sm text-accent-700">
|
||||
<div className="bg-st-amber-bg rounded-md p-3 text-sm text-st-amber-fg">
|
||||
{t.offlineBanner}
|
||||
</div>
|
||||
)}
|
||||
@@ -225,6 +238,40 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
||||
</div>
|
||||
)}
|
||||
|
||||
{!zoneToken && (
|
||||
<div className="grid grid-cols-2 gap-3">
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 mb-1">
|
||||
{t.siteLabel} <span className="text-red-500">*</span>
|
||||
</label>
|
||||
<select
|
||||
required
|
||||
className="w-full border border-divider px-3 py-2.5 text-sm focus:outline-none focus:ring-2 focus:ring-accent"
|
||||
value={siteId}
|
||||
onChange={e => { setSiteId(e.target.value); setZoneId('') }}
|
||||
>
|
||||
<option value="">{t.sitePlaceholder}</option>
|
||||
{sites.map(s => <option key={s.id} value={s.id}>{s.name}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 mb-1">
|
||||
{t.zoneLabel} <span className="text-red-500">*</span>
|
||||
</label>
|
||||
<select
|
||||
required
|
||||
disabled={!siteId}
|
||||
className="w-full border border-divider px-3 py-2.5 text-sm focus:outline-none focus:ring-2 focus:ring-accent disabled:opacity-50"
|
||||
value={zoneId}
|
||||
onChange={e => setZoneId(e.target.value)}
|
||||
>
|
||||
<option value="">{t.zonePlaceholder}</option>
|
||||
{zonesForSite(sites, siteId).map(z => <option key={z.id} value={z.id}>{z.name}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 mb-1">
|
||||
{t.incidentTypeLabel} <span className="text-red-500">*</span>
|
||||
@@ -308,15 +355,15 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
||||
</div>
|
||||
|
||||
{qualityCheck && !qualityCheck.passes && (
|
||||
<div className="bg-accent-100 border border-accent-300 p-3 space-y-2">
|
||||
<p className="text-xs font-semibold text-accent-700 uppercase tracking-wide">
|
||||
<div className="bg-st-amber-bg rounded-md p-3 space-y-2">
|
||||
<p className="text-xs font-semibold text-st-amber-fg uppercase tracking-wide">
|
||||
{t.qualityScoreLabel.replace('{score}', String(qualityCheck.score))}
|
||||
</p>
|
||||
<p className="text-sm text-accent-700">{qualityCheck.feedback}</p>
|
||||
<p className="text-sm text-st-amber-fg">{qualityCheck.feedback}</p>
|
||||
{qualityCheck.suggestions.length > 0 && (
|
||||
<ul className="list-disc list-inside space-y-1">
|
||||
{qualityCheck.suggestions.map((s, i) => (
|
||||
<li key={i} className="text-xs text-accent-700">{s}</li>
|
||||
<li key={i} className="text-xs text-st-amber-fg">{s}</li>
|
||||
))}
|
||||
</ul>
|
||||
)}
|
||||
@@ -382,7 +429,7 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
||||
|
||||
<button
|
||||
type="submit"
|
||||
disabled={submitting || !form.incident_type || (form.incident_type === 'transport' && !form.truck_id)}
|
||||
disabled={submitting || !effectiveZoneToken || !form.incident_type || (form.incident_type === 'transport' && !form.truck_id)}
|
||||
className="w-full bg-accent text-white py-3 font-medium text-sm
|
||||
hover:bg-accent-600 disabled:opacity-50 disabled:cursor-not-allowed transition-colors"
|
||||
>
|
||||
|
||||
@@ -157,7 +157,7 @@ export function TriageForm({ incidentId, currentSeverity }: Props) {
|
||||
</div>
|
||||
|
||||
{aiRationale && (
|
||||
<div className="bg-accent-100 border border-accent-300 p-3">
|
||||
<div className="bg-accent-tint rounded-md p-3">
|
||||
<p className="text-xs font-semibold text-accent-700 mb-1">AI Suggestion Rationale</p>
|
||||
<p className="text-xs text-accent-700">{aiRationale}</p>
|
||||
<p className="text-xs text-accent-400 mt-1">Fields pre-filled — review before submitting.</p>
|
||||
|
||||
@@ -0,0 +1,135 @@
|
||||
'use client'
|
||||
|
||||
import { useEffect, useRef } from 'react'
|
||||
import Link from 'next/link'
|
||||
import { usePathname, useRouter } from 'next/navigation'
|
||||
import { LogOut, Search, ShieldCheck, User } from 'lucide-react'
|
||||
import { NotificationBell } from '@/components/notifications/bell'
|
||||
import { Avatar } from '@/components/ui/avatar'
|
||||
import { cx } from '@/components/ui/cx'
|
||||
import { MobileShell } from './mobile-shell'
|
||||
import { isActivePath, navItemsFor, searchHrefFor } from './nav-items'
|
||||
|
||||
const ITEM = 'flex items-center gap-2.5 h-8 px-2.5 rounded-md text-[13px] w-full text-left'
|
||||
const ITEM_ACTIVE = 'bg-surface text-ink font-semibold shadow-chip'
|
||||
const ITEM_IDLE = 'text-ink-3 hover:bg-rule-2'
|
||||
|
||||
export function AppShell({
|
||||
role,
|
||||
userName,
|
||||
children,
|
||||
}: {
|
||||
role: string
|
||||
userName: string
|
||||
children: React.ReactNode
|
||||
}) {
|
||||
const pathname = usePathname()
|
||||
const router = useRouter()
|
||||
const items = navItemsFor(role)
|
||||
const searchHref = searchHrefFor(role)
|
||||
const searchRef = useRef<HTMLInputElement>(null)
|
||||
const displayName = userName || 'User'
|
||||
const roleLabel = role.replace(/_/g, ' ').replace(/\b\w/g, c => c.toUpperCase())
|
||||
|
||||
useEffect(() => {
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if ((e.metaKey || e.ctrlKey) && e.key.toLowerCase() === 'k') {
|
||||
e.preventDefault()
|
||||
searchRef.current?.focus()
|
||||
}
|
||||
}
|
||||
document.addEventListener('keydown', onKey)
|
||||
return () => document.removeEventListener('keydown', onKey)
|
||||
}, [])
|
||||
|
||||
const logout = async () => {
|
||||
await fetch('/api/auth/logout', { method: 'POST' })
|
||||
router.push('/login')
|
||||
router.refresh()
|
||||
}
|
||||
|
||||
const accountActive = pathname === '/account'
|
||||
|
||||
return (
|
||||
<div className="min-h-screen bg-ground">
|
||||
<header className="hidden md:flex fixed top-0 left-0 right-0 z-40 h-14 items-center justify-between gap-4 pl-5 pr-4 bg-topbar">
|
||||
<div className="flex items-center gap-2.5 w-56">
|
||||
<span className="inline-grid place-items-center w-7 h-7 rounded-md bg-accent text-white">
|
||||
<ShieldCheck size={16} strokeWidth={2} aria-hidden />
|
||||
</span>
|
||||
<span className="text-[15px] font-[650] text-white tracking-tight">IMS</span>
|
||||
<span className="text-[13px] text-neutral-400">Setia HSE</span>
|
||||
</div>
|
||||
|
||||
{searchHref ? (
|
||||
<form action={searchHref} method="get" className="flex-1 max-w-[520px]">
|
||||
<label className="flex items-center gap-2 h-[34px] px-2.5 rounded-[10px] bg-ink-2 shadow-[inset_0_0_0_1px_var(--color-ink-3)] text-neutral-400 text-[13px]">
|
||||
<Search size={16} strokeWidth={2} aria-hidden />
|
||||
<input
|
||||
ref={searchRef}
|
||||
name="q"
|
||||
type="search"
|
||||
placeholder="Search incidents"
|
||||
aria-label="Search incidents"
|
||||
className="flex-1 bg-transparent text-white placeholder:text-neutral-400 outline-none"
|
||||
/>
|
||||
<kbd className="font-mono text-[11px] text-neutral-400">⌘K</kbd>
|
||||
</label>
|
||||
</form>
|
||||
) : (
|
||||
<div className="flex-1" />
|
||||
)}
|
||||
|
||||
<div className="flex items-center gap-2 w-56 justify-end">
|
||||
<NotificationBell />
|
||||
<div className="flex items-center gap-2 py-1 pl-1 pr-2.5 rounded-md bg-ink-2">
|
||||
<Avatar name={displayName} />
|
||||
<span className="text-[13px] text-rule-2 max-w-32 truncate">{displayName}</span>
|
||||
</div>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
<aside className="hidden md:flex fixed top-14 left-0 bottom-0 z-30 w-60 flex-col gap-0.5 p-3 bg-rule border-r border-rule-2">
|
||||
{items.map(item => {
|
||||
const active = isActivePath(item.href, pathname)
|
||||
const Icon = item.icon
|
||||
return (
|
||||
<Link
|
||||
key={item.href}
|
||||
href={item.href}
|
||||
aria-current={active ? 'page' : undefined}
|
||||
className={cx(ITEM, active ? ITEM_ACTIVE : ITEM_IDLE)}
|
||||
>
|
||||
<Icon size={16} strokeWidth={2} className={active ? 'text-accent' : 'text-ink-3'} aria-hidden />
|
||||
<span className="flex-1">{item.label}</span>
|
||||
</Link>
|
||||
)
|
||||
})}
|
||||
<div className="flex-1" />
|
||||
<div className="flex flex-col gap-0.5 pt-2.5 border-t border-rule-2">
|
||||
<div className="px-2.5 pb-1">
|
||||
<p className="text-[13px] font-semibold truncate">{displayName}</p>
|
||||
<p className="text-xs text-muted truncate">{roleLabel}</p>
|
||||
</div>
|
||||
<Link
|
||||
href="/account"
|
||||
aria-current={accountActive ? 'page' : undefined}
|
||||
className={cx(ITEM, accountActive ? ITEM_ACTIVE : ITEM_IDLE)}
|
||||
>
|
||||
<User size={16} strokeWidth={2} className={accountActive ? 'text-accent' : 'text-ink-3'} aria-hidden />
|
||||
Account
|
||||
</Link>
|
||||
<button type="button" onClick={logout} className={cx(ITEM, ITEM_IDLE, 'cursor-pointer')}>
|
||||
<LogOut size={16} strokeWidth={2} className="text-ink-3" aria-hidden />
|
||||
Log out
|
||||
</button>
|
||||
<p className="px-2.5 pt-2 text-xs text-faint">v2.0.0</p>
|
||||
</div>
|
||||
</aside>
|
||||
|
||||
<main className="md:pl-60 md:pt-14 pb-16 md:pb-0">{children}</main>
|
||||
|
||||
<MobileShell items={items} pathname={pathname} onLogout={logout} />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
'use client'
|
||||
|
||||
import Link from 'next/link'
|
||||
import { LogOut } from 'lucide-react'
|
||||
import { isActivePath, type NavItem } from './nav-items'
|
||||
import { cx } from '@/components/ui/cx'
|
||||
|
||||
export function MobileShell({
|
||||
items,
|
||||
pathname,
|
||||
onLogout,
|
||||
}: {
|
||||
items: NavItem[]
|
||||
pathname: string
|
||||
onLogout: () => void
|
||||
}) {
|
||||
const tabs = items.slice(0, 4)
|
||||
return (
|
||||
<nav
|
||||
aria-label="Mobile"
|
||||
className="md:hidden fixed bottom-0 left-0 right-0 z-40 flex bg-surface border-t border-rule pb-[env(safe-area-inset-bottom)]"
|
||||
>
|
||||
{tabs.map(item => {
|
||||
const active = isActivePath(item.href, pathname)
|
||||
const Icon = item.icon
|
||||
return (
|
||||
<Link
|
||||
key={item.href}
|
||||
href={item.href}
|
||||
aria-current={active ? 'page' : undefined}
|
||||
className={cx(
|
||||
'flex-1 flex flex-col items-center gap-1 pt-2 pb-1.5 text-[10.5px] font-medium',
|
||||
active ? 'text-accent' : 'text-faint',
|
||||
)}
|
||||
>
|
||||
<Icon size={22} strokeWidth={1.8} aria-hidden />
|
||||
<span className="leading-none">{item.label}</span>
|
||||
</Link>
|
||||
)
|
||||
})}
|
||||
{items.length <= 4 && (
|
||||
<button
|
||||
type="button"
|
||||
onClick={onLogout}
|
||||
className="flex-1 flex flex-col items-center gap-1 pt-2 pb-1.5 text-[10.5px] font-medium text-faint cursor-pointer"
|
||||
>
|
||||
<LogOut size={22} strokeWidth={1.8} aria-hidden />
|
||||
<span className="leading-none">Log out</span>
|
||||
</button>
|
||||
)}
|
||||
</nav>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
import {
|
||||
AlignLeft,
|
||||
CircleCheck,
|
||||
ClipboardList,
|
||||
LayoutDashboard,
|
||||
Plus,
|
||||
Settings,
|
||||
Users,
|
||||
type LucideIcon,
|
||||
} from 'lucide-react'
|
||||
|
||||
export interface NavItem {
|
||||
label: string
|
||||
href: string
|
||||
icon: LucideIcon
|
||||
}
|
||||
|
||||
const NAV_ITEMS: Record<string, NavItem[]> = {
|
||||
ssa: [
|
||||
{ label: 'Overview', href: '/ssa', icon: AlignLeft },
|
||||
{ label: 'My Reports', href: '/ssa/my-reports', icon: ClipboardList },
|
||||
{ label: 'Site Incidents', href: '/ssa/incidents', icon: ClipboardList },
|
||||
{ label: 'My CAPAs', href: '/ssa/capas', icon: CircleCheck },
|
||||
{ label: 'New Incident', href: '/report', icon: Plus },
|
||||
],
|
||||
hse: [
|
||||
{ label: 'Dashboard', href: '/hse/dashboard', icon: LayoutDashboard },
|
||||
{ label: 'Incidents', href: '/hse/incidents', icon: ClipboardList },
|
||||
{ label: 'CAPA', href: '/hse/capa', icon: CircleCheck },
|
||||
{ label: 'Settings', href: '/hse/settings', icon: Settings },
|
||||
],
|
||||
management: [{ label: 'Dashboard', href: '/management', icon: LayoutDashboard }],
|
||||
admin: [
|
||||
{ label: 'Admin', href: '/admin', icon: Users },
|
||||
{ label: 'Dashboard', href: '/hse/dashboard', icon: LayoutDashboard },
|
||||
{ label: 'Incidents', href: '/hse/incidents', icon: ClipboardList },
|
||||
{ label: 'CAPA', href: '/hse/capa', icon: CircleCheck },
|
||||
{ label: 'Management', href: '/management', icon: AlignLeft },
|
||||
{ label: 'Settings', href: '/hse/settings', icon: Settings },
|
||||
],
|
||||
}
|
||||
|
||||
const EXACT_ROOTS = ['/ssa', '/management', '/admin', '/report', '/account']
|
||||
|
||||
export function navItemsFor(role: string): NavItem[] {
|
||||
return NAV_ITEMS[role] ?? NAV_ITEMS.ssa
|
||||
}
|
||||
|
||||
export function isActivePath(href: string, pathname: string): boolean {
|
||||
return EXACT_ROOTS.includes(href) ? pathname === href : pathname.startsWith(href)
|
||||
}
|
||||
|
||||
export function searchHrefFor(role: string): string | null {
|
||||
if (role === 'hse' || role === 'admin') return '/hse/incidents'
|
||||
if (role === 'ssa') return '/ssa/incidents'
|
||||
return null
|
||||
}
|
||||
@@ -1,202 +0,0 @@
|
||||
'use client'
|
||||
|
||||
import Link from 'next/link'
|
||||
import { usePathname, useRouter } from 'next/navigation'
|
||||
import {
|
||||
AlignLeft,
|
||||
CircleCheck,
|
||||
ClipboardList,
|
||||
LayoutDashboard,
|
||||
LogOut,
|
||||
Plus,
|
||||
Settings,
|
||||
User,
|
||||
Users,
|
||||
} from 'lucide-react'
|
||||
import { NotificationBell } from '@/components/notifications/bell'
|
||||
|
||||
interface NavItem {
|
||||
label: string
|
||||
href: string
|
||||
icon: React.ReactNode
|
||||
}
|
||||
|
||||
interface SidebarProps {
|
||||
role: string
|
||||
userName: string
|
||||
userEmail: string
|
||||
}
|
||||
|
||||
const IconGrid = () => <AlignLeft size={20} aria-hidden />
|
||||
const IconList = () => <ClipboardList size={20} aria-hidden />
|
||||
const IconCheck = () => <CircleCheck size={20} aria-hidden />
|
||||
const IconChart = () => <LayoutDashboard size={20} aria-hidden />
|
||||
const IconSettings = () => <Settings size={20} aria-hidden />
|
||||
const IconUsers = () => <Users size={20} aria-hidden />
|
||||
const IconPlus = () => <Plus size={20} aria-hidden />
|
||||
const IconLogout = () => <LogOut size={16} aria-hidden />
|
||||
const IconUser = () => <User size={16} aria-hidden />
|
||||
|
||||
const NAV_ITEMS: Record<string, NavItem[]> = {
|
||||
reporter: [
|
||||
{ label: 'My Reports', href: '/reporter', icon: <IconList /> },
|
||||
{ label: 'New Incident', href: '/report', icon: <IconPlus /> },
|
||||
],
|
||||
supervisor: [
|
||||
{ label: 'Overview', href: '/supervisor', icon: <IconGrid /> },
|
||||
{ label: 'Incidents', href: '/supervisor/incidents', icon: <IconList /> },
|
||||
],
|
||||
hse: [
|
||||
{ label: 'Dashboard', href: '/hse/dashboard', icon: <IconChart /> },
|
||||
{ label: 'Incidents', href: '/hse/incidents', icon: <IconList /> },
|
||||
{ label: 'CAPA', href: '/hse/capa', icon: <IconCheck /> },
|
||||
{ label: 'Settings', href: '/hse/settings', icon: <IconSettings /> },
|
||||
],
|
||||
management: [
|
||||
{ label: 'Dashboard', href: '/management', icon: <IconChart /> },
|
||||
],
|
||||
capa_owner: [
|
||||
{ label: 'My CAPAs', href: '/capa-owner', icon: <IconCheck /> },
|
||||
],
|
||||
admin: [
|
||||
{ label: 'Admin', href: '/admin', icon: <IconUsers /> },
|
||||
{ label: 'Dashboard', href: '/hse/dashboard', icon: <IconChart /> },
|
||||
{ label: 'Incidents', href: '/hse/incidents', icon: <IconList /> },
|
||||
{ label: 'CAPA', href: '/hse/capa', icon: <IconCheck /> },
|
||||
{ label: 'Management', href: '/management', icon: <IconGrid /> },
|
||||
{ label: 'Settings', href: '/hse/settings', icon: <IconSettings /> },
|
||||
],
|
||||
}
|
||||
|
||||
const EXACT_ROOTS = ['/reporter', '/supervisor', '/management', '/capa-owner', '/admin', '/report', '/account']
|
||||
|
||||
function isActivePath(href: string, pathname: string): boolean {
|
||||
return EXACT_ROOTS.includes(href) ? pathname === href : pathname.startsWith(href)
|
||||
}
|
||||
|
||||
function initials(name: string): string {
|
||||
return name
|
||||
.split(' ')
|
||||
.map(w => w[0] ?? '')
|
||||
.join('')
|
||||
.toUpperCase()
|
||||
.slice(0, 2)
|
||||
}
|
||||
|
||||
function useNavItems(role: string): NavItem[] {
|
||||
return NAV_ITEMS[role] ?? NAV_ITEMS.reporter
|
||||
}
|
||||
|
||||
const LINK_BASE = 'flex items-center gap-3 px-3 py-2 text-sm border-l-2 transition-colors'
|
||||
const LINK_ACTIVE = 'border-accent text-accent-700 font-extrabold bg-accent-100/50'
|
||||
const LINK_IDLE = 'border-transparent text-ink/70 font-medium hover:bg-ink/7 hover:text-ink'
|
||||
|
||||
function NavLink({ item, pathname }: { item: NavItem; pathname: string }) {
|
||||
const active = isActivePath(item.href, pathname)
|
||||
return (
|
||||
<Link
|
||||
href={item.href}
|
||||
aria-current={active ? 'page' : undefined}
|
||||
className={`${LINK_BASE} ${active ? LINK_ACTIVE : LINK_IDLE}`}
|
||||
>
|
||||
<span className={active ? 'text-accent-700' : 'text-ink/50'}>{item.icon}</span>
|
||||
{item.label}
|
||||
</Link>
|
||||
)
|
||||
}
|
||||
|
||||
export function Sidebar({ role, userName, userEmail }: SidebarProps) {
|
||||
const pathname = usePathname()
|
||||
const router = useRouter()
|
||||
const items = useNavItems(role)
|
||||
const mobileItems = items.slice(0, 4)
|
||||
|
||||
const logout = async () => {
|
||||
await fetch('/api/auth/logout', { method: 'POST' })
|
||||
router.push('/login')
|
||||
router.refresh()
|
||||
}
|
||||
|
||||
const displayName = userName || userEmail || 'User'
|
||||
const roleLabel = role.replace(/_/g, ' ').replace(/\b\w/g, c => c.toUpperCase())
|
||||
const accountActive = pathname === '/account'
|
||||
|
||||
return (
|
||||
<>
|
||||
{/* Desktop sidebar */}
|
||||
<aside className="hidden sm:flex fixed left-0 top-0 h-full w-60 bg-ground border-r-2 border-divider flex-col z-40">
|
||||
<div className="flex items-center justify-between px-4 py-4 border-b-2 border-divider">
|
||||
<span className="text-lg font-extrabold tracking-tight text-ink">IMS</span>
|
||||
<NotificationBell />
|
||||
</div>
|
||||
|
||||
<nav className="flex-1 overflow-y-auto py-3">
|
||||
{items.map(item => (
|
||||
<NavLink key={item.href} item={item} pathname={pathname} />
|
||||
))}
|
||||
</nav>
|
||||
|
||||
<div className="border-t-2 border-divider py-3">
|
||||
<div className="flex items-center gap-2 px-4 py-2 mb-1">
|
||||
<div className="w-8 h-8 rounded-full bg-accent flex items-center justify-center text-ground text-xs font-extrabold flex-shrink-0">
|
||||
{initials(displayName)}
|
||||
</div>
|
||||
<div className="min-w-0">
|
||||
<p className="text-sm font-extrabold text-ink truncate">{displayName}</p>
|
||||
<p className="text-xs text-ink/60 truncate">{roleLabel}</p>
|
||||
</div>
|
||||
</div>
|
||||
<Link
|
||||
href="/account"
|
||||
aria-current={accountActive ? 'page' : undefined}
|
||||
className={`${LINK_BASE} ${accountActive ? LINK_ACTIVE : LINK_IDLE}`}
|
||||
>
|
||||
<span className={accountActive ? 'text-accent-700' : 'text-ink/50'}>
|
||||
<IconUser />
|
||||
</span>
|
||||
Account
|
||||
</Link>
|
||||
<button
|
||||
onClick={logout}
|
||||
className={`${LINK_BASE} ${LINK_IDLE} w-full text-left cursor-pointer`}
|
||||
>
|
||||
<span className="text-ink/50"><IconLogout /></span>
|
||||
Logout
|
||||
</button>
|
||||
<div className="mt-3 pt-3 border-t border-divider px-4">
|
||||
<p className="text-xs text-ink/50">v1.2.2</p>
|
||||
</div>
|
||||
</div>
|
||||
</aside>
|
||||
|
||||
{/* Mobile bottom tab bar */}
|
||||
<nav className="sm:hidden fixed bottom-0 left-0 right-0 bg-ground border-t-2 border-divider flex z-40 safe-area-pb">
|
||||
{mobileItems.map(item => {
|
||||
const active = isActivePath(item.href, pathname)
|
||||
return (
|
||||
<Link
|
||||
key={item.href}
|
||||
href={item.href}
|
||||
aria-current={active ? 'page' : undefined}
|
||||
className={`flex-1 flex flex-col items-center gap-1 py-2 text-[10px] font-extrabold transition-colors ${
|
||||
active ? 'text-accent-700' : 'text-ink/55'
|
||||
}`}
|
||||
>
|
||||
{item.icon}
|
||||
<span className="leading-none">{item.label}</span>
|
||||
</Link>
|
||||
)
|
||||
})}
|
||||
{items.length <= 4 && (
|
||||
<button
|
||||
onClick={logout}
|
||||
className="flex-1 flex flex-col items-center gap-1 py-2 text-[10px] font-extrabold text-ink/55 cursor-pointer"
|
||||
>
|
||||
<IconLogout />
|
||||
<span className="leading-none">Logout</span>
|
||||
</button>
|
||||
)}
|
||||
</nav>
|
||||
</>
|
||||
)
|
||||
}
|
||||
@@ -1,8 +1,10 @@
|
||||
'use client'
|
||||
|
||||
import { useCallback, useEffect, useRef, useState } from 'react'
|
||||
import { useCallback, useEffect, useState } from 'react'
|
||||
import Link from 'next/link'
|
||||
import { Bell } from 'lucide-react'
|
||||
import { Drawer } from '@/components/ui/drawer'
|
||||
import { cx } from '@/components/ui/cx'
|
||||
|
||||
type Notification = {
|
||||
id: string
|
||||
@@ -14,11 +16,15 @@ type Notification = {
|
||||
|
||||
const POLL_MS = 60_000
|
||||
|
||||
function isToday(iso: string): boolean {
|
||||
return new Date(iso).toDateString() === new Date().toDateString()
|
||||
}
|
||||
|
||||
export function NotificationBell() {
|
||||
const [notifications, setNotifications] = useState<Notification[]>([])
|
||||
const [unread, setUnread] = useState(0)
|
||||
const [open, setOpen] = useState(false)
|
||||
const panelRef = useRef<HTMLDivElement>(null)
|
||||
const [tab, setTab] = useState<'all' | 'unread'>('all')
|
||||
|
||||
const load = useCallback(() => {
|
||||
fetch('/api/notifications')
|
||||
@@ -36,15 +42,6 @@ export function NotificationBell() {
|
||||
return () => clearInterval(id)
|
||||
}, [load])
|
||||
|
||||
useEffect(() => {
|
||||
if (!open) return
|
||||
const onClick = (e: MouseEvent) => {
|
||||
if (panelRef.current && !panelRef.current.contains(e.target as Node)) setOpen(false)
|
||||
}
|
||||
document.addEventListener('mousedown', onClick)
|
||||
return () => document.removeEventListener('mousedown', onClick)
|
||||
}, [open])
|
||||
|
||||
const markAllRead = () => {
|
||||
fetch('/api/notifications', {
|
||||
method: 'POST',
|
||||
@@ -58,62 +55,94 @@ export function NotificationBell() {
|
||||
.catch(() => {})
|
||||
}
|
||||
|
||||
const shown = tab === 'unread' ? notifications.filter(n => !n.read_at) : notifications
|
||||
const groups: Array<{ label: string; items: Notification[] }> = [
|
||||
{ label: 'Today', items: shown.filter(n => isToday(n.sent_at)) },
|
||||
{ label: 'Earlier', items: shown.filter(n => !isToday(n.sent_at)) },
|
||||
].filter(g => g.items.length > 0)
|
||||
|
||||
return (
|
||||
<div ref={panelRef} className="fixed top-3 right-3 z-50">
|
||||
<>
|
||||
<button
|
||||
onClick={() => setOpen(o => !o)}
|
||||
type="button"
|
||||
onClick={() => setOpen(true)}
|
||||
aria-label={`Notifications${unread > 0 ? ` (${unread} unread)` : ''}`}
|
||||
className="relative bg-surface border border-divider w-10 h-10 flex items-center justify-center text-ink cursor-pointer transition-colors hover:bg-ink/7 active:bg-ink/15"
|
||||
className="relative inline-grid place-items-center w-8 h-8 rounded-md text-neutral-300 hover:bg-ink-2 cursor-pointer"
|
||||
>
|
||||
<Bell size={18} strokeWidth={2} aria-hidden />
|
||||
<Bell size={16} strokeWidth={2} aria-hidden />
|
||||
{unread > 0 && (
|
||||
<span className="absolute -top-1 -right-1 bg-accent text-ground text-[10px] font-extrabold min-w-[18px] h-[18px] px-1 flex items-center justify-center">
|
||||
<span className="absolute -top-0.5 -right-0.5 min-w-[16px] h-4 px-1 rounded-full bg-accent text-white text-[10px] font-semibold grid place-items-center">
|
||||
{unread > 99 ? '99+' : unread}
|
||||
</span>
|
||||
)}
|
||||
</button>
|
||||
|
||||
{open && (
|
||||
<div className="absolute right-0 mt-2 w-80 max-h-96 overflow-y-auto bg-surface shadow-lg border border-divider">
|
||||
<div className="flex items-center justify-between px-4 py-2 border-b-2 border-divider">
|
||||
<span className="text-sm font-extrabold text-ink">Notifications</span>
|
||||
{unread > 0 && (
|
||||
<button onClick={markAllRead} className="text-xs text-accent-700 hover:underline">
|
||||
<Drawer
|
||||
open={open}
|
||||
onClose={() => setOpen(false)}
|
||||
title="Notifications"
|
||||
actions={
|
||||
unread > 0 ? (
|
||||
<button
|
||||
type="button"
|
||||
onClick={markAllRead}
|
||||
className="px-2 text-[12.5px] font-[550] text-accent hover:underline cursor-pointer"
|
||||
>
|
||||
Mark all read
|
||||
</button>
|
||||
) : undefined
|
||||
}
|
||||
>
|
||||
<div className="flex gap-0.5 px-3 pb-2 border-b border-rule">
|
||||
{(['all', 'unread'] as const).map(t => (
|
||||
<button
|
||||
key={t}
|
||||
type="button"
|
||||
onClick={() => setTab(t)}
|
||||
className={cx(
|
||||
'inline-flex items-center gap-1.5 h-7 px-2.5 rounded-md text-[13px] cursor-pointer',
|
||||
tab === t ? 'bg-rule-2 font-semibold' : 'font-medium text-ink-3 hover:bg-surface-2',
|
||||
)}
|
||||
>
|
||||
{t === 'all' ? 'All' : 'Unread'}
|
||||
<span className="text-xs font-medium text-faint">{t === 'all' ? notifications.length : unread}</span>
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
{notifications.length === 0 ? (
|
||||
<p className="px-4 py-6 text-sm text-gray-400 text-center">No notifications</p>
|
||||
|
||||
{groups.length === 0 ? (
|
||||
<p className="px-4 py-10 text-sm text-faint text-center">No notifications</p>
|
||||
) : (
|
||||
groups.map(g => (
|
||||
<section key={g.label}>
|
||||
<h3 className="px-4 pt-3 pb-1 text-[11.5px] font-semibold tracking-wide uppercase text-faint">{g.label}</h3>
|
||||
<ul>
|
||||
{notifications.map(n => {
|
||||
const inner = (
|
||||
{g.items.map(n => {
|
||||
const body = (
|
||||
<>
|
||||
<p className={`text-sm ${n.read_at ? 'text-gray-500' : 'text-gray-900 font-medium'}`}>
|
||||
<p className={cx('text-[13px]', n.read_at ? 'text-muted' : 'text-ink font-medium')}>
|
||||
{n.title ?? 'Notification'}
|
||||
</p>
|
||||
<p className="text-xs text-gray-400 mt-0.5">
|
||||
{new Date(n.sent_at).toLocaleString()}
|
||||
</p>
|
||||
<p className="text-xs text-faint mt-0.5">{new Date(n.sent_at).toLocaleString()}</p>
|
||||
</>
|
||||
)
|
||||
return (
|
||||
<li key={n.id} className="border-b border-gray-50 last:border-0">
|
||||
<li key={n.id} className={cx('border-b border-rule', !n.read_at && 'bg-accent-tint')}>
|
||||
{n.link ? (
|
||||
<Link href={n.link} className="block px-4 py-3 hover:bg-gray-50" onClick={() => setOpen(false)}>
|
||||
{inner}
|
||||
<Link href={n.link} className="block px-4 py-3" onClick={() => setOpen(false)}>
|
||||
{body}
|
||||
</Link>
|
||||
) : (
|
||||
<div className="px-4 py-3">{inner}</div>
|
||||
<div className="px-4 py-3">{body}</div>
|
||||
)}
|
||||
</li>
|
||||
)
|
||||
})}
|
||||
</ul>
|
||||
</section>
|
||||
))
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</Drawer>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -49,8 +49,8 @@ export function ApiKeyForm({ settings }: Props) {
|
||||
<label className="text-sm font-semibold text-gray-800">{KEY_LABELS[key]}</label>
|
||||
<span className={`text-xs font-medium px-2 py-0.5 ${
|
||||
status?.set
|
||||
? 'bg-neutral-100 text-ink'
|
||||
: 'bg-accent-100 text-accent-700'
|
||||
? 'bg-st-green-bg text-st-green-fg'
|
||||
: 'bg-st-amber-bg text-st-amber-fg'
|
||||
}`}>
|
||||
{status?.set ? 'Configured' : 'Not set'}
|
||||
</span>
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
export function initials(name: string): string {
|
||||
return name
|
||||
.split(' ')
|
||||
.map(w => w[0] ?? '')
|
||||
.join('')
|
||||
.toUpperCase()
|
||||
.slice(0, 2)
|
||||
}
|
||||
|
||||
export function Avatar({ name }: { name: string }) {
|
||||
return (
|
||||
<span className="inline-grid place-items-center w-6 h-6 rounded-[6px] bg-accent-200 text-accent-700 text-[11px] font-[650]">
|
||||
{initials(name)}
|
||||
</span>
|
||||
)
|
||||
}
|
||||
@@ -1,25 +1,36 @@
|
||||
import type { ButtonHTMLAttributes } from 'react'
|
||||
import { cx } from './cx'
|
||||
|
||||
type Variant = 'primary' | 'secondary' | 'ghost' | 'icon'
|
||||
type Variant = 'primary' | 'secondary' | 'icon'
|
||||
|
||||
const BASE =
|
||||
'inline-flex items-center gap-1.5 text-left font-extrabold text-sm leading-tight ' +
|
||||
'border border-transparent cursor-pointer transition-colors ' +
|
||||
'inline-flex items-center justify-center gap-1.5 whitespace-nowrap transition-colors cursor-pointer ' +
|
||||
'disabled:opacity-45 disabled:cursor-not-allowed'
|
||||
|
||||
const VARIANTS: Record<Variant, string> = {
|
||||
primary: 'justify-start bg-accent text-ground px-3.5 py-2 hover:bg-accent-600 active:bg-accent-700',
|
||||
secondary: 'justify-start border-divider text-ink px-3.5 py-2 hover:bg-ink/7 active:bg-ink/15',
|
||||
ghost: 'justify-start text-accent-700 px-1 py-2 hover:bg-accent/10 active:bg-accent/20',
|
||||
icon: 'justify-center w-9 h-9 p-0 text-ink hover:bg-ink/7 active:bg-ink/15',
|
||||
primary: 'h-8 px-3 rounded-md bg-ink-2 text-white text-[13px] font-semibold shadow-primary hover:bg-ink active:bg-black',
|
||||
secondary: 'h-8 px-3 rounded-md bg-surface text-ink text-[13px] font-medium shadow-secondary hover:bg-surface-2 active:bg-rule',
|
||||
icon: 'w-7 h-7 rounded-md text-ink-3 hover:bg-rule',
|
||||
}
|
||||
|
||||
type Props = ButtonHTMLAttributes<HTMLButtonElement> & {
|
||||
variant?: Variant
|
||||
block?: boolean
|
||||
mobile?: boolean
|
||||
}
|
||||
|
||||
export function Button({ variant = 'primary', block = false, className, type = 'button', ...rest }: Props) {
|
||||
return <button type={type} className={cx(BASE, VARIANTS[variant], block && 'w-full', className)} {...rest} />
|
||||
export function buttonClass(
|
||||
variant: Variant = 'primary',
|
||||
opts: { block?: boolean; mobile?: boolean } = {},
|
||||
): string {
|
||||
return cx(
|
||||
BASE,
|
||||
VARIANTS[variant],
|
||||
opts.mobile && variant !== 'icon' && 'h-12 rounded-xl text-sm',
|
||||
opts.block && 'w-full',
|
||||
)
|
||||
}
|
||||
|
||||
export function Button({ variant = 'primary', block = false, mobile = false, className, type = 'button', ...rest }: Props) {
|
||||
return <button type={type} className={cx(buttonClass(variant, { block, mobile }), className)} {...rest} />
|
||||
}
|
||||
|
||||
@@ -12,11 +12,11 @@ export function Card({
|
||||
children?: ReactNode
|
||||
}) {
|
||||
return (
|
||||
<div className="flex flex-col gap-2 p-3 bg-surface">
|
||||
{kicker && <span className="text-[10px] tracking-[0.1em] uppercase text-accent-700">{kicker}</span>}
|
||||
{title && <h3 className="text-[17px] leading-tight font-extrabold">{title}</h3>}
|
||||
{children && <div className="flex-1 text-[13px] opacity-80">{children}</div>}
|
||||
{meta && <div className="flex items-center gap-1.5 text-[11px] text-ink/50">{meta}</div>}
|
||||
<div className="flex flex-col gap-2 p-4 bg-surface rounded-xl shadow-card">
|
||||
{kicker && <span className="text-[11px] font-semibold tracking-wide uppercase text-muted">{kicker}</span>}
|
||||
{title && <h3 className="text-base font-[650]">{title}</h3>}
|
||||
{children && <div className="flex-1 text-[13px] text-ink-3">{children}</div>}
|
||||
{meta && <div className="flex items-center gap-1.5 text-xs text-faint">{meta}</div>}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
import { Check, Minus } from 'lucide-react'
|
||||
import { cx } from './cx'
|
||||
|
||||
export function Checkbox({
|
||||
checked,
|
||||
indeterminate = false,
|
||||
onChange,
|
||||
label,
|
||||
}: {
|
||||
checked: boolean
|
||||
indeterminate?: boolean
|
||||
onChange: (next: boolean) => void
|
||||
label: string
|
||||
}) {
|
||||
const on = checked || indeterminate
|
||||
return (
|
||||
<button
|
||||
type="button"
|
||||
role="checkbox"
|
||||
aria-checked={indeterminate ? 'mixed' : checked}
|
||||
aria-label={label}
|
||||
onClick={e => {
|
||||
e.stopPropagation()
|
||||
onChange(!checked)
|
||||
}}
|
||||
className={cx(
|
||||
'inline-grid place-items-center w-4 h-4 rounded-[5px] cursor-pointer',
|
||||
on ? 'bg-accent text-white' : 'bg-surface shadow-[inset_0_0_0_1.5px_var(--color-faint)]',
|
||||
)}
|
||||
>
|
||||
{indeterminate ? <Minus size={12} strokeWidth={3} aria-hidden /> : checked ? <Check size={12} strokeWidth={3} aria-hidden /> : null}
|
||||
</button>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
'use client'
|
||||
|
||||
import { useEffect } from 'react'
|
||||
import { X } from 'lucide-react'
|
||||
import { Button } from './button'
|
||||
|
||||
export function Drawer({
|
||||
open,
|
||||
onClose,
|
||||
title,
|
||||
actions,
|
||||
children,
|
||||
}: {
|
||||
open: boolean
|
||||
onClose: () => void
|
||||
title: string
|
||||
actions?: React.ReactNode
|
||||
children: React.ReactNode
|
||||
}) {
|
||||
useEffect(() => {
|
||||
if (!open) return
|
||||
const onKey = (e: KeyboardEvent) => { if (e.key === 'Escape') onClose() }
|
||||
document.addEventListener('keydown', onKey)
|
||||
return () => document.removeEventListener('keydown', onKey)
|
||||
}, [open, onClose])
|
||||
|
||||
if (!open) return null
|
||||
|
||||
return (
|
||||
<div className="fixed inset-0 z-50">
|
||||
<div className="absolute inset-0 bg-black/30" onClick={onClose} aria-hidden />
|
||||
<aside
|
||||
role="dialog"
|
||||
aria-modal="true"
|
||||
aria-label={title}
|
||||
className="absolute top-2 right-2 bottom-2 w-[420px] max-w-[calc(100vw-16px)] flex flex-col overflow-hidden rounded-2xl bg-surface shadow-drawer"
|
||||
>
|
||||
<div className="flex items-center justify-between px-4 pt-3.5 pb-2.5">
|
||||
<h2 className="text-base font-[650]">{title}</h2>
|
||||
<div className="flex items-center gap-1">
|
||||
{actions}
|
||||
<Button variant="icon" aria-label="Close" onClick={onClose}>
|
||||
<X size={16} strokeWidth={2} aria-hidden />
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex-1 overflow-y-auto">{children}</div>
|
||||
</aside>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -2,14 +2,13 @@ import type { InputHTMLAttributes, ReactNode, SelectHTMLAttributes, TextareaHTML
|
||||
import { cx } from './cx'
|
||||
|
||||
export const INPUT_CLASS =
|
||||
'w-full min-h-9 px-2.5 py-1.5 text-sm text-ink caret-accent bg-surface border border-divider ' +
|
||||
'hover:border-ink/45 focus-visible:border-accent focus-visible:outline-offset-0 ' +
|
||||
'disabled:opacity-45 disabled:cursor-not-allowed'
|
||||
'w-full h-9 px-3 rounded-md bg-surface text-[13px] text-ink caret-accent shadow-input ' +
|
||||
'placeholder:text-faint disabled:opacity-45 disabled:cursor-not-allowed'
|
||||
|
||||
export function Field({ label, htmlFor, children }: { label: string; htmlFor: string; children: ReactNode }) {
|
||||
return (
|
||||
<div>
|
||||
<label htmlFor={htmlFor} className="block text-xs mb-[5px] text-ink/70">
|
||||
<label htmlFor={htmlFor} className="block text-xs text-muted mb-[5px]">
|
||||
{label}
|
||||
</label>
|
||||
{children}
|
||||
@@ -22,7 +21,7 @@ export function Input({ className, ...rest }: InputHTMLAttributes<HTMLInputEleme
|
||||
}
|
||||
|
||||
export function Textarea({ className, ...rest }: TextareaHTMLAttributes<HTMLTextAreaElement>) {
|
||||
return <textarea className={cx(INPUT_CLASS, 'min-h-[90px] resize-y', className)} {...rest} />
|
||||
return <textarea className={cx(INPUT_CLASS, 'h-auto min-h-[90px] py-2 resize-y', className)} {...rest} />
|
||||
}
|
||||
|
||||
export function Select({ className, ...rest }: SelectHTMLAttributes<HTMLSelectElement>) {
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
import { ChevronDown, X } from 'lucide-react'
|
||||
import { cx } from './cx'
|
||||
|
||||
export function FilterChip({
|
||||
label,
|
||||
value,
|
||||
options,
|
||||
onChange,
|
||||
}: {
|
||||
label: string
|
||||
value: string
|
||||
options: Array<{ value: string; label: string }>
|
||||
onChange: (value: string) => void
|
||||
}) {
|
||||
const selected = options.find(o => o.value === value)
|
||||
const set = Boolean(value && selected)
|
||||
return (
|
||||
<label
|
||||
className={cx(
|
||||
'relative inline-flex items-center gap-1 h-7 px-2.5 rounded-md text-[12.5px] whitespace-nowrap cursor-pointer',
|
||||
set ? 'bg-accent-tint-2 text-accent-700 shadow-chip-set' : 'bg-surface text-ink-2 shadow-chip',
|
||||
)}
|
||||
>
|
||||
<span>{set ? `${label}: ${selected!.label}` : label}</span>
|
||||
{!set && <ChevronDown size={12} strokeWidth={2.5} aria-hidden />}
|
||||
<select
|
||||
aria-label={label}
|
||||
value={value}
|
||||
onChange={e => onChange(e.target.value)}
|
||||
className="absolute inset-0 w-full h-full opacity-0 cursor-pointer"
|
||||
>
|
||||
<option value="">{label}</option>
|
||||
{options.map(o => (
|
||||
<option key={o.value} value={o.value}>{o.label}</option>
|
||||
))}
|
||||
</select>
|
||||
{set && (
|
||||
<button
|
||||
type="button"
|
||||
aria-label={`Clear ${label}`}
|
||||
onClick={() => onChange('')}
|
||||
className="relative z-10 inline-grid place-items-center w-4 h-4 cursor-pointer"
|
||||
>
|
||||
<X size={12} strokeWidth={2.5} aria-hidden />
|
||||
</button>
|
||||
)}
|
||||
</label>
|
||||
)
|
||||
}
|
||||
+10
-13
@@ -2,6 +2,7 @@
|
||||
|
||||
import { useEffect } from 'react'
|
||||
import { X } from 'lucide-react'
|
||||
import { Button } from './button'
|
||||
|
||||
interface ModalProps {
|
||||
open: boolean
|
||||
@@ -26,21 +27,17 @@ export function Modal({ open, onClose, title, children, footer, width = 'md' }:
|
||||
|
||||
return (
|
||||
<div className="fixed inset-0 z-50 flex items-center justify-center p-4" role="dialog" aria-modal="true">
|
||||
<div className="absolute inset-0 bg-neutral-900/50" onClick={onClose} />
|
||||
<div className={`relative w-full ${maxW} bg-surface shadow-lg`}>
|
||||
<div className="flex items-center justify-between px-6 py-4 border-b-2 border-divider">
|
||||
<h2 className="text-xl font-extrabold text-ink">{title}</h2>
|
||||
<button
|
||||
onClick={onClose}
|
||||
aria-label="Close"
|
||||
className="inline-flex w-9 h-9 items-center justify-center text-ink cursor-pointer transition-colors hover:bg-ink/7 active:bg-ink/15"
|
||||
>
|
||||
<X size={18} strokeWidth={2} aria-hidden />
|
||||
</button>
|
||||
<div className="absolute inset-0 bg-black/30" onClick={onClose} />
|
||||
<div className={`relative w-full ${maxW} bg-surface rounded-xl shadow-float`}>
|
||||
<div className="flex items-center justify-between px-5 py-3.5 border-b border-rule">
|
||||
<h2 className="text-base font-[650]">{title}</h2>
|
||||
<Button variant="icon" aria-label="Close" onClick={onClose}>
|
||||
<X size={16} strokeWidth={2} aria-hidden />
|
||||
</Button>
|
||||
</div>
|
||||
<div className="px-6 py-5">{children}</div>
|
||||
<div className="px-5 py-4">{children}</div>
|
||||
{footer && (
|
||||
<div className="px-6 py-4 border-t border-divider flex justify-end gap-2">
|
||||
<div className="px-5 py-3.5 border-t border-rule flex justify-end gap-2">
|
||||
{footer}
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
import type { ReactNode } from 'react'
|
||||
import { cx } from './cx'
|
||||
|
||||
export function Segmented({
|
||||
value,
|
||||
onChange,
|
||||
options,
|
||||
}: {
|
||||
value: string
|
||||
onChange: (v: string) => void
|
||||
options: Array<{ value: string; label: ReactNode }>
|
||||
}) {
|
||||
return (
|
||||
<div className="inline-flex p-0.5 rounded-[10px] bg-rule-2">
|
||||
{options.map(o => (
|
||||
<button
|
||||
key={o.value}
|
||||
type="button"
|
||||
aria-pressed={o.value === value}
|
||||
onClick={() => onChange(o.value)}
|
||||
className={cx(
|
||||
'inline-flex items-center gap-1.5 px-2.5 py-[5px] rounded-md text-[13px] cursor-pointer whitespace-nowrap',
|
||||
o.value === value ? 'bg-surface font-semibold shadow-sm' : 'text-ink-3',
|
||||
)}
|
||||
>
|
||||
{o.label}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -1,72 +1,60 @@
|
||||
import type { ReactNode } from 'react'
|
||||
import {
|
||||
AlarmClock,
|
||||
BadgeCheck,
|
||||
Circle,
|
||||
CircleAlert,
|
||||
CircleCheck,
|
||||
ClipboardList,
|
||||
ListChecks,
|
||||
Loader,
|
||||
RotateCcw,
|
||||
Search,
|
||||
type LucideIcon,
|
||||
} from 'lucide-react'
|
||||
import { Tag, type TagVariant } from './tag'
|
||||
import { cx } from './cx'
|
||||
|
||||
const TONES: Record<string, TagVariant> = {
|
||||
reported: 'accent',
|
||||
triaged: 'outline',
|
||||
investigating: 'outline',
|
||||
capa_pending: 'outline',
|
||||
verification: 'outline',
|
||||
closed: 'neutral',
|
||||
open: 'accent',
|
||||
in_progress: 'outline',
|
||||
overdue: 'accent',
|
||||
pending_verification: 'outline',
|
||||
verified: 'neutral',
|
||||
reopened: 'accent',
|
||||
export type StatusHue = 'amber' | 'blue' | 'violet' | 'orange' | 'indigo' | 'green' | 'grey' | 'red'
|
||||
|
||||
const HUES: Record<string, StatusHue> = {
|
||||
reported: 'amber', triaged: 'blue', investigating: 'violet', capa_pending: 'orange',
|
||||
verification: 'indigo', closed: 'green',
|
||||
open: 'grey', in_progress: 'blue', overdue: 'red', pending_verification: 'indigo',
|
||||
verified: 'green', reopened: 'red',
|
||||
critical: 'red', high: 'orange', med: 'amber', medium: 'amber', low: 'grey', active: 'green',
|
||||
}
|
||||
|
||||
const ICONS: Record<string, LucideIcon> = {
|
||||
reported: CircleAlert,
|
||||
triaged: ListChecks,
|
||||
investigating: Search,
|
||||
capa_pending: ClipboardList,
|
||||
verification: BadgeCheck,
|
||||
closed: CircleCheck,
|
||||
open: Circle,
|
||||
in_progress: Loader,
|
||||
overdue: AlarmClock,
|
||||
pending_verification: BadgeCheck,
|
||||
verified: CircleCheck,
|
||||
reopened: RotateCcw,
|
||||
const LABELS: Record<string, string> = {
|
||||
capa_pending: 'CAPA pending', pending_verification: 'Verification', in_progress: 'In progress', med: 'Medium',
|
||||
}
|
||||
|
||||
export function statusTone(status: string): TagVariant {
|
||||
return TONES[status] ?? 'neutral'
|
||||
// Full literal class strings so Tailwind can see them.
|
||||
const HUE_CLASS: Record<StatusHue, string> = {
|
||||
amber: 'bg-st-amber-bg text-st-amber-fg',
|
||||
blue: 'bg-st-blue-bg text-st-blue-fg',
|
||||
violet: 'bg-st-violet-bg text-st-violet-fg',
|
||||
orange: 'bg-st-orange-bg text-st-orange-fg',
|
||||
indigo: 'bg-st-indigo-bg text-st-indigo-fg',
|
||||
green: 'bg-st-green-bg text-st-green-fg',
|
||||
grey: 'bg-st-grey-bg text-st-grey-fg',
|
||||
red: 'bg-st-red-bg text-st-red-fg',
|
||||
}
|
||||
|
||||
function humanize(value: string): string {
|
||||
return value
|
||||
.split('_')
|
||||
.map(w => (w === 'capa' ? 'CAPA' : w.charAt(0).toUpperCase() + w.slice(1)))
|
||||
.join(' ')
|
||||
export function statusHue(key: string): StatusHue {
|
||||
return HUES[key] ?? 'grey'
|
||||
}
|
||||
|
||||
export function StatusTag({ status, children }: { status: string; children?: ReactNode }) {
|
||||
const Icon = ICONS[status]
|
||||
function label(key: string): string {
|
||||
if (LABELS[key]) return LABELS[key]
|
||||
const words = key.split('_').join(' ')
|
||||
return words.charAt(0).toUpperCase() + words.slice(1)
|
||||
}
|
||||
|
||||
function Pill({ hue, className, children }: { hue: StatusHue; className?: string; children: ReactNode }) {
|
||||
return (
|
||||
<Tag variant={statusTone(status)}>
|
||||
{Icon && <Icon size={12} strokeWidth={2} aria-hidden />}
|
||||
{children ?? humanize(status)}
|
||||
</Tag>
|
||||
<span
|
||||
className={cx(
|
||||
'inline-flex items-center px-2 py-0.5 rounded-md text-xs font-[550] whitespace-nowrap',
|
||||
HUE_CLASS[hue],
|
||||
className,
|
||||
)}
|
||||
>
|
||||
{children}
|
||||
</span>
|
||||
)
|
||||
}
|
||||
|
||||
const PRIORITY_TONES: Record<string, TagVariant> = { high: 'accent', med: 'outline', low: 'neutral' }
|
||||
export function StatusTag({ status, children }: { status: string; children?: ReactNode }) {
|
||||
return <Pill hue={statusHue(status)}>{children ?? label(status)}</Pill>
|
||||
}
|
||||
|
||||
export function PriorityTag({ priority, children }: { priority: string; children?: ReactNode }) {
|
||||
return <Tag variant={PRIORITY_TONES[priority] ?? 'neutral'}>{children ?? humanize(priority)}</Tag>
|
||||
return <Pill hue={statusHue(priority)}>{children ?? label(priority)}</Pill>
|
||||
}
|
||||
|
||||
@@ -0,0 +1,226 @@
|
||||
'use client'
|
||||
|
||||
import type { ReactNode } from 'react'
|
||||
import { ArrowDown, ArrowUp, ChevronLeft, ChevronRight, ChevronsUpDown, Inbox } from 'lucide-react'
|
||||
import { Checkbox } from './checkbox'
|
||||
import { cx } from './cx'
|
||||
|
||||
export type Column<T> = { key: string; header: string; sortKey?: string; cell: (row: T) => ReactNode }
|
||||
export type Sort = { key: string; dir: 'asc' | 'desc' }
|
||||
export type TableView = { key: string; label: string; count?: number }
|
||||
|
||||
export interface TableCardProps<T> {
|
||||
columns: Column<T>[]
|
||||
rows: T[]
|
||||
rowKey: (row: T) => string
|
||||
onRowOpen?: (row: T) => void
|
||||
rowActions?: (row: T) => ReactNode
|
||||
views?: { items: TableView[]; active: string; onChange: (key: string) => void }
|
||||
toolbar?: ReactNode
|
||||
sort?: Sort
|
||||
onSortChange?: (sortKey: string) => void
|
||||
selection?: { selected: Set<string>; onChange: (next: Set<string>) => void }
|
||||
bulkActions?: ReactNode
|
||||
footer?: { from: number; to: number; total: number; page: number; pageCount: number; onPage: (page: number) => void }
|
||||
empty?: { title: string; action?: ReactNode }
|
||||
mobileRow?: (row: T) => ReactNode
|
||||
}
|
||||
|
||||
const TH = 'px-3 py-[9px] text-xs font-[550] text-muted text-left bg-surface-2 border-b border-rule-2 whitespace-nowrap'
|
||||
const TD = 'px-3 py-3 text-[13px] border-b border-rule'
|
||||
|
||||
export function TableCard<T>({
|
||||
columns, rows, rowKey, onRowOpen, rowActions, views, toolbar, sort, onSortChange,
|
||||
selection, bulkActions, footer, empty, mobileRow,
|
||||
}: TableCardProps<T>) {
|
||||
const selectedOnPage = selection ? rows.filter(r => selection.selected.has(rowKey(r))).length : 0
|
||||
const allSelected = rows.length > 0 && selectedOnPage === rows.length
|
||||
|
||||
const setAll = (next: boolean) => {
|
||||
if (!selection) return
|
||||
const s = new Set(selection.selected)
|
||||
rows.forEach(r => (next ? s.add(rowKey(r)) : s.delete(rowKey(r))))
|
||||
selection.onChange(s)
|
||||
}
|
||||
const setOne = (id: string, next: boolean) => {
|
||||
if (!selection) return
|
||||
const s = new Set(selection.selected)
|
||||
if (next) s.add(id)
|
||||
else s.delete(id)
|
||||
selection.onChange(s)
|
||||
}
|
||||
|
||||
const open = (row: T) => onRowOpen?.(row)
|
||||
const isEmpty = rows.length === 0 && empty
|
||||
|
||||
return (
|
||||
<div className="relative bg-surface rounded-xl shadow-card overflow-hidden">
|
||||
{views && (
|
||||
<div className="flex items-center gap-0.5 p-2 border-b border-rule">
|
||||
{views.items.map(v => (
|
||||
<button
|
||||
key={v.key}
|
||||
type="button"
|
||||
onClick={() => views.onChange(v.key)}
|
||||
className={cx(
|
||||
'inline-flex items-center gap-1.5 h-7 px-2.5 rounded-md text-[13px] cursor-pointer',
|
||||
v.key === views.active ? 'bg-rule-2 font-semibold text-ink' : 'font-medium text-ink-3 hover:bg-surface-2',
|
||||
)}
|
||||
>
|
||||
{v.label}
|
||||
{v.count !== undefined && <span className="text-xs font-medium text-faint">{v.count}</span>}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{toolbar && <div className="flex flex-wrap items-center gap-2 px-3 py-2.5 border-b border-rule">{toolbar}</div>}
|
||||
|
||||
{isEmpty ? (
|
||||
<div className="flex flex-col items-center gap-3 px-4 py-14 text-center">
|
||||
<span className="inline-grid place-items-center w-16 h-16 rounded-xl bg-surface-2 text-faint">
|
||||
<Inbox size={28} strokeWidth={1.8} aria-hidden />
|
||||
</span>
|
||||
<p className="text-sm text-ink-3">{empty.title}</p>
|
||||
{empty.action}
|
||||
</div>
|
||||
) : (
|
||||
<>
|
||||
<div className="hidden md:block overflow-x-auto">
|
||||
<table className="w-full border-collapse">
|
||||
<thead>
|
||||
<tr>
|
||||
{selection && (
|
||||
<th className={cx(TH, 'w-7 pl-4')}>
|
||||
<Checkbox
|
||||
checked={allSelected}
|
||||
indeterminate={selectedOnPage > 0 && !allSelected}
|
||||
onChange={setAll}
|
||||
label="Select all rows"
|
||||
/>
|
||||
</th>
|
||||
)}
|
||||
{columns.map(c => {
|
||||
const sorted = sort && c.sortKey && sort.key === c.sortKey ? sort.dir : null
|
||||
return (
|
||||
<th
|
||||
key={c.key}
|
||||
className={TH}
|
||||
aria-sort={sorted ? (sorted === 'asc' ? 'ascending' : 'descending') : undefined}
|
||||
>
|
||||
{c.sortKey && onSortChange ? (
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => onSortChange(c.sortKey!)}
|
||||
className="inline-flex items-center gap-1 cursor-pointer"
|
||||
>
|
||||
{c.header}
|
||||
{sorted === 'asc' ? (
|
||||
<ArrowUp size={12} strokeWidth={2.5} className="text-ink" aria-hidden />
|
||||
) : sorted === 'desc' ? (
|
||||
<ArrowDown size={12} strokeWidth={2.5} className="text-ink" aria-hidden />
|
||||
) : (
|
||||
<ChevronsUpDown size={12} strokeWidth={2} className="text-neutral-400" aria-hidden />
|
||||
)}
|
||||
</button>
|
||||
) : (
|
||||
c.header
|
||||
)}
|
||||
</th>
|
||||
)
|
||||
})}
|
||||
{rowActions && <th className={cx(TH, 'w-24')} />}
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{rows.map(row => {
|
||||
const id = rowKey(row)
|
||||
const selected = Boolean(selection?.selected.has(id))
|
||||
return (
|
||||
<tr
|
||||
key={id}
|
||||
tabIndex={onRowOpen ? 0 : undefined}
|
||||
onClick={() => open(row)}
|
||||
onKeyDown={e => { if (e.key === 'Enter') open(row) }}
|
||||
className={cx(
|
||||
'group',
|
||||
onRowOpen && 'cursor-pointer',
|
||||
selected ? 'bg-accent-tint' : 'bg-surface hover:bg-surface-2',
|
||||
)}
|
||||
>
|
||||
{selection && (
|
||||
<td className={cx(TD, 'pl-4')} onClick={e => e.stopPropagation()}>
|
||||
<Checkbox checked={selected} onChange={next => setOne(id, next)} label="Select row" />
|
||||
</td>
|
||||
)}
|
||||
{columns.map(c => (
|
||||
<td key={c.key} className={TD}>{c.cell(row)}</td>
|
||||
))}
|
||||
{rowActions && (
|
||||
<td className={TD} onClick={e => e.stopPropagation()}>
|
||||
<div className="flex justify-end gap-1 opacity-0 group-hover:opacity-100 focus-within:opacity-100">
|
||||
{rowActions(row)}
|
||||
</div>
|
||||
</td>
|
||||
)}
|
||||
</tr>
|
||||
)
|
||||
})}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
{mobileRow && (
|
||||
<ul className="md:hidden">
|
||||
{rows.map(row => (
|
||||
<li
|
||||
key={rowKey(row)}
|
||||
onClick={() => open(row)}
|
||||
className={cx('px-4 py-3 border-b border-rule', onRowOpen && 'cursor-pointer')}
|
||||
>
|
||||
{mobileRow(row)}
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
|
||||
{footer && (
|
||||
<div className="flex items-center justify-between px-4 py-2.5 bg-surface-2 text-[13px] text-muted">
|
||||
<span>{`Showing ${footer.from}–${footer.to} of ${footer.total}`}</span>
|
||||
<div className="flex">
|
||||
<button
|
||||
type="button"
|
||||
aria-label="Previous page"
|
||||
disabled={footer.page <= 1}
|
||||
onClick={() => footer.onPage(footer.page - 1)}
|
||||
className="inline-flex items-center h-8 px-[7px] rounded-l-md bg-surface text-ink shadow-chip disabled:text-neutral-400 cursor-pointer"
|
||||
>
|
||||
<ChevronLeft size={16} strokeWidth={2} aria-hidden />
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
aria-label="Next page"
|
||||
disabled={footer.page >= footer.pageCount}
|
||||
onClick={() => footer.onPage(footer.page + 1)}
|
||||
className="inline-flex items-center h-8 px-[7px] rounded-r-md bg-surface text-ink shadow-chip -ml-px disabled:text-neutral-400 cursor-pointer"
|
||||
>
|
||||
<ChevronRight size={16} strokeWidth={2} aria-hidden />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{selection && bulkActions && selection.selected.size > 0 && (
|
||||
<div className="sticky bottom-3 flex justify-center px-4 pb-3 pt-5 bg-gradient-to-t from-surface">
|
||||
<div className="flex items-center gap-1.5 py-1.5 pr-1.5 pl-3 rounded-xl bg-surface shadow-float">
|
||||
<span className="text-[13px] font-semibold px-2">{`${selection.selected.size} selected`}</span>
|
||||
<span className="w-px h-5 bg-rule-2" />
|
||||
{bulkActions}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
export const TABLE = 'w-full border-collapse text-sm'
|
||||
export const TH =
|
||||
'text-left text-[11px] uppercase tracking-[0.08em] text-ink/60 px-2 py-2 border-b-2 border-divider'
|
||||
export const TR = 'hover:bg-ink/4'
|
||||
export const TD = 'px-2 py-2 border-b border-divider'
|
||||
@@ -1,24 +0,0 @@
|
||||
import type { ReactNode } from 'react'
|
||||
import { cx } from './cx'
|
||||
|
||||
export type TagVariant = 'accent' | 'neutral' | 'outline'
|
||||
|
||||
const VARIANTS: Record<TagVariant, string> = {
|
||||
accent: 'bg-accent-100 text-accent-800',
|
||||
neutral: 'bg-neutral-100 text-neutral-800',
|
||||
outline: 'border border-accent text-accent-700',
|
||||
}
|
||||
|
||||
export function Tag({ variant, children, className }: { variant: TagVariant; children: ReactNode; className?: string }) {
|
||||
return (
|
||||
<span
|
||||
className={cx(
|
||||
'inline-flex items-center gap-1 text-[11px] font-medium tracking-wide px-2.5 py-[3px] whitespace-nowrap',
|
||||
VARIANTS[variant],
|
||||
className,
|
||||
)}
|
||||
>
|
||||
{children}
|
||||
</span>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
-- Apply by hand on the server DB with the owner's go-ahead. Not run by deploy.
|
||||
BEGIN;
|
||||
ALTER TABLE evidence_files ADD COLUMN IF NOT EXISTS capa_id UUID REFERENCES capa_actions(id) ON DELETE RESTRICT;
|
||||
CREATE INDEX IF NOT EXISTS evidence_files_capa_id_idx ON evidence_files(capa_id);
|
||||
COMMIT;
|
||||
@@ -0,0 +1,5 @@
|
||||
-- Apply by hand on the server DB with the owner's go-ahead. Not run by deploy.
|
||||
BEGIN;
|
||||
ALTER TABLE trucks ADD COLUMN IF NOT EXISTS site_id UUID REFERENCES sites(id);
|
||||
CREATE INDEX IF NOT EXISTS trucks_site_id_idx ON trucks(site_id);
|
||||
COMMIT;
|
||||
@@ -0,0 +1,166 @@
|
||||
-- Merge reporter + supervisor + capa_owner into one role: ssa (Site Safety Assistant).
|
||||
-- Run by hand on the production DB with the owner's go-ahead. Take a pg_dump first.
|
||||
-- This migration drops all RLS policies, migrates the enum type, recreates auth_user_role(),
|
||||
-- then re-applies all policies in a single transaction to avoid access gaps.
|
||||
-- After this, users must log out and in again (role is in the JWT cookie).
|
||||
|
||||
-- ============================================================================
|
||||
-- STEP 1: Add new 'ssa' value to enum (must be separate transaction)
|
||||
-- ============================================================================
|
||||
BEGIN;
|
||||
ALTER TYPE user_role ADD VALUE IF NOT EXISTS 'ssa';
|
||||
COMMIT;
|
||||
|
||||
-- ============================================================================
|
||||
-- STEP 2: Full migration in one transaction (no RLS gaps)
|
||||
-- ============================================================================
|
||||
BEGIN;
|
||||
|
||||
-- Update all old role names to 'ssa'
|
||||
UPDATE users SET role = 'ssa' WHERE role IN ('reporter', 'supervisor', 'capa_owner');
|
||||
|
||||
-- Drop all existing RLS policies (safe: RLS still ON during migration)
|
||||
DO $$
|
||||
DECLARE r record;
|
||||
BEGIN
|
||||
FOR r IN SELECT schemaname, tablename, policyname FROM pg_policies WHERE schemaname = 'public' LOOP
|
||||
EXECUTE format('DROP POLICY %I ON %I.%I', r.policyname, r.schemaname, r.tablename);
|
||||
END LOOP;
|
||||
END $$;
|
||||
|
||||
-- Recreate enum type with final values only
|
||||
ALTER TYPE user_role RENAME TO user_role_old;
|
||||
CREATE TYPE user_role AS ENUM ('ssa', 'hse', 'management', 'admin');
|
||||
|
||||
-- Alter column to new enum type
|
||||
ALTER TABLE users ALTER COLUMN role DROP DEFAULT;
|
||||
ALTER TABLE users ALTER COLUMN role TYPE user_role USING role::text::user_role;
|
||||
ALTER TABLE users ALTER COLUMN role SET DEFAULT 'ssa';
|
||||
|
||||
-- Drop and recreate auth_user_role() to return new enum type
|
||||
DROP FUNCTION IF EXISTS public.auth_user_role();
|
||||
CREATE OR REPLACE FUNCTION public.auth_user_role()
|
||||
RETURNS user_role
|
||||
LANGUAGE sql
|
||||
SECURITY DEFINER
|
||||
STABLE
|
||||
SET search_path = public
|
||||
AS $$
|
||||
SELECT role FROM public.users WHERE id = app_current_user_id()
|
||||
$$;
|
||||
|
||||
-- Clean up old enum type
|
||||
DROP TYPE user_role_old;
|
||||
|
||||
-- ============================================================================
|
||||
-- STEP 3: Re-apply all RLS policies (same as db/rls.sql)
|
||||
-- ============================================================================
|
||||
|
||||
-- sites
|
||||
CREATE POLICY "sites_read" ON sites FOR SELECT USING (active = true);
|
||||
CREATE POLICY "sites_admin_all" ON sites FOR ALL USING (auth_user_role() = 'admin');
|
||||
|
||||
-- zones
|
||||
CREATE POLICY "zones_read" ON zones FOR SELECT USING (true);
|
||||
CREATE POLICY "zones_admin_all" ON zones FOR ALL USING (auth_user_role() = 'admin');
|
||||
|
||||
-- trucks
|
||||
CREATE POLICY "trucks_read" ON trucks FOR SELECT USING (true);
|
||||
CREATE POLICY "trucks_admin_all" ON trucks FOR ALL USING (auth_user_role() = 'admin');
|
||||
|
||||
-- users
|
||||
CREATE POLICY "users_read_own" ON users FOR SELECT USING (id = app_current_user_id());
|
||||
CREATE POLICY "users_read_elevated" ON users FOR SELECT
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'management', 'ssa'));
|
||||
CREATE POLICY "users_update_own" ON users FOR UPDATE
|
||||
USING (id = app_current_user_id())
|
||||
WITH CHECK (
|
||||
id = app_current_user_id()
|
||||
AND role = (SELECT role FROM public.users WHERE id = app_current_user_id())
|
||||
);
|
||||
CREATE POLICY "users_admin_all" ON users FOR ALL USING (auth_user_role() = 'admin');
|
||||
|
||||
-- incidents
|
||||
CREATE POLICY "incidents_insert" ON incidents FOR INSERT
|
||||
WITH CHECK (reported_by = app_current_user_id());
|
||||
CREATE POLICY "incidents_read_reporter" ON incidents FOR SELECT
|
||||
USING (reported_by = app_current_user_id());
|
||||
CREATE POLICY "incidents_read_ssa" ON incidents FOR SELECT
|
||||
USING (auth_user_role() = 'ssa' AND site_id = auth_user_site_id());
|
||||
CREATE POLICY "incidents_read_elevated" ON incidents FOR SELECT
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'management'));
|
||||
CREATE POLICY "incidents_update_elevated" ON incidents FOR UPDATE
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'ssa'));
|
||||
|
||||
-- evidence_files
|
||||
CREATE POLICY "evidence_insert" ON evidence_files FOR INSERT
|
||||
WITH CHECK (uploaded_by = app_current_user_id());
|
||||
CREATE POLICY "evidence_read_uploader" ON evidence_files FOR SELECT
|
||||
USING (uploaded_by = app_current_user_id());
|
||||
CREATE POLICY "evidence_read_elevated" ON evidence_files FOR SELECT
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'management', 'ssa'));
|
||||
|
||||
-- investigations
|
||||
CREATE POLICY "investigations_hse_admin" ON investigations FOR ALL
|
||||
USING (auth_user_role() IN ('hse', 'admin'));
|
||||
CREATE POLICY "investigations_read_ssa" ON investigations FOR SELECT
|
||||
USING (auth_user_role() = 'ssa');
|
||||
|
||||
-- capa_actions
|
||||
CREATE POLICY "capa_read_owner" ON capa_actions FOR SELECT
|
||||
USING (owner_user_id = app_current_user_id() OR department = auth_user_department());
|
||||
CREATE POLICY "capa_update_owner" ON capa_actions FOR UPDATE
|
||||
USING (owner_user_id = app_current_user_id());
|
||||
CREATE POLICY "capa_read_elevated" ON capa_actions FOR SELECT
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'management', 'ssa'));
|
||||
CREATE POLICY "capa_hse_admin_all" ON capa_actions FOR ALL
|
||||
USING (auth_user_role() IN ('hse', 'admin'));
|
||||
|
||||
-- dosh_reports
|
||||
CREATE POLICY "dosh_hse_admin" ON dosh_reports FOR ALL
|
||||
USING (auth_user_role() IN ('hse', 'admin'));
|
||||
|
||||
-- notifications_log
|
||||
CREATE POLICY "notifications_insert_elevated" ON notifications_log FOR INSERT
|
||||
WITH CHECK (auth_user_role() IN ('hse', 'admin', 'ssa'));
|
||||
CREATE POLICY "notifications_read_own" ON notifications_log FOR SELECT
|
||||
USING (recipient_user_id = app_current_user_id());
|
||||
CREATE POLICY "notifications_read_admin" ON notifications_log FOR SELECT
|
||||
USING (auth_user_role() = 'admin');
|
||||
CREATE POLICY "notifications_update_own" ON notifications_log FOR UPDATE
|
||||
USING (recipient_user_id = app_current_user_id())
|
||||
WITH CHECK (recipient_user_id = app_current_user_id());
|
||||
|
||||
-- audit_log
|
||||
CREATE POLICY "audit_read_elevated" ON audit_log FOR SELECT
|
||||
USING (auth_user_role() IN ('hse', 'admin'));
|
||||
|
||||
-- app_settings
|
||||
CREATE POLICY "admin_select_settings" ON app_settings FOR SELECT
|
||||
USING (auth_user_role() = 'admin');
|
||||
CREATE POLICY "admin_update_settings" ON app_settings FOR ALL
|
||||
USING (auth_user_role() = 'admin');
|
||||
|
||||
-- incident_addenda
|
||||
CREATE POLICY "addenda_read" ON incident_addenda FOR SELECT
|
||||
USING (
|
||||
auth_user_role() IN ('hse', 'admin', 'ssa', 'management')
|
||||
OR EXISTS (
|
||||
SELECT 1 FROM incidents i
|
||||
WHERE i.id = incident_id AND i.reported_by = app_current_user_id()
|
||||
)
|
||||
);
|
||||
CREATE POLICY "addenda_insert" ON incident_addenda FOR INSERT
|
||||
WITH CHECK (
|
||||
author = app_current_user_id()
|
||||
AND auth_user_role() IN ('hse', 'admin', 'ssa')
|
||||
);
|
||||
|
||||
COMMIT;
|
||||
|
||||
-- ============================================================================
|
||||
-- After migration succeeds:
|
||||
-- 1. Verify all users have role = 'ssa' (no 'reporter', 'supervisor', 'capa_owner')
|
||||
-- 2. Ask users to log out and in again (clears old JWT with old role)
|
||||
-- 3. Deploy the new code (app/api, auth checks, RLS already match)
|
||||
-- ============================================================================
|
||||
@@ -0,0 +1,67 @@
|
||||
-- One-off: delete ALL incidents (and children) and every user with role <> 'admin'.
|
||||
-- Usage: psql -p 5433 -d ims -v mode=dryrun -f cleanup-test-data.sql (counts only)
|
||||
-- psql -p 5433 -d ims -v mode=run -f cleanup-test-data.sql (deletes, one transaction)
|
||||
-- Evidence files on disk are NOT touched (5-year retention).
|
||||
|
||||
\set ON_ERROR_STOP on
|
||||
|
||||
\if :{?mode}
|
||||
\else
|
||||
\echo 'Set -v mode=dryrun or -v mode=run'
|
||||
\quit
|
||||
\endif
|
||||
|
||||
BEGIN;
|
||||
|
||||
\echo '--- admins kept ---'
|
||||
SELECT id, name, email FROM users WHERE role = 'admin' ORDER BY email;
|
||||
|
||||
\echo '--- row counts to delete ---'
|
||||
SELECT 'incidents' AS tbl, count(*) FROM incidents
|
||||
UNION ALL SELECT 'evidence_files', count(*) FROM evidence_files
|
||||
UNION ALL SELECT 'investigations', count(*) FROM investigations
|
||||
UNION ALL SELECT 'capa_actions', count(*) FROM capa_actions
|
||||
UNION ALL SELECT 'dosh_reports', count(*) FROM dosh_reports
|
||||
UNION ALL SELECT 'incident_addenda', count(*) FROM incident_addenda
|
||||
UNION ALL SELECT 'notifications_log', count(*) FROM notifications_log
|
||||
UNION ALL SELECT 'audit_log (all)', count(*) FROM audit_log
|
||||
UNION ALL SELECT 'users (non-admin)', count(*) FROM users WHERE role <> 'admin';
|
||||
|
||||
SELECT (:'mode' = 'run') AS do_delete \gset
|
||||
\if :do_delete
|
||||
-- Closed incidents are locked by triggers; disable them for this transaction only.
|
||||
ALTER TABLE incidents DISABLE TRIGGER incidents_closed_lock_delete;
|
||||
ALTER TABLE incidents DISABLE TRIGGER incidents_closed_lock_update;
|
||||
|
||||
DELETE FROM notifications_log;
|
||||
DELETE FROM incident_addenda;
|
||||
DELETE FROM dosh_reports;
|
||||
DELETE FROM evidence_files;
|
||||
DELETE FROM capa_actions;
|
||||
DELETE FROM investigations;
|
||||
DELETE FROM incidents;
|
||||
|
||||
-- audit_log: remove rows about deleted incident-side tables and about non-admin users.
|
||||
DELETE FROM audit_log
|
||||
WHERE table_name IN ('incidents','evidence_files','investigations','capa_actions','dosh_reports','incident_addenda')
|
||||
OR changed_by IN (SELECT id FROM users WHERE role <> 'admin')
|
||||
OR (table_name = 'users' AND record_id IN (SELECT id FROM users WHERE role <> 'admin'));
|
||||
|
||||
UPDATE app_settings SET updated_by = NULL
|
||||
WHERE updated_by IN (SELECT id FROM users WHERE role <> 'admin');
|
||||
|
||||
DELETE FROM password_reset_tokens WHERE user_id IN (SELECT id FROM users WHERE role <> 'admin');
|
||||
DELETE FROM users WHERE role <> 'admin';
|
||||
|
||||
ALTER TABLE incidents ENABLE TRIGGER incidents_closed_lock_delete;
|
||||
ALTER TABLE incidents ENABLE TRIGGER incidents_closed_lock_update;
|
||||
|
||||
\echo '--- after ---'
|
||||
SELECT 'incidents' AS tbl, count(*) FROM incidents
|
||||
UNION ALL SELECT 'users', count(*) FROM users
|
||||
UNION ALL SELECT 'admins', count(*) FROM users WHERE role = 'admin';
|
||||
COMMIT;
|
||||
\else
|
||||
ROLLBACK;
|
||||
\echo 'dry run: nothing changed'
|
||||
\endif
|
||||
+11
-11
@@ -56,7 +56,7 @@ CREATE POLICY "trucks_admin_all" ON trucks FOR ALL USING (auth_user_role() =
|
||||
-- users
|
||||
CREATE POLICY "users_read_own" ON users FOR SELECT USING (id = app_current_user_id());
|
||||
CREATE POLICY "users_read_elevated" ON users FOR SELECT
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'management', 'supervisor'));
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'management', 'ssa'));
|
||||
CREATE POLICY "users_update_own" ON users FOR UPDATE
|
||||
USING (id = app_current_user_id())
|
||||
WITH CHECK (
|
||||
@@ -70,12 +70,12 @@ CREATE POLICY "incidents_insert" ON incidents FOR INSERT
|
||||
WITH CHECK (reported_by = app_current_user_id());
|
||||
CREATE POLICY "incidents_read_reporter" ON incidents FOR SELECT
|
||||
USING (reported_by = app_current_user_id());
|
||||
CREATE POLICY "incidents_read_supervisor" ON incidents FOR SELECT
|
||||
USING (auth_user_role() = 'supervisor' AND site_id = auth_user_site_id());
|
||||
CREATE POLICY "incidents_read_ssa" ON incidents FOR SELECT
|
||||
USING (auth_user_role() = 'ssa' AND site_id = auth_user_site_id());
|
||||
CREATE POLICY "incidents_read_elevated" ON incidents FOR SELECT
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'management'));
|
||||
CREATE POLICY "incidents_update_elevated" ON incidents FOR UPDATE
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'supervisor'));
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'ssa'));
|
||||
|
||||
-- evidence_files
|
||||
CREATE POLICY "evidence_insert" ON evidence_files FOR INSERT
|
||||
@@ -83,14 +83,14 @@ CREATE POLICY "evidence_insert" ON evidence_files FOR INSERT
|
||||
CREATE POLICY "evidence_read_uploader" ON evidence_files FOR SELECT
|
||||
USING (uploaded_by = app_current_user_id());
|
||||
CREATE POLICY "evidence_read_elevated" ON evidence_files FOR SELECT
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'management', 'supervisor'));
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'management', 'ssa'));
|
||||
-- No DELETE policy: files are never deleted (soft-delete only via `deleted` flag)
|
||||
|
||||
-- investigations
|
||||
CREATE POLICY "investigations_hse_admin" ON investigations FOR ALL
|
||||
USING (auth_user_role() IN ('hse', 'admin'));
|
||||
CREATE POLICY "investigations_read_supervisor" ON investigations FOR SELECT
|
||||
USING (auth_user_role() = 'supervisor');
|
||||
CREATE POLICY "investigations_read_ssa" ON investigations FOR SELECT
|
||||
USING (auth_user_role() = 'ssa');
|
||||
|
||||
-- capa_actions (capa_update_owner is tightened — no department clause)
|
||||
CREATE POLICY "capa_read_owner" ON capa_actions FOR SELECT
|
||||
@@ -98,7 +98,7 @@ CREATE POLICY "capa_read_owner" ON capa_actions FOR SELECT
|
||||
CREATE POLICY "capa_update_owner" ON capa_actions FOR UPDATE
|
||||
USING (owner_user_id = app_current_user_id());
|
||||
CREATE POLICY "capa_read_elevated" ON capa_actions FOR SELECT
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'management', 'supervisor'));
|
||||
USING (auth_user_role() IN ('hse', 'admin', 'management', 'ssa'));
|
||||
CREATE POLICY "capa_hse_admin_all" ON capa_actions FOR ALL
|
||||
USING (auth_user_role() IN ('hse', 'admin'));
|
||||
|
||||
@@ -108,7 +108,7 @@ CREATE POLICY "dosh_hse_admin" ON dosh_reports FOR ALL
|
||||
|
||||
-- notifications_log (final state after migration 19 fix)
|
||||
CREATE POLICY "notifications_insert_elevated" ON notifications_log FOR INSERT
|
||||
WITH CHECK (auth_user_role() IN ('hse', 'admin', 'supervisor'));
|
||||
WITH CHECK (auth_user_role() IN ('hse', 'admin', 'ssa'));
|
||||
CREATE POLICY "notifications_read_own" ON notifications_log FOR SELECT
|
||||
USING (recipient_user_id = app_current_user_id());
|
||||
CREATE POLICY "notifications_read_admin" ON notifications_log FOR SELECT
|
||||
@@ -130,7 +130,7 @@ CREATE POLICY "admin_update_settings" ON app_settings FOR ALL
|
||||
-- incident_addenda
|
||||
CREATE POLICY "addenda_read" ON incident_addenda FOR SELECT
|
||||
USING (
|
||||
auth_user_role() IN ('hse', 'admin', 'supervisor', 'management')
|
||||
auth_user_role() IN ('hse', 'admin', 'ssa', 'management')
|
||||
OR EXISTS (
|
||||
SELECT 1 FROM incidents i
|
||||
WHERE i.id = incident_id AND i.reported_by = app_current_user_id()
|
||||
@@ -139,5 +139,5 @@ CREATE POLICY "addenda_read" ON incident_addenda FOR SELECT
|
||||
CREATE POLICY "addenda_insert" ON incident_addenda FOR INSERT
|
||||
WITH CHECK (
|
||||
author = app_current_user_id()
|
||||
AND auth_user_role() IN ('hse', 'admin', 'supervisor')
|
||||
AND auth_user_role() IN ('hse', 'admin', 'ssa')
|
||||
);
|
||||
|
||||
+8
-2
@@ -16,7 +16,7 @@ CREATE EXTENSION IF NOT EXISTS pgcrypto;
|
||||
-- Enums
|
||||
-- ---------------------------------------------------------------------------
|
||||
CREATE TYPE user_role AS ENUM (
|
||||
'reporter', 'supervisor', 'hse', 'capa_owner', 'management', 'admin'
|
||||
'ssa', 'hse', 'management', 'admin'
|
||||
);
|
||||
|
||||
CREATE TYPE incident_type AS ENUM (
|
||||
@@ -80,7 +80,7 @@ CREATE TABLE users (
|
||||
name TEXT NOT NULL DEFAULT '',
|
||||
email TEXT NOT NULL DEFAULT '' UNIQUE,
|
||||
phone TEXT,
|
||||
role user_role NOT NULL DEFAULT 'reporter',
|
||||
role user_role NOT NULL DEFAULT 'ssa',
|
||||
department TEXT,
|
||||
site_id UUID REFERENCES sites(id),
|
||||
active BOOLEAN NOT NULL DEFAULT true,
|
||||
@@ -101,6 +101,9 @@ CREATE TABLE trucks (
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||
);
|
||||
|
||||
ALTER TABLE trucks ADD COLUMN IF NOT EXISTS site_id UUID REFERENCES sites(id);
|
||||
CREATE INDEX IF NOT EXISTS trucks_site_id_idx ON trucks(site_id);
|
||||
|
||||
-- incidents: final column set includes all columns added in later migrations
|
||||
CREATE TABLE incidents (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
@@ -197,6 +200,9 @@ CREATE INDEX capa_actions_owner_idx ON capa_actions(owner_user_id);
|
||||
CREATE INDEX capa_actions_status_idx ON capa_actions(status);
|
||||
CREATE INDEX capa_actions_due_date_idx ON capa_actions(due_date);
|
||||
|
||||
ALTER TABLE evidence_files ADD COLUMN capa_id UUID REFERENCES capa_actions(id) ON DELETE RESTRICT;
|
||||
CREATE INDEX evidence_files_capa_id_idx ON evidence_files(capa_id);
|
||||
|
||||
CREATE TABLE dosh_reports (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
incident_id UUID NOT NULL REFERENCES incidents(id) ON DELETE RESTRICT,
|
||||
|
||||
@@ -0,0 +1,143 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<script src="./support.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<x-dc>
|
||||
<helmet>
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link href="https://fonts.googleapis.com/css2?family=Geist:wght@400;500;600;700&family=Geist+Mono:wght@400;500;600&display=swap" rel="stylesheet">
|
||||
<style>
|
||||
body{margin:0;background:#f7f7f7;color:#1f1f1f;font-family:Geist,system-ui,sans-serif;-webkit-font-smoothing:antialiased}
|
||||
a{color:#0f766e;text-decoration:none}a:hover{text-decoration:underline}
|
||||
</style>
|
||||
</helmet>
|
||||
<div style="max-width:1080px;margin:0 auto;padding:56px 40px 96px;display:flex;flex-direction:column;gap:56px">
|
||||
<div style="display:flex;flex-direction:column;gap:12px">
|
||||
<div style="font:600 12px 'Geist Mono',monospace;color:#616161;letter-spacing:.04em">IMS · UI REFRESH · HANDOFF SPEC</div>
|
||||
<div style="font-size:30px;font-weight:600;letter-spacing:-.02em">Patterns, tokens and states</div>
|
||||
<div style="font-size:15px;line-height:1.55;color:#4a4a4a;max-width:720px;text-wrap:pretty">Everything in <a href="IMS Admin.dc.html">IMS Admin.dc.html</a> is built from the pieces below. Values are the ones used in the mockups; map them to Tailwind theme tokens once and the screens follow. Type is Geist (UI) and Geist Mono (references, keyboard hints).</div>
|
||||
</div>
|
||||
|
||||
<div style="display:flex;flex-direction:column;gap:20px">
|
||||
<div style="font-size:18px;font-weight:600;letter-spacing:-.01em;padding-bottom:10px;border-bottom:1px solid #dcdcdc">1 · Color</div>
|
||||
<div style="display:grid;grid-template-columns:repeat(auto-fill,minmax(150px,1fr));gap:12px">
|
||||
<sc-for list="{{ colors }}" as="c" hint-placeholder-count="12"><div style="display:flex;flex-direction:column;gap:8px"><div style="height:56px;border-radius:10px;background:{{ c.hex }};box-shadow:inset 0 0 0 1px rgba(0,0,0,.08)"></div><div style="font-size:13px;font-weight:550">{{ c.name }}</div><div style="font:500 12px 'Geist Mono',monospace;color:#616161">{{ c.hex }}</div><div style="font-size:12px;color:#616161;line-height:1.4">{{ c.use }}</div></div></sc-for>
|
||||
</div>
|
||||
<div style="font-size:14px;font-weight:600;margin-top:8px">Status pills</div>
|
||||
<div style="display:flex;flex-wrap:wrap;gap:8px">
|
||||
<sc-for list="{{ pills }}" as="p" hint-placeholder-count="12"><span style="display:inline-flex;align-items:center;gap:8px;padding:2px 8px 2px 8px;border-radius:8px;font-size:12px;font-weight:550;white-space:nowrap;background:{{ p.bg }};color:{{ p.fg }}">{{ p.label }}<span style="font:500 11px 'Geist Mono',monospace;opacity:.75">{{ p.bg }} / {{ p.fg }}</span></span></sc-for>
|
||||
</div>
|
||||
<div style="font-size:13px;color:#4a4a4a;line-height:1.5;max-width:720px">Pill text is always a dark ramp step on a light tint — never white on a saturated fill. Priority uses the same scale: Critical = red, High = orange, Medium = yellow, Low = neutral. Incident status and CAPA status share one palette so the dashboard reads consistently.</div>
|
||||
</div>
|
||||
|
||||
<div style="display:flex;flex-direction:column;gap:20px">
|
||||
<div style="font-size:18px;font-weight:600;letter-spacing:-.01em;padding-bottom:10px;border-bottom:1px solid #dcdcdc">2 · Type, radius, shadow</div>
|
||||
<div style="display:grid;grid-template-columns:1fr 1fr;gap:24px">
|
||||
<div style="display:flex;flex-direction:column;gap:10px">
|
||||
<sc-for list="{{ type }}" as="t" hint-placeholder-count="7"><div style="display:grid;grid-template-columns:150px 1fr;gap:16px;align-items:baseline;padding:8px 0;border-bottom:1px solid #ebebeb"><span style="font:500 12px 'Geist Mono',monospace;color:#616161">{{ t.spec }}</span><span style="font-size:{{ t.size }};font-weight:{{ t.w }};font-family:{{ t.fam }};letter-spacing:{{ t.ls }}">{{ t.sample }}</span></div></sc-for>
|
||||
</div>
|
||||
<div style="display:flex;flex-direction:column;gap:10px">
|
||||
<sc-for list="{{ shape }}" as="s" hint-placeholder-count="6"><div style="display:grid;grid-template-columns:150px 1fr;gap:16px;align-items:center;padding:8px 0;border-bottom:1px solid #ebebeb"><span style="font:500 12px 'Geist Mono',monospace;color:#616161">{{ s.k }}</span><span style="font-size:13px;color:#303030">{{ s.v }}</span></div></sc-for>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="display:flex;flex-direction:column;gap:20px">
|
||||
<div style="font-size:18px;font-weight:600;letter-spacing:-.01em;padding-bottom:10px;border-bottom:1px solid #dcdcdc">3 · Buttons and controls</div>
|
||||
<div style="display:flex;flex-wrap:wrap;gap:24px;align-items:flex-start">
|
||||
<div style="display:flex;flex-direction:column;gap:10px"><span style="font-size:12px;color:#616161">Primary · 32px · #303030, inset highlight</span><span style="display:inline-flex;align-items:center;gap:6px;height:32px;padding:0 12px;border-radius:8px;background:#303030;color:#fff;font-size:13px;font-weight:600;box-shadow:inset 0 -1px 0 #000,inset 0 1px 0 rgba(255,255,255,.18),0 1px 2px rgba(0,0,0,.2);cursor:pointer;white-space:nowrap;align-self:flex-start">{{ ic.plus }}Report incident</span><span style="font-size:12px;color:#616161">hover #1f1f1f · active #000 · focus 2px ring #0f766e offset 2px</span></div>
|
||||
<div style="display:flex;flex-direction:column;gap:10px"><span style="font-size:12px;color:#616161">Secondary · white, 1px #d4d4d4 ring</span><span style="display:inline-flex;align-items:center;gap:6px;height:32px;padding:0 12px;border-radius:8px;background:#fff;color:#1f1f1f;font-size:13px;font-weight:550;box-shadow:inset 0 0 0 1px #d4d4d4,0 1px 0 rgba(0,0,0,.05);cursor:pointer;white-space:nowrap;align-self:flex-start">{{ ic.download }}Export</span><span style="font-size:12px;color:#616161">hover bg #f7f7f7 · active bg #ebebeb</span></div>
|
||||
<div style="display:flex;flex-direction:column;gap:10px"><span style="font-size:12px;color:#616161">Icon button · 28px, ghost</span><span style="width:28px;height:28px;border-radius:8px;display:grid;place-items:center;color:#4a4a4a;cursor:pointer;background:#ebebeb">{{ ic.more }}</span><span style="font-size:12px;color:#616161">rest transparent · hover #ebebeb</span></div>
|
||||
<div style="display:flex;flex-direction:column;gap:10px"><span style="font-size:12px;color:#616161">Filter chip · 28px</span><div style="display:flex;gap:6px"><span style="display:inline-flex;align-items:center;gap:4px;height:28px;padding:0 10px;border-radius:8px;font-size:12.5px;color:#303030;box-shadow:inset 0 0 0 1px #d4d4d4;background:#fff;cursor:pointer;white-space:nowrap">Owner{{ ic.chev12 }}</span><span style="display:inline-flex;align-items:center;gap:4px;height:28px;padding:0 10px;border-radius:8px;font-size:12.5px;background:#e6f4f1;box-shadow:inset 0 0 0 1px #9fd3c7;color:#0b4f47;cursor:pointer;white-space:nowrap">Priority: Critical{{ ic.x12 }}</span></div><span style="font-size:12px;color:#616161">unset: chevron · set: teal tint + value + clear ×</span></div>
|
||||
<div style="display:flex;flex-direction:column;gap:10px"><span style="font-size:12px;color:#616161">Segmented · 2px padding on #e3e3e3</span><div style="display:flex;padding:2px;border-radius:10px;background:#e3e3e3;align-self:flex-start"><span style="display:flex;align-items:center;gap:6px;padding:5px 10px;border-radius:8px;background:#fff;font-size:13px;font-weight:600;box-shadow:0 1px 2px rgba(0,0,0,.1);white-space:nowrap">{{ ic.rows }}List</span><span style="display:flex;align-items:center;gap:6px;padding:5px 10px;font-size:13px;color:#4a4a4a;white-space:nowrap">{{ ic.kanban }}Board</span></div></div>
|
||||
<div style="display:flex;flex-direction:column;gap:10px"><span style="font-size:12px;color:#616161">Checkbox · 16px, radius 5</span><div style="display:flex;gap:8px;align-items:center"><span style="width:16px;height:16px;border-radius:5px;box-shadow:inset 0 0 0 1.5px #8a8a8a;background:#fff;display:block"></span><span style="width:16px;height:16px;border-radius:5px;background:#0f766e;color:#fff;display:grid;place-items:center">{{ ic.tick12 }}</span><span style="width:16px;height:16px;border-radius:5px;background:#0f766e;color:#fff;display:grid;place-items:center">{{ ic.minus12 }}</span></div><span style="font-size:12px;color:#616161">off · on · indeterminate (header)</span></div>
|
||||
<div style="display:flex;flex-direction:column;gap:10px"><span style="font-size:12px;color:#616161">Text input · 36px desktop, 48px mobile</span><div style="height:36px;padding:0 12px;border-radius:8px;box-shadow:inset 0 0 0 1px #8a8a8a;background:#fff;font-size:13px;display:flex;align-items:center;color:#8a8a8a;width:220px">Placeholder</div><span style="font-size:12px;color:#616161">rest ring #8a8a8a · focus ring 2px #0f766e · error #b3261e</span></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="display:flex;flex-direction:column;gap:20px">
|
||||
<div style="font-size:18px;font-weight:600;letter-spacing:-.01em;padding-bottom:10px;border-bottom:1px solid #dcdcdc">4 · Table card</div>
|
||||
<div style="font-size:13px;color:#4a4a4a;line-height:1.5;max-width:720px;text-wrap:pretty">One component wraps every list in the app. Anatomy top to bottom; every part is optional except the table and the card.</div>
|
||||
<div style="background:#fff;border-radius:12px;box-shadow:0 0 0 1px rgba(0,0,0,.08),0 1px 2px rgba(0,0,0,.06);overflow:hidden;position:relative">
|
||||
<div style="display:flex;align-items:center;justify-content:space-between;padding:8px;border-bottom:1px solid #ebebeb"><div style="display:flex;gap:2px;align-items:center"><div style="display:flex;align-items:center;gap:6px;height:28px;padding:0 10px;border-radius:8px;font-size:13px;font-weight:600;background:#e3e3e3;color:#1f1f1f">All <span style="font-size:12px;color:#8a8a8a;font-weight:500">248</span></div><div style="display:flex;align-items:center;gap:6px;height:28px;padding:0 10px;border-radius:8px;font-size:13px;font-weight:500;color:#4a4a4a">Open <span style="font-size:12px;color:#8a8a8a">37</span></div><div style="width:28px;height:28px;border-radius:8px;display:grid;place-items:center;color:#4a4a4a">{{ ic.plus }}</div></div><span style="font:500 11px 'Geist Mono',monospace;color:#8a8a8a;padding-right:4px">A · saved views · padding 8 · active #e3e3e3</span></div>
|
||||
<div style="display:flex;align-items:center;gap:8px;padding:10px 12px;border-bottom:1px solid #ebebeb"><div style="display:flex;align-items:center;gap:8px;height:32px;padding:0 10px;border-radius:8px;box-shadow:inset 0 0 0 1px #8a8a8a;background:#fff;color:#616161;font-size:13px;min-width:260px">{{ ic.search }}<span>Search</span></div><span style="display:inline-flex;align-items:center;gap:4px;height:28px;padding:0 10px;border-radius:8px;font-size:12.5px;color:#303030;box-shadow:inset 0 0 0 1px #d4d4d4;background:#fff;white-space:nowrap">Site{{ ic.chev12 }}</span><span style="flex:1"></span><span style="font:500 11px 'Geist Mono',monospace;color:#8a8a8a">B · search + filter chips · padding 10/12</span></div>
|
||||
<table><thead><tr><th style="padding:9px 12px;font-size:12px;font-weight:550;color:#616161;text-align:left;background:#f7f7f7;border-bottom:1px solid #e3e3e3;white-space:nowrap;width:28px;padding-left:16px"><span style="width:16px;height:16px;border-radius:5px;box-shadow:inset 0 0 0 1.5px #8a8a8a;background:#fff;display:block"></span></th><th style="padding:9px 12px;font-size:12px;font-weight:550;color:#616161;text-align:left;background:#f7f7f7;border-bottom:1px solid #e3e3e3;white-space:nowrap"><span style="display:inline-flex;align-items:center;gap:4px">Reference<span style="color:#1f1f1f">{{ ic.down12 }}</span></span></th><th style="padding:9px 12px;font-size:12px;font-weight:550;color:#616161;text-align:left;background:#f7f7f7;border-bottom:1px solid #e3e3e3;white-space:nowrap"><span style="display:inline-flex;align-items:center;gap:4px">Status<span style="color:#c4c4c4">{{ ic.sort12 }}</span></span></th><th style="padding:9px 12px;font-size:12px;font-weight:550;color:#616161;text-align:left;background:#f7f7f7;border-bottom:1px solid #e3e3e3;white-space:nowrap;width:100%"><span style="font:500 11px 'Geist Mono',monospace;color:#8a8a8a;font-weight:500">C · header #f7f7f7 · 12px/550 · sorted column ink, others #c4c4c4</span></th><th style="padding:9px 12px;background:#f7f7f7;border-bottom:1px solid #e3e3e3;width:100px"></th></tr></thead>
|
||||
<tbody>
|
||||
<tr style="background:#fff"><td style="padding:12px;font-size:13px;border-bottom:1px solid #ebebeb;padding-left:16px"><span style="width:16px;height:16px;border-radius:5px;box-shadow:inset 0 0 0 1.5px #8a8a8a;background:#fff;display:block"></span></td><td style="padding:12px;font-size:13px;border-bottom:1px solid #ebebeb"><a href="#" style="font-family:'Geist Mono',monospace;font-size:12.5px">IMS-2026-0248</a></td><td style="padding:12px;font-size:13px;border-bottom:1px solid #ebebeb"><span style="display:inline-flex;align-items:center;padding:2px 8px;border-radius:8px;font-size:12px;font-weight:550;background:#ede7ff;color:#4b2e99">Investigating</span></td><td style="padding:12px;font-size:13px;border-bottom:1px solid #ebebeb;color:#8a8a8a;font:500 11px 'Geist Mono',monospace">D · row rest · #fff · 13px · 12px cell padding · 1px #ebebeb rule</td><td style="padding:12px;border-bottom:1px solid #ebebeb"></td></tr>
|
||||
<tr style="background:#f7f7f7"><td style="padding:12px;font-size:13px;border-bottom:1px solid #ebebeb;padding-left:16px"><span style="width:16px;height:16px;border-radius:5px;box-shadow:inset 0 0 0 1.5px #8a8a8a;background:#fff;display:block"></span></td><td style="padding:12px;font-size:13px;border-bottom:1px solid #ebebeb"><a href="#" style="font-family:'Geist Mono',monospace;font-size:12.5px">IMS-2026-0247</a></td><td style="padding:12px;font-size:13px;border-bottom:1px solid #ebebeb"><span style="display:inline-flex;align-items:center;padding:2px 8px;border-radius:8px;font-size:12px;font-weight:550;background:#e0efff;color:#00527c">Triaged</span></td><td style="padding:12px;font-size:13px;border-bottom:1px solid #ebebeb;color:#8a8a8a;font:500 11px 'Geist Mono',monospace">E · row hover · #f7f7f7 · quick actions appear right</td><td style="padding:12px;border-bottom:1px solid #ebebeb"><div style="display:flex;gap:4px;justify-content:flex-end"><span style="width:28px;height:28px;border-radius:8px;display:grid;place-items:center;color:#4a4a4a">{{ ic.eye }}</span><span style="width:28px;height:28px;border-radius:8px;display:grid;place-items:center;color:#4a4a4a">{{ ic.more }}</span></div></td></tr>
|
||||
<tr style="background:#f2f7f6"><td style="padding:12px;font-size:13px;border-bottom:1px solid #ebebeb;padding-left:16px"><span style="width:16px;height:16px;border-radius:5px;background:#0f766e;color:#fff;display:grid;place-items:center">{{ ic.tick12 }}</span></td><td style="padding:12px;font-size:13px;border-bottom:1px solid #ebebeb"><a href="#" style="font-family:'Geist Mono',monospace;font-size:12.5px">IMS-2026-0246</a></td><td style="padding:12px;font-size:13px;border-bottom:1px solid #ebebeb"><span style="display:inline-flex;align-items:center;padding:2px 8px;border-radius:8px;font-size:12px;font-weight:550;background:#fff1c2;color:#6b4a00">Reported</span></td><td style="padding:12px;font-size:13px;border-bottom:1px solid #ebebeb;color:#8a8a8a;font:500 11px 'Geist Mono',monospace">F · row selected · #f2f7f6</td><td style="padding:12px;border-bottom:1px solid #ebebeb"></td></tr>
|
||||
</tbody></table>
|
||||
<div style="display:flex;align-items:center;justify-content:space-between;padding:10px 16px;background:#f7f7f7;font-size:13px;color:#616161"><span>Showing 1–3 of 248</span><span style="font:500 11px 'Geist Mono',monospace;color:#8a8a8a">G · footer #f7f7f7 · count left, pager right</span><div style="display:flex"><span style="display:inline-flex;align-items:center;height:32px;padding:0 7px;border-radius:8px 0 0 8px;background:#fff;box-shadow:inset 0 0 0 1px #d4d4d4;color:#b5b5b5">{{ ic.chevLeft }}</span><span style="display:inline-flex;align-items:center;height:32px;padding:0 7px;border-radius:0 8px 8px 0;background:#fff;box-shadow:inset 0 0 0 1px #d4d4d4;margin-left:-1px;color:#1f1f1f">{{ ic.chevRight }}</span></div></div>
|
||||
<div style="display:flex;justify-content:center;padding:20px 16px 24px;background:#fcfcfc;border-top:1px solid #ebebeb"><div style="display:flex;align-items:center;gap:6px;padding:6px 6px 6px 12px;border-radius:12px;background:#fff;box-shadow:0 0 0 1px rgba(0,0,0,.1),0 12px 32px rgba(0,0,0,.18)"><span style="width:16px;height:16px;border-radius:5px;background:#0f766e;color:#fff;display:grid;place-items:center">{{ ic.tick12 }}</span><span style="font-size:13px;font-weight:600;padding:0 8px 0 4px;white-space:nowrap">1 selected</span><span style="width:1px;height:20px;background:#e3e3e3"></span><span style="display:inline-flex;align-items:center;height:32px;padding:0 12px;border-radius:8px;font-size:13px;font-weight:550">Assign</span><span style="display:inline-flex;align-items:center;height:32px;padding:0 12px;border-radius:8px;font-size:13px;font-weight:550">Export</span><span style="font:500 11px 'Geist Mono',monospace;color:#8a8a8a;padding:0 8px">H · bulk bar · floats centred above footer, appears on first selection</span></div></div>
|
||||
</div>
|
||||
<div style="display:grid;grid-template-columns:1fr 1fr;gap:24px;font-size:13px;color:#4a4a4a;line-height:1.55">
|
||||
<div style="display:flex;flex-direction:column;gap:8px"><span style="font-weight:600;color:#1f1f1f">Behaviour</span><span>Whole row is clickable and opens the record; the checkbox cell, links and quick actions stop propagation.</span><span>Sorting is single-column; the sorted header shows a filled arrow, others a faint double chevron.</span><span>Saved views are server-side filters; the + opens "Save current filters as view". Counts update live.</span><span>Empty state replaces thead + tbody with a 64px icon tile, one line of copy and the primary action (see artboard 08).</span></div>
|
||||
<div style="display:flex;flex-direction:column;gap:8px"><span style="font-weight:600;color:#1f1f1f">Mobile</span><span>Below 768px the table becomes a stacked list in the same card: reference + status on line one, type · zone on line two, date on line three, chevron right (artboard 10).</span><span>Saved views become horizontally scrolling 999px chips; filters collapse to one "Filter" button opening a sheet.</span><span>Bulk bar is replaced by a bottom sheet.</span></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="display:flex;flex-direction:column;gap:20px">
|
||||
<div style="font-size:18px;font-weight:600;letter-spacing:-.01em;padding-bottom:10px;border-bottom:1px solid #dcdcdc">5 · Layout shell</div>
|
||||
<div style="display:grid;grid-template-columns:1fr 1fr;gap:24px;font-size:13px;color:#4a4a4a;line-height:1.55">
|
||||
<div style="display:flex;flex-direction:column;gap:8px"><span style="font-weight:600;color:#1f1f1f">Desktop</span><span>Top bar 56px #1a1a1a: brand 224px · ⌘K search max 520px #303030 · bell + user chip 224px.</span><span>Sidebar 240px #ebebeb, padding 12, items 32px radius 8; active item white with 1px ring and teal icon; badges 999px #dcdcdc.</span><span>Main padding 24/32, column gap 16. Page title 20px/650 with actions right. Detail pages use 1fr + 320–340px side rail.</span><span>Page background #f1f1f1; cards white, radius 12, ring rgba(0,0,0,.08) + 1px shadow.</span></div>
|
||||
<div style="display:flex;flex-direction:column;gap:8px"><span style="font-weight:600;color:#1f1f1f">Mobile (reporter)</span><span>390px reference. Page title 22px/650, horizontal padding 16, card gap 12.</span><span>Tab bar: white, 1px top rule, 3 items, 22px icons, 10.5px labels; active #0f766e.</span><span>Form controls 48px tall, radius 12; primary button full width 48px. Footers sit on #f1f1f1 with a 1px top rule and 30px bottom safe area.</span><span>Minimum hit target 44px everywhere.</span></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="display:flex;flex-direction:column;gap:12px">
|
||||
<div style="font-size:18px;font-weight:600;letter-spacing:-.01em;padding-bottom:10px;border-bottom:1px solid #dcdcdc">6 · Screen index</div>
|
||||
<div style="display:grid;grid-template-columns:repeat(auto-fill,minmax(300px,1fr));gap:6px 24px">
|
||||
<sc-for list="{{ screens }}" as="s" hint-placeholder-count="24"><div style="display:flex;gap:10px;padding:6px 0;border-bottom:1px solid #ebebeb;font-size:13px"><span style="font:600 11px 'Geist Mono',monospace;color:#616161;width:32px;flex:none;padding-top:2px">{{ s.id }}</span><span style="flex:1">{{ s.name }}</span><span style="font-size:12px;color:#8a8a8a;white-space:nowrap">{{ s.route }}</span></div></sc-for>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</x-dc>
|
||||
<script type="text/x-dc" data-dc-script>
|
||||
class Component extends DCLogic {
|
||||
renderVals() {
|
||||
const I = (paths, s = 16, w = 2) => React.createElement('svg', { width: s, height: s, viewBox: '0 0 24 24', fill: 'none', stroke: 'currentColor', strokeWidth: w, strokeLinecap: 'round', strokeLinejoin: 'round', style: { flex: 'none' } }, paths.map((d, i) => React.createElement('path', { key: i, d })));
|
||||
const P = {
|
||||
plus: ['M12 5v14', 'M5 12h14'], download: ['M12 3v12', 'm7 10 5 5 5-5', 'M4 19h16'], more: ['M12 12h.01', 'M19 12h.01', 'M5 12h.01'],
|
||||
chevDown: ['m6 9 6 6 6-6'], x: ['M18 6 6 18', 'm6 6 12 12'], rows: ['M3 5h18v14H3z', 'M3 12h18'], kanban: ['M6 5v11', 'M12 5v6', 'M18 5v14'],
|
||||
tick: ['M20 6 9 17l-5-5'], minus: ['M5 12h14'], search: ['M11 19a8 8 0 1 0 0-16 8 8 0 0 0 0 16z', 'm21 21-4.3-4.3'],
|
||||
sort: ['m7 15 5 5 5-5', 'm7 9 5-5 5 5'], down: ['M12 5v14', 'm19 12-7 7-7-7'], eye: ['M2 12s3.5-7 10-7 10 7 10 7-3.5 7-10 7S2 12 2 12z', 'M12 15a3 3 0 1 0 0-6 3 3 0 0 0 0 6z'],
|
||||
chevLeft: ['m15 18-6-6 6-6'], chevRight: ['m9 18 6-6-6-6']
|
||||
};
|
||||
const ic = {}; Object.keys(P).forEach(k => { ic[k] = I(P[k]); });
|
||||
ic.tick12 = I(P.tick, 12, 3); ic.minus12 = I(P.minus, 12, 3); ic.more = I(P.more, 16, 3); ic.sort12 = I(P.sort, 12); ic.down12 = I(P.down, 12, 2.5); ic.x12 = I(P.x, 12, 2.5); ic.chev12 = I(P.chevDown, 12, 2.5);
|
||||
const colors = [
|
||||
['Ink', '#1f1f1f', 'Primary text, active sidebar text'], ['Ink 2', '#303030', 'Primary button, chip text'], ['Ink 3', '#4a4a4a', 'Secondary text, icons'], ['Muted', '#616161', 'Labels, helper text'], ['Faint', '#8a8a8a', 'Placeholders, input ring'],
|
||||
['Rule', '#ebebeb', 'Row rules, sidebar bg'], ['Rule 2', '#e3e3e3', 'Header rule, segmented bg'], ['Ring', '#d4d4d4', 'Secondary button and chip ring'], ['Surface 2', '#f7f7f7', 'Table header, footer, row hover'], ['Ground', '#f1f1f1', 'Page background'],
|
||||
['Teal', '#0f766e', 'Accent: checks, links, active tab icon'], ['Teal tint', '#f2f7f6', 'Selected row, selected card'], ['Teal tint 2', '#e6f4f1', 'Set filter chip (ring #9fd3c7, text #0b4f47)'], ['Danger', '#b3261e', 'Overdue text, required marks'], ['Top bar', '#1a1a1a', 'App header (#303030 for its controls)']
|
||||
].map(c => ({ name: c[0], hex: c[1], use: c[2] }));
|
||||
const pills = [
|
||||
['Reported', '#fff1c2', '#6b4a00'], ['Triaged', '#e0efff', '#00527c'], ['Investigating', '#ede7ff', '#4b2e99'], ['CAPA pending', '#ffe6cf', '#7a3a00'], ['Verification', '#e3e8ff', '#2c3e8f'], ['Closed', '#d7f4e3', '#0c5132'],
|
||||
['Open', '#ebebeb', '#4a4a4a'], ['In progress', '#e0efff', '#00527c'], ['Overdue · Critical', '#fee3e0', '#8e1f0b'], ['High', '#ffe6cf', '#7a3a00'], ['Medium', '#fff1c2', '#6b4a00'], ['Active', '#d7f4e3', '#0c5132']
|
||||
].map(p => ({ label: p[0], bg: p[1], fg: p[2] }));
|
||||
const type = [
|
||||
['32 / 600 / -0.02em', '32px', 600, 'Geist', '-.02em', 'Cover title'], ['22 / 650 / -0.02em', '22px', 650, 'Geist', '-.02em', 'Mobile page title'], ['20 / 650 / -0.01em', '20px', 650, 'Geist', '-.01em', 'Page title'], ['16 / 650', '16px', 650, 'Geist', '-.01em', 'Card title (detail)'], ['14 / 600', '14px', 600, 'Geist', '0', 'Section heading'], ['13 / 400–550', '13px', 450, 'Geist', '0', 'Body, table cells, buttons'], ['12 / 550', '12px', 550, 'Geist', '0', 'Table header, pill, helper'], ['12.5 mono', '12.5px', 500, "'Geist Mono'", '0', 'IMS-2026-0247']
|
||||
].map(t => ({ spec: t[0], size: t[1], w: t[2], fam: t[3], ls: t[4], sample: t[5] }));
|
||||
const shape = [
|
||||
['radius', '12 cards, phones' + ' · 10 drawer/inputs mobile · 8 buttons, chips, inputs, pills, sidebar items · 6 avatars 24px · 5 checkbox · 999 badges'],
|
||||
['card', 'bg #fff · box-shadow 0 0 0 1px rgba(0,0,0,.08), 0 1px 2px rgba(0,0,0,.06)'],
|
||||
['floating', 'box-shadow 0 0 0 1px rgba(0,0,0,.1), 0 12px 32px rgba(0,0,0,.18) (bulk bar, drawer uses 24/60 .24)'],
|
||||
['focus', 'outline 2px #0f766e, offset 2px, on every interactive element'],
|
||||
['spacing', '4 · 6 · 8 · 10 · 12 · 16 · 20 · 24 · 32. Card padding 16–20 · table cell 12 · toolbar 10/12'],
|
||||
['icons', 'Lucide, 16px stroke 2 in UI · 12px stroke 2.5 inside chips/checks · 22px stroke 1.8 in mobile tab bar']
|
||||
].map(s => ({ k: s[0], v: s[1] }));
|
||||
const screens = [
|
||||
['01', 'Incidents list', '/hse/incidents'], ['01b', 'Notifications drawer', 'global'], ['02', 'Incident detail', '/hse/incidents/[id]'], ['02b', 'Triage form', '/hse/incidents/[id] · triage'], ['02c', 'Investigation form', '/hse/incidents/[id] · investigation'], ['02d', 'DOSH reporting · JKKP 6', '/hse/incidents/[id] · new'],
|
||||
['03', 'Dashboard', '/hse/dashboard'], ['04', 'CAPA list', '/hse/capa'], ['04b', 'CAPA board', '/hse/capa · board'], ['04c', 'CAPA detail · verification', '/hse/capa · new'],
|
||||
['05', 'Admin · users', '/admin'], ['05b', 'Admin · sites & zones', '/admin · tab'], ['05c', 'Admin · trucks', '/admin · tab'], ['05d', 'Admin · audit log', '/admin · new tab'], ['06', 'Settings', '/hse/settings'], ['07', 'Reporter · my reports', '/reporter'], ['08', 'Empty state', 'pattern'],
|
||||
['09', 'Mobile · reporter home', '/reporter'], ['10', 'Mobile · incidents', '/hse/incidents'], ['11', 'Mobile · incident detail', '/hse/incidents/[id]'], ['12–15', 'Mobile · new incident 1/3 → saved offline', '/report'], ['16', 'Mobile · CAPA owner action', '/capa-owner']
|
||||
].map(s => ({ id: s[0], name: s[1], route: s[2] }));
|
||||
return { ic, colors, pills, type, shape, screens };
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,214 @@
|
||||
# IMS Design System: Admin refresh
|
||||
|
||||
Source of truth for IMS UI. Derived from `IMS Admin Spec.dc.html` (patterns, tokens, states) and `IMS Admin.dc.html` (25 artboards: 7 desktop screens plus variants, 9 mobile screens). When this file and the mockups disagree, fix this file and say so in the PR. The earlier Modernist system (`design-system/_ds/`) is retired.
|
||||
|
||||
Rules in `CLAUDE.md` ("Design system") summarise this file. Tokens in `app/globals.css` mirror §2.
|
||||
|
||||
## 1. Principles
|
||||
|
||||
- Neutral commerce-admin look: grey ground, white cards, dark primary action, one teal accent used sparingly.
|
||||
- Every list is a `TableCard` (§4.9). Do not hand-build tables.
|
||||
- Status is always a dark text step on a light tint, with a text label (§4.2). Never white text on a saturated fill, never colour alone.
|
||||
- Rules are 1px. Corners come from the radius scale in §2.3. Text and headings are flush left.
|
||||
- Minimum hit target 44px on mobile.
|
||||
|
||||
## 2. Tokens
|
||||
|
||||
### 2.1 Colour
|
||||
|
||||
| Token | Hex | Use |
|
||||
| --- | --- | --- |
|
||||
| `ink` | `#1f1f1f` | Primary text, active sidebar text |
|
||||
| `ink-2` | `#303030` | Primary button, chip text |
|
||||
| `ink-3` | `#4a4a4a` | Secondary text, icons |
|
||||
| `muted` | `#616161` | Labels, helper text |
|
||||
| `faint` | `#8a8a8a` | Placeholders, input ring |
|
||||
| `rule` | `#ebebeb` | Row rules, sidebar background |
|
||||
| `rule-2` | `#e3e3e3` | Header rule, segmented background |
|
||||
| `ring` | `#d4d4d4` | Secondary button and chip ring |
|
||||
| `surface` | `#ffffff` | Cards, rows, inputs |
|
||||
| `surface-2` | `#f7f7f7` | Table header, footer, row hover |
|
||||
| `ground` | `#f1f1f1` | Page background |
|
||||
| `accent` | `#0f766e` | Checks, links, focus ring, active tab icon |
|
||||
| `accent-tint` | `#f2f7f6` | Selected row, selected card |
|
||||
| `accent-tint-2` | `#e6f4f1` | Set filter chip (ring `#9fd3c7`, text `#0b4f47`) |
|
||||
| `danger` | `#b3261e` | Overdue text, required marks, input error |
|
||||
| `topbar` | `#1a1a1a` | App header (its controls use `#303030`, ring `#3d3d3d`, text `#a3a3a3`) |
|
||||
|
||||
Tailwind names: `bg-ground`, `bg-surface`, `bg-surface-2`, `text-ink`, `text-ink-2`, `text-ink-3`, `text-muted`, `text-faint`, `border-rule`, `border-rule-2`, `border-ring`, `bg-accent`, `text-accent`, `bg-accent-tint`, `bg-accent-tint-2`, `text-danger`, `bg-topbar`.
|
||||
|
||||
### 2.2 Type
|
||||
|
||||
Geist for UI, Geist Mono for references and keyboard hints. Exposed as `--font-geist` and `--font-geist-mono`.
|
||||
|
||||
| Spec | Use |
|
||||
| --- | --- |
|
||||
| 32 / 600 / -0.02em | Cover title |
|
||||
| 22 / 650 / -0.02em | Mobile page title |
|
||||
| 20 / 650 / -0.01em | Page title |
|
||||
| 16 / 650 / -0.01em | Card title (detail) |
|
||||
| 14 / 600 | Section heading |
|
||||
| 13 / 400-550 | Body, table cells, buttons |
|
||||
| 12 / 550 | Table header, pill, helper |
|
||||
| 12.5 mono / 500 | References such as `IMS-2026-0247` |
|
||||
|
||||
### 2.3 Radius, shadow, spacing, icons
|
||||
|
||||
- **Radius:** 12 cards and phones; 10 mobile drawer and mobile inputs; 8 buttons, chips, inputs, pills, sidebar items; 6 avatars (24px); 5 checkbox; 999 badges. Tailwind: `rounded-md` = 8, `rounded-xl` = 12, `rounded-[5px]` checkbox.
|
||||
- **Card shadow** (`shadow-card`): `0 0 0 1px rgba(0,0,0,.08), 0 1px 2px rgba(0,0,0,.06)`.
|
||||
- **Floating shadow** (`shadow-float`, bulk bar): `0 0 0 1px rgba(0,0,0,.1), 0 12px 32px rgba(0,0,0,.18)`. Drawer: `0 0 0 1px rgba(0,0,0,.1), 0 24px 60px rgba(0,0,0,.24)`.
|
||||
- **Focus:** `outline: 2px solid accent; outline-offset: 2px` on every interactive element.
|
||||
- **Spacing:** 4, 6, 8, 10, 12, 16, 20, 24, 32. Card padding 16-20, table cell 12, toolbar 10/12.
|
||||
- **Icons:** Lucide. 16px stroke 2 in UI; 12px stroke 2.5 inside chips and checks; 22px stroke 1.8 in the mobile tab bar.
|
||||
- **Motion:** transitions 120ms on background and shadow only.
|
||||
|
||||
## 3. Layout shell
|
||||
|
||||
**Desktop (`AppShell`)**
|
||||
- Top bar 56px `topbar`: brand 224px (28px teal tile radius 8, "IMS", muted "Setia HSE"), search max 520px (34px, radius 10, shows a Cmd-K hint), bell and user chip on the right.
|
||||
- Sidebar 240px `rule` background, 1px right border `#e0e0e0`, padding 12, items 32px radius 8, 13px. Active item: white, 1px ring, teal icon. Badges 999 `#dcdcdc`, 11px/600. Footer block has a 1px `#dcdcdc` top rule.
|
||||
- Main: padding 24/32, column gap 16. Page title 20px/650 with actions on the right. Detail pages use `1fr` plus a 320-340px side rail.
|
||||
- Page background `ground`; cards `surface`, radius 12, `shadow-card`.
|
||||
|
||||
**Mobile (`MobileShell`, reporter and CAPA owner)**
|
||||
- 390px reference. Page title 22px/650, horizontal padding 16, card gap 12.
|
||||
- Tab bar: white, 1px top rule, 3 items, 22px icons, 10.5px labels, active `accent`.
|
||||
- Controls 48px tall, radius 12; primary button full width 48px. Footers sit on `ground` with a 1px top rule and 30px bottom safe area.
|
||||
|
||||
## 4. Components
|
||||
|
||||
Hover and active values below are per component. Every interactive element also gets the global focus ring (§2.3). Disabled controls drop to 45% opacity.
|
||||
|
||||
### 4.1 Button
|
||||
- **Primary** 32px, radius 8, `#303030`, white 13px/600, inset highlight `inset 0 -1px 0 #000, inset 0 1px 0 rgba(255,255,255,.18), 0 1px 2px rgba(0,0,0,.2)`. Hover `#1f1f1f`, active `#000`.
|
||||
- **Secondary** white, 13px/550, ring `inset 0 0 0 1px #d4d4d4, 0 1px 0 rgba(0,0,0,.05)`. Hover `#f7f7f7`, active `#ebebeb`.
|
||||
- **Icon** 28px ghost, radius 8, `ink-3`. Hover `#ebebeb`.
|
||||
- Mobile primary: full width, 48px, radius 12.
|
||||
|
||||
### 4.2 StatusTag and PriorityTag
|
||||
Pill: `inline-flex`, padding 2px 8px, radius 8, 12px/550, no wrap. Dark text on a light tint. Incident status and CAPA status share one palette.
|
||||
|
||||
| Label | Background | Text |
|
||||
| --- | --- | --- |
|
||||
| Reported | `#fff1c2` | `#6b4a00` |
|
||||
| Triaged | `#e0efff` | `#00527c` |
|
||||
| Investigating | `#ede7ff` | `#4b2e99` |
|
||||
| CAPA pending | `#ffe6cf` | `#7a3a00` |
|
||||
| Verification | `#e3e8ff` | `#2c3e8f` |
|
||||
| Closed | `#d7f4e3` | `#0c5132` |
|
||||
| Open | `#ebebeb` | `#4a4a4a` |
|
||||
| In progress | `#e0efff` | `#00527c` |
|
||||
| Overdue / Critical | `#fee3e0` | `#8e1f0b` |
|
||||
| High | `#ffe6cf` | `#7a3a00` |
|
||||
| Medium | `#fff1c2` | `#6b4a00` |
|
||||
| Low | `#ebebeb` | `#4a4a4a` |
|
||||
| Active | `#d7f4e3` | `#0c5132` |
|
||||
| Verified | `#d7f4e3` | `#0c5132` |
|
||||
| Reopened | `#fee3e0` | `#8e1f0b` |
|
||||
|
||||
Mapping from the data model: incident `reported/triaged/investigating/capa_pending/verification/closed` use the matching rows; CAPA `open/in_progress/overdue/pending_verification/verified/reopened/closed` map to Open, In progress, Overdue, Verification, Verified, Reopened, Closed; priority `high/med/low` map to High, Medium, Low. Severity 5 and Critical use the Overdue / Critical row. Tailwind: one pair per hue, `bg-st-<hue>-bg` / `text-st-<hue>-fg`, hue in `amber blue violet orange indigo green grey red`; `StatusTag` maps each status to a hue (reported amber, triaged blue, investigating violet, capa_pending orange, verification and pending_verification indigo, closed and verified green, open and low grey, in_progress blue, overdue and reopened red, high orange, med amber). Banners follow the same pairs: error red, warning or offline amber, success green; AI suggestions and hints use `bg-accent-tint`. No icon required; the text label is always present.
|
||||
|
||||
### 4.3 FilterChip
|
||||
28px, radius 8, 12.5px, padding 0 10px. Unset: white, ring `#d4d4d4`, text `#303030`, trailing 12px chevron. Set: `accent-tint-2`, ring `#9fd3c7`, text `#0b4f47`, shows "Label: value" and a clear x.
|
||||
|
||||
### 4.4 Segmented
|
||||
Container padding 2px, background `#e3e3e3`, radius 10. Option 13px, padding 5px 10px, radius 8. Active: white, 13px/600, `0 1px 2px rgba(0,0,0,.1)`. Used for List / Board.
|
||||
|
||||
### 4.5 Checkbox
|
||||
16px, radius 5. Off: white with `inset 0 0 0 1.5px #8a8a8a`. On and indeterminate (header): `accent` fill, white 12px tick or minus at stroke 3.
|
||||
|
||||
### 4.6 Field and Input
|
||||
Input 36px desktop, 48px mobile, padding 0 12px, radius 8 (12 on mobile), 13px, white. Rest ring `inset 0 0 0 1px #8a8a8a`; focus ring 2px `accent`; error ring `danger`. Placeholder `faint`. Label 12px `muted`, 5px above. Textarea and Select share the ring.
|
||||
|
||||
### 4.7 Avatar
|
||||
24px, radius 6, background `#c5e8e0`, text `#0b4f47`, 11px/650, initials. Top bar variant sits in a `#303030` chip.
|
||||
|
||||
### 4.8 Card
|
||||
White, radius 12, `shadow-card`, padding 16-20. Selected card uses `accent-tint`. Detail card title 16px/650.
|
||||
|
||||
### 4.9 TableCard
|
||||
One component wraps every list. Parts top to bottom, all optional except the table and the card:
|
||||
- **A. Saved views:** padding 8, bottom rule `#ebebeb`. View chip 28px radius 8, 13px; active `#e3e3e3` 13px/600 with a faint count (12px `#8a8a8a`); trailing + button opens "Save current filters as view". Saved views are server-side filters; counts update live.
|
||||
- **B. Toolbar:** padding 10/12, bottom rule. Search 32px, radius 8, ring `#8a8a8a`, min-width 260. Filter chips (§4.3). Right-aligned actions.
|
||||
- **C. Header:** `surface-2`, 12px/550 `muted`, padding 9/12, bottom rule `#e3e3e3`. Single-column sort: sorted column shows a filled arrow in `ink`, others a faint `#c4c4c4` double chevron.
|
||||
- **D. Row rest:** white, 13px, cell padding 12, 1px `#ebebeb` rule. References in Geist Mono 12.5px in `accent`.
|
||||
- **E. Row hover:** `surface-2`; quick actions (eye, more) appear on the right as 28px icon buttons.
|
||||
- **F. Row selected:** `accent-tint` and a filled checkbox.
|
||||
- **G. Footer:** `surface-2`, padding 10/16, "Showing 1-3 of 248" left, pager right (32px segmented chevrons, radius 8 on outer ends, ring `#d4d4d4`).
|
||||
- **H. Bulk bar:** floats centred above the footer on first selection. White, radius 12, `shadow-float`, padding 6 6 6 12; checkbox, "N selected", divider, ghost actions (Assign, Export).
|
||||
- **Empty state:** replaces thead and tbody: 64px icon tile, one line of copy, the primary action.
|
||||
|
||||
Behaviour: the whole row opens the record; the checkbox cell, links and quick actions stop propagation.
|
||||
|
||||
**Mobile:** below 768px the table becomes a stacked list in the same card: reference + status on line one, type and zone on line two, date on line three, chevron right. Saved views become horizontally scrolling 999px chips; filters collapse to one "Filter" button opening a sheet; the bulk bar becomes a bottom sheet.
|
||||
|
||||
### 4.10 Drawer
|
||||
Notifications drawer: absolute, top/right/bottom 8px, width 420px, white, radius 14, shadow `0 0 0 1px rgba(0,0,0,.1), 0 24px 60px rgba(0,0,0,.24)`; scrim `rgba(0,0,0,.28)`. Header 16px/650 title with "Mark all read" (12.5px/550 `accent`), settings and close icon buttons. Tab row of 28px view chips with counts. Group labels 11.5px/600 uppercase `faint`. Items: 32px radius-9 icon tile, padding 12/16, rule `#f0f0f0`, unread items tinted.
|
||||
|
||||
## 5. Screen index
|
||||
|
||||
| Id | Screen | Route |
|
||||
| --- | --- | --- |
|
||||
| 01 | Incidents list | `/hse/incidents` |
|
||||
| 01b | Notifications drawer | global |
|
||||
| 02 | Incident detail | `/hse/incidents/[id]` |
|
||||
| 02b | Triage form | `/hse/incidents/[id]` triage |
|
||||
| 02c | Investigation form | `/hse/incidents/[id]` investigation |
|
||||
| 02d | DOSH reporting (JKKP 6) | `/hse/incidents/[id]` new |
|
||||
| 03 | Dashboard | `/hse/dashboard` |
|
||||
| 04 | CAPA list | `/hse/capa` |
|
||||
| 04b | CAPA board | `/hse/capa` board |
|
||||
| 04c | CAPA detail, verification | `/hse/capa` new |
|
||||
| 05 | Admin, users | `/admin` |
|
||||
| 05b | Admin, sites and zones | `/admin` tab |
|
||||
| 05c | Admin, trucks | `/admin` tab |
|
||||
| 05d | Admin, audit log | `/admin` new tab |
|
||||
| 06 | Settings, API keys | `/hse/settings` |
|
||||
| 07 | Reporter, my reports | `/reporter` |
|
||||
| 08 | Empty state | pattern |
|
||||
| 09 | Mobile, reporter home | `/reporter` |
|
||||
| 10 | Mobile, incidents | `/hse/incidents` |
|
||||
| 11 | Mobile, incident detail | `/hse/incidents/[id]` |
|
||||
| 12-15 | Mobile, new incident 1/3 to saved offline | `/report` |
|
||||
| 16 | Mobile, CAPA owner action | `/capa-owner` |
|
||||
|
||||
Mockup features with no backend yet (do not fake them in the UI): CAPA export, bulk actions on a selection (send reminder, reassign, escalate), group-by, department and due-date range filters, the activity and comments feed, cost, evidence files on a CAPA, the verification note, "ask owner a question", and edit. Add them in a slice that also adds the backend.
|
||||
|
||||
New routes in the mockup that do not exist yet: audit log (05d), DOSH reporting entry (02d), and any "new tab" marked above. Treat them as separate features; do not build them as part of the restyle.
|
||||
|
||||
## 6. Accessibility
|
||||
|
||||
- Text on tints passes contrast because pills use dark steps. Body text is `ink` or `ink-3` on white or `ground`; `faint` is for placeholders only.
|
||||
- Focus ring on every interactive element; nothing relies on colour alone.
|
||||
- Hit targets 44px minimum on mobile.
|
||||
|
||||
## 7. Scope
|
||||
|
||||
This file covers look and component structure. Routes, queries, permissions and audit logging do not change as part of a restyle.
|
||||
|
||||
## 8. Build order
|
||||
|
||||
1. **Tokens:** replace the Modernist tokens in `app/globals.css` with §2 (`@theme static`), Geist via `next/font`, `shadow-card`, `shadow-float`, `st-*` pairs. Keep the `gray-*`/`blue-*`/`red-*` remaps pointing at the new neutral and teal values so unmigrated pages stay readable.
|
||||
2. **UI primitives:** `Button`, `StatusTag`, `PriorityTag`, `Checkbox`, `Field`/`Input`/`Select`/`Textarea`, `FilterChip`, `Segmented`, `Avatar`, `Card`, `Drawer` in `components/ui/`.
|
||||
3. **TableCard** (§4.9) with the desktop and mobile variants.
|
||||
4. **Shells:** `AppShell` (top bar, sidebar, notifications drawer) and `MobileShell`.
|
||||
5. **Migrate the Incidents list** (screen 01 and 10) as the first full screen.
|
||||
6. **Remaining screens**, in §5 order, one plan per group.
|
||||
|
||||
Slice 1 (gate, tokens, primitives, TableCard, shells, Incidents list) and slice 2 (CAPA list, board, detail, verification, create form) are implemented; the remaining screens follow in later plans.
|
||||
|
||||
Gate first: before step 1, update `scripts/check-design-gates.mjs` to allow `rounded-*`, flag `border-b-2` and `border-2`, and flag Archivo and `#ec3013`. `npm run check:design` must pass at the end of each step.
|
||||
|
||||
## 9. What changes from the live Modernist build
|
||||
|
||||
| Area | Now (Modernist) | After |
|
||||
| --- | --- | --- |
|
||||
| Font | Archivo | Geist and Geist Mono |
|
||||
| Accent | `#ec3013` red | `#0f766e` teal (used sparingly) |
|
||||
| Primary button | red, flush left | `#303030`, 32px, radius 8 |
|
||||
| Radius | 0 everywhere | 8 / 10 / 12 scale |
|
||||
| Rules | 2px section rules | 1px |
|
||||
| Status | mono tags (accent, outline, neutral) | coloured pills (§4.2) |
|
||||
| Sidebar | flat, 2px rule | dark top bar plus `#ebebeb` sidebar |
|
||||
| Lists | per-page tables | `TableCard` |
|
||||
| Gate | no rounded, 2px rules | rounded allowed, 2px flagged |
|
||||
File diff suppressed because it is too large
Load Diff
@@ -21,6 +21,80 @@ _Nothing yet._
|
||||
|
||||
---
|
||||
|
||||
## [2.0.0] - 2026-11-06
|
||||
|
||||
**Breaking:** the Reporter, Supervisor and CAPA Owner roles are merged into one
|
||||
role, **Site Safety Assistant (SSA)**. Existing sessions carry the old role, so
|
||||
those users must log out and in again after the deploy.
|
||||
|
||||
### Changed
|
||||
|
||||
- **Roles — `reporter`, `supervisor` and `capa_owner` become `ssa`.**
|
||||
The role set is now `ssa`, `hse`, `management`, `admin`.
|
||||
- SSA sees incidents for their own site and their own reports, can update
|
||||
incidents, and works their assigned CAPAs.
|
||||
- Role checks in the API, the nav, notifications (e.g. new-incident and CAPA
|
||||
escalation emails) and the user manager now use `ssa`.
|
||||
- Unknown roles fall back to the SSA navigation.
|
||||
- **Pages moved under `/ssa`:** `/reporter` → `/ssa/my-reports`,
|
||||
`/supervisor` → `/ssa`, `/supervisor/incidents` → `/ssa/incidents`,
|
||||
`/capa-owner` → `/ssa/capas`. The header search for SSA targets `/ssa/incidents`.
|
||||
|
||||
### Removed
|
||||
|
||||
- Legacy Supabase code and dependencies: `lib/supabase/*`, `@supabase/ssr`,
|
||||
`@supabase/supabase-js` and the `supabase/` migrations folder. The app already
|
||||
ran on local PostgreSQL; `db/schema.sql` and `db/rls.sql` are the schema source
|
||||
of truth.
|
||||
|
||||
### Affected modules
|
||||
|
||||
Auth and roles (`lib/auth/roles.ts`), navigation and shell (`components/layout/*`),
|
||||
SSA pages (`app/(protected)/ssa/*`), incident, CAPA and addenda API routes,
|
||||
admin user manager, email and CAPA-escalation notifications, RLS policies.
|
||||
|
||||
### Database migrations
|
||||
|
||||
- **`db/ops/2026-11-06-merge-roles-into-ssa.sql`**, applied by hand to production
|
||||
on 2026-11-06 as the `postgres` superuser (the app DB user cannot bypass RLS).
|
||||
One transaction: converts `reporter`/`supervisor`/`capa_owner` users to `ssa`,
|
||||
recreates the `user_role` enum as `ssa, hse, management, admin`, recreates
|
||||
`auth_user_role()`, then drops and re-creates all 34 RLS policies.
|
||||
Take a `pg_dump` first. Users with the old role in their session cookie must log
|
||||
out and in again.
|
||||
- No migration is needed for the Supabase removal.
|
||||
|
||||
### API changes
|
||||
|
||||
- No endpoint was added or removed. The role value in the session and in
|
||||
`/api/admin/users` is now `ssa` instead of `reporter`, `supervisor` or
|
||||
`capa_owner`. Creating or updating a user with any role outside the four new
|
||||
ones returns `422 Invalid role`; the default role for a new user is `ssa`.
|
||||
- Page routes changed as listed under **Changed**.
|
||||
|
||||
### Testing
|
||||
|
||||
1. Log in as an `ssa` user. Check `/ssa`, `/ssa/my-reports`, `/ssa/incidents`
|
||||
(site incidents only) and `/ssa/capas`.
|
||||
2. Submit a new incident at `/report` and confirm it shows under **My Reports**.
|
||||
3. Open an assigned CAPA and submit proof (note and photos).
|
||||
4. As `hse` and `admin`, confirm dashboards, incident lists and the user manager
|
||||
still work, and that the user manager offers only the four new roles.
|
||||
5. Run `npm run test` and `npm run build`. Seven tests fail on `main` as well
|
||||
(AI routes, bulk-import, email); no new failures were introduced.
|
||||
6. In Postgres: `SELECT DISTINCT role FROM users;` returns only
|
||||
`ssa`, `hse`, `management`, `admin`.
|
||||
|
||||
### Also in this version since 1.2.2 (summarised from git history)
|
||||
|
||||
- IMS Admin UI refresh: new tokens, Geist, `TableCard`, new shells; Incidents and
|
||||
CAPA lists migrated.
|
||||
- CAPA owners submit proof with a note and photos; HSE sees a photo gallery.
|
||||
- Trucks are linked to a site; the report form lists all trucks.
|
||||
- AI provider switched to a local model.
|
||||
|
||||
---
|
||||
|
||||
## [1.1.0] - 2026-07-16
|
||||
|
||||
### Fixed
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
# Cleanup: delete test incidents and non-admin users
|
||||
|
||||
Owner go-ahead required before step 4. Never run during business hours without telling HSE.
|
||||
|
||||
1. **Backup** (on the server, `ssh -p 9321 setia@175.136.239.121`):
|
||||
```bash
|
||||
D=$(date +%Y%m%d-%H%M)
|
||||
pg_dump -p 5433 -Fc ims > /srv/apps/ims/backups/ims-pre-cleanup-$D.dump
|
||||
tar -czf /srv/apps/ims/backups/evidence-pre-cleanup-$D.tgz /var/lib/ims-evidence
|
||||
ls -lh /srv/apps/ims/backups/*pre-cleanup-$D*
|
||||
```
|
||||
Create `/srv/apps/ims/backups` first if missing. Both files must be non-empty.
|
||||
2. **Upload** `db/ops/cleanup-test-data.sql` to `/srv/apps/ims/backups/` (not into `app/`).
|
||||
3. **Dry run.** Use a DB role that owns the tables and bypasses RLS (superuser, or the owner role with BYPASSRLS). The tables have FORCE RLS and no DELETE policies, so as `app_user` or a plain owner the counts can read 0 and deletes silently remove nothing. Check first: `psql -p 5433 -d ims -Atc "select rolsuper or rolbypassrls from pg_roles where rolname = current_user"` must print `t`. Then:
|
||||
```bash
|
||||
psql -p 5433 -d ims -v mode=dryrun -f /srv/apps/ims/backups/cleanup-test-data.sql
|
||||
```
|
||||
Send the admins list and the row counts to the owner. If incidents or users show 0 when the app shows rows, you are on the wrong role: stop. Mention that audit_log rows written by non-admin users about other tables (zones, trucks, settings) are also removed. Stop here until they confirm.
|
||||
4. **Run** after explicit confirmation:
|
||||
```bash
|
||||
psql -p 5433 -d ims -v ON_ERROR_STOP=1 -v mode=run -f /srv/apps/ims/backups/cleanup-test-data.sql
|
||||
```
|
||||
5. **Verify**: `systemctl is-active ims` is `active`; log in as an admin at https://ims.setia.com.my/login; Incidents page is empty; Users page lists only admins.
|
||||
6. **Rollback** (only if wrong): `pg_restore -p 5433 -d ims --clean --if-exists <dump>`; evidence files were never touched.
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,886 @@
|
||||
# Truck to Site Link Implementation Plan
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** Let admin link a truck to one site (with edit), and make the Report an Incident truck dropdown show only trucks for the selected site plus unassigned trucks.
|
||||
|
||||
**Architecture:** Nullable `trucks.site_id` column (hand-applied SQL). `/api/admin/trucks` POST and PATCH accept `site_id` and PATCH becomes a partial edit (truck_no, carrier, site_id, active). The Trucks admin tab gets a Site select on add, a site label per row and an Edit modal. The report form filters trucks with a pure helper `trucksForSite`.
|
||||
|
||||
**Tech Stack:** Next.js 16 App Router, Drizzle ORM + `pg`, vitest + Testing Library.
|
||||
|
||||
Spec: `docs/superpowers/specs/2026-10-15-truck-site-link-design.md`
|
||||
|
||||
## Global Constraints
|
||||
|
||||
- A truck links to **one** site, optional. Existing trucks stay unassigned.
|
||||
- A truck with no site shows for **every** site on the report form.
|
||||
- `POST /api/incidents` is NOT changed and does not reject a truck/site mismatch.
|
||||
- Schema change is hand-applied: write `db/ops/2026-10-15-trucks-site-id.sql`, edit `db/schema.sql` and `lib/db/schema.ts`. Do NOT run any SQL against any database. No RLS change.
|
||||
- Every DB mutation writes `audit_log` in the same transaction (existing pattern with `writeAuditLog`).
|
||||
- Admin routes use `requireAdmin()` and `asAdmin`.
|
||||
- UI uses existing tokens and classes (`bg-surface`, `border-divider`, `text-accent-700`, ...). No hard-coded hex, no `bg-white`, no 2px borders. `npm run check:design` must print `design gates: clean`.
|
||||
- Baseline: 7 pre-existing failing vitest tests. Do not fix or count them. After code changes run `graphify update .`.
|
||||
- Never commit `.env*`. Do not commit the unrelated dirty files (`design-system/ims-admin/MASTER.md` deletion, `*.zip`, `artifacts/`, `scripts/create-agent-*.js`, `.superpowers/sdd/progress.md`). Stage only the files named in each task.
|
||||
- Work on branch `feat/truck-site`.
|
||||
|
||||
---
|
||||
|
||||
### Task 1: Schema, SQL and site/truck helpers
|
||||
|
||||
**Files:**
|
||||
- Create: `db/ops/2026-10-15-trucks-site-id.sql`
|
||||
- Modify: `db/schema.sql` (after the `CREATE TABLE trucks (...)` block, line ~96-102)
|
||||
- Modify: `lib/db/schema.ts` (`trucks` table, line ~102)
|
||||
- Create: `lib/report/trucks.ts`
|
||||
- Create: `lib/admin/truck-input.ts`
|
||||
- Modify: `lib/report/zones.ts` (add `siteIdForToken`)
|
||||
- Test: `tests/lib/report/trucks.test.ts`, `tests/lib/admin/truck-input.test.ts`, `tests/lib/report/zones.test.ts` (append)
|
||||
|
||||
**Interfaces:**
|
||||
- Produces: `trucksForSite<T extends { site_id: string | null }>(trucks: T[], siteId: string): T[]`; `siteForTruck(trucks: { id: string; site_id: string | null }[], truckId: string | null | undefined): string | null`; `parseSiteId(raw: unknown): { ok: true; value: string | null | undefined } | { ok: false }`; `siteIdForToken(sites: SiteOption[], token: string | null): string` (returns `''` when none); `trucks.siteId` Drizzle column.
|
||||
|
||||
- [ ] **Step 1: Write the failing tests**
|
||||
|
||||
`tests/lib/report/trucks.test.ts`:
|
||||
```ts
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { trucksForSite, siteForTruck } from '@/lib/report/trucks'
|
||||
|
||||
const trucks = [
|
||||
{ id: 't1', site_id: 'A' },
|
||||
{ id: 't2', site_id: 'B' },
|
||||
{ id: 't3', site_id: null },
|
||||
]
|
||||
|
||||
describe('trucksForSite', () => {
|
||||
it('returns matching and unassigned trucks', () => {
|
||||
expect(trucksForSite(trucks, 'A').map(t => t.id)).toEqual(['t1', 't3'])
|
||||
expect(trucksForSite(trucks, 'B').map(t => t.id)).toEqual(['t2', 't3'])
|
||||
})
|
||||
it('returns all trucks when no site is selected', () => {
|
||||
expect(trucksForSite(trucks, '').map(t => t.id)).toEqual(['t1', 't2', 't3'])
|
||||
})
|
||||
it('returns only unassigned trucks for a site with none linked', () => {
|
||||
expect(trucksForSite(trucks, 'C').map(t => t.id)).toEqual(['t3'])
|
||||
})
|
||||
})
|
||||
|
||||
describe('siteForTruck', () => {
|
||||
it('returns the truck site', () => {
|
||||
expect(siteForTruck(trucks, 't2')).toBe('B')
|
||||
})
|
||||
it('returns null for unassigned, unknown or missing truck', () => {
|
||||
expect(siteForTruck(trucks, 't3')).toBeNull()
|
||||
expect(siteForTruck(trucks, 'nope')).toBeNull()
|
||||
expect(siteForTruck(trucks, null)).toBeNull()
|
||||
})
|
||||
})
|
||||
```
|
||||
|
||||
`tests/lib/admin/truck-input.test.ts`:
|
||||
```ts
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { parseSiteId } from '@/lib/admin/truck-input'
|
||||
|
||||
const UUID = '3f2b8c1e-9d4a-4e6f-8a1b-2c3d4e5f6a7b'
|
||||
|
||||
describe('parseSiteId', () => {
|
||||
it('treats undefined as not provided', () => {
|
||||
expect(parseSiteId(undefined)).toEqual({ ok: true, value: undefined })
|
||||
})
|
||||
it('treats null and empty string as clear', () => {
|
||||
expect(parseSiteId(null)).toEqual({ ok: true, value: null })
|
||||
expect(parseSiteId('')).toEqual({ ok: true, value: null })
|
||||
})
|
||||
it('accepts a uuid', () => {
|
||||
expect(parseSiteId(UUID)).toEqual({ ok: true, value: UUID })
|
||||
})
|
||||
it('rejects anything else', () => {
|
||||
expect(parseSiteId('abc')).toEqual({ ok: false })
|
||||
expect(parseSiteId(12)).toEqual({ ok: false })
|
||||
})
|
||||
})
|
||||
```
|
||||
|
||||
Append to `tests/lib/report/zones.test.ts` (add `siteIdForToken` to its existing import from `@/lib/report/zones`):
|
||||
```ts
|
||||
describe('siteIdForToken', () => {
|
||||
const sites = [
|
||||
{ id: 'A', name: 'Site A', zones: [{ id: 'z1', name: 'Dock', qr_code_token: 'tok-1' }] },
|
||||
{ id: 'B', name: 'Site B', zones: [{ id: 'z2', name: 'Yard', qr_code_token: 'tok-2' }] },
|
||||
]
|
||||
it('finds the site that owns the token', () => {
|
||||
expect(siteIdForToken(sites, 'tok-2')).toBe('B')
|
||||
})
|
||||
it('returns empty string for null or unknown token', () => {
|
||||
expect(siteIdForToken(sites, null)).toBe('')
|
||||
expect(siteIdForToken(sites, 'nope')).toBe('')
|
||||
})
|
||||
})
|
||||
```
|
||||
|
||||
- [ ] **Step 2: Run tests to verify they fail**
|
||||
|
||||
Run: `npx vitest run tests/lib/report/trucks.test.ts tests/lib/admin/truck-input.test.ts tests/lib/report/zones.test.ts`
|
||||
Expected: FAIL (modules / export not found).
|
||||
|
||||
- [ ] **Step 3: Write the helpers**
|
||||
|
||||
`lib/report/trucks.ts`:
|
||||
```ts
|
||||
export function trucksForSite<T extends { site_id: string | null }>(trucks: T[], siteId: string): T[] {
|
||||
if (!siteId) return trucks
|
||||
return trucks.filter(t => t.site_id === null || t.site_id === siteId)
|
||||
}
|
||||
|
||||
export function siteForTruck(
|
||||
trucks: { id: string; site_id: string | null }[],
|
||||
truckId: string | null | undefined,
|
||||
): string | null {
|
||||
if (!truckId) return null
|
||||
return trucks.find(t => t.id === truckId)?.site_id ?? null
|
||||
}
|
||||
```
|
||||
|
||||
`lib/admin/truck-input.ts`:
|
||||
```ts
|
||||
const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
|
||||
|
||||
export type SiteIdInput = { ok: true; value: string | null | undefined } | { ok: false }
|
||||
|
||||
// undefined = field not sent, null/'' = clear the link, uuid string = set it.
|
||||
export function parseSiteId(raw: unknown): SiteIdInput {
|
||||
if (raw === undefined) return { ok: true, value: undefined }
|
||||
if (raw === null || raw === '') return { ok: true, value: null }
|
||||
if (typeof raw === 'string' && UUID_RE.test(raw)) return { ok: true, value: raw }
|
||||
return { ok: false }
|
||||
}
|
||||
```
|
||||
|
||||
Append to `lib/report/zones.ts`:
|
||||
```ts
|
||||
export function siteIdForToken(sites: SiteOption[], token: string | null): string {
|
||||
if (!token) return ''
|
||||
return sites.find(s => s.zones.some(z => z.qr_code_token === token))?.id ?? ''
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 4: Schema and SQL**
|
||||
|
||||
`db/ops/2026-10-15-trucks-site-id.sql`:
|
||||
```sql
|
||||
-- Apply by hand on the server DB with the owner's go-ahead. Not run by deploy.
|
||||
BEGIN;
|
||||
ALTER TABLE trucks ADD COLUMN IF NOT EXISTS site_id UUID REFERENCES sites(id);
|
||||
CREATE INDEX IF NOT EXISTS trucks_site_id_idx ON trucks(site_id);
|
||||
COMMIT;
|
||||
```
|
||||
|
||||
`db/schema.sql`: immediately after the `CREATE TABLE trucks (...);` block add
|
||||
```sql
|
||||
ALTER TABLE trucks ADD COLUMN IF NOT EXISTS site_id UUID REFERENCES sites(id);
|
||||
CREATE INDEX IF NOT EXISTS trucks_site_id_idx ON trucks(site_id);
|
||||
```
|
||||
|
||||
`lib/db/schema.ts`: in `trucks` add after `carrier`:
|
||||
```ts
|
||||
siteId: uuid('site_id').references(() => sites.id),
|
||||
```
|
||||
(`sites` is declared above `trucks`, so no `AnyPgColumn` needed.)
|
||||
|
||||
- [ ] **Step 5: Run tests and typecheck**
|
||||
|
||||
Run: `npx vitest run tests/lib/report/trucks.test.ts tests/lib/admin/truck-input.test.ts tests/lib/report/zones.test.ts && npx tsc --noEmit`
|
||||
Expected: all PASS, tsc clean.
|
||||
|
||||
- [ ] **Step 6: Commit**
|
||||
|
||||
```bash
|
||||
git add db/ops/2026-10-15-trucks-site-id.sql db/schema.sql lib/db/schema.ts lib/report/trucks.ts lib/report/zones.ts lib/admin/truck-input.ts tests/lib/report/trucks.test.ts tests/lib/report/zones.test.ts tests/lib/admin/truck-input.test.ts
|
||||
git commit -m "feat(trucks): site_id column and site/truck helpers"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 2: Truck API accepts site_id and edits
|
||||
|
||||
**Files:**
|
||||
- Modify: `app/api/admin/trucks/route.ts` (POST and PATCH; DELETE unchanged)
|
||||
- Test: `tests/api/admin-trucks.test.ts` (create)
|
||||
|
||||
**Interfaces:**
|
||||
- Consumes: `parseSiteId` from `@/lib/admin/truck-input`; `trucks.siteId`.
|
||||
- Produces: `POST /api/admin/trucks {truck_no, carrier?, site_id?}`: 201 `{id}`, 422 invalid/unknown/inactive site, 400 duplicate. `PATCH /api/admin/trucks {id, active?, truck_no?, carrier?, site_id?}`: 200 `{ok:true}`, 422 for missing id, empty change set, empty `truck_no`, or bad/unknown/inactive site, 409 duplicate truck number, 500 other.
|
||||
|
||||
- [ ] **Step 1: Write the failing tests**
|
||||
|
||||
`tests/api/admin-trucks.test.ts`:
|
||||
```ts
|
||||
// @vitest-environment node
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
|
||||
const { selectQueue, setSpy, insertSpy, audit, txError } = vi.hoisted(() => ({
|
||||
selectQueue: [] as unknown[][],
|
||||
setSpy: vi.fn(),
|
||||
insertSpy: vi.fn(),
|
||||
audit: vi.fn(),
|
||||
txError: { code: null as string | null },
|
||||
}))
|
||||
|
||||
vi.mock('@/lib/auth/require-admin', () => ({
|
||||
requireAdmin: async () => ({ session: { sub: 'admin-1', role: 'admin' } }),
|
||||
}))
|
||||
vi.mock('@/lib/db/audit', () => ({ writeAuditLog: audit }))
|
||||
vi.mock('@/lib/db/with-user', () => {
|
||||
const tx = {
|
||||
execute: async () => undefined,
|
||||
insert: () => ({
|
||||
values: (v: unknown) => {
|
||||
insertSpy(v)
|
||||
return { returning: async () => [{ id: 'truck-new' }] }
|
||||
},
|
||||
}),
|
||||
update: () => ({
|
||||
set: (v: unknown) => {
|
||||
setSpy(v)
|
||||
return {
|
||||
where: async () => {
|
||||
if (txError.code) throw Object.assign(new Error('db'), { code: txError.code })
|
||||
},
|
||||
}
|
||||
},
|
||||
}),
|
||||
}
|
||||
const db = {
|
||||
select: () => ({ from: () => ({ where: () => ({ limit: async () => selectQueue.shift() ?? [] }) }) }),
|
||||
transaction: async (fn: (t: unknown) => unknown) => fn(tx),
|
||||
}
|
||||
return { asAdmin: async (fn: (d: unknown) => unknown) => fn(db) }
|
||||
})
|
||||
|
||||
import { POST, PATCH } from '@/app/api/admin/trucks/route'
|
||||
|
||||
const SITE = '3f2b8c1e-9d4a-4e6f-8a1b-2c3d4e5f6a7b'
|
||||
const req = (method: string, body: unknown) =>
|
||||
new Request('http://localhost/api/admin/trucks', {
|
||||
method,
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(body),
|
||||
}) as never
|
||||
|
||||
beforeEach(() => {
|
||||
selectQueue.length = 0
|
||||
setSpy.mockClear()
|
||||
insertSpy.mockClear()
|
||||
audit.mockClear()
|
||||
txError.code = null
|
||||
})
|
||||
|
||||
describe('POST /api/admin/trucks', () => {
|
||||
it('creates a truck with no site', async () => {
|
||||
const res = await POST(req('POST', { truck_no: 'WXY 1' }))
|
||||
expect(res.status).toBe(201)
|
||||
expect(insertSpy).toHaveBeenCalledWith({ truckNo: 'WXY 1', carrier: null, siteId: null })
|
||||
})
|
||||
it('creates a truck linked to an active site and audits it', async () => {
|
||||
selectQueue.push([{ id: SITE }])
|
||||
const res = await POST(req('POST', { truck_no: 'WXY 2', site_id: SITE }))
|
||||
expect(res.status).toBe(201)
|
||||
expect(insertSpy).toHaveBeenCalledWith({ truckNo: 'WXY 2', carrier: null, siteId: SITE })
|
||||
expect(audit).toHaveBeenCalledTimes(1)
|
||||
expect(audit.mock.calls[0][4]).toMatchObject({ site_id: SITE })
|
||||
})
|
||||
it('422 for a malformed site_id', async () => {
|
||||
const res = await POST(req('POST', { truck_no: 'WXY 3', site_id: 'abc' }))
|
||||
expect(res.status).toBe(422)
|
||||
expect(insertSpy).not.toHaveBeenCalled()
|
||||
})
|
||||
it('422 for an unknown or inactive site', async () => {
|
||||
selectQueue.push([])
|
||||
const res = await POST(req('POST', { truck_no: 'WXY 4', site_id: SITE }))
|
||||
expect(res.status).toBe(422)
|
||||
expect(insertSpy).not.toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
|
||||
describe('PATCH /api/admin/trucks', () => {
|
||||
it('sets site_id and audits with the previous row', async () => {
|
||||
selectQueue.push([{ id: 't1', siteId: null }], [{ id: SITE }])
|
||||
const res = await PATCH(req('PATCH', { id: 't1', site_id: SITE }))
|
||||
expect(res.status).toBe(200)
|
||||
expect(setSpy).toHaveBeenCalledWith({ siteId: SITE })
|
||||
expect(audit).toHaveBeenCalledTimes(1)
|
||||
expect(audit.mock.calls[0][4]).toEqual({ siteId: SITE })
|
||||
expect(audit.mock.calls[0][5]).toEqual({ id: 't1', siteId: null })
|
||||
})
|
||||
it('clears the site with null', async () => {
|
||||
selectQueue.push([{ id: 't1', siteId: SITE }])
|
||||
const res = await PATCH(req('PATCH', { id: 't1', site_id: null }))
|
||||
expect(res.status).toBe(200)
|
||||
expect(setSpy).toHaveBeenCalledWith({ siteId: null })
|
||||
})
|
||||
it('edits truck_no and carrier together', async () => {
|
||||
selectQueue.push([{ id: 't1' }])
|
||||
const res = await PATCH(req('PATCH', { id: 't1', truck_no: ' ABC 9 ', carrier: ' ' }))
|
||||
expect(res.status).toBe(200)
|
||||
expect(setSpy).toHaveBeenCalledWith({ truckNo: 'ABC 9', carrier: null })
|
||||
})
|
||||
it('still toggles active', async () => {
|
||||
selectQueue.push([{ id: 't1' }])
|
||||
const res = await PATCH(req('PATCH', { id: 't1', active: false }))
|
||||
expect(res.status).toBe(200)
|
||||
expect(setSpy).toHaveBeenCalledWith({ active: false })
|
||||
})
|
||||
it('422 when nothing to change', async () => {
|
||||
const res = await PATCH(req('PATCH', { id: 't1' }))
|
||||
expect(res.status).toBe(422)
|
||||
})
|
||||
it('422 for an empty truck_no', async () => {
|
||||
const res = await PATCH(req('PATCH', { id: 't1', truck_no: ' ' }))
|
||||
expect(res.status).toBe(422)
|
||||
expect(setSpy).not.toHaveBeenCalled()
|
||||
})
|
||||
it('422 for a malformed or unknown site', async () => {
|
||||
expect((await PATCH(req('PATCH', { id: 't1', site_id: 'abc' }))).status).toBe(422)
|
||||
selectQueue.push([{ id: 't1' }], [])
|
||||
expect((await PATCH(req('PATCH', { id: 't1', site_id: SITE }))).status).toBe(422)
|
||||
expect(setSpy).not.toHaveBeenCalled()
|
||||
})
|
||||
it('409 for a duplicate truck number', async () => {
|
||||
selectQueue.push([{ id: 't1' }])
|
||||
txError.code = '23505'
|
||||
const res = await PATCH(req('PATCH', { id: 't1', truck_no: 'DUP 1' }))
|
||||
expect(res.status).toBe(409)
|
||||
})
|
||||
})
|
||||
```
|
||||
|
||||
- [ ] **Step 2: Run to verify failure**
|
||||
|
||||
Run: `npx vitest run tests/api/admin-trucks.test.ts`
|
||||
Expected: FAIL (site_id ignored, PATCH only handles `active`).
|
||||
|
||||
- [ ] **Step 3: Implement**
|
||||
|
||||
In `app/api/admin/trucks/route.ts`:
|
||||
|
||||
Change imports to:
|
||||
```ts
|
||||
import { trucks, incidents, sites } from '@/lib/db/schema'
|
||||
import { parseSiteId } from '@/lib/admin/truck-input'
|
||||
import { and, eq, sql } from 'drizzle-orm'
|
||||
```
|
||||
|
||||
Add above `POST`:
|
||||
```ts
|
||||
async function activeSiteExists(id: string): Promise<boolean> {
|
||||
const [row] = await asAdmin(db =>
|
||||
db.select({ id: sites.id }).from(sites).where(and(eq(sites.id, id), eq(sites.active, true))).limit(1)
|
||||
)
|
||||
return !!row
|
||||
}
|
||||
```
|
||||
|
||||
Replace the whole `POST` function with:
|
||||
```ts
|
||||
export async function POST(request: NextRequest) {
|
||||
const { session } = await requireAdmin()
|
||||
if (!session) return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||
|
||||
const body: { truck_no?: string; carrier?: string; site_id?: unknown } = await request.json().catch(() => ({}))
|
||||
const truck_no = (body.truck_no ?? '').trim()
|
||||
if (!truck_no) return NextResponse.json({ error: 'truck_no required' }, { status: 422 })
|
||||
|
||||
const parsedSite = parseSiteId(body.site_id)
|
||||
if (!parsedSite.ok) return NextResponse.json({ error: 'site_id invalid' }, { status: 422 })
|
||||
const siteId = parsedSite.value ?? null
|
||||
if (siteId && !(await activeSiteExists(siteId)))
|
||||
return NextResponse.json({ error: 'Site not found or inactive' }, { status: 422 })
|
||||
|
||||
const carrier = (body.carrier ?? '').trim() || null
|
||||
|
||||
try {
|
||||
let truckId: string | undefined
|
||||
await asAdmin(async db => {
|
||||
await db.transaction(async tx => {
|
||||
await tx.execute(sql`SELECT set_config('app.user_id', ${session.sub}, true)`)
|
||||
const [truck] = await tx.insert(trucks).values({ truckNo: truck_no, carrier, siteId }).returning({ id: trucks.id })
|
||||
if (!truck) throw new Error('Insert failed')
|
||||
truckId = truck.id
|
||||
await writeAuditLog(tx, 'trucks', truck.id, 'INSERT', { truck_no, carrier, site_id: siteId })
|
||||
})
|
||||
})
|
||||
if (!truckId) return NextResponse.json({ error: 'Insert failed' }, { status: 400 })
|
||||
return NextResponse.json({ id: truckId }, { status: 201 })
|
||||
} catch (e) {
|
||||
const code = (e as { code?: string }).code
|
||||
return NextResponse.json(
|
||||
{ error: code === '23505' ? 'Truck number already exists' : 'Insert failed' },
|
||||
{ status: 400 },
|
||||
)
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
Replace the whole `PATCH` function with:
|
||||
```ts
|
||||
export async function PATCH(request: NextRequest) {
|
||||
const { session } = await requireAdmin()
|
||||
if (!session) return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||
|
||||
const body: {
|
||||
id?: string
|
||||
active?: boolean
|
||||
truck_no?: string
|
||||
carrier?: string | null
|
||||
site_id?: unknown
|
||||
} = await request.json().catch(() => ({}))
|
||||
if (!body.id) return NextResponse.json({ error: 'id required' }, { status: 422 })
|
||||
|
||||
const set: { active?: boolean; truckNo?: string; carrier?: string | null; siteId?: string | null } = {}
|
||||
if (typeof body.active === 'boolean') set.active = body.active
|
||||
if (body.truck_no !== undefined) {
|
||||
const no = String(body.truck_no).trim()
|
||||
if (!no) return NextResponse.json({ error: 'truck_no required' }, { status: 422 })
|
||||
set.truckNo = no
|
||||
}
|
||||
if (body.carrier !== undefined) set.carrier = (body.carrier ?? '').trim() || null
|
||||
const parsedSite = parseSiteId(body.site_id)
|
||||
if (!parsedSite.ok) return NextResponse.json({ error: 'site_id invalid' }, { status: 422 })
|
||||
if (parsedSite.value !== undefined) set.siteId = parsedSite.value
|
||||
if (Object.keys(set).length === 0)
|
||||
return NextResponse.json({ error: 'nothing to update' }, { status: 422 })
|
||||
|
||||
const [before] = await asAdmin(db =>
|
||||
db.select().from(trucks).where(eq(trucks.id, body.id!)).limit(1)
|
||||
)
|
||||
if (set.siteId && !(await activeSiteExists(set.siteId)))
|
||||
return NextResponse.json({ error: 'Site not found or inactive' }, { status: 422 })
|
||||
|
||||
try {
|
||||
await asAdmin(async db => {
|
||||
await db.transaction(async tx => {
|
||||
await tx.execute(sql`SELECT set_config('app.user_id', ${session.sub}, true)`)
|
||||
await tx.update(trucks).set(set).where(eq(trucks.id, body.id!))
|
||||
await writeAuditLog(tx, 'trucks', body.id!, 'admin_update', set, before ?? null)
|
||||
})
|
||||
})
|
||||
} catch (e) {
|
||||
const code = (e as { code?: string }).code
|
||||
if (code === '23505') return NextResponse.json({ error: 'Truck number already exists' }, { status: 409 })
|
||||
return NextResponse.json({ error: 'Update failed' }, { status: 500 })
|
||||
}
|
||||
return NextResponse.json({ ok: true })
|
||||
}
|
||||
```
|
||||
|
||||
Note the test for "422 for a malformed or unknown site" in PATCH: the malformed case returns before any select; the unknown case consumes `[before]` then the site check.
|
||||
|
||||
- [ ] **Step 4: Run tests and typecheck**
|
||||
|
||||
Run: `npx vitest run tests/api/admin-trucks.test.ts && npx tsc --noEmit`
|
||||
Expected: all PASS, tsc clean.
|
||||
|
||||
- [ ] **Step 5: Commit**
|
||||
|
||||
```bash
|
||||
git add app/api/admin/trucks/route.ts tests/api/admin-trucks.test.ts
|
||||
git commit -m "feat(trucks): admin API accepts site_id and partial edits"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 3: Admin Trucks tab UI (site select, label, edit modal)
|
||||
|
||||
**Files:**
|
||||
- Modify: `app/(protected)/admin/page.tsx` (truck query + props)
|
||||
- Modify: `components/admin/admin-panel.tsx`
|
||||
- Modify: `components/admin/truck-manager.tsx`
|
||||
- Test: `tests/components/admin/truck-manager.test.tsx` (create)
|
||||
|
||||
**Interfaces:**
|
||||
- Consumes: `PATCH /api/admin/trucks` and `POST /api/admin/trucks` from Task 2.
|
||||
- Produces: `Truck` gains `site_id: string | null`; new exported `TruckSite = { id: string; name: string; active: boolean }`; `TruckManager` props `{ trucks: Truck[]; sites: TruckSite[] }`; `AdminPanel` prop `truckSites: TruckSite[]`.
|
||||
|
||||
- [ ] **Step 1: Write the failing test**
|
||||
|
||||
`tests/components/admin/truck-manager.test.tsx`:
|
||||
```tsx
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
import { render, screen, fireEvent, waitFor } from '@testing-library/react'
|
||||
import { TruckManager, type Truck, type TruckSite } from '@/components/admin/truck-manager'
|
||||
|
||||
const { refresh } = vi.hoisted(() => ({ refresh: vi.fn() }))
|
||||
vi.mock('next/navigation', () => ({ useRouter: () => ({ refresh }) }))
|
||||
|
||||
const fetchMock = vi.fn()
|
||||
beforeEach(() => {
|
||||
refresh.mockClear()
|
||||
fetchMock.mockReset()
|
||||
fetchMock.mockResolvedValue({ ok: true, json: async () => ({ ok: true }) })
|
||||
vi.stubGlobal('fetch', fetchMock)
|
||||
})
|
||||
|
||||
const sites: TruckSite[] = [
|
||||
{ id: 'site-a', name: 'Site A', active: true },
|
||||
{ id: 'site-b', name: 'Site B', active: true },
|
||||
{ id: 'site-old', name: 'Old Site', active: false },
|
||||
]
|
||||
const trucks: Truck[] = [
|
||||
{ id: 't1', truck_no: 'WXY 1', carrier: null, site_id: 'site-a', active: true },
|
||||
{ id: 't2', truck_no: 'WXY 2', carrier: 'Setia', site_id: null, active: true },
|
||||
]
|
||||
|
||||
describe('TruckManager site link', () => {
|
||||
it('shows the site name or Unassigned on each row', () => {
|
||||
render(<TruckManager trucks={trucks} sites={sites} />)
|
||||
expect(screen.getByText('Site A')).toBeTruthy()
|
||||
expect(screen.getByText('Unassigned')).toBeTruthy()
|
||||
})
|
||||
|
||||
it('edits the site of a truck via PATCH', async () => {
|
||||
render(<TruckManager trucks={trucks} sites={sites} />)
|
||||
fireEvent.click(screen.getAllByRole('button', { name: 'Edit' })[1])
|
||||
fireEvent.change(screen.getByLabelText('Site'), { target: { value: 'site-b' } })
|
||||
fireEvent.click(screen.getByRole('button', { name: 'Save' }))
|
||||
await waitFor(() => expect(fetchMock).toHaveBeenCalled())
|
||||
const [url, init] = fetchMock.mock.calls[0]
|
||||
expect(url).toBe('/api/admin/trucks')
|
||||
expect(init.method).toBe('PATCH')
|
||||
expect(JSON.parse(init.body)).toEqual({ id: 't2', truck_no: 'WXY 2', carrier: 'Setia', site_id: 'site-b' })
|
||||
await waitFor(() => expect(refresh).toHaveBeenCalled())
|
||||
})
|
||||
|
||||
it('clears the site with the No site option', async () => {
|
||||
render(<TruckManager trucks={trucks} sites={sites} />)
|
||||
fireEvent.click(screen.getAllByRole('button', { name: 'Edit' })[0])
|
||||
fireEvent.change(screen.getByLabelText('Site'), { target: { value: '' } })
|
||||
fireEvent.click(screen.getByRole('button', { name: 'Save' }))
|
||||
await waitFor(() => expect(fetchMock).toHaveBeenCalled())
|
||||
expect(JSON.parse(fetchMock.mock.calls[0][1].body).site_id).toBeNull()
|
||||
})
|
||||
|
||||
it('does not offer inactive sites unless already linked', () => {
|
||||
render(<TruckManager trucks={trucks} sites={sites} />)
|
||||
fireEvent.click(screen.getAllByRole('button', { name: 'Edit' })[0])
|
||||
const select = screen.getByLabelText('Site') as HTMLSelectElement
|
||||
const labels = Array.from(select.options).map(o => o.textContent)
|
||||
expect(labels).toEqual(['No site', 'Site A', 'Site B'])
|
||||
})
|
||||
|
||||
it('sends site_id when adding a truck', async () => {
|
||||
render(<TruckManager trucks={trucks} sites={sites} />)
|
||||
fireEvent.click(screen.getByRole('button', { name: /Add Truck/ }))
|
||||
fireEvent.change(screen.getByLabelText(/Truck Number/), { target: { value: 'NEW 1' } })
|
||||
fireEvent.change(screen.getByLabelText('Site'), { target: { value: 'site-b' } })
|
||||
fireEvent.click(screen.getAllByRole('button', { name: 'Add Truck' }).pop()!)
|
||||
await waitFor(() => expect(fetchMock).toHaveBeenCalled())
|
||||
expect(JSON.parse(fetchMock.mock.calls[0][1].body)).toEqual({ truck_no: 'NEW 1', carrier: null, site_id: 'site-b' })
|
||||
})
|
||||
})
|
||||
```
|
||||
|
||||
- [ ] **Step 2: Run to verify failure**
|
||||
|
||||
Run: `npx vitest run tests/components/admin/truck-manager.test.tsx`
|
||||
Expected: FAIL (no `sites` prop, no Edit button).
|
||||
|
||||
- [ ] **Step 3: Implement `components/admin/truck-manager.tsx`**
|
||||
|
||||
3a. Replace the type/props block at the top:
|
||||
```ts
|
||||
export type Truck = {
|
||||
id: string
|
||||
truck_no: string
|
||||
carrier: string | null
|
||||
site_id: string | null
|
||||
active: boolean
|
||||
}
|
||||
|
||||
export type TruckSite = { id: string; name: string; active: boolean }
|
||||
|
||||
interface Props {
|
||||
trucks: Truck[]
|
||||
sites: TruckSite[]
|
||||
}
|
||||
```
|
||||
and the signature `export function TruckManager({ trucks, sites }: Props) {`.
|
||||
|
||||
3b. After the existing `const [confirmDelete, ...]` state add:
|
||||
```ts
|
||||
const [siteId, setSiteId] = useState('')
|
||||
const [editing, setEditing] = useState<Truck | null>(null)
|
||||
const [editNo, setEditNo] = useState('')
|
||||
const [editCarrier, setEditCarrier] = useState('')
|
||||
const [editSiteId, setEditSiteId] = useState('')
|
||||
|
||||
const siteName = (id: string | null) => sites.find(s => s.id === id)?.name ?? null
|
||||
const siteChoices = (currentId: string) => sites.filter(s => s.active || s.id === currentId)
|
||||
|
||||
const openEdit = (tk: Truck) => {
|
||||
setEditing(tk)
|
||||
setEditNo(tk.truck_no)
|
||||
setEditCarrier(tk.carrier ?? '')
|
||||
setEditSiteId(tk.site_id ?? '')
|
||||
setError(null)
|
||||
}
|
||||
```
|
||||
|
||||
3c. In `handleAdd` change the body to `JSON.stringify({ truck_no: no, carrier: carrier.trim() || null, site_id: siteId || null })` and after `setCarrier('')` add `setSiteId('')`.
|
||||
|
||||
3d. After `handleDelete` add:
|
||||
```ts
|
||||
const handleSaveEdit = async () => {
|
||||
if (!editing) return
|
||||
const no = editNo.trim()
|
||||
if (!no) return
|
||||
const ok = await send('PATCH', {
|
||||
id: editing.id,
|
||||
truck_no: no,
|
||||
carrier: editCarrier.trim() || null,
|
||||
site_id: editSiteId || null,
|
||||
})
|
||||
if (ok) setEditing(null)
|
||||
}
|
||||
```
|
||||
|
||||
3e. In the row, replace the left block
|
||||
```tsx
|
||||
<div className="flex items-center gap-3">
|
||||
<span className="text-sm font-semibold text-gray-900">{tk.truck_no}</span>
|
||||
{tk.carrier && <span className="text-xs text-gray-400">{tk.carrier}</span>}
|
||||
</div>
|
||||
```
|
||||
with
|
||||
```tsx
|
||||
<div className="flex items-center gap-3">
|
||||
<span className="text-sm font-semibold text-gray-900">{tk.truck_no}</span>
|
||||
{tk.carrier && <span className="text-xs text-gray-400">{tk.carrier}</span>}
|
||||
<span className={`text-xs px-2 py-0.5 ${tk.site_id ? 'bg-neutral-100 text-ink' : 'bg-gray-100 text-gray-500'}`}>
|
||||
{siteName(tk.site_id) ?? 'Unassigned'}
|
||||
</span>
|
||||
</div>
|
||||
```
|
||||
and, in the right-hand actions, add before the "Report link" anchor:
|
||||
```tsx
|
||||
<button disabled={busyId === tk.id} onClick={() => openEdit(tk)}
|
||||
className="text-xs text-accent-700 hover:underline cursor-pointer disabled:opacity-50">
|
||||
Edit
|
||||
</button>
|
||||
```
|
||||
|
||||
3f. In the Add modal, update both reset handlers (`onClose` and Cancel) to also call `setSiteId('')`, and add inside the `space-y-4` div after the carrier field:
|
||||
```tsx
|
||||
<div>
|
||||
<label className={lbl} htmlFor="add-truck-site">Site</label>
|
||||
<select id="add-truck-site" value={siteId} onChange={e => setSiteId(e.target.value)} className={inp}>
|
||||
<option value="">No site</option>
|
||||
{siteChoices('').map(s => <option key={s.id} value={s.id}>{s.name}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
```
|
||||
|
||||
3g. Add an Edit modal before the Delete Confirm modal:
|
||||
```tsx
|
||||
{/* Edit Truck Modal */}
|
||||
<Modal open={!!editing} onClose={() => { setEditing(null); setError(null) }}
|
||||
title="Edit Truck" width="sm"
|
||||
footer={
|
||||
<>
|
||||
<button onClick={() => { setEditing(null); setError(null) }}
|
||||
className="px-4 py-2 text-sm font-medium border border-divider text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
|
||||
Cancel
|
||||
</button>
|
||||
<button disabled={busyId === editing?.id || !editNo.trim()} onClick={handleSaveEdit}
|
||||
className="px-4 py-2 bg-accent text-white text-sm font-semibold hover:bg-accent-600 disabled:opacity-50 cursor-pointer transition-colors">
|
||||
{busyId === editing?.id ? 'Saving…' : 'Save'}
|
||||
</button>
|
||||
</>
|
||||
}
|
||||
>
|
||||
{error && <p className="text-xs text-red-600 bg-red-50 px-3 py-2 mb-3">{error}</p>}
|
||||
<div className="space-y-4">
|
||||
<div>
|
||||
<label className={lbl} htmlFor="edit-truck-no">Truck Number *</label>
|
||||
<input id="edit-truck-no" type="text" value={editNo} onChange={e => setEditNo(e.target.value)} className={inp} />
|
||||
</div>
|
||||
<div>
|
||||
<label className={lbl} htmlFor="edit-truck-carrier">Carrier (optional)</label>
|
||||
<input id="edit-truck-carrier" type="text" value={editCarrier} onChange={e => setEditCarrier(e.target.value)} className={inp} />
|
||||
</div>
|
||||
<div>
|
||||
<label className={lbl} htmlFor="edit-truck-site">Site</label>
|
||||
<select id="edit-truck-site" value={editSiteId} onChange={e => setEditSiteId(e.target.value)} className={inp}>
|
||||
<option value="">No site</option>
|
||||
{siteChoices(editing?.site_id ?? '').map(s => <option key={s.id} value={s.id}>{s.name}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</Modal>
|
||||
```
|
||||
|
||||
Note: the delete-confirm modal and the row `Delete`/`Active` buttons stay unchanged. When only one modal is open at a time, `getByLabelText('Site')` is unambiguous.
|
||||
|
||||
3h. `components/admin/admin-panel.tsx`: import `TruckSite`, add prop `truckSites: TruckSite[]` to `Props`, destructure it, and render `<TruckManager trucks={trucks} sites={truckSites} />`.
|
||||
|
||||
3i. `app/(protected)/admin/page.tsx`: add `siteId: trucks.siteId` to the trucks select (the `id: trucks.id, truckNo: ...` object), map `site_id: t.siteId ?? null` in `truckList`, build
|
||||
```ts
|
||||
const truckSites = siteRows.map(s => ({ id: s.id, name: s.name, active: s.active }))
|
||||
```
|
||||
and pass `truckSites={truckSites}` to `<AdminPanel .../>` (find the existing `<AdminPanel` usage in that file and add the prop).
|
||||
|
||||
- [ ] **Step 4: Run tests, typecheck, design gate**
|
||||
|
||||
Run: `npx vitest run tests/components/admin/truck-manager.test.tsx && npx tsc --noEmit && npm run check:design`
|
||||
Expected: tests PASS, tsc clean, `design gates: clean`.
|
||||
|
||||
- [ ] **Step 5: Commit**
|
||||
|
||||
```bash
|
||||
git add components/admin/truck-manager.tsx components/admin/admin-panel.tsx "app/(protected)/admin/page.tsx" tests/components/admin/truck-manager.test.tsx
|
||||
git commit -m "feat(trucks): site select, site label and edit modal in admin"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 4: Report form filters trucks by site
|
||||
|
||||
**Files:**
|
||||
- Modify: `app/report/page.tsx` (truck query adds `siteId`, list adds `site_id`)
|
||||
- Modify: `components/incidents/report-form.tsx`
|
||||
- Test: `tests/components/incidents/report-form-trucks.test.tsx` (create)
|
||||
|
||||
**Interfaces:**
|
||||
- Consumes: `trucksForSite`, `siteForTruck` from `@/lib/report/trucks`; `siteIdForToken` from `@/lib/report/zones` (Task 1).
|
||||
- Produces: `ReportForm` prop `trucks: Array<{ id; truck_no; carrier; site_id: string | null }>`.
|
||||
|
||||
- [ ] **Step 1: Write the failing test**
|
||||
|
||||
`tests/components/incidents/report-form-trucks.test.tsx`:
|
||||
```tsx
|
||||
import { describe, it, expect, vi } from 'vitest'
|
||||
import { render, screen, fireEvent, within } from '@testing-library/react'
|
||||
import { ReportForm } from '@/components/incidents/report-form'
|
||||
import { I18nProvider } from '@/lib/i18n/context'
|
||||
import en from '@/messages/en.json'
|
||||
|
||||
vi.mock('next/navigation', () => ({ useRouter: () => ({ push: vi.fn(), refresh: vi.fn() }) }))
|
||||
|
||||
const sites = [
|
||||
{ id: 'site-a', name: 'Site A', zones: [{ id: 'z1', name: 'Dock', qr_code_token: 'tok-a' }] },
|
||||
{ id: 'site-b', name: 'Site B', zones: [{ id: 'z2', name: 'Yard', qr_code_token: 'tok-b' }] },
|
||||
]
|
||||
const trucks = [
|
||||
{ id: 't1', truck_no: 'AAA 1', carrier: null, site_id: 'site-a' },
|
||||
{ id: 't2', truck_no: 'BBB 2', carrier: null, site_id: 'site-b' },
|
||||
{ id: 't3', truck_no: 'FREE 3', carrier: null, site_id: null },
|
||||
]
|
||||
|
||||
function renderForm(props: Partial<React.ComponentProps<typeof ReportForm>> = {}) {
|
||||
return render(
|
||||
<I18nProvider messages={en}>
|
||||
<ReportForm
|
||||
zoneToken={null}
|
||||
zoneName={null}
|
||||
siteName={null}
|
||||
sites={sites}
|
||||
defaultSiteId=""
|
||||
trucks={trucks}
|
||||
initialTruckId="t1"
|
||||
{...props}
|
||||
/>
|
||||
</I18nProvider>,
|
||||
)
|
||||
}
|
||||
|
||||
const selectWith = (text: string) =>
|
||||
screen.getAllByRole('combobox').find(s => within(s).queryByText(text)) as HTMLSelectElement
|
||||
|
||||
const truckNos = () =>
|
||||
Array.from(selectWith(en.ReportForm.truckPlaceholder).options).map(o => o.textContent)
|
||||
|
||||
describe('ReportForm truck filter', () => {
|
||||
it('defaults the site to the preselected truck site and filters trucks', () => {
|
||||
renderForm()
|
||||
expect(selectWith(en.ReportForm.sitePlaceholder).value).toBe('site-a')
|
||||
expect(truckNos()).toEqual([en.ReportForm.truckPlaceholder, 'AAA 1', 'FREE 3'])
|
||||
})
|
||||
|
||||
it('changing the site refilters and clears a truck that no longer fits', () => {
|
||||
renderForm()
|
||||
expect(selectWith(en.ReportForm.truckPlaceholder).value).toBe('t1')
|
||||
fireEvent.change(selectWith(en.ReportForm.sitePlaceholder), { target: { value: 'site-b' } })
|
||||
expect(truckNos()).toEqual([en.ReportForm.truckPlaceholder, 'BBB 2', 'FREE 3'])
|
||||
expect(selectWith(en.ReportForm.truckPlaceholder).value).toBe('')
|
||||
})
|
||||
|
||||
it('uses the QR zone site when a zone token is present', () => {
|
||||
renderForm({ zoneToken: 'tok-b', zoneName: 'Yard', siteName: 'Site B', initialTruckId: null })
|
||||
// transport is not preselected without a truck, so pick it to reveal the truck select
|
||||
fireEvent.change(screen.getAllByRole('combobox').find(s => within(s).queryByText(en.IncidentType.transport))!, {
|
||||
target: { value: 'transport' },
|
||||
})
|
||||
expect(truckNos()).toEqual([en.ReportForm.truckPlaceholder, 'BBB 2', 'FREE 3'])
|
||||
})
|
||||
})
|
||||
```
|
||||
If the incident-type control is not a `<select>`, adapt only the third test's interaction (look at how the type picker renders in `report-form.tsx`) and keep its assertion; report the adaptation.
|
||||
|
||||
- [ ] **Step 2: Run to verify failure**
|
||||
|
||||
Run: `npx vitest run tests/components/incidents/report-form-trucks.test.tsx`
|
||||
Expected: FAIL (all trucks listed, site not defaulted from truck).
|
||||
|
||||
- [ ] **Step 3: Implement**
|
||||
|
||||
`app/report/page.tsx`: add `siteId: trucks.siteId,` to the truck select, and in `truckList` add `site_id: t.siteId ?? null,`.
|
||||
|
||||
`components/incidents/report-form.tsx`:
|
||||
|
||||
3a. Imports: change the React import to `import { useState, useEffect, useMemo } from 'react'`; change the zones import to
|
||||
```ts
|
||||
import { zonesForSite, resolveZoneToken, siteIdForToken, type SiteOption } from '@/lib/report/zones'
|
||||
import { trucksForSite, siteForTruck } from '@/lib/report/trucks'
|
||||
```
|
||||
|
||||
3b. In `Props` change the trucks type to
|
||||
`trucks: Array<{ id: string; truck_no: string; carrier: string | null; site_id: string | null }>`.
|
||||
|
||||
3c. Replace the `const [siteId, setSiteId] = useState(...)` block with:
|
||||
```ts
|
||||
const truckSite = !zoneToken ? siteForTruck(trucks, initialTruckId) : null
|
||||
const [siteId, setSiteId] = useState(
|
||||
truckSite && sites.some(s => s.id === truckSite)
|
||||
? truckSite
|
||||
: sites.some(s => s.id === defaultSiteId) ? defaultSiteId : (sites.length === 1 ? sites[0].id : '')
|
||||
)
|
||||
```
|
||||
|
||||
3d. After the `effectiveZoneToken` line add:
|
||||
```ts
|
||||
const effectiveSiteId = zoneToken ? siteIdForToken(sites, zoneToken) : siteId
|
||||
const truckOptions = useMemo(() => trucksForSite(trucks, effectiveSiteId), [trucks, effectiveSiteId])
|
||||
```
|
||||
|
||||
3e. After the `form` state declaration (it must come after `useState` for `form`) add:
|
||||
```ts
|
||||
useEffect(() => {
|
||||
setForm(f => (f.truck_id && !truckOptions.some(tk => tk.id === f.truck_id) ? { ...f, truck_id: '' } : f))
|
||||
}, [truckOptions])
|
||||
```
|
||||
(If the repo lint rule `react-hooks/set-state-in-effect` complains, add the same `// eslint-disable-next-line react-hooks/set-state-in-effect` comment used in this file above the `setForm` line.)
|
||||
|
||||
3f. In the Truck `<select>`, replace `{trucks.map(tk => (` with `{truckOptions.map(tk => (`.
|
||||
|
||||
- [ ] **Step 4: Run tests, typecheck, design gate, full suite**
|
||||
|
||||
Run: `npx vitest run tests/components/incidents/report-form-trucks.test.tsx && npx tsc --noEmit && npm run check:design && npx vitest run`
|
||||
Expected: new tests PASS, tsc clean, `design gates: clean`, full suite shows only the 7 pre-existing failures.
|
||||
|
||||
- [ ] **Step 5: graphify and commit**
|
||||
|
||||
```bash
|
||||
graphify update .
|
||||
git add app/report/page.tsx components/incidents/report-form.tsx tests/components/incidents/report-form-trucks.test.tsx
|
||||
git commit -m "feat(report): filter truck list by selected site"
|
||||
```
|
||||
@@ -0,0 +1,72 @@
|
||||
# Zone picker, CAPA completion proof, test-data cleanup
|
||||
|
||||
Date: 2026-10-14. Status: draft for review.
|
||||
|
||||
Three independent changes from the 2026-10-13 field feedback. Each can ship on its own.
|
||||
|
||||
## 1. Zone picker on `/report`
|
||||
|
||||
### Problem
|
||||
`/report` without `?zone=<qr_token>` shows "No zone detected — zone will not be recorded", but `POST /api/incidents` requires `zone_token` and returns 404 "Zone not found" without it. A user who opens Report from the Incidents page cannot submit.
|
||||
|
||||
### Design
|
||||
- `app/report/page.tsx` also loads active sites with their active zones (`asAdmin`, same pattern as `trucks`) and passes `sites: { id, name, zones: { id, name, qr_code_token }[] }[]` and `defaultSiteId` (`users.site_id` of the session user) to `ReportForm`.
|
||||
- With a valid QR token: unchanged ("Site — Zone" header, token sent as today).
|
||||
- Without a token (or an unknown token): the "No zone detected" banner is removed. `ReportForm` shows two required selects, **Site** (default `defaultSiteId`) then **Zone** (filtered to the site). The chosen zone's `qr_code_token` is sent as `zone_token`.
|
||||
- Submit button stays disabled until a zone is resolved (token or selection).
|
||||
- No API or schema change; the server still validates the token and the active flags.
|
||||
- New labels (Site, Zone, "Select zone…") added to the existing i18n message files.
|
||||
- Offline queue: the queued payload already carries `zone_token`, so it keeps working.
|
||||
|
||||
### Out of scope
|
||||
Making zone optional; a "General" zone per site.
|
||||
|
||||
## 2. CAPA completion proof
|
||||
|
||||
### Problem
|
||||
`CapaOwnerActions` sends `PATCH /api/capa/[id] {status:'pending_verification'}` directly. The PIC can submit with no evidence and no notes.
|
||||
|
||||
### Design
|
||||
- "Submit for Verification" opens a form: **completion note** (required) and **1 to 5 photos** (required, JPG/PNG/HEIC, same size limit as incident evidence). The submit button is disabled until both are present.
|
||||
- New `POST /api/capa/[id]/submit` (multipart):
|
||||
- Allowed: CAPA owner, or hse/admin. Status must be `in_progress`; otherwise 409.
|
||||
- Validates note non-empty and 1 to 5 image files; otherwise 422.
|
||||
- In one `withUser` transaction: store files via `lib/storage/evidence.ts`, insert `evidence_files` rows (`stage = 'capa'`, `capa_id` set, hash recorded), set `owner_notes`, `completed_at`, `status = 'pending_verification'`, and write `audit_log` (include file ids and the note).
|
||||
- `PATCH /api/capa/[id]` rejects `status: 'pending_verification'` with 403 for everyone (the new endpoint is the only path). Owner `in_progress` transition is unchanged.
|
||||
- CAPA detail page: "Completion report" section shows the note and a photo gallery (signed `/api/evidence/...` URLs) so HSE sees proof when verifying or reopening.
|
||||
- Evidence rows are never hard-deleted (5-year retention).
|
||||
|
||||
### Schema change (manual, needs owner go-ahead)
|
||||
```sql
|
||||
ALTER TABLE evidence_files ADD COLUMN IF NOT EXISTS capa_id UUID REFERENCES capa_actions(id) ON DELETE RESTRICT;
|
||||
CREATE INDEX IF NOT EXISTS evidence_files_capa_id_idx ON evidence_files(capa_id);
|
||||
```
|
||||
The `evidence_stage` enum already has `capa`; no enum change. Update `db/schema.sql`, `lib/db/schema.ts`, no RLS change: the PIC is the uploader and already reads own rows.
|
||||
|
||||
### Out of scope
|
||||
Photos on "Mark In Progress"; HSE-side evidence upload; video.
|
||||
|
||||
## 3. Test-data cleanup (ops, one-off)
|
||||
|
||||
### Scope
|
||||
Delete all incidents and every user with `role != 'admin'` from the production DB.
|
||||
|
||||
### Design
|
||||
- Script `db/ops/cleanup-test-data.sql` plus a short runbook in `docs/`.
|
||||
- Steps:
|
||||
1. `pg_dump` of `ims` and a tar of `/var/lib/ims-evidence` on the server, kept outside the deploy folders.
|
||||
2. Dry run: print row counts per table (incidents, children, users to delete, admins kept). Show the list of admins kept.
|
||||
3. Wait for explicit user confirmation of those counts.
|
||||
4. Run in one transaction, FK order: notifications (`notifications_log`, in-app), `capa_actions`, `investigations`, `dosh_reports`, addenda, `evidence_files`, `audit_log` rows for incidents, `incidents`, then `users` where `role != 'admin'`. Anything else referencing those users (audit_log `changed_by`, etc.) is nulled or removed per the real FK list found in the dry run.
|
||||
5. Verify counts and that admin login works.
|
||||
- Evidence files on disk are left in place (retention rule); orphaned files can be reviewed separately.
|
||||
- Nothing runs against production without step 3 confirmation. Run after the schema change in section 2, or independently.
|
||||
|
||||
## Testing
|
||||
- Zone picker: component test for site-to-zone filtering and submit gating; manual check with and without `?zone=`.
|
||||
- CAPA submit: API tests for 401/403/409/422, success path writes files, audit row and status; PATCH bypass returns 403.
|
||||
- Cleanup: dry-run counts match expectations on a restored dump before running on production.
|
||||
- `npm run check:design` must print `design gates: clean` for UI changes.
|
||||
|
||||
## Deploy
|
||||
Follow CLAUDE.md deploy steps (build locally, upload standalone build only, check `BUILD_ID`, restart, verify). Schema SQL applied by hand beforehand with the owner's go-ahead.
|
||||
@@ -0,0 +1,43 @@
|
||||
# Link trucks to a site
|
||||
|
||||
Date: 2026-10-15. Status: draft for review.
|
||||
|
||||
## Problem
|
||||
Trucks are a flat list. The Report an Incident form shows every active truck regardless of site. Admin cannot say which site a truck belongs to.
|
||||
|
||||
## Decisions
|
||||
- A truck links to **one** site (optional).
|
||||
- The report form **filters** the Truck dropdown by the selected site.
|
||||
- A truck with no site (all existing trucks) shows for **every** site until an admin assigns one.
|
||||
|
||||
## 1. Schema (manual, needs owner go-ahead)
|
||||
```sql
|
||||
ALTER TABLE trucks ADD COLUMN IF NOT EXISTS site_id UUID REFERENCES sites(id);
|
||||
CREATE INDEX IF NOT EXISTS trucks_site_id_idx ON trucks(site_id);
|
||||
```
|
||||
- Add `db/ops/2026-10-15-trucks-site-id.sql` (wrapped in BEGIN/COMMIT), update `db/schema.sql` and `lib/db/schema.ts` (`siteId: uuid('site_id').references(() => sites.id)`).
|
||||
- No RLS change: `trucks_read` (all) and `trucks_admin_all` already cover the column.
|
||||
|
||||
## 2. Admin, Trucks tab
|
||||
- `app/(protected)/admin/page.tsx` selects `trucks.siteId`; `TruckManager` receives `site_id` per truck and the list of active sites.
|
||||
- Add form: optional Site select. Each row shows the site name, or "Unassigned". Edit modal: Site select with a "No site" option.
|
||||
- `POST /api/admin/trucks` and `PATCH /api/admin/trucks` accept `site_id` (uuid or null). Non-null must reference an existing active site, otherwise 422. Audit log entry stays in the same transaction and records old and new `site_id`.
|
||||
|
||||
## 3. Report form
|
||||
- `app/report/page.tsx` passes `site_id` with each truck.
|
||||
- New pure helper `trucksForSite(trucks, siteId)` in `lib/report/trucks.ts`: returns trucks where `site_id` is null or equals `siteId`; with no `siteId`, returns all.
|
||||
- The site comes from the QR zone when present, otherwise from the Site select. When the site changes and the selected truck no longer fits, the selection clears.
|
||||
- `?truck_id=` still pre-selects the truck. If no zone is given, the truck's `site_id` (when set) becomes the default site.
|
||||
- `POST /api/incidents` is unchanged and does not reject a truck/site mismatch (UI filter only).
|
||||
|
||||
## Testing
|
||||
- `trucksForSite` unit tests (null site, matching, other site, no site selected).
|
||||
- API tests for `site_id` on create and edit: invalid site 422, valid site saved with audit row, null clears.
|
||||
- Component test: truck dropdown filters on site change and clears an invalid selection.
|
||||
- `npm run check:design` must print `design gates: clean`.
|
||||
|
||||
## Out of scope
|
||||
Several sites per truck, bulk assignment, filtering the Incidents list by truck site.
|
||||
|
||||
## Deploy
|
||||
Apply the SQL by hand first (additive, nullable, safe for the old build), then deploy per CLAUDE.md.
|
||||
@@ -0,0 +1,11 @@
|
||||
const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
|
||||
|
||||
export type SiteIdInput = { ok: true; value: string | null | undefined } | { ok: false }
|
||||
|
||||
// undefined = field not sent, null/'' = clear the link, uuid string = set it.
|
||||
export function parseSiteId(raw: unknown): SiteIdInput {
|
||||
if (raw === undefined) return { ok: true, value: undefined }
|
||||
if (raw === null || raw === '') return { ok: true, value: null }
|
||||
if (typeof raw === 'string' && UUID_RE.test(raw)) return { ok: true, value: raw }
|
||||
return { ok: false }
|
||||
}
|
||||
+11
-9
@@ -1,26 +1,28 @@
|
||||
// lib/auth/roles.ts
|
||||
// 'ssa' = Site Safety Assistant. Replaces the former reporter, supervisor and capa_owner roles.
|
||||
export type UserRole =
|
||||
| 'reporter'
|
||||
| 'supervisor'
|
||||
| 'ssa'
|
||||
| 'hse'
|
||||
| 'capa_owner'
|
||||
| 'management'
|
||||
| 'admin'
|
||||
|
||||
export const ALL_ROLES: UserRole[] = [
|
||||
'reporter',
|
||||
'supervisor',
|
||||
'ssa',
|
||||
'hse',
|
||||
'capa_owner',
|
||||
'management',
|
||||
'admin',
|
||||
]
|
||||
|
||||
export const ROLE_LABELS: Record<UserRole, string> = {
|
||||
ssa: 'Site Safety Assistant (SSA)',
|
||||
hse: 'HSE',
|
||||
management: 'Management',
|
||||
admin: 'Admin',
|
||||
}
|
||||
|
||||
export const ROLE_HOME: Record<UserRole, string> = {
|
||||
reporter: '/reporter',
|
||||
supervisor: '/supervisor',
|
||||
ssa: '/ssa',
|
||||
hse: '/hse',
|
||||
capa_owner: '/capa-owner',
|
||||
management: '/management',
|
||||
admin: '/admin',
|
||||
}
|
||||
|
||||
@@ -0,0 +1,111 @@
|
||||
export type CapaStatus =
|
||||
| 'open' | 'in_progress' | 'overdue' | 'pending_verification' | 'verified' | 'reopened' | 'closed'
|
||||
export type CapaPriority = 'low' | 'med' | 'high'
|
||||
|
||||
export interface CapaRow {
|
||||
id: string
|
||||
incident_id: string
|
||||
description: string
|
||||
department: string
|
||||
due_date: string
|
||||
priority: CapaPriority
|
||||
status: CapaStatus
|
||||
incident_ref: string | null
|
||||
owner_name: string | null
|
||||
}
|
||||
|
||||
export const PAGE_SIZE = 25
|
||||
|
||||
export const STATUS_ORDER: CapaStatus[] = [
|
||||
'open', 'in_progress', 'overdue', 'reopened', 'pending_verification', 'verified', 'closed',
|
||||
]
|
||||
|
||||
export type CapaViewKey = 'all' | 'active' | 'overdue' | 'verification' | 'done'
|
||||
|
||||
export const VIEWS: Array<{ key: CapaViewKey; label: string; statuses: CapaStatus[] | null }> = [
|
||||
{ key: 'all', label: 'All', statuses: null },
|
||||
{ key: 'active', label: 'Active', statuses: ['open', 'in_progress', 'reopened'] },
|
||||
{ key: 'overdue', label: 'Overdue', statuses: ['overdue'] },
|
||||
{ key: 'verification', label: 'Verification', statuses: ['pending_verification'] },
|
||||
{ key: 'done', label: 'Done', statuses: ['verified', 'closed'] },
|
||||
]
|
||||
|
||||
export interface CapaFilters {
|
||||
q: string
|
||||
owner: string
|
||||
department: string
|
||||
priority: string
|
||||
view: CapaViewKey
|
||||
}
|
||||
|
||||
export const EMPTY_FILTERS: CapaFilters = { q: '', owner: '', department: '', priority: '', view: 'all' }
|
||||
|
||||
export type CapaSortKey = 'due_date' | 'priority' | 'status'
|
||||
export type CapaSort = { key: CapaSortKey; dir: 'asc' | 'desc' }
|
||||
|
||||
function matchesOthers(r: CapaRow, f: CapaFilters): boolean {
|
||||
if (f.owner && r.owner_name !== f.owner) return false
|
||||
if (f.department && r.department !== f.department) return false
|
||||
if (f.priority && r.priority !== f.priority) return false
|
||||
if (f.q) {
|
||||
const q = f.q.toLowerCase()
|
||||
const hay = `${r.description} ${r.incident_ref ?? ''} ${r.owner_name ?? ''}`.toLowerCase()
|
||||
if (!hay.includes(q)) return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
function inView(r: CapaRow, view: CapaViewKey): boolean {
|
||||
const statuses = VIEWS.find(v => v.key === view)?.statuses ?? null
|
||||
return statuses === null || statuses.includes(r.status)
|
||||
}
|
||||
|
||||
export function filterCapas(rows: CapaRow[], f: CapaFilters): CapaRow[] {
|
||||
return rows.filter(r => matchesOthers(r, f) && inView(r, f.view))
|
||||
}
|
||||
|
||||
export function viewCounts(rows: CapaRow[], f: CapaFilters): Record<CapaViewKey, number> {
|
||||
const scoped = rows.filter(r => matchesOthers(r, f))
|
||||
const counts = {} as Record<CapaViewKey, number>
|
||||
for (const v of VIEWS) counts[v.key] = scoped.filter(r => inView(r, v.key)).length
|
||||
return counts
|
||||
}
|
||||
|
||||
const PRIORITY_RANK: Record<CapaPriority, number> = { high: 0, med: 1, low: 2 }
|
||||
|
||||
export function sortCapas(rows: CapaRow[], sort: CapaSort): CapaRow[] {
|
||||
const sign = sort.dir === 'asc' ? 1 : -1
|
||||
const key = (r: CapaRow): number | string =>
|
||||
sort.key === 'priority' ? PRIORITY_RANK[r.priority]
|
||||
: sort.key === 'status' ? STATUS_ORDER.indexOf(r.status)
|
||||
: r.due_date
|
||||
return [...rows].sort((a, b) => {
|
||||
const ka = key(a)
|
||||
const kb = key(b)
|
||||
return ka < kb ? -sign : ka > kb ? sign : 0
|
||||
})
|
||||
}
|
||||
|
||||
export function nextSort(current: CapaSort, key: CapaSortKey): CapaSort {
|
||||
if (current.key === key) return { key, dir: current.dir === 'asc' ? 'desc' : 'asc' }
|
||||
return { key, dir: 'asc' }
|
||||
}
|
||||
|
||||
export function paginate<T>(rows: T[], page: number, size: number) {
|
||||
const total = rows.length
|
||||
const pageCount = Math.max(1, Math.ceil(total / size))
|
||||
const p = Math.min(Math.max(1, page), pageCount)
|
||||
const items = rows.slice((p - 1) * size, p * size)
|
||||
const from = items.length === 0 ? 0 : (p - 1) * size + 1
|
||||
const to = items.length === 0 ? 0 : from + items.length - 1
|
||||
return { items, from, to, total, page: p, pageCount }
|
||||
}
|
||||
|
||||
export function distinct(values: Array<string | null | undefined>): string[] {
|
||||
return [...new Set(values.filter((v): v is string => Boolean(v)))].sort()
|
||||
}
|
||||
|
||||
export function daysLate(due: string, today: string): number {
|
||||
const diff = Math.round((Date.parse(today) - Date.parse(due)) / 86_400_000)
|
||||
return Math.max(0, diff)
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user