feat: add bulk user group assignment

This commit is contained in:
马登山
2026-04-28 18:00:36 +08:00
parent e20cc7f81a
commit 92e02137ec
5 changed files with 190 additions and 1 deletions
+12 -1
View File
@@ -16,6 +16,7 @@ import { useDataTable } from "@/hooks/use-data-table"
import { usePermissions } from "@/hooks/use-permissions"
import { UserNewForm } from "@/components/user/new-form"
import { UserEditForm } from "@/components/user/edit-form"
import { UserAddToGroupForm } from "@/components/user/add-to-group-form"
import { useUsers } from "@/hooks/use-users"
import { useDialog } from "@/lib/feedback/dialog"
import { useMessage } from "@/lib/feedback/message"
@@ -64,6 +65,7 @@ export default function UsersPage() {
const [searchTerm, setSearchTerm] = useState("")
const [newFormOpen, setNewFormOpen] = useState(false)
const [editFormOpen, setEditFormOpen] = useState(false)
const [addToGroupOpen, setAddToGroupOpen] = useState(false)
const [editRow, setEditRow] = useState<UserRow | null>(null)
const getDataList = React.useCallback(async () => {
@@ -212,7 +214,7 @@ export default function UsersPage() {
}
const addToGroup = () => {
message.error(t("Add to Group") + " - " + t("Coming soon"))
setAddToGroupOpen(true)
}
return (
@@ -269,6 +271,15 @@ export default function UsersPage() {
<UserNewForm open={newFormOpen} onOpenChange={setNewFormOpen} onSuccess={getDataList} />
<UserEditForm open={editFormOpen} onOpenChange={setEditFormOpen} row={editRow} onSuccess={getDataList} />
<UserAddToGroupForm
open={addToGroupOpen}
onOpenChange={setAddToGroupOpen}
selectedUsers={selectedKeys}
onSuccess={() => {
table.resetRowSelection()
getDataList()
}}
/>
</div>
</Page>
)
+101
View File
@@ -0,0 +1,101 @@
"use client"
import * as React from "react"
import { useTranslation } from "react-i18next"
import { Badge } from "@/components/ui/badge"
import { Button } from "@/components/ui/button"
import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog"
import { Spinner } from "@/components/ui/spinner"
import { useGroups } from "@/hooks/use-groups"
import { useMessage } from "@/lib/feedback/message"
import { buildAddUsersToGroupsRequests } from "@/lib/user-group-memberships"
import { UserEditGroups } from "./edit/groups"
interface UserAddToGroupFormProps {
open: boolean
onOpenChange: (open: boolean) => void
selectedUsers: string[]
onSuccess: () => void
}
export function UserAddToGroupForm({ open, onOpenChange, selectedUsers, onSuccess }: UserAddToGroupFormProps) {
const { t } = useTranslation()
const message = useMessage()
const { listGroup, updateGroupMembers } = useGroups()
const [groups, setGroups] = React.useState<string[]>([])
const [groupsList, setGroupsList] = React.useState<{ label: string; value: string }[]>([])
const [loading, setLoading] = React.useState(false)
const [submitting, setSubmitting] = React.useState(false)
React.useEffect(() => {
if (!open) return
setGroups([])
setLoading(true)
listGroup()
.then((res) => {
setGroupsList((res as string[] | undefined)?.map((group) => ({ label: group, value: group })) ?? [])
})
.catch(() => {
message.error(t("Failed to get data"))
})
.finally(() => setLoading(false))
}, [listGroup, message, open, t])
const closeModal = () => onOpenChange(false)
const submitForm = async () => {
const requests = buildAddUsersToGroupsRequests(selectedUsers, groups)
if (!requests.length) {
message.error(t("Please select at least one item"))
return
}
setSubmitting(true)
try {
await Promise.all(requests.map((request) => updateGroupMembers(request)))
message.success(t("Edit Success"))
onOpenChange(false)
onSuccess()
} catch (error) {
console.error(error)
message.error((error as Error)?.message || t("Edit Failed"))
} finally {
setSubmitting(false)
}
}
return (
<Dialog open={open} onOpenChange={closeModal}>
<DialogContent className="sm:max-w-lg" onPointerDownOutside={(e) => e.preventDefault()}>
<DialogHeader>
<DialogTitle>{t("Add to Group")}</DialogTitle>
</DialogHeader>
<div className="space-y-4">
<div className="space-y-2">
<div className="text-sm font-medium">{t("Users")}</div>
<div className="flex flex-wrap gap-2">
{selectedUsers.map((user) => (
<Badge key={user} variant="secondary">
{user}
</Badge>
))}
</div>
</div>
<UserEditGroups value={groups} options={groupsList} disabled={loading || submitting} onChange={setGroups} />
</div>
<DialogFooter>
<Button variant="outline" onClick={closeModal} disabled={submitting}>
{t("Cancel")}
</Button>
<Button onClick={submitForm} disabled={loading || submitting || !selectedUsers.length}>
{submitting ? <Spinner className="size-4" /> : null}
<span>{t("Submit")}</span>
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
)
}
+13
View File
@@ -0,0 +1,13 @@
export function buildAddUsersToGroupsRequests(users, groups) {
const normalizedUsers = users.map((user) => user.trim()).filter(Boolean)
const normalizedGroups = groups.map((group) => group.trim()).filter(Boolean)
return normalizedUsers.flatMap((user) =>
normalizedGroups.map((group) => ({
group,
members: [user],
isRemove: false,
groupStatus: "enabled",
})),
)
}
+20
View File
@@ -0,0 +1,20 @@
export interface UpdateGroupMembersRequest {
group: string
members: string[]
isRemove: boolean
groupStatus: string
}
export function buildAddUsersToGroupsRequests(users: string[], groups: string[]): UpdateGroupMembersRequest[] {
const normalizedUsers = users.map((user) => user.trim()).filter(Boolean)
const normalizedGroups = groups.map((group) => group.trim()).filter(Boolean)
return normalizedUsers.flatMap((user) =>
normalizedGroups.map((group) => ({
group,
members: [user],
isRemove: false,
groupStatus: "enabled",
})),
)
}
+44
View File
@@ -0,0 +1,44 @@
import test from "node:test"
import assert from "node:assert/strict"
import { buildAddUsersToGroupsRequests } from "../../lib/user-group-memberships.js"
test("buildAddUsersToGroupsRequests creates one add-members request per selected user and group", () => {
assert.deepEqual(buildAddUsersToGroupsRequests(["alice", "bob"], ["admins", "auditors"]), [
{
group: "admins",
members: ["alice"],
isRemove: false,
groupStatus: "enabled",
},
{
group: "auditors",
members: ["alice"],
isRemove: false,
groupStatus: "enabled",
},
{
group: "admins",
members: ["bob"],
isRemove: false,
groupStatus: "enabled",
},
{
group: "auditors",
members: ["bob"],
isRemove: false,
groupStatus: "enabled",
},
])
})
test("buildAddUsersToGroupsRequests ignores blank users and groups", () => {
assert.deepEqual(buildAddUsersToGroupsRequests([" alice ", ""], [" admins ", ""]), [
{
group: "admins",
members: ["alice"],
isRemove: false,
groupStatus: "enabled",
},
])
})