From 93d7e43d4794679153efb2c326059d33562f42c3 Mon Sep 17 00:00:00 2001
From: Parkreiner <michaelsmith@coder.com>
Date: Tue, 7 Nov 2023 14:03:02 +0000
Subject: [PATCH 1/5] fix: update button disabling logic

---
 .../components/PaginationWidget/PaginationWidgetBase.tsx  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/site/src/components/PaginationWidget/PaginationWidgetBase.tsx b/site/src/components/PaginationWidget/PaginationWidgetBase.tsx
index f72e9632ffdca..ab2b51327c447 100644
--- a/site/src/components/PaginationWidget/PaginationWidgetBase.tsx
+++ b/site/src/components/PaginationWidget/PaginationWidgetBase.tsx
@@ -21,14 +21,15 @@ export const PaginationWidgetBase = ({
 }: PaginationWidgetBaseProps): JSX.Element | null => {
   const theme = useTheme();
   const isMobile = useMediaQuery(theme.breakpoints.down("md"));
-  const numPages = Math.ceil(count / limit);
-  const isFirstPage = page === 0;
-  const isLastPage = page === numPages - 1;
 
+  const numPages = Math.ceil(count / limit);
   if (numPages < 2) {
     return null;
   }
 
+  const isFirstPage = page <= 1;
+  const isLastPage = page >= numPages;
+
   return (
     <div
       css={{
@@ -79,6 +80,7 @@ export const PaginationWidgetBase = ({
           );
         })
       )}
+
       <Button
         aria-label="Next page"
         disabled={isLastPage}

From df60c4b9e88a3eaa5ca9ed36724caa9156011b51 Mon Sep 17 00:00:00 2001
From: Parkreiner <michaelsmith@coder.com>
Date: Tue, 7 Nov 2023 14:04:46 +0000
Subject: [PATCH 2/5] chore: reduce line diffs for hotfix

---
 site/src/components/PaginationWidget/PaginationWidgetBase.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/site/src/components/PaginationWidget/PaginationWidgetBase.tsx b/site/src/components/PaginationWidget/PaginationWidgetBase.tsx
index ab2b51327c447..56f3767859a78 100644
--- a/site/src/components/PaginationWidget/PaginationWidgetBase.tsx
+++ b/site/src/components/PaginationWidget/PaginationWidgetBase.tsx
@@ -80,7 +80,6 @@ export const PaginationWidgetBase = ({
           );
         })
       )}
-
       <Button
         aria-label="Next page"
         disabled={isLastPage}

From efd5cf1d81b9af8aa78750f7a454c9236f7ab383 Mon Sep 17 00:00:00 2001
From: Parkreiner <michaelsmith@coder.com>
Date: Tue, 7 Nov 2023 14:05:53 +0000
Subject: [PATCH 3/5] chore: rename prop for clarity

---
 .../PaginationWidget/PaginationWidgetBase.tsx | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/site/src/components/PaginationWidget/PaginationWidgetBase.tsx b/site/src/components/PaginationWidget/PaginationWidgetBase.tsx
index 56f3767859a78..5771730d33c8c 100644
--- a/site/src/components/PaginationWidget/PaginationWidgetBase.tsx
+++ b/site/src/components/PaginationWidget/PaginationWidgetBase.tsx
@@ -15,9 +15,9 @@ export type PaginationWidgetBaseProps = {
 
 export const PaginationWidgetBase = ({
   count,
-  page,
   limit,
   onChange,
+  page: currentPage,
 }: PaginationWidgetBaseProps): JSX.Element | null => {
   const theme = useTheme();
   const isMobile = useMediaQuery(theme.breakpoints.down("md"));
@@ -27,8 +27,8 @@ export const PaginationWidgetBase = ({
     return null;
   }
 
-  const isFirstPage = page <= 1;
-  const isLastPage = page >= numPages;
+  const isFirstPage = currentPage <= 1;
+  const isLastPage = currentPage >= numPages;
 
   return (
     <div
@@ -48,21 +48,25 @@ export const PaginationWidgetBase = ({
         disabled={isFirstPage}
         onClick={() => {
           if (!isFirstPage) {
-            onChange(page - 1);
+            onChange(currentPage - 1);
           }
         }}
       >
         <KeyboardArrowLeft />
       </Button>
       {isMobile ? (
-        <PageButton activePage={page} page={page} numPages={numPages} />
+        <PageButton
+          activePage={currentPage}
+          page={currentPage}
+          numPages={numPages}
+        />
       ) : (
-        buildPagedList(numPages, page).map((pageItem) => {
+        buildPagedList(numPages, currentPage).map((pageItem) => {
           if (pageItem === "left" || pageItem === "right") {
             return (
               <PageButton
                 key={pageItem}
-                activePage={page}
+                activePage={currentPage}
                 placeholder="..."
                 disabled
               />
@@ -73,7 +77,7 @@ export const PaginationWidgetBase = ({
             <PageButton
               key={pageItem}
               page={pageItem}
-              activePage={page}
+              activePage={currentPage}
               numPages={numPages}
               onPageClick={() => onChange(pageItem)}
             />
@@ -85,7 +89,7 @@ export const PaginationWidgetBase = ({
         disabled={isLastPage}
         onClick={() => {
           if (!isLastPage) {
-            onChange(page + 1);
+            onChange(currentPage + 1);
           }
         }}
       >

From 728de8545cca3316a282a86733f8b5b38e7437c0 Mon Sep 17 00:00:00 2001
From: Parkreiner <michaelsmith@coder.com>
Date: Tue, 7 Nov 2023 14:16:11 +0000
Subject: [PATCH 4/5] fix: undo prop rename

---
 .../PaginationWidget/PaginationWidgetBase.tsx | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/site/src/components/PaginationWidget/PaginationWidgetBase.tsx b/site/src/components/PaginationWidget/PaginationWidgetBase.tsx
index 5771730d33c8c..80d4b8f599824 100644
--- a/site/src/components/PaginationWidget/PaginationWidgetBase.tsx
+++ b/site/src/components/PaginationWidget/PaginationWidgetBase.tsx
@@ -14,10 +14,10 @@ export type PaginationWidgetBaseProps = {
 };
 
 export const PaginationWidgetBase = ({
+  page,
   count,
   limit,
   onChange,
-  page: currentPage,
 }: PaginationWidgetBaseProps): JSX.Element | null => {
   const theme = useTheme();
   const isMobile = useMediaQuery(theme.breakpoints.down("md"));
@@ -27,8 +27,8 @@ export const PaginationWidgetBase = ({
     return null;
   }
 
-  const isFirstPage = currentPage <= 1;
-  const isLastPage = currentPage >= numPages;
+  const isFirstPage = page <= 1;
+  const isLastPage = page >= numPages;
 
   return (
     <div
@@ -48,25 +48,21 @@ export const PaginationWidgetBase = ({
         disabled={isFirstPage}
         onClick={() => {
           if (!isFirstPage) {
-            onChange(currentPage - 1);
+            onChange(page - 1);
           }
         }}
       >
         <KeyboardArrowLeft />
       </Button>
       {isMobile ? (
-        <PageButton
-          activePage={currentPage}
-          page={currentPage}
-          numPages={numPages}
-        />
+        <PageButton activePage={page} page={page} numPages={numPages} />
       ) : (
-        buildPagedList(numPages, currentPage).map((pageItem) => {
+        buildPagedList(numPages, page).map((pageItem) => {
           if (pageItem === "left" || pageItem === "right") {
             return (
               <PageButton
                 key={pageItem}
-                activePage={currentPage}
+                activePage={page}
                 placeholder="..."
                 disabled
               />
@@ -77,7 +73,7 @@ export const PaginationWidgetBase = ({
             <PageButton
               key={pageItem}
               page={pageItem}
-              activePage={currentPage}
+              activePage={page}
               numPages={numPages}
               onPageClick={() => onChange(pageItem)}
             />
@@ -89,7 +85,7 @@ export const PaginationWidgetBase = ({
         disabled={isLastPage}
         onClick={() => {
           if (!isLastPage) {
-            onChange(currentPage + 1);
+            onChange(page + 1);
           }
         }}
       >

From 7de6866817b1f3ac2d3220844371de39da1b722a Mon Sep 17 00:00:00 2001
From: Parkreiner <michaelsmith@coder.com>
Date: Tue, 7 Nov 2023 14:17:30 +0000
Subject: [PATCH 5/5] chore: move prop again

---
 site/src/components/PaginationWidget/PaginationWidgetBase.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/src/components/PaginationWidget/PaginationWidgetBase.tsx b/site/src/components/PaginationWidget/PaginationWidgetBase.tsx
index 80d4b8f599824..56f3767859a78 100644
--- a/site/src/components/PaginationWidget/PaginationWidgetBase.tsx
+++ b/site/src/components/PaginationWidget/PaginationWidgetBase.tsx
@@ -14,8 +14,8 @@ export type PaginationWidgetBaseProps = {
 };
 
 export const PaginationWidgetBase = ({
-  page,
   count,
+  page,
   limit,
   onChange,
 }: PaginationWidgetBaseProps): JSX.Element | null => {