Client: Fixed up pagination, now also stored

client/src/pages/spools/list.tsx

@@ -42,28 +42,43 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
   const initialState = useInitialTableState("spoolList");
 
   // Fetch data from the API
-  const { tableProps, sorters, filters, setSorters, setFilters } =
-    useTable<ISpool>({
-      syncWithLocation: false,
-      pagination: {
-        mode: "off", // Perform pagination in antd's Table instead. Otherwise client-side sorting/filtering doesn't work.
-      },
-      sorters: {
-        mode: "off", // Disable server-side sorting
-        initial: initialState.sorters,
-      },
-      filters: {
-        mode: "off", // Disable server-side filtering
-        initial: initialState.filters,
-      },
-    });
+  const {
+    tableProps,
+    sorters,
+    setSorters,
+    filters,
+    setFilters,
+    current,
+    pageSize,
+    setCurrent,
+    setPageSize,
+  } = useTable<ISpool>({
+    syncWithLocation: false,
+    pagination: {
+      mode: "off", // Perform pagination in antd's Table instead. Otherwise client-side sorting/filtering doesn't work.
+      current: initialState.pagination.current,
+      pageSize: initialState.pagination.pageSize,
+    },
+    sorters: {
+      mode: "off", // Disable server-side sorting
+      initial: initialState.sorters,
+    },
+    filters: {
+      mode: "off", // Disable server-side filtering
+      initial: initialState.filters,
+    },
+  });
 
   // Type the sorters and filters
   const typedSorters = typeSorters<ISpoolCollapsed>(sorters);
   const typedFilters = typeFilters<ISpoolCollapsed>(filters);
 
   // Store state in local storage
-  useStoreInitialState("spoolList", { sorters, filters });
+  useStoreInitialState("spoolList", {
+    sorters,
+    filters,
+    pagination: { current, pageSize },
+  });
 
   // Collapse the dataSource to a mutable list and add a filament_name field
   const dataSource: ISpoolCollapsed[] = React.useMemo(
@@ -98,6 +113,7 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
             onClick={() => {
               setFilters([], "replace");
               setSorters([{ field: "id", order: "asc" }]);
+              setCurrent(1);
             }}
           >
             Clear Filters
@@ -109,7 +125,15 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
       <Table
         {...tableProps}
         dataSource={filteredDataSource}
-        pagination={{ showSizeChanger: true, pageSize: 20 }}
+        pagination={{
+          showSizeChanger: true,
+          current: current,
+          pageSize: pageSize,
+          onChange: (page, pageSize) => {
+            setCurrent(page);
+            setPageSize(pageSize);
+          },
+        }}
         rowKey="id"
       >
         <Table.Column