fix: [GROOT-1314] fix broken pagination for taxonomy requests (#2701)

Author: LiamStokingerContentful

lib/adapters/REST/endpoints/concept-scheme.ts

@@ -41,7 +41,7 @@ export const getMany: RestEndpoint<'ConceptScheme', 'getMany'> = (
 ) => {
   const url = params.query?.pageUrl ?? basePath(params.organizationId)
   return raw.get<CursorPaginatedCollectionProp<ConceptSchemeProps>>(http, url, {
-    params: params.query?.pageUrl ? {} : params.query,
+    params: params.query?.pageUrl ? undefined : params.query,
   })
 }
 

lib/adapters/REST/endpoints/concept.ts

@@ -156,11 +156,11 @@ function cursorBasedCollection(
     organizationId: string
     query?: Record<string, string | number> & { pageUrl?: string }
   }
-): { url: string; queryParams: Record<string, string | number> } {
+): { url: string; queryParams?: Record<string, string | number> } {
   return params.query?.pageUrl
-    ? { url: params.query?.pageUrl, queryParams: {} }
+    ? { url: params.query?.pageUrl }
     : {
         url: `${basePath(params.organizationId)}${path}`,
-        queryParams: params.query || {},
+        queryParams: params.query,
       }
 }

test/integration/taxonomy-integration.test.ts

@@ -254,6 +254,38 @@ describe('Taxonomy Integration', () => {
     expect(items.length).toBe(3)
   })
 
+  it('gets a list of all paginated concepts', async () => {
+    await Promise.all(
+      Array(3)
+        .fill(null)
+        .map(async (i) => {
+          const concept: CreateConceptProps = {
+            prefLabel: {
+              'en-US': `Test Concept ${i}`,
+            },
+          }
+
+          const result = await client.concept.create({}, concept)
+          conceptsToDelete.push(result)
+        })
+    )
+
+    const { items, pages } = await client.concept.getMany({
+      query: {
+        limit: 2,
+      },
+    })
+    expect(items.length).toBe(2)
+
+    const { items: nextItems } = await client.concept.getMany({
+      query: {
+        limit: 2,
+        pageUrl: pages?.next,
+      },
+    })
+    expect(nextItems.length).toBe(1)
+  })
+
   it('creates a concept with a broader concept', async () => {
     const first = await client.concept.create(
       {},
@@ -533,6 +565,38 @@ describe('Taxonomy Integration', () => {
     const { items } = await client.conceptScheme.getMany({})
     expect(items.length).toBe(3)
   })
+
+  it('gets a list of all paginated concept schemes', async () => {
+    await Promise.all(
+      Array(3)
+        .fill(null)
+        .map(async (i) => {
+          const conceptScheme: CreateConceptSchemeProps = {
+            prefLabel: {
+              'en-US': `Test ConceptScheme ${i}`,
+            },
+          }
+
+          const result = await client.conceptScheme.create({}, conceptScheme)
+          conceptSchemesToDelete.push(result)
+        })
+    )
+
+    const { items, pages } = await client.conceptScheme.getMany({
+      query: {
+        limit: 2,
+      },
+    })
+    expect(items.length).toBe(2)
+
+    const { items: nextItems } = await client.conceptScheme.getMany({
+      query: {
+        limit: 2,
+        pageUrl: pages?.next,
+      },
+    })
+    expect(nextItems.length).toBe(1)
+  })
 })
 
 function isConceptProps(concept: any) {

test/unit/adapters/REST/endpoints/concept-scheme.test.ts

@@ -199,7 +199,8 @@ describe('ConceptScheme', () => {
         params: {
           query: { pageUrl: 'page-url', params: {} },
         },
-        expected: { url: 'page-url', params: {} },
+        // IMPORTANT: if we pass {} instead of undefined for params, axios adds ? which breaks the pre-appended url params
+        expected: { url: 'page-url', params: undefined },
       },
     ]
 

test/unit/adapters/REST/endpoints/concept.test.ts

@@ -38,14 +38,16 @@ describe('Concept', () => {
       {
         name: 'without query params',
         params: {},
-        expected: { url: '/organizations/organization-id/taxonomy/concepts', params: {} },
+        // IMPORTANT: if we pass {} instead of undefined for params, axios adds ? which breaks the pre-appended url params
+        expected: { url: '/organizations/organization-id/taxonomy/concepts', params: undefined },
       },
       {
         name: 'with pageUrl query params',
         params: {
           query: { pageUrl: 'page-url' },
         },
-        expected: { url: 'page-url', params: {} },
+        // IMPORTANT: if we pass {} instead of undefined for params, axios adds ? which breaks the pre-appended url params
+        expected: { url: 'page-url', params: undefined },
       },
       {
         name: 'with conceptScheme query params',