geonetwork-ui 2.3.0-dev.376e0e90 → 2.3.0-dev.6083baae

package/src/libs/{ui/inputs/src/lib → feature/editor/src/lib/components/record-form}/form-field/form-field-array/form-field-array.component.ts

@@ -5,5 +5,6 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'
   templateUrl: './form-field-array.component.html',
   styleUrls: ['./form-field-array.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
 })
 export class FormFieldArrayComponent {}

package/src/libs/{ui/inputs/src/lib → feature/editor/src/lib/components/record-form}/form-field/form-field-file/form-field-file.component.ts

@@ -1,11 +1,14 @@
+import { CommonModule } from '@angular/common'
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
-import { FormControl } from '@angular/forms'
+import { FormControl, ReactiveFormsModule } from '@angular/forms'
 
 @Component({
   selector: 'gn-ui-form-field-file',
   templateUrl: './form-field-file.component.html',
   styleUrls: ['./form-field-file.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule, ReactiveFormsModule],
 })
 export class FormFieldFileComponent {
   @Input() control!: FormControl

package/src/libs/{ui/inputs/src/lib → feature/editor/src/lib/components/record-form}/form-field/form-field-object/form-field-object.component.ts

@@ -5,5 +5,6 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'
   templateUrl: './form-field-object.component.html',
   styleUrls: ['./form-field-object.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
 })
 export class FormFieldObjectComponent {}

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

@@ -0,0 +1,5 @@
+.icon-small {
+  font-size: 16px;
+  height: 16px;
+  width: 16px;
+}

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

@@ -0,0 +1,20 @@
+<gn-ui-form-field-wrapper [label]="label" [hint]="hint">
+  <gn-ui-button
+    form-field-interaction
+    [extraClass]="getButtonExtraClass()"
+    (buttonClick)="togglePreview()"
+  >
+    <span class="material-symbols-outlined mr-1 icon-small">{{
+      preview ? 'visibility' : 'visibility_off'
+    }}</span>
+    {{ preview ? 'WYSIWYG' : 'Markdown' }}
+  </gn-ui-button>
+  <gn-ui-markdown-editor
+    class="h-full"
+    [preview]="preview"
+    [helperText]="helperText"
+    [placeholder]="placeholder"
+    [textContent]="control.value"
+    (textContentChanged)="handleTextContentChanged($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

@@ -0,0 +1,44 @@
+import { CommonModule } from '@angular/common'
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { FormControl, 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'
+
+@Component({
+  selector: 'gn-ui-form-field-rich',
+  templateUrl: './form-field-rich.component.html',
+  styleUrls: ['./form-field-rich.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [
+    CommonModule,
+    ReactiveFormsModule,
+    MarkdownEditorComponent,
+    FormFieldWrapperComponent,
+    ButtonComponent,
+  ],
+})
+export class FormFieldRichComponent {
+  @Input() control!: FormControl
+  @Input() label: string
+  @Input() hint: string
+  @Input() helperText: string
+  @Input() placeholder = 'Votre texte ici' //TODO: translate
+
+  preview = false
+
+  getButtonExtraClass() {
+    return `${
+      this.preview ? 'text-gray-200 bg-gray-900' : 'text-gray-900 bg-gray-200'
+    } rounded-[1.25rem] p-[0.375rem] text-xs font-medium w-24`
+  }
+
+  togglePreview() {
+    this.preview = !this.preview
+  }
+
+  handleTextContentChanged(textContent: string) {
+    this.control.setValue(textContent)
+  }
+}

package/src/libs/{ui/inputs/src/lib → feature/editor/src/lib/components/record-form}/form-field/form-field-simple/form-field-simple.component.ts

@@ -1,11 +1,14 @@
+import { CommonModule } from '@angular/common'
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
-import { FormControl } from '@angular/forms'
+import { FormControl, ReactiveFormsModule } from '@angular/forms'
 
 @Component({
   selector: 'gn-ui-form-field-simple',
   templateUrl: './form-field-simple.component.html',
   styleUrls: ['./form-field-simple.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule, ReactiveFormsModule],
 })
 export class FormFieldSimpleComponent {
   @Input() type: 'date' | 'url' | 'text' | 'number' | 'list' | 'toggle'

package/src/libs/{ui/inputs/src/lib → feature/editor/src/lib/components/record-form}/form-field/form-field-spatial-extent/form-field-spatial-extent.component.ts

@@ -5,5 +5,6 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'
   templateUrl: './form-field-spatial-extent.component.html',
   styleUrls: ['./form-field-spatial-extent.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
 })
 export class FormFieldSpatialExtentComponent {}

package/src/libs/{ui/inputs/src/lib → feature/editor/src/lib/components/record-form}/form-field/form-field-temporal-extent/form-field-temporal-extent.component.ts

@@ -5,5 +5,6 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'
   templateUrl: './form-field-temporal-extent.component.html',
   styleUrls: ['./form-field-temporal-extent.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
 })
 export class FormFieldTemporalExtentComponent {}

package/src/libs/{ui/inputs/src/lib → feature/editor/src/lib/components/record-form}/form-field/form-field.component.html

@@ -39,12 +39,12 @@
       [invalid]="isFieldInvalid"
     ></gn-ui-form-field-file>
   </ng-container>
-  <ng-container *ngIf="isRichField">
+  <ng-container *ngIf="isAbstract">
     <gn-ui-form-field-rich
-      class="grow"
+      class="h-[8rem]"
       [control]="formControl"
-      [readonly]="isFieldLocked"
-      [invalid]="isFieldInvalid"
+      [label]="config.labelKey | translate"
+      [hint]="config.hintKey | translate"
     ></gn-ui-form-field-rich>
   </ng-container>
   <ng-container *ngIf="isArrayField">

package/src/libs/{ui/inputs/src/lib → feature/editor/src/lib/components/record-form}/form-field/form-field.component.ts

@@ -4,17 +4,42 @@ import {
   Input,
   Output,
 } from '@angular/core'
-import { FormFieldConfig } from './form-field.model'
-import { FormControl } from '@angular/forms'
+import { FormControl, ReactiveFormsModule } from '@angular/forms'
+import { MatIconModule } from '@angular/material/icon'
+import { TranslateModule } from '@ngx-translate/core'
 import { Observable } from 'rxjs'
+import { FormFieldArrayComponent } from './form-field-array/form-field-array.component'
+import { FormFieldFileComponent } from './form-field-file/form-field-file.component'
+import { FormFieldObjectComponent } from './form-field-object/form-field-object.component'
+import { FormFieldRichComponent } from './form-field-rich/form-field-rich.component'
+import { FormFieldSimpleComponent } from './form-field-simple/form-field-simple.component'
+import { FormFieldSpatialExtentComponent } from './form-field-spatial-extent/form-field-spatial-extent.component'
+import { FormFieldTemporalExtentComponent } from './form-field-temporal-extent/form-field-temporal-extent.component'
+import { FormFieldConfig } from './form-field.model'
+import { CommonModule } from '@angular/common'
 
 @Component({
   selector: 'gn-ui-form-field',
   templateUrl: './form-field.component.html',
   styleUrls: ['./form-field.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [
+    FormFieldSimpleComponent,
+    FormFieldRichComponent,
+    FormFieldObjectComponent,
+    FormFieldSpatialExtentComponent,
+    FormFieldTemporalExtentComponent,
+    FormFieldFileComponent,
+    FormFieldArrayComponent,
+    CommonModule,
+    ReactiveFormsModule,
+    TranslateModule,
+    MatIconModule,
+  ],
 })
 export class FormFieldComponent {
+  @Input() model: string
   @Input() config: FormFieldConfig
   @Input() set value(v: unknown) {
     this.formControl.setValue(v, {
@@ -49,9 +74,6 @@ export class FormFieldComponent {
       this.config.type === 'toggle'
     )
   }
-  get isRichField() {
-    return this.config.type === 'rich'
-  }
   get isFileField() {
     return this.config.type === 'file'
   }
@@ -77,4 +99,8 @@ export class FormFieldComponent {
   get isFieldInvalid() {
     return !this.config.locked && this.config.invalid
   }
+
+  get isAbstract() {
+    return this.model === 'abstract'
+  }
 }

package/src/libs/feature/editor/src/lib/{record-form → components/record-form}/record-form.component.html

@@ -2,6 +2,7 @@
   <ng-container *ngFor="let field of fields$ | async; trackBy: fieldTracker">
     <gn-ui-form-field
       *ngIf="field.config.formFieldConfig && !field.config.hidden"
+      [model]="field.config.model"
       [config]="field.config.formFieldConfig"
       [value]="field.value"
       (valueChange)="handleFieldValueChange(field, $event)"

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

@@ -1,8 +1,17 @@
 import { CommonModule } from '@angular/common'
 import { ChangeDetectionStrategy, Component } from '@angular/core'
-import { UiInputsModule } from '../../../../../../libs/ui/inputs/src'
-import { EditorFacade } from '../+state/editor.facade'
-import { EditorFieldState, EditorFieldValue } from '../models/fields.model'
+import { EditorFacade } from '../../+state/editor.facade'
+import { EditorFieldState, EditorFieldValue } from '../../models/fields.model'
+import {
+  FormFieldArrayComponent,
+  FormFieldComponent,
+  FormFieldFileComponent,
+  FormFieldObjectComponent,
+  FormFieldRichComponent,
+  FormFieldSimpleComponent,
+  FormFieldSpatialExtentComponent,
+  FormFieldTemporalExtentComponent,
+} from './form-field'
 
 @Component({
   selector: 'gn-ui-record-form',
@@ -10,7 +19,17 @@ import { EditorFieldState, EditorFieldValue } from '../models/fields.model'
   styleUrls: ['./record-form.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, UiInputsModule],
+  imports: [
+    CommonModule,
+    FormFieldComponent,
+    FormFieldArrayComponent,
+    FormFieldFileComponent,
+    FormFieldObjectComponent,
+    FormFieldRichComponent,
+    FormFieldSimpleComponent,
+    FormFieldSpatialExtentComponent,
+    FormFieldTemporalExtentComponent,
+  ],
 })
 export class RecordFormComponent {
   fields$ = this.facade.recordFields$

package/src/libs/feature/editor/src/lib/feature-editor.module.ts

@@ -1,20 +1,20 @@
+import { CommonModule } from '@angular/common'
+import { HttpClientModule, HttpClientXsrfModule } from '@angular/common/http'
 import { NgModule } from '@angular/core'
 import { MatNativeDateModule } from '@angular/material/core'
 import { MatDatepickerModule } from '@angular/material/datepicker'
 import { MatFormFieldModule } from '@angular/material/form-field'
-import { WizardComponent } from './components/wizard/wizard.component'
-import { WizardFieldComponent } from './components/wizard-field/wizard-field.component'
 import { UiInputsModule } from '../../../../../libs/ui/inputs/src'
 import { UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
-import { TranslateModule } from '@ngx-translate/core'
-import { WizardSummarizeComponent } from './components/wizard-summarize/wizard-summarize.component'
-import { CommonModule } from '@angular/common'
-import { HttpClientModule, HttpClientXsrfModule } from '@angular/common/http'
-import { StoreModule } from '@ngrx/store'
 import { EffectsModule } from '@ngrx/effects'
-import * as fromEditor from './+state/editor.reducer'
+import { StoreModule } from '@ngrx/store'
+import { TranslateModule } from '@ngx-translate/core'
 import { EditorEffects } from './+state/editor.effects'
 import { EditorFacade } from './+state/editor.facade'
+import * as fromEditor from './+state/editor.reducer'
+import { WizardFieldComponent } from './components/wizard-field/wizard-field.component'
+import { WizardSummarizeComponent } from './components/wizard-summarize/wizard-summarize.component'
+import { WizardComponent } from './components/wizard/wizard.component'
 
 @NgModule({
   declarations: [
@@ -42,5 +42,5 @@ import { EditorFacade } from './+state/editor.facade'
   providers: [EditorFacade],
 })
 export class FeatureEditorModule {}
-export * from './services/wizard.service'
 export * from './models/index'
+export * from './services/wizard.service'

package/src/libs/feature/editor/src/lib/models/fields.model.ts

@@ -1,4 +1,4 @@
-import { FormFieldConfig } from '../../../../../../libs/ui/inputs/src'
+import { FormFieldConfig } from '../components/record-form/form-field'
 
 // Expressions should be enclosed in `${}` to be recognized as such
 // eg. ${dateNow()}

package/src/libs/feature/map/src/lib/add-layer-from-catalog/add-layer-record-preview/add-layer-record-preview.component.ts

@@ -59,7 +59,11 @@ export class AddLayerRecordPreviewComponent extends RecordPreviewComponent {
         name: link.name,
       })
     } else if (link.accessServiceProtocol === 'wmts') {
-      return this.mapUtils.getWmtsLayerFromCapabilities(link)
+      return of({
+        url: link.url.toString(),
+        type: MapContextLayerTypeEnum.WMTS,
+        name: link.name,
+      })
     }
     return throwError(() => 'protocol not supported')
   }

package/src/libs/feature/map/src/lib/add-layer-from-file/add-layer-from-file.component.html

@@ -1,6 +1,6 @@
 <div class="flex flex-col gap-2 my-2">
   <div class="flex items-center gap-4">
-    <div class="flex-grow rounded-md border-2 border-gray-200">
+    <div class="grow rounded-md border-2 border-gray-200">
       <gn-ui-drag-and-drop-file-input
         (fileChange)="handleFileChange($event)"
         [accept]="acceptedMimeType.join(',')"

package/src/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.html

@@ -0,0 +1,36 @@
+<div class="flex items-center mb-5">
+  <gn-ui-text-input
+    [(value)]="ogcUrl"
+    (valueChange)="urlChange.next($event)"
+    [hint]="'map.ogc.urlInput.hint' | translate"
+    class="w-96"
+  >
+  </gn-ui-text-input>
+</div>
+
+<div *ngIf="errorMessage" class="text-red-500 mt-2">
+  {{ errorMessage }}
+</div>
+
+<div *ngIf="loading">
+  <p class="loading-message" translate>map.loading.service</p>
+</div>
+
+<div *ngIf="!loading && layers.length > 0">
+  <h2 class="font-bold" translate>map.layers.available</h2>
+  <ng-container *ngFor="let layer of layers">
+    <div class="flex items-center justify-between my-2 layer-item-tree">
+      <p class="max-w-xs overflow-hidden overflow-ellipsis whitespace-nowrap">
+        {{ layer }}
+      </p>
+      <gn-ui-button
+        class="layer-add-btn"
+        type="primary"
+        (buttonClick)="addLayer(layer)"
+        extraClass="text-sm !px-2 !py-1"
+        translate
+        ><span translate> map.layer.add </span></gn-ui-button
+      >
+    </div>
+  </ng-container>
+</div>

package/src/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.ts

@@ -0,0 +1,80 @@
+import {
+  Component,
+  OnInit,
+  Output,
+  EventEmitter,
+  ChangeDetectionStrategy,
+  Input,
+  ChangeDetectorRef,
+} from '@angular/core'
+import { OgcApiEndpoint } from '@camptocamp/ogc-client'
+import { Subject, debounceTime } from 'rxjs'
+import {
+  MapContextLayerModel,
+  MapContextLayerTypeEnum,
+} from '../map-context/map-context.model'
+import { TranslateModule } from '@ngx-translate/core'
+import { UiInputsModule } from '../../../../../../libs/ui/inputs/src'
+import { CommonModule } from '@angular/common'
+import { MapLayer } from '../+state/map.models'
+
+@Component({
+  selector: 'gn-ui-add-layer-from-ogc-api',
+  templateUrl: './add-layer-from-ogc-api.component.html',
+  styleUrls: ['./add-layer-from-ogc-api.component.css'],
+  standalone: true,
+  imports: [CommonModule, TranslateModule, UiInputsModule],
+})
+export class AddLayerFromOgcApiComponent implements OnInit {
+  @Input() ogcUrl: string
+  @Output() layerAdded = new EventEmitter<MapLayer>()
+
+  urlChange = new Subject<string>()
+  layerUrl = ''
+  loading = false
+  layers: string[] = []
+  ogcEndpoint: OgcApiEndpoint = null
+  errorMessage: string | null = null
+
+  constructor(private changeDetectorRef: ChangeDetectorRef) {}
+
+  ngOnInit() {
+    this.urlChange.pipe(debounceTime(700)).subscribe(() => {
+      this.loadLayers()
+      this.changeDetectorRef.detectChanges() // manually trigger change detection
+    })
+  }
+
+  async loadLayers() {
+    this.errorMessage = null
+    try {
+      this.loading = true
+      if (this.ogcUrl.trim() === '') {
+        this.layers = []
+        return
+      }
+      this.ogcEndpoint = await new OgcApiEndpoint(this.ogcUrl)
+
+      // Currently only supports feature collections
+      this.layers = await this.ogcEndpoint.featureCollections
+    } catch (error) {
+      const err = error as Error
+      this.layers = []
+      this.errorMessage = 'Error loading layers: ' + err.message
+    } finally {
+      this.loading = false
+      this.changeDetectorRef.markForCheck()
+    }
+  }
+
+  async addLayer(layer: string) {
+    this.layerUrl = await this.ogcEndpoint.getCollectionItemsUrl(layer)
+
+    const layerToAdd: MapContextLayerModel = {
+      name: layer,
+      url: this.layerUrl,
+      type: MapContextLayerTypeEnum.OGCAPI,
+    }
+    this.layerAdded.emit({ ...layerToAdd, title: layer })
+  }
+}

package/src/libs/feature/map/src/lib/feature-map.module.ts

@@ -25,6 +25,7 @@ import { AddLayerFromFileComponent } from './add-layer-from-file/add-layer-from-
 import { AddLayerFromWfsComponent } from './add-layer-from-wfs/add-layer-from-wfs.component'
 import { GeocodingComponent } from './geocoding/geocoding.component'
 import { GEOCODING_PROVIDER, GeocodingProvider } from './geocoding.service'
+import { AddLayerFromOgcApiComponent } from './add-layer-from-ogc-api/add-layer-from-ogc-api.component'
 
 @NgModule({
   declarations: [
@@ -59,6 +60,7 @@ import { GEOCODING_PROVIDER, GeocodingProvider } from './geocoding.service'
     EffectsModule.forFeature([MapEffects]),
     UiElementsModule,
     UiInputsModule,
+    AddLayerFromOgcApiComponent,
   ],
   providers: [
     {

package/src/libs/feature/map/src/lib/layers-panel/layers-panel.component.html

@@ -40,6 +40,14 @@
           <gn-ui-add-layer-from-wfs></gn-ui-add-layer-from-wfs>
         </div>
       </mat-tab>
+      <mat-tab [label]="'map.add.layer.ogc.api' | translate" bodyClass="h-full">
+        <div class="p-3">
+          <gn-ui-add-layer-from-ogc-api
+            [ogcUrl]="ogcUrl"
+            (layerAdded)="addLayer($event)"
+          ></gn-ui-add-layer-from-ogc-api>
+        </div>
+      </mat-tab>
       <mat-tab [label]="'map.add.layer.file' | translate" bodyClass="h-full">
         <div class="p-3">
           <gn-ui-add-layer-from-file></gn-ui-add-layer-from-file>

package/src/libs/feature/map/src/lib/layers-panel/layers-panel.component.ts

@@ -9,9 +9,14 @@ import { MapFacade } from '../+state/map.facade'
 })
 export class LayersPanelComponent {
   layers$ = this.mapFacade.layers$
+  ogcUrl = ''
   constructor(private mapFacade: MapFacade) {}
 
   deleteLayer(index: number) {
     this.mapFacade.removeLayer(index)
   }
+
+  addLayer(layer) {
+    this.mapFacade.addLayer(layer)
+  }
 }

package/src/libs/feature/map/src/lib/map-context/map-context.model.ts

@@ -1,7 +1,6 @@
 import type { FeatureCollection } from 'geojson'
 import { Coordinate } from 'ol/coordinate'
 import type { Extent } from 'ol/extent'
-import { Options } from 'ol/source/WMTS'
 
 export enum MapContextLayerTypeEnum {
   XYZ = 'xyz',
@@ -9,6 +8,7 @@ export enum MapContextLayerTypeEnum {
   WMTS = 'wmts',
   WFS = 'wfs',
   GEOJSON = 'geojson',
+  OGCAPI = 'ogcapi',
 }
 
 export interface MapContextModel {
@@ -24,8 +24,8 @@ export interface MapContextLayerWmsModel {
 
 export interface MapContextLayerWmtsModel {
   type: 'wmts'
-  options: Options
-  extent?: Extent
+  url: string
+  name: string
 }
 
 interface MapContextLayerWfsModel {
@@ -34,6 +34,12 @@ interface MapContextLayerWfsModel {
   name: string
 }
 
+export interface MapContextLayerOgcapiModel {
+  type: 'ogcapi'
+  url: string
+  name: string
+}
+
 interface LayerXyzModel {
   type: 'xyz'
   name?: string
@@ -71,6 +77,7 @@ export type MapContextLayerModel =
   | MapContextLayerWfsModel
   | MapContextLayerXyzModel
   | MapContextLayerGeojsonModel
+  | MapContextLayerOgcapiModel
 
 export interface MapContextViewModel {
   center?: Coordinate // expressed in long/lat (EPSG:4326)