geonetwork-ui 2.8.0-dev.398701d7f → 2.8.0-dev.5186798f7

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

@@ -451,6 +451,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 +538,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*',

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))
     )

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

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core'
 import { SiteApiService } from '../../../../../../../libs/data-access/gn4/src'
+import { Observable, of, switchMap } from 'rxjs'
 import { map, shareReplay } from 'rxjs/operators'
-import { Observable } from 'rxjs'
 
 @Injectable({
   providedIn: 'root',
@@ -25,7 +25,8 @@ export class Gn4SettingsService {
   constructor(private siteApiService: SiteApiService) {}
 
   private getSettingsSetValueByKey(key: string) {
-    return this.siteApiService.getSettingsSet(null, [key]).pipe(
+    return of(true).pipe(
+      switchMap(() => this.siteApiService.getSettingsSet(null, [key])),
       map((v) => v[key]),
       shareReplay({ bufferSize: 1, refCount: true })
     )

package/src/libs/common/domain/src/index.ts

@@ -0,0 +1,2 @@
+export * from './lib/organizations.service.interface'
+export * from './lib/platform.service.interface'

package/src/libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model.ts

@@ -24,5 +24,5 @@ export interface DatavizConfigModel {
   view: string
   source: DatasetOnlineResource
   chartConfig?: DatavizChartConfigModel
-  styleTMSIndex: number
+  styleTMSIndex?: number
 }

package/src/libs/common/domain/src/lib/model/record/metadata.model.ts

@@ -113,6 +113,12 @@ export interface INSPIRE_topic {
   label: string
 }
 
+export interface ResourceIdentifier {
+  code: string
+  codeSpace?: string
+  url?: string
+}
+
 export interface BaseRecord {
   uniqueIdentifier: Uuid
   ownerOrganization: Organization
@@ -135,7 +141,8 @@ export interface BaseRecord {
   updateFrequency?: UpdateFrequency
 
   // information related to the resource (dataset, service)
-  resourceIdentifier?: string
+
+  resourceIdentifiers?: Array<ResourceIdentifier>
   contactsForResource: Array<Individual>
   resourceCreated?: Date
   resourcePublished?: Date
@@ -163,6 +170,8 @@ export type ServiceProtocol =
   | 'GPFDL'
   | 'tms'
   | 'maplibre-style'
+  | 'postgis'
+  | 'stac'
   | 'other'
 
 marker('record.metadata.api.accessServiceProtocol.wms')
@@ -174,6 +183,8 @@ marker('record.metadata.api.accessServiceProtocol.ogcFeatures')
 marker('record.metadata.api.accessServiceProtocol.GPFDL')
 marker('record.metadata.api.accessServiceProtocol.tms')
 marker('record.metadata.api.accessServiceProtocol.maplibre-style')
+marker('record.metadata.api.accessServiceProtocol.postgis')
+marker('record.metadata.api.accessServiceProtocol.stac')
 marker('record.metadata.api.accessServiceProtocol.other')
 
 export type OnlineResourceType = 'service' | 'download' | 'link' | 'endpoint'

package/src/libs/common/domain/src/lib/model/search/sort-by.model.ts

@@ -6,4 +6,9 @@ export const SortByEnum: Record<string, SortByField> = {
   RELEVANCY: ['desc', '_score'],
   QUALITY_SCORE: ['desc', 'qualityScore'],
   CHANGE_DATE: ['desc', 'changeDate'],
+  RESOURCE_DATES: [
+    ['desc', 'revisionDateForResource'],
+    ['desc', 'publicationDateForResource'],
+    ['desc', 'creationDateForResource'],
+  ],
 }

package/src/libs/common/domain/src/lib/platform.service.interface.ts

@@ -45,6 +45,7 @@ export abstract class PlatformServiceInterface {
     thesaurusId: string
   ): Observable<Keyword[]>
 
+  abstract getFeedbacksAllowed(): Observable<boolean>
   abstract getUserFeedbacks(recordUuid: string): Observable<UserFeedback[]>
   abstract postUserFeedbacks(recordUuid: UserFeedback): Observable<void>
 
@@ -58,5 +59,4 @@ export abstract class PlatformServiceInterface {
     removeDuplicate?: boolean
   ): Observable<UploadEvent>
   abstract getFileContent(url: URL): Observable<any>
-  abstract getFeedbacksAllowed(): Observable<boolean>
 }

package/src/libs/common/fixtures/src/lib/elasticsearch/metadata-links.fixtures.ts

@@ -154,4 +154,9 @@ export const elasticLinkFixture = (): Record<string, unknown> => ({
     name: 'myothertmslayer',
     url: 'https://my.tms.server/MapServer',
   },
+  stacItems: {
+    accessServiceProtocol: 'STAC:Items',
+    name: 'stac layer',
+    url: '  https://stacapi-cdos.apps.okd.crocc.meso.umontpellier.fr/collections/lidarhd/items',
+  },
 })

package/src/libs/common/fixtures/src/lib/link.fixtures.ts

@@ -259,4 +259,23 @@ export const aSetOfLinksFixture = () => ({
       accessServiceProtocol: 'wms',
       type: 'endpoint',
     }) as ServiceEndpoint,
+  postgisLink: () =>
+    ({
+      name: 'France_Regions',
+      description:
+        'Boundaries for the administrative regions of metropolitan France.',
+      url: new URL('http://geo.local:5432/france_demo'),
+      type: 'service',
+      accessServiceProtocol: 'postgis',
+    }) as DatasetServiceDistribution,
+  stacLink: () =>
+    ({
+      name: 'Lidar HD point cloud (COPC)',
+      description: 'Lidar HD classified point clouds from IGN',
+      url: new URL(
+        'https://stacapi-cdos.apps.okd.crocc.meso.umontpellier.fr/collections/lidarhd/items'
+      ),
+      type: 'service',
+      accessServiceProtocol: 'stac',
+    }) as DatasetServiceDistribution,
 })

package/src/libs/data-access/gn4/src/openapi/model/user.api.model.ts

@@ -21,7 +21,7 @@ export interface UserApiModel {
   emailAddresses?: Set<string>
   addresses?: Set<AddressApiModel>
   primaryAddress?: AddressApiModel
-  organization?: string
+  organisation?: string
   kind?: string
   lastLoginDate?: string
   authorities?: Array<GrantedAuthorityApiModel>

package/src/libs/feature/dataviz/src/lib/chart-view/chart-view.component.ts

@@ -108,6 +108,7 @@ export class ChartViewComponent {
   chartType$ = new BehaviorSubject<InputChartType>('bar')
 
   @Input() set userChartConfig(config: DatavizChartConfigModel) {
+    if (!config) return
     this.aggregation$.next(config.aggregation)
     this.xProperty$.next(config.xProperty)
     this.yProperty$.next(config.yProperty)

package/src/libs/feature/dataviz/src/lib/service/data.service.ts

@@ -7,6 +7,9 @@ import {
   WfsEndpoint,
   WfsVersion,
   TmsEndpoint,
+  StacEndpoint,
+  GetCollectionItemsOptions,
+  StacItemsDocument,
 } from '@camptocamp/ogc-client'
 import {
   BaseReader,
@@ -97,16 +100,27 @@ export class DataService {
         if (!featureType) {
           throw new Error('wfs.featuretype.notfound')
         }
+
+        const wfsVersion = endpoint.getVersion()
+        const addSrsName = wfsVersion === '1.1.0' || wfsVersion === '2.0.0'
+        const defaultCrs = featureType.defaultCrs
+
+        const shouldAddOutputCrs = addSrsName && defaultCrs
+
         return {
-          all: featureType.outputFormats.reduce(
-            (prev, curr) => ({
+          all: featureType.outputFormats.reduce((prev, curr) => {
+            const isJsonFormat = curr.toLowerCase().includes('json')
+            return {
               ...prev,
               [curr]: endpoint.getFeatureUrl(featureType.name, {
                 outputFormat: curr,
+                ...(shouldAddOutputCrs &&
+                  !isJsonFormat && {
+                    outputCrs: defaultCrs,
+                  }),
               }),
-            }),
-            {}
-          ),
+            }
+          }, {}),
           geojson: endpoint.supportsJson(featureType.name)
             ? endpoint.getFeatureUrl(featureType.name, {
                 asJson: true,
@@ -233,6 +247,17 @@ export class DataService {
       })
   }
 
+  async getItemsFromStacApi(
+    url: string,
+    options: GetCollectionItemsOptions
+  ): Promise<StacItemsDocument> {
+    return await StacEndpoint.getItemsFromUrl(url, options)
+      .then((response) => response)
+      .catch(() => {
+        throw new Error(`ogc.unreachable.unknown`)
+      })
+  }
+
   async getGeodataLinksFromTms(
     tmsLink: DatasetServiceDistribution,
     keepOriginalLink = false

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.html

@@ -69,11 +69,11 @@
         (valueChange)="valueChange.emit($event)"
       ></gn-ui-form-field-overviews>
     </ng-container>
-    <ng-container *ngSwitchCase="'resourceIdentifier'">
+    <ng-container *ngSwitchCase="'resourceIdentifiers'">
       <gn-ui-form-field-simple
         [type]="'text'"
-        [value]="valueAsString"
-        (valueChange)="valueChange.emit($event)"
+        [value]="valueAsResourceIdentifierCode"
+        (valueChange)="handleResourceIdentifierChange($event)"
       ></gn-ui-form-field-simple>
     </ng-container>
     <ng-container *ngSwitchCase="'resourceCreated'">

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.ts

@@ -142,4 +142,34 @@ export class FormFieldComponent {
   get valueAsOnlineResources() {
     return this.value as Array<OnlineResource>
   }
+  get valueAsResourceIdentifierCode() {
+    const identifiers = this.value as Array<{
+      code: string
+      codeSpace?: string
+      url?: string
+    }>
+    return identifiers?.[0]?.code || ''
+  }
+
+  handleResourceIdentifierChange(code: string) {
+    const identifiers = this.value as Array<{
+      code: string
+      codeSpace?: string
+      url?: string
+    }>
+
+    if (!code) {
+      this.valueChange.emit(identifiers?.slice(1) || [])
+      return
+    }
+
+    if (identifiers?.[0]) {
+      this.valueChange.emit([
+        { ...identifiers[0], code },
+        ...identifiers.slice(1),
+      ])
+    } else {
+      this.valueChange.emit([{ code }])
+    }
+  }
 }

package/src/libs/feature/editor/src/lib/fields.config.ts

@@ -81,7 +81,7 @@ export const RECORD_RESOURCE_CREATED_FIELD: EditorField = {
 }
 
 export const RESOURCE_IDENTIFIER_FIELD: EditorField = {
-  model: 'resourceIdentifier',
+  model: 'resourceIdentifiers',
   formFieldConfig: {
     labelKey: marker('editor.record.form.field.resourceIdentifier'),
   },

package/src/libs/feature/record/src/index.ts

@@ -8,3 +8,4 @@ export * from './lib/external-viewer-button/external-viewer-button.component'
 export * from './lib/gpf-api-dl/gpf-api-dl.component'
 export * from './lib/map-view/map-view.component'
 export * from './lib/record-meta/record-meta.component'
+export * from './lib/stac-view/stac-view.component'

package/src/libs/feature/record/src/lib/data-view-permalink/data-view-permalink.component.ts

@@ -12,7 +12,7 @@ import { MdViewFacade } from '../state'
 import { CopyTextButtonComponent } from '../../../../../../libs/ui/inputs/src'
 import { CommonModule } from '@angular/common'
 import { TranslatePipe } from '@ngx-translate/core'
-import { GEONETWORK_UI_TAG_NAME } from '../../../../../../libs/util/shared/src'
+import { GEONETWORK_UI_TAG_NAME, PROXY_PATH } from '../../../../../../libs/util/shared/src'
 
 export const WEB_COMPONENT_EMBEDDER_URL = new InjectionToken<string>(
   'webComponentEmbedderUrl'
@@ -60,6 +60,9 @@ export class DataViewPermalinkComponent {
         url.searchParams.append('e', `gn-dataset-view-map`)
       }
       url.searchParams.append('a', `api-url=${this.config.basePath}`)
+      if (this.proxyPath) {
+        url.searchParams.append('a', `proxy-path=${this.proxyPath}`)
+      }
       url.searchParams.append('a', `dataset-id=${metadata.uniqueIdentifier}`)
       url.searchParams.append('a', `primary-color=#0f4395`)
       url.searchParams.append('a', `secondary-color=#8bc832`)
@@ -72,6 +75,9 @@ export class DataViewPermalinkComponent {
   constructor(
     @Inject(Configuration) private config: Configuration,
     @Optional()
+    @Inject(PROXY_PATH)
+    private proxyPath: string,
+    @Optional()
     @Inject(WEB_COMPONENT_EMBEDDER_URL)
     protected wcEmbedderBaseUrl: string,
     private facade: MdViewFacade