updated exxecutors page
Deploy Frontend / build-and-deploy (push) Successful in 26s Details

This commit is contained in:
romanskijdev 2026-06-26 21:15:16 +03:00
parent 983b003abf
commit 13d7f4de67
1 changed files with 204 additions and 140 deletions

View File

@ -21,8 +21,6 @@ import {
IconPencil,
IconTrash,
IconPlus,
IconList,
IconUsers,
IconInfoCircle,
IconFile,
IconCheck,
@ -35,6 +33,7 @@ import {
} from '@/features/topicExecutors/hooks/useTopicExecutors'
import { useUsers } from '@/features/users/hooks/useUsers'
import { useTopics } from '@/features/topics/hooks/useTopics'
import { useCategories } from '@/features/categories/hooks/useCategories'
import {
groupExecutorsByTopic,
TARGET_SYSTEMS,
@ -50,14 +49,30 @@ type ViewMode = 'cards' | 'table'
export default function TopicExecutorsPage() {
const [viewMode, setViewMode] = useState<ViewMode>('cards')
// ✅ Фильтры - адаптированы под дизайн Hierarchies
const [topicFilter, setTopicFilter] = useState<string | null>(null)
const [categoryFilter, setCategoryFilter] = useState<string | null>(null)
const [userFilter, setUserFilter] = useState<string | null>(null)
const [targetSystemFilter, setTargetSystemFilter] = useState<string | null>(null)
const [editExecutor, setEditExecutor] = useState<ApprovalTopicExecutor | null>(null)
const [createModalOpened, setCreateModalOpened] = useState(false)
const [presetGroup, setPresetGroup] = useState<TopicExecutorsGroup | null>(null)
// ✅ Получаем категории
const { data: categories } = useCategories({ limit: 1000 })
// ✅ Получаем темы с учетом фильтра по категории
const { data: categoryTopics } = useTopics({
limit: 1000,
...(categoryFilter && { category_id: Number(categoryFilter) }),
})
const { data, isLoading, isFetching } = useTopicExecutors({
...(topicFilter && { topic_id: Number(topicFilter) }),
...(userFilter && { user_id: Number(userFilter) }),
...(categoryFilter && { category_id: Number(categoryFilter) }),
...(targetSystemFilter && { target_system: targetSystemFilter }),
})
@ -72,7 +87,18 @@ export default function TopicExecutorsPage() {
return groupExecutorsByTopic(data.data)
}, [data])
const topicOptions = topics?.data?.map((t) => ({
// ✅ Опции для фильтров
const userOptions = users?.data?.map((u) => ({
value: String(u.id),
label: u.full_name || `Пользователь #${u.id}`,
})) || []
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 || '',
})) || []
@ -82,6 +108,16 @@ export default function TopicExecutorsPage() {
label: s.label,
}))
// ✅ Обработчик изменения фильтров - сбрасывает страницу и выделение
const handleFilterChange =
(setter: (value: string | null) => void) => (value: string | null) => {
setter(value)
// Если меняется категория, сбрасываем тему
if (setter === setCategoryFilter) {
setTopicFilter(null)
}
}
const handleDelete = (id: number) => {
modals.openConfirmModal({
title: 'Подтвердите удаление',
@ -117,16 +153,19 @@ export default function TopicExecutorsPage() {
return (
<Stack gap="md">
{/* Заголовок */}
{/* Заголовок - адаптирован под дизайн Hierarchies */}
<Group justify="space-between">
<Text size="xl" fw={700}>Исполнители тем</Text>
<Group>
<Text c="dimmed" size="sm">
Всего: {data?.data?.length || 0}
</Text>
<SegmentedControl
value={viewMode}
onChange={(v) => setViewMode(v as ViewMode)}
data={[
{ value: 'cards', label: 'Карточки' },
{ value: 'table', label: 'Таблица'},
{ value: 'table', label: 'Таблица' },
]}
/>
<Button
@ -150,67 +189,82 @@ export default function TopicExecutorsPage() {
</Text>
</Alert>
{/* Фильтры */}
{/* ✅ Фильтры - адаптированы под дизайн Hierarchies */}
<Paper withBorder p="md">
<Group gap="md" align="flex-end">
<Select
label="Тема"
placeholder="Все темы"
data={topicOptions}
value={topicFilter}
onChange={setTopicFilter}
clearable
searchable
style={{ minWidth: 300 }}
/>
<Select
label="Целевая система"
placeholder="Все системы"
data={targetSystemOptions}
value={targetSystemFilter}
onChange={setTargetSystemFilter}
clearable
style={{ minWidth: 200 }}
/>
<Text c="dimmed" size="sm">
Всего исполнителей: {data?.data?.length || 0}
</Text>
</Group>
<Stack gap="md">
<Group gap="md" align="flex-end">
<Select
label="Категория"
placeholder="Все категории"
data={categoryOptions}
value={categoryFilter}
onChange={handleFilterChange(setCategoryFilter)}
clearable
searchable
style={{ flex: 1, minWidth: 250 }}
/>
<Select
label="Тема"
placeholder="Все темы"
data={topicOptions}
value={topicFilter}
onChange={handleFilterChange(setTopicFilter)}
clearable
searchable
style={{ flex: 1, minWidth: 250 }}
/>
</Group>
<Group gap="md" align="flex-end">
<Select
label="Исполнитель"
placeholder="Все исполнители"
data={userOptions}
value={userFilter}
onChange={handleFilterChange(setUserFilter)}
clearable
searchable
style={{ flex: 1, minWidth: 250 }}
/>
<Select
label="Целевая система"
placeholder="Все системы"
data={targetSystemOptions}
value={targetSystemFilter}
onChange={handleFilterChange(setTargetSystemFilter)}
clearable
style={{ flex: 1, minWidth: 200 }}
/>
</Group>
</Stack>
</Paper>
{/* Контент */}
{isLoading ? (
<Center p={60}>
<Loader />
</Center>
) : viewMode === 'cards' ? (
// Режим карточек
<ScrollArea>
<Stack gap="md">
{groups.length === 0 ? (
<Paper withBorder p={40}>
<Center>
<Paper withBorder>
{isLoading ? (
<Center p={60}>
<Loader />
</Center>
) : viewMode === 'cards' ? (
<ScrollArea p="md">
<Stack gap="md">
{groups.length === 0 ? (
<Center p={40}>
<Text c="dimmed">Исполнители не найдены</Text>
</Center>
</Paper>
) : (
groups.map((group) => (
<TopicExecutorsCard
key={group.topicId}
group={group}
onEditExecutor={handleEditExecutor}
onDeleteExecutor={handleDelete}
onAddExecutor={handleAddExecutor}
/>
))
)}
</Stack>
</ScrollArea>
) : (
// Режим таблицы
<Paper withBorder>
) : (
groups.map((group) => (
<TopicExecutorsCard
key={group.topicId}
group={group}
onEditExecutor={handleEditExecutor}
onDeleteExecutor={handleDelete}
onAddExecutor={handleAddExecutor}
/>
))
)}
</Stack>
</ScrollArea>
) : (
<Table striped highlightOnHover>
<Table.Thead>
<Table.Tr>
@ -221,94 +275,104 @@ export default function TopicExecutorsPage() {
<Table.Th>Задача</Table.Th>
<Table.Th style={{ width: 120 }}>Система</Table.Th>
<Table.Th style={{ width: 80 }}>Файл</Table.Th>
<Table.Th style={{ width: 100 }}>Статус</Table.Th>
<Table.Th style={{ width: 80 }}>Статус</Table.Th>
<Table.Th style={{ width: 100 }}>Действия</Table.Th>
</Table.Tr>
</Table.Thead>
<Table.Tbody>
{data?.data?.map((executor) => (
<Table.Tr key={executor.id}>
<Table.Td>{executor.id}</Table.Td>
<Table.Td>
<Text size="sm" fw={500}>
{executor.topic?.name || '—'}
</Text>
<Text size="xs" c="dimmed" ff="monospace">
{executor.topic?.code}
</Text>
</Table.Td>
<Table.Td>
<Text size="sm" fw={500}>
{executor.user?.full_name || '—'}
</Text>
<Text size="xs" c="dimmed">
{executor.user?.department?.name}
</Text>
</Table.Td>
<Table.Td>
<Badge variant="light" color="orange">
#{executor.step_order}
</Badge>
</Table.Td>
<Table.Td>
<Text size="xs" lineClamp={2}>
{executor.task_text || '—'}
</Text>
</Table.Td>
<Table.Td>
<Badge
size="xs"
variant="light"
color={TARGET_SYSTEM_COLORS[executor.target_system || ''] || 'gray'}
>
{TARGET_SYSTEM_LABELS[executor.target_system || ''] || executor.target_system}
</Badge>
</Table.Td>
<Table.Td>
{executor.require_file ? (
<IconFile size={16} color="var(--mantine-color-violet-6)" />
) : (
<Text size="xs" c="dimmed">—</Text>
)}
</Table.Td>
<Table.Td>
<Badge
size="xs"
variant="light"
color={executor.is_active ? 'green' : 'gray'}
leftSection={executor.is_active ? <IconCheck size={10} /> : <IconX size={10} />}
>
{executor.is_active ? 'Активен' : 'Неактивен'}
</Badge>
</Table.Td>
<Table.Td>
<Group gap="xs">
<Tooltip label="Редактировать">
<ActionIcon
variant="light"
color="blue"
onClick={() => setEditExecutor(executor)}
>
<IconPencil size={16} />
</ActionIcon>
</Tooltip>
<Tooltip label="Удалить">
<ActionIcon
variant="light"
color="red"
onClick={() => handleDelete(executor.id!)}
>
<IconTrash size={16} />
</ActionIcon>
</Tooltip>
</Group>
{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((executor) => (
<Table.Tr key={executor.id}>
<Table.Td>{executor.id}</Table.Td>
<Table.Td>
<Text size="sm" fw={500}>
{executor.topic?.name || '—'}
</Text>
<Text size="xs" c="dimmed" ff="monospace">
{executor.topic?.code}
</Text>
</Table.Td>
<Table.Td>
<Text size="sm" fw={500}>
{executor.user?.full_name || '—'}
</Text>
<Text size="xs" c="dimmed">
{executor.user?.department?.name}
</Text>
</Table.Td>
<Table.Td>
<Badge variant="light" color="orange">
#{executor.step_order}
</Badge>
</Table.Td>
<Table.Td>
<Text size="xs" lineClamp={2}>
{executor.task_text || '—'}
</Text>
</Table.Td>
<Table.Td>
<Badge
size="xs"
variant="light"
color={TARGET_SYSTEM_COLORS[executor.target_system || ''] || 'gray'}
>
{TARGET_SYSTEM_LABELS[executor.target_system || ''] || executor.target_system}
</Badge>
</Table.Td>
<Table.Td>
{executor.require_file ? (
<IconFile size={16} color="var(--mantine-color-violet-6)" />
) : (
<Text size="xs" c="dimmed">—</Text>
)}
</Table.Td>
<Table.Td>
<Badge
size="xs"
variant="light"
color={executor.is_active ? 'green' : 'gray'}
leftSection={executor.is_active ? <IconCheck size={10} /> : <IconX size={10} />}
>
{executor.is_active ? 'Активен' : 'Неактивен'}
</Badge>
</Table.Td>
<Table.Td>
<Group gap="xs">
<Tooltip label="Редактировать">
<ActionIcon
variant="light"
color="blue"
onClick={() => setEditExecutor(executor)}
>
<IconPencil size={16} />
</ActionIcon>
</Tooltip>
<Tooltip label="Удалить">
<ActionIcon
variant="light"
color="red"
onClick={() => handleDelete(executor.id!)}
>
<IconTrash size={16} />
</ActionIcon>
</Tooltip>
</Group>
</Table.Td>
</Table.Tr>
))
)}
</Table.Tbody>
</Table>
</Paper>
)}
)}
</Paper>
{isFetching && !isLoading && (
<Box style={{ position: 'fixed', top: 70, right: 20, zIndex: 1000 }}>