geonetwork-ui 2.4.0-dev.fdf8f64b → 2.4.1-dev.4e8752d34

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "geonetwork-ui",
-  "version": "2.4.0-dev.fdf8f64b",
+  "version": "2.4.1-dev.4e8752d34",
   "engines": {
-    "node": ">=14.17.0"
+    "node": ">=20"
   },
   "main": "./index.ts",
   "type": "module",
@@ -23,66 +23,73 @@
     "url": "https://github.com/geonetwork/geonetwork-ui"
   },
   "peerDependencies": {
-    "@angular/animations": "16.x || 17.x",
-    "@angular/cdk": "16.x || 17.x",
-    "@angular/common": "16.x || 17.x",
-    "@angular/compiler": "16.x || 17.x",
-    "@angular/core": "16.x || 17.x",
-    "@angular/forms": "16.x || 17.x",
-    "@angular/material": "16.x || 17.x",
-    "@angular/material-moment-adapter": "16.x || 17.x",
-    "@angular/platform-browser": "16.x || 17.x",
-    "@angular/platform-browser-dynamic": "16.x || 17.x",
-    "@angular/router": "16.x || 17.x",
-    "@ngrx/component": "16.x || 17.x",
-    "@ngrx/effects": "16.x || 17.x",
-    "@ngrx/router-store": "16.x || 17.x",
-    "@ngrx/store": "16.x || 17.x",
-    "@ngrx/store-devtools": "16.x || 17.x",
-    "@ngx-translate/core": "14.x",
-    "@ngx-translate/http-loader": "7.x",
+    "@angular/animations": "17.x || 18.x || 19.x",
+    "@angular/cdk": "17.x || 18.x || 19.x",
+    "@angular/common": "17.x || 18.x || 19.x",
+    "@angular/compiler": "17.x || 18.x || 19.x",
+    "@angular/core": "17.x || 18.x || 19.x",
+    "@angular/forms": "17.x || 18.x || 19.x",
+    "@angular/material": "17.x || 18.x || 19.x",
+    "@angular/material-moment-adapter": "17.x || 18.x || 19.x",
+    "@angular/platform-browser": "17.x || 18.x || 19.x",
+    "@angular/platform-browser-dynamic": "17.x || 18.x || 19.x",
+    "@angular/router": "17.x || 18.x || 19.x",
+    "@ngrx/component": "17.x || 18.x || 19.x",
+    "@ngrx/effects": "17.x || 18.x || 19.x",
+    "@ngrx/router-store": "17.x || 18.x || 19.x",
+    "@ngrx/store": "17.x || 18.x || 19.x",
+    "@ngrx/store-devtools": "17.x || 18.x || 19.x",
+    "@ngrx/operators": "18.x",
+    "@ngx-translate/core": "15.x",
+    "@ngx-translate/http-loader": "16.x",
     "rxjs": "7.x",
     "zone.js": "*",
     "tailwindcss": "3.x"
   },
   "dependencies": {
     "@biesbjerg/ngx-translate-extract-marker": "^1.0.0",
-    "@camptocamp/ogc-client": "1.1.1-dev.c75dcba",
-    "@geospatial-sdk/core": "^0.0.5-dev.20",
-    "@geospatial-sdk/geocoding": "^0.0.5-dev.20",
-    "@geospatial-sdk/openlayers": "^0.0.5-dev.20",
+    "@camptocamp/ogc-client": "1.1.1-dev.3e2d3cc",
+    "@geospatial-sdk/core": "0.0.5-dev.31",
+    "@geospatial-sdk/geocoding": "0.0.5-dev.31",
+    "@geospatial-sdk/legend": "0.0.5-dev.31",
+    "@geospatial-sdk/openlayers": "0.0.5-dev.31",
     "@ltd/j-toml": "~1.35.2",
     "@messageformat/core": "^3.0.1",
-    "@nx/angular": "16.6.0",
-    "@rgrove/parse-xml": "~4.0.1",
-    "alasql": "^3.1.0",
-    "axios": "^1.6.0",
+    "@ng-icons/core": "29.10.0",
+    "@ng-icons/iconoir": "29.10.0",
+    "@ng-icons/material-icons": "29.10.0",
+    "@ng-icons/tabler-icons": "29.10.0",
+    "@nx/angular": "20.2.2",
+    "@rgrove/parse-xml": "4.2.0",
+    "alasql": "4.6.0",
+    "axios": "1.7.9",
     "basiclightbox": "^5.0.4",
-    "chart.js": "^4.2.0",
-    "chroma-js": "^2.1.2",
-    "date-fns": "^2.29.3",
+    "chart.js": "4.4.7",
+    "chroma-js": "3.1.2",
+    "date-fns": "4.1.0",
     "document-register-element": "^1.14.10",
-    "duration-relativetimeformat": "^2.0.3",
-    "embla-carousel": "^8.0.0-rc14",
-    "express": "^4.17.1",
+    "duration-relativetimeformat": "^2.0.4",
+    "embla-carousel": "8.5.1",
+    "express": "^4.21.1",
     "geojson-validation": "^1.0.2",
-    "marked": "^11.1.1",
-    "moment": "^2.29.4",
-    "ng-table-virtual-scroll": "^1.4.1",
+    "marked": "15.0.4",
+    "moment": "2.30.1",
+    "ng-table-virtual-scroll": "1.6.1",
     "ngx-chips": "3.0.0",
-    "ngx-dropzone": "^3.0.0",
-    "ngx-translate-messageformat-compiler": "~6.5.0",
+    "ngx-dropzone": "3.1.0",
+    "ngx-translate-messageformat-compiler": "7.0.0",
     "ol": "^8.2.0",
-    "papaparse": "^5.3.1",
+    "papaparse": "5.4.1",
     "pg": "^8.9.0",
     "proj4": "^2.9.2",
+    "rdflib": "^2.2.35",
     "reflect-metadata": "^0.1.13",
-    "semver": "^7.5.4",
-    "tippy.js": "^6.3.7",
+    "semver": "7.6.3",
+    "tippy.js": "6.3.7",
     "tslib": "^2.3.0",
     "typeorm": "^0.3.14",
     "whatwg-fetch": "^3.6.2",
-    "xlsx": "^0.17.3"
+    "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz"
   },
   "module": "fesm2022/geonetwork-ui.mjs",
   "typings": "index.d.ts",

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

@@ -7,6 +7,7 @@ export function matchProtocol(protocol: string): ServiceProtocol {
   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'
+  if (/DOWNLOAD-1/i.test(protocol)) return 'GPFDL'
   return 'other'
 }
 

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

@@ -0,0 +1,50 @@
+import {
+  CatalogRecord,
+  RecordKind,
+  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
+
+  return (
+    possibleResourceTypes[type as keyof typeof possibleResourceTypes] ||
+    'dataset'
+  )
+}
+
+export function getReuseType(type: string): ReuseType {
+  const possibleReuseTypes = {
+    application: 'application',
+    map: 'map',
+    'map/static': 'map', // old index field
+    'map/interactive': 'map', // old index field
+    'map-interactive': 'map', // new index field since Oct 10, 2024
+    'map-static': 'map', // new index field
+    mapDigital: 'map',
+    interactiveMap: 'map',
+    staticMap: 'map',
+  } as const
+
+  const kind = getResourceType(type)
+
+  return kind === 'reuse'
+    ? possibleReuseTypes[type as keyof typeof possibleReuseTypes] || 'other'
+    : undefined
+}
+
+export function kindToCodeListValue(record: CatalogRecord) {
+  return record.kind === 'reuse' ? record.reuseType : record.kind
+}

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

@@ -6,7 +6,7 @@ export function isEqual<
     | Date
     | number
     | URL
-    | unknown
+    | unknown,
 >(a: T, b: T): boolean {
   if (Array.isArray(a) && Array.isArray(b)) {
     return a.length === b.length && a.every((e, i) => isEqual(e, b[i]))

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

@@ -2,6 +2,8 @@ import {
   CatalogRecord,
   CatalogRecordKeys,
   DatasetRecord,
+  LanguageCode,
+  RecordTranslations,
   ServiceRecord,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { BaseConverter, MetadataMapperContext } from '../base.converter'
@@ -10,6 +12,7 @@ import {
   readAbstract,
   readContacts,
   readContactsForResource,
+  readDefaultLanguage,
   readKeywords,
   readLandingPage,
   readLicenses,
@@ -35,7 +38,12 @@ import { exportGraphToXml } from './utils/serialize-to-xml'
 export class DcatApConverter extends BaseConverter<string> {
   protected readers: Record<
     CatalogRecordKeys,
-    (dataStore: Store, catalogRecord: NamedNode) => unknown
+    (
+      dataStore: Store,
+      catalogRecord: NamedNode,
+      translations: RecordTranslations,
+      defaultLanguage: LanguageCode
+    ) => unknown
   > = {
     uniqueIdentifier: readUniqueIdentifier,
     title: readTitle,
@@ -47,16 +55,20 @@ export class DcatApConverter extends BaseConverter<string> {
     spatialExtents: readSpatialExtents,
     keywords: readKeywords,
     topics: readTopics,
+    resourceIdentifier: () => undefined,
     recordUpdated: readRecordUpdated,
     recordCreated: readRecordCreated,
     resourceUpdated: readResourceUpdated,
     resourceCreated: readResourceCreated,
     ownerOrganization: readOwnerOrganization,
     licenses: readLicenses,
+    defaultLanguage: readDefaultLanguage,
+    otherLanguages: () => [], // languages will be inferred from found translations
     // TODO
     kind: () => 'dataset',
     recordPublished: () => undefined,
     resourcePublished: () => undefined,
+    reuseType: () => undefined,
     legalConstraints: () => [],
     securityConstraints: () => [],
     otherConstraints: () => [],
@@ -67,7 +79,7 @@ export class DcatApConverter extends BaseConverter<string> {
     temporalExtents: () => [],
     spatialRepresentation: () => undefined,
     extras: () => undefined,
-    languages: () => [],
+    translations: () => undefined,
   }
 
   protected writers: Record<
@@ -83,9 +95,11 @@ export class DcatApConverter extends BaseConverter<string> {
     recordUpdated: () => undefined,
     recordCreated: () => undefined,
     recordPublished: () => undefined,
+    resourceIdentifier: () => undefined,
     resourceUpdated: () => undefined,
     resourceCreated: () => undefined,
     resourcePublished: () => undefined,
+    reuseType: () => undefined,
     contacts: () => undefined,
     contactsForResource: () => undefined,
     keywords: () => undefined,
@@ -104,7 +118,9 @@ export class DcatApConverter extends BaseConverter<string> {
     spatialExtents: () => undefined,
     extras: () => undefined,
     landingPage: () => undefined,
-    languages: () => undefined,
+    defaultLanguage: () => undefined,
+    otherLanguages: () => undefined,
+    translations: () => undefined,
   }
 
   constructor(
@@ -124,92 +140,197 @@ export class DcatApConverter extends BaseConverter<string> {
       DCAT('CatalogRecord')
     ) as NamedNode
 
+    const tr: RecordTranslations = {}
+
+    // we need the default language first for the other fields
+    const defaultLanguage = this.readers['defaultLanguage'](
+      dataStore,
+      catalogRecord,
+      tr,
+      null
+    ) as string
     const uniqueIdentifier = this.readers['uniqueIdentifier'](
       dataStore,
-      catalogRecord
+      catalogRecord,
+      tr,
+      defaultLanguage
+    )
+    const kind = this.readers['kind'](
+      dataStore,
+      catalogRecord,
+      tr,
+      defaultLanguage
     )
-    const kind = this.readers['kind'](dataStore, catalogRecord)
     const ownerOrganization = this.readers['ownerOrganization'](
       dataStore,
-      catalogRecord
+      catalogRecord,
+      tr,
+      defaultLanguage
+    )
+    const title = this.readers['title'](
+      dataStore,
+      catalogRecord,
+      tr,
+      defaultLanguage
+    )
+    const abstract = this.readers['abstract'](
+      dataStore,
+      catalogRecord,
+      tr,
+      defaultLanguage
+    )
+    const contacts = this.readers['contacts'](
+      dataStore,
+      catalogRecord,
+      tr,
+      defaultLanguage
     )
-    const title = this.readers['title'](dataStore, catalogRecord)
-    const abstract = this.readers['abstract'](dataStore, catalogRecord)
-    const contacts = this.readers['contacts'](dataStore, catalogRecord)
     const contactsForResource = this.readers['contactsForResource'](
       dataStore,
-      catalogRecord
+      catalogRecord,
+      tr,
+      defaultLanguage
     )
     const recordUpdated = this.readers['recordUpdated'](
       dataStore,
-      catalogRecord
+      catalogRecord,
+      tr,
+      defaultLanguage
     )
     const recordCreated = this.readers['recordCreated'](
       dataStore,
-      catalogRecord
+      catalogRecord,
+      tr,
+      defaultLanguage
     )
     const recordPublished = this.readers['recordPublished'](
       dataStore,
-      catalogRecord
+      catalogRecord,
+      tr,
+      defaultLanguage
     )
     const resourceCreated = this.readers['resourceCreated'](
       dataStore,
-      catalogRecord
+      catalogRecord,
+      tr,
+      defaultLanguage
     )
     const resourceUpdated = this.readers['resourceUpdated'](
       dataStore,
-      catalogRecord
+      catalogRecord,
+      tr,
+      defaultLanguage
     )
     const resourcePublished = this.readers['resourcePublished'](
       dataStore,
-      catalogRecord
+      catalogRecord,
+      tr,
+      defaultLanguage
+    )
+    const keywords = this.readers['keywords'](
+      dataStore,
+      catalogRecord,
+      tr,
+      defaultLanguage
+    )
+    const topics = this.readers['topics'](
+      dataStore,
+      catalogRecord,
+      tr,
+      defaultLanguage
     )
-    const keywords = this.readers['keywords'](dataStore, catalogRecord)
-    const topics = this.readers['topics'](dataStore, catalogRecord)
     const legalConstraints = this.readers['legalConstraints'](
       dataStore,
-      catalogRecord
+      catalogRecord,
+      tr,
+      defaultLanguage
     )
     const otherConstraints = this.readers['otherConstraints'](
       dataStore,
-      catalogRecord
+      catalogRecord,
+      tr,
+      defaultLanguage
     )
     const securityConstraints = this.readers['securityConstraints'](
       dataStore,
-      catalogRecord
+      catalogRecord,
+      tr,
+      defaultLanguage
+    )
+    const licenses = this.readers['licenses'](
+      dataStore,
+      catalogRecord,
+      tr,
+      defaultLanguage
+    )
+    const overviews = this.readers['overviews'](
+      dataStore,
+      catalogRecord,
+      tr,
+      defaultLanguage
+    )
+    const landingPage = this.readers['landingPage'](
+      dataStore,
+      catalogRecord,
+      tr,
+      defaultLanguage
+    )
+    const otherLanguages = this.readers['otherLanguages'](
+      dataStore,
+      catalogRecord,
+      tr,
+      defaultLanguage
     )
-    const licenses = this.readers['licenses'](dataStore, catalogRecord)
-    const overviews = this.readers['overviews'](dataStore, catalogRecord)
-    const landingPage = this.readers['landingPage'](dataStore, catalogRecord)
 
     if (kind === 'dataset') {
-      const status = this.readers['status'](dataStore, catalogRecord)
+      const status = this.readers['status'](
+        dataStore,
+        catalogRecord,
+        tr,
+        defaultLanguage
+      )
       const spatialRepresentation = this.readers['spatialRepresentation'](
         dataStore,
-        catalogRecord
+        catalogRecord,
+        tr,
+        defaultLanguage
       )
       const spatialExtents = this.readers['spatialExtents'](
         dataStore,
-        catalogRecord
+        catalogRecord,
+        tr,
+        defaultLanguage
       )
       const temporalExtents = this.readers['temporalExtents'](
         dataStore,
-        catalogRecord
+        catalogRecord,
+        tr,
+        defaultLanguage
+      )
+      const lineage = this.readers['lineage'](
+        dataStore,
+        catalogRecord,
+        tr,
+        defaultLanguage
       )
-      const lineage = this.readers['lineage'](dataStore, catalogRecord)
       const onlineResources = this.readers['onlineResources'](
         dataStore,
-        catalogRecord
+        catalogRecord,
+        tr,
+        defaultLanguage
       )
       const updateFrequency = this.readers['updateFrequency'](
         dataStore,
-        catalogRecord
+        catalogRecord,
+        tr,
+        defaultLanguage
       )
 
       return {
         uniqueIdentifier,
         kind,
-        languages: [],
+        defaultLanguage,
+        otherLanguages,
         ...(recordCreated && { recordCreated }),
         ...(recordPublished && { recordPublished }),
         recordUpdated,
@@ -236,16 +357,20 @@ export class DcatApConverter extends BaseConverter<string> {
         onlineResources,
         updateFrequency,
         ...(landingPage && { landingPage }),
+        translations: tr,
       } as DatasetRecord
     } else {
       const onlineResources = this.readers['onlineResources'](
         dataStore,
-        catalogRecord
+        catalogRecord,
+        tr,
+        defaultLanguage
       )
       return {
         uniqueIdentifier,
         kind,
-        languages: [],
+        defaultLanguage,
+        otherLanguages,
         ...(recordCreated && { recordCreated }),
         ...(recordPublished && { recordPublished }),
         recordUpdated,
@@ -266,6 +391,7 @@ export class DcatApConverter extends BaseConverter<string> {
         overviews,
         onlineResources,
         ...(landingPage && { landingPage }),
+        translations: tr,
       } as ServiceRecord
     }
   }