geonetwork-ui 2.3.0-dev.139106e0 → 2.3.0-dev.16f429aa

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

@@ -1,5 +1,5 @@
 import { DatasetRecord } from '../../../../../libs/common/domain/src/lib/model/record'
-import { deepFreeze } from './utils/freeze'
+import { deepFreeze } from './utils'
 
 export const DATASET_RECORDS: DatasetRecord[] = deepFreeze([
   {
@@ -49,8 +49,8 @@ export const DATASET_RECORDS: DatasetRecord[] = deepFreeze([
     status: 'ongoing',
     recordCreated: new Date('2022-02-01T15:12:00'),
     recordUpdated: new Date('2022-02-01T15:12:00'),
-    datasetCreated: new Date('2022-09-01T14:18:19'),
-    datasetUpdated: new Date('2022-12-04T15:12:00'),
+    resourceCreated: new Date('2022-09-01T14:18:19'),
+    resourceUpdated: new Date('2022-12-04T15:12:00'),
     title: 'A very interesting dataset (un jeu de données très intéressant)',
     abstract: `# Introduction
 This dataset has been established for testing purposes.

package/src/libs/common/fixtures/src/lib/user-feedbacks.fixtures.ts

@@ -0,0 +1,83 @@
+import { UserFeedback } from '../../../../../libs/common/domain/src/lib/model/record'
+import { deepFreeze } from './utils'
+
+export const SOME_USER_FEEDBACKS: UserFeedback[] = deepFreeze([
+  {
+    uuid: '4ad03fb7-1728-424c-bdaa-aedd531b07a8',
+    comment: 'A nice comment.',
+    metadataUUID: 'my-dataset-001',
+    authorUserId: '46798',
+    authorName: 'Arnaud De Maison',
+    authorEmail: 'a.demaison@geo2france.fr',
+    published: true,
+    parentUuid: undefined,
+    date: new Date('2023-01-01T08:00:00Z'),
+  },
+  {
+    uuid: '52cbd0f1-9cb9-4409-8e85-bc608f049af4',
+    comment: 'A very nice comment that is a reply.',
+    metadataUUID: 'my-dataset-001',
+    authorUserId: '46798',
+    authorName: 'Arnaud De Maison',
+    authorEmail: 'a.demaison@geo2france.fr',
+    published: true,
+    parentUuid: '4ad03fb7-1728-424c-bdaa-aedd531b07a8',
+    date: new Date('2023-01-01T09:00:00Z'),
+  },
+  {
+    uuid: 'b48f62ec-b5e6-4d27-a396-2c2b44f6dcb5',
+    comment: 'Another nice comment.',
+    metadataUUID: 'my-dataset-001',
+    authorUserId: '46798',
+    authorName: 'Arnaud De Maison',
+    authorEmail: 'a.demaison@geo2france.fr',
+    published: true,
+    parentUuid: undefined,
+    date: new Date('2023-01-01T10:00:00Z'),
+  },
+  {
+    uuid: '1f12a3be-fc8a-4e83-968f-9b88ffbcab02',
+    comment: 'Another very nice reply.',
+    metadataUUID: 'my-dataset-001',
+    authorUserId: '46798',
+    authorName: 'Arnaud De Maison',
+    authorEmail: 'a.demaison@geo2france.fr',
+    published: true,
+    parentUuid: '4ad03fb7-1728-424c-bdaa-aedd531b07a8',
+    date: new Date('2023-01-01T11:00:00Z'),
+  },
+  {
+    uuid: 'f8dd778d-e93c-4b3c-ba9b-9574be070f46',
+    comment: 'Another nice comment.',
+    metadataUUID: 'my-dataset-001',
+    authorUserId: '46798',
+    authorName: 'Arnaud De Maison',
+    authorEmail: 'a.demaison@geo2france.fr',
+    published: true,
+    parentUuid: undefined,
+    date: new Date('2023-01-01T10:00:00Z'),
+  },
+  {
+    uuid: 'df3b8872-61d1-4ae9-8822-bb070b94d7d1',
+    comment: 'Another nice comment.',
+    metadataUUID: 'my-dataset-001',
+    authorUserId: '46798',
+    authorName: 'Arnaud De Maison',
+    authorEmail: 'a.demaison@geo2france.fr',
+    published: true,
+    parentUuid: undefined,
+    date: new Date('2023-01-01T11:00:00Z'),
+  },
+])
+
+export const A_USER_FEEDBACK: UserFeedback = deepFreeze({
+  uuid: '4ad03fb7-1728-424c-bdaa-aedd531b07a8',
+  comment: 'A nice comment.',
+  metadataUUID: 'my-dataset-001',
+  authorUserId: '46798',
+  authorName: 'Arnaud De Maison',
+  authorEmail: 'a.demaison@geo2france.fr',
+  published: true,
+  parentUuid: undefined,
+  date: new Date('2023-01-01T08:00:00Z'),
+})

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

@@ -1,6 +1,11 @@
 import { Injectable } from '@angular/core'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
-import { WfsEndpoint, WfsVersion } from '@camptocamp/ogc-client'
+import {
+  OgcApiCollectionInfo,
+  OgcApiEndpoint,
+  WfsEndpoint,
+  WfsVersion,
+} from '@camptocamp/ogc-client'
 import {
   BaseReader,
   FetchError,
@@ -27,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')
@@ -148,6 +154,35 @@ 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.featureCollections
+      .then((collections) => {
+        return endpoint.getCollectionInfo(collections[0])
+      })
+      .catch((error) => {
+        throw new Error(`ogc.unreachable.unknown`)
+      })
+  }
+
   getDownloadLinksFromEsriRest(
     esriRestLink: DatasetServiceDistribution
   ): DatasetDistribution[] {
@@ -205,6 +240,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-license/form-field-license.component.html

@@ -0,0 +1,8 @@
+<gn-ui-dropdown-selector
+  [title]="label"
+  [showTitle]="false"
+  [choices]="choices"
+  [selected]="selected"
+  (selectValue)="onSelectValue($event)"
+>
+</gn-ui-dropdown-selector>

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

@@ -0,0 +1,64 @@
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { FormControl } from '@angular/forms'
+import { marker } from '@biesbjerg/ngx-translate-extract-marker'
+import { DropdownSelectorComponent } from '../../../../../../../../../libs/ui/inputs/src'
+
+@Component({
+  selector: 'gn-ui-form-field-license',
+  templateUrl: './form-field-license.component.html',
+  styleUrls: ['./form-field-license.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [DropdownSelectorComponent],
+})
+export class FormFieldLicenseComponent {
+  @Input() control!: FormControl
+  @Input() label: string
+
+  get selected() {
+    return this.control.value[0]?.text
+  }
+
+  onSelectValue(value: unknown) {
+    this.control.setValue([{ text: value }])
+  }
+
+  choices = [
+    {
+      value: 'cc-by',
+      label: marker('editor.record.form.license.cc-by'),
+    },
+    {
+      value: 'cc-by-sa',
+      label: marker('editor.record.form.license.cc-by-sa'),
+    },
+    {
+      value: 'cc-zero',
+      label: marker('editor.record.form.license.cc-zero'),
+    },
+    {
+      value: 'etalab',
+      label: marker('editor.record.form.license.etalab'),
+    },
+    {
+      value: 'etalab-v2',
+      label: marker('editor.record.form.license.etalab-v2'),
+    },
+    {
+      value: 'odbl',
+      label: marker('editor.record.form.license.odbl'),
+    },
+    {
+      value: 'odc-by',
+      label: marker('editor.record.form.license.odc-by'),
+    },
+    {
+      value: 'pddl',
+      label: marker('editor.record.form.license.pddl'),
+    },
+    {
+      value: 'unknown',
+      label: marker('editor.record.form.license.unknown'),
+    },
+  ]
+}

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

@@ -0,0 +1,4 @@
+<gn-ui-date-picker
+  [date]="control.value"
+  (dateChange)="control.setValue($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

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

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

@@ -1,29 +1,18 @@
 <div class="flex flex-col h-full">
-  <div class="mb-2 flex flex-row">
-    <label class="grow">
-      <span class="font-medium field-label">{{
-        config.labelKey | translate
-      }}</span>
-      <span *ngIf="config.hintKey" class="text-gray-900 text-sm">
-        - {{ config.hintKey | translate }}
-      </span>
-    </label>
-    <mat-icon
-      *ngIf="isFieldOk"
-      class="material-symbols-outlined text-[#c6d950] icon-ok"
-      >check_circle</mat-icon
-    >
-    <mat-icon
-      *ngIf="isFieldLocked"
-      class="material-symbols-outlined text-blue-400 icon-locked"
-      >lock</mat-icon
-    >
-    <mat-icon
-      *ngIf="isFieldInvalid"
-      class="material-symbols-outlined text-pink-500 icon-invalid"
-      >cancel</mat-icon
+  <ng-container *ngIf="withoutWrapper; else withGenericWrapper">
+    <ng-container *ngTemplateOutlet="fieldContent"></ng-container>
+  </ng-container>
+  <ng-template #withGenericWrapper>
+    <gn-ui-form-field-wrapper
+      [label]="config.labelKey | translate"
+      [hint]="config.hintKey | translate"
     >
-  </div>
+      <ng-container *ngTemplateOutlet="fieldContent"></ng-container>
+    </gn-ui-form-field-wrapper>
+  </ng-template>
+</div>
+
+<ng-template #fieldContent>
   <ng-container *ngIf="isTitle">
     <div class="flex justify-between items-center gap-3">
       <h2
@@ -48,6 +37,30 @@
       </span>
     </div>
   </ng-container>
+  <ng-container *ngIf="isAbstract">
+    <gn-ui-form-field-rich
+      class="h-[8rem]"
+      [control]="formControl"
+      [label]="config.labelKey | translate"
+      [hint]="config.hintKey | translate"
+    ></gn-ui-form-field-rich>
+  </ng-container>
+  <ng-container *ngIf="isLicenses">
+    <gn-ui-form-field-license
+      [control]="formControl"
+      [label]="config.labelKey | translate"
+    ></gn-ui-form-field-license>
+  </ng-container>
+  <ng-container *ngIf="isResourceUpdated">
+    <gn-ui-form-field-resource-updated
+      [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"
@@ -63,14 +76,6 @@
       [invalid]="isFieldInvalid"
     ></gn-ui-form-field-file>
   </ng-container>
-  <ng-container *ngIf="isAbstract">
-    <gn-ui-form-field-rich
-      class="h-[8rem]"
-      [control]="formControl"
-      [label]="config.labelKey | translate"
-      [hint]="config.hintKey | translate"
-    ></gn-ui-form-field-rich>
-  </ng-container>
   <ng-container *ngIf="isArrayField">
     <gn-ui-form-field-array></gn-ui-form-field-array>
   </ng-container>
@@ -89,4 +94,4 @@
   >
     {{ config.invalidHintKey | translate }}
   </div>
-</div>
+</ng-template>

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

@@ -11,16 +11,20 @@ import { FormControl, ReactiveFormsModule } from '@angular/forms'
 import { MatIconModule } from '@angular/material/icon'
 import { MatTooltipModule } from '@angular/material/tooltip'
 import { EditableLabelDirective } from '../../../../../../../../libs/ui/inputs/src'
+import { FormFieldWrapperComponent } from '../../../../../../../../libs/ui/layout/src'
 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 { FormFieldLicenseComponent } from './form-field-license/form-field-license.component'
 import { FormFieldObjectComponent } from './form-field-object/form-field-object.component'
+import { FormFieldResourceUpdatedComponent } from './form-field-resource-updated/form-field-resource-updated.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 { FormFieldUpdateFrequencyComponent } from './form-field-update-frequency/form-field-update-frequency.component'
 
 @Component({
   selector: 'gn-ui-form-field',
@@ -34,6 +38,10 @@ import { FormFieldConfig } from './form-field.model'
     EditableLabelDirective,
     MatIconModule,
     MatTooltipModule,
+    FormFieldWrapperComponent,
+    FormFieldLicenseComponent,
+    FormFieldResourceUpdatedComponent,
+    FormFieldUpdateFrequencyComponent,
     FormFieldSimpleComponent,
     FormFieldRichComponent,
     FormFieldObjectComponent,
@@ -118,4 +126,17 @@ export class FormFieldComponent {
   get isAbstract() {
     return this.model === 'abstract'
   }
+  get isLicenses() {
+    return this.model === 'licenses'
+  }
+  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

@@ -1,3 +1,4 @@
+import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 import { EditorFieldsConfig } from './models/fields.model'
 
 export const DEFAULT_FIELDS: EditorFieldsConfig = [
@@ -32,4 +33,25 @@ export const DEFAULT_FIELDS: EditorFieldsConfig = [
     },
     onSaveProcess: '${dateNow()}',
   },
+  {
+    model: 'licenses',
+    formFieldConfig: {
+      labelKey: marker('editor.record.form.license'),
+      type: 'list',
+    },
+  },
+  {
+    model: 'resourceUpdated',
+    formFieldConfig: {
+      labelKey: marker('editor.record.form.resourceUpdated'),
+      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;
+}