fixes
This commit is contained in:
parent
40b0ef3ab2
commit
547f71f840
|
|
@ -31,9 +31,6 @@ const FilterLayout = ({
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const translateArray = translateOptions(search_array, t);
|
const translateArray = translateOptions(search_array, t);
|
||||||
const [isOpen, setIsOpen] = useState(false);
|
const [isOpen, setIsOpen] = useState(false);
|
||||||
// send this with api request
|
|
||||||
// type: type,
|
|
||||||
// page: currentPage,
|
|
||||||
|
|
||||||
const { FilterBody, FilterSubmit } = useFilter();
|
const { FilterBody, FilterSubmit } = useFilter();
|
||||||
return (
|
return (
|
||||||
|
|
@ -61,9 +58,7 @@ const FilterLayout = ({
|
||||||
</span>
|
</span>
|
||||||
<MdKeyboardArrowDown />
|
<MdKeyboardArrowDown />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<span>
|
<span>
|
||||||
|
|
|
||||||
|
|
@ -10,13 +10,13 @@ const App: React.FC = () => {
|
||||||
const { Filter } = useFilterStateState();
|
const { Filter } = useFilterStateState();
|
||||||
const name = Filter?.name ;
|
const name = Filter?.name ;
|
||||||
const sort_by = Filter?.sort_by ;
|
const sort_by = Filter?.sort_by ;
|
||||||
|
|
||||||
const response = useGetAllGrade({
|
const response = useGetAllGrade({
|
||||||
pagination: true,
|
pagination: true,
|
||||||
...filterState,
|
...filterState,
|
||||||
name,
|
name:filterState.name || name,
|
||||||
sort_by
|
sort_by
|
||||||
});
|
});
|
||||||
// console.log(response);
|
|
||||||
|
|
||||||
return <DataTable response={response} useColumns={useColumns} />;
|
return <DataTable response={response} useColumns={useColumns} />;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@ const TableHeader = () => {
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const deleteMutation = useDeleteTag();
|
const deleteMutation = useDeleteTag();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="TableWithHeader">
|
<div className="TableWithHeader">
|
||||||
<Suspense fallback={<Spin />}>
|
<Suspense fallback={<Spin />}>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user