geonetwork-ui 2.10.0-dev.300bb3d2d → 2.10.0-dev.37a1e4c4d

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

@@ -108,11 +108,6 @@ export interface Keyword {
   translations?: KeywordTranslations
 }
 
-export interface INSPIRE_topic {
-  value: string
-  label: string
-}
-
 export interface ResourceIdentifier {
   code: string
   codeSpace?: string
@@ -254,10 +249,20 @@ export interface DatasetTemporalExtent {
   end?: Date
 }
 
+/**
+ * Represents a source dataset referenced from a lineage entry.
+ */
+export interface SourceRecord {
+  uuid?: string
+  title?: string
+  href?: 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>
   onlineResources: Array<DatasetOnlineResource>
   spatialExtents: Array<DatasetSpatialExtent>
   temporalExtents: Array<DatasetTemporalExtent>
@@ -285,6 +290,7 @@ 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>
   onlineResources: Array<DatasetOnlineResource>
   reuseType: ReuseType
   spatialExtents: Array<DatasetSpatialExtent>

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/fixtures/src/lib/records.fixtures.ts

@@ -134,6 +134,7 @@ 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: [],
     licenses: [
       {
         text: 'Licence ODbL mai 2013 (basée sur ODbL 1.0)',
@@ -310,6 +311,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: [],
     legalConstraints: [],
     securityConstraints: [],
     otherConstraints: [],
@@ -361,6 +363,7 @@ export const simpleDatasetRecordFixture = (): DatasetRecord => ({
   overviews: [],
   spatialExtents: [],
   temporalExtents: [],
+  sourceRecords: [],
   onlineResources: [
     {
       type: 'download',
@@ -413,6 +416,7 @@ export const simpleDatasetRecordWithFcatsFixture = (): DatasetRecord => ({
   overviews: [],
   spatialExtents: [],
   temporalExtents: [],
+  sourceRecords: [],
   onlineResources: [],
   updateFrequency: { per: 'month', updatedTimes: 3 },
   translations: {},
@@ -978,6 +982,7 @@ export const multilingualDatasetFixture: () => DatasetRecord = () => ({
   title: 'English Title',
   abstract: 'English Abstract',
   lineage: 'English Lineage',
+  sourceRecords: [],
   translations: {
     title: { fr: 'Titre Français', de: 'Titel DE' },
     abstract: { fr: 'Résumé Français', de: 'Beschreibung DE' },

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/lib/+state/editor.actions.ts

@@ -1,6 +1,7 @@
 import { createAction, props } from '@ngrx/store'
 import {
   CatalogRecord,
+  CatalogRecordKeys,
   LanguageCode,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { SaveRecordError } from './editor.models'
@@ -73,3 +74,8 @@ export const canEditRecord = createAction(
   '[Editor] User can edit record',
   props<{ canEditRecord: boolean }>()
 )
+
+export const setFocusedField = createAction(
+  '[Editor] Set focused field',
+  props<{ model: CatalogRecordKeys }>()
+)

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

@@ -4,9 +4,10 @@ import * as EditorActions from './editor.actions'
 import * as EditorSelectors from './editor.selectors'
 import {
   CatalogRecord,
+  CatalogRecordKeys,
   LanguageCode,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
-import { filter } from 'rxjs'
+import { filter, map } from 'rxjs'
 import { Actions, ofType } from '@ngrx/effects'
 import { EditorConfig, EditorFieldIdentification } from '../models'
 
@@ -37,6 +38,10 @@ export class EditorFacade {
   )
   isPublished$ = this.store.pipe(select(EditorSelectors.selectIsPublished))
   canEditRecord$ = this.store.pipe(select(EditorSelectors.selectCanEditRecord))
+  focusedField$ = this.actions$.pipe(
+    ofType(EditorActions.setFocusedField),
+    map(({ model }) => model)
+  )
 
   openRecord(record: CatalogRecord, recordSource: string) {
     this.store.dispatch(
@@ -77,6 +82,10 @@ export class EditorFacade {
     this.store.dispatch(EditorActions.setCurrentPage({ page }))
   }
 
+  setFocusedField(model: CatalogRecordKeys) {
+    this.store.dispatch(EditorActions.setFocusedField({ model }))
+  }
+
   setFieldVisibility(field: EditorFieldIdentification, visible: boolean) {
     this.store.dispatch(EditorActions.setFieldVisibility({ field, visible }))
   }

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

@@ -0,0 +1,67 @@
+<div class="flex flex-col gap-7">
+  <div class="grid grid-cols-2 gap-4">
+    <div class="min-w-0">
+      <h3 class="text-[16px] font-bold text-main mb-[12px]" translate>
+        editor.record.form.field.contactDetails.lastName
+      </h3>
+      <gn-ui-text-input
+        class="block w-full"
+        extraClass="w-full"
+        [(value)]="contact.lastName"
+        (valueChange)="emitContactChange()"
+        [placeholder]="
+          'editor.record.form.field.contactDetails.lastName.placeholder'
+            | translate
+        "
+        data-test="contactDetailsLastName"
+      ></gn-ui-text-input>
+    </div>
+    <div class="min-w-0">
+      <h3 class="text-[16px] font-bold text-main mb-[12px]" translate>
+        editor.record.form.field.contactDetails.firstName
+      </h3>
+      <gn-ui-text-input
+        class="block w-full"
+        extraClass="w-full"
+        [(value)]="contact.firstName"
+        (valueChange)="emitContactChange()"
+        [placeholder]="
+          'editor.record.form.field.contactDetails.firstName.placeholder'
+            | translate
+        "
+        data-test="contactDetailsFirstName"
+      ></gn-ui-text-input>
+    </div>
+  </div>
+  <div>
+    <h3 class="text-[16px] font-bold text-main mb-[12px]" translate>
+      editor.record.form.field.contactDetails.email
+    </h3>
+    <gn-ui-text-input
+      class="block w-full"
+      extraClass="w-full"
+      [value]="contact.organization?.email ?? ''"
+      (valueChange)="handleOrganizationChange({ email: $event })"
+      [placeholder]="
+        'editor.record.form.field.contactDetails.email.placeholder' | translate
+      "
+      data-test="contactDetailsEmail"
+    ></gn-ui-text-input>
+  </div>
+  <div>
+    <h3 class="text-[16px] font-bold text-main mb-[12px]" translate>
+      editor.record.form.field.contactDetails.organization
+    </h3>
+    <gn-ui-text-input
+      class="block w-full"
+      extraClass="w-full"
+      [value]="contact.organization?.name ?? ''"
+      (valueChange)="handleOrganizationChange({ name: $event })"
+      [placeholder]="
+        'editor.record.form.field.contactDetails.organization.placeholder'
+          | translate
+      "
+      data-test="contactDetailsOrganization"
+    ></gn-ui-text-input>
+  </div>
+</div>

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

@@ -0,0 +1,39 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core'
+import {
+  Individual,
+  Organization,
+} from '../../../../../../../libs/common/domain/src/lib/model/record'
+import { TextInputComponent } from '../../../../../../../libs/ui/inputs/src'
+import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
+
+@Component({
+  selector: 'gn-ui-contact-details-form',
+  templateUrl: './contact-details-form.component.html',
+  styleUrls: ['./contact-details-form.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [TextInputComponent, TranslateDirective, TranslatePipe],
+})
+export class ContactDetailsFormComponent {
+  @Input() contact: Individual
+  @Output() contactChange = new EventEmitter<Individual>()
+
+  emitContactChange() {
+    this.contactChange.emit(this.contact)
+  }
+
+  handleOrganizationChange(change: Partial<Organization>) {
+    this.contact.organization = {
+      ...(this.contact.organization ?? ({} as Organization)),
+      ...change,
+    } as Organization
+
+    this.emitContactChange()
+  }
+}

package/src/libs/feature/editor/src/lib/components/metadata-quality-panel/metadata-quality-panel.component.html

@@ -7,11 +7,26 @@
       >editor.record.form.metadataQuality.title</span
     >
   </div>
-  @for (properties of propertiesByPage; track properties; let i = $index) {
+  @for (
+    properties of (propertiesByPage$ | async) ?? [];
+    track properties;
+    let isLast = $last
+  ) {
     <div class="flex flex-col gap-2">
       @for (property of properties; track property) {
         <gn-ui-button
-          [extraClass]="getExtraClass(property.value)"
+          style="
+            --gn-ui-button-justify: space-between;
+            --gn-ui-button-height: 34px;
+            --gn-ui-button-width: 100%;
+            --gn-ui-button-border-width: 0;
+            --gn-ui-button-color: black;
+            --gn-ui-button-background: transparent;
+            --gn-ui-button-bg-hover: #f3f4f6;
+            --gn-ui-button-disabled-opacity: 1;
+          "
+          [disabled]="property.value"
+          (buttonClick)="onCriterionClick(property)"
           type="outline"
           attr.data-cy="md-quality-btn-{{ property.label }}"
         >
@@ -28,7 +43,7 @@
           </div>
         </gn-ui-button>
       }
-      @if (i !== propertiesByPage.length - 1) {
+      @if (!isLast) {
         <hr class="border-gray-300 w-11/12 mx-auto" />
       }
     </div>

package/src/libs/feature/editor/src/lib/components/metadata-quality-panel/metadata-quality-panel.component.ts

@@ -1,5 +1,5 @@
-import { Component, Input, OnChanges } from '@angular/core'
-import { CatalogRecord } from '../../../../../../../libs/common/domain/src/lib/model/record'
+import { Component, inject } from '@angular/core'
+import { CatalogRecordKeys } from '../../../../../../../libs/common/domain/src/lib/model/record'
 import { ButtonComponent } from '../../../../../../../libs/ui/inputs/src'
 import {
   getAllKeysValidator,
@@ -13,8 +13,10 @@ import {
 } from '@ng-icons/core'
 import { iconoirBadgeCheck, iconoirSystemShut } from '@ng-icons/iconoir'
 import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
-import { EditorConfig } from '../../models'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
+import { EditorFacade } from '../../+state/editor.facade'
+import { combineLatest, map } from 'rxjs'
+import { AsyncPipe } from '@angular/common'
 
 //forced translations that are not available in fields.config.ts
 marker('editor.record.form.field.keywords')
@@ -29,6 +31,7 @@ marker('editor.record.form.field.organisation')
     TranslatePipe,
     ButtonComponent,
     NgIconComponent,
+    AsyncPipe,
   ],
   providers: [
     provideIcons({
@@ -42,47 +45,37 @@ marker('editor.record.form.field.organisation')
   templateUrl: './metadata-quality-panel.component.html',
   styleUrl: './metadata-quality-panel.component.css',
 })
-export class MetadataQualityPanelComponent implements OnChanges {
+export class MetadataQualityPanelComponent {
+  facade = inject(EditorFacade)
   propsToValidate: ValidatorMapperKeys[] = getAllKeysValidator()
-  propertiesByPage: { label: string; value: boolean }[][] = []
-  @Input() editorConfig: EditorConfig
-  @Input() record: CatalogRecord
 
-  ngOnChanges() {
-    if (this.editorConfig && this.record) {
-      const fieldsByPage = this.editorConfig.pages.map((page) =>
-        page.sections.flatMap((section) =>
-          section.fields
-            .filter((field) => this.propsToValidate.includes(field.model))
-            .map((field) => field.model as ValidatorMapperKeys)
-        )
-      )
-      // FIXME: temporarily add topics and organisation to the first and third page
-      // as long as they are not handled by the editor
-      if (fieldsByPage.length > 0) {
-        fieldsByPage[0].includes('topics') || fieldsByPage[0].push('topics')
-        fieldsByPage[2].includes('organisation') ||
-          fieldsByPage[2].push('organisation')
-      }
-      this.propertiesByPage = fieldsByPage
-        .map((fields) =>
-          getQualityValidators(
-            this.record,
-            fields as ValidatorMapperKeys[]
-          ).map(({ name, validator }) => ({
-            label: `editor.record.form.field.${name}`, // use same translations as in fields.config.ts
-            value: validator(),
-          }))
+  propertiesByPage$ = combineLatest([
+    this.facade.editorConfig$,
+    this.facade.record$,
+  ]).pipe(
+    map(([editorConfig, record]) => {
+      if (!editorConfig || !record) return []
+      const validators = getQualityValidators(record, this.propsToValidate)
+      return editorConfig.pages
+        .map((page) =>
+          page.sections
+            .flatMap((section) => section.fields)
+            .flatMap(({ model }) =>
+              validators.filter((v) => (v.alias ?? v.name) === model)
+            )
+            .map(({ name, validator, alias }) => ({
+              label: `editor.record.form.field.${name}`,
+              value: validator(),
+              model: (alias ?? name) as CatalogRecordKeys,
+            }))
         )
         .filter((arr) => arr.length > 0)
-    }
-  }
+    })
+  )
 
-  getExtraClass(checked: boolean): string {
-    const baseClasses =
-      'flex flex-row justify-between rounded mb-1 h-[34px] w-full focus:ring-0 hover:border-none border-none hover:text-black text-black cursor-default'
-    return checked
-      ? `${baseClasses} bg-neutral-100 hover:bg-neutral-100`
-      : `${baseClasses} bg-transparent hover:bg-transparent`
+  onCriterionClick(property: { value: boolean; model: CatalogRecordKeys }) {
+    if (!property.value) {
+      this.facade.setFocusedField(property.model)
+    }
   }
 }

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

@@ -0,0 +1,41 @@
+import { Directive, ElementRef, inject, Input } from '@angular/core'
+
+@Directive({
+  selector: '[gnUiFieldFocus]',
+  standalone: true,
+  exportAs: 'fieldFocus',
+})
+export class FieldFocusDirective {
+  @Input() gnUiFieldFocusGlowClass = 'gn-ui-field-focus-glow'
+
+  private el = inject(ElementRef)
+
+  public focusField(focusInnerTarget = true) {
+    setTimeout(() => {
+      const host = this.el.nativeElement as HTMLElement
+      const glowClass = this.gnUiFieldFocusGlowClass
+
+      host.classList.remove(glowClass)
+      void host.offsetWidth
+      host.classList.add(glowClass)
+      host.addEventListener(
+        'animationend',
+        () => host.classList.remove(glowClass),
+        { once: true }
+      )
+
+      host.scrollIntoView({ behavior: 'smooth', block: 'start' })
+      if (!focusInnerTarget) {
+        return
+      }
+      const target =
+        host.querySelector<HTMLElement>(
+          'input, textarea, select, [contenteditable="true"]'
+        ) ??
+        host.querySelector<HTMLElement>(
+          'button:not([disabled]), [tabindex]:not([tabindex="-1"])'
+        )
+      target?.focus({ preventScroll: true })
+    })
+  }
+}

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

@@ -2,7 +2,7 @@ import {
   ChangeDetectionStrategy,
   Component,
   OnDestroy,
-  OnInit,
+  afterNextRender,
   inject,
 } from '@angular/core'
 import { CommonModule } from '@angular/common'
@@ -67,9 +67,7 @@ export type ConstraintChoice =
   styleUrls: ['./form-field-constraints-shortcuts.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class FormFieldConstraintsShortcutsComponent
-  implements OnInit, OnDestroy
-{
+export class FormFieldConstraintsShortcutsComponent implements OnDestroy {
   private editorFacade = inject(EditorFacade)
 
   legalConstraints$ = this.editorFacade.record$.pipe(
@@ -112,37 +110,37 @@ export class FormFieldConstraintsShortcutsComponent
 
   onDestroy$ = new Subject<void>()
 
-  ngOnInit(): void {
-    // hide all constraints if any toggle is activated
-    this.anyToggleActivated$
-      .pipe(takeUntil(this.onDestroy$), distinctUntilChanged())
-      .subscribe((anyToggleActivated) => {
-        if (anyToggleActivated) {
-          this.hideAllConstraintSections()
-        }
-      })
+  constructor() {
+    // Deferred to afterNextRender to avoid dispatching store actions
+    // synchronously during Angular's change detection cycle (NG0100)
+    afterNextRender(() => {
+      this.anyToggleActivated$
+        .pipe(takeUntil(this.onDestroy$), distinctUntilChanged())
+        .subscribe((anyToggleActivated) => {
+          if (anyToggleActivated) {
+            this.hideAllConstraintSections()
+          }
+        })
 
-    // also hide constraints which are empty arrays
-    const hideEmptyConstraints = (
-      constraints$: Observable<Constraint[]>,
-      model: ConstraintChoice
-    ) => {
-      const isConstraintNotEmpty$ = constraints$.pipe(
-        takeUntil(this.onDestroy$),
-        map((c) => c.length > 0),
-        distinctUntilChanged()
-      )
-      combineLatest([
-        isConstraintNotEmpty$,
-        this.anyToggleActivated$,
-      ]).subscribe(([isNotEmpty, anyToggleActivated]) => {
-        const visible = isNotEmpty && !anyToggleActivated
-        this.editorFacade.setFieldVisibility({ model }, visible)
-      })
-    }
-    hideEmptyConstraints(this.legalConstraints$, 'legalConstraints')
-    hideEmptyConstraints(this.securityConstraints$, 'securityConstraints')
-    hideEmptyConstraints(this.otherConstraints$, 'otherConstraints')
+      const hideEmptyConstraints = (
+        constraints$: Observable<Constraint[]>,
+        model: ConstraintChoice
+      ) => {
+        const isConstraintNotEmpty$ = constraints$.pipe(
+          takeUntil(this.onDestroy$),
+          map((c) => c.length > 0),
+          distinctUntilChanged()
+        )
+        combineLatest([isConstraintNotEmpty$, this.anyToggleActivated$])
+          .pipe(takeUntil(this.onDestroy$))
+          .subscribe(([isNotEmpty, anyToggleActivated]) => {
+            const visible = isNotEmpty && !anyToggleActivated
+            this.editorFacade.setFieldVisibility({ model }, visible)
+          })
+      }
+      hideEmptyConstraints(this.securityConstraints$, 'securityConstraints')
+      hideEmptyConstraints(this.otherConstraints$, 'otherConstraints')
+    })
   }
 
   ngOnDestroy() {

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

@@ -10,21 +10,21 @@
   </gn-ui-autocomplete>
 
   @if (contacts.length > 0) {
-    @if (contacts.length === 1) {
-      @for (contact of contacts; track contact; let index = $index) {
+    <gn-ui-sortable-list
+      [items]="contacts"
+      (itemsOrderChange)="handleContactsChanged($event)"
+      [elementTemplate]="contactTemplate"
+    ></gn-ui-sortable-list>
+    <ng-template #contactTemplate let-contact let-index="index">
+      @if (modelSpecifier === 'contact:editableDetails') {
+        <gn-ui-contact-details-form
+          [contact]="contact"
+          (contactChange)="handleContactChanged($event, index)"
+        ></gn-ui-contact-details-form>
+      } @else {
         <gn-ui-contact-card [contact]="contact"></gn-ui-contact-card>
       }
-    }
-    @if (contacts.length > 1) {
-      <gn-ui-sortable-list
-        [items]="contacts"
-        (itemsOrderChange)="handleContactsChanged($event)"
-        [elementTemplate]="contactTemplate"
-      ></gn-ui-sortable-list>
-      <ng-template #contactTemplate let-contact>
-        <gn-ui-contact-card [contact]="contact"></gn-ui-contact-card>
-      </ng-template>
-    }
+    </ng-template>
   } @else {
     <div
       class="p-4 text-sm border border-primary bg-primary-lightest rounded-lg"