Compare commits
62
Commits
bf178d5b8d
...
v2.0.0
| 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 | ||
|
|
137780d013 | ||
|
|
c5a98eed06 | ||
|
|
ba9eeefe47 | ||
|
|
0b5020b3d0 | ||
|
|
e7416bf236 | ||
|
|
4411ed54b5 | ||
|
|
3a941a357b | ||
|
|
8701d24c6c | ||
|
|
106136e902 | ||
|
|
ef7f1c9660 |
@@ -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.
|
Replaces WhatsApp/Excel safety reporting. Client: Ms. Agnes, Mr. Terence, Mr. Yap, Mr. Jensen.
|
||||||
|
|
||||||
## Stack
|
## Stack
|
||||||
- **Frontend + API routes:** Next.js (App Router)
|
- **Frontend + API routes:** Next.js 16 (App Router)
|
||||||
- **DB + Auth + Storage:** Supabase (Postgres + RLS + pgvector)
|
- **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).
|
||||||
- **Hosting:** VPS at `http://64.176.82.100/ims/` + Supabase cloud
|
- **Auth:** own email + password. `bcryptjs` hashes, `jose` JWT in the `ims_session` cookie (8h), checked in `middleware.ts`. No Supabase GoTrue.
|
||||||
- **AI:** Claude API — server-side only, never client-side
|
- **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.
|
||||||
- **Email:** Resend
|
- **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
|
- **WhatsApp:** Meta WhatsApp Business Cloud API
|
||||||
- **PDF:** pdf-lib (JKKP form fill)
|
- **PDF:** pdf-lib (JKKP form fill, incident report)
|
||||||
- **QR:** qrcode npm package
|
- **QR:** qrcode npm package
|
||||||
|
|
||||||
## Current Phase
|
## 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.
|
See `[[phases]]` memory for full phase breakdown and deliverables.
|
||||||
|
|
||||||
## Deployment (Production)
|
## 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
|
- **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).
|
||||||
# Correct deployment:
|
- 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`.
|
||||||
tar -czf - package.json package-lock.json .next | \
|
- Env files live in `/srv/apps/ims/shared/` (`.env`, `.env.production`); `app/.env*` are links to them. Never overwrite, delete or ship `.env*`.
|
||||||
ssh -p 9321 setia@175.136.239.121 "cd /var/www/ims && tar -xzf -"
|
- Evidence files: `/var/lib/ims-evidence` (do not touch). A deploy never runs DB migrations; ask before changing the DB.
|
||||||
pm2 restart wsims
|
- 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
|
## Dev Conventions
|
||||||
- Never commit `.env` or API keys. All secrets in env vars only.
|
- 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.
|
- 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.
|
||||||
- Claude API calls: server-side API routes only (`/app/api/...`).
|
- AI calls: server-side API routes only (`/app/api/...`).
|
||||||
- Incident reference format: `SITE-YYYYMM-####`
|
- Incident reference format: `SITE-YYYYMM-####`
|
||||||
- Every DB mutation writes to `audit_log` (table, record_id, action, changed_by, changed_at, old/new value).
|
- 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).
|
- 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/
|
IMS/
|
||||||
├── docs/ # PRD, tech spec, roadmap, specs — source of truth
|
├── 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
|
├── app/ # Next.js App Router pages + API routes
|
||||||
├── components/ # Shared UI components
|
├── components/
|
||||||
|
│ ├── ui/ # Button, StatusTag, TableCard, … (design.md §4)
|
||||||
|
│ └── layout/ # AppShell, MobileShell
|
||||||
├── lib/
|
├── lib/
|
||||||
│ ├── supabase/ # Supabase client + server helpers
|
│ ├── db/ # Drizzle schema, withUser/asAdmin, audit helper
|
||||||
│ ├── claude/ # Claude API wrappers (server-side)
|
│ ├── auth/ # bcryptjs passwords, jose sessions, roles
|
||||||
│ └── notifications/ # Resend + WhatsApp senders
|
│ ├── storage/ # evidence files on disk + signed URLs
|
||||||
├── supabase/
|
│ ├── claude/ # AI client (DeepSeek) + Google embeddings
|
||||||
│ └── migrations/ # SQL migration files
|
│ └── notifications/ # Brevo email + WhatsApp senders, in-app
|
||||||
|
├── db/ # schema.sql, rls.sql, migration/ops scripts
|
||||||
└── public/
|
└── public/
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -62,6 +75,23 @@ IMS/
|
|||||||
- `[[phases]]` — 4 phases + deliverables, current phase
|
- `[[phases]]` — 4 phases + deliverables, current phase
|
||||||
- `[[compliance]]` — NADOPOD 2004, JKKP 6/7/8 rules
|
- `[[compliance]]` — NADOPOD 2004, JKKP 6/7/8 rules
|
||||||
|
|
||||||
|
## Design system (IMS Admin refresh)
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
- 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
|
## graphify
|
||||||
When graphify-out/graph.json exists:
|
When graphify-out/graph.json exists:
|
||||||
- Run `graphify query "<question>"` before browsing source.
|
- Run `graphify query "<question>"` before browsing source.
|
||||||
|
|||||||
@@ -3,22 +3,14 @@ import { describe, it, expect } from 'vitest'
|
|||||||
import { getRoleHome, ROLE_HOME, ALL_ROLES } from '@/lib/auth/roles'
|
import { getRoleHome, ROLE_HOME, ALL_ROLES } from '@/lib/auth/roles'
|
||||||
|
|
||||||
describe('getRoleHome', () => {
|
describe('getRoleHome', () => {
|
||||||
it('returns /reporter for reporter role', () => {
|
it('returns /ssa for ssa role', () => {
|
||||||
expect(getRoleHome('reporter')).toBe('/reporter')
|
expect(getRoleHome('ssa')).toBe('/ssa')
|
||||||
})
|
|
||||||
|
|
||||||
it('returns /supervisor for supervisor role', () => {
|
|
||||||
expect(getRoleHome('supervisor')).toBe('/supervisor')
|
|
||||||
})
|
})
|
||||||
|
|
||||||
it('returns /hse for hse role', () => {
|
it('returns /hse for hse role', () => {
|
||||||
expect(getRoleHome('hse')).toBe('/hse')
|
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', () => {
|
it('returns /management for management role', () => {
|
||||||
expect(getRoleHome('management')).toBe('/management')
|
expect(getRoleHome('management')).toBe('/management')
|
||||||
})
|
})
|
||||||
@@ -27,11 +19,11 @@ describe('getRoleHome', () => {
|
|||||||
expect(getRoleHome('admin')).toBe('/admin')
|
expect(getRoleHome('admin')).toBe('/admin')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('ROLE_HOME covers exactly 6 roles', () => {
|
it('ROLE_HOME covers exactly 4 roles', () => {
|
||||||
expect(Object.keys(ROLE_HOME)).toHaveLength(6)
|
expect(Object.keys(ROLE_HOME)).toHaveLength(4)
|
||||||
})
|
})
|
||||||
|
|
||||||
it('ALL_ROLES lists exactly 6 roles', () => {
|
it('ALL_ROLES lists exactly 4 roles', () => {
|
||||||
expect(ALL_ROLES).toHaveLength(6)
|
expect(ALL_ROLES).toHaveLength(4)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ export default function ForgotPasswordPage() {
|
|||||||
<p className="text-sm text-gray-500">
|
<p className="text-sm text-gray-500">
|
||||||
If an account exists for <strong>{email}</strong>, a password reset link has been sent.
|
If an account exists for <strong>{email}</strong>, a password reset link has been sent.
|
||||||
</p>
|
</p>
|
||||||
<Link href="/login" className="text-sm text-blue-600 hover:underline">
|
<Link href="/login" className="text-sm text-accent-700 hover:underline">
|
||||||
Back to sign in
|
Back to sign in
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
@@ -57,19 +57,19 @@ export default function ForgotPasswordPage() {
|
|||||||
onChange={e => setEmail(e.target.value)}
|
onChange={e => setEmail(e.target.value)}
|
||||||
required
|
required
|
||||||
autoComplete="email"
|
autoComplete="email"
|
||||||
className="border border-gray-300 rounded-md px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
|
className="border border-divider px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-accent"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
type="submit"
|
type="submit"
|
||||||
disabled={loading}
|
disabled={loading}
|
||||||
className="bg-blue-600 hover:bg-blue-700 text-white font-medium py-2 rounded-md disabled:opacity-50 transition-colors"
|
className="bg-accent hover:bg-accent-600 text-white font-medium py-2 disabled:opacity-50 transition-colors"
|
||||||
>
|
>
|
||||||
{loading ? 'Sending…' : 'Send reset link'}
|
{loading ? 'Sending…' : 'Send reset link'}
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<p className="text-center text-sm text-gray-500">
|
<p className="text-center text-sm text-gray-500">
|
||||||
<Link href="/login" className="text-blue-600 hover:underline">
|
<Link href="/login" className="text-accent-700 hover:underline">
|
||||||
Back to sign in
|
Back to sign in
|
||||||
</Link>
|
</Link>
|
||||||
</p>
|
</p>
|
||||||
|
|||||||
@@ -8,13 +8,13 @@ interface Props {
|
|||||||
export default async function LoginPage({ searchParams }: Props) {
|
export default async function LoginPage({ searchParams }: Props) {
|
||||||
const { message } = await searchParams
|
const { message } = await searchParams
|
||||||
return (
|
return (
|
||||||
<main className="min-h-screen flex items-center justify-center bg-gray-50 p-4">
|
<main className="min-h-screen flex items-center justify-center bg-ground p-4">
|
||||||
{message === 'password_reset' && (
|
{message === 'password_reset' && (
|
||||||
<div className="fixed top-4 left-1/2 -translate-x-1/2 bg-green-50 border border-green-200 text-green-700 text-sm rounded 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.
|
Password updated — sign in with your new password.
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
<div className="bg-white rounded-xl shadow-sm border p-8 w-full max-w-sm">
|
<div className="bg-surface rounded-xl shadow-card p-8 w-full max-w-sm">
|
||||||
<LoginForm />
|
<LoginForm />
|
||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ export default function ResetPasswordPage() {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{error && (
|
{error && (
|
||||||
<p className="bg-red-50 border border-red-200 text-red-700 text-sm rounded px-3 py-2">
|
<p className="bg-red-50 border border-red-200 text-red-700 text-sm px-3 py-2">
|
||||||
{error}{' '}
|
{error}{' '}
|
||||||
{error.includes('expired') && (
|
{error.includes('expired') && (
|
||||||
<Link href="/forgot-password" className="underline">
|
<Link href="/forgot-password" className="underline">
|
||||||
@@ -68,7 +68,7 @@ export default function ResetPasswordPage() {
|
|||||||
required
|
required
|
||||||
minLength={8}
|
minLength={8}
|
||||||
autoComplete="new-password"
|
autoComplete="new-password"
|
||||||
className="border border-gray-300 rounded-md px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
|
className="border border-divider px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-accent"
|
||||||
/>
|
/>
|
||||||
<input
|
<input
|
||||||
type="password"
|
type="password"
|
||||||
@@ -77,13 +77,13 @@ export default function ResetPasswordPage() {
|
|||||||
onChange={e => setConfirm(e.target.value)}
|
onChange={e => setConfirm(e.target.value)}
|
||||||
required
|
required
|
||||||
autoComplete="new-password"
|
autoComplete="new-password"
|
||||||
className="border border-gray-300 rounded-md px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
|
className="border border-divider px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-accent"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
type="submit"
|
type="submit"
|
||||||
disabled={loading}
|
disabled={loading}
|
||||||
className="bg-blue-600 hover:bg-blue-700 text-white font-medium py-2 rounded-md disabled:opacity-50 transition-colors"
|
className="bg-accent hover:bg-accent-600 text-white font-medium py-2 disabled:opacity-50 transition-colors"
|
||||||
>
|
>
|
||||||
{loading ? 'Saving…' : 'Set password'}
|
{loading ? 'Saving…' : 'Set password'}
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ export default async function AdminHome() {
|
|||||||
qrCodeToken: zones.qrCodeToken, active: zones.active,
|
qrCodeToken: zones.qrCodeToken, active: zones.active,
|
||||||
}).from(zones)),
|
}).from(zones)),
|
||||||
asAdmin(db => db.select({
|
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))),
|
}).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 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 => ({
|
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 (
|
return (
|
||||||
@@ -57,7 +59,7 @@ export default async function AdminHome() {
|
|||||||
<p className="text-sm text-gray-500 mt-0.5">Manage users, sites, zones, and trucks</p>
|
<p className="text-sm text-gray-500 mt-0.5">Manage users, sites, zones, and trucks</p>
|
||||||
</div>
|
</div>
|
||||||
<div className="mb-6 flex gap-3">
|
<div className="mb-6 flex gap-3">
|
||||||
<Link href="/bulk-import" className="px-4 py-2 bg-green-600 text-white rounded-lg text-sm font-medium hover:bg-green-700">
|
<Link href="/bulk-import" className="px-4 py-2 bg-accent text-white text-sm font-medium hover:bg-accent-600">
|
||||||
Bulk Import Incidents
|
Bulk Import Incidents
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
@@ -66,6 +68,7 @@ export default async function AdminHome() {
|
|||||||
sites={sitesWithZones}
|
sites={sitesWithZones}
|
||||||
siteOptions={siteOptions}
|
siteOptions={siteOptions}
|
||||||
trucks={truckList}
|
trucks={truckList}
|
||||||
|
truckSites={truckSites}
|
||||||
/>
|
/>
|
||||||
</main>
|
</main>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -2,23 +2,30 @@ export const dynamic = 'force-dynamic'
|
|||||||
|
|
||||||
import { notFound, redirect } from 'next/navigation'
|
import { notFound, redirect } from 'next/navigation'
|
||||||
import Link from 'next/link'
|
import Link from 'next/link'
|
||||||
|
import { ArrowLeft } from 'lucide-react'
|
||||||
import { asAdmin } from '@/lib/db/with-user'
|
import { asAdmin } from '@/lib/db/with-user'
|
||||||
import { getSession } from '@/lib/auth/get-session'
|
import { getSession } from '@/lib/auth/get-session'
|
||||||
import { capaActions, incidents, users } from '@/lib/db/schema'
|
import { capaActions, evidenceFiles, incidents, users } from '@/lib/db/schema'
|
||||||
import { eq } from 'drizzle-orm'
|
import { eq, and, asc } from 'drizzle-orm'
|
||||||
import { aliasedTable } from 'drizzle-orm'
|
import { aliasedTable } from 'drizzle-orm'
|
||||||
import { VerifyForm } from '@/components/capa/verify-form'
|
import { VerifyForm } from '@/components/capa/verify-form'
|
||||||
import { CloseCapaButton } from '@/components/capa/close-capa-button'
|
import { CloseCapaButton } from '@/components/capa/close-capa-button'
|
||||||
import { CapaOwnerActions } from '@/components/capa/capa-owner-actions'
|
import { CapaOwnerActions } from '@/components/capa/capa-owner-actions'
|
||||||
|
import { Avatar } from '@/components/ui/avatar'
|
||||||
|
import { PriorityTag, StatusTag } from '@/components/ui/status-tag'
|
||||||
|
import { daysLate } from '@/lib/capa/list'
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
params: Promise<{ id: string }>
|
params: Promise<{ id: string }>
|
||||||
}
|
}
|
||||||
|
|
||||||
const PRIORITY_BADGE: Record<string, string> = {
|
function Row({ label, children }: { label: string; children: React.ReactNode }) {
|
||||||
low: 'bg-gray-100 text-gray-600',
|
return (
|
||||||
med: 'bg-yellow-100 text-yellow-700',
|
<div className="flex items-center justify-between gap-3 border-b border-rule py-2.5 last:border-0">
|
||||||
high: 'bg-red-100 text-red-700',
|
<dt className="text-xs text-muted">{label}</dt>
|
||||||
|
<dd className="text-right text-[13px]">{children}</dd>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export default async function CapaDetailPage({ params }: Props) {
|
export default async function CapaDetailPage({ params }: Props) {
|
||||||
@@ -53,79 +60,111 @@ export default async function CapaDetailPage({ params }: Props) {
|
|||||||
|
|
||||||
if (!capa) notFound()
|
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 isHse = session && ['hse', 'admin'].includes(session.role)
|
||||||
const status = capa.status
|
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 (
|
return (
|
||||||
<main className="max-w-2xl mx-auto px-4 py-6">
|
<div className="space-y-4 px-4 py-5 md:px-8 md:py-6">
|
||||||
<Link href="/hse/capa" className="text-sm text-blue-600 hover:underline mb-4 inline-block">
|
<Link href="/hse/capa" className="inline-flex items-center gap-1 text-[13px] text-accent hover:underline">
|
||||||
← CAPA Board
|
<ArrowLeft size={14} strokeWidth={2} aria-hidden />
|
||||||
|
CAPA
|
||||||
</Link>
|
</Link>
|
||||||
|
|
||||||
<div className="bg-white rounded-xl shadow-sm p-5 mb-4 space-y-4">
|
<div className="space-y-2">
|
||||||
<div className="flex items-start justify-between">
|
<h1 className="text-xl font-[650]">{capa.description}</h1>
|
||||||
<div>
|
<div className="flex flex-wrap items-center gap-2">
|
||||||
<p className="text-xs text-gray-500 mb-1">
|
<StatusTag status={shownStatus} />
|
||||||
Incident: {capa.incidentRefNo ?? '—'}
|
<PriorityTag priority={capa.priority} />
|
||||||
</p>
|
<span className="text-[13px] text-muted">
|
||||||
<p className="text-gray-900 font-medium">{capa.description}</p>
|
From{' '}
|
||||||
</div>
|
<Link href={`/hse/incidents/${capa.incidentId}`} className="font-mono text-[12.5px] text-accent hover:underline">
|
||||||
<span className={`px-2 py-1 rounded text-xs font-semibold ${PRIORITY_BADGE[capa.priority] ?? ''}`}>
|
{capa.incidentRefNo ?? '—'}
|
||||||
{capa.priority}
|
</Link>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</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>
|
<div className="space-y-4">
|
||||||
<p className="text-xs text-gray-500">Owner</p>
|
{canAct && (
|
||||||
<p className="text-gray-800">{capa.ownerName ?? '—'}</p>
|
<div>
|
||||||
</div>
|
<CapaOwnerActions capaId={id} currentStatus={status} />
|
||||||
<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>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{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-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>
|
</div>
|
||||||
|
|
||||||
{capa.rootCauseRef && (
|
<aside>
|
||||||
<div>
|
<section className="rounded-xl bg-surface p-5 shadow-card">
|
||||||
<p className="text-xs text-gray-500">Root Cause Reference</p>
|
<h2 className="mb-1 text-sm font-semibold">Details</h2>
|
||||||
<p className="text-sm text-gray-800">{capa.rootCauseRef}</p>
|
<dl>
|
||||||
</div>
|
<Row label="Owner">
|
||||||
)}
|
{capa.ownerName ? (
|
||||||
|
<span className="inline-flex items-center gap-2">
|
||||||
{capa.completedAt && (
|
<Avatar name={capa.ownerName} />
|
||||||
<p className="text-xs text-gray-500">
|
{capa.ownerName}
|
||||||
Completed: {new Date(capa.completedAt).toLocaleString('en-MY', { timeZone: 'Asia/Kuala_Lumpur' })}
|
</span>
|
||||||
</p>
|
) : (
|
||||||
)}
|
'—'
|
||||||
|
)}
|
||||||
|
</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>
|
||||||
|
)}
|
||||||
|
</dl>
|
||||||
|
</section>
|
||||||
|
</aside>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
{['open', 'in_progress', 'overdue', 'reopened'].includes(status) &&
|
|
||||||
(isHse || session?.sub === capa.ownerUserId) && (
|
|
||||||
<CapaOwnerActions capaId={id} currentStatus={status} />
|
|
||||||
)}
|
|
||||||
|
|
||||||
{isHse && status === 'pending_verification' && (
|
|
||||||
<VerifyForm capaId={id} />
|
|
||||||
)}
|
|
||||||
|
|
||||||
{isHse && status === 'verified' && (
|
|
||||||
<CloseCapaButton capaId={id} />
|
|
||||||
)}
|
|
||||||
</main>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
export const dynamic = 'force-dynamic'
|
export const dynamic = 'force-dynamic'
|
||||||
|
|
||||||
import { redirect } from 'next/navigation'
|
import { redirect } from 'next/navigation'
|
||||||
import Link from 'next/link'
|
|
||||||
import { asAdmin } from '@/lib/db/with-user'
|
import { asAdmin } from '@/lib/db/with-user'
|
||||||
import { getSession } from '@/lib/auth/get-session'
|
import { getSession } from '@/lib/auth/get-session'
|
||||||
import { capaActions, incidents, users } from '@/lib/db/schema'
|
import { capaActions, incidents, users } from '@/lib/db/schema'
|
||||||
import { eq, asc } from 'drizzle-orm'
|
import { eq, asc } from 'drizzle-orm'
|
||||||
import { aliasedTable } 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() {
|
export default async function CapaListPage() {
|
||||||
const session = await getSession()
|
const session = await getSession()
|
||||||
@@ -34,29 +34,23 @@ export default async function CapaListPage() {
|
|||||||
)
|
)
|
||||||
|
|
||||||
const today = new Date().toISOString().slice(0, 10)
|
const today = new Date().toISOString().slice(0, 10)
|
||||||
const capas = rows.map(r => ({
|
const capas: CapaRow[] = rows.map(r => ({
|
||||||
id: r.id,
|
id: r.id,
|
||||||
incident_id: r.incidentId,
|
incident_id: r.incidentId,
|
||||||
description: r.description,
|
description: r.description,
|
||||||
department: r.department,
|
department: r.department,
|
||||||
due_date: r.dueDate,
|
due_date: r.dueDate,
|
||||||
priority: r.priority,
|
priority: r.priority,
|
||||||
status: (r.status === 'open' || r.status === 'in_progress') && r.dueDate && r.dueDate < today
|
status: ((r.status === 'open' || r.status === 'in_progress') && r.dueDate && r.dueDate < today
|
||||||
? 'overdue' as const
|
? 'overdue'
|
||||||
: r.status,
|
: r.status) as CapaStatus,
|
||||||
incidents: { reference_no: r.incidentRefNo ?? null },
|
incident_ref: r.incidentRefNo ?? null,
|
||||||
owner: r.ownerName ? { name: r.ownerName } : null,
|
owner_name: r.ownerName ?? null,
|
||||||
}))
|
}))
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<main className="max-w-6xl mx-auto px-4 py-6">
|
<div className="px-4 py-5 md:px-8 md:py-6">
|
||||||
<div className="flex items-center justify-between mb-6">
|
<CapaWorkspace capas={capas} today={today} />
|
||||||
<h1 className="text-2xl font-bold text-gray-900">CAPA Board</h1>
|
</div>
|
||||||
<Link href="/hse/incidents" className="text-sm text-blue-600 hover:underline">
|
|
||||||
← Incidents
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
<CapaBoard capas={capas} />
|
|
||||||
</main>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -165,17 +165,17 @@ export default async function HseDashboardPage({
|
|||||||
<div className="flex gap-3">
|
<div className="flex gap-3">
|
||||||
<a
|
<a
|
||||||
href="/api/dashboard/export?role=hse"
|
href="/api/dashboard/export?role=hse"
|
||||||
className="text-sm text-gray-500 hover:text-gray-700 border border-gray-200 rounded-lg px-3 py-1.5"
|
className="text-sm text-gray-500 hover:text-gray-700 border border-divider px-3 py-1.5"
|
||||||
>
|
>
|
||||||
Export CSV
|
Export CSV
|
||||||
</a>
|
</a>
|
||||||
<a
|
<a
|
||||||
href={`/api/reports/jkkp8?year=${now.getFullYear()}`}
|
href={`/api/reports/jkkp8?year=${now.getFullYear()}`}
|
||||||
className="text-sm text-gray-500 hover:text-gray-700 border border-gray-200 rounded-lg px-3 py-1.5"
|
className="text-sm text-gray-500 hover:text-gray-700 border border-divider px-3 py-1.5"
|
||||||
>
|
>
|
||||||
JKKP 8
|
JKKP 8
|
||||||
</a>
|
</a>
|
||||||
<Link href="/hse/incidents" className="text-sm text-blue-600 hover:underline">
|
<Link href="/hse/incidents" className="text-sm text-accent-700 hover:underline">
|
||||||
All incidents →
|
All incidents →
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
@@ -187,8 +187,8 @@ export default async function HseDashboardPage({
|
|||||||
{(tab === 'overview') && (
|
{(tab === 'overview') && (
|
||||||
<>
|
<>
|
||||||
{now.getMonth() === 0 && (
|
{now.getMonth() === 0 && (
|
||||||
<div className="bg-amber-50 border border-amber-200 rounded-xl p-4 mb-6">
|
<div className="bg-st-amber-bg rounded-xl p-4 mb-6">
|
||||||
<p className="text-sm text-amber-800">
|
<p className="text-sm text-st-amber-fg">
|
||||||
<strong>JKKP 8 annual register due:</strong> the {now.getFullYear() - 1} register must be
|
<strong>JKKP 8 annual register due:</strong> the {now.getFullYear() - 1} register must be
|
||||||
submitted to DOSH before 31 January {now.getFullYear()}.{' '}
|
submitted to DOSH before 31 January {now.getFullYear()}.{' '}
|
||||||
<a href={`/api/reports/jkkp8?year=${now.getFullYear() - 1}`} className="underline font-medium">
|
<a href={`/api/reports/jkkp8?year=${now.getFullYear() - 1}`} className="underline font-medium">
|
||||||
@@ -210,7 +210,7 @@ export default async function HseDashboardPage({
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="bg-white rounded-xl shadow-sm p-5">
|
<div className="bg-surface shadow-sm p-5">
|
||||||
<h2 className="text-sm font-semibold text-gray-900 mb-1">
|
<h2 className="text-sm font-semibold text-gray-900 mb-1">
|
||||||
Leading vs Lagging — Last 30 Days
|
Leading vs Lagging — Last 30 Days
|
||||||
</h2>
|
</h2>
|
||||||
@@ -218,18 +218,18 @@ export default async function HseDashboardPage({
|
|||||||
Leading: hazard + near-miss reports (predict risk) · Lagging: injuries (past harm)
|
Leading: hazard + near-miss reports (predict risk) · Lagging: injuries (past harm)
|
||||||
</p>
|
</p>
|
||||||
<div className="flex gap-4">
|
<div className="flex gap-4">
|
||||||
<div className="flex-1 text-center bg-blue-50 rounded-lg p-4">
|
<div className="flex-1 text-center bg-neutral-100 p-4">
|
||||||
<p className="text-3xl font-bold text-blue-600">{leadingCount}</p>
|
<p className="text-3xl font-bold text-accent-700">{leadingCount}</p>
|
||||||
<p className="text-xs text-blue-700 mt-1">Leading (Hazards + Near Misses)</p>
|
<p className="text-xs text-accent-700 mt-1">Leading (Hazards + Near Misses)</p>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex-1 text-center bg-red-50 rounded-lg p-4">
|
<div className="flex-1 text-center bg-red-50 p-4">
|
||||||
<p className="text-3xl font-bold text-red-600">{laggingCount}</p>
|
<p className="text-3xl font-bold text-red-600">{laggingCount}</p>
|
||||||
<p className="text-xs text-red-700 mt-1">Lagging (Injuries)</p>
|
<p className="text-xs text-red-700 mt-1">Lagging (Injuries)</p>
|
||||||
</div>
|
</div>
|
||||||
{capaOnTimeRate !== null && (
|
{capaOnTimeRate !== null && (
|
||||||
<div className="flex-1 text-center bg-green-50 rounded-lg p-4">
|
<div className="flex-1 text-center bg-neutral-100 p-4">
|
||||||
<p className="text-3xl font-bold text-green-600">{capaOnTimeRate}%</p>
|
<p className="text-3xl font-bold text-ink">{capaOnTimeRate}%</p>
|
||||||
<p className="text-xs text-green-700 mt-1">CAPA On-Time Rate</p>
|
<p className="text-xs text-ink mt-1">CAPA On-Time Rate</p>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
@@ -240,7 +240,7 @@ export default async function HseDashboardPage({
|
|||||||
{/* Trends tab */}
|
{/* Trends tab */}
|
||||||
{tab === 'trends' && (
|
{tab === 'trends' && (
|
||||||
<>
|
<>
|
||||||
<div className="bg-white rounded-xl shadow-sm p-5 mb-4">
|
<div className="bg-surface shadow-sm p-5 mb-4">
|
||||||
<h2 className="text-sm font-semibold text-gray-900 mb-1">
|
<h2 className="text-sm font-semibold text-gray-900 mb-1">
|
||||||
Incident Trend — Last 12 Months
|
Incident Trend — Last 12 Months
|
||||||
</h2>
|
</h2>
|
||||||
@@ -253,7 +253,7 @@ export default async function HseDashboardPage({
|
|||||||
return (
|
return (
|
||||||
<div key={m.month} className="flex-1 flex flex-col items-center gap-1">
|
<div key={m.month} className="flex-1 flex flex-col items-center gap-1">
|
||||||
<div className="w-full flex flex-col-reverse" style={{ height: '192px' }}>
|
<div className="w-full flex flex-col-reverse" style={{ height: '192px' }}>
|
||||||
<div className="w-full bg-blue-400" style={{ height: `${(m.leading / monthlyMax) * 192}px` }} />
|
<div className="w-full bg-accent-400" style={{ height: `${(m.leading / monthlyMax) * 192}px` }} />
|
||||||
<div className="w-full bg-red-400" style={{ height: `${(m.lagging / monthlyMax) * 192}px` }} />
|
<div className="w-full bg-red-400" style={{ height: `${(m.lagging / monthlyMax) * 192}px` }} />
|
||||||
<div className="w-full bg-gray-300" style={{ height: `${(Math.max(0, other) / monthlyMax) * 192}px` }} />
|
<div className="w-full bg-gray-300" style={{ height: `${(Math.max(0, other) / monthlyMax) * 192}px` }} />
|
||||||
</div>
|
</div>
|
||||||
@@ -266,7 +266,7 @@ export default async function HseDashboardPage({
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{rootCauses.length > 0 && (
|
{rootCauses.length > 0 && (
|
||||||
<div className="bg-white rounded-xl shadow-sm p-5">
|
<div className="bg-surface shadow-sm p-5">
|
||||||
<h2 className="text-sm font-semibold text-gray-900 mb-4">Top Root Causes</h2>
|
<h2 className="text-sm font-semibold text-gray-900 mb-4">Top Root Causes</h2>
|
||||||
<ol className="space-y-2">
|
<ol className="space-y-2">
|
||||||
{rootCauses.map((rc, i) => (
|
{rootCauses.map((rc, i) => (
|
||||||
@@ -288,7 +288,7 @@ export default async function HseDashboardPage({
|
|||||||
{tab === 'zones' && (
|
{tab === 'zones' && (
|
||||||
<>
|
<>
|
||||||
{by_zone.length > 0 && (
|
{by_zone.length > 0 && (
|
||||||
<div className="bg-white rounded-xl shadow-sm p-5 mb-4">
|
<div className="bg-surface shadow-sm p-5 mb-4">
|
||||||
<h2 className="text-sm font-semibold text-gray-900 mb-4">
|
<h2 className="text-sm font-semibold text-gray-900 mb-4">
|
||||||
Zone Incident Heatmap — Last 90 Days
|
Zone Incident Heatmap — Last 90 Days
|
||||||
</h2>
|
</h2>
|
||||||
@@ -296,9 +296,9 @@ export default async function HseDashboardPage({
|
|||||||
{by_zone.map(({ name, count }) => (
|
{by_zone.map(({ name, count }) => (
|
||||||
<div key={name} className="flex items-center gap-3">
|
<div key={name} className="flex items-center gap-3">
|
||||||
<span className="text-sm text-gray-600 w-36 shrink-0 truncate">{name}</span>
|
<span className="text-sm text-gray-600 w-36 shrink-0 truncate">{name}</span>
|
||||||
<div className="flex-1 bg-gray-100 rounded-full h-3">
|
<div className="flex-1 bg-gray-100 h-3">
|
||||||
<div
|
<div
|
||||||
className="h-3 rounded-full"
|
className="h-3"
|
||||||
style={{
|
style={{
|
||||||
width: `${(count / zoneMax) * 100}%`,
|
width: `${(count / zoneMax) * 100}%`,
|
||||||
backgroundColor: `hsl(220, 70%, ${Math.max(30, 80 - Math.round((count / zoneMax) * 50))}%)`,
|
backgroundColor: `hsl(220, 70%, ${Math.max(30, 80 - Math.round((count / zoneMax) * 50))}%)`,
|
||||||
@@ -312,15 +312,15 @@ export default async function HseDashboardPage({
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<div className="bg-white rounded-xl shadow-sm p-5 mb-4">
|
<div className="bg-surface shadow-sm p-5 mb-4">
|
||||||
<h2 className="text-sm font-semibold text-gray-900 mb-4">By Incident Type</h2>
|
<h2 className="text-sm font-semibold text-gray-900 mb-4">By Incident Type</h2>
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
{Object.entries(by_type).sort((a, b) => b[1] - a[1]).map(([type, count]) => (
|
{Object.entries(by_type).sort((a, b) => b[1] - a[1]).map(([type, count]) => (
|
||||||
<div key={type} className="flex items-center gap-3">
|
<div key={type} className="flex items-center gap-3">
|
||||||
<span className="text-sm text-gray-600 w-32 shrink-0">{TYPE_LABELS[type] ?? type}</span>
|
<span className="text-sm text-gray-600 w-32 shrink-0">{TYPE_LABELS[type] ?? type}</span>
|
||||||
<div className="flex-1 bg-gray-100 rounded-full h-2">
|
<div className="flex-1 bg-gray-100 h-2">
|
||||||
<div
|
<div
|
||||||
className="bg-blue-500 h-2 rounded-full"
|
className="bg-accent h-2"
|
||||||
style={{ width: total > 0 ? `${(count / total) * 100}%` : '0%' }}
|
style={{ width: total > 0 ? `${(count / total) * 100}%` : '0%' }}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -333,7 +333,7 @@ export default async function HseDashboardPage({
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="bg-white rounded-xl shadow-sm p-5">
|
<div className="bg-surface shadow-sm p-5">
|
||||||
<h2 className="text-sm font-semibold text-gray-900 mb-4">By Site</h2>
|
<h2 className="text-sm font-semibold text-gray-900 mb-4">By Site</h2>
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
{by_site.map(({ name, count }) => (
|
{by_site.map(({ name, count }) => (
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { notFound, redirect } from 'next/navigation'
|
import { notFound, redirect } from 'next/navigation'
|
||||||
import Link from 'next/link'
|
import Link from 'next/link'
|
||||||
|
import { ArrowLeft } from 'lucide-react'
|
||||||
import { asAdmin } from '@/lib/db/with-user'
|
import { asAdmin } from '@/lib/db/with-user'
|
||||||
import { getSession } from '@/lib/auth/get-session'
|
import { getSession } from '@/lib/auth/get-session'
|
||||||
import { incidents } from '@/lib/db/schema'
|
import { incidents } from '@/lib/db/schema'
|
||||||
@@ -30,15 +31,18 @@ export default async function NewCapaPage({ params }: Props) {
|
|||||||
if (!incident) notFound()
|
if (!incident) notFound()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<main className="max-w-lg mx-auto px-4 py-6">
|
<div className="max-w-xl space-y-4 px-4 py-5 md:px-8 md:py-6">
|
||||||
<Link href={`/hse/incidents/${id}`} className="text-sm text-blue-600 hover:underline mb-4 inline-block">
|
<Link href={`/hse/incidents/${id}`} className="inline-flex items-center gap-1 text-[13px] text-accent hover:underline">
|
||||||
← Back to incident
|
<ArrowLeft size={14} strokeWidth={2} aria-hidden />
|
||||||
|
Back to incident
|
||||||
</Link>
|
</Link>
|
||||||
<h1 className="text-xl font-bold text-gray-900 mb-1">Add CAPA Action</h1>
|
<div>
|
||||||
<p className="text-sm text-gray-500 mb-6">
|
<h1 className="text-xl font-[650]">Add CAPA action</h1>
|
||||||
{incident.referenceNo ?? id}
|
<p className="mt-0.5 font-mono text-[12.5px] text-muted">{incident.referenceNo ?? id}</p>
|
||||||
</p>
|
</div>
|
||||||
<CapaForm incidentId={id} />
|
<div className="rounded-xl bg-surface p-5 shadow-card">
|
||||||
</main>
|
<CapaForm incidentId={id} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ export default async function InvestigationPage({ params }: Props) {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<main className="max-w-2xl mx-auto px-4 py-6">
|
<main className="max-w-2xl mx-auto px-4 py-6">
|
||||||
<Link href={`/hse/incidents/${id}`} className="text-sm text-blue-600 hover:underline mb-4 inline-block">
|
<Link href={`/hse/incidents/${id}`} className="text-sm text-accent-700 hover:underline mb-4 inline-block">
|
||||||
← Back to incident
|
← Back to incident
|
||||||
</Link>
|
</Link>
|
||||||
<h1 className="text-xl font-bold text-gray-900 mb-1">Investigation Workspace</h1>
|
<h1 className="text-xl font-bold text-gray-900 mb-1">Investigation Workspace</h1>
|
||||||
|
|||||||
@@ -175,14 +175,14 @@ export default async function HseIncidentDetailPage({ params }: Props) {
|
|||||||
<a
|
<a
|
||||||
href={`/api/incidents/${id}/jkkp-pdf?form=jkkp6`}
|
href={`/api/incidents/${id}/jkkp-pdf?form=jkkp6`}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
className="inline-block bg-gray-800 text-white rounded-lg px-4 py-2 text-sm font-semibold hover:bg-gray-900"
|
className="inline-block bg-gray-800 text-white px-4 py-2 text-sm font-semibold hover:bg-gray-900"
|
||||||
>
|
>
|
||||||
Download JKKP 6 (PDF)
|
Download JKKP 6 (PDF)
|
||||||
</a>
|
</a>
|
||||||
<a
|
<a
|
||||||
href={`/api/incidents/${id}/jkkp-pdf?form=jkkp7`}
|
href={`/api/incidents/${id}/jkkp-pdf?form=jkkp7`}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
className="inline-block bg-gray-600 text-white rounded-lg px-4 py-2 text-sm font-semibold hover:bg-gray-700"
|
className="inline-block bg-gray-600 text-white px-4 py-2 text-sm font-semibold hover:bg-gray-700"
|
||||||
>
|
>
|
||||||
Download JKKP 7 (PDF)
|
Download JKKP 7 (PDF)
|
||||||
</a>
|
</a>
|
||||||
@@ -194,7 +194,7 @@ export default async function HseIncidentDetailPage({ params }: Props) {
|
|||||||
href={`/api/incidents/${id}/report-pdf`}
|
href={`/api/incidents/${id}/report-pdf`}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noopener noreferrer"
|
rel="noopener noreferrer"
|
||||||
className="flex items-center gap-1.5 px-3 py-1.5 bg-green-600 text-white text-xs font-semibold rounded-lg hover:bg-green-700 transition-colors"
|
className="flex items-center gap-1.5 px-3 py-1.5 bg-accent text-white text-xs font-semibold hover:bg-accent-600 transition-colors"
|
||||||
>
|
>
|
||||||
<svg className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
|
<svg className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" d="M12 10v6m0 0l-3-3m3 3l3-3m2 8H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z" />
|
<path strokeLinecap="round" strokeLinejoin="round" d="M12 10v6m0 0l-3-3m3 3l3-3m2 8H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z" />
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ export default async function TriagePage({ params }: Props) {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<main className="max-w-lg mx-auto px-4 py-6">
|
<main className="max-w-lg mx-auto px-4 py-6">
|
||||||
<Link href={`/hse/incidents/${id}`} className="text-sm text-blue-600 hover:underline mb-4 inline-block">
|
<Link href={`/hse/incidents/${id}`} className="text-sm text-accent-700 hover:underline mb-4 inline-block">
|
||||||
← Back to incident
|
← Back to incident
|
||||||
</Link>
|
</Link>
|
||||||
<h1 className="text-xl font-bold text-gray-900 mb-1">Triage Incident</h1>
|
<h1 className="text-xl font-bold text-gray-900 mb-1">Triage Incident</h1>
|
||||||
|
|||||||
@@ -1,106 +1,39 @@
|
|||||||
export const dynamic = 'force-dynamic'
|
export const dynamic = 'force-dynamic'
|
||||||
|
|
||||||
|
import Link from 'next/link'
|
||||||
import { redirect } from 'next/navigation'
|
import { redirect } from 'next/navigation'
|
||||||
import { asAdmin } from '@/lib/db/with-user'
|
|
||||||
import { getSession } from '@/lib/auth/get-session'
|
import { getSession } from '@/lib/auth/get-session'
|
||||||
import { incidents, sites, zones, trucks, users } from '@/lib/db/schema'
|
import { buttonClass } from '@/components/ui/button'
|
||||||
import { eq, and, or, ilike, desc, asc, sql } from 'drizzle-orm'
|
import { IncidentTable } from '@/components/incidents/incident-table'
|
||||||
import { aliasedTable } from 'drizzle-orm'
|
import { loadIncidentList } from '@/lib/incidents/list-query'
|
||||||
import { IncidentList, type Incident } from '@/components/incidents/incident-list'
|
import { parseListParams } from '@/lib/incidents/list-params'
|
||||||
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 HseInboxPage({
|
export default async function HseInboxPage({
|
||||||
searchParams,
|
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()
|
const session = await getSession()
|
||||||
if (!session) redirect('/login')
|
if (!session) redirect('/login')
|
||||||
|
|
||||||
const params = await searchParams
|
const params = parseListParams(await searchParams)
|
||||||
const page = Math.max(1, Number.parseInt(params.page ?? '1', 10) || 1)
|
const data = await loadIncidentList(params)
|
||||||
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 (
|
return (
|
||||||
<main className="max-w-4xl mx-auto px-4 py-6">
|
<div className="px-4 py-5 md:px-8 md:py-6 space-y-4">
|
||||||
<div className="flex items-center justify-between mb-4">
|
<div className="flex items-center justify-between">
|
||||||
<h1 className="text-2xl font-bold text-gray-900">Incident Inbox</h1>
|
<h1 className="text-[22px] md:text-xl font-[650]">Incidents</h1>
|
||||||
<span className="text-sm text-gray-500">{total} incidents</span>
|
<Link href="/report" className={buttonClass('primary')}>Report incident</Link>
|
||||||
</div>
|
</div>
|
||||||
<IncidentFilters sites={siteOptions} trucks={truckOptions} />
|
<IncidentTable
|
||||||
<IncidentList incidents={incidentList} basePath="/hse" />
|
incidents={data.incidents}
|
||||||
<Pagination page={page} pageSize={PAGE_SIZE} total={total} href="/hse/incidents" />
|
basePath="/hse"
|
||||||
</main>
|
total={data.total}
|
||||||
|
counts={data.counts}
|
||||||
|
params={params}
|
||||||
|
sites={data.sites}
|
||||||
|
trucks={data.trucks}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,12 +13,12 @@ export default async function HsePage() {
|
|||||||
<h1 className="text-2xl font-bold text-gray-900 mb-1">HSE Officer Portal</h1>
|
<h1 className="text-2xl font-bold text-gray-900 mb-1">HSE Officer Portal</h1>
|
||||||
<p className="text-gray-500 text-sm mb-8">Welcome, {session.name}</p>
|
<p className="text-gray-500 text-sm mb-8">Welcome, {session.name}</p>
|
||||||
<div className="grid grid-cols-2 gap-4 sm:grid-cols-3">
|
<div className="grid grid-cols-2 gap-4 sm:grid-cols-3">
|
||||||
<Link href="/hse/incidents" className="bg-white rounded-xl shadow-sm p-5 hover:shadow-md transition-shadow border border-gray-100">
|
<Link href="/hse/incidents" className="bg-surface shadow-sm p-5 hover:shadow-md transition-shadow border border-divider">
|
||||||
<div className="text-2xl mb-2">📋</div>
|
<div className="text-2xl mb-2">📋</div>
|
||||||
<div className="font-semibold text-gray-900">Incident Inbox</div>
|
<div className="font-semibold text-gray-900">Incident Inbox</div>
|
||||||
<div className="text-xs text-gray-500 mt-1">View all incidents</div>
|
<div className="text-xs text-gray-500 mt-1">View all incidents</div>
|
||||||
</Link>
|
</Link>
|
||||||
<Link href="/hse/dashboard" className="bg-white rounded-xl shadow-sm p-5 hover:shadow-md transition-shadow border border-gray-100">
|
<Link href="/hse/dashboard" className="bg-surface shadow-sm p-5 hover:shadow-md transition-shadow border border-divider">
|
||||||
<div className="text-2xl mb-2">📊</div>
|
<div className="text-2xl mb-2">📊</div>
|
||||||
<div className="font-semibold text-gray-900">Dashboard</div>
|
<div className="font-semibold text-gray-900">Dashboard</div>
|
||||||
<div className="text-xs text-gray-500 mt-1">Stats & overview</div>
|
<div className="text-xs text-gray-500 mt-1">Stats & overview</div>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ export const dynamic = 'force-dynamic'
|
|||||||
|
|
||||||
import { redirect } from 'next/navigation'
|
import { redirect } from 'next/navigation'
|
||||||
import { getSession } from '@/lib/auth/get-session'
|
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({
|
export default async function ProtectedLayout({
|
||||||
children,
|
children,
|
||||||
@@ -13,15 +13,8 @@ export default async function ProtectedLayout({
|
|||||||
if (!session) redirect('/login')
|
if (!session) redirect('/login')
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="min-h-screen bg-gray-50">
|
<AppShell role={session.role} userName={session.name}>
|
||||||
<Sidebar
|
{children}
|
||||||
role={session.role}
|
</AppShell>
|
||||||
userName={session.name}
|
|
||||||
userEmail=""
|
|
||||||
/>
|
|
||||||
<div className="sm:ml-60 pb-16 sm:pb-0">
|
|
||||||
{children}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ export default async function ManagementPage() {
|
|||||||
|
|
||||||
const SEVERITY_LABELS: Record<number, string> = { 1: 'Minor', 2: 'Low', 3: 'Moderate', 4: 'Serious', 5: 'Critical' }
|
const SEVERITY_LABELS: Record<number, string> = { 1: 'Minor', 2: 'Low', 3: 'Moderate', 4: 'Serious', 5: 'Critical' }
|
||||||
const SEVERITY_COLORS: Record<number, string> = {
|
const SEVERITY_COLORS: Record<number, string> = {
|
||||||
1: 'bg-green-400', 2: 'bg-yellow-400', 3: 'bg-orange-400', 4: 'bg-red-500', 5: 'bg-red-700',
|
1: 'bg-neutral-300', 2: 'bg-neutral-500', 3: 'bg-accent-300', 4: 'bg-accent', 5: 'bg-accent-700',
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -97,7 +97,7 @@ export default async function ManagementPage() {
|
|||||||
<h1 className="text-2xl font-bold text-gray-900">Management Dashboard</h1>
|
<h1 className="text-2xl font-bold text-gray-900">Management Dashboard</h1>
|
||||||
<a
|
<a
|
||||||
href="/api/dashboard/export?role=management"
|
href="/api/dashboard/export?role=management"
|
||||||
className="text-sm text-gray-500 hover:text-gray-700 border border-gray-200 rounded-lg px-3 py-1.5"
|
className="text-sm text-gray-500 hover:text-gray-700 border border-divider px-3 py-1.5"
|
||||||
>
|
>
|
||||||
Export CSV
|
Export CSV
|
||||||
</a>
|
</a>
|
||||||
@@ -119,15 +119,15 @@ export default async function ManagementPage() {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Leading vs lagging */}
|
{/* Leading vs lagging */}
|
||||||
<div className="bg-white rounded-xl shadow-sm p-5 mb-4">
|
<div className="bg-surface shadow-sm p-5 mb-4">
|
||||||
<h2 className="text-sm font-semibold text-gray-700 uppercase tracking-wide mb-1">Leading vs Lagging — Last 30 Days</h2>
|
<h2 className="text-sm font-semibold text-gray-700 uppercase tracking-wide mb-1">Leading vs Lagging — Last 30 Days</h2>
|
||||||
<p className="text-xs text-gray-400 mb-4">Leading: hazard + near-miss · Lagging: injuries</p>
|
<p className="text-xs text-gray-400 mb-4">Leading: hazard + near-miss · Lagging: injuries</p>
|
||||||
<div className="flex gap-6">
|
<div className="flex gap-6">
|
||||||
<div className="flex-1 text-center bg-blue-50 rounded-lg p-4">
|
<div className="flex-1 text-center bg-neutral-100 p-4">
|
||||||
<p className="text-3xl font-bold text-blue-600">{leadingCount}</p>
|
<p className="text-3xl font-bold text-accent-700">{leadingCount}</p>
|
||||||
<p className="text-xs text-blue-700 mt-1">Leading (Hazards + Near Misses)</p>
|
<p className="text-xs text-accent-700 mt-1">Leading (Hazards + Near Misses)</p>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex-1 text-center bg-red-50 rounded-lg p-4">
|
<div className="flex-1 text-center bg-red-50 p-4">
|
||||||
<p className="text-3xl font-bold text-red-600">{laggingCount}</p>
|
<p className="text-3xl font-bold text-red-600">{laggingCount}</p>
|
||||||
<p className="text-xs text-red-700 mt-1">Lagging (Injuries)</p>
|
<p className="text-xs text-red-700 mt-1">Lagging (Injuries)</p>
|
||||||
</div>
|
</div>
|
||||||
@@ -135,15 +135,15 @@ export default async function ManagementPage() {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Severity distribution */}
|
{/* Severity distribution */}
|
||||||
<div className="bg-white rounded-xl shadow-sm p-5 mb-4">
|
<div className="bg-surface shadow-sm p-5 mb-4">
|
||||||
<h2 className="text-sm font-semibold text-gray-700 uppercase tracking-wide mb-4">Severity Distribution (All Time)</h2>
|
<h2 className="text-sm font-semibold text-gray-700 uppercase tracking-wide mb-4">Severity Distribution (All Time)</h2>
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
{([5, 4, 3, 2, 1] as const).map(sev => (
|
{([5, 4, 3, 2, 1] as const).map(sev => (
|
||||||
<div key={sev} className="flex items-center gap-3">
|
<div key={sev} className="flex items-center gap-3">
|
||||||
<span className="text-sm text-gray-600 w-24 shrink-0">{SEVERITY_LABELS[sev]}</span>
|
<span className="text-sm text-gray-600 w-24 shrink-0">{SEVERITY_LABELS[sev]}</span>
|
||||||
<div className="flex-1 bg-gray-100 rounded-full h-3">
|
<div className="flex-1 bg-gray-100 h-3">
|
||||||
<div
|
<div
|
||||||
className={`h-3 rounded-full ${SEVERITY_COLORS[sev]}`}
|
className={`h-3 ${SEVERITY_COLORS[sev]}`}
|
||||||
style={{ width: severityMax > 0 ? `${(severityDist[sev] / severityMax) * 100}%` : '0%' }}
|
style={{ width: severityMax > 0 ? `${(severityDist[sev] / severityMax) * 100}%` : '0%' }}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -154,7 +154,7 @@ export default async function ManagementPage() {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Site comparison */}
|
{/* Site comparison */}
|
||||||
<div className="bg-white rounded-xl shadow-sm p-5">
|
<div className="bg-surface shadow-sm p-5">
|
||||||
<h2 className="text-sm font-semibold text-gray-700 uppercase tracking-wide mb-4">Incidents by Site</h2>
|
<h2 className="text-sm font-semibold text-gray-700 uppercase tracking-wide mb-4">Incidents by Site</h2>
|
||||||
{by_site.length === 0 ? (
|
{by_site.length === 0 ? (
|
||||||
<p className="text-sm text-gray-400">No data</p>
|
<p className="text-sm text-gray-400">No data</p>
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import { eq, asc } from 'drizzle-orm'
|
|||||||
import { StatCard } from '@/components/dashboard/stat-card'
|
import { StatCard } from '@/components/dashboard/stat-card'
|
||||||
import { CapaOwnerActions } from '@/components/capa/capa-owner-actions'
|
import { CapaOwnerActions } from '@/components/capa/capa-owner-actions'
|
||||||
import { CapaOwnerNotesForm } from '@/components/capa/capa-owner-notes-form'
|
import { CapaOwnerNotesForm } from '@/components/capa/capa-owner-notes-form'
|
||||||
|
import { StatusTag } from '@/components/ui/status-tag'
|
||||||
|
|
||||||
const STATUS_LABELS: Record<string, string> = {
|
const STATUS_LABELS: Record<string, string> = {
|
||||||
open: 'Open',
|
open: 'Open',
|
||||||
@@ -20,20 +21,10 @@ const STATUS_LABELS: Record<string, string> = {
|
|||||||
closed: 'Closed',
|
closed: 'Closed',
|
||||||
}
|
}
|
||||||
|
|
||||||
const STATUS_COLORS: Record<string, string> = {
|
export default async function MyCapasPage() {
|
||||||
open: 'bg-gray-100 text-gray-700',
|
|
||||||
in_progress: 'bg-blue-100 text-blue-700',
|
|
||||||
overdue: 'bg-red-100 text-red-700',
|
|
||||||
pending_verification: 'bg-purple-100 text-purple-700',
|
|
||||||
verified: 'bg-green-100 text-green-700',
|
|
||||||
reopened: 'bg-orange-100 text-orange-700',
|
|
||||||
closed: 'bg-gray-100 text-gray-500',
|
|
||||||
}
|
|
||||||
|
|
||||||
export default async function CapaOwnerPage() {
|
|
||||||
const session = await getSession()
|
const session = await getSession()
|
||||||
if (!session) redirect('/login')
|
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 =>
|
const rows = await asAdmin(db =>
|
||||||
db.select({
|
db.select({
|
||||||
@@ -63,9 +54,9 @@ export default async function CapaOwnerPage() {
|
|||||||
const doneCount = rows.filter(c => ['verified', 'closed'].includes(c.status)).length
|
const doneCount = rows.filter(c => ['verified', 'closed'].includes(c.status)).length
|
||||||
|
|
||||||
const PRIORITY_COLORS: Record<string, string> = {
|
const PRIORITY_COLORS: Record<string, string> = {
|
||||||
high: 'text-red-600 font-semibold',
|
high: 'text-accent-700 font-extrabold',
|
||||||
med: 'text-orange-500 font-medium',
|
med: 'text-accent-700 font-medium',
|
||||||
low: 'text-gray-400',
|
low: 'text-ink/50',
|
||||||
}
|
}
|
||||||
|
|
||||||
const activeRows = rows.filter(c => !['verified', 'closed'].includes(c.status))
|
const activeRows = rows.filter(c => !['verified', 'closed'].includes(c.status))
|
||||||
@@ -82,11 +73,11 @@ export default async function CapaOwnerPage() {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{activeRows.length === 0 ? (
|
{activeRows.length === 0 ? (
|
||||||
<div className="bg-white rounded-xl shadow-sm p-8 text-center">
|
<div className="bg-surface shadow-sm p-8 text-center">
|
||||||
<p className="text-gray-400 text-sm">No active CAPAs assigned to you.</p>
|
<p className="text-gray-400 text-sm">No active CAPAs assigned to you.</p>
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<div className="bg-white rounded-xl shadow-sm divide-y divide-gray-50">
|
<div className="bg-surface shadow-sm divide-y divide-gray-50">
|
||||||
{activeRows.map(capa => {
|
{activeRows.map(capa => {
|
||||||
const isOverdue = isCapaOverdue(capa)
|
const isOverdue = isCapaOverdue(capa)
|
||||||
return (
|
return (
|
||||||
@@ -95,15 +86,13 @@ export default async function CapaOwnerPage() {
|
|||||||
<div className="flex-1 min-w-0">
|
<div className="flex-1 min-w-0">
|
||||||
<p className="text-sm text-gray-800">{capa.description}</p>
|
<p className="text-sm text-gray-800">{capa.description}</p>
|
||||||
{capa.incidentRefNo && (
|
{capa.incidentRefNo && (
|
||||||
<Link href={`/hse/incidents/${capa.incidentId}`} className="text-xs text-blue-600 hover:underline mt-0.5 inline-block">
|
<Link href={`/hse/incidents/${capa.incidentId}`} className="text-xs text-accent-700 hover:underline mt-0.5 inline-block">
|
||||||
{capa.incidentRefNo}
|
{capa.incidentRefNo}
|
||||||
</Link>
|
</Link>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
<div className="shrink-0 text-right space-y-1">
|
<div className="shrink-0 text-right space-y-1">
|
||||||
<span className={`text-xs rounded-full px-2 py-0.5 ${STATUS_COLORS[capa.status] ?? 'bg-gray-100 text-gray-600'}`}>
|
<StatusTag status={capa.status}>{STATUS_LABELS[capa.status] ?? capa.status}</StatusTag>
|
||||||
{STATUS_LABELS[capa.status] ?? capa.status}
|
|
||||||
</span>
|
|
||||||
<p className={`text-xs ${isOverdue ? 'text-red-600 font-semibold' : 'text-gray-400'}`}>
|
<p className={`text-xs ${isOverdue ? 'text-red-600 font-semibold' : 'text-gray-400'}`}>
|
||||||
{capa.dueDate ? `Due ${new Date(capa.dueDate).toLocaleDateString('en-MY')}` : 'No due date'}
|
{capa.dueDate ? `Due ${new Date(capa.dueDate).toLocaleDateString('en-MY')}` : 'No due date'}
|
||||||
</p>
|
</p>
|
||||||
@@ -127,13 +116,11 @@ export default async function CapaOwnerPage() {
|
|||||||
{doneRows.length > 0 && (
|
{doneRows.length > 0 && (
|
||||||
<div className="mt-6">
|
<div className="mt-6">
|
||||||
<h2 className="text-xs font-semibold text-gray-400 uppercase tracking-wide mb-2">Completed ({doneCount})</h2>
|
<h2 className="text-xs font-semibold text-gray-400 uppercase tracking-wide mb-2">Completed ({doneCount})</h2>
|
||||||
<div className="bg-white rounded-xl shadow-sm divide-y divide-gray-50 opacity-60">
|
<div className="bg-surface shadow-sm divide-y divide-gray-50 opacity-60">
|
||||||
{doneRows.map(capa => (
|
{doneRows.map(capa => (
|
||||||
<div key={capa.id} className="p-4 flex items-center justify-between">
|
<div key={capa.id} className="p-4 flex items-center justify-between">
|
||||||
<p className="text-sm text-gray-500 line-clamp-1">{capa.description}</p>
|
<p className="text-sm text-gray-500 line-clamp-1">{capa.description}</p>
|
||||||
<span className={`text-xs rounded-full px-2 py-0.5 ml-4 shrink-0 ${STATUS_COLORS[capa.status] ?? 'bg-gray-100'}`}>
|
<span className="shrink-0"><StatusTag status={capa.status}>{STATUS_LABELS[capa.status] ?? capa.status}</StatusTag></span>
|
||||||
{STATUS_LABELS[capa.status] ?? capa.status}
|
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
+2
-2
@@ -14,7 +14,7 @@ interface Props {
|
|||||||
params: Promise<{ id: string }>
|
params: Promise<{ id: string }>
|
||||||
}
|
}
|
||||||
|
|
||||||
export default async function SupervisorIncidentDetailPage({ params }: Props) {
|
export default async function SsaIncidentDetailPage({ params }: Props) {
|
||||||
const { id } = await params
|
const { id } = await params
|
||||||
|
|
||||||
const session = await getSession()
|
const session = await getSession()
|
||||||
@@ -136,7 +136,7 @@ export default async function SupervisorIncidentDetailPage({ params }: Props) {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<main className="max-w-3xl mx-auto px-4 py-6">
|
<main className="max-w-3xl mx-auto px-4 py-6">
|
||||||
<Link href="/supervisor/incidents" className="text-sm text-blue-600 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
|
← Back to inbox
|
||||||
</Link>
|
</Link>
|
||||||
<IncidentDetail incident={incidentProp} />
|
<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>
|
||||||
|
)
|
||||||
|
}
|
||||||
+11
-18
@@ -6,18 +6,13 @@ import { redirect, notFound } from 'next/navigation'
|
|||||||
import { getSession } from '@/lib/auth/get-session'
|
import { getSession } from '@/lib/auth/get-session'
|
||||||
import { incidents, sites, zones, capaActions } from '@/lib/db/schema'
|
import { incidents, sites, zones, capaActions } from '@/lib/db/schema'
|
||||||
import { eq, and } from 'drizzle-orm'
|
import { eq, and } from 'drizzle-orm'
|
||||||
|
import { StatusTag } from '@/components/ui/status-tag'
|
||||||
|
|
||||||
const STATUS_LABELS: Record<string, string> = {
|
const STATUS_LABELS: Record<string, string> = {
|
||||||
reported: 'Reported', triaged: 'Triaged', investigating: 'Investigating',
|
reported: 'Reported', triaged: 'Triaged', investigating: 'Investigating',
|
||||||
capa_pending: 'CAPA Pending', verification: 'Verification', closed: 'Closed',
|
capa_pending: 'CAPA Pending', verification: 'Verification', closed: 'Closed',
|
||||||
}
|
}
|
||||||
const STATUS_COLORS: Record<string, string> = {
|
export default async function MyReportDetail({
|
||||||
reported: 'bg-gray-100 text-gray-600', triaged: 'bg-yellow-100 text-yellow-800',
|
|
||||||
investigating: 'bg-blue-100 text-blue-700', capa_pending: 'bg-orange-100 text-orange-700',
|
|
||||||
verification: 'bg-purple-100 text-purple-700', closed: 'bg-green-100 text-green-700',
|
|
||||||
}
|
|
||||||
|
|
||||||
export default async function ReporterIncidentDetail({
|
|
||||||
params,
|
params,
|
||||||
}: {
|
}: {
|
||||||
params: Promise<{ id: string }>
|
params: Promise<{ id: string }>
|
||||||
@@ -65,18 +60,16 @@ export default async function ReporterIncidentDetail({
|
|||||||
return (
|
return (
|
||||||
<main className="max-w-2xl mx-auto px-4 py-6 space-y-4">
|
<main className="max-w-2xl mx-auto px-4 py-6 space-y-4">
|
||||||
<div className="flex items-center gap-2 mb-2">
|
<div className="flex items-center gap-2 mb-2">
|
||||||
<Link href="/reporter" className="text-sm text-blue-600 hover:underline">← My Reports</Link>
|
<Link href="/ssa/my-reports" className="text-sm text-accent-700 hover:underline">← My Reports</Link>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="bg-white rounded-xl shadow-sm p-5">
|
<div className="bg-surface shadow-sm p-5">
|
||||||
<div className="flex items-start justify-between gap-3 mb-4">
|
<div className="flex items-start justify-between gap-3 mb-4">
|
||||||
<div>
|
<div>
|
||||||
<h1 className="text-lg font-bold text-gray-900">{inc.referenceNo ?? inc.id.slice(0, 8)}</h1>
|
<h1 className="text-lg font-bold text-gray-900">{inc.referenceNo ?? inc.id.slice(0, 8)}</h1>
|
||||||
<p className="text-sm text-gray-500 capitalize">{inc.incidentType?.replace(/_/g, ' ')}</p>
|
<p className="text-sm text-gray-500 capitalize">{inc.incidentType?.replace(/_/g, ' ')}</p>
|
||||||
</div>
|
</div>
|
||||||
<span className={`text-xs rounded-full px-2 py-1 shrink-0 ${STATUS_COLORS[inc.status] ?? 'bg-gray-100 text-gray-600'}`}>
|
<span className="shrink-0"><StatusTag status={inc.status}>{STATUS_LABELS[inc.status] ?? inc.status}</StatusTag></span>
|
||||||
{STATUS_LABELS[inc.status] ?? inc.status}
|
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="grid grid-cols-2 gap-3 text-sm mb-4">
|
<div className="grid grid-cols-2 gap-3 text-sm mb-4">
|
||||||
@@ -98,7 +91,7 @@ export default async function ReporterIncidentDetail({
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{inc.description && (
|
{inc.description && (
|
||||||
<div className="border-t border-gray-100 pt-4">
|
<div className="border-t border-divider pt-4">
|
||||||
<p className="text-xs text-gray-500 mb-1">Description</p>
|
<p className="text-xs text-gray-500 mb-1">Description</p>
|
||||||
<p className="text-sm text-gray-800 whitespace-pre-line">{inc.description}</p>
|
<p className="text-sm text-gray-800 whitespace-pre-line">{inc.description}</p>
|
||||||
</div>
|
</div>
|
||||||
@@ -106,16 +99,16 @@ export default async function ReporterIncidentDetail({
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{capas.length > 0 && (
|
{capas.length > 0 && (
|
||||||
<div className="bg-white rounded-xl shadow-sm p-5">
|
<div className="bg-surface shadow-sm p-5">
|
||||||
<h2 className="text-sm font-semibold text-gray-900 mb-3">Corrective Actions ({capas.length})</h2>
|
<h2 className="text-sm font-semibold text-gray-900 mb-3">Corrective Actions ({capas.length})</h2>
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
{capas.map(c => (
|
{capas.map(c => (
|
||||||
<div key={c.id} className="flex items-start justify-between gap-3 text-sm">
|
<div key={c.id} className="flex items-start justify-between gap-3 text-sm">
|
||||||
<p className="text-gray-700 flex-1">{c.description}</p>
|
<p className="text-gray-700 flex-1">{c.description}</p>
|
||||||
<span className={`text-xs rounded-full px-2 py-0.5 shrink-0 ${
|
<span className={`text-xs px-2 py-0.5 shrink-0 ${
|
||||||
c.status === 'verified' ? 'bg-green-100 text-green-700' :
|
c.status === 'verified' ? 'bg-st-green-bg text-st-green-fg' :
|
||||||
c.status === 'pending_verification' ? 'bg-purple-100 text-purple-700' :
|
c.status === 'pending_verification' ? 'bg-st-indigo-bg text-st-indigo-fg' :
|
||||||
'bg-gray-100 text-gray-600'
|
'bg-st-grey-bg text-st-grey-fg'
|
||||||
}`}>{c.status.replace(/_/g, ' ')}</span>
|
}`}>{c.status.replace(/_/g, ' ')}</span>
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
@@ -6,6 +6,7 @@ import { redirect } from 'next/navigation'
|
|||||||
import { getSession } from '@/lib/auth/get-session'
|
import { getSession } from '@/lib/auth/get-session'
|
||||||
import { incidents, sites } from '@/lib/db/schema'
|
import { incidents, sites } from '@/lib/db/schema'
|
||||||
import { eq, desc } from 'drizzle-orm'
|
import { eq, desc } from 'drizzle-orm'
|
||||||
|
import { StatusTag } from '@/components/ui/status-tag'
|
||||||
|
|
||||||
const STATUS_LABELS: Record<string, string> = {
|
const STATUS_LABELS: Record<string, string> = {
|
||||||
reported: 'Reported',
|
reported: 'Reported',
|
||||||
@@ -16,21 +17,12 @@ const STATUS_LABELS: Record<string, string> = {
|
|||||||
closed: 'Closed',
|
closed: 'Closed',
|
||||||
}
|
}
|
||||||
|
|
||||||
const STATUS_COLORS: Record<string, string> = {
|
|
||||||
reported: 'bg-gray-100 text-gray-600',
|
|
||||||
triaged: 'bg-yellow-100 text-yellow-800',
|
|
||||||
investigating: 'bg-blue-100 text-blue-700',
|
|
||||||
capa_pending: 'bg-orange-100 text-orange-700',
|
|
||||||
verification: 'bg-purple-100 text-purple-700',
|
|
||||||
closed: 'bg-green-100 text-green-700',
|
|
||||||
}
|
|
||||||
|
|
||||||
const TYPE_LABELS: Record<string, string> = {
|
const TYPE_LABELS: Record<string, string> = {
|
||||||
injury: 'Injury', near_miss: 'Near Miss', hazard: 'Hazard',
|
injury: 'Injury', near_miss: 'Near Miss', hazard: 'Hazard',
|
||||||
asset_damage: 'Asset Damage', environmental: 'Environmental', security: 'Security', fire: 'Fire',
|
asset_damage: 'Asset Damage', environmental: 'Environmental', security: 'Security', fire: 'Fire',
|
||||||
}
|
}
|
||||||
|
|
||||||
export default async function ReporterPage() {
|
export default async function MyReportsPage() {
|
||||||
const session = await getSession()
|
const session = await getSession()
|
||||||
if (!session) redirect('/login')
|
if (!session) redirect('/login')
|
||||||
|
|
||||||
@@ -62,36 +54,36 @@ export default async function ReporterPage() {
|
|||||||
</div>
|
</div>
|
||||||
<Link
|
<Link
|
||||||
href="/report"
|
href="/report"
|
||||||
className="bg-blue-600 text-white rounded-lg px-4 py-2 text-sm font-semibold hover:bg-blue-700"
|
className="bg-accent text-white px-4 py-2 text-sm font-semibold hover:bg-accent-600"
|
||||||
>
|
>
|
||||||
+ New Report
|
+ New Report
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex gap-4 mb-6 text-sm">
|
<div className="flex gap-4 mb-6 text-sm">
|
||||||
<div className="bg-white rounded-xl shadow-sm p-4 flex-1 text-center">
|
<div className="bg-surface shadow-sm p-4 flex-1 text-center">
|
||||||
<p className="text-2xl font-bold text-gray-900">{rows.length}</p>
|
<p className="text-2xl font-bold text-gray-900">{rows.length}</p>
|
||||||
<p className="text-xs text-gray-500 mt-1">Total Submitted</p>
|
<p className="text-xs text-gray-500 mt-1">Total Submitted</p>
|
||||||
</div>
|
</div>
|
||||||
<div className="bg-white rounded-xl shadow-sm p-4 flex-1 text-center">
|
<div className="bg-surface shadow-sm p-4 flex-1 text-center">
|
||||||
<p className="text-2xl font-bold text-yellow-600">{openCount}</p>
|
<p className="text-2xl font-bold text-accent-700">{openCount}</p>
|
||||||
<p className="text-xs text-gray-500 mt-1">In Progress</p>
|
<p className="text-xs text-gray-500 mt-1">In Progress</p>
|
||||||
</div>
|
</div>
|
||||||
<div className="bg-white rounded-xl shadow-sm p-4 flex-1 text-center">
|
<div className="bg-surface shadow-sm p-4 flex-1 text-center">
|
||||||
<p className="text-2xl font-bold text-green-600">{closedCount}</p>
|
<p className="text-2xl font-bold text-ink">{closedCount}</p>
|
||||||
<p className="text-xs text-gray-500 mt-1">Closed</p>
|
<p className="text-xs text-gray-500 mt-1">Closed</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{rows.length === 0 ? (
|
{rows.length === 0 ? (
|
||||||
<div className="bg-white rounded-xl shadow-sm p-8 text-center">
|
<div className="bg-surface shadow-sm p-8 text-center">
|
||||||
<p className="text-gray-400 text-sm mb-4">No incidents reported yet.</p>
|
<p className="text-gray-400 text-sm mb-4">No incidents reported yet.</p>
|
||||||
<Link href="/report" className="text-blue-600 text-sm hover:underline">Submit your first report →</Link>
|
<Link href="/report" className="text-accent-700 text-sm hover:underline">Submit your first report →</Link>
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<div className="bg-white rounded-xl shadow-sm divide-y divide-gray-50">
|
<div className="bg-surface shadow-sm divide-y divide-gray-50">
|
||||||
{rows.map(inc => (
|
{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 items-start justify-between gap-3">
|
||||||
<div className="flex-1 min-w-0">
|
<div className="flex-1 min-w-0">
|
||||||
<p className="text-sm font-semibold text-gray-900">
|
<p className="text-sm font-semibold text-gray-900">
|
||||||
@@ -110,9 +102,7 @@ export default async function ReporterPage() {
|
|||||||
</p>
|
</p>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
<span className={`text-xs rounded-full px-2 py-0.5 shrink-0 ${STATUS_COLORS[inc.status] ?? 'bg-gray-100 text-gray-600'}`}>
|
<span className="shrink-0"><StatusTag status={inc.status}>{STATUS_LABELS[inc.status] ?? inc.status}</StatusTag></span>
|
||||||
{STATUS_LABELS[inc.status] ?? inc.status}
|
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
</Link>
|
</Link>
|
||||||
))}
|
))}
|
||||||
@@ -8,6 +8,7 @@ import { incidents, sites, capaActions, users } from '@/lib/db/schema'
|
|||||||
import { eq, not, and, inArray, sql, desc } from 'drizzle-orm'
|
import { eq, not, and, inArray, sql, desc } from 'drizzle-orm'
|
||||||
import { aliasedTable } from 'drizzle-orm'
|
import { aliasedTable } from 'drizzle-orm'
|
||||||
import { StatCard } from '@/components/dashboard/stat-card'
|
import { StatCard } from '@/components/dashboard/stat-card'
|
||||||
|
import { StatusTag } from '@/components/ui/status-tag'
|
||||||
|
|
||||||
const STATUS_LABELS: Record<string, string> = {
|
const STATUS_LABELS: Record<string, string> = {
|
||||||
reported: 'Reported',
|
reported: 'Reported',
|
||||||
@@ -18,24 +19,15 @@ const STATUS_LABELS: Record<string, string> = {
|
|||||||
closed: 'Closed',
|
closed: 'Closed',
|
||||||
}
|
}
|
||||||
|
|
||||||
const STATUS_COLORS: Record<string, string> = {
|
export default async function SsaPage() {
|
||||||
reported: 'bg-gray-100 text-gray-700',
|
|
||||||
triaged: 'bg-yellow-100 text-yellow-800',
|
|
||||||
investigating: 'bg-blue-100 text-blue-700',
|
|
||||||
capa_pending: 'bg-orange-100 text-orange-700',
|
|
||||||
verification: 'bg-purple-100 text-purple-700',
|
|
||||||
closed: 'bg-green-100 text-green-700',
|
|
||||||
}
|
|
||||||
|
|
||||||
export default async function SupervisorPage() {
|
|
||||||
const session = await getSession()
|
const session = await getSession()
|
||||||
if (!session) redirect('/login')
|
if (!session) redirect('/login')
|
||||||
if (!['supervisor', 'admin'].includes(session.role)) redirect('/')
|
if (!['ssa', 'admin'].includes(session.role)) redirect('/')
|
||||||
|
|
||||||
if (!session.siteId) {
|
if (!session.siteId) {
|
||||||
return (
|
return (
|
||||||
<main className="max-w-4xl mx-auto px-4 py-6">
|
<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>
|
<p className="text-sm text-gray-500">No site assigned — contact your administrator.</p>
|
||||||
</main>
|
</main>
|
||||||
)
|
)
|
||||||
@@ -116,10 +108,10 @@ export default async function SupervisorPage() {
|
|||||||
<main className="max-w-4xl mx-auto px-4 py-6">
|
<main className="max-w-4xl mx-auto px-4 py-6">
|
||||||
<div className="flex items-center justify-between mb-6">
|
<div className="flex items-center justify-between mb-6">
|
||||||
<div>
|
<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>
|
<p className="text-sm text-gray-500 mt-1">{siteName}</p>
|
||||||
</div>
|
</div>
|
||||||
<Link href="/supervisor/incidents" className="text-sm text-blue-600 hover:underline">
|
<Link href="/ssa/incidents" className="text-sm text-accent-700 hover:underline">
|
||||||
All incidents →
|
All incidents →
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
@@ -133,7 +125,7 @@ export default async function SupervisorPage() {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Open incidents */}
|
{/* Open incidents */}
|
||||||
<div className="bg-white rounded-xl shadow-sm p-5 mb-4">
|
<div className="bg-surface shadow-sm p-5 mb-4">
|
||||||
<h2 className="text-sm font-semibold text-gray-700 uppercase tracking-wide mb-4">Open Incidents</h2>
|
<h2 className="text-sm font-semibold text-gray-700 uppercase tracking-wide mb-4">Open Incidents</h2>
|
||||||
{openIncidents.length === 0 ? (
|
{openIncidents.length === 0 ? (
|
||||||
<p className="text-sm text-gray-400">No open incidents.</p>
|
<p className="text-sm text-gray-400">No open incidents.</p>
|
||||||
@@ -142,16 +134,14 @@ export default async function SupervisorPage() {
|
|||||||
{openIncidents.map(inc => (
|
{openIncidents.map(inc => (
|
||||||
<Link
|
<Link
|
||||||
key={inc.id}
|
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 rounded"
|
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>
|
<div>
|
||||||
<p className="text-sm font-medium text-gray-900">{inc.referenceNo ?? inc.id.slice(0, 8)}</p>
|
<p className="text-sm font-medium text-gray-900">{inc.referenceNo ?? inc.id.slice(0, 8)}</p>
|
||||||
<p className="text-xs text-gray-500">{TYPE_LABELS[inc.incidentType] ?? inc.incidentType}</p>
|
<p className="text-xs text-gray-500">{TYPE_LABELS[inc.incidentType] ?? inc.incidentType}</p>
|
||||||
</div>
|
</div>
|
||||||
<span className={`text-xs rounded-full px-2 py-0.5 font-medium ${STATUS_COLORS[inc.status] ?? 'bg-gray-100 text-gray-700'}`}>
|
<StatusTag status={inc.status}>{STATUS_LABELS[inc.status] ?? inc.status}</StatusTag>
|
||||||
{STATUS_LABELS[inc.status] ?? inc.status}
|
|
||||||
</span>
|
|
||||||
</Link>
|
</Link>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
@@ -160,7 +150,7 @@ export default async function SupervisorPage() {
|
|||||||
|
|
||||||
{/* Overdue CAPAs */}
|
{/* Overdue CAPAs */}
|
||||||
{overdueCount > 0 && (
|
{overdueCount > 0 && (
|
||||||
<div className="bg-white rounded-xl shadow-sm p-5">
|
<div className="bg-surface shadow-sm p-5">
|
||||||
<h2 className="text-sm font-semibold text-red-600 uppercase tracking-wide mb-4">Overdue CAPAs</h2>
|
<h2 className="text-sm font-semibold text-red-600 uppercase tracking-wide mb-4">Overdue CAPAs</h2>
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
{overdueCapas.map(capa => (
|
{overdueCapas.map(capa => (
|
||||||
@@ -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 { NextRequest, NextResponse } from 'next/server'
|
||||||
import { requireAdmin } from '@/lib/auth/require-admin'
|
import { requireAdmin } from '@/lib/auth/require-admin'
|
||||||
import { asAdmin } from '@/lib/db/with-user'
|
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 { 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) {
|
export async function POST(request: NextRequest) {
|
||||||
const { session } = await requireAdmin()
|
const { session } = await requireAdmin()
|
||||||
if (!session) return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
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()
|
const truck_no = (body.truck_no ?? '').trim()
|
||||||
if (!truck_no) return NextResponse.json({ error: 'truck_no required' }, { status: 422 })
|
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 {
|
try {
|
||||||
let truckId: string | undefined
|
let truckId: string | undefined
|
||||||
await asAdmin(async db => {
|
await asAdmin(async db => {
|
||||||
await db.transaction(async tx => {
|
await db.transaction(async tx => {
|
||||||
await tx.execute(sql`SELECT set_config('app.user_id', ${session.sub}, true)`)
|
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')
|
if (!truck) throw new Error('Insert failed')
|
||||||
truckId = truck.id
|
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 })
|
if (!truckId) return NextResponse.json({ error: 'Insert failed' }, { status: 400 })
|
||||||
@@ -41,21 +57,46 @@ export async function PATCH(request: NextRequest) {
|
|||||||
const { session } = await requireAdmin()
|
const { session } = await requireAdmin()
|
||||||
if (!session) return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
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 })
|
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 =>
|
const [before] = await asAdmin(db =>
|
||||||
db.select().from(trucks).where(eq(trucks.id, body.id!)).limit(1)
|
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 {
|
try {
|
||||||
await asAdmin(async db => {
|
await asAdmin(async db => {
|
||||||
await db.transaction(async tx => {
|
await db.transaction(async tx => {
|
||||||
await tx.execute(sql`SELECT set_config('app.user_id', ${session.sub}, true)`)
|
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 tx.update(trucks).set(set).where(eq(trucks.id, body.id!))
|
||||||
await writeAuditLog(tx, 'trucks', body.id!, 'admin_update', { active: body.active }, before ?? null)
|
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({ error: 'Update failed' }, { status: 500 })
|
||||||
}
|
}
|
||||||
return NextResponse.json({ ok: true })
|
return NextResponse.json({ ok: true })
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ export async function POST(request: NextRequest) {
|
|||||||
name: body.name ?? '',
|
name: body.name ?? '',
|
||||||
email,
|
email,
|
||||||
phone: (body.phone ?? '').trim() || null,
|
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,
|
siteId: body.site_id ?? null,
|
||||||
department: body.department ?? null,
|
department: body.department ?? null,
|
||||||
passwordHash,
|
passwordHash,
|
||||||
@@ -78,7 +78,7 @@ export async function POST(request: NextRequest) {
|
|||||||
if (!created) throw new Error('User creation failed')
|
if (!created) throw new Error('User creation failed')
|
||||||
createdId = created.id
|
createdId = created.id
|
||||||
await writeAuditLog(tx, 'users', created.id, 'created', {
|
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 role = session.role
|
||||||
const isOwner = row.ownerUserId === session.sub
|
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 })
|
if (!canRead) return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||||
|
|
||||||
const ownerField = ['hse', 'admin'].includes(role)
|
const ownerField = ['hse', 'admin'].includes(role)
|
||||||
@@ -105,6 +105,13 @@ export async function PATCH(
|
|||||||
|
|
||||||
const body = await request.json()
|
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']
|
const privilegedStatuses = ['verified', 'reopened', 'closed']
|
||||||
if (body.status && privilegedStatuses.includes(body.status) && !['hse', 'admin'].includes(role)) {
|
if (body.status && privilegedStatuses.includes(body.status) && !['hse', 'admin'].includes(role)) {
|
||||||
return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
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 ('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 ('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 ('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
|
// Build audit new/old value from original snake_case body keys for consistency
|
||||||
const auditNew: Record<string, unknown> = {}
|
const auditNew: Record<string, unknown> = {}
|
||||||
for (const key of allowed) {
|
for (const key of allowed) {
|
||||||
if (key in body) auditNew[key] = body[key]
|
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 => {
|
await withUser(session.sub, async tx => {
|
||||||
let oldNotes: string | null = null
|
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))
|
.leftJoin(incidents, eq(capaActions.incidentId, incidents.id))
|
||||||
.orderBy(asc(capaActions.dueDate))
|
.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
|
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 { writeAuditLog } from '@/lib/db/audit'
|
||||||
import { incidents, sites, zones, auditLog } from '@/lib/db/schema'
|
import { incidents, sites, zones, auditLog } from '@/lib/db/schema'
|
||||||
import { eq, and, gte, desc } from 'drizzle-orm'
|
import { eq, and, gte, desc } from 'drizzle-orm'
|
||||||
import { createDeepSeekClient } from '@/lib/claude/client'
|
import { createLocalLLMClient } from '@/lib/claude/client'
|
||||||
import { getApiKey } from '@/lib/settings'
|
|
||||||
|
|
||||||
type ZoneAggregate = {
|
type ZoneAggregate = {
|
||||||
zone: string
|
zone: string
|
||||||
@@ -103,13 +102,12 @@ export async function POST() {
|
|||||||
return NextResponse.json({ error: 'Rate limit: wait 60 seconds between AI requests' }, { status: 429 })
|
return NextResponse.json({ error: 'Rate limit: wait 60 seconds between AI requests' }, { status: 429 })
|
||||||
}
|
}
|
||||||
|
|
||||||
const deepseekKey = await getApiKey('DEEPSEEK_API_KEY')
|
const client = createLocalLLMClient()
|
||||||
const client = createDeepSeekClient(deepseekKey)
|
|
||||||
|
|
||||||
let res: Awaited<ReturnType<typeof client.chat.completions.create>>
|
let res: Awaited<ReturnType<typeof client.chat.completions.create>>
|
||||||
try {
|
try {
|
||||||
res = await client.chat.completions.create({
|
res = await client.chat.completions.create({
|
||||||
model: 'deepseek-v4-pro',
|
model: 'qwen2.5-coder-32b-instruct-Q4_K_M',
|
||||||
max_tokens: 2048,
|
max_tokens: 2048,
|
||||||
messages: [
|
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 =>
|
await withUser(session.sub, async tx =>
|
||||||
writeAuditLog(tx, 'incidents', session.sub, 'ai_risk_flags',
|
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 })
|
return NextResponse.json({ flags, summary: input.summary })
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ export async function GET(
|
|||||||
const { id } = await params
|
const { id } = await params
|
||||||
const session = await getSession()
|
const session = await getSession()
|
||||||
if (!session) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
|
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 })
|
return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||||
|
|
||||||
const authorAlias = aliasedTable(users, 'author_user')
|
const authorAlias = aliasedTable(users, 'author_user')
|
||||||
@@ -45,7 +45,7 @@ export async function POST(
|
|||||||
const { id } = await params
|
const { id } = await params
|
||||||
const session = await getSession()
|
const session = await getSession()
|
||||||
if (!session) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
|
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 })
|
return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||||
|
|
||||||
const body: { body?: string } = await request.json().catch(() => ({}))
|
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 { writeAuditLog } from '@/lib/db/audit'
|
||||||
import { incidents, auditLog, sites, zones } from '@/lib/db/schema'
|
import { incidents, auditLog, sites, zones } from '@/lib/db/schema'
|
||||||
import { eq, and, gte, sql } from 'drizzle-orm'
|
import { eq, and, gte, sql } from 'drizzle-orm'
|
||||||
import { createDeepSeekClient } from '@/lib/claude/client'
|
import { createLocalLLMClient } from '@/lib/claude/client'
|
||||||
import { getApiKey } from '@/lib/settings'
|
|
||||||
|
|
||||||
export async function POST(
|
export async function POST(
|
||||||
_request: NextRequest,
|
_request: NextRequest,
|
||||||
@@ -32,8 +31,7 @@ export async function POST(
|
|||||||
if (Number(rateRow?.cnt ?? 0) > 0)
|
if (Number(rateRow?.cnt ?? 0) > 0)
|
||||||
return NextResponse.json({ error: 'Rate limited — please wait 60 seconds' }, { status: 429 })
|
return NextResponse.json({ error: 'Rate limited — please wait 60 seconds' }, { status: 429 })
|
||||||
|
|
||||||
const deepseekKey = await getApiKey('DEEPSEEK_API_KEY')
|
const client = createLocalLLMClient()
|
||||||
const client = createDeepSeekClient(deepseekKey)
|
|
||||||
|
|
||||||
const [incident] = await withUser(session.sub, async tx =>
|
const [incident] = await withUser(session.sub, async tx =>
|
||||||
tx.select({
|
tx.select({
|
||||||
@@ -59,7 +57,7 @@ export async function POST(
|
|||||||
let res: Awaited<ReturnType<typeof client.chat.completions.create>>
|
let res: Awaited<ReturnType<typeof client.chat.completions.create>>
|
||||||
try {
|
try {
|
||||||
res = await client.chat.completions.create({
|
res = await client.chat.completions.create({
|
||||||
model: 'deepseek-v4-pro',
|
model: 'qwen2.5-coder-32b-instruct-Q4_K_M',
|
||||||
max_tokens: 2048,
|
max_tokens: 2048,
|
||||||
messages: [
|
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 withUser(session.sub, async tx => {
|
||||||
await writeAuditLog(tx, 'incidents', id, 'ai_rca_draft', {
|
await writeAuditLog(tx, 'incidents', id, 'ai_rca_draft', {
|
||||||
root_cause_summary: draft.root_cause_summary as string,
|
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 { writeAuditLog } from '@/lib/db/audit'
|
||||||
import { incidents, auditLog } from '@/lib/db/schema'
|
import { incidents, auditLog } from '@/lib/db/schema'
|
||||||
import { eq, and, gte, sql } from 'drizzle-orm'
|
import { eq, and, gte, sql } from 'drizzle-orm'
|
||||||
import { createDeepSeekClient } from '@/lib/claude/client'
|
import { createLocalLLMClient } from '@/lib/claude/client'
|
||||||
import { getApiKey } from '@/lib/settings'
|
|
||||||
|
|
||||||
export async function POST(
|
export async function POST(
|
||||||
_request: NextRequest,
|
_request: NextRequest,
|
||||||
@@ -32,8 +31,7 @@ export async function POST(
|
|||||||
if (Number(rateRow?.cnt ?? 0) > 0)
|
if (Number(rateRow?.cnt ?? 0) > 0)
|
||||||
return NextResponse.json({ error: 'Rate limited — please wait 60 seconds' }, { status: 429 })
|
return NextResponse.json({ error: 'Rate limited — please wait 60 seconds' }, { status: 429 })
|
||||||
|
|
||||||
const deepseekKey = await getApiKey('DEEPSEEK_API_KEY')
|
const client = createLocalLLMClient()
|
||||||
const client = createDeepSeekClient(deepseekKey)
|
|
||||||
|
|
||||||
const [incident] = await withUser(session.sub, async tx =>
|
const [incident] = await withUser(session.sub, async tx =>
|
||||||
tx.select({
|
tx.select({
|
||||||
@@ -50,7 +48,7 @@ export async function POST(
|
|||||||
let res: Awaited<ReturnType<typeof client.chat.completions.create>>
|
let res: Awaited<ReturnType<typeof client.chat.completions.create>>
|
||||||
try {
|
try {
|
||||||
res = await client.chat.completions.create({
|
res = await client.chat.completions.create({
|
||||||
model: 'deepseek-v4-pro',
|
model: 'qwen2.5-coder-32b-instruct-Q4_K_M',
|
||||||
max_tokens: 1024,
|
max_tokens: 1024,
|
||||||
messages: [
|
messages: [
|
||||||
{
|
{
|
||||||
@@ -105,7 +103,7 @@ Output exactly this JSON structure:
|
|||||||
}
|
}
|
||||||
|
|
||||||
await withUser(session.sub, async tx => {
|
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)
|
return NextResponse.json(input)
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ export async function POST(
|
|||||||
await createInAppNotifications([{
|
await createInAppNotifications([{
|
||||||
userId: incident.reportedBy,
|
userId: incident.reportedBy,
|
||||||
title: `Your incident report ${incident.referenceNo ?? ''} has been closed`,
|
title: `Your incident report ${incident.referenceNo ?? ''} has been closed`,
|
||||||
link: '/reporter',
|
link: '/ssa/my-reports',
|
||||||
incidentId: id,
|
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 })
|
if (!incident) return NextResponse.json({ error: 'Not found' }, { status: 404 })
|
||||||
|
|
||||||
const isOwner = incident.reporterId === session.sub
|
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 })
|
if (!isOwner && !isSiteStaff) return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||||
|
|
||||||
const evidenceFileRows = await withUser(session.sub, async tx =>
|
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 { writeAuditLog } from '@/lib/db/audit'
|
||||||
import { auditLog } from '@/lib/db/schema'
|
import { auditLog } from '@/lib/db/schema'
|
||||||
import { eq, and, gte, sql } from 'drizzle-orm'
|
import { eq, and, gte, sql } from 'drizzle-orm'
|
||||||
import { createDeepSeekClient } from '@/lib/claude/client'
|
import { createLocalLLMClient } from '@/lib/claude/client'
|
||||||
import { getApiKey } from '@/lib/settings'
|
|
||||||
|
|
||||||
export async function POST(request: NextRequest) {
|
export async function POST(request: NextRequest) {
|
||||||
const session = await getSession()
|
const session = await getSession()
|
||||||
@@ -26,8 +25,7 @@ export async function POST(request: NextRequest) {
|
|||||||
if (Number(rateRow?.cnt ?? 0) > 0)
|
if (Number(rateRow?.cnt ?? 0) > 0)
|
||||||
return NextResponse.json({ error: 'Rate limited — please wait 60 seconds' }, { status: 429 })
|
return NextResponse.json({ error: 'Rate limited — please wait 60 seconds' }, { status: 429 })
|
||||||
|
|
||||||
const deepseekKey = await getApiKey('DEEPSEEK_API_KEY')
|
const client = createLocalLLMClient()
|
||||||
const client = createDeepSeekClient(deepseekKey)
|
|
||||||
|
|
||||||
let body: { description?: string; incident_type?: string }
|
let body: { description?: string; incident_type?: string }
|
||||||
try {
|
try {
|
||||||
@@ -42,7 +40,7 @@ export async function POST(request: NextRequest) {
|
|||||||
let res: Awaited<ReturnType<typeof client.chat.completions.create>>
|
let res: Awaited<ReturnType<typeof client.chat.completions.create>>
|
||||||
try {
|
try {
|
||||||
res = await client.chat.completions.create({
|
res = await client.chat.completions.create({
|
||||||
model: 'deepseek-v4-pro',
|
model: 'qwen2.5-coder-32b-instruct-Q4_K_M',
|
||||||
max_tokens: 1024,
|
max_tokens: 1024,
|
||||||
messages: [
|
messages: [
|
||||||
{
|
{
|
||||||
@@ -89,7 +87,7 @@ Scoring criteria: specificity (location, time, persons involved), completeness (
|
|||||||
|
|
||||||
await withUser(session.sub, async tx => {
|
await withUser(session.sub, async tx => {
|
||||||
await writeAuditLog(tx, 'incidents', session.sub, 'ai_quality_check', {
|
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',
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
+19
-11
@@ -188,7 +188,7 @@ async function handlePost(request: Request) {
|
|||||||
db.select({ id: users.id, phone: users.phone })
|
db.select({ id: users.id, phone: users.phone })
|
||||||
.from(users)
|
.from(users)
|
||||||
.where(and(
|
.where(and(
|
||||||
inArray(users.role, ['supervisor', 'hse']),
|
inArray(users.role, ['ssa', 'hse']),
|
||||||
eq(users.siteId, zone.siteId),
|
eq(users.siteId, zone.siteId),
|
||||||
))
|
))
|
||||||
)
|
)
|
||||||
@@ -212,17 +212,25 @@ async function handlePost(request: Request) {
|
|||||||
}
|
}
|
||||||
})()
|
})()
|
||||||
|
|
||||||
// Embed description asynchronously
|
// Embed description asynchronously (disabled if no GOOGLE_AI_API_KEY)
|
||||||
getApiKey('GOOGLE_AI_API_KEY').then(googleAiKey =>
|
getApiKey('GOOGLE_AI_API_KEY')
|
||||||
import('@/lib/claude/embed').then(({ embedText }) =>
|
.then(googleAiKey =>
|
||||||
embedText(input.description.trim(), googleAiKey).then(embeddingVec => {
|
import('@/lib/claude/embed').then(({ embedText }) =>
|
||||||
const embStr = `[${(embeddingVec as number[]).join(',')}]`
|
embedText(input.description.trim(), googleAiKey).then(embeddingVec => {
|
||||||
return asAdmin(db =>
|
const embStr = `[${(embeddingVec as number[]).join(',')}]`
|
||||||
db.execute(sql`UPDATE incidents SET embedding = ${embStr}::vector(768) WHERE id = ${incidentId}::uuid`)
|
return asAdmin(db =>
|
||||||
)
|
db.execute(sql`UPDATE incidents SET embedding = ${embStr}::vector(768) WHERE id = ${incidentId}::uuid`)
|
||||||
})
|
)
|
||||||
|
})
|
||||||
|
)
|
||||||
)
|
)
|
||||||
).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 })
|
return NextResponse.json({ id: incidentId, reference_no: referenceNo }, { status: 201 })
|
||||||
}
|
}
|
||||||
|
|||||||
+170
-30
@@ -1,37 +1,177 @@
|
|||||||
@import "tailwindcss";
|
@import "tailwindcss";
|
||||||
|
|
||||||
:root {
|
/* IMS Admin refresh tokens. Source of truth: design-system/design.md section 2.
|
||||||
--background: #ffffff;
|
Static emits every variable so plain CSS can use var(--color-*) too. */
|
||||||
--foreground: #171717;
|
@theme static {
|
||||||
|
--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;
|
||||||
|
|
||||||
|
/* 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;
|
||||||
|
|
||||||
|
/* 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: #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-gray-50: var(--color-neutral-100);
|
||||||
|
--color-gray-100: var(--color-neutral-200);
|
||||||
|
--color-gray-200: var(--color-neutral-300);
|
||||||
|
--color-gray-300: var(--color-neutral-400);
|
||||||
|
--color-gray-400: var(--color-neutral-500);
|
||||||
|
--color-gray-500: var(--color-neutral-600);
|
||||||
|
--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-ink);
|
||||||
|
--color-gray-950: var(--color-ink);
|
||||||
|
|
||||||
|
--color-blue-50: var(--color-accent-100);
|
||||||
|
--color-blue-100: var(--color-accent-100);
|
||||||
|
--color-blue-200: var(--color-accent-200);
|
||||||
|
--color-blue-300: var(--color-accent-300);
|
||||||
|
--color-blue-400: var(--color-accent-400);
|
||||||
|
--color-blue-500: var(--color-accent-500);
|
||||||
|
--color-blue-600: var(--color-accent);
|
||||||
|
--color-blue-700: var(--color-accent-700);
|
||||||
|
--color-blue-800: var(--color-accent-800);
|
||||||
|
--color-blue-900: var(--color-accent-900);
|
||||||
|
--color-blue-950: 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;
|
||||||
|
|
||||||
|
/* 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;
|
||||||
|
|
||||||
|
--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-geist), system-ui, sans-serif;
|
||||||
|
--font-mono: var(--font-geist-mono), ui-monospace, SFMono-Regular, Menlo, monospace;
|
||||||
}
|
}
|
||||||
|
|
||||||
@theme inline {
|
@layer base {
|
||||||
--color-background: var(--background);
|
html {
|
||||||
--color-foreground: var(--foreground);
|
background: var(--color-ground);
|
||||||
--font-sans: var(--font-geist-sans);
|
}
|
||||||
--font-mono: var(--font-geist-mono);
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (prefers-color-scheme: dark) {
|
body {
|
||||||
:root {
|
background: var(--color-ground);
|
||||||
--background: #0a0a0a;
|
color: var(--color-ink);
|
||||||
--foreground: #ededed;
|
font-family: var(--font-sans);
|
||||||
|
font-size: 13px;
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1, h2, h3, h4, h5, h6 {
|
||||||
|
font-weight: 650;
|
||||||
|
line-height: 1.25;
|
||||||
|
letter-spacing: -0.01em;
|
||||||
|
}
|
||||||
|
|
||||||
|
:focus {
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
:focus-visible {
|
||||||
|
outline: 2px solid var(--color-accent);
|
||||||
|
outline-offset: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
::selection {
|
||||||
|
background: color-mix(in srgb, var(--color-accent) 25%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
input,
|
||||||
|
textarea,
|
||||||
|
select {
|
||||||
|
color: var(--color-ink);
|
||||||
|
}
|
||||||
|
|
||||||
|
input::placeholder,
|
||||||
|
textarea::placeholder {
|
||||||
|
color: var(--color-faint);
|
||||||
|
}
|
||||||
|
|
||||||
|
button:disabled,
|
||||||
|
input:disabled,
|
||||||
|
select:disabled,
|
||||||
|
textarea:disabled {
|
||||||
|
opacity: 0.45;
|
||||||
|
cursor: not-allowed;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
|
||||||
background: var(--background);
|
|
||||||
color: var(--foreground);
|
|
||||||
font-family: Arial, Helvetica, sans-serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
input,
|
|
||||||
textarea,
|
|
||||||
select {
|
|
||||||
color: #111827; /* gray-900 — dark typed text */
|
|
||||||
}
|
|
||||||
|
|
||||||
input::placeholder,
|
|
||||||
textarea::placeholder {
|
|
||||||
color: #6b7280; /* gray-500 — readable placeholder */
|
|
||||||
}
|
|
||||||
|
|||||||
+6
-3
@@ -4,8 +4,8 @@ import './globals.css'
|
|||||||
import { I18nProvider } from '@/lib/i18n/context'
|
import { I18nProvider } from '@/lib/i18n/context'
|
||||||
import { getLocale, loadMessages } from '@/lib/i18n/server'
|
import { getLocale, loadMessages } from '@/lib/i18n/server'
|
||||||
|
|
||||||
const geistSans = Geist({
|
const geist = Geist({
|
||||||
variable: '--font-geist-sans',
|
variable: '--font-geist',
|
||||||
subsets: ['latin'],
|
subsets: ['latin'],
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -17,6 +17,9 @@ const geistMono = Geist_Mono({
|
|||||||
export const metadata: Metadata = {
|
export const metadata: Metadata = {
|
||||||
title: 'IMS — HSE Incident Management',
|
title: 'IMS — HSE Incident Management',
|
||||||
description: 'Setia Corporation HSE Incident Management System',
|
description: 'Setia Corporation HSE Incident Management System',
|
||||||
|
icons: {
|
||||||
|
icon: '/favicon.ico',
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
export default async function RootLayout({
|
export default async function RootLayout({
|
||||||
@@ -30,7 +33,7 @@ export default async function RootLayout({
|
|||||||
return (
|
return (
|
||||||
<html
|
<html
|
||||||
lang={locale}
|
lang={locale}
|
||||||
className={`${geistSans.variable} ${geistMono.variable} h-full antialiased`}
|
className={`${geist.variable} ${geistMono.variable} h-full antialiased`}
|
||||||
>
|
>
|
||||||
<head>
|
<head>
|
||||||
<link rel="manifest" href="/manifest.json" />
|
<link rel="manifest" href="/manifest.json" />
|
||||||
|
|||||||
+29
-6
@@ -3,8 +3,9 @@ export const dynamic = 'force-dynamic'
|
|||||||
import { redirect } from 'next/navigation'
|
import { redirect } from 'next/navigation'
|
||||||
import { asAdmin } from '@/lib/db/with-user'
|
import { asAdmin } from '@/lib/db/with-user'
|
||||||
import { getSession } from '@/lib/auth/get-session'
|
import { getSession } from '@/lib/auth/get-session'
|
||||||
import { zones, sites, trucks } from '@/lib/db/schema'
|
import { zones, sites, trucks, users } from '@/lib/db/schema'
|
||||||
import { eq, asc } from 'drizzle-orm'
|
import { eq, asc, and } from 'drizzle-orm'
|
||||||
|
import { groupSites } from '@/lib/report/zones'
|
||||||
import { ReportForm } from '@/components/incidents/report-form'
|
import { ReportForm } from '@/components/incidents/report-form'
|
||||||
import { LanguageSwitcher } from '@/components/language-switcher'
|
import { LanguageSwitcher } from '@/components/language-switcher'
|
||||||
import { OfflineSync } from '@/components/incidents/offline-sync'
|
import { OfflineSync } from '@/components/incidents/offline-sync'
|
||||||
@@ -43,6 +44,7 @@ export default async function ReportPage({ searchParams }: Props) {
|
|||||||
id: trucks.id,
|
id: trucks.id,
|
||||||
truckNo: trucks.truckNo,
|
truckNo: trucks.truckNo,
|
||||||
carrier: trucks.carrier,
|
carrier: trucks.carrier,
|
||||||
|
siteId: trucks.siteId,
|
||||||
})
|
})
|
||||||
.from(trucks)
|
.from(trucks)
|
||||||
.where(eq(trucks.active, true))
|
.where(eq(trucks.active, true))
|
||||||
@@ -53,8 +55,29 @@ export default async function ReportPage({ searchParams }: Props) {
|
|||||||
id: t.id,
|
id: t.id,
|
||||||
truck_no: t.truckNo,
|
truck_no: t.truckNo,
|
||||||
carrier: t.carrier ?? null,
|
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 (
|
return (
|
||||||
<main className="min-h-screen bg-gray-50 py-6 px-4 max-w-lg mx-auto">
|
<main className="min-h-screen bg-gray-50 py-6 px-4 max-w-lg mx-auto">
|
||||||
<div className="mb-6">
|
<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>
|
<h1 className="text-2xl font-bold text-gray-900">{/* will be translated via ReportForm */}Report an Incident</h1>
|
||||||
<LanguageSwitcher />
|
<LanguageSwitcher />
|
||||||
</div>
|
</div>
|
||||||
{zoneName ? (
|
{zoneName && (
|
||||||
<p className="text-sm text-gray-600 mt-1">
|
<p className="text-sm text-gray-600 mt-1">
|
||||||
{siteName ?? 'Unknown Site'} — {zoneName}
|
{siteName ?? 'Unknown Site'} — {zoneName}
|
||||||
</p>
|
</p>
|
||||||
) : (
|
|
||||||
<p className="text-sm text-amber-600 mt-1">No zone detected — zone will not be recorded</p>
|
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
<ReportForm
|
<ReportForm
|
||||||
zoneToken={zone ?? null}
|
zoneToken={zoneName ? (zone ?? null) : null}
|
||||||
zoneName={zoneName}
|
zoneName={zoneName}
|
||||||
siteName={siteName}
|
siteName={siteName}
|
||||||
|
sites={siteOptions}
|
||||||
|
defaultSiteId={defaultSiteId}
|
||||||
trucks={truckList}
|
trucks={truckList}
|
||||||
initialTruckId={truck_id ?? null}
|
initialTruckId={truck_id ?? null}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ export default async function ReportSuccessPage({ searchParams }: Props) {
|
|||||||
const { ref } = await searchParams
|
const { ref } = await searchParams
|
||||||
return (
|
return (
|
||||||
<main className="min-h-screen bg-gray-50 flex items-center justify-center px-4">
|
<main className="min-h-screen bg-gray-50 flex items-center justify-center px-4">
|
||||||
<div className="bg-white rounded-xl shadow-sm p-8 max-w-sm w-full text-center">
|
<div className="bg-surface shadow-sm p-8 max-w-sm w-full text-center">
|
||||||
<div className="text-4xl mb-4">✓</div>
|
<div className="text-4xl mb-4">✓</div>
|
||||||
<h1 className="text-xl font-bold text-gray-900 mb-2">Report submitted</h1>
|
<h1 className="text-xl font-bold text-gray-900 mb-2">Report submitted</h1>
|
||||||
{ref && (
|
{ref && (
|
||||||
@@ -19,9 +19,9 @@ export default async function ReportSuccessPage({ searchParams }: Props) {
|
|||||||
</p>
|
</p>
|
||||||
)}
|
)}
|
||||||
<p className="text-sm text-gray-500 mb-6">
|
<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>
|
</p>
|
||||||
<Link href="/report" className="text-sm text-blue-600 hover:underline">
|
<Link href="/report" className="text-sm text-accent-700 hover:underline">
|
||||||
Submit another report
|
Submit another report
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ export default function ChangePasswordForm() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="bg-white rounded-xl shadow-sm p-5">
|
<div className="bg-surface shadow-sm p-5">
|
||||||
<h2 className="text-base font-semibold text-gray-900 mb-4">Change Password</h2>
|
<h2 className="text-base font-semibold text-gray-900 mb-4">Change Password</h2>
|
||||||
<form onSubmit={handleSubmit} className="space-y-4">
|
<form onSubmit={handleSubmit} className="space-y-4">
|
||||||
<div>
|
<div>
|
||||||
@@ -67,7 +67,7 @@ export default function ChangePasswordForm() {
|
|||||||
onChange={e => setCurrent(e.target.value)}
|
onChange={e => setCurrent(e.target.value)}
|
||||||
disabled={loading}
|
disabled={loading}
|
||||||
autoComplete="current-password"
|
autoComplete="current-password"
|
||||||
className="w-full border border-gray-300 rounded-lg px-3 py-2 text-sm focus:ring-2 focus:ring-blue-500 focus:border-transparent disabled:opacity-50"
|
className="w-full border border-divider px-3 py-2 text-sm focus:ring-2 focus:ring-accent focus:border-transparent disabled:opacity-50"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
@@ -80,7 +80,7 @@ export default function ChangePasswordForm() {
|
|||||||
onChange={e => setNewPass(e.target.value)}
|
onChange={e => setNewPass(e.target.value)}
|
||||||
disabled={loading}
|
disabled={loading}
|
||||||
autoComplete="new-password"
|
autoComplete="new-password"
|
||||||
className="w-full border border-gray-300 rounded-lg px-3 py-2 text-sm focus:ring-2 focus:ring-blue-500 focus:border-transparent disabled:opacity-50"
|
className="w-full border border-divider px-3 py-2 text-sm focus:ring-2 focus:ring-accent focus:border-transparent disabled:opacity-50"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
@@ -93,17 +93,17 @@ export default function ChangePasswordForm() {
|
|||||||
onChange={e => setConfirm(e.target.value)}
|
onChange={e => setConfirm(e.target.value)}
|
||||||
disabled={loading}
|
disabled={loading}
|
||||||
autoComplete="new-password"
|
autoComplete="new-password"
|
||||||
className="w-full border border-gray-300 rounded-lg px-3 py-2 text-sm focus:ring-2 focus:ring-blue-500 focus:border-transparent disabled:opacity-50"
|
className="w-full border border-divider px-3 py-2 text-sm focus:ring-2 focus:ring-accent focus:border-transparent disabled:opacity-50"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{error && <p className="text-xs text-red-600 mt-1">{error}</p>}
|
{error && <p className="text-xs text-red-600 mt-1">{error}</p>}
|
||||||
{success && <p className="text-xs text-green-600 mt-1">Password changed successfully.</p>}
|
{success && <p className="text-xs text-ink mt-1">Password changed successfully.</p>}
|
||||||
|
|
||||||
<button
|
<button
|
||||||
type="submit"
|
type="submit"
|
||||||
disabled={loading}
|
disabled={loading}
|
||||||
className="bg-blue-600 text-white rounded-lg px-4 py-2 text-sm font-semibold disabled:opacity-50 hover:bg-blue-700"
|
className="bg-accent text-white px-4 py-2 text-sm font-semibold disabled:opacity-50 hover:bg-accent-600"
|
||||||
>
|
>
|
||||||
{loading ? 'Saving…' : 'Update Password'}
|
{loading ? 'Saving…' : 'Update Password'}
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
import { useState } from 'react'
|
import { useState } from 'react'
|
||||||
import { UserManager, type AdminUser, type SiteOption } from './user-manager'
|
import { UserManager, type AdminUser, type SiteOption } from './user-manager'
|
||||||
import { SiteZoneManager, type SiteWithZones } from './site-zone-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'
|
type Tab = 'users' | 'sites' | 'trucks'
|
||||||
|
|
||||||
@@ -12,9 +12,10 @@ interface Props {
|
|||||||
sites: SiteWithZones[]
|
sites: SiteWithZones[]
|
||||||
siteOptions: SiteOption[]
|
siteOptions: SiteOption[]
|
||||||
trucks: Truck[]
|
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 [tab, setTab] = useState<Tab>('users')
|
||||||
|
|
||||||
const tabs: { id: Tab; label: string; count: number }[] = [
|
const tabs: { id: Tab; label: string; count: number }[] = [
|
||||||
@@ -25,27 +26,27 @@ export function AdminPanel({ users, sites, siteOptions, trucks }: Props) {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<div className="flex gap-1 border-b border-gray-200 mb-6">
|
<div className="flex gap-1 border-b border-divider mb-6">
|
||||||
{tabs.map(t => (
|
{tabs.map(t => (
|
||||||
<button
|
<button
|
||||||
key={t.id}
|
key={t.id}
|
||||||
onClick={() => setTab(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
|
tab === t.id
|
||||||
? 'border-green-600 text-green-700'
|
? 'border-accent text-ink'
|
||||||
: 'border-transparent text-gray-500 hover:text-gray-700'
|
: 'border-transparent text-gray-500 hover:text-gray-700'
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
{t.label}
|
{t.label}
|
||||||
<span className={`ml-1.5 text-xs px-1.5 py-0.5 rounded-full ${
|
<span className={`ml-1.5 text-xs px-1.5 py-0.5 ${
|
||||||
tab === t.id ? 'bg-green-100 text-green-700' : 'bg-gray-100 text-gray-500'
|
tab === t.id ? 'bg-neutral-100 text-ink' : 'bg-gray-100 text-gray-500'
|
||||||
}`}>{t.count}</span>
|
}`}>{t.count}</span>
|
||||||
</button>
|
</button>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
{tab === 'users' && <UserManager users={users} sites={siteOptions} />}
|
{tab === 'users' && <UserManager users={users} sites={siteOptions} />}
|
||||||
{tab === 'sites' && <SiteZoneManager sites={sites} />}
|
{tab === 'sites' && <SiteZoneManager sites={sites} />}
|
||||||
{tab === 'trucks' && <TruckManager trucks={trucks} />}
|
{tab === 'trucks' && <TruckManager trucks={trucks} sites={truckSites} />}
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ export function BulkImportForm() {
|
|||||||
if (stage === 'upload') {
|
if (stage === 'upload') {
|
||||||
return (
|
return (
|
||||||
<div className="space-y-4">
|
<div className="space-y-4">
|
||||||
<label className="block cursor-pointer rounded border-2 border-dashed border-gray-300 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
|
<input
|
||||||
type="file"
|
type="file"
|
||||||
onChange={handleUpload}
|
onChange={handleUpload}
|
||||||
@@ -201,14 +201,14 @@ export function BulkImportForm() {
|
|||||||
<div className="flex gap-2">
|
<div className="flex gap-2">
|
||||||
<button
|
<button
|
||||||
onClick={() => setStage('upload')}
|
onClick={() => setStage('upload')}
|
||||||
className="px-4 py-2 text-gray-600 hover:bg-gray-100 rounded"
|
className="px-4 py-2 text-gray-600 hover:bg-gray-100"
|
||||||
>
|
>
|
||||||
Back
|
Back
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
onClick={handleImport}
|
onClick={handleImport}
|
||||||
disabled={!canImport || loading}
|
disabled={!canImport || loading}
|
||||||
className="px-4 py-2 bg-blue-600 text-white rounded disabled:opacity-50 disabled:cursor-not-allowed"
|
className="px-4 py-2 bg-accent text-white disabled:opacity-50 disabled:cursor-not-allowed"
|
||||||
>
|
>
|
||||||
{loading ? 'Importing...' : 'Import All'}
|
{loading ? 'Importing...' : 'Import All'}
|
||||||
</button>
|
</button>
|
||||||
@@ -220,9 +220,9 @@ export function BulkImportForm() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="space-y-4">
|
<div className="space-y-4">
|
||||||
<h3 className="font-bold text-green-600">✓ Import Complete</h3>
|
<h3 className="font-bold text-ink">✓ Import Complete</h3>
|
||||||
<p>{folders.length} incidents created</p>
|
<p>{folders.length} incidents created</p>
|
||||||
{message && <p className="text-green-600 text-sm">{message}</p>}
|
{message && <p className="text-ink text-sm">{message}</p>}
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
import { useState } from 'react'
|
import { useState } from 'react'
|
||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
import { Modal } from '@/components/ui/modal'
|
import { Modal } from '@/components/ui/modal'
|
||||||
|
import { INPUT_CLASS as inp } from '@/components/ui/field'
|
||||||
|
|
||||||
export type SiteWithZones = {
|
export type SiteWithZones = {
|
||||||
id: string
|
id: string
|
||||||
@@ -16,7 +17,6 @@ interface Props {
|
|||||||
sites: SiteWithZones[]
|
sites: SiteWithZones[]
|
||||||
}
|
}
|
||||||
|
|
||||||
const inp = 'w-full border border-gray-300 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-green-500 focus:border-green-500'
|
|
||||||
const lbl = 'block text-xs font-medium text-gray-600 mb-1'
|
const lbl = 'block text-xs font-medium text-gray-600 mb-1'
|
||||||
|
|
||||||
type DeleteTarget = { kind: 'site'; id: string; name: string } | { kind: 'zone'; id: string; name: string }
|
type DeleteTarget = { kind: 'site'; id: string; name: string } | { kind: 'zone'; id: string; name: string }
|
||||||
@@ -81,22 +81,22 @@ export function SiteZoneManager({ sites }: Props) {
|
|||||||
const totalZones = sites.reduce((n, s) => n + s.zones.length, 0)
|
const totalZones = sites.reduce((n, s) => n + s.zones.length, 0)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="bg-white rounded-xl border border-gray-200 shadow-sm overflow-hidden">
|
<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-gray-100">
|
<div className="flex items-center justify-between px-5 py-4 border-b border-divider">
|
||||||
<div>
|
<div>
|
||||||
<h2 className="text-sm font-semibold text-gray-900">Sites & Zones</h2>
|
<h2 className="text-sm font-semibold text-gray-900">Sites & Zones</h2>
|
||||||
<p className="text-xs text-gray-400 mt-0.5">{sites.length} site{sites.length !== 1 ? 's' : ''} · {totalZones} zone{totalZones !== 1 ? 's' : ''}</p>
|
<p className="text-xs text-gray-400 mt-0.5">{sites.length} site{sites.length !== 1 ? 's' : ''} · {totalZones} zone{totalZones !== 1 ? 's' : ''}</p>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex gap-2">
|
<div className="flex gap-2">
|
||||||
<button onClick={() => { setShowAddZone(true); setError(null) }}
|
<button onClick={() => { setShowAddZone(true); setError(null) }}
|
||||||
className="flex items-center gap-1.5 px-3 py-1.5 bg-gray-100 text-gray-700 text-xs font-semibold rounded-lg hover:bg-gray-200 transition-colors cursor-pointer">
|
className="flex items-center gap-1.5 px-3 py-1.5 bg-gray-100 text-gray-700 text-xs font-semibold hover:bg-gray-200 transition-colors cursor-pointer">
|
||||||
<svg className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2.5}>
|
<svg className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2.5}>
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" d="M12 4v16m8-8H4" />
|
<path strokeLinecap="round" strokeLinejoin="round" d="M12 4v16m8-8H4" />
|
||||||
</svg>
|
</svg>
|
||||||
Add Zone
|
Add Zone
|
||||||
</button>
|
</button>
|
||||||
<button onClick={() => { setShowAddSite(true); setError(null) }}
|
<button onClick={() => { setShowAddSite(true); setError(null) }}
|
||||||
className="flex items-center gap-1.5 px-3 py-1.5 bg-green-600 text-white text-xs font-semibold rounded-lg hover:bg-green-700 transition-colors cursor-pointer">
|
className="flex items-center gap-1.5 px-3 py-1.5 bg-accent text-white text-xs font-semibold hover:bg-accent-600 transition-colors cursor-pointer">
|
||||||
<svg className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2.5}>
|
<svg className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2.5}>
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" d="M12 4v16m8-8H4" />
|
<path strokeLinecap="round" strokeLinejoin="round" d="M12 4v16m8-8H4" />
|
||||||
</svg>
|
</svg>
|
||||||
@@ -118,10 +118,10 @@ export function SiteZoneManager({ sites }: Props) {
|
|||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
<button disabled={busyId === site.id}
|
<button disabled={busyId === site.id}
|
||||||
onClick={() => send('PATCH', { kind: 'site', id: site.id, active: !site.active })}
|
onClick={() => send('PATCH', { kind: 'site', id: site.id, active: !site.active })}
|
||||||
className={`text-xs font-medium px-2.5 py-1 rounded-full border transition-colors cursor-pointer disabled:opacity-50 ${
|
className={`text-xs font-medium px-2.5 py-1 border transition-colors cursor-pointer disabled:opacity-50 ${
|
||||||
site.active
|
site.active
|
||||||
? 'bg-green-50 text-green-700 border-green-200 hover:bg-green-100'
|
? 'bg-neutral-100 text-ink border-divider hover:bg-neutral-200'
|
||||||
: 'bg-gray-50 text-gray-500 border-gray-200 hover:bg-gray-100'
|
: 'bg-gray-50 text-gray-500 border-divider hover:bg-gray-100'
|
||||||
}`}>
|
}`}>
|
||||||
{site.active ? 'Active' : 'Inactive'}
|
{site.active ? 'Active' : 'Inactive'}
|
||||||
</button>
|
</button>
|
||||||
@@ -134,21 +134,21 @@ export function SiteZoneManager({ sites }: Props) {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{site.zones.length > 0 && (
|
{site.zones.length > 0 && (
|
||||||
<ul className="mt-3 space-y-1.5 pl-3 border-l-2 border-gray-100">
|
<ul className="mt-3 space-y-1.5 pl-3 border-l border-divider">
|
||||||
{site.zones.map(z => (
|
{site.zones.map(z => (
|
||||||
<li key={z.id} className={`flex items-center justify-between ${!z.active ? 'opacity-50' : ''}`}>
|
<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>
|
<span className="text-xs text-gray-700 font-medium">{z.name}</span>
|
||||||
<div className="flex items-center gap-3">
|
<div className="flex items-center gap-3">
|
||||||
<a href={`/report?zone=${z.qr_code_token}`} target="_blank"
|
<a href={`/report?zone=${z.qr_code_token}`} target="_blank"
|
||||||
className="text-xs text-blue-600 hover:underline cursor-pointer">
|
className="text-xs text-accent-700 hover:underline cursor-pointer">
|
||||||
Report link
|
Report link
|
||||||
</a>
|
</a>
|
||||||
<button disabled={busyId === z.id}
|
<button disabled={busyId === z.id}
|
||||||
onClick={() => send('PATCH', { kind: 'zone', id: z.id, active: !z.active })}
|
onClick={() => send('PATCH', { kind: 'zone', id: z.id, active: !z.active })}
|
||||||
className={`text-xs font-medium px-2 py-0.5 rounded-full border transition-colors cursor-pointer disabled:opacity-50 ${
|
className={`text-xs font-medium px-2 py-0.5 border transition-colors cursor-pointer disabled:opacity-50 ${
|
||||||
z.active
|
z.active
|
||||||
? 'bg-green-50 text-green-700 border-green-200 hover:bg-green-100'
|
? 'bg-neutral-100 text-ink border-divider hover:bg-neutral-200'
|
||||||
: 'bg-gray-50 text-gray-500 border-gray-200 hover:bg-gray-100'
|
: 'bg-gray-50 text-gray-500 border-divider hover:bg-gray-100'
|
||||||
}`}>
|
}`}>
|
||||||
{z.active ? 'Active' : 'Inactive'}
|
{z.active ? 'Active' : 'Inactive'}
|
||||||
</button>
|
</button>
|
||||||
@@ -178,18 +178,18 @@ export function SiteZoneManager({ sites }: Props) {
|
|||||||
footer={
|
footer={
|
||||||
<>
|
<>
|
||||||
<button onClick={() => { setShowAddSite(false); setSiteName(''); setError(null) }}
|
<button onClick={() => { setShowAddSite(false); setSiteName(''); setError(null) }}
|
||||||
className="px-4 py-2 text-sm font-medium rounded-lg border border-gray-300 text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
|
className="px-4 py-2 text-sm font-medium border border-divider text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
|
||||||
Cancel
|
Cancel
|
||||||
</button>
|
</button>
|
||||||
<button disabled={busy || !siteName.trim()}
|
<button disabled={busy || !siteName.trim()}
|
||||||
onClick={async () => { if (await post({ kind: 'site', name: siteName })) { setSiteName(''); setShowAddSite(false) } }}
|
onClick={async () => { if (await post({ kind: 'site', name: siteName })) { setSiteName(''); setShowAddSite(false) } }}
|
||||||
className="px-4 py-2 bg-green-600 text-white text-sm font-semibold rounded-lg hover:bg-green-700 disabled:opacity-50 cursor-pointer transition-colors">
|
className="px-4 py-2 bg-accent text-white text-sm font-semibold hover:bg-accent-600 disabled:opacity-50 cursor-pointer transition-colors">
|
||||||
{busy ? 'Adding…' : 'Add Site'}
|
{busy ? 'Adding…' : 'Add Site'}
|
||||||
</button>
|
</button>
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
{error && <p className="text-xs text-red-600 bg-red-50 px-3 py-2 rounded-lg mb-3">{error}</p>}
|
{error && <p className="text-xs text-red-600 bg-red-50 px-3 py-2 mb-3">{error}</p>}
|
||||||
<div>
|
<div>
|
||||||
<label className={lbl} htmlFor="add-site-name">Site Name *</label>
|
<label className={lbl} htmlFor="add-site-name">Site Name *</label>
|
||||||
<input id="add-site-name" type="text" placeholder="e.g. Setia Warehouse KL"
|
<input id="add-site-name" type="text" placeholder="e.g. Setia Warehouse KL"
|
||||||
@@ -205,7 +205,7 @@ export function SiteZoneManager({ sites }: Props) {
|
|||||||
footer={
|
footer={
|
||||||
<>
|
<>
|
||||||
<button onClick={() => { setShowAddZone(false); setZoneName(''); setZoneSiteId(''); setError(null) }}
|
<button onClick={() => { setShowAddZone(false); setZoneName(''); setZoneSiteId(''); setError(null) }}
|
||||||
className="px-4 py-2 text-sm font-medium rounded-lg border border-gray-300 text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
|
className="px-4 py-2 text-sm font-medium border border-divider text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
|
||||||
Cancel
|
Cancel
|
||||||
</button>
|
</button>
|
||||||
<button disabled={busy || !zoneName.trim() || !zoneSiteId}
|
<button disabled={busy || !zoneName.trim() || !zoneSiteId}
|
||||||
@@ -214,13 +214,13 @@ export function SiteZoneManager({ sites }: Props) {
|
|||||||
setZoneName(''); setZoneSiteId(''); setShowAddZone(false)
|
setZoneName(''); setZoneSiteId(''); setShowAddZone(false)
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
className="px-4 py-2 bg-green-600 text-white text-sm font-semibold rounded-lg hover:bg-green-700 disabled:opacity-50 cursor-pointer transition-colors">
|
className="px-4 py-2 bg-accent text-white text-sm font-semibold hover:bg-accent-600 disabled:opacity-50 cursor-pointer transition-colors">
|
||||||
{busy ? 'Adding…' : 'Add Zone'}
|
{busy ? 'Adding…' : 'Add Zone'}
|
||||||
</button>
|
</button>
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
{error && <p className="text-xs text-red-600 bg-red-50 px-3 py-2 rounded-lg mb-3">{error}</p>}
|
{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 className="space-y-4">
|
||||||
<div>
|
<div>
|
||||||
<label className={lbl} htmlFor="add-zone-site">Site *</label>
|
<label className={lbl} htmlFor="add-zone-site">Site *</label>
|
||||||
@@ -243,12 +243,12 @@ export function SiteZoneManager({ sites }: Props) {
|
|||||||
footer={
|
footer={
|
||||||
<>
|
<>
|
||||||
<button onClick={() => setConfirmDelete(null)}
|
<button onClick={() => setConfirmDelete(null)}
|
||||||
className="px-4 py-2 text-sm font-medium rounded-lg border border-gray-300 text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
|
className="px-4 py-2 text-sm font-medium border border-divider text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
|
||||||
Cancel
|
Cancel
|
||||||
</button>
|
</button>
|
||||||
<button disabled={!!(confirmDelete && busyId === confirmDelete.id)}
|
<button disabled={!!(confirmDelete && busyId === confirmDelete.id)}
|
||||||
onClick={() => confirmDelete && handleDelete(confirmDelete)}
|
onClick={() => confirmDelete && handleDelete(confirmDelete)}
|
||||||
className="px-4 py-2 bg-red-600 text-white text-sm font-semibold rounded-lg hover:bg-red-700 disabled:opacity-50 cursor-pointer transition-colors">
|
className="px-4 py-2 bg-red-600 text-white text-sm font-semibold hover:bg-red-700 disabled:opacity-50 cursor-pointer transition-colors">
|
||||||
Delete
|
Delete
|
||||||
</button>
|
</button>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -3,22 +3,26 @@
|
|||||||
import { useState } from 'react'
|
import { useState } from 'react'
|
||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
import { Modal } from '@/components/ui/modal'
|
import { Modal } from '@/components/ui/modal'
|
||||||
|
import { INPUT_CLASS as inp } from '@/components/ui/field'
|
||||||
|
|
||||||
export type Truck = {
|
export type Truck = {
|
||||||
id: string
|
id: string
|
||||||
truck_no: string
|
truck_no: string
|
||||||
carrier: string | null
|
carrier: string | null
|
||||||
|
site_id: string | null
|
||||||
active: boolean
|
active: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type TruckSite = { id: string; name: string; active: boolean }
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
trucks: Truck[]
|
trucks: Truck[]
|
||||||
|
sites: TruckSite[]
|
||||||
}
|
}
|
||||||
|
|
||||||
const inp = 'w-full border border-gray-300 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-green-500 focus:border-green-500'
|
|
||||||
const lbl = 'block text-xs font-medium text-gray-600 mb-1'
|
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 router = useRouter()
|
||||||
const [truckNo, setTruckNo] = useState('')
|
const [truckNo, setTruckNo] = useState('')
|
||||||
const [carrier, setCarrier] = useState('')
|
const [carrier, setCarrier] = useState('')
|
||||||
@@ -27,6 +31,22 @@ export function TruckManager({ trucks }: Props) {
|
|||||||
const [error, setError] = useState<string | null>(null)
|
const [error, setError] = useState<string | null>(null)
|
||||||
const [showAdd, setShowAdd] = useState(false)
|
const [showAdd, setShowAdd] = useState(false)
|
||||||
const [confirmDelete, setConfirmDelete] = useState<Truck | null>(null)
|
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 handleAdd = async () => {
|
||||||
const no = truckNo.trim()
|
const no = truckNo.trim()
|
||||||
@@ -37,12 +57,13 @@ export function TruckManager({ trucks }: Props) {
|
|||||||
const res = await fetch('/api/admin/trucks', {
|
const res = await fetch('/api/admin/trucks', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: { 'Content-Type': 'application/json' },
|
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()
|
const data = await res.json()
|
||||||
if (!res.ok) { setError(data.error ?? 'Failed to add truck'); return }
|
if (!res.ok) { setError(data.error ?? 'Failed to add truck'); return }
|
||||||
setTruckNo('')
|
setTruckNo('')
|
||||||
setCarrier('')
|
setCarrier('')
|
||||||
|
setSiteId('')
|
||||||
setShowAdd(false)
|
setShowAdd(false)
|
||||||
router.refresh()
|
router.refresh()
|
||||||
} catch {
|
} catch {
|
||||||
@@ -82,15 +103,28 @@ export function TruckManager({ trucks }: Props) {
|
|||||||
setConfirmDelete(null)
|
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 (
|
return (
|
||||||
<div className="bg-white rounded-xl border border-gray-200 shadow-sm overflow-hidden">
|
<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-gray-100">
|
<div className="flex items-center justify-between px-5 py-4 border-b border-divider">
|
||||||
<div>
|
<div>
|
||||||
<h2 className="text-sm font-semibold text-gray-900">Trucks</h2>
|
<h2 className="text-sm font-semibold text-gray-900">Trucks</h2>
|
||||||
<p className="text-xs text-gray-400 mt-0.5">{trucks.length} vehicle{trucks.length !== 1 ? 's' : ''}</p>
|
<p className="text-xs text-gray-400 mt-0.5">{trucks.length} vehicle{trucks.length !== 1 ? 's' : ''}</p>
|
||||||
</div>
|
</div>
|
||||||
<button onClick={() => { setShowAdd(true); setError(null) }}
|
<button onClick={() => { setShowAdd(true); setError(null) }}
|
||||||
className="flex items-center gap-1.5 px-3 py-1.5 bg-green-600 text-white text-xs font-semibold rounded-lg hover:bg-green-700 transition-colors cursor-pointer">
|
className="flex items-center gap-1.5 px-3 py-1.5 bg-accent text-white text-xs font-semibold hover:bg-accent-600 transition-colors cursor-pointer">
|
||||||
<svg className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2.5}>
|
<svg className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2.5}>
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" d="M12 4v16m8-8H4" />
|
<path strokeLinecap="round" strokeLinejoin="round" d="M12 4v16m8-8H4" />
|
||||||
</svg>
|
</svg>
|
||||||
@@ -106,18 +140,25 @@ export function TruckManager({ trucks }: Props) {
|
|||||||
<div className="flex items-center gap-3">
|
<div className="flex items-center gap-3">
|
||||||
<span className="text-sm font-semibold text-gray-900">{tk.truck_no}</span>
|
<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>}
|
{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>
|
||||||
<div className="flex items-center gap-3">
|
<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"
|
<a href={`/report?truck_id=${tk.id}`} target="_blank"
|
||||||
className="text-xs text-blue-600 hover:underline cursor-pointer">
|
className="text-xs text-accent-700 hover:underline cursor-pointer">
|
||||||
Report link
|
Report link
|
||||||
</a>
|
</a>
|
||||||
<button disabled={busyId === tk.id}
|
<button disabled={busyId === tk.id}
|
||||||
onClick={() => send('PATCH', { id: tk.id, active: !tk.active })}
|
onClick={() => send('PATCH', { id: tk.id, active: !tk.active })}
|
||||||
className={`text-xs font-medium px-2.5 py-1 rounded-full border transition-colors cursor-pointer disabled:opacity-50 ${
|
className={`text-xs font-medium px-2.5 py-1 border transition-colors cursor-pointer disabled:opacity-50 ${
|
||||||
tk.active
|
tk.active
|
||||||
? 'bg-green-50 text-green-700 border-green-200 hover:bg-green-100'
|
? 'bg-neutral-100 text-ink border-divider hover:bg-neutral-200'
|
||||||
: 'bg-gray-50 text-gray-500 border-gray-200 hover:bg-gray-100'
|
: 'bg-gray-50 text-gray-500 border-divider hover:bg-gray-100'
|
||||||
}`}>
|
}`}>
|
||||||
{tk.active ? 'Active' : 'Inactive'}
|
{tk.active ? 'Active' : 'Inactive'}
|
||||||
</button>
|
</button>
|
||||||
@@ -134,22 +175,22 @@ export function TruckManager({ trucks }: Props) {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Add Truck Modal */}
|
{/* 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"
|
title="Add Truck" width="sm"
|
||||||
footer={
|
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 rounded-lg border border-gray-300 text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
|
className="px-4 py-2 text-sm font-medium border border-divider text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
|
||||||
Cancel
|
Cancel
|
||||||
</button>
|
</button>
|
||||||
<button disabled={submitting || !truckNo.trim()} onClick={handleAdd}
|
<button disabled={submitting || !truckNo.trim()} onClick={handleAdd}
|
||||||
className="px-4 py-2 bg-green-600 text-white text-sm font-semibold rounded-lg hover:bg-green-700 disabled:opacity-50 cursor-pointer transition-colors">
|
className="px-4 py-2 bg-accent text-white text-sm font-semibold hover:bg-accent-600 disabled:opacity-50 cursor-pointer transition-colors">
|
||||||
{submitting ? 'Adding…' : 'Add Truck'}
|
{submitting ? 'Adding…' : 'Add Truck'}
|
||||||
</button>
|
</button>
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
{error && <p className="text-xs text-red-600 bg-red-50 px-3 py-2 rounded-lg mb-3">{error}</p>}
|
{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 className="space-y-4">
|
||||||
<div>
|
<div>
|
||||||
<label className={lbl} htmlFor="add-truck-no">Truck Number *</label>
|
<label className={lbl} htmlFor="add-truck-no">Truck Number *</label>
|
||||||
@@ -165,6 +206,49 @@ export function TruckManager({ trucks }: Props) {
|
|||||||
onKeyDown={e => e.key === 'Enter' && handleAdd()}
|
onKeyDown={e => e.key === 'Enter' && handleAdd()}
|
||||||
className={inp} />
|
className={inp} />
|
||||||
</div>
|
</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>
|
</div>
|
||||||
</Modal>
|
</Modal>
|
||||||
|
|
||||||
@@ -173,12 +257,12 @@ export function TruckManager({ trucks }: Props) {
|
|||||||
footer={
|
footer={
|
||||||
<>
|
<>
|
||||||
<button onClick={() => setConfirmDelete(null)}
|
<button onClick={() => setConfirmDelete(null)}
|
||||||
className="px-4 py-2 text-sm font-medium rounded-lg border border-gray-300 text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
|
className="px-4 py-2 text-sm font-medium border border-divider text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
|
||||||
Cancel
|
Cancel
|
||||||
</button>
|
</button>
|
||||||
<button disabled={busyId === confirmDelete?.id}
|
<button disabled={busyId === confirmDelete?.id}
|
||||||
onClick={() => confirmDelete && handleDelete(confirmDelete)}
|
onClick={() => confirmDelete && handleDelete(confirmDelete)}
|
||||||
className="px-4 py-2 bg-red-600 text-white text-sm font-semibold rounded-lg hover:bg-red-700 disabled:opacity-50 cursor-pointer transition-colors">
|
className="px-4 py-2 bg-red-600 text-white text-sm font-semibold hover:bg-red-700 disabled:opacity-50 cursor-pointer transition-colors">
|
||||||
{busyId === confirmDelete?.id ? 'Deleting…' : 'Delete'}
|
{busyId === confirmDelete?.id ? 'Deleting…' : 'Delete'}
|
||||||
</button>
|
</button>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -2,8 +2,9 @@
|
|||||||
|
|
||||||
import { useState } from 'react'
|
import { useState } from 'react'
|
||||||
import { useRouter } from 'next/navigation'
|
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 { Modal } from '@/components/ui/modal'
|
||||||
|
import { INPUT_CLASS as inp } from '@/components/ui/field'
|
||||||
|
|
||||||
export type AdminUser = {
|
export type AdminUser = {
|
||||||
id: string
|
id: string
|
||||||
@@ -22,9 +23,8 @@ interface Props {
|
|||||||
sites: SiteOption[]
|
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 inp = 'w-full border border-gray-300 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-green-500 focus:border-green-500'
|
|
||||||
const lbl = 'block text-xs font-medium text-gray-600 mb-1'
|
const lbl = 'block text-xs font-medium text-gray-600 mb-1'
|
||||||
|
|
||||||
export function UserManager({ users, sites }: Props) {
|
export function UserManager({ users, sites }: Props) {
|
||||||
@@ -95,15 +95,15 @@ export function UserManager({ users, sites }: Props) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="bg-white rounded-xl border border-gray-200 shadow-sm overflow-hidden">
|
<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-gray-100">
|
<div className="flex items-center justify-between px-5 py-4 border-b border-divider">
|
||||||
<div>
|
<div>
|
||||||
<h2 className="text-sm font-semibold text-gray-900">Users</h2>
|
<h2 className="text-sm font-semibold text-gray-900">Users</h2>
|
||||||
<p className="text-xs text-gray-400 mt-0.5">{users.length} account{users.length !== 1 ? 's' : ''}</p>
|
<p className="text-xs text-gray-400 mt-0.5">{users.length} account{users.length !== 1 ? 's' : ''}</p>
|
||||||
</div>
|
</div>
|
||||||
<button
|
<button
|
||||||
onClick={() => { setShowAdd(true); setError(null) }}
|
onClick={() => { setShowAdd(true); setError(null) }}
|
||||||
className="flex items-center gap-1.5 px-3 py-1.5 bg-green-600 text-white text-xs font-semibold rounded-lg hover:bg-green-700 transition-colors cursor-pointer"
|
className="flex items-center gap-1.5 px-3 py-1.5 bg-accent text-white text-xs font-semibold hover:bg-accent-600 transition-colors cursor-pointer"
|
||||||
>
|
>
|
||||||
<svg className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2.5}>
|
<svg className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2.5}>
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" d="M12 4v16m8-8H4" />
|
<path strokeLinecap="round" strokeLinejoin="round" d="M12 4v16m8-8H4" />
|
||||||
@@ -134,14 +134,14 @@ export function UserManager({ users, sites }: Props) {
|
|||||||
<td className="px-5 py-3">
|
<td className="px-5 py-3">
|
||||||
<select value={u.role} disabled={busyId === u.id}
|
<select value={u.role} disabled={busyId === u.id}
|
||||||
onChange={e => patchUser(u.id, { role: e.target.value })}
|
onChange={e => patchUser(u.id, { role: e.target.value })}
|
||||||
className="border border-gray-200 rounded-lg px-2 py-1 text-xs focus:outline-none focus:ring-1 focus:ring-green-500 cursor-pointer">
|
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>
|
</select>
|
||||||
</td>
|
</td>
|
||||||
<td className="px-5 py-3">
|
<td className="px-5 py-3">
|
||||||
<select value={u.site_id ?? ''} disabled={busyId === u.id}
|
<select value={u.site_id ?? ''} disabled={busyId === u.id}
|
||||||
onChange={e => patchUser(u.id, { site_id: e.target.value || null })}
|
onChange={e => patchUser(u.id, { site_id: e.target.value || null })}
|
||||||
className="border border-gray-200 rounded-lg px-2 py-1 text-xs focus:outline-none focus:ring-1 focus:ring-green-500 cursor-pointer">
|
className="border border-divider px-2 py-1 text-xs focus:outline-none focus:ring-1 focus:ring-accent cursor-pointer">
|
||||||
<option value="">No site</option>
|
<option value="">No site</option>
|
||||||
{sites.map(s => <option key={s.id} value={s.id}>{s.name}</option>)}
|
{sites.map(s => <option key={s.id} value={s.id}>{s.name}</option>)}
|
||||||
</select>
|
</select>
|
||||||
@@ -149,10 +149,10 @@ export function UserManager({ users, sites }: Props) {
|
|||||||
<td className="px-5 py-3">
|
<td className="px-5 py-3">
|
||||||
<button disabled={busyId === u.id}
|
<button disabled={busyId === u.id}
|
||||||
onClick={() => patchUser(u.id, { active: !u.active })}
|
onClick={() => patchUser(u.id, { active: !u.active })}
|
||||||
className={`text-xs px-2.5 py-1 rounded-full font-medium border transition-colors cursor-pointer ${
|
className={`text-xs px-2.5 py-1 font-medium border transition-colors cursor-pointer ${
|
||||||
u.active
|
u.active
|
||||||
? 'bg-green-50 text-green-700 border-green-200 hover:bg-green-100'
|
? 'bg-neutral-100 text-ink border-divider hover:bg-neutral-200'
|
||||||
: 'bg-gray-50 text-gray-500 border-gray-200 hover:bg-gray-100'
|
: 'bg-gray-50 text-gray-500 border-divider hover:bg-gray-100'
|
||||||
}`}>
|
}`}>
|
||||||
{u.active ? 'Active' : 'Inactive'}
|
{u.active ? 'Active' : 'Inactive'}
|
||||||
</button>
|
</button>
|
||||||
@@ -178,18 +178,18 @@ export function UserManager({ users, sites }: Props) {
|
|||||||
footer={
|
footer={
|
||||||
<>
|
<>
|
||||||
<button type="button" onClick={() => { setShowAdd(false); setForm(EMPTY); setError(null) }}
|
<button type="button" onClick={() => { setShowAdd(false); setForm(EMPTY); setError(null) }}
|
||||||
className="px-4 py-2 text-sm font-medium rounded-lg border border-gray-300 text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
|
className="px-4 py-2 text-sm font-medium border border-divider text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
|
||||||
Cancel
|
Cancel
|
||||||
</button>
|
</button>
|
||||||
<button form="add-user-form" type="submit" disabled={submitting}
|
<button form="add-user-form" type="submit" disabled={submitting}
|
||||||
className="px-4 py-2 bg-green-600 text-white text-sm font-semibold rounded-lg hover:bg-green-700 disabled:opacity-50 cursor-pointer transition-colors">
|
className="px-4 py-2 bg-accent text-white text-sm font-semibold hover:bg-accent-600 disabled:opacity-50 cursor-pointer transition-colors">
|
||||||
{submitting ? 'Adding…' : 'Add User'}
|
{submitting ? 'Adding…' : 'Add User'}
|
||||||
</button>
|
</button>
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<form id="add-user-form" onSubmit={handleSubmit} className="space-y-4">
|
<form id="add-user-form" onSubmit={handleSubmit} className="space-y-4">
|
||||||
{error && <p className="text-xs text-red-600 bg-red-50 px-3 py-2 rounded-lg">{error}</p>}
|
{error && <p className="text-xs text-red-600 bg-red-50 px-3 py-2">{error}</p>}
|
||||||
<div className="grid grid-cols-2 gap-3">
|
<div className="grid grid-cols-2 gap-3">
|
||||||
<div>
|
<div>
|
||||||
<label className={lbl} htmlFor="au-email">Email *</label>
|
<label className={lbl} htmlFor="au-email">Email *</label>
|
||||||
@@ -224,7 +224,7 @@ export function UserManager({ users, sites }: Props) {
|
|||||||
<select id="au-role" value={form.role}
|
<select id="au-role" value={form.role}
|
||||||
onChange={e => setForm(v => ({ ...v, role: e.target.value as UserRole }))}
|
onChange={e => setForm(v => ({ ...v, role: e.target.value as UserRole }))}
|
||||||
className={inp}>
|
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>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
@@ -245,12 +245,12 @@ export function UserManager({ users, sites }: Props) {
|
|||||||
footer={
|
footer={
|
||||||
<>
|
<>
|
||||||
<button onClick={() => setConfirmDelete(null)}
|
<button onClick={() => setConfirmDelete(null)}
|
||||||
className="px-4 py-2 text-sm font-medium rounded-lg border border-gray-300 text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
|
className="px-4 py-2 text-sm font-medium border border-divider text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors">
|
||||||
Cancel
|
Cancel
|
||||||
</button>
|
</button>
|
||||||
<button disabled={busyId === confirmDelete?.id}
|
<button disabled={busyId === confirmDelete?.id}
|
||||||
onClick={() => confirmDelete && deleteUser(confirmDelete)}
|
onClick={() => confirmDelete && deleteUser(confirmDelete)}
|
||||||
className="px-4 py-2 bg-red-600 text-white text-sm font-semibold rounded-lg hover:bg-red-700 disabled:opacity-50 cursor-pointer transition-colors">
|
className="px-4 py-2 bg-red-600 text-white text-sm font-semibold hover:bg-red-700 disabled:opacity-50 cursor-pointer transition-colors">
|
||||||
{busyId === confirmDelete?.id ? 'Deleting…' : 'Delete'}
|
{busyId === confirmDelete?.id ? 'Deleting…' : 'Delete'}
|
||||||
</button>
|
</button>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -4,6 +4,8 @@
|
|||||||
import { useState } from 'react'
|
import { useState } from 'react'
|
||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
import Link from 'next/link'
|
import Link from 'next/link'
|
||||||
|
import { Button } from '@/components/ui/button'
|
||||||
|
import { Input } from '@/components/ui/field'
|
||||||
|
|
||||||
export function LoginForm() {
|
export function LoginForm() {
|
||||||
const [email, setEmail] = useState('')
|
const [email, setEmail] = useState('')
|
||||||
@@ -37,44 +39,38 @@ export function LoginForm() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<form onSubmit={handleSubmit} className="flex flex-col gap-4 w-full max-w-sm">
|
<form onSubmit={handleSubmit} className="flex flex-col gap-4 w-full max-w-sm">
|
||||||
<div className="text-center">
|
<div className="pb-3 border-b border-rule">
|
||||||
<h1 className="text-2xl font-bold">IMS</h1>
|
<h1 className="text-[22px] font-[650]">IMS</h1>
|
||||||
<p className="text-sm text-gray-500 mt-1">HSE Incident Management</p>
|
<p className="text-sm text-ink/60 mt-1">HSE Incident Management</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{error && (
|
{error && (
|
||||||
<p className="bg-red-50 border border-red-200 text-red-700 text-sm rounded px-3 py-2">
|
<p className="bg-st-red-bg text-st-red-fg text-[13px] px-3 py-2 rounded-md">
|
||||||
{error}
|
{error}
|
||||||
</p>
|
</p>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<input
|
<Input
|
||||||
type="email"
|
type="email"
|
||||||
placeholder="Email"
|
placeholder="Email"
|
||||||
value={email}
|
value={email}
|
||||||
onChange={(e) => setEmail(e.target.value)}
|
onChange={(e) => setEmail(e.target.value)}
|
||||||
required
|
required
|
||||||
autoComplete="email"
|
autoComplete="email"
|
||||||
className="border rounded-md px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
|
|
||||||
/>
|
/>
|
||||||
<input
|
<Input
|
||||||
type="password"
|
type="password"
|
||||||
placeholder="Password"
|
placeholder="Password"
|
||||||
value={password}
|
value={password}
|
||||||
onChange={(e) => setPassword(e.target.value)}
|
onChange={(e) => setPassword(e.target.value)}
|
||||||
required
|
required
|
||||||
autoComplete="current-password"
|
autoComplete="current-password"
|
||||||
className="border rounded-md px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
|
|
||||||
/>
|
/>
|
||||||
<button
|
<Button type="submit" variant="primary" block disabled={loading}>
|
||||||
type="submit"
|
|
||||||
disabled={loading}
|
|
||||||
className="bg-blue-600 hover:bg-blue-700 text-white font-medium py-2 rounded-md disabled:opacity-50 transition-colors"
|
|
||||||
>
|
|
||||||
{loading ? 'Signing in…' : 'Sign in'}
|
{loading ? 'Signing in…' : 'Sign in'}
|
||||||
</button>
|
</Button>
|
||||||
<p className="text-center text-sm text-gray-500">
|
<p className="text-sm text-ink/60">
|
||||||
<Link href="/forgot-password" className="text-blue-600 hover:underline">
|
<Link href="/forgot-password" className="text-accent-700 hover:underline">
|
||||||
Forgot password?
|
Forgot password?
|
||||||
</Link>
|
</Link>
|
||||||
</p>
|
</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,135 +0,0 @@
|
|||||||
'use client'
|
|
||||||
|
|
||||||
import { useState } from 'react'
|
|
||||||
import Link from 'next/link'
|
|
||||||
|
|
||||||
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 STATUS_COLORS: Record<CapaStatus, string> = {
|
|
||||||
open: 'bg-blue-50 border-blue-200',
|
|
||||||
in_progress: 'bg-yellow-50 border-yellow-200',
|
|
||||||
overdue: 'bg-red-50 border-red-200',
|
|
||||||
pending_verification: 'bg-purple-50 border-purple-200',
|
|
||||||
verified: 'bg-green-50 border-green-200',
|
|
||||||
reopened: 'bg-orange-50 border-orange-200',
|
|
||||||
closed: 'bg-gray-50 border-gray-200',
|
|
||||||
}
|
|
||||||
const PRIORITY_BADGE: Record<'low' | 'med' | 'high', string> = {
|
|
||||||
low: 'bg-gray-100 text-gray-600',
|
|
||||||
med: 'bg-yellow-100 text-yellow-700',
|
|
||||||
high: 'bg-red-100 text-red-700',
|
|
||||||
}
|
|
||||||
|
|
||||||
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-blue-600 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-gray-100">
|
|
||||||
{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-blue-600 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">
|
|
||||||
<span className={`px-2 py-0.5 rounded text-xs font-medium ${PRIORITY_BADGE[c.priority]}`}>
|
|
||||||
{c.priority}
|
|
||||||
</span>
|
|
||||||
</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-blue-600 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={`rounded-xl border p-4 ${STATUS_COLORS[status]}`}>
|
|
||||||
<h3 className="text-xs font-semibold uppercase tracking-wide text-gray-600 mb-3">
|
|
||||||
{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-white rounded-lg p-3 shadow-sm hover:shadow-md transition-shadow border border-gray-100">
|
|
||||||
<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>
|
|
||||||
<span className={`px-1.5 py-0.5 rounded ${PRIORITY_BADGE[c.priority]}`}>{c.priority}</span>
|
|
||||||
</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 { useState, useEffect } from 'react'
|
||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
|
import { Button } from '@/components/ui/button'
|
||||||
|
import { Field, Input, Select, Textarea } from '@/components/ui/field'
|
||||||
|
|
||||||
interface User {
|
interface User {
|
||||||
id: string
|
id: string
|
||||||
@@ -71,59 +73,62 @@ export function CapaForm({ incidentId }: Props) {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<form onSubmit={handleSubmit} className="space-y-4">
|
<form onSubmit={handleSubmit} className="space-y-4">
|
||||||
<div>
|
<Field label="Action Description *" htmlFor="capa-description">
|
||||||
<label className="block text-sm font-medium text-gray-700 mb-1">Action Description *</label>
|
<Textarea
|
||||||
<textarea
|
id="capa-description"
|
||||||
value={description}
|
value={description}
|
||||||
onChange={e => setDescription(e.target.value)}
|
onChange={e => setDescription(e.target.value)}
|
||||||
rows={3} required
|
rows={3}
|
||||||
className="w-full rounded-lg border border-gray-300 px-3 py-2 text-sm"
|
required
|
||||||
placeholder="What corrective action will be taken?"
|
placeholder="What corrective action will be taken?"
|
||||||
/>
|
/>
|
||||||
</div>
|
</Field>
|
||||||
|
|
||||||
<div>
|
<Field label="Root Cause Reference" htmlFor="capa-root-cause">
|
||||||
<label className="block text-sm font-medium text-gray-700 mb-1">Root Cause Reference</label>
|
<Input
|
||||||
<input type="text" value={rootCauseRef}
|
id="capa-root-cause"
|
||||||
|
type="text"
|
||||||
|
value={rootCauseRef}
|
||||||
onChange={e => setRootCauseRef(e.target.value)}
|
onChange={e => setRootCauseRef(e.target.value)}
|
||||||
className="w-full rounded-lg border border-gray-300 px-3 py-2 text-sm"
|
placeholder="e.g. Why #3 — inadequate training"
|
||||||
placeholder="e.g. Why #3 — inadequate training" />
|
/>
|
||||||
</div>
|
</Field>
|
||||||
|
|
||||||
<div>
|
<Field label="Assigned To *" htmlFor="capa-owner">
|
||||||
<label className="block text-sm font-medium text-gray-700 mb-1">Assigned To *</label>
|
<Select id="capa-owner" value={ownerId} onChange={e => handleOwnerChange(e.target.value)} required>
|
||||||
<select value={ownerId} onChange={e => handleOwnerChange(e.target.value)} required
|
|
||||||
className="w-full rounded-lg border border-gray-300 px-3 py-2 text-sm">
|
|
||||||
<option value="">Select owner…</option>
|
<option value="">Select owner…</option>
|
||||||
{users.map(u => (
|
{users.map(u => (
|
||||||
<option key={u.id} value={u.id}>{u.name} ({u.department})</option>
|
<option key={u.id} value={u.id}>{u.name} ({u.department})</option>
|
||||||
))}
|
))}
|
||||||
</select>
|
</Select>
|
||||||
</div>
|
</Field>
|
||||||
|
|
||||||
<div className="grid grid-cols-2 gap-3">
|
<div className="grid grid-cols-2 gap-3">
|
||||||
<div>
|
<Field label="Due Date *" htmlFor="capa-due">
|
||||||
<label className="block text-sm font-medium text-gray-700 mb-1">Due Date *</label>
|
<Input id="capa-due" type="date" value={dueDate} onChange={e => setDueDate(e.target.value)} required />
|
||||||
<input type="date" value={dueDate} onChange={e => setDueDate(e.target.value)} required
|
</Field>
|
||||||
className="w-full rounded-lg border border-gray-300 px-3 py-2 text-sm" />
|
<Field label="Priority" htmlFor="capa-priority">
|
||||||
</div>
|
<Select
|
||||||
<div>
|
id="capa-priority"
|
||||||
<label className="block text-sm font-medium text-gray-700 mb-1">Priority</label>
|
value={priority}
|
||||||
<select value={priority} onChange={e => setPriority(e.target.value as 'low' | 'med' | 'high')}
|
onChange={e => setPriority(e.target.value as 'low' | 'med' | 'high')}
|
||||||
className="w-full rounded-lg border border-gray-300 px-3 py-2 text-sm">
|
>
|
||||||
<option value="low">Low</option>
|
<option value="low">Low</option>
|
||||||
<option value="med">Medium</option>
|
<option value="med">Medium</option>
|
||||||
<option value="high">High</option>
|
<option value="high">High</option>
|
||||||
</select>
|
</Select>
|
||||||
</div>
|
</Field>
|
||||||
</div>
|
</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}
|
<Button type="submit" block disabled={saving}>
|
||||||
className="w-full bg-amber-600 text-white rounded-lg py-2 text-sm font-semibold disabled:opacity-50">
|
|
||||||
{saving ? 'Creating…' : 'Create CAPA Action'}
|
{saving ? 'Creating…' : 'Create CAPA Action'}
|
||||||
</button>
|
</Button>
|
||||||
</form>
|
</form>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,8 @@
|
|||||||
|
|
||||||
import { useState } from 'react'
|
import { useState } from 'react'
|
||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
|
import { Button } from '@/components/ui/button'
|
||||||
|
import { SubmitVerificationForm } from '@/components/capa/submit-verification-form'
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
capaId: string
|
capaId: string
|
||||||
@@ -33,26 +35,14 @@ export function CapaOwnerActions({ capaId, currentStatus }: Props) {
|
|||||||
|
|
||||||
if (currentStatus === 'open' || currentStatus === 'reopened' || currentStatus === 'overdue') {
|
if (currentStatus === 'open' || currentStatus === 'reopened' || currentStatus === 'overdue') {
|
||||||
return (
|
return (
|
||||||
<button
|
<Button variant="secondary" onClick={() => updateStatus('in_progress')} disabled={loading}>
|
||||||
onClick={() => updateStatus('in_progress')}
|
|
||||||
disabled={loading}
|
|
||||||
className="text-sm px-3 py-1.5 border border-gray-300 rounded-md hover:bg-gray-50 disabled:opacity-50"
|
|
||||||
>
|
|
||||||
{loading ? '…' : 'Mark In Progress'}
|
{loading ? '…' : 'Mark In Progress'}
|
||||||
</button>
|
</Button>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (currentStatus === 'in_progress') {
|
if (currentStatus === 'in_progress') {
|
||||||
return (
|
return <SubmitVerificationForm capaId={capaId} />
|
||||||
<button
|
|
||||||
onClick={() => updateStatus('pending_verification')}
|
|
||||||
disabled={loading}
|
|
||||||
className="text-sm px-3 py-1.5 bg-blue-600 text-white rounded-md hover:bg-blue-700 disabled:opacity-50"
|
|
||||||
>
|
|
||||||
{loading ? '…' : 'Submit for Verification'}
|
|
||||||
</button>
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return null
|
return null
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
'use client'
|
'use client'
|
||||||
|
|
||||||
import { useState } from 'react'
|
import { useState } from 'react'
|
||||||
|
import { Button } from '@/components/ui/button'
|
||||||
|
import { Field, Textarea } from '@/components/ui/field'
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
capaId: string
|
capaId: string
|
||||||
@@ -32,25 +34,22 @@ export function CapaOwnerNotesForm({ capaId, initialNotes }: Props) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="mt-3 space-y-1">
|
<div className="mt-3 space-y-2">
|
||||||
<label className="text-xs text-gray-500 font-medium">Remarks / Notes</label>
|
<Field label="Remarks / Notes" htmlFor={`notes-${capaId}`}>
|
||||||
<textarea
|
<Textarea
|
||||||
value={notes}
|
id={`notes-${capaId}`}
|
||||||
onChange={e => { setNotes(e.target.value); setSaved(false) }}
|
value={notes}
|
||||||
rows={2}
|
onChange={e => { setNotes(e.target.value); setSaved(false) }}
|
||||||
placeholder="Add any notes or updates for this action…"
|
rows={2}
|
||||||
className="w-full rounded-md border border-gray-200 px-3 py-2 text-sm text-gray-800 resize-none focus:outline-none focus:ring-2 focus:ring-blue-500"
|
placeholder="Add any notes or updates for this action…"
|
||||||
/>
|
/>
|
||||||
{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">
|
<div className="flex items-center gap-2">
|
||||||
<button
|
<Button variant="secondary" onClick={handleSave} disabled={saving}>
|
||||||
onClick={handleSave}
|
|
||||||
disabled={saving}
|
|
||||||
className="text-xs px-3 py-1 bg-gray-800 text-white rounded-md hover:bg-gray-700 disabled:opacity-50"
|
|
||||||
>
|
|
||||||
{saving ? 'Saving…' : 'Save Notes'}
|
{saving ? 'Saving…' : 'Save Notes'}
|
||||||
</button>
|
</Button>
|
||||||
{saved && <span className="text-xs text-green-600">Saved</span>}
|
{saved && <span className="text-xs text-st-green-fg">Saved</span>}
|
||||||
</div>
|
</div>
|
||||||
</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 { useState } from 'react'
|
||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
|
import { Button } from '@/components/ui/button'
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
capaId: string
|
capaId: string
|
||||||
@@ -31,19 +32,21 @@ export function CloseCapaButton({ capaId }: Props) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="border border-gray-200 rounded-xl p-5 space-y-3 bg-green-50">
|
<div className="space-y-3 rounded-xl bg-surface p-5 shadow-card">
|
||||||
<h3 className="text-sm font-semibold text-gray-800">Close CAPA</h3>
|
<div>
|
||||||
<p className="text-sm text-gray-600">
|
<h3 className="text-sm font-semibold">Close CAPA</h3>
|
||||||
This CAPA has been verified as effective. Close it to mark it fully resolved.
|
<p className="mt-0.5 text-xs text-muted">
|
||||||
</p>
|
This CAPA has been verified as effective. Close it to mark it fully resolved.
|
||||||
{error && <p className="text-sm text-red-600">{error}</p>}
|
</p>
|
||||||
<button
|
</div>
|
||||||
onClick={handleClose}
|
{error && (
|
||||||
disabled={loading}
|
<p role="alert" className="rounded-md bg-st-red-bg px-3 py-2 text-[13px] text-st-red-fg">
|
||||||
className="w-full bg-green-700 text-white rounded-lg py-2 text-sm font-semibold hover:bg-green-800 disabled:opacity-50"
|
{error}
|
||||||
>
|
</p>
|
||||||
|
)}
|
||||||
|
<Button onClick={handleClose} disabled={loading}>
|
||||||
{loading ? 'Closing…' : 'Close CAPA'}
|
{loading ? 'Closing…' : 'Close CAPA'}
|
||||||
</button>
|
</Button>
|
||||||
</div>
|
</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 { useState } from 'react'
|
||||||
import { useRouter } from 'next/navigation'
|
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 {
|
interface Props {
|
||||||
capaId: string
|
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) {
|
export function VerifyForm({ capaId }: Props) {
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const [verdict, setVerdict] = useState<'verified' | 'reopened' | null>(null)
|
const [verdict, setVerdict] = useState<Verdict | null>(null)
|
||||||
const [reopenReason, setReopenReason] = useState('')
|
const [reopenReason, setReopenReason] = useState('')
|
||||||
const [saving, setSaving] = useState(false)
|
const [saving, setSaving] = useState(false)
|
||||||
const [error, setError] = useState<string | null>(null)
|
const [error, setError] = useState<string | null>(null)
|
||||||
@@ -39,50 +72,50 @@ export function VerifyForm({ capaId }: Props) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<form onSubmit={handleSubmit} className="border border-gray-200 rounded-xl p-5 space-y-4 bg-purple-50">
|
<form onSubmit={handleSubmit} className="space-y-4 rounded-xl bg-surface p-5 shadow-card">
|
||||||
<h3 className="text-sm font-semibold text-gray-800">HSE Verification</h3>
|
<div>
|
||||||
<div className="flex gap-3">
|
<h3 className="text-sm font-semibold">Verify this action</h3>
|
||||||
<button
|
<p className="mt-0.5 text-xs text-muted">Confirm the corrective action fixed the root cause, or send it back.</p>
|
||||||
type="button"
|
|
||||||
onClick={() => setVerdict('verified')}
|
|
||||||
className={`flex-1 py-2 rounded-lg text-sm font-medium border ${
|
|
||||||
verdict === 'verified'
|
|
||||||
? 'bg-green-600 text-white border-green-600'
|
|
||||||
: 'bg-white text-gray-700 border-gray-300 hover:border-green-500'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
Verified — Effective
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => setVerdict('reopened')}
|
|
||||||
className={`flex-1 py-2 rounded-lg text-sm font-medium border ${
|
|
||||||
verdict === 'reopened'
|
|
||||||
? 'bg-orange-600 text-white border-orange-600'
|
|
||||||
: 'bg-white text-gray-700 border-gray-300 hover:border-orange-500'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
Reopen — Ineffective
|
|
||||||
</button>
|
|
||||||
</div>
|
</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' && (
|
{verdict === 'reopened' && (
|
||||||
<div>
|
<Field label="Why is the action ineffective? *" htmlFor="reopen-reason">
|
||||||
<label className="block text-sm font-medium text-gray-700 mb-1">Why is the action ineffective? *</label>
|
<Textarea
|
||||||
<textarea
|
id="reopen-reason"
|
||||||
value={reopenReason}
|
value={reopenReason}
|
||||||
onChange={e => setReopenReason(e.target.value)}
|
onChange={e => setReopenReason(e.target.value)}
|
||||||
rows={2} required
|
rows={2}
|
||||||
className="w-full rounded-lg border border-gray-300 px-3 py-2 text-sm"
|
required
|
||||||
placeholder="Describe why the corrective action did not resolve the root cause…"
|
placeholder="Describe why the corrective action did not resolve the root cause…"
|
||||||
/>
|
/>
|
||||||
</div>
|
</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 && (
|
{verdict && (
|
||||||
<button type="submit" disabled={saving}
|
<Button type="submit" disabled={saving}>
|
||||||
className="w-full bg-gray-900 text-white rounded-lg py-2 text-sm font-semibold disabled:opacity-50">
|
{saving ? 'Saving…' : verdict === 'verified' ? 'Confirm verification' : 'Reopen action'}
|
||||||
{saving ? 'Saving…' : 'Submit Verification'}
|
</Button>
|
||||||
</button>
|
|
||||||
)}
|
)}
|
||||||
</form>
|
</form>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -15,15 +15,15 @@ function TabsInner({ activeTab }: { activeTab: string }) {
|
|||||||
const pathname = usePathname()
|
const pathname = usePathname()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex border-b border-gray-200 mb-6 overflow-x-auto -mx-4 px-4">
|
<div className="flex border-b border-divider mb-6 overflow-x-auto -mx-4 px-4">
|
||||||
{TABS.map(tab => (
|
{TABS.map(tab => (
|
||||||
<button
|
<button
|
||||||
key={tab.key}
|
key={tab.key}
|
||||||
onClick={() => router.replace(`${pathname}?tab=${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
|
activeTab === tab.key
|
||||||
? 'border-blue-600 text-blue-600'
|
? 'border-accent text-accent-700'
|
||||||
: 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'
|
: 'border-transparent text-gray-500 hover:text-gray-700 hover:border-divider'
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
{tab.label}
|
{tab.label}
|
||||||
@@ -35,7 +35,7 @@ function TabsInner({ activeTab }: { activeTab: string }) {
|
|||||||
|
|
||||||
export function DashboardTabs({ activeTab }: { activeTab: string }) {
|
export function DashboardTabs({ activeTab }: { activeTab: string }) {
|
||||||
return (
|
return (
|
||||||
<Suspense fallback={<div className="h-11 mb-6 border-b border-gray-200" />}>
|
<Suspense fallback={<div className="h-11 mb-6 border-b border-divider" />}>
|
||||||
<TabsInner activeTab={activeTab} />
|
<TabsInner activeTab={activeTab} />
|
||||||
</Suspense>
|
</Suspense>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -11,9 +11,9 @@ type RiskFlag = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const LEVEL_COLORS: Record<RiskFlag['risk_level'], string> = {
|
const LEVEL_COLORS: Record<RiskFlag['risk_level'], string> = {
|
||||||
low: 'bg-yellow-50 text-yellow-700 border-yellow-200',
|
low: 'bg-st-grey-bg text-st-grey-fg border-transparent',
|
||||||
medium: 'bg-orange-50 text-orange-700 border-orange-200',
|
medium: 'bg-st-amber-bg text-st-amber-fg border-transparent',
|
||||||
high: 'bg-red-50 text-red-700 border-red-200',
|
high: 'bg-st-red-bg text-st-red-fg border-transparent',
|
||||||
}
|
}
|
||||||
|
|
||||||
export function RiskFlagsPanel() {
|
export function RiskFlagsPanel() {
|
||||||
@@ -43,7 +43,7 @@ export function RiskFlagsPanel() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="bg-white rounded-xl shadow-sm p-5 mb-4">
|
<div className="bg-surface shadow-sm p-5 mb-4">
|
||||||
<div className="flex items-center justify-between mb-1">
|
<div className="flex items-center justify-between mb-1">
|
||||||
<h2 className="text-sm font-semibold text-gray-700 uppercase tracking-wide">
|
<h2 className="text-sm font-semibold text-gray-700 uppercase tracking-wide">
|
||||||
Rising-Risk Zones (AI)
|
Rising-Risk Zones (AI)
|
||||||
@@ -51,7 +51,7 @@ export function RiskFlagsPanel() {
|
|||||||
<button
|
<button
|
||||||
onClick={analyze}
|
onClick={analyze}
|
||||||
disabled={loading}
|
disabled={loading}
|
||||||
className="bg-purple-50 text-purple-700 border border-purple-300 rounded-lg px-3 py-1.5 text-xs font-semibold disabled:opacity-50 hover:bg-purple-100"
|
className="bg-accent-100 text-accent-700 border border-accent-300 px-3 py-1.5 text-xs font-semibold disabled:opacity-50 hover:bg-accent-200"
|
||||||
>
|
>
|
||||||
{loading ? 'Analyzing…' : flags ? 'Re-analyze' : 'Analyze 90-Day Risk'}
|
{loading ? 'Analyzing…' : flags ? 'Re-analyze' : 'Analyze 90-Day Risk'}
|
||||||
</button>
|
</button>
|
||||||
@@ -71,7 +71,7 @@ export function RiskFlagsPanel() {
|
|||||||
<p className="text-sm text-gray-700 mb-3">{summary}</p>
|
<p className="text-sm text-gray-700 mb-3">{summary}</p>
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
{flags.map(f => (
|
{flags.map(f => (
|
||||||
<div key={`${f.site}-${f.zone}`} className={`border rounded-lg 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">
|
<div className="flex items-center justify-between mb-1">
|
||||||
<span className="text-sm font-semibold">{f.zone} · {f.site}</span>
|
<span className="text-sm font-semibold">{f.zone} · {f.site}</span>
|
||||||
<span className="text-xs font-bold uppercase">{f.risk_level}</span>
|
<span className="text-xs font-bold uppercase">{f.risk_level}</span>
|
||||||
|
|||||||
@@ -7,14 +7,14 @@ interface Props {
|
|||||||
|
|
||||||
const ACCENT = {
|
const ACCENT = {
|
||||||
default: 'border-gray-200',
|
default: 'border-gray-200',
|
||||||
green: 'border-green-400',
|
green: 'border-divider',
|
||||||
yellow: 'border-yellow-400',
|
yellow: 'border-accent-300',
|
||||||
red: 'border-red-400',
|
red: 'border-red-400',
|
||||||
}
|
}
|
||||||
|
|
||||||
export function StatCard({ label, value, sub, accent = 'default' }: Props) {
|
export function StatCard({ label, value, sub, accent = 'default' }: Props) {
|
||||||
return (
|
return (
|
||||||
<div className={`bg-white rounded-xl shadow-sm p-5 border-t-4 ${ACCENT[accent]}`}>
|
<div className={`bg-surface shadow-sm p-5 border-t-4 ${ACCENT[accent]}`}>
|
||||||
<p className="text-xs text-gray-500 uppercase tracking-wide font-medium">{label}</p>
|
<p className="text-xs text-gray-500 uppercase tracking-wide font-medium">{label}</p>
|
||||||
<p className="text-3xl font-bold text-gray-900 mt-1">{value}</p>
|
<p className="text-3xl font-bold text-gray-900 mt-1">{value}</p>
|
||||||
{sub && <p className="text-xs text-gray-400 mt-1">{sub}</p>}
|
{sub && <p className="text-xs text-gray-400 mt-1">{sub}</p>}
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ export function ClosurePanel({ incidentId, status, canClose, canAddAddenda }: Pr
|
|||||||
<button
|
<button
|
||||||
onClick={closeIncident}
|
onClick={closeIncident}
|
||||||
disabled={busy}
|
disabled={busy}
|
||||||
className="bg-green-700 text-white rounded-lg px-4 py-2 text-sm font-semibold hover:bg-green-800 disabled:opacity-50"
|
className="bg-accent text-white px-4 py-2 text-sm font-semibold hover:bg-accent-700 disabled:opacity-50"
|
||||||
>
|
>
|
||||||
{busy ? 'Closing…' : 'Close Incident'}
|
{busy ? 'Closing…' : 'Close Incident'}
|
||||||
</button>
|
</button>
|
||||||
@@ -89,7 +89,7 @@ export function ClosurePanel({ incidentId, status, canClose, canAddAddenda }: Pr
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="mt-6 bg-white rounded-xl shadow-sm p-5">
|
<div className="mt-6 bg-surface shadow-sm p-5">
|
||||||
<h2 className="text-sm font-semibold text-gray-700 uppercase tracking-wide mb-1">Addenda</h2>
|
<h2 className="text-sm font-semibold text-gray-700 uppercase tracking-wide mb-1">Addenda</h2>
|
||||||
<p className="text-xs text-gray-400 mb-3">
|
<p className="text-xs text-gray-400 mb-3">
|
||||||
This incident is closed and locked. New information is recorded as addenda.
|
This incident is closed and locked. New information is recorded as addenda.
|
||||||
@@ -99,7 +99,7 @@ export function ClosurePanel({ incidentId, status, canClose, canAddAddenda }: Pr
|
|||||||
) : (
|
) : (
|
||||||
<ul className="space-y-3">
|
<ul className="space-y-3">
|
||||||
{addenda.map(a => (
|
{addenda.map(a => (
|
||||||
<li key={a.id} className="border border-gray-100 rounded-lg p-3">
|
<li key={a.id} className="border border-divider p-3">
|
||||||
<p className="text-sm text-gray-800 whitespace-pre-wrap">{a.body}</p>
|
<p className="text-sm text-gray-800 whitespace-pre-wrap">{a.body}</p>
|
||||||
<p className="text-xs text-gray-400 mt-1">
|
<p className="text-xs text-gray-400 mt-1">
|
||||||
{a.author?.name ?? 'Unknown'} · {new Date(a.created_at).toLocaleString('en-MY', { timeZone: 'Asia/Kuala_Lumpur' })}
|
{a.author?.name ?? 'Unknown'} · {new Date(a.created_at).toLocaleString('en-MY', { timeZone: 'Asia/Kuala_Lumpur' })}
|
||||||
@@ -115,12 +115,12 @@ export function ClosurePanel({ incidentId, status, canClose, canAddAddenda }: Pr
|
|||||||
onChange={e => setDraft(e.target.value)}
|
onChange={e => setDraft(e.target.value)}
|
||||||
rows={3}
|
rows={3}
|
||||||
placeholder="Add an addendum…"
|
placeholder="Add an addendum…"
|
||||||
className="w-full border border-gray-200 rounded-lg p-2 text-sm"
|
className="w-full border border-divider p-2 text-sm"
|
||||||
/>
|
/>
|
||||||
<button
|
<button
|
||||||
onClick={addAddendum}
|
onClick={addAddendum}
|
||||||
disabled={busy || !draft.trim()}
|
disabled={busy || !draft.trim()}
|
||||||
className="mt-2 bg-gray-800 text-white rounded-lg px-4 py-2 text-sm font-semibold hover:bg-gray-900 disabled:opacity-50"
|
className="mt-2 bg-gray-800 text-white px-4 py-2 text-sm font-semibold hover:bg-gray-900 disabled:opacity-50"
|
||||||
>
|
>
|
||||||
{busy ? 'Saving…' : 'Add Addendum'}
|
{busy ? 'Saving…' : 'Add Addendum'}
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ export function EvidenceGallery({ files, stage }: Props) {
|
|||||||
href={file.file_url}
|
href={file.file_url}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noopener noreferrer"
|
rel="noopener noreferrer"
|
||||||
className="block rounded-lg overflow-hidden bg-gray-100 aspect-square hover:opacity-90 transition-opacity"
|
className="block overflow-hidden bg-gray-100 aspect-square hover:opacity-90 transition-opacity"
|
||||||
>
|
>
|
||||||
{isImage(file.file_type) ? (
|
{isImage(file.file_type) ? (
|
||||||
<img
|
<img
|
||||||
|
|||||||
@@ -57,8 +57,8 @@ export function FileUpload({ onFilesChange, disabled = false }: Props) {
|
|||||||
return (
|
return (
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
<div
|
<div
|
||||||
className={`border-2 border-dashed rounded-lg p-6 text-center cursor-pointer transition-colors
|
className={`border border-dashed p-6 text-center cursor-pointer transition-colors
|
||||||
${dragging ? 'border-blue-500 bg-blue-50' : 'border-gray-300 hover:border-gray-400'}
|
${dragging ? 'border-accent bg-accent-100' : 'border-divider hover:border-gray-400'}
|
||||||
${disabled ? 'opacity-50 pointer-events-none' : ''}`}
|
${disabled ? 'opacity-50 pointer-events-none' : ''}`}
|
||||||
onClick={() => inputRef.current?.click()}
|
onClick={() => inputRef.current?.click()}
|
||||||
onDragOver={e => { e.preventDefault(); setDragging(true) }}
|
onDragOver={e => { e.preventDefault(); setDragging(true) }}
|
||||||
@@ -94,7 +94,7 @@ export function FileUpload({ onFilesChange, disabled = false }: Props) {
|
|||||||
{files.length > 0 && (
|
{files.length > 0 && (
|
||||||
<ul className="space-y-1">
|
<ul className="space-y-1">
|
||||||
{files.map((f, i) => (
|
{files.map((f, i) => (
|
||||||
<li key={i} className="flex items-center justify-between bg-gray-50 rounded px-3 py-2 text-sm">
|
<li key={i} className="flex items-center justify-between bg-gray-50 px-3 py-2 text-sm">
|
||||||
<span className="truncate max-w-xs">{f.name}</span>
|
<span className="truncate max-w-xs">{f.name}</span>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { EvidenceGallery } from './evidence-gallery'
|
import { EvidenceGallery } from './evidence-gallery'
|
||||||
|
import { StatusTag } from '@/components/ui/status-tag'
|
||||||
|
|
||||||
const TYPE_LABELS: Record<string, string> = {
|
const TYPE_LABELS: Record<string, string> = {
|
||||||
injury: 'Injury / Medical',
|
injury: 'Injury / Medical',
|
||||||
@@ -11,15 +12,6 @@ const TYPE_LABELS: Record<string, string> = {
|
|||||||
transport: 'Transport / Vehicle',
|
transport: 'Transport / Vehicle',
|
||||||
}
|
}
|
||||||
|
|
||||||
const STATUS_COLORS: Record<string, string> = {
|
|
||||||
reported: 'bg-yellow-100 text-yellow-800',
|
|
||||||
triaged: 'bg-blue-100 text-blue-800',
|
|
||||||
investigating: 'bg-purple-100 text-purple-800',
|
|
||||||
capa_pending: 'bg-orange-100 text-orange-800',
|
|
||||||
verification: 'bg-indigo-100 text-indigo-800',
|
|
||||||
closed: 'bg-green-100 text-green-800',
|
|
||||||
}
|
|
||||||
|
|
||||||
const MEDICAL_LABELS: Record<string, string> = {
|
const MEDICAL_LABELS: Record<string, string> = {
|
||||||
none: 'None',
|
none: 'None',
|
||||||
first_aid: 'First Aid',
|
first_aid: 'First Aid',
|
||||||
@@ -72,7 +64,7 @@ export function IncidentDetail({ incident }: Props) {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="space-y-6">
|
<div className="space-y-6">
|
||||||
<div className="bg-white rounded-xl shadow-sm p-5">
|
<div className="bg-surface shadow-sm p-5">
|
||||||
<div className="flex items-start justify-between mb-4">
|
<div className="flex items-start justify-between mb-4">
|
||||||
<div>
|
<div>
|
||||||
<h1 className="text-xl font-bold text-gray-900 font-mono">
|
<h1 className="text-xl font-bold text-gray-900 font-mono">
|
||||||
@@ -80,9 +72,7 @@ export function IncidentDetail({ incident }: Props) {
|
|||||||
</h1>
|
</h1>
|
||||||
<p className="text-sm text-gray-600 mt-0.5">{TYPE_LABELS[incident.incident_type] ?? incident.incident_type}</p>
|
<p className="text-sm text-gray-600 mt-0.5">{TYPE_LABELS[incident.incident_type] ?? incident.incident_type}</p>
|
||||||
</div>
|
</div>
|
||||||
<span className={`text-xs px-2.5 py-1 rounded-full font-medium ${STATUS_COLORS[incident.status] ?? 'bg-gray-100'}`}>
|
<StatusTag status={incident.status}>{incident.status.replace(/_/g, ' ').toUpperCase()}</StatusTag>
|
||||||
{incident.status.replace(/_/g, ' ').toUpperCase()}
|
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<dl className="grid grid-cols-2 gap-4 sm:grid-cols-3">
|
<dl className="grid grid-cols-2 gap-4 sm:grid-cols-3">
|
||||||
@@ -114,12 +104,12 @@ export function IncidentDetail({ incident }: Props) {
|
|||||||
</dl>
|
</dl>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="bg-white rounded-xl shadow-sm p-5">
|
<div className="bg-surface shadow-sm p-5">
|
||||||
<h2 className="text-sm font-semibold text-gray-900 mb-2">Description</h2>
|
<h2 className="text-sm font-semibold text-gray-900 mb-2">Description</h2>
|
||||||
<p className="text-sm text-gray-800 leading-relaxed whitespace-pre-wrap">{incident.description}</p>
|
<p className="text-sm text-gray-800 leading-relaxed whitespace-pre-wrap">{incident.description}</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="bg-white rounded-xl shadow-sm p-5">
|
<div className="bg-surface shadow-sm p-5">
|
||||||
<h2 className="text-sm font-semibold text-gray-900 mb-3">
|
<h2 className="text-sm font-semibold text-gray-900 mb-3">
|
||||||
Evidence — Report Stage
|
Evidence — Report Stage
|
||||||
<span className="ml-2 text-gray-400 font-normal normal-case">
|
<span className="ml-2 text-gray-400 font-normal normal-case">
|
||||||
|
|||||||
@@ -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-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<select
|
|
||||||
value={searchParams.get('status') ?? ''}
|
|
||||||
onChange={e => updateParam('status', e.target.value)}
|
|
||||||
className="text-sm border border-gray-300 rounded-lg px-2 py-1.5 focus:outline-none focus:ring-2 focus:ring-blue-500 bg-white"
|
|
||||||
>
|
|
||||||
{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-gray-300 rounded-lg px-2 py-1.5 focus:outline-none focus:ring-2 focus:ring-blue-500 bg-white"
|
|
||||||
>
|
|
||||||
{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-gray-300 rounded-lg px-2 py-1.5 focus:outline-none focus:ring-2 focus:ring-blue-500 bg-white"
|
|
||||||
>
|
|
||||||
<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-gray-300 rounded-lg px-2 py-1.5 focus:outline-none focus:ring-2 focus:ring-blue-500 bg-white"
|
|
||||||
>
|
|
||||||
<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,6 +1,7 @@
|
|||||||
'use client'
|
'use client'
|
||||||
|
|
||||||
import Link from 'next/link'
|
import Link from 'next/link'
|
||||||
|
import { StatusTag } from '@/components/ui/status-tag'
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
incidentId: string
|
incidentId: string
|
||||||
@@ -12,15 +13,6 @@ interface Props {
|
|||||||
canAddCapa?: boolean
|
canAddCapa?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
const STATUS_COLORS: Record<string, string> = {
|
|
||||||
reported: 'bg-yellow-100 text-yellow-800',
|
|
||||||
triaged: 'bg-blue-100 text-blue-800',
|
|
||||||
investigating: 'bg-purple-100 text-purple-800',
|
|
||||||
capa_pending: 'bg-orange-100 text-orange-800',
|
|
||||||
verification: 'bg-indigo-100 text-indigo-800',
|
|
||||||
closed: 'bg-green-100 text-green-800',
|
|
||||||
}
|
|
||||||
|
|
||||||
const STATUS_LABELS: Record<string, string> = {
|
const STATUS_LABELS: Record<string, string> = {
|
||||||
reported: 'Reported',
|
reported: 'Reported',
|
||||||
triaged: 'Triaged',
|
triaged: 'Triaged',
|
||||||
@@ -35,7 +27,7 @@ export function IncidentHeader({
|
|||||||
canTriage, canInvestigate, canAddCapa,
|
canTriage, canInvestigate, canAddCapa,
|
||||||
}: Props) {
|
}: Props) {
|
||||||
return (
|
return (
|
||||||
<div className="sticky top-0 z-30 bg-white border-b border-gray-200 shadow-sm">
|
<div className="sticky top-0 z-30 bg-surface border-b border-divider shadow-sm">
|
||||||
<div className="max-w-3xl mx-auto px-4 py-3 flex items-center justify-between gap-4 flex-wrap">
|
<div className="max-w-3xl mx-auto px-4 py-3 flex items-center justify-between gap-4 flex-wrap">
|
||||||
<div className="flex items-center gap-3 min-w-0">
|
<div className="flex items-center gap-3 min-w-0">
|
||||||
<Link href={backHref} className="text-sm text-gray-500 hover:text-gray-700 shrink-0">
|
<Link href={backHref} className="text-sm text-gray-500 hover:text-gray-700 shrink-0">
|
||||||
@@ -45,15 +37,13 @@ export function IncidentHeader({
|
|||||||
<span className="text-sm font-mono font-semibold text-gray-900 truncate">
|
<span className="text-sm font-mono font-semibold text-gray-900 truncate">
|
||||||
{referenceNo ?? 'Pending'}
|
{referenceNo ?? 'Pending'}
|
||||||
</span>
|
</span>
|
||||||
<span className={`text-xs px-2 py-0.5 rounded-full font-medium shrink-0 ${STATUS_COLORS[status] ?? 'bg-gray-100 text-gray-800'}`}>
|
<span className="shrink-0"><StatusTag status={status}>{STATUS_LABELS[status] ?? status.replace(/_/g, ' ')}</StatusTag></span>
|
||||||
{STATUS_LABELS[status] ?? status.replace(/_/g, ' ')}
|
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
<div className="flex gap-2 shrink-0">
|
<div className="flex gap-2 shrink-0">
|
||||||
{canTriage && (
|
{canTriage && (
|
||||||
<Link
|
<Link
|
||||||
href={`/hse/incidents/${incidentId}/triage`}
|
href={`/hse/incidents/${incidentId}/triage`}
|
||||||
className="text-xs px-3 py-1.5 bg-blue-600 text-white rounded-lg font-medium hover:bg-blue-700"
|
className="text-xs px-3 py-1.5 bg-accent text-white font-medium hover:bg-accent-600"
|
||||||
>
|
>
|
||||||
Triage
|
Triage
|
||||||
</Link>
|
</Link>
|
||||||
@@ -61,7 +51,7 @@ export function IncidentHeader({
|
|||||||
{canInvestigate && (
|
{canInvestigate && (
|
||||||
<Link
|
<Link
|
||||||
href={`/hse/incidents/${incidentId}/investigation`}
|
href={`/hse/incidents/${incidentId}/investigation`}
|
||||||
className="text-xs px-3 py-1.5 bg-indigo-600 text-white rounded-lg font-medium hover:bg-indigo-700"
|
className="text-xs px-3 py-1.5 bg-accent text-white font-medium hover:bg-accent-600"
|
||||||
>
|
>
|
||||||
Investigate
|
Investigate
|
||||||
</Link>
|
</Link>
|
||||||
@@ -69,7 +59,7 @@ export function IncidentHeader({
|
|||||||
{canAddCapa && (
|
{canAddCapa && (
|
||||||
<Link
|
<Link
|
||||||
href={`/hse/incidents/${incidentId}/capa/new`}
|
href={`/hse/incidents/${incidentId}/capa/new`}
|
||||||
className="text-xs px-3 py-1.5 bg-amber-600 text-white rounded-lg font-medium hover:bg-amber-700"
|
className="text-xs px-3 py-1.5 bg-accent text-white font-medium hover:bg-accent-600"
|
||||||
>
|
>
|
||||||
Add CAPA
|
Add CAPA
|
||||||
</Link>
|
</Link>
|
||||||
|
|||||||
@@ -1,137 +0,0 @@
|
|||||||
'use client'
|
|
||||||
|
|
||||||
import { useState } from 'react'
|
|
||||||
import Link from 'next/link'
|
|
||||||
|
|
||||||
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_COLORS: Record<string, string> = {
|
|
||||||
reported: 'bg-yellow-100 text-yellow-800',
|
|
||||||
triaged: 'bg-blue-100 text-blue-800',
|
|
||||||
investigating: 'bg-purple-100 text-purple-800',
|
|
||||||
capa_pending: 'bg-orange-100 text-orange-800',
|
|
||||||
verification: 'bg-indigo-100 text-indigo-800',
|
|
||||||
closed: 'bg-green-100 text-green-800',
|
|
||||||
}
|
|
||||||
|
|
||||||
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-gray-300 rounded-lg px-3 py-2 text-sm w-48 focus:outline-none focus:ring-2 focus:ring-blue-500"
|
|
||||||
value={search}
|
|
||||||
onChange={e => setSearch(e.target.value)}
|
|
||||||
/>
|
|
||||||
<select
|
|
||||||
className="border border-gray-300 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
|
|
||||||
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-gray-300 rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
|
|
||||||
value={statusFilter}
|
|
||||||
onChange={e => setStatusFilter(e.target.value)}
|
|
||||||
>
|
|
||||||
<option value="">All statuses</option>
|
|
||||||
{Object.keys(STATUS_COLORS).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-gray-100 bg-white rounded-xl 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>
|
|
||||||
<span className={`text-xs px-2 py-0.5 rounded-full font-medium ${STATUS_COLORS[inc.status] ?? 'bg-gray-100 text-gray-700'}`}>
|
|
||||||
{inc.status.replace(/_/g, ' ').toUpperCase()}
|
|
||||||
</span>
|
|
||||||
</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>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -136,7 +136,7 @@ export function InvestigationForm({ incidentId, existingInvestigationId }: Props
|
|||||||
type="button"
|
type="button"
|
||||||
onClick={getAiDraft}
|
onClick={getAiDraft}
|
||||||
disabled={aiDraftLoading}
|
disabled={aiDraftLoading}
|
||||||
className="bg-purple-50 text-purple-700 border border-purple-300 rounded-lg px-3 py-1.5 text-xs font-semibold disabled:opacity-50 hover:bg-purple-100"
|
className="bg-accent-100 text-accent-700 border border-accent-300 px-3 py-1.5 text-xs font-semibold disabled:opacity-50 hover:bg-accent-200"
|
||||||
>
|
>
|
||||||
{aiDraftLoading ? 'Drafting…' : 'Get AI Draft'}
|
{aiDraftLoading ? 'Drafting…' : 'Get AI Draft'}
|
||||||
</button>
|
</button>
|
||||||
@@ -148,10 +148,10 @@ export function InvestigationForm({ incidentId, existingInvestigationId }: Props
|
|||||||
<button
|
<button
|
||||||
key={m} type="button"
|
key={m} type="button"
|
||||||
onClick={() => setMethod(m)}
|
onClick={() => setMethod(m)}
|
||||||
className={`px-3 py-1.5 rounded-lg text-sm font-medium border ${
|
className={`px-3 py-1.5 text-sm font-medium border ${
|
||||||
method === m
|
method === m
|
||||||
? 'bg-blue-600 text-white border-blue-600'
|
? 'bg-accent text-white border-accent'
|
||||||
: 'bg-white text-gray-700 border-gray-300 hover:border-blue-400'
|
: 'bg-surface text-gray-700 border-divider hover:border-accent'
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
{m === 'five_why' ? '5-Why' : m === 'fishbone' ? 'Fishbone' : 'Other'}
|
{m === 'five_why' ? '5-Why' : m === 'fishbone' ? 'Fishbone' : 'Other'}
|
||||||
@@ -164,25 +164,25 @@ export function InvestigationForm({ incidentId, existingInvestigationId }: Props
|
|||||||
<div className="space-y-3">
|
<div className="space-y-3">
|
||||||
<p className="text-sm font-medium text-gray-700">5-Why Analysis</p>
|
<p className="text-sm font-medium text-gray-700">5-Why Analysis</p>
|
||||||
{fiveWhy.map((step, i) => (
|
{fiveWhy.map((step, i) => (
|
||||||
<div key={i} className="border border-gray-200 rounded-lg p-3 space-y-2">
|
<div key={i} className="border border-divider p-3 space-y-2">
|
||||||
<label className="block text-xs text-gray-500">Why #{i + 1}</label>
|
<label className="block text-xs text-gray-500">Why #{i + 1}</label>
|
||||||
<input
|
<input
|
||||||
type="text" value={step.why}
|
type="text" value={step.why}
|
||||||
onChange={e => updateWhyStep(i, 'why', e.target.value)}
|
onChange={e => updateWhyStep(i, 'why', e.target.value)}
|
||||||
placeholder="Why did this happen?"
|
placeholder="Why did this happen?"
|
||||||
className="w-full rounded border border-gray-300 px-2 py-1.5 text-sm"
|
className="w-full border border-divider px-2 py-1.5 text-sm"
|
||||||
/>
|
/>
|
||||||
<textarea
|
<textarea
|
||||||
value={step.answer}
|
value={step.answer}
|
||||||
onChange={e => updateWhyStep(i, 'answer', e.target.value)}
|
onChange={e => updateWhyStep(i, 'answer', e.target.value)}
|
||||||
rows={2} placeholder="Answer / finding…"
|
rows={2} placeholder="Answer / finding…"
|
||||||
className="w-full rounded border border-gray-300 px-2 py-1.5 text-sm"
|
className="w-full border border-divider px-2 py-1.5 text-sm"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
{fiveWhy.length < 5 && (
|
{fiveWhy.length < 5 && (
|
||||||
<button type="button" onClick={addWhyStep}
|
<button type="button" onClick={addWhyStep}
|
||||||
className="text-sm text-blue-600 hover:underline">
|
className="text-sm text-accent-700 hover:underline">
|
||||||
+ Add another Why
|
+ Add another Why
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
@@ -193,7 +193,7 @@ export function InvestigationForm({ incidentId, existingInvestigationId }: Props
|
|||||||
<div className="space-y-3">
|
<div className="space-y-3">
|
||||||
<p className="text-sm font-medium text-gray-700">Fishbone (Ishikawa) Analysis</p>
|
<p className="text-sm font-medium text-gray-700">Fishbone (Ishikawa) Analysis</p>
|
||||||
{fishbone.map((cat, catIdx) => (
|
{fishbone.map((cat, catIdx) => (
|
||||||
<div key={cat.category} className="border border-gray-200 rounded-lg p-3">
|
<div key={cat.category} className="border border-divider p-3">
|
||||||
<p className="text-xs font-semibold text-gray-600 mb-2">{CATEGORY_LABELS[cat.category]}</p>
|
<p className="text-xs font-semibold text-gray-600 mb-2">{CATEGORY_LABELS[cat.category]}</p>
|
||||||
{cat.causes.map((cause, causeIdx) => (
|
{cat.causes.map((cause, causeIdx) => (
|
||||||
<input
|
<input
|
||||||
@@ -201,11 +201,11 @@ export function InvestigationForm({ incidentId, existingInvestigationId }: Props
|
|||||||
type="text" value={cause}
|
type="text" value={cause}
|
||||||
onChange={e => updateFishboneCause(catIdx, causeIdx, e.target.value)}
|
onChange={e => updateFishboneCause(catIdx, causeIdx, e.target.value)}
|
||||||
placeholder="Contributing cause…"
|
placeholder="Contributing cause…"
|
||||||
className="w-full rounded border border-gray-300 px-2 py-1.5 text-sm mb-1.5"
|
className="w-full border border-divider px-2 py-1.5 text-sm mb-1.5"
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
<button type="button" onClick={() => addFishboneCause(catIdx)}
|
<button type="button" onClick={() => addFishboneCause(catIdx)}
|
||||||
className="text-xs text-blue-600 hover:underline">
|
className="text-xs text-accent-700 hover:underline">
|
||||||
+ Add cause
|
+ Add cause
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -219,7 +219,7 @@ export function InvestigationForm({ incidentId, existingInvestigationId }: Props
|
|||||||
<select
|
<select
|
||||||
value={alcoholTest}
|
value={alcoholTest}
|
||||||
onChange={e => setAlcoholTest(e.target.value)}
|
onChange={e => setAlcoholTest(e.target.value)}
|
||||||
className="w-full rounded-lg border border-gray-300 px-3 py-2 text-sm"
|
className="w-full border border-divider px-3 py-2 text-sm"
|
||||||
>
|
>
|
||||||
<option value="">Not conducted</option>
|
<option value="">Not conducted</option>
|
||||||
<option value="negative">Negative</option>
|
<option value="negative">Negative</option>
|
||||||
@@ -233,7 +233,7 @@ export function InvestigationForm({ incidentId, existingInvestigationId }: Props
|
|||||||
<select
|
<select
|
||||||
value={urineTest}
|
value={urineTest}
|
||||||
onChange={e => setUrineTest(e.target.value)}
|
onChange={e => setUrineTest(e.target.value)}
|
||||||
className="w-full rounded-lg border border-gray-300 px-3 py-2 text-sm"
|
className="w-full border border-divider px-3 py-2 text-sm"
|
||||||
>
|
>
|
||||||
<option value="">Not conducted</option>
|
<option value="">Not conducted</option>
|
||||||
<option value="negative">Negative</option>
|
<option value="negative">Negative</option>
|
||||||
@@ -256,13 +256,13 @@ export function InvestigationForm({ incidentId, existingInvestigationId }: Props
|
|||||||
value={ref}
|
value={ref}
|
||||||
onChange={e => setWitnessRefs(witnessRefs.map((w, j) => (j === i ? e.target.value : w)))}
|
onChange={e => setWitnessRefs(witnessRefs.map((w, j) => (j === i ? e.target.value : w)))}
|
||||||
placeholder="e.g. Ali bin Ahmad — statement dated 12/07/2026"
|
placeholder="e.g. Ali bin Ahmad — statement dated 12/07/2026"
|
||||||
className="w-full rounded border border-gray-300 px-2 py-1.5 text-sm mb-1.5"
|
className="w-full border border-divider px-2 py-1.5 text-sm mb-1.5"
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => setWitnessRefs([...witnessRefs, ''])}
|
onClick={() => setWitnessRefs([...witnessRefs, ''])}
|
||||||
className="text-xs text-blue-600 hover:underline"
|
className="text-xs text-accent-700 hover:underline"
|
||||||
>
|
>
|
||||||
+ Add witness statement
|
+ Add witness statement
|
||||||
</button>
|
</button>
|
||||||
@@ -274,7 +274,7 @@ export function InvestigationForm({ incidentId, existingInvestigationId }: Props
|
|||||||
value={findingsText}
|
value={findingsText}
|
||||||
onChange={e => setFindingsText(e.target.value)}
|
onChange={e => setFindingsText(e.target.value)}
|
||||||
rows={3}
|
rows={3}
|
||||||
className="w-full rounded-lg border border-gray-300 px-3 py-2 text-sm"
|
className="w-full border border-divider px-3 py-2 text-sm"
|
||||||
placeholder="Describe the sequence of events and contributing factors…"
|
placeholder="Describe the sequence of events and contributing factors…"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -285,7 +285,7 @@ export function InvestigationForm({ incidentId, existingInvestigationId }: Props
|
|||||||
value={rootCause}
|
value={rootCause}
|
||||||
onChange={e => setRootCause(e.target.value)}
|
onChange={e => setRootCause(e.target.value)}
|
||||||
rows={2}
|
rows={2}
|
||||||
className="w-full rounded-lg border border-gray-300 px-3 py-2 text-sm"
|
className="w-full border border-divider px-3 py-2 text-sm"
|
||||||
placeholder="One-sentence root cause statement…"
|
placeholder="One-sentence root cause statement…"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -293,7 +293,7 @@ export function InvestigationForm({ incidentId, existingInvestigationId }: Props
|
|||||||
{!existingInvestigationId && (
|
{!existingInvestigationId && (
|
||||||
<label className="flex items-center gap-2 text-sm text-gray-700">
|
<label className="flex items-center gap-2 text-sm text-gray-700">
|
||||||
<input type="checkbox" checked={complete} onChange={e => setComplete(e.target.checked)}
|
<input type="checkbox" checked={complete} onChange={e => setComplete(e.target.checked)}
|
||||||
className="rounded border-gray-300 text-blue-600" />
|
className="border-divider text-accent-700" />
|
||||||
Mark investigation complete (transitions incident to CAPA Pending)
|
Mark investigation complete (transitions incident to CAPA Pending)
|
||||||
</label>
|
</label>
|
||||||
)}
|
)}
|
||||||
@@ -301,7 +301,7 @@ export function InvestigationForm({ incidentId, existingInvestigationId }: Props
|
|||||||
{error && <p className="text-sm text-red-600">{error}</p>}
|
{error && <p className="text-sm text-red-600">{error}</p>}
|
||||||
|
|
||||||
<button type="submit" disabled={saving}
|
<button type="submit" disabled={saving}
|
||||||
className="w-full bg-indigo-600 text-white rounded-lg py-2 text-sm font-semibold disabled:opacity-50">
|
className="w-full bg-accent text-white py-2 text-sm font-semibold disabled:opacity-50">
|
||||||
{saving ? 'Saving…' : existingInvestigationId ? 'Update Investigation' : 'Start Investigation'}
|
{saving ? 'Saving…' : existingInvestigationId ? 'Update Investigation' : 'Start Investigation'}
|
||||||
</button>
|
</button>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
@@ -35,15 +35,15 @@ export function InvestigationPanel({ investigation: inv }: Props) {
|
|||||||
const investigatorName = inv.investigator?.name ?? inv.investigator?.email ?? 'Unknown'
|
const investigatorName = inv.investigator?.name ?? inv.investigator?.email ?? 'Unknown'
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="mt-6 bg-white rounded-xl shadow-sm border border-gray-200 overflow-hidden">
|
<div className="mt-6 bg-surface shadow-sm border border-divider overflow-hidden">
|
||||||
<div className="flex items-center justify-between px-5 py-4 border-b border-gray-100">
|
<div className="flex items-center justify-between px-5 py-4 border-b border-divider">
|
||||||
<h2 className="text-sm font-semibold text-gray-900">Investigation</h2>
|
<h2 className="text-sm font-semibold text-gray-900">Investigation</h2>
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
<span className="text-xs text-gray-500">{METHOD_LABELS[inv.method] ?? inv.method}</span>
|
<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 rounded-full ${
|
<span className={`text-xs font-medium px-2 py-0.5 ${
|
||||||
inv.completed_at
|
inv.completed_at
|
||||||
? 'bg-green-100 text-green-700'
|
? 'bg-st-green-bg text-st-green-fg'
|
||||||
: 'bg-yellow-100 text-yellow-700'
|
: 'bg-st-blue-bg text-st-blue-fg'
|
||||||
}`}>
|
}`}>
|
||||||
{inv.completed_at ? 'Completed' : 'In Progress'}
|
{inv.completed_at ? 'Completed' : 'In Progress'}
|
||||||
</span>
|
</span>
|
||||||
@@ -67,7 +67,7 @@ export function InvestigationPanel({ investigation: inv }: Props) {
|
|||||||
<ol className="space-y-3">
|
<ol className="space-y-3">
|
||||||
{inv.five_why_steps.map((step, i) => (
|
{inv.five_why_steps.map((step, i) => (
|
||||||
<li key={i} className="flex gap-3">
|
<li key={i} className="flex gap-3">
|
||||||
<span className="flex-shrink-0 w-6 h-6 rounded-full bg-blue-100 text-blue-700 text-xs font-bold flex items-center justify-center">
|
<span className="flex-shrink-0 w-6 h-6 bg-accent-100 text-accent-700 text-xs font-bold flex items-center justify-center">
|
||||||
{i + 1}
|
{i + 1}
|
||||||
</span>
|
</span>
|
||||||
<div className="flex-1 min-w-0">
|
<div className="flex-1 min-w-0">
|
||||||
@@ -107,7 +107,7 @@ export function InvestigationPanel({ investigation: inv }: Props) {
|
|||||||
|
|
||||||
{/* Root cause */}
|
{/* Root cause */}
|
||||||
{inv.root_cause_summary && (
|
{inv.root_cause_summary && (
|
||||||
<div className="bg-red-50 border border-red-100 rounded-lg px-4 py-3">
|
<div className="bg-red-50 border border-red-100 px-4 py-3">
|
||||||
<h3 className="text-xs font-semibold text-red-600 uppercase tracking-wide mb-1">Root Cause</h3>
|
<h3 className="text-xs font-semibold text-red-600 uppercase tracking-wide mb-1">Root Cause</h3>
|
||||||
<p className="text-sm text-gray-900 whitespace-pre-wrap">{inv.root_cause_summary}</p>
|
<p className="text-sm text-gray-900 whitespace-pre-wrap">{inv.root_cause_summary}</p>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -56,15 +56,15 @@ export function OfflineSync() {
|
|||||||
if (pendingCount === 0) return null
|
if (pendingCount === 0) return null
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="fixed bottom-4 left-4 right-4 bg-yellow-50 border border-yellow-300 rounded-lg p-3 flex items-center justify-between shadow-md z-50">
|
<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-yellow-800 font-medium">
|
<span className="text-sm text-st-amber-fg font-medium">
|
||||||
{pendingCount} report{pendingCount > 1 ? 's' : ''} saved offline
|
{pendingCount} report{pendingCount > 1 ? 's' : ''} saved offline
|
||||||
</span>
|
</span>
|
||||||
<button
|
<button
|
||||||
onClick={syncNow}
|
onClick={syncNow}
|
||||||
disabled={syncing || !navigator.onLine}
|
disabled={syncing || !navigator.onLine}
|
||||||
className="text-xs bg-yellow-600 text-white px-3 py-1.5 rounded font-medium
|
className="text-xs bg-accent text-white px-3 py-1.5 font-medium
|
||||||
hover:bg-yellow-700 disabled:opacity-50 disabled:cursor-not-allowed transition-colors"
|
hover:bg-accent-600 disabled:opacity-50 disabled:cursor-not-allowed transition-colors"
|
||||||
>
|
>
|
||||||
{syncing ? 'Syncing…' : 'Sync now'}
|
{syncing ? 'Syncing…' : 'Sync now'}
|
||||||
</button>
|
</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-blue-600 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 { FileUpload } from '@/components/incidents/file-upload'
|
||||||
import type { IncidentType, MedicalStatus } from '@/lib/incidents/validate'
|
import type { IncidentType, MedicalStatus } from '@/lib/incidents/validate'
|
||||||
import { useTranslations } from '@/lib/i18n/context'
|
import { useTranslations } from '@/lib/i18n/context'
|
||||||
|
import { zonesForSite, resolveZoneToken, type SiteOption } from '@/lib/report/zones'
|
||||||
|
import { siteForTruck } from '@/lib/report/trucks'
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
zoneToken: string | null
|
zoneToken: string | null
|
||||||
zoneName: string | null
|
zoneName: string | null
|
||||||
siteName: 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
|
initialTruckId?: string | null
|
||||||
}
|
}
|
||||||
|
|
||||||
export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
export function ReportForm({ zoneToken, sites, defaultSiteId, trucks, initialTruckId }: Props) {
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const t = useTranslations('ReportForm')
|
const t = useTranslations('ReportForm')
|
||||||
const itLabels = useTranslations('IncidentType')
|
const itLabels = useTranslations('IncidentType')
|
||||||
@@ -52,6 +56,15 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
|||||||
} | null>(null)
|
} | null>(null)
|
||||||
const [overrideQuality, setOverrideQuality] = useState(false)
|
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({
|
const [form, setForm] = useState({
|
||||||
incident_type: (initialTruckId ? 'transport' : '') as IncidentType | '',
|
incident_type: (initialTruckId ? 'transport' : '') as IncidentType | '',
|
||||||
description: '',
|
description: '',
|
||||||
@@ -73,7 +86,7 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
|||||||
value={(typeDetails[key] as string) ?? ''}
|
value={(typeDetails[key] as string) ?? ''}
|
||||||
onChange={e => setDetail(key, e.target.value)}
|
onChange={e => setDetail(key, e.target.value)}
|
||||||
placeholder={placeholder}
|
placeholder={placeholder}
|
||||||
className="w-full border border-gray-300 rounded-lg px-3 py-2.5 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
|
className="w-full border border-divider px-3 py-2.5 text-sm focus:outline-none focus:ring-2 focus:ring-accent"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
@@ -82,7 +95,7 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
|||||||
<label className="flex items-center gap-3 cursor-pointer">
|
<label className="flex items-center gap-3 cursor-pointer">
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
className="w-4 h-4 text-blue-600"
|
className="w-4 h-4 text-accent-700"
|
||||||
checked={Boolean(typeDetails[key])}
|
checked={Boolean(typeDetails[key])}
|
||||||
onChange={e => setDetail(key, e.target.checked)}
|
onChange={e => setDetail(key, e.target.checked)}
|
||||||
/>
|
/>
|
||||||
@@ -113,7 +126,7 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
|||||||
try {
|
try {
|
||||||
const { addPendingReport } = await import('@/lib/offline/db')
|
const { addPendingReport } = await import('@/lib/offline/db')
|
||||||
await addPendingReport({
|
await addPendingReport({
|
||||||
zone_token: zoneToken ?? '',
|
zone_token: effectiveZoneToken ?? '',
|
||||||
incident_type: form.incident_type as IncidentType,
|
incident_type: form.incident_type as IncidentType,
|
||||||
description: form.description,
|
description: form.description,
|
||||||
injury_involved: form.injury_involved,
|
injury_involved: form.injury_involved,
|
||||||
@@ -162,7 +175,7 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const fd = new FormData()
|
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('incident_type', form.incident_type)
|
||||||
fd.append('description', form.description)
|
fd.append('description', form.description)
|
||||||
fd.append('injury_involved', String(form.injury_involved))
|
fd.append('injury_involved', String(form.injury_involved))
|
||||||
@@ -205,33 +218,67 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
|||||||
|
|
||||||
if (savedOffline) {
|
if (savedOffline) {
|
||||||
return (
|
return (
|
||||||
<div className="bg-green-50 border border-green-200 rounded-xl p-5 text-sm text-green-700">
|
<div className="bg-neutral-100 border border-divider p-5 text-sm text-ink">
|
||||||
{t.savedOffline}
|
{t.savedOffline}
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<form onSubmit={handleSubmit} className="space-y-5 bg-white rounded-xl shadow-sm p-5">
|
<form onSubmit={handleSubmit} className="space-y-5 bg-surface shadow-sm p-5">
|
||||||
{!isOnline && (
|
{!isOnline && (
|
||||||
<div className="bg-yellow-50 border border-yellow-200 rounded p-3 text-sm text-yellow-700">
|
<div className="bg-st-amber-bg rounded-md p-3 text-sm text-st-amber-fg">
|
||||||
{t.offlineBanner}
|
{t.offlineBanner}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{error && (
|
{error && (
|
||||||
<div className="bg-red-50 border border-red-200 rounded p-3 text-sm text-red-700">
|
<div className="bg-red-50 border border-red-200 p-3 text-sm text-red-700">
|
||||||
{error}
|
{error}
|
||||||
</div>
|
</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>
|
<div>
|
||||||
<label className="block text-sm font-medium text-gray-700 mb-1">
|
<label className="block text-sm font-medium text-gray-700 mb-1">
|
||||||
{t.incidentTypeLabel} <span className="text-red-500">*</span>
|
{t.incidentTypeLabel} <span className="text-red-500">*</span>
|
||||||
</label>
|
</label>
|
||||||
<select
|
<select
|
||||||
required
|
required
|
||||||
className="w-full border border-gray-300 rounded-lg px-3 py-2.5 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
|
className="w-full border border-divider px-3 py-2.5 text-sm focus:outline-none focus:ring-2 focus:ring-accent"
|
||||||
value={form.incident_type}
|
value={form.incident_type}
|
||||||
onChange={e => {
|
onChange={e => {
|
||||||
setForm(f => ({ ...f, incident_type: e.target.value as IncidentType, truck_id: '' }))
|
setForm(f => ({ ...f, incident_type: e.target.value as IncidentType, truck_id: '' }))
|
||||||
@@ -246,26 +293,26 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{form.incident_type === 'environmental' && (
|
{form.incident_type === 'environmental' && (
|
||||||
<div className="space-y-3 border border-gray-200 rounded-lg p-3">
|
<div className="space-y-3 border border-divider p-3">
|
||||||
{detailText('substance', tdLabels.substance, tdLabels.substancePlaceholder)}
|
{detailText('substance', tdLabels.substance, tdLabels.substancePlaceholder)}
|
||||||
{detailText('estimated_volume', tdLabels.estimatedVolume, tdLabels.estimatedVolumePlaceholder)}
|
{detailText('estimated_volume', tdLabels.estimatedVolume, tdLabels.estimatedVolumePlaceholder)}
|
||||||
{detailCheckbox('containment_deployed', tdLabels.containmentDeployed)}
|
{detailCheckbox('containment_deployed', tdLabels.containmentDeployed)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{form.incident_type === 'asset_damage' && (
|
{form.incident_type === 'asset_damage' && (
|
||||||
<div className="space-y-3 border border-gray-200 rounded-lg p-3">
|
<div className="space-y-3 border border-divider p-3">
|
||||||
{detailText('equipment_id', tdLabels.equipmentId, tdLabels.equipmentIdPlaceholder)}
|
{detailText('equipment_id', tdLabels.equipmentId, tdLabels.equipmentIdPlaceholder)}
|
||||||
{detailCheckbox('loto_applied', tdLabels.lotoApplied)}
|
{detailCheckbox('loto_applied', tdLabels.lotoApplied)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{form.incident_type === 'security' && (
|
{form.incident_type === 'security' && (
|
||||||
<div className="space-y-3 border border-gray-200 rounded-lg p-3">
|
<div className="space-y-3 border border-divider p-3">
|
||||||
{detailText('persons_involved', tdLabels.personsInvolved, tdLabels.personsInvolvedPlaceholder)}
|
{detailText('persons_involved', tdLabels.personsInvolved, tdLabels.personsInvolvedPlaceholder)}
|
||||||
{detailCheckbox('police_reported', tdLabels.policeReported)}
|
{detailCheckbox('police_reported', tdLabels.policeReported)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{form.incident_type === 'fire' && (
|
{form.incident_type === 'fire' && (
|
||||||
<div className="space-y-3 border border-gray-200 rounded-lg p-3">
|
<div className="space-y-3 border border-divider p-3">
|
||||||
{detailCheckbox('alarm_raised', tdLabels.alarmRaised)}
|
{detailCheckbox('alarm_raised', tdLabels.alarmRaised)}
|
||||||
{detailCheckbox('fire_brigade_called', tdLabels.fireBrigadeCalled)}
|
{detailCheckbox('fire_brigade_called', tdLabels.fireBrigadeCalled)}
|
||||||
</div>
|
</div>
|
||||||
@@ -278,7 +325,7 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
|||||||
</label>
|
</label>
|
||||||
<select
|
<select
|
||||||
required
|
required
|
||||||
className="w-full border border-gray-300 rounded-lg px-3 py-2.5 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
|
className="w-full border border-divider px-3 py-2.5 text-sm focus:outline-none focus:ring-2 focus:ring-accent"
|
||||||
value={form.truck_id}
|
value={form.truck_id}
|
||||||
onChange={e => setForm(f => ({ ...f, truck_id: e.target.value }))}
|
onChange={e => setForm(f => ({ ...f, truck_id: e.target.value }))}
|
||||||
>
|
>
|
||||||
@@ -301,31 +348,31 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
|||||||
minLength={10}
|
minLength={10}
|
||||||
rows={4}
|
rows={4}
|
||||||
placeholder={t.descriptionPlaceholder}
|
placeholder={t.descriptionPlaceholder}
|
||||||
className="w-full border border-gray-300 rounded-lg px-3 py-2.5 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500 resize-none"
|
className="w-full border border-divider px-3 py-2.5 text-sm focus:outline-none focus:ring-2 focus:ring-accent resize-none"
|
||||||
value={form.description}
|
value={form.description}
|
||||||
onChange={e => setForm(f => ({ ...f, description: e.target.value }))}
|
onChange={e => setForm(f => ({ ...f, description: e.target.value }))}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{qualityCheck && !qualityCheck.passes && (
|
{qualityCheck && !qualityCheck.passes && (
|
||||||
<div className="rounded-lg bg-amber-50 border border-amber-200 p-3 space-y-2">
|
<div className="bg-st-amber-bg rounded-md p-3 space-y-2">
|
||||||
<p className="text-xs font-semibold text-amber-700 uppercase tracking-wide">
|
<p className="text-xs font-semibold text-st-amber-fg uppercase tracking-wide">
|
||||||
{t.qualityScoreLabel.replace('{score}', String(qualityCheck.score))}
|
{t.qualityScoreLabel.replace('{score}', String(qualityCheck.score))}
|
||||||
</p>
|
</p>
|
||||||
<p className="text-sm text-amber-800">{qualityCheck.feedback}</p>
|
<p className="text-sm text-st-amber-fg">{qualityCheck.feedback}</p>
|
||||||
{qualityCheck.suggestions.length > 0 && (
|
{qualityCheck.suggestions.length > 0 && (
|
||||||
<ul className="list-disc list-inside space-y-1">
|
<ul className="list-disc list-inside space-y-1">
|
||||||
{qualityCheck.suggestions.map((s, i) => (
|
{qualityCheck.suggestions.map((s, i) => (
|
||||||
<li key={i} className="text-xs text-amber-700">{s}</li>
|
<li key={i} className="text-xs text-st-amber-fg">{s}</li>
|
||||||
))}
|
))}
|
||||||
</ul>
|
</ul>
|
||||||
)}
|
)}
|
||||||
<label className="flex items-center gap-2 text-xs text-amber-700 cursor-pointer mt-1">
|
<label className="flex items-center gap-2 text-xs text-accent-700 cursor-pointer mt-1">
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
checked={overrideQuality}
|
checked={overrideQuality}
|
||||||
onChange={e => setOverrideQuality(e.target.checked)}
|
onChange={e => setOverrideQuality(e.target.checked)}
|
||||||
className="rounded border-amber-300 text-amber-600"
|
className="border-accent-300 text-accent-700"
|
||||||
/>
|
/>
|
||||||
{t.submitAnyway}
|
{t.submitAnyway}
|
||||||
</label>
|
</label>
|
||||||
@@ -336,7 +383,7 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
|||||||
<label className="flex items-center gap-3 cursor-pointer">
|
<label className="flex items-center gap-3 cursor-pointer">
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
className="w-4 h-4 text-blue-600"
|
className="w-4 h-4 text-accent-700"
|
||||||
checked={form.injury_involved}
|
checked={form.injury_involved}
|
||||||
onChange={e => setForm(f => ({ ...f, injury_involved: e.target.checked, medical_status: '' }))}
|
onChange={e => setForm(f => ({ ...f, injury_involved: e.target.checked, medical_status: '' }))}
|
||||||
/>
|
/>
|
||||||
@@ -350,7 +397,7 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
|||||||
</label>
|
</label>
|
||||||
<select
|
<select
|
||||||
required={form.injury_involved}
|
required={form.injury_involved}
|
||||||
className="w-full border border-gray-300 rounded-lg px-3 py-2.5 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
|
className="w-full border border-divider px-3 py-2.5 text-sm focus:outline-none focus:ring-2 focus:ring-accent"
|
||||||
value={form.medical_status}
|
value={form.medical_status}
|
||||||
onChange={e => setForm(f => ({ ...f, medical_status: e.target.value as MedicalStatus }))}
|
onChange={e => setForm(f => ({ ...f, medical_status: e.target.value as MedicalStatus }))}
|
||||||
>
|
>
|
||||||
@@ -365,7 +412,7 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
|||||||
<label className="flex items-center gap-3 cursor-pointer">
|
<label className="flex items-center gap-3 cursor-pointer">
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
className="w-4 h-4 text-blue-600"
|
className="w-4 h-4 text-accent-700"
|
||||||
checked={form.asset_involved}
|
checked={form.asset_involved}
|
||||||
onChange={e => setForm(f => ({ ...f, asset_involved: e.target.checked }))}
|
onChange={e => setForm(f => ({ ...f, asset_involved: e.target.checked }))}
|
||||||
/>
|
/>
|
||||||
@@ -382,9 +429,9 @@ export function ReportForm({ zoneToken, trucks, initialTruckId }: Props) {
|
|||||||
|
|
||||||
<button
|
<button
|
||||||
type="submit"
|
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-blue-600 text-white py-3 rounded-lg font-medium text-sm
|
className="w-full bg-accent text-white py-3 font-medium text-sm
|
||||||
hover:bg-blue-700 disabled:opacity-50 disabled:cursor-not-allowed transition-colors"
|
hover:bg-accent-600 disabled:opacity-50 disabled:cursor-not-allowed transition-colors"
|
||||||
>
|
>
|
||||||
{submitting ? t.submitting : t.submitButton}
|
{submitting ? t.submitting : t.submitButton}
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ export function SimilarIncidentsPanel({ incidentId }: Props) {
|
|||||||
|
|
||||||
if (loading) {
|
if (loading) {
|
||||||
return (
|
return (
|
||||||
<div className="mt-6 bg-white rounded-xl shadow-sm p-5">
|
<div className="mt-6 bg-surface shadow-sm p-5">
|
||||||
<p className="text-sm text-gray-400">Loading similar incidents…</p>
|
<p className="text-sm text-gray-400">Loading similar incidents…</p>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
@@ -51,7 +51,7 @@ export function SimilarIncidentsPanel({ incidentId }: Props) {
|
|||||||
if (error || similar.length === 0) return null
|
if (error || similar.length === 0) return null
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="mt-6 bg-white rounded-xl shadow-sm p-5">
|
<div className="mt-6 bg-surface shadow-sm p-5">
|
||||||
<h2 className="text-sm font-semibold text-gray-700 uppercase tracking-wide mb-3">
|
<h2 className="text-sm font-semibold text-gray-700 uppercase tracking-wide mb-3">
|
||||||
Similar Past Incidents
|
Similar Past Incidents
|
||||||
</h2>
|
</h2>
|
||||||
@@ -60,7 +60,7 @@ export function SimilarIncidentsPanel({ incidentId }: Props) {
|
|||||||
<a
|
<a
|
||||||
key={inc.id}
|
key={inc.id}
|
||||||
href={`/hse/incidents/${inc.id}`}
|
href={`/hse/incidents/${inc.id}`}
|
||||||
className="block border border-gray-200 rounded-lg p-3 hover:border-blue-300 hover:bg-blue-50 transition-colors"
|
className="block border border-divider p-3 hover:border-accent hover:bg-neutral-100 transition-colors"
|
||||||
>
|
>
|
||||||
<div className="flex items-center justify-between mb-1">
|
<div className="flex items-center justify-between mb-1">
|
||||||
<span className="text-xs font-medium text-gray-500">
|
<span className="text-xs font-medium text-gray-500">
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ export function TriageForm({ incidentId, currentSeverity }: Props) {
|
|||||||
<form onSubmit={handleSubmit} className="space-y-6">
|
<form onSubmit={handleSubmit} className="space-y-6">
|
||||||
<div>
|
<div>
|
||||||
<label className="block text-sm font-medium text-gray-700 mb-2">Severity</label>
|
<label className="block text-sm font-medium text-gray-700 mb-2">Severity</label>
|
||||||
<div className="flex rounded-lg border border-gray-300 overflow-hidden divide-x divide-gray-300">
|
<div className="flex border border-divider overflow-hidden divide-x divide-divider">
|
||||||
{([1, 2, 3, 4, 5] as const).map(v => (
|
{([1, 2, 3, 4, 5] as const).map(v => (
|
||||||
<button
|
<button
|
||||||
key={v}
|
key={v}
|
||||||
@@ -103,8 +103,8 @@ export function TriageForm({ incidentId, currentSeverity }: Props) {
|
|||||||
onClick={() => setSeverity(v)}
|
onClick={() => setSeverity(v)}
|
||||||
className={`flex-1 py-2 text-xs font-medium transition-colors ${
|
className={`flex-1 py-2 text-xs font-medium transition-colors ${
|
||||||
severity === v
|
severity === v
|
||||||
? 'bg-blue-600 text-white border-blue-600'
|
? 'bg-accent text-white border-accent'
|
||||||
: 'bg-white text-gray-700 hover:bg-gray-50'
|
: 'bg-surface text-gray-700 hover:bg-gray-50'
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
<span className="block font-bold">{v}</span>
|
<span className="block font-bold">{v}</span>
|
||||||
@@ -126,7 +126,7 @@ export function TriageForm({ incidentId, currentSeverity }: Props) {
|
|||||||
<input
|
<input
|
||||||
type="checkbox" checked={value}
|
type="checkbox" checked={value}
|
||||||
onChange={e => set(e.target.checked)}
|
onChange={e => set(e.target.checked)}
|
||||||
className="rounded border-gray-300 text-blue-600"
|
className="border-divider text-accent-700"
|
||||||
/>
|
/>
|
||||||
{label}
|
{label}
|
||||||
</label>
|
</label>
|
||||||
@@ -134,7 +134,7 @@ export function TriageForm({ incidentId, currentSeverity }: Props) {
|
|||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
{dosh.reasons.length > 0 && (
|
{dosh.reasons.length > 0 && (
|
||||||
<div className="rounded-lg bg-red-50 border border-red-200 p-3 space-y-1">
|
<div className="bg-red-50 border border-red-200 p-3 space-y-1">
|
||||||
<p className="text-xs font-semibold text-red-700 uppercase tracking-wide">DOSH Reporting Required</p>
|
<p className="text-xs font-semibold text-red-700 uppercase tracking-wide">DOSH Reporting Required</p>
|
||||||
{dosh.reasons.map(r => (
|
{dosh.reasons.map(r => (
|
||||||
<p key={r} className="text-xs text-red-600">{r}</p>
|
<p key={r} className="text-xs text-red-600">{r}</p>
|
||||||
@@ -151,16 +151,16 @@ export function TriageForm({ incidentId, currentSeverity }: Props) {
|
|||||||
value={triageNotes}
|
value={triageNotes}
|
||||||
onChange={e => setTriageNotes(e.target.value)}
|
onChange={e => setTriageNotes(e.target.value)}
|
||||||
rows={3}
|
rows={3}
|
||||||
className="w-full rounded-lg border border-gray-300 px-3 py-2 text-sm focus:ring-2 focus:ring-blue-500 focus:border-transparent"
|
className="w-full border border-divider px-3 py-2 text-sm focus:ring-2 focus:ring-accent focus:border-transparent"
|
||||||
placeholder="Initial assessment, immediate actions taken..."
|
placeholder="Initial assessment, immediate actions taken..."
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{aiRationale && (
|
{aiRationale && (
|
||||||
<div className="rounded-lg bg-purple-50 border border-purple-200 p-3">
|
<div className="bg-accent-tint rounded-md p-3">
|
||||||
<p className="text-xs font-semibold text-purple-700 mb-1">AI Suggestion Rationale</p>
|
<p className="text-xs font-semibold text-accent-700 mb-1">AI Suggestion Rationale</p>
|
||||||
<p className="text-xs text-purple-600">{aiRationale}</p>
|
<p className="text-xs text-accent-700">{aiRationale}</p>
|
||||||
<p className="text-xs text-purple-400 mt-1">Fields pre-filled — review before submitting.</p>
|
<p className="text-xs text-accent-400 mt-1">Fields pre-filled — review before submitting.</p>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
@@ -171,14 +171,14 @@ export function TriageForm({ incidentId, currentSeverity }: Props) {
|
|||||||
type="button"
|
type="button"
|
||||||
onClick={getAiSuggestion}
|
onClick={getAiSuggestion}
|
||||||
disabled={aiLoading || saving}
|
disabled={aiLoading || saving}
|
||||||
className="flex-1 bg-purple-50 text-purple-700 border border-purple-300 rounded-lg py-2 text-sm font-semibold disabled:opacity-50 hover:bg-purple-100"
|
className="flex-1 bg-accent-100 text-accent-700 border border-accent-300 py-2 text-sm font-semibold disabled:opacity-50 hover:bg-accent-200"
|
||||||
>
|
>
|
||||||
{aiLoading ? 'Getting suggestion…' : 'Get AI Suggestion'}
|
{aiLoading ? 'Getting suggestion…' : 'Get AI Suggestion'}
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
type="submit"
|
type="submit"
|
||||||
disabled={saving}
|
disabled={saving}
|
||||||
className="flex-1 bg-blue-600 text-white rounded-lg py-2 text-sm font-semibold disabled:opacity-50"
|
className="flex-1 bg-accent text-white py-2 text-sm font-semibold disabled:opacity-50"
|
||||||
>
|
>
|
||||||
{saving ? 'Saving…' : 'Complete Triage'}
|
{saving ? 'Saving…' : 'Complete Triage'}
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ export function LanguageSwitcher() {
|
|||||||
value={current}
|
value={current}
|
||||||
onChange={e => handleChange(e.target.value)}
|
onChange={e => handleChange(e.target.value)}
|
||||||
aria-label="Select language"
|
aria-label="Select language"
|
||||||
className="text-xs border border-gray-300 rounded px-2 py-1 bg-white text-gray-700 focus:outline-none focus:ring-1 focus:ring-blue-500"
|
className="text-xs border border-divider px-2 py-1 bg-surface text-gray-700 focus:outline-none focus:ring-1 focus:ring-accent"
|
||||||
>
|
>
|
||||||
{Object.entries(LOCALES).map(([code, label]) => (
|
{Object.entries(LOCALES).map(([code, label]) => (
|
||||||
<option key={code} value={code}>{label}</option>
|
<option key={code} value={code}>{label}</option>
|
||||||
|
|||||||
@@ -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,234 +0,0 @@
|
|||||||
'use client'
|
|
||||||
|
|
||||||
import Link from 'next/link'
|
|
||||||
import { usePathname, useRouter } from 'next/navigation'
|
|
||||||
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 = () => (
|
|
||||||
<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M4 6h16M4 12h16M4 18h7" />
|
|
||||||
</svg>
|
|
||||||
)
|
|
||||||
const IconList = () => (
|
|
||||||
<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2" />
|
|
||||||
</svg>
|
|
||||||
)
|
|
||||||
const IconCheck = () => (
|
|
||||||
<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" />
|
|
||||||
</svg>
|
|
||||||
)
|
|
||||||
const IconChart = () => (
|
|
||||||
<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M9 19v-6a2 2 0 00-2-2H5a2 2 0 00-2 2v6a2 2 0 002 2h2a2 2 0 002-2zm0 0V9a2 2 0 012-2h2a2 2 0 012 2v10m-6 0a2 2 0 002 2h2a2 2 0 002-2m0 0V5a2 2 0 012-2h2a2 2 0 012 2v14a2 2 0 01-2 2h-2a2 2 0 01-2-2z" />
|
|
||||||
</svg>
|
|
||||||
)
|
|
||||||
const IconSettings = () => (
|
|
||||||
<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z" />
|
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
|
|
||||||
</svg>
|
|
||||||
)
|
|
||||||
const IconUsers = () => (
|
|
||||||
<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M12 4.354a4 4 0 110 5.292M15 21H3v-1a6 6 0 0112 0v1zm0 0h6v-1a6 6 0 00-9-5.197M13 7a4 4 0 11-8 0 4 4 0 018 0z" />
|
|
||||||
</svg>
|
|
||||||
)
|
|
||||||
const IconPlus = () => (
|
|
||||||
<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M12 4v16m8-8H4" />
|
|
||||||
</svg>
|
|
||||||
)
|
|
||||||
const IconLogout = () => (
|
|
||||||
<svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1" />
|
|
||||||
</svg>
|
|
||||||
)
|
|
||||||
const IconUser = () => (
|
|
||||||
<svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z" />
|
|
||||||
</svg>
|
|
||||||
)
|
|
||||||
|
|
||||||
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 /> },
|
|
||||||
],
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
||||||
function NavLink({ item, pathname }: { item: NavItem; pathname: string }) {
|
|
||||||
// Exact match for root-level single-page roles, prefix match otherwise
|
|
||||||
const exactRoots = ['/reporter', '/supervisor', '/management', '/capa-owner', '/admin', '/report', '/account']
|
|
||||||
const isActive = exactRoots.includes(item.href)
|
|
||||||
? pathname === item.href
|
|
||||||
: pathname.startsWith(item.href)
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Link
|
|
||||||
href={item.href}
|
|
||||||
className={`flex items-center gap-3 px-3 py-2 rounded-lg text-sm font-medium transition-colors ${
|
|
||||||
isActive
|
|
||||||
? 'bg-blue-50 text-blue-700'
|
|
||||||
: 'text-gray-600 hover:bg-gray-100 hover:text-gray-900'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
<span className={isActive ? 'text-blue-600' : 'text-gray-400'}>{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())
|
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
{/* Desktop sidebar */}
|
|
||||||
<aside className="hidden sm:flex fixed left-0 top-0 h-full w-60 bg-white border-r border-gray-200 flex-col z-40">
|
|
||||||
{/* Header */}
|
|
||||||
<div className="flex items-center justify-between px-4 py-4 border-b border-gray-100">
|
|
||||||
<span className="text-base font-bold text-gray-900 tracking-tight">IMS</span>
|
|
||||||
<NotificationBell />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Nav */}
|
|
||||||
<nav className="flex-1 overflow-y-auto px-3 py-3 space-y-1">
|
|
||||||
{items.map(item => (
|
|
||||||
<NavLink key={item.href} item={item} pathname={pathname} />
|
|
||||||
))}
|
|
||||||
</nav>
|
|
||||||
|
|
||||||
{/* User + logout */}
|
|
||||||
<div className="border-t border-gray-100 px-3 py-3">
|
|
||||||
<div className="flex items-center gap-2 px-2 py-2 mb-1">
|
|
||||||
<div className="w-8 h-8 rounded-full bg-blue-600 flex items-center justify-center text-white text-xs font-bold flex-shrink-0">
|
|
||||||
{initials(displayName)}
|
|
||||||
</div>
|
|
||||||
<div className="min-w-0">
|
|
||||||
<p className="text-sm font-medium text-gray-900 truncate">{displayName}</p>
|
|
||||||
<p className="text-xs text-gray-500 truncate">{roleLabel}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<Link
|
|
||||||
href="/account"
|
|
||||||
className={`flex items-center gap-2 w-full px-3 py-2 text-sm rounded-lg transition-colors ${
|
|
||||||
pathname === '/account'
|
|
||||||
? 'bg-blue-50 text-blue-700'
|
|
||||||
: 'text-gray-600 hover:bg-gray-100 hover:text-gray-900'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
<span className={pathname === '/account' ? 'text-blue-600' : 'text-gray-400'}>
|
|
||||||
<IconUser />
|
|
||||||
</span>
|
|
||||||
Account
|
|
||||||
</Link>
|
|
||||||
<button
|
|
||||||
onClick={logout}
|
|
||||||
className="flex items-center gap-2 w-full px-3 py-2 text-sm text-gray-600 hover:bg-gray-100 hover:text-gray-900 rounded-lg transition-colors"
|
|
||||||
>
|
|
||||||
<IconLogout />
|
|
||||||
Logout
|
|
||||||
</button>
|
|
||||||
<div className="mt-3 pt-3 border-t border-gray-100 px-2 text-center">
|
|
||||||
<p className="text-xs text-gray-400">v1.2.2</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</aside>
|
|
||||||
|
|
||||||
{/* Mobile bottom tab bar */}
|
|
||||||
<nav className="sm:hidden fixed bottom-0 left-0 right-0 bg-white border-t border-gray-200 flex z-40 safe-area-pb">
|
|
||||||
{mobileItems.map(item => {
|
|
||||||
const exactRoots = ['/reporter', '/supervisor', '/management', '/capa-owner', '/admin', '/report', '/account']
|
|
||||||
const isActive = exactRoots.includes(item.href)
|
|
||||||
? pathname === item.href
|
|
||||||
: pathname.startsWith(item.href)
|
|
||||||
return (
|
|
||||||
<Link
|
|
||||||
key={item.href}
|
|
||||||
href={item.href}
|
|
||||||
className={`flex-1 flex flex-col items-center gap-1 py-2 text-[10px] font-medium transition-colors ${
|
|
||||||
isActive ? 'text-blue-600' : 'text-gray-400'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
{item.icon}
|
|
||||||
<span className="leading-none">{item.label}</span>
|
|
||||||
</Link>
|
|
||||||
)
|
|
||||||
})}
|
|
||||||
{/* Mobile logout in "More" slot if room */}
|
|
||||||
{items.length <= 4 && (
|
|
||||||
<button
|
|
||||||
onClick={logout}
|
|
||||||
className="flex-1 flex flex-col items-center gap-1 py-2 text-[10px] font-medium text-gray-400"
|
|
||||||
>
|
|
||||||
<IconLogout />
|
|
||||||
<span className="leading-none">Logout</span>
|
|
||||||
</button>
|
|
||||||
)}
|
|
||||||
</nav>
|
|
||||||
</>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,10 @@
|
|||||||
'use client'
|
'use client'
|
||||||
|
|
||||||
import { useCallback, useEffect, useRef, useState } from 'react'
|
import { useCallback, useEffect, useState } from 'react'
|
||||||
import Link from 'next/link'
|
import Link from 'next/link'
|
||||||
|
import { Bell } from 'lucide-react'
|
||||||
|
import { Drawer } from '@/components/ui/drawer'
|
||||||
|
import { cx } from '@/components/ui/cx'
|
||||||
|
|
||||||
type Notification = {
|
type Notification = {
|
||||||
id: string
|
id: string
|
||||||
@@ -13,11 +16,15 @@ type Notification = {
|
|||||||
|
|
||||||
const POLL_MS = 60_000
|
const POLL_MS = 60_000
|
||||||
|
|
||||||
|
function isToday(iso: string): boolean {
|
||||||
|
return new Date(iso).toDateString() === new Date().toDateString()
|
||||||
|
}
|
||||||
|
|
||||||
export function NotificationBell() {
|
export function NotificationBell() {
|
||||||
const [notifications, setNotifications] = useState<Notification[]>([])
|
const [notifications, setNotifications] = useState<Notification[]>([])
|
||||||
const [unread, setUnread] = useState(0)
|
const [unread, setUnread] = useState(0)
|
||||||
const [open, setOpen] = useState(false)
|
const [open, setOpen] = useState(false)
|
||||||
const panelRef = useRef<HTMLDivElement>(null)
|
const [tab, setTab] = useState<'all' | 'unread'>('all')
|
||||||
|
|
||||||
const load = useCallback(() => {
|
const load = useCallback(() => {
|
||||||
fetch('/api/notifications')
|
fetch('/api/notifications')
|
||||||
@@ -35,15 +42,6 @@ export function NotificationBell() {
|
|||||||
return () => clearInterval(id)
|
return () => clearInterval(id)
|
||||||
}, [load])
|
}, [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 = () => {
|
const markAllRead = () => {
|
||||||
fetch('/api/notifications', {
|
fetch('/api/notifications', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
@@ -57,62 +55,94 @@ export function NotificationBell() {
|
|||||||
.catch(() => {})
|
.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 (
|
return (
|
||||||
<div ref={panelRef} className="fixed top-3 right-3 z-50">
|
<>
|
||||||
<button
|
<button
|
||||||
onClick={() => setOpen(o => !o)}
|
type="button"
|
||||||
|
onClick={() => setOpen(true)}
|
||||||
aria-label={`Notifications${unread > 0 ? ` (${unread} unread)` : ''}`}
|
aria-label={`Notifications${unread > 0 ? ` (${unread} unread)` : ''}`}
|
||||||
className="relative bg-white rounded-full shadow-sm border border-gray-200 w-10 h-10 flex items-center justify-center hover:shadow-md transition-shadow"
|
className="relative inline-grid place-items-center w-8 h-8 rounded-md text-neutral-300 hover:bg-ink-2 cursor-pointer"
|
||||||
>
|
>
|
||||||
<span className="text-lg" aria-hidden>🔔</span>
|
<Bell size={16} strokeWidth={2} aria-hidden />
|
||||||
{unread > 0 && (
|
{unread > 0 && (
|
||||||
<span className="absolute -top-1 -right-1 bg-red-600 text-white text-[10px] font-bold rounded-full 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}
|
{unread > 99 ? '99+' : unread}
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
{open && (
|
<Drawer
|
||||||
<div className="absolute right-0 mt-2 w-80 max-h-96 overflow-y-auto bg-white rounded-xl shadow-lg border border-gray-200">
|
open={open}
|
||||||
<div className="flex items-center justify-between px-4 py-2 border-b border-gray-100">
|
onClose={() => setOpen(false)}
|
||||||
<span className="text-sm font-semibold text-gray-700">Notifications</span>
|
title="Notifications"
|
||||||
{unread > 0 && (
|
actions={
|
||||||
<button onClick={markAllRead} className="text-xs text-blue-600 hover:underline">
|
unread > 0 ? (
|
||||||
Mark all read
|
<button
|
||||||
</button>
|
type="button"
|
||||||
)}
|
onClick={markAllRead}
|
||||||
</div>
|
className="px-2 text-[12.5px] font-[550] text-accent hover:underline cursor-pointer"
|
||||||
{notifications.length === 0 ? (
|
>
|
||||||
<p className="px-4 py-6 text-sm text-gray-400 text-center">No notifications</p>
|
Mark all read
|
||||||
) : (
|
</button>
|
||||||
<ul>
|
) : undefined
|
||||||
{notifications.map(n => {
|
}
|
||||||
const inner = (
|
>
|
||||||
<>
|
<div className="flex gap-0.5 px-3 pb-2 border-b border-rule">
|
||||||
<p className={`text-sm ${n.read_at ? 'text-gray-500' : 'text-gray-900 font-medium'}`}>
|
{(['all', 'unread'] as const).map(t => (
|
||||||
{n.title ?? 'Notification'}
|
<button
|
||||||
</p>
|
key={t}
|
||||||
<p className="text-xs text-gray-400 mt-0.5">
|
type="button"
|
||||||
{new Date(n.sent_at).toLocaleString()}
|
onClick={() => setTab(t)}
|
||||||
</p>
|
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',
|
||||||
return (
|
)}
|
||||||
<li key={n.id} className="border-b border-gray-50 last:border-0">
|
>
|
||||||
{n.link ? (
|
{t === 'all' ? 'All' : 'Unread'}
|
||||||
<Link href={n.link} className="block px-4 py-3 hover:bg-gray-50" onClick={() => setOpen(false)}>
|
<span className="text-xs font-medium text-faint">{t === 'all' ? notifications.length : unread}</span>
|
||||||
{inner}
|
</button>
|
||||||
</Link>
|
))}
|
||||||
) : (
|
|
||||||
<div className="px-4 py-3">{inner}</div>
|
|
||||||
)}
|
|
||||||
</li>
|
|
||||||
)
|
|
||||||
})}
|
|
||||||
</ul>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
)}
|
|
||||||
</div>
|
{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>
|
||||||
|
{g.items.map(n => {
|
||||||
|
const body = (
|
||||||
|
<>
|
||||||
|
<p className={cx('text-[13px]', n.read_at ? 'text-muted' : 'text-ink font-medium')}>
|
||||||
|
{n.title ?? 'Notification'}
|
||||||
|
</p>
|
||||||
|
<p className="text-xs text-faint mt-0.5">{new Date(n.sent_at).toLocaleString()}</p>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
return (
|
||||||
|
<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" onClick={() => setOpen(false)}>
|
||||||
|
{body}
|
||||||
|
</Link>
|
||||||
|
) : (
|
||||||
|
<div className="px-4 py-3">{body}</div>
|
||||||
|
)}
|
||||||
|
</li>
|
||||||
|
)
|
||||||
|
})}
|
||||||
|
</ul>
|
||||||
|
</section>
|
||||||
|
))
|
||||||
|
)}
|
||||||
|
</Drawer>
|
||||||
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,13 +44,13 @@ export function ApiKeyForm({ settings }: Props) {
|
|||||||
{Object.keys(KEY_LABELS).map(key => {
|
{Object.keys(KEY_LABELS).map(key => {
|
||||||
const status = settings[key]
|
const status = settings[key]
|
||||||
return (
|
return (
|
||||||
<div key={key} className="bg-white rounded-xl shadow-sm p-5">
|
<div key={key} className="bg-surface shadow-sm p-5">
|
||||||
<div className="flex items-center justify-between mb-1">
|
<div className="flex items-center justify-between mb-1">
|
||||||
<label className="text-sm font-semibold text-gray-800">{KEY_LABELS[key]}</label>
|
<label className="text-sm font-semibold text-gray-800">{KEY_LABELS[key]}</label>
|
||||||
<span className={`text-xs font-medium px-2 py-0.5 rounded-full ${
|
<span className={`text-xs font-medium px-2 py-0.5 ${
|
||||||
status?.set
|
status?.set
|
||||||
? 'bg-green-100 text-green-700'
|
? 'bg-st-green-bg text-st-green-fg'
|
||||||
: 'bg-yellow-100 text-yellow-700'
|
: 'bg-st-amber-bg text-st-amber-fg'
|
||||||
}`}>
|
}`}>
|
||||||
{status?.set ? 'Configured' : 'Not set'}
|
{status?.set ? 'Configured' : 'Not set'}
|
||||||
</span>
|
</span>
|
||||||
@@ -66,18 +66,18 @@ export function ApiKeyForm({ settings }: Props) {
|
|||||||
value={values[key]}
|
value={values[key]}
|
||||||
onChange={e => setValues(v => ({ ...v, [key]: e.target.value }))}
|
onChange={e => setValues(v => ({ ...v, [key]: e.target.value }))}
|
||||||
placeholder={status?.set ? 'Enter new key to replace…' : 'Enter API key…'}
|
placeholder={status?.set ? 'Enter new key to replace…' : 'Enter API key…'}
|
||||||
className="flex-1 border border-gray-300 rounded-lg px-3 py-2 text-sm text-gray-900 placeholder-gray-500 focus:ring-2 focus:ring-blue-500 focus:border-transparent font-mono"
|
className="flex-1 border border-divider px-3 py-2 text-sm text-gray-900 placeholder-gray-500 focus:ring-2 focus:ring-accent focus:border-transparent font-mono"
|
||||||
/>
|
/>
|
||||||
<button
|
<button
|
||||||
onClick={() => save(key)}
|
onClick={() => save(key)}
|
||||||
disabled={saving[key] || !values[key]}
|
disabled={saving[key] || !values[key]}
|
||||||
className="bg-blue-600 text-white rounded-lg px-4 py-2 text-sm font-semibold disabled:opacity-50 hover:bg-blue-700"
|
className="bg-accent text-white px-4 py-2 text-sm font-semibold disabled:opacity-50 hover:bg-accent-600"
|
||||||
>
|
>
|
||||||
{saving[key] ? 'Saving…' : 'Save'}
|
{saving[key] ? 'Saving…' : 'Save'}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
{results[key] === 'ok' && (
|
{results[key] === 'ok' && (
|
||||||
<p className="text-xs text-green-600 mt-2">Saved. Reload the page to confirm.</p>
|
<p className="text-xs text-ink mt-2">Saved. Reload the page to confirm.</p>
|
||||||
)}
|
)}
|
||||||
{results[key] === 'error' && (
|
{results[key] === 'error' && (
|
||||||
<p className="text-xs text-red-600 mt-2">Save failed. Check your permissions.</p>
|
<p className="text-xs text-red-600 mt-2">Save failed. Check your permissions.</p>
|
||||||
|
|||||||
@@ -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>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
import type { ButtonHTMLAttributes } from 'react'
|
||||||
|
import { cx } from './cx'
|
||||||
|
|
||||||
|
type Variant = 'primary' | 'secondary' | 'icon'
|
||||||
|
|
||||||
|
const BASE =
|
||||||
|
'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: '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 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} />
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
import type { ReactNode } from 'react'
|
||||||
|
|
||||||
|
export function Card({
|
||||||
|
kicker,
|
||||||
|
title,
|
||||||
|
meta,
|
||||||
|
children,
|
||||||
|
}: {
|
||||||
|
kicker?: ReactNode
|
||||||
|
title?: ReactNode
|
||||||
|
meta?: ReactNode
|
||||||
|
children?: ReactNode
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<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,2 @@
|
|||||||
|
export const cx = (...parts: Array<string | false | null | undefined>): string =>
|
||||||
|
parts.filter(Boolean).join(' ')
|
||||||
@@ -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>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
import type { InputHTMLAttributes, ReactNode, SelectHTMLAttributes, TextareaHTMLAttributes } from 'react'
|
||||||
|
import { cx } from './cx'
|
||||||
|
|
||||||
|
export const INPUT_CLASS =
|
||||||
|
'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 text-muted mb-[5px]">
|
||||||
|
{label}
|
||||||
|
</label>
|
||||||
|
{children}
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function Input({ className, ...rest }: InputHTMLAttributes<HTMLInputElement>) {
|
||||||
|
return <input className={cx(INPUT_CLASS, className)} {...rest} />
|
||||||
|
}
|
||||||
|
|
||||||
|
export function Textarea({ className, ...rest }: TextareaHTMLAttributes<HTMLTextAreaElement>) {
|
||||||
|
return <textarea className={cx(INPUT_CLASS, 'h-auto min-h-[90px] py-2 resize-y', className)} {...rest} />
|
||||||
|
}
|
||||||
|
|
||||||
|
export function Select({ className, ...rest }: SelectHTMLAttributes<HTMLSelectElement>) {
|
||||||
|
return <select className={cx(INPUT_CLASS, className)} {...rest} />
|
||||||
|
}
|
||||||
@@ -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>
|
||||||
|
)
|
||||||
|
}
|
||||||
+11
-12
@@ -1,6 +1,8 @@
|
|||||||
'use client'
|
'use client'
|
||||||
|
|
||||||
import { useEffect } from 'react'
|
import { useEffect } from 'react'
|
||||||
|
import { X } from 'lucide-react'
|
||||||
|
import { Button } from './button'
|
||||||
|
|
||||||
interface ModalProps {
|
interface ModalProps {
|
||||||
open: boolean
|
open: boolean
|
||||||
@@ -25,20 +27,17 @@ export function Modal({ open, onClose, title, children, footer, width = 'md' }:
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="fixed inset-0 z-50 flex items-center justify-center p-4" role="dialog" aria-modal="true">
|
<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-gray-900/50" onClick={onClose} />
|
<div className="absolute inset-0 bg-black/30" onClick={onClose} />
|
||||||
<div className={`relative w-full ${maxW} bg-white rounded-2xl shadow-2xl`}>
|
<div className={`relative w-full ${maxW} bg-surface rounded-xl shadow-float`}>
|
||||||
<div className="flex items-center justify-between px-6 py-4 border-b border-gray-100">
|
<div className="flex items-center justify-between px-5 py-3.5 border-b border-rule">
|
||||||
<h2 className="text-sm font-semibold text-gray-900">{title}</h2>
|
<h2 className="text-base font-[650]">{title}</h2>
|
||||||
<button onClick={onClose} aria-label="Close"
|
<Button variant="icon" aria-label="Close" onClick={onClose}>
|
||||||
className="text-gray-400 hover:text-gray-600 p-1 rounded-lg hover:bg-gray-100 transition-colors cursor-pointer">
|
<X size={16} strokeWidth={2} aria-hidden />
|
||||||
<svg className="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2.5}>
|
</Button>
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" d="M6 18 18 6M6 6l12 12" />
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
<div className="px-6 py-5">{children}</div>
|
<div className="px-5 py-4">{children}</div>
|
||||||
{footer && (
|
{footer && (
|
||||||
<div className="px-6 py-4 border-t border-gray-100 flex justify-end gap-2">
|
<div className="px-5 py-3.5 border-t border-rule flex justify-end gap-2">
|
||||||
{footer}
|
{footer}
|
||||||
</div>
|
</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>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
import type { ReactNode } from 'react'
|
||||||
|
import { cx } from './cx'
|
||||||
|
|
||||||
|
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 LABELS: Record<string, string> = {
|
||||||
|
capa_pending: 'CAPA pending', pending_verification: 'Verification', in_progress: 'In progress', med: 'Medium',
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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',
|
||||||
|
}
|
||||||
|
|
||||||
|
export function statusHue(key: string): StatusHue {
|
||||||
|
return HUES[key] ?? 'grey'
|
||||||
|
}
|
||||||
|
|
||||||
|
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 (
|
||||||
|
<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>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
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 <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>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -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
|
-- users
|
||||||
CREATE POLICY "users_read_own" ON users FOR SELECT USING (id = app_current_user_id());
|
CREATE POLICY "users_read_own" ON users FOR SELECT USING (id = app_current_user_id());
|
||||||
CREATE POLICY "users_read_elevated" ON users FOR SELECT
|
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
|
CREATE POLICY "users_update_own" ON users FOR UPDATE
|
||||||
USING (id = app_current_user_id())
|
USING (id = app_current_user_id())
|
||||||
WITH CHECK (
|
WITH CHECK (
|
||||||
@@ -70,12 +70,12 @@ CREATE POLICY "incidents_insert" ON incidents FOR INSERT
|
|||||||
WITH CHECK (reported_by = app_current_user_id());
|
WITH CHECK (reported_by = app_current_user_id());
|
||||||
CREATE POLICY "incidents_read_reporter" ON incidents FOR SELECT
|
CREATE POLICY "incidents_read_reporter" ON incidents FOR SELECT
|
||||||
USING (reported_by = app_current_user_id());
|
USING (reported_by = app_current_user_id());
|
||||||
CREATE POLICY "incidents_read_supervisor" ON incidents FOR SELECT
|
CREATE POLICY "incidents_read_ssa" ON incidents FOR SELECT
|
||||||
USING (auth_user_role() = 'supervisor' AND site_id = auth_user_site_id());
|
USING (auth_user_role() = 'ssa' AND site_id = auth_user_site_id());
|
||||||
CREATE POLICY "incidents_read_elevated" ON incidents FOR SELECT
|
CREATE POLICY "incidents_read_elevated" ON incidents FOR SELECT
|
||||||
USING (auth_user_role() IN ('hse', 'admin', 'management'));
|
USING (auth_user_role() IN ('hse', 'admin', 'management'));
|
||||||
CREATE POLICY "incidents_update_elevated" ON incidents FOR UPDATE
|
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
|
-- evidence_files
|
||||||
CREATE POLICY "evidence_insert" ON evidence_files FOR INSERT
|
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
|
CREATE POLICY "evidence_read_uploader" ON evidence_files FOR SELECT
|
||||||
USING (uploaded_by = app_current_user_id());
|
USING (uploaded_by = app_current_user_id());
|
||||||
CREATE POLICY "evidence_read_elevated" ON evidence_files FOR SELECT
|
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)
|
-- No DELETE policy: files are never deleted (soft-delete only via `deleted` flag)
|
||||||
|
|
||||||
-- investigations
|
-- investigations
|
||||||
CREATE POLICY "investigations_hse_admin" ON investigations FOR ALL
|
CREATE POLICY "investigations_hse_admin" ON investigations FOR ALL
|
||||||
USING (auth_user_role() IN ('hse', 'admin'));
|
USING (auth_user_role() IN ('hse', 'admin'));
|
||||||
CREATE POLICY "investigations_read_supervisor" ON investigations FOR SELECT
|
CREATE POLICY "investigations_read_ssa" ON investigations FOR SELECT
|
||||||
USING (auth_user_role() = 'supervisor');
|
USING (auth_user_role() = 'ssa');
|
||||||
|
|
||||||
-- capa_actions (capa_update_owner is tightened — no department clause)
|
-- capa_actions (capa_update_owner is tightened — no department clause)
|
||||||
CREATE POLICY "capa_read_owner" ON capa_actions FOR SELECT
|
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
|
CREATE POLICY "capa_update_owner" ON capa_actions FOR UPDATE
|
||||||
USING (owner_user_id = app_current_user_id());
|
USING (owner_user_id = app_current_user_id());
|
||||||
CREATE POLICY "capa_read_elevated" ON capa_actions FOR SELECT
|
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
|
CREATE POLICY "capa_hse_admin_all" ON capa_actions FOR ALL
|
||||||
USING (auth_user_role() IN ('hse', 'admin'));
|
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)
|
-- notifications_log (final state after migration 19 fix)
|
||||||
CREATE POLICY "notifications_insert_elevated" ON notifications_log FOR INSERT
|
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
|
CREATE POLICY "notifications_read_own" ON notifications_log FOR SELECT
|
||||||
USING (recipient_user_id = app_current_user_id());
|
USING (recipient_user_id = app_current_user_id());
|
||||||
CREATE POLICY "notifications_read_admin" ON notifications_log FOR SELECT
|
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
|
-- incident_addenda
|
||||||
CREATE POLICY "addenda_read" ON incident_addenda FOR SELECT
|
CREATE POLICY "addenda_read" ON incident_addenda FOR SELECT
|
||||||
USING (
|
USING (
|
||||||
auth_user_role() IN ('hse', 'admin', 'supervisor', 'management')
|
auth_user_role() IN ('hse', 'admin', 'ssa', 'management')
|
||||||
OR EXISTS (
|
OR EXISTS (
|
||||||
SELECT 1 FROM incidents i
|
SELECT 1 FROM incidents i
|
||||||
WHERE i.id = incident_id AND i.reported_by = app_current_user_id()
|
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
|
CREATE POLICY "addenda_insert" ON incident_addenda FOR INSERT
|
||||||
WITH CHECK (
|
WITH CHECK (
|
||||||
author = app_current_user_id()
|
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
|
-- Enums
|
||||||
-- ---------------------------------------------------------------------------
|
-- ---------------------------------------------------------------------------
|
||||||
CREATE TYPE user_role AS ENUM (
|
CREATE TYPE user_role AS ENUM (
|
||||||
'reporter', 'supervisor', 'hse', 'capa_owner', 'management', 'admin'
|
'ssa', 'hse', 'management', 'admin'
|
||||||
);
|
);
|
||||||
|
|
||||||
CREATE TYPE incident_type AS ENUM (
|
CREATE TYPE incident_type AS ENUM (
|
||||||
@@ -80,7 +80,7 @@ CREATE TABLE users (
|
|||||||
name TEXT NOT NULL DEFAULT '',
|
name TEXT NOT NULL DEFAULT '',
|
||||||
email TEXT NOT NULL DEFAULT '' UNIQUE,
|
email TEXT NOT NULL DEFAULT '' UNIQUE,
|
||||||
phone TEXT,
|
phone TEXT,
|
||||||
role user_role NOT NULL DEFAULT 'reporter',
|
role user_role NOT NULL DEFAULT 'ssa',
|
||||||
department TEXT,
|
department TEXT,
|
||||||
site_id UUID REFERENCES sites(id),
|
site_id UUID REFERENCES sites(id),
|
||||||
active BOOLEAN NOT NULL DEFAULT true,
|
active BOOLEAN NOT NULL DEFAULT true,
|
||||||
@@ -101,6 +101,9 @@ CREATE TABLE trucks (
|
|||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
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
|
-- incidents: final column set includes all columns added in later migrations
|
||||||
CREATE TABLE incidents (
|
CREATE TABLE incidents (
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
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_status_idx ON capa_actions(status);
|
||||||
CREATE INDEX capa_actions_due_date_idx ON capa_actions(due_date);
|
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 (
|
CREATE TABLE dosh_reports (
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
incident_id UUID NOT NULL REFERENCES incidents(id) ON DELETE RESTRICT,
|
incident_id UUID NOT NULL REFERENCES incidents(id) ON DELETE RESTRICT,
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user