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,57 @@
|
||||
export const dynamic = 'force-dynamic'
|
||||
|
||||
import { NextRequest, NextResponse } from 'next/server'
|
||||
import { createClient } from '@/lib/supabase/server'
|
||||
|
||||
async function requireAdmin() {
|
||||
const supabase = await createClient()
|
||||
const { data: { user }, error } = await supabase.auth.getUser()
|
||||
if (error || !user) return { supabase, user: null }
|
||||
const { data: profile } = await supabase
|
||||
.from('users').select('role').eq('id', user.id).single()
|
||||
if (!profile || profile.role !== 'admin') return { supabase, user: null }
|
||||
return { supabase, user }
|
||||
}
|
||||
|
||||
export async function POST(request: NextRequest) {
|
||||
const { supabase, user } = await requireAdmin()
|
||||
if (!user) return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||
|
||||
const body: { kind?: 'site' | 'zone'; name?: string; address?: string; site_id?: string } =
|
||||
await request.json().catch(() => ({}))
|
||||
const name = (body.name ?? '').trim()
|
||||
if (!name) return NextResponse.json({ error: 'name required' }, { status: 422 })
|
||||
|
||||
if (body.kind === 'zone') {
|
||||
if (!body.site_id) return NextResponse.json({ error: 'site_id required for zone' }, { status: 422 })
|
||||
const { data: zone, error } = await supabase
|
||||
.from('zones')
|
||||
.insert({ site_id: body.site_id, name })
|
||||
.select('id, qr_code_token')
|
||||
.single()
|
||||
if (error || !zone) return NextResponse.json({ error: 'Insert failed' }, { status: 500 })
|
||||
|
||||
await supabase.rpc('write_audit_log', {
|
||||
p_table_name: 'zones',
|
||||
p_record_id: zone.id,
|
||||
p_action: 'INSERT',
|
||||
p_new_value: { name, site_id: body.site_id },
|
||||
})
|
||||
return NextResponse.json({ id: zone.id, qr_code_token: zone.qr_code_token }, { status: 201 })
|
||||
}
|
||||
|
||||
const { data: site, error } = await supabase
|
||||
.from('sites')
|
||||
.insert({ name, address: body.address ?? null })
|
||||
.select('id')
|
||||
.single()
|
||||
if (error || !site) return NextResponse.json({ error: 'Insert failed' }, { status: 500 })
|
||||
|
||||
await supabase.rpc('write_audit_log', {
|
||||
p_table_name: 'sites',
|
||||
p_record_id: site.id,
|
||||
p_action: 'INSERT',
|
||||
p_new_value: { name, address: body.address ?? null },
|
||||
})
|
||||
return NextResponse.json({ id: site.id }, { status: 201 })
|
||||
}
|
||||
@@ -0,0 +1,124 @@
|
||||
export const dynamic = 'force-dynamic'
|
||||
|
||||
import { NextRequest, NextResponse } from 'next/server'
|
||||
import { createClient } from '@/lib/supabase/server'
|
||||
import { createAdminClient } from '@/lib/supabase/admin'
|
||||
import { isValidRole } from '@/lib/auth/roles'
|
||||
|
||||
async function requireAdmin() {
|
||||
const supabase = await createClient()
|
||||
const { data: { user }, error } = await supabase.auth.getUser()
|
||||
if (error || !user) return { supabase, user: null }
|
||||
const { data: profile } = await supabase
|
||||
.from('users').select('role').eq('id', user.id).single()
|
||||
if (!profile || profile.role !== 'admin') return { supabase, user: null }
|
||||
return { supabase, user }
|
||||
}
|
||||
|
||||
export async function GET() {
|
||||
const { supabase, user } = await requireAdmin()
|
||||
if (!user) return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||
|
||||
const { data, error } = await supabase
|
||||
.from('users')
|
||||
.select('id, name, email, phone, role, department, site_id, active, created_at')
|
||||
.order('created_at', { ascending: false })
|
||||
|
||||
if (error) return NextResponse.json({ error: 'Fetch failed' }, { status: 500 })
|
||||
return NextResponse.json(data ?? [])
|
||||
}
|
||||
|
||||
export async function POST(request: NextRequest) {
|
||||
const { supabase, user } = await requireAdmin()
|
||||
if (!user) return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||
|
||||
const body: { email?: string; name?: string; role?: string; site_id?: string } =
|
||||
await request.json().catch(() => ({}))
|
||||
const email = (body.email ?? '').trim().toLowerCase()
|
||||
if (!email || !email.includes('@'))
|
||||
return NextResponse.json({ error: 'Valid email required' }, { status: 422 })
|
||||
if (body.role && !isValidRole(body.role))
|
||||
return NextResponse.json({ error: 'Invalid role' }, { status: 422 })
|
||||
|
||||
let admin
|
||||
try {
|
||||
admin = createAdminClient()
|
||||
} catch {
|
||||
return NextResponse.json(
|
||||
{ error: 'User invites unavailable: SUPABASE_SERVICE_ROLE_KEY not configured' },
|
||||
{ status: 503 },
|
||||
)
|
||||
}
|
||||
|
||||
const { data: invited, error: inviteError } = await admin.auth.admin.inviteUserByEmail(email, {
|
||||
data: { full_name: body.name ?? '' },
|
||||
})
|
||||
if (inviteError || !invited?.user)
|
||||
return NextResponse.json({ error: inviteError?.message ?? 'Invite failed' }, { status: 500 })
|
||||
|
||||
// handle_new_auth_user trigger creates the profile row; set role/site on top of it
|
||||
const { error: profileError } = await admin
|
||||
.from('users')
|
||||
.update({
|
||||
name: body.name ?? '',
|
||||
role: body.role ?? 'reporter',
|
||||
site_id: body.site_id ?? null,
|
||||
})
|
||||
.eq('id', invited.user.id)
|
||||
if (profileError)
|
||||
return NextResponse.json({ error: 'Invite sent but profile update failed' }, { status: 500 })
|
||||
|
||||
await supabase.rpc('write_audit_log', {
|
||||
p_table_name: 'users',
|
||||
p_record_id: invited.user.id,
|
||||
p_action: 'invited',
|
||||
p_new_value: { email, role: body.role ?? 'reporter', site_id: body.site_id ?? null },
|
||||
})
|
||||
|
||||
return NextResponse.json({ id: invited.user.id }, { status: 201 })
|
||||
}
|
||||
|
||||
export async function PATCH(request: NextRequest) {
|
||||
const { supabase, user } = await requireAdmin()
|
||||
if (!user) return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
||||
|
||||
const body: {
|
||||
id?: string
|
||||
role?: string
|
||||
site_id?: string | null
|
||||
active?: boolean
|
||||
department?: string | null
|
||||
} = await request.json().catch(() => ({}))
|
||||
|
||||
if (!body.id) return NextResponse.json({ error: 'id required' }, { status: 422 })
|
||||
if (body.role !== undefined && !isValidRole(body.role))
|
||||
return NextResponse.json({ error: 'Invalid role' }, { status: 422 })
|
||||
if (body.id === user.id && body.active === false)
|
||||
return NextResponse.json({ error: 'Cannot deactivate your own account' }, { status: 422 })
|
||||
if (body.id === user.id && body.role !== undefined && body.role !== 'admin')
|
||||
return NextResponse.json({ error: 'Cannot demote your own account' }, { status: 422 })
|
||||
|
||||
const update: Record<string, unknown> = {}
|
||||
if (body.role !== undefined) update.role = body.role
|
||||
if (body.site_id !== undefined) update.site_id = body.site_id
|
||||
if (body.active !== undefined) update.active = body.active
|
||||
if (body.department !== undefined) update.department = body.department
|
||||
if (Object.keys(update).length === 0)
|
||||
return NextResponse.json({ error: 'Nothing to update' }, { status: 422 })
|
||||
|
||||
const { data: before } = await supabase
|
||||
.from('users').select('role, site_id, active, department').eq('id', body.id).single()
|
||||
|
||||
const { error } = await supabase.from('users').update(update).eq('id', body.id)
|
||||
if (error) return NextResponse.json({ error: 'Update failed' }, { status: 500 })
|
||||
|
||||
await supabase.rpc('write_audit_log', {
|
||||
p_table_name: 'users',
|
||||
p_record_id: body.id,
|
||||
p_action: 'admin_update',
|
||||
p_old_value: before ?? null,
|
||||
p_new_value: update,
|
||||
})
|
||||
|
||||
return NextResponse.json({ ok: true })
|
||||
}
|
||||
Reference in New Issue
Block a user