MOPC/MOPC-Portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: admin UX improvements — notify buttons, eval config, round finalization

Browse Source 
Custom body support for advancement/rejection notification emails, evaluation
config toggle fix, user actions improvements, round finalization with reorder
support, project detail page enhancements, award pool duplicate prevention.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Matt
2026-03-04 13:29:22 +01:00
parent f24bea3df2
commit 1103d42439
11 changed files with 606 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/components/admin/user-actions.tsx
View File

@@ -7,6 +7,7 @@ import { Button } from '@/components/ui/button'
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuCheckboxItem,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuSub,
@@ -32,7 +33,6 @@ import {
Trash2,
Loader2,
Shield,
Check,
} from 'lucide-react'
type Role = 'SUPER_ADMIN' | 'PROGRAM_ADMIN' | 'JURY_MEMBER' | 'MENTOR' | 'OBSERVER'
@@ -50,10 +50,11 @@ interface UserActionsProps {
userEmail: string
userStatus: string
userRole: Role
userRoles?: Role[]
currentUserRole?: Role
}
export function UserActions({ userId, userEmail, userStatus, userRole, currentUserRole }: UserActionsProps) {
export function UserActions({ userId, userEmail, userStatus, userRole, userRoles, currentUserRole }: UserActionsProps) {
const [showDeleteDialog, setShowDeleteDialog] = useState(false)
const [isSending, setIsSending] = useState(false)
@@ -64,13 +65,13 @@ export function UserActions({ userId, userEmail, userStatus, userRole, currentUs
utils.user.list.invalidate()
},
})
const updateUser = trpc.user.update.useMutation({
const updateRoles = trpc.user.updateRoles.useMutation({
onSuccess: () => {
utils.user.list.invalidate()
toast.success('Role updated successfully')
toast.success('Roles updated successfully')
},
onError: (error) => {
toast.error(error.message || 'Failed to update role')
toast.error(error.message || 'Failed to update roles')
},
})
@@ -88,9 +89,20 @@ export function UserActions({ userId, userEmail, userStatus, userRole, currentUs
// Can this user's role be changed by the current user?
const canChangeRole = isSuperAdmin || (!['SUPER_ADMIN', 'PROGRAM_ADMIN'].includes(userRole))
const handleRoleChange = (newRole: Role) => {
if (newRole === userRole) return
updateUser.mutate({ id: userId, role: newRole })
// Current roles for this user (array or fallback to single role)
const currentRoles: Role[] = userRoles?.length ? userRoles : [userRole]
const handleToggleRole = (role: Role) => {
const has = currentRoles.includes(role)
let newRoles: Role[]
if (has) {
// Don't allow removing the last role
if (currentRoles.length <= 1) return
newRoles = currentRoles.filter(r => r !== role)
} else {
newRoles = [...currentRoles, role]
}
updateRoles.mutate({ userId, roles: newRoles })
}
const handleSendInvitation = async () => {
@@ -144,22 +156,20 @@ export function UserActions({ userId, userEmail, userStatus, userRole, currentUs
</DropdownMenuItem>
{canChangeRole && (
<DropdownMenuSub>
<DropdownMenuSubTrigger disabled={updateUser.isPending}>
<DropdownMenuSubTrigger disabled={updateRoles.isPending}>
<Shield className="mr-2 h-4 w-4" />
{updateUser.isPending ? 'Updating...' : 'Change Role'}
{updateRoles.isPending ? 'Updating...' : 'Roles'}
</DropdownMenuSubTrigger>
<DropdownMenuSubContent>
{getAvailableRoles().map((role) => (
<DropdownMenuItem
<DropdownMenuCheckboxItem
key={role}
onClick={() => handleRoleChange(role)}
disabled={role === userRole}
checked={currentRoles.includes(role)}
onCheckedChange={() => handleToggleRole(role)}
disabled={currentRoles.includes(role) && currentRoles.length <= 1}
>
{role === userRole && <Check className="mr-2 h-4 w-4" />}
<span className={role === userRole ? 'font-medium' : role !== userRole ? 'ml-6' : ''}>
{ROLE_LABELS[role]}
</span>
</DropdownMenuItem>
{ROLE_LABELS[role]}
</DropdownMenuCheckboxItem>
))}
</DropdownMenuSubContent>
</DropdownMenuSub>
@@ -214,6 +224,7 @@ interface UserMobileActionsProps {
userEmail: string
userStatus: string
userRole: Role
userRoles?: Role[]
currentUserRole?: Role
}
@@ -222,23 +233,25 @@ export function UserMobileActions({
userEmail,
userStatus,
userRole,
userRoles,
currentUserRole,
}: UserMobileActionsProps) {
const [isSending, setIsSending] = useState(false)
const utils = trpc.useUtils()
const sendInvitation = trpc.user.sendInvitation.useMutation()
const updateUser = trpc.user.update.useMutation({
const updateRoles = trpc.user.updateRoles.useMutation({
onSuccess: () => {
utils.user.list.invalidate()
toast.success('Role updated successfully')
toast.success('Roles updated successfully')
},
onError: (error) => {
toast.error(error.message || 'Failed to update role')
toast.error(error.message || 'Failed to update roles')
},
})
const isSuperAdmin = currentUserRole === 'SUPER_ADMIN'
const canChangeRole = isSuperAdmin || (!['SUPER_ADMIN', 'PROGRAM_ADMIN'].includes(userRole))
const currentRoles: Role[] = userRoles?.length ? userRoles : [userRole]
const handleSendInvitation = async () => {
if (userStatus !== 'NONE' && userStatus !== 'INVITED') {
@@ -283,21 +296,31 @@ export function UserMobileActions({
</Button>
</div>
{canChangeRole && (
<select
value={userRole}
onChange={(e) => updateUser.mutate({ id: userId, role: e.target.value as Role })}
disabled={updateUser.isPending}
className="w-full rounded-md border border-input bg-background px-3 py-1.5 text-sm"
>
<div className="flex flex-wrap gap-1.5">
{(isSuperAdmin
? (['SUPER_ADMIN', 'PROGRAM_ADMIN', 'JURY_MEMBER', 'MENTOR', 'OBSERVER'] as Role[])
: (['JURY_MEMBER', 'MENTOR', 'OBSERVER'] as Role[])
).map((role) => (
<option key={role} value={role}>
{ROLE_LABELS[role]}
</option>
))}
</select>
).map((role) => {
const isActive = currentRoles.includes(role)
return (
<Button
key={role}
variant={isActive ? 'default' : 'outline'}
size="sm"
className="h-6 text-xs px-2"
disabled={updateRoles.isPending || (isActive && currentRoles.length <= 1)}
onClick={() => {
const newRoles = isActive
? currentRoles.filter(r => r !== role)
: [...currentRoles, role]
updateRoles.mutate({ userId, roles: newRoles })
}}
>
{ROLE_LABELS[role]}
</Button>
)
})}
</div>
)}
</div>
)