refactor(members): decompose members-client + fix form-field focus bug (slice 8)

663-line members-client.tsx → a 255-line orchestrator + members/components/
{member-form-dialog,members-table,members-toolbar}.tsx + types.ts. The add/edit
form fields (previously defined INSIDE render, which remounted and lost input
focus every keystroke) are now a stable top-level component in member-form-dialog
— fixing that footgun. tsc 0, build ok.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Moheeb Zara
2026-08-04 06:14:25 -07:00
co-authored by Claude Opus 4.8
parent 543b1d65eb
commit 9100532bef
5 changed files with 687 additions and 504 deletions
@@ -0,0 +1,109 @@
'use client'
import type { Dispatch, SetStateAction } from 'react'
import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/components/ui/dialog'
import type { MemberForm } from '../types'
// Top-level (NOT defined inside the render body): keeping this stable is what
// preserves input focus across keystrokes. The add and edit dialogs both render it.
function MemberFormFields({ form, setForm }: { form: MemberForm; setForm: Dispatch<SetStateAction<MemberForm>> }) {
return (
<>
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
<div>
<label htmlFor="member-display-name" className="font-mono text-[10px] tracking-widest text-muted-foreground uppercase block mb-1">Full Name *</label>
<input id="member-display-name" type="text" required value={form.display_name} onChange={e => setForm(f => ({ ...f, display_name: e.target.value }))}
className="w-full bg-background border border-border rounded px-3 py-2 font-sans text-sm text-foreground focus:outline-none focus:border-primary transition" />
</div>
<div>
<label htmlFor="member-email" className="font-mono text-[10px] tracking-widest text-muted-foreground uppercase block mb-1">Email *</label>
<input id="member-email" type="email" required value={form.email} onChange={e => setForm(f => ({ ...f, email: e.target.value }))}
className="w-full bg-background border border-border rounded px-3 py-2 font-sans text-sm text-foreground focus:outline-none focus:border-primary transition" />
</div>
</div>
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
<div>
<label htmlFor="member-phone" className="font-mono text-[10px] tracking-widest text-muted-foreground uppercase block mb-1">Phone</label>
<input id="member-phone" type="tel" value={form.phone} onChange={e => setForm(f => ({ ...f, phone: e.target.value }))}
className="w-full bg-background border border-border rounded px-3 py-2 font-sans text-sm text-foreground focus:outline-none focus:border-primary transition" />
</div>
<div>
<label htmlFor="member-handle" className="font-mono text-[10px] tracking-widest text-muted-foreground uppercase block mb-1">Handle</label>
<input id="member-handle" type="text" value={form.handle} placeholder="@username" onChange={e => setForm(f => ({ ...f, handle: e.target.value }))}
className="w-full bg-background border border-border rounded px-3 py-2 font-mono text-sm text-foreground focus:outline-none focus:border-primary transition" />
</div>
</div>
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
<div>
<label htmlFor="member-tier" className="font-mono text-[10px] tracking-widest text-muted-foreground uppercase block mb-1">Tier</label>
<select id="member-tier" value={form.tier} onChange={e => setForm(f => ({ ...f, tier: e.target.value }))}
className="w-full bg-background border border-border rounded px-3 py-2 font-sans text-sm text-foreground focus:outline-none focus:border-primary">
<option value="plus">Plus</option>
<option value="basic">Basic</option>
<option value="associate">Associate</option>
<option value="admin">Admin</option>
</select>
</div>
<div>
<label htmlFor="member-role" className="font-mono text-[10px] tracking-widest text-muted-foreground uppercase block mb-1">Role</label>
<select id="member-role" value={form.role} onChange={e => setForm(f => ({ ...f, role: e.target.value }))}
className="w-full bg-background border border-border rounded px-3 py-2 font-sans text-sm text-foreground focus:outline-none focus:border-primary">
<option value="member">Member</option>
<option value="board">Board</option>
<option value="treasurer">Treasurer</option>
<option value="admin">Admin</option>
</select>
</div>
</div>
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
<div>
<label htmlFor="member-joined-at" className="font-mono text-[10px] tracking-widest text-muted-foreground uppercase block mb-1">Joined At</label>
<input id="member-joined-at" type="date" value={form.joined_at?.slice(0, 10)} onChange={e => setForm(f => ({ ...f, joined_at: e.target.value }))}
className="w-full bg-background border border-border rounded px-3 py-2 font-sans text-sm text-foreground focus:outline-none focus:border-primary" />
</div>
<div className="flex items-center gap-3 pt-6">
<label className="flex items-center gap-2 cursor-pointer">
<input type="checkbox" checked={form.has_card_access} onChange={e => setForm(f => ({ ...f, has_card_access: e.target.checked }))}
className="w-4 h-4 accent-primary" />
<span className="font-sans text-sm text-foreground">Card Access</span>
</label>
</div>
</div>
</>
)
}
interface MemberFormDialogProps {
open: boolean
// Drives title + submit-button copy; add and edit share one form-state shape.
isEdit: boolean
memberName?: string | null
form: MemberForm
setForm: Dispatch<SetStateAction<MemberForm>>
loading: boolean
error: string
onSubmit: (e: React.FormEvent) => void
onClose: () => void
}
export function MemberFormDialog({ open, isEdit, memberName, form, setForm, loading, error, onSubmit, onClose }: MemberFormDialogProps) {
return (
<Dialog open={open} onOpenChange={(o) => { if (!o) onClose() }}>
<DialogContent className="sm:max-w-lg max-h-[90vh] overflow-y-auto">
<DialogHeader>
<DialogTitle>{isEdit ? <>Edit {memberName}</> : 'Add Member'}</DialogTitle>
</DialogHeader>
<form onSubmit={onSubmit} className="space-y-4">
<MemberFormFields form={form} setForm={setForm} />
{error && <p className="font-mono text-xs text-red-500">{error}</p>}
<div className="flex gap-3 pt-2">
<button type="button" disabled={loading} onClick={onClose} className="flex-1 border border-border text-foreground font-sans text-sm py-2 rounded hover:border-primary/50 transition disabled:opacity-60">Cancel</button>
<button type="submit" disabled={loading} className="flex-1 bg-primary text-white font-sans text-sm py-2 rounded hover:bg-primary/90 transition disabled:opacity-60">
{isEdit ? (loading ? 'Saving...' : 'Save Changes') : (loading ? 'Adding...' : 'Add Member')}
</button>
</div>
</form>
</DialogContent>
</Dialog>
)
}
@@ -0,0 +1,344 @@
'use client'
import { useState, type Dispatch, type SetStateAction } from 'react'
import { Users } from 'lucide-react'
import { Empty, EmptyHeader, EmptyMedia, EmptyTitle, EmptyDescription } from '@/components/ui/empty'
import type { Member, SortKey, AreaLeadRole } from '../types'
const TIER_COLORS: Record<string, string> = {
plus: 'text-blue-600 bg-blue-50 border-blue-200',
basic: 'text-muted-foreground bg-muted border-border',
associate: 'text-purple-600 bg-purple-50 border-purple-200',
admin: 'text-primary bg-primary/5 border-primary/20',
}
interface MembersTableProps {
// Already filtered by the orchestrator; the table owns only its sort order.
members: Member[]
isAdmin: boolean
canGrantCerts: boolean
canManageCards: boolean
canViewForms: boolean
areaLeadRoles: AreaLeadRole[]
selected: Set<string>
setSelected: Dispatch<SetStateAction<Set<string>>>
toggleSel: (id: string) => void
onApprove: (memberId: string) => void
onRemove: (memberId: string) => void
onEdit: (m: Member) => void
onCerts: (m: Member) => void
onCards: (m: Member) => void
onForms: (m: Member) => void
onMakeAreaLead: (memberId: string, areaLeadRoleId: string) => void
}
export function MembersTable({
members: filteredMembers,
isAdmin,
canGrantCerts,
canManageCards,
canViewForms,
areaLeadRoles,
selected,
setSelected,
toggleSel,
onApprove,
onRemove,
onEdit,
onCerts,
onCards,
onForms,
onMakeAreaLead,
}: MembersTableProps) {
const [sort, setSort] = useState<{ key: SortKey; dir: 'asc' | 'desc' } | null>(null)
const sortedMembers = sort
? [...filteredMembers].sort((a, b) => {
const dir = sort.dir === 'asc' ? 1 : -1
const val = (m: Member): string => {
switch (sort.key) {
case 'name': return (m.display_name ?? '').toLowerCase()
case 'tier': return m.tier ?? ''
case 'status': return m.status ?? ''
case 'joined': return m.joined_at ?? ''
case 'last_payment': return (m.last_paid_at || m.last_payment_at || '') as string
default: return ''
}
}
return val(a).localeCompare(val(b)) * dir
})
: filteredMembers
function toggleSort(key: SortKey) {
setSort(s =>
s && s.key === key
? (s.dir === 'asc' ? { key, dir: 'desc' } : null)
: { key, dir: 'asc' },
)
}
const caret = (key: SortKey) => (sort?.key === key ? (sort.dir === 'asc' ? ' ↑' : ' ↓') : '')
return (
<div className="bg-card rounded border border-border overflow-hidden">
<div className="overflow-x-auto hidden md:block">
<table className="w-full">
<thead>
<tr className="border-b border-border">
{isAdmin && (
<th className="px-4 py-3 w-8">
<input
type="checkbox"
aria-label="Select all shown members"
checked={sortedMembers.length > 0 && sortedMembers.every(m => selected.has(m.id))}
onChange={e =>
setSelected(e.target.checked ? new Set(sortedMembers.map(m => m.id)) : new Set())
}
/>
</th>
)}
{([
['name', 'MEMBER', ''],
['tier', 'TIER', ''],
['joined', 'JOINED', 'hidden md:table-cell'],
['last_payment', 'LAST PAYMENT', 'hidden lg:table-cell'],
['status', 'STATUS', ''],
] as [SortKey, string, string][]).map(([key, label, cls]) => (
<th key={key} className={`px-4 py-3 text-left font-mono text-[10px] tracking-widest text-muted-foreground ${cls}`}>
<button
type="button"
onClick={() => toggleSort(key)}
className="font-mono text-[10px] tracking-widest uppercase hover:text-foreground transition"
aria-label={`Sort by ${label}`}
>
{label}{caret(key)}
</button>
</th>
))}
{canGrantCerts && (
<th className="px-4 py-3 text-left font-mono text-[10px] tracking-widest text-muted-foreground">CERTS</th>
)}
{canManageCards && (
<th className="px-4 py-3 text-left font-mono text-[10px] tracking-widest text-muted-foreground">CARDS</th>
)}
{canViewForms && (
<th className="px-4 py-3 text-left font-mono text-[10px] tracking-widest text-muted-foreground">FORMS</th>
)}
{isAdmin && (
<th className="px-4 py-3 text-left font-mono text-[10px] tracking-widest text-muted-foreground">ACTIONS</th>
)}
</tr>
</thead>
<tbody className="divide-y divide-border">
{sortedMembers.length > 0 ? sortedMembers.map(m => {
const initials = (m.display_name || 'U').split(' ').map((n: string) => n[0]).join('').toUpperCase().slice(0, 2)
const hasIssue = m.payment_status && m.payment_status !== 'current'
return (
<tr key={m.id} className={`hover:bg-muted/30 transition ${hasIssue ? 'bg-red-50/20' : ''}`}>
{isAdmin && (
<td className="px-4 py-3 w-8">
<input
type="checkbox"
aria-label={`Select ${m.display_name}`}
checked={selected.has(m.id)}
onChange={() => toggleSel(m.id)}
/>
</td>
)}
<td className="px-4 py-3">
<div className="flex items-center gap-3">
<div className={`w-8 h-8 rounded flex items-center justify-center text-[10px] font-mono font-bold flex-shrink-0 ${
hasIssue ? 'bg-red-100 text-red-600' : 'bg-primary/10 text-primary'
}`}>
{initials}
</div>
<div>
<p className="font-sans text-sm font-medium text-foreground">{m.display_name}</p>
<p className={`font-mono text-[10px] ${hasIssue ? 'text-red-500' : 'text-muted-foreground'}`}>
{m.email}{m.handle ? ` · @${m.handle}` : ''}{m.payment_note ? ` — ${m.payment_note}` : ''}
</p>
</div>
</div>
</td>
<td className="px-4 py-3">
<span className={`font-mono text-[10px] px-2 py-0.5 rounded border ${TIER_COLORS[m.tier?.toLowerCase()] ?? 'text-muted-foreground bg-muted border-border'}`}>
{m.tier?.toUpperCase()}
</span>
</td>
<td className="px-4 py-3 font-mono text-xs text-muted-foreground hidden md:table-cell">
{m.joined_at ? new Date(m.joined_at).toLocaleDateString('en-US', { month: 'short', year: 'numeric' }) : '-'}
</td>
<td className="px-4 py-3 font-mono text-xs text-muted-foreground hidden lg:table-cell">
{(m.last_paid_at || m.last_payment_at) ? new Date((m.last_paid_at || m.last_payment_at)!).toLocaleDateString('en-US', { month: 'short', year: 'numeric' }) : '-'}
</td>
<td className="px-4 py-3">
{m.status === 'unverified' ? (
<span className="flex items-center gap-1 font-mono text-xs text-orange-600">
<span className="w-1.5 h-1.5 rounded-full bg-orange-400" /> unverified
</span>
) : m.payment_status === 'current' ? (
<span className="flex items-center gap-1 font-mono text-xs text-primary">
<span className="w-1.5 h-1.5 rounded-full bg-primary" /> current
</span>
) : m.payment_status ? (
<span className="flex items-center gap-1 font-mono text-xs text-red-600">
<span className="w-1.5 h-1.5 rounded-full bg-red-500" /> {m.payment_status}
</span>
) : (
<span className="font-mono text-xs text-muted-foreground">{m.status}</span>
)}
</td>
{canGrantCerts && (
<td className="px-4 py-3">
<button
onClick={() => onCerts(m)}
className="font-mono text-[10px] border border-border px-3 py-2 min-h-[44px] rounded hover:border-primary hover:text-primary transition"
>
CERTS
</button>
</td>
)}
{canManageCards && (
<td className="px-4 py-3">
<button
onClick={() => onCards(m)}
className="font-mono text-[10px] border border-border px-3 py-2 min-h-[44px] rounded hover:border-primary hover:text-primary transition"
>
CARDS
</button>
</td>
)}
{canViewForms && (
<td className="px-4 py-3">
<button
onClick={() => onForms(m)}
className="font-mono text-[10px] border border-border px-3 py-2 min-h-[44px] rounded hover:border-primary hover:text-primary transition"
>
FORMS
</button>
</td>
)}
{isAdmin && (
<td className="px-4 py-3">
<div className="flex items-center gap-2">
{m.status === 'unverified' && (
<button
onClick={() => onApprove(m.id)}
className="font-mono text-[10px] border border-primary/30 text-primary bg-primary/5 px-3 py-2 min-h-[44px] rounded hover:bg-primary/10 transition"
>
APPROVE
</button>
)}
<button
onClick={() => onEdit(m)}
className="font-mono text-[10px] border border-border px-3 py-2 min-h-[44px] rounded hover:border-primary hover:text-primary transition"
>
EDIT
</button>
<button
onClick={() => onRemove(m.id)}
className="font-mono text-[10px] border border-border px-3 py-2 min-h-[44px] rounded hover:border-red-300 hover:text-red-600 transition"
>
REMOVE
</button>
{areaLeadRoles.length > 0 && (
<select
defaultValue=""
onChange={e => { onMakeAreaLead(m.id, e.target.value); e.currentTarget.value = '' }}
className="font-mono text-[10px] border border-border px-2 py-2 min-h-[44px] rounded bg-background text-muted-foreground hover:border-primary hover:text-primary transition focus:outline-none"
title="Assign this member as an area lead"
>
<option value="">+ area lead</option>
{areaLeadRoles.map(r => (
<option key={r.id} value={r.id}>
{r.area_name}{r.lead_id ? ' (reassign)' : ' (vacant)'}
</option>
))}
</select>
)}
</div>
</td>
)}
</tr>
)
}) : (
<tr>
<td colSpan={5 + (isAdmin ? 1 : 0) + (canGrantCerts ? 1 : 0) + (canManageCards ? 1 : 0) + (canViewForms ? 1 : 0) + (isAdmin ? 1 : 0)} className="p-0">
<Empty className="border-0">
<EmptyHeader>
<EmptyMedia variant="icon"><Users /></EmptyMedia>
<EmptyTitle>No members match this filter</EmptyTitle>
<EmptyDescription>Try a different tab, clear the search, or change the tier filter.</EmptyDescription>
</EmptyHeader>
</Empty>
</td>
</tr>
)}
</tbody>
</table>
</div>
{/* Mobile: stacked cards (the table is unusable on phones). */}
<div className="md:hidden divide-y divide-border">
{sortedMembers.length > 0 ? sortedMembers.map(m => {
const hasIssue = m.payment_status && m.payment_status !== 'current'
return (
<div key={m.id} className={`p-4 ${hasIssue ? 'bg-red-50/20' : ''}`}>
<div className="flex items-start justify-between gap-3">
<div className="min-w-0 flex items-start gap-2">
{isAdmin && (
<input
type="checkbox"
aria-label={`Select ${m.display_name}`}
className="mt-1"
checked={selected.has(m.id)}
onChange={() => toggleSel(m.id)}
/>
)}
<div className="min-w-0">
<p className="font-sans text-sm font-medium text-foreground truncate">{m.display_name}</p>
<p className={`font-mono text-[10px] truncate ${hasIssue ? 'text-red-500' : 'text-muted-foreground'}`}>{m.email}</p>
</div>
</div>
<span className={`font-mono text-[10px] px-2 py-0.5 rounded border shrink-0 ${TIER_COLORS[m.tier?.toLowerCase()] ?? 'text-muted-foreground bg-muted border-border'}`}>
{m.tier?.toUpperCase()}
</span>
</div>
<p className="font-mono text-[10px] text-muted-foreground mt-1">
{m.status === 'unverified' ? 'unverified' : (m.payment_status || m.status)}
{m.joined_at ? ` · joined ${new Date(m.joined_at).toLocaleDateString('en-US', { month: 'short', year: 'numeric' })}` : ''}
</p>
<div className="flex flex-wrap gap-2 mt-3">
{isAdmin && m.status === 'unverified' && (
<button onClick={() => onApprove(m.id)} className="font-mono text-[10px] border border-primary/30 text-primary bg-primary/5 px-3 py-2 min-h-[44px] rounded">APPROVE</button>
)}
{isAdmin && (
<button onClick={() => onEdit(m)} className="font-mono text-[10px] border border-border px-3 py-2 min-h-[44px] rounded">EDIT</button>
)}
{canGrantCerts && (
<button onClick={() => onCerts(m)} className="font-mono text-[10px] border border-border px-3 py-2 min-h-[44px] rounded">CERTS</button>
)}
{canManageCards && (
<button onClick={() => onCards(m)} className="font-mono text-[10px] border border-border px-3 py-2 min-h-[44px] rounded">CARDS</button>
)}
{canViewForms && (
<button onClick={() => onForms(m)} className="font-mono text-[10px] border border-border px-3 py-2 min-h-[44px] rounded">FORMS</button>
)}
{isAdmin && (
<button onClick={() => onRemove(m.id)} className="font-mono text-[10px] border border-border px-3 py-2 min-h-[44px] rounded hover:border-red-300 hover:text-red-600">REMOVE</button>
)}
</div>
</div>
)
}) : (
<Empty className="border-0">
<EmptyHeader>
<EmptyMedia variant="icon"><Users /></EmptyMedia>
<EmptyTitle>No members match this filter</EmptyTitle>
<EmptyDescription>Try a different tab, clear the search, or change the tier filter.</EmptyDescription>
</EmptyHeader>
</Empty>
)}
</div>
</div>
)
}
@@ -0,0 +1,97 @@
'use client'
import type { Dispatch, SetStateAction } from 'react'
import type { MemberTab } from '../types'
interface MembersTabsProps {
activeTab: MemberTab
setActiveTab: Dispatch<SetStateAction<MemberTab>>
total: number
paymentIssues: number
unverified: number
}
// Full-bleed tab bar (sits directly under the page header, outside the padded
// content region), so it is its own component rather than part of the filters.
export function MembersTabs({ activeTab, setActiveTab, total, paymentIssues, unverified }: MembersTabsProps) {
return (
<div className="bg-card border-b border-border px-4 md:px-6 flex gap-4 md:gap-6 overflow-x-auto">
{[
{ key: 'all', label: `All ${total}` },
{ key: 'payment_issues', label: `Payment Issues ${paymentIssues}` },
{ key: 'unverified', label: `Pending Approval ${unverified}` },
{ key: 'inactive', label: 'Inactive' },
].map(({ key, label }) => (
<button
key={key}
onClick={() => setActiveTab(key as MemberTab)}
className={`font-sans text-sm py-3 border-b-2 transition ${
activeTab === key ? 'border-primary text-primary' : 'border-transparent text-muted-foreground hover:text-foreground'
}`}
>
{label}
</button>
))}
</div>
)
}
interface MembersToolbarProps {
search: string
setSearch: Dispatch<SetStateAction<string>>
tierFilter: string
setTierFilter: Dispatch<SetStateAction<string>>
canBulk: boolean
selectedCount: number
onBulkApprove: () => void
onClearSelection: () => void
}
// Search + tier filter row, plus the bulk-actions bar shown when a selection
// exists. Renders as a fragment so the surrounding padded content div is
// unchanged.
export function MembersToolbar({ search, setSearch, tierFilter, setTierFilter, canBulk, selectedCount, onBulkApprove, onClearSelection }: MembersToolbarProps) {
return (
<>
<div className="flex gap-3 mb-4">
<div className="flex-1 relative">
<svg className="absolute left-3 top-1/2 -translate-y-1/2 w-4 h-4 text-muted-foreground" 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="text"
aria-label="Search members"
placeholder="Search..."
value={search}
onChange={e => setSearch(e.target.value)}
className="w-full bg-card border border-border rounded pl-9 pr-4 py-2 font-sans text-sm text-foreground placeholder:text-muted-foreground focus:outline-none focus:border-primary transition"
/>
</div>
<select
value={tierFilter}
onChange={e => setTierFilter(e.target.value)}
className="bg-card border border-border text-foreground text-sm font-sans rounded px-2 md:px-3 py-2 focus:outline-none focus:border-primary"
>
<option value="">All Tiers</option>
<option value="plus">Plus</option>
<option value="basic">Basic</option>
<option value="associate">Associate</option>
</select>
</div>
{canBulk && selectedCount > 0 && (
<div className="sticky top-0 z-10 flex items-center justify-between gap-3 rounded-lg border border-primary/30 bg-primary/5 px-4 py-2">
<span className="font-mono text-xs text-foreground">{selectedCount} selected</span>
<span className="flex items-center gap-2">
<button onClick={onBulkApprove} className="font-mono text-[10px] border border-primary/30 text-primary bg-primary/10 px-3 py-2 min-h-[40px] rounded hover:bg-primary/15 transition">
Approve selected
</button>
<button onClick={onClearSelection} className="font-mono text-[10px] border border-border px-3 py-2 min-h-[40px] rounded hover:border-primary transition">
Clear
</button>
</span>
</div>
)}
</>
)
}