Updated users and dashboard UI
Deploy Frontend / build-and-deploy (push) Successful in 33s Details

This commit is contained in:
romanskijdev 2026-11-18 12:09:46 +03:00
parent 0a4a7829b0
commit ca4e725bce
16 changed files with 1015 additions and 857 deletions

View File

@ -0,0 +1,29 @@
import { Button, Group, Modal, Text } from '@mantine/core'
import type { ReactNode } from 'react'
interface Props {
opened: boolean
onClose: () => void
onConfirm: () => void
title: string
message: ReactNode
confirmLabel?: string
danger?: boolean
loading?: boolean
}
export function ConfirmModal({
opened, onClose, onConfirm, title, message, confirmLabel = 'Подтвердить', danger, loading,
}: Props) {
return (
<Modal opened={opened} onClose={onClose} title={title} size="sm">
<Text size="sm" c="dimmed">{message}</Text>
<Group justify="flex-end" gap="xs" mt="lg">
<Button variant="default" onClick={onClose} disabled={loading}>Отмена</Button>
<Button color={danger ? 'red' : undefined} onClick={onConfirm} loading={loading}>
{confirmLabel}
</Button>
</Group>
</Modal>
)
}

View File

@ -0,0 +1,90 @@
import { Group, Pagination, Paper, Skeleton, Table, Text } from '@mantine/core'
import type { ReactNode } from 'react'
import { EmptyState } from './EmptyState'
export interface Column<T> {
key: string
header: ReactNode
cell: (row: T) => ReactNode
width?: number | string
align?: 'left' | 'right' | 'center'
}
interface Props<T> {
columns: Column<T>[]
rows: T[]
getRowId: (row: T) => string | number
loading?: boolean // первая загрузка: показываем скелетоны
refreshing?: boolean // перезапрос: приглушаем строки
onRowClick?: (row: T) => void
empty?: { title: string; description?: string }
pagination?: { page: number; pageSize: number; total: number; onChange: (page: number) => void }
minWidth?: number
}
export function DataTable<T>({
columns, rows, getRowId, loading, refreshing, onRowClick,
empty = { title: 'Ничего не найдено' }, pagination, minWidth = 800,
}: Props<T>) {
const pages = pagination ? Math.max(1, Math.ceil(pagination.total / pagination.pageSize)) : 1
const from = pagination ? (pagination.page - 1) * pagination.pageSize + 1 : 0
const to = pagination ? Math.min(pagination.page * pagination.pageSize, pagination.total) : 0
return (
<Paper style={{ overflow: 'hidden' }}>
<Table.ScrollContainer minWidth={minWidth}>
<Table highlightOnHover={!!onRowClick}>
<Table.Thead>
<Table.Tr>
{columns.map((c) => (
<Table.Th key={c.key} w={c.width} ta={c.align} fz="xs" fw={500} c="dimmed">
{c.header}
</Table.Th>
))}
</Table.Tr>
</Table.Thead>
<Table.Tbody style={{ opacity: refreshing && !loading ? 0.55 : 1, transition: 'opacity 120ms' }}>
{loading
? Array.from({ length: 8 }).map((_, r) => (
<Table.Tr key={r}>
{columns.map((c, i) => (
<Table.Td key={c.key}>
<Skeleton h={12} w={`${55 + ((r * 7 + i * 13) % 35)}%`} />
</Table.Td>
))}
</Table.Tr>
))
: rows.map((row) => (
<Table.Tr
key={getRowId(row)}
onClick={onRowClick ? () => onRowClick(row) : undefined}
style={{ cursor: onRowClick ? 'pointer' : undefined }}
>
{columns.map((c) => (
<Table.Td key={c.key} ta={c.align}>{c.cell(row)}</Table.Td>
))}
</Table.Tr>
))}
</Table.Tbody>
</Table>
</Table.ScrollContainer>
{!loading && rows.length === 0 && (
<EmptyState title={empty.title} description={empty.description} />
)}
{pagination && pagination.total > pagination.pageSize && (
<Group
justify="space-between"
px="md"
py="sm"
style={{ borderTop: '1px solid var(--mantine-color-default-border)' }}
>
<Text size="xs" c="dimmed">{from}–{to} из {pagination.total}</Text>
<Pagination size="sm" value={pagination.page} total={pages} onChange={pagination.onChange} />
</Group>
)}
</Paper>
)
}

View File

@ -0,0 +1,28 @@
import { Button, Group } from '@mantine/core'
import { IconX } from '@tabler/icons-react'
import type { ReactNode } from 'react'
interface Props {
children: ReactNode
activeCount?: number
onReset?: () => void
}
export function FilterBar({ children, activeCount = 0, onReset }: Props) {
return (
<Group gap="sm" align="center">
{children}
{activeCount > 0 && onReset && (
<Button
variant="subtle"
color="gray"
size="sm"
leftSection={<IconX size={14} />}
onClick={onReset}
>
Сбросить · {activeCount}
</Button>
)}
</Group>
)
}

View File

@ -0,0 +1,64 @@
import { useMemo, useState } from 'react'
import { Badge, Button, Checkbox, Popover, ScrollArea, Stack, Text, TextInput } from '@mantine/core'
import { IconChevronDown, IconSearch } from '@tabler/icons-react'
interface Props {
label: string
options: { value: string; label: string }[]
value: string[]
onChange: (value: string[]) => void
width?: number
}
export function MultiFilter({ label, options, value, onChange, width = 260 }: Props) {
const [query, setQuery] = useState('')
const filtered = useMemo(() => {
const q = query.trim().toLowerCase()
return q ? options.filter((o) => o.label.toLowerCase().includes(q)) : options
}, [options, query])
return (
<Popover position="bottom-start" shadow="md" width={width}>
<Popover.Target>
<Button
variant="default"
size="sm"
fw={400}
rightSection={<IconChevronDown size={14} />}
>
{label}
{value.length > 0 && <Badge size="xs" circle variant="filled" ml={8}>{value.length}</Badge>}
</Button>
</Popover.Target>
<Popover.Dropdown p="xs">
<TextInput
size="xs"
placeholder="Поиск"
leftSection={<IconSearch size={14} />}
value={query}
onChange={(e) => setQuery(e.currentTarget.value)}
mb="xs"
/>
<ScrollArea.Autosize mah={260} type="auto">
<Checkbox.Group value={value} onChange={onChange}>
<Stack gap={8} p={4}>
{filtered.map((o) => (
<Checkbox key={o.value} value={o.value} label={o.label} size="sm" />
))}
</Stack>
</Checkbox.Group>
{filtered.length === 0 && (
<Text size="xs" c="dimmed" ta="center" py="xs">Ничего не найдено</Text>
)}
</ScrollArea.Autosize>
{value.length > 0 && (
<Button variant="subtle" color="gray" size="compact-xs" mt="xs" onClick={() => onChange([])}>
Очистить
</Button>
)}
</Popover.Dropdown>
</Popover>
)
}

View File

@ -9,7 +9,7 @@ interface Props {
export function PageHeader({ title, description, actions }: Props) {
return (
<Group justify="space-between" align="flex-start" wrap="nowrap" mb="lg">
<Group justify="space-between" align="flex-start" wrap="nowrap">
<Stack gap={2}>
<Title order={3}>{title}</Title>
{description && <Text size="sm" c="dimmed">{description}</Text>}

View File

@ -0,0 +1,20 @@
import { Group, Paper, Text } from '@mantine/core'
import type { ReactNode } from 'react'
interface Props {
title: ReactNode
extra?: ReactNode
children: ReactNode
}
export function Panel({ title, extra, children }: Props) {
return (
<Paper p="md">
<Group justify="space-between" wrap="nowrap" mb="md" mih={22}>
<Text size="sm" fw={600}>{title}</Text>
{extra}
</Group>
{children}
</Paper>
)
}

View File

@ -0,0 +1,59 @@
import { Group, Paper, Text, ThemeIcon } from '@mantine/core'
import type { Icon } from '@tabler/icons-react'
import type { ReactNode } from 'react'
import { Link } from 'react-router-dom'
import classes from './ui.module.css'
function Sparkline({ data, color }: { data: number[]; color: string }) {
if (data.length < 2) return null
const w = 72, h = 28
const max = Math.max(...data, 1)
const points = data
.map((v, i) => `${(i / (data.length - 1)) * w},${h - 2 - (v / max) * (h - 4)}`)
.join(' ')
return (
<svg width={w} height={h} aria-hidden>
<polyline
points={points}
fill="none"
stroke={`var(--mantine-color-${color}-filled)`}
strokeWidth={1.6}
strokeLinecap="round"
strokeLinejoin="round"
/>
</svg>
)
}
interface Props {
label: string
value: ReactNode
hint?: ReactNode
icon: Icon
color?: string
to?: string
spark?: number[]
}
export function StatCard({ label, value, hint, icon: IconCmp, color = 'gray', to, spark }: Props) {
const body = (
<>
<Group justify="space-between" align="flex-start" wrap="nowrap">
<Text size="sm" c="dimmed" fw={500}>{label}</Text>
<ThemeIcon variant="light" color={color} size={30} radius="md">
<IconCmp size={16} stroke={1.7} />
</ThemeIcon>
</Group>
<Group justify="space-between" align="flex-end" wrap="nowrap" mt={10}>
<Text fz={28} fw={600} lh={1}>{value}</Text>
{spark && <Sparkline data={spark} color={color} />}
</Group>
{hint && <Text size="xs" c="dimmed" mt={8}>{hint}</Text>}
</>
)
if (to) {
return <Paper component={Link} to={to} p="md" className={classes.interactive}>{body}</Paper>
}
return <Paper p="md">{body}</Paper>
}

View File

@ -0,0 +1,19 @@
import { Badge } from '@mantine/core'
import { APPROVAL_STATUS, TASK_STATUS, USER_STATUS } from './statuses'
const MAPS = { approval: APPROVAL_STATUS, task: TASK_STATUS, user: USER_STATUS }
export function StatusBadge({ kind, status }: { kind: keyof typeof MAPS; status: string }) {
const meta = MAPS[kind][status]
return (
<Badge variant="dot" color={meta?.color ?? 'gray'} size="md">
{meta?.label ?? status}
</Badge>
)
}
export function userStatusOf(u: { is_blocked?: boolean; is_fired?: boolean }) {
if (u.is_fired) return 'fired'
if (u.is_blocked) return 'blocked'
return 'active'
}

View File

@ -0,0 +1,58 @@
import { Box, Group, Progress, Stack, Text, UnstyledButton } from '@mantine/core'
import { Link } from 'react-router-dom'
import { EmptyState } from './EmptyState'
import type { StatusMeta } from './statuses'
import classes from './ui.module.css'
interface Props {
items: { status: string; count: number }[]
meta: Record<string, StatusMeta>
linkTo: (status: string) => string
}
export function StatusBreakdown({ items, meta, linkTo }: Props) {
const counts = new Map(items.map((i) => [i.status, i.count]))
const rows = Object.entries(meta).map(([status, m]) => ({
status,
...m,
count: counts.get(status) ?? 0,
}))
const total = rows.reduce((s, r) => s + r.count, 0)
if (total === 0) return <EmptyState title="Нет данных" />
return (
<Stack gap="md">
<Progress.Root size={10} radius="xl">
{rows
.filter((r) => r.count > 0)
.map((r) => (
<Progress.Section key={r.status} value={(r.count / total) * 100} color={r.color} />
))}
</Progress.Root>
<Stack gap={2}>
{rows.map((r) => (
<UnstyledButton key={r.status} component={Link} to={linkTo(r.status)} className={classes.row}>
<Group justify="space-between" wrap="nowrap">
<Group gap={8} wrap="nowrap">
<Box
w={8}
h={8}
style={{ borderRadius: '50%', background: `var(--mantine-color-${r.color}-filled)` }}
/>
<Text size="sm" c={r.count === 0 ? 'dimmed' : undefined}>{r.plural}</Text>
</Group>
<Group gap="xs" wrap="nowrap">
<Text size="sm" fw={500}>{r.count}</Text>
<Text size="xs" c="dimmed" w={36} ta="right">
{Math.round((r.count / total) * 100)}%
</Text>
</Group>
</Group>
</UnstyledButton>
))}
</Stack>
</Stack>
)
}

View File

@ -0,0 +1,74 @@
import { Box, Group, Text } from '@mantine/core'
import dayjs from 'dayjs'
import { CartesianGrid, Line, LineChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts'
export interface TrendSeries {
key: string
label: string
color: string
}
interface Props {
data: Record<string, any>[]
series: TrendSeries[]
xKey?: string
height?: number
}
const tick = { fill: 'var(--mantine-color-dimmed)', fontSize: 12 }
const colorOf = (c: string) => `var(--mantine-color-${c}-filled)`
export function TrendChart({ data, series, xKey = 'date', height = 220 }: Props) {
const labels = Object.fromEntries(series.map((s) => [s.key, s.label]))
return (
<>
<Group gap="md" mb="xs">
{series.map((s) => (
<Group key={s.key} gap={6}>
<Box w={8} h={8} style={{ borderRadius: '50%', background: colorOf(s.color) }} />
<Text size="xs" c="dimmed">{s.label}</Text>
</Group>
))}
</Group>
<ResponsiveContainer width="100%" height={height}>
<LineChart data={data} margin={{ top: 8, right: 8, left: -20, bottom: 0 }}>
<CartesianGrid vertical={false} stroke="var(--mantine-color-default-border)" />
<XAxis
dataKey={xKey}
tickFormatter={(d) => dayjs(d).format('DD.MM')}
tick={tick}
tickLine={false}
axisLine={false}
/>
<YAxis allowDecimals={false} tick={tick} tickLine={false} axisLine={false} />
<Tooltip
cursor={{ stroke: 'var(--mantine-color-default-border)' }}
labelFormatter={(d) => dayjs(d).format('D MMMM')}
formatter={(v: any, name: any) => [v, labels[name] ?? name]}
contentStyle={{
background: 'var(--mantine-color-body)',
border: '1px solid var(--mantine-color-default-border)',
borderRadius: 8,
boxShadow: 'none',
fontSize: 12,
}}
labelStyle={{ color: 'var(--mantine-color-dimmed)', marginBottom: 4 }}
/>
{series.map((s) => (
<Line
key={s.key}
type="monotone"
dataKey={s.key}
stroke={colorOf(s.color)}
strokeWidth={2}
dot={false}
activeDot={{ r: 4 }}
/>
))}
</LineChart>
</ResponsiveContainer>
</>
)
}

View File

@ -0,0 +1,27 @@
export interface StatusMeta {
label: string // для бейджа конкретной записи
plural: string // для сводок и счётчиков
color: string // цвет Mantine
}
export const APPROVAL_STATUS: Record<string, StatusMeta> = {
pending: { label: 'На согласовании', plural: 'На согласовании', color: 'blue' },
revision: { label: 'На доработке', plural: 'На доработке', color: 'violet' },
approved: { label: 'Согласована', plural: 'Согласованы', color: 'green' },
rejected: { label: 'Отклонена', plural: 'Отклонены', color: 'red' },
revoked: { label: 'Отозвана', plural: 'Отозваны', color: 'orange' },
draft: { label: 'Черновик', plural: 'Черновики', color: 'gray' },
}
export const TASK_STATUS: Record<string, StatusMeta> = {
pending: { label: 'В работе', plural: 'В работе', color: 'blue' },
waiting: { label: 'В очереди', plural: 'В очереди', color: 'gray' },
completed: { label: 'Выполнена', plural: 'Выполнены', color: 'green' },
cancelled: { label: 'Отменена', plural: 'Отменены', color: 'red' },
}
export const USER_STATUS: Record<string, StatusMeta> = {
active: { label: 'Активен', plural: 'Активные', color: 'green' },
blocked: { label: 'Заблокирован', plural: 'Заблокированные', color: 'red' },
fired: { label: 'Уволен', plural: 'Уволенные', color: 'gray' },
}

View File

@ -0,0 +1,18 @@
.interactive,
.row {
display: block;
color: inherit;
text-decoration: none;
transition: background-color 120ms ease;
}
.interactive:hover,
.row:hover {
background-color: var(--mantine-color-default-hover);
}
.row {
width: 100%;
padding: 8px;
border-radius: var(--mantine-radius-sm);
}

7
src/lib/plural.ts Normal file
View File

@ -0,0 +1,7 @@
export function plural(n: number, forms: [string, string, string]) {
const m10 = n % 10
const m100 = n % 100
if (m10 === 1 && m100 !== 11) return forms[0]
if (m10 >= 2 && m10 <= 4 && (m100 < 12 || m100 > 14)) return forms[1]
return forms[2]
}

View File

@ -1,602 +1,346 @@
import { useEffect, useState } from 'react'
import { useState } from 'react'
import {
SimpleGrid,
Paper,
Text,
Group,
Stack,
Loader,
Center,
Badge,
Progress,
Alert,
Box,
ThemeIcon,
UnstyledButton,
ActionIcon, Alert, Avatar, Badge, Box, Button, Group, Progress, ScrollArea,
SimpleGrid, Skeleton, Stack, Text, ThemeIcon, Tooltip, UnstyledButton,
} from '@mantine/core'
import {
IconUsers,
IconFileCheck,
IconBuilding,
IconCategory,
IconAlertTriangle,
IconAlertOctagon,
IconClock,
IconAlertCircle,
IconCircleCheck,
IconChecklist,
IconCalendarOff,
IconChevronRight,
IconUserExclamation,
IconAlertCircle, IconAlertTriangle, IconArrowBackUp, IconCategory, IconChecklist,
IconChevronRight, IconFileCheck, IconRefresh, IconTrendingUp, IconUserExclamation,
type Icon,
} from '@tabler/icons-react'
import {
PieChart,
Pie,
Cell,
ResponsiveContainer,
LineChart,
Line,
XAxis,
YAxis,
CartesianGrid,
Tooltip,
Legend,
} from 'recharts'
import { useNavigate } from 'react-router-dom'
import { dashboardApi } from '@/api/dashboard'
import type { DashboardStats } from '@/api/dashboard'
import { useQuery } from '@tanstack/react-query'
import { Link } from 'react-router-dom'
import dayjs from 'dayjs'
import 'dayjs/locale/ru'
import TopicGapsModal from "@/components/TopicGapsModal.tsx";
import { dashboardApi } from '@/api/dashboard'
import type { DashboardStats } from '@/api/dashboard'
import { useAuth } from '@/hooks/useAuth'
import TopicGapsModal from '@/components/TopicGapsModal.tsx'
import { PageHeader } from '@/components/ui/PageHeader'
import { Panel } from '@/components/ui/Panel'
import { StatCard } from '@/components/ui/StatCard'
import { StatusBreakdown } from '@/components/ui/StatusBreakdown'
import { TrendChart } from '@/components/ui/TrendChart'
import { APPROVAL_STATUS, TASK_STATUS } from '@/components/ui/statuses'
import { plural } from '@/lib/plural'
import classes from '@/components/ui/ui.module.css'
dayjs.locale('ru')
const STATUS_COLORS: Record<string, string> = {
draft: '#868e96',
pending: '#228be6',
approved: '#40c057',
rejected: '#fa5252',
revoked: '#fd7e14',
revision: '#7950f2',
interface AttentionItem {
id: string
color: string
icon: Icon
title: string
description: string
to?: string
onClick?: () => void
}
const STATUS_LABELS: Record<string, string> = {
draft: 'Черновики',
pending: 'На согласовании',
approved: 'Согласованы',
rejected: 'Отклонены',
revoked: 'Отозваны',
revision: 'На доработке',
function AttentionRow({ item }: { item: AttentionItem }) {
const content = (
<Group wrap="nowrap" gap="sm">
<ThemeIcon variant="light" color={item.color} size={32} radius="md">
<item.icon size={16} stroke={1.7} />
</ThemeIcon>
<Box style={{ flex: 1, minWidth: 0 }}>
<Text size="sm" fw={500}>{item.title}</Text>
<Text size="xs" c="dimmed" lineClamp={1}>{item.description}</Text>
</Box>
<IconChevronRight size={16} color="var(--mantine-color-dimmed)" />
</Group>
)
if (item.to) {
return <UnstyledButton component={Link} to={item.to} className={classes.row}>{content}</UnstyledButton>
}
return <UnstyledButton onClick={item.onClick} className={classes.row}>{content}</UnstyledButton>
}
const TASK_STATUS_COLORS: Record<string, string> = {
pending: '#228be6',
waiting: '#868e96',
completed: '#40c057',
cancelled: '#fa5252',
}
const TASK_STATUS_LABELS: Record<string, string> = {
pending: 'В работе',
waiting: 'В очереди',
completed: 'Выполнены',
cancelled: 'Отменены',
}
export default function Dashboard() {
const navigate = useNavigate()
const [stats, setStats] = useState<DashboardStats | null>(null)
const [loading, setLoading] = useState(true)
const [error, setError] = useState<string | null>(null)
const [topicGapsOpened, setTopicGapsOpened] = useState(false)
useEffect(() => {
const loadData = async () => {
try {
const response = await dashboardApi.getStats()
setStats(response.data)
} catch (err: any) {
setError(err.response?.data?.error_description || 'Ошибка загрузки')
} finally {
setLoading(false)
}
}
loadData()
}, [])
if (loading) {
return (
<Center h={400}>
<Loader size="xl" />
</Center>
)
}
if (error || !stats) {
return (
<Alert icon={<IconAlertCircle size={16} />} color="red" title="Ошибка">
{error || 'Не удалось загрузить данные'}
</Alert>
)
}
// Фильтруем нулевые значения для pie chart
const chartData = stats.statusData.filter(s => s.count > 0)
const totalApprovals = chartData.reduce((sum, s) => sum + s.count, 0)
const taskChartData = stats.taskStatusData.filter(s => s.count > 0)
const totalTasks = taskChartData.reduce((sum, s) => sum + s.count, 0)
// 🆕 Клик по алерту "просрочены" — ведёт на заявки со status=pending
// и date_to = сегодня минус oldPendingDays (те же самые заявки, что
// посчитаны в oldPendingCount на бэкенде — общее определение "просрочки").
const goToOldPending = () => {
const cutoff = dayjs().subtract(stats.oldPendingDays, 'day').format('YYYY-MM-DD')
navigate(`/approvals?status=pending&date_to=${cutoff}`)
}
const goToRevision = () => {
navigate('/approvals?status=revision')
}
const goToTasksByStatus = (status: string) => {
navigate(`/approval-tasks?status=${status}`)
}
function DashboardSkeleton() {
return (
<Stack gap="lg">
{/* Заголовок */}
<Group justify="space-between">
<div>
<Text size="xl" fw={700}>Dashboard</Text>
<Text size="sm" c="dimmed">Обзор системы согласований</Text>
</div>
<Badge size="lg" variant="light" color="blue">
{dayjs().format('DD MMMM YYYY')}
</Badge>
</Group>
{/* 🆕 Alert теперь кликабельный — ведёт на отфильтрованный список заявок */}
{stats.oldPendingCount > 0 && (
<UnstyledButton onClick={goToOldPending} style={{ width: '100%' }}>
<Alert
icon={<IconAlertTriangle size={16} />}
color="orange"
variant="light"
title={`⚠️ ${stats.oldPendingCount} заявок требуют внимания`}
style={{ cursor: 'pointer' }}
>
<Group justify="space-between">
<Text size="sm">
Есть заявки, которые находятся на согласовании более {stats.oldPendingDays} дней.
</Text>
<Group gap={4} c="orange">
<Text size="xs" fw={600}>Посмотреть список</Text>
<IconChevronRight size={14} />
</Group>
</Group>
</Alert>
</UnstyledButton>
)}
{/* 🆕 Проблемы конфигурации инициаторов */}
{stats.topicGaps.length > 0 && (
<UnstyledButton onClick={() => setTopicGapsOpened(true)} style={{ width: '100%' }}>
<Paper withBorder p="md" radius="md" style={{ cursor: 'pointer' }}>
<Group justify="space-between">
<Group>
<ThemeIcon variant="light" color="orange" size="lg">
<IconAlertTriangle size={18} />
</ThemeIcon>
<div>
<Text fw={600}>
{stats.topicGaps.length} {stats.topicGaps.length === 1 ? 'тема без' : 'тем без'} назначенного порядка согласования
</Text>
<Text size="sm" c="dimmed">
Есть право создать заявку, но некому её согласовать — сотрудник наткнётся на ошибку в боте.
</Text>
</div>
</Group>
<Group gap={4} c="orange">
<Text size="xs" fw={600}>Показать список</Text>
<IconChevronRight size={14} />
</Group>
</Group>
</Paper>
</UnstyledButton>
)}
{stats.usersWithoutHierarchy.length > 0 && (
<Alert
icon={<IconUserExclamation size={16} />}
color="red"
variant="light"
title={`${stats.usersWithoutHierarchy.length} сотрудник(ов) без настроенной иерархии`}
>
<Text size="sm">
У перечисленных ниже есть право создавать заявки, но для их отдела не
настроено вообще ни одного правила согласования:{' '}
<Text span fw={600}>
{stats.usersWithoutHierarchy.map(u => u.full_name || `ID ${u.user_id}`).join(', ')}
</Text>
</Text>
</Alert>
)}
<TopicGapsModal
opened={topicGapsOpened}
onClose={() => setTopicGapsOpened(false)}
gaps={stats.topicGaps}
/>
{/* 🆕 Alert теперь кликабельный — ведёт на заявки на доработке */}
{stats.approvals.revision > 0 && (
<UnstyledButton onClick={goToRevision} style={{ width: '100%' }}>
<Paper withBorder p="md" radius="md" style={{ cursor: 'pointer' }}>
<Group justify="space-between">
<Group>
<ThemeIcon variant="light" color="orange" size="lg">
<IconClock size={18} />
</ThemeIcon>
<div>
<Text fw={600}>Требуют внимания: {stats.approvals.revision} заявок на доработке</Text>
<Text size="sm" c="dimmed">
Эти заявки были возвращены согласующими на доработку и требуют действий от инициаторов.
</Text>
</div>
</Group>
<IconChevronRight size={18} color="var(--mantine-color-gray-5)" />
</Group>
</Paper>
</UnstyledButton>
)}
{/* 🆕 Кто отсутствует сегодня */}
<Paper withBorder p="md" radius="md">
<Group mb="md">
<ThemeIcon variant="light" color="gray" size="lg">
<IconCalendarOff size={18} />
</ThemeIcon>
<Text fw={600}>
Отсутствуют сегодня{stats.absentToday.length > 0 ? ` (${stats.absentToday.length})` : ''}
</Text>
</Group>
{stats.absentToday.length === 0 ? (
<Text c="dimmed" size="sm">Сегодня все на месте</Text>
) : (
<SimpleGrid cols={{ base: 1, sm: 2, lg: 3 }} spacing="xs">
{stats.absentToday.map((person, i) => (
<Group key={i} gap="xs" wrap="nowrap">
<Text size="sm" fw={500} truncate>{person.name}</Text>
<Text size="xs" c="dimmed" truncate>— {person.description}</Text>
</Group>
))}
</SimpleGrid>
)}
</Paper>
{/* KPI карточки */}
<SimpleGrid cols={{ base: 1, sm: 2, lg: 4 }} spacing="md">
<StatCard
title="Пользователи"
value={stats.users.total}
subtitle={`${stats.users.active} активных`}
icon={IconUsers}
color="blue"
trend={stats.users.blocked > 0 ? `${stats.users.blocked} заблокировано` : undefined}
/>
<StatCard
title="Заявки"
value={stats.approvals.total}
subtitle={`${stats.approvals.today} за сегодня`}
icon={IconFileCheck}
color="green"
trend={stats.approvals.pending > 0 ? `${stats.approvals.pending} в работе` : undefined}
/>
<StatCard
title="Темы"
value={stats.topics.total}
subtitle={`${stats.topics.active} активных`}
icon={IconCategory}
color="violet"
trend={`${stats.categories} категорий`}
/>
<StatCard
title="Отделы / Роли"
value={stats.departments}
subtitle={`${stats.roles} ролей`}
icon={IconBuilding}
color="orange"
trend={`${stats.executors} исполнителей`}
/>
<PageHeader title="Обзор" />
<SimpleGrid cols={{ base: 1, xs: 2, lg: 4 }}>
{[0, 1, 2, 3].map((i) => <Skeleton key={i} h={112} radius="md" />)}
</SimpleGrid>
{/* Графики по заявкам */}
<SimpleGrid cols={{ base: 1, lg: 2 }} spacing="md">
{/* Pie chart */}
<Paper withBorder p="md" radius="md">
<Group justify="space-between" mb="md">
<Text fw={600}>Распределение заявок по статусам</Text>
<Badge variant="light">{totalApprovals} всего</Badge>
</Group>
{chartData.length === 0 ? (
<Center h={250}>
<Text c="dimmed">Нет данных</Text>
</Center>
) : (
<ResponsiveContainer width="100%" height={250}>
<PieChart>
<Pie
data={chartData}
dataKey="count"
nameKey="status"
cx="50%"
cy="50%"
innerRadius={60}
outerRadius={90}
paddingAngle={2}
label={(entry: any) => STATUS_LABELS[entry.payload?.status] || entry.payload?.status}
onClick={(entry: any) => navigate(`/approvals?status=${entry.status}`)}
style={{ cursor: 'pointer' }}
>
{chartData.map((entry, index) => (
<Cell
key={`cell-${index}`}
fill={STATUS_COLORS[entry.status] || '#868e96'}
/>
))}
</Pie>
<Tooltip
formatter={(value: any, name: any) => [
value,
STATUS_LABELS[name] || name
]}
/>
</PieChart>
</ResponsiveContainer>
)}
</Paper>
{/* Line chart */}
<Paper withBorder p="md" radius="md">
<Group justify="space-between" mb="md">
<Text fw={600}>Динамика за 7 дней</Text>
<Badge variant="light" color="blue">Заявки</Badge>
</Group>
<ResponsiveContainer width="100%" height={250}>
<LineChart data={stats.dailyData}>
<CartesianGrid strokeDasharray="3 3" />
<XAxis
dataKey="date"
tickFormatter={(d) => dayjs(d).format('DD.MM')}
/>
<YAxis />
<Tooltip
labelFormatter={(d) => dayjs(d).format('DD.MM.YYYY')}
formatter={(value: any, name: any) => [
value,
name === 'created' ? 'Создано' : 'Согласовано'
]}
/>
<Legend
formatter={(value) =>
value === 'created' ? 'Создано' : 'Согласовано'
}
/>
<Line
type="monotone"
dataKey="created"
stroke="#228be6"
strokeWidth={2}
dot={{ r: 4 }}
/>
<Line
type="monotone"
dataKey="approved"
stroke="#40c057"
strokeWidth={2}
dot={{ r: 4 }}
/>
</LineChart>
</ResponsiveContainer>
</Paper>
</SimpleGrid>
{/* 🆕 Задачи — те же два графика, что у заявок выше */}
<SimpleGrid cols={{ base: 1, lg: 2 }} spacing="md">
<Paper withBorder p="md" radius="md">
<Group justify="space-between" mb="md">
<Group gap="xs">
<ThemeIcon variant="light" color="teal" size="lg">
<IconChecklist size={18} />
</ThemeIcon>
<Text fw={600}>Задачи по статусам</Text>
</Group>
<Badge variant="light">{totalTasks} всего</Badge>
</Group>
{taskChartData.length === 0 ? (
<Center h={250}>
<Text c="dimmed">Нет данных</Text>
</Center>
) : (
<ResponsiveContainer width="100%" height={250}>
<PieChart>
<Pie
data={taskChartData}
dataKey="count"
nameKey="status"
cx="50%"
cy="50%"
innerRadius={60}
outerRadius={90}
paddingAngle={2}
label={(entry: any) => TASK_STATUS_LABELS[entry.payload?.status] || entry.payload?.status}
onClick={(entry: any) => goToTasksByStatus(entry.status)}
style={{ cursor: 'pointer' }}
>
{taskChartData.map((entry, index) => (
<Cell
key={`task-cell-${index}`}
fill={TASK_STATUS_COLORS[entry.status] || '#868e96'}
/>
))}
</Pie>
<Tooltip
formatter={(value: any, name: any) => [
value,
TASK_STATUS_LABELS[name] || name
]}
/>
</PieChart>
</ResponsiveContainer>
)}
</Paper>
<Paper withBorder p="md" radius="md">
<Group justify="space-between" mb="md">
<Text fw={600}>Динамика задач за 7 дней</Text>
<Badge variant="light" color="teal">Задачи</Badge>
</Group>
<ResponsiveContainer width="100%" height={250}>
<LineChart data={stats.taskDailyData}>
<CartesianGrid strokeDasharray="3 3" />
<XAxis
dataKey="date"
tickFormatter={(d) => dayjs(d).format('DD.MM')}
/>
<YAxis />
<Tooltip
labelFormatter={(d) => dayjs(d).format('DD.MM.YYYY')}
formatter={(value: any, name: any) => [
value,
name === 'created' ? 'Создано' : 'Выполнено'
]}
/>
<Legend
formatter={(value) =>
value === 'created' ? 'Создано' : 'Выполнено'
}
/>
<Line
type="monotone"
dataKey="created"
stroke="#228be6"
strokeWidth={2}
dot={{ r: 4 }}
/>
<Line
type="monotone"
dataKey="completed"
stroke="#12b886"
strokeWidth={2}
dot={{ r: 4 }}
/>
</LineChart>
</ResponsiveContainer>
</Paper>
</SimpleGrid>
{/* Разбивка по категориям + узкие места */}
<SimpleGrid cols={{ base: 1, lg: 2 }} spacing="md">
{/* Разбивка по категориям */}
<Paper withBorder p="md" radius="md">
<Group mb="md">
<ThemeIcon variant="light" color="violet" size="lg">
<IconCategory size={18} />
</ThemeIcon>
<Text fw={600}>Заявки по категориям</Text>
</Group>
{stats.categoryBreakdown.length === 0 ? (
<Center h={200}>
<Text c="dimmed">Нет данных</Text>
</Center>
) : (
<Stack gap="sm">
{stats.categoryBreakdown.map((cat) => {
const maxCount = Math.max(...stats.categoryBreakdown.map(c => c.total_count))
const percent = maxCount > 0 ? (cat.total_count / maxCount) * 100 : 0
return (
<Box key={cat.id}>
<Group justify="space-between" mb={4}>
<Text size="sm" fw={500}>{cat.name}</Text>
<Group gap="xs">
<Text size="sm" fw={600}>{cat.total_count}</Text>
{cat.pending_count > 0 && (
<Badge size="xs" color="blue" variant="light">
{cat.pending_count} в работе
</Badge>
)}
</Group>
</Group>
<Progress value={percent} size="sm" color="violet" />
</Box>
)
})}
</Stack>
)}
</Paper>
<SimpleGrid cols={{ base: 1, lg: 2 }}>
<Skeleton h={300} radius="md" />
<Skeleton h={300} radius="md" />
</SimpleGrid>
</Stack>
)
}
// Компонент карточки статистики
interface StatCardProps {
title: string
value: number | string
subtitle?: string
icon: any
color: string
trend?: string
}
const countOf = (items: { status: string; count: number }[], status: string) =>
items.find((i) => i.status === status)?.count ?? 0
function StatCard({ title, value, subtitle, icon: Icon, color, trend }: StatCardProps) {
return (
<Paper withBorder p="md" radius="md">
<Group justify="space-between" align="flex-start">
<Stack gap={4}>
<Text c="dimmed" size="xs" tt="uppercase" fw={700}>
{title}
</Text>
<Text size="xl" fw={700} c={color}>
{value}
</Text>
{subtitle && (
<Text size="xs" c="dimmed">
{subtitle}
</Text>
)}
export default function Dashboard() {
const { user } = useAuth()
const isObserver = user?.is_observer === true
const [gapsOpened, setGapsOpened] = useState(false)
const { data: stats, isLoading, isFetching, error, refetch } = useQuery({
queryKey: ['dashboard-stats'],
queryFn: async () => (await dashboardApi.getStats()).data as DashboardStats,
refetchInterval: 60_000,
})
if (isLoading) return <DashboardSkeleton />
if (error || !stats) {
const message = (error as any)?.response?.data?.error_description || 'Не удалось загрузить данные'
return (
<Alert icon={<IconAlertCircle size={16} />} color="red" title="Ошибка">
<Stack gap="xs" align="flex-start">
<Text size="sm">{message}</Text>
<Button size="xs" variant="default" onClick={() => refetch()}>Повторить</Button>
</Stack>
<ThemeIcon
variant="light"
color={color}
size="xl"
radius="md"
>
<Icon size={24} />
</ThemeIcon>
</Group>
</Alert>
)
}
{trend && (
<Box
mt="md"
pt="md"
style={{
borderTop: '1px solid var(--mantine-color-gray-3)',
}}
>
<Text size="xs" c="dimmed">{trend}</Text>
</Box>
// --- производные метрики ---
const tasksInWork = countOf(stats.taskStatusData, 'pending')
const tasksQueued = countOf(stats.taskStatusData, 'waiting')
const createdSeries = stats.dailyData.map((d) => d.created)
const created7 = createdSeries.reduce((s, v) => s + v, 0)
const approved7 = stats.dailyData.reduce((s, d) => s + d.approved, 0)
const cutoff = dayjs().subtract(stats.oldPendingDays, 'day').format('YYYY-MM-DD')
// --- «Требует внимания» ---
const attention: AttentionItem[] = []
if (stats.oldPendingCount > 0) {
const n = stats.oldPendingCount
const d = stats.oldPendingDays
attention.push({
id: 'old',
color: 'orange',
icon: IconAlertTriangle,
title: `${n} ${plural(n, ['заявка', 'заявки', 'заявок'])} на согласовании дольше ${d} ${plural(d, ['дня', 'дней', 'дней'])}`,
description: 'Стоит напомнить согласующим',
to: `/approvals?status=pending&date_to=${cutoff}`,
})
}
if (stats.approvals.revision > 0) {
const n = stats.approvals.revision
attention.push({
id: 'revision',
color: 'violet',
icon: IconArrowBackUp,
title: `${n} ${plural(n, ['заявка', 'заявки', 'заявок'])} на доработке`,
description: 'Возвращены согласующими, ждут действий инициатора',
to: '/approvals?status=revision',
})
}
if (!isObserver && stats.topicGaps.length > 0) {
const n = stats.topicGaps.length
attention.push({
id: 'gaps',
color: 'orange',
icon: IconCategory,
title: `${n} ${plural(n, ['тема', 'темы', 'тем'])} без порядка согласования`,
description: 'Сотрудник сможет создать заявку, но согласовать её будет некому',
onClick: () => setGapsOpened(true),
})
}
if (!isObserver && stats.usersWithoutHierarchy.length > 0) {
const list = stats.usersWithoutHierarchy
const names = list.slice(0, 3).map((u) => u.full_name || `ID ${u.user_id}`).join(', ')
const rest = list.length - 3
attention.push({
id: 'hierarchy',
color: 'red',
icon: IconUserExclamation,
title: `${list.length} ${plural(list.length, ['сотрудник', 'сотрудника', 'сотрудников'])} без иерархии согласования`,
description: rest > 0 ? `${names} и ещё ${rest}` : names,
to: '/hierarchies',
})
}
const maxCategory = Math.max(1, ...stats.categoryBreakdown.map((c) => c.total_count))
const catalog = [
{ label: 'Пользователи', value: stats.users.total, to: '/users',
hint: stats.users.blocked > 0 ? `${stats.users.blocked} заблокировано` : `${stats.users.active} активных` },
{ label: 'Темы', value: stats.topics.total, to: '/topics', hint: `${stats.topics.active} активных` },
{ label: 'Категории', value: stats.categories, to: '/categories' },
{ label: 'Отделы', value: stats.departments, to: '/departments' },
{ label: 'Роли', value: stats.roles, to: '/roles' },
{ label: 'Исполнители', value: stats.executors, to: '/executors' },
]
return (
<Stack gap="lg">
<PageHeader
title="Обзор"
description={dayjs().format('dddd, D MMMM')}
actions={
<Tooltip label="Обновить">
<ActionIcon size="lg" loading={isFetching} onClick={() => refetch()} aria-label="Обновить">
<IconRefresh size={18} stroke={1.6} />
</ActionIcon>
</Tooltip>
}
/>
{attention.length > 0 && (
<Panel title="Требует внимания" extra={<Badge color="orange">{attention.length}</Badge>}>
<Stack gap={2} mx={-8} mb={-8}>
{attention.map((item) => <AttentionRow key={item.id} item={item} />)}
</Stack>
</Panel>
)}
</Paper>
<SimpleGrid cols={{ base: 1, xs: 2, lg: 4 }}>
<StatCard
label="На согласовании"
value={stats.approvals.pending}
hint={stats.oldPendingCount > 0 ? `${stats.oldPendingCount} просрочено` : 'Просрочек нет'}
icon={IconFileCheck}
color={stats.oldPendingCount > 0 ? 'orange' : 'brand'}
to="/approvals?status=pending"
/>
<StatCard
label="На доработке"
value={stats.approvals.revision}
hint="Ждут действий инициатора"
icon={IconArrowBackUp}
color="violet"
to="/approvals?status=revision"
/>
<StatCard
label="Задачи в работе"
value={tasksInWork}
hint={`${tasksQueued} в очереди`}
icon={IconChecklist}
color="teal"
to="/approval-tasks?status=pending"
/>
<StatCard
label="Создано за 7 дней"
value={created7}
hint={`Сегодня ${stats.approvals.today} · согласовано за неделю ${approved7}`}
icon={IconTrendingUp}
color="gray"
spark={createdSeries}
/>
</SimpleGrid>
<SimpleGrid cols={{ base: 1, lg: 2 }}>
<Panel
title="Заявки по статусам"
extra={<Text size="xs" c="dimmed">Всего {stats.approvals.total}</Text>}
>
<StatusBreakdown
items={stats.statusData}
meta={APPROVAL_STATUS}
linkTo={(s) => `/approvals?status=${s}`}
/>
</Panel>
<Panel title="Заявки за 7 дней">
<TrendChart
data={stats.dailyData}
series={[
{ key: 'created', label: 'Создано', color: 'brand' },
{ key: 'approved', label: 'Согласовано', color: 'green' },
]}
/>
</Panel>
</SimpleGrid>
<SimpleGrid cols={{ base: 1, lg: 2 }}>
<Panel title="Задачи по статусам">
<StatusBreakdown
items={stats.taskStatusData}
meta={TASK_STATUS}
linkTo={(s) => `/approval-tasks?status=${s}`}
/>
</Panel>
<Panel title="Задачи за 7 дней">
<TrendChart
data={stats.taskDailyData}
series={[
{ key: 'created', label: 'Создано', color: 'brand' },
{ key: 'completed', label: 'Выполнено', color: 'teal' },
]}
/>
</Panel>
</SimpleGrid>
<SimpleGrid cols={{ base: 1, lg: 2 }}>
<Panel title="Заявки по категориям">
{stats.categoryBreakdown.length === 0 ? (
<Text size="sm" c="dimmed">Нет данных</Text>
) : (
<Stack gap="md">
{stats.categoryBreakdown.map((cat) => (
<Box key={cat.id}>
<Group justify="space-between" mb={6} wrap="nowrap">
<Text size="sm" truncate>{cat.name}</Text>
<Group gap="xs" wrap="nowrap">
{cat.pending_count > 0 && (
<Text size="xs" c="dimmed">{cat.pending_count} в работе</Text>
)}
<Text size="sm" fw={500}>{cat.total_count}</Text>
</Group>
</Group>
<Progress value={(cat.total_count / maxCategory) * 100} size="xs" color="gray" />
</Box>
))}
</Stack>
)}
</Panel>
<Panel
title="Отсутствуют сегодня"
extra={stats.absentToday.length > 0 && <Badge color="gray">{stats.absentToday.length}</Badge>}
>
{stats.absentToday.length === 0 ? (
<Text size="sm" c="dimmed">Сегодня все на месте</Text>
) : (
<ScrollArea.Autosize mah={280} type="auto">
<Stack gap="sm">
{stats.absentToday.map((p, i) => (
<Group key={i} gap="sm" wrap="nowrap">
<Avatar size={28} radius="xl" color="initials" name={p.name} />
<Box style={{ minWidth: 0 }}>
<Text size="sm" fw={500} truncate>{p.name}</Text>
<Text size="xs" c="dimmed" truncate>{p.description}</Text>
</Box>
</Group>
))}
</Stack>
</ScrollArea.Autosize>
)}
</Panel>
</SimpleGrid>
{!isObserver && (
<Panel title="Справочники">
<SimpleGrid cols={{ base: 2, sm: 3, lg: 6 }} spacing="xs" mx={-8} mb={-8}>
{catalog.map((c) => (
<UnstyledButton key={c.label} component={Link} to={c.to} className={classes.row}>
<Text size="xs" c="dimmed">{c.label}</Text>
<Text fz={20} fw={600} lh={1.3}>{c.value}</Text>
{c.hint && <Text size="xs" c="dimmed">{c.hint}</Text>}
</UnstyledButton>
))}
</SimpleGrid>
</Panel>
)}
<TopicGapsModal
opened={gapsOpened}
onClose={() => setGapsOpened(false)}
gaps={stats.topicGaps}
/>
</Stack>
)
}

View File

@ -1,38 +1,51 @@
import { useState, useMemo } from 'react'
import { useMemo, useState } from 'react'
import {
Paper,
Table,
Badge,
Group,
ActionIcon,
Text,
TextInput,
Select,
MultiSelect,
Pagination,
Loader,
Center,
Tooltip,
Box,
Stack,
Modal,
Button,
ActionIcon, Avatar, Badge, Box, Group, Menu, SegmentedControl, Select, Stack, Text,
TextInput, Tooltip,
} from '@mantine/core'
import { IconPencil, IconSearch, IconTrash } from '@tabler/icons-react'
import { useDebouncedValue } from '@mantine/hooks'
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 UserEditModal from '@/components/UserEditModal.tsx'
import { useAuth } from '@/hooks/useAuth'
import { PageHeader } from '@/components/ui/PageHeader'
import { FilterBar } from '@/components/ui/FilterBar'
import { MultiFilter } from '@/components/ui/MultiFilter'
import { DataTable, type Column } from '@/components/ui/DataTable'
import { ConfirmModal } from '@/components/ui/ConfirmModal'
import { StatusBadge, userStatusOf } from '@/components/ui/StatusBadge'
const LIMIT = 20
const MAX_ROLES = 2
type StatusFilter = 'all' | 'active' | 'blocked' | 'fired'
function RoleBadges({ roles }: { roles?: { id?: number; role?: { name?: string } }[] }) {
if (!Array.isArray(roles) || roles.length === 0) return <Text size="sm" c="dimmed">—</Text>
const rest = roles.slice(MAX_ROLES)
return (
<Group gap={4} wrap="nowrap">
{roles.slice(0, MAX_ROLES).map((ur, i) => (
<Badge key={ur.id ?? i} color="gray">{ur.role?.name ?? 'Роль'}</Badge>
))}
{rest.length > 0 && (
<Tooltip label={rest.map((r) => r.role?.name).join(', ')} multiline w={220}>
<Badge color="gray" variant="outline">+{rest.length}</Badge>
</Tooltip>
)}
</Group>
)
}
export default function UsersPage() {
const [page, setPage] = useState(1)
const [search, setSearch] = useState('')
const [selectedRoleIds, setSelectedRoleIds] = useState<number[]>([]) // ✅ Массив ID ролей
const [departmentFilter, setDepartmentFilter] = useState<string | null>(null)
const [statusFilter, setStatusFilter] = useState<string | null>(null)
const [debouncedSearch] = useDebouncedValue(search.trim(), 300)
const [roleIds, setRoleIds] = useState<string[]>([])
const [department, setDepartment] = useState<string | null>(null)
const [status, setStatus] = useState<StatusFilter>('all')
const [editUserId, setEditUserId] = useState<number | null>(null)
const [deleteUserId, setDeleteUserId] = useState<number | null>(null)
@ -42,37 +55,40 @@ export default function UsersPage() {
const { data, isLoading, isFetching } = useUsers({
offset: (page - 1) * LIMIT,
limit: LIMIT,
...(departmentFilter && { department_id: Number(departmentFilter) }),
...(statusFilter === 'blocked' && { is_blocked: true }),
...(statusFilter === 'fired' && { is_fired: true }),
...(statusFilter === 'active' && { is_blocked: false, is_fired: false }),
...(search && { full_name: search }),
...(selectedRoleIds.length > 0 && { role_ids: selectedRoleIds }), // ✅ Передаём массив
...(department && { department_id: Number(department) }),
...(status === 'blocked' && { is_blocked: true }),
...(status === 'fired' && { is_fired: true }),
...(status === 'active' && { is_blocked: false, is_fired: false }),
...(debouncedSearch && { full_name: debouncedSearch }),
...(roleIds.length > 0 && { role_ids: roleIds.map(Number) }),
})
const { data: departments } = useDepartments()
const { data: allRoles } = useRoles({ limit: 1000 }) // ✅ Получаем все роли
const { data: allRoles } = useRoles({ limit: 1000 })
const deleteUser = useDeleteUser()
const departmentOptions = useMemo(() => {
if (!departments || !Array.isArray(departments)) return []
return departments.map((d) => ({
value: String(d.id),
label: d.name || '',
}))
}, [departments])
const roleOptions = useMemo(() => {
if (!allRoles || !Array.isArray(allRoles)) return []
return allRoles.map((r) => ({
value: String(r.id),
label: r.name || '',
}))
}, [allRoles])
const departmentOptions = useMemo(
() => (Array.isArray(departments) ? departments.map((d) => ({ value: String(d.id), label: d.name || '' })) : []),
[departments],
)
const roleOptions = useMemo(
() => (Array.isArray(allRoles) ? allRoles.map((r) => ({ value: String(r.id), label: r.name || '' })) : []),
[allRoles],
)
const users = Array.isArray(data?.data) ? data.data : []
const totalPages = data?.total_count ? Math.ceil(data.total_count / LIMIT) : 1
const hasSelected = selectedRoleIds.length > 0;
const total = data?.total_count ?? 0
const activeFilters =
(search ? 1 : 0) + (roleIds.length ? 1 : 0) + (department ? 1 : 0) + (status !== 'all' ? 1 : 0)
const resetFilters = () => {
setSearch('')
setRoleIds([])
setDepartment(null)
setStatus('all')
setPage(1)
}
const handleDelete = async () => {
if (!deleteUserId) return
@ -80,215 +96,140 @@ export default function UsersPage() {
setDeleteUserId(null)
}
return (
<Stack gap="md">
<Group justify="space-between">
<Text size="xl" fw={700}>Пользователи</Text>
<Text c="dimmed" size="sm">
Всего: {data?.total_count || 0}
</Text>
</Group>
<Paper withBorder p="md">
<Group gap="md" align="flex-end">
<TextInput
label="Поиск по имени"
placeholder="Иванов Иван..."
leftSection={<IconSearch size={16} />}
value={search}
onChange={(e) => {
setSearch(e.currentTarget.value)
setPage(1)
}}
style={{ flex: 1 }}
/>
<Box style={{ width: 250 }}>
<MultiSelect
label="Роли"
// ✅ Меняем placeholder в зависимости от количества выбранных
placeholder={hasSelected ? `Выбрано: ${selectedRoleIds.length}` : "Все роли"}
data={roleOptions}
value={selectedRoleIds.map(String)}
onChange={(v) => {
setSelectedRoleIds(v.map(Number))
setPage(1)
}}
searchable
clearable
maxDropdownHeight={400}
limit={15}
styles={{
input: {
minHeight: 36,
},
pill: {
display: 'none',
},
pillsList: {
display: 'none',
},
}}
/>
const columns: Column<(typeof users)[number]>[] = [
{
key: 'id',
header: 'ID',
width: 70,
cell: (u) => <Text size="sm" c="dimmed">{u.id}</Text>,
},
{
key: 'user',
header: 'Пользователь',
cell: (u) => (
<Group gap="sm" wrap="nowrap">
<Avatar size={32} radius="xl" color="initials" name={u.full_name ?? ''} />
<Box style={{ minWidth: 0 }}>
<Text size="sm" fw={500} truncate>{u.full_name}</Text>
<Text size="xs" c="dimmed" truncate>{u.username ? `@${u.username}` : '—'}</Text>
</Box>
<Select
label="Отдел"
placeholder="Все отделы"
data={departmentOptions}
value={departmentFilter}
onChange={(v) => {
setDepartmentFilter(v)
setPage(1)
}}
clearable
style={{ minWidth: 200 }}
/>
<Select
label="Статус"
placeholder="Все"
data={[
{ value: 'active', label: 'Активные' },
{ value: 'blocked', label: 'Заблокированные' },
{ value: 'fired', label: 'Уволенные' },
]}
value={statusFilter}
onChange={(v) => {
setStatusFilter(v)
setPage(1)
}}
clearable
style={{ minWidth: 180 }}
/>
</Group>
</Paper>
<Paper withBorder>
{isLoading ? (
<Center p={60}>
<Loader />
</Center>
) : (
<>
<Table striped highlightOnHover>
<Table.Thead>
<Table.Tr>
<Table.Th style={{ width: 60 }}>ID</Table.Th>
<Table.Th>Telegram ID</Table.Th>
<Table.Th>Имя</Table.Th>
<Table.Th>Username</Table.Th>
<Table.Th>Отдел</Table.Th>
<Table.Th>Роли</Table.Th>
<Table.Th>Статус</Table.Th>
<Table.Th style={{ width: 100 }}>Действия</Table.Th>
</Table.Tr>
</Table.Thead>
<Table.Tbody>
{users.length === 0 ? (
<Table.Tr>
<Table.Td colSpan={8}>
<Center p={40}>
<Text c="dimmed">Пользователи не найдены</Text>
</Center>
</Table.Td>
</Table.Tr>
) : (
users.map((user) => (
<Table.Tr key={user.id}>
<Table.Td>{user.id}</Table.Td>
<Table.Td>
<Text size="sm" ff="monospace">{user.telegram_id}</Text>
</Table.Td>
<Table.Td>
<Text fw={500}>{user.full_name}</Text>
</Table.Td>
<Table.Td>
<Text size="sm" c="dimmed">@{user.username || '—'}</Text>
</Table.Td>
<Table.Td>
{user.department?.name || <Text c="dimmed">—</Text>}
</Table.Td>
<Table.Td>
<Group gap={4}>
{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>
</Table.Td>
<Table.Td>
<UserStatusBadge
isBlocked={user.is_blocked}
isFired={user.is_fired}
/>
</Table.Td>
<Table.Td>
<Group gap={4}>
<Tooltip label="Редактировать">
<ActionIcon
variant="light"
color="blue"
onClick={() => setEditUserId(user.id!)}
>
<IconPencil size={16} />
</ActionIcon>
</Tooltip>
{isRootAdmin && (
<Tooltip label="Удалить пользователя">
<ActionIcon
variant="light"
color="red"
onClick={() => setDeleteUserId(user.id!)}
>
<IconTrash size={16} />
</ActionIcon>
</Tooltip>
)}
</Group>
</Table.Td>
</Table.Tr>
))
)}
</Table.Tbody>
</Table>
{totalPages > 1 && (
<Box p="md" style={{ borderTop: '1px solid var(--mantine-color-gray-3)' }}>
<Group justify="space-between">
<Text size="sm" c="dimmed">
Страница {page} из {totalPages}
</Text>
<Pagination
value={page}
onChange={setPage}
total={totalPages}
withEdges
/>
</Group>
</Box>
),
},
{
key: 'telegram',
header: 'Telegram ID',
cell: (u) => <Text size="sm" ff="monospace" c="dimmed">{u.telegram_id}</Text>,
},
{
key: 'department',
header: 'Отдел',
cell: (u) => <Text size="sm">{u.department?.name || <Text span c="dimmed">—</Text>}</Text>,
},
{
key: 'roles',
header: 'Роли',
cell: (u) => <RoleBadges roles={u.user_roles} />,
},
{
key: 'status',
header: 'Статус',
cell: (u) => <StatusBadge kind="user" status={userStatusOf(u)} />,
},
{
key: 'actions',
header: '',
width: 56,
align: 'right',
cell: (u) => (
<Menu position="bottom-end" width={180}>
<Menu.Target>
<ActionIcon aria-label="Действия" onClick={(e) => e.stopPropagation()}>
<IconDots size={16} />
</ActionIcon>
</Menu.Target>
<Menu.Dropdown onClick={(e) => e.stopPropagation()}>
<Menu.Item leftSection={<IconPencil size={14} />} onClick={() => setEditUserId(u.id!)}>
Редактировать
</Menu.Item>
{isRootAdmin && (
<>
<Menu.Divider />
<Menu.Item color="red" leftSection={<IconTrash size={14} />} onClick={() => setDeleteUserId(u.id!)}>
Удалить
</Menu.Item>
</>
)}
</>
)}
</Paper>
</Menu.Dropdown>
</Menu>
),
},
]
{isFetching && !isLoading && (
<Box style={{ position: 'fixed', top: 70, right: 20, zIndex: 1000 }}>
<Loader size="xs" />
</Box>
)}
return (
<Stack gap="lg">
<PageHeader title="Пользователи" description={`Всего: ${total}`} />
<FilterBar activeCount={activeFilters} onReset={resetFilters}>
<TextInput
placeholder="Поиск по имени"
leftSection={<IconSearch size={16} />}
value={search}
onChange={(e) => {
setSearch(e.currentTarget.value)
setPage(1)
}}
w={260}
/>
<MultiFilter
label="Роли"
options={roleOptions}
value={roleIds}
onChange={(v) => {
setRoleIds(v)
setPage(1)
}}
/>
<Select
placeholder="Все отделы"
data={departmentOptions}
value={department}
onChange={(v) => {
setDepartment(v)
setPage(1)
}}
searchable
clearable
w={200}
/>
<SegmentedControl
value={status}
onChange={(v) => {
setStatus(v as StatusFilter)
setPage(1)
}}
data={[
{ value: 'all', label: 'Все' },
{ value: 'active', label: 'Активные' },
{ value: 'blocked', label: 'Заблокированные' },
{ value: 'fired', label: 'Уволенные' },
]}
/>
</FilterBar>
<DataTable
columns={columns}
rows={users}
getRowId={(u) => u.id!}
loading={isLoading}
refreshing={isFetching}
onRowClick={(u) => setEditUserId(u.id!)}
empty={{
title: 'Пользователи не найдены',
description: activeFilters > 0 ? 'Попробуйте изменить или сбросить фильтры' : undefined,
}}
pagination={{ page, pageSize: LIMIT, total, onChange: setPage }}
/>
<UserEditModal
userId={editUserId}
@ -296,36 +237,16 @@ export default function UsersPage() {
onClose={() => setEditUserId(null)}
/>
<Modal
<ConfirmModal
opened={deleteUserId !== null}
onClose={() => setDeleteUserId(null)}
title="Подтверждение удаления"
size="md"
>
<Stack gap="md">
<Text>
Вы уверены, что хотите удалить пользователя? Это действие нельзя отменить.
</Text>
<Group justify="flex-end">
<Button variant="default" onClick={() => setDeleteUserId(null)}>
Отмена
</Button>
<Button
color="red"
onClick={handleDelete}
loading={deleteUser.isPending}
>
Удалить
</Button>
</Group>
</Stack>
</Modal>
onConfirm={handleDelete}
title="Удалить пользователя?"
message="Это действие нельзя отменить."
confirmLabel="Удалить"
danger
loading={deleteUser.isPending}
/>
</Stack>
)
}
function UserStatusBadge({ isBlocked, isFired }: { isBlocked?: boolean; isFired?: boolean }) {
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>
}

View File

@ -25,7 +25,7 @@ export const theme = createTheme({
Paper: { defaultProps: { withBorder: true, radius: 'md' } },
Button: { defaultProps: { fw: 500 } },
ActionIcon: { defaultProps: { variant: 'subtle', color: 'gray' } },
Badge: { defaultProps: { variant: 'light', radius: 'sm', fw: 600 } },
Badge: { defaultProps: { variant: 'light', radius: 'sm', fw: 500, tt: 'none' } },
TextInput: { defaultProps: { size: 'sm' } },
Select: { defaultProps: { size: 'sm' } },
MultiSelect: { defaultProps: { size: 'sm' } },