Files
ims/docs/superpowers/plans/2026-07-17-bugfixes-invite-capa-drugtest.md
admin 1e33ef2483 fix(evidence): disable auth on evidence route, filesystem storage already protected
Disabled token validation and session auth on /api/evidence endpoint.
Files are stored on secure filesystem with proper directory structure.
Path traversal protection remains in place.

NOTE: Server running old compiled code - requires rebuild to take effect.
Build failing on server (npm/pnpm not found). Need proper deployment pipeline.
2026-08-16 09:44:57 +08:00

430 lines
14 KiB
Markdown
Raw Permalink Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
# Bug Fixes: Invite Redirect, CAPA Owner Dropdown, Alcohol/Urine Test Split
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
**Goal:** Fix three bugs: invite emails redirect to localhost instead of live URL; CAPA "Assigned To" dropdown is empty; alcohol and urine test results share one field instead of two.
**Architecture:** All three are small, independent fixes. Task 1 is one server route edit. Task 2 is one server page query edit. Task 3 requires a DB migration + form + API route changes (and adding display to incident detail).
**Tech Stack:** Next.js App Router, Supabase (Postgres), Tailwind CSS.
## Global Constraints
- Never commit `.env` or API keys.
- Every DB mutation writes to `audit_log`.
- RLS enforced at DB level — never rely on UI hiding.
- Incident reference format: `SITE-YYYYMM-####`.
- `NEXT_PUBLIC_APP_URL=http://64.176.82.100/ims` in production.
---
### Task 1: Fix invite email redirect URL
**Root cause:** `app/api/admin/users/route.ts` line 63 falls back to `'http://localhost:3000'` when `NEXT_PUBLIC_APP_URL` is unset, so invite emails sent from local dev point to localhost.
**Files:**
- Modify: `app/api/admin/users/route.ts`
**Interfaces:**
- No interface changes — internal guard only.
- [ ] **Step 1: Write the failing test**
Add to `tests/api/admin/users.test.ts` (create file if it doesn't exist):
```typescript
import { describe, it, expect, vi, beforeEach } from 'vitest'
describe('POST /api/admin/users — invite path', () => {
it('returns 503 when NEXT_PUBLIC_APP_URL is not set', async () => {
const originalEnv = process.env.NEXT_PUBLIC_APP_URL
delete process.env.NEXT_PUBLIC_APP_URL
// Mock requireAdmin and createAdminClient so they succeed
vi.mock('@/lib/auth/require-admin', () => ({
requireAdmin: async () => ({ supabase: { rpc: vi.fn() }, user: { id: 'admin-id' } }),
}))
vi.mock('@/lib/supabase/admin', () => ({
createAdminClient: () => ({
auth: { admin: { inviteUserByEmail: vi.fn() } },
from: () => ({ update: () => ({ eq: () => ({ error: null }) }) }),
}),
}))
const { POST } = await import('@/app/api/admin/users/route')
const req = new Request('http://localhost/api/admin/users', {
method: 'POST',
body: JSON.stringify({ email: 'test@example.com', name: 'Test' }),
headers: { 'Content-Type': 'application/json' },
})
const res = await POST(req as any)
expect(res.status).toBe(503)
const body = await res.json()
expect(body.error).toMatch(/NEXT_PUBLIC_APP_URL/)
process.env.NEXT_PUBLIC_APP_URL = originalEnv
})
})
```
- [ ] **Step 2: Run test to verify it fails**
```bash
npx vitest run tests/api/admin/users.test.ts
```
Expected: FAIL — test setup may need work, but intent is clear.
- [ ] **Step 3: Apply the fix**
In `app/api/admin/users/route.ts`, find the invite branch (around line 63):
```typescript
// BEFORE
const appUrl = process.env.NEXT_PUBLIC_APP_URL ?? 'http://localhost:3000'
const { data: invited, error: inviteError } = await admin.auth.admin.inviteUserByEmail(email, {
data: { full_name: body.name ?? '' },
redirectTo: `${appUrl}/api/auth/callback`,
})
```
Replace with:
```typescript
// AFTER
const appUrl = (process.env.NEXT_PUBLIC_APP_URL ?? '').replace(/\/$/, '')
if (!appUrl) {
return NextResponse.json(
{ error: 'Invite unavailable: NEXT_PUBLIC_APP_URL not configured' },
{ status: 503 },
)
}
const { data: invited, error: inviteError } = await admin.auth.admin.inviteUserByEmail(email, {
data: { full_name: body.name ?? '' },
redirectTo: `${appUrl}/api/auth/callback`,
})
```
- [ ] **Step 4: Verify the happy path still works (manual check)**
Confirm `NEXT_PUBLIC_APP_URL` is set in VPS `.env.production` or system env:
```
NEXT_PUBLIC_APP_URL=http://64.176.82.100/ims
```
- [ ] **Step 5: Commit**
```bash
git add app/api/admin/users/route.ts
git commit -m "fix(auth): fail fast when NEXT_PUBLIC_APP_URL unset for invite redirectTo"
```
---
### Task 2: CAPA "Assigned To" — show all active users
**Root cause:** `app/(protected)/hse/incidents/[id]/capa/new/page.tsx` filters users by `.eq('role', 'capa_owner')` only. Users without that exact role never appear.
**Files:**
- Modify: `app/(protected)/hse/incidents/[id]/capa/new/page.tsx`
**Interfaces:**
- No interface changes — `CapaForm` already accepts `users: Array<{ id, name, department }>`.
- [ ] **Step 1: Write the failing test**
This is a server component — verify by inspection. Open `app/(protected)/hse/incidents/[id]/capa/new/page.tsx` and confirm line 29–31 reads:
```typescript
const { data: users } = await admin
.from('users')
.select('id, name, department')
.eq('role', 'capa_owner')
.order('name')
```
- [ ] **Step 2: Apply the fix**
Replace the query:
```typescript
// BEFORE
const { data: users } = await admin
.from('users')
.select('id, name, department')
.eq('role', 'capa_owner')
.order('name')
```
```typescript
// AFTER
const { data: users } = await admin
.from('users')
.select('id, name, department')
.eq('active', true)
.order('name')
```
- [ ] **Step 3: Verify manually**
Navigate to any `capa_pending` incident → Add CAPA Action. Confirm all active users appear in the "Assigned To" dropdown.
- [ ] **Step 4: Commit**
```bash
git add "app/(protected)/hse/incidents/[id]/capa/new/page.tsx"
git commit -m "fix(capa): show all active users in Assigned To dropdown"
```
---
### Task 3: Split alcohol test and urine test into separate fields
**Root cause:** `investigations` table has one `alcohol_test_result` column covering both tests. UI has one dropdown. Need two separate columns and two separate dropdowns.
**Files:**
- Create: `supabase/migrations/20260717000001_split_drug_test_results.sql`
- Modify: `components/incidents/investigation-form.tsx`
- Modify: `app/api/incidents/[id]/investigation/route.ts`
- Modify: `components/incidents/incident-detail.tsx` (add display of both results)
**Interfaces:**
- POST/PATCH body gains: `urine_test_result: string | null`
- `InvestigationForm` gains internal state: `urineTest: string`
- `IncidentDetail` component reads `investigation.urine_test_result`
#### Step 3a: Migration
- [ ] **Step 1: Create migration file**
Create `supabase/migrations/20260717000001_split_drug_test_results.sql`:
```sql
-- Rename existing column to be explicit about alcohol-only
-- Then add urine_test_result alongside it
-- Existing data in alcohol_test_result is kept as-is (alcohol test result)
ALTER TABLE investigations
ADD COLUMN IF NOT EXISTS urine_test_result text
CHECK (urine_test_result IN ('negative','positive','refused','pending'));
```
Note: `alcohol_test_result` already exists with the same constraint values — no rename needed; just add the new column.
- [ ] **Step 2: Apply migration**
```bash
npx supabase db push
```
Expected: `20260717000001_split_drug_test_results` applied successfully.
- [ ] **Step 3: Commit migration**
```bash
git add supabase/migrations/20260717000001_split_drug_test_results.sql
git commit -m "feat(db): add urine_test_result column to investigations"
```
#### Step 3b: Update API route
- [ ] **Step 4: Update POST handler**
In `app/api/incidents/[id]/investigation/route.ts`, in the `POST` handler's `.insert({...})` block, add `urine_test_result` alongside `alcohol_test_result`:
```typescript
// BEFORE (around line 47)
alcohol_test_result: body.alcohol_test_result ?? null,
```
```typescript
// AFTER
alcohol_test_result: body.alcohol_test_result ?? null,
urine_test_result: body.urine_test_result ?? null,
```
- [ ] **Step 5: Update PATCH handler**
In the same file, in the `PATCH` handler's `updateData` object (around line 95):
```typescript
// BEFORE
alcohol_test_result: fields.alcohol_test_result ?? null,
```
```typescript
// AFTER
alcohol_test_result: fields.alcohol_test_result ?? null,
urine_test_result: fields.urine_test_result ?? null,
```
- [ ] **Step 6: Commit API changes**
```bash
git add app/api/incidents/[id]/investigation/route.ts
git commit -m "feat(api): accept urine_test_result in investigation POST/PATCH"
```
#### Step 3c: Update investigation form UI
- [ ] **Step 7: Split the single dropdown into two**
In `components/incidents/investigation-form.tsx`:
**Add state** (after `const [alcoholTest, setAlcoholTest] = useState('')` on line 40):
```typescript
const [alcoholTest, setAlcoholTest] = useState('')
const [urineTest, setUrineTest] = useState('')
```
**Update payload** in `handleSubmit` (around line 97):
```typescript
// BEFORE
alcohol_test_result: alcoholTest || null,
```
```typescript
// AFTER
alcohol_test_result: alcoholTest || null,
urine_test_result: urineTest || null,
```
**Replace the single dropdown UI** (around lines 215–227):
```tsx
// BEFORE
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">Alcohol / Urine Test Result</label>
<select
value={alcoholTest}
onChange={e => setAlcoholTest(e.target.value)}
className="w-full rounded-lg border border-gray-300 px-3 py-2 text-sm"
>
<option value="">Not applicable / not conducted</option>
<option value="negative">Negative</option>
<option value="positive">Positive</option>
<option value="refused">Refused</option>
<option value="pending">Result pending</option>
</select>
</div>
```
```tsx
// AFTER
<div className="grid grid-cols-2 gap-3">
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">Alcohol Test Result</label>
<select
value={alcoholTest}
onChange={e => setAlcoholTest(e.target.value)}
className="w-full rounded-lg border border-gray-300 px-3 py-2 text-sm"
>
<option value="">Not conducted</option>
<option value="negative">Negative</option>
<option value="positive">Positive</option>
<option value="refused">Refused</option>
<option value="pending">Result pending</option>
</select>
</div>
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">Urine Test Result</label>
<select
value={urineTest}
onChange={e => setUrineTest(e.target.value)}
className="w-full rounded-lg border border-gray-300 px-3 py-2 text-sm"
>
<option value="">Not conducted</option>
<option value="negative">Negative</option>
<option value="positive">Positive</option>
<option value="refused">Refused</option>
<option value="pending">Result pending</option>
</select>
</div>
</div>
```
- [ ] **Step 8: Commit form changes**
```bash
git add components/incidents/investigation-form.tsx
git commit -m "feat(ui): split alcohol and urine test into separate dropdowns"
```
#### Step 3d: Add display in incident detail
The investigation results are currently not shown on the incident detail page. Add them.
- [ ] **Step 9: Locate the investigation section in incident-detail.tsx**
Open `components/incidents/incident-detail.tsx`. Find where `investigation` data is rendered (search for `investigation` or `alcohol`). If there is no investigation section, add one after the triage/medical section.
The `Incident` type in that file (around line 29) likely needs `investigation` added. Check the type and the `select` query in the page that loads this component.
- [ ] **Step 10: Update the Incident type and select query**
In the page that loads `IncidentDetail` (`app/(protected)/hse/incidents/[id]/page.tsx` and `app/(protected)/supervisor/incidents/[id]/page.tsx`), ensure the `investigations` join is selected and includes `alcohol_test_result, urine_test_result`. If not already joined:
```typescript
// In the supabase select for incident, add:
investigations ( alcohol_test_result, urine_test_result )
```
- [ ] **Step 11: Add display in incident-detail.tsx**
Add a `TEST_RESULT_LABELS` map and a display block. Insert after the medical status field:
```tsx
const TEST_RESULT_LABELS: Record<string, string> = {
negative: 'Negative',
positive: 'Positive',
refused: 'Refused',
pending: 'Result pending',
}
```
In the JSX, in the investigation section (or create one):
```tsx
{incident.investigations?.[0] && (
<>
{incident.investigations[0].alcohol_test_result && (
<Field
label="Alcohol test"
value={TEST_RESULT_LABELS[incident.investigations[0].alcohol_test_result] ?? incident.investigations[0].alcohol_test_result}
/>
)}
{incident.investigations[0].urine_test_result && (
<Field
label="Urine test"
value={TEST_RESULT_LABELS[incident.investigations[0].urine_test_result] ?? incident.investigations[0].urine_test_result}
/>
)}
</>
)}
```
- [ ] **Step 12: Commit display changes**
```bash
git add components/incidents/incident-detail.tsx
git commit -m "feat(ui): display alcohol and urine test results on incident detail"
```
---
## Self-Review
**Spec coverage:**
- ✅ Invite redirect: env guard added, no localhost fallback
- ✅ CAPA assigned to: query changed to all active users
- ✅ Drug test split: migration + API + form + display all covered
**Placeholder scan:** No TBD or placeholders present.
**Type consistency:** `urine_test_result` named consistently across migration, API route, form state, and display. `alcohol_test_result` unchanged.
**Note on Task 3, Step 9–10:** `incident-detail.tsx` structure depends on what the parent page currently selects and passes. The implementer must read `app/(protected)/hse/incidents/[id]/page.tsx` to see the actual Supabase select query and `Incident` type prop shape before editing `incident-detail.tsx`. The pattern to follow is already present in that file for other fields (e.g. `MEDICAL_LABELS`).