Merge pull request #813 from geonetwork/fix/ogc-request-limit

[Datahub][API form] Fix OGC API default limit
geonetwork · Mar 6, 2024 · 4db0b59 · 4db0b59
2 parents 37255b6 + 1fab7d2
commit 4db0b59
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/apps/datahub-e2e/src/e2e/datasetDetailPage.cy.ts b/apps/datahub-e2e/src/e2e/datasetDetailPage.cy.ts
@@ -605,7 +605,7 @@ describe('api form', () => {
       .find('gn-ui-copy-text-button')
       .find('input')
       .invoke('val')
-      .should('include', 'f=json')
+      .should('include', 'limit=-1&f=json')
   })
   it('should close the panel on click', () => {
     cy.get('gn-ui-record-api-form').prev().find('button').click()

diff --git a/libs/ui/elements/src/lib/record-api-form/record-api-form.component.html b/libs/ui/elements/src/lib/record-api-form/record-api-form.component.html
@@ -20,16 +20,16 @@
           <gn-ui-text-input
             class="mr-2 w-20"
             (input)="setLimit($event.target.value)"
-            [value]="limit$ | async"
+            [value]="(limit$ | async) !== '-1' ? (limit$ | async) : ''"
             hint=""
           >
           </gn-ui-text-input>
           <div class="flex items-center">
             <input
               class="mr-2 cursor-pointer"
               type="checkbox"
-              [checked]="(limit$ | async) === ''"
-              (change)="setLimit('')"
+              [checked]="(limit$ | async) === '-1'"
+              (change)="setLimit('-1')"
             />
             <span class="text-sm" translate
               >record.metadata.api.form.limit.all</span

diff --git a/libs/ui/elements/src/lib/record-api-form/record-api-form.component.spec.ts b/libs/ui/elements/src/lib/record-api-form/record-api-form.component.spec.ts
@@ -34,10 +34,10 @@ describe('RecordApFormComponent', () => {
     it('should set the links and initial values correctly', async () => {
       expect(component.apiBaseUrl).toBe('https://api.example.com/data')
       expect(component.offset$.getValue()).toBe('')
-      expect(component.limit$.getValue()).toBe('')
+      expect(component.limit$.getValue()).toBe('-1')
       expect(component.format$.getValue()).toBe('json')
       const url = await firstValueFrom(component.apiQueryUrl$)
-      expect(url).toBe('https://api.example.com/data?f=json')
+      expect(url).toBe('https://api.example.com/data?limit=-1&f=json')
     })
   })
   describe('When URL params are changed', () => {
@@ -83,7 +83,7 @@ describe('RecordApFormComponent', () => {
     it('should reset URL to default parameters', () => {
       component.resetUrl()
       expect(component.offset$.getValue()).toBe('')
-      expect(component.limit$.getValue()).toBe('')
+      expect(component.limit$.getValue()).toBe('-1')
       expect(component.format$.getValue()).toBe('json')
     })
   })

diff --git a/libs/ui/elements/src/lib/record-api-form/record-api-form.component.ts b/libs/ui/elements/src/lib/record-api-form/record-api-form.component.ts
@@ -4,7 +4,7 @@ import { BehaviorSubject, combineLatest, map } from 'rxjs'
 
 const DEFAULT_PARAMS = {
   OFFSET: '',
-  LIMIT: '',
+  LIMIT: '-1',
   FORMAT: 'json',
 }
 @Component({