fix users page crush
Deploy Frontend / build-and-deploy (push) Successful in 24s
Details
Deploy Frontend / build-and-deploy (push) Successful in 24s
Details
This commit is contained in:
parent
021a6fca85
commit
48cd2450ea
|
|
@ -5,7 +5,6 @@ import {
|
|||
Badge,
|
||||
Group,
|
||||
ActionIcon,
|
||||
Button,
|
||||
Text,
|
||||
TextInput,
|
||||
Select,
|
||||
|
|
@ -42,14 +41,17 @@ export default function UsersPage() {
|
|||
|
||||
const { data: departments } = useDepartments()
|
||||
|
||||
// ✅ Безопасная нормализация отделов
|
||||
const departmentOptions = useMemo(() => {
|
||||
if (!departments) return []
|
||||
if (!Array.isArray(departments)) return []
|
||||
return departments.map((d) => ({
|
||||
value: String(d.id),
|
||||
label: d.name || '',
|
||||
}))
|
||||
}, [departments])
|
||||
|
||||
// ✅ Безопасная нормализация списка пользователей
|
||||
const users = Array.isArray(data?.data) ? data.data : []
|
||||
const totalPages = data?.total_count ? Math.ceil(data.total_count / LIMIT) : 1
|
||||
|
||||
return (
|
||||
|
|
@ -61,7 +63,6 @@ export default function UsersPage() {
|
|||
</Text>
|
||||
</Group>
|
||||
|
||||
{/* Фильтры */}
|
||||
<Paper withBorder p="md">
|
||||
<Group gap="md" align="flex-end">
|
||||
<TextInput
|
||||
|
|
@ -108,7 +109,6 @@ export default function UsersPage() {
|
|||
</Group>
|
||||
</Paper>
|
||||
|
||||
{/* Таблица */}
|
||||
<Paper withBorder>
|
||||
{isLoading ? (
|
||||
<Center p={60}>
|
||||
|
|
@ -130,7 +130,7 @@ export default function UsersPage() {
|
|||
</Table.Tr>
|
||||
</Table.Thead>
|
||||
<Table.Tbody>
|
||||
{data?.data?.length === 0 ? (
|
||||
{users.length === 0 ? (
|
||||
<Table.Tr>
|
||||
<Table.Td colSpan={8}>
|
||||
<Center p={40}>
|
||||
|
|
@ -139,7 +139,7 @@ export default function UsersPage() {
|
|||
</Table.Td>
|
||||
</Table.Tr>
|
||||
) : (
|
||||
(data?.data || []).map((user) => (
|
||||
users.map((user) => (
|
||||
<Table.Tr key={user.id}>
|
||||
<Table.Td>{user.id}</Table.Td>
|
||||
<Table.Td>
|
||||
|
|
@ -156,17 +156,21 @@ export default function UsersPage() {
|
|||
</Table.Td>
|
||||
<Table.Td>
|
||||
<Group gap={4}>
|
||||
{user.user_roles?.slice(0, 3).map((ur) => (
|
||||
<Badge key={ur.id} size="xs" variant="light">
|
||||
{ur.role?.name || 'Роль'}
|
||||
</Badge>
|
||||
))}
|
||||
{user.user_roles && user.user_roles.length > 3 && (
|
||||
<Badge size="xs" variant="outline">
|
||||
+{user.user_roles.length - 3}
|
||||
</Badge>
|
||||
)}
|
||||
{(!user.user_roles || user.user_roles.length === 0) && (
|
||||
{/* ✅ Безопасный рендер ролей */}
|
||||
{Array.isArray(user.user_roles) ? (
|
||||
<>
|
||||
{user.user_roles.slice(0, 3).map((ur) => (
|
||||
<Badge key={ur.id} size="xs" variant="light">
|
||||
{ur.role?.name || 'Роль'}
|
||||
</Badge>
|
||||
))}
|
||||
{user.user_roles.length > 3 && (
|
||||
<Badge size="xs" variant="outline">
|
||||
+{user.user_roles.length - 3}
|
||||
</Badge>
|
||||
)}
|
||||
</>
|
||||
) : (
|
||||
<Text size="xs" c="dimmed">—</Text>
|
||||
)}
|
||||
</Group>
|
||||
|
|
@ -194,7 +198,6 @@ export default function UsersPage() {
|
|||
</Table.Tbody>
|
||||
</Table>
|
||||
|
||||
{/* Пагинация */}
|
||||
{totalPages > 1 && (
|
||||
<Box p="md" style={{ borderTop: '1px solid var(--mantine-color-gray-3)' }}>
|
||||
<Group justify="space-between">
|
||||
|
|
@ -214,21 +217,12 @@ export default function UsersPage() {
|
|||
)}
|
||||
</Paper>
|
||||
|
||||
{/* Индикатор обновления */}
|
||||
{isFetching && !isLoading && (
|
||||
<Box
|
||||
style={{
|
||||
position: 'fixed',
|
||||
top: 70,
|
||||
right: 20,
|
||||
zIndex: 1000
|
||||
}}
|
||||
>
|
||||
<Box style={{ position: 'fixed', top: 70, right: 20, zIndex: 1000 }}>
|
||||
<Loader size="xs" />
|
||||
</Box>
|
||||
)}
|
||||
|
||||
{/* Модальное окно редактирования */}
|
||||
<UserEditModal
|
||||
userId={editUserId}
|
||||
opened={editUserId !== null}
|
||||
|
|
@ -245,11 +239,7 @@ function UserStatusBadge({
|
|||
isBlocked?: boolean
|
||||
isFired?: boolean
|
||||
}) {
|
||||
if (isFired) {
|
||||
return <Badge color="gray" variant="filled">Уволен</Badge>
|
||||
}
|
||||
if (isBlocked) {
|
||||
return <Badge color="red" variant="filled">Заблокирован</Badge>
|
||||
}
|
||||
if (isFired) return <Badge color="gray" variant="filled">Уволен</Badge>
|
||||
if (isBlocked) return <Badge color="red" variant="filled">Заблокирован</Badge>
|
||||
return <Badge color="green" variant="light">Активен</Badge>
|
||||
}
|
||||
Loading…
Reference in New Issue