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

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

@@ -9,11 +9,11 @@
     "
     (buttonClick)="togglePreview()"
   >
-    <span
-      class="material-symbols-outlined gn-ui-icon-small"
+    <ng-icon
+      [name]="preview ? 'matVisibilityOffOutline' : 'matVisibilityOutline'"
+      size="16"
       [ngClass]="{ 'text-primary': !preview }"
-      >{{ preview ? 'visibility_off' : 'visibility' }}</span
-    >
+    ></ng-icon>
     &nbsp;
     {{ preview ? 'Edit' : 'Preview' }}
   </gn-ui-button>

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

@@ -10,6 +10,11 @@ import { ReactiveFormsModule } from '@angular/forms'
 import { MarkdownEditorComponent } from '../../../../../../../../../libs/ui/elements/src'
 import { ButtonComponent } from '../../../../../../../../../libs/ui/inputs/src'
 import { FormFieldWrapperComponent } from '../../../../../../../../../libs/ui/layout/src'
+import { NgIconComponent, provideIcons } from '@ng-icons/core'
+import {
+  matVisibilityOffOutline,
+  matVisibilityOutline,
+} from '@ng-icons/material-icons/outline'
 
 @Component({
   selector: 'gn-ui-form-field-rich',
@@ -23,7 +28,9 @@ import { FormFieldWrapperComponent } from '../../../../../../../../../libs/ui/la
     MarkdownEditorComponent,
     FormFieldWrapperComponent,
     ButtonComponent,
+    NgIconComponent,
   ],
+  providers: [provideIcons({ matVisibilityOutline, matVisibilityOffOutline })],
 })
 export class FormFieldRichComponent {
   @Input() label: string

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

@@ -5,7 +5,7 @@ import {
   DropdownMultiselectComponent,
 } from '../../../../../../../../../libs/ui/inputs/src'
 import { TranslatePipe, TranslateService } from '@ngx-translate/core'
-import { INSPIRE_TOPICS } from '../../../../fields.config'
+import { ISO_TOPICS } from '../../../../fields.config'
 
 @Component({
   selector: 'gn-ui-form-field-topics',
@@ -22,7 +22,7 @@ export class FormFieldTopicsComponent {
     this.topics = topics
   }
   @Output() valueChange: EventEmitter<string[]> = new EventEmitter()
-  availableTopics = INSPIRE_TOPICS.map((topic) => {
+  availableTopics = ISO_TOPICS.map((topic) => {
     return {
       label: this.translateService.instant(topic.label),
       value: topic.value,

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

@@ -1,11 +1,15 @@
 <div class="flex flex-col gap-2">
   <gn-ui-check-toggle
-    [label]="'editor.record.form.updateFrequency.planned' | translate"
+    [label]="
+      'editor.record.form.updateFrequency.planned' | translate: { recordKind }
+    "
     [value]="planned"
     (toggled)="onPlannedToggled()"
   ></gn-ui-check-toggle>
   <gn-ui-dropdown-selector
-    [title]="'editor.record.form.field.updateFrequency' | translate"
+    [title]="
+      'editor.record.form.field.updateFrequency' | translate: { recordKind }
+    "
     [showTitle]="false"
     [choices]="choices"
     [selected]="selectedFrequency"

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

@@ -2,12 +2,13 @@ import {
   ChangeDetectionStrategy,
   Component,
   EventEmitter,
+  inject,
   Input,
   OnInit,
   Output,
-  inject,
 } from '@angular/core'
 import {
+  RecordKind,
   UpdateFrequency,
   UpdateFrequencyCode,
   updateFrequencyCodeValues,
@@ -37,6 +38,7 @@ export class FormFieldUpdateFrequencyComponent implements OnInit {
   private translateService = inject(TranslateService)
 
   @Input() value: UpdateFrequency
+  @Input() recordKind: RecordKind
   @Output() valueChange: EventEmitter<UpdateFrequency> = new EventEmitter()
 
   protected choices: DropdownChoice[] = []

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

@@ -1,37 +1,3 @@
 :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

@@ -12,8 +12,8 @@
   </ng-container>
   <ng-template #withGenericWrapper>
     <gn-ui-form-field-wrapper
-      [label]="config.labelKey! | translate"
-      [hint]="config.hintKey! | translate"
+      [label]="config.labelKey! | translate: { recordKind }"
+      [hint]="config.hintKey! | translate: { recordKind }"
     >
       <ng-container *ngTemplateOutlet="fieldContent"></ng-container>
     </gn-ui-form-field-wrapper>
@@ -34,30 +34,32 @@
           [value]="valueAsString"
           (change)="valueChange.emit($event.target.value)"
           [placeholder]="
-            'editor.record.form.field.title.placeholder' | translate
+            'editor.record.form.field.title.placeholder'
+              | translate: { recordKind }
           "
         ></textarea>
         <div class="flex flex-row justify-between self-start mt-0.5">
-          <span
-            class="material-symbols-outlined gn-ui-icon-small m-2 cursor-pointer"
+          <ng-icon
+            name="matEditOutline"
+            size="16"
+            class="m-2 cursor-pointer"
             (click)="focusTitleInput()"
-            >edit</span
-          >
-          <span
+          ></ng-icon>
+          <ng-icon
             *ngIf="config.hintKey"
-            class="material-symbols-outlined gn-ui-icon-small m-2"
-            [matTooltip]="config.hintKey! | translate"
+            name="matHelpOutline"
+            size="16"
+            class="m-2"
+            [matTooltip]="config.hintKey! | translate: { recordKind }"
             matTooltipPosition="above"
-          >
-            help
-          </span>
+          ></ng-icon>
         </div>
       </div>
     </ng-container>
     <ng-container *ngSwitchCase="'abstract'">
       <gn-ui-form-field-rich
-        [label]="config.labelKey! | translate"
-        [hint]="config.hintKey! | translate"
+        [label]="config.labelKey! | translate: { recordKind }"
+        [hint]="config.hintKey! | translate: { recordKind }"
         [value]="valueAsString"
         (valueChange)="valueChange.emit($event)"
       ></gn-ui-form-field-rich>
@@ -65,6 +67,7 @@
     <ng-container *ngSwitchCase="'overviews'">
       <gn-ui-form-field-overviews
         [metadataUuid]="uniqueIdentifier"
+        [recordKind]="recordKind"
         [value]="valueAsOverviews"
         (valueChange)="valueChange.emit($event)"
       ></gn-ui-form-field-overviews>
@@ -92,6 +95,7 @@
       <gn-ui-form-field-update-frequency
         [value]="valueAsUpdateFrequency"
         (valueChange)="valueChange.emit($event)"
+        [recordKind]="recordKind"
       ></gn-ui-form-field-update-frequency>
     </ng-container>
     <ng-container *ngSwitchCase="'temporalExtents'">
@@ -117,7 +121,7 @@
     </ng-container>
     <ng-container *ngSwitchCase="'licenses'">
       <gn-ui-form-field-license
-        [label]="config.labelKey! | translate"
+        [label]="config.labelKey! | translate: { recordKind }"
         [recordLicences]="valueAsConstraints"
         (recordLicencesChange)="valueChange.emit($event)"
       ></gn-ui-form-field-license>

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

@@ -18,9 +18,15 @@ import {
   Individual,
   Keyword,
   OnlineResource,
+  RecordKind,
   UpdateFrequency,
 } from '../../../../../../../../libs/common/domain/src/lib/model/record'
 import { FormFieldWrapperComponent } from '../../../../../../../../libs/ui/layout/src'
+import { NgIconComponent, provideIcons } from '@ng-icons/core'
+import {
+  matEditOutline,
+  matHelpOutline,
+} from '@ng-icons/material-icons/outline'
 import { TranslatePipe } from '@ngx-translate/core'
 import {
   FieldFocusDirective,
@@ -78,11 +84,14 @@ import { FormFieldTopicsComponent } from './form-field-topics/form-field-topics.
     FormFieldSpatialToggleComponent,
     FormFieldTopicsComponent,
     TextFieldModule,
+    NgIconComponent,
   ],
+  providers: [provideIcons({ matEditOutline, matHelpOutline })],
   hostDirectives: [FieldFocusDirective],
 })
 export class FormFieldComponent {
   @Input() uniqueIdentifier: string
+  @Input() recordKind: RecordKind
   @Input() model: CatalogRecordKeys
   @Input() modelSpecifier: FieldModelSpecifier
   @Input() componentName: FormFieldComponentName

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

@@ -0,0 +1,35 @@
+/* Glow applied by FieldFocusDirective (gnUiFieldFocus) to a focused field or,
+   when the field is hidden, to its whole section. */
+.gn-ui-field-focus-glow {
+  position: relative;
+}
+
+.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;
+}
+
+.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/record-form.component.html

@@ -3,16 +3,28 @@
     section of facade.currentSections$ | async;
     track sectionTracker($index, section)
   ) {
-    @if (!section.hidden) {
-      <div class="flex flex-col gap-6 border p-8 rounded-[8px] shadow">
+    @if (evaluateExpression(section.hidden)() !== true) {
+      <div
+        class="flex flex-col gap-6 border p-8 rounded-[8px] shadow scroll-mt-[90px]"
+        gnUiFieldFocus
+        #sectionFocus="fieldFocus"
+      >
         <div class="flex flex-col gap-2">
           @if (section.labelKey) {
-            <div class="text-2xl font-title text-black" translate>
+            <div
+              class="text-2xl font-title text-black"
+              translate
+              [translateParams]="{ recordKind: recordKind$ | async }"
+            >
               {{ section.labelKey }}
             </div>
           }
           @if (section.descriptionKey) {
-            <div class="text-gray-800 text-sm" translate>
+            <div
+              class="text-gray-800 text-sm"
+              translate
+              [translateParams]="{ recordKind: recordKind$ | async }"
+            >
               {{ section.descriptionKey }}
             </div>
           }
@@ -22,7 +34,7 @@
             field of section.fieldsWithValues;
             track fieldTracker($index, field)
           ) {
-            @if (!field.config.hidden) {
+            @if (evaluateExpression(field.config.hidden)() !== true) {
               <gn-ui-form-field
                 [ngClass]="
                   field.config.gridColumnSpan === 1
@@ -30,6 +42,7 @@
                     : 'col-span-2'
                 "
                 [uniqueIdentifier]="recordUniqueIdentifier$ | async"
+                [recordKind]="recordKind$ | async"
                 [model]="field.config.model!"
                 [modelSpecifier]="field.config.modelSpecifier!"
                 [config]="field.config.formFieldConfig"

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

@@ -2,14 +2,17 @@ import { CommonModule } from '@angular/common'
 import {
   ChangeDetectionStrategy,
   Component,
+  computed,
   inject,
   OnDestroy,
   OnInit,
+  Signal,
+  signal,
   viewChildren,
 } from '@angular/core'
 import { EditorFacade } from '../../+state/editor.facade'
 import { EditorFieldValue } from '../../models'
-import { FormFieldComponent } from './form-field'
+import { FieldFocusDirective, FormFieldComponent } from './form-field'
 import { TranslateDirective } from '@ngx-translate/core'
 import {
   EditorFieldWithValue,
@@ -18,6 +21,9 @@ import {
 import { firstValueFrom, map, Subscription, withLatestFrom } from 'rxjs'
 import { CatalogRecordKeys } from '../../../../../../../libs/common/domain/src/lib/model/record'
 import { switchMap } from 'rxjs/operators'
+import { toSignal } from '@angular/core/rxjs-interop'
+import { evaluate, isExpression } from '../../expressions'
+import { NotificationsService } from '../../../../../../../libs/feature/notifications/src'
 
 @Component({
   selector: 'gn-ui-record-form',
@@ -25,28 +31,40 @@ import { switchMap } from 'rxjs/operators'
   styleUrls: ['./record-form.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, FormFieldComponent, TranslateDirective],
+  imports: [
+    CommonModule,
+    FormFieldComponent,
+    FieldFocusDirective,
+    TranslateDirective,
+  ],
 })
 export class RecordFormComponent implements OnInit, OnDestroy {
   facade = inject(EditorFacade)
+  notifications = inject(NotificationsService)
   subscription = new Subscription()
 
   recordUniqueIdentifier$ = this.facade.record$.pipe(
     map((record) => record.uniqueIdentifier)
   )
+  recordKind$ = this.facade.record$.pipe(map((record) => record.kind))
 
   focusFieldWithPage$ = this.facade.focusedField$.pipe(
-    switchMap(
-      async (field) => [field, await this.getPageIndexForField(field)] as const
-    )
+    switchMap(async (field) => {
+      const location = await this.getFieldLocation(field)
+      return [field, location?.page ?? null, location?.section ?? -1] as const
+    })
   )
 
   formFields = viewChildren(FormFieldComponent)
+  sectionFocusDirectives = viewChildren<FieldFocusDirective>('sectionFocus')
 
-  focusField(model: CatalogRecordKeys) {
-    const fields = this.formFields()
-    const field = fields.find((f) => f.model === model)
-    field?.fieldFocus.focusField()
+  focusField(model: CatalogRecordKeys, sectionIndex: number) {
+    const field = this.formFields().find((f) => f.model === model)
+    if (field) {
+      field.fieldFocus.focusField()
+      return
+    }
+    this.sectionFocusDirectives()[sectionIndex]?.focusField(false)
   }
 
   ngOnInit() {
@@ -55,15 +73,15 @@ export class RecordFormComponent implements OnInit, OnDestroy {
         .pipe(
           withLatestFrom(
             this.facade.currentPage$,
-            ([field, fieldPage], currentPage) =>
-              [field, fieldPage, currentPage] as const
+            ([field, fieldPage, fieldSection], currentPage) =>
+              [field, fieldPage, fieldSection, currentPage] as const
           )
         )
-        .subscribe(([field, fieldPage, currentPage]) => {
+        .subscribe(([field, fieldPage, fieldSection, currentPage]) => {
           if (fieldPage !== null && fieldPage !== currentPage) {
             this.facade.setCurrentPage(fieldPage)
           }
-          setTimeout(() => this.focusField(field))
+          setTimeout(() => this.focusField(field, fieldSection))
         })
     )
   }
@@ -87,13 +105,52 @@ export class RecordFormComponent implements OnInit, OnDestroy {
     return section.labelKey
   }
 
-  async getPageIndexForField(model: CatalogRecordKeys): Promise<number | null> {
+  async getFieldLocation(
+    model: CatalogRecordKeys
+  ): Promise<{ page: number; section: number } | null> {
     const config = await firstValueFrom(this.facade.editorConfig$)
-    const pageIndex = config.pages.findIndex((page) =>
-      page.sections.some((section) =>
-        section.fields.some((field) => field.model === model)
-      )
+    const page = config.pages.findIndex((p) =>
+      p.sections.some((s) => s.fields.some((f) => f.model === model))
+    )
+    if (page < 0) {
+      return null
+    }
+    const section = config.pages[page].sections
+      .filter((s) => !s.hidden)
+      .findIndex((s) => s.fields.some((f) => f.model === model))
+    return { page, section }
+  }
+
+  private recordSignal = toSignal(this.facade.record$, { requireSync: true })
+  private expressionCache = new Map<string, Signal<EditorFieldValue>>()
+
+  // only compiles the expression into an evaluator the first time;
+  // then we store a computed() signal in the cache so that the evaluator is
+  // run again if the record changes
+  evaluateExpression(
+    expressionOrValue: string | EditorFieldValue
+  ): Signal<EditorFieldValue> {
+    if (!isExpression(expressionOrValue)) {
+      return signal(expressionOrValue as EditorFieldValue)
+    }
+    const expression = expressionOrValue as string
+    if (this.expressionCache.has(expression)) {
+      return this.expressionCache.get(expression)
+    }
+    const { evaluator, errors } = evaluate(expression)
+    if (errors.length) {
+      console.error(`The following errors happened while evaluating the expression '${expression}':
+${errors.map((err) => `> ${err}`).join('\n')}`)
+      this.notifications.showNotification({
+        type: 'warning',
+        title: 'Technical error',
+        text: 'An error happened while evaluating an expression inside the editor configuration; open the developer console for more information',
+      })
+    }
+    this.expressionCache.set(
+      expression,
+      computed(() => evaluator({ globals: { record: this.recordSignal() } }))
     )
-    return pageIndex >= 0 ? pageIndex : null
+    return this.expressionCache.get(expression)
   }
 }