geonetwork-ui 2.10.0-dev.cc63fa135 → 2.10.0-dev.cf0577fae

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

@@ -150,6 +150,7 @@
     <ng-container *ngSwitchCase="'contacts'">
       <gn-ui-form-field-contacts
         [value]="valueAsIndividuals"
+        [modelSpecifier]="modelSpecifier"
         (valueChange)="valueChange.emit($event)"
       ></gn-ui-form-field-contacts>
     </ng-container>

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

@@ -4,6 +4,7 @@ import {
   Component,
   ElementRef,
   EventEmitter,
+  inject,
   Input,
   Output,
   ViewChild,
@@ -22,6 +23,7 @@ import {
 import { FormFieldWrapperComponent } from '../../../../../../../../libs/ui/layout/src'
 import { TranslatePipe } from '@ngx-translate/core'
 import {
+  FieldFocusDirective,
   FormFieldDateComponent,
   FormFieldLicenseComponent,
   FormFieldTemporalExtentsComponent,
@@ -77,6 +79,7 @@ import { FormFieldTopicsComponent } from './form-field-topics/form-field-topics.
     FormFieldTopicsComponent,
     TextFieldModule,
   ],
+  hostDirectives: [FieldFocusDirective],
 })
 export class FormFieldComponent {
   @Input() uniqueIdentifier: string
@@ -92,6 +95,8 @@ export class FormFieldComponent {
   @ViewChild('titleInput') titleInput: ElementRef
   isOpenData = false
 
+  fieldFocus = inject(FieldFocusDirective)
+
   toggleIsOpenData(event: boolean) {
     this.isOpenData = event
   }

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

@@ -1,3 +1,4 @@
+export * from './field-focus.directive'
 export * from './form-field-keywords/form-field-keywords.component'
 export * from './form-field-license/form-field-license.component'
 export * from './form-field-date/form-field-date.component'

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

@@ -1,3 +0,0 @@
-gn-ui-form-field {
-  scroll-margin-top: 90px;
-}

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

@@ -24,7 +24,6 @@
           ) {
             @if (!field.config.hidden) {
               <gn-ui-form-field
-                [id]="anchorIdPrefix + field.config.model"
                 [ngClass]="
                   field.config.gridColumnSpan === 1
                     ? 'col-span-1'

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

@@ -2,10 +2,10 @@ import { CommonModule } from '@angular/common'
 import {
   ChangeDetectionStrategy,
   Component,
-  ElementRef,
   inject,
   OnDestroy,
   OnInit,
+  viewChildren,
 } from '@angular/core'
 import { EditorFacade } from '../../+state/editor.facade'
 import { EditorFieldValue } from '../../models'
@@ -15,8 +15,9 @@ import {
   EditorFieldWithValue,
   EditorSectionWithValues,
 } from '../../+state/editor.models'
-import { filter, firstValueFrom, map, Subscription, switchMap } from 'rxjs'
+import { firstValueFrom, map, Subscription, withLatestFrom } from 'rxjs'
 import { CatalogRecordKeys } from '../../../../../../../libs/common/domain/src/lib/model/record'
+import { switchMap } from 'rxjs/operators'
 
 @Component({
   selector: 'gn-ui-record-form',
@@ -27,41 +28,42 @@ import { CatalogRecordKeys } from '../../../../../../../libs/common/domain/src/l
   imports: [CommonModule, FormFieldComponent, TranslateDirective],
 })
 export class RecordFormComponent implements OnInit, OnDestroy {
-  anchorIdPrefix = 'gn-ui--field-'
   facade = inject(EditorFacade)
-  private el = inject(ElementRef)
   subscription = new Subscription()
 
   recordUniqueIdentifier$ = this.facade.record$.pipe(
     map((record) => record.uniqueIdentifier)
   )
 
+  focusFieldWithPage$ = this.facade.focusedField$.pipe(
+    switchMap(
+      async (field) => [field, await this.getPageIndexForField(field)] as const
+    )
+  )
+
+  formFields = viewChildren(FormFieldComponent)
+
+  focusField(model: CatalogRecordKeys) {
+    const fields = this.formFields()
+    const field = fields.find((f) => f.model === model)
+    field?.fieldFocus.focusField()
+  }
+
   ngOnInit() {
     this.subscription.add(
-      this.facade.focusedField$
+      this.focusFieldWithPage$
         .pipe(
-          filter((field) => !!field),
-          switchMap(async (field) => ({
-            field: field as CatalogRecordKeys,
-            pageIndex: await this.getPageIndexForField(
-              field as CatalogRecordKeys
-            ),
-          }))
+          withLatestFrom(
+            this.facade.currentPage$,
+            ([field, fieldPage], currentPage) =>
+              [field, fieldPage, currentPage] as const
+          )
         )
-        .subscribe(async ({ field, pageIndex }) => {
-          const currentPage = await firstValueFrom(this.facade.currentPage$)
-          if (pageIndex !== null && pageIndex !== currentPage) {
-            this.facade.setCurrentPage(pageIndex)
-            this.el.nativeElement.scrollIntoView({
-              behavior: 'instant',
-              block: 'start',
-            })
+        .subscribe(([field, fieldPage, currentPage]) => {
+          if (fieldPage !== null && fieldPage !== currentPage) {
+            this.facade.setCurrentPage(fieldPage)
           }
-          setTimeout(() =>
-            document
-              .getElementById(this.anchorIdPrefix + field)
-              ?.scrollIntoView({ behavior: 'instant', block: 'start' })
-          )
+          setTimeout(() => this.focusField(field))
         })
     )
   }

package/src/libs/feature/editor/src/lib/models/editor-config.model.ts

@@ -19,9 +19,13 @@ export interface FormFieldConfig {
 // This is used for instance to target only certain online resources in a field
 type OnlineLinkResourceSpecifier = `onlineResourceType:link`
 type DatasetDistributionsSpecifier = `onlineResourceType:!link`
+// When set on the `contacts` field, contacts are rendered as editable detail
+// fields (ContactDetailsFormComponent) instead of cards (ContactCardComponent)
+type EditableContactDetailsSpecifier = `contact:editableDetails`
 export type FieldModelSpecifier =
   | OnlineLinkResourceSpecifier
   | DatasetDistributionsSpecifier
+  | EditableContactDetailsSpecifier
 
 export type FormFieldComponentName =
   | 'form-field-constraints-shortcuts'

package/src/libs/feature/editor/src/lib/services/editor.service.ts

@@ -1,5 +1,5 @@
 import { Injectable, inject } from '@angular/core'
-import { forkJoin, Observable, of, switchMap } from 'rxjs'
+import { Observable, switchMap } from 'rxjs'
 import { map, tap } from 'rxjs/operators'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { EditorConfig } from '../models/'

package/src/libs/util/app-config/src/lib/app-config.ts

@@ -2,6 +2,7 @@ import * as TOML from '@ltd/j-toml'
 import {
   checkMetadataLanguage,
   checkNewRecordDefaultLanguage,
+  checkNewRecordStandard,
   parseConfigSection,
   parseMultiConfigSection,
   parseTranslationsConfigSection,
@@ -297,7 +298,7 @@ export function loadAppConfig(configUrl = 'assets/configuration/default.toml') {
         parsed,
         'editing',
         [],
-        ['new_record_default_language'],
+        ['new_record_default_language', 'new_record_standard'],
         warnings,
         errors
       )
@@ -310,6 +311,15 @@ export function loadAppConfig(configUrl = 'assets/configuration/default.toml') {
           warnings
         )
       }
+      if (
+        parsedEditingSection !== null &&
+        parsedEditingSection.new_record_standard !== undefined
+      ) {
+        parsedEditingSection = checkNewRecordStandard(
+          parsedEditingSection,
+          warnings
+        )
+      }
       editorConfig =
         parsedEditingSection === null
           ? null
@@ -318,6 +328,9 @@ export function loadAppConfig(configUrl = 'assets/configuration/default.toml') {
                 parsedEditingSection.new_record_default_language as
                   | string
                   | undefined,
+              NEW_RECORD_STANDARD: parsedEditingSection.new_record_standard as
+                | EditorConfig['NEW_RECORD_STANDARD']
+                | undefined,
             } as EditorConfig)
 
       customTranslations = parseTranslationsConfigSection(

package/src/libs/util/app-config/src/lib/model.ts

@@ -69,8 +69,11 @@ export interface MetadataQualityConfig {
   ENABLED: boolean
 }
 
+export type NewRecordStandard = 'iso19139' | 'iso19115-3'
+
 export interface EditorConfig {
   NEW_RECORD_DEFAULT_LANGUAGE?: string
+  NEW_RECORD_STANDARD?: NewRecordStandard
 }
 
 export type CustomTranslations = { [translationKey: string]: string }

package/src/libs/util/app-config/src/lib/parse-utils.ts

@@ -159,3 +159,30 @@ export function checkNewRecordDefaultLanguage(
     new_record_default_language: lang2,
   }
 }
+
+export function checkNewRecordStandard(
+  parsedConfigSection: any,
+  outWarnings: string[]
+) {
+  const standard = parsedConfigSection.new_record_standard
+  const normalizedStandard =
+    typeof standard === 'string' ? standard.trim().toLowerCase() : null
+
+  if (
+    normalizedStandard === 'iso19139' ||
+    normalizedStandard === 'iso19115-3'
+  ) {
+    return {
+      ...parsedConfigSection,
+      new_record_standard: normalizedStandard,
+    }
+  }
+
+  outWarnings.push(
+    `In the [editing] section: new_record_standard = "${standard}" is not a supported metadata standard`
+  )
+  return {
+    ...parsedConfigSection,
+    new_record_standard: undefined,
+  }
+}

package/translations/de.json

@@ -150,6 +150,14 @@
   "editor.record.form.draft.updateAlert": "Seit der Erstellung dieses Entwurfs wurde dieser Datensatz am { date } von { user } geändert. Durch das Veröffentlichen Ihrer Version können dessen Änderungen gelöscht werden. Um dies zu vermeiden, können Sie Ihre Änderungen rückgängig machen oder Ihre Version in voller Kenntnis der Sachlage veröffentlichen.",
   "editor.record.form.field.abstract": "Kurzbeschreibung",
   "editor.record.form.field.constraintsShortcuts": "",
+  "editor.record.form.field.contactDetails.email": "",
+  "editor.record.form.field.contactDetails.email.placeholder": "",
+  "editor.record.form.field.contactDetails.firstName": "",
+  "editor.record.form.field.contactDetails.firstName.placeholder": "",
+  "editor.record.form.field.contactDetails.lastName": "",
+  "editor.record.form.field.contactDetails.lastName.placeholder": "",
+  "editor.record.form.field.contactDetails.organization": "",
+  "editor.record.form.field.contactDetails.organization.placeholder": "",
   "editor.record.form.field.contacts": "Ansprechpartner - Email",
   "editor.record.form.field.contacts.noContact": "Bitte geben Sie mindestens einen Ansprechpartner an.",
   "editor.record.form.field.contacts.placeholder": "Kontakt auswählen",
@@ -495,7 +503,6 @@
   "record.metadata.preview.config.idle": "Standardvorschau festlegen",
   "record.metadata.preview.config.saved": "Gespeichert!",
   "record.metadata.preview.config.saving": "Speichern...",
-  "record.metadata.producer": "Datenproduzent",
   "record.metadata.publication": "Veröffentlichungsdatum",
   "record.metadata.publications": "{count, plural, =0{Veröffentlichungsdatum} one{Veröffentlichungsdatum} other{Veröffentlichungen}}",
   "record.metadata.quality": "Metadatenqualität",

package/translations/en.json

@@ -150,6 +150,14 @@
   "editor.record.form.draft.updateAlert": "Since you created this draft, the dataset has been updated on { date } by { user }. Publishing your draft might erase their edits. To avoid this, you need to either cancel your changes or knowingly publish your own version.",
   "editor.record.form.field.abstract": "Abstract",
   "editor.record.form.field.constraintsShortcuts": "",
+  "editor.record.form.field.contactDetails.email": "Contact email",
+  "editor.record.form.field.contactDetails.email.placeholder": "example@domainname.com",
+  "editor.record.form.field.contactDetails.firstName": "Contact first name",
+  "editor.record.form.field.contactDetails.firstName.placeholder": "First name",
+  "editor.record.form.field.contactDetails.lastName": "Contact last name",
+  "editor.record.form.field.contactDetails.lastName.placeholder": "Last name",
+  "editor.record.form.field.contactDetails.organization": "Contact organization",
+  "editor.record.form.field.contactDetails.organization.placeholder": "Company",
   "editor.record.form.field.contacts": "Point of contact - Email",
   "editor.record.form.field.contacts.noContact": "Please provide at least one point of contact.",
   "editor.record.form.field.contacts.placeholder": "Choose a contact",
@@ -495,7 +503,6 @@
   "record.metadata.preview.config.idle": "Set as default preview",
   "record.metadata.preview.config.saved": "Saved !",
   "record.metadata.preview.config.saving": "Saving...",
-  "record.metadata.producer": "Data producer",
   "record.metadata.publication": "Date of publication",
   "record.metadata.publications": "{count, plural, =0{publication} one{publication} other{publications}}",
   "record.metadata.quality": "Metadata Quality",

package/translations/es.json

@@ -150,6 +150,14 @@
   "editor.record.form.draft.updateAlert": "",
   "editor.record.form.field.abstract": "",
   "editor.record.form.field.constraintsShortcuts": "",
+  "editor.record.form.field.contactDetails.email": "",
+  "editor.record.form.field.contactDetails.email.placeholder": "",
+  "editor.record.form.field.contactDetails.firstName": "",
+  "editor.record.form.field.contactDetails.firstName.placeholder": "",
+  "editor.record.form.field.contactDetails.lastName": "",
+  "editor.record.form.field.contactDetails.lastName.placeholder": "",
+  "editor.record.form.field.contactDetails.organization": "",
+  "editor.record.form.field.contactDetails.organization.placeholder": "",
   "editor.record.form.field.contacts": "Punto de contacto - Correo ",
   "editor.record.form.field.contacts.noContact": "",
   "editor.record.form.field.contacts.placeholder": "",
@@ -495,7 +503,6 @@
   "record.metadata.preview.config.idle": "",
   "record.metadata.preview.config.saved": "",
   "record.metadata.preview.config.saving": "",
-  "record.metadata.producer": "",
   "record.metadata.publication": "",
   "record.metadata.publications": "{count, plural, =0{} one{} other{}}",
   "record.metadata.quality": "",

package/translations/fr.json

@@ -150,6 +150,14 @@
   "editor.record.form.draft.updateAlert": "Depuis la création de ce brouillon, ce jeu de données a été modifié le { date } par { user }. Publier votre version peut supprimer ses modifications. Pour éviter cela, vous pouvez annuler vos changements, ou publier votre version en connaissance de cause.",
   "editor.record.form.field.abstract": "Description",
   "editor.record.form.field.constraintsShortcuts": "",
+  "editor.record.form.field.contactDetails.email": "Email du point de contact",
+  "editor.record.form.field.contactDetails.email.placeholder": "exemple@nomdedomaine.com",
+  "editor.record.form.field.contactDetails.firstName": "Prénom du point de contact",
+  "editor.record.form.field.contactDetails.firstName.placeholder": "Prénom",
+  "editor.record.form.field.contactDetails.lastName": "Nom du point de contact",
+  "editor.record.form.field.contactDetails.lastName.placeholder": "Nom",
+  "editor.record.form.field.contactDetails.organization": "Organisation du point de contact",
+  "editor.record.form.field.contactDetails.organization.placeholder": "Company",
   "editor.record.form.field.contacts": "Point de contact - Email",
   "editor.record.form.field.contacts.noContact": "Veuillez renseigner au moins un point de contact.",
   "editor.record.form.field.contacts.placeholder": "Choisissez un contact",
@@ -495,7 +503,6 @@
   "record.metadata.preview.config.idle": "Définir l'aperçu par défaut",
   "record.metadata.preview.config.saved": "Sauvegardé !",
   "record.metadata.preview.config.saving": "Sauvegarde...",
-  "record.metadata.producer": "Producteur de la donnée",
   "record.metadata.publication": "Date de publication",
   "record.metadata.publications": "{count, plural, =0{ressource} one{ressource} other{ressources}}",
   "record.metadata.quality": "Description de la ressource",

package/translations/it.json

@@ -150,6 +150,14 @@
   "editor.record.form.draft.updateAlert": "Da quando è stata creata questa bozza, questo dataset è stato modificato il { date } da { user }. La pubblicazione della sua versione potrebbe rimuovere le loro modifiche. Per evitarlo, puoi annullare le sue modifiche o pubblicare la sua versione consapevolmente.",
   "editor.record.form.field.abstract": "Riassunto",
   "editor.record.form.field.constraintsShortcuts": "",
+  "editor.record.form.field.contactDetails.email": "",
+  "editor.record.form.field.contactDetails.email.placeholder": "",
+  "editor.record.form.field.contactDetails.firstName": "",
+  "editor.record.form.field.contactDetails.firstName.placeholder": "",
+  "editor.record.form.field.contactDetails.lastName": "",
+  "editor.record.form.field.contactDetails.lastName.placeholder": "",
+  "editor.record.form.field.contactDetails.organization": "",
+  "editor.record.form.field.contactDetails.organization.placeholder": "",
   "editor.record.form.field.contacts": "",
   "editor.record.form.field.contacts.noContact": "Inserisci almeno un punto di contatto.",
   "editor.record.form.field.contacts.placeholder": "Scegli un contatto",
@@ -495,7 +503,6 @@
   "record.metadata.preview.config.idle": "",
   "record.metadata.preview.config.saved": "",
   "record.metadata.preview.config.saving": "",
-  "record.metadata.producer": "Produttore dei dati",
   "record.metadata.publication": "Data di pubblicazione",
   "record.metadata.publications": "{count, plural, =0{pubblicazione} one{pubblicazione} other{pubblicazioni}}",
   "record.metadata.quality": "Qualità dei metadati",

package/translations/nl.json

@@ -150,6 +150,14 @@
   "editor.record.form.draft.updateAlert": "",
   "editor.record.form.field.abstract": "",
   "editor.record.form.field.constraintsShortcuts": "",
+  "editor.record.form.field.contactDetails.email": "",
+  "editor.record.form.field.contactDetails.email.placeholder": "",
+  "editor.record.form.field.contactDetails.firstName": "",
+  "editor.record.form.field.contactDetails.firstName.placeholder": "",
+  "editor.record.form.field.contactDetails.lastName": "",
+  "editor.record.form.field.contactDetails.lastName.placeholder": "",
+  "editor.record.form.field.contactDetails.organization": "",
+  "editor.record.form.field.contactDetails.organization.placeholder": "",
   "editor.record.form.field.contacts": "",
   "editor.record.form.field.contacts.noContact": "",
   "editor.record.form.field.contacts.placeholder": "",
@@ -495,7 +503,6 @@
   "record.metadata.preview.config.idle": "",
   "record.metadata.preview.config.saved": "",
   "record.metadata.preview.config.saving": "",
-  "record.metadata.producer": "",
   "record.metadata.publication": "",
   "record.metadata.publications": "{count, plural, =0{} one{} other{}}",
   "record.metadata.quality": "",

package/translations/pt.json

@@ -150,6 +150,14 @@
   "editor.record.form.draft.updateAlert": "",
   "editor.record.form.field.abstract": "",
   "editor.record.form.field.constraintsShortcuts": "",
+  "editor.record.form.field.contactDetails.email": "",
+  "editor.record.form.field.contactDetails.email.placeholder": "",
+  "editor.record.form.field.contactDetails.firstName": "",
+  "editor.record.form.field.contactDetails.firstName.placeholder": "",
+  "editor.record.form.field.contactDetails.lastName": "",
+  "editor.record.form.field.contactDetails.lastName.placeholder": "",
+  "editor.record.form.field.contactDetails.organization": "",
+  "editor.record.form.field.contactDetails.organization.placeholder": "",
   "editor.record.form.field.contacts": "",
   "editor.record.form.field.contacts.noContact": "",
   "editor.record.form.field.contacts.placeholder": "",
@@ -495,7 +503,6 @@
   "record.metadata.preview.config.idle": "",
   "record.metadata.preview.config.saved": "",
   "record.metadata.preview.config.saving": "",
-  "record.metadata.producer": "",
   "record.metadata.publication": "",
   "record.metadata.publications": "{count, plural, =0{} one{} other{}}",
   "record.metadata.quality": "",

package/translations/sk.json

@@ -150,6 +150,14 @@
   "editor.record.form.draft.updateAlert": "",
   "editor.record.form.field.abstract": "",
   "editor.record.form.field.constraintsShortcuts": "",
+  "editor.record.form.field.contactDetails.email": "",
+  "editor.record.form.field.contactDetails.email.placeholder": "",
+  "editor.record.form.field.contactDetails.firstName": "",
+  "editor.record.form.field.contactDetails.firstName.placeholder": "",
+  "editor.record.form.field.contactDetails.lastName": "",
+  "editor.record.form.field.contactDetails.lastName.placeholder": "",
+  "editor.record.form.field.contactDetails.organization": "",
+  "editor.record.form.field.contactDetails.organization.placeholder": "",
   "editor.record.form.field.contacts": "",
   "editor.record.form.field.contacts.noContact": "",
   "editor.record.form.field.contacts.placeholder": "",
@@ -495,7 +503,6 @@
   "record.metadata.preview.config.idle": "",
   "record.metadata.preview.config.saved": "",
   "record.metadata.preview.config.saving": "",
-  "record.metadata.producer": "",
   "record.metadata.publication": "dátum publikácia",
   "record.metadata.publications": "{count, plural, =0{publikácia} one{publikácia} other{publikácie}}",
   "record.metadata.quality": "Kvalita metadát",