diff --git a/src/modules/audit/audit.tsx b/src/modules/audit/audit.tsx index 994d5ed..8636838 100644 --- a/src/modules/audit/audit.tsx +++ b/src/modules/audit/audit.tsx @@ -8,12 +8,9 @@ import { useLocation, useParams } from "react-router-dom"; import { useTranslation } from "react-i18next"; import { Namespaces } from "../../i18n/i18n"; -const useQuery = () => new URLSearchParams(useLocation().search); - export default function Audit() { const location = useLocation(); const params = useParams(); - const query = useQuery(); const { t } = useTranslation(); const [loaded, setLoaded] = useState(false); @@ -34,17 +31,16 @@ export default function Audit() { const [filters, setFilters] = useState>(new Map()); const doSearch = useCallback(async () => { - const { page, pageSize } = pagedData; const auditId = params.auditId ?? ""; - const primaryOnly = query.get("primaryOnly"); + const primaryOnly = new URLSearchParams(location.search).get("primaryOnly"); const isPrimaryOnly = primaryOnly === null || primaryOnly.toLowerCase() === "true"; const result = await auditService.getLog( auditId, isPrimaryOnly, - page, - pageSize, + pagedData.page, + pagedData.pageSize, sortColumn.key, sortColumn.order === "asc", filters, @@ -56,7 +52,14 @@ export default function Audit() { } else { setLoaded(false); } - }, [pagedData, sortColumn, filters, params.auditId, query]); + }, [ + pagedData.page, + pagedData.pageSize, + sortColumn, + filters, + params.auditId, + location.search, + ]); const changePage = async (page: number, pageSize: number) => { setPagedData((prev) => ({