From 4c0de556724943f2f3cb55ed82b81eabc9c23351 Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Tue, 30 Jul 2024 16:47:13 -0700
Subject: [PATCH] Fixed: Setting page size in Queue, History and Blocklist

Closes #7035
---
 frontend/src/Activity/Blocklist/Blocklist.tsx | 3 +++
 frontend/src/Activity/History/History.tsx     | 3 +++
 frontend/src/Activity/Queue/Queue.tsx         | 4 ++++
 frontend/src/Activity/Queue/QueueOptions.tsx  | 6 +++++-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/frontend/src/Activity/Blocklist/Blocklist.tsx b/frontend/src/Activity/Blocklist/Blocklist.tsx
index 4205ae12e..4163bc9ca 100644
--- a/frontend/src/Activity/Blocklist/Blocklist.tsx
+++ b/frontend/src/Activity/Blocklist/Blocklist.tsx
@@ -59,6 +59,7 @@ function Blocklist() {
     sortKey,
     sortDirection,
     page,
+    pageSize,
     totalPages,
     totalRecords,
     isRemoving,
@@ -223,6 +224,7 @@ function Blocklist() {
           <PageToolbarSection alignContent={align.RIGHT}>
             <TableOptionsModalWrapper
               columns={columns}
+              pageSize={pageSize}
               onTableOptionChange={handleTableOptionChange}
             >
               <PageToolbarButton
@@ -264,6 +266,7 @@ function Blocklist() {
                 allSelected={allSelected}
                 allUnselected={allUnselected}
                 columns={columns}
+                pageSize={pageSize}
                 sortKey={sortKey}
                 sortDirection={sortDirection}
                 onTableOptionChange={handleTableOptionChange}
diff --git a/frontend/src/Activity/History/History.tsx b/frontend/src/Activity/History/History.tsx
index 1020d90ea..9f00a1ab3 100644
--- a/frontend/src/Activity/History/History.tsx
+++ b/frontend/src/Activity/History/History.tsx
@@ -53,6 +53,7 @@ function History() {
     sortKey,
     sortDirection,
     page,
+    pageSize,
     totalPages,
     totalRecords,
   } = useSelector((state: AppState) => state.history);
@@ -154,6 +155,7 @@ function History() {
         <PageToolbarSection alignContent={align.RIGHT}>
           <TableOptionsModalWrapper
             columns={columns}
+            pageSize={pageSize}
             onTableOptionChange={handleTableOptionChange}
           >
             <PageToolbarButton
@@ -193,6 +195,7 @@ function History() {
           <div>
             <Table
               columns={columns}
+              pageSize={pageSize}
               sortKey={sortKey}
               sortDirection={sortDirection}
               onTableOptionChange={handleTableOptionChange}
diff --git a/frontend/src/Activity/Queue/Queue.tsx b/frontend/src/Activity/Queue/Queue.tsx
index 6c5e0fb1b..bd063e69a 100644
--- a/frontend/src/Activity/Queue/Queue.tsx
+++ b/frontend/src/Activity/Queue/Queue.tsx
@@ -73,6 +73,7 @@ function Queue() {
     sortKey,
     sortDirection,
     page,
+    pageSize,
     totalPages,
     totalRecords,
     isGrabbing,
@@ -269,8 +270,10 @@ function Queue() {
               allSelected={allSelected}
               allUnselected={allUnselected}
               columns={columns}
+              pageSize={pageSize}
               sortKey={sortKey}
               sortDirection={sortDirection}
+              optionsComponent={QueueOptions}
               onTableOptionChange={handleTableOptionChange}
               onSelectAllChange={handleSelectAllChange}
               onSortPress={handleSortPress}
@@ -344,6 +347,7 @@ function Queue() {
         <PageToolbarSection alignContent={align.RIGHT}>
           <TableOptionsModalWrapper
             columns={columns}
+            pageSize={pageSize}
             maxPageSize={200}
             optionsComponent={QueueOptions}
             onTableOptionChange={handleTableOptionChange}
diff --git a/frontend/src/Activity/Queue/QueueOptions.tsx b/frontend/src/Activity/Queue/QueueOptions.tsx
index 70bb0fdcf..615f6922a 100644
--- a/frontend/src/Activity/Queue/QueueOptions.tsx
+++ b/frontend/src/Activity/Queue/QueueOptions.tsx
@@ -5,7 +5,7 @@ import FormGroup from 'Components/Form/FormGroup';
 import FormInputGroup from 'Components/Form/FormInputGroup';
 import FormLabel from 'Components/Form/FormLabel';
 import { inputTypes } from 'Helpers/Props';
-import { setQueueOption } from 'Store/Actions/queueActions';
+import { gotoQueuePage, setQueueOption } from 'Store/Actions/queueActions';
 import { CheckInputChanged } from 'typings/inputs';
 import translate from 'Utilities/String/translate';
 
@@ -22,6 +22,10 @@ function QueueOptions() {
           [name]: value,
         })
       );
+
+      if (name === 'includeUnknownSeriesItems') {
+        dispatch(gotoQueuePage({ page: 1 }));
+      }
     },
     [dispatch]
   );