geonetwork-ui 2.10.0-dev.a9cc01fc7 → 2.10.0-dev.cbf02ead8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geonetwork-ui",
-  "version": "2.10.0-dev.a9cc01fc7",
+  "version": "2.10.0-dev.cbf02ead8",
   "engines": {
     "node": ">=20"
   },

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-online-single-link-resource/form-field-online-single-link-resource.component.html

@@ -0,0 +1,5 @@
+<gn-ui-url-input
+  [value]="displayUrl"
+  [showValidateButton]="false"
+  (valueChange)="handleUrlChange($event)"
+></gn-ui-url-input>

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-online-single-link-resource/form-field-online-single-link-resource.component.ts

@@ -0,0 +1,89 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+  inject,
+} from '@angular/core'
+import { marker } from '@biesbjerg/ngx-translate-extract-marker'
+import {
+  OnlineLinkResource,
+  OnlineResource,
+} from '../../../../../../../../../libs/common/domain/src/lib/model/record'
+import { NotificationsService } from '../../../../../../../../../libs/feature/notifications/src'
+import { UrlInputComponent } from '../../../../../../../../../libs/ui/inputs/src'
+import { TranslateService } from '@ngx-translate/core'
+
+marker('editor.record.form.field.onlineLinkageResource.defaultName')
+
+@Component({
+  selector: 'gn-ui-form-field-online-single-link-resource',
+  templateUrl: './form-field-online-single-link-resource.component.html',
+  styleUrls: ['./form-field-online-single-link-resource.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [UrlInputComponent],
+})
+export class FormFieldOnlineSingleLinkResourceComponent {
+  private notificationsService = inject(NotificationsService)
+  private translateService = inject(TranslateService)
+
+  @Input() set value(onlineResources: Array<OnlineResource>) {
+    this.allResources = onlineResources ?? []
+    const firstResource = this.allResources[0]
+    this.displayUrl = firstResource?.url?.toString() ?? ''
+  }
+  @Output() valueChange: EventEmitter<Array<OnlineResource>> =
+    new EventEmitter()
+
+  private allResources: OnlineResource[] = []
+  displayUrl = ''
+
+  handleUrlChange(url: string | null) {
+    if (!url) return
+
+    try {
+      const parsedUrl = new URL(url)
+
+      if (this.allResources.length === 0) {
+        const defaultName = this.translateService.instant(
+          'editor.record.form.field.onlineLinkageResource.defaultName'
+        )
+        const newResource: OnlineLinkResource = {
+          type: 'link',
+          url: parsedUrl,
+          name: defaultName,
+        }
+        this.valueChange.emit([newResource])
+      } else {
+        const updatedFirst: OnlineResource = {
+          ...this.allResources[0],
+          url: parsedUrl,
+        }
+        this.valueChange.emit([updatedFirst, ...this.allResources.slice(1)])
+      }
+    } catch (error) {
+      this.handleError(error as Error)
+    }
+  }
+
+  private handleError(error: Error) {
+    this.notificationsService.showNotification(
+      {
+        type: 'error',
+        title: this.translateService.instant(
+          'editor.record.onlineResourceError.title'
+        ),
+        text: `${this.translateService.instant(
+          'editor.record.onlineResourceError.body'
+        )} ${error.message}`,
+        closeMessage: this.translateService.instant(
+          'editor.record.onlineResourceError.closeMessage'
+        ),
+      },
+      undefined,
+      error
+    )
+  }
+}

package/src/libs/feature/notify-reuse/src/index.ts

@@ -0,0 +1 @@
+export * from './lib/notify-reuse-form/notify-reuse-form.component'

package/src/libs/feature/notify-reuse/src/lib/notify-reuse-form/notify-reuse-form.component.html

@@ -0,0 +1 @@
+@if (record) {}

package/src/libs/feature/notify-reuse/src/lib/notify-reuse-form/notify-reuse-form.component.ts

@@ -0,0 +1,21 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core'
+import { ReuseRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+
+@Component({
+  selector: 'gn-ui-notify-reuse-form',
+  standalone: true,
+  imports: [],
+  templateUrl: './notify-reuse-form.component.html',
+  styleUrl: './notify-reuse-form.component.css',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class NotifyReuseFormComponent {
+  @Input() record: ReuseRecord | null = null
+  @Output() recordChange = new EventEmitter<ReuseRecord>()
+}

package/src/libs/ui/map/src/lib/components/map-container/map-container.component.ts

@@ -204,11 +204,12 @@ export class MapContainerComponent implements AfterViewInit, OnChanges {
 
   async ngOnChanges(changes: SimpleChanges) {
     if ('context' in changes && !changes['context'].isFirstChange()) {
+      const olMap = await this.openlayersMap
       const diff = computeMapContextDiff(
         this.processContext(changes['context'].currentValue),
         this.processContext(changes['context'].previousValue)
       )
-      await applyContextDiffToMap(this.olMap, diff)
+      await applyContextDiffToMap(olMap, diff)
 
       if (this._resolvedExtentChange && diff.viewChanges) {
         this._resolvedExtentChange.emit(this.calculateCurrentMapExtent())

package/src/libs/ui/map/src/lib/components/spatial-extent/spatial-extent.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input } from '@angular/core'
+import { ChangeDetectorRef, Component, inject, Input } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { Geometry } from 'geojson'
 import { GeoJSONFeatureCollection } from 'ol/format/GeoJSON.js'
@@ -10,8 +10,8 @@ import {
   MapContextLayer,
 } from '@geospatial-sdk/core'
 import { MapContainerComponent } from '../map-container/map-container.component'
-import { BehaviorSubject, Observable } from 'rxjs'
-import { switchMap } from 'rxjs/operators'
+import { BehaviorSubject, from, Observable, of } from 'rxjs'
+import { map, switchMap, tap } from 'rxjs/operators'
 import { DatasetSpatialExtent } from '../../../../../../../libs/common/domain/src/lib/model/record'
 
 @Component({
@@ -22,14 +22,16 @@ import { DatasetSpatialExtent } from '../../../../../../../libs/common/domain/sr
   styleUrl: './spatial-extent.component.css',
 })
 export class SpatialExtentComponent {
+  private _cdr = inject(ChangeDetectorRef)
+
   @Input() set spatialExtents(value: DatasetSpatialExtent[]) {
     this.spatialExtents$.next(value)
   }
   spatialExtents$ = new BehaviorSubject<DatasetSpatialExtent[]>([])
   mapContext$: Observable<MapContext> = this.spatialExtents$.pipe(
-    switchMap(async (extents) => {
+    switchMap((extents) => {
       if (extents.length === 0) {
-        return null // null extent means default view
+        return of(null)
       }
       const featureCollection: GeoJSONFeatureCollection = {
         type: 'FeatureCollection',
@@ -61,11 +63,10 @@ export class SpatialExtentComponent {
           'fill-color': 'rgba(153, 153, 153, 0.3)',
         },
       }
-      const view = await createViewFromLayer(layer)
-      return {
-        view,
-        layers: [layer],
-      }
+      return from(createViewFromLayer(layer)).pipe(
+        map((view) => ({ view, layers: [layer] }) as MapContext),
+        tap(() => this._cdr.markForCheck())
+      )
     })
   )
 

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

@@ -1,6 +1,7 @@
 import * as TOML from '@ltd/j-toml'
 import {
   checkMetadataLanguage,
+  checkNewRecordDefaultLanguage,
   parseConfigSection,
   parseMultiConfigSection,
   parseTranslationsConfigSection,
@@ -8,6 +9,7 @@ import {
 import {
   CustomTranslations,
   CustomTranslationsAllLanguages,
+  EditorConfig,
   GlobalConfig,
   LayerConfig,
   MapConfig,
@@ -51,6 +53,12 @@ export function getOptionalSearchConfig(): SearchConfig | null {
   return searchConfig
 }
 
+let editorConfig: EditorConfig = null
+
+export function getOptionalEditorConfig(): EditorConfig | null {
+  return editorConfig
+}
+
 let metadataQualityConfig: MetadataQualityConfig = null
 export function getMetadataQualityConfig(): MetadataQualityConfig {
   return (
@@ -285,6 +293,33 @@ export function loadAppConfig(configUrl = 'assets/configuration/default.toml') {
               SORTABLE: parsedMetadataQualitySection.sortable,
             } as MetadataQualityConfig)
 
+      let parsedEditingSection = parseConfigSection(
+        parsed,
+        'editing',
+        [],
+        ['new_record_default_language'],
+        warnings,
+        errors
+      )
+      if (
+        parsedEditingSection !== null &&
+        parsedEditingSection.new_record_default_language !== undefined
+      ) {
+        parsedEditingSection = checkNewRecordDefaultLanguage(
+          parsedEditingSection,
+          warnings
+        )
+      }
+      editorConfig =
+        parsedEditingSection === null
+          ? null
+          : ({
+              NEW_RECORD_DEFAULT_LANGUAGE:
+                parsedEditingSection.new_record_default_language as
+                  | string
+                  | undefined,
+            } as EditorConfig)
+
       customTranslations = parseTranslationsConfigSection(
         parsed,
         'translations'
@@ -309,6 +344,7 @@ export function isConfigLoaded() {
 export function _reset() {
   globalConfig = null
   themeConfig = null
+  editorConfig = null
   customTranslations = null
 }
 

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

@@ -69,6 +69,10 @@ export interface MetadataQualityConfig {
   ENABLED: boolean
 }
 
+export interface EditorConfig {
+  NEW_RECORD_DEFAULT_LANGUAGE?: string
+}
+
 export type CustomTranslations = { [translationKey: string]: string }
 export type CustomTranslationsAllLanguages = {
   [lang: string]: CustomTranslations

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

@@ -1,4 +1,4 @@
-import { toLang2 } from '../../../../../libs/util/i18n/src'
+import { LANG_2_TO_3_MAPPER, toLang2 } from '../../../../../libs/util/i18n/src'
 
 const flatten = (
   base: string,
@@ -137,3 +137,25 @@ export function checkMetadataLanguage(
   }
   return parsedConfigSection
 }
+
+export function checkNewRecordDefaultLanguage(
+  parsedConfigSection: any,
+  outWarnings: string[]
+) {
+  const lang2 = toLang2(
+    parsedConfigSection.new_record_default_language.toLowerCase()
+  )
+  if (!(lang2 in LANG_2_TO_3_MAPPER)) {
+    outWarnings.push(
+      `In the [editing] section: new_record_default_language = "${parsedConfigSection.new_record_default_language}" is not a recognized ISO 639 language code`
+    )
+    return {
+      ...parsedConfigSection,
+      new_record_default_language: undefined,
+    }
+  }
+  return {
+    ...parsedConfigSection,
+    new_record_default_language: lang2,
+  }
+}

package/translations/de.json

@@ -159,6 +159,7 @@
   "editor.record.form.field.legalConstraints": "Rechtliche Einschränkung",
   "editor.record.form.field.license": "Lizenz",
   "editor.record.form.field.onlineLinkResources": "Beigefügte Ressourcen",
+  "editor.record.form.field.onlineLinkageResource.defaultName": "Link",
   "editor.record.form.field.onlineResource.cancel": "Abbrechen",
   "editor.record.form.field.onlineResource.confirm": "Bestätigen",
   "editor.record.form.field.onlineResource.dialogTitle": "Vorschau des Datensatzes bearbeiten",

package/translations/en.json

@@ -159,6 +159,7 @@
   "editor.record.form.field.legalConstraints": "Legal constraint",
   "editor.record.form.field.license": "License",
   "editor.record.form.field.onlineLinkResources": "Attached resources",
+  "editor.record.form.field.onlineLinkageResource.defaultName": "Link",
   "editor.record.form.field.onlineResource.cancel": "Cancel",
   "editor.record.form.field.onlineResource.confirm": "Confirm",
   "editor.record.form.field.onlineResource.dialogTitle": "Modify the dataset preview",

package/translations/es.json

@@ -159,6 +159,7 @@
   "editor.record.form.field.legalConstraints": "",
   "editor.record.form.field.license": "",
   "editor.record.form.field.onlineLinkResources": "",
+  "editor.record.form.field.onlineLinkageResource.defaultName": "",
   "editor.record.form.field.onlineResource.cancel": "",
   "editor.record.form.field.onlineResource.confirm": "",
   "editor.record.form.field.onlineResource.dialogTitle": "",

package/translations/fr.json

@@ -159,6 +159,7 @@
   "editor.record.form.field.legalConstraints": "Contrainte légale",
   "editor.record.form.field.license": "Licence",
   "editor.record.form.field.onlineLinkResources": "Ressources attachées",
+  "editor.record.form.field.onlineLinkageResource.defaultName": "Lien",
   "editor.record.form.field.onlineResource.cancel": "Annuler",
   "editor.record.form.field.onlineResource.confirm": "Valider",
   "editor.record.form.field.onlineResource.dialogTitle": "Modifier l'aperçu du jeu de données",

package/translations/it.json

@@ -159,6 +159,7 @@
   "editor.record.form.field.legalConstraints": "Vincolo legale",
   "editor.record.form.field.license": "Licenza",
   "editor.record.form.field.onlineLinkResources": "Risorse allegate",
+  "editor.record.form.field.onlineLinkageResource.defaultName": "Link",
   "editor.record.form.field.onlineResource.cancel": "Annulla",
   "editor.record.form.field.onlineResource.confirm": "Convalida",
   "editor.record.form.field.onlineResource.dialogTitle": "Modifica anteprima dataset",

package/translations/nl.json

@@ -159,6 +159,7 @@
   "editor.record.form.field.legalConstraints": "",
   "editor.record.form.field.license": "",
   "editor.record.form.field.onlineLinkResources": "",
+  "editor.record.form.field.onlineLinkageResource.defaultName": "",
   "editor.record.form.field.onlineResource.cancel": "",
   "editor.record.form.field.onlineResource.confirm": "",
   "editor.record.form.field.onlineResource.dialogTitle": "",

package/translations/pt.json

@@ -159,6 +159,7 @@
   "editor.record.form.field.legalConstraints": "",
   "editor.record.form.field.license": "",
   "editor.record.form.field.onlineLinkResources": "",
+  "editor.record.form.field.onlineLinkageResource.defaultName": "",
   "editor.record.form.field.onlineResource.cancel": "",
   "editor.record.form.field.onlineResource.confirm": "",
   "editor.record.form.field.onlineResource.dialogTitle": "",

package/translations/sk.json

@@ -159,6 +159,7 @@
   "editor.record.form.field.legalConstraints": "",
   "editor.record.form.field.license": "Licencia",
   "editor.record.form.field.onlineLinkResources": "",
+  "editor.record.form.field.onlineLinkageResource.defaultName": "",
   "editor.record.form.field.onlineResource.cancel": "",
   "editor.record.form.field.onlineResource.confirm": "",
   "editor.record.form.field.onlineResource.dialogTitle": "",