From 63d93d67921f5982fefddf28ee1f0df8cbcf7bd8 Mon Sep 17 00:00:00 2001 From: romanskijdev Date: Wed, 18 Nov 2026 12:17:54 +0300 Subject: [PATCH] Updated users editing UI --- src/components/CopyRolesModal.tsx | 123 --------- src/components/CopyRolesPanel.tsx | 147 ++++++++++ src/components/UserDrawer.module.css | 43 +++ src/components/UserEditDrawer.tsx | 398 +++++++++++++++++++++++++++ src/components/UserEditModal.tsx | 295 -------------------- src/pages/users/UsersPage.tsx | 4 +- 6 files changed, 590 insertions(+), 420 deletions(-) delete mode 100644 src/components/CopyRolesModal.tsx create mode 100644 src/components/CopyRolesPanel.tsx create mode 100644 src/components/UserDrawer.module.css create mode 100644 src/components/UserEditDrawer.tsx delete mode 100644 src/components/UserEditModal.tsx diff --git a/src/components/CopyRolesModal.tsx b/src/components/CopyRolesModal.tsx deleted file mode 100644 index 96f4f85..0000000 --- a/src/components/CopyRolesModal.tsx +++ /dev/null @@ -1,123 +0,0 @@ -import { useState } from 'react' -import { - Modal, - Stack, - TextInput, - Text, - Button, - Group, - Loader, - Center, - Paper, - Badge, - ScrollArea, - Box, -} from '@mantine/core' -import { IconSearch, IconCopy } from '@tabler/icons-react' -import { useUsers } from '@/features/users/hooks/useUsers' - -interface CopyRolesModalProps { - opened: boolean - onClose: () => void - onCopy: (roleIds: number[]) => void - currentUserId: number | null -} - -export default function CopyRolesModal({ opened, onClose, onCopy, currentUserId }: CopyRolesModalProps) { - const [search, setSearch] = useState('') - const [selectedUserId, setSelectedUserId] = useState(null) - - const { data, isLoading } = useUsers({ - offset: 0, - limit: 100, - ...(search && { full_name: search }), - }) - - const users = Array.isArray(data?.data) ? data.data : [] - - const handleSelectUser = (userId: number) => { - setSelectedUserId(userId) - } - - const handleCopy = () => { - if (!selectedUserId) return - - const selectedUser = users.find(u => u.id === selectedUserId) - if (selectedUser && Array.isArray(selectedUser.user_roles)) { - const roleIds = selectedUser.user_roles - .map(ur => ur.role_id) - .filter((id): id is number => !!id) - onCopy(roleIds) - } - } - - return ( - - - } - value={search} - onChange={(e) => setSearch(e.currentTarget.value)} - /> - - {isLoading ? ( -
- -
- ) : ( - - - {users - .filter(u => u.id !== currentUserId) - .map((user) => ( - handleSelectUser(user.id!)} - > - - - {user.full_name} - - {user.username ? `@${user.username}` : user.telegram_id} - - - - {Array.isArray(user.user_roles) ? user.user_roles.length : 0} ролей - - - - ))} - - - )} - - - - - -
-
- ) -} \ No newline at end of file diff --git a/src/components/CopyRolesPanel.tsx b/src/components/CopyRolesPanel.tsx new file mode 100644 index 0000000..054ba92 --- /dev/null +++ b/src/components/CopyRolesPanel.tsx @@ -0,0 +1,147 @@ +import { useMemo, useState } from 'react' +import { + ActionIcon, + Avatar, + Box, + Button, + Drawer, + Group, + ScrollArea, + SegmentedControl, + Skeleton, + Stack, + Text, + TextInput, + UnstyledButton, +} from '@mantine/core' +import { useDebouncedValue } from '@mantine/hooks' +import { IconArrowLeft, IconCheck, IconSearch } from '@tabler/icons-react' +import { useUsers } from '@/features/users/hooks/useUsers' +import classes from './UserDrawer.module.css' + +type Mode = 'replace' | 'merge' + +interface Props { + currentUserId: number | null + onBack: () => void + onApply: (roleIds: number[], mode: Mode) => void +} + +interface Picked { + id: number + roleIds: number[] +} + +export default function CopyRolesPanel({ currentUserId, onBack, onApply }: Props) { + const [search, setSearch] = useState('') + const [debounced] = useDebouncedValue(search.trim(), 300) + const [picked, setPicked] = useState(null) + const [mode, setMode] = useState('replace') + + const { data, isLoading } = useUsers({ + offset: 0, + limit: 100, + ...(debounced && { full_name: debounced }), + }) + + const users = useMemo( + () => (Array.isArray(data?.data) ? data.data : []).filter((u) => u.id !== currentUserId), + [data, currentUserId], + ) + + const pick = (user: (typeof users)[number]) => { + const roleIds = Array.isArray(user.user_roles) + ? user.user_roles.map((ur) => ur.role_id).filter((id): id is number => !!id) + : [] + setPicked({ id: user.id!, roleIds }) + } + + return ( + <> + + + + + + Скопировать роли + + + + + + + } + value={search} + onChange={(e) => setSearch(e.currentTarget.value)} + autoFocus + /> + + setMode(v as Mode)} + data={[ + { value: 'replace', label: 'Заменить текущие' }, + { value: 'merge', label: 'Добавить к текущим' }, + ]} + /> + + {isLoading ? ( + + {Array.from({ length: 6 }).map((_, i) => )} + + ) : users.length === 0 ? ( + Никого не найдено + ) : ( + + + {users.map((u) => { + const roles = (Array.isArray(u.user_roles) ? u.user_roles : []) + .map((ur) => ur.role?.name) + .filter(Boolean) + const isPicked = picked?.id === u.id + return ( + pick(u)} + > + + + + + {u.full_name} + + {roles.length} ролей + + + + {roles.length > 0 ? roles.join(', ') : 'Без ролей'} + + + {isPicked && } + + + ) + })} + + + )} + + + + Роли применятся после сохранения + + + + + + + + ) +} \ No newline at end of file diff --git a/src/components/UserDrawer.module.css b/src/components/UserDrawer.module.css new file mode 100644 index 0000000..2931227 --- /dev/null +++ b/src/components/UserDrawer.module.css @@ -0,0 +1,43 @@ +.body { + display: flex; + flex-direction: column; + min-height: calc(100dvh - 68px); + padding: 0; +} + +.section { + padding: var(--mantine-spacing-md) var(--mantine-spacing-lg); +} + +.tabsList { + padding: 0 var(--mantine-spacing-lg); +} + +.footer { + position: sticky; + bottom: 0; + margin-top: auto; + padding: var(--mantine-spacing-sm) var(--mantine-spacing-lg); + background: var(--mantine-color-body); + border-top: 1px solid var(--mantine-color-default-border); +} + +.infoRow + .infoRow { + border-top: 1px solid var(--mantine-color-default-border); +} + +.pickRow { + display: block; + width: 100%; + padding: 8px 10px; + border-radius: var(--mantine-radius-md); + transition: background-color 120ms ease; +} + +.pickRow:hover { + background-color: var(--mantine-color-default-hover); +} + +.pickRow[data-selected] { + background-color: var(--mantine-primary-color-light); +} \ No newline at end of file diff --git a/src/components/UserEditDrawer.tsx b/src/components/UserEditDrawer.tsx new file mode 100644 index 0000000..4382c7c --- /dev/null +++ b/src/components/UserEditDrawer.tsx @@ -0,0 +1,398 @@ +import { useEffect, useMemo, useRef, useState } from 'react' +import { + ActionIcon, + Avatar, + Box, + Button, + Checkbox, + CopyButton, + Drawer, + Group, + ScrollArea, + Select, + Skeleton, + Stack, + Switch, + Tabs, + Text, + TextInput, + Tooltip, + UnstyledButton, +} from '@mantine/core' +import { useForm } from '@mantine/form' +import { IconCheck, IconCopy, IconSearch } from '@tabler/icons-react' +import dayjs from 'dayjs' +import { useUser, useUpdateUser } from '@/features/users/hooks/useUsers' +import { useDepartments } from '@/features/users/hooks/useDepartments' +import { useRoles } from '@/features/users/hooks/useRoles' +import { useUserRoles, useBulkAssignRoles } from '@/features/users/hooks/useUserRoles' +import { ConfirmModal } from '@/components/ui/ConfirmModal' +import { StatusBadge, userStatusOf } from '@/components/ui/StatusBadge' +import CopyRolesPanel from './CopyRolesPanel' +import classes from './UserDrawer.module.css' + +interface Props { + userId: number | null + opened: boolean + onClose: () => void +} + +const EMPTY = { + full_name: '', + department_id: null as number | null, + is_blocked: false, + is_fired: false, + role_ids: [] as number[], +} + +function InfoRow({ label, children }: { label: string; children: React.ReactNode }) { + return ( + + {label} + {children} + + ) +} + +export default function UserEditDrawer({ userId, opened, onClose }: Props) { + const { data: user, isLoading: userLoading } = useUser(userId) + const { data: departments } = useDepartments() + const { data: allRoles } = useRoles({ limit: 1000 }) + const { data: userRoles, isLoading: rolesLoading } = useUserRoles(userId) + + const updateUser = useUpdateUser() + const assignRoles = useBulkAssignRoles() + + const [tab, setTab] = useState('profile') + const [view, setView] = useState<'edit' | 'copy'>('edit') + const [roleQuery, setRoleQuery] = useState('') + const [confirmClose, setConfirmClose] = useState(false) + const initializedFor = useRef(null) + + const form = useForm({ + initialValues: EMPTY, + validate: { + full_name: (v) => (v.trim() ? null : 'Укажите ФИО'), + }, + }) + + const isLoading = userLoading || rolesLoading + const isSubmitting = updateUser.isPending || assignRoles.isPending + + // Инициализация формы: один раз за открытие, чтобы фоновые обновления данных не затирали правки + useEffect(() => { + if (!opened || isLoading || !user || initializedFor.current === userId) return + + const fromApi = Array.isArray(userRoles) + ? userRoles.map((ur) => ur.role?.id || ur.role_id).filter((id): id is number => !!id) + : [] + const fromUser = Array.isArray(user.user_roles) + ? user.user_roles.map((ur) => ur.role_id).filter((id): id is number => !!id) + : [] + + const values = { + full_name: user.full_name || '', + department_id: user.department_id || null, + is_blocked: user.is_blocked || false, + is_fired: user.is_fired || false, + role_ids: fromApi.length > 0 ? fromApi : fromUser, + } + form.setValues(values) + form.resetDirty(values) + initializedFor.current = userId + }, [opened, isLoading, user, userRoles, userId]) + + // Сброс локального состояния при закрытии + useEffect(() => { + if (!opened) { + initializedFor.current = null + setTab('profile') + setView('edit') + setRoleQuery('') + setConfirmClose(false) + } + }, [opened]) + + const requestClose = () => (form.isDirty() ? setConfirmClose(true) : onClose()) + + const handleSubmit = async (values: typeof form.values) => { + if (!userId) return + await updateUser.mutateAsync({ + id: userId, + full_name: values.full_name.trim(), + department_id: values.department_id, + is_blocked: values.is_blocked, + is_fired: values.is_fired, + }) + await assignRoles.mutateAsync({ user_id: userId, role_ids: values.role_ids }) + onClose() + } + + const departmentOptions = useMemo( + () => (Array.isArray(departments) ? departments.map((d) => ({ value: String(d.id), label: d.name || '' })) : []), + [departments], + ) + + const roleItems = useMemo( + () => + Array.isArray(allRoles) + ? allRoles.map((r) => ({ id: r.id as number, name: r.name || '', description: r.description as string | undefined })) + : [], + [allRoles], + ) + + const filteredRoles = useMemo(() => { + const q = roleQuery.trim().toLowerCase() + if (!q) return roleItems + return roleItems.filter((r) => r.name.toLowerCase().includes(q) || (r.description ?? '').toLowerCase().includes(q)) + }, [roleItems, roleQuery]) + + const selected = useMemo(() => new Set(form.values.role_ids), [form.values.role_ids]) + + const toggleRole = (id: number) => + form.setFieldValue( + 'role_ids', + selected.has(id) ? form.values.role_ids.filter((x) => x !== id) : [...form.values.role_ids, id], + ) + + const applyCopiedRoles = (roleIds: number[], mode: 'replace' | 'merge') => { + form.setFieldValue('role_ids', mode === 'merge' ? Array.from(new Set([...form.values.role_ids, ...roleIds])) : roleIds) + setView('edit') + setTab('roles') + } + + return ( + <> + + + + {view === 'copy' ? ( + setView('edit')} + onApply={applyCopiedRoles} + /> + ) : ( + <> + + + + + {user?.full_name || 'Пользователь'} + + ID {userId} + {user && } + + + + + + + + {isLoading ? ( + + + + + + + ) : !user ? ( + Пользователь не найден + ) : ( +
setTab('profile'))} + > + + + Профиль + {form.values.role_ids.length} + } + > + Роли + + Доступ + + + + + + + {user.telegram_id} + + {({ copied, copy }) => ( + + + {copied ? : } + + + )} + + + {user.username && ( + + @{user.username} + + )} + {user.last_login && ( + + {dayjs(user.last_login).format('D MMM YYYY, HH:mm')} + + )} + + + + + form.setFieldValue('department_id', v ? Number(v) : null)} - clearable - /> - - - - {/* Вкладка: Роли */} - - - - - Выбрано ролей: {form.values.role_ids.length} - - - - - - - - - setCopyRolesOpened(true)} - > - - - - - - - form.setFieldValue('role_ids', v.map(Number))} - searchable - clearable - description="Пользователь может иметь несколько ролей" - maxDropdownHeight={300} - /> - - - - {/* Вкладка: Настройки */} - - - form.setFieldValue('is_blocked', e.currentTarget.checked)} - color="red" - /> - - form.setFieldValue('is_fired', e.currentTarget.checked)} - color="gray" - /> - - - - - - - - - - - - ) : ( -
- Пользователь не найден -
- )} - - - setCopyRolesOpened(false)} - onCopy={handleCopyRoles} - currentUserId={userId} - /> - - ) -} \ No newline at end of file diff --git a/src/pages/users/UsersPage.tsx b/src/pages/users/UsersPage.tsx index 2810d16..e204030 100644 --- a/src/pages/users/UsersPage.tsx +++ b/src/pages/users/UsersPage.tsx @@ -8,7 +8,7 @@ import { IconDots, IconPencil, IconSearch, IconTrash } from '@tabler/icons-react import { useUsers, useDeleteUser } from '@/features/users/hooks/useUsers' import { useDepartments } from '@/features/users/hooks/useDepartments' import { useRoles } from '@/features/users/hooks/useRoles' -import UserEditModal from '@/components/UserEditModal.tsx' +import UserEditDrawer from '@/components/UserEditDrawer' import { useAuth } from '@/hooks/useAuth' import { PageHeader } from '@/components/ui/PageHeader' import { FilterBar } from '@/components/ui/FilterBar' @@ -231,7 +231,7 @@ export default function UsersPage() { pagination={{ page, pageSize: LIMIT, total, onChange: setPage }} /> - setEditUserId(null)}