update hierarchy page
Deploy Frontend / build-and-deploy (push) Successful in 31s Details

This commit is contained in:
romanskijdev 2026-06-24 13:51:21 +03:00
parent 9d5bff8d6e
commit 7db584c101
3 changed files with 222 additions and 128 deletions

2
.env
View File

@ -1,5 +1,5 @@
# API Configuration
VITE_API_BASE_URL=http://localhost:1726/api
#VITE_API_BASE_URL=http://localhost:1726/api
VITE_API_KEY=test
VITE_API_PUBLIC_KEY=ruspet_public_key_2026
VITE_API_PRIVATE_KEY=ruspet_private_key_SUPER_SECRET_2026

View File

@ -40,7 +40,7 @@ export default function Header({
size="sm"
/>
<Text ml="md" fw={700}>
Ruspet Admin Panel
Панель управления администратора
</Text>
</Group>

View File

@ -16,17 +16,15 @@ import {
Badge,
Alert,
ScrollArea,
Pagination,
} from '@mantine/core'
import {
IconPencil,
IconTrash,
IconPlus,
IconList,
IconRoute,
IconInfoCircle,
} from '@tabler/icons-react'
import { modals } from '@mantine/modals'
import { notifications } from '@mantine/notifications'
import {
useHierarchies,
useDeleteHierarchy
@ -45,19 +43,38 @@ import ChainVisualization from './components/ChainVisualization'
import HierarchyEditModal from './components/HierarchyEditModal'
import type { UserHierarchy } from '@/types/api'
const LIMIT = 20
type ViewMode = 'chains' | 'table'
export default function HierarchiesPage() {
const [viewMode, setViewMode] = useState<ViewMode>('chains')
const [page, setPage] = useState(1)
// Фильтры
const [subordinateFilter, setSubordinateFilter] = useState<string | null>(null)
const [departmentFilter, setDepartmentFilter] = useState<string | null>(null)
const [categoryFilter, setCategoryFilter] = useState<string | null>(null)
const [topicFilter, setTopicFilter] = useState<string | null>(null)
const [editHierarchy, setEditHierarchy] = useState<UserHierarchy | null>(null)
const [createModalOpened, setCreateModalOpened] = useState(false)
const [presetGroup, setPresetGroup] = useState<ChainGroup | null>(null)
// Загружаем темы только для выбранной категории (если она выбрана)
const { data: categoryTopics } = useTopics({
limit: 1000,
...(categoryFilter && { category_id: Number(categoryFilter) }),
})
// Основной запрос с пагинацией и фильтрами
const { data, isLoading, isFetching } = useHierarchies({
offset: (page - 1) * LIMIT,
limit: LIMIT,
...(subordinateFilter && { subordinate_id: Number(subordinateFilter) }),
...(departmentFilter && { department_id: Number(departmentFilter) }),
...(categoryFilter && { topic_category_id: Number(categoryFilter) }),
...(topicFilter && { topic_id: Number(topicFilter) }),
})
const { data: users } = useUsers({ limit: 1000 })
@ -67,6 +84,8 @@ export default function HierarchiesPage() {
const deleteHierarchy = useDeleteHierarchy()
const totalPages = data?.total_count ? Math.ceil(data.total_count / LIMIT) : 1
// Группируем в цепочки
const chains = useMemo(() => {
if (!data?.data) return []
@ -88,6 +107,7 @@ export default function HierarchiesPage() {
})
}, [chains, categories, topics])
// Опции для фильтров
const userOptions = users?.data?.map((u) => ({
value: String(u.id),
label: u.full_name || `Пользователь #${u.id}`,
@ -98,6 +118,17 @@ export default function HierarchiesPage() {
label: d.name || '',
})) || []
const categoryOptions = categories?.data?.map((c) => ({
value: String(c.id),
label: c.name || '',
})) || []
// Если выбрана категория, показываем только её темы, иначе все темы
const topicOptions = (categoryFilter ? categoryTopics?.data : topics?.data)?.map((t) => ({
value: String(t.id),
label: t.name || '',
})) || []
const handleDelete = (id: number) => {
modals.openConfirmModal({
title: 'Подтвердите удаление',
@ -136,6 +167,9 @@ export default function HierarchiesPage() {
<Group justify="space-between">
<Text size="xl" fw={700}>Иерархия согласований</Text>
<Group>
<Text c="dimmed" size="sm">
Всего: {data?.total_count || 0}
</Text>
<SegmentedControl
value={viewMode}
onChange={(v) => setViewMode(v as ViewMode)}
@ -167,65 +201,98 @@ export default function HierarchiesPage() {
{/* Фильтры */}
<Paper withBorder p="md">
<Group gap="md" align="flex-end">
<Select
label="Сотрудник"
placeholder="Все пользователи"
data={userOptions}
value={subordinateFilter}
onChange={setSubordinateFilter}
clearable
searchable
style={{ minWidth: 250 }}
/>
<Stack gap="md">
<Group gap="md" align="flex-end">
<Select
label="Сотрудник"
placeholder="Все пользователи"
data={userOptions}
value={subordinateFilter}
onChange={(v) => {
setSubordinateFilter(v)
setPage(1)
}}
clearable
searchable
style={{ flex: 1, minWidth: 250 }}
/>
<Select
label="Отдел"
placeholder="Все отделы"
data={departmentOptions}
value={departmentFilter}
onChange={setDepartmentFilter}
clearable
style={{ minWidth: 200 }}
/>
<Select
label="Отдел"
placeholder="Все отделы"
data={departmentOptions}
value={departmentFilter}
onChange={(v) => {
setDepartmentFilter(v)
setPage(1)
}}
clearable
style={{ flex: 1, minWidth: 200 }}
/>
</Group>
<Text c="dimmed" size="sm">
Всего связей: {data?.data?.length || 0}
</Text>
</Group>
<Group gap="md" align="flex-end">
<Select
label="Категория"
placeholder="Все категории"
data={categoryOptions}
value={categoryFilter}
onChange={(v) => {
setCategoryFilter(v)
setTopicFilter(null) // Сбрасываем тему при смене категории
setPage(1)
}}
clearable
searchable
style={{ flex: 1, minWidth: 200 }}
/>
<Select
label="Тема"
placeholder="Все темы"
data={topicOptions}
value={topicFilter}
onChange={(v) => {
setTopicFilter(v)
setPage(1)
}}
clearable
searchable
style={{ flex: 1, minWidth: 200 }}
/>
</Group>
</Stack>
</Paper>
{/* Контент */}
{isLoading ? (
<Center p={60}>
<Loader />
</Center>
) : viewMode === 'chains' ? (
// Режим цепочек
<ScrollArea>
<Stack gap="md">
{enrichedChains.length === 0 ? (
<Paper withBorder p={40}>
<Center>
<Paper withBorder>
{isLoading ? (
<Center p={60}>
<Loader />
</Center>
) : viewMode === 'chains' ? (
// Режим цепочек
<ScrollArea p="md">
<Stack gap="md">
{enrichedChains.length === 0 ? (
<Center p={40}>
<Text c="dimmed">Связи не найдены</Text>
</Center>
</Paper>
) : (
enrichedChains.map((chain) => (
<ChainVisualization
key={chain.key}
group={chain}
onEditStep={handleEditStep}
onDeleteStep={handleDelete}
onAddStep={handleAddStep}
/>
))
)}
</Stack>
</ScrollArea>
) : (
// Режим таблицы
<Paper withBorder>
) : (
enrichedChains.map((chain) => (
<ChainVisualization
key={chain.key}
group={chain}
onEditStep={handleEditStep}
onDeleteStep={handleDelete}
onAddStep={handleAddStep}
/>
))
)}
</Stack>
</ScrollArea>
) : (
// Режим таблицы
<Table striped highlightOnHover>
<Table.Thead>
<Table.Tr>
@ -240,80 +307,107 @@ export default function HierarchiesPage() {
</Table.Tr>
</Table.Thead>
<Table.Tbody>
{data?.data?.map((h) => {
const scopeType = h.topic_id ? 'topic' :
h.topic_category_id ? 'category' : 'global'
let scopeObjectName = 'Все темы'
if (scopeType === 'category' && h.topic_category_id) {
const cat = categories?.data?.find((c) => c.id === h.topic_category_id)
scopeObjectName = cat?.name || `#${h.topic_category_id}`
} else if (scopeType === 'topic' && h.topic_id) {
const topic = topics?.data?.find((t) => t.id === h.topic_id)
scopeObjectName = topic?.name || `#${h.topic_id}`
}
{data?.data?.length === 0 ? (
<Table.Tr>
<Table.Td colSpan={8}>
<Center p={40}>
<Text c="dimmed">Связи не найдены</Text>
</Center>
</Table.Td>
</Table.Tr>
) : (
data?.data?.map((h) => {
const scopeType = h.topic_id ? 'topic' :
h.topic_category_id ? 'category' : 'global'
let scopeObjectName = 'Все темы'
if (scopeType === 'category' && h.topic_category_id) {
const cat = categories?.data?.find((c) => c.id === h.topic_category_id)
scopeObjectName = cat?.name || `#${h.topic_category_id}`
} else if (scopeType === 'topic' && h.topic_id) {
const topic = topics?.data?.find((t) => t.id === h.topic_id)
scopeObjectName = topic?.name || `#${h.topic_id}`
}
return (
<Table.Tr key={h.id}>
<Table.Td>{h.id}</Table.Td>
<Table.Td>
<Text size="sm" fw={500}>
{h.subordinate?.full_name || '—'}
</Text>
</Table.Td>
<Table.Td>
<Text size="sm" fw={500}>
{h.approver?.full_name || '—'}
</Text>
</Table.Td>
<Table.Td>
<Text size="sm">{h.department?.name || '—'}</Text>
</Table.Td>
<Table.Td>
<Badge
size="xs"
color={SCOPE_COLORS[scopeType as keyof typeof SCOPE_COLORS]}
variant="light"
>
{SCOPE_LABELS[scopeType as keyof typeof SCOPE_LABELS]}
</Badge>
</Table.Td>
<Table.Td>
<Text size="sm" lineClamp={1}>{scopeObjectName}</Text>
</Table.Td>
<Table.Td>
<Badge variant="light" color="gray">
#{h.priority}
</Badge>
</Table.Td>
<Table.Td>
<Group gap="xs">
<Tooltip label="Редактировать">
<ActionIcon
variant="light"
color="blue"
onClick={() => setEditHierarchy(h)}
>
<IconPencil size={16} />
</ActionIcon>
</Tooltip>
<Tooltip label="Удалить">
<ActionIcon
variant="light"
color="red"
onClick={() => handleDelete(h.id!)}
>
<IconTrash size={16} />
</ActionIcon>
</Tooltip>
</Group>
</Table.Td>
</Table.Tr>
)
})}
return (
<Table.Tr key={h.id}>
<Table.Td>{h.id}</Table.Td>
<Table.Td>
<Text size="sm" fw={500}>
{h.subordinate?.full_name || '—'}
</Text>
</Table.Td>
<Table.Td>
<Text size="sm" fw={500}>
{h.approver?.full_name || '—'}
</Text>
</Table.Td>
<Table.Td>
<Text size="sm">{h.department?.name || '—'}</Text>
</Table.Td>
<Table.Td>
<Badge
size="xs"
color={SCOPE_COLORS[scopeType as keyof typeof SCOPE_COLORS]}
variant="light"
>
{SCOPE_LABELS[scopeType as keyof typeof SCOPE_LABELS]}
</Badge>
</Table.Td>
<Table.Td>
<Text size="sm" lineClamp={1}>{scopeObjectName}</Text>
</Table.Td>
<Table.Td>
<Badge variant="light" color="gray">
#{h.priority}
</Badge>
</Table.Td>
<Table.Td>
<Group gap="xs">
<Tooltip label="Редактировать">
<ActionIcon
variant="light"
color="blue"
onClick={() => setEditHierarchy(h)}
>
<IconPencil size={16} />
</ActionIcon>
</Tooltip>
<Tooltip label="Удалить">
<ActionIcon
variant="light"
color="red"
onClick={() => handleDelete(h.id!)}
>
<IconTrash size={16} />
</ActionIcon>
</Tooltip>
</Group>
</Table.Td>
</Table.Tr>
)
})
)}
</Table.Tbody>
</Table>
</Paper>
)}
)}
{/* Пагинация */}
{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>
)}
</Paper>
{isFetching && !isLoading && (
<Box style={{ position: 'fixed', top: 70, right: 20, zIndex: 1000 }}>