feat: Phase 5 & 6 — usability, compliance hardening, analytics
Phase 5 (usability + compliance): - In-app notification bell/badge: migration 016 adds read state + per-user RLS + create_in_app_notification SECURITY DEFINER RPC; /api/notifications; wired into incident creation, CAPA assign/verify, escalation cron - Incident closure: new POST /api/incidents/[id]/close (requires verification status + all CAPAs verified); migration 017 locks closed incidents at DB level (update/delete triggers) with append-only incident_addenda + UI panel - Server-side pagination on HSE/supervisor incident inboxes (.range, 25/page) - Investigation form: alcohol/urine test result + witness statement refs (existing schema columns, now editable) - Type-specific intake fields: migration 018 adds incidents.type_details JSONB; whitelist validation; environmental/asset/security/fire field groups in report form; EN/MS/ZH labels; offline queue support - JKKP 8 annual register CSV export (/api/reports/jkkp8) + dashboard button + January statutory deadline banner - Admin page: user invite (service-role client), role/site/active management, site + zone CRUD with QR report links — replaces Phase 0 stub - Evidence gallery thumbnails via Supabase render transform with fallback Phase 6 (analytics): - 12-month stacked trend chart (leading/lagging/other) + top root causes (lib/dashboard/trends.ts pure helpers) - AI rising-risk zones: /api/dashboard/ai/risk-flags aggregates 90-day zone stats, claude-opus-4-8 forced tool_use, panel on HSE + management dashboards, suggestion audit-logged Also fixes 9 pre-existing missing /ims basePath prefixes in client fetches and download links. 132 tests passing, tsc clean, next build clean. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01CPf5Rc8QPx6V8KLEEgfKEQ
This commit is contained in:
@@ -0,0 +1,61 @@
|
||||
export const dynamic = 'force-dynamic'
|
||||
|
||||
import { NextRequest, NextResponse } from 'next/server'
|
||||
import { createClient } from '@/lib/supabase/server'
|
||||
|
||||
export async function GET(
|
||||
_request: NextRequest,
|
||||
{ params }: { params: Promise<{ id: string }> }
|
||||
) {
|
||||
const { id } = await params
|
||||
const supabase = await createClient()
|
||||
|
||||
const { data: { user }, error: authError } = await supabase.auth.getUser()
|
||||
if (authError || !user) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
|
||||
|
||||
const { data, error } = await supabase
|
||||
.from('incident_addenda')
|
||||
.select('id, body, created_at, author:users!author (name)')
|
||||
.eq('incident_id', id)
|
||||
.order('created_at', { ascending: true })
|
||||
|
||||
if (error) return NextResponse.json({ error: 'Fetch failed' }, { status: 500 })
|
||||
return NextResponse.json(data ?? [])
|
||||
}
|
||||
|
||||
export async function POST(
|
||||
request: NextRequest,
|
||||
{ params }: { params: Promise<{ id: string }> }
|
||||
) {
|
||||
const { id } = await params
|
||||
const supabase = await createClient()
|
||||
|
||||
const { data: { user }, error: authError } = await supabase.auth.getUser()
|
||||
if (authError || !user) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
|
||||
|
||||
const { data: profile } = await supabase
|
||||
.from('users').select('role').eq('id', user.id).single()
|
||||
if (!profile || !['hse', 'admin', 'supervisor'].includes(profile.role))
|
||||
return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||
|
||||
const body: { body?: string } = await request.json().catch(() => ({}))
|
||||
const text = (body.body ?? '').trim()
|
||||
if (!text) return NextResponse.json({ error: 'body required' }, { status: 422 })
|
||||
|
||||
const { data: addendum, error } = await supabase
|
||||
.from('incident_addenda')
|
||||
.insert({ incident_id: id, author: user.id, body: text })
|
||||
.select('id')
|
||||
.single()
|
||||
|
||||
if (error || !addendum) return NextResponse.json({ error: 'Insert failed' }, { status: 500 })
|
||||
|
||||
await supabase.rpc('write_audit_log', {
|
||||
p_table_name: 'incident_addenda',
|
||||
p_record_id: addendum.id,
|
||||
p_action: 'INSERT',
|
||||
p_new_value: { incident_id: id, author: user.id },
|
||||
})
|
||||
|
||||
return NextResponse.json({ id: addendum.id }, { status: 201 })
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
export const dynamic = 'force-dynamic'
|
||||
|
||||
import { NextRequest, NextResponse } from 'next/server'
|
||||
import { createClient } from '@/lib/supabase/server'
|
||||
import { createInAppNotifications } from '@/lib/notifications/in-app'
|
||||
|
||||
export async function POST(
|
||||
_request: NextRequest,
|
||||
{ params }: { params: Promise<{ id: string }> }
|
||||
) {
|
||||
const { id } = await params
|
||||
const supabase = await createClient()
|
||||
|
||||
const { data: { user }, error: authError } = await supabase.auth.getUser()
|
||||
if (authError || !user) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
|
||||
|
||||
const { data: profile } = await supabase
|
||||
.from('users').select('role').eq('id', user.id).single()
|
||||
if (!profile || !['hse', 'admin'].includes(profile.role))
|
||||
return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||
|
||||
const { data: incident } = await supabase
|
||||
.from('incidents')
|
||||
.select('status, reference_no, reported_by')
|
||||
.eq('id', id)
|
||||
.single()
|
||||
if (!incident) return NextResponse.json({ error: 'Not found' }, { status: 404 })
|
||||
if (incident.status === 'closed')
|
||||
return NextResponse.json({ error: 'Already closed' }, { status: 409 })
|
||||
if (incident.status !== 'verification')
|
||||
return NextResponse.json({ error: 'Incident must be in verification status' }, { status: 409 })
|
||||
|
||||
const { data: openCapas } = await supabase
|
||||
.from('capa_actions')
|
||||
.select('id')
|
||||
.eq('incident_id', id)
|
||||
.not('status', 'in', '(verified,closed)')
|
||||
if (openCapas && openCapas.length > 0)
|
||||
return NextResponse.json({ error: 'All CAPA actions must be verified before closure' }, { status: 409 })
|
||||
|
||||
const closedAt = new Date().toISOString()
|
||||
const { error } = await supabase
|
||||
.from('incidents')
|
||||
.update({ status: 'closed', closed_at: closedAt })
|
||||
.eq('id', id)
|
||||
if (error) return NextResponse.json({ error: 'Update failed' }, { status: 500 })
|
||||
|
||||
await supabase.rpc('write_audit_log', {
|
||||
p_table_name: 'incidents',
|
||||
p_record_id: id,
|
||||
p_action: 'closed',
|
||||
p_new_value: { status: 'closed', closed_at: closedAt, closed_by: user.id },
|
||||
})
|
||||
|
||||
if (incident.reported_by) {
|
||||
await createInAppNotifications(supabase, [{
|
||||
userId: incident.reported_by,
|
||||
title: `Your incident report ${incident.reference_no ?? ''} has been closed`,
|
||||
link: '/reporter',
|
||||
incidentId: id,
|
||||
}])
|
||||
}
|
||||
|
||||
return NextResponse.json({ ok: true, closed_at: closedAt })
|
||||
}
|
||||
@@ -37,6 +37,8 @@ export async function POST(
|
||||
root_cause_summary: body.root_cause_summary ?? null,
|
||||
five_why_steps: method === 'five_why' ? (body.five_why_steps ?? []) : null,
|
||||
fishbone_categories: method === 'fishbone' ? (body.fishbone_categories ?? []) : null,
|
||||
alcohol_test_result: body.alcohol_test_result ?? null,
|
||||
witness_statement_refs: Array.isArray(body.witness_statement_refs) ? body.witness_statement_refs : [],
|
||||
})
|
||||
.select('id')
|
||||
.single()
|
||||
@@ -83,6 +85,8 @@ export async function PATCH(
|
||||
root_cause_summary: fields.root_cause_summary ?? null,
|
||||
five_why_steps: fields.five_why_steps ?? null,
|
||||
fishbone_categories: fields.fishbone_categories ?? null,
|
||||
alcohol_test_result: fields.alcohol_test_result ?? null,
|
||||
witness_statement_refs: Array.isArray(fields.witness_statement_refs) ? fields.witness_statement_refs : [],
|
||||
}
|
||||
if (complete) updateData.completed_at = new Date().toISOString()
|
||||
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
import { NextResponse } from 'next/server'
|
||||
import { createClient } from '@/lib/supabase/server'
|
||||
import { validateIncidentInput, type IncidentType, type MedicalStatus } from '@/lib/incidents/validate'
|
||||
import { validateIncidentInput, validateTypeDetails, type IncidentType, type MedicalStatus } from '@/lib/incidents/validate'
|
||||
import { uploadEvidenceFile, type EvidenceStage } from '@/lib/supabase/storage'
|
||||
import { sendNewIncidentEmail } from '@/lib/notifications/email'
|
||||
import { sendWhatsAppMessage } from '@/lib/notifications/whatsapp'
|
||||
import { createInAppNotifications } from '@/lib/notifications/in-app'
|
||||
import { getApiKey } from '@/lib/settings'
|
||||
|
||||
export const dynamic = 'force-dynamic'
|
||||
@@ -42,6 +43,21 @@ export async function POST(request: Request) {
|
||||
return NextResponse.json({ error: 'Validation failed', details: validation.errors }, { status: 422 })
|
||||
}
|
||||
|
||||
let rawDetails: Record<string, unknown> | undefined
|
||||
if (typeof body.type_details === 'string' && body.type_details) {
|
||||
try {
|
||||
rawDetails = JSON.parse(body.type_details)
|
||||
} catch {
|
||||
return NextResponse.json({ error: 'Validation failed', details: ['type_details must be valid JSON'] }, { status: 422 })
|
||||
}
|
||||
} else if (body.type_details && typeof body.type_details === 'object') {
|
||||
rawDetails = body.type_details as Record<string, unknown>
|
||||
}
|
||||
const detailsCheck = validateTypeDetails(input.incident_type, rawDetails)
|
||||
if (!detailsCheck.ok) {
|
||||
return NextResponse.json({ error: 'Validation failed', details: detailsCheck.errors }, { status: 422 })
|
||||
}
|
||||
|
||||
const { data: zone, error: zoneError } = await supabase
|
||||
.from('zones')
|
||||
.select('id, site_id')
|
||||
@@ -63,6 +79,7 @@ export async function POST(request: Request) {
|
||||
injury_involved: input.injury_involved,
|
||||
asset_involved: input.asset_involved,
|
||||
medical_status: input.injury_involved ? (input.medical_status ?? 'none') : null,
|
||||
type_details: detailsCheck.sanitized,
|
||||
})
|
||||
.select('id, reference_no')
|
||||
.single()
|
||||
@@ -121,9 +138,20 @@ export async function POST(request: Request) {
|
||||
const siteName = (siteData as { name: string } | null)?.name ?? 'Unknown'
|
||||
const { data: recipients } = await supabase
|
||||
.from('users')
|
||||
.select('phone')
|
||||
.select('id, phone')
|
||||
.in('role', ['supervisor', 'hse'])
|
||||
.eq('site_id', zone.site_id)
|
||||
|
||||
await createInAppNotifications(
|
||||
supabase,
|
||||
(recipients ?? []).map((r: { id: string }) => ({
|
||||
userId: r.id,
|
||||
title: `New ${input.incident_type.replace(/_/g, ' ')} incident ${incident.reference_no ?? ''} at ${siteName}`,
|
||||
link: `/hse/incidents/${incident.id}`,
|
||||
incidentId: incident.id,
|
||||
})),
|
||||
)
|
||||
|
||||
for (const r of recipients ?? []) {
|
||||
const phone = (r as { phone: string | null }).phone ?? ''
|
||||
if (!phone) continue
|
||||
|
||||
Reference in New Issue
Block a user