sts-sponsors team mailing list archive

[Jones Ogolo <mp+441313@xxxxxxxxxxxxxxxxxx>]

Jones Ogolo has proposed merging ~jonesogolo/maas-site-manager:fix-pagination-input-page into maas-site-manager:main.

Commit message:
Fix incorrect display of page number on pagination input

Requested reviews:
  MAAS Committers (maas-committers)

For more details, see:
https://code.launchpad.net/~jonesogolo/maas-site-manager/+git/maas-site-manager/+merge/441313

QA Steps:
- goto /requests
- set to display 50 items per page
- click the next button until you reach the last page
- set to display 20 items per page

Ensure page number returns to '1' on items per page change
-- 
Your team MAAS Committers is requested to review the proposed merge of ~jonesogolo/maas-site-manager:fix-pagination-input-page into maas-site-manager:main.

diff --git a/frontend/src/components/base/TablePagination/TablePagination.tsx b/frontend/src/components/base/TablePagination/TablePagination.tsx
index e9b4fbf..6d094b4 100644
--- a/frontend/src/components/base/TablePagination/TablePagination.tsx
+++ b/frontend/src/components/base/TablePagination/TablePagination.tsx
@@ -1,5 +1,9 @@
 import type { ChangeEvent } from "react";
+<<<<<<< frontend/src/components/base/TablePagination/TablePagination.tsx
 import { useMemo, useState } from "react";
+=======
+import { useMemo, useState, useEffect } from "react";
+>>>>>>> frontend/src/components/base/TablePagination/TablePagination.tsx
 
 import { Button, Icon, Input } from "@canonical/react-components";
 
@@ -42,6 +46,13 @@ const TablePagination = ({
     }
   };
 
+<<<<<<< frontend/src/components/base/TablePagination/TablePagination.tsx
+=======
+  useEffect(() => {
+    setPageNumber(currentPage);
+  }, [currentPage]);
+
+>>>>>>> frontend/src/components/base/TablePagination/TablePagination.tsx
   const handleInputBlur = () => {
     setPageNumber(currentPage);
     setError("");
@@ -49,12 +60,18 @@ const TablePagination = ({
 
   const handleNextClick = () => {
     onNextClick();
+<<<<<<< frontend/src/components/base/TablePagination/TablePagination.tsx
     setPageNumber((prev) => (prev ? prev + 1 : undefined));
+=======
+>>>>>>> frontend/src/components/base/TablePagination/TablePagination.tsx
   };
 
   const handlePreviousClick = () => {
     onPreviousClick();
+<<<<<<< frontend/src/components/base/TablePagination/TablePagination.tsx
     setPageNumber((prev) => (prev ? prev - 1 : undefined));
+=======
+>>>>>>> frontend/src/components/base/TablePagination/TablePagination.tsx
   };
 
   return (