geonetwork-ui 2.3.0-dev.e03215d1 → 2.3.0-dev.e43863db

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

@@ -4,6 +4,9 @@ import {
   DatasetRecord,
   ServiceRecord,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { XmlElement } from '@rgrove/parse-xml'
+import { BaseConverter } from '../base.converter'
+import { isEqual } from '../convert-utils'
 import {
   createDocument,
   createElement,
@@ -11,32 +14,6 @@ import {
   parseXmlString,
   xmlToString,
 } from '../xml-utils'
-import {
-  writeAbstract,
-  writeContacts,
-  writeContactsForResource,
-  writeDistributions,
-  writeGraphicOverviews,
-  writeKeywords,
-  writeKind,
-  writeLegalConstraints,
-  writeLicenses,
-  writeLineage,
-  writeOnlineResources,
-  writeOtherConstraints,
-  writeOwnerOrganization,
-  writeRecordUpdated,
-  writeResourceCreated,
-  writeResourcePublished,
-  writeResourceUpdated,
-  writeSecurityConstraints,
-  writeSpatialRepresentation,
-  writeStatus,
-  writeTitle,
-  writeTopics,
-  writeUniqueIdentifier,
-  writeUpdateFrequency,
-} from './write-parts'
 import {
   readAbstract,
   readContacts,
@@ -59,13 +36,38 @@ import {
   readSecurityConstraints,
   readSpatialRepresentation,
   readStatus,
+  readTemporalExtents,
   readTitle,
   readUniqueIdentifier,
   readUpdateFrequency,
 } from './read-parts'
-import { isEqual } from '../convert-utils'
-import { BaseConverter } from '../base.converter'
-import { XmlElement } from '@rgrove/parse-xml'
+import {
+  writeAbstract,
+  writeContacts,
+  writeContactsForResource,
+  writeDistributions,
+  writeGraphicOverviews,
+  writeKeywords,
+  writeKind,
+  writeLegalConstraints,
+  writeLicenses,
+  writeLineage,
+  writeOnlineResources,
+  writeOtherConstraints,
+  writeOwnerOrganization,
+  writeRecordUpdated,
+  writeResourceCreated,
+  writeResourcePublished,
+  writeResourceUpdated,
+  writeSecurityConstraints,
+  writeSpatialRepresentation,
+  writeStatus,
+  writeTemporalExtents,
+  writeTitle,
+  writeTopics,
+  writeUniqueIdentifier,
+  writeUpdateFrequency,
+} from './write-parts'
 
 export class Iso19139Converter extends BaseConverter<string> {
   protected readers: Record<
@@ -98,9 +100,9 @@ export class Iso19139Converter extends BaseConverter<string> {
     lineage: readLineage,
     distributions: readDistributions,
     onlineResources: readOnlineResources,
+    temporalExtents: readTemporalExtents,
     // TODO
     spatialExtents: () => [],
-    temporalExtents: () => [],
     extras: () => undefined,
     landingPage: () => undefined,
     languages: () => [],
@@ -136,9 +138,9 @@ export class Iso19139Converter extends BaseConverter<string> {
     lineage: writeLineage,
     distributions: writeDistributions,
     onlineResources: writeOnlineResources,
+    temporalExtents: writeTemporalExtents,
     // TODO
     spatialExtents: () => undefined,
-    temporalExtents: () => undefined,
     extras: () => undefined,
     landingPage: () => undefined,
     languages: () => undefined,
@@ -311,6 +313,8 @@ export class Iso19139Converter extends BaseConverter<string> {
       fieldChanged('spatialRepresentation') &&
         this.writers['spatialRepresentation'](record, rootEl)
       fieldChanged('overviews') && this.writers['overviews'](record, rootEl)
+      fieldChanged('temporalExtents') &&
+        this.writers['temporalExtents'](record, rootEl)
       fieldChanged('distributions') &&
         this.writers['distributions'](record, rootEl)
       fieldChanged('lineage') && this.writers['lineage'](record, rootEl)

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

@@ -14,18 +14,7 @@ import {
   UpdateFrequency,
   UpdateFrequencyCustom,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
-import { getStatusFromStatusCode } from './utils/status.mapper'
-import { getUpdateFrequencyFromFrequencyCode } from './utils/update-frequency.mapper'
-import {
-  findChildElement,
-  findChildrenElement,
-  findNestedElement,
-  findNestedElements,
-  findParent,
-  readAttribute,
-  readText,
-  XmlElement,
-} from '../xml-utils'
+import { matchMimeType, matchProtocol } from '../common/distribution.mapper'
 import {
   ChainableFunction,
   combine,
@@ -37,10 +26,21 @@ import {
   mapArray,
   pipe,
 } from '../function-utils'
-import { getRoleFromRoleCode } from './utils/role.mapper'
-import { matchMimeType, matchProtocol } from '../common/distribution.mapper'
-import { getKeywordTypeFromKeywordTypeCode } from './utils/keyword.mapper'
+import {
+  XmlElement,
+  findChildElement,
+  findChildrenElement,
+  findNestedElement,
+  findNestedElements,
+  findParent,
+  readAttribute,
+  readText,
+} from '../xml-utils'
 import { fullNameToParts } from './utils/individual-name'
+import { getKeywordTypeFromKeywordTypeCode } from './utils/keyword.mapper'
+import { getRoleFromRoleCode } from './utils/role.mapper'
+import { getStatusFromStatusCode } from './utils/status.mapper'
+import { getUpdateFrequencyFromFrequencyCode } from './utils/update-frequency.mapper'
 
 export function extractCharacterString(): ChainableFunction<
   XmlElement,
@@ -434,7 +434,7 @@ export function getUpdateFrequencyFromCustomPeriod(
   } else if (days <= 7) {
     return {
       per: 'week',
-      updatedTimes: Math.round(7 / days),
+      updatedTimes: Math.round(7 / days - 0.0001), // this is to make sure that 'every 2 days' = '3 times per week'
     }
   } else if (days) {
     return {
@@ -843,3 +843,55 @@ export function readOnlineResources(
     flattenArray()
   )(rootEl)
 }
+
+export function readTemporalExtents(rootEl: XmlElement) {
+  return pipe(
+    findIdentification(),
+    findNestedElements('gmd:extent', 'gmd:EX_Extent', 'gmd:temporalElement'),
+    mapArray(
+      combine(
+        findNestedElement(
+          'gmd:EX_TemporalExtent',
+          'gmd:extent',
+          'gml:TimePeriod'
+        ),
+        findNestedElement(
+          'gmd:EX_TemporalExtent',
+          'gmd:extent',
+          'gml:TimeInstant'
+        )
+      )
+    ),
+    mapArray(([periodEl, instantEl]) => {
+      if (periodEl) {
+        return pipe(
+          combine(
+            pipe(
+              findChildElement('gml:beginPosition', false),
+              readText(),
+              map((dateStr) => (dateStr ? new Date(dateStr) : null))
+            ),
+            pipe(
+              findChildElement('gml:endPosition', false),
+              readText(),
+              map((dateStr) => (dateStr ? new Date(dateStr) : null))
+            )
+          ),
+          map(([start, end]) => ({
+            start,
+            end,
+          }))
+        )(periodEl)
+      } else {
+        return pipe(
+          findChildElement('gml:timePosition', false),
+          readText(),
+          map((dateStr) => (dateStr ? new Date(dateStr) : null)),
+          map((date) => ({
+            start: date,
+          }))
+        )(instantEl)
+      }
+    })
+  )(rootEl)
+}

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

@@ -15,7 +15,20 @@ import {
   UpdateFrequencyCode,
   UpdateFrequencyCustom,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
+import format from 'date-fns/format'
+import {
+  ChainableFunction,
+  fallback,
+  filterArray,
+  getAtIndex,
+  map,
+  mapArray,
+  noop,
+  pipe,
+  tap,
+} from '../function-utils'
 import {
+  XmlElement,
   addAttribute,
   appendChildren,
   createChild,
@@ -24,29 +37,13 @@ import {
   findChildOrCreate,
   findChildrenElement,
   findNestedChildOrCreate,
-  findNestedElement,
   findNestedElements,
   readAttribute,
-  readText,
   removeAllChildren,
   removeChildren,
   removeChildrenByName,
   setTextContent,
-  XmlElement,
 } from '../xml-utils'
-import {
-  ChainableFunction,
-  combine,
-  fallback,
-  filterArray,
-  getAtIndex,
-  map,
-  mapArray,
-  noop,
-  pipe,
-  tap,
-} from '../function-utils'
-import format from 'date-fns/format'
 import { readKind } from './read-parts'
 import { namePartsToFull } from './utils/individual-name'
 
@@ -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
@@ -1129,3 +1126,61 @@ export function writeOnlineResources(
     appendChildren(...record.onlineResources.map(createOnlineResource))
   )(rootEl)
 }
+
+export function writeTemporalExtents(
+  record: DatasetRecord,
+  rootEl: XmlElement
+) {
+  pipe(
+    findOrCreateIdentification(),
+    findNestedChildOrCreate('gmd:extent', 'gmd:EX_Extent'),
+    removeChildrenByName('gmd:temporalElement'),
+    appendChildren(
+      ...record.temporalExtents.map((extent) =>
+        pipe(
+          createElement('gmd:temporalElement'),
+          createChild('gmd:EX_TemporalExtent'),
+          appendChildren(
+            'start' in extent && 'end' in extent
+              ? pipe(
+                  createElement('gmd:extent'),
+                  createChild('gml:TimePeriod'),
+                  appendChildren(
+                    pipe(
+                      createElement('gml:beginPosition'),
+                      pipe(
+                        extent.start
+                          ? setTextContent(format(extent.start, 'yyyy-MM-dd'))
+                          : addAttribute('indeterminatePosition', 'unknown')
+                      )
+                    ),
+                    pipe(
+                      createElement('gml:endPosition'),
+                      pipe(
+                        extent.end
+                          ? setTextContent(format(extent.end, 'yyyy-MM-dd'))
+                          : addAttribute('indeterminatePosition', 'unknown')
+                      )
+                    )
+                  )
+                )
+              : pipe(
+                  createElement('gmd:extent'),
+                  createChild('gml:TimeInstant'),
+                  appendChildren(
+                    pipe(
+                      createElement('gml:timePosition'),
+                      pipe(
+                        extent.start
+                          ? setTextContent(format(extent.start, 'yyyy-MM-dd'))
+                          : addAttribute('indeterminatePosition', 'unknown')
+                      )
+                    )
+                  )
+                )
+          )
+        )
+      )
+    )
+  )(rootEl)
+}

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/domain/src/lib/model/record/metadata.model.ts

@@ -169,12 +169,12 @@ export interface DatasetSpatialExtent {
 }
 
 /**
- * At least a start or an end date should be provided
+ * Period if both start and end are provided
+ * Instant if only start is provided
  */
 export interface DatasetTemporalExtent {
-  start?: Date
+  start: Date
   end?: Date
-  description?: string
 }
 
 export interface DatasetRecord extends BaseRecord {

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/common/fixtures/src/lib/records.fixtures.ts

@@ -117,6 +117,14 @@ Cette section contient des *caractères internationaux* (ainsi que des "caractè
         description: 'This WFS service offers direct download capability',
         identifierInService: 'my:featuretype',
       },
+      {
+        type: 'service',
+        url: new URL('https://my-org.net/ogc'),
+        accessServiceProtocol: 'ogcFeatures',
+        name: 'my:featuretype',
+        description: 'This OGC service offers direct download capability',
+        identifierInService: 'my:featuretype',
+      },
     ],
     lineage: `This record was edited manually to test the conversion processes
 

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

@@ -1,6 +1,12 @@
 import { Injectable } from '@angular/core'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
-import { WfsEndpoint, WfsVersion } from '@camptocamp/ogc-client'
+import {
+  OgcApiCollectionInfo,
+  OgcApiEndpoint,
+  OgcApiRecord,
+  WfsEndpoint,
+  WfsVersion,
+} from '@camptocamp/ogc-client'
 import {
   BaseReader,
   FetchError,
@@ -27,6 +33,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')
@@ -148,6 +155,48 @@ export class DataService {
     )
   }
 
+  async getDownloadLinksFromOgcApiFeatures(
+    ogcApiLink: DatasetServiceDistribution
+  ): Promise<DatasetDistribution[]> {
+    const collectionInfo = await this.getDownloadUrlsFromOgcApi(
+      ogcApiLink.url.href
+    )
+    return Object.keys(collectionInfo.bulkDownloadLinks).map((downloadLink) => {
+      return {
+        ...ogcApiLink,
+        type: 'download',
+        url: new URL(collectionInfo.bulkDownloadLinks[downloadLink]),
+        mimeType: getMimeTypeForFormat(
+          getFileFormatFromServiceOutput(downloadLink)
+        ),
+      }
+    })
+  }
+
+  async getDownloadUrlsFromOgcApi(url: string): Promise<OgcApiCollectionInfo> {
+    const endpoint = new OgcApiEndpoint(this.proxy.getProxiedUrl(url))
+    return await endpoint.allCollections
+      .then((collections) => {
+        return endpoint.getCollectionInfo(collections[0].name)
+      })
+      .catch((error) => {
+        throw new Error(`ogc.unreachable.unknown`)
+      })
+  }
+
+  async getItemsFromOgcApi(url: string): Promise<OgcApiRecord> {
+    const endpoint = new OgcApiEndpoint(this.proxy.getProxiedUrl(url))
+    return await endpoint.featureCollections
+      .then((collections) => {
+        return collections.length
+          ? endpoint.getCollectionItem(collections[0], '1')
+          : null
+      })
+      .catch((error) => {
+        throw new Error(`ogc.unreachable.unknown`)
+      })
+  }
+
   getDownloadLinksFromEsriRest(
     esriRestLink: DatasetServiceDistribution
   ): DatasetDistribution[] {
@@ -205,6 +254,21 @@ export class DataService {
         'geojson'
       )
       return from(openDataset(url, 'geojson')).pipe()
+    } else if (
+      link.type === 'service' &&
+      link.accessServiceProtocol === 'ogcFeatures'
+    ) {
+      return from(this.getDownloadUrlsFromOgcApi(link.url.href)).pipe(
+        switchMap((collectionInfo) => {
+          const geojsonUrl = collectionInfo.jsonDownloadLink
+          return openDataset(geojsonUrl, 'geojson')
+        }),
+        tap((url) => {
+          if (url === null) {
+            throw new Error('wfs.geojsongml.notsupported')
+          }
+        })
+      )
     }
     return throwError(() => 'protocol not supported')
   }

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"