geonetwork-ui 2.6.0-dev.3a78a5eaa → 2.6.0-dev.47d0cd11c

package/libs/util/shared/src/lib/links/link-utils.d.ts

@@ -1,112 +1,119 @@
-import { DatasetOnlineResource, ServiceProtocol } from '../../../../../../libs/common/domain/src/lib/model/record';
+import { DatasetOnlineResource, ServiceOnlineResource, ServiceProtocol } from '../../../../../../libs/common/domain/src/lib/model/record';
 export declare const FORMATS: {
     readonly csv: {
         readonly extensions: readonly ["csv"];
         readonly priority: 1;
-        readonly color: "#a6d6c0";
+        readonly color: "#F6A924";
         readonly mimeTypes: readonly ["text/csv", "application/csv"];
     };
     readonly excel: {
         readonly extensions: readonly ["excel", "xls", "xlsx", "ms-excel", "openxmlformats-officedocument"];
         readonly priority: 2;
-        readonly color: "#acc5e4";
+        readonly color: "#FFDE10";
         readonly mimeTypes: readonly ["application/vnd.ms-excel", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"];
     };
     readonly geojson: {
         readonly extensions: readonly ["geojson"];
         readonly priority: 3;
-        readonly color: "#b3cde8";
+        readonly color: "#293C6F";
         readonly mimeTypes: readonly ["application/geo+json", "application/vnd.geo+json"];
     };
     readonly json: {
         readonly extensions: readonly ["json"];
         readonly priority: 3;
-        readonly color: "#b3cde8";
+        readonly color: "#84D0F0";
         readonly mimeTypes: readonly ["application/json"];
     };
     readonly shp: {
         readonly extensions: readonly ["shp", "shape", "zipped-shapefile"];
         readonly priority: 4;
-        readonly color: "#b2d8ba";
+        readonly color: "#009036";
         readonly mimeTypes: readonly ["x-gis/x-shapefile"];
     };
     readonly gml: {
         readonly extensions: readonly ["gml"];
         readonly priority: 5;
-        readonly color: "#e3b3e5";
+        readonly color: "#E75113";
         readonly mimeTypes: readonly ["application/gml+xml", "text/xml; subtype=gml"];
     };
     readonly kml: {
         readonly extensions: readonly ["kml", "kmz"];
         readonly priority: 6;
-        readonly color: "#c1e6a0";
+        readonly color: "#F4B5D0";
         readonly mimeTypes: readonly ["application/vnd.google-earth.kml+xml", "application/vnd.google-earth.kmz"];
     };
     readonly gpkg: {
         readonly extensions: readonly ["gpkg", "geopackage"];
         readonly priority: 7;
-        readonly color: "#f7cce6";
+        readonly color: "#7D5D9F";
         readonly mimeTypes: readonly ["application/geopackage+sqlite3"];
     };
     readonly zip: {
         readonly extensions: readonly ["zip", "tar.gz"];
         readonly priority: 8;
-        readonly color: "#ffe7a3";
+        readonly color: "#B0CB52";
         readonly mimeTypes: readonly ["application/zip", "application/x-zip"];
     };
     readonly pdf: {
         readonly extensions: readonly ["pdf"];
         readonly priority: 9;
-        readonly color: "#f5b2a3";
+        readonly color: "#49579E";
         readonly mimeTypes: readonly ["application/pdf"];
     };
     readonly jpg: {
         readonly extensions: readonly ["jpg", "jpeg", "jfif", "pjpeg", "pjp"];
         readonly priority: 9;
-        readonly color: "#d1c1e9";
+        readonly color: "#C4A98F";
         readonly mimeTypes: readonly ["image/jpg"];
     };
     readonly svg: {
         readonly extensions: readonly ["svg"];
         readonly priority: 10;
-        readonly color: "#f3c1c9";
+        readonly color: "#EB6D82";
         readonly mimeTypes: readonly ["image/svg+xml"];
     };
     readonly dxf: {
         readonly extensions: readonly ["dxf"];
         readonly priority: 11;
-        readonly color: "#f6ceac";
+        readonly color: "#DCCD00";
         readonly mimeTypes: readonly ["application/x-dxf", "image/x-dxf"];
     };
     readonly html: {
         readonly extensions: readonly ["html", "htm"];
         readonly priority: 12;
-        readonly color: "#FFF2CC";
+        readonly color: "#C0C9B6";
         readonly mimeTypes: readonly ["text/html"];
     };
     readonly fgb: {
         readonly extensions: readonly ["fgb", "flatgeobuf"];
         readonly priority: 13;
-        readonly color: "#ffe7a3";
+        readonly color: "#A8111C";
         readonly mimeTypes: readonly ["application/flatgeobuf"];
     };
     readonly jsonfg: {
         readonly extensions: readonly ["jsonfg", "jsonfgc"];
         readonly priority: 14;
-        readonly color: "#ffe7a3";
+        readonly color: "#009EE0";
         readonly mimeTypes: readonly ["application/vnd.ogc.fg+json", "application/vnd.ogc.fg+json;compatibility=geojson"];
     };
 };
 export type FileFormat = keyof typeof FORMATS;
 export declare function getFormatPriority(linkFormat: FileFormat): number;
-export declare function getLinkPriority(link: DatasetOnlineResource): number;
+export declare function getLinkPriority(link: DatasetOnlineResource | ServiceOnlineResource): number;
 export declare function getFileFormatFromServiceOutput(serviceOutput: string): FileFormat | null;
-export declare function getFileFormat(link: DatasetOnlineResource): FileFormat;
-export declare function isFormatInQueryParam(link: DatasetOnlineResource, alias: string): boolean;
+export declare function getFileFormat(link: DatasetOnlineResource | ServiceOnlineResource): FileFormat;
+export declare function isFormatInQueryParam(link: DatasetOnlineResource | ServiceOnlineResource, alias: string): boolean;
 export declare function mimeTypeToFormat(mimeType: string): FileFormat;
-export declare function checkFileFormat(link: DatasetOnlineResource, format: FileFormat): boolean;
+export declare function checkFileFormat(link: DatasetOnlineResource | ServiceOnlineResource, format: FileFormat): boolean;
 export declare function getBadgeColor(linkFormat: FileFormat): string;
-export declare function getLinkLabel(link: DatasetOnlineResource): string;
-export declare function getLayers(url: string, serviceProtocol: ServiceProtocol): Promise<any[]>;
+export declare function getLinkLabel(link: DatasetOnlineResource | ServiceOnlineResource): string;
+export declare function getLayers(url: string, serviceProtocol: ServiceProtocol): Promise<{
+    name: string;
+    hasRecords?: boolean;
+    hasFeatures?: boolean;
+    hasVectorTiles?: boolean;
+    hasMapTiles?: boolean;
+}[] | import("@camptocamp/ogc-client").WfsFeatureTypeFull[] | import("@camptocamp/ogc-client").WmsLayerFull[] | import("@camptocamp/ogc-client").WmtsLayer[]>;
+export declare function wmsLayerFlatten(layerFull: any): any[];
 export declare function getMimeTypeForFormat(format: FileFormat): string | null;
 //# sourceMappingURL=link-utils.d.ts.map

package/libs/util/shared/src/lib/links/link-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"link-utils.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/links/link-utils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,eAAe,EAChB,MAAM,2DAA2D,CAAA;AAUlE,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgHV,CAAA;AAEV,MAAM,MAAM,UAAU,GAAG,MAAM,OAAO,OAAO,CAAA;AAE7C,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAUhE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,qBAAqB,GAAG,MAAM,CAEnE;AAED,wBAAgB,8BAA8B,CAC5C,aAAa,EAAE,MAAM,GACpB,UAAU,GAAG,IAAI,CAgBnB;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,qBAAqB,GAAG,UAAU,CAcrE;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,qBAAqB,EAC3B,KAAK,EAAE,MAAM,GACZ,OAAO,CAQT;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAO7D;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,qBAAqB,EAC3B,MAAM,EAAE,UAAU,GACjB,OAAO,CAMT;AAED,wBAAgB,aAAa,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAQ5D;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,qBAAqB,GAAG,MAAM,CA0BhE;AAED,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe,kBAwB5E;AAcD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAEtE"}
+{"version":3,"file":"link-utils.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/links/link-utils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,eAAe,EAChB,MAAM,2DAA2D,CAAA;AAUlE,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgHV,CAAA;AAEV,MAAM,MAAM,UAAU,GAAG,MAAM,OAAO,OAAO,CAAA;AAE7C,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAUhE;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,GAClD,MAAM,CAER;AAED,wBAAgB,8BAA8B,CAC5C,aAAa,EAAE,MAAM,GACpB,UAAU,GAAG,IAAI,CAgBnB;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,GAClD,UAAU,CAcZ;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,EACnD,KAAK,EAAE,MAAM,GACZ,OAAO,CAQT;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAO7D;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,EACnD,MAAM,EAAE,UAAU,GACjB,OAAO,CAQT;AAED,wBAAgB,aAAa,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAQ5D;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,GAClD,MAAM,CA6BR;AAED,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe;;;;;;8JAmC5E;AAED,wBAAgB,eAAe,CAAC,SAAS,KAAA,SAUxC;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAEtE"}

package/libs/util/shared/src/lib/record.util.d.ts

@@ -0,0 +1,3 @@
+import { CatalogRecord, LanguageCode } from '../../../../../libs/common/domain/src/lib/model/record';
+export declare function updateLanguages<T extends CatalogRecord>(record: T, defaultLanguage: LanguageCode, otherLanguages: LanguageCode[]): T;
+//# sourceMappingURL=record.util.d.ts.map

package/libs/util/shared/src/lib/record.util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"record.util.d.ts","sourceRoot":"","sources":["../../../../../src/libs/util/shared/src/lib/record.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EAMb,YAAY,EAIb,MAAM,wDAAwD,CAAA;AAa/D,wBAAgB,eAAe,CAAC,CAAC,SAAS,aAAa,EACrD,MAAM,EAAE,CAAC,EACT,eAAe,EAAE,YAAY,EAC7B,cAAc,EAAE,YAAY,EAAE,GAC7B,CAAC,CAoFH"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geonetwork-ui",
-  "version": "2.6.0-dev.3a78a5eaa",
+  "version": "2.6.0-dev.47d0cd11c",
   "engines": {
     "node": ">=20"
   },
@@ -40,7 +40,7 @@
     "@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/core": "16.x",
     "@ngx-translate/http-loader": "16.x",
     "rxjs": "7.x",
     "zone.js": "*",
@@ -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",
@@ -77,7 +77,7 @@
     "ng-table-virtual-scroll": "1.6.1",
     "ngx-chips": "3.0.0",
     "ngx-dropzone": "3.1.0",
-    "ngx-translate-messageformat-compiler": "7.0.0",
+    "ngx-translate-messageformat-compiler": "~7.1.0",
     "ol": "^8.2.0",
     "papaparse": "5.4.1",
     "pg": "^8.9.0",

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/dcat-ap/dcat-ap.converter.ts

@@ -8,6 +8,7 @@ import {
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { BaseConverter, MetadataMapperContext } from '../base.converter'
 import { isEqual } from '../convert-utils'
+import { isFieldTranslatable } from '../translate-utils'
 import {
   readAbstract,
   readContacts,
@@ -404,6 +405,8 @@ export class DcatApConverter extends BaseConverter<string> {
     let fieldChanged: (name: string) => boolean
     if (reference) {
       const originalRecord = await this.readRecord(reference)
+      // eslint-disable-next-line prefer-const
+      let languagesChanged: boolean
       await loadGraph(
         dataStore,
         reference,
@@ -413,9 +416,11 @@ export class DcatApConverter extends BaseConverter<string> {
 
       fieldChanged = (name: string) => {
         return originalRecord !== null
-          ? !isEqual(record[name], originalRecord[name])
+          ? !isEqual(record[name], originalRecord[name]) ||
+              (languagesChanged && isFieldTranslatable(name))
           : true
       }
+      languagesChanged = fieldChanged('otherLanguages')
     } else {
       fieldChanged = () => true
     }
@@ -437,6 +442,8 @@ export class DcatApConverter extends BaseConverter<string> {
     fieldChanged('uniqueIdentifier') &&
       this.writers['uniqueIdentifier'](record, dataStore, recordNode)
     fieldChanged('kind') && this.writers['kind'](record, dataStore, recordNode)
+    fieldChanged('defaultLanguage') &&
+      this.writers['defaultLanguage'](record, dataStore, recordNode)
 
     fieldChanged('contacts') &&
       this.writers['contacts'](record, dataStore, recordNode)
@@ -494,6 +501,8 @@ export class DcatApConverter extends BaseConverter<string> {
       fieldChanged('lineage') &&
         this.writers['lineage'](record, dataStore, recordNode)
     }
+    fieldChanged('otherLanguages') &&
+      this.writers['otherLanguages'](record, dataStore, recordNode)
 
     if (this.contentType.includes('xml')) {
       return exportGraphToXml(dataStore)

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

@@ -18,7 +18,7 @@ import { getAsValidUrl } from '../common/url'
 import { fullNameToParts } from '../iso19139/utils/individual-name'
 import { readLicenseFromString } from '../common/license'
 import { matchProtocol } from '../common/distribution.mapper'
-import { LANG_3_TO_2_MAPPER } from '../../../../../../libs/util/i18n/src/lib/language-codes'
+import { getLang2FromLang3 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
 
 function getDatasetNode(dataStore: Store, recordNode: NamedNode): NamedNode {
   return (dataStore.the(recordNode, FOAF('primaryTopic'), null) ||
@@ -457,7 +457,7 @@ export function readDefaultLanguage(dataStore: Store, recordNode: NamedNode) {
   const languageNode = statements[0].object as NamedNode
   let language = languageNode.value.split('/').pop().toLowerCase()
   if (language.length === 3) {
-    language = LANG_3_TO_2_MAPPER[language] ?? language
+    language = getLang2FromLang3(language) ?? language
   }
   return language.substring(0, 2)
 }

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: {