fixes for pagination logic

stacklok · Jan 17, 2025 · 3a1060d · 3a1060d
1 parent 415b4e9
commit 3a1060d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/src/components/__tests__/Dashboard.test.tsx b/src/components/__tests__/Dashboard.test.tsx
@@ -324,7 +324,7 @@ describe("Dashboard", () => {
     await waitFor(() => {
       expect(
         within(screen.getByTestId("alerts-table")).getAllByRole("row"),
-      ).toHaveLength(15);
+      ).toHaveLength(16);
     });
   });
 
@@ -333,13 +333,16 @@ describe("Dashboard", () => {
 
     render(<Dashboard />);
 
-    await waitFor(async () => {
-      await userEvent.click(screen.getByRole("button", { name: /next/i }));
+    await waitFor(
+      async () => {
+        await userEvent.click(screen.getByRole("button", { name: /next/i }));
 
-      expect(
-        within(screen.getByTestId("alerts-table")).getAllByRole("row").length,
-      ).toBeLessThan(15);
-    });
+        expect(
+          within(screen.getByTestId("alerts-table")).getAllByRole("row").length,
+        ).toBeLessThan(16);
+      },
+      { timeout: 5000 },
+    );
 
     // on the last page, we cannot go further
     expect(screen.getByRole("button", { name: /next/i })).toBeDisabled();
@@ -357,7 +360,7 @@ describe("Dashboard", () => {
 
       expect(
         within(screen.getByTestId("alerts-table")).getAllByRole("row").length,
-      ).toEqual(15);
+      ).toEqual(16);
     });
   });
 });
diff --git a/src/hooks/useClientSidePagination.ts b/src/hooks/useClientSidePagination.ts
@@ -4,12 +4,12 @@ export function useClientSidePagination<T>(
   pageSize: number,
 ) {
   const pageStart = page * pageSize;
-  const pageEnd = page * pageSize + pageSize - 1;
+  const pageEnd = page * pageSize + pageSize;
 
   const dataView = data.slice(pageStart, pageEnd);
 
   const hasPreviousPage = page > 0;
-  const hasNextPage = pageEnd + 1 < data.length;
+  const hasNextPage = pageEnd < data.length;
 
   return { pageStart, pageEnd, dataView, hasPreviousPage, hasNextPage };
 }