Added useFilterQuery. Converted websites and reports pages.

src/components/hooks/useDataTable.js

@@ -1,13 +0,0 @@
-import { useState } from 'react';
-import { usePaging } from 'components/hooks/usePaging';
-
-export function useDataTable(config = {}) {
-  const { initialData, initialQuery, initialPageInfo } = config;
-  const [data, setData] = useState(initialData ?? null);
-  const [query, setQuery] = useState(initialQuery ?? '');
-  const { pageInfo, setPageInfo } = usePaging(initialPageInfo);
-
-  return { data, setData, query, setQuery, pageInfo, setPageInfo };
-}
-
-export default useDataTable;

src/components/hooks/useFilterQuery.js

@@ -0,0 +1,16 @@
+import { useState } from 'react';
+import { useApi } from 'components/hooks/useApi';
+
+export function useFilterQuery(key, fn, options) {
+  const [params, setParams] = useState({
+    query: '',
+    page: 1,
+  });
+  const { useQuery } = useApi();
+
+  const result = useQuery([...key, params], fn.bind(null, params), options);
+
+  return { ...result, params, setParams };
+}
+
+export default useFilterQuery;

src/components/hooks/usePaging.js

@@ -1,9 +0,0 @@
-import { useState } from 'react';
-
-const DEFAULT_PAGE_INFO = { page: 1, pageSize: 10, total: 0 };
-
-export function usePaging(initialPageInfo) {
-  const [pageInfo, setPageInfo] = useState(initialPageInfo ?? { ...DEFAULT_PAGE_INFO });
-
-  return { pageInfo, setPageInfo };
-}