fix(platform-service): Exclude place thesarus keywords

libs/api/repository/src/lib/gn4/platform/gn4-platform.service.spec.ts

@@ -370,6 +370,95 @@ describe('Gn4PlatformService', () => {
       })
     })
   })
+  describe('#searchKeywords', () => {
+    beforeEach(() => {
+      jest.spyOn(service, 'searchKeywords')
+    })
+    it('calls api service with qeury', () => {
+      service.searchKeywords('road').subscribe()
+      expect(registriesApiService.searchKeywords).toHaveBeenCalledWith(
+        'road',
+        'fre',
+        10,
+        0,
+        null,
+        ['external.theme.httpinspireeceuropaeutheme-theme'],
+        null,
+        '*road*'
+      )
+    })
+    it('returns mapped thesaurus with translated values', async () => {
+      const keywords = await lastValueFrom(service.searchKeywords('road'))
+      expect(keywords).toEqual([
+        {
+          description:
+            'Localisation des propriétés fondée sur les identifiants des adresses, habituellement le nom de la rue, le numéro de la maison et le code postal.',
+          key: 'http://inspire.ec.europa.eu/theme/ad',
+          label: 'Adresses',
+          thesaurus: {
+            id: 'external.theme.httpinspireeceuropaeutheme-theme',
+            name: 'GEMET - INSPIRE themes, version 1.0',
+            type: 'theme',
+            url: new URL(
+              'http://localhost:8080/geonetwork/srv/api/registries/vocabularies/external.theme.httpinspireeceuropaeutheme-theme'
+            ),
+          },
+          type: 'theme',
+        },
+        {
+          description:
+            "Modèles numériques pour l'altitude des surfaces terrestres, glaciaires et océaniques. Comprend l'altitude terrestre, la bathymétrie et la ligne de rivage.",
+          key: 'http://inspire.ec.europa.eu/theme/el',
+          label: 'Altitude',
+          thesaurus: {
+            id: 'external.theme.httpinspireeceuropaeutheme-theme',
+            name: 'GEMET - INSPIRE themes, version 1.0',
+            type: 'theme',
+            url: new URL(
+              'http://localhost:8080/geonetwork/srv/api/registries/vocabularies/external.theme.httpinspireeceuropaeutheme-theme'
+            ),
+          },
+          type: 'theme',
+        },
+      ])
+    })
+    describe('if translations are unavailable', () => {
+      it('uses default values', async () => {
+        service['langService']['iso3'] = 'ger'
+        const keywords = await lastValueFrom(service.searchKeywords('road'))
+        expect(keywords).toEqual([
+          {
+            description: 'localization of properties',
+            key: 'http://inspire.ec.europa.eu/theme/ad',
+            label: 'addresses',
+            thesaurus: {
+              id: 'external.theme.httpinspireeceuropaeutheme-theme',
+              name: 'GEMET - INSPIRE themes, version 1.0',
+              type: 'theme',
+              url: new URL(
+                'http://localhost:8080/geonetwork/srv/api/registries/vocabularies/external.theme.httpinspireeceuropaeutheme-theme'
+              ),
+            },
+            type: 'theme',
+          },
+          {
+            description: 'digital terrain models',
+            key: 'http://inspire.ec.europa.eu/theme/el',
+            label: 'altitude',
+            thesaurus: {
+              id: 'external.theme.httpinspireeceuropaeutheme-theme',
+              name: 'GEMET - INSPIRE themes, version 1.0',
+              type: 'theme',
+              url: new URL(
+                'http://localhost:8080/geonetwork/srv/api/registries/vocabularies/external.theme.httpinspireeceuropaeutheme-theme'
+              ),
+            },
+            type: 'theme',
+          },
+        ])
+      })
+    })
+  })
   describe('#getKeywordsByUri', () => {
     it('calls api service ', async () => {
       service.getKeywordsByUri('http://inspire.ec.europa.eu/theme/')

libs/api/repository/src/lib/gn4/platform/gn4-platform.service.ts

@@ -1,11 +1,10 @@
 import { Injectable } from '@angular/core'
 import { Observable, combineLatest, of, switchMap } from 'rxjs'
-import { catchError, map, shareReplay, tap } from 'rxjs/operators'
+import { catchError, concatMap, map, shareReplay, tap } from 'rxjs/operators'
 import {
   MeApiService,
   RegistriesApiService,
   SiteApiService,
-  ThesaurusInfoApiModel,
   ToolsApiService,
   UserfeedbackApiService,
   UsersApiService,
@@ -146,25 +145,35 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     )
     .pipe(
       map((thesaurus) => {
-        // FIXME: find a better way to exclude place keywords
-        // thesaurus[0].filter((thes) => thes.dname !== 'place')
-        return thesaurus[0] as ThesaurusApiResponse[]
+        const thesauriWithoutPlace = thesaurus[0].filter(
+          (thes) => thes.dname !== 'place'
+        )
+        return thesauriWithoutPlace as ThesaurusApiResponse[]
       }),
       shareReplay(1)
     )
 
   searchKeywords(query: string): Observable<Keyword[]> {
-    const keywords$: Observable<KeywordApiResponse[]> =
-      this.registriesApiService.searchKeywords(
-        query,
-        this.langService.iso3,
-        10,
-        0,
-        null,
-        null,
-        null,
-        `*${query}*`
-      ) as Observable<KeywordApiResponse[]>
+    const keywords$: Observable<KeywordApiResponse[]> = this.allThesaurus$.pipe(
+      concatMap((thesaurus) => {
+        return this.registriesApiService
+          .searchKeywords(
+            query,
+            this.langService.iso3,
+            10,
+            0,
+            null,
+            thesaurus.map((thes) => thes.key),
+            null,
+            `*${query}*`
+          )
+          .pipe(
+            map((keywords) => {
+              return keywords as KeywordApiResponse[]
+            })
+          )
+      })
+    )
 
     return combineLatest([keywords$, this.allThesaurus$]).pipe(
       map(([keywords, thesaurus]) => {