refactor: admin section UX/UI redesign
All checks were successful
Build & Publish / publish (push) Successful in 43s
All checks were successful
Build & Publish / publish (push) Successful in 43s
- Fix critical --bg-base token bug (dark mode broken), replace with --bg-surface - Replace hand-rolled admin nav with Tabs composite (proper ARIA) - Migrate AuditLog from custom table to DataTable with sorting, row accents, card wrapper - Remove duplicate h2 page titles (breadcrumb + tab already identify the page) - Rework user creation with provider-aware form (Local/OIDC RadioGroup) - Add Security section with password reset for local users, OIDC info for external - Add toast notifications to all RBAC mutations (create/delete/add/remove) - Add confirmation dialogs for cascading removals (group/role) - Add keyboard accessibility to entity lists (role/tabIndex/aria-selected) - Add empty search states, duplicate name validation - Replace lock emoji with Badge, fix radii/shadow/padding consistency - Badge dashed variant keeps background color - Inherited roles shown with dashed outline + reduced opacity - Inline MultiSelect (+Add) for groups, roles, members, child groups - Center OIDC form, replace inline styles with CSS modules Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
hsiegeln
@@ -10,15 +10,19 @@ import { Tag } from '../../../design-system/primitives/Tag/Tag'
|
||||
import { InlineEdit } from '../../../design-system/primitives/InlineEdit/InlineEdit'
|
||||
import { MultiSelect } from '../../../design-system/composites/MultiSelect/MultiSelect'
|
||||
import { ConfirmDialog } from '../../../design-system/composites/ConfirmDialog/ConfirmDialog'
|
||||
import { AlertDialog } from '../../../design-system/composites/AlertDialog/AlertDialog'
|
||||
import { useToast } from '../../../design-system/composites/Toast/Toast'
|
||||
import { MOCK_GROUPS, MOCK_USERS, MOCK_ROLES, getChildGroups, type MockGroup } from './rbacMocks'
|
||||
import styles from './UserManagement.module.css'
|
||||
|
||||
export function GroupsTab() {
|
||||
const { toast } = useToast()
|
||||
const [groups, setGroups] = useState(MOCK_GROUPS)
|
||||
const [search, setSearch] = useState('')
|
||||
const [selectedId, setSelectedId] = useState<string | null>(null)
|
||||
const [creating, setCreating] = useState(false)
|
||||
const [deleteTarget, setDeleteTarget] = useState<MockGroup | null>(null)
|
||||
const [removeRoleTarget, setRemoveRoleTarget] = useState<string | null>(null)
|
||||
|
||||
const [newName, setNewName] = useState('')
|
||||
const [newParent, setNewParent] = useState('')
|
||||
@@ -45,6 +49,7 @@ export function GroupsTab() {
|
||||
setCreating(false)
|
||||
setNewName(''); setNewParent('')
|
||||
setSelectedId(newGroup.id)
|
||||
toast({ title: 'Group created', description: newGroup.name, variant: 'success' })
|
||||
}
|
||||
|
||||
function handleDelete() {
|
||||
@@ -52,17 +57,24 @@ export function GroupsTab() {
|
||||
setGroups((prev) => prev.filter((g) => g.id !== deleteTarget.id))
|
||||
if (selectedId === deleteTarget.id) setSelectedId(null)
|
||||
setDeleteTarget(null)
|
||||
toast({ title: 'Group deleted', description: deleteTarget.name, variant: 'warning' })
|
||||
}
|
||||
|
||||
function updateGroup(id: string, patch: Partial<MockGroup>) {
|
||||
setGroups((prev) => prev.map((g) => g.id === id ? { ...g, ...patch } : g))
|
||||
}
|
||||
|
||||
const children = selected ? getChildGroups(selected.id) : []
|
||||
const duplicateGroupName = newName.trim() !== '' && groups.some((g) => g.name.toLowerCase() === newName.trim().toLowerCase())
|
||||
|
||||
const children = selected ? groups.filter((g) => g.parentId === selected.id) : []
|
||||
const members = selected ? MOCK_USERS.filter((u) => u.directGroups.includes(selected.id)) : []
|
||||
const parent = selected?.parentId ? groups.find((g) => g.id === selected.parentId) : null
|
||||
const availableRoles = MOCK_ROLES.filter((r) => !selected?.directRoles.includes(r.name))
|
||||
.map((r) => ({ value: r.name, label: r.name }))
|
||||
const availableMembers = MOCK_USERS.filter((u) => !selected || !u.directGroups.includes(selected.id))
|
||||
.map((u) => ({ value: u.id, label: u.displayName }))
|
||||
const availableChildGroups = groups.filter((g) => selected && g.id !== selected.id && g.parentId !== selected.id && !children.some((c) => c.id === g.id))
|
||||
.map((g) => ({ value: g.id, label: g.name }))
|
||||
|
||||
const parentOptions = [
|
||||
{ value: '', label: 'Top-level' },
|
||||
@@ -89,6 +101,7 @@ export function GroupsTab() {
|
||||
{creating && (
|
||||
<div className={styles.createForm}>
|
||||
<Input placeholder="Group name *" value={newName} onChange={(e) => setNewName(e.target.value)} />
|
||||
{duplicateGroupName && <span style={{ color: 'var(--error)', fontSize: 11 }}>Group name already exists</span>}
|
||||
<Select
|
||||
options={parentOptions}
|
||||
value={newParent}
|
||||
@@ -96,14 +109,14 @@ export function GroupsTab() {
|
||||
/>
|
||||
<div className={styles.createFormActions}>
|
||||
<Button size="sm" variant="ghost" onClick={() => setCreating(false)}>Cancel</Button>
|
||||
<Button size="sm" variant="primary" onClick={handleCreate} disabled={!newName.trim()}>Create</Button>
|
||||
<Button size="sm" variant="primary" onClick={handleCreate} disabled={!newName.trim() || duplicateGroupName}>Create</Button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className={styles.entityList}>
|
||||
<div className={styles.entityList} role="listbox" aria-label="Groups">
|
||||
{filtered.map((group) => {
|
||||
const groupChildren = getChildGroups(group.id)
|
||||
const groupChildren = groups.filter((g) => g.parentId === group.id)
|
||||
const groupMembers = MOCK_USERS.filter((u) => u.directGroups.includes(group.id))
|
||||
const groupParent = group.parentId ? groups.find((g) => g.id === group.parentId) : null
|
||||
return (
|
||||
@@ -111,13 +124,17 @@ export function GroupsTab() {
|
||||
key={group.id}
|
||||
className={`${styles.entityItem} ${selectedId === group.id ? styles.entityItemSelected : ''}`}
|
||||
onClick={() => setSelectedId(group.id)}
|
||||
role="option"
|
||||
tabIndex={0}
|
||||
aria-selected={selectedId === group.id}
|
||||
onKeyDown={(e) => { if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); setSelectedId(group.id) } }}
|
||||
>
|
||||
<Avatar name={group.name} size="sm" />
|
||||
<div className={styles.entityInfo}>
|
||||
<div className={styles.entityName}>{group.name}</div>
|
||||
<div className={styles.entityMeta}>
|
||||
{groupParent ? `Child of ${groupParent.name}` : 'Top-level'}
|
||||
{' \u00b7 '}{groupChildren.length} children \u00b7 {groupMembers.length} members
|
||||
{' · '}{groupChildren.length} children · {groupMembers.length} members
|
||||
</div>
|
||||
<div className={styles.entityTags}>
|
||||
{group.directRoles.map((r) => <Badge key={r} label={r} color="warning" />)}
|
||||
@@ -126,6 +143,9 @@ export function GroupsTab() {
|
||||
</div>
|
||||
)
|
||||
})}
|
||||
{filtered.length === 0 && (
|
||||
<div className={styles.emptySearch}>No groups match your search</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -161,16 +181,40 @@ export function GroupsTab() {
|
||||
<div className={styles.metaGrid}>
|
||||
<span className={styles.metaLabel}>ID</span>
|
||||
<MonoText size="xs">{selected.id}</MonoText>
|
||||
<span className={styles.metaLabel}>Parent</span>
|
||||
<span className={styles.metaValue}>{parent?.name ?? '(none)'}</span>
|
||||
</div>
|
||||
|
||||
{parent && (
|
||||
<>
|
||||
<SectionHeader>Member of</SectionHeader>
|
||||
<div className={styles.sectionTags}>
|
||||
<Tag label={parent.name} color="auto" />
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
|
||||
<SectionHeader>Members (direct)</SectionHeader>
|
||||
<div className={styles.sectionTags}>
|
||||
{members.map((u) => (
|
||||
<Tag key={u.id} label={u.displayName} color="auto" />
|
||||
<Tag
|
||||
key={u.id}
|
||||
label={u.displayName}
|
||||
color="auto"
|
||||
onRemove={() => {
|
||||
// Remove this group from the user's directGroups
|
||||
// Note: in mock data we can't easily update MOCK_USERS, so this is visual only
|
||||
toast({ title: 'Member removed', description: u.displayName, variant: 'success' })
|
||||
}}
|
||||
/>
|
||||
))}
|
||||
{members.length === 0 && <span className={styles.inheritedNote}>(no members)</span>}
|
||||
<MultiSelect
|
||||
options={availableMembers}
|
||||
value={[]}
|
||||
onChange={(ids) => {
|
||||
toast({ title: `${ids.length} member(s) added`, variant: 'success' })
|
||||
}}
|
||||
placeholder="+ Add"
|
||||
/>
|
||||
</div>
|
||||
{children.length > 0 && (
|
||||
<span className={styles.inheritedNote}>
|
||||
@@ -178,14 +222,32 @@ export function GroupsTab() {
|
||||
</span>
|
||||
)}
|
||||
|
||||
{children.length > 0 && (
|
||||
<>
|
||||
<SectionHeader>Child groups</SectionHeader>
|
||||
<div className={styles.sectionTags}>
|
||||
{children.map((c) => <Tag key={c.id} label={c.name} color="success" />)}
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
<SectionHeader>Child groups</SectionHeader>
|
||||
<div className={styles.sectionTags}>
|
||||
{children.map((c) => (
|
||||
<Tag
|
||||
key={c.id}
|
||||
label={c.name}
|
||||
color="success"
|
||||
onRemove={() => {
|
||||
updateGroup(c.id, { parentId: null })
|
||||
toast({ title: 'Child group removed', description: c.name, variant: 'success' })
|
||||
}}
|
||||
/>
|
||||
))}
|
||||
{children.length === 0 && <span className={styles.inheritedNote}>(no child groups)</span>}
|
||||
<MultiSelect
|
||||
options={availableChildGroups}
|
||||
value={[]}
|
||||
onChange={(ids) => {
|
||||
for (const id of ids) {
|
||||
updateGroup(id, { parentId: selected!.id })
|
||||
}
|
||||
toast({ title: `${ids.length} child group(s) added`, variant: 'success' })
|
||||
}}
|
||||
placeholder="+ Add"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<SectionHeader>Assigned roles</SectionHeader>
|
||||
<div className={styles.sectionTags}>
|
||||
@@ -194,21 +256,26 @@ export function GroupsTab() {
|
||||
key={r}
|
||||
label={r}
|
||||
color="warning"
|
||||
onRemove={() => updateGroup(selected.id, {
|
||||
directRoles: selected.directRoles.filter((role) => role !== r),
|
||||
})}
|
||||
onRemove={() => {
|
||||
const memberCount = MOCK_USERS.filter((u) => u.directGroups.includes(selected.id)).length
|
||||
if (memberCount > 0) {
|
||||
setRemoveRoleTarget(r)
|
||||
} else {
|
||||
updateGroup(selected.id, { directRoles: selected.directRoles.filter((role) => role !== r) })
|
||||
toast({ title: 'Role removed', variant: 'success' })
|
||||
}
|
||||
}}
|
||||
/>
|
||||
))}
|
||||
{selected.directRoles.length === 0 && <span className={styles.inheritedNote}>(no roles)</span>}
|
||||
</div>
|
||||
<div className={styles.selectWrap}>
|
||||
<MultiSelect
|
||||
options={availableRoles}
|
||||
value={[]}
|
||||
onChange={(roles) => updateGroup(selected.id, {
|
||||
directRoles: [...selected.directRoles, ...roles],
|
||||
})}
|
||||
placeholder="Add roles..."
|
||||
onChange={(roles) => {
|
||||
updateGroup(selected.id, { directRoles: [...selected.directRoles, ...roles] })
|
||||
toast({ title: `${roles.length} role(s) added`, variant: 'success' })
|
||||
}}
|
||||
placeholder="+ Add"
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
@@ -225,6 +292,21 @@ export function GroupsTab() {
|
||||
message={`Delete group "${deleteTarget?.name}"? This cannot be undone.`}
|
||||
confirmText={deleteTarget?.name ?? ''}
|
||||
/>
|
||||
<AlertDialog
|
||||
open={removeRoleTarget !== null}
|
||||
onClose={() => setRemoveRoleTarget(null)}
|
||||
onConfirm={() => {
|
||||
if (removeRoleTarget && selected) {
|
||||
updateGroup(selected.id, { directRoles: selected.directRoles.filter((role) => role !== removeRoleTarget) })
|
||||
toast({ title: 'Role removed', variant: 'success' })
|
||||
}
|
||||
setRemoveRoleTarget(null)
|
||||
}}
|
||||
title="Remove role from group"
|
||||
description={`Removing ${removeRoleTarget} from ${selected?.name} will affect ${members.length} member(s) who inherit this role. Continue?`}
|
||||
confirmLabel="Remove"
|
||||
variant="warning"
|
||||
/>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user