Merge #575

575: Fix pagination not showing the right amount of pages r=bidoubiwa a=bidoubiwa

fixes: #574

Bug was due to splice changing hits on place. Changing order of function call fixes this issue as `searchresponse.hits` was not altered yet.

Co-authored-by: Charlotte Vermandel <[email protected]>

Author: bors[bot]

src/adapter/search-response-adapter/__tests__/pagination-adapter.tests.ts

@@ -29,13 +29,6 @@ const numberPagesTestParameters = [
   },
   // Not an Algolia behavior. Algolia returns an error:
   // "Value too small for \"hitsPerPage\" parameter, expected integer between 0 and 9223372036854775807",
-  {
-    hitsPerPage: -1,
-    hitsLength: 20,
-    numberPages: 0,
-  },
-  // Not an Algolia behavior. Algolia returns an error:
-  // "Value too small for \"hitsPerPage\" parameter, expected integer between 0 and 9223372036854775807",
   {
     hitsPerPage: 1.5,
     hitsLength: 20,
@@ -129,15 +122,6 @@ const paginateHitsTestsParameters = [
     hitsPerPage: 0,
     returnedHits: [],
   },
-  // Wrong types
-  // Not an Algolia behavior. Algolia returns an error:
-  // "Value too small for \"hitsPerPage\" parameter, expected integer between 0 and 9223372036854775807",
-  {
-    hits: [{ id: 1 }, { id: 2 }, { id: 3 }],
-    page: 0,
-    hitsPerPage: -1,
-    returnedHits: [],
-  },
 ]
 
 describe.each(numberPagesTestParameters)(
@@ -163,3 +147,17 @@ describe.each(paginateHitsTestsParameters)(
     })
   }
 )
+
+it('Should throw when hitsPerPage is negative', () => {
+  try {
+    const hits: string[] = []
+    const hitsPerPage = -1
+    const page = 0
+    adaptPagination(hits, page, hitsPerPage)
+  } catch (e: any) {
+    expect(e.message).toBe(
+      'Value too small for "hitsPerPage" parameter, expected integer between 0 and 9223372036854775807'
+    )
+    expect(e.name).toBe('TypeError')
+  }
+})

src/adapter/search-response-adapter/pagination-adapter.ts

@@ -11,6 +11,11 @@ export function adaptPagination(
   page: number,
   hitsPerPage: number
 ): Array<Record<string, any>> {
+  if (hitsPerPage < 0) {
+    throw new TypeError(
+      'Value too small for "hitsPerPage" parameter, expected integer between 0 and 9223372036854775807'
+    )
+  }
   const start = page * hitsPerPage
-  return hits.splice(start, hitsPerPage)
+  return hits.slice(start, start + hitsPerPage)
 }

src/adapter/search-response-adapter/search-response-adapter.ts

@@ -29,13 +29,11 @@ export function adaptSearchResponse<T>(
   if (exhaustiveFacetsCount) {
     searchResponseOptionals.exhaustiveFacetsCount = exhaustiveFacetsCount
   }
-
-  const hits = adaptHits(searchResponse.hits, searchContext, paginationContext)
-
   const nbPages = ceiledDivision(
     searchResponse.hits.length,
     paginationContext.hitsPerPage
   )
+  const hits = adaptHits(searchResponse.hits, searchContext, paginationContext)
 
   const exhaustiveNbHits = searchResponse.exhaustiveNbHits
   const nbHits = searchResponse.nbHits