Updated categories page
Deploy Frontend / build-and-deploy (push) Failing after 28s Details

This commit is contained in:
romanskijdev 2026-11-18 15:32:58 +03:00
parent c3290d7c1d
commit f7ca74a7b5
10 changed files with 993 additions and 2167 deletions

View File

@ -161,10 +161,10 @@
│ │ ├── hierarchies
│ │ │ ├── HierarchiesPage.tsx
│ │ │ ├── components
│ │ │ │ ├── ChainDuplicateModal.tsx
│ │ │ │ ├── ChainDuplicateDrawer.tsx
│ │ │ │ ├── ChainVisualization.tsx
│ │ │ │ ├── HierarchyEditModal.tsx
│ │ │ │ ├── PersonDuplicateModal.tsx
│ │ │ │ ├── HierarchyEditDrawer.tsx
│ │ │ │ ├── PersonDuplicateDrawer.tsx
│ │ ├── monthlyOrders
│ │ │ ├── MonthlyOrdersSettingsPage.tsx
│ │ ├── notifications

View File

@ -1,11 +1,11 @@
import { useEffect, useMemo, useState } from 'react'
import { ActionIcon, Badge, Button, Select, Stack, Text, TextInput, Tooltip } from '@mantine/core'
import { ActionIcon, Badge, Button, Group, Select, Stack, Text, TextInput, Tooltip } from '@mantine/core'
import { useDebouncedValue } from '@mantine/hooks'
import { IconPencil, IconPlus, IconSearch, IconTrash } from '@tabler/icons-react'
import { useCategories, useDeleteCategory } from '@/features/categories/hooks/useCategories'
import type { Category } from '@/features/categories/types'
import { ApprovalTopicCategory } from '@/src/types/api'
import { PageHeader } from '@/components/ui/PageHeader'
import { FilterBar } from '@/components/ui/FilterBar'
import { DataTable, type Column } from '@/components/ui/DataTable'
@ -31,7 +31,7 @@ export default function CategoriesPage() {
const [debouncedSearch] = useDebouncedValue(searchInput.trim(), 400)
const [drawerId, setDrawerId] = useState<number | 'new' | null>(null)
const [deleteTarget, setDeleteTarget] = useState<Category | null>(null)
const [deleteTarget, setDeleteTarget] = useState<ApprovalTopicCategory | null>(null)
const deleteCategory = useDeleteCategory()
@ -70,7 +70,7 @@ export default function CategoriesPage() {
setDeleteTarget(null)
}
const columns: Column<Category>[] = [
const columns: Column<ApprovalTopicCategory>[] = [
{
key: 'id',
header: 'ID',
@ -170,7 +170,7 @@ export default function CategoriesPage() {
/>
</FilterBar>
<DataTable<Category>
<DataTable<ApprovalTopicCategory>
columns={columns}
rows={data?.data ?? []}
getRowId={(r) => r.id!}

View File

@ -1,61 +1,35 @@
import { useState, useMemo } from 'react'
import {
Paper,
Table,
Group,
ActionIcon,
Button,
Text,
Select,
Loader,
Center,
Tooltip,
Box,
Stack,
SegmentedControl,
Badge,
Alert,
ScrollArea,
Pagination,
Checkbox,
} from '@mantine/core'
import {
IconPencil,
IconTrash,
IconPlus,
IconInfoCircle,
IconUsers,
} from '@tabler/icons-react'
import { ActionIcon, Badge, Box, Button, Checkbox, Group, SegmentedControl, Select, Stack, Text, Tooltip } from '@mantine/core'
import { IconCopy, IconPencil, IconPlus, IconTrash, IconUsers } from '@tabler/icons-react'
import { modals } from '@mantine/modals'
import { notifications } from '@mantine/notifications'
import {
useHierarchies,
useDeleteHierarchy,
useUpdateHierarchy, HIERARCHIES_QUERY_KEY,
} from '@/features/hierarchies/hooks/useHierarchies'
import { useQueryClient } from '@tanstack/react-query'
import { useHierarchies, useDeleteHierarchy, useUpdateHierarchy, HIERARCHIES_QUERY_KEY } from '@/features/hierarchies/hooks/useHierarchies'
import { useUsers } from '@/features/users/hooks/useUsers'
import { useDepartments } from '@/features/departments/hooks/useDepartments'
import { useCategories } from '@/features/categories/hooks/useCategories'
import { useTopics } from '@/features/topics/hooks/useTopics'
import {
groupHierarchiesIntoChains,
SCOPE_COLORS,
SCOPE_LABELS,
type ChainGroup,
} from '@/features/hierarchies/utils'
import ChainVisualization from './components/ChainVisualization'
import ChainDuplicateModal from './components/ChainDuplicateModal'
import HierarchyEditModal from './components/HierarchyEditModal'
import PersonDuplicateModal from './components/PersonDuplicateModal'
import type { UserHierarchy } from '@/types/api'
import { hierarchiesApi } from '@/api/hierarchies'
import { useQueryClient } from '@tanstack/react-query'
import type { UserHierarchy } from '@/types/api'
import { groupHierarchiesIntoChains, SCOPE_COLORS, SCOPE_LABELS, type ChainGroup } from '@/features/hierarchies/utils'
import { PageHeader } from '@/components/ui/PageHeader'
import { FilterBar } from '@/components/ui/FilterBar'
import { DataTable, type Column } from '@/components/ui/DataTable'
import { ConfirmModal } from '@/components/ui/ConfirmModal'
import ChainVisualization from './components/ChainVisualization'
import HierarchyEditDrawer from './components/HierarchyEditDrawer'
import ChainDuplicateDrawer from './components/ChainDuplicateDrawer'
import PersonDuplicateDrawer from './components/PersonDuplicateDrawer'
const LIMIT = 20
type ViewMode = 'chains' | 'table'
export default function HierarchiesPage() {
const queryClient = useQueryClient()
const [viewMode, setViewMode] = useState<ViewMode>('chains')
const [page, setPage] = useState(1)
@ -67,17 +41,17 @@ export default function HierarchiesPage() {
const [categoryFilter, setCategoryFilter] = useState<string | null>(null)
const [topicFilter, setTopicFilter] = useState<string | null>(null)
// Массовое удаление
const [selectedIds, setSelectedIds] = useState<number[]>([])
const [isDeleting, setIsDeleting] = useState(false)
// Модалки
// Drawers
const [editHierarchy, setEditHierarchy] = useState<UserHierarchy | null>(null)
const [createModalOpened, setCreateModalOpened] = useState(false)
const [createDrawerOpened, setCreateDrawerOpened] = useState(false)
const [presetGroup, setPresetGroup] = useState<ChainGroup | null>(null)
const [duplicateGroup, setDuplicateGroup] = useState<ChainGroup | null>(null)
const [duplicateModalOpened, setDuplicateModalOpened] = useState(false)
const [personDuplicateOpened, setPersonDuplicateOpened] = useState(false)
const [deleteTarget, setDeleteTarget] = useState<number | null>(null)
const { data: categoryTopics } = useTopics({
limit: 1000,
@ -92,9 +66,7 @@ export default function HierarchiesPage() {
...(departmentFilter && { department_id: Number(departmentFilter) }),
...(categoryFilter && { topic_category_id: Number(categoryFilter) }),
...(topicFilter && { topic_id: Number(topicFilter) }),
...(userStatusFilter && {
user_status: userStatusFilter as 'active' | 'fired' | 'blocked',
}),
...(userStatusFilter && { user_status: userStatusFilter as 'active' | 'fired' | 'blocked' }),
})
const { data: users } = useUsers({ limit: 1000 })
@ -105,14 +77,11 @@ export default function HierarchiesPage() {
const deleteHierarchy = useDeleteHierarchy()
const updateHierarchy = useUpdateHierarchy()
const totalPages = data?.total_count ? Math.ceil(data.total_count / LIMIT) : 1
const chains = useMemo(() => {
if (!data?.data) return []
return groupHierarchiesIntoChains(data.data)
}, [data])
const total = data?.total_count ?? 0
const enrichedChains = useMemo(() => {
if (!data?.data) return []
const chains = groupHierarchiesIntoChains(data.data)
return chains.map((chain) => {
let scopeObjectName = 'Все темы'
if (chain.scopeType === 'category' && chain.scopeObjectId) {
@ -124,7 +93,7 @@ export default function HierarchiesPage() {
}
return { ...chain, scopeObjectName }
})
}, [chains, categories, topics])
}, [data, categories, topics])
const filteredUsers = useMemo(() => {
if (!users?.data) return []
@ -136,116 +105,39 @@ export default function HierarchiesPage() {
})
}, [users, userStatusFilter])
const userOptions =
filteredUsers.map((u) => ({
value: String(u.id),
label: u.full_name || `Пользователь #${u.id}`,
})) || []
users?.data?.map((u) => ({
value: String(u.id),
label: u.full_name || `Пользователь #${u.id}`,
})) || [];
const allUserOptions =
users?.data?.map((u) => ({
value: String(u.id),
label: u.full_name || `Пользователь #${u.id}`,
})) || []
const departmentOptions =
departments?.data?.map((d) => ({
value: String(d.id),
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 userOptions = filteredUsers.map((u) => ({ value: String(u.id), label: u.full_name || `ID ${u.id}` }))
const allUserOptions = users?.data?.map((u) => ({ value: String(u.id), label: u.full_name || `ID ${u.id}` })) || []
const departmentOptions = departments?.data?.map((d) => ({ value: String(d.id), 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 handleSelectAll = () => {
if (selectedIds.length === data?.data?.length) {
setSelectedIds([])
} else {
setSelectedIds(data?.data?.map((h) => h.id!) || [])
}
if (selectedIds.length === data?.data?.length) setSelectedIds([])
else setSelectedIds(data?.data?.map((h) => h.id!) || [])
}
const handleSelectOne = (id: number) => {
setSelectedIds((prev) =>
prev.includes(id) ? prev.filter((x) => x !== id) : [...prev, id]
)
setSelectedIds((prev) => prev.includes(id) ? prev.filter((x) => x !== id) : [...prev, id])
}
const handleFilterChange =
(setter: (value: string | null) => void) => (value: string | null) => {
setter(value)
setPage(1)
const setFilter = (setter: (val: string | null) => void) => (val: string | null) => {
setter(val)
setPage(1)
setSelectedIds([])
}
const handleBulkDelete = async () => {
setIsDeleting(true)
try {
await Promise.all(selectedIds.map((id) => hierarchiesApi.delete(id)))
await queryClient.invalidateQueries({ queryKey: [HIERARCHIES_QUERY_KEY] })
notifications.show({ title: 'Успешно', message: `Удалено связей: ${selectedIds.length}`, color: 'green' })
setSelectedIds([])
} catch {
notifications.show({ title: 'Ошибка', message: 'Не удалось удалить выбранные связи', color: 'red' })
} finally {
setIsDeleting(false)
}
const queryClient = useQueryClient()
const handleBulkDelete = () => {
modals.openConfirmModal({
title: 'Подтвердите массовое удаление',
children: (
<Text size="sm">
Вы уверены, что хотите удалить <strong>{selectedIds.length}</strong>{' '}
записей? Это действие необратимо.
</Text>
),
labels: { confirm: 'Удалить все', cancel: 'Отмена' },
confirmProps: { color: 'red', loading: isDeleting },
onConfirm: async () => {
setIsDeleting(true)
try {
// Удаляем напрямую через API, не вызывая мутацию поштучно
await Promise.all(selectedIds.map((id) => hierarchiesApi.delete(id)))
// Обновляем список один раз
queryClient.invalidateQueries({ queryKey: [HIERARCHIES_QUERY_KEY] })
notifications.show({
title: 'Успешно',
message: `Успешно удалено записей: ${selectedIds.length}`,
color: 'green',
})
setSelectedIds([])
} catch (error) {
notifications.show({
title: 'Ошибка',
message: 'Не удалось удалить некоторые записи',
color: 'red',
})
} finally {
setIsDeleting(false)
}
},
})
}
const handleDelete = (id: number) => {
modals.openConfirmModal({
title: 'Подтвердите удаление',
children: (
<Text size="sm">
Вы уверены, что хотите удалить эту связь?
</Text>
),
labels: { confirm: 'Удалить', cancel: 'Отмена' },
confirmProps: { color: 'red' },
onConfirm: async () => {
await deleteHierarchy.mutateAsync(id)
},
})
}
const handleDeleteChain = (group: ChainGroup) => {
@ -254,464 +146,216 @@ export default function HierarchiesPage() {
modals.openConfirmModal({
title: 'Удалить всю цепочку',
children: (
<Text size="sm">
Вы уверены, что хотите удалить всю цепочку согласования для{' '}
<strong>{group.subordinateName}</strong> ({group.scopeObjectName}, шагов:{' '}
{stepIds.length})? Это действие необратимо.
</Text>
),
labels: { confirm: 'Удалить цепочку', cancel: 'Отмена' },
children: <Text size="sm">Вы уверены, что хотите удалить цепочку согласования для <strong>{group.subordinateName}</strong> (шагов: {stepIds.length})?</Text>,
labels: { confirm: 'Удалить', cancel: 'Отмена' },
confirmProps: { color: 'red' },
onConfirm: async () => {
try {
await Promise.all(stepIds.map((id) => hierarchiesApi.delete(id)))
queryClient.invalidateQueries({ queryKey: [HIERARCHIES_QUERY_KEY] })
notifications.show({
title: 'Успешно',
message: `Цепочка удалена (удалено шагов: ${stepIds.length})`,
color: 'green',
})
} catch (error) {
notifications.show({
title: 'Ошибка',
message: 'Не удалось удалить цепочку полностью',
color: 'red',
})
await queryClient.invalidateQueries({ queryKey: [HIERARCHIES_QUERY_KEY] })
notifications.show({ title: 'Успешно', message: 'Цепочка удалена', color: 'green' })
} catch {
notifications.show({ title: 'Ошибка', message: 'Не удалось удалить цепочку', color: 'red' })
}
},
})
}
const handleEditStep = (id: number) => {
const hierarchy = data?.data?.find((h) => h.id === id)
if (hierarchy) {
setEditHierarchy(hierarchy)
const handleSwapSteps = async (stepA: UserHierarchy, stepB: UserHierarchy) => {
try {
await Promise.all([
updateHierarchy.mutateAsync({ id: stepA.id!, priority: stepB.priority }),
updateHierarchy.mutateAsync({ id: stepB.id!, priority: stepA.priority }),
])
await queryClient.invalidateQueries({ queryKey: [HIERARCHIES_QUERY_KEY] })
} catch {
notifications.show({ title: 'Ошибка', message: 'Не удалось изменить порядок', color: 'red' })
}
}
const handleAddStep = (group: ChainGroup) => {
setPresetGroup(group)
setCreateModalOpened(true)
}
const handleDuplicateChain = (group: ChainGroup) => {
setDuplicateGroup(group)
setDuplicateModalOpened(true)
}
const handleCloseModal = () => {
setEditHierarchy(null)
setCreateModalOpened(false)
setPresetGroup(null)
}
const handleCloseDuplicateModal = () => {
setDuplicateGroup(null)
setDuplicateModalOpened(false)
}
const isAllSelected =
(data?.data?.length ?? 0) > 0 && selectedIds.length === (data?.data?.length ?? 0)
const isIndeterminate =
selectedIds.length > 0 && selectedIds.length < (data?.data?.length || 0)
const handleBulkUpdateSystem = async (group: ChainGroup, targetSystem: string | null) => {
try {
// Обновляем все шаги в выбранной цепочке асинхронно
await Promise.all(
group.steps.map((step) =>
updateHierarchy.mutateAsync({
id: step.id!,
subordinate_id: step.subordinate_id,
approver_id: step.approver_id,
department_id: step.department_id,
topic_category_id: step.topic_category_id,
topic_id: step.topic_id,
priority: step.priority,
target_system: targetSystem, // Применяем новую систему
})
updateHierarchy.mutateAsync({ ...step, target_system: targetSystem })
)
)
} catch (error) {
console.error("Ошибка при массовом обновлении систем цепочки", error)
notifications.show({ title: 'Ошибка', message: 'Не удалось обновить систему', color: 'red' })
}
}
return (
<Stack gap="md">
{/* Заголовок */}
<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)
setSelectedIds([])
}}
data={[
{ value: 'chains', label: 'Цепочки' },
{ value: 'table', label: 'Таблица' },
]}
/>
<Tooltip label="Скопировать все цепочки одного сотрудника для другого — например, для нового сотрудника с такой же ролью">
<Button
variant="light"
leftSection={<IconUsers size={16} />}
onClick={() => setPersonDuplicateOpened(true)}
>
Дублировать по сотруднику
</Button>
const isAllSelected = (data?.data?.length ?? 0) > 0 && selectedIds.length === (data?.data?.length ?? 0)
const isIndeterminate = selectedIds.length > 0 && selectedIds.length < (data?.data?.length || 0)
const activeCount = [
subordinateFilter, approverFilter, userStatusFilter, departmentFilter, categoryFilter, topicFilter
].filter(Boolean).length
const resetFilters = () => {
setSubordinateFilter(null)
setApproverFilter(null)
setUserStatusFilter(null)
setDepartmentFilter(null)
setCategoryFilter(null)
setTopicFilter(null)
setPage(1)
setSelectedIds([])
}
const columns: Column<UserHierarchy>[] = [
{
key: 'select',
header: <Checkbox checked={isAllSelected} indeterminate={isIndeterminate} onChange={handleSelectAll} />,
width: 50,
cell: (r) => (
<Checkbox
checked={selectedIds.includes(r.id!)}
onChange={() => handleSelectOne(r.id!)}
onClick={(e) => e.stopPropagation()}
/>
),
},
{ key: 'id', header: 'ID', width: 60, cell: (r) => <Text size="sm">#{r.id}</Text> },
{ key: 'sub', header: 'Подчинённый', cell: (r) => <Text size="sm" fw={500}>{r.subordinate?.full_name || '—'}</Text> },
{ key: 'app', header: 'Согласующий', cell: (r) => <Text size="sm" fw={500}>{r.approver?.full_name || '—'}</Text> },
{ key: 'dep', header: 'Отдел', cell: (r) => <Text size="sm">{r.department?.name || '—'}</Text> },
{
key: 'scope',
header: 'Область',
cell: (r) => {
const type = r.topic_id ? 'topic' : r.topic_category_id ? 'category' : 'global'
return <Badge size="xs" color={SCOPE_COLORS[type]} variant="light">{SCOPE_LABELS[type]}</Badge>
}
},
{ key: 'priority', header: 'Порядок', width: 80, cell: (r) => <Badge variant="light" color="gray">#{r.priority}</Badge> },
{
key: 'actions',
header: '',
width: 100,
align: 'right',
cell: (r) => (
<Group gap="xs" justify="flex-end" wrap="nowrap">
<Tooltip label="Редактировать">
<ActionIcon variant="subtle" color="blue" onClick={(e) => { e.stopPropagation(); setEditHierarchy(r); }}>
<IconPencil size={16} />
</ActionIcon>
</Tooltip>
<Tooltip label="Удалить">
<ActionIcon variant="subtle" color="red" onClick={(e) => { e.stopPropagation(); setDeleteTarget(r.id!); }}>
<IconTrash size={16} />
</ActionIcon>
</Tooltip>
<Button
leftSection={<IconPlus size={16} />}
onClick={() => {
setPresetGroup(null)
setCreateModalOpened(true)
}}
>
Добавить связь
</Button>
</Group>
</Group>
),
},
]
<Alert icon={<IconInfoCircle size={16} />} color="blue" variant="light">
<Text size="sm">
Иерархия определяет порядок согласования заявок. Каждая цепочка показывает,
через каких согласующих проходит заявка от конкретного сотрудника.
</Text>
</Alert>
return (
<Stack gap="lg">
<PageHeader
title="Иерархия согласований"
description={`Всего: ${total}`}
actions={
<Group gap="sm">
<SegmentedControl
value={viewMode}
onChange={(v) => { setViewMode(v as ViewMode); setSelectedIds([]); }}
data={[{ value: 'chains', label: 'Цепочки' }, { value: 'table', label: 'Таблица' }]}
/>
<Tooltip label="Скопировать все цепочки сотрудника для другого">
<Button variant="light" leftSection={<IconUsers size={16} />} onClick={() => setPersonDuplicateOpened(true)}>
Дублировать по сотруднику
</Button>
</Tooltip>
<Button leftSection={<IconPlus size={16} />} onClick={() => { setPresetGroup(null); setCreateDrawerOpened(true); }}>
Добавить связь
</Button>
</Group>
}
/>
{/* Фильтры */}
<Paper withBorder p="md">
<FilterBar activeCount={activeCount} onReset={resetFilters}>
<Select placeholder="Инициатор" data={userOptions} value={subordinateFilter} onChange={setFilter(setSubordinateFilter)} searchable clearable w={180} />
<Select placeholder="Статус сотрудника" data={[{ value: 'active', label: 'Активен' }, { value: 'fired', label: 'Уволен' }, { value: 'blocked', label: 'Заблокирован' }]} value={userStatusFilter} onChange={setFilter(setUserStatusFilter)} clearable w={160} />
<Select placeholder="Согласующий" data={allUserOptions} value={approverFilter} onChange={setFilter(setApproverFilter)} searchable clearable w={180} />
<Select placeholder="Отдел" data={departmentOptions} value={departmentFilter} onChange={setFilter(setDepartmentFilter)} clearable w={160} />
<Select placeholder="Категория" data={categoryOptions} value={categoryFilter} onChange={(v) => { setFilter(setCategoryFilter)(v); setTopicFilter(null); }} searchable clearable w={180} />
<Select placeholder="Тема" data={topicOptions} value={topicFilter} onChange={setFilter(setTopicFilter)} searchable clearable w={180} />
</FilterBar>
{viewMode === 'chains' ? (
<Stack gap="md">
<Group gap="md" align="flex-end">
<Select
label="Сотрудник (инициатор)"
placeholder="Все пользователи"
data={userOptions}
value={subordinateFilter}
onChange={handleFilterChange(setSubordinateFilter)}
clearable
searchable
style={{ flex: 1, minWidth: 220 }}
{enrichedChains.map((chain) => (
<ChainVisualization
key={chain.key}
group={chain}
onEditStep={(id) => setEditHierarchy(data?.data?.find(h => h.id === id) || null)}
onDeleteStep={setDeleteTarget}
onDeleteChain={handleDeleteChain}
onAddStep={(group) => { setPresetGroup(group); setCreateDrawerOpened(true); }}
onDuplicateChain={(group) => setDuplicateGroup(group)}
onBulkUpdateSystem={handleBulkUpdateSystem}
onSwapSteps={handleSwapSteps}
/>
<Select
label="Статус сотрудника"
placeholder="Все статусы"
data={[
{ value: 'active', label: 'Активен' },
{ value: 'fired', label: 'Уволен' },
{ value: 'blocked', label: 'Заблокирован' },
]}
value={userStatusFilter}
onChange={handleFilterChange(setUserStatusFilter)}
clearable
style={{ width: 180 }}
/>
<Select
label="Согласующий"
placeholder="Все согласующие"
data={allUserOptions}
value={approverFilter}
onChange={handleFilterChange(setApproverFilter)}
clearable
searchable
style={{ flex: 1, minWidth: 220 }}
/>
</Group>
<Group gap="md" align="flex-end">
<Select
label="Отдел"
placeholder="Все отделы"
data={departmentOptions}
value={departmentFilter}
onChange={handleFilterChange(setDepartmentFilter)}
clearable
style={{ flex: 1, minWidth: 200 }}
/>
<Select
label="Категория"
placeholder="Все категории"
data={categoryOptions}
value={categoryFilter}
onChange={(v) => {
handleFilterChange(setCategoryFilter)(v)
setTopicFilter(null)
}}
clearable
searchable
style={{ flex: 1, minWidth: 200 }}
/>
<Select
label="Тема"
placeholder="Все темы"
data={topicOptions}
value={topicFilter}
onChange={handleFilterChange(setTopicFilter)}
clearable
searchable
style={{ flex: 1, minWidth: 200 }}
/>
</Group>
))}
</Stack>
</Paper>
{/* Контент */}
<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>
) : (
enrichedChains.map((chain) => (
<ChainVisualization
key={chain.key}
group={chain}
onEditStep={handleEditStep}
onDeleteStep={handleDelete}
onDeleteChain={handleDeleteChain}
onAddStep={handleAddStep}
onDuplicateChain={handleDuplicateChain}
onBulkUpdateSystem={handleBulkUpdateSystem}
/>
))
)}
</Stack>
</ScrollArea>
) : (
<>
{selectedIds.length > 0 && (
<Box
p="sm"
bg="red.0"
style={{ borderBottom: '1px solid var(--mantine-color-red-3)' }}
>
<Group justify="space-between">
<Text size="sm" fw={500}>
Выбрано записей: <strong>{selectedIds.length}</strong>
</Text>
<Group gap="xs">
<Button
variant="subtle"
size="xs"
onClick={() => setSelectedIds([])}
>
Снять выделение
</Button>
<Button
color="red"
size="xs"
leftSection={<IconTrash size={14} />}
onClick={handleBulkDelete}
loading={isDeleting}
>
Удалить выбранные
</Button>
</Group>
) : (
<Stack gap={0}>
{selectedIds.length > 0 && (
<Box p="xs" bg="red.0" style={{ borderBottom: '1px solid var(--mantine-color-red-2)', borderTopLeftRadius: 4, borderTopRightRadius: 4 }}>
<Group justify="space-between">
<Text size="sm" fw={500} c="red.9">Выбрано записей: {selectedIds.length}</Text>
<Group gap="xs">
<Button variant="subtle" color="dark" size="xs" onClick={() => setSelectedIds([])}>Отмена</Button>
<Button color="red" size="xs" leftSection={<IconTrash size={14} />} onClick={handleBulkDelete} loading={isDeleting}>Удалить выбранные</Button>
</Group>
</Box>
)}
<Table striped highlightOnHover>
<Table.Thead>
<Table.Tr>
<Table.Th style={{ width: 50 }}>
<Checkbox
checked={isAllSelected}
indeterminate={isIndeterminate}
onChange={handleSelectAll}
/>
</Table.Th>
<Table.Th style={{ width: 60 }}>ID</Table.Th>
<Table.Th>Подчинённый</Table.Th>
<Table.Th>Согласующий</Table.Th>
<Table.Th>Отдел</Table.Th>
<Table.Th>Область</Table.Th>
<Table.Th>Объект</Table.Th>
<Table.Th style={{ width: 80 }}>Порядок</Table.Th>
<Table.Th style={{ width: 100 }}>Действия</Table.Th>
</Table.Tr>
</Table.Thead>
<Table.Tbody>
{data?.data?.length === 0 ? (
<Table.Tr>
<Table.Td colSpan={9}>
<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}
style={{
backgroundColor: selectedIds.includes(h.id!)
? 'var(--mantine-color-blue-0)'
: undefined,
}}
>
<Table.Td>
<Checkbox
checked={selectedIds.includes(h.id!)}
onChange={() => handleSelectOne(h.id!)}
/>
</Table.Td>
<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>
</>
)}
{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={(newPage) => {
setPage(newPage)
setSelectedIds([])
}}
total={totalPages}
withEdges
/>
</Group>
</Box>
)}
</Paper>
{isFetching && !isLoading && (
<Box style={{ position: 'fixed', top: 70, right: 20, zIndex: 1000 }}>
<Loader size="xs" />
</Box>
</Group>
</Box>
)}
<DataTable<UserHierarchy>
columns={columns}
rows={data?.data ?? []}
getRowId={(r) => r.id!}
loading={isLoading}
refreshing={isFetching}
onRowClick={(r) => setEditHierarchy(r)}
empty={{ title: 'Связи не найдены' }}
pagination={{ page, pageSize: LIMIT, total, onChange: (p) => { setPage(p); setSelectedIds([]); } }}
/>
</Stack>
)}
{/* Модалки */}
<HierarchyEditModal
<HierarchyEditDrawer
hierarchy={editHierarchy}
opened={editHierarchy !== null}
onClose={handleCloseModal}
/>
<HierarchyEditModal
hierarchy={null}
presetGroup={presetGroup}
opened={createModalOpened}
onClose={handleCloseModal}
opened={editHierarchy !== null || createDrawerOpened}
onClose={() => { setEditHierarchy(null); setPresetGroup(null); setCreateDrawerOpened(false); }}
/>
<ChainDuplicateModal
<ChainDuplicateDrawer
group={duplicateGroup}
opened={duplicateModalOpened}
onClose={handleCloseDuplicateModal}
opened={duplicateGroup !== null}
onClose={() => setDuplicateGroup(null)}
/>
<PersonDuplicateModal
<PersonDuplicateDrawer
opened={personDuplicateOpened}
onClose={() => setPersonDuplicateOpened(false)}
/>
<ConfirmModal
opened={deleteTarget !== null}
onClose={() => setDeleteTarget(null)}
onConfirm={async () => {
await deleteHierarchy.mutateAsync(deleteTarget!);
setDeleteTarget(null);
}}
title="Удалить связь"
message="Вы уверены, что хотите удалить этого согласующего из цепочки?"
confirmLabel="Удалить"
danger
/>
</Stack>
)
}

View File

@ -0,0 +1,233 @@
import { useEffect } from 'react'
import { Drawer, Stack, Select, Group, Button, Text, Paper, Divider, ActionIcon, Badge, Avatar, Box, Radio, Alert } from '@mantine/core'
import { useForm } from '@mantine/form'
import { IconInfoCircle, IconPlus, IconTrash, IconChevronRight } from '@tabler/icons-react'
import { notifications } from '@mantine/notifications'
import { useCreateHierarchy } from '@/features/hierarchies/hooks/useHierarchies'
import { useUsers } from '@/features/users/hooks/useUsers'
import { useDepartments } from '@/features/departments/hooks/useDepartments'
import { useCategories } from '@/features/categories/hooks/useCategories'
import { useTopics } from '@/features/topics/hooks/useTopics'
import { useAllSystemOptions } from '@/features/hierarchies/hooks/useSystemOptions'
import type { ChainGroup } from '@/features/hierarchies/utils'
import classes from '@/components/UserDrawer.module.css'
interface Props {
group: ChainGroup | null
opened: boolean
onClose: () => void
}
type ScopeType = 'global' | 'category' | 'topic'
interface StepForm {
approver_id: number | null
priority: number
target_system: string | null
}
export default function ChainDuplicateDrawer({ group, opened, onClose }: Props) {
const createHierarchy = useCreateHierarchy()
const { data: users } = useUsers({ limit: 1000 })
const { data: departments } = useDepartments()
const { data: categories } = useCategories({ limit: 1000 })
const { options: systemOptions } = useAllSystemOptions()
const { data: allTopics } = useTopics({ limit: 1000 })
const form = useForm({
initialValues: {
subordinate_id: null as number | null,
department_id: null as number | null,
scope_type: 'global' as ScopeType,
topic_category_id: null as number | null,
topic_id: null as number | null,
steps: [] as StepForm[],
},
validate: {
subordinate_id: (v) => (v === null ? 'Выберите инициатора' : null),
department_id: (v) => (v === null ? 'Выберите отдел' : null),
topic_category_id: (v, values) => {
if ((values.scope_type === 'category' || values.scope_type === 'topic') && v === null) return 'Выберите категорию'
return null
},
topic_id: (v, values) => {
if (values.scope_type === 'topic' && v === null) return 'Выберите тему'
return null
},
steps: { approver_id: (v) => (v === null ? 'Обязательно' : null) },
},
})
const { data: categoryTopics } = useTopics({
limit: 1000,
...(form.values.topic_category_id && { category_id: form.values.topic_category_id }),
})
useEffect(() => {
if (!opened) return
if (group) {
let resolvedCategoryId: number | null = null
if (group.scopeType === 'category') resolvedCategoryId = group.scopeObjectId
else if (group.scopeType === 'topic') {
const matchedTopic = allTopics?.data?.find((t) => t.id === group.scopeObjectId)
resolvedCategoryId = matchedTopic?.category_id || null
}
form.setValues({
subordinate_id: group.subordinateId,
department_id: group.departmentId,
scope_type: group.scopeType,
topic_category_id: resolvedCategoryId,
topic_id: group.scopeType === 'topic' ? group.scopeObjectId : null,
steps: group.steps.map((s, idx) => ({
approver_id: s.approver_id || null,
priority: idx,
target_system: s.target_system || null,
})),
})
}
}, [group, opened, allTopics])
const handleScopeTypeChange = (value: ScopeType) => {
form.setFieldValue('scope_type', value)
if (value === 'global') {
form.setFieldValue('topic_category_id', null)
form.setFieldValue('topic_id', null)
} else if (value === 'category') {
form.setFieldValue('topic_id', null)
}
}
const addStep = () => {
form.insertListItem('steps', { approver_id: null, priority: form.values.steps.length, target_system: null })
}
const removeStep = (index: number) => {
form.removeListItem('steps', index)
form.values.steps.forEach((_, idx) => form.setFieldValue(`steps.${idx}.priority`, idx))
}
const userOptions = users?.data?.map((u) => ({ value: String(u.id), label: u.full_name || `ID ${u.id}` })) || []
const departmentOptions = departments?.data?.map((d) => ({ value: String(d.id), label: d.name || '' })) || []
const categoryOptions = categories?.data?.map((c) => ({ value: String(c.id), label: c.name || '' })) || []
const topicOptions = categoryTopics?.data?.map((t) => ({ value: String(t.id), label: t.name || '' })) || []
const handleSubmit = async (values: typeof form.values) => {
if (values.steps.length === 0) return notifications.show({ title: 'Ошибка', message: 'Добавьте хотя бы один шаг', color: 'red' })
try {
for (const step of values.steps) {
await createHierarchy.mutateAsync({
subordinate_id: values.subordinate_id!,
approver_id: step.approver_id!,
department_id: values.department_id!,
priority: step.priority,
target_system: step.target_system || null,
topic_category_id: values.scope_type === 'global' ? null : values.scope_type === 'category' ? values.topic_category_id : null,
topic_id: values.scope_type === 'topic' ? values.topic_id : null,
})
}
notifications.show({ title: 'Успешно', message: `Создана цепочка (${values.steps.length} шагов)`, color: 'green' })
onClose()
} catch {
notifications.show({ title: 'Ошибка', message: 'Не удалось дублировать', color: 'red' })
}
}
const isSubmitting = createHierarchy.isPending
return (
<Drawer.Root opened={opened} onClose={onClose} position="right" size="min(600px, 100vw)">
<Drawer.Overlay backgroundOpacity={0.25} />
<Drawer.Content>
<Drawer.Header>
<Text fw={600}>Дублирование цепочки</Text>
<Drawer.CloseButton />
</Drawer.Header>
<Drawer.Body className={classes.body}>
<form style={{ display: 'contents' }} onSubmit={form.onSubmit(handleSubmit)}>
<Stack gap="lg" className={classes.section}>
<Alert icon={<IconInfoCircle size={16} />} color="blue" variant="light">
<Text size="sm">Новая цепочка на основе выбранной. Измените инициатора, отдел, область действия или шаги.</Text>
</Alert>
<Paper withBorder p="md">
<Text size="sm" fw={600} mb="sm">Общие параметры</Text>
<Stack gap="sm">
<Select label="Инициатор" data={userOptions} value={form.values.subordinate_id ? String(form.values.subordinate_id) : null} onChange={(v) => form.setFieldValue('subordinate_id', v ? Number(v) : null)} searchable required error={form.errors.subordinate_id} />
<Select label="Отдел" data={departmentOptions} value={form.values.department_id ? String(form.values.department_id) : null} onChange={(v) => form.setFieldValue('department_id', v ? Number(v) : null)} searchable required error={form.errors.department_id} />
</Stack>
</Paper>
<Paper withBorder p="md">
<Text size="sm" fw={600} mb="sm">Область действия</Text>
<Stack gap="sm">
<Radio.Group value={form.values.scope_type} onChange={(v) => handleScopeTypeChange(v as ScopeType)}>
<Stack gap="xs">
<Radio value="global" label="Глобальное правило" />
<Radio value="category" label="Для категории тем" />
<Radio value="topic" label="Для конкретной темы" />
</Stack>
</Radio.Group>
{(form.values.scope_type === 'category' || form.values.scope_type === 'topic') && (
<Select label="Категория" data={categoryOptions} value={form.values.topic_category_id ? String(form.values.topic_category_id) : null} onChange={(v) => { form.setFieldValue('topic_category_id', v ? Number(v) : null); form.setFieldValue('topic_id', null); }} searchable required error={form.errors.topic_category_id} />
)}
{form.values.scope_type === 'topic' && (
<Select label="Тема" data={topicOptions} value={form.values.topic_id ? String(form.values.topic_id) : null} onChange={(v) => form.setFieldValue('topic_id', v ? Number(v) : null)} searchable required disabled={!form.values.topic_category_id} error={form.errors.topic_id} />
)}
</Stack>
</Paper>
<Paper withBorder p="md">
<Group justify="space-between" mb="sm">
<Text size="sm" fw={600}>Шаги согласования</Text>
<Button variant="subtle" size="xs" leftSection={<IconPlus size={14} />} onClick={addStep}>Добавить шаг</Button>
</Group>
<Stack gap="sm">
{form.values.steps.map((step, index) => (
<Paper key={index} withBorder p="sm" bg="gray.0">
<Group gap="sm" align="flex-start">
<Avatar size="sm" radius="xl" color="blue" mt={4}>{index + 1}</Avatar>
<Stack gap="xs" style={{ flex: 1 }}>
<Group grow gap="xs">
<Select placeholder="Согласующий" data={userOptions} value={step.approver_id ? String(step.approver_id) : null} onChange={(v) => form.setFieldValue(`steps.${index}.approver_id`, v ? Number(v) : null)} searchable />
<Select placeholder="Система: Все" data={[{ value: 'all', label: 'Система: Все' }, ...systemOptions.map((s) => ({ value: s.value, label: `Система: ${s.label}` }))]} value={step.target_system || 'all'} onChange={(v) => form.setFieldValue(`steps.${index}.target_system`, (v === 'all' || !v) ? null : v)} clearable />
</Group>
</Stack>
<ActionIcon variant="subtle" color="red" size="md" mt={4} onClick={() => removeStep(index)}><IconTrash size={16} /></ActionIcon>
</Group>
</Paper>
))}
</Stack>
</Paper>
{form.values.steps.length > 0 && (
<Paper withBorder p="md" bg="gray.0">
<Text size="xs" fw={600} c="dimmed" mb="xs" tt="uppercase">Предпросмотр</Text>
<Group gap="xs" wrap="nowrap" style={{ overflowX: 'auto' }}>
<Badge variant="light" color="gray" tt="none">{users?.data?.find((u) => u.id === form.values.subordinate_id)?.full_name || 'Инициатор'}</Badge>
{form.values.steps.map((step, index) => (
<Group key={index} gap={4} wrap="nowrap">
<IconChevronRight size={14} color="var(--mantine-color-gray-5)" />
<Badge variant="light" color="blue" tt="none">
{users?.data?.find((u) => u.id === step.approver_id)?.full_name || `Шаг ${index + 1}`}
{step.target_system && ` (${step.target_system})`}
</Badge>
</Group>
))}
</Group>
</Paper>
)}
</Stack>
<Group className={classes.footer} justify="flex-end" gap="sm">
<Button variant="default" onClick={onClose} disabled={isSubmitting}>Отмена</Button>
<Button type="submit" loading={isSubmitting}>Сохранить цепочку</Button>
</Group>
</form>
</Drawer.Body>
</Drawer.Content>
</Drawer.Root>
)
}

View File

@ -1,527 +0,0 @@
import { useEffect } from 'react'
import {
Modal,
Stack,
Select,
Group,
Button,
Text,
Paper,
Divider,
ActionIcon,
Badge,
Avatar,
Box,
Radio,
Alert,
} from '@mantine/core'
import { useForm } from '@mantine/form'
import {
IconInfoCircle,
IconPlus,
IconTrash,
IconCopy,
IconChevronRight,
} from '@tabler/icons-react'
import { notifications } from '@mantine/notifications'
import { useCreateHierarchy } from '@/features/hierarchies/hooks/useHierarchies'
import { useUsers } from '@/features/users/hooks/useUsers'
import { useDepartments } from '@/features/departments/hooks/useDepartments'
import { useCategories } from '@/features/categories/hooks/useCategories'
import { useTopics } from '@/features/topics/hooks/useTopics'
import { useAllSystemOptions } from '@/features/hierarchies/hooks/useSystemOptions' // 👈 ИМПОРТИРОВАЛИ ХУК
import type { ChainGroup } from '@/features/hierarchies/utils'
interface ChainDuplicateModalProps {
group: ChainGroup | null
opened: boolean
onClose: () => void
}
type ScopeType = 'global' | 'category' | 'topic'
interface StepForm {
approver_id: number | null
priority: number
target_system: string | null // 👈 ДОБАВИЛИ ПОЛЕ В ИНТЕРФЕЙС
}
export default function ChainDuplicateModal({
group,
opened,
onClose,
}: ChainDuplicateModalProps) {
const createHierarchy = useCreateHierarchy()
const { data: users } = useUsers({ limit: 1000 })
const { data: departments } = useDepartments()
const { data: categories } = useCategories({ limit: 1000 })
// Подтягиваем доступные системы
const { options: systemOptions } = useAllSystemOptions()
const { data: allTopics } = useTopics({ limit: 1000 })
const form = useForm({
initialValues: {
subordinate_id: null as number | null,
department_id: null as number | null,
scope_type: 'global' as ScopeType,
topic_category_id: null as number | null,
topic_id: null as number | null,
steps: [] as StepForm[],
},
validate: {
subordinate_id: (v) => (v === null ? 'Выберите инициатора' : null),
department_id: (v) => (v === null ? 'Выберите отдел' : null),
topic_category_id: (v, values) => {
if (
(values.scope_type === 'category' || values.scope_type === 'topic') &&
v === null
) {
return 'Выберите категорию'
}
return null
},
topic_id: (v, values) => {
if (values.scope_type === 'topic' && v === null) {
return 'Выберите тему'
}
return null
},
steps: {
approver_id: (v) => (v === null ? 'Выберите согласующего' : null),
},
},
})
const { data: categoryTopics } = useTopics({
limit: 1000,
...(form.values.topic_category_id && { category_id: form.values.topic_category_id }),
})
useEffect(() => {
if (group && opened) {
let resolvedCategoryId: number | null = null
if (group.scopeType === 'category') {
resolvedCategoryId = group.scopeObjectId
} else if (group.scopeType === 'topic') {
const matchedTopic = allTopics?.data?.find((t) => t.id === group.scopeObjectId)
resolvedCategoryId = matchedTopic?.category_id || null
}
form.setValues({
subordinate_id: group.subordinateId,
department_id: group.departmentId,
scope_type: group.scopeType,
topic_category_id: resolvedCategoryId,
topic_id: group.scopeType === 'topic' ? group.scopeObjectId : null,
steps: group.steps.map((s, idx) => ({
approver_id: s.approver_id || null,
priority: idx,
target_system: s.target_system || null, // 👈 ИНИЦИАЛИЗИРУЕМ ИЗ БД
})),
})
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [group, opened, allTopics])
const handleScopeTypeChange = (value: ScopeType) => {
form.setFieldValue('scope_type', value)
if (value === 'global') {
form.setFieldValue('topic_category_id', null)
form.setFieldValue('topic_id', null)
} else if (value === 'category') {
form.setFieldValue('topic_id', null)
}
}
const addStep = () => {
form.insertListItem('steps', {
approver_id: null,
priority: form.values.steps.length,
target_system: null, // 👈 ИНИЦИАЛИЗИРУЕМ ДЛЯ НОВОГО ШАГА
})
}
const removeStep = (index: number) => {
form.removeListItem('steps', index)
form.values.steps.forEach((_, idx) => {
form.setFieldValue(`steps.${idx}.priority`, idx)
})
}
const userOptions =
users?.data?.map((u) => ({
value: String(u.id),
label: u.full_name || `Пользователь #${u.id}`,
})) || []
const departmentOptions =
departments?.data?.map((d) => ({
value: String(d.id),
label: d.name || '',
})) || []
const categoryOptions =
categories?.data?.map((c) => ({
value: String(c.id),
label: c.name || '',
})) || []
const topicOptions =
categoryTopics?.data?.map((t) => ({
value: String(t.id),
label: t.name || '',
})) || []
const handleSubmit = async (values: typeof form.values) => {
if (values.steps.length === 0) {
notifications.show({
title: 'Ошибка',
message: 'Добавьте хотя бы один шаг согласования',
color: 'red',
})
return
}
try {
for (const step of values.steps) {
await createHierarchy.mutateAsync({
subordinate_id: values.subordinate_id!,
approver_id: step.approver_id!,
department_id: values.department_id!,
priority: step.priority,
target_system: step.target_system || null, // 👈 ОТПРАВЛЯЕМ СИСТЕМУ
topic_category_id:
values.scope_type === 'global'
? null
: values.scope_type === 'category'
? values.topic_category_id
: null,
topic_id: values.scope_type === 'topic' ? values.topic_id : null,
})
}
notifications.show({
title: 'Успешно',
message: `Цепочка дублирована (${values.steps.length} шагов)`,
color: 'green',
})
onClose()
} catch (error) {
notifications.show({
title: 'Ошибка',
message: 'Не удалось дублировать цепочку',
color: 'red',
})
}
}
const isSubmitting = createHierarchy.isPending
return (
<Modal
opened={opened}
onClose={onClose}
title={
<Group gap="xs">
<IconCopy size={20} />
<Text fw={600}>Дублирование цепочки</Text>
</Group>
}
size="lg"
centered
>
<form onSubmit={form.onSubmit(handleSubmit)}>
<Stack gap="md">
<Alert icon={<IconInfoCircle size={16} />} color="blue" variant="light">
<Text size="sm">
Создайте новую цепочку на основе существующей. Вы можете изменить
инициатора, отдел, область действия и согласующих.
</Text>
</Alert>
{/* Общие параметры */}
<Paper withBorder p="md">
<Text size="sm" fw={600} mb="sm" c="dark">
Общие параметры
</Text>
<Stack gap="sm">
<Select
label="Инициатор"
placeholder="Выберите пользователя"
data={userOptions}
value={
form.values.subordinate_id
? String(form.values.subordinate_id)
: null
}
onChange={(v) =>
form.setFieldValue(
'subordinate_id',
v ? Number(v) : null
)
}
searchable
required
error={form.errors.subordinate_id}
/>
<Select
label="Отдел"
placeholder="Выберите отдел"
data={departmentOptions}
value={
form.values.department_id
? String(form.values.department_id)
: null
}
onChange={(v) =>
form.setFieldValue(
'department_id',
v ? Number(v) : null
)
}
searchable
required
error={form.errors.department_id}
/>
</Stack>
</Paper>
{/* Область действия */}
<Paper withBorder p="md">
<Text size="sm" fw={600} mb="sm" c="dark">
Область действия
</Text>
<Stack gap="sm">
<Radio.Group
value={form.values.scope_type}
onChange={(v) => handleScopeTypeChange(v as ScopeType)}
>
<Stack gap="xs">
<Radio
value="global"
label="Глобальное правило"
description="Для всех тем согласований"
/>
<Radio
value="category"
label="Для категории тем"
description="Только для тем выбранной категории"
/>
<Radio
value="topic"
label="Для конкретной темы"
description="Только для выбранной темы"
/>
</Stack>
</Radio.Group>
{(form.values.scope_type === 'category' ||
form.values.scope_type === 'topic') && (
<Select
label="Категория"
placeholder="Выберите категорию"
data={categoryOptions}
value={
form.values.topic_category_id
? String(form.values.topic_category_id)
: null
}
onChange={(v) => {
form.setFieldValue(
'topic_category_id',
v ? Number(v) : null
)
form.setFieldValue('topic_id', null)
}}
searchable
required
error={form.errors.topic_category_id}
/>
)}
{form.values.scope_type === 'topic' && (
<Select
label="Тема"
placeholder="Выберите тему"
data={topicOptions}
value={
form.values.topic_id
? String(form.values.topic_id)
: null
}
onChange={(v) =>
form.setFieldValue('topic_id', v ? Number(v) : null)
}
searchable
required
disabled={!form.values.topic_category_id}
error={form.errors.topic_id}
/>
)}
</Stack>
</Paper>
{/* Шаги согласования */}
<Paper withBorder p="md">
<Group justify="space-between" mb="sm">
<Text size="sm" fw={600} c="dark">
Шаги согласования
</Text>
<Button
variant="subtle"
size="xs"
leftSection={<IconPlus size={14} />}
onClick={addStep}
>
Добавить шаг
</Button>
</Group>
<Stack gap="sm">
{form.values.steps.length === 0 ? (
<Box py="md">
<Text size="sm" c="dimmed" ta="center">
Нет шагов согласования. Добавьте хотя бы один.
</Text>
</Box>
) : (
form.values.steps.map((step, index) => (
<Paper
key={index}
withBorder
p="sm"
style={{
borderColor: 'var(--mantine-color-gray-3)',
backgroundColor: 'var(--mantine-color-gray-0)',
}}
>
<Group gap="sm" align="flex-start">
<Avatar
size="sm"
radius="xl"
color="blue"
variant="filled"
mt={4}
>
{index + 1}
</Avatar>
<Stack gap="xs" style={{ flex: 1 }}>
<Group gap="xs">
<Badge
size="xs"
variant="light"
color="gray"
tt="none"
>
Шаг {index + 1}
</Badge>
<Badge
size="xs"
variant="light"
color="gray"
tt="none"
>
Priority: {step.priority}
</Badge>
</Group>
<Group grow gap="xs">
<Select
placeholder="Выберите согласующего"
data={userOptions}
value={step.approver_id ? String(step.approver_id) : null}
onChange={(v) =>
form.setFieldValue(`steps.${index}.approver_id`, v ? Number(v) : null)
}
searchable
error={
Array.isArray(form.errors.steps) && form.errors.steps[index]
? (form.errors.steps[index] as any)?.approver_id
: undefined
}
/>
{/* 👈 ДОБАВЛЕННЫЙ ВЫБОР СИСТЕМЫ */}
<Select
placeholder="Система: Все (по умолчанию)"
data={[
{ value: 'all', label: 'Система: Все' },
...systemOptions.map((s) => ({ value: s.value, label: `Система: ${s.label}` })),
]}
value={step.target_system || 'all'}
onChange={(v) =>
form.setFieldValue(
`steps.${index}.target_system`,
(v === 'all' || !v) ? null : v
)
}
clearable
/>
</Group>
</Stack>
<ActionIcon
variant="subtle"
color="red"
size="md"
mt={4}
onClick={() => removeStep(index)}
>
<IconTrash size={16} />
</ActionIcon>
</Group>
</Paper>
))
)}
</Stack>
</Paper>
{/* Предпросмотр */}
{form.values.steps.length > 0 && (
<Paper withBorder p="md" bg="gray.0">
<Text size="xs" fw={600} c="dimmed" mb="xs" tt="uppercase">
Предпросмотр цепочки
</Text>
<Group gap="xs" wrap="nowrap" style={{ overflowX: 'auto' }}>
<Badge variant="light" color="gray" tt="none">
{users?.data?.find(
(u) => u.id === form.values.subordinate_id
)?.full_name || 'Инициатор'}
</Badge>
{form.values.steps.map((step, index) => (
<Group key={index} gap={4} wrap="nowrap">
<IconChevronRight
size={14}
color="var(--mantine-color-gray-5)"
/>
<Badge variant="light" color="blue" tt="none">
{users?.data?.find(
(u) => u.id === step.approver_id
)?.full_name || `Шаг ${index + 1}`}
{step.target_system && ` (${step.target_system})`}
</Badge>
</Group>
))}
</Group>
</Paper>
)}
<Divider />
<Group justify="flex-end" gap="sm">
<Button variant="default" onClick={onClose} disabled={isSubmitting}>
Отмена
</Button>
<Button type="submit" loading={isSubmitting}>
Дублировать цепочку
</Button>
</Group>
</Stack>
</form>
</Modal>
)
}

View File

@ -1,78 +1,39 @@
// ChainVisualization.tsx
import {useMemo, useState} from 'react'
import {
Paper,
Group,
Stack,
Text,
Badge,
ActionIcon,
Avatar,
Box,
Divider,
Tooltip,
Select,
} from '@mantine/core'
import {
IconChevronRight,
IconPencil,
IconTrash,
IconWorld,
IconCategory,
IconFileText,
IconCopy,
IconPlus,
IconServer,
} from '@tabler/icons-react'
import { useMemo } from 'react'
import { Paper, Group, Stack, Text, Badge, ActionIcon, Avatar, Box, Divider, Tooltip, Select } from '@mantine/core'
import { IconChevronRight, IconPencil, IconTrash, IconWorld, IconCategory, IconFileText, IconCopy, IconPlus, IconServer, IconArrowLeft, IconArrowRight } from '@tabler/icons-react'
import type { ChainGroup } from '@/features/hierarchies/utils'
import { SCOPE_COLORS, SCOPE_LABELS } from '@/features/hierarchies/utils'
import {
useCategorySystemOptions,
ALL_SYSTEMS_VALUE,
useAllSystemOptions
} from '@/features/hierarchies/hooks/useSystemOptions'
import {useTopics} from "@/features/topics/hooks/useTopics.ts";
import type { UserHierarchy } from '@/types/api'
import { useCategorySystemOptions, ALL_SYSTEMS_VALUE, useAllSystemOptions } from '@/features/hierarchies/hooks/useSystemOptions'
import { useTopics } from '@/features/topics/hooks/useTopics'
interface ChainVisualizationProps {
interface Props {
group: ChainGroup
onEditStep: (hierarchyId: number) => void
onDeleteStep: (hierarchyId: number) => void
onDeleteChain: (group: ChainGroup) => void // <-- ДОБАВЛЕНО
onDeleteChain: (group: ChainGroup) => void
onAddStep: (group: ChainGroup) => void
onDuplicateChain: (group: ChainGroup) => void
onBulkUpdateSystem?: (group: ChainGroup, targetSystem: string | null) => void
onSwapSteps: (stepA: UserHierarchy, stepB: UserHierarchy) => void
}
const ScopeIcon = ({ type }: { type: string }) => {
switch (type) {
case 'global':
return <IconWorld size={13} />
case 'category':
return <IconCategory size={13} />
case 'topic':
return <IconFileText size={13} />
default:
return <IconWorld size={13} />
case 'category': return <IconCategory size={13} />
case 'topic': return <IconFileText size={13} />
default: return <IconWorld size={13} />
}
}
// Внутри компонента ChainVisualization:
export default function ChainVisualization({
group,
onEditStep,
onDeleteStep,
onDeleteChain,
onAddStep,
onDuplicateChain,
onBulkUpdateSystem,
}: ChainVisualizationProps) {
// Получаем все темы, чтобы уметь мапить topicId -> categoryId, если scopeType === 'topic'
group, onEditStep, onDeleteStep, onDeleteChain, onAddStep, onDuplicateChain, onBulkUpdateSystem, onSwapSteps
}: Props) {
const { data: allTopics } = useTopics({ limit: 1000 })
const resolvedCategoryId = useMemo(() => {
if (group.scopeType === 'category') {
return group.scopeObjectId
}
if (group.scopeType === 'category') return group.scopeObjectId
if (group.scopeType === 'topic' && group.scopeObjectId && allTopics?.data) {
const foundTopic = allTopics.data.find(t => t.id === group.scopeObjectId)
return foundTopic?.category_id || null
@ -80,248 +41,103 @@ export default function ChainVisualization({
return null
}, [group.scopeType, group.scopeObjectId, allTopics?.data])
// Если цепочка глобальная (resolvedCategoryId === null), берем вообще все системы через useAllSystemOptions,
// иначе — системы конкретной категории через useCategorySystemOptions.
const categoryOptionsResult = useCategorySystemOptions(resolvedCategoryId)
const allOptionsResult = useAllSystemOptions(group.scopeType === 'global')
const systemOptions = group.scopeType === 'global' ? allOptionsResult.options : categoryOptionsResult.options
console.log(`[ChainVisualization] Группа ${group.key} (scope: ${group.scopeType}): resolvedCategoryId = ${resolvedCategoryId}, доступно систем:`, systemOptions)
// Текущая система цепочки (если у всех шагов одинаковая система, иначе 'all')
const currentChainSystem = group.steps.every(
(s) => s.target_system === group.steps[0]?.target_system
)
const currentChainSystem = group.steps.every(s => s.target_system === group.steps[0]?.target_system)
? group.steps[0]?.target_system || ALL_SYSTEMS_VALUE
: ALL_SYSTEMS_VALUE
// Формируем опции для Select
const selectData = [
{ value: ALL_SYSTEMS_VALUE, label: 'Система: Все' },
...systemOptions.map((opt) => ({
value: opt.value,
label: `Система: ${opt.label}`,
})),
...systemOptions.map((opt) => ({ value: opt.value, label: `Система: ${opt.label}` })),
]
return (
<Paper
withBorder
p="lg"
style={{
backgroundColor: 'var(--mantine-color-white)',
borderColor: 'var(--mantine-color-gray-3)',
}}
>
{/* Заголовок группы */}
<Paper withBorder p="lg">
<Group justify="space-between" mb="lg">
<Group gap="md">
<Avatar size="md" radius="xl" color="gray" variant="filled">
{group.subordinateName.charAt(0).toUpperCase()}
</Avatar>
<Stack gap={0}>
<Text fw={600} size="sm" c="dark">
{group.subordinateName}
</Text>
<Text size="xs" c="dimmed">
{group.departmentName}
</Text>
<Text fw={600} size="sm">{group.subordinateName}</Text>
<Text size="xs" c="dimmed">{group.departmentName}</Text>
</Stack>
<Divider orientation="vertical" />
<Badge
variant="outline"
color={SCOPE_COLORS[group.scopeType]}
leftSection={<ScopeIcon type={group.scopeType} />}
size="sm"
tt="none"
>
<Badge variant="outline" color={SCOPE_COLORS[group.scopeType]} leftSection={<ScopeIcon type={group.scopeType} />} size="sm" tt="none">
{SCOPE_LABELS[group.scopeType]}: {group.scopeObjectName}
</Badge>
{/* Выпадающий список систем отображается ТОЛЬКО если у темы/категории есть заданные systems */}
{systemOptions.length > 0 && (
<Select
size="xs"
leftSection={<IconServer size={14} />}
data={selectData}
value={currentChainSystem}
onChange={(val) => {
const newSystem = val === ALL_SYSTEMS_VALUE ? "" : val
if (onBulkUpdateSystem) {
onBulkUpdateSystem(group, newSystem)
}
}}
style={{ width: 180 }}
onChange={(val) => onBulkUpdateSystem?.(group, val === ALL_SYSTEMS_VALUE ? "" : val)}
w={180}
/>
)}
</Group>
<Group gap="xs">
<Tooltip label="Добавить шаг" withArrow>
<ActionIcon
variant="subtle"
color="gray"
size="md"
onClick={() => onAddStep(group)}
>
<IconPlus size={18} />
</ActionIcon>
</Tooltip>
<Tooltip label="Дублировать цепочку" withArrow>
<ActionIcon
variant="subtle"
color="gray"
size="md"
onClick={() => onDuplicateChain(group)}
>
<IconCopy size={18} />
</ActionIcon>
</Tooltip>
<Tooltip label="Удалить всю цепочку" withArrow>
<ActionIcon
variant="subtle"
color="red"
size="md"
onClick={() => onDeleteChain(group)}
>
<IconTrash size={18} />
</ActionIcon>
</Tooltip>
<Tooltip label="Добавить шаг"><ActionIcon variant="subtle" color="gray" size="md" onClick={() => onAddStep(group)}><IconPlus size={18} /></ActionIcon></Tooltip>
<Tooltip label="Дублировать цепочку"><ActionIcon variant="subtle" color="gray" size="md" onClick={() => onDuplicateChain(group)}><IconCopy size={18} /></ActionIcon></Tooltip>
<Tooltip label="Удалить всю цепочку"><ActionIcon variant="subtle" color="red" size="md" onClick={() => onDeleteChain(group)}><IconTrash size={18} /></ActionIcon></Tooltip>
</Group>
</Group>
<Divider mb="lg" />
{/* Цепочка согласования */}
<Box style={{ overflowX: 'auto' }}>
<Group gap={0} wrap="nowrap" align="stretch">
{/* Карточка инициатора */}
<Paper
withBorder
p="md"
style={{
minWidth: 180,
borderColor: 'var(--mantine-color-gray-3)',
backgroundColor: 'var(--mantine-color-gray-0)',
}}
>
<Paper withBorder p="md" bg="gray.0" miw={180}>
<Stack gap="xs" align="center">
<Text
size="xs"
fw={600}
c="dimmed"
tt="uppercase"
style={{ letterSpacing: '0.5px' }}
>
Инициатор
</Text>
<Avatar size="md" radius="xl" color="gray" variant="filled">
{group.subordinateName.charAt(0).toUpperCase()}
</Avatar>
<Text size="sm" fw={500} ta="center" lineClamp={2} c="dark">
{group.subordinateName}
</Text>
<Text size="xs" fw={600} c="dimmed" tt="uppercase" style={{ letterSpacing: '0.5px' }}>Инициатор</Text>
<Avatar size="md" radius="xl" color="gray" variant="filled">{group.subordinateName.charAt(0).toUpperCase()}</Avatar>
<Text size="sm" fw={500} ta="center" lineClamp={2}>{group.subordinateName}</Text>
</Stack>
</Paper>
{/* Шаги согласования */}
{group.steps.map((step, index) => (
<Group key={step.id} gap={0} wrap="nowrap" align="stretch">
<Stack
gap={2}
align="center"
justify="center"
px="xs"
style={{ minWidth: 60 }}
>
<Stack gap={2} align="center" justify="center" px="xs" miw={60}>
<IconChevronRight size={20} color="var(--mantine-color-gray-5)" />
<Badge size="xs" variant="light" color="gray" tt="none">
{index + 1}
</Badge>
<Badge size="xs" variant="light" color="gray" tt="none">{index + 1}</Badge>
</Stack>
{/* Карточка согласующего */}
<Paper
withBorder
p="md"
style={{
minWidth: 180,
borderColor: 'var(--mantine-color-gray-3)',
backgroundColor: 'var(--mantine-color-white)',
cursor: 'pointer',
transition: 'border-color 0.15s ease',
position: 'relative',
}}
onClick={() => onEditStep(step.id!)}
onMouseEnter={(e) => {
e.currentTarget.style.borderColor = 'var(--mantine-color-blue-5)'
}}
onMouseLeave={(e) => {
e.currentTarget.style.borderColor = 'var(--mantine-color-gray-3)'
}}
>
<Paper withBorder p="md" bg="white" miw={180}>
<Stack gap="xs" align="center">
<Group gap={6}>
<Text
size="xs"
fw={600}
c="dimmed"
tt="uppercase"
style={{ letterSpacing: '0.5px' }}
>
Шаг {index + 1}
</Text>
<Badge size="xs" variant="light" color="gray" tt="none">
#{step.priority}
</Badge>
<Text size="xs" fw={600} c="dimmed" tt="uppercase" style={{ letterSpacing: '0.5px' }}>Шаг {index + 1}</Text>
<Badge size="xs" variant="light" color="gray" tt="none">#{step.priority}</Badge>
</Group>
<Avatar size="md" radius="xl" color="blue" variant="filled">
{step.approver?.full_name?.charAt(0).toUpperCase() || '?'}
</Avatar>
<Text size="sm" fw={500} ta="center" lineClamp={2}>{step.approver?.full_name || '—'}</Text>
<Text size="sm" fw={500} ta="center" lineClamp={2} c="dark">
{step.approver?.full_name || '—'}
</Text>
{step.target_system && <Badge size="xs" color="cyan" variant="light">Система: {step.target_system}</Badge>}
{/* Бейдж конкретной целевой системы для шага (если выбрано) */}
{step.target_system && (
<Badge size="xs" color="cyan" variant="light">
Система: {step.target_system}
</Badge>
)}
<Divider w="100%" my={4} />
<Divider style={{ width: '100%', margin: '4px 0' }} />
<Group gap="xs" justify="center">
<Tooltip label="Редактировать" withArrow>
<ActionIcon
variant="subtle"
color="gray"
size="sm"
onClick={(e) => {
e.stopPropagation()
onEditStep(step.id!)
}}
>
<Group gap={4} justify="center">
<Tooltip label="Сдвинуть влево">
<ActionIcon variant="subtle" color="gray" size="sm" disabled={index === 0} onClick={() => onSwapSteps(step, group.steps[index - 1])}>
<IconArrowLeft size={14} />
</ActionIcon>
</Tooltip>
<Tooltip label="Редактировать">
<ActionIcon variant="subtle" color="blue" size="sm" onClick={() => onEditStep(step.id!)}>
<IconPencil size={14} />
</ActionIcon>
</Tooltip>
<Tooltip label="Удалить" withArrow>
<ActionIcon
variant="subtle"
color="red"
size="sm"
onClick={(e) => {
e.stopPropagation()
onDeleteStep(step.id!)
}}
>
<IconTrash size={14} />
<Tooltip label="Сдвинуть вправо">
<ActionIcon variant="subtle" color="gray" size="sm" disabled={index === group.steps.length - 1} onClick={() => onSwapSteps(step, group.steps[index + 1])}>
<IconArrowRight size={14} />
</ActionIcon>
</Tooltip>
</Group>

View File

@ -0,0 +1,285 @@
import { useEffect } from 'react'
import { Drawer, Stack, Select, NumberInput, Group, Button, Text, Badge, Paper, Alert, Radio, Box } from '@mantine/core'
import { useForm } from '@mantine/form'
import { IconInfoCircle, IconAlertCircle, IconCopy } from '@tabler/icons-react'
import { notifications } from '@mantine/notifications'
import { useCreateHierarchy, useUpdateHierarchy } from '@/features/hierarchies/hooks/useHierarchies'
import { useUsers } from '@/features/users/hooks/useUsers'
import { useDepartments } from '@/features/departments/hooks/useDepartments'
import { useCategories } from '@/features/categories/hooks/useCategories'
import { useTopics } from '@/features/topics/hooks/useTopics'
import { useAllSystemOptions } from '@/features/hierarchies/hooks/useSystemOptions'
import type { UserHierarchy } from '@/types/api'
import type { ChainGroup } from '@/features/hierarchies/utils'
import classes from '@/components/UserDrawer.module.css'
interface Props {
hierarchy: UserHierarchy | null
presetGroup?: ChainGroup | null
opened: boolean
onClose: () => void
}
type ScopeType = 'global' | 'category' | 'topic'
export default function HierarchyEditDrawer({ hierarchy, presetGroup, opened, onClose }: Props) {
const createHierarchy = useCreateHierarchy()
const updateHierarchy = useUpdateHierarchy()
const { data: users } = useUsers({ limit: 1000 })
const { data: departments } = useDepartments()
const { data: categories } = useCategories({ limit: 1000 })
const { options: systemOptions } = useAllSystemOptions()
const isEditMode = hierarchy !== null
const form = useForm({
initialValues: {
subordinate_id: null as number | null,
approver_id: null as number | null,
department_id: null as number | null,
scope_type: 'global' as ScopeType,
topic_category_id: null as number | null,
topic_id: null as number | null,
priority: 0,
target_system: null as string | null
},
validate: {
subordinate_id: (v) => (v === null ? 'Выберите подчинённого' : null),
approver_id: (v) => (v === null ? 'Выберите согласующего' : null),
department_id: (v) => (!isEditMode && v === null ? 'Выберите отдел' : null),
topic_category_id: (v, values) => {
if (isEditMode) return null
if ((values.scope_type === 'category' || values.scope_type === 'topic') && v === null) return 'Выберите категорию'
return null
},
topic_id: (v, values) => {
if (isEditMode) return null
if (values.scope_type === 'topic' && v === null) return 'Выберите тему'
return null
},
},
})
const { data: categoryTopics } = useTopics({
limit: 1000,
...(form.values.topic_category_id && { category_id: form.values.topic_category_id }),
})
const { data: allTopics } = useTopics({ limit: 1000 })
useEffect(() => {
if (!opened) return
if (hierarchy) {
let scopeType: ScopeType = 'global'
if (hierarchy.topic_id) scopeType = 'topic'
else if (hierarchy.topic_category_id) scopeType = 'category'
let resolvedCategoryId = hierarchy.topic_category_id || null
if (scopeType === 'topic' && !resolvedCategoryId && allTopics?.data) {
const matchedTopic = allTopics.data.find((t) => t.id === hierarchy.topic_id)
resolvedCategoryId = matchedTopic?.category_id || null
}
form.setValues({
subordinate_id: hierarchy.subordinate_id || null,
approver_id: hierarchy.approver_id || null,
department_id: hierarchy.department_id || null,
scope_type: scopeType,
topic_category_id: resolvedCategoryId,
topic_id: hierarchy.topic_id || null,
target_system: hierarchy.target_system || null,
priority: hierarchy.priority ?? 0,
})
} else if (presetGroup) {
let resolvedCategoryId: number | null = null
if (presetGroup.scopeType === 'category') resolvedCategoryId = presetGroup.scopeObjectId
else if (presetGroup.scopeType === 'topic') {
const matchedTopic = allTopics?.data?.find((t) => t.id === presetGroup.scopeObjectId)
resolvedCategoryId = matchedTopic?.category_id || null
}
form.setValues({
subordinate_id: presetGroup.subordinateId,
department_id: presetGroup.departmentId,
scope_type: presetGroup.scopeType,
topic_category_id: resolvedCategoryId,
topic_id: presetGroup.scopeType === 'topic' ? presetGroup.scopeObjectId : null,
priority: presetGroup.steps.length,
approver_id: null,
})
} else {
form.reset()
}
}, [hierarchy, presetGroup, opened, allTopics])
const handleScopeTypeChange = (value: ScopeType) => {
form.setFieldValue('scope_type', value)
if (value === 'global') {
form.setFieldValue('topic_category_id', null)
form.setFieldValue('topic_id', null)
} else if (value === 'category') {
form.setFieldValue('topic_id', null)
}
}
const userOptions = users?.data?.map((u) => ({ value: String(u.id), label: u.full_name || `ID ${u.id}` })) || []
const departmentOptions = departments?.data?.map((d) => ({ value: String(d.id), label: d.name || '' })) || []
const categoryOptions = categories?.data?.map((c) => ({ value: String(c.id), label: c.name || '' })) || []
const topicOptions = categoryTopics?.data?.map((t) => ({ value: String(t.id), label: t.name || '' })) || []
const buildPayload = (values: typeof form.values) => ({
subordinate_id: values.subordinate_id!,
approver_id: values.approver_id!,
department_id: values.department_id!,
priority: values.priority,
target_system: values.target_system || null,
topic_category_id: values.scope_type === 'global' ? null : values.scope_type === 'category' ? values.topic_category_id : null,
topic_id: values.scope_type === 'topic' ? values.topic_id : null,
})
const handleSubmit = async (values: typeof form.values) => {
const payload = buildPayload(values)
if (isEditMode && hierarchy?.id) await updateHierarchy.mutateAsync({ id: hierarchy.id, ...payload })
else await createHierarchy.mutateAsync(payload)
onClose()
}
const handleDuplicate = async () => {
if (!isEditMode) return
try {
await createHierarchy.mutateAsync(buildPayload(form.values))
notifications.show({ title: 'Успешно', message: 'Связь продублирована', color: 'green' })
onClose()
} catch {
notifications.show({ title: 'Ошибка', message: 'Не удалось продублировать связь', color: 'red' })
}
}
const isSubmitting = createHierarchy.isPending || updateHierarchy.isPending
const hasErrors = Object.keys(form.errors).length > 0
return (
<Drawer.Root opened={opened} onClose={onClose} position="right" size="min(480px, 100vw)">
<Drawer.Overlay backgroundOpacity={0.25} />
<Drawer.Content>
<Drawer.Header>
<Box style={{ minWidth: 0 }}>
<Group gap="sm" wrap="nowrap">
<Text fw={600}>{isEditMode ? 'Редактирование связи' : 'Добавление связи'}</Text>
{hierarchy && <Badge variant="light">ID: {hierarchy.id}</Badge>}
</Group>
</Box>
<Drawer.CloseButton />
</Drawer.Header>
<Drawer.Body className={classes.body}>
<form style={{ display: 'contents' }} onSubmit={form.onSubmit(handleSubmit)}>
<Stack gap="lg" className={classes.section}>
{hasErrors && (
<Alert icon={<IconAlertCircle size={16} />} color="red" variant="light">
<Text size="sm">Проверьте поля, отмеченные красным.</Text>
</Alert>
)}
<Select
label="Инициатор"
placeholder="Выберите пользователя"
data={userOptions}
value={form.values.subordinate_id ? String(form.values.subordinate_id) : null}
onChange={(v) => form.setFieldValue('subordinate_id', v ? Number(v) : null)}
searchable required disabled={!!presetGroup}
error={form.errors.subordinate_id}
/>
<Select
label="Отдел"
placeholder="Выберите отдел"
data={departmentOptions}
value={form.values.department_id ? String(form.values.department_id) : null}
onChange={(v) => form.setFieldValue('department_id', v ? Number(v) : null)}
searchable required={!isEditMode} disabled={isEditMode || !!presetGroup}
error={form.errors.department_id}
/>
<Select
label="Согласующий"
placeholder="Выберите пользователя"
data={userOptions}
value={form.values.approver_id ? String(form.values.approver_id) : null}
onChange={(v) => form.setFieldValue('approver_id', v ? Number(v) : null)}
searchable required
error={form.errors.approver_id}
/>
<Paper withBorder p="md">
<Text size="sm" fw={500} mb="sm">Область действия</Text>
<Radio.Group value={form.values.scope_type} onChange={(v) => handleScopeTypeChange(v as ScopeType)}>
<Stack gap="xs">
<Radio value="global" label="Глобальное правило" disabled={isEditMode} />
<Radio value="category" label="Для категории тем" disabled={isEditMode} />
<Radio value="topic" label="Для конкретной темы" disabled={isEditMode} />
</Stack>
</Radio.Group>
</Paper>
{(form.values.scope_type === 'category' || form.values.scope_type === 'topic') && (
<Select
label="Категория"
placeholder="Выберите категорию"
data={categoryOptions}
value={form.values.topic_category_id ? String(form.values.topic_category_id) : null}
onChange={(v) => {
form.setFieldValue('topic_category_id', v ? Number(v) : null)
form.setFieldValue('topic_id', null)
}}
searchable required={!isEditMode} disabled={isEditMode || !!presetGroup}
error={form.errors.topic_category_id}
/>
)}
{form.values.scope_type === 'topic' && (
<Select
label="Тема"
placeholder="Выберите тему"
data={topicOptions}
value={form.values.topic_id ? String(form.values.topic_id) : null}
onChange={(v) => form.setFieldValue('topic_id', v ? Number(v) : null)}
searchable required={!isEditMode} disabled={!form.values.topic_category_id || isEditMode || !!presetGroup}
error={form.errors.topic_id}
/>
)}
<Select
label="Целевая система шага"
placeholder="Все системы"
data={[{ value: 'all', label: 'Все системы' }, ...systemOptions.map((s) => ({ value: s.value, label: s.label }))]}
value={form.values.target_system || 'all'}
onChange={(v) => form.setFieldValue('target_system', (v === 'all' || !v) ? "" : v)}
/>
<NumberInput
label="Порядок шага (priority)"
value={form.values.priority}
onChange={(v) => form.setFieldValue('priority', Number(v) || 0)}
min={0} required
/>
</Stack>
<Group className={classes.footer} justify="space-between" wrap="nowrap">
{isEditMode ? (
<Button variant="light" color="teal" leftSection={<IconCopy size={16} />} onClick={handleDuplicate} disabled={isSubmitting}>
Дублировать
</Button>
) : <div />}
<Group gap="xs">
<Button variant="default" onClick={onClose} disabled={isSubmitting}>Отмена</Button>
<Button type="submit" loading={isSubmitting}>{isEditMode ? 'Сохранить' : 'Создать'}</Button>
</Group>
</Group>
</form>
</Drawer.Body>
</Drawer.Content>
</Drawer.Root>
)
}

View File

@ -1,421 +0,0 @@
import { useEffect } from 'react'
import {
Modal,
Stack,
Select,
NumberInput,
Group,
Button,
Text,
Badge,
Paper,
Alert,
Radio,
} from '@mantine/core'
import { useForm } from '@mantine/form'
import { IconInfoCircle, IconAlertCircle, IconCopy } from '@tabler/icons-react'
import { notifications } from '@mantine/notifications'
import {
useCreateHierarchy,
useUpdateHierarchy
} from '@/features/hierarchies/hooks/useHierarchies'
import { useUsers } from '@/features/users/hooks/useUsers'
import { useDepartments } from '@/features/departments/hooks/useDepartments'
import { useCategories } from '@/features/categories/hooks/useCategories'
import { useTopics } from '@/features/topics/hooks/useTopics'
import type { UserHierarchy } from '@/types/api'
import type { ChainGroup } from '@/features/hierarchies/utils'
import { useAllSystemOptions } from '@/features/hierarchies/hooks/useSystemOptions'
interface HierarchyEditModalProps {
hierarchy: UserHierarchy | null
presetGroup?: ChainGroup | null // Для добавления шага в существующую группу
opened: boolean
onClose: () => void
}
type ScopeType = 'global' | 'category' | 'topic'
export default function HierarchyEditModal({
hierarchy,
presetGroup,
opened,
onClose
}: HierarchyEditModalProps) {
const createHierarchy = useCreateHierarchy()
const updateHierarchy = useUpdateHierarchy()
const { data: users } = useUsers({ limit: 1000 })
const { data: departments } = useDepartments()
const { data: categories } = useCategories({ limit: 1000 })
const { options: systemOptions } = useAllSystemOptions()
const isEditMode = hierarchy !== null
const form = useForm({
initialValues: {
subordinate_id: null as number | null,
approver_id: null as number | null,
department_id: null as number | null,
scope_type: 'global' as ScopeType,
topic_category_id: null as number | null,
topic_id: null as number | null,
priority: 0,
target_system: null as string | null
},
validate: {
subordinate_id: (v) => (v === null ? 'Выберите подчинённого' : null),
approver_id: (v) => (v === null ? 'Выберите согласующего' : null),
// department_id/topic_category_id/topic_id заблокированы в режиме
// редактирования (см. disabled ниже) — если их всё же валидировать
// как обязательные, а на самой записи значение почему-то пустое,
// форма зависает намертво: поле нельзя ни заполнить (заблокировано),
// ни пропустить (обязательное).
department_id: (v) => (!isEditMode && v === null ? 'Выберите отдел' : null),
topic_category_id: (v, values) => {
if (isEditMode) return null
if ((values.scope_type === 'category' || values.scope_type === 'topic') && v === null) {
return 'Выберите категорию'
}
return null
},
topic_id: (v, values) => {
if (isEditMode) return null
if (values.scope_type === 'topic' && v === null) {
return 'Выберите тему'
}
return null
},
},
})
// Темы выбранной категории — для выпадающего списка "Тема" при создании.
const { data: categoryTopics } = useTopics({
limit: 1000,
...(form.values.topic_category_id && { category_id: form.values.topic_category_id }),
})
// Полный список тем без фильтра — нужен, чтобы восстановить
// topic_category_id по topic_id (см. useEffect ниже), когда сама
// категория не сохранена явно — и на записи из БД (режим редактирования),
// и в presetGroup (добавление шага в существующую цепочку с областью
// действия "тема" — это и был баг №5).
const { data: allTopics } = useTopics({ limit: 1000 })
// Заполняем форму данными
useEffect(() => {
if (hierarchy) {
let scopeType: ScopeType = 'global'
if (hierarchy.topic_id) scopeType = 'topic'
else if (hierarchy.topic_category_id) scopeType = 'category'
let resolvedCategoryId = hierarchy.topic_category_id || null
if (scopeType === 'topic' && !resolvedCategoryId && allTopics?.data) {
const matchedTopic = allTopics.data.find((t) => t.id === hierarchy.topic_id)
resolvedCategoryId = matchedTopic?.category_id || null
}
form.setValues({
subordinate_id: hierarchy.subordinate_id || null,
approver_id: hierarchy.approver_id || null,
department_id: hierarchy.department_id || null,
scope_type: scopeType,
topic_category_id: resolvedCategoryId,
topic_id: hierarchy.topic_id || null,
target_system: hierarchy.target_system || null,
priority: hierarchy.priority ?? 0,
})
} else if (presetGroup) {
let resolvedCategoryId: number | null = null
if (presetGroup.scopeType === 'category') {
resolvedCategoryId = presetGroup.scopeObjectId
} else if (presetGroup.scopeType === 'topic') {
const matchedTopic = allTopics?.data?.find((t) => t.id === presetGroup.scopeObjectId)
resolvedCategoryId = matchedTopic?.category_id || null
}
form.setValues({
subordinate_id: presetGroup.subordinateId,
department_id: presetGroup.departmentId,
scope_type: presetGroup.scopeType,
topic_category_id: resolvedCategoryId,
topic_id: presetGroup.scopeType === 'topic' ? presetGroup.scopeObjectId : null,
priority: presetGroup.steps.length, // Следующий priority
approver_id: null,
})
} else {
form.reset()
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [hierarchy, presetGroup, opened, allTopics])
const handleScopeTypeChange = (value: ScopeType) => {
form.setFieldValue('scope_type', value)
if (value === 'global') {
form.setFieldValue('topic_category_id', null)
form.setFieldValue('topic_id', null)
} else if (value === 'category') {
form.setFieldValue('topic_id', null)
}
}
// Опции
const userOptions = users?.data?.map((u) => ({
value: String(u.id),
label: u.full_name || `Пользователь #${u.id}`,
})) || []
const departmentOptions = departments?.data?.map((d) => ({
value: String(d.id),
label: d.name || '',
})) || []
const categoryOptions = categories?.data?.map((c) => ({
value: String(c.id),
label: c.name || '',
})) || []
const topicOptions = categoryTopics?.data?.map((t) => ({
value: String(t.id),
label: t.name || '',
})) || []
const buildPayload = (values: typeof form.values) => ({
subordinate_id: values.subordinate_id!,
approver_id: values.approver_id!,
department_id: values.department_id!,
priority: values.priority,
target_system: values.target_system || null,
topic_category_id: values.scope_type === 'global' ? null :
values.scope_type === 'category' ? values.topic_category_id : null,
topic_id: values.scope_type === 'topic' ? values.topic_id : null,
})
const handleSubmit = async (values: typeof form.values) => {
const payload = buildPayload(values)
if (isEditMode && hierarchy?.id) {
await updateHierarchy.mutateAsync({
id: hierarchy.id,
...payload,
})
} else {
await createHierarchy.mutateAsync(payload)
}
onClose()
}
// НОВОЕ (пункт 3): дублирование прямо из окна редактирования — создаёт
// новую запись с теми же значениями, что сейчас на экране, не трогая
// ту, что редактируется. Доступно только в режиме редактирования —
// дублировать ещё не сохранённую форму нечего.
const handleDuplicate = async () => {
if (!isEditMode) return
try {
await createHierarchy.mutateAsync(buildPayload(form.values))
notifications.show({
title: 'Успешно',
message: 'Связь продублирована — можно найти копию в списке и отредактировать при необходимости',
color: 'green',
})
onClose()
} catch (error) {
notifications.show({
title: 'Ошибка',
message: 'Не удалось продублировать связь',
color: 'red',
})
}
}
const isSubmitting = createHierarchy.isPending || updateHierarchy.isPending
const hasErrors = Object.keys(form.errors).length > 0
return (
<Modal
opened={opened}
onClose={onClose}
title={
<Group>
<Text fw={700}>
{isEditMode ? 'Редактирование связи' : 'Добавление связи'}
</Text>
{hierarchy && <Badge variant="light">ID: {hierarchy.id}</Badge>}
</Group>
}
size="lg"
>
<form onSubmit={form.onSubmit(handleSubmit)}>
<Stack gap="md">
{hasErrors && (
<Alert icon={<IconAlertCircle size={16} />} color="red" variant="light">
<Text size="sm">Проверьте поля, отмеченные красным, ниже.</Text>
</Alert>
)}
<Select
label="Сотрудник (инициатор)"
placeholder="Выберите пользователя"
data={userOptions}
value={form.values.subordinate_id ? String(form.values.subordinate_id) : null}
onChange={(v) => form.setFieldValue('subordinate_id', v ? Number(v) : null)}
searchable
required
disabled={!!presetGroup}
description="Пользователь, для которого настраивается согласование"
error={form.errors.subordinate_id}
/>
{/* Отдел */}
<Select
label="Отдел"
placeholder="Выберите отдел"
data={departmentOptions}
value={form.values.department_id ? String(form.values.department_id) : null}
onChange={(v) => form.setFieldValue('department_id', v ? Number(v) : null)}
searchable
required={!isEditMode}
disabled={isEditMode || !!presetGroup}
error={form.errors.department_id}
/>
{/* Согласующий */}
<Select
label="Согласующий"
placeholder="Выберите пользователя"
data={userOptions}
value={form.values.approver_id ? String(form.values.approver_id) : null}
onChange={(v) => form.setFieldValue('approver_id', v ? Number(v) : null)}
searchable
required
description="Пользователь, который будет согласовывать заявки"
error={form.errors.approver_id}
/>
{/* Область действия */}
<Paper withBorder p="md">
<Text size="sm" fw={500} mb="sm">
Область действия
</Text>
<Radio.Group
value={form.values.scope_type}
onChange={(v) => handleScopeTypeChange(v as ScopeType)}
>
<Stack gap="xs">
<Radio
value="global"
label="Глобальное правило"
description="Для всех тем согласований"
disabled={isEditMode}
/>
<Radio
value="category"
label="Для категории тем"
description="Только для тем выбранной категории"
disabled={isEditMode}
/>
<Radio
value="topic"
label="Для конкретной темы"
description="Только для выбранной темы"
disabled={isEditMode}
/>
</Stack>
</Radio.Group>
</Paper>
{/* Категория */}
{(form.values.scope_type === 'category' || form.values.scope_type === 'topic') && (
<Select
label="Категория"
placeholder="Выберите категорию"
data={categoryOptions}
value={form.values.topic_category_id ? String(form.values.topic_category_id) : null}
onChange={(v) => {
form.setFieldValue('topic_category_id', v ? Number(v) : null)
form.setFieldValue('topic_id', null)
}}
searchable
required={!isEditMode}
disabled={isEditMode || !!presetGroup}
error={form.errors.topic_category_id}
/>
)}
{/* Тема */}
{form.values.scope_type === 'topic' && (
<Select
label="Тема"
placeholder="Выберите тему"
data={topicOptions}
value={form.values.topic_id ? String(form.values.topic_id) : null}
onChange={(v) => form.setFieldValue('topic_id', v ? Number(v) : null)}
searchable
required={!isEditMode}
disabled={!form.values.topic_category_id || isEditMode || !!presetGroup}
description={!form.values.topic_category_id && !isEditMode ? 'Сначала выберите категорию' : undefined}
error={form.errors.topic_id}
/>
)}
<Select
label="Целевая система шага"
placeholder="Все системы (по умолчанию)"
data={[
{ value: 'all', label: 'Все системы' },
...systemOptions.map((s) => ({ value: s.value, label: s.label })),
]}
value={form.values.target_system || 'all'}
onChange={(v) => form.setFieldValue('target_system', (v === 'all' || !v) ? "" : v)}
description="Укажите систему, если данный шаг согласующего применяется только к определенной системе"
/>
{/* Priority */}
<NumberInput
label="Порядок шага (priority)"
description="0 = первый шаг, 1 = второй и т.д."
value={form.values.priority}
onChange={(v) => form.setFieldValue('priority', Number(v) || 0)}
min={0}
required
/>
<Alert icon={<IconInfoCircle size={16} />} color="blue" variant="light">
<Text size="sm">
Шаги выполняются последовательно в порядке возрастания priority.
Заявка переходит к следующему согласующему только после одобрения предыдущим.
{isEditMode && ' Область действия и отдел при редактировании не меняются — чтобы поменять их, удалите связь и создайте новую.'}
</Text>
</Alert>
{/* Кнопки */}
<Group justify="space-between" mt="md">
{isEditMode ? (
<Button
variant="light"
color="teal"
leftSection={<IconCopy size={16} />}
onClick={handleDuplicate}
disabled={isSubmitting}
>
Дублировать
</Button>
) : (
<div />
)}
<Group>
<Button variant="default" onClick={onClose} disabled={isSubmitting}>
Отмена
</Button>
<Button type="submit" loading={isSubmitting}>
{isEditMode ? 'Сохранить' : 'Создать'}
</Button>
</Group>
</Group>
</Stack>
</form>
</Modal>
)
}

View File

@ -0,0 +1,197 @@
import { useState, useMemo, useEffect } from 'react'
import { Drawer, Stack, Select, Group, Button, Text, Paper, Alert, Badge, Loader, Center, Radio, Checkbox, Divider, Box } from '@mantine/core'
import { IconInfoCircle } from '@tabler/icons-react'
import { notifications } from '@mantine/notifications'
import { useQueryClient } from '@tanstack/react-query'
import { useHierarchies, HIERARCHIES_QUERY_KEY } from '@/features/hierarchies/hooks/useHierarchies'
import { useUsers } from '@/features/users/hooks/useUsers'
import { useCategories } from '@/features/categories/hooks/useCategories'
import { useTopics } from '@/features/topics/hooks/useTopics'
import { hierarchiesApi } from '@/api/hierarchies'
import type { UserHierarchy } from '@/types/api'
import classes from '@/components/UserDrawer.module.css'
interface Props {
opened: boolean
onClose: () => void
}
type DuplicateMode = 'replace' | 'append' | 'manual'
const NO_USER_SENTINEL = 0
export default function PersonDuplicateDrawer({ opened, onClose }: Props) {
const queryClient = useQueryClient()
const [sourceId, setSourceId] = useState<string | null>(null)
const [targetId, setTargetId] = useState<string | null>(null)
const [mode, setMode] = useState<DuplicateMode>('append')
const [selectedScopeKeys, setSelectedScopeKeys] = useState<string[]>([])
const [isDuplicating, setIsDuplicating] = useState(false)
const { data: users } = useUsers({ limit: 1000 })
const { data: categories } = useCategories({ limit: 1000 })
const { data: topics } = useTopics({ limit: 1000 })
const { data: sourceHierarchies, isLoading: sourceLoading } = useHierarchies({ subordinate_id: sourceId ? Number(sourceId) : NO_USER_SENTINEL, limit: 1000 })
const { data: targetHierarchies, isLoading: targetLoading } = useHierarchies({ subordinate_id: targetId ? Number(targetId) : NO_USER_SENTINEL, limit: 1000 })
const sourceRows = sourceId ? sourceHierarchies?.data || [] : []
const targetRows = targetId ? targetHierarchies?.data || [] : []
const userOptions = users?.data?.map((u) => ({ value: String(u.id), label: u.full_name || `ID ${u.id}` })) || []
const getCategoryKeyAndLabel = (h: UserHierarchy) => {
if (h.topic_category_id) {
const c = categories?.data?.find((cat) => cat.id === h.topic_category_id)
return { key: `cat_${h.topic_category_id}`, label: `Категория: ${c?.name || `#${h.topic_category_id}`}` }
}
if (h.topic_id) {
const t = topics?.data?.find((top) => top.id === h.topic_id)
if (t?.category_id) {
const c = categories?.data?.find((cat) => cat.id === t.category_id)
return { key: `cat_${t.category_id}`, label: `Категория: ${c?.name || `#${t.category_id}`} (с темами)` }
}
return { key: `topic_${h.topic_id}`, label: `Тема: ${t?.name || `#${h.topic_id}`}` }
}
return { key: 'global', label: 'Глобальные правила' }
}
const availableScopes = useMemo(() => {
const map = new Map<string, { key: string; label: string; rows: UserHierarchy[] }>()
for (const h of sourceRows) {
const { key, label } = getCategoryKeyAndLabel(h)
if (!map.has(key)) map.set(key, { key, label, rows: [] })
map.get(key)!.rows.push(h)
}
return Array.from(map.values())
}, [sourceRows, categories, topics])
useEffect(() => {
if (!opened) {
setSourceId(null)
setTargetId(null)
setMode('append')
setSelectedScopeKeys([])
}
}, [opened])
useEffect(() => {
setSelectedScopeKeys(availableScopes.map((s) => s.key))
}, [sourceId, availableScopes.length])
const rowsToCreate = useMemo(() => {
let baseRows = sourceRows
if (mode === 'manual') baseRows = sourceRows.filter((h) => selectedScopeKeys.includes(getCategoryKeyAndLabel(h).key))
if (mode === 'append' || mode === 'manual') {
return baseRows.filter((src) => !targetRows.some((trg) =>
trg.approver_id === src.approver_id && trg.department_id === src.department_id &&
(trg.topic_category_id ?? null) === (src.topic_category_id ?? null) &&
(trg.topic_id ?? null) === (src.topic_id ?? null) &&
(trg.target_system || null) === (src.target_system || null)
))
}
return baseRows
}, [sourceRows, targetRows, mode, selectedScopeKeys])
const handleDuplicate = async () => {
if (!sourceId || !targetId) return
if (mode === 'manual' && selectedScopeKeys.length === 0) return
setIsDuplicating(true)
try {
if (mode === 'replace' && targetRows.length > 0) {
for (const oldRow of targetRows) if (oldRow.id) await hierarchiesApi.delete(oldRow.id)
}
let created = 0
for (const h of rowsToCreate) {
if (!h.approver_id || !h.department_id) continue
await hierarchiesApi.create({
subordinate_id: Number(targetId), approver_id: h.approver_id, department_id: h.department_id,
priority: h.priority ?? 0, topic_category_id: h.topic_category_id ?? null,
topic_id: h.topic_id ?? null, target_system: h.target_system ?? null,
})
created++
}
await queryClient.invalidateQueries({ queryKey: [HIERARCHIES_QUERY_KEY] })
notifications.show({ title: 'Успешно', message: `Добавлено связей: ${created}`, color: 'green' })
onClose()
} catch {
notifications.show({ title: 'Ошибка', message: 'Ошибка при дублировании связей', color: 'red' })
} finally {
setIsDuplicating(false)
}
}
return (
<Drawer.Root opened={opened} onClose={onClose} position="right" size="min(480px, 100vw)">
<Drawer.Overlay backgroundOpacity={0.25} />
<Drawer.Content>
<Drawer.Header>
<Text fw={600}>Копирование связей</Text>
<Drawer.CloseButton />
</Drawer.Header>
<Drawer.Body className={classes.body}>
<Stack gap="lg" className={classes.section}>
<Alert icon={<IconInfoCircle size={16} />} color="blue" variant="light">
<Text size="sm">Замена или дополнение цепочек согласования для нового сотрудника по образцу.</Text>
</Alert>
<Select label="От кого копировать (образец)" data={userOptions.filter((o) => o.value !== targetId)} value={sourceId} onChange={setSourceId} searchable required />
<Select label="Кому назначить связи" data={userOptions.filter((o) => o.value !== sourceId)} value={targetId} onChange={setTargetId} searchable required disabled={!sourceId} />
{sourceId && targetId && (
<Paper withBorder p="md">
<Text size="sm" fw={600} mb="sm">Режим копирования</Text>
<Radio.Group value={mode} onChange={(val) => setMode(val as DuplicateMode)}>
<Stack gap="xs">
<Radio value="replace" label="Заменить текущие цепочки" description={`Удалит старые связи (${targetRows.length})`} />
<Radio value="append" label="Дополнить текущие" description="Только недостающие шаги" />
<Radio value="manual" label="Выбрать вручную" />
</Stack>
</Radio.Group>
{mode === 'manual' && availableScopes.length > 0 && (
<>
<Divider my="sm" />
<Stack gap="xs">
{availableScopes.map((scope) => (
<Checkbox
key={scope.key} checked={selectedScopeKeys.includes(scope.key)}
onChange={() => setSelectedScopeKeys(prev => prev.includes(scope.key) ? prev.filter(k => k !== scope.key) : [...prev, scope.key])}
label={<Group gap="xs"><Text size="sm">{scope.label}</Text><Badge size="xs" variant="light" color="blue">шагов: {scope.rows.length}</Badge></Group>}
/>
))}
</Stack>
</>
)}
</Paper>
)}
{sourceId && (
<Paper withBorder p="md" bg="gray.0">
<Text size="xs" fw={600} c="dimmed" mb="xs" tt="uppercase">Будет создано связей: {rowsToCreate.length}</Text>
{sourceLoading || targetLoading ? <Center p="md"><Loader size="sm" /></Center> : (
<Stack gap={6} style={{ maxHeight: 200, overflowY: 'auto' }}>
{rowsToCreate.map((h) => (
<Group key={h.id} justify="space-between" wrap="nowrap">
<Text size="sm">{h.approver?.full_name}</Text>
</Group>
))}
</Stack>
)}
</Paper>
)}
</Stack>
<Group className={classes.footer} justify="flex-end" gap="sm">
<Button variant="default" onClick={onClose} disabled={isDuplicating}>Отмена</Button>
<Button onClick={handleDuplicate} loading={isDuplicating} disabled={!sourceId || !targetId || (mode !== 'replace' && rowsToCreate.length === 0)}>
{mode === 'replace' ? `Заменить (${rowsToCreate.length})` : `Скопировать (${rowsToCreate.length})`}
</Button>
</Group>
</Drawer.Body>
</Drawer.Content>
</Drawer.Root>
)
}

View File

@ -1,401 +0,0 @@
import { useState, useMemo, useEffect } from 'react'
import {
Modal,
Stack,
Select,
Group,
Button,
Text,
Paper,
Alert,
Badge,
Loader,
Center,
Radio,
Checkbox,
Divider,
} from '@mantine/core'
import { IconInfoCircle, IconUsers } from '@tabler/icons-react'
import { notifications } from '@mantine/notifications'
import {
useHierarchies,
HIERARCHIES_QUERY_KEY,
} from '@/features/hierarchies/hooks/useHierarchies'
import { useUsers } from '@/features/users/hooks/useUsers'
import { useCategories } from '@/features/categories/hooks/useCategories'
import { useTopics } from '@/features/topics/hooks/useTopics'
import { hierarchiesApi } from '@/api/hierarchies'
import { useQueryClient } from '@tanstack/react-query'
import type { UserHierarchy } from '@/types/api'
interface PersonDuplicateModalProps {
opened: boolean
onClose: () => void
}
type DuplicateMode = 'replace' | 'append' | 'manual'
const NO_USER_SENTINEL = 0
export default function PersonDuplicateModal({ opened, onClose }: PersonDuplicateModalProps) {
const [sourceId, setSourceId] = useState<string | null>(null)
const [targetId, setTargetId] = useState<string | null>(null)
const [mode, setMode] = useState<DuplicateMode>('append')
const [selectedScopeKeys, setSelectedScopeKeys] = useState<string[]>([])
const [isDuplicating, setIsDuplicating] = useState(false)
const queryClient = useQueryClient()
const { data: users } = useUsers({ limit: 1000 })
const { data: categories } = useCategories({ limit: 1000 })
const { data: topics } = useTopics({ limit: 1000 })
// Связи исходного сотрудника
const { data: sourceHierarchies, isLoading: sourceLoading } = useHierarchies({
subordinate_id: sourceId ? Number(sourceId) : NO_USER_SENTINEL,
limit: 1000,
})
// Связи целевого сотрудника (нужны для удаления при 'replace' и проверки дублей при 'append')
const { data: targetHierarchies, isLoading: targetLoading } = useHierarchies({
subordinate_id: targetId ? Number(targetId) : NO_USER_SENTINEL,
limit: 1000,
})
const sourceRows = sourceId ? sourceHierarchies?.data || [] : []
const targetRows = targetId ? targetHierarchies?.data || [] : []
const userOptions =
users?.data?.map((u) => ({
value: String(u.id),
label: u.full_name || `Пользователь #${u.id}`,
})) || []
// Определяем ключ категории/области для группировки при ручном выборе
const getCategoryKeyAndLabel = (h: UserHierarchy) => {
if (h.topic_category_id) {
const c = categories?.data?.find((cat) => cat.id === h.topic_category_id)
return {
key: `cat_${h.topic_category_id}`,
label: `Категория: ${c?.name || `#${h.topic_category_id}`}`,
}
}
if (h.topic_id) {
const t = topics?.data?.find((top) => top.id === h.topic_id)
if (t?.category_id) {
const c = categories?.data?.find((cat) => cat.id === t.category_id)
return {
key: `cat_${t.category_id}`,
label: `Категория: ${c?.name || `#${t.category_id}`} (включая темы)`,
}
}
return {
key: `topic_${h.topic_id}`,
label: `Тема: ${t?.name || `#${h.topic_id}`}`,
}
}
return {
key: 'global',
label: 'Глобальные правила (Все темы)',
}
}
// Группируем связи исходного пользователя по категориям для режима "Выбрать вручную"
const availableScopes = useMemo(() => {
const map = new Map<string, { key: string; label: string; rows: UserHierarchy[] }>()
for (const h of sourceRows) {
const { key, label } = getCategoryKeyAndLabel(h)
if (!map.has(key)) {
map.set(key, { key, label, rows: [] })
}
map.get(key)!.rows.push(h)
}
return Array.from(map.values())
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [sourceRows, categories, topics])
// При смене исходного пользователя по умолчанию выделяем все доступные категории
useEffect(() => {
setSelectedScopeKeys(availableScopes.map((s) => s.key))
}, [sourceId, availableScopes.length])
const describeScope = (h: { topic_id?: number | null; topic_category_id?: number | null }) => {
if (h.topic_id) {
const t = topics?.data?.find((t) => t.id === h.topic_id)
return `Тема: ${t?.name || `#${h.topic_id}`}`
}
if (h.topic_category_id) {
const c = categories?.data?.find((c) => c.id === h.topic_category_id)
return `Категория: ${c?.name || `#${h.topic_category_id}`}`
}
return 'Глобально'
}
// Вычисляем итоговый список записей для создания
const rowsToCreate = useMemo(() => {
let baseRows = sourceRows
if (mode === 'manual') {
baseRows = sourceRows.filter((h) => {
const { key } = getCategoryKeyAndLabel(h)
return selectedScopeKeys.includes(key)
})
}
if (mode === 'append' || mode === 'manual') {
// Исключаем те шаги, которые уже точно существуют у целевого пользователя
return baseRows.filter(
(src) =>
!targetRows.some(
(trg) =>
trg.approver_id === src.approver_id &&
trg.department_id === src.department_id &&
(trg.topic_category_id ?? null) === (src.topic_category_id ?? null) &&
(trg.topic_id ?? null) === (src.topic_id ?? null) &&
(trg.target_system || null) === (src.target_system || null)
)
)
}
return baseRows
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [sourceRows, targetRows, mode, selectedScopeKeys, categories, topics])
const handleClose = () => {
setSourceId(null)
setTargetId(null)
setMode('append')
setSelectedScopeKeys([])
onClose()
}
const toggleScopeKey = (key: string) => {
setSelectedScopeKeys((prev) =>
prev.includes(key) ? prev.filter((k) => k !== key) : [...prev, key]
)
}
const handleDuplicate = async () => {
if (!sourceId || !targetId) return
if (mode === 'manual' && selectedScopeKeys.length === 0) return
setIsDuplicating(true)
try {
// 1. Если выбран режим "Заменить текущие", сначала удаляем все старые цепочки целевого пользователя
if (mode === 'replace' && targetRows.length > 0) {
for (const oldRow of targetRows) {
if (oldRow.id) {
await hierarchiesApi.delete(oldRow.id)
}
}
}
// 2. Создаём новые записи
let createdCount = 0
for (const h of rowsToCreate) {
if (!h.approver_id || !h.department_id) continue
await hierarchiesApi.create({
subordinate_id: Number(targetId),
approver_id: h.approver_id,
department_id: h.department_id,
priority: h.priority ?? 0,
topic_category_id: h.topic_category_id ?? null,
topic_id: h.topic_id ?? null,
target_system: h.target_system ?? null,
})
createdCount++
}
await queryClient.invalidateQueries({ queryKey: [HIERARCHIES_QUERY_KEY] })
notifications.show({
title: 'Успешно',
message:
mode === 'replace'
? `Старые связи удалены (${targetRows.length}), создано новых: ${createdCount}`
: `Добавлено новых связей: ${createdCount}`,
color: 'green',
})
handleClose()
} catch (error) {
notifications.show({
title: 'Ошибка',
message: 'Произошла ошибка при дублировании связей. Проверьте список.',
color: 'red',
})
} finally {
setIsDuplicating(false)
}
}
return (
<Modal
opened={opened}
onClose={handleClose}
title={
<Group gap="xs">
<IconUsers size={20} />
<Text fw={600}>Дублировать связи сотрудника</Text>
</Group>
}
size="lg"
centered
>
<Stack gap="md">
<Alert icon={<IconInfoCircle size={16} />} color="blue" variant="light">
<Text size="sm">
Скопирует цепочки согласования выбранного сотрудника для другого сотрудника.
Вы можете полностью заменить текущие цепочки, дополнить их недостающими или
выбрать нужные категории вручную.
</Text>
</Alert>
<Select
label="От кого копировать (образец)"
placeholder="Выберите сотрудника, чьи связи нужно скопировать"
data={userOptions.filter((o) => o.value !== targetId)}
value={sourceId}
onChange={setSourceId}
searchable
required
/>
<Select
label="Кому назначить связи"
placeholder="Выберите сотрудника"
data={userOptions.filter((o) => o.value !== sourceId)}
value={targetId}
onChange={setTargetId}
searchable
required
disabled={!sourceId}
/>
{sourceId && targetId && (
<Paper withBorder p="md">
<Text size="sm" fw={600} mb="sm">
Режим дублирования
</Text>
<Radio.Group
value={mode}
onChange={(val) => setMode(val as DuplicateMode)}
>
<Stack gap="xs">
<Radio
value="replace"
label="Заменить текущие цепочки"
description={`Полностью удалит старые связи сотрудника (${targetRows.length}) и заменит их связями образца`}
/>
<Radio
value="append"
label="Дополнить текущие"
description="К существующим цепочкам будут добавлены только недостающие шаги"
/>
<Radio
value="manual"
label="Выбрать вручную"
description="Выберите галочками категории образца, которые нужно продублировать"
/>
</Stack>
</Radio.Group>
{mode === 'manual' && availableScopes.length > 0 && (
<>
<Divider my="sm" />
<Group justify="space-between" mb="xs">
<Text size="xs" fw={600} c="dimmed" tt="uppercase">
Категории для копирования
</Text>
<Button
variant="subtle"
size="compact-xs"
onClick={() =>
setSelectedScopeKeys(
selectedScopeKeys.length === availableScopes.length
? []
: availableScopes.map((s) => s.key)
)
}
>
{selectedScopeKeys.length === availableScopes.length
? 'Снять все'
: 'Выбрать все'}
</Button>
</Group>
<Stack gap="xs">
{availableScopes.map((scope) => (
<Checkbox
key={scope.key}
checked={selectedScopeKeys.includes(scope.key)}
onChange={() => toggleScopeKey(scope.key)}
label={
<Group gap="xs">
<Text size="sm">{scope.label}</Text>
<Badge size="xs" variant="light" color="blue">
шагов: {scope.rows.length}
</Badge>
</Group>
}
/>
))}
</Stack>
</>
)}
</Paper>
)}
{sourceId && (
<Paper withBorder p="md" bg="gray.0">
<Text size="xs" fw={600} c="dimmed" mb="xs" tt="uppercase">
Будет создано связей ({rowsToCreate.length})
</Text>
{sourceLoading || targetLoading ? (
<Center p="md">
<Loader size="sm" />
</Center>
) : sourceRows.length === 0 ? (
<Text size="sm" c="dimmed">
У исходного сотрудника нет настроенных связей.
</Text>
) : rowsToCreate.length === 0 ? (
<Text size="sm" c="dimmed">
Нет новых связей для добавления (все выбранные связи уже существуют у сотрудника или не выбрана ни одна категория).
</Text>
) : (
<Stack gap={6} style={{ maxHeight: 220, overflowY: 'auto' }}>
{rowsToCreate.map((h) => (
<Group key={h.id} justify="space-between" wrap="nowrap">
<Text size="sm">
{h.approver?.full_name || `Согласующий #${h.approver_id}`}
</Text>
<Badge size="xs" variant="light" color="gray" tt="none">
{describeScope(h)}
</Badge>
</Group>
))}
</Stack>
)}
</Paper>
)}
<Group justify="flex-end" mt="md">
<Button variant="default" onClick={handleClose} disabled={isDuplicating}>
Отмена
</Button>
<Button
onClick={handleDuplicate}
loading={isDuplicating}
disabled={
!sourceId ||
!targetId ||
(mode !== 'replace' && rowsToCreate.length === 0) ||
(mode === 'replace' && sourceRows.length === 0)
}
>
{mode === 'replace'
? `Заменить (${rowsToCreate.length})`
: `Продублировать (${rowsToCreate.length})`}
</Button>
</Group>
</Stack>
</Modal>
)
}