"Generated by an API" label is displayed for both WFS and OGC API dow…

…nloads
geonetwork · Jan 20, 2025 · d19b770 · d19b770
1 parent fbf7973
commit d19b770
Show file tree

Hide file tree

Showing 16 changed files with 49 additions and 26 deletions.
diff --git a/apps/datahub-e2e/src/e2e/datasets.cy.ts b/apps/datahub-e2e/src/e2e/datasets.cy.ts
@@ -5,9 +5,7 @@ describe('datasets', () => {
     cy.visit('/search')
 
     // aliases
-    cy.get('gn-ui-results-list-item', { timeout: 10000 })
-      .find('a')
-      .as('results')
+    cy.get('gn-ui-results-list-item').find('a').as('results')
     cy.get('@results').eq(2).as('sampleResult')
     cy.get('@results')
       .then(($results) => $results.length)

diff --git a/libs/common/fixtures/src/lib/link.fixtures.ts b/libs/common/fixtures/src/lib/link.fixtures.ts
@@ -169,6 +169,15 @@ export const aSetOfLinksFixture = () => ({
       ),
       accessServiceProtocol: 'wfs',
     } as DatasetDownloadDistribution),
+  geodataOgcApiDownload: () =>
+    ({
+      name: 'mylayer',
+      type: 'download',
+      url: new URL(
+        'https://my.ogc.server/data/ogcapi/collections/comptages_velo/items?'
+      ),
+      accessServiceProtocol: 'ogcFeatures',
+    } as DatasetDownloadDistribution),
   geodataWms2: () =>
     ({
       name: 'myotherlayer',

diff --git a/libs/ui/elements/src/lib/download-item/download-item.component.html b/libs/ui/elements/src/lib/download-item/download-item.component.html
@@ -20,9 +20,9 @@
       >
       <span
         class="pl-2 inline-flex items-center text-gray-800 text-sm"
-        *ngIf="isFromWfs"
+        *ngIf="isFromAPI"
         translate=""
-        >datahub.search.filter.generatedByWfs</span
+        >datahub.search.filter.generatedByAPI</span
       >
     </div>
   </div>

diff --git a/libs/ui/elements/src/lib/download-item/download-item.component.spec.ts b/libs/ui/elements/src/lib/download-item/download-item.component.spec.ts
@@ -78,19 +78,19 @@ describe('DownloadsListItemComponent', () => {
       expect(badgeElt.styles['background-color']).toEqual('red')
     })
 
-    describe('when it is not Wfs', () => {
-      it('do not display wfs information', () => {
+    describe('when it is not WFS or OGC API', () => {
+      it('do not display wfs or OGC API information', () => {
         const spans = fixture.debugElement.queryAll(By.css('span'))
 
         expect(spans.length).toBe(1)
       })
     })
-    describe('when it is not Wfs', () => {
+    describe('when it is WFS or OGC API', () => {
       beforeEach(() => {
-        component.isFromWfs = true
+        component.isFromAPI = true
         fixture.detectChanges()
       })
-      it('add wfs information', () => {
+      it('add WFS or OGC API information', () => {
         const spans = fixture.debugElement.queryAll(By.css('span'))
 
         expect(spans.length).toBe(2)

diff --git a/libs/ui/elements/src/lib/download-item/download-item.component.ts b/libs/ui/elements/src/lib/download-item/download-item.component.ts
@@ -28,7 +28,7 @@ export class DownloadItemComponent {
   @Input() link: DatasetOnlineResource
   @Input() color: string
   @Input() format: string
-  @Input() isFromWfs: boolean
+  @Input() isFromAPI: boolean
   @Output() exportUrl = new EventEmitter<string>()
 
   openUrl() {

diff --git a/libs/ui/elements/src/lib/downloads-list/downloads-list.component.html b/libs/ui/elements/src/lib/downloads-list/downloads-list.component.html
@@ -31,6 +31,6 @@
     [link]="link"
     [color]="getLinkColor(link)"
     [format]="getLinkFormat(link)"
-    [isFromWfs]="isFromWfs(link)"
+    [isFromAPI]="isFromAPI(link)"
   ></gn-ui-download-item>
 </div>
diff --git a/libs/ui/elements/src/lib/downloads-list/downloads-list.component.spec.ts b/libs/ui/elements/src/lib/downloads-list/downloads-list.component.spec.ts
@@ -116,7 +116,7 @@ describe('DownloadsListComponent', () => {
       fixture.detectChanges()
       items = de.queryAll(By.directive(DownloadItemComponent))
     })
-    it('contains color, isWfs & format', () => {
+    it('contains color, isAPI & format', () => {
       expect(items.length).toBe(1)
       expect(items[0].componentInstance.link).toEqual(
         aSetOfLinksFixture().geodataShpWithMimeType()
@@ -125,7 +125,7 @@ describe('DownloadsListComponent', () => {
       expect(items[0].componentInstance.color).toEqual(
         expect.stringMatching(/#[0-9a-b]{2,6}/i)
       )
-      expect(items[0].componentInstance.isFromWfs).toEqual(false)
+      expect(items[0].componentInstance.isFromAPI).toEqual(false)
     })
   })
   describe('displaying download links from WFS', () => {
@@ -136,8 +136,20 @@ describe('DownloadsListComponent', () => {
       fixture.detectChanges()
       items = de.queryAll(By.directive(DownloadItemComponent))
     })
-    it('sets isFromWfs to true', () => {
-      expect(items[0].componentInstance.isFromWfs).toEqual(true)
+    it('sets isFromAPI to true', () => {
+      expect(items[0].componentInstance.isFromAPI).toEqual(true)
+    })
+  })
+  describe('displaying download links from OGC Features', () => {
+    let items: DebugElement[]
+
+    beforeEach(() => {
+      component.links = [aSetOfLinksFixture().geodataOgcApiDownload()]
+      fixture.detectChanges()
+      items = de.queryAll(By.directive(DownloadItemComponent))
+    })
+    it('sets isFromAPI to true', () => {
+      expect(items[0].componentInstance.isFromAPI).toEqual(true)
     })
   })
   describe('filtering links', () => {

diff --git a/libs/ui/elements/src/lib/downloads-list/downloads-list.component.ts b/libs/ui/elements/src/lib/downloads-list/downloads-list.component.ts
@@ -129,7 +129,11 @@ export class DownloadsListComponent {
     return getBadgeColor(getFileFormat(link))
   }
 
-  isFromWfs(link: DatasetOnlineResource) {
-    return link.type === 'download' && link.accessServiceProtocol === 'wfs'
+  isFromAPI(link: DatasetOnlineResource) {
+    return (
+      link.type === 'download' &&
+      (link.accessServiceProtocol === 'wfs' ||
+        link.accessServiceProtocol === 'ogcFeatures')
+    )
   }
 }
diff --git a/translations/de.json b/translations/de.json
@@ -138,7 +138,7 @@
   "datahub.record.addToFavorites": "Zu Favoriten hinzufügen",
   "datahub.search.back": "Zurück",
   "datahub.search.filter.all": "Alle",
-  "datahub.search.filter.generatedByWfs": "Generiert durch eine API",
+  "datahub.search.filter.generatedByAPI": "Generiert durch eine API",
   "datahub.search.filter.others": "Andere",
   "dataset.error.http": "Die Daten konnten aufgrund eines HTTP-Fehlers nicht geladen werden: \"{ info }\"",
   "dataset.error.network": "Die Daten konnten aufgrund eines Netzwerkfehlers oder CORS-Beschränkungen nicht geladen werden: \"{ info }\"",

diff --git a/translations/en.json b/translations/en.json
@@ -138,7 +138,7 @@
   "datahub.record.addToFavorites": "Add to favorites",
   "datahub.search.back": "Back",
   "datahub.search.filter.all": "All",
-  "datahub.search.filter.generatedByWfs": "Generated by an API",
+  "datahub.search.filter.generatedByAPI": "Generated by an API",
   "datahub.search.filter.others": "Others",
   "dataset.error.http": "The data could not be loaded because of an HTTP error: \"{ info }\"",
   "dataset.error.network": "The data could not be loaded because of a network error or CORS limitations: \"{ info }\"",

diff --git a/translations/es.json b/translations/es.json
@@ -138,7 +138,7 @@
   "datahub.record.addToFavorites": "",
   "datahub.search.back": "",
   "datahub.search.filter.all": "",
-  "datahub.search.filter.generatedByWfs": "",
+  "datahub.search.filter.generatedByAPI": "",
   "datahub.search.filter.others": "",
   "dataset.error.http": "",
   "dataset.error.network": "",

diff --git a/translations/fr.json b/translations/fr.json
@@ -138,7 +138,7 @@
   "datahub.record.addToFavorites": "Ajouter aux favoris",
   "datahub.search.back": "Retour",
   "datahub.search.filter.all": "Tous",
-  "datahub.search.filter.generatedByWfs": "généré par une API",
+  "datahub.search.filter.generatedByAPI": "généré par une API",
   "datahub.search.filter.others": "Autres",
   "dataset.error.http": "Le chargement des données a échoué en raison d'une erreur HTTP: \"{ info }\"",
   "dataset.error.network": "Le chargement des données a échoué en raison d'une erreur réseau ou de limitations CORS: \"{ info }\"",

diff --git a/translations/it.json b/translations/it.json
@@ -138,7 +138,7 @@
   "datahub.record.addToFavorites": "Aggiungere a miei preferiti",
   "datahub.search.back": "Ritorna",
   "datahub.search.filter.all": "Tutti",
-  "datahub.search.filter.generatedByWfs": "generato da un'API",
+  "datahub.search.filter.generatedByAPI": "generato da un'API",
   "datahub.search.filter.others": "Altri",
   "dataset.error.http": "Il caricamento dei dati non è riuscito a causa di un errore HTTP: \"{info}\"",
   "dataset.error.network": "Il caricamento dei dati non è riuscito a causa di un errore di rete o di limitazioni CORS: \"{info}\"",

diff --git a/translations/nl.json b/translations/nl.json
@@ -138,7 +138,7 @@
   "datahub.record.addToFavorites": "",
   "datahub.search.back": "",
   "datahub.search.filter.all": "",
-  "datahub.search.filter.generatedByWfs": "",
+  "datahub.search.filter.generatedByAPI": "",
   "datahub.search.filter.others": "",
   "dataset.error.http": "",
   "dataset.error.network": "",

diff --git a/translations/pt.json b/translations/pt.json
@@ -138,7 +138,7 @@
   "datahub.record.addToFavorites": "",
   "datahub.search.back": "",
   "datahub.search.filter.all": "",
-  "datahub.search.filter.generatedByWfs": "",
+  "datahub.search.filter.generatedByAPI": "",
   "datahub.search.filter.others": "",
   "dataset.error.http": "",
   "dataset.error.network": "",

diff --git a/translations/sk.json b/translations/sk.json
@@ -138,7 +138,7 @@
   "datahub.record.addToFavorites": "Pridať do obľúbených",
   "datahub.search.back": "Späť na výsledky",
   "datahub.search.filter.all": "Všetky",
-  "datahub.search.filter.generatedByWfs": "vygenerované cez API",
+  "datahub.search.filter.generatedByAPI": "vygenerované cez API",
   "datahub.search.filter.others": "Iné",
   "dataset.error.http": "Dáta sa nedajú načítať kvôli chybe HTTP: \"{ info }\"",
   "dataset.error.network": "Dáta sa nedajú načítať kvôli chybe v sieti alebo obmedzeniam CORS: \"{ info }\"",