geonetwork-ui 2.6.0-dev.502fa026d → 2.6.0-dev.531f5a239

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geonetwork-ui",
-  "version": "2.6.0-dev.502fa026d",
+  "version": "2.6.0-dev.531f5a239",
   "engines": {
     "node": ">=20"
   },
@@ -62,7 +62,7 @@
     "@nx/angular": "20.2.2",
     "@rgrove/parse-xml": "4.2.0",
     "alasql": "4.6.0",
-    "axios": "1.7.9",
+    "axios": "1.8.2",
     "basiclightbox": "^5.0.4",
     "chart.js": "4.4.7",
     "chroma-js": "3.1.2",

package/src/libs/api/metadata-converter/src/index.ts

@@ -5,3 +5,4 @@ export * from './lib/gn4'
 export * from './lib/dcat-ap'
 export * from './lib/xml-utils'
 export * from './lib/base.converter'
+export * from './lib/common/resource-types'

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

@@ -1,7 +1,4 @@
-import {
-  CatalogRecord,
-  DatasetRecord,
-} from '../../../../../libs/common/domain/src/lib/model/record'
+import { CatalogRecord } from '../../../../../libs/common/domain/src/lib/model/record'
 
 export class MetadataMapperContext {
   readonly location?

package/src/libs/api/metadata-converter/src/lib/common/distribution.mapper.ts

@@ -4,6 +4,7 @@ export function matchProtocol(protocol: string): ServiceProtocol {
   if (/wms/i.test(protocol)) return 'wms'
   if (/wfs/i.test(protocol)) return 'wfs'
   if (/wmts/i.test(protocol)) return 'wmts'
+  if (/tms/i.test(protocol)) return 'tms'
   if (/wps/i.test(protocol)) return 'wps'
   if (/ogc\W*api\W*features/i.test(protocol)) return 'ogcFeatures'
   if (/esri/i.test(protocol)) return 'esriRest'

package/src/libs/api/metadata-converter/src/lib/common/resource-types.ts

@@ -4,23 +4,37 @@ import {
   ReuseType,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 
-export function getResourceType(type: string): RecordKind {
-  const possibleResourceTypes = {
-    application: 'reuse',
-    dataset: 'dataset',
-    map: 'reuse',
-    'map/static': 'reuse', // old index field
-    'map/interactive': 'reuse', // old index field
-    'map-interactive': 'reuse', // new index field since Oct 10, 2024
-    'map-static': 'reuse', // new index field
-    mapDigital: 'reuse',
-    interactiveMap: 'reuse',
-    staticMap: 'reuse',
-    service: 'service',
-  } as const
+export const PossibleResourceTypes = {
+  application: 'reuse',
+  dataset: 'dataset',
+  interactiveMap: 'reuse',
+  map: 'reuse',
+  'map/static': 'reuse', // old index field
+  'map/interactive': 'reuse', // old index field
+  'map-interactive': 'reuse', // new index field since Oct 10, 2024
+  'map-static': 'reuse', // new index field
+  mapDigital: 'reuse',
+  series: 'dataset',
+  service: 'service',
+  staticMap: 'reuse',
+} as const
+
+type KindType = keyof typeof PossibleResourceTypes
+type ResourceType = 'reuse' | 'dataset' | 'service'
+type PossibleResourceTypesGrouped = {
+  [K in ResourceType]: KindType[]
+}
+
+export const PossibleResourceTypesDefinition = Object.entries(
+  PossibleResourceTypes
+).reduce(
+  (acc, [key, val]) => ((acc[val] ??= []).push(key), acc),
+  {}
+) as PossibleResourceTypesGrouped
 
+export function getResourceType(type: string): RecordKind {
   return (
-    possibleResourceTypes[type as keyof typeof possibleResourceTypes] ||
+    PossibleResourceTypes[type as keyof typeof PossibleResourceTypes] ||
     'dataset'
   )
 }

package/src/libs/api/metadata-converter/src/lib/fixtures/geo2france.records.service+eaux-usees.ts

@@ -174,10 +174,10 @@ export const GEO2FRANCE_SERVICE_EAUXUSEES_RECORD: ServiceRecord = {
   onlineResources: [
     {
       type: 'endpoint',
-      endpointUrl: new URL(
+      url: new URL(
         'https://services.sandre.eaufrance.fr/geo/odp?SERVICE=WFS&VERSION=2.0.0&REQUEST=GetCapabilities'
       ),
-      protocol: 'wfs',
+      accessServiceProtocol: 'wfs',
       description:
         'Ouvrages de dépollution - Système de traitement des eaux usées - France entière',
       translations: {},

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

@@ -617,7 +617,7 @@ Die Quelle ist zu bezeichnen: „Quelle: Stadt Zürich“.`,
   status: 'completed',
   updateFrequency: 'asNeeded',
   defaultLanguage: 'de',
-  otherLanguages: ['fr', 'it', 'en', 'rm'],
+  otherLanguages: ['fr', 'it', 'en', 'rm', 'aar'],
   translations: {
     abstract: {
       en: 'The perimeters of the Alpine Convention in Switzerland. The Alpine Convention is an international treaty between the eight Alpine countries: Germany, France, Italy, Liechtenstein, Monaco, Austria, Switzerland and Slovenia, plus the European Union. The aim of the treaty is to protect the Alps by means of cross-sectoral, integrated and sustainable policies.',
@@ -772,10 +772,10 @@ export const GEOCAT_CH_SERVICE_RECORD: ServiceRecord = {
     },
     {
       type: 'endpoint',
-      endpointUrl: new URL(
+      url: new URL(
         'https://services.geo.sg.ch/wss/service/SG00170_WMS/guest?request=GetCapabilities&service=WMS'
       ),
-      protocol: 'wms',
+      accessServiceProtocol: 'wms',
       description:
         'https://services.geo.sg.ch/wss/service/SG00170_WMS/guest?request=GetCapabilities&service=WMS',
       translations: {

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

@@ -629,10 +629,10 @@ export const METAWAL_SERVICE_RECORD: ServiceRecord = {
     {
       description:
         'Ce service ESRI-REST permet de visualiser la couche de données "Plan parcellaire cadastral - situation 01/01/2016" (uniquement les données du bâti et le parcellaire)',
-      endpointUrl: new URL(
+      url: new URL(
         'https://geoservices.wallonie.be/arcgis/rest/services/PLAN_REGLEMENT/CADMAP_2016_PARCELLES/MapServer'
       ),
-      protocol: 'esriRest',
+      accessServiceProtocol: 'esriRest',
       type: 'endpoint',
       translations: {},
     },

package/src/libs/api/metadata-converter/src/lib/fixtures/wallonie.records.service+napitswallonia.ts

@@ -274,10 +274,10 @@ export const WALLONIE_SERVICE_NAPITSWALLONIA_RECORD: ServiceRecord = {
   onlineResources: [
     {
       type: 'endpoint',
-      endpointUrl: new URL(
+      url: new URL(
         'https://metawal.wallonie.be/geonetwork/api/collections/napits'
       ),
-      protocol: 'other',
+      accessServiceProtocol: 'other',
       description: "Point d'accès OGC API Records pour NAP-ITS-Wallonia.",
       translations: {},
     },

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

@@ -152,12 +152,22 @@ export class Gn4FieldMapper {
       )
       const languages = langList.map((lang) => LANG_3_TO_2_MAPPER[lang])
       const defaultLanguage = output.defaultLanguage ?? languages[0] ?? null // set the first language as main one as fallback
+
+      return {
+        ...output,
+        defaultLanguage,
+      }
+    },
+    otherLanguage: (output, source) => {
+      const langList = getAsArray(selectField<string>(source, 'otherLanguage'))
+      const languages = langList.map((lang) => LANG_3_TO_2_MAPPER[lang])
+      const defaultLanguage = output.defaultLanguage ?? languages[0] ?? null
       const otherLanguages = languages.filter(
         (lang) => lang !== defaultLanguage
       )
+
       return {
         ...output,
-        defaultLanguage,
         otherLanguages,
       }
     },
@@ -294,12 +304,52 @@ export class Gn4FieldMapper {
         ) ?? {},
         '_source'
       )
-      const featureCatalogIdentifier = selectField(
+      const featureCatalogIdentifier: string = selectField(
         <SourceWithUnknownProps>fcatSource,
         'uuid'
       )
-      return featureCatalogIdentifier
-        ? this.addExtra({ featureCatalogIdentifier }, output)
+      const sourceOfLinks = getAsArray(
+        selectField(
+          <SourceWithUnknownProps>selectField(source, 'related'),
+          'hassources'
+        )
+      )
+      const sourceOfIdentifiers: string[] = sourceOfLinks
+        .filter((link) => link['origin'] === 'catalog')
+        .map((link) => {
+          return selectField(
+            selectField(<SourceWithUnknownProps>link, '_source'),
+            'uuid'
+          )
+        })
+      const extraValues: Record<string, string | string[]> = {}
+      if (featureCatalogIdentifier) {
+        extraValues.featureCatalogIdentifier = featureCatalogIdentifier
+      }
+      if (sourceOfIdentifiers && sourceOfIdentifiers.length > 0) {
+        extraValues.sourceOfIdentifiers = sourceOfIdentifiers
+      }
+      return Object.keys(extraValues).length > 0
+        ? this.addExtra(extraValues, output)
+        : output
+    },
+    recordLink: (output, source) => {
+      const recordLinks = getAsArray(
+        selectField<SourceWithUnknownProps[]>(source, 'recordLink')
+      )
+      const sourcesIdentifiers: string[] = recordLinks
+        .filter(
+          (link) => link['origin'] === 'catalog' && link['type'] === 'sources'
+        )
+        .map((link) => selectField(<SourceWithUnknownProps>link, 'to'))
+
+      return sourcesIdentifiers && sourcesIdentifiers.length > 0
+        ? this.addExtra(
+            {
+              sourcesIdentifiers,
+            },
+            output
+          )
         : output
     },
     isPublishedToAll: (output, source) =>
@@ -309,6 +359,13 @@ export class Gn4FieldMapper {
         },
         output
       ),
+    isHarvested: (output, source) =>
+      this.addExtra(
+        {
+          isHarvested: selectField(source, 'isHarvested') !== 'false',
+        },
+        output
+      ),
     edit: (output, source) =>
       this.addExtra(
         {
@@ -430,6 +487,7 @@ export class Gn4FieldMapper {
       /^OGC:WMS/.test(protocol) ||
       /^OGC:WFS/.test(protocol) ||
       /^OGC:WMTS/.test(protocol) ||
+      /TMS/i.test(protocol) ||
       /ogc\W*api\W*features/i.test(protocol) ||
       (/^WWW:DOWNLOAD-/.test(protocol) && /data.geopf.fr/.test(url)) // TO DO : change with the good protocol when decided
     ) {
@@ -460,6 +518,11 @@ export class Gn4FieldMapper {
       ),
       selectField<string>(sourceLink, 'description')
     )
+    const descriptionLink = selectField<object>(sourceLink, 'descriptionObject')
+    const accessRestricted =
+      descriptionLink &&
+      'link' in descriptionLink &&
+      descriptionLink.link.toString().includes('#MD_RestrictionCode_restricted')
     // no url: fail early
     if (url === null) {
       // TODO: collect errors at the record level?
@@ -485,6 +548,7 @@ export class Gn4FieldMapper {
           type,
           url: url,
           accessServiceProtocol,
+          accessRestricted: accessRestricted,
         }
       case 'link':
         return {
@@ -503,8 +567,8 @@ export class Gn4FieldMapper {
         return {
           ...distribution,
           type,
-          endpointUrl: url,
-          protocol: accessServiceProtocol,
+          url: url,
+          accessServiceProtocol: accessServiceProtocol,
         }
     }
   }

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

@@ -164,7 +164,6 @@ export type MetadataObject = Partial<{
   resourceDate: ResourceDate[]
   resourceEdition: string
   resourceIdentifier: ResourceIdentifier[]
-  resourceLanguage: string[]
   resourceTemporalDateRange: ResourceTemporalDateRange[]
   resourceTemporalExtentDateRange: ResourceTemporalDateRange[]
   resourceTitleObject: MultilingualField

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

@@ -363,11 +363,18 @@ export function readOnlineResources(rootEl: XmlElement): OnlineResource[] {
   )(rootEl)
 }
 
-function readLocaleElement(): ChainableFunction<XmlElement, LanguageCode> {
+export function readLocaleElement(): ChainableFunction<
+  XmlElement,
+  LanguageCode
+> {
   return pipe(
     findChildElement('lan:LanguageCode'),
     readAttribute('codeListValue'),
-    map((lang) => (lang ? LANG_3_TO_2_MAPPER[lang.toLowerCase()] : null))
+    map((lang) => {
+      const normalized = lang?.toLowerCase()
+      const iso2Lang = LANG_3_TO_2_MAPPER[normalized]
+      return iso2Lang ?? lang
+    })
   )
 }
 
@@ -381,6 +388,9 @@ export function readDefaultLanguage(rootEl: XmlElement): LanguageCode {
 export function readOtherLanguages(rootEl: XmlElement): LanguageCode[] {
   return pipe(
     findChildrenElement('mdb:otherLocale', false),
-    mapArray(readLocaleElement())
+    mapArray(readLocaleElement()),
+    map((languages) =>
+      languages.filter((lang): lang is LanguageCode => lang !== null)
+    )
   )(rootEl)
 }

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

@@ -529,7 +529,11 @@ export function writeOnlineResources(
 }
 
 function writeLocaleElement(language: LanguageCode) {
-  const lang3 = LANG_2_TO_3_MAPPER[language.toLowerCase()]
+  const normalizedLang = language.toLowerCase()
+  const lang3 =
+    normalizedLang.length === 2
+      ? LANG_2_TO_3_MAPPER[normalizedLang]
+      : normalizedLang
   return pipe(
     findChildOrCreate('lan:PT_Locale'),
     writeAttribute('id', language.toUpperCase()),

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

@@ -65,7 +65,8 @@ export function extractCharacterString(): ChainableFunction<
   return pipe(
     fallback(
       findChildElement('gco:CharacterString', false),
-      findChildElement('gmx:Anchor', false)
+      findChildElement('gmx:Anchor', false),
+      findChildElement('gmx:MimeFileType', false)
     ),
     readText()
   )
@@ -965,8 +966,8 @@ export function extractServiceOnlineResources(): ChainableFunction<
         } else {
           return {
             type: 'endpoint',
-            endpointUrl: url,
-            protocol,
+            url: url,
+            accessServiceProtocol: protocol,
             ...(description && { description }),
             translations,
           }
@@ -1161,11 +1162,14 @@ export function readOtherLanguages(rootEl: XmlElement): LanguageCode[] {
     findChildrenElement('gmd:locale', false),
     mapArray(
       pipe(
-        findChildElement('gmd:LanguageCode'),
+        findChildElement('lan:LanguageCode'),
         readAttribute('codeListValue'),
-        map((lang) => LANG_3_TO_2_MAPPER[lang.toLowerCase()])
+        map((lang) => LANG_3_TO_2_MAPPER[lang.toLowerCase()] ?? lang)
       )
     ),
+    map((languages) =>
+      languages.filter((lang): lang is LanguageCode => lang !== null)
+    ),
     map((languages) => (languages.length ? languages : [defaultLanguage]))
   )(rootEl)
 }
@@ -1173,7 +1177,7 @@ export function readOtherLanguages(rootEl: XmlElement): LanguageCode[] {
 export function readDefaultLanguage(rootEl: XmlElement): LanguageCode {
   return pipe(
     findChildElement('gmd:language', false),
-    findChildElement('gmd:LanguageCode'),
+    findChildElement('lan:LanguageCode'),
     readAttribute('codeListValue'),
     map((lang) => (lang ? LANG_3_TO_2_MAPPER[lang.toLowerCase()] : null))
   )(rootEl)

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

@@ -1227,7 +1227,7 @@ export function writeLineage(record: DatasetRecord, rootEl: XmlElement) {
 }
 
 export function getServiceEndpointProtocol(endpoint: ServiceEndpoint): string {
-  switch (endpoint.protocol.toLowerCase()) {
+  switch (endpoint.accessServiceProtocol.toLowerCase()) {
     case 'wfs':
       return 'OGC:WFS'
     case 'wms':
@@ -1235,14 +1235,14 @@ export function getServiceEndpointProtocol(endpoint: ServiceEndpoint): string {
     case 'wps':
       return 'OGC:WPS'
     default:
-      return endpoint.protocol
+      return endpoint.accessServiceProtocol
   }
 }
 
 export function createOnlineResource(onlineResource: ServiceOnlineResource) {
   let linkageUrl, functionCode, protocol
   if (onlineResource.type === 'endpoint') {
-    linkageUrl = onlineResource.endpointUrl.toString()
+    linkageUrl = onlineResource.url.toString()
     protocol = getServiceEndpointProtocol(onlineResource)
     functionCode = 'download'
   } else {
@@ -1471,7 +1471,10 @@ export function writeLanguages(record: DatasetRecord, rootEl: XmlElement) {
       writeAttribute('id', lang.toUpperCase()),
       createNestedChild('gmd:languageCode', 'gmd:LanguageCode'),
       writeAttribute('codeList', 'http://www.loc.gov/standards/iso639-2/'),
-      writeAttribute('codeListValue', LANG_2_TO_3_MAPPER[lang])
+      writeAttribute(
+        'codeListValue',
+        lang.length === 2 ? LANG_2_TO_3_MAPPER[lang] : lang
+      )
     )
 
   // add new languages (only if other than default one)

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

@@ -8,6 +8,7 @@ export const ES_SOURCE_SUMMARY = [
   'overview',
   'logo',
   'codelist_status_text',
+  'link',
   'linkProtocol',
   'contactForResource.organisation',
   'contact.organisation',
@@ -18,6 +19,7 @@ export const ES_SOURCE_SUMMARY = [
   'cl_maintenanceAndUpdateFrequency',
   'tag',
   'MD_LegalConstraintsUseLimitationObject',
+  'MD_LegalConstraintsOtherConstraintsObject',
   'qualityScore',
 ]
 

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

@@ -124,11 +124,11 @@ export class ElasticsearchService {
     this.runtimeFields[fieldName] = expression
   }
 
-  getMetadataByIdPayload(uuid: string): EsSearchParams {
+  getMetadataByIdsPayload(uuids: string[]): EsSearchParams {
     return {
       query: {
         ids: {
-          values: [uuid],
+          values: uuids,
         },
       },
     }
@@ -299,14 +299,6 @@ export class ElasticsearchService {
 
   private mustNotFilters(): Record<string, unknown>[] {
     return [
-      {
-        ...this.queryFilterOnValues('resourceType', [
-          'service',
-          'map',
-          'map/static',
-          'mapDigital',
-        ]),
-      },
       {
         query_string: {
           query:
@@ -429,7 +421,7 @@ export class ElasticsearchService {
           must_not: this.mustNotFilters(),
         },
       },
-      _source: ['resourceTitleObject', 'uuid'],
+      _source: ['resourceTitleObject', 'uuid', 'resourceType'],
       from: 0,
       size: 20,
     }