Implement Prototype 1 improvements: unified members, project filters, audit expansion, filtering rounds, special awards

- Unified Member Management: merge /admin/users and /admin/mentors into /admin/members with role tabs, search, pagination
- Project List Filters: add search, multi-status filter, round/category/country selects, boolean toggles, URL persistence
- Audit Log Expansion: track logins, round state changes, evaluation submissions, file access, role changes via shared logAudit utility
- Founding Date Field: add foundedAt to Project model with CSV import support
- Filtering Round System: configurable rules (field-based, document check, AI screening), execution engine, results review with override/reinstate
- Special Awards System: named awards with eligibility criteria, dedicated jury, PICK_WINNER/RANKED/SCORED voting modes, AI eligibility
- Dashboard resilience: wrap heavy queries in try-catch to prevent error boundary on transient DB failures
- Reusable pagination component extracted to src/components/shared/pagination.tsx
- Old /admin/users and /admin/mentors routes redirect to /admin/members
- Prisma migration for all schema additions (additive, no data loss)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
2026-02-02 16:58:29 +01:00
parent 8fda8deded
commit 90e3adfab2
44 changed files with 7268 additions and 2154 deletions

View File

@@ -0,0 +1,353 @@
'use client'
import { useState, useCallback, useEffect } from 'react'
import Link from 'next/link'
import { useSearchParams, usePathname } from 'next/navigation'
import { trpc } from '@/lib/trpc/client'
import { Badge } from '@/components/ui/badge'
import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input'
import {
Card,
CardContent,
CardDescription,
CardHeader,
CardTitle,
} from '@/components/ui/card'
import {
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
} from '@/components/ui/table'
import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs'
import { Skeleton } from '@/components/ui/skeleton'
import { UserAvatar } from '@/components/shared/user-avatar'
import { UserActions, UserMobileActions } from '@/components/admin/user-actions'
import { Pagination } from '@/components/shared/pagination'
import { Plus, Users, Search } from 'lucide-react'
import { formatDate } from '@/lib/utils'
type RoleValue = 'SUPER_ADMIN' | 'PROGRAM_ADMIN' | 'JURY_MEMBER' | 'MENTOR' | 'OBSERVER'
type TabKey = 'all' | 'jury' | 'mentors' | 'observers' | 'admins'
const TAB_ROLES: Record<TabKey, RoleValue[] | undefined> = {
all: undefined,
jury: ['JURY_MEMBER'],
mentors: ['MENTOR'],
observers: ['OBSERVER'],
admins: ['SUPER_ADMIN', 'PROGRAM_ADMIN'],
}
const statusColors: Record<string, 'default' | 'success' | 'secondary' | 'destructive'> = {
ACTIVE: 'success',
INVITED: 'secondary',
SUSPENDED: 'destructive',
}
const roleColors: Record<string, 'default' | 'outline' | 'secondary'> = {
JURY_MEMBER: 'default',
MENTOR: 'secondary',
OBSERVER: 'outline',
PROGRAM_ADMIN: 'default',
SUPER_ADMIN: 'destructive' as 'default',
}
export function MembersContent() {
const searchParams = useSearchParams()
const pathname = usePathname()
const tab = (searchParams.get('tab') as TabKey) || 'all'
const search = searchParams.get('search') || ''
const page = parseInt(searchParams.get('page') || '1', 10)
const [searchInput, setSearchInput] = useState(search)
// Debounced search
useEffect(() => {
const timer = setTimeout(() => {
updateParams({ search: searchInput || null, page: '1' })
}, 300)
return () => clearTimeout(timer)
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [searchInput])
const updateParams = useCallback(
(updates: Record<string, string | null>) => {
const params = new URLSearchParams(searchParams.toString())
Object.entries(updates).forEach(([key, value]) => {
if (value === null || value === '') {
params.delete(key)
} else {
params.set(key, value)
}
})
window.history.replaceState(null, '', `${pathname}?${params.toString()}`)
},
[searchParams, pathname]
)
const roles = TAB_ROLES[tab]
const { data, isLoading } = trpc.user.list.useQuery({
roles: roles,
search: search || undefined,
page,
perPage: 20,
})
const handleTabChange = (value: string) => {
updateParams({ tab: value === 'all' ? null : value, page: '1' })
}
return (
<div className="space-y-6">
{/* Header */}
<div className="flex items-center justify-between">
<div>
<h1 className="text-2xl font-semibold tracking-tight">Members</h1>
<p className="text-muted-foreground">
Manage jury members, mentors, observers, and admins
</p>
</div>
<Button asChild>
<Link href="/admin/members/invite">
<Plus className="mr-2 h-4 w-4" />
Invite Member
</Link>
</Button>
</div>
{/* Tabs */}
<Tabs value={tab} onValueChange={handleTabChange}>
<div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
<TabsList>
<TabsTrigger value="all">All</TabsTrigger>
<TabsTrigger value="jury">Jury</TabsTrigger>
<TabsTrigger value="mentors">Mentors</TabsTrigger>
<TabsTrigger value="observers">Observers</TabsTrigger>
<TabsTrigger value="admins">Admins</TabsTrigger>
</TabsList>
{/* Search */}
<div className="relative w-full sm:w-64">
<Search className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
<Input
placeholder="Search by name or email..."
value={searchInput}
onChange={(e) => setSearchInput(e.target.value)}
className="pl-9"
/>
</div>
</div>
</Tabs>
{/* Content */}
{isLoading ? (
<MembersSkeleton />
) : data && data.users.length > 0 ? (
<>
{/* Desktop table */}
<Card className="hidden md:block">
<Table>
<TableHeader>
<TableRow>
<TableHead>Member</TableHead>
<TableHead>Role</TableHead>
<TableHead>Expertise</TableHead>
<TableHead>Assignments</TableHead>
<TableHead>Status</TableHead>
<TableHead>Last Login</TableHead>
<TableHead className="text-right">Actions</TableHead>
</TableRow>
</TableHeader>
<TableBody>
{data.users.map((user) => (
<TableRow key={user.id}>
<TableCell>
<div className="flex items-center gap-3">
<UserAvatar
user={user}
avatarUrl={(user as Record<string, unknown>).avatarUrl as string | undefined}
size="sm"
/>
<div>
<p className="font-medium">{user.name || 'Unnamed'}</p>
<p className="text-sm text-muted-foreground">
{user.email}
</p>
</div>
</div>
</TableCell>
<TableCell>
<Badge variant={roleColors[user.role] || 'secondary'}>
{user.role.replace(/_/g, ' ')}
</Badge>
</TableCell>
<TableCell>
{user.expertiseTags && user.expertiseTags.length > 0 ? (
<div className="flex flex-wrap gap-1">
{user.expertiseTags.slice(0, 2).map((tag) => (
<Badge key={tag} variant="outline" className="text-xs">
{tag}
</Badge>
))}
{user.expertiseTags.length > 2 && (
<Badge variant="outline" className="text-xs">
+{user.expertiseTags.length - 2}
</Badge>
)}
</div>
) : (
<span className="text-sm text-muted-foreground">-</span>
)}
</TableCell>
<TableCell>
<div>
{user.role === 'MENTOR' ? (
<p>{user._count.mentorAssignments} mentored</p>
) : (
<p>{user._count.assignments} assigned</p>
)}
</div>
</TableCell>
<TableCell>
<Badge variant={statusColors[user.status] || 'secondary'}>
{user.status}
</Badge>
</TableCell>
<TableCell>
{user.lastLoginAt ? (
formatDate(user.lastLoginAt)
) : (
<span className="text-muted-foreground">Never</span>
)}
</TableCell>
<TableCell className="text-right">
<UserActions
userId={user.id}
userEmail={user.email}
userStatus={user.status}
/>
</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</Card>
{/* Mobile cards */}
<div className="space-y-4 md:hidden">
{data.users.map((user) => (
<Card key={user.id}>
<CardHeader className="pb-3">
<div className="flex items-start justify-between">
<div className="flex items-center gap-3">
<UserAvatar
user={user}
avatarUrl={(user as Record<string, unknown>).avatarUrl as string | undefined}
size="md"
/>
<div>
<CardTitle className="text-base">
{user.name || 'Unnamed'}
</CardTitle>
<CardDescription className="text-xs">
{user.email}
</CardDescription>
</div>
</div>
<Badge variant={statusColors[user.status] || 'secondary'}>
{user.status}
</Badge>
</div>
</CardHeader>
<CardContent className="space-y-3">
<div className="flex items-center justify-between text-sm">
<span className="text-muted-foreground">Role</span>
<Badge variant={roleColors[user.role] || 'secondary'}>
{user.role.replace(/_/g, ' ')}
</Badge>
</div>
<div className="flex items-center justify-between text-sm">
<span className="text-muted-foreground">Assignments</span>
<span>
{user.role === 'MENTOR'
? `${user._count.mentorAssignments} mentored`
: `${user._count.assignments} assigned`}
</span>
</div>
{user.expertiseTags && user.expertiseTags.length > 0 && (
<div className="flex flex-wrap gap-1">
{user.expertiseTags.map((tag) => (
<Badge key={tag} variant="outline" className="text-xs">
{tag}
</Badge>
))}
</div>
)}
<UserMobileActions
userId={user.id}
userEmail={user.email}
userStatus={user.status}
/>
</CardContent>
</Card>
))}
</div>
{/* Pagination */}
<Pagination
page={page}
totalPages={data.totalPages}
total={data.total}
perPage={data.perPage}
onPageChange={(newPage) => updateParams({ page: String(newPage) })}
/>
</>
) : (
<Card>
<CardContent className="flex flex-col items-center justify-center py-12 text-center">
<Users className="h-12 w-12 text-muted-foreground/50" />
<p className="mt-2 font-medium">No members found</p>
<p className="text-sm text-muted-foreground">
{search
? 'Try adjusting your search'
: 'Invite members to get started'}
</p>
<Button asChild className="mt-4">
<Link href="/admin/members/invite">
<Plus className="mr-2 h-4 w-4" />
Invite Member
</Link>
</Button>
</CardContent>
</Card>
)}
</div>
)
}
function MembersSkeleton() {
return (
<Card>
<CardContent className="p-6">
<div className="space-y-4">
{[...Array(5)].map((_, i) => (
<div key={i} className="flex items-center gap-4">
<Skeleton className="h-10 w-10 rounded-full" />
<div className="flex-1 space-y-2">
<Skeleton className="h-5 w-32" />
<Skeleton className="h-4 w-48" />
</div>
<Skeleton className="h-9 w-9" />
</div>
))}
</div>
</CardContent>
</Card>
)
}

View File

@@ -88,7 +88,7 @@ export function UserActions({ userId, userEmail, userStatus }: UserActionsProps)
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<DropdownMenuItem asChild>
<Link href={`/admin/users/${userId}`}>
<Link href={`/admin/members/${userId}`}>
<UserCog className="mr-2 h-4 w-4" />
Edit
</Link>
@@ -172,7 +172,7 @@ export function UserMobileActions({
return (
<div className="flex gap-2 pt-2">
<Button variant="outline" size="sm" className="flex-1" asChild>
<Link href={`/admin/users/${userId}`}>
<Link href={`/admin/members/${userId}`}>
<UserCog className="mr-2 h-4 w-4" />
Edit
</Link>

View File

@@ -51,6 +51,7 @@ const PROJECT_FIELDS = [
{ key: 'teamName', label: 'Team Name', required: false },
{ key: 'description', label: 'Description', required: false },
{ key: 'tags', label: 'Tags (comma-separated)', required: false },
{ key: 'foundedAt', label: 'Founded Date', required: false },
]
interface ParsedRow {

View File

@@ -30,8 +30,8 @@ import {
Handshake,
FileText,
CircleDot,
GraduationCap,
History,
Trophy,
User,
} from 'lucide-react'
import { getInitials } from '@/lib/utils'
@@ -60,21 +60,21 @@ const navigation = [
href: '/admin/rounds' as const,
icon: CircleDot,
},
{
name: 'Awards',
href: '/admin/awards' as const,
icon: Trophy,
},
{
name: 'Projects',
href: '/admin/projects' as const,
icon: ClipboardList,
},
{
name: 'Jury Members',
href: '/admin/users' as const,
name: 'Members',
href: '/admin/members' as const,
icon: Users,
},
{
name: 'Mentors',
href: '/admin/mentors' as const,
icon: GraduationCap,
},
{
name: 'Reports',
href: '/admin/reports' as const,

View File

@@ -0,0 +1,56 @@
'use client'
import { Button } from '@/components/ui/button'
import { ChevronLeft, ChevronRight } from 'lucide-react'
interface PaginationProps {
page: number
totalPages: number
total: number
perPage: number
onPageChange: (page: number) => void
}
export function Pagination({
page,
totalPages,
total,
perPage,
onPageChange,
}: PaginationProps) {
if (totalPages <= 1) return null
const from = (page - 1) * perPage + 1
const to = Math.min(page * perPage, total)
return (
<div className="flex items-center justify-between">
<p className="text-sm text-muted-foreground">
Showing {from} to {to} of {total} results
</p>
<div className="flex items-center gap-2">
<Button
variant="outline"
size="sm"
onClick={() => onPageChange(page - 1)}
disabled={page === 1}
>
<ChevronLeft className="h-4 w-4" />
Previous
</Button>
<span className="text-sm">
Page {page} of {totalPages}
</span>
<Button
variant="outline"
size="sm"
onClick={() => onPageChange(page + 1)}
disabled={page >= totalPages}
>
Next
<ChevronRight className="h-4 w-4" />
</Button>
</div>
</div>
)
}

View File

@@ -0,0 +1,111 @@
'use client'
import { trpc } from '@/lib/trpc/client'
import { Badge } from '@/components/ui/badge'
import {
Card,
CardContent,
CardDescription,
CardHeader,
CardTitle,
} from '@/components/ui/card'
import { Skeleton } from '@/components/ui/skeleton'
import { Clock, Activity } from 'lucide-react'
import { formatDate } from '@/lib/utils'
const actionColors: Record<string, 'default' | 'destructive' | 'secondary' | 'outline'> = {
CREATE: 'default',
UPDATE: 'secondary',
DELETE: 'destructive',
LOGIN_SUCCESS: 'outline',
LOGIN_FAILED: 'destructive',
INVITATION_ACCEPTED: 'default',
EVALUATION_SUBMITTED: 'default',
SUBMIT_EVALUATION: 'default',
ROLE_CHANGED: 'secondary',
PASSWORD_SET: 'outline',
PASSWORD_CHANGED: 'outline',
FILE_DOWNLOADED: 'outline',
ROUND_ACTIVATED: 'default',
ROUND_CLOSED: 'secondary',
}
interface UserActivityLogProps {
userId: string
limit?: number
}
export function UserActivityLog({ userId, limit = 20 }: UserActivityLogProps) {
const { data: logs, isLoading } = trpc.audit.getByUser.useQuery({
userId,
limit,
})
if (isLoading) {
return (
<Card>
<CardHeader>
<CardTitle>Activity Log</CardTitle>
</CardHeader>
<CardContent>
<div className="space-y-3">
{[...Array(5)].map((_, i) => (
<div key={i} className="flex items-center gap-3">
<Skeleton className="h-4 w-32" />
<Skeleton className="h-6 w-20" />
<Skeleton className="h-4 w-24" />
</div>
))}
</div>
</CardContent>
</Card>
)
}
return (
<Card>
<CardHeader>
<CardTitle className="flex items-center gap-2">
<Activity className="h-5 w-5" />
Activity Log
</CardTitle>
<CardDescription>Recent actions by this member</CardDescription>
</CardHeader>
<CardContent>
{logs && logs.length > 0 ? (
<div className="space-y-3">
{logs.map((log) => (
<div
key={log.id}
className="flex items-center gap-3 text-sm"
>
<div className="flex items-center gap-1 text-muted-foreground shrink-0 w-36">
<Clock className="h-3 w-3" />
<span className="text-xs font-mono">
{formatDate(log.timestamp)}
</span>
</div>
<Badge
variant={actionColors[log.action] || 'secondary'}
className="shrink-0"
>
{log.action.replace(/_/g, ' ')}
</Badge>
<span className="text-muted-foreground truncate">
{log.entityType}
{log.entityId && (
<span className="font-mono text-xs ml-1">
{log.entityId.slice(0, 8)}...
</span>
)}
</span>
</div>
))}
</div>
) : (
<p className="text-sm text-muted-foreground">No activity recorded yet.</p>
)}
</CardContent>
</Card>
)
}