From c3290d7c1df365edb68a2994cd72585be88a14ac Mon Sep 17 00:00:00 2001 From: romanskijdev Date: Wed, 18 Nov 2026 15:24:26 +0300 Subject: [PATCH] Updated categories page --- result.txt | 2 +- src/pages/categories/CategoriesPage.tsx | 392 ++++++++---------- .../categories/components/CategoryDrawer.tsx | 145 +++++++ .../components/CategoryEditModal.tsx | 152 ------- 4 files changed, 329 insertions(+), 362 deletions(-) create mode 100644 src/pages/categories/components/CategoryDrawer.tsx delete mode 100644 src/pages/categories/components/CategoryEditModal.tsx diff --git a/result.txt b/result.txt index ad67e63..32ce226 100644 --- a/result.txt +++ b/result.txt @@ -148,7 +148,7 @@ │ │ ├── categories │ │ │ ├── CategoriesPage.tsx │ │ │ ├── components -│ │ │ │ ├── CategoryEditModal.tsx +│ │ │ │ ├── CategoryDrawer.tsx │ │ ├── flowNodes │ │ │ ├── FlowTreeGuidePage.tsx │ │ │ ├── FlowTreePage.tsx diff --git a/src/pages/categories/CategoriesPage.tsx b/src/pages/categories/CategoriesPage.tsx index 41af889..12ecb08 100644 --- a/src/pages/categories/CategoriesPage.tsx +++ b/src/pages/categories/CategoriesPage.tsx @@ -1,230 +1,204 @@ -import { useState } from 'react' -import { - Paper, - Table, - Badge, - Group, - ActionIcon, - Button, - Text, - TextInput, - Pagination, - Loader, - Center, - Tooltip, - Box, - Stack, - Switch, -} from '@mantine/core' -import { IconPencil, IconTrash, IconPlus, IconSearch } from '@tabler/icons-react' -import { modals } from '@mantine/modals' +import { useEffect, useMemo, useState } from 'react' +import { ActionIcon, Badge, Button, 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 CategoryEditModal from './components/CategoryEditModal' +import type { Category } from '@/features/categories/types' + +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 CategoryDrawer from './components/CategoryDrawer' const LIMIT = 20 +interface Filters { + search: string + isActive: string | null +} + +const EMPTY_FILTERS: Filters = { + search: '', + isActive: null, +} + export default function CategoriesPage() { const [page, setPage] = useState(1) - const [search, setSearch] = useState('') - const [activeFilter, setActiveFilter] = useState(null) - const [editCategoryId, setEditCategoryId] = useState(null) - const [createModalOpened, setCreateModalOpened] = useState(false) + const [filters, setFilters] = useState(EMPTY_FILTERS) + const [searchInput, setSearchInput] = useState('') + const [debouncedSearch] = useDebouncedValue(searchInput.trim(), 400) - const { data, isLoading, isFetching } = useCategories({ - offset: (page - 1) * LIMIT, - limit: LIMIT, - ...(search && { name: search }), - ...(activeFilter !== null && { is_active: activeFilter }), - }) + const [drawerId, setDrawerId] = useState(null) + const [deleteTarget, setDeleteTarget] = useState(null) const deleteCategory = useDeleteCategory() - const totalPages = data?.total_count ? Math.ceil(data.total_count / LIMIT) : 1 + // Сброс страницы при поиске + useEffect(() => setPage(1), [debouncedSearch]) - const handleDelete = (id: number) => { - modals.openConfirmModal({ - title: 'Подтвердите удаление', - children: ( - - Вы уверены, что хотите удалить эту категорию? Все темы этой категории останутся без категории. - - ), - labels: { confirm: 'Удалить', cancel: 'Отмена' }, - confirmProps: { color: 'red' }, - onConfirm: () => deleteCategory.mutate(id), - }) + const updateFilter = (patch: Partial) => { + setFilters((prev) => ({ ...prev, ...patch })) + setPage(1) } + const requestParams = useMemo(() => { + const params: Record = { offset: (page - 1) * LIMIT, limit: LIMIT } + if (debouncedSearch.length >= 2) params.name = debouncedSearch + if (filters.isActive !== null) params.is_active = filters.isActive === 'true' + return params + }, [page, filters, debouncedSearch]) + + const { data, isLoading, isFetching } = useCategories(requestParams) + const total = data?.total_count ?? 0 + + const activeCount = [ + debouncedSearch.length >= 2, + filters.isActive !== null, + ].filter(Boolean).length + + const handleReset = () => { + setSearchInput('') + setFilters(EMPTY_FILTERS) + setPage(1) + } + + const handleDelete = async () => { + if (!deleteTarget?.id) return + await deleteCategory.mutateAsync(deleteTarget.id) + setDeleteTarget(null) + } + + const columns: Column[] = [ + { + key: 'id', + header: 'ID', + width: 80, + cell: (r) => #{r.id}, + }, + { + key: 'name', + header: 'Название', + cell: (r) => {r.name}, + }, + { + key: 'code', + header: 'Код', + width: 200, + cell: (r) => {r.code}, + }, + { + key: 'description', + header: 'Описание', + cell: (r) => {r.description || '—'}, + }, + { + key: 'status', + header: 'Статус', + width: 120, + cell: (r) => ( + + {r.is_active ? 'Активна' : 'Неактивна'} + + ), + }, + { + key: 'actions', + header: '', + width: 100, + align: 'right', + cell: (r) => ( + + + { e.stopPropagation(); setDrawerId(r.id!); }} + > + + + + + { e.stopPropagation(); setDeleteTarget(r); }} + > + + + + + ), + }, + ] + return ( - - - Категории тем - - - Всего: {data?.total_count || 0} - - - - - - {/* Фильтры */} - - - } - value={search} - onChange={(e) => { - setSearch(e.currentTarget.value) - setPage(1) - }} - style={{ flex: 1 }} - /> - - { - setActiveFilter(e.currentTarget.checked ? true : null) - setPage(1) - }} - /> - - - - {/* Таблица */} - - {isLoading ? ( -
- -
- ) : ( - <> - - - - ID - Название - Код - Описание - Статус - Действия - - - - {data?.data?.length === 0 ? ( - - -
- Категории не найдены -
-
-
- ) : ( - (data?.data || []).map((category) => ( - - {category.id} - - {category.name} - - - - {category.code} - - - - - {category.description || '—'} - - - - - {category.is_active ? 'Активна' : 'Неактивна'} - - - - - - setEditCategoryId(category.id!)} - > - - - - - handleDelete(category.id!)} - > - - - - - - - )) - )} -
-
- - {/* Пагинация */} - {totalPages > 1 && ( - - - - Страница {page} из {totalPages} - - - - - )} - - )} -
- - {/* Индикатор обновления */} - {isFetching && !isLoading && ( - - - - )} - - {/* Модальное окно редактирования */} - setEditCategoryId(null)} + } /> - {/* Модальное окно создания */} - setCreateModalOpened(false)} + + } + value={searchInput} + onChange={(e) => setSearchInput(e.currentTarget.value)} + w={280} + /> +