feat(db): phase 4 group 6 — server component pages to Drizzle

Converts all 18 server component page files from Supabase client queries
to Drizzle ORM using asAdmin. Adds getSession() + redirect to the three
pages (hse/incidents, hse/incidents/[id], hse/dashboard) that lacked it.
Maps snake_case component prop shapes explicitly where required.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-07-23 17:29:22 +08:00
co-authored by Claude Sonnet 4.6
parent c2db693d9f
commit f591c0be18
18 changed files with 932 additions and 450 deletions
+35 -11
View File
@@ -2,24 +2,48 @@ export const dynamic = 'force-dynamic'
import { redirect } from 'next/navigation'
import Link from 'next/link'
import { createClient } from '@/lib/supabase/server'
import { asAdmin } from '@/lib/db/with-user'
import { getSession } from '@/lib/auth/get-session'
import { capaActions, incidents, users } from '@/lib/db/schema'
import { eq, asc } from 'drizzle-orm'
import { aliasedTable } from 'drizzle-orm'
import { CapaBoard } from '@/components/capa/capa-board'
export default async function CapaListPage() {
const session = await getSession()
if (!session) redirect('/login?redirect=/hse/capa')
const supabase = await createClient()
const ownerAlias = aliasedTable(users, 'owner')
const { data: capas } = await supabase
.from('capa_actions')
.select(`
id, incident_id, description, department, due_date, priority, status,
incidents (reference_no, incident_type),
owner:users!owner_user_id (name, email)
`)
.order('due_date', { ascending: true })
const rows = await asAdmin(db =>
db.select({
id: capaActions.id,
incidentId: capaActions.incidentId,
description: capaActions.description,
department: capaActions.department,
dueDate: capaActions.dueDate,
priority: capaActions.priority,
status: capaActions.status,
incidentRefNo: incidents.referenceNo,
ownerName: ownerAlias.name,
})
.from(capaActions)
.leftJoin(incidents, eq(capaActions.incidentId, incidents.id))
.leftJoin(ownerAlias, eq(capaActions.ownerUserId, ownerAlias.id))
.orderBy(asc(capaActions.dueDate))
)
const capas = rows.map(r => ({
id: r.id,
incident_id: r.incidentId,
description: r.description,
department: r.department,
due_date: r.dueDate,
priority: r.priority,
status: r.status,
incidents: { reference_no: r.incidentRefNo ?? null },
owner: r.ownerName ? { name: r.ownerName } : null,
}))
return (
<main className="max-w-6xl mx-auto px-4 py-6">
@@ -29,7 +53,7 @@ export default async function CapaListPage() {
Incidents
</Link>
</div>
<CapaBoard capas={(capas ?? []) as unknown as Parameters<typeof CapaBoard>[0]['capas']} />
<CapaBoard capas={capas as Parameters<typeof CapaBoard>[0]['capas']} />
</main>
)
}