geonetwork-ui 2.3.2 → 2.4.0-dev.0925104f

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

@@ -0,0 +1,6 @@
+<gn-ui-check-toggle
+  [label]="'editor.record.form.classification.opendata' | translate"
+  [value]="openData"
+  (toggled)="onOpenDataToggled($event)"
+  data-cy="openDataToggle"
+></gn-ui-check-toggle>

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

@@ -0,0 +1,48 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  Output,
+} from '@angular/core'
+import { Constraint } from '../../../../../../../../../libs/common/domain/src/lib/model/record'
+import { CheckToggleComponent } from '../../../../../../../../../libs/ui/inputs/src'
+import { TranslateModule } from '@ngx-translate/core'
+import { OPEN_DATA_LICENSES } from './../../../../fields.config'
+
+@Component({
+  selector: 'gn-ui-form-field-open-data',
+  templateUrl: './form-field-open-data.component.html',
+  styleUrls: ['./form-field-open-data.component.css'],
+  standalone: true,
+  imports: [CheckToggleComponent, TranslateModule],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class FormFieldOpenDataComponent implements OnChanges {
+  @Input() value: Array<Constraint>
+  @Output() valueChange = new EventEmitter<Array<Constraint>>()
+  @Output() openDataChange = new EventEmitter<boolean>()
+
+  openData = false
+
+  get config() {
+    return OPEN_DATA_LICENSES
+  }
+
+  ngOnChanges() {
+    if (this.value && this.value.length > 0) {
+      this.openData = this.config.includes(this.value[0].text)
+    } else {
+      this.openData = false
+    }
+    this.openDataChange.emit(this.openData)
+  }
+
+  onOpenDataToggled(openData: boolean) {
+    this.openDataChange.emit(openData)
+    if (openData) {
+      this.valueChange.emit([{ text: this.config[0] }])
+    }
+  }
+}

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

@@ -0,0 +1,5 @@
+<gn-ui-overview-upload
+  [metadataUuid]="metadataUuid"
+  [overview]="firstOverview"
+  (overviewChange)="handleOverviewChange($event)"
+></gn-ui-overview-upload>

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

@@ -0,0 +1,33 @@
+import { CommonModule } from '@angular/common'
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core'
+import { GraphicOverview } from '../../../../../../../../../libs/common/domain/src/lib/model/record'
+import { OverviewUploadComponent } from '../../../overview-upload/overview-upload.component'
+
+@Component({
+  selector: 'gn-ui-form-field-overviews',
+  templateUrl: './form-field-overviews.component.html',
+  styleUrls: ['./form-field-overviews.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule, OverviewUploadComponent],
+})
+export class FormFieldOverviewsComponent {
+  @Input() metadataUuid: string
+  @Input() value: Array<GraphicOverview>
+  @Output() valueChange: EventEmitter<Array<GraphicOverview>> =
+    new EventEmitter()
+
+  get firstOverview() {
+    return this.value[0]
+  }
+
+  handleOverviewChange(overView: GraphicOverview | null) {
+    this.valueChange.emit(overView ? [overView] : [])
+  }
+}

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

@@ -1,4 +1,4 @@
 <gn-ui-date-picker
-  [date]="control.value"
-  (dateChange)="control.setValue($event)"
+  [date]="value"
+  (dateChange)="valueChange.emit($event)"
 ></gn-ui-date-picker>

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

@@ -1,5 +1,10 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
-import { FormControl } from '@angular/forms'
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core'
 import { DatePickerComponent } from '../../../../../../../../../libs/ui/inputs/src'
 
 @Component({
@@ -11,5 +16,6 @@ import { DatePickerComponent } from '../../../../../../../../../libs/ui/inputs/s
   imports: [DatePickerComponent],
 })
 export class FormFieldResourceUpdatedComponent {
-  @Input() control!: FormControl
+  @Input() value: Date
+  @Output() valueChange: EventEmitter<Date> = new EventEmitter()
 }

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

@@ -14,7 +14,7 @@
     [preview]="preview"
     [helperText]="helperText"
     [placeholder]="placeholder"
-    [textContent]="control.value"
-    (textContentChanged)="handleTextContentChanged($event)"
+    [textContent]="value"
+    (textContentChanged)="valueChange.emit($event)"
   ></gn-ui-markdown-editor>
 </gn-ui-form-field-wrapper>

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

@@ -1,6 +1,14 @@
 import { CommonModule } from '@angular/common'
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
-import { FormControl, ReactiveFormsModule } from '@angular/forms'
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core'
+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'
@@ -20,11 +28,13 @@ import { FormFieldWrapperComponent } from '../../../../../../../../../libs/ui/la
   ],
 })
 export class FormFieldRichComponent {
-  @Input() control!: FormControl
   @Input() label: string
   @Input() hint: string
   @Input() helperText: string
   @Input() placeholder = 'Votre texte ici' //TODO: translate
+  @Input() value: string
+
+  @Output() valueChange: EventEmitter<string> = new EventEmitter()
 
   preview = false
 
@@ -37,8 +47,4 @@ export class FormFieldRichComponent {
   togglePreview() {
     this.preview = !this.preview
   }
-
-  handleTextContentChanged(textContent: string) {
-    this.control.setValue(textContent)
-  }
 }

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

@@ -2,8 +2,9 @@
   *ngIf="!isSelect"
   [type]="inputType"
   [readonly]="readonly"
-  [formControl]="control"
   [placeholder]="placeholder"
+  [value]="value"
+  (valueChange)="valueChange.emit($event)"
   class="border rounded-md p-3 w-full bg-white transition-colors"
   [ngClass]="{
     'border-pink-500': invalid,
@@ -13,7 +14,8 @@
 />
 <select
   *ngIf="isSelect"
-  [formControl]="control"
+  [value]="value"
+  (valueChange)="valueChange.emit($event)"
   class="border rounded-md p-3 w-full bg-white transition-colors"
   [ngClass]="{
     'border-pink-500': invalid,
@@ -21,7 +23,7 @@
     'text-gray-600': readonly
   }"
 >
-  <option *ngFor="let option of options" [ngValue]="option.value">
+  <option *ngFor="let option of options" [value]="option.value">
     {{ option.label }}
   </option>
 </select>

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

@@ -1,6 +1,11 @@
 import { CommonModule } from '@angular/common'
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
-import { FormControl, ReactiveFormsModule } from '@angular/forms'
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core'
 
 @Component({
   selector: 'gn-ui-form-field-simple',
@@ -8,15 +13,17 @@ import { FormControl, ReactiveFormsModule } from '@angular/forms'
   styleUrls: ['./form-field-simple.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, ReactiveFormsModule],
+  imports: [CommonModule],
 })
 export class FormFieldSimpleComponent {
   @Input() type: 'date' | 'url' | 'text' | 'number' | 'list' | 'toggle'
-  @Input() control!: FormControl
   @Input() readonly = false
   @Input() invalid = false
   @Input() placeholder = ''
   @Input() options?: { label: string; value: unknown }[]
+  @Input() value: unknown
+
+  @Output() valueChange: EventEmitter<unknown> = new EventEmitter()
 
   get inputType() {
     switch (this.type) {

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

@@ -1 +1,15 @@
-<p>form-field-spatial-extent works!</p>
+<div class="flex flex-col gap-3">
+  <gn-ui-generic-keywords
+    [placeholder]="'Search for place keywords'"
+    [keywords]="shownKeywords$ | async"
+    [keywordTypes]="['place']"
+    (deletedKeyword)="handleKeywordDelete($event)"
+    (addedKeyword)="handleKeywordAdd($event)"
+  >
+  </gn-ui-generic-keywords>
+</div>
+<div class="w-full h-96">
+  <gn-ui-form-field-map-container
+    [spatialExtents]="spatialExtents$ | async"
+  ></gn-ui-form-field-map-container>
+</div>

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

@@ -1,4 +1,29 @@
+import { CommonModule } from '@angular/common'
 import { ChangeDetectionStrategy, Component } from '@angular/core'
+import {
+  DatasetSpatialExtent,
+  Keyword,
+} from '../../../../../../../../../libs/common/domain/src/lib/model/record'
+import { GenericKeywordsComponent } from '../../../generic-keywords/generic-keywords.component'
+import { PlatformServiceInterface } from '../../../../../../../../../libs/common/domain/src/lib/platform.service.interface'
+import { firstValueFrom, map, shareReplay } from 'rxjs'
+import { EditorFacade } from '../../../../+state/editor.facade'
+import { switchMap } from 'rxjs/operators'
+import { FormFieldMapContainerComponent } from '../form-field-map-container/form-field-map-container.component'
+import { TranslateService } from '@ngx-translate/core'
+
+// This intermediary type will let us keep track of which keyword is bound to
+// which extent; these properties will not be persisted
+type KeywordWithExtent = Keyword & {
+  _linkedExtent: DatasetSpatialExtent
+  _doNotSave: boolean
+}
+
+/**
+ * This form field is not like the others, as it will read directly from the state to handle both spatial extents
+ * and place keywords.
+ * Other types of keywords will not be touched by this field.
+ */
 
 @Component({
   selector: 'gn-ui-form-field-spatial-extent',
@@ -6,5 +31,135 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'
   styleUrls: ['./form-field-spatial-extent.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
+  imports: [
+    CommonModule,
+    GenericKeywordsComponent,
+    FormFieldMapContainerComponent,
+  ],
 })
-export class FormFieldSpatialExtentComponent {}
+export class FormFieldSpatialExtentComponent {
+  spatialExtents$ = this.editorFacade.record$.pipe(
+    map((record) => ('spatialExtents' in record ? record?.spatialExtents : []))
+  )
+
+  shownKeywords$ = this.editorFacade.record$.pipe(
+    map((record) => record?.keywords.filter((k) => k.type === 'place')),
+    // look for full keywords in the thesauri
+    switchMap((keywords) =>
+      Promise.all(
+        keywords.map(async (keyword) => {
+          if (!keyword.thesaurus) return keyword
+          const allKeywords = await firstValueFrom(
+            this.platformService.searchKeywordsInThesaurus(
+              keyword.label,
+              keyword.thesaurus.id
+            )
+          )
+          const found = allKeywords.find((k) => k.label === keyword.label)
+          return found ?? keyword
+        })
+      )
+    ),
+    // add additional "unnamed" keywords for extents without a matching keyword
+    switchMap(async (keywords) => {
+      const spatialExtents = await firstValueFrom(this.spatialExtents$)
+      const keywordsFromExtents = await Promise.all(
+        spatialExtents.map(async (extent) => {
+          const existingKeyword =
+            extent.description &&
+            (keywords.find(
+              (k) => k.key === extent.description
+            ) as KeywordWithExtent)
+          if (existingKeyword) {
+            existingKeyword._linkedExtent = extent
+            return null
+          }
+          let bbox = null
+          if ('geometry' in extent) {
+            bbox = extent.geometry // FIXME: this should be a bbox too but for now it works...
+          } else if ('bbox' in extent) {
+            bbox = extent.bbox
+          }
+          const label = await firstValueFrom(
+            this.translateService.get('editor.record.placeKeywordWithoutLabel')
+          )
+          return {
+            label,
+            type: 'place',
+            ...(bbox && { bbox }),
+            _linkedExtent: extent,
+            _doNotSave: true,
+          } as KeywordWithExtent
+        })
+      ).then((keywords) => keywords.filter((k) => !!k))
+
+      return [...keywords, ...keywordsFromExtents]
+    }),
+    shareReplay(1)
+  )
+
+  constructor(
+    private platformService: PlatformServiceInterface,
+    private editorFacade: EditorFacade,
+    private translateService: TranslateService
+  ) {}
+
+  async handleKeywordDelete(keyword: Keyword) {
+    const spatialExtents = await firstValueFrom(this.spatialExtents$)
+    const shownKeywords = (await firstValueFrom(
+      this.shownKeywords$
+    )) as KeywordWithExtent[]
+    const newKeywords = shownKeywords.filter((k) => k !== keyword)
+    const linkedExtent =
+      '_linkedExtent' in keyword ? keyword._linkedExtent : null
+    const newExtents = linkedExtent
+      ? spatialExtents.filter((extent) => linkedExtent !== extent)
+      : spatialExtents
+    return this.emitChanges(newKeywords, newExtents)
+  }
+
+  async handleKeywordAdd(keyword: Keyword) {
+    const spatialExtents = await firstValueFrom(this.spatialExtents$)
+    const shownKeywords = await firstValueFrom(this.shownKeywords$)
+    const newKeywords = [...shownKeywords, keyword] as KeywordWithExtent[]
+    let newExtents = spatialExtents
+    if (keyword.bbox) {
+      newExtents = [
+        ...spatialExtents,
+        {
+          bbox: keyword.bbox,
+          description: keyword.key ?? undefined,
+        },
+      ]
+    }
+    return this.emitChanges(newKeywords, newExtents)
+  }
+
+  async emitChanges(
+    placeKeywords: KeywordWithExtent[],
+    spatialExtents: DatasetSpatialExtent[]
+  ) {
+    // some keywords are only present to allow control over extents; they **should not** be saved!
+    const filteredPlaceKeywords = placeKeywords
+      .filter((keyword) => !keyword._doNotSave)
+      .map(
+        ({ label, thesaurus, type }) =>
+          ({
+            label,
+            type,
+            ...(thesaurus && { thesaurus }),
+          } as Keyword)
+      )
+    const notPlaceKeywords = await firstValueFrom(
+      this.editorFacade.record$.pipe(
+        map((record) => record.keywords.filter((k) => k.type !== 'place'))
+      )
+    )
+
+    this.editorFacade.updateRecordField('keywords', [
+      ...notPlaceKeywords,
+      ...filteredPlaceKeywords,
+    ])
+    this.editorFacade.updateRecordField('spatialExtents', spatialExtents)
+  }
+}

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-temporal-extents/form-field-temporal-extents-date/form-field-temporal-extents-date.component.html

@@ -0,0 +1,7 @@
+<div class="border rounded-lg px-4 pb-4">
+  <p class="my-2" translate>editor.record.form.temporalExtents.date</p>
+  <gn-ui-date-picker
+    [date]="control.value?.start"
+    (dateChange)="control.setValue({ start: $event })"
+  ></gn-ui-date-picker>
+</div>

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

@@ -0,0 +1,16 @@
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { FormControl } from '@angular/forms'
+import { DatePickerComponent } from '../../../../../../../../../../libs/ui/inputs/src'
+import { TranslateModule } from '@ngx-translate/core'
+
+@Component({
+  selector: 'gn-ui-form-field-temporal-extents-date',
+  templateUrl: './form-field-temporal-extents-date.component.html',
+  styleUrls: ['./form-field-temporal-extents-date.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [DatePickerComponent, TranslateModule],
+})
+export class FormFieldTemporalExtentsDateComponent {
+  @Input() control!: FormControl
+}

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-temporal-extents/form-field-temporal-extents-range/form-field-temporal-extents-range.component.html

@@ -0,0 +1,13 @@
+<div class="border rounded-lg px-4 pb-4">
+  <p class="my-2" translate>editor.record.form.temporalExtents.range</p>
+  <gn-ui-date-range-picker
+    [startDate]="control.value?.start"
+    [endDate]="control.value?.end"
+    (startDateChange)="
+      control.setValue({ start: $event, end: control.value?.end })
+    "
+    (endDateChange)="
+      control.setValue({ start: control.value?.start, end: $event })
+    "
+  ></gn-ui-date-range-picker>
+</div>

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

@@ -0,0 +1,16 @@
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { FormControl } from '@angular/forms'
+import { DateRangePickerComponent } from '../../../../../../../../../../libs/ui/inputs/src'
+import { TranslateModule } from '@ngx-translate/core'
+
+@Component({
+  selector: 'gn-ui-form-field-temporal-extents-range',
+  templateUrl: './form-field-temporal-extents-range.component.html',
+  styleUrls: ['./form-field-temporal-extents-range.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [DateRangePickerComponent, TranslateModule],
+})
+export class FormFieldTemporalExtentsRangeComponent {
+  @Input() control!: FormControl
+}

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

@@ -0,0 +1,13 @@
+<div class="flex gap-2 mb-2">
+  <gn-ui-button
+    *ngFor="let addOption of addOptions$ | async"
+    (buttonClick)="onAdd(addOption.eventName)"
+  >
+    <span class="material-symbols-outlined gn-ui-icon-small"> add </span>
+    &nbsp;{{ addOption.buttonLabel }}</gn-ui-button
+  >
+</div>
+<gn-ui-sortable-list
+  [elements]="elements"
+  (elementsChange)="onElementsChange($event)"
+></gn-ui-sortable-list>

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

@@ -0,0 +1,119 @@
+import { CommonModule } from '@angular/common'
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  OnChanges,
+  Output,
+} from '@angular/core'
+import { FormArray, FormControl } from '@angular/forms'
+import { DatasetTemporalExtent } from '../../../../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  DynamicElement,
+  SortableListComponent,
+} from '../../../../../../../../../libs/ui/elements/src'
+import { ButtonComponent } from '../../../../../../../../../libs/ui/inputs/src'
+import { TranslateService } from '@ngx-translate/core'
+import { Observable, combineLatest, map } from 'rxjs'
+import { FormFieldTemporalExtentsDateComponent } from './form-field-temporal-extents-date/form-field-temporal-extents-date.component'
+import { FormFieldTemporalExtentsRangeComponent } from './form-field-temporal-extents-range/form-field-temporal-extents-range.component'
+
+@Component({
+  selector: 'gn-ui-form-field-temporal-extents',
+  templateUrl: './form-field-temporal-extents.component.html',
+  styleUrls: ['./form-field-temporal-extents.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule, ButtonComponent, SortableListComponent],
+})
+export class FormFieldTemporalExtentsComponent implements OnChanges {
+  @Input() value: Array<DatasetTemporalExtent>
+  @Output() valueChange: Observable<Array<DatasetTemporalExtent>>
+
+  array: FormArray = new FormArray([])
+  elements: DynamicElement[] = []
+
+  addOptions$ = combineLatest([
+    this.translateService
+      .get('editor.record.form.temporalExtents.addDate')
+      .pipe(map((buttonLabel) => ({ buttonLabel, eventName: 'date' }))),
+    this.translateService
+      .get('editor.record.form.temporalExtents.addRange')
+      .pipe(map((buttonLabel) => ({ buttonLabel, eventName: 'range' }))),
+  ])
+
+  constructor(private translateService: TranslateService) {
+    this.valueChange = this.array.valueChanges
+  }
+
+  ngOnChanges() {
+    this.resetValueFromInput(this.value)
+  }
+
+  onElementsChange(elements: DynamicElement[]) {
+    this.elements = elements
+    this.array.clear({ emitEvent: false })
+
+    this.elements.forEach((e: DynamicElement, i: number) =>
+      this.array.push(e.inputs.control, {
+        emitEvent: i === elements.length - 1,
+      })
+    )
+  }
+
+  onAdd(eventName: string) {
+    switch (eventName) {
+      case 'date': {
+        const instant = { start: new Date() }
+        this.pushDate(instant, this.elements, true)
+        break
+      }
+      case 'range': {
+        const range = {
+          start: new Date(),
+          end: new Date(),
+        }
+        this.pushRange(range, this.elements, true)
+        break
+      }
+    }
+  }
+
+  private resetValueFromInput(value) {
+    this.array.clear({ emitEvent: false })
+    this.elements = []
+    if (!value) return
+
+    const newElements = []
+    value.forEach((v: DatasetTemporalExtent) => {
+      if ('start' in v && 'end' in v) {
+        this.pushRange(v, newElements, false)
+      } else {
+        this.pushDate(v, newElements, false)
+      }
+    })
+    this.elements = newElements
+  }
+
+  private pushDate(instant, elements, emitEvent) {
+    const dateControl = new FormControl(instant)
+    this.array.push(dateControl, { emitEvent })
+    elements.push({
+      component: FormFieldTemporalExtentsDateComponent,
+      inputs: {
+        control: dateControl,
+      },
+    })
+  }
+
+  private pushRange(period, elements, emitEvent) {
+    const rangeControl = new FormControl(period)
+    this.array.push(rangeControl, { emitEvent })
+    elements.push({
+      component: FormFieldTemporalExtentsRangeComponent,
+      inputs: {
+        control: rangeControl,
+      },
+    })
+  }
+}