geonetwork-ui 2.4.0-dev.cd525aa1 → 2.4.0-dev.d5b28b1e

package/src/libs/api/metadata-converter/src/lib/iso19139/read-parts.ts

@@ -4,7 +4,6 @@ import {
   GraphicOverview,
   Individual,
   Keyword,
-  KeywordThesaurus,
   Organization,
   RecordKind,
   RecordStatus,
@@ -14,6 +13,8 @@ import {
   UpdateFrequency,
   UpdateFrequencyCustom,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { ThesaurusModel } from '../../../../../../libs/common/domain/src/lib/model/thesaurus'
+import { Geometry } from 'geojson'
 import { matchMimeType, matchProtocol } from '../common/distribution.mapper'
 import {
   ChainableFunction,
@@ -27,15 +28,17 @@ import {
   pipe,
 } from '../function-utils'
 import {
-  XmlElement,
   findChildElement,
   findChildrenElement,
   findNestedElement,
   findNestedElements,
   findParent,
+  firstChildElement,
   readAttribute,
   readText,
+  XmlElement,
 } from '../xml-utils'
+import { readGeometry } from './utils/geometry'
 import { fullNameToParts } from './utils/individual-name'
 import { getKeywordTypeFromKeywordTypeCode } from './utils/keyword.mapper'
 import { getRoleFromRoleCode } from './utils/role.mapper'
@@ -66,6 +69,14 @@ export function extractDateTime(): ChainableFunction<XmlElement, Date> {
   )
 }
 
+export function extractDecimal(): ChainableFunction<XmlElement, number> {
+  return pipe(
+    findChildElement('gco:Decimal', false),
+    readText(),
+    map((numberStr) => (numberStr ? Number(numberStr) : null))
+  )
+}
+
 export function extractUrl(): ChainableFunction<XmlElement, URL> {
   const getUrl = pipe(findChildElement('gmd:URL', false), readText())
   const getCharacterString = pipe(
@@ -609,7 +620,7 @@ export function readContactsForResource(rootEl: XmlElement): Individual[] {
 }
 
 // from gmd:thesaurusName
-export function readThesaurus(rootEl: XmlElement): KeywordThesaurus {
+export function readThesaurus(rootEl: XmlElement): ThesaurusModel {
   if (!rootEl) return null
 
   const findIdentifier = findNestedElement(
@@ -895,3 +906,62 @@ export function readTemporalExtents(rootEl: XmlElement) {
     })
   )(rootEl)
 }
+
+export function readSpatialExtents(rootEl: XmlElement) {
+  const extractGeometry = (rootEl: XmlElement): Geometry => {
+    if (!rootEl) return null
+    return pipe(
+      findChildElement('gmd:polygon', false),
+      firstChildElement,
+      map((el) => readGeometry(el))
+    )(rootEl)
+  }
+
+  const extractBBox = (
+    rootEl: XmlElement
+  ): [number, number, number, number] => {
+    if (!rootEl) return null
+    return pipe(
+      combine(
+        pipe(findChildElement('gmd:westBoundLongitude'), extractDecimal()),
+        pipe(findChildElement('gmd:southBoundLatitude'), extractDecimal()),
+        pipe(findChildElement('gmd:eastBoundLongitude'), extractDecimal()),
+        pipe(findChildElement('gmd:northBoundLatitude'), extractDecimal())
+      )
+    )(rootEl)
+  }
+
+  const extractDescription = (rootEl: XmlElement): string => {
+    if (!rootEl) return null
+    return pipe(
+      findNestedElement(
+        'gmd:geographicIdentifier',
+        'gmd:MD_Identifier',
+        'gmd:code'
+      ),
+      extractCharacterString()
+    )(rootEl)
+  }
+
+  return pipe(
+    findIdentification(),
+    findNestedElements('gmd:extent', 'gmd:EX_Extent', 'gmd:geographicElement'),
+    mapArray(
+      combine(
+        pipe(findChildElement('gmd:EX_BoundingPolygon'), extractGeometry),
+        pipe(findChildElement('gmd:EX_GeographicBoundingBox'), extractBBox),
+        pipe(
+          findChildElement('gmd:EX_GeographicDescription'),
+          extractDescription
+        )
+      )
+    ),
+    mapArray(([geometry, bbox, description]) => {
+      return {
+        ...(geometry && { geometry }),
+        ...(bbox && { bbox }),
+        ...(description && { description }),
+      }
+    })
+  )(rootEl)
+}

package/src/libs/api/metadata-converter/src/lib/iso19139/utils/geometry.ts

@@ -0,0 +1,39 @@
+import { XmlElement } from '@rgrove/parse-xml'
+import { Geometry } from 'geojson'
+import GML32 from 'ol/format/GML32'
+import GeoJSON from 'ol/format/GeoJSON'
+import { parse } from 'ol/xml'
+import {
+  createDocument,
+  getRootElement,
+  parseXmlString,
+  xmlToString,
+} from '../../xml-utils'
+
+export function readGeometry(el: XmlElement): Geometry {
+  const xmlDoc = createDocument(el)
+  xmlDoc.root.attributes['xmlns'] = 'http://www.opengis.net/gml/3.2'
+  const gmlString = xmlToString(xmlDoc)
+  const doc = parse(gmlString)
+  // we need an intermediate node to be able to parse the GML
+  const node = document.createElement('pre')
+  node.appendChild(doc.documentElement)
+  const gml32Format = new GML32()
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  const geometry = gml32Format.readGeometryFromNode(node)
+  const geojsonFormat = new GeoJSON()
+  return geojsonFormat.writeGeometryObject(geometry)
+}
+
+export function writeGeometry(geometryObject: Geometry): XmlElement {
+  const geojsonFormat = new GeoJSON()
+  const geometry = geojsonFormat.readGeometry(geometryObject)
+  const gml32Format = new GML32()
+  const node = gml32Format.writeGeometryNode(geometry)
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  const element = node.firstElementChild as HTMLElement
+  const gmlString = new XMLSerializer().serializeToString(element)
+  return getRootElement(parseXmlString(gmlString))
+}

package/src/libs/api/metadata-converter/src/lib/iso19139/utils/keyword.mapper.ts

@@ -1,4 +1,4 @@
-import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/record'
+import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus'
 
 export function getKeywordTypeFromKeywordTypeCode(
   typeCode: string

package/src/libs/api/metadata-converter/src/lib/iso19139/write-parts.ts

@@ -6,7 +6,6 @@ import {
   DatasetServiceDistribution,
   Individual,
   Keyword,
-  KeywordThesaurus,
   RecordStatus,
   Role,
   ServiceEndpoint,
@@ -15,7 +14,9 @@ import {
   UpdateFrequencyCode,
   UpdateFrequencyCustom,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { ThesaurusModel } from '../../../../../../libs/common/domain/src/lib/model/thesaurus'
 import format from 'date-fns/format'
+import { Geometry } from 'geojson'
 import {
   ChainableFunction,
   fallback,
@@ -45,6 +46,7 @@ import {
   setTextContent,
 } from '../xml-utils'
 import { readKind } from './read-parts'
+import { writeGeometry } from './utils/geometry'
 import { namePartsToFull } from './utils/individual-name'
 
 export function writeCharacterString(
@@ -101,6 +103,14 @@ export function writeDate(
   )
 }
 
+export function writeDecimal(
+  decimal: number
+): ChainableFunction<XmlElement, XmlElement> {
+  return tap(
+    pipe(findChildOrCreate('gco:Decimal'), setTextContent(decimal.toString()))
+  )
+}
+
 export function getProgressCode(status: RecordStatus): string {
   switch (status) {
     case 'completed':
@@ -367,7 +377,7 @@ export function removeKeywords() {
 }
 
 // returns a <gmd:thesaurusName> element
-export function createThesaurus(thesaurus: KeywordThesaurus) {
+export function createThesaurus(thesaurus: ThesaurusModel) {
   return pipe(
     createElement('gmd:thesaurusName'),
     createChild('gmd:CI_Citation'),
@@ -1184,3 +1194,62 @@ export function writeTemporalExtents(
     )
   )(rootEl)
 }
+
+export function writeSpatialExtents(record: DatasetRecord, rootEl: XmlElement) {
+  const appendBoundingPolygon = (geometry?: Geometry) => {
+    if (!geometry) return null
+    return pipe(
+      createElement('gmd:EX_BoundingPolygon'),
+      appendChildren(
+        pipe(
+          createElement('gmd:polygon'),
+          appendChildren(() => writeGeometry(geometry))
+        )
+      )
+    )
+  }
+
+  const appendGeographicBoundingBox = (
+    bbox?: [number, number, number, number]
+  ) => {
+    if (!bbox) return null
+    return pipe(
+      createElement('gmd:EX_GeographicBoundingBox'),
+      appendChildren(
+        pipe(createElement('gmd:westBoundLongitude'), writeDecimal(bbox[0])),
+        pipe(createElement('gmd:eastBoundLongitude'), writeDecimal(bbox[2])),
+        pipe(createElement('gmd:southBoundLatitude'), writeDecimal(bbox[1])),
+        pipe(createElement('gmd:northBoundLatitude'), writeDecimal(bbox[3]))
+      )
+    )
+  }
+
+  const appendGeographicDescription = (description?: string) => {
+    if (!description) return null
+    return pipe(
+      createElement('gmd:EX_GeographicDescription'),
+      createChild('gmd:geographicIdentifier'),
+      createChild('gmd:MD_Identifier'),
+      createChild('gmd:code'),
+      writeCharacterString(description)
+    )
+  }
+
+  pipe(
+    findOrCreateIdentification(),
+    findNestedChildOrCreate('gmd:extent', 'gmd:EX_Extent'),
+    removeChildrenByName('gmd:geographicElement'),
+    appendChildren(
+      ...record.spatialExtents.map((extent) =>
+        pipe(
+          createElement('gmd:geographicElement'),
+          appendChildren(
+            appendBoundingPolygon(extent.geometry),
+            appendGeographicBoundingBox(extent.bbox),
+            appendGeographicDescription(extent.description)
+          )
+        )
+      )
+    )
+  )(rootEl)
+}

package/src/libs/api/metadata-converter/src/lib/xml-utils.ts

@@ -6,6 +6,7 @@ import {
   XmlText,
 } from '@rgrove/parse-xml'
 import { ChainableFunction, fallback } from './function-utils'
+
 export { XmlDocument, XmlElement } from '@rgrove/parse-xml'
 
 export class XmlParseError extends Error {
@@ -115,6 +116,10 @@ export function allChildrenElement(element: XmlElement): Array<XmlElement> {
   ] as Array<XmlElement>
 }
 
+export function firstChildElement(element: XmlElement): XmlElement {
+  return allChildrenElement(element)[0] ?? null
+}
+
 /**
  * Will return all matching elements nested according to the given
  * names (similar to a path), starting form the input element;
@@ -228,6 +233,7 @@ export function xmlToString(
 ${padding}<${el.name}${attrs}/>
 ${parentPadding}`
   }
+
   return `
 ${padding}<${el.name}${attrs}>${children}</${el.name}>
 ${parentPadding}`
@@ -307,11 +313,13 @@ function getTreeRoot(element: XmlElement): XmlElement {
 
 // stays on the parent element
 // if the given elements are part of a subtree, will add the root of subtree
+// will filter out falsy elements
 export function appendChildren(
   ...childrenFns: Array<ChainableFunction<void, XmlElement>>
 ): ChainableFunction<XmlElement, XmlElement> {
   return (element) => {
     if (!element) return null
+    childrenFns = childrenFns.filter((fn) => fn)
     element.children.push(...childrenFns.map((fn) => fn()).map(getTreeRoot))
     element.children.forEach((el) => (el.parent = element))
     return element

package/src/libs/api/repository/src/lib/gn4/gn4-repository.ts

@@ -9,6 +9,7 @@ import {
   from,
   Observable,
   of,
+  Subject,
   switchMap,
   throwError,
 } from 'rxjs'
@@ -32,8 +33,13 @@ import {
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { HttpErrorResponse } from '@angular/common/http'
 
+const TEMPORARY_ID_PREFIX = 'TEMP-ID-'
+
 @Injectable()
 export class Gn4Repository implements RecordsRepositoryInterface {
+  _draftsChanged = new Subject<void>()
+  draftsChanged$ = this._draftsChanged.asObservable()
+
   constructor(
     private gn4SearchApi: SearchApiService,
     private gn4SearchHelper: ElasticsearchService,
@@ -230,6 +236,26 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     )
   }
 
+  openRecordForDuplication(
+    uniqueIdentifier: string
+  ): Observable<[CatalogRecord, string, false] | null> {
+    return this.loadRecordAsXml(uniqueIdentifier).pipe(
+      switchMap(async (recordAsXml) => {
+        const converter = findConverterForDocument(recordAsXml)
+        const record = await converter.readRecord(recordAsXml)
+        record.uniqueIdentifier = `${TEMPORARY_ID_PREFIX}${Date.now()}`
+        record.title = `${record.title} (Copy)`
+        const xml = await converter.writeRecord(record, recordAsXml)
+        window.localStorage.setItem(
+          this.getLocalStorageKeyForRecord(record.uniqueIdentifier),
+          xml
+        )
+        this._draftsChanged.next()
+        return [record, xml, false] as [CatalogRecord, string, false]
+      })
+    )
+  }
+
   private serializeRecordToXml(
     record: CatalogRecord,
     referenceRecordSource?: string
@@ -265,28 +291,36 @@ export class Gn4Repository implements RecordsRepositoryInterface {
             undefined,
             recordXml
           )
-          .pipe(map(() => recordXml))
-      ),
-      tap(() => {
-        // if saving was successful, the associated draft can be discarded
-        window.localStorage.removeItem(
-          this.getLocalStorageKeyForRecord(record.uniqueIdentifier)
-        )
-      })
+          .pipe(
+            map((response) => {
+              const metadataId = Object.keys(response.metadataInfos)[0]
+              return response.metadataInfos[metadataId][0].uuid
+            })
+          )
+      )
     )
   }
 
+  deleteRecord(uniqueIdentifier: string): Observable<void> {
+    return this.gn4RecordsApi.deleteRecord(uniqueIdentifier)
+  }
+
+  generateTemporaryId(): string {
+    return `${TEMPORARY_ID_PREFIX}${Date.now()}`
+  }
+
   saveRecordAsDraft(
     record: CatalogRecord,
     referenceRecordSource?: string
   ): Observable<string> {
     return this.serializeRecordToXml(record, referenceRecordSource).pipe(
-      tap((recordXml) =>
+      tap((recordXml) => {
         window.localStorage.setItem(
           this.getLocalStorageKeyForRecord(record.uniqueIdentifier),
           recordXml
         )
-      )
+        this._draftsChanged.next()
+      })
     )
   }
 
@@ -294,6 +328,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     window.localStorage.removeItem(
       this.getLocalStorageKeyForRecord(uniqueIdentifier)
     )
+    this._draftsChanged.next()
   }
 
   recordHasDraft(uniqueIdentifier: string): boolean {
@@ -303,4 +338,22 @@ export class Gn4Repository implements RecordsRepositoryInterface {
       ) !== null
     )
   }
+
+  isRecordNotYetSaved(uniqueIdentifier: string): boolean {
+    return uniqueIdentifier.startsWith(TEMPORARY_ID_PREFIX)
+  }
+
+  // generated by copilot
+  getAllDrafts(): Observable<CatalogRecord[]> {
+    const items = { ...window.localStorage }
+    const drafts = Object.keys(items)
+      .filter((key) => key.startsWith('geonetwork-ui-draft-'))
+      .map((key) => window.localStorage.getItem(key))
+      .filter((draft) => draft !== null)
+    return from(
+      Promise.all(
+        drafts.map((draft) => findConverterForDocument(draft).readRecord(draft))
+      )
+    )
+  }
 }

package/src/libs/api/repository/src/lib/gn4/organizations/organizations-from-groups.service.ts

@@ -76,6 +76,7 @@ export class OrganizationsFromGroupsService
     return {
       name: group.label[lang3],
       ...(group.description && { description: group.description }),
+      ...(group.email && { email: group.email }),
       ...(group.logo && {
         logoUrl: getAsUrl(`${IMAGE_URL}${group.logo}`),
       }),

package/src/libs/api/repository/src/lib/gn4/organizations/organizations-from-metadata.service.ts

@@ -230,10 +230,12 @@ export class OrganizationsFromMetadataService
       if (!group) return fullOrg
       return {
         ...fullOrg,
+        email: emails[0],
         ...(group.description && { description: group.description }),
         ...(group.logo && { logoUrl: getAsUrl(`${IMAGE_URL}${group.logo}`) }),
         ...(group.website && { website: getAsUrl(group.website) }),
-      }
+        ...(group.email && { email: group.email }),
+      } as Organization
     })
   }
 

package/src/libs/api/repository/src/lib/gn4/platform/gn4-platform.mapper.ts

@@ -8,11 +8,16 @@ import { Injectable } from '@angular/core'
 import { AvatarServiceInterface } from '../auth'
 import { map } from 'rxjs/operators'
 import { Observable, of } from 'rxjs'
-import { ThesaurusModel } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus/thesaurus.model'
 import {
+  Keyword,
   UserFeedback,
   UserFeedbackViewModel,
 } from '../../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  KeywordApiResponse,
+  ThesaurusApiResponse,
+} from '../../../../../../../libs/api/metadata-converter/src'
+import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus'
 
 @Injectable()
 export class Gn4PlatformMapper {
@@ -40,7 +45,7 @@ export class Gn4PlatformMapper {
     const {
       enabled,
       emailAddresses,
-      organisation,
+      organization,
       kind,
       lastLoginDate,
       accountNonExpired,
@@ -52,8 +57,12 @@ export class Gn4PlatformMapper {
     return { ...apiUser, id: id.toString() } as UserModel
   }
 
-  thesaurusFromApi(thesaurus: any[], lang3?: string): ThesaurusModel {
-    return thesaurus.map((keyword) => {
+  keywordsFromApi(
+    keywords: KeywordApiResponse[],
+    thesaurus: ThesaurusApiResponse[],
+    lang3?: string
+  ): Keyword[] {
+    return keywords.map((keyword): Keyword => {
       let key = keyword.uri
       // sometines GN can prefix an URI with an "all thesaurus" URI; only keep the last one
       if (key.indexOf('@@@') > -1) {
@@ -65,10 +74,22 @@ export class Gn4PlatformMapper {
         lang3 && lang3 in keyword.definitions
           ? keyword.definitions[lang3]
           : keyword.definition
+
+      const matchedThesaurus = thesaurus.find(
+        (thes) => keyword.thesaurusKey === thes.key
+      )
+
       return {
         key,
         label,
         description,
+        type: matchedThesaurus?.dname as KeywordType,
+        thesaurus: {
+          id: matchedThesaurus?.key,
+          name: matchedThesaurus?.title,
+          url: new URL(matchedThesaurus?.url),
+          type: matchedThesaurus?.dname as KeywordType,
+        },
       }
     })
   }

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { Observable, of, switchMap } from 'rxjs'
+import { Observable, combineLatest, of, switchMap } from 'rxjs'
 import { catchError, map, shareReplay, tap } from 'rxjs/operators'
 import {
   MeApiService,
@@ -12,13 +12,19 @@ import {
 import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { UserModel } from '../../../../../../../libs/common/domain/src/lib/model/user/user.model'
 import {
+  Keyword,
   Organization,
   UserFeedback,
 } from '../../../../../../../libs/common/domain/src/lib/model/record'
 import { Gn4PlatformMapper } from './gn4-platform.mapper'
 import { ltr } from 'semver'
-import { ThesaurusModel } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus/thesaurus.model'
 import { LangService } from '../../../../../../../libs/util/i18n/src'
+import { HttpClient } from '@angular/common/http'
+import {
+  KeywordApiResponse,
+  ThesaurusApiResponse,
+} from '../../../../../../../libs/api/metadata-converter/src'
+import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus'
 
 const minApiVersion = '4.2.2'
 
@@ -60,7 +66,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
    * A map of already loaded thesauri (groups of keywords); the key is a URI
    * @private
    */
-  private thesauri: Record<string, Observable<ThesaurusModel>> = {}
+  private keywordsByThesauri: Record<string, Observable<Keyword[]>> = {}
 
   constructor(
     private siteApiService: SiteApiService,
@@ -70,7 +76,8 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     private toolsApiService: ToolsApiService,
     private registriesApiService: RegistriesApiService,
     private langService: LangService,
-    private userfeedbackApiService: UserfeedbackApiService
+    private userfeedbackApiService: UserfeedbackApiService,
+    private httpClient: HttpClient
   ) {
     this.me$ = this.meApi.getMe().pipe(
       switchMap((apiUser) => this.mapper.userFromMeApi(apiUser)),
@@ -121,7 +128,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
       // the thesaurus URI is inferred by removing a part of the keyword URI
       // this is not exact science but it's OK, we'll still end up loading a bunch of keywords at once anyway
       const thesaurusUri = key.replace(/\/([^/]+)$/, '/')
-      return this.getThesaurusByUri(thesaurusUri).pipe(
+      return this.getKeywordsByUri(thesaurusUri).pipe(
         map((thesaurus) => {
           for (const item of thesaurus) {
             if (item.key === key) return item.label
@@ -133,12 +140,60 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     return this.keyTranslations$.pipe(map((translations) => translations[key]))
   }
 
-  getThesaurusByUri(uri: string): Observable<ThesaurusModel> {
-    if (this.thesauri[uri]) {
-      return this.thesauri[uri]
+  private allThesaurus$ = this.httpClient
+    .get(
+      `${this.registriesApiService.configuration.basePath}/thesaurus?_content_type=json`
+    )
+    .pipe(
+      map((thesaurus) => {
+        return thesaurus[0] as ThesaurusApiResponse[]
+      }),
+      shareReplay(1)
+    )
+
+  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]) => {
+        return this.mapper.keywordsFromApi(
+          keywords,
+          thesaurus,
+          this.langService.iso3
+        )
+      })
+    )
+  }
+
+  getKeywordsByUri(uri: string): Observable<Keyword[]> {
+    if (this.keywordsByThesauri[uri]) {
+      return this.keywordsByThesauri[uri]
     }
-    this.thesauri[uri] = this.registriesApiService
-      .searchKeywords(
+    const keywords$: Observable<KeywordApiResponse[]> =
+      this.registriesApiService.searchKeywords(
         null,
         this.langService.iso3,
         1000,
@@ -147,18 +202,23 @@ export class Gn4PlatformService implements PlatformServiceInterface {
         null,
         null,
         `${uri}*`
-      )
-      .pipe(
-        map((thesaurus) =>
-          this.mapper.thesaurusFromApi(
-            thesaurus as any[],
-            this.langService.iso3
-          )
-        ),
-        shareReplay(1)
-      )
+      ) as Observable<KeywordApiResponse[]>
+
+    this.keywordsByThesauri[uri] = combineLatest([
+      keywords$,
+      this.allThesaurus$,
+    ]).pipe(
+      map(([keywords, thesaurus]) => {
+        return this.mapper.keywordsFromApi(
+          keywords,
+          thesaurus,
+          this.langService.iso3
+        )
+      }),
+      shareReplay(1)
+    )
 
-    return this.thesauri[uri]
+    return this.keywordsByThesauri[uri]
   }
 
   getUserFeedbacks(uuid: string): Observable<UserFeedback[]> {