geonetwork-ui 2.10.0-dev.fc6515c0b → 2.11.0-dev.2478042b2

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

@@ -1,5 +1,5 @@
 import { HttpClient, HttpEventType } from '@angular/common/http'
-import { Injectable, InjectionToken, inject } from '@angular/core'
+import { inject, Injectable, InjectionToken } from '@angular/core'
 import {
   KeywordApiResponse,
   ThesaurusApiResponse,
@@ -12,11 +12,13 @@ import {
 } 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 { GroupModel } from '../../../../../../../libs/common/domain/src/lib/model/user/group.model'
 import {
   PlatformServiceInterface,
   UploadEvent,
 } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import {
+  GroupsApiService,
   MeApiService,
   RecordsApiService,
   RegistriesApiService,
@@ -57,6 +59,7 @@ export const DISABLE_AUTH = new InjectionToken<boolean>('gnDisableAuth', {
 export class Gn4PlatformService implements PlatformServiceInterface {
   private meApi = inject(MeApiService)
   private usersApi = inject(UsersApiService)
+  private groupsApi = inject(GroupsApiService)
   private mapper = inject(Gn4PlatformMapper)
   private toolsApiService = inject(ToolsApiService)
   private registriesApiService = inject(RegistriesApiService)
@@ -97,7 +100,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
   private keywordsByThesauri: Record<string, Observable<Keyword[]>> = {}
 
   private get lang3() {
-    return toLang3(this.translateService.currentLang)
+    return toLang3(this.translateService.getCurrentLang())
   }
 
   constructor() {
@@ -155,6 +158,38 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     return this.users$
   }
 
+  getUserPermissionsByGroup(): Observable<GroupModel[]> {
+    if (this.disableAuth) return of([])
+    return combineLatest([this.meApi.getMe(), this.groupsApi.getGroups()]).pipe(
+      map(([meResponse, groups]) => {
+        if (!meResponse) return []
+        if (meResponse.admin) {
+          return groups.map((group) => ({
+            groupId: group.id,
+            groupName: group.name,
+            isMember: true,
+            canEdit: true,
+            canApprove: true,
+            canAdministrate: true,
+          }))
+        }
+        const reviewerIds = meResponse.groupsWithReviewer ?? []
+        const editorIds = meResponse.groupsWithEditor ?? []
+        const memberIds = meResponse.groupsWithRegisteredUser ?? []
+        const adminIds = meResponse.groupsWithUserAdmin ?? []
+
+        return groups.map((group) => ({
+          groupId: group.id,
+          groupName: group.name,
+          isMember: memberIds.includes(group.id),
+          canEdit: editorIds.includes(group.id),
+          canApprove: reviewerIds.includes(group.id),
+          canAdministrate: adminIds.includes(group.id),
+        }))
+      })
+    )
+  }
+
   translateKey(key: string): Observable<string> {
     // if the key is a URI, use the registries API to look for the translation
     if (key.match(/^https?:\/\//)) {

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

@@ -104,15 +104,12 @@ export interface Keyword {
   type: KeywordType
   thesaurus?: ThesaurusModel
   bbox?: [number, number, number, number]
+  // thesaurus hierarchy path incl. the keyword as last element; unset for root-level keywords
+  hierarchyPath?: string[]
 
   translations?: KeywordTranslations
 }
 
-export interface INSPIRE_topic {
-  value: string
-  label: string
-}
-
 export interface ResourceIdentifier {
   code: string
   codeSpace?: string
@@ -254,10 +251,67 @@ export interface DatasetTemporalExtent {
   end?: Date
 }
 
+/**
+ * Represents a source dataset referenced from a lineage entry.
+ */
+export interface SourceRecord {
+  uuid?: string
+  title?: string
+  href?: string
+}
+
+marker('domain.record.associationType.crossReference')
+marker('domain.record.associationType.largerWorkCitation')
+marker('domain.record.associationType.partOfSeamlessDatabase')
+marker('domain.record.associationType.stereoMate')
+marker('domain.record.associationType.isComposedOf')
+marker('domain.record.associationType.collectiveTitle')
+marker('domain.record.associationType.series')
+marker('domain.record.associationType.dependency')
+marker('domain.record.associationType.revisionOf')
+
+// DS_AssociationTypeCode values of the ISO19115-3 codelist, any unrecognized value
+// being mapped to 'crossReference'
+export const associationTypeValues = [
+  'crossReference',
+  'largerWorkCitation',
+  'partOfSeamlessDatabase',
+  'stereoMate',
+  'isComposedOf',
+  'collectiveTitle',
+  'series',
+  'dependency',
+  'revisionOf',
+] as const
+
+export type AssociationType = (typeof associationTypeValues)[number]
+
+/**
+ * Represents another record associated with this one (e.g. a parent/sibling dataset).
+ */
+export interface AssociatedRecord {
+  uniqueIdentifier: string
+  associationType: AssociationType
+}
+
+/**
+ * Nature of the link between a record and another one; the association type is
+ * only known for 'sibling' relations, as it is held by the declaring record.
+ */
+export type RecordRelation = 'source' | 'sourceOf' | 'sibling' | 'associated'
+
+export interface LinkedRecord {
+  record: CatalogRecord
+  relation: RecordRelation
+  associationType?: AssociationType
+}
+
 export interface DatasetRecord extends BaseRecord {
   kind: 'dataset'
   status: RecordStatus
   lineage: string // Explanation of the origin of this record (e.g: how, why)"
+  sourceRecords: Array<SourceRecord>
+  associatedRecords: Array<AssociatedRecord>
   onlineResources: Array<DatasetOnlineResource>
   spatialExtents: Array<DatasetSpatialExtent>
   temporalExtents: Array<DatasetTemporalExtent>
@@ -285,6 +339,8 @@ export interface ServiceRecord extends BaseRecord {
 export interface ReuseRecord extends BaseRecord {
   kind: 'reuse'
   lineage: string // Explanation of the origin of this record (e.g: how, why)"
+  sourceRecords: Array<SourceRecord>
+  associatedRecords: Array<AssociatedRecord>
   onlineResources: Array<DatasetOnlineResource>
   reuseType: ReuseType
   spatialExtents: Array<DatasetSpatialExtent>

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

@@ -6,9 +6,5 @@ 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'],
-  ],
+  RESOURCE_DATE: ['desc', 'resourceDate.date'],
 }

package/src/libs/common/domain/src/lib/model/thesaurus/thesaurus.model.ts

@@ -1,7 +1,8 @@
 export type KeywordType = 'place' | 'temporal' | 'theme' | 'other'
 
 export interface ThesaurusModel {
-  id: string
+  // absent when the source provides no identifier for the thesaurus
+  id?: string
   name?: string
   url?: URL
   thesaurusKey?: string

package/src/libs/common/domain/src/lib/model/user/group.model.ts

@@ -0,0 +1,8 @@
+export interface GroupModel {
+  groupId: number
+  groupName: string
+  isMember: boolean
+  canEdit: boolean
+  canApprove: boolean
+  canAdministrate: boolean
+}

package/src/libs/common/domain/src/lib/model/user/index.ts

@@ -1 +1,2 @@
 export * from './user.model'
+export * from './group.model'

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

@@ -1,5 +1,6 @@
 import type { Observable } from 'rxjs'
 import type { UserModel } from './model/user/user.model'
+import type { GroupModel } from './model/user/group.model'
 import type { Organization } from './model/record/organization.model'
 import { CatalogRecord, Keyword, UserFeedback } from './model/record'
 import { KeywordType } from './model/thesaurus'
@@ -28,6 +29,7 @@ export abstract class PlatformServiceInterface {
   abstract getMe(): Observable<UserModel>
   abstract isAnonymous(): Observable<boolean>
   abstract getUsers(): Observable<UserModel[]>
+  abstract getUserPermissionsByGroup(): Observable<GroupModel[]>
   abstract getUsersByOrganization(
     organisation: Organization
   ): Observable<UserModel[]>

package/src/libs/common/domain/src/lib/repository/records-repository.interface.ts

@@ -10,6 +10,7 @@ import {
   CatalogRecord,
   DatasetFeatureCatalog,
   LanguageCode,
+  LinkedRecord,
 } from '../model/record'
 
 export abstract class RecordsRepositoryInterface {
@@ -23,8 +24,7 @@ export abstract class RecordsRepositoryInterface {
   abstract getSimilarRecords(
     similarTo: CatalogRecord
   ): Observable<CatalogRecord[]>
-  abstract getSources(record: CatalogRecord): Observable<CatalogRecord[]>
-  abstract getSourceOf(record: CatalogRecord): Observable<CatalogRecord[]>
+  abstract getLinkedRecords(record: CatalogRecord): Observable<LinkedRecord[]>
   abstract fuzzySearch(query: string): Observable<SearchResults>
   abstract canDuplicate(record: CatalogRecord): boolean
   abstract canDelete(record: CatalogRecord): Observable<boolean>
@@ -39,7 +39,8 @@ export abstract class RecordsRepositoryInterface {
    * @returns Observable<[CatalogRecord, string, boolean] | null>
    */
   abstract openRecordForEdition(
-    uniqueIdentifier: string
+    uniqueIdentifier: string,
+    disableDraft?: boolean
   ): Observable<[CatalogRecord, string, boolean] | null>
 
   /**

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

@@ -3,6 +3,7 @@ import {
   DatasetRecord,
   DatasetSpatialExtent,
   Keyword,
+  ReuseRecord,
   ServiceRecord,
 } from '../../../../../libs/common/domain/src/lib/model/record'
 
@@ -134,6 +135,8 @@ Cette section contient des *caractères internationaux* (ainsi que des "caractè
     lineage: `This record was edited manually to test the conversion processes
 
 As such, **it is not very interesting at all.**`,
+    sourceRecords: [],
+    associatedRecords: [],
     licenses: [
       {
         text: 'Licence ODbL mai 2013 (basée sur ODbL 1.0)',
@@ -310,6 +313,8 @@ Malgré l'attention portée à la création de ces données, il est rappelé que
     ],
     lineage: `Document d’urbanisme numérisé conformément aux prescriptions nationales du CNIG par le Service d'Information Géographique de l'Agglomération de la Région de Compiègne.
 Ce lot de données produit en 2019, a été numérisé à partir du PCI Vecteur de 2019 et contrôlé par le Service d'Information Géographique de l'Agglomération de la Région de Compiègne.`,
+    sourceRecords: [],
+    associatedRecords: [],
     legalConstraints: [],
     securityConstraints: [],
     otherConstraints: [],
@@ -361,6 +366,8 @@ export const simpleDatasetRecordFixture = (): DatasetRecord => ({
   overviews: [],
   spatialExtents: [],
   temporalExtents: [],
+  sourceRecords: [],
+  associatedRecords: [],
   onlineResources: [
     {
       type: 'download',
@@ -413,6 +420,8 @@ export const simpleDatasetRecordWithFcatsFixture = (): DatasetRecord => ({
   overviews: [],
   spatialExtents: [],
   temporalExtents: [],
+  sourceRecords: [],
+  associatedRecords: [],
   onlineResources: [],
   updateFrequency: { per: 'month', updatedTimes: 3 },
   translations: {},
@@ -978,6 +987,8 @@ export const multilingualDatasetFixture: () => DatasetRecord = () => ({
   title: 'English Title',
   abstract: 'English Abstract',
   lineage: 'English Lineage',
+  sourceRecords: [],
+  associatedRecords: [],
   translations: {
     title: { fr: 'Titre Français', de: 'Titel DE' },
     abstract: { fr: 'Résumé Français', de: 'Beschreibung DE' },
@@ -1022,3 +1033,54 @@ export const multilingualDatasetFixture: () => DatasetRecord = () => ({
   topics: [],
   recordUpdated: null,
 })
+
+export const simpleReuseRecordFixture = (): ReuseRecord => ({
+  abstract: `Sample reuse record`,
+  kind: 'reuse',
+  reuseType: 'application',
+  recordUpdated: new Date('2023-03-17T07:38:08.875Z'),
+  recordPublished: null,
+  ownerOrganization: null,
+  licenses: [],
+  legalConstraints: [],
+  securityConstraints: [],
+  otherConstraints: [],
+  contacts: [],
+  contactsForResource: [],
+  keywords: [],
+  topics: [],
+  spatialExtents: [],
+  temporalExtents: [],
+  lineage: 'bla',
+  sourceRecords: [],
+  associatedRecords: [],
+  overviews: [],
+  defaultLanguage: null,
+  otherLanguages: [],
+  title: 'Sites de gestion des déchets miniers - Service de visualisation WMS',
+  onlineResources: [
+    {
+      name: 'Rapport de disponibilité du service WMS',
+      description:
+        'Ce service de visualisation WMS permet de consulter la série de couches de données "Sites de gestion des déchets miniers - Série".',
+      mimeType: 'text/html',
+      type: 'link',
+      url: new URL(
+        'https://geoservices.wallonie.be/rapportDisponibilite/wms/sites_de_gestion_des_dechets_miniers_srie.html'
+      ),
+      accessRestricted: false,
+    },
+  ],
+  uniqueIdentifier: '00b22798-ec8e-4500-89e8-90eeeda45919',
+  landingPage: new URL(
+    'http://localhost:4200/geonetwork/srv/fre/catalog.search#/metadata/00b22798-ec8e-4500-89e8-90eeeda45919'
+  ),
+  extras: {
+    isPublishedToAll: true,
+    id: '723',
+    isHarvested: true,
+    ownerInfo: 'admin|admin|admin|Administrator',
+    edit: true,
+  },
+  recordCreated: new Date('2023-03-17T07:38:08.875Z'),
+})

package/src/libs/feature/catalog/src/lib/sources/sources.service.ts

@@ -1,4 +1,4 @@
-import { Injectable, inject } from '@angular/core'
+import { inject, Injectable } from '@angular/core'
 import { SourcesApiService } from '../../../../../../libs/data-access/gn4/src'
 import { Observable } from 'rxjs'
 import { filter, map, shareReplay } from 'rxjs/operators'
@@ -21,7 +21,10 @@ export class SourcesService {
     return this.sources$.pipe(
       map((sources) => sources.filter((source) => source.uuid === uuid)[0]),
       filter((source) => !!source),
-      map((source) => source.label[toLang3(this.translateService.currentLang)])
+      map(
+        (source) =>
+          source.label[toLang3(this.translateService.getCurrentLang())]
+      )
     )
   }
 }

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

@@ -2,9 +2,9 @@ import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
+  inject,
   Input,
   Output,
-  inject,
 } from '@angular/core'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 import {
@@ -183,7 +183,7 @@ export class ChartViewComponent {
   yChoices$ = this.properties$.pipe(
     map((properties) =>
       properties
-        .filter((prop) => prop.type === 'number' || prop.type === 'date')
+        .filter((prop) => prop.type === 'number')
         .map((prop) => ({ value: prop.name, label: prop.label || prop.name }))
     ),
     tap((choices) => {
@@ -222,6 +222,7 @@ export class ChartViewComponent {
     switchMap(([dataset, xProp, yProp, aggregation]) => {
       const fieldAgg: FieldAggregation =
         aggregation === 'count' ? ['count'] : [aggregation, yProp]
+      this.loading = true
       return dataset
         .groupBy(['distinct', xProp])
         .aggregate(fieldAgg)

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

@@ -2,11 +2,11 @@ import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
+  inject,
   Input,
   OnDestroy,
   OnInit,
   ViewChild,
-  inject,
 } from '@angular/core'
 import {
   DataTableComponent,
@@ -75,6 +75,7 @@ export class GeoTableViewComponent implements OnInit, OnDestroy {
   }
 
   private async initMapContext(): Promise<MapContext> {
+    this.dataset.load()
     this.dataset.selectAll()
     return {
       layers: [

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

@@ -1,15 +1,15 @@
-import { Injectable, inject } from '@angular/core'
+import { inject, Injectable } from '@angular/core'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 import {
+  GetCollectionItemsOptions,
   OgcApiCollectionInfo,
   OgcApiEndpoint,
   OgcApiRecord,
-  WfsEndpoint,
-  WfsVersion,
-  TmsEndpoint,
   StacEndpoint,
-  GetCollectionItemsOptions,
   StacItemsDocument,
+  TmsEndpoint,
+  WfsEndpoint,
+  WfsVersion,
 } from '@camptocamp/ogc-client'
 import {
   BaseReader,
@@ -26,7 +26,7 @@ import {
 } from '../../../../../../libs/util/shared/src'
 import type { FeatureCollection } from 'geojson'
 import { from, Observable, throwError } from 'rxjs'
-import { catchError, map, switchMap, tap } from 'rxjs/operators'
+import { catchError, map, switchMap } from 'rxjs/operators'
 import {
   DatasetOnlineResource,
   DatasetServiceDistribution,
@@ -347,14 +347,11 @@ export class DataService {
     if (link.type === 'service' && link.accessServiceProtocol === 'wfs') {
       const wfsUrlEndpoint = this.proxy.getProxiedUrl(link.url.toString())
       return from(
-        openDataset(
-          wfsUrlEndpoint,
-          'wfs',
-          {
-            wfsFeatureType: link.name,
-          },
-          cacheActive
-        )
+        openDataset(wfsUrlEndpoint, {
+          typeHint: 'wfs',
+          wfsFeatureType: link.name,
+          enableCache: cacheActive,
+        })
       )
     } else if (link.type === 'download') {
       const linkProxifiedUrl = this.proxy.getProxiedUrl(link.url.toString())
@@ -364,7 +361,10 @@ export class DataService {
           ? (format as SupportedType)
           : undefined
       return from(
-        openDataset(linkProxifiedUrl, supportedType, undefined, cacheActive)
+        openDataset(linkProxifiedUrl, {
+          typeHint: supportedType,
+          enableCache: cacheActive,
+        })
       ).pipe()
     } else if (
       link.type === 'service' &&
@@ -374,7 +374,9 @@ export class DataService {
         link.url.toString(),
         'geojson'
       )
-      return from(openDataset(url, 'geojson', undefined, cacheActive)).pipe()
+      return from(
+        openDataset(url, { typeHint: 'geojson', enableCache: cacheActive })
+      ).pipe()
     } else if (
       link.type === 'service' &&
       link.accessServiceProtocol === 'ogcFeatures'
@@ -395,12 +397,10 @@ export class DataService {
           }
           const urlWithoutLimit = new URL(geojsonUrl)
           urlWithoutLimit.searchParams.delete('limit')
-          return openDataset(
-            urlWithoutLimit.toString(),
-            'geojson',
-            undefined,
-            cacheActive
-          )
+          return openDataset(urlWithoutLimit.toString(), {
+            typeHint: 'geojson',
+            enableCache: cacheActive,
+          })
         })
       )
     }

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

@@ -3,6 +3,7 @@ export * from './lib/+state/editor.facade'
 export * from './lib/+state/editor.models'
 export * from './lib/+state/editor.reducer'
 export * from './lib/+state/editor.selectors'
+export * from './lib/components/contact-details/contact-details-form.component'
 export * from './lib/components/import-record/import-record.component'
 export * from './lib/components/metadata-quality-panel/metadata-quality-panel.component'
 export * from './lib/components/multilingual-panel/multilingual-panel.component'

package/src/libs/feature/editor/src/lib/+state/editor.actions.ts

@@ -29,7 +29,10 @@ export const markRecordAsChanged = createAction(
   '[Editor] Mark record as changed'
 )
 
-export const saveRecord = createAction('[Editor] Save record')
+export const saveRecord = createAction(
+  '[Editor] Save record',
+  props<{ publish: boolean }>()
+)
 export const saveRecordSuccess = createAction('[Editor] Save record success')
 export const saveRecordFailure = createAction(
   '[Editor] Save record failure',

package/src/libs/feature/editor/src/lib/+state/editor.effects.ts

@@ -28,30 +28,37 @@ export class EditorEffects {
         this.store.select(selectRecordSource),
         this.store.select(selectEditorConfig)
       ),
-      switchMap(([, record, recordSource, fieldsConfig]) =>
-        this.editorService.saveRecord(record, recordSource, fieldsConfig).pipe(
-          switchMap(([savedRecord, savedRecordSource]) => {
-            const actions: Action[] = [EditorActions.saveRecordSuccess()]
+      switchMap(([{ publish }, record, recordSource, fieldsConfig]) =>
+        this.editorService
+          .saveRecord(record, recordSource, fieldsConfig, publish)
+          .pipe(
+            switchMap(([savedRecord, savedRecordSource]) => {
+              const actions: Action[] = [EditorActions.saveRecordSuccess()]
+
+              if (publish) {
+                // saving without publishing doesn't unpublish
+                actions.push(EditorActions.isPublished({ isPublished: true }))
+              }
 
-            if (!record?.uniqueIdentifier) {
-              actions.push(
-                EditorActions.openRecord({
-                  record: savedRecord,
-                  recordSource: savedRecordSource,
+              if (!record?.uniqueIdentifier) {
+                actions.push(
+                  EditorActions.openRecord({
+                    record: savedRecord,
+                    recordSource: savedRecordSource,
+                  })
+                )
+              }
+
+              return of(...actions)
+            }),
+            catchError((error) =>
+              of(
+                EditorActions.saveRecordFailure({
+                  error,
                 })
               )
-            }
-
-            return of(...actions)
-          }),
-          catchError((error) =>
-            of(
-              EditorActions.saveRecordFailure({
-                error,
-              })
             )
           )
-        )
       )
     )
   )

package/src/libs/feature/editor/src/lib/+state/editor.facade.ts

@@ -54,7 +54,11 @@ export class EditorFacade {
   }
 
   saveRecord() {
-    this.store.dispatch(EditorActions.saveRecord())
+    this.store.dispatch(EditorActions.saveRecord({ publish: false }))
+  }
+
+  saveAndPublishRecord() {
+    this.store.dispatch(EditorActions.saveRecord({ publish: true }))
   }
 
   undoRecordDraft() {

package/src/libs/feature/editor/src/lib/components/constraint-card/constraint-card.component.ts

@@ -8,7 +8,6 @@ import {
 
 import { FormFieldRichComponent } from '../record-form/form-field/form-field-rich/form-field-rich.component'
 import { ButtonComponent, UrlInputComponent } from '../../../../../../../libs/ui/inputs/src'
-import { MatIconModule } from '@angular/material/icon'
 import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
 import { Constraint } from '../../../../../../../libs/common/domain/src/lib/model/record'
 import {
@@ -26,7 +25,6 @@ import { marker } from '@biesbjerg/ngx-translate-extract-marker'
     FormFieldRichComponent,
     UrlInputComponent,
     ButtonComponent,
-    MatIconModule,
     TranslateDirective,
     TranslatePipe,
     NgIconComponent,