geonetwork-ui 2.3.0-dev.c4b41b40 → 2.3.0-dev.cc25794c

package/src/libs/api/metadata-converter/src/lib/iso19139/write-parts.ts

@@ -24,10 +24,8 @@ import {
   findChildOrCreate,
   findChildrenElement,
   findNestedChildOrCreate,
-  findNestedElement,
   findNestedElements,
   readAttribute,
-  readText,
   removeAllChildren,
   removeChildren,
   removeChildrenByName,
@@ -36,7 +34,6 @@ import {
 } from '../xml-utils'
 import {
   ChainableFunction,
-  combine,
   fallback,
   filterArray,
   getAtIndex,
@@ -220,7 +217,7 @@ export function getISODuration(updateFrequency: UpdateFrequencyCustom): string {
       else duration.hours = Math.round(24 / updateFrequency.updatedTimes)
       break
     case 'week':
-      duration.days = Math.round(7 / updateFrequency.updatedTimes)
+      duration.days = Math.round(7 / updateFrequency.updatedTimes - 0.0001) // this is to make sure that '2 times per week' = 'every 3 days'
       break
     case 'month':
       if (updateFrequency.updatedTimes <= 1) duration.months = 1

package/src/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.ts

@@ -162,19 +162,25 @@ export class Gn4PlatformService implements PlatformServiceInterface {
   }
 
   getUserFeedbacks(uuid: string): Observable<UserFeedback[]> {
-    return this.userfeedbackApiService
-      .getUserComments(uuid)
-      .pipe(
-        map((userFeedbacks) =>
-          userFeedbacks.map(this.mapper.userFeedbacksFromApi)
-        )
-      )
+    return this.userfeedbackApiService.getUserComments(uuid).pipe(
+      map((userFeedbacks) =>
+        userFeedbacks.map(this.mapper.userFeedbacksFromApi)
+      ),
+      catchError((error) => {
+        console.error('Error fetching user feedbacks:', error)
+        return of(undefined)
+      })
+    )
   }
 
   postUserFeedbacks(userFeedback: UserFeedback): Observable<void> {
     const mappedUserFeedBack = this.mapper.userFeedbacksToApi(userFeedback)
-    return this.userfeedbackApiService
-      .newUserFeedback(mappedUserFeedBack)
-      .pipe(map(() => undefined))
+    return this.userfeedbackApiService.newUserFeedback(mappedUserFeedBack).pipe(
+      map(() => undefined),
+      catchError((error) => {
+        console.error('Error posting user feedback:', error)
+        return of(undefined)
+      })
+    )
   }
 }

package/src/libs/common/fixtures/src/lib/link.fixtures.ts

@@ -110,6 +110,14 @@ export const LINK_FIXTURES: Record<string, DatasetDistribution> = deepFreeze({
     url: new URL('https://my.ogc.server/wfs'),
     accessServiceProtocol: 'wfs',
   },
+  geodataWfsDownload: {
+    name: 'mylayer',
+    type: 'download',
+    url: new URL(
+      'https://my.ogc.server/wfs?GetFeature&FeatureType=surval_parametre_ligne&format=csv'
+    ),
+    accessServiceProtocol: 'wfs',
+  },
   geodataWms2: {
     name: 'myotherlayer',
     type: 'service',

package/src/libs/feature/dataviz/src/lib/service/data.service.ts

@@ -32,6 +32,7 @@ marker('wfs.unreachable.http')
 marker('wfs.unreachable.unknown')
 marker('wfs.featuretype.notfound')
 marker('wfs.geojsongml.notsupported')
+marker('ogc.unreachable.unknown')
 marker('dataset.error.network')
 marker('dataset.error.http')
 marker('dataset.error.parse')
@@ -159,7 +160,6 @@ export class DataService {
     const collectionInfo = await this.getDownloadUrlsFromOgcApi(
       ogcApiLink.url.href
     )
-
     return Object.keys(collectionInfo.bulkDownloadLinks).map((downloadLink) => {
       return {
         ...ogcApiLink,
@@ -174,29 +174,12 @@ export class DataService {
 
   async getDownloadUrlsFromOgcApi(url: string): Promise<OgcApiCollectionInfo> {
     const endpoint = new OgcApiEndpoint(this.proxy.getProxiedUrl(url))
-    return await endpoint.featureCollections
+    return await endpoint.allCollections
       .then((collections) => {
-        return endpoint.getCollectionInfo(collections[0])
+        return endpoint.getCollectionInfo(collections[0].name)
       })
       .catch((error) => {
-        if (error instanceof Error) {
-          throw new Error(`wfs.unreachable.unknown`)
-        } else {
-          if (error.type === 'network') {
-            throw new Error(`wfs.unreachable.cors`)
-          }
-          if (error.type === 'http') {
-            throw new Error(`wfs.unreachable.http`)
-          }
-          if (error.type === 'parse') {
-            throw new Error(`wfs.unreachable.parse`)
-          }
-          if (error.type === 'unsupportedType') {
-            throw new Error(`wfs.unreachable.unsupportedType`)
-          } else {
-            throw new Error(`wfs.unreachable.unknown`)
-          }
-        }
+        throw new Error(`ogc.unreachable.unknown`)
       })
   }
 

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

@@ -0,0 +1,14 @@
+<gn-ui-check-toggle
+  [label]="'editor.record.form.updateFrequency.planned' | translate"
+  [value]="planned"
+  (toggled)="onPlannedToggled()"
+></gn-ui-check-toggle>
+<gn-ui-dropdown-selector
+  title="updateFrequency"
+  [showTitle]="false"
+  [choices]="choices"
+  [selected]="selectedFrequency"
+  (selectValue)="onSelectFrequencyValue($event)"
+  [disabled]="!planned"
+>
+</gn-ui-dropdown-selector>

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

@@ -0,0 +1,143 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core'
+import { FormControl } from '@angular/forms'
+import { marker } from '@biesbjerg/ngx-translate-extract-marker'
+import {
+  CheckToggleComponent,
+  DropdownSelectorComponent,
+} from '../../../../../../../../../libs/ui/inputs/src'
+import { TranslateModule, TranslateService } from '@ngx-translate/core'
+
+@Component({
+  selector: 'gn-ui-form-field-update-frequency',
+  templateUrl: './form-field-update-frequency.component.html',
+  styleUrls: ['./form-field-update-frequency.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CheckToggleComponent, DropdownSelectorComponent, TranslateModule],
+})
+export class FormFieldUpdateFrequencyComponent implements OnInit {
+  @Input() control: FormControl
+
+  get planned() {
+    return this.control.value !== 'notPlanned'
+  }
+
+  constructor(private translateService: TranslateService) {}
+
+  ngOnInit() {
+    const updatedTimes = this.control.value?.updatedTimes
+    const per = this.control.value?.per
+    if (updatedTimes && updatedTimes !== 1 && updatedTimes !== 2) {
+      this.choices = [
+        {
+          value: `${per}.${updatedTimes}`,
+          label: this.translateService.instant(
+            `domain.record.updateFrequency.${per}`,
+            {
+              count: updatedTimes,
+            }
+          ),
+        },
+        ...this.choices,
+      ]
+    }
+  }
+
+  onPlannedToggled() {
+    if (this.planned) {
+      this.control.setValue('notPlanned')
+    } else {
+      this.control.setValue({ updatedTimes: 1, per: 'day' })
+    }
+  }
+
+  get selectedFrequency() {
+    const { updatedTimes, per } = this.control.value
+    return `${per}.${updatedTimes}`
+  }
+
+  onSelectFrequencyValue(value: unknown) {
+    const split = (value as string).split('.')
+    this.control.setValue({ updatedTimes: Number(split[1]), per: split[0] })
+  }
+
+  choices = [
+    {
+      value: 'day.1',
+      label: this.translateService.instant(
+        'domain.record.updateFrequency.day',
+        {
+          count: 1,
+        }
+      ),
+    },
+    {
+      value: 'day.2',
+      label: this.translateService.instant(
+        'domain.record.updateFrequency.day',
+        {
+          count: 2,
+        }
+      ),
+    },
+    {
+      value: 'week.1',
+      label: this.translateService.instant(
+        'domain.record.updateFrequency.week',
+        {
+          count: 1,
+        }
+      ),
+    },
+    {
+      value: 'week.2',
+      label: this.translateService.instant(
+        'domain.record.updateFrequency.week',
+        {
+          count: 2,
+        }
+      ),
+    },
+    {
+      value: 'month.1',
+      label: this.translateService.instant(
+        'domain.record.updateFrequency.month',
+        {
+          count: 1,
+        }
+      ),
+    },
+    {
+      value: 'month.2',
+      label: this.translateService.instant(
+        'domain.record.updateFrequency.month',
+        {
+          count: 2,
+        }
+      ),
+    },
+    {
+      value: 'year.1',
+      label: this.translateService.instant(
+        'domain.record.updateFrequency.year',
+        {
+          count: 1,
+        }
+      ),
+    },
+    {
+      value: 'year.2',
+      label: this.translateService.instant(
+        'domain.record.updateFrequency.year',
+        {
+          count: 2,
+        }
+      ),
+    },
+  ]
+}

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

@@ -56,6 +56,11 @@
       [control]="formControl"
     ></gn-ui-form-field-resource-updated>
   </ng-container>
+  <ng-container *ngIf="isUpdateFrequency">
+    <gn-ui-form-field-update-frequency
+      [control]="formControl"
+    ></gn-ui-form-field-update-frequency>
+  </ng-container>
   <ng-container *ngIf="isSimpleField">
     <gn-ui-form-field-simple
       [type]="simpleType"

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

@@ -24,6 +24,7 @@ import { FormFieldSimpleComponent } from './form-field-simple/form-field-simple.
 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 { FormFieldUpdateFrequencyComponent } from './form-field-update-frequency/form-field-update-frequency.component'
 
 @Component({
   selector: 'gn-ui-form-field',
@@ -40,6 +41,7 @@ import { FormFieldConfig } from './form-field.model'
     FormFieldWrapperComponent,
     FormFieldLicenseComponent,
     FormFieldResourceUpdatedComponent,
+    FormFieldUpdateFrequencyComponent,
     FormFieldSimpleComponent,
     FormFieldRichComponent,
     FormFieldObjectComponent,
@@ -130,6 +132,9 @@ export class FormFieldComponent {
   get isResourceUpdated() {
     return this.model === 'resourceUpdated'
   }
+  get isUpdateFrequency() {
+    return this.model === 'updateFrequency'
+  }
 
   get withoutWrapper() {
     return this.model === 'title' || this.model === 'abstract'

package/src/libs/feature/editor/src/lib/fields.config.ts

@@ -47,4 +47,11 @@ export const DEFAULT_FIELDS: EditorFieldsConfig = [
       type: 'date',
     },
   },
+  {
+    model: 'updateFrequency',
+    formFieldConfig: {
+      labelKey: marker('editor.record.form.updateFrequency'),
+      type: 'text',
+    },
+  },
 ]

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

@@ -0,0 +1,7 @@
+.dropdown-content {
+  display: none;
+}
+
+.relative:hover .dropdown-content {
+  display: block;
+}

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

@@ -4,8 +4,7 @@
     (valueChange)="urlChange.next($event)"
     [hint]="'map.ogc.urlInput.hint' | translate"
     class="w-96"
-  >
-  </gn-ui-text-input>
+  ></gn-ui-text-input>
 </div>
 
 <div *ngIf="errorMessage" class="text-red-500 mt-2">
@@ -16,21 +15,36 @@
   <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
+<ng-container *ngFor="let layer of layers">
+  <div
+    *ngIf="shouldDisplayLayer(layer)"
+    class="flex items-center justify-between my-2 layer-item-tree"
+  >
+    <div class="flex flex-col items-start w-full">
+      <p
+        class="max-w-xs overflow-hidden overflow-ellipsis whitespace-nowrap"
+        [title]="layer.name"
       >
+        {{ layer.name }}
+      </p>
+      <div class="flex justify-between items-center w-full">
+        <gn-ui-dropdown-selector
+          [title]="'Add Layer As' | translate"
+          [choices]="getLayerChoices(layer)"
+          (selectValue)="onLayerTypeSelect(layer.name, $event)"
+          [selected]="selectedLayerTypes[layer.name]"
+          extraBtnClass="w-6 h-5 !text-sm !px-2 !py-1"
+        ></gn-ui-dropdown-selector>
+        <gn-ui-button
+          class="layer-add-btn"
+          type="primary"
+          (buttonClick)="addLayer(layer.name, selectedLayerTypes[layer.name])"
+          extraClass="text-sm !px-2 !py-1"
+          translate
+        >
+          <span translate>map.layer.add</span>
+        </gn-ui-button>
+      </div>
     </div>
-  </ng-container>
-</div>
+  </div>
+</ng-container>

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

@@ -14,7 +14,7 @@ import {
   MapContextLayerTypeEnum,
 } from '../map-context/map-context.model'
 import { TranslateModule } from '@ngx-translate/core'
-import { UiInputsModule } from '../../../../../../libs/ui/inputs/src'
+import { DropdownChoice, UiInputsModule } from '../../../../../../libs/ui/inputs/src'
 import { CommonModule } from '@angular/common'
 import { MapLayer } from '../+state/map.models'
 
@@ -30,18 +30,16 @@ export class AddLayerFromOgcApiComponent implements OnInit {
   @Output() layerAdded = new EventEmitter<MapLayer>()
 
   urlChange = new Subject<string>()
-  layerUrl = ''
   loading = false
-  layers: string[] = []
-  ogcEndpoint: OgcApiEndpoint = null
+  layers: any[] = []
   errorMessage: string | null = null
+  selectedLayerTypes: { [key: string]: DropdownChoice['value'] } = {}
 
   constructor(private changeDetectorRef: ChangeDetectorRef) {}
 
   ngOnInit() {
     this.urlChange.pipe(debounceTime(700)).subscribe(() => {
       this.loadLayers()
-      this.changeDetectorRef.detectChanges() // manually trigger change detection
     })
   }
 
@@ -49,14 +47,13 @@ export class AddLayerFromOgcApiComponent implements OnInit {
     this.errorMessage = null
     try {
       this.loading = true
-      if (this.ogcUrl.trim() === '') {
+      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
+      const ogcEndpoint = await new OgcApiEndpoint(this.ogcUrl)
+      this.layers = await ogcEndpoint.allCollections
+      this.setDefaultLayerTypes()
     } catch (error) {
       const err = error as Error
       this.layers = []
@@ -67,14 +64,72 @@ export class AddLayerFromOgcApiComponent implements OnInit {
     }
   }
 
-  async addLayer(layer: string) {
-    this.layerUrl = await this.ogcEndpoint.getCollectionItemsUrl(layer)
+  setDefaultLayerTypes() {
+    this.layers.forEach((layer) => {
+      const choices = this.getLayerChoices(layer)
+      if (choices.length > 0) {
+        this.selectedLayerTypes[layer.name] = choices[0].value
+      }
+    })
+  }
 
-    const layerToAdd: MapContextLayerModel = {
-      name: layer,
-      url: this.layerUrl,
-      type: MapContextLayerTypeEnum.OGCAPI,
+  getLayerChoices(layer: any) {
+    const choices = []
+    if (layer.hasRecords) {
+      choices.push({ label: 'Records', value: 'record' })
+    }
+    if (layer.hasFeatures) {
+      choices.push({ label: 'Features', value: 'features' })
+    }
+    if (layer.hasVectorTiles) {
+      choices.push({ label: 'Vector Tiles', value: 'vectorTiles' })
+    }
+    if (layer.hasMapTiles) {
+      choices.push({ label: 'Map Tiles', value: 'mapTiles' })
+    }
+    return choices
+  }
+
+  shouldDisplayLayer(layer: any) {
+    return (
+      layer.hasRecords ||
+      layer.hasFeatures ||
+      layer.hasVectorTiles ||
+      layer.hasMapTiles
+    )
+  }
+
+  onLayerTypeSelect(layerName: string, selectedType: any) {
+    this.selectedLayerTypes[layerName] = selectedType
+      ? selectedType
+      : this.getLayerChoices(layerName)[0]?.value
+  }
+
+  async addLayer(layer: string, layerType: any) {
+    try {
+      const ogcEndpoint = await new OgcApiEndpoint(this.ogcUrl)
+      let layerUrl: string
+
+      if (layerType === 'vectorTiles') {
+        layerUrl = await ogcEndpoint.getVectorTilesetUrl(layer)
+      } else if (layerType === 'mapTiles') {
+        layerUrl = await ogcEndpoint.getMapTilesetUrl(layer)
+      } else {
+        layerUrl = await ogcEndpoint.getCollectionItemsUrl(layer, {
+          outputFormat: 'json',
+        })
+      }
+
+      const layerToAdd: MapContextLayerModel = {
+        name: layer,
+        url: layerUrl,
+        type: MapContextLayerTypeEnum.OGCAPI,
+        layerType: layerType,
+      }
+      this.layerAdded.emit({ ...layerToAdd, title: layer })
+    } catch (error) {
+      const err = error as Error
+      console.error('Error adding layer:', err.message)
     }
-    this.layerAdded.emit({ ...layerToAdd, title: layer })
   }
 }

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

@@ -20,29 +20,35 @@ export interface MapContextLayerWmsModel {
   type: 'wms'
   url: string
   name: string
+  attributions?: string
 }
 
 export interface MapContextLayerWmtsModel {
   type: 'wmts'
   url: string
   name: string
+  attributions?: string
 }
 
 interface MapContextLayerWfsModel {
   type: 'wfs'
   url: string
   name: string
+  attributions?: string
 }
 
 export interface MapContextLayerOgcapiModel {
   type: 'ogcapi'
   url: string
   name: string
+  layerType: 'feature' | 'vectorTiles' | 'mapTiles' | 'record'
+  attributions?: string
 }
 
 interface LayerXyzModel {
   type: 'xyz'
   name?: string
+  attributions?: string
 }
 interface LayerXyzModelWithUrl extends LayerXyzModel {
   url: string
@@ -58,6 +64,7 @@ export type MapContextLayerXyzModel =
 
 interface LayerGeojson {
   type: 'geojson'
+  attributions?: string
 }
 interface LayerGeojsonWithUrl extends LayerGeojson {
   url: string