Merge pull request #915 from geonetwork/ME-exclude-place-thesauri-key…

…words

fix(platform-service): Exclude place thesarus keywords

apps/datahub/src/app/home/navigation-menu/navigation-menu.component.spec.ts

@@ -78,7 +78,7 @@ describe('NavigationMenuComponent', () => {
       })
       it('displays activeLabel for organisations', async () => {
         const activeLabel = (await readFirst(component.activeLink$)).label
-        expect(activeLabel).toEqual('datahub.header.organisations')
+        expect(activeLabel).toEqual('datahub.header.organizations')
       })
     })
     describe('navigate to a route with missing label', () => {

apps/datahub/src/app/home/navigation-menu/navigation-menu.component.ts

@@ -13,7 +13,7 @@ import { getThemeConfig } from '@geonetwork-ui/util/app-config'
 
 marker('datahub.header.news')
 marker('datahub.header.datasets')
-marker('datahub.header.organisations')
+marker('datahub.header.organizations')
 
 @Component({
   selector: 'datahub-navigation-menu',
@@ -34,7 +34,7 @@ export class NavigationMenuComponent {
     },
     {
       link: `${ROUTER_ROUTE_ORGANIZATIONS}`,
-      label: 'datahub.header.organisations',
+      label: 'datahub.header.organizations',
     },
   ]
 

apps/datahub/src/app/home/news-page/key-figures/key-figures.component.ts

@@ -8,7 +8,7 @@ import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 import { of } from 'rxjs'
 
 marker('catalog.figures.datasets')
-marker('catalog.figures.organisations')
+marker('catalog.figures.organizations')
 
 @Component({
   selector: 'datahub-key-figures',

apps/datahub/src/app/organization/organization-details/organization-details.component.html

@@ -65,7 +65,7 @@
                 class="font-title text-[28px] font-medium text-title text-center sm:text-left"
                 translate
               >
-                organization.lastPublishedDatasets
+                organization.details.lastPublishedDatasets
               </p>
               <ng-container
                 *ngIf="
@@ -87,7 +87,7 @@
                     data-test="orgDetailsSearchAllBtn"
                     translate
                   >
-                    organization.lastPublishedDatasets.searchAllButton
+                    organization.details.lastPublishedDatasets.searchAllButton
                   </a>
                 </div>
               </ng-container>

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

@@ -370,6 +370,151 @@ describe('Gn4PlatformService', () => {
       })
     })
   })
+  describe('#searchKeywords', () => {
+    beforeEach(() => {
+      jest.spyOn(service, 'searchKeywords')
+    })
+    it('calls api service with qeury', () => {
+      service.searchKeywords('road', ['theme']).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', ['theme'])
+      )
+      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', ['theme'])
+        )
+        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('if keywordType is empty Array', () => {
+      it('calls api service with empty array and returns keywords from all thesauri', async () => {
+        service.searchKeywords('road', ['theme']).subscribe()
+        const keywords = await lastValueFrom(
+          service.searchKeywords('road', ['theme'])
+        )
+
+        expect(registriesApiService.searchKeywords).toHaveBeenCalledWith(
+          'road',
+          'fre',
+          10,
+          0,
+          null,
+          ['external.theme.httpinspireeceuropaeutheme-theme'],
+          null,
+          '*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('#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

@@ -5,7 +5,6 @@ import {
   MeApiService,
   RegistriesApiService,
   SiteApiService,
-  ThesaurusInfoApiModel,
   ToolsApiService,
   UserfeedbackApiService,
   UsersApiService,
@@ -25,6 +24,7 @@ import {
   KeywordApiResponse,
   ThesaurusApiResponse,
 } from '@geonetwork-ui/api/metadata-converter'
+import { KeywordType } from '@geonetwork-ui/common/domain/model/thesaurus'
 
 const minApiVersion = '4.2.2'
 
@@ -146,25 +146,36 @@ 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[]
       }),
       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[]>
+  searchKeywords(
+    query: string,
+    keywordTypes: KeywordType[]
+  ): Observable<Keyword[]> {
+    const keywords$: Observable<KeywordApiResponse[]> = this.allThesaurus$.pipe(
+      switchMap((thesaurus) => {
+        const selectedThesauri = []
+        keywordTypes.map((keywordType) => {
+          selectedThesauri.push(
+            ...thesaurus.filter((thes) => thes.dname === keywordType)
+          )
+        })
+
+        return this.registriesApiService.searchKeywords(
+          query,
+          this.langService.iso3,
+          10,
+          0,
+          null,
+          selectedThesauri.map((thes) => thes.key),
+          null,
+          `*${query}*`
+        ) as Observable<KeywordApiResponse[]>
+      })
+    )
 
     return combineLatest([keywords$, this.allThesaurus$]).pipe(
       map(([keywords, thesaurus]) => {

libs/common/domain/src/lib/platform.service.interface.ts

@@ -2,6 +2,7 @@ import type { Observable } from 'rxjs'
 import type { UserModel } from './model/user/user.model'
 import type { Organization } from './model/record/organization.model'
 import { Keyword, UserFeedback } from './model/record'
+import { KeywordType } from './model/thesaurus'
 
 export abstract class PlatformServiceInterface {
   abstract getType(): string
@@ -15,7 +16,10 @@ export abstract class PlatformServiceInterface {
   ): Observable<UserModel[]>
   abstract getOrganizations(): Observable<Organization[]>
   abstract translateKey(key: string): Observable<string>
-  abstract searchKeywords(query: string): Observable<Keyword[]>
+  abstract searchKeywords(
+    query: string,
+    keywordTypes: KeywordType[]
+  ): Observable<Keyword[]>
   abstract getKeywordsByUri(uri: string): Observable<Keyword[]>
   abstract getUserFeedbacks(recordUuid: string): Observable<UserFeedback[]>
   abstract postUserFeedbacks(recordUuid: UserFeedback): Observable<void>

libs/feature/editor/src/lib/components/record-form/form-field/form-field-keywords/form-field-keywords.component.ts

@@ -35,13 +35,15 @@ export class FormFieldKeywordsComponent {
   }
 
   autoCompleteAction = (query: string) => {
-    return this.platformService.searchKeywords(query).pipe(
-      map((keywords) =>
-        keywords.map((keyword) => {
-          return { title: keyword.label, value: keyword }
-        })
+    return this.platformService
+      .searchKeywords(query, ['temporal', 'theme', 'other'])
+      .pipe(
+        map((keywords) =>
+          keywords.map((keyword) => {
+            return { title: keyword.label, value: keyword }
+          })
+        )
       )
-    )
   }
 
   constructor(private platformService: PlatformServiceInterface) {}

translations/de.json

@@ -126,7 +126,7 @@
   "datahub.header.lastRecords": "Die neuesten",
   "datahub.header.myfavorites": "Meine Favoriten",
   "datahub.header.news": "Startseite",
-  "datahub.header.organisations": "Organisationen",
+  "datahub.header.organizations": "Organisationen",
   "datahub.header.popularRecords": "Die beliebtesten",
   "datahub.header.title.html": "<div class=\"text-white\">Entdecken Sie offene<br> Daten meiner Organisation</div>",
   "datahub.news.contact.contactus": "Kontaktieren Sie uns",
@@ -162,6 +162,7 @@
   "downloads.format.unknown": "unbekannt",
   "downloads.wfs.featuretype.not.found": "Der Layer wurde nicht gefunden",
   "dropFile": "Datei ablegen",
+  "editor.record.form.keywords": "Schlagwörter",
   "editor.record.form.license": "Lizenz",
   "editor.record.form.license.cc-by": "",
   "editor.record.form.license.cc-by-sa": "",
@@ -261,12 +262,10 @@
   "organisations.sortBy.nameDesc": "Name Z → A",
   "organisations.sortBy.recordCountAsc": "Veröffentlichungen 0 → 9",
   "organisations.sortBy.recordCountDesc": "Veröffentlichungen 9 → 0",
-  "organization.header.recordCount": "{count, plural, =0{} one{} other{}}",
-  "organization.details.publishedDataset": "{count, plural, =0{} one{} other{}}",
+  "organization.details.lastPublishedDatasets": "",
+  "organization.details.lastPublishedDatasets.searchAllButton": "",
   "organization.details.mailContact": "",
-  "organization.datasets": "",
-  "organization.lastPublishedDatasets": "",
-  "organization.lastPublishedDatasets.searchAllButton": "",
+  "organization.header.recordCount": "{count, plural, =0{} one{} other{}}",
   "pagination.nextPage": "Nächste Seite",
   "pagination.page": "Seite",
   "pagination.pageOf": "von",
@@ -364,11 +363,11 @@
   "results.sortBy.relevancy": "Relevanz",
   "search.autocomplete.error": "Vorschläge konnten nicht abgerufen werden:",
   "search.error.couldNotReachApi": "Die API konnte nicht erreicht werden",
+  "search.error.organizationHasNoDataset": "",
+  "search.error.organizationNotFound": "",
   "search.error.receivedError": "Ein Fehler ist aufgetreten",
   "search.error.recordHasnolink": "",
   "search.error.recordNotFound": "Der Datensatz mit der Kennung \"{ id }\" konnte nicht gefunden werden.",
-  "search.error.organizationNotFound": "",
-  "search.error.organizationHasNoDataset": "",
   "search.field.any.placeholder": "Suche Datensätze ...",
   "search.field.sortBy": "Sortieren nach:",
   "search.filters.clear": "Zurücksetzen",