geonetwork-ui 2.8.0-dev.93d2d87c0 → 2.8.0-dev.b7a1670bc

package/libs/util/shared/src/index.d.ts

@@ -4,4 +4,5 @@ export * from './lib/links';
 export * from './lib/image-fallback.directive';
 export * from './lib/gn-ui-version';
 export * from './lib/record';
+export * from './lib/humanize-date.directive';
 //# sourceMappingURL=index.d.ts.map

package/libs/util/shared/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/libs/util/shared/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,gCAAgC,CAAA;AAC9C,cAAc,qBAAqB,CAAA;AACnC,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/libs/util/shared/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,gCAAgC,CAAA;AAC9C,cAAc,qBAAqB,CAAA;AACnC,cAAc,cAAc,CAAA;AAC5B,cAAc,+BAA+B,CAAA"}

package/libs/util/shared/src/lib/humanize-date.directive.d.ts

@@ -0,0 +1,15 @@
+import { Renderer2, ElementRef, OnInit } from '@angular/core';
+import { DateService } from './services/date.service';
+import * as i0 from "@angular/core";
+export declare class GnUiHumanizeDateDirective implements OnInit {
+    private dateService;
+    private el;
+    private renderer;
+    gnUiHumanizeDate: Date | string;
+    constructor(dateService: DateService, el: ElementRef, renderer: Renderer2);
+    ngOnInit(): Promise<void>;
+    private updateElement;
+    static ɵfac: i0.ɵɵFactoryDeclaration<GnUiHumanizeDateDirective, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<GnUiHumanizeDateDirective, "[gnUiHumanizeDate]", never, { "gnUiHumanizeDate": { "alias": "gnUiHumanizeDate"; "required": false; }; }, {}, never, never, true, never>;
+}
+//# sourceMappingURL=humanize-date.directive.d.ts.map

package/libs/util/shared/src/lib/humanize-date.directive.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"humanize-date.directive.d.ts","sourceRoot":"","sources":["../../../../../src/libs/util/shared/src/lib/humanize-date.directive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAa,UAAU,EAAS,MAAM,EAAE,MAAM,eAAe,CAAA;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;;AAErD,qBAIa,yBAA0B,YAAW,MAAM;IAIpD,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,QAAQ;IALT,gBAAgB,EAAE,IAAI,GAAG,MAAM,CAAA;gBAG9B,WAAW,EAAE,WAAW,EACxB,EAAE,EAAE,UAAU,EACd,QAAQ,EAAE,SAAS;IAGvB,QAAQ;YAIA,aAAa;yCAbhB,yBAAyB;2CAAzB,yBAAyB;CA2BrC"}

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

@@ -1 +1 @@
-{"version":3,"file":"link-classifier.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/links/link-classifier.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACtB,MAAM,2DAA2D,CAAA;;AAGlE,oBAAY,SAAS;IACnB,GAAG,QAAQ;IACX,OAAO,WAAW;IAClB,QAAQ,aAAa;IACrB,IAAI,SAAS;IACb,OAAO,YAAY;IACnB,YAAY,gBAAgB;IAC5B,OAAO,YAAY;CACpB;AAED,qBAGa,qBAAqB;IAChC,gBAAgB,CACd,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,GAClD,SAAS,EAAE;IA0Cd,QAAQ,CACN,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,EACnD,KAAK,EAAE,SAAS;yCA/CP,qBAAqB;6CAArB,qBAAqB;CAmDjC"}
+{"version":3,"file":"link-classifier.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/links/link-classifier.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACtB,MAAM,2DAA2D,CAAA;;AAGlE,oBAAY,SAAS;IACnB,GAAG,QAAQ;IACX,OAAO,WAAW;IAClB,QAAQ,aAAa;IACrB,IAAI,SAAS;IACb,OAAO,YAAY;IACnB,YAAY,gBAAgB;IAC5B,OAAO,YAAY;CACpB;AAED,qBAGa,qBAAqB;IAChC,gBAAgB,CACd,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,GAClD,SAAS,EAAE;IA8Cd,QAAQ,CACN,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,EACnD,KAAK,EAAE,SAAS;yCAnDP,qBAAqB;6CAArB,qBAAqB;CAuDjC"}

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

@@ -114,6 +114,12 @@ export declare const FORMATS: {
         readonly color: "#5A9E6F";
         readonly mimeTypes: readonly ["image/webp"];
     };
+    readonly postgis: {
+        readonly extensions: readonly ["postgis"];
+        readonly priority: 18;
+        readonly color: "#336791";
+        readonly mimeTypes: readonly [];
+    };
 };
 export type FileFormat = keyof typeof FORMATS;
 export declare function getFormatPriority(linkFormat: FileFormat): number;

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,qBAAqB,EACrB,eAAe,EAChB,MAAM,2DAA2D,CAAA;AAUlE,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyIV,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,CAST;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,SAAS,CAAC,IAAI,EAAE,qBAAqB,GAAG,MAAM,CAO7D;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"}
+{"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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+IV,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,CAmBZ;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,EACnD,KAAK,EAAE,MAAM,GACZ,OAAO,CAST;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,SAAS,CAAC,IAAI,EAAE,qBAAqB,GAAG,MAAM,CAO7D;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/services/date.service.d.ts

@@ -1,12 +1,16 @@
 import { TranslateService } from '@ngx-translate/core';
+import { type Locale } from 'date-fns/locale';
 import * as i0 from "@angular/core";
 export declare class DateService {
     private translateService;
+    dateLocales: Promise<Record<import("geonetwork-ui").LanguageCode2, Locale>>;
     constructor(translateService: TranslateService);
     private getDateObject;
     private getLocaleAndDate;
+    private getDateLocale;
     formatDate(date: Date | string, options?: Intl.DateTimeFormatOptions): string;
     formatDateTime(date: Date | string, options?: Intl.DateTimeFormatOptions): string;
+    formatRelativeDateTime(date: Date | string): Promise<string>;
     static ɵfac: i0.ɵɵFactoryDeclaration<DateService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<DateService>;
 }

package/libs/util/shared/src/lib/services/date.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"date.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/services/date.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;;AAEtD,qBAGa,WAAW;IACV,OAAO,CAAC,gBAAgB;gBAAhB,gBAAgB,EAAE,gBAAgB;IAEtD,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,gBAAgB;IASxB,UAAU,CACR,IAAI,EAAE,IAAI,GAAG,MAAM,EACnB,OAAO,CAAC,EAAE,IAAI,CAAC,qBAAqB,GACnC,MAAM;IAKT,cAAc,CACZ,IAAI,EAAE,IAAI,GAAG,MAAM,EACnB,OAAO,CAAC,EAAE,IAAI,CAAC,qBAAqB,GACnC,MAAM;yCAlCE,WAAW;6CAAX,WAAW;CAsCvB"}
+{"version":3,"file":"date.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/services/date.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAA;;AAK7C,qBAGa,WAAW;IAKV,OAAO,CAAC,gBAAgB;IAJpC,WAAW,iEAEV;gBAEmB,gBAAgB,EAAE,gBAAgB;IAEtD,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,gBAAgB;YASV,aAAa;IAM3B,UAAU,CACR,IAAI,EAAE,IAAI,GAAG,MAAM,EACnB,OAAO,CAAC,EAAE,IAAI,CAAC,qBAAqB,GACnC,MAAM;IAKT,cAAc,CACZ,IAAI,EAAE,IAAI,GAAG,MAAM,EACnB,OAAO,CAAC,EAAE,IAAI,CAAC,qBAAqB,GACnC,MAAM;IAKH,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;yCAjDvD,WAAW;6CAAX,WAAW;CA4DvB"}

package/libs/util/shared/src/lib/services/proxy.service.d.ts

@@ -1,18 +1,19 @@
-import { InjectionToken } from '@angular/core';
+import { InjectionToken, Injector } from '@angular/core';
 import { Location } from '@angular/common';
 import * as i0 from "@angular/core";
 export declare const PROXY_PATH: InjectionToken<string>;
 export declare class ProxyService {
-    private proxyPath;
+    private injector;
     private location;
-    constructor(proxyPath: string, location: Location);
+    private get proxyPath();
+    constructor(injector: Injector, location: Location);
     /**
      * Transforms the URL to go through a proxy specified with the PROXY_PATH
      * injection token.
      * @param url
      */
     getProxiedUrl(url: string): string;
-    static ɵfac: i0.ɵɵFactoryDeclaration<ProxyService, [{ optional: true; }, null]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<ProxyService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<ProxyService>;
 }
 //# sourceMappingURL=proxy.service.d.ts.map

package/libs/util/shared/src/lib/services/proxy.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/services/proxy.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,cAAc,EAAY,MAAM,eAAe,CAAA;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;;AAE1C,eAAO,MAAM,UAAU,wBAA0C,CAAA;AAEjE,qBAGa,YAAY;IAEW,OAAO,CAAC,SAAS;IACjD,OAAO,CAAC,QAAQ;gBADwB,SAAS,EAAE,MAAM,EACjD,QAAQ,EAAE,QAAQ;IAG5B;;;;OAIG;IACH,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;yCAXvB,YAAY;6CAAZ,YAAY;CA6BxB"}
+{"version":3,"file":"proxy.service.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/services/proxy.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,cAAc,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;;AAE1C,eAAO,MAAM,UAAU,wBAA0C,CAAA;AAEjE,qBAGa,YAAY;IAMrB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,QAAQ;IANlB,OAAO,KAAK,SAAS,GAEpB;gBAGS,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ;IAG5B;;;;OAIG;IACH,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;yCAfvB,YAAY;6CAAZ,YAAY;CAiCxB"}

package/libs/util/shared/src/lib/utils/sort-by.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sort-by.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/utils/sort-by.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2DAA2D,CAAA;AAEvF,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,EAAE,CAG7D;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,CAE1D;AAED,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,WAAW,CAKlE"}
+{"version":3,"file":"sort-by.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/util/shared/src/lib/utils/sort-by.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2DAA2D,CAAA;AAEvF,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,EAAE,CAG7D;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,CAE1D;AAED,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,WAAW,CAQlE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geonetwork-ui",
-  "version": "2.8.0-dev.93d2d87c0",
+  "version": "2.8.0-dev.b7a1670bc",
   "engines": {
     "node": ">=20"
   },
@@ -50,10 +50,10 @@
   "dependencies": {
     "@biesbjerg/ngx-translate-extract-marker": "~1.0.0",
     "@camptocamp/ogc-client": "1.3.1-dev.edb3244",
-    "@geospatial-sdk/core": "0.0.5-dev.37",
-    "@geospatial-sdk/geocoding": "0.0.5-dev.37",
-    "@geospatial-sdk/legend": "0.0.5-dev.37",
-    "@geospatial-sdk/openlayers": "0.0.5-dev.37",
+    "@geospatial-sdk/core": "0.0.5-dev.40",
+    "@geospatial-sdk/geocoding": "0.0.5-dev.40",
+    "@geospatial-sdk/legend": "0.0.5-dev.40",
+    "@geospatial-sdk/openlayers": "0.0.5-dev.40",
     "@ltd/j-toml": "~1.35.2",
     "@messageformat/core": "^3.0.1",
     "@ng-icons/core": "29.10.0",

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

@@ -9,6 +9,8 @@ export function matchProtocol(protocol: string): ServiceProtocol {
   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'
+  if (/DB:POSTGIS/i.test(protocol)) return 'postgis'
+  if (/stac\W*items/i.test(protocol)) return 'stac'
   return 'other'
 }
 

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

@@ -14,11 +14,14 @@ export const PossibleResourceTypes = {
   'map-interactive': 'reuse', // new index field since Oct 10, 2024
   'map-static': 'reuse', // new index field
   mapDigital: 'reuse',
+  mapHardcopy: 'reuse',
   series: 'dataset',
   service: 'service',
   staticMap: 'reuse',
 } as const
 
+export const ReusePresentationForms = ['mapDigital', 'mapHardcopy'] as string[]
+
 type KindType = keyof typeof PossibleResourceTypes
 type ResourceType = 'reuse' | 'dataset' | 'service'
 type PossibleResourceTypesGrouped = {
@@ -59,6 +62,14 @@ export function getReuseType(type: string): ReuseType {
     : undefined
 }
 
+export function getReusePresentationForm(
+  presentationForms?: string[]
+): string | undefined {
+  return presentationForms?.find((presentationForm) =>
+    ReusePresentationForms.includes(presentationForm)
+  )
+}
+
 export function kindToCodeListValue(record: CatalogRecord) {
   return record.kind === 'reuse' ? record.reuseType : record.kind
 }

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

@@ -56,7 +56,7 @@ export class DcatApConverter extends BaseConverter<string> {
     spatialExtents: readSpatialExtents,
     keywords: readKeywords,
     topics: readTopics,
-    resourceIdentifier: () => undefined,
+    resourceIdentifiers: () => undefined,
     recordUpdated: readRecordUpdated,
     recordCreated: readRecordCreated,
     resourceUpdated: readResourceUpdated,
@@ -96,7 +96,7 @@ export class DcatApConverter extends BaseConverter<string> {
     recordUpdated: () => undefined,
     recordCreated: () => undefined,
     recordPublished: () => undefined,
-    resourceIdentifier: () => undefined,
+    resourceIdentifiers: () => undefined,
     resourceUpdated: () => undefined,
     resourceCreated: () => undefined,
     resourcePublished: () => undefined,

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

@@ -70,7 +70,7 @@ export const GENERIC_DATASET_RECORD: DatasetRecord = {
   recordCreated: new Date('2021-11-15T09:00:00'),
   recordPublished: new Date('2022-01-01T10:00:00'),
   recordUpdated: new Date('2022-02-01T15:12:00'),
-  resourceIdentifier: '2d974612-70b1-4662-a9f4-c43cbe453773',
+  resourceIdentifiers: [{ code: '2d974612-70b1-4662-a9f4-c43cbe453773' }],
   resourceCreated: new Date('2022-09-01T14:18:19'),
   resourceUpdated: new Date('2022-12-04T15:12:00'),
   title: 'A very interesting dataset (un jeu de données très intéressant)',

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

@@ -2,7 +2,7 @@ import { ServiceRecord } from '../../../../../../libs/common/domain/src/lib/mode
 
 export const GEO2FRANCE_SERVICE_EAUXUSEES_RECORD: ServiceRecord = {
   uniqueIdentifier: 'be052079-f1f6-4f6f-a722-cbf11deb40eb',
-  resourceIdentifier: 'https://id.eaufrance.fr/meta/ODP_WFS',
+  resourceIdentifiers: [{ code: 'https://id.eaufrance.fr/meta/ODP_WFS' }],
   kind: 'service',
   otherLanguages: [],
   defaultLanguage: 'fr',

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

@@ -146,6 +146,9 @@ Ce lot de données produit en 2019, a été numérisé à partir du PCI Vecteur
   defaultLanguage: 'fr',
   otherLanguages: [],
   translations: {},
-  resourceIdentifier:
-    'https://www.geoportail-urbanisme.gouv.fr/document/60036_PLU_20220329',
+  resourceIdentifiers: [
+    {
+      code: 'https://www.geoportail-urbanisme.gouv.fr/document/60036_PLU_20220329',
+    },
+  ],
 }

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

@@ -68,7 +68,7 @@ export const GEOCAT_CH_DATASET_RECORD: DatasetRecord = {
   abstract: `Perimeter der Alpenkonvention in der Schweiz. Die Alpenkonvention ist ein völkerrechtlicher Vertrag zwischen den acht Alpenländern Deutschland, Frankreich, Italien, Liechtenstein, Monaco, Österreich, Schweiz, Slowenien sowie der Europäischen Union. Das Ziel des Übereinkommens ist der Schutz der Alpen durch eine sektorübergreifende, ganzheitliche und nachhaltige Politik.`,
   overviews: [],
   topics: ['planningCadastre', 'planningCadastre_Planning'],
-  resourceIdentifier: 'ch.are.alpenkonvention',
+  resourceIdentifiers: [{ code: 'ch.are.alpenkonvention' }],
   keywords: [
     {
       thesaurus: {

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

@@ -2,7 +2,7 @@ import { ReuseRecord } from '../../../../../../libs/common/domain/src/lib/model/
 
 export const GEORHENA_REUSE_SOLAIRE_RECORD: ReuseRecord = {
   uniqueIdentifier: '015e6d20-0d69-4ae7-adfe-85c588aac141',
-  resourceIdentifier: '04_2022_301',
+  resourceIdentifiers: [{ code: '04_2022_301' }],
   kind: 'reuse',
   otherLanguages: ['de', 'en'],
   defaultLanguage: 'fr',

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

@@ -71,7 +71,7 @@ Toutes ces données sont reprises dans BDR.`,
   recordCreated: new Date('2019-04-02T12:34:35'),
   recordUpdated: new Date('2022-06-16T05:01:21'),
   resourceCreated: new Date('2002-01-01'),
-  resourceIdentifier: '2d974612-70b1-4662-a9f4-c43cbe453773',
+  resourceIdentifiers: [{ code: '2d974612-70b1-4662-a9f4-c43cbe453773' }],
   resourceUpdated: new Date('2022-06-16'),
   resourcePublished: new Date('2022-06-16'),
   onlineResources: [
@@ -645,7 +645,7 @@ export const METAWAL_SERVICE_RECORD: ServiceRecord = {
   },
   recordCreated: new Date('2019-04-02T12:31:58'),
   recordUpdated: new Date('2022-02-09T11:31:06.766Z'),
-  resourceIdentifier: '6d2b6fdb-f1ea-4d48-8697-a0c05512f1dc',
+  resourceIdentifiers: [{ code: '6d2b6fdb-f1ea-4d48-8697-a0c05512f1dc' }],
   resourcePublished: new Date('2016-12-01'),
   securityConstraints: [],
   title:

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

@@ -2,7 +2,7 @@ import { ReuseRecord } from '../../../../../../libs/common/domain/src/lib/model/
 
 export const WALLONIE_REUSE_SPW_RECORD: ReuseRecord = {
   uniqueIdentifier: '83809bcd-1763-4d28-b820-2b9828083ba5',
-  resourceIdentifier: '83809bcd-1763-4d28-b820-2b9828083ba5',
+  resourceIdentifiers: [{ code: '83809bcd-1763-4d28-b820-2b9828083ba5' }],
   kind: 'reuse',
   otherLanguages: [],
   defaultLanguage: 'fr',

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

@@ -2,7 +2,7 @@ import { ServiceRecord } from '../../../../../../libs/common/domain/src/lib/mode
 
 export const WALLONIE_SERVICE_NAPITSWALLONIA_RECORD: ServiceRecord = {
   uniqueIdentifier: 'fe1c1a3d-c75b-435c-a1d1-48426818f54d',
-  resourceIdentifier: 'fe1c1a3d-c75b-435c-a1d1-48426818f54d',
+  resourceIdentifiers: [{ code: 'fe1c1a3d-c75b-435c-a1d1-48426818f54d' }],
   kind: 'service',
   otherLanguages: [],
   defaultLanguage: 'fr',

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

@@ -26,7 +26,11 @@ import {
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { matchProtocol } from '../common/distribution.mapper'
 import { Thesaurus } from './types'
-import { getResourceType, getReuseType } from '../common/resource-types'
+import {
+  getResourceType,
+  getReusePresentationForm,
+  getReuseType,
+} from '../common/resource-types'
 import { TranslateService } from '@ngx-translate/core'
 import { toLang2, toLang3 } from '../../../../../../libs/util/i18n/src'
 
@@ -402,8 +406,12 @@ export class Gn4FieldMapper {
       ),
     resourceType: (output, source) => {
       const resourceType = getFirstValue(selectField(source, 'resourceType'))
-      const kind = getResourceType(resourceType)
-      const reuseType = getReuseType(resourceType)
+      const presentationForms = getAsArray(
+        selectField(source, 'cl_presentationForm')
+      ).map((presentationForm) => presentationForm.key) as string[]
+      const type = getReusePresentationForm(presentationForms) || resourceType
+      const kind = getResourceType(type)
+      const reuseType = getReuseType(type)
       return {
         ...output,
         kind,
@@ -451,6 +459,32 @@ export class Gn4FieldMapper {
         }),
       }
     },
+    resourceIdentifier: (output, source) => {
+      const identifiers = getAsArray(selectField(source, 'resourceIdentifier'))
+
+      if (!identifiers.length) return output
+
+      const mappedIdentifiers = identifiers
+        .map((id) => {
+          const code = selectField<string>(id, 'code')
+          const codeSpace = selectField<string>(id, 'codeSpace')
+          const link = selectField<string>(id, 'link')
+
+          return {
+            code,
+            ...(codeSpace && { codeSpace }),
+            ...(link && { url: link }),
+          }
+        })
+        .filter((id) => id !== null)
+
+      if (!mappedIdentifiers.length) return output
+
+      return {
+        ...output,
+        resourceIdentifiers: mappedIdentifiers,
+      }
+    },
   }
 
   private genericField = (output) => output
@@ -512,6 +546,8 @@ export class Gn4FieldMapper {
       /^OGC:WMTS/.test(protocol) ||
       /TMS/i.test(protocol) ||
       /ogc\W*api\W*features/i.test(protocol) ||
+      /^DB:POSTGIS/i.test(protocol) ||
+      /stac\W*items/i.test(protocol) ||
       (/^WWW:DOWNLOAD-/.test(protocol) && /data.geopf.fr/.test(url)) // TO DO : change with the good protocol when decided
     ) {
       return 'service'

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

@@ -92,7 +92,7 @@ export class Iso19139Converter extends BaseConverter<string> {
     recordUpdated: readRecordUpdated,
     recordCreated: () => undefined, // not supported in ISO19139
     recordPublished: () => undefined, // not supported in ISO19139
-    resourceIdentifier: readResourceIdentifier,
+    resourceIdentifiers: readResourceIdentifier,
     resourceUpdated: readResourceUpdated,
     resourceCreated: readResourceCreated,
     resourcePublished: readResourcePublished,
@@ -133,7 +133,7 @@ export class Iso19139Converter extends BaseConverter<string> {
     recordUpdated: writeRecordUpdated,
     recordCreated: () => undefined, // not supported in ISO19139
     recordPublished: () => undefined, // not supported in ISO19139
-    resourceIdentifier: writeResourceIdentifier,
+    resourceIdentifiers: writeResourceIdentifier,
     resourceUpdated: writeResourceUpdated,
     resourceCreated: writeResourceCreated,
     resourcePublished: writeResourcePublished,
@@ -240,12 +240,19 @@ export class Iso19139Converter extends BaseConverter<string> {
     const onlineResources = this.readers['onlineResources'](rootEl, tr)
     const otherLanguages = this.readers['otherLanguages'](rootEl, tr)
     const defaultLanguage = this.readers['defaultLanguage'](rootEl, tr)
-    const resourceIdentifier = this.readers['resourceIdentifier'](rootEl, tr)
+    const resourceIdentifiers = this.readers['resourceIdentifiers'](
+      rootEl,
+      tr
+    ) as Array<{
+      code: string
+      codeSpace?: string
+      url?: string
+    }>
     const spatialExtents = this.readers['spatialExtents'](rootEl, tr)
 
     return {
       uniqueIdentifier,
-      ...(resourceIdentifier && { resourceIdentifier }),
+      ...(resourceIdentifiers?.length > 0 && { resourceIdentifiers }),
       kind,
       otherLanguages,
       defaultLanguage,
@@ -388,8 +395,8 @@ export class Iso19139Converter extends BaseConverter<string> {
       this.writers['otherConstraints'](record, rootEl)
     fieldChanged('onlineResources') &&
       this.writers['onlineResources'](record, rootEl)
-    fieldChanged('resourceIdentifier') &&
-      this.writers['resourceIdentifier'](record, rootEl)
+    fieldChanged('resourceIdentifiers') &&
+      this.writers['resourceIdentifiers'](record, rootEl)
 
     if (record.kind === 'dataset') {
       fieldChanged('status') && this.writers['status'](record, rootEl)

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

@@ -1183,8 +1183,10 @@ export function readDefaultLanguage(rootEl: XmlElement): LanguageCode {
   )(rootEl)
 }
 
-export function readResourceIdentifier(rootEl: XmlElement): string {
-  return pipe(
+export function readResourceIdentifier(
+  rootEl: XmlElement
+): Array<{ code: string; codeSpace?: string; url?: string }> {
+  const code = pipe(
     findIdentification(),
     findNestedElement(
       'gmd:citation',
@@ -1195,4 +1197,6 @@ export function readResourceIdentifier(rootEl: XmlElement): string {
     ),
     extractCharacterString()
   )(rootEl)
+
+  return code ? [{ code }] : []
 }

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

@@ -1502,14 +1502,16 @@ export function writeResourceIdentifier(
   record: DatasetRecord,
   rootEl: XmlElement
 ) {
+  const firstIdentifier = record.resourceIdentifiers?.[0]?.code
+
   pipe(
     findOrCreateIdentification(),
     findNestedChildOrCreate('gmd:citation', 'gmd:CI_Citation'),
     removeChildrenByName('gmd:identifier'),
-    record.resourceIdentifier
+    firstIdentifier
       ? pipe(
           createNestedChild('gmd:identifier', 'gmd:MD_Identifier', 'gmd:code'),
-          writeCharacterString(record.resourceIdentifier)
+          writeCharacterString(firstIdentifier)
         )
       : noop
   )(rootEl)

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

@@ -33,7 +33,10 @@ export class AuthService {
     return baseUrl
       .replace(
         '${current_url}',
-        new URL(this.location.path(), window.location.href).toString()
+        new URL(
+          this.location.prepareExternalUrl(this.location.path()),
+          window.location.href
+        ).toString()
       )
       .replace('${lang2}', toLang2(this.translateService.currentLang))
       .replace('${lang3}', toLang3(this.translateService.currentLang))

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

@@ -7,7 +7,6 @@ export const ES_SOURCE_SUMMARY = [
   'resourceAbstractObject',
   'overview',
   'logo',
-  'codelist_status_text',
   'link',
   'linkProtocol',
   'contactForResource*.organisation*',
@@ -16,6 +15,7 @@ export const ES_SOURCE_SUMMARY = [
   'userSavedCount',
   'cl_topic',
   'cl_maintenanceAndUpdateFrequency',
+  'cl_presentationForm',
   'MD_LegalConstraints*Object',
   'qualityScore',
   'allKeywords',

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

@@ -43,18 +43,26 @@ export class Gn4PlatformMapper {
   userFromApi(apiUser: UserApiModel): UserModel {
     if (!apiUser) return null
     const {
-      enabled,
+      addresses,
       emailAddresses,
-      organization,
+      enabled,
+      id,
       kind,
       lastLoginDate,
+      security,
+      primaryAddress,
+      authorities,
       accountNonExpired,
       accountNonLocked,
-      id,
       credentialsNonExpired,
       ...user
     } = apiUser
-    return { ...apiUser, id: id.toString() } as UserModel
+
+    return {
+      ...user,
+      id: id.toString(),
+      email: emailAddresses ? emailAddresses[0] || '' : '',
+    } as UserModel
   }
 
   keywordsFromApi(

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

@@ -1,12 +1,21 @@
+import { HttpClient, HttpEventType } from '@angular/common/http'
 import { Inject, Injectable, InjectionToken, Optional } from '@angular/core'
 import {
-  catchError,
-  filter,
-  map,
-  mergeMap,
-  shareReplay,
-  tap,
-} from 'rxjs/operators'
+  KeywordApiResponse,
+  ThesaurusApiResponse,
+} from '../../../../../../../libs/api/metadata-converter/src'
+import {
+  CatalogRecord,
+  Keyword,
+  Organization,
+  UserFeedback,
+} from '../../../../../../../libs/common/domain/src/lib/model/record'
+import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus'
+import { UserModel } from '../../../../../../../libs/common/domain/src/lib/model/user/user.model'
+import {
+  PlatformServiceInterface,
+  UploadEvent,
+} from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import {
   MeApiService,
   RecordsApiService,
@@ -15,26 +24,9 @@ import {
   UserfeedbackApiService,
   UsersApiService,
 } from '../../../../../../../libs/data-access/gn4/src'
-import {
-  PlatformServiceInterface,
-  UploadEvent,
-} from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
-import { UserModel } from '../../../../../../../libs/common/domain/src/lib/model/user/user.model'
-import {
-  CatalogRecord,
-  Keyword,
-  Organization,
-  UserFeedback,
-} from '../../../../../../../libs/common/domain/src/lib/model/record'
-import { Gn4PlatformMapper } from './gn4-platform.mapper'
-import { ltr } from 'semver'
-import { HttpClient, HttpEventType } from '@angular/common/http'
-import {
-  KeywordApiResponse,
-  ThesaurusApiResponse,
-} from '../../../../../../../libs/api/metadata-converter/src'
-import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus'
+import { toLang3 } from '../../../../../../../libs/util/i18n/src'
 import { noDuplicateFileName } from '../../../../../../../libs/util/shared/src'
+import { TranslateService } from '@ngx-translate/core'
 import {
   combineLatest,
   forkJoin,
@@ -43,9 +35,17 @@ import {
   switchMap,
   throwError,
 } from 'rxjs'
-import { TranslateService } from '@ngx-translate/core'
-import { toLang3 } from '../../../../../../../libs/util/i18n/src'
+import {
+  catchError,
+  filter,
+  map,
+  mergeMap,
+  shareReplay,
+  tap,
+} from 'rxjs/operators'
+import { ltr } from 'semver'
 import { Gn4SettingsService } from '../settings/gn4-settings.service'
+import { Gn4PlatformMapper } from './gn4-platform.mapper'
 
 const minApiVersion = '4.2.2'
 
@@ -56,7 +56,6 @@ export const DISABLE_AUTH = new InjectionToken<boolean>('gnDisableAuth', {
 @Injectable()
 export class Gn4PlatformService implements PlatformServiceInterface {
   private readonly type = 'GeoNetwork'
-  private readonly me$: Observable<UserModel>
   private readonly users$: Observable<UserModel[]>
   private readonly isUserAnonymous$: Observable<boolean>
   private readonly gnParseVersion = '4.2.5'
@@ -70,6 +69,15 @@ export class Gn4PlatformService implements PlatformServiceInterface {
       }),
       shareReplay(1)
     )
+
+  private me$ = this.disableAuth
+    ? of(null)
+    : of(true).pipe(
+        switchMap(() => this.meApi.getMe()),
+        switchMap((apiUser) => this.mapper.userFromMeApi(apiUser)),
+        shareReplay({ bufferSize: 1, refCount: true })
+      )
+
   /**
    * A map of already loaded thesauri (groups of keywords); the key is a URI
    * @private
@@ -93,13 +101,6 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     private settingsService: Gn4SettingsService,
     @Inject(DISABLE_AUTH) @Optional() private disableAuth: boolean
   ) {
-    this.me$ = this.disableAuth
-      ? of(null)
-      : this.meApi.getMe().pipe(
-          switchMap((apiUser) => this.mapper.userFromMeApi(apiUser)),
-          shareReplay({ bufferSize: 1, refCount: true })
-        )
-
     this.isUserAnonymous$ = this.me$.pipe(
       map((user) => !user || !('id' in user))
     )