fix(pagination): correctly use 1-based pagination in createURL (#5798)

* WIP * tests
algolia · Aug 8, 2023 · 69ec7de · 69ec7de
1 parent 6f136ec
commit 69ec7de
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 35 deletions.
diff --git a/packages/instantsearch.js/src/connectors/pagination/connectPagination.ts b/packages/instantsearch.js/src/connectors/pagination/connectPagination.ts
@@ -171,7 +171,7 @@ const connectPagination: PaginationConnector = function connectPagination(
           connectorState.createURL = (page) =>
             createURL((uiState) => ({
               ...uiState,
-              page,
+              page: page + 1,
             }));
         }
 

diff --git a/packages/react-instantsearch/src/widgets/__tests__/Pagination.test.tsx b/packages/react-instantsearch/src/widgets/__tests__/Pagination.test.tsx
@@ -2025,7 +2025,7 @@ describe('Pagination', () => {
   });
 
   test('renders with translations', async () => {
-    const { getByRole, findByRole, debug } = render(
+    const { getByRole, findByRole } = render(
       <InstantSearchTestWrapper
         searchClient={createMockedSearchClient({ nbPages: 3 })}
       >
@@ -2066,8 +2066,6 @@ describe('Pagination', () => {
     });
     expect(firstPageLink).toHaveTextContent('First');
 
-    debug();
-
     const previousPageLink = getByRole('link', {
       name: 'Previous page',
     });

diff --git a/tests/common/connectors/pagination/routing.ts b/tests/common/connectors/pagination/routing.ts
@@ -65,7 +65,7 @@ export function createRoutingTests(
             // eslint-disable-next-line jest/no-conditional-expect
             expect(link).toHaveAttribute(
               'href',
-              router.createURL({ indexName: { page: 10 } })
+              router.createURL({ indexName: { page: 11 } })
             );
           }
         }
@@ -80,7 +80,7 @@ export function createRoutingTests(
         {
           expect(screen.getByTestId('Pagination-link')).toHaveAttribute(
             'href',
-            router.createURL({ indexName: { page: 10 } })
+            router.createURL({ indexName: { page: 11 } })
           );
         }
 
@@ -96,7 +96,7 @@ export function createRoutingTests(
           // URL is still the same, as it overrides the current state
           expect(screen.getByTestId('Pagination-link')).toHaveAttribute(
             'href',
-            router.createURL({ indexName: { page: 10 } })
+            router.createURL({ indexName: { page: 11 } })
           );
         }
 
@@ -108,7 +108,7 @@ export function createRoutingTests(
 
           expect(screen.getByTestId('Pagination-link')).toHaveAttribute(
             'href',
-            router.createURL({ indexName: { page: 10 } })
+            router.createURL({ indexName: { page: 11 } })
           );
         }
 
@@ -124,7 +124,7 @@ export function createRoutingTests(
           // URL is still the same, as it overrides the current state
           expect(screen.getByTestId('Pagination-link')).toHaveAttribute(
             'href',
-            router.createURL({ indexName: { page: 10 } })
+            router.createURL({ indexName: { page: 11 } })
           );
         }
 
@@ -137,7 +137,7 @@ export function createRoutingTests(
 
           expect(screen.getByTestId('Pagination-link')).toHaveAttribute(
             'href',
-            router.createURL({ indexName: { page: 10 } })
+            router.createURL({ indexName: { page: 11 } })
           );
         }
       });

diff --git a/tests/common/shared/routing.ts b/tests/common/shared/routing.ts
@@ -98,11 +98,7 @@ export function createRoutingTests(
             // eslint-disable-next-line jest/no-conditional-expect
             expect(paginationLink).toHaveAttribute(
               'href',
-              router.createURL({
-                indexName: {
-                  page: 10,
-                },
-              })
+              router.createURL({ indexName: { page: 11 } })
             );
           }
         }
@@ -124,9 +120,7 @@ export function createRoutingTests(
 
           expect(screen.getByTestId('Pagination-link')).toHaveAttribute(
             'href',
-            router.createURL({
-              indexName: { page: 10 },
-            })
+            router.createURL({ indexName: { page: 11 } })
           );
         }
 
@@ -149,12 +143,12 @@ export function createRoutingTests(
             })
           );
 
-          // expect(screen.getByTestId('Pagination-link')).toHaveAttribute(
-          //   'href',
-          //   router.createURL({
-          //     indexName: { menu: { [attribute]: 'Apple' }, page: 10 },
-          //   })
-          // );
+          expect(screen.getByTestId('Pagination-link')).toHaveAttribute(
+            'href',
+            router.createURL({
+              indexName: { menu: { [attribute]: 'Apple' }, page: 11 },
+            })
+          );
         }
 
         // Wait for new results to come in
@@ -173,7 +167,7 @@ export function createRoutingTests(
           expect(screen.getByTestId('Pagination-link')).toHaveAttribute(
             'href',
             router.createURL({
-              indexName: { menu: { [attribute]: 'Apple' }, page: 10 },
+              indexName: { menu: { [attribute]: 'Apple' }, page: 11 },
             })
           );
         }
@@ -199,9 +193,7 @@ export function createRoutingTests(
 
           expect(screen.getByTestId('Pagination-link')).toHaveAttribute(
             'href',
-            router.createURL({
-              indexName: { page: 10 },
-            })
+            router.createURL({ indexName: { page: 11 } })
           );
         }
 
@@ -220,9 +212,7 @@ export function createRoutingTests(
 
           expect(screen.getByTestId('Pagination-link')).toHaveAttribute(
             'href',
-            router.createURL({
-              indexName: { page: 10 },
-            })
+            router.createURL({ indexName: { page: 11 } })
           );
         }
 
@@ -238,7 +228,7 @@ export function createRoutingTests(
           // URL is still the same, as it overrides the current state
           expect(screen.getByTestId('Pagination-link')).toHaveAttribute(
             'href',
-            router.createURL({ indexName: { page: 10 } })
+            router.createURL({ indexName: { page: 11 } })
           );
 
           expect(screen.getByTestId('Menu-link')).toHaveAttribute(
@@ -257,7 +247,7 @@ export function createRoutingTests(
 
           expect(screen.getByTestId('Pagination-link')).toHaveAttribute(
             'href',
-            router.createURL({ indexName: { page: 10 } })
+            router.createURL({ indexName: { page: 11 } })
           );
 
           expect(screen.getByTestId('Menu-link')).toHaveAttribute(
@@ -280,7 +270,7 @@ export function createRoutingTests(
           // URL is still the same, as it overrides the current state
           expect(screen.getByTestId('Pagination-link')).toHaveAttribute(
             'href',
-            router.createURL({ indexName: { page: 10 } })
+            router.createURL({ indexName: { page: 11 } })
           );
 
           expect(screen.getByTestId('Menu-link')).toHaveAttribute(
@@ -300,7 +290,7 @@ export function createRoutingTests(
 
           expect(screen.getByTestId('Pagination-link')).toHaveAttribute(
             'href',
-            router.createURL({ indexName: { page: 10 } })
+            router.createURL({ indexName: { page: 11 } })
           );
 
           expect(screen.getByTestId('Menu-link')).toHaveAttribute(