geonetwork-ui 2.10.0-dev.dc713c01a → 2.10.0-dev.e2dc4fd62

package/src/libs/api/metadata-converter/src/lib/fixtures/georhena.records.ts

@@ -206,6 +206,7 @@ export const GEORHENA_REUSE_SOLAIRE_RECORD: ReuseRecord = {
     },
   },
   lineage: null,
+  sourceRecords: [],
   temporalExtents: [
     {
       start: new Date('2016-01-01T00:00:00.000Z'),

package/src/libs/api/metadata-converter/src/lib/fixtures/metadata-for-i18n.records.ts

@@ -2170,6 +2170,7 @@ export const METADATA_FOR_I18N_DATASET_RECORD: DatasetRecord = {
   },
   status: 'completed',
   lineage: 'This is a statement about the lineage.',
+  sourceRecords: [],
   spatialRepresentation: 'vector',
   temporalExtents: [],
   updateFrequency: 'continual',
@@ -4234,6 +4235,7 @@ export const METADATA_FOR_I18N_NO_OTHERLANGUAGE: DatasetRecord = {
   translations: { lineage: {}, title: {}, abstract: {} },
   status: 'completed',
   lineage: 'This is a statement about the lineage.',
+  sourceRecords: [],
   spatialRepresentation: 'vector',
   temporalExtents: [],
   updateFrequency: 'continual',

package/src/libs/api/metadata-converter/src/lib/fixtures/metawal.records.ts

@@ -419,6 +419,7 @@ Cette donnée a été intégrée dans la base de données routière (BDR). Les D
 
 Ces données, intégrées dans la Banque de Données routières (BDR), ont fait l’objet d’une mise à jour massive en 2014-2015.
 Depuis, ce sont les Districts routiers qui assurent la tenue à jour de ces informations directement dans la base de données.`,
+  sourceRecords: [],
   otherConstraints: [],
   overviews: [
     {

package/src/libs/api/metadata-converter/src/lib/fixtures/opendataswiss.records.ts

@@ -370,6 +370,7 @@ export const OPENDATASWISS_DATASET_RECORD: DatasetRecord = {
     'http://dcat-ap.ch/vocabulary/themes/geography',
   ],
   lineage: '',
+  sourceRecords: [],
   ownerOrganization: {
     name: 'Bundesamt für Energie',
   },

package/src/libs/api/metadata-converter/src/lib/fixtures/sextant.records.ts

@@ -82,6 +82,7 @@ export const SEXTANT_BATHYMETRY_DATASET_RECORD: DatasetRecord = {
                 Le pas de la grille est de 25m.
                 Produit interne Ifremer.`,
   lineage: '',
+  sourceRecords: [],
   ownerOrganization: null,
   recordUpdated: new Date('2020-06-03T22:34:05.000Z'),
   resourceUpdated: new Date('2020-06-03T22:34:05.000Z'),
@@ -322,6 +323,7 @@ export const SEXTANT_CURRENTS_DATASET_RECORD: CatalogRecord = {
   ],
   lineage:
     'Sallée, J.B.; Speer, K and Morrow, R. Southern Ocean fronts and their variability to climate modes, Journ. of Climate, 2008, Vol. 21(12), pp. 3020-3039',
+  sourceRecords: [],
   onlineResources: [
     {
       name: 'Digital Object Identifier (DOI)',

package/src/libs/api/metadata-converter/src/lib/fixtures/vlaanderen.dcat-ap.records.ts

@@ -68,6 +68,7 @@ export const VLAANDEREN_DATASET_RECORD: DatasetRecord = {
   temporalExtents: [],
   topics: ['biodiversity'],
   lineage: '',
+  sourceRecords: [],
   recordUpdated: new Date('2024-09-19T01:15:09.732Z'),
   resourceUpdated: new Date('2021-04-14T11:15+02:00'),
   status: 'completed',

package/src/libs/api/metadata-converter/src/lib/fixtures/wallonie.records.reuse.ts

@@ -447,5 +447,13 @@ export const WALLONIE_REUSE_SPW_RECORD: ReuseRecord = {
     'https://metawal.wallonie.be/geonetwork/srv/api/records/83809bcd-1763-4d28-b820-2b9828083ba5'
   ),
   lineage: "L'application a été développée sur base de l'API GeoViewer",
+  sourceRecords: [
+    {
+      uuid: 'ee965118-2416-4d48-b07e-bbc696f002c2',
+      title:
+        'SCoT (Schéma de cohérence territoriale) en région Hauts-de-France',
+      href: 'https://metawal.wallonie.be/geonetwork/srv/api/records/ee965118-2416-4d48-b07e-bbc696f002c2',
+    },
+  ],
   temporalExtents: [],
 }

package/src/libs/api/metadata-converter/src/lib/gn4/atomic-operations.ts

@@ -101,27 +101,68 @@ export const mapContact = (
   }
 }
 
-export const mapKeywords = (thesauri: Thesaurus[], language: string) => {
+export interface KeywordTree {
+  default?: string[]
+}
+
+/**
+ * Resolves a keyword's ancestor path within its thesaurus tree, or null for a
+ * root-level keyword (no ancestors to show). Tree entries are `^`-joined label
+ * paths (default language); they aren't index-aligned with the keywords, so we
+ * match on the last segment (not by position/URI), shortest path on poly-hierarchy.
+ */
+export const getKeywordHierarchyPath = (
+  keywordDefaultLabel: string,
+  tree?: KeywordTree | null
+): string[] | null => {
+  if (!keywordDefaultLabel || !tree?.default) return null
+  const shortest = tree.default
+    .map((entry) => entry.split('^'))
+    .filter((path) => path[path.length - 1] === keywordDefaultLabel)
+    .reduce(
+      (shortest, path) =>
+        !shortest || path.length < shortest.length ? path : shortest,
+      null
+    )
+  return shortest?.length > 1 ? shortest : null
+}
+
+export const mapKeywords = (
+  thesauri: Record<string, Thesaurus>,
+  language: string,
+  source?: SourceWithUnknownProps
+) => {
   const keywords = []
   for (const thesaurusId in thesauri) {
     const rawThesaurus = thesauri[thesaurusId]
+    // thesauri have an `id` (registered) or a `multilingualTitle` (cited);
+    // free-keyword groups only have a machine-key `title` like "otherKeywords-theme"
+    const { id, multilingualTitle, link = null } = rawThesaurus
     let thesaurus = null
-    if (rawThesaurus.id) {
-      const thesaurusSource: SourceWithUnknownProps = { ...rawThesaurus }
-      const url = getAsUrl(selectField(thesaurusSource, 'link'))
-      const name = selectField(thesaurusSource, 'title')
+    if (id || multilingualTitle) {
+      const url = getAsUrl(link)
+      const name = multilingualTitle
+        ? selectTranslatedValue<string>(multilingualTitle, language)
+        : rawThesaurus.title
       thesaurus = {
-        id: rawThesaurus.id,
+        ...(id && { id }),
         ...(name && { name }),
         ...(url && { url }),
       }
     }
+    const tree =
+      source && selectField<KeywordTree>(source, `${thesaurusId}_tree`)
+    // free-keyword groups have no `theme` field; their type is in the group key
+    const typeCode =
+      rawThesaurus.theme || thesaurusId.match(/otherKeywords-(\w+)$/)?.[1]
     for (const keyword of rawThesaurus.keywords) {
+      const hierarchyPath = getKeywordHierarchyPath(keyword.default, tree)
       keywords.push({
         label: selectTranslatedValue<string>(keyword, language),
-        type: getKeywordTypeFromKeywordTypeCode(rawThesaurus.theme),
+        type: getKeywordTypeFromKeywordTypeCode(typeCode),
         ...(keyword.link && { key: keyword.link }),
         ...(thesaurus && { thesaurus }),
+        ...(hierarchyPath && { hierarchyPath }),
       })
     }
   }

package/src/libs/api/metadata-converter/src/lib/gn4/gn4.converter.ts

@@ -24,6 +24,7 @@ export class Gn4Converter extends BaseConverter<Gn4Record> {
       kind: 'dataset',
       status: null,
       lineage: null,
+      sourceRecords: [],
       recordUpdated: null,
       recordPublished: null,
       ownerOrganization: null,

package/src/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.ts

@@ -14,7 +14,7 @@ import {
   toDate,
 } from './atomic-operations'
 import { MetadataUrlService } from './metadata-url.service'
-import { Injectable, inject } from '@angular/core'
+import { inject, Injectable } from '@angular/core'
 import { getStatusFromStatusCode } from '../iso19139/utils/status.mapper'
 import { getUpdateFrequencyFromFrequencyCode } from '../iso19139/utils/update-frequency.mapper'
 import {
@@ -49,7 +49,7 @@ export class Gn4FieldMapper {
   private translateService = inject(TranslateService)
 
   private get getLocalizedIndexKey() {
-    return `lang${toLang3(this.translateService.currentLang)}`
+    return `lang${toLang3(this.translateService.getCurrentLang())}`
   }
 
   protected fields: Record<string, EsFieldMapperFn> = {
@@ -240,8 +240,9 @@ export class Gn4FieldMapper {
     allKeywords: (output, source) => ({
       ...output,
       keywords: mapKeywords(
-        selectField<Thesaurus[]>(source, 'allKeywords'),
-        this.getLocalizedIndexKey
+        selectField<Record<string, Thesaurus>>(source, 'allKeywords'),
+        this.getLocalizedIndexKey,
+        source
       ),
     }),
     inspireTheme: (output, source) => ({

package/src/libs/api/metadata-converter/src/lib/gn4/metadata-url.service.ts

@@ -1,4 +1,4 @@
-import { Injectable, inject } from '@angular/core'
+import { inject, Injectable } from '@angular/core'
 import { Configuration } from '../../../../../../libs/data-access/gn4/src'
 import { TranslateService } from '@ngx-translate/core'
 import { toLang3 } from '../../../../../../libs/util/i18n/src'
@@ -13,7 +13,7 @@ export class MetadataUrlService {
   getUrl(uuid: string, apiPath: string = this.apiConfiguration.basePath) {
     const prefix = `${apiPath}/../`
     return `${prefix}${toLang3(
-      this.translate.currentLang
+      this.translate.getCurrentLang()
     )}/catalog.search#/metadata/${uuid}`
   }
 }

package/src/libs/api/metadata-converter/src/lib/gn4/types/metadata.model.ts

@@ -62,6 +62,7 @@ type ThesaurusName = string
 export interface Thesaurus {
   id?: string
   title?: string
+  multilingualTitle?: MultilingualField
   theme?: string
   link?: string
   keywords: MultilingualField[]

package/src/libs/api/metadata-converter/src/lib/iso19115-3/iso19115-3.converter.ts

@@ -9,6 +9,7 @@ import {
   readKind,
   readLandingPage,
   readLineage,
+  readSourceRecords,
   readOnlineResources,
   readOtherLanguages,
   readOwnerOrganization,
@@ -25,6 +26,7 @@ import {
   writeKind,
   writeLandingPage,
   writeLineage,
+  writeSourceRecords,
   writeOnlineResources,
   writeOtherLanguages,
   writeRecordCreated,
@@ -53,6 +55,7 @@ export class Iso191153Converter extends Iso19139Converter {
     this.readers['ownerOrganization'] = readOwnerOrganization
     this.readers['landingPage'] = readLandingPage
     this.readers['lineage'] = readLineage
+    this.readers['sourceRecords'] = readSourceRecords
     this.readers['onlineResources'] = readOnlineResources
     this.readers['defaultLanguage'] = readDefaultLanguage
     this.readers['otherLanguages'] = readOtherLanguages
@@ -72,6 +75,7 @@ export class Iso191153Converter extends Iso19139Converter {
     this.writers['ownerOrganization'] = () => undefined // fixme: find a way to store this value properly
     this.writers['landingPage'] = writeLandingPage
     this.writers['lineage'] = writeLineage
+    this.writers['sourceRecords'] = writeSourceRecords
     this.writers['onlineResources'] = writeOnlineResources
     this.writers['status'] = writeStatus
     this.writers['spatialRepresentation'] = writeSpatialRepresentation
@@ -167,6 +171,9 @@ export class Iso191153Converter extends Iso19139Converter {
       'gmd:fileName': 'mcc:fileName',
       'gmd:fileDescription': 'mcc:fileDescription',
 
+      // lineage sources
+      'gmd:source': 'mrl:source',
+
       // no more URL elements
       'gmd:URL': 'gco:CharacterString',
     })

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

@@ -21,6 +21,7 @@ import {
   extractCharacterString,
   extractDatasetOnlineResources,
   extractDateTime,
+  extractSourceRecords,
   extractLocalizedCharacterString,
   extractReuseOnlineResources,
   extractRole,
@@ -31,6 +32,7 @@ import {
 import {
   Individual,
   LanguageCode,
+  SourceRecord,
   OnlineResource,
   Organization,
   OrganizationTranslations,
@@ -291,6 +293,12 @@ export function readLineage(
   )(rootEl)
 }
 
+export function readSourceRecords(rootEl: XmlElement): SourceRecord[] {
+  return extractSourceRecords(
+    pipe(findNestedElement('mdb:resourceLineage', 'mrl:LI_Lineage'))(rootEl)
+  )
+}
+
 function extractDateInfo(
   type: 'creation' | 'revision' | 'publication'
 ): ChainableFunction<XmlElement, Date> {

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

@@ -34,6 +34,7 @@ import {
 } from '../function-utils'
 import {
   appendKeywords,
+  appendSourceRecords,
   appendOnlineResource,
   appendServiceOnlineResources,
   createDistributionInfo,
@@ -564,3 +565,10 @@ export function writeOtherLanguages(record: DatasetRecord, rootEl: XmlElement) {
     )
   )(rootEl)
 }
+
+export function writeSourceRecords(record: DatasetRecord, rootEl: XmlElement) {
+  pipe(
+    findNestedChildOrCreate('mdb:resourceLineage', 'mrl:LI_Lineage'),
+    appendSourceRecords(record.sourceRecords)
+  )(rootEl)
+}

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

@@ -30,6 +30,7 @@ import {
   readLegalConstraints,
   readLicenses,
   readLineage,
+  readSourceRecords,
   readOnlineResources,
   readOtherConstraints,
   readOtherLanguages,
@@ -62,6 +63,7 @@ import {
   writeLegalConstraints,
   writeLicenses,
   writeLineage,
+  writeSourceRecords,
   writeOnlineResources,
   writeOtherConstraints,
   writeRecordUpdated,
@@ -112,6 +114,7 @@ export class Iso19139Converter extends BaseConverter<string> {
     spatialRepresentation: readSpatialRepresentation,
     overviews: readOverviews,
     lineage: readLineage,
+    sourceRecords: readSourceRecords,
     onlineResources: readOnlineResources,
     temporalExtents: readTemporalExtents,
     spatialExtents: readSpatialExtents,
@@ -153,6 +156,7 @@ export class Iso19139Converter extends BaseConverter<string> {
     spatialRepresentation: writeSpatialRepresentation,
     overviews: writeGraphicOverviews,
     lineage: writeLineage,
+    sourceRecords: writeSourceRecords,
     onlineResources: writeOnlineResources,
     temporalExtents: writeTemporalExtents,
     spatialExtents: writeSpatialExtents,
@@ -295,6 +299,7 @@ export class Iso19139Converter extends BaseConverter<string> {
       )
       const temporalExtents = this.readers['temporalExtents'](rootEl, tr)
       const lineage = this.readers['lineage'](rootEl, tr)
+      const sourceRecords = this.readers['sourceRecords'](rootEl, tr)
       const updateFrequency = this.readers['updateFrequency'](rootEl, tr)
 
       return this.afterRecordRead({
@@ -302,6 +307,7 @@ export class Iso19139Converter extends BaseConverter<string> {
         kind,
         status,
         lineage,
+        ...(sourceRecords && { sourceRecords }),
         ...(spatialRepresentation && { spatialRepresentation }),
         temporalExtents,
         updateFrequency,
@@ -309,6 +315,7 @@ export class Iso19139Converter extends BaseConverter<string> {
       } as DatasetRecord)
     } else if (kind === 'reuse') {
       const lineage = this.readers['lineage'](rootEl, tr)
+      const sourceRecords = this.readers['sourceRecords'](rootEl, tr)
       const temporalExtents = this.readers['temporalExtents'](rootEl, tr)
       const reuseType = this.readers['reuseType'](rootEl, tr)
 
@@ -316,6 +323,7 @@ export class Iso19139Converter extends BaseConverter<string> {
         ...this.readBaseRecord(rootEl, tr),
         kind,
         lineage,
+        ...(sourceRecords && { sourceRecords }),
         temporalExtents,
         reuseType,
       } as ReuseRecord)
@@ -411,7 +419,10 @@ export class Iso19139Converter extends BaseConverter<string> {
         this.writers['spatialExtents'](record, rootEl)
       ;(fieldChanged('lineage') || fieldChanged('translations')) &&
         this.writers['lineage'](record, rootEl)
+      fieldChanged('sourceRecords') &&
+        this.writers['sourceRecords'](record, rootEl)
     }
+
     fieldChanged('otherLanguages') &&
       this.writers['otherLanguages'](record, rootEl)
 

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

@@ -8,6 +8,7 @@ import {
   Keyword,
   KeywordTranslations,
   LanguageCode,
+  SourceRecord,
   ModelTranslations,
   OnlineLinkResource,
   OnlineResource,
@@ -894,6 +895,38 @@ export function readLineage(
   )(rootEl)
 }
 
+export function extractSourceRecords(liLineageEl: XmlElement): SourceRecord[] {
+  if (!liLineageEl) return []
+  return pipe(
+    findChildrenElement('gmd:source', false),
+    mapArray((el) => {
+      const uuid = readAttribute('uuidref')(el)
+      const title = readAttribute('xlink:title')(el)
+      const href = readAttribute('xlink:href')(el)
+      if (!uuid && !title && !href) return null
+      return {
+        ...(uuid ? { uuid } : {}),
+        ...(title ? { title } : {}),
+        ...(href ? { href } : {}),
+      } as SourceRecord
+    }),
+    filterArray((s): s is SourceRecord => s !== null)
+  )(liLineageEl)
+}
+
+export function readSourceRecords(rootEl: XmlElement): SourceRecord[] {
+  return extractSourceRecords(
+    pipe(
+      findNestedElement(
+        'gmd:dataQualityInfo',
+        'gmd:DQ_DataQuality',
+        'gmd:lineage',
+        'gmd:LI_Lineage'
+      )
+    )(rootEl)
+  )
+}
+
 export function readUpdateFrequency(rootEl: XmlElement): UpdateFrequency {
   return pipe(
     findIdentification(),

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

@@ -8,6 +8,7 @@ import {
   Individual,
   Keyword,
   LanguageCode,
+  SourceRecord,
   RecordStatus,
   RecordTranslations,
   ReuseRecord,
@@ -1231,6 +1232,38 @@ export function writeLineage(record: DatasetRecord, rootEl: XmlElement) {
   )(rootEl)
 }
 
+export function appendSourceRecords(
+  sources: SourceRecord[]
+): ChainableFunction<XmlElement, XmlElement> {
+  return pipe(
+    removeChildrenByName('gmd:source'),
+    appendChildren(
+      ...sources
+        .filter((source) => source.uuid || source.title || source.href)
+        .map((source) =>
+          pipe(
+            createElement('gmd:source'),
+            source.uuid ? writeAttribute('uuidref', source.uuid) : noop,
+            source.title ? writeAttribute('xlink:title', source.title) : noop,
+            source.href ? writeAttribute('xlink:href', source.href) : noop
+          )
+        )
+    )
+  )
+}
+
+export function writeSourceRecords(record: DatasetRecord, rootEl: XmlElement) {
+  pipe(
+    findNestedChildOrCreate(
+      'gmd:dataQualityInfo',
+      'gmd:DQ_DataQuality',
+      'gmd:lineage',
+      'gmd:LI_Lineage'
+    ),
+    appendSourceRecords(record.sourceRecords)
+  )(rootEl)
+}
+
 export function getServiceEndpointProtocol(endpoint: ServiceEndpoint): string {
   switch (endpoint.accessServiceProtocol.toLowerCase()) {
     case 'wfs':

package/src/libs/api/repository/src/lib/gn4/auth/auth.service.ts

@@ -1,4 +1,4 @@
-import { Injectable, InjectionToken, inject } from '@angular/core'
+import { inject, Injectable, InjectionToken } from '@angular/core'
 import { toLang2, toLang3 } from '../../../../../../../libs/util/i18n/src'
 import { TranslateService } from '@ngx-translate/core'
 import { Location } from '@angular/common'
@@ -44,8 +44,12 @@ export class AuthService {
           window.location.href
         ).toString()
       )
-      .replace('${lang2}', toLang2(this.translateService.currentLang))
-      .replace('${lang3}', toLang3(this.translateService.currentLang))
+      .replace(
+        '${current_path}',
+        this.location.prepareExternalUrl(this.location.path())
+      )
+      .replace('${lang2}', toLang2(this.translateService.getCurrentLang()))
+      .replace('${lang3}', toLang3(this.translateService.getCurrentLang()))
   }
 
   get logoutUrl() {
@@ -55,7 +59,7 @@ export class AuthService {
   get settingsUrl() {
     return this.baseSettingsUrl.replace(
       '${lang3}',
-      toLang3(this.translateService.currentLang)
+      toLang3(this.translateService.getCurrentLang())
     )
   }
 }

package/src/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.ts

@@ -1,4 +1,4 @@
-import { Injectable, Injector, inject } from '@angular/core'
+import { inject, Injectable, Injector } from '@angular/core'
 import type { Geometry } from 'geojson'
 import {
   ES_QUERY_FIELDS_PRIORITY,
@@ -234,7 +234,7 @@ export class ElasticsearchService {
     if (this.metadataLang) {
       const lang3 = toLang3(
         this.isCurrentSearchLang()
-          ? this.translateService.currentLang
+          ? this.translateService.getCurrentLang()
           : this.metadataLang
       )
       return `lang${lang3}`