geonetwork-ui 2.9.0-dev.fc19cbfed → 2.10.0-dev.02185426a

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

@@ -12,7 +12,6 @@ import {
 } from './editor.selectors'
 import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
-
 @Injectable()
 export class EditorEffects {
   private actions$ = inject(Actions)
@@ -29,30 +28,37 @@ export class EditorEffects {
         this.store.select(selectRecordSource),
         this.store.select(selectEditorConfig)
       ),
-      switchMap(([, record, recordSource, fieldsConfig]) =>
-        this.editorService.saveRecord(record, recordSource, fieldsConfig).pipe(
-          switchMap(([savedRecord, savedRecordSource]) => {
-            const actions: Action[] = [EditorActions.saveRecordSuccess()]
+      switchMap(([{ publish }, record, recordSource, fieldsConfig]) =>
+        this.editorService
+          .saveRecord(record, recordSource, fieldsConfig, publish)
+          .pipe(
+            switchMap(([savedRecord, savedRecordSource]) => {
+              const actions: Action[] = [EditorActions.saveRecordSuccess()]
 
-            if (!record?.uniqueIdentifier) {
-              actions.push(
-                EditorActions.openRecord({
-                  record: savedRecord,
-                  recordSource: savedRecordSource,
+              if (publish) {
+                // saving without publishing doesn't unpublish
+                actions.push(EditorActions.isPublished({ isPublished: true }))
+              }
+
+              if (!record?.uniqueIdentifier) {
+                actions.push(
+                  EditorActions.openRecord({
+                    record: savedRecord,
+                    recordSource: savedRecordSource,
+                  })
+                )
+              }
+
+              return of(...actions)
+            }),
+            catchError((error) =>
+              of(
+                EditorActions.saveRecordFailure({
+                  error,
                 })
               )
-            }
-
-            return of(...actions)
-          }),
-          catchError((error) =>
-            of(
-              EditorActions.saveRecordFailure({
-                error,
-              })
             )
           )
-        )
       )
     )
   )

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(
@@ -49,7 +54,11 @@ export class EditorFacade {
   }
 
   saveRecord() {
-    this.store.dispatch(EditorActions.saveRecord())
+    this.store.dispatch(EditorActions.saveRecord({ publish: false }))
+  }
+
+  saveAndPublishRecord() {
+    this.store.dispatch(EditorActions.saveRecord({ publish: true }))
   }
 
   undoRecordDraft() {
@@ -77,6 +86,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/generic-keywords/generic-keywords.component.html

@@ -11,20 +11,11 @@
   ></gn-ui-autocomplete>
   <div class="flex gap-2 flex-wrap">
     @for (keyword of keywords; track keyword) {
-      <gn-ui-badge
-        [removable]="true"
-        (badgeRemoveClicked)="removeKeyword(keyword)"
-        >{{ keyword.label }}
-        @if (isPlaceWithoutExtent(keyword)) {
-          <ng-icon
-            [title]="
-              'editor.record.form.keywords.place.withoutExtent' | translate
-            "
-            class="badge-warning"
-            name="matWarningAmberOutline"
-          ></ng-icon>
-        }
-      </gn-ui-badge>
+      <gn-ui-keyword-badge
+        [keyword]="keyword"
+        [editable]="true"
+        (keywordRemove)="removeKeyword($event)"
+      ></gn-ui-keyword-badge>
     }
   </div>
 </div>

package/src/libs/feature/editor/src/lib/components/generic-keywords/generic-keywords.component.ts

@@ -7,40 +7,20 @@ import {
   inject,
 } from '@angular/core'
 import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
-import { AutocompleteComponent, BadgeComponent } from '../../../../../../../libs/ui/inputs/src'
+import { AutocompleteComponent } from '../../../../../../../libs/ui/inputs/src'
+import { KeywordBadgeComponent } from '../../../../../../../libs/ui/elements/src'
 import { map } from 'rxjs'
 import { Keyword } from '../../../../../../../libs/common/domain/src/lib/model/record'
 import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus'
-import { TranslatePipe } from '@ngx-translate/core'
-import {
-  NgIconComponent,
-  provideIcons,
-  provideNgIconsConfig,
-} from '@ng-icons/core'
-import { matWarningAmberOutline } from '@ng-icons/material-icons/outline'
 
 type AutocompleteItem = { title: string; value: Keyword }
 
 @Component({
   selector: 'gn-ui-generic-keywords',
   templateUrl: './generic-keywords.component.html',
-  styleUrls: ['./generic-keywords.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [
-    AutocompleteComponent,
-    NgIconComponent,
-    BadgeComponent,
-    TranslatePipe,
-  ],
-  providers: [
-    provideIcons({
-      matWarningAmberOutline,
-    }),
-    provideNgIconsConfig({
-      size: '1.5em',
-    }),
-  ],
+  imports: [AutocompleteComponent, KeywordBadgeComponent],
 })
 export class GenericKeywordsComponent {
   private platformService = inject(PlatformServiceInterface)
@@ -87,9 +67,4 @@ export class GenericKeywordsComponent {
     this.changedKeywords.emit(this.keywords)
     this.deletedKeyword.emit(keyword)
   }
-
-  isPlaceWithoutExtent(keyword: Keyword): boolean {
-    if (keyword.type !== 'place') return false
-    return !keyword.bbox
-  }
 }

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/online-service-resource-input/online-service-resource-input.component.html

@@ -3,13 +3,13 @@
     editor.record.form.field.onlineResource.edit.protocol
   </h3>
   @if (protocolHint) {
-    <span
-      class="material-symbols-outlined m-2 gn-ui-icon-small"
+    <ng-icon
+      name="matHelpOutline"
+      size="16"
+      class="m-2"
       [matTooltip]="protocolHint"
       matTooltipPosition="above"
-    >
-      help
-    </span>
+    ></ng-icon>
   }
 </div>
 <div class="flex flex-row items-center gap-4 h-[48px]">
@@ -20,7 +20,7 @@
     [disabled]="disabled"
     (change)="resetAllFormFields()"
   >
-    @for (protocolOption of protocolOptions; track protocolOption) {
+    @for (protocolOption of availableProtocolOptions; track protocolOption) {
       <mat-radio-button [value]="protocolOption.value">
         {{ protocolOption.label | translate }}
       </mat-radio-button>
@@ -45,6 +45,11 @@
     }
   </gn-ui-url-input>
 
+  @if (loading) {
+    <div class="flex justify-center w-full py-4">
+      <gn-ui-spinning-loader></gn-ui-spinning-loader>
+    </div>
+  }
   @if (errorMessage) {
     <p class="text-sm text-red-500 pl-4" translate>
       editor.record.form.field.onlineResource.edit.identifier.error

package/src/libs/feature/editor/src/lib/components/online-service-resource-input/online-service-resource-input.component.ts

@@ -22,6 +22,7 @@ import {
   TextInputComponent,
   UrlInputComponent,
 } from '../../../../../../../libs/ui/inputs/src'
+import { SpinningLoaderComponent } from '../../../../../../../libs/ui/widgets/src'
 import { createFuzzyFilter, getLayers } from '../../../../../../../libs/util/shared/src'
 import {
   NgIconComponent,
@@ -29,6 +30,7 @@ import {
   provideNgIconsConfig,
 } from '@ng-icons/core'
 import { iconoirRefresh } from '@ng-icons/iconoir'
+import { matHelpOutline } from '@ng-icons/material-icons/outline'
 import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
 import {
   BehaviorSubject,
@@ -57,13 +59,14 @@ marker(
     MatTooltipModule,
     MatRadioModule,
     NgIconComponent,
+    SpinningLoaderComponent,
     TextInputComponent,
     TranslateDirective,
     TranslatePipe,
     UrlInputComponent,
   ],
   providers: [
-    provideIcons({ iconoirRefresh }),
+    provideIcons({ iconoirRefresh, matHelpOutline }),
     provideNgIconsConfig({
       size: '1.5em',
     }),
@@ -79,17 +82,19 @@ export class OnlineServiceResourceInputComponent {
   @Input() protocolHint?: string
   @Input() disabled? = false
   @Input() modifyMode? = false
+  @Input() protocolOptions?: ServiceProtocol[]
   @Output() serviceChange: EventEmitter<DatasetServiceDistribution> =
     new EventEmitter()
 
   errorMessage = false
+  loading = false
   resetUrlOnChange = Math.random()
 
   layersSubject = new BehaviorSubject<{ name?: string; title?: string }[]>([])
   layers$: Observable<{ name?: string; title?: string }[]> =
     this.layersSubject.asObservable()
 
-  protocolOptions: {
+  allProtocolOptions: {
     label: string
     value: ServiceProtocol
   }[] = [
@@ -123,6 +128,13 @@ export class OnlineServiceResourceInputComponent {
     },
   ]
 
+  get availableProtocolOptions() {
+    if (!this.protocolOptions) return this.allProtocolOptions
+    return this.protocolOptions.flatMap(
+      (v) => this.allProtocolOptions.find((o) => o.value === v) ?? []
+    )
+  }
+
   get activeLayerSuggestion() {
     return !['wps', 'GPFDL', 'esriRest', 'other'].includes(
       this._service.accessServiceProtocol
@@ -135,6 +147,8 @@ export class OnlineServiceResourceInputComponent {
   }
 
   async handleUploadClick(url: string) {
+    this.loading = true
+    this.cdr.detectChanges()
     try {
       const layers = await getLayers(url, this._service.accessServiceProtocol)
 
@@ -148,6 +162,7 @@ export class OnlineServiceResourceInputComponent {
       this.layersSubject.next([])
     }
 
+    this.loading = false
     this.cdr.detectChanges()
   }
 
@@ -159,6 +174,7 @@ export class OnlineServiceResourceInputComponent {
 
   resetLayersSuggestion() {
     this.errorMessage = false
+    this.loading = false
     this.layersSubject.next([])
     this._service.identifierInService = null
   }

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 })
+    })
+  }
+}