From b35b4d27a6db6065fdbb37ffee9d5e7e37f02862 Mon Sep 17 00:00:00 2001 From: zkldi <20380519+zkldi@users.noreply.github.com> Date: Mon, 14 Aug 2023 14:10:54 +0100 Subject: [PATCH] feat: custom pagination on all tables --- .../tables/components/TachiTable.tsx | 36 +++++++++++++------ .../src/components/util/table/useZTable.tsx | 16 ++++++--- 2 files changed, 37 insertions(+), 15 deletions(-) diff --git a/client/src/components/tables/components/TachiTable.tsx b/client/src/components/tables/components/TachiTable.tsx index 2fbaa6724..ee20adf23 100644 --- a/client/src/components/tables/components/TachiTable.tsx +++ b/client/src/components/tables/components/TachiTable.tsx @@ -4,9 +4,10 @@ import Icon from "components/util/Icon"; import SmallText from "components/util/SmallText"; import { useZTable, ZTableSortFn } from "components/util/table/useZTable"; import { UserSettingsContext } from "context/UserSettingsContext"; -import React, { useContext, useState } from "react"; +import React, { useContext, useEffect, useState } from "react"; import { Button } from "react-bootstrap"; import { integer } from "tachi-common"; +import Select from "components/util/Select"; import FilterDirectivesIndicator from "./FilterDirectivesIndicator"; import NoDataWrapper from "./NoDataWrapper"; import PageSelector from "./PageSelector"; @@ -98,6 +99,16 @@ export default function TachiTable({ const sortFunctions = GetSortFunctions(headers); + const ztable = useZTable(dataset ?? [], { + search, + searchFunction, + sortFunctions, + entryName, + pageLen, + defaultSortMode, + defaultReverseSort, + }); + const { window, setPage, @@ -111,15 +122,7 @@ export default function TachiTable({ reverseSort, changeSort, filteredDataset, - } = useZTable(dataset ?? [], { - search, - searchFunction, - sortFunctions, - entryName, - pageLen, - defaultSortMode, - defaultReverseSort, - }); + } = ztable; const headersRow = ParseHeaders(headers, { changeSort, @@ -164,7 +167,18 @@ export default function TachiTable({
-
{displayStr}
+
+ +
{settings?.preferences.developerMode && (