geonetwork-ui 2.10.0-dev.25c2dd4c0 → 2.10.0-dev.2be368c45

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

@@ -3,7 +3,7 @@ import {
   HttpErrorResponse,
   HttpHeaders,
 } from '@angular/common/http'
-import { Injectable, InjectionToken, inject } from '@angular/core'
+import { inject, Injectable, InjectionToken } from '@angular/core'
 import {
   assertValidXml,
   BaseConverter,
@@ -327,8 +327,10 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     return this.settingsService.allowEditHarvested$.pipe(
       map((allowEditHarvested) => {
         return (
-          record.extras['edit'] &&
-          (!record.extras['isHarvested'] || allowEditHarvested)
+          (this.platformService.supportsAuthentication() &&
+            record.extras?.['edit'] &&
+            (!record.extras?.['isHarvested'] || allowEditHarvested)) ??
+          false
         )
       })
     )
@@ -336,10 +338,10 @@ export class Gn4Repository implements RecordsRepositoryInterface {
 
   private canEdit(record: CatalogRecord, allowEditHarvested: boolean): boolean {
     return (
-      this.platformService.supportsAuthentication() &&
-      record.kind === 'dataset' &&
-      record.extras['edit'] &&
-      (!record.extras['isHarvested'] || allowEditHarvested)
+      (this.platformService.supportsAuthentication() &&
+        record.extras?.['edit'] &&
+        (!record.extras?.['isHarvested'] || allowEditHarvested)) ??
+      false
     )
   }
 
@@ -361,8 +363,10 @@ export class Gn4Repository implements RecordsRepositoryInterface {
   }
 
   openRecordForEdition(
-    uniqueIdentifier: string
+    uniqueIdentifier: string,
+    disableDraft?: boolean
   ): Observable<[CatalogRecord, string, boolean] | null> {
+    this.disableDraft = disableDraft ?? this.disableDraft
     const draft$ = this.disableDraft
       ? of(null)
       : of(this.getRecordFromLocalStorage(uniqueIdentifier))
@@ -385,38 +389,52 @@ export class Gn4Repository implements RecordsRepositoryInterface {
   openRecordForDuplication(
     uniqueIdentifier: string
   ): Observable<[CatalogRecord, string, true] | null> {
-    return this.gn4RecordsApi
-      .create(
-        uniqueIdentifier,
-        '2',
-        'METADATA',
-        '',
-        false,
-        undefined,
-        true,
-        false,
-        undefined,
-        'body',
-        false,
-        {
-          httpHeaderAccept: 'application/json',
-          httpContentTypeSelected: 'application/json;charset=UTF-8',
-        }
-      )
-      .pipe(
-        switchMap((uniqueIdentifier) => {
-          return this.getRecordAsXml(uniqueIdentifier)
-        }),
-        switchMap((xml) => {
-          return from(
-            findConverterForDocument(xml)
-              .readRecord(xml)
-              .then((record) => {
-                return [record, xml, true] as [CatalogRecord, string, true]
-              })
+    return this.platformService.getUserPermissionsByGroup().pipe(
+      map((permissions) => {
+        const groupId =
+          permissions.find((p) => p.canApprove)?.groupId?.toString() ??
+          permissions.find((p) => p.canEdit)?.groupId?.toString()
+        if (!groupId)
+          throw new Error(
+            'Current user has no writable group to duplicate into'
+          )
+        return groupId
+      }),
+      switchMap((groupId) =>
+        this.gn4RecordsApi
+          .create(
+            uniqueIdentifier,
+            groupId,
+            'METADATA',
+            '',
+            false,
+            undefined,
+            true,
+            false,
+            undefined,
+            'body',
+            false,
+            {
+              httpHeaderAccept: 'application/json',
+              httpContentTypeSelected: 'application/json;charset=UTF-8',
+            }
+          )
+          .pipe(
+            switchMap((uniqueIdentifier) => {
+              return this.getRecordAsXml(uniqueIdentifier)
+            }),
+            switchMap((xml) => {
+              return from(
+                findConverterForDocument(xml)
+                  .readRecord(xml)
+                  .then((record) => {
+                    return [record, xml, true] as [CatalogRecord, string, true]
+                  })
+              )
+            })
           )
-        })
       )
+    )
   }
 
   saveRecord(

package/src/libs/api/repository/src/lib/gn4/organizations/organizations-from-groups.service.ts

@@ -52,7 +52,7 @@ export class OrganizationsFromGroupsService
   organisationsCount$ = this.organisations$.pipe(map((orgs) => orgs.length))
 
   private get lang3() {
-    return toLang3(this.translateService.currentLang)
+    return toLang3(this.translateService.getCurrentLang())
   }
 
   constructor(

package/src/libs/api/repository/src/lib/gn4/organizations/organizations-from-metadata.service.ts

@@ -128,7 +128,7 @@ export class OrganizationsFromMetadataService
   ) {}
 
   private get langIndex() {
-    return `lang${toLang3(this.translateService.currentLang)}`
+    return `lang${toLang3(this.translateService.getCurrentLang())}`
   }
 
   equalsNormalizedStrings(

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
@@ -263,11 +260,20 @@ export interface SourceRecord {
   href?: string
 }
 
+/**
+ * Represents another record associated with this one (e.g. a parent/sibling dataset).
+ */
+export interface AssociatedRecord {
+  uuid: string
+  associationType: string
+}
+
 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>
@@ -296,6 +302,7 @@ 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/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

@@ -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'
 
@@ -135,6 +136,7 @@ Cette section contient des *caractères internationaux* (ainsi que des "caractè
 
 As such, **it is not very interesting at all.**`,
     sourceRecords: [],
+    associatedRecords: [],
     licenses: [
       {
         text: 'Licence ODbL mai 2013 (basée sur ODbL 1.0)',
@@ -312,6 +314,7 @@ 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: [],
@@ -364,6 +367,7 @@ export const simpleDatasetRecordFixture = (): DatasetRecord => ({
   spatialExtents: [],
   temporalExtents: [],
   sourceRecords: [],
+  associatedRecords: [],
   onlineResources: [
     {
       type: 'download',
@@ -417,6 +421,7 @@ export const simpleDatasetRecordWithFcatsFixture = (): DatasetRecord => ({
   spatialExtents: [],
   temporalExtents: [],
   sourceRecords: [],
+  associatedRecords: [],
   onlineResources: [],
   updateFrequency: { per: 'month', updatedTimes: 3 },
   translations: {},
@@ -983,6 +988,7 @@ export const multilingualDatasetFixture: () => DatasetRecord = () => ({
   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' },
@@ -1027,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/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,

package/src/libs/feature/editor/src/lib/components/contact-details/contact-details-form.component.html

@@ -7,8 +7,8 @@
       <gn-ui-text-input
         class="block w-full"
         extraClass="w-full"
-        [(value)]="contact.lastName"
-        (valueChange)="emitContactChange()"
+        [value]="contact.lastName ?? ''"
+        (valueChange)="handleChange({ lastName: $event })"
         [placeholder]="
           'editor.record.form.field.contactDetails.lastName.placeholder'
             | translate
@@ -23,8 +23,8 @@
       <gn-ui-text-input
         class="block w-full"
         extraClass="w-full"
-        [(value)]="contact.firstName"
-        (valueChange)="emitContactChange()"
+        [value]="contact.firstName ?? ''"
+        (valueChange)="handleChange({ firstName: $event })"
         [placeholder]="
           'editor.record.form.field.contactDetails.firstName.placeholder'
             | translate
@@ -40,8 +40,9 @@
     <gn-ui-text-input
       class="block w-full"
       extraClass="w-full"
-      [value]="contact.organization?.email ?? ''"
-      (valueChange)="handleOrganizationChange({ email: $event })"
+      [type]="'email'"
+      [value]="contact.email ?? ''"
+      (valueChange)="handleChange({ email: $event })"
       [placeholder]="
         'editor.record.form.field.contactDetails.email.placeholder' | translate
       "

package/src/libs/feature/editor/src/lib/components/contact-details/contact-details-form.component.ts

@@ -24,16 +24,18 @@ export class ContactDetailsFormComponent {
   @Input() contact: Individual
   @Output() contactChange = new EventEmitter<Individual>()
 
-  emitContactChange() {
-    this.contactChange.emit(this.contact)
+  // emit a fresh contact on each change; never mutate the @Input
+  handleChange(change: Partial<Individual>) {
+    this.contactChange.emit({ ...this.contact, ...change })
   }
 
   handleOrganizationChange(change: Partial<Organization>) {
-    this.contact.organization = {
-      ...(this.contact.organization ?? ({} as Organization)),
-      ...change,
-    } as Organization
-
-    this.emitContactChange()
+    this.contactChange.emit({
+      ...this.contact,
+      organization: {
+        ...(this.contact.organization ?? ({} as Organization)),
+        ...change,
+      } as Organization,
+    })
   }
 }

package/src/libs/feature/editor/src/lib/components/generic-keywords/generic-keywords.component.html

@@ -11,20 +11,11 @@
   ></gn-ui-autocomplete>
   <div class="flex gap-2 flex-wrap">
     @for (keyword of keywords; track keyword) {
-      <gn-ui-badge
-        [removable]="true"
-        (badgeRemoveClicked)="removeKeyword(keyword)"
-        >{{ keyword.label }}
-        @if (isPlaceWithoutExtent(keyword)) {
-          <ng-icon
-            [title]="
-              'editor.record.form.keywords.place.withoutExtent' | translate
-            "
-            class="badge-warning"
-            name="matWarningAmberOutline"
-          ></ng-icon>
-        }
-      </gn-ui-badge>
+      <gn-ui-keyword-badge
+        [keyword]="keyword"
+        [editable]="true"
+        (keywordRemove)="removeKeyword($event)"
+      ></gn-ui-keyword-badge>
     }
   </div>
 </div>