From 547f71f8408eb85c782d5046ab39497d8693b8d7 Mon Sep 17 00:00:00 2001 From: Moaz Dawalibi Date: Tue, 5 Nov 2024 14:15:40 +0300 Subject: [PATCH] fixes --- src/Layout/Dashboard/FilterLayout.tsx | 5 ----- src/Pages/Admin/Grade/Table.tsx | 4 ++-- src/Pages/Admin/Tags/Page.tsx | 1 + 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Layout/Dashboard/FilterLayout.tsx b/src/Layout/Dashboard/FilterLayout.tsx index 1ed1c08..2269a60 100644 --- a/src/Layout/Dashboard/FilterLayout.tsx +++ b/src/Layout/Dashboard/FilterLayout.tsx @@ -31,9 +31,6 @@ const FilterLayout = ({ const { t } = useTranslation(); const translateArray = translateOptions(search_array, t); const [isOpen, setIsOpen] = useState(false); - // send this with api request - // type: type, - // page: currentPage, const { FilterBody, FilterSubmit } = useFilter(); return ( @@ -61,9 +58,7 @@ const FilterLayout = ({ - } - diff --git a/src/Pages/Admin/Grade/Table.tsx b/src/Pages/Admin/Grade/Table.tsx index 107e721..c9400b4 100644 --- a/src/Pages/Admin/Grade/Table.tsx +++ b/src/Pages/Admin/Grade/Table.tsx @@ -10,13 +10,13 @@ const App: React.FC = () => { const { Filter } = useFilterStateState(); const name = Filter?.name ; const sort_by = Filter?.sort_by ; + const response = useGetAllGrade({ pagination: true, ...filterState, - name, + name:filterState.name || name, sort_by }); -// console.log(response); return ; }; diff --git a/src/Pages/Admin/Tags/Page.tsx b/src/Pages/Admin/Tags/Page.tsx index 382cdc7..210fcc2 100644 --- a/src/Pages/Admin/Tags/Page.tsx +++ b/src/Pages/Admin/Tags/Page.tsx @@ -26,6 +26,7 @@ const TableHeader = () => { ]); const deleteMutation = useDeleteTag(); + return (
}>