From 828cca9c194b07f337bf5bd2fdbfd26748638d2a Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Sun, 5 Mar 2023 19:31:28 -0800
Subject: [PATCH] Fix playlist pagination

---
 .../playlist-detail-song-list-header-filters.tsx         | 2 +-
 .../playlists/components/playlist-list-content.tsx       | 9 ++++++---
 .../components/playlist-list-header-filters.tsx          | 6 +++---
 src/renderer/store/playlist.store.ts                     | 6 +++---
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/renderer/features/playlists/components/playlist-detail-song-list-header-filters.tsx b/src/renderer/features/playlists/components/playlist-detail-song-list-header-filters.tsx
index dc2b34cf..7c559207 100644
--- a/src/renderer/features/playlists/components/playlist-detail-song-list-header-filters.tsx
+++ b/src/renderer/features/playlists/components/playlist-detail-song-list-header-filters.tsx
@@ -161,7 +161,7 @@ export const PlaylistDetailSongListHeaderFilters = ({
       tableRef.current?.api.ensureIndexVisible(0, 'top');
 
       if (page.display === ListDisplayType.TABLE_PAGINATED) {
-        setPagination({ currentPage: 0 });
+        setPagination({ data: { currentPage: 0 } });
       }
     },
     [tableRef, page.display, server, playlistId, queryClient, setPagination],
diff --git a/src/renderer/features/playlists/components/playlist-list-content.tsx b/src/renderer/features/playlists/components/playlist-list-content.tsx
index 197232f2..43ab2ba3 100644
--- a/src/renderer/features/playlists/components/playlist-list-content.tsx
+++ b/src/renderer/features/playlists/components/playlist-list-content.tsx
@@ -116,9 +116,11 @@ export const PlaylistListContent = ({ tableRef, itemCount }: PlaylistListContent
       }
 
       setPagination({
-        itemsPerPage: event.api.paginationGetPageSize(),
-        totalItems: event.api.paginationGetRowCount(),
-        totalPages: event.api.paginationGetTotalPages() + 1,
+        data: {
+          itemsPerPage: event.api.paginationGetPageSize(),
+          totalItems: event.api.paginationGetRowCount(),
+          totalPages: event.api.paginationGetTotalPages() + 1,
+        },
       });
     },
     [isPaginationEnabled, pagination.currentPage, pagination.itemsPerPage, setPagination],
@@ -217,6 +219,7 @@ export const PlaylistListContent = ({ tableRef, itemCount }: PlaylistListContent
       >
         {page.display === ListDisplayType.TABLE_PAGINATED && (
           <TablePagination
+            pageKey=""
             pagination={pagination}
             setPagination={setPagination}
             tableRef={tableRef}
diff --git a/src/renderer/features/playlists/components/playlist-list-header-filters.tsx b/src/renderer/features/playlists/components/playlist-list-header-filters.tsx
index 1838863b..c8c41917 100644
--- a/src/renderer/features/playlists/components/playlist-list-header-filters.tsx
+++ b/src/renderer/features/playlists/components/playlist-list-header-filters.tsx
@@ -110,7 +110,7 @@ export const PlaylistListHeaderFilters = ({ tableRef }: PlaylistListHeaderFilter
       tableRef.current?.api.setDatasource(dataSource);
       tableRef.current?.api.purgeInfiniteCache();
       tableRef.current?.api.ensureIndexVisible(0, 'top');
-      setPagination({ currentPage: 0 });
+      setPagination({ data: { currentPage: 0 } });
     },
     [page.filter, queryClient, server, setPagination, tableRef],
   );
@@ -147,9 +147,9 @@ export const PlaylistListHeaderFilters = ({ tableRef }: PlaylistListHeaderFilter
 
       if (display === ListDisplayType.TABLE) {
         tableRef.current?.api.paginationSetPageSize(tableRef.current.props.infiniteInitialRowCount);
-        setPagination({ currentPage: 0 });
+        setPagination({ data: { currentPage: 0 } });
       } else if (display === ListDisplayType.TABLE_PAGINATED) {
-        setPagination({ currentPage: 0 });
+        setPagination({ data: { currentPage: 0 } });
       }
     },
     [page, setPage, setPagination, tableRef],
diff --git a/src/renderer/store/playlist.store.ts b/src/renderer/store/playlist.store.ts
index 00dbf9fb..6e06b62f 100644
--- a/src/renderer/store/playlist.store.ts
+++ b/src/renderer/store/playlist.store.ts
@@ -48,7 +48,7 @@ export interface PlaylistSlice extends PlaylistState {
     setFilters: (data: Partial<PlaylistListFilter>) => PlaylistListFilter;
     setStore: (data: Partial<PlaylistSlice>) => void;
     setTable: (data: Partial<TableProps>) => void;
-    setTablePagination: (data: Partial<TableProps['pagination']>) => void;
+    setTablePagination: (args: { data: Partial<TablePagination> }) => void;
   };
 }
 
@@ -98,9 +98,9 @@ export const usePlaylistStore = create<PlaylistSlice>()(
               state.list.table = { ...state.list.table, ...data };
             });
           },
-          setTablePagination: (data) => {
+          setTablePagination: (args) => {
             set((state) => {
-              state.list.table.pagination = { ...state.list.table.pagination, ...data };
+              state.list.table.pagination = { ...state.list.table.pagination, ...args.data };
             });
           },
         },