geonetwork-ui 2.10.0-dev.69145ed6a → 2.10.0-dev.7e58935b2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geonetwork-ui",
-  "version": "2.10.0-dev.69145ed6a",
+  "version": "2.10.0-dev.7e58935b2",
   "engines": {
     "node": ">=20"
   },

package/src/libs/api/repository/src/lib/gn4/auth/auth.service.ts

@@ -44,6 +44,10 @@ export class AuthService {
           window.location.href
         ).toString()
       )
+      .replace(
+        '${current_path}',
+        this.location.prepareExternalUrl(this.location.path())
+      )
       .replace('${lang2}', toLang2(this.translateService.currentLang))
       .replace('${lang3}', toLang3(this.translateService.currentLang))
   }

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/record-form/form-field/field-focus.directive.ts

@@ -0,0 +1,38 @@
+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() {
+    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' })
+      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

@@ -139,7 +139,6 @@ export class FormFieldConstraintsShortcutsComponent implements OnDestroy {
           this.editorFacade.setFieldVisibility({ model }, visible)
         })
       }
-      hideEmptyConstraints(this.legalConstraints$, 'legalConstraints')
       hideEmptyConstraints(this.securityConstraints$, 'securityConstraints')
       hideEmptyConstraints(this.otherConstraints$, 'otherConstraints')
     })

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

@@ -15,8 +15,15 @@
       (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 #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>
+      }
     </ng-template>
   } @else {
     <div

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

@@ -28,6 +28,7 @@ import { UserModel } from '../../../../../../../../../libs/common/domain/src/lib
 import { PlatformServiceInterface } from '../../../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { OrganizationsServiceInterface } from '../../../../../../../../../libs/common/domain/src/lib/organizations.service.interface'
 import { ContactCardComponent } from '../../../contact-card/contact-card.component'
+import { ContactDetailsFormComponent } from '../../../contact-details/contact-details-form.component'
 import {
   createFuzzyFilter,
   getIndividualDisplayName,
@@ -35,6 +36,7 @@ import {
 } from '../../../../../../../../../libs/util/shared/src'
 import { map } from 'rxjs/operators'
 import { SortableListComponent } from '../../../../../../../../../libs/ui/layout/src'
+import { FieldModelSpecifier } from '../../../../models/editor-config.model'
 
 @Component({
   selector: 'gn-ui-form-field-contacts',
@@ -47,6 +49,7 @@ import { SortableListComponent } from '../../../../../../../../../libs/ui/layout
     TranslateDirective,
     TranslatePipe,
     ContactCardComponent,
+    ContactDetailsFormComponent,
     SortableListComponent,
   ],
 })
@@ -56,6 +59,7 @@ export class FormFieldContactsComponent implements OnDestroy, OnChanges {
   private changeDetectorRef = inject(ChangeDetectorRef)
 
   @Input() value: Individual[]
+  @Input() modelSpecifier: FieldModelSpecifier
   @Output() valueChange: EventEmitter<Individual[]> = new EventEmitter()
 
   contacts: Individual[] = []
@@ -117,6 +121,14 @@ export class FormFieldContactsComponent implements OnDestroy, OnChanges {
     this.valueChange.emit(contacts)
   }
 
+  handleContactChanged(updatedContact: Individual, index: number) {
+    const contacts = this.contacts.map((contact, i) =>
+      i === index ? updatedContact : contact
+    )
+
+    this.handleContactsChanged(contacts)
+  }
+
   /**
    * gn-ui-autocomplete
    */

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

@@ -0,0 +1,37 @@
+:host {
+  scroll-margin-top: 90px;
+}
+
+:host.gn-ui-field-focus-glow {
+  position: relative;
+}
+
+:host.gn-ui-field-focus-glow::after {
+  content: '';
+  position: absolute;
+  inset: -8px;
+  border-radius: 8px;
+  background-color: color-mix(in srgb, var(--color-primary) 12%, transparent);
+  pointer-events: none;
+  animation: gn-ui-field-focus-glow 3s ease-out forwards;
+}
+
+:host.gn-ui-field-focus-glow::before {
+  content: '';
+  position: absolute;
+  inset: -16px;
+  border: 2px dashed var(--color-primary);
+  border-radius: 10px;
+  pointer-events: none;
+  animation: gn-ui-field-focus-glow 3s ease-out forwards;
+}
+
+@keyframes gn-ui-field-focus-glow {
+  0%,
+  55% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0;
+  }
+}

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/ui/elements/src/index.ts

@@ -19,6 +19,7 @@ export * from './lib/metadata-info/metadata-info.component'
 export * from './lib/metadata-quality-item/metadata-quality-item.component'
 export * from './lib/metadata-quality/metadata-quality.component'
 export * from './lib/contact-pill/contact-pill.component'
+export * from './lib/contact-details/contact-details.component'
 export * from './lib/notification/notification.component'
 export * from './lib/record-api-form/record-api-form.component'
 export * from './lib/thumbnail/thumbnail.component'

package/src/libs/ui/elements/src/lib/contact-details/contact-details.component.html

@@ -0,0 +1,96 @@
+<div
+  class="bg-gray-50 rounded border border-gray-200 shadow-md p-4 flex flex-col gap-3 w-full"
+  data-test="contact-details"
+>
+  @if (displayName) {
+    <div class="flex items-center gap-3">
+      @if (organization?.logoUrl?.href) {
+        <div
+          class="flex items-center justify-center rounded-md bg-white w-14 h-14 shrink-0 overflow-hidden"
+        >
+          <gn-ui-thumbnail
+            class="relative h-full w-full"
+            [thumbnailUrl]="organization.logoUrl.href"
+            fit="contain"
+          ></gn-ui-thumbnail>
+        </div>
+      }
+      <span
+        class="font-title text-xl leading-tight"
+        data-test="contact-details-name"
+        >{{ displayName }}</span
+      >
+    </div>
+  }
+
+  <!-- Email + phone: always shown; icon dimmed when field is absent -->
+  <div class="grid grid-cols-2 gap-1 rounded-md overflow-hidden">
+    <div class="bg-gray-100 flex items-center gap-2 px-3 py-2">
+      <ng-icon
+        class="!w-5 !h-5 !text-[20px] shrink-0"
+        [class.opacity-30]="!contact.email"
+        [class.opacity-75]="!!contact.email"
+        name="matMailOutline"
+      ></ng-icon>
+      @if (contact.email) {
+        <a
+          [href]="'mailto:' + contact.email"
+          class="text-sm break-all hover:underline"
+          data-test="contact-details-email"
+          >{{ contact.email }}</a
+        >
+      }
+    </div>
+    <div class="bg-gray-100 flex items-center gap-2 px-3 py-2">
+      <ng-icon
+        class="!w-5 !h-5 !text-[20px] shrink-0"
+        [class.opacity-30]="!contact.phone"
+        [class.opacity-75]="!!contact.phone"
+        name="matCallOutline"
+      ></ng-icon>
+      @if (contact.phone) {
+        <span class="text-sm" data-test="contact-details-phone">{{
+          contact.phone
+        }}</span>
+      }
+    </div>
+  </div>
+
+  <!-- Address: always shown; icon dimmed when absent -->
+  <div class="bg-gray-100 rounded-md flex items-start gap-2 px-3 py-2">
+    <ng-icon
+      class="!w-5 !h-5 !text-[20px] shrink-0 mt-0.5"
+      [class.opacity-30]="!addressLines.length"
+      [class.opacity-75]="!!addressLines.length"
+      name="matLocationOnOutline"
+    ></ng-icon>
+    @if (addressLines.length) {
+      <div class="flex flex-col" data-test="contact-details-address">
+        @for (line of addressLines; track line) {
+          <p class="text-sm m-0">{{ line }}</p>
+        }
+      </div>
+    }
+  </div>
+
+  <!-- Website: only shown when org exists; icon dimmed when absent -->
+  @if (organization) {
+    <div class="bg-gray-100 rounded-md flex items-center gap-2 px-3 py-2">
+      <ng-icon
+        class="!w-5 !h-5 !text-[20px] shrink-0"
+        [class.opacity-30]="!organization.website"
+        [class.opacity-75]="!!organization.website"
+        name="matOpenInNew"
+      ></ng-icon>
+      @if (organization.website) {
+        <a
+          [href]="organization.website.href"
+          target="_blank"
+          class="text-sm break-all hover:underline"
+          data-test="contact-details-website"
+          >{{ organization.website.href }}</a
+        >
+      }
+    </div>
+  }
+</div>

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

@@ -0,0 +1,45 @@
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { Individual } from '../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  getAddressLines,
+  getIndividualDisplayName,
+} from '../../../../../../libs/util/shared/src'
+import { NgIcon, provideIcons } from '@ng-icons/core'
+import { matMailOutline, matOpenInNew } from '@ng-icons/material-icons/baseline'
+import {
+  matCallOutline,
+  matLocationOnOutline,
+} from '@ng-icons/material-icons/outline'
+import { ThumbnailComponent } from '../thumbnail/thumbnail.component'
+import { TranslateModule } from '@ngx-translate/core'
+
+@Component({
+  selector: 'gn-ui-contact-details',
+  templateUrl: './contact-details.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [NgIcon, ThumbnailComponent, TranslateModule],
+  viewProviders: [
+    provideIcons({
+      matCallOutline,
+      matLocationOnOutline,
+      matMailOutline,
+      matOpenInNew,
+    }),
+  ],
+})
+export class ContactDetailsComponent {
+  @Input() contact: Individual
+
+  get organization() {
+    return this.contact?.organization
+  }
+
+  get displayName(): string {
+    return getIndividualDisplayName(this.contact)
+  }
+
+  get addressLines(): string[] {
+    return getAddressLines(this.contact?.address)
+  }
+}

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

@@ -1,7 +1,10 @@
 <gn-ui-button
-  type="primary-light"
+  [type]="overlayOpen ? 'primary' : 'primary-light'"
   extraClass="group w-full min-h-12 gap-3 justify-between py-2 pl-5 pr-4 rounded"
   data-test="contact-pill"
+  (buttonClick)="toggleOverlay()"
+  cdkOverlayOrigin
+  #overlayOrigin="cdkOverlayOrigin"
 >
   <span
     class="font-title font-medium text-base leading-tight truncate group-hover:text-white"
@@ -11,6 +14,24 @@
   <div
     class="gn-ui-card-icon items-center justify-center w-10 h-8 group-hover:border-white group-hover:text-white"
   >
-    <ng-icon class="!w-6 !h-6 !text-[24px]" name="matInfoOutline"></ng-icon>
+    @if (overlayOpen) {
+      <ng-icon class="!w-6 !h-6 !text-[24px]" name="matClose"></ng-icon>
+    } @else {
+      <ng-icon class="!w-6 !h-6 !text-[24px]" name="matInfoOutline"></ng-icon>
+    }
   </div>
 </gn-ui-button>
+
+<ng-template
+  cdkConnectedOverlay
+  [cdkConnectedOverlayOrigin]="overlayOrigin"
+  [cdkConnectedOverlayOpen]="overlayOpen"
+  [cdkConnectedOverlayPositions]="overlayPositions"
+  [cdkConnectedOverlayOffsetX]="overlayOffsetX"
+  (overlayOutsideClick)="closeOverlay()"
+  (detach)="closeOverlay()"
+>
+  <div [style.width.px]="overlayWidth">
+    <gn-ui-contact-details [contact]="contact"></gn-ui-contact-details>
+  </div>
+</ng-template>