geonetwork-ui 2.10.0-dev.69145ed6a → 2.10.0-dev.6a17c789a

package/src/libs/ui/elements/src/lib/contact-pill/contact-pill.component.ts

@@ -1,26 +1,70 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { ConnectedPosition, OverlayModule } from '@angular/cdk/overlay'
+import {
+  ChangeDetectionStrategy,
+  Component,
+  ElementRef,
+  inject,
+  Input,
+} from '@angular/core'
 import { Individual } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { NgIcon, provideIcons } from '@ng-icons/core'
+import { matClose } from '@ng-icons/material-icons/baseline'
 import { matInfoOutline } from '@ng-icons/material-icons/outline'
 import { ButtonComponent } from '../../../../../../libs/ui/inputs/src'
 import { getIndividualDisplayName } from '../../../../../../libs/util/shared/src'
+import { ContactDetailsComponent } from '../contact-details/contact-details.component'
 
 @Component({
   selector: 'gn-ui-contact-pill',
   templateUrl: './contact-pill.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [NgIcon, ButtonComponent],
-  viewProviders: [
-    provideIcons({
-      matInfoOutline,
-    }),
-  ],
+  imports: [NgIcon, ButtonComponent, OverlayModule, ContactDetailsComponent],
+  viewProviders: [provideIcons({ matClose, matInfoOutline })],
 })
 export class ContactPillComponent {
   @Input() contact: Individual
 
+  private host = inject(ElementRef<HTMLElement>)
+
+  overlayOpen = false
+  overlayWidth = 0
+  overlayOffsetX = 0
+  overlayPositions: ConnectedPosition[] = [
+    {
+      originX: 'start',
+      originY: 'bottom',
+      overlayX: 'start',
+      overlayY: 'top',
+      offsetY: 4,
+    },
+    {
+      originX: 'start',
+      originY: 'top',
+      overlayX: 'start',
+      overlayY: 'bottom',
+      offsetY: -4,
+    },
+  ]
+
   get displayName(): string {
     return getIndividualDisplayName(this.contact)
   }
+
+  toggleOverlay() {
+    if (!this.overlayOpen) {
+      // Calculate the width and horizontal offset of the overlay to align it with the parent element
+      const parent =
+        this.host.nativeElement.parentElement.getBoundingClientRect()
+      const pill = this.host.nativeElement.getBoundingClientRect()
+      this.overlayWidth = parent.width
+      this.overlayOffsetX = parent.left - pill.left
+    }
+
+    this.overlayOpen = !this.overlayOpen
+  }
+
+  closeOverlay() {
+    this.overlayOpen = false
+  }
 }

package/src/libs/ui/elements/src/lib/metadata-contact/metadata-contact.component.ts

@@ -21,7 +21,7 @@ import {
   matCallOutline,
   matLocationOnOutline,
 } from '@ng-icons/material-icons/outline'
-
+import { getAddressLines } from '../../../../../../libs/util/shared/src'
 import { TranslateDirective } from '@ngx-translate/core'
 
 @Component({
@@ -59,10 +59,7 @@ export class MetadataContactComponent {
   }
 
   get address() {
-    const addressParts = this.contacts[0].address
-      .split(',')
-      .map((part) => part.trim())
-    return addressParts
+    return getAddressLines(this.contacts[0]?.address)
   }
 
   onOrganizationClick() {

package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html

@@ -53,7 +53,7 @@
     data-test="usage-panel"
   >
     <div class="flex flex-col gap-[10px] mr-4 py-[12px] rounded text-gray-900">
-      @for (license of licenses; track license) {
+      @for (license of licenses; track $index) {
         @if (license.url) {
           <div class="text-primary">
             <a
@@ -113,11 +113,11 @@
   >
     <div class="flex flex-col gap-1 pt-3 pb-4">
       @for (group of contactGroups; track group.role) {
-        <div class="flex flex-col gap-1 rounded bg-gray-50 py-4 px-2">
+        <div class="flex flex-col gap-1 rounded py-4 px-2">
           <p class="text-xs font-normal text-black">
             {{ group.roleLabel | translate }}
           </p>
-          <div class="grid gap-0.5 grid-cols-1 md:grid-cols-2">
+          <div class="grid gap-1 grid-cols-1 md:grid-cols-2">
             @for (contact of group.contacts; track contact.email) {
               <gn-ui-contact-pill [contact]="contact"></gn-ui-contact-pill>
             }

package/src/libs/ui/inputs/src/lib/button/button.component.ts

@@ -25,6 +25,7 @@ export class ButtonComponent {
       | 'outline'
       | 'light'
       | 'gray'
+      | 'gray-light'
       | 'black'
       | 'primary-light'
   ) {
@@ -45,6 +46,9 @@ export class ButtonComponent {
       case 'gray':
         this.btnClass = 'gn-ui-btn-gray'
         break
+      case 'gray-light':
+        this.btnClass = 'gn-ui-btn-gray-light'
+        break
       case 'black':
         this.btnClass = 'gn-ui-btn-black'
         break

package/src/libs/ui/inputs/src/lib/url-input/url-input.component.html

@@ -6,7 +6,7 @@
     type="url"
     [value]="inputValue"
     (input)="handleInput($event)"
-    (keydown.enter)="handleUpload(input)"
+    (keydown.enter)="handleUpload(input, $event)"
     [placeholder]="placeholder"
     [attr.aria-label]="placeholder"
     [disabled]="disabled"
@@ -25,7 +25,7 @@
       extraClass="absolute inset-y-[var(--side-padding)] right-[var(--side-padding)]"
       type="primary"
       [disabled]="disabled || input.value === '' || !isValidUrl(input.value)"
-      (buttonClick)="handleUpload(input)"
+      (buttonClick)="handleUpload(input, $event)"
     >
       <ng-content>
         <ng-icon name="iconoirArrowUp"></ng-icon>

package/src/libs/ui/inputs/src/lib/url-input/url-input.component.ts

@@ -81,7 +81,8 @@ export class UrlInputComponent implements OnChanges {
     this.valueChange.next(value)
   }
 
-  handleUpload(element: HTMLInputElement) {
+  handleUpload(element: HTMLInputElement, event: Event) {
+    event.stopPropagation()
     const value = element.value
     if (!value || !this.isValidUrl(value)) return
     this.uploadClick.next(value)

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/src/libs/util/shared/src/lib/links/link-utils.ts

@@ -266,7 +266,7 @@ export function checkFileFormat(
       new RegExp(`[./]${format}`, 'i').test(link.name.toLowerCase())) ||
     ('url' in link &&
       new RegExp(`[./]${format}`, 'i').test(link.url.toString())) ||
-    ('name' in link && link.name.toLowerCase().includes(format))
+    ('name' in link && new RegExp(`\\b${format}\\b`, 'i').test(link.name))
   )
 }
 

package/src/libs/util/shared/src/lib/utils/user-display.ts

@@ -12,6 +12,15 @@ export function getIndividualDisplayName(individual: Individual): string {
   return individual.organization?.name ?? individual.email ?? ''
 }
 
+export function getAddressLines(address: string | undefined): string[] {
+  return address
+    ? address
+        .split(',')
+        .map((part) => part.trim())
+        .filter(Boolean)
+    : []
+}
+
 export function toIndividual(user: UserModel): Individual {
   return {
     firstName: user.name,

package/tailwind.base.css

@@ -119,6 +119,12 @@
     border-gray-100 focus:ring-4 focus:ring-gray-50;
   }
 
+  .gn-ui-btn-gray-light {
+    @apply gn-ui-btn text-black
+    bg-gray-50 hover:bg-gray-100 focus:bg-gray-100 active:bg-gray-200
+    border-gray-50 focus:ring-4 focus:ring-gray-100;
+  }
+
   .gn-ui-btn-black {
     @apply gn-ui-btn text-white
     bg-black hover:bg-gray-950 focus:bg-gray-950 active:bg-gray-900

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",