Skip to content

Self-evolving Context Database for AI Agents. Unify Agent Memory, Knowledge RAG and Skills.

feat(web-studio): add account user group management (#5284)

yufeng48e5cf870d84
diff --git a/web-studio/src/components/ui/tabs.tsx b/web-studio/src/components/ui/tabs.tsx
new file mode 100644
index 000000000..824ebeef9
--- /dev/null
+++ b/web-studio/src/components/ui/tabs.tsx
@@ -0,0 +1,80 @@
+import { Tabs as TabsPrimitive } from "@base-ui/react/tabs"
+import { cva, type VariantProps } from "class-variance-authority"
+import { cn } from "#/lib/utils"
+
+function Tabs({
+ className,
+ orientation = "horizontal",
+ ...props
+}: TabsPrimitive.Root.Props) {
+ return (
+ <TabsPrimitive.Root
+ orientation={orientation}
+ data-slot="tabs"
+ data-orientation={orientation}
+ className={cn(
+ "group/tabs flex gap-2 data-horizontal:flex-col",
+ className
+ )}
+ {...props}
+ />
+ )
+}
+
+const tabsListVariants = cva(
+ "group/tabs-list inline-flex w-fit items-center justify-center rounded-lg p-[3px] text-muted-foreground group-data-horizontal/tabs:h-9 group-data-vertical/tabs:h-fit group-data-vertical/tabs:flex-col data-[variant=line]:rounded-none",
+ {
+ variants: {
+ variant: {
+ default: "bg-muted",
+ line: "gap-1 bg-transparent",
+ },
+ },
+ defaultVariants: {
+ variant: "default",
+ },
+ }
+)
+
+function TabsList({
+ className,
+ variant = "default",
+ ...props
+}: TabsPrimitive.List.Props & VariantProps<typeof tabsListVariants>) {
+ return (
+ <TabsPrimitive.List
+ data-slot="tabs-list"
+ data-variant={variant}
+ className={cn(tabsListVariants({ variant }), className)}
+ {...props}
+ />
+ )
+}
+
+function TabsTrigger({ className, ...props }: TabsPrimitive.Tab.Props) {
+ return (
+ <TabsPrimitive.Tab
+ data-slot="tabs-trigger"
+ className={cn(
+ "relative inline-flex h-[calc(100%-1px)] flex-1 items-center justify-center gap-1.5 rounded-md border border-transparent px-2 py-1 text-sm font-medium whitespace-nowrap text-foreground/60 transition-all group-data-vertical/tabs:w-full group-data-vertical/tabs:justify-start hover:text-foreground focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 focus-visible:outline-1 focus-visible:outline-ring disabled:pointer-events-none disabled:opacity-50 has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 aria-disabled:pointer-events-none aria-disabled:opacity-50 dark:text-muted-foreground dark:hover:text-foreground group-data-[variant=default]/tabs-list:data-active:shadow-sm group-data-[variant=line]/tabs-list:data-active:shadow-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+ "group-data-[variant=line]/tabs-list:bg-transparent group-data-[variant=line]/tabs-list:data-active:bg-transparent dark:group-data-[variant=line]/tabs-list:data-active:border-transparent dark:group-data-[variant=line]/tabs-list:data-active:bg-transparent",
+ "data-active:bg-background data-active:text-foreground dark:data-active:border-input dark:data-active:bg-input/30 dark:data-active:text-foreground",
+ "after:absolute after:bg-foreground after:opacity-0 after:transition-opacity group-data-horizontal/tabs:after:inset-x-0 group-data-horizontal/tabs:after:bottom-[-5px] group-data-horizontal/tabs:after:h-0.5 group-data-vertical/tabs:after:inset-y-0 group-data-vertical/tabs:after:-right-1 group-data-vertical/tabs:after:w-0.5 group-data-[variant=line]/tabs-list:data-active:after:opacity-100",
+ className
+ )}
+ {...props}
+ />
+ )
+}
+
+function TabsContent({ className, ...props }: TabsPrimitive.Panel.Props) {
+ return (
+ <TabsPrimitive.Panel
+ data-slot="tabs-content"
+ className={cn("flex-1 text-sm outline-none", className)}
+ {...props}
+ />
+ )
+}
+
+export { Tabs, TabsList, TabsTrigger, TabsContent, tabsListVariants }
diff --git a/web-studio/src/i18n/locales/en/workspace.ts b/web-studio/src/i18n/locales/en/workspace.ts
index a7428a3e6..b6981cfac 100644
--- a/web-studio/src/i18n/locales/en/workspace.ts
+++ b/web-studio/src/i18n/locales/en/workspace.ts
@@ -392,7 +392,8 @@ const workspace = {
timing: 'Duration',
totalDuration: 'Total Time',
processingNotStarted: 'Not started',
- processingDurationHelp: 'Worker processing time, including model and I/O calls. Excludes queue and downstream waits; overlapping workers count once. Incomplete or legacy records are unavailable.',
+ processingDurationHelp:
+ 'Worker processing time, including model and I/O calls. Excludes queue and downstream waits; overlapping workers count once. Incomplete or legacy records are unavailable.',
processingDuration: 'Processing Time',
waitingDuration: 'Waiting Time',
timingUnavailable: 'Not recorded',
@@ -778,6 +779,44 @@ const workspace = {
},
},
settings: {
+ groups: {
+ navigation: 'User management',
+ usersTab: 'Users',
+ title: 'User groups',
+ description:
+ 'Manage groups within Account {{account}}. Resource permissions are granted separately.',
+ id: 'Group ID',
+ count: 'Members',
+ actions: 'Actions',
+ create: 'Create group',
+ idHint:
+ 'A unique ID within this Account. It cannot be renamed after creation.',
+ manage: 'Manage members',
+ delete: 'Delete group',
+ deleteHint: 'Remove all members before deleting this group.',
+ deleteDescription:
+ 'Delete {{group}}? Existing resource ACL references are not removed. Recreating this ID may reactivate those grants.',
+ empty: 'No user groups yet.',
+ search: 'Search groups',
+ members: 'Members of {{group}}',
+ memberHint:
+ 'Membership changes affect subsequent requests. Other grants may still allow access after removal.',
+ add: 'Add',
+ remove: 'Remove',
+ searchUsers: 'Search existing users to add',
+ currentMembers: 'Current members',
+ candidates: 'Account users',
+ noMembers: 'This group has no members.',
+ noUsers: 'No matching users.',
+ created: 'User group created',
+ deleted: 'User group deleted',
+ updated: 'Group membership updated',
+ failed: 'Operation failed',
+ loadFailed: 'Could not load data',
+ previous: 'Previous',
+ next: 'Next',
+ page: 'Page {{page}} of {{pages}}',
+ },
actions: {
addAccount: 'Add account',
addUser: 'Add user',
diff --git a/web-studio/src/i18n/locales/zh-CN/workspace.ts b/web-studio/src/i18n/locales/zh-CN/workspace.ts
index 357bbb205..6c4a49cc9 100644
--- a/web-studio/src/i18n/locales/zh-CN/workspace.ts
+++ b/web-studio/src/i18n/locales/zh-CN/workspace.ts
@@ -381,7 +381,8 @@ const workspace = {
timing: '耗时',
totalDuration: '总耗时',
processingNotStarted: '未开始',
- processingDurationHelp: '仅累计工序实际处理区间,含模型与 I/O 调用;排除排队和等待下游,并行重叠只计一次。旧任务或重启后记录不完整时显示未记录。',
+ processingDurationHelp:
+ '仅累计工序实际处理区间,含模型与 I/O 调用;排除排队和等待下游,并行重叠只计一次。旧任务或重启后记录不完整时显示未记录。',
processingDuration: '处理耗时',
waitingDuration: '等待耗时',
timingUnavailable: '未记录',
@@ -745,6 +746,43 @@ const workspace = {
},
},
settings: {
+ groups: {
+ navigation: '用户管理',
+ usersTab: '用户',
+ title: '用户组',
+ description:
+ '管理 Account {{account}} 内的用户组。资源访问权限需要单独授予。',
+ id: '用户组 ID',
+ count: '成员数',
+ actions: '操作',
+ create: '新建用户组',
+ idHint: '当前 Account 内唯一的标识,创建后不可修改。',
+ manage: '管理成员',
+ delete: '删除用户组',
+ deleteHint: '请先移除组内所有成员,再删除用户组。',
+ deleteDescription:
+ '确定删除 {{group}}?资源中的 ACL 引用不会被清理,重新创建相同 ID 可能恢复原有授权。',
+ empty: '暂无用户组。',
+ search: '搜索用户组',
+ members: '{{group}} 的成员',
+ memberHint:
+ '成员变更在后续请求中生效。移除成员后,其他授权仍可能允许其访问资源。',
+ add: '添加',
+ remove: '移除',
+ searchUsers: '搜索要添加的已有用户',
+ currentMembers: '当前成员',
+ candidates: 'Account 用户',
+ noMembers: '该用户组暂无成员。',
+ noUsers: '没有匹配的用户。',
+ created: '用户组已创建',
+ deleted: '用户组已删除',
+ updated: '用户组成员已更新',
+ failed: '操作失败',
+ loadFailed: '数据加载失败',
+ previous: '上一页',
+ next: '下一页',
+ page: '第 {{page}} / {{pages}} 页',
+ },
actions: {
addAccount: '新增账号',
addUser: '新增用户',
diff --git a/web-studio/src/lib/admin-groups.test.ts b/web-studio/src/lib/admin-groups.test.ts
new file mode 100644
index 000000000..21c04d72a
--- /dev/null
+++ b/web-studio/src/lib/admin-groups.test.ts
@@ -0,0 +1,76 @@
+import axios from 'axios'
+import { afterEach, expect, it, vi } from 'vitest'
+import {
+ createAdminGroup,
+ deleteAdminGroup,
+ fetchAdminGroupMembers,
+ fetchAdminGroups,
+ updateAdminGroupMember,
+} from './admin'
+import type { InternalAxiosRequestConfig } from 'axios'
+
+const connection = {
+ baseUrl: 'http://localhost:1933/',
+ accountId: 'tenant a',
+ userId: 'data-user',
+ apiKey: 'control-key',
+}
+afterEach(() => vi.restoreAllMocks())
+
+it('uses the control credential and encodes account, group and user path segments', async () => {
+ const requests: InternalAxiosRequestConfig[] = []
+ const transport = axios.create({
+ adapter: async (config) => {
+ requests.push(config)
+ return {
+ status: 200,
+ statusText: 'OK',
+ headers: {},
+ config,
+ data: { status: 'ok', result: { added: true } },
+ }
+ },
+ })
+ vi.spyOn(axios, 'create').mockReturnValue(transport)
+ await updateAdminGroupMember(connection, 'group/a', '[email protected]', true)
+ expect(requests[0].url).toBe(
+ 'http://localhost:1933/api/v1/admin/accounts/tenant%20a/groups/group%2Fa/members/bob%40example.com',
+ )
+ expect(requests[0].method).toBe('put')
+ expect(requests[0].headers.get('X-API-Key')).toBe('control-key')
+ expect(requests[0].headers.get('X-OpenViking-User')).toBeUndefined()
+})
+
+it('matches group CRUD and member endpoint contracts and unwraps results', async () => {
+ const requests: InternalAxiosRequestConfig[] = []
+ const groups = [{ group_id: 'team', member_count: 0 }]
+ const transport = axios.create({
+ adapter: async (config) => {
+ requests.push(config)
+ return {
+ status: 200,
+ statusText: 'OK',
+ headers: {},
+ config,
+ data: { status: 'ok', result: groups },
+ }
+ },
+ })
+ vi.spyOn(axios, 'create').mockReturnValue(transport)
+ expect(await fetchAdminGroups(connection)).toEqual(groups)
+ await createAdminGroup(connection, 'team')
+ expect(JSON.parse(requests[1].data)).toEqual({ group_id: 'team' })
+ await fetchAdminGroupMembers(connection, 'team')
+ await updateAdminGroupMember(connection, 'team', 'alice', false)
+ await deleteAdminGroup(connection, 'team')
+ expect(requests.map((request) => request.method)).toEqual([
+ 'get',
+ 'post',
+ 'get',
+ 'delete',
+ 'delete',
+ ])
+ expect(requests[2].url).toMatch(/\/groups\/team\/members$/)
+ expect(requests[3].url).toMatch(/\/groups\/team\/members\/alice$/)
+ expect(requests[4].url).toMatch(/\/groups\/team$/)
+})
diff --git a/web-studio/src/lib/admin.ts b/web-studio/src/lib/admin.ts
index e37eb3641..2409b3178 100644
--- a/web-studio/src/lib/admin.ts
+++ b/web-studio/src/lib/admin.ts
@@ -585,3 +585,68 @@ export async function updateUserMemorySettings(
}),
)
}
+
+export type AdminGroup = { group_id: string; member_count: number }
+
+const groupsUrl = '/api/v1/admin/accounts/{account_id}/groups'
+
+export function fetchAdminGroups(connection: AdminConnection) {
+ return getOvResult<AdminGroup[]>(
+ createAdminClient(connection).get({
+ url: groupsUrl,
+ path: { account_id: connection.accountId },
+ }),
+ )
+}
+
+export function createAdminGroup(connection: AdminConnection, groupId: string) {
+ return getOvResult<AdminGroup>(
+ createAdminClient(connection).post({
+ url: groupsUrl,
+ path: { account_id: connection.accountId },
+ headers: { 'Content-Type': 'application/json' },
+ body: { group_id: groupId },
+ }),
+ )
+}
+
+export function deleteAdminGroup(connection: AdminConnection, groupId: string) {
+ return getOvResult<{ deleted: boolean }>(
+ createAdminClient(connection).delete({
+ url: `${groupsUrl}/{group_id}`,
+ path: { account_id: connection.accountId, group_id: groupId },
+ }),
+ )
+}
+
+export function fetchAdminGroupMembers(
+ connection: AdminConnection,
+ groupId: string,
+) {
+ return getOvResult<{ group_id: string; members: string[] }>(
+ createAdminClient(connection).get({
+ url: `${groupsUrl}/{group_id}/members`,
+ path: { account_id: connection.accountId, group_id: groupId },
+ }),
+ )
+}
+
+export function updateAdminGroupMember(
+ connection: AdminConnection,
+ groupId: string,
+ userId: string,
+ add: boolean,
+) {
+ const client = createAdminClient(connection)
+ const options = {
+ url: `${groupsUrl}/{group_id}/members/{user_id}`,
+ path: {
+ account_id: connection.accountId,
+ group_id: groupId,
+ user_id: userId,
+ },
+ }
+ return getOvResult<unknown>(
+ add ? client.put(options) : client.delete(options),
+ )
+}
diff --git a/web-studio/src/routes/users/-components/user-groups.test.tsx b/web-studio/src/routes/users/-components/user-groups.test.tsx
new file mode 100644
index 000000000..307ad81ed
--- /dev/null
+++ b/web-studio/src/routes/users/-components/user-groups.test.tsx
@@ -0,0 +1,177 @@
+// @vitest-environment jsdom
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import {
+ cleanup,
+ render,
+ screen,
+ waitFor,
+ within,
+} from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { UserGroups } from './user-groups'
+
+const api = vi.hoisted(() => ({
+ groups: vi.fn(),
+ members: vi.fn(),
+ users: vi.fn(),
+ create: vi.fn(),
+ remove: vi.fn(),
+ change: vi.fn(),
+ error: vi.fn(),
+}))
+vi.mock('#/lib/admin', () => ({
+ fetchAdminGroups: api.groups,
+ fetchAdminGroupMembers: api.members,
+ fetchAdminUsersPage: api.users,
+ createAdminGroup: api.create,
+ deleteAdminGroup: api.remove,
+ updateAdminGroupMember: api.change,
+}))
+vi.mock('sonner', () => ({ toast: { success: vi.fn(), error: api.error } }))
+vi.mock('react-i18next', () => ({
+ useTranslation: () => ({ t: (key: string) => key }),
+}))
+const connection = {
+ baseUrl: 'http://localhost:1933',
+ accountId: 'acme',
+ userId: 'root',
+ apiKey: 'admin-key',
+}
+function mount() {
+ const client = new QueryClient({
+ defaultOptions: { queries: { retry: false }, mutations: { retry: false } },
+ })
+ render(
+ <QueryClientProvider client={client}>
+ <UserGroups connection={connection} />
+ </QueryClientProvider>,
+ )
+ return userEvent.setup()
+}
+beforeEach(() => {
+ vi.resetAllMocks()
+ api.groups.mockResolvedValue([
+ { group_id: 'engineering', member_count: 1 },
+ { group_id: 'empty', member_count: 0 },
+ ])
+ api.members.mockResolvedValue({ group_id: 'engineering', members: ['alice'] })
+ api.users.mockResolvedValue({
+ users: [{ userId: 'alice' }, { userId: 'bob' }],
+ total: 2,
+ })
+ api.create.mockResolvedValue({ group_id: 'new', member_count: 0 })
+ api.remove.mockResolvedValue({ deleted: true })
+ api.change.mockResolvedValue({ added: true })
+})
+afterEach(cleanup)
+
+it('creates a trimmed group ID using the management connection and refreshes the list', async () => {
+ const user = mount()
+ await screen.findByText('engineering')
+ await user.click(screen.getByRole('button', { name: 'groups.create' }))
+ const dialog = screen.getByRole('dialog')
+ await user.type(within(dialog).getByLabelText('groups.id'), ' new ')
+ await user.click(
+ within(dialog).getByRole('button', { name: 'groups.create' }),
+ )
+ await waitFor(() =>
+ expect(api.create).toHaveBeenCalledWith(connection, 'new'),
+ )
+ await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull())
+ expect(api.groups.mock.calls.length).toBeGreaterThan(1)
+})
+
+it('blocks nonempty deletion and requires confirmation for empty groups', async () => {
+ const user = mount()
+ const populated = (await screen.findByText('engineering')).closest('tr')!
+ expect(
+ within(populated)
+ .getByRole('button', { name: 'groups.delete' })
+ .hasAttribute('disabled'),
+ ).toBe(true)
+ const empty = screen.getByText('empty').closest('tr')!
+ await user.click(within(empty).getByRole('button', { name: 'groups.delete' }))
+ expect(api.remove).not.toHaveBeenCalled()
+ await user.click(
+ within(screen.getByRole('alertdialog')).getByRole('button', {
+ name: 'groups.delete',
+ }),
+ )
+ await waitFor(() =>
+ expect(api.remove).toHaveBeenCalledWith(connection, 'empty'),
+ )
+})
+
+it('adds and removes members, disables duplicate additions and searches account users', async () => {
+ const user = mount()
+ await screen.findByText('engineering')
+ await user.click(
+ within(screen.getByText('engineering').closest('tr')!).getByRole('button', {
+ name: 'groups.manage',
+ }),
+ )
+ await screen.findByText('bob')
+ const aliceCandidate = screen.getAllByText('alice')[1].closest('li')!
+ expect(
+ within(aliceCandidate)
+ .getByRole('button', { name: 'groups.add' })
+ .hasAttribute('disabled'),
+ ).toBe(true)
+ await user.click(
+ within(screen.getByText('bob').closest('li')!).getByRole('button', {
+ name: 'groups.add',
+ }),
+ )
+ await waitFor(() =>
+ expect(api.change).toHaveBeenCalledWith(
+ connection,
+ 'engineering',
+ 'bob',
+ true,
+ ),
+ )
+ await waitFor(() =>
+ expect(
+ screen
+ .getByRole('button', { name: 'groups.remove' })
+ .hasAttribute('disabled'),
+ ).toBe(false),
+ )
+ await user.click(screen.getByRole('button', { name: 'groups.remove' }))
+ await waitFor(() =>
+ expect(api.change).toHaveBeenCalledWith(
+ connection,
+ 'engineering',
+ 'alice',
+ false,
+ ),
+ )
+ await user.type(screen.getByLabelText('groups.searchUsers'), 'bob')
+ await waitFor(() =>
+ expect(api.users).toHaveBeenLastCalledWith(connection, 'acme', {
+ page: 1,
+ pageSize: 20,
+ search: 'bob',
+ }),
+ )
+})
+
+it('keeps a failed deletion open and refreshes potentially stale member counts', async () => {
+ api.remove.mockRejectedValue(new Error('Group must be empty before deletion'))
+ const user = mount()
+ await screen.findByText('empty')
+ await user.click(
+ within(screen.getByText('empty').closest('tr')!).getByRole('button', {
+ name: 'groups.delete',
+ }),
+ )
+ await user.click(
+ within(screen.getByRole('alertdialog')).getByRole('button', {
+ name: 'groups.delete',
+ }),
+ )
+ await waitFor(() => expect(api.error).toHaveBeenCalled())
+ expect(screen.getByRole('alertdialog')).toBeTruthy()
+ expect(api.groups.mock.calls.length).toBeGreaterThan(1)
+})
diff --git a/web-studio/src/routes/users/-components/user-groups.tsx b/web-studio/src/routes/users/-components/user-groups.tsx
new file mode 100644
index 000000000..d498fd70d
--- /dev/null
+++ b/web-studio/src/routes/users/-components/user-groups.tsx
@@ -0,0 +1,501 @@
+import { useEffect, useState } from 'react'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+import { useTranslation } from 'react-i18next'
+import { toast } from 'sonner'
+import { Button } from '#/components/ui/button'
+import { Badge } from '#/components/ui/badge'
+import { Input } from '#/components/ui/input'
+import {
+ Field,
+ FieldDescription,
+ FieldGroup,
+ FieldLabel,
+} from '#/components/ui/field'
+import { Alert, AlertDescription, AlertTitle } from '#/components/ui/alert'
+import {
+ Dialog,
+ DialogContent,
+ DialogHeader,
+ DialogTitle,
+ DialogDescription,
+ DialogFooter,
+} from '#/components/ui/dialog'
+import {
+ AlertDialog,
+ AlertDialogContent,
+ AlertDialogHeader,
+ AlertDialogTitle,
+ AlertDialogDescription,
+ AlertDialogFooter,
+ AlertDialogCancel,
+ AlertDialogAction,
+} from '#/components/ui/alert-dialog'
+import {
+ Table,
+ TableHeader,
+ TableHead,
+ TableBody,
+ TableRow,
+ TableCell,
+} from '#/components/ui/table'
+import {
+ createAdminGroup,
+ deleteAdminGroup,
+ fetchAdminGroups,
+ fetchAdminGroupMembers,
+ fetchAdminUsersPage,
+ updateAdminGroupMember,
+} from '#/lib/admin'
+import type { AdminConnection } from '#/lib/admin'
+import { getErrorMessage } from '../-lib/error'
+
+function QueryError({ error, retry }: { error: unknown; retry: () => void }) {
+ const { t } = useTranslation('settings')
+ return (
+ <Alert variant="destructive">
+ <AlertTitle>{t('groups.loadFailed')}</AlertTitle>
+ <AlertDescription>
+ <p>{getErrorMessage(error)}</p>
+ <Button variant="outline" onClick={retry}>
+ {t('actions.refresh')}
+ </Button>
+ </AlertDescription>
+ </Alert>
+ )
+}
+
+export function UserGroups({ connection }: { connection: AdminConnection }) {
+ const { t } = useTranslation('settings')
+ const client = useQueryClient()
+ const scope = [connection.baseUrl, connection.accountId, connection.apiKey]
+ const queryKey = ['managed-groups', ...scope]
+ const groups = useQuery({
+ queryKey,
+ queryFn: () => fetchAdminGroups(connection),
+ retry: false,
+ })
+ const [search, setSearch] = useState('')
+ const [creating, setCreating] = useState(false)
+ const [groupId, setGroupId] = useState('')
+ const [selected, setSelected] = useState<string | null>(null)
+ const [deleting, setDeleting] = useState<string | null>(null)
+ const onError = (error: unknown) =>
+ toast.error(t('groups.failed'), { description: getErrorMessage(error) })
+ const create = useMutation({
+ mutationFn: (id: string) => createAdminGroup(connection, id),
+ onError,
+ onSuccess: async () => {
+ setCreating(false)
+ setGroupId('')
+ toast.success(t('groups.created'))
+ await client.invalidateQueries({ queryKey })
+ },
+ })
+ const remove = useMutation({
+ mutationFn: (id: string) => deleteAdminGroup(connection, id),
+ onError: async (error) => {
+ onError(error)
+ await client.invalidateQueries({ queryKey })
+ },
+ onSuccess: async () => {
+ setDeleting(null)
+ toast.success(t('groups.deleted'))
+ await client.invalidateQueries({ queryKey })
+ },
+ })
+ const filtered =
+ groups.data?.filter((group) =>
+ group.group_id.toLowerCase().includes(search.trim().toLowerCase()),
+ ) ?? []
+ return (
+ <div className="flex flex-col gap-5">
+ <header className="flex flex-wrap items-center justify-between gap-3">
+ <div className="flex flex-col gap-2">
+ <h1 className="text-2xl font-semibold">
+ {t('groups.title')}{' '}
+ <Badge variant="secondary">{connection.accountId}</Badge>
+ </h1>
+ <p className="text-sm text-muted-foreground">
+ {t('groups.description', { account: connection.accountId })}
+ </p>
+ </div>
+ <div className="flex gap-2">
+ <Button
+ variant="outline"
+ disabled={groups.isFetching}
+ onClick={() => void groups.refetch()}
+ >
+ {t('actions.refresh')}
+ </Button>
+ <Button onClick={() => setCreating(true)}>
+ {t('groups.create')}
+ </Button>
+ </div>
+ </header>
+ <Input
+ className="max-w-sm"
+ aria-label={t('groups.search')}
+ placeholder={t('groups.search')}
+ value={search}
+ onChange={(event) => setSearch(event.target.value)}
+ />
+ {groups.isPending ? (
+ <p role="status">{t('loading')}</p>
+ ) : groups.isError ? (
+ <QueryError error={groups.error} retry={() => void groups.refetch()} />
+ ) : (
+ <div className="rounded-lg border">
+ <Table>
+ <TableHeader>
+ <TableRow>
+ <TableHead>{t('groups.id')}</TableHead>
+ <TableHead>{t('groups.count')}</TableHead>
+ <TableHead className="text-right">
+ {t('groups.actions')}
+ </TableHead>
+ </TableRow>
+ </TableHeader>
+ <TableBody>
+ {filtered.length === 0 ? (
+ <TableRow>
+ <TableCell
+ colSpan={3}
+ className="py-10 text-center text-muted-foreground"
+ >
+ {t('groups.empty')}
+ </TableCell>
+ </TableRow>
+ ) : (
+ filtered.map((group) => (
+ <TableRow key={group.group_id}>
+ <TableCell className="font-mono">
+ {group.group_id}
+ </TableCell>
+ <TableCell>{group.member_count}</TableCell>
+ <TableCell>
+ <div className="flex justify-end gap-2">
+ <Button
+ variant="outline"
+ size="sm"
+ onClick={() => setSelected(group.group_id)}
+ >
+ {t('groups.manage')}
+ </Button>
+ <span
+ title={
+ group.member_count
+ ? t('groups.deleteHint')
+ : undefined
+ }
+ >
+ <Button
+ size="sm"
+ variant="ghost"
+ disabled={
+ group.member_count > 0 || remove.isPending
+ }
+ onClick={() => setDeleting(group.group_id)}
+ >
+ {t('groups.delete')}
+ </Button>
+ </span>
+ </div>
+ </TableCell>
+ </TableRow>
+ ))
+ )}
+ </TableBody>
+ </Table>
+ </div>
+ )}
+ <Dialog
+ open={creating}
+ onOpenChange={(open) => {
+ if (!create.isPending) setCreating(open)
+ }}
+ >
+ <DialogContent showCloseButton={!create.isPending}>
+ <form
+ className="flex flex-col gap-5"
+ onSubmit={(event) => {
+ event.preventDefault()
+ if (groupId.trim() && !create.isPending)
+ create.mutate(groupId.trim())
+ }}
+ >
+ <DialogHeader>
+ <DialogTitle>{t('groups.create')}</DialogTitle>
+ <DialogDescription>
+ {t('groups.description', { account: connection.accountId })}
+ </DialogDescription>
+ </DialogHeader>
+ <FieldGroup>
+ <Field>
+ <FieldLabel htmlFor="new-group-id">{t('groups.id')}</FieldLabel>
+ <Input
+ id="new-group-id"
+ required
+ value={groupId}
+ disabled={create.isPending}
+ onChange={(event) => setGroupId(event.target.value)}
+ />
+ <FieldDescription>{t('groups.idHint')}</FieldDescription>
+ </Field>
+ </FieldGroup>
+ <DialogFooter>
+ <Button
+ type="button"
+ variant="outline"
+ disabled={create.isPending}
+ onClick={() => setCreating(false)}
+ >
+ {t('actions.cancel')}
+ </Button>
+ <Button
+ type="submit"
+ disabled={!groupId.trim() || create.isPending}
+ >
+ {create.isPending ? t('loading') : t('groups.create')}
+ </Button>
+ </DialogFooter>
+ </form>
+ </DialogContent>
+ </Dialog>
+ <AlertDialog
+ open={deleting !== null}
+ onOpenChange={(open) => {
+ if (!open && !remove.isPending) setDeleting(null)
+ }}
+ >
+ <AlertDialogContent>
+ <AlertDialogHeader>
+ <AlertDialogTitle>{t('groups.delete')}</AlertDialogTitle>
+ <AlertDialogDescription>
+ {t('groups.deleteDescription', { group: deleting })}
+ </AlertDialogDescription>
+ </AlertDialogHeader>
+ <AlertDialogFooter>
+ <AlertDialogCancel disabled={remove.isPending}>
+ {t('actions.cancel')}
+ </AlertDialogCancel>
+ <AlertDialogAction
+ variant="destructive"
+ disabled={remove.isPending}
+ onClick={(event) => {
+ event.preventDefault()
+ if (deleting) remove.mutate(deleting)
+ }}
+ >
+ {remove.isPending ? t('loading') : t('groups.delete')}
+ </AlertDialogAction>
+ </AlertDialogFooter>
+ </AlertDialogContent>
+ </AlertDialog>
+ {selected !== null && (
+ <GroupMembers
+ key={selected}
+ connection={connection}
+ groupId={selected}
+ onClose={() => setSelected(null)}
+ />
+ )}
+ </div>
+ )
+}
+
+function GroupMembers({
+ connection,
+ groupId,
+ onClose,
+}: {
+ connection: AdminConnection
+ groupId: string
+ onClose: () => void
+}) {
+ const { t } = useTranslation('settings')
+ const client = useQueryClient()
+ const scope = [connection.baseUrl, connection.accountId, connection.apiKey]
+ const membersKey = ['managed-group-members', ...scope, groupId]
+ const members = useQuery({
+ queryKey: membersKey,
+ queryFn: () => fetchAdminGroupMembers(connection, groupId),
+ retry: false,
+ })
+ const [search, setSearch] = useState('')
+ const [query, setQuery] = useState('')
+ const [page, setPage] = useState(1)
+ useEffect(() => {
+ const timer = setTimeout(() => {
+ setQuery(search)
+ setPage(1)
+ }, 250)
+ return () => clearTimeout(timer)
+ }, [search])
+ const users = useQuery({
+ queryKey: ['group-user-candidates', ...scope, query, page],
+ queryFn: () =>
+ fetchAdminUsersPage(connection, connection.accountId, {
+ page,
+ pageSize: 20,
+ search: query,
+ }),
+ retry: false,
+ })
+ const change = useMutation({
+ mutationFn: ({ userId, add }: { userId: string; add: boolean }) =>
+ updateAdminGroupMember(connection, groupId, userId, add),
+ onError: (error) =>
+ toast.error(t('groups.failed'), { description: getErrorMessage(error) }),
+ onSuccess: () => {
+ toast.success(t('groups.updated'))
+ },
+ onSettled: async () => {
+ await Promise.all([
+ client.invalidateQueries({ queryKey: membersKey }),
+ client.invalidateQueries({ queryKey: ['managed-groups', ...scope] }),
+ ])
+ },
+ })
+ const pages = Math.max(1, Math.ceil((users.data?.total ?? 0) / 20))
+ return (
+ <Dialog
+ open
+ onOpenChange={(open) => {
+ if (!open && !change.isPending) onClose()
+ }}
+ >
+ <DialogContent
+ className="gap-5 sm:max-w-3xl"
+ showCloseButton={!change.isPending}
+ >
+ <DialogHeader className="pr-8">
+ <DialogTitle className="break-all text-lg">
+ {t('groups.members', { group: groupId })}
+ </DialogTitle>
+ <DialogDescription>{t('groups.memberHint')}</DialogDescription>
+ </DialogHeader>
+ <div className="grid min-w-0 gap-5 sm:grid-cols-2">
+ <section className="flex min-w-0 flex-col gap-3">
+ <h2 className="flex items-center gap-2 font-medium">
+ {t('groups.currentMembers')}
+ {members.isSuccess && (
+ <Badge variant="secondary">{members.data.members.length}</Badge>
+ )}
+ </h2>
+ {members.isPending ? (
+ <p role="status">{t('loading')}</p>
+ ) : members.isError ? (
+ <QueryError
+ error={members.error}
+ retry={() => void members.refetch()}
+ />
+ ) : (
+ <ul className="max-h-80 overflow-y-auto overscroll-contain rounded-lg border divide-y">
+ {members.data.members.length === 0 && (
+ <li className="px-3 py-6 text-center text-sm text-muted-foreground">
+ {t('groups.noMembers')}
+ </li>
+ )}
+ {members.data.members.map((user) => (
+ <li
+ key={user}
+ className="flex items-center justify-between gap-3 px-3 py-2"
+ >
+ <span className="truncate font-mono text-sm" title={user}>
+ {user}
+ </span>
+ <Button
+ variant="outline"
+ size="sm"
+ disabled={change.isPending || members.isFetching}
+ onClick={() =>
+ change.mutate({ userId: user, add: false })
+ }
+ >
+ {t('groups.remove')}
+ </Button>
+ </li>
+ ))}
+ </ul>
+ )}
+ </section>
+ <section className="flex min-w-0 flex-col gap-3">
+ <h2 className="font-medium">{t('groups.candidates')}</h2>
+ <Input
+ aria-label={t('groups.searchUsers')}
+ placeholder={t('groups.searchUsers')}
+ value={search}
+ onChange={(event) => setSearch(event.target.value)}
+ />
+ {users.isPending ? (
+ <p role="status">{t('loading')}</p>
+ ) : users.isError ? (
+ <QueryError
+ error={users.error}
+ retry={() => void users.refetch()}
+ />
+ ) : (
+ <>
+ <ul className="max-h-80 overflow-y-auto overscroll-contain rounded-lg border divide-y">
+ {users.data.users.length === 0 && (
+ <li className="px-3 py-6 text-center text-sm text-muted-foreground">
+ {t('groups.noUsers')}
+ </li>
+ )}
+ {users.data.users.map((user) => (
+ <li
+ key={user.userId}
+ className="flex items-center justify-between gap-3 px-3 py-2"
+ >
+ <span
+ className="truncate font-mono text-sm"
+ title={user.userId}
+ >
+ {user.userId}
+ </span>
+ <Button
+ size="sm"
+ variant="outline"
+ disabled={
+ !members.isSuccess ||
+ members.isFetching ||
+ change.isPending ||
+ search !== query ||
+ members.data.members.includes(user.userId)
+ }
+ onClick={() =>
+ change.mutate({ userId: user.userId, add: true })
+ }
+ >
+ {t('groups.add')}
+ </Button>
+ </li>
+ ))}
+ </ul>
+ <div className="flex flex-wrap items-center justify-between gap-2 text-xs text-muted-foreground">
+ <Button
+ variant="outline"
+ size="sm"
+ disabled={page <= 1 || users.isFetching}
+ onClick={() => setPage(page - 1)}
+ >
+ {t('groups.previous')}
+ </Button>
+ <span>{t('groups.page', { page, pages })}</span>
+ <Button
+ variant="outline"
+ size="sm"
+ disabled={page >= pages || users.isFetching}
+ onClick={() => setPage(page + 1)}
+ >
+ {t('groups.next')}
+ </Button>
+ </div>
+ </>
+ )}
+ </section>
+ </div>
+ </DialogContent>
+ </Dialog>
+ )
+}
diff --git a/web-studio/src/routes/users/route.tsx b/web-studio/src/routes/users/route.tsx
index d56092f36..5428435e0 100644
--- a/web-studio/src/routes/users/route.tsx
+++ b/web-studio/src/routes/users/route.tsx
@@ -16,6 +16,9 @@ import {
import { useTranslation } from 'react-i18next'
import { toast } from 'sonner'
+import { Tabs, TabsList, TabsTrigger, TabsContent } from '#/components/ui/tabs'
+import { UserGroups } from './-components/user-groups'
+
import { Badge } from '#/components/ui/badge'
import { Button } from '#/components/ui/button'
import { Input } from '#/components/ui/input'
@@ -107,6 +110,47 @@ function resolveKeyLabel(user: AdminUser): string {
}
function UserManagementRoute() {
+ const { t } = useTranslation('settings')
+ const { connection, connectionRole, isConnectionRoleLoading, serverMode } =
+ useAppConnection()
+ const { canManageUsers } = resolveStudioManagementCapabilities({
+ hasControlCredential: Boolean(connection.adminApiKey.trim()),
+ isRoleLoading: isConnectionRoleLoading,
+ role: connectionRole,
+ serverMode,
+ })
+ if (!canManageUsers) return <UserManagementPanel />
+ const adminConnection: AdminConnection = {
+ accountId: connection.accountId,
+ apiKey: connection.adminApiKey,
+ baseUrl: connection.baseUrl,
+ userId: connection.userId,
+ }
+ return (
+ <Tabs
+ key={JSON.stringify([
+ connection.baseUrl,
+ connection.accountId,
+ connection.adminApiKey,
+ ])}
+ defaultValue="users"
+ className="w-full min-w-0"
+ >
+ <TabsList aria-label={t('groups.navigation')}>
+ <TabsTrigger value="users">{t('groups.usersTab')}</TabsTrigger>
+ <TabsTrigger value="groups">{t('groups.title')}</TabsTrigger>
+ </TabsList>
+ <TabsContent value="users">
+ <UserManagementPanel />
+ </TabsContent>
+ <TabsContent value="groups">
+ <UserGroups connection={adminConnection} />
+ </TabsContent>
+ </Tabs>
+ )
+}
+
+function UserManagementPanel() {
const { t } = useTranslation('settings')
const queryClient = useQueryClient()
const {