geonetwork-ui 2.3.0-dev.179fba83 → 2.3.0-dev.287bf00c

package/src/libs/common/fixtures/src/index.ts

@@ -1,11 +1,13 @@
+export * from './lib/elasticsearch'
+export * from './lib/gn4'
+export * from './lib/search'
+
 export * from './lib/geojson.fixtures'
+export * from './lib/link.fixtures'
 export * from './lib/ol-feature.fixture'
+export * from './lib/organisations.fixture'
 export * from './lib/record-link.fixtures'
-export * from './lib/link.fixtures'
 export * from './lib/records.fixtures'
-export * from './lib/organisations.fixture'
-export * from './lib/elasticsearch'
-export * from './lib/search'
-export * from './lib/user.fixtures'
 export * from './lib/repository.fixtures'
-export * from './lib/gn4'
+export * from './lib/user.fixtures'
+export * from './lib/user-feedbacks.fixtures'

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,
@@ -148,6 +153,53 @@ 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) => {
+        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`)
+          }
+        }
+      })
+  }
+
   getDownloadLinksFromEsriRest(
     esriRestLink: DatasetServiceDistribution
   ): DatasetDistribution[] {
@@ -205,6 +257,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/index.ts

@@ -5,7 +5,7 @@ export * from './lib/+state/editor.reducer'
 export * from './lib/+state/editor.actions'
 export * from './lib/feature-editor.module'
 export * from './lib/services/editor.service'
-export * from './lib/record-form/record-form.component'
+export * from './lib/components/record-form/record-form.component'
 export * from './lib/components/wizard/wizard.component'
 export * from './lib/components/wizard-field/wizard-field.component'
 export * from './lib/components/wizard-summarize/wizard-summarize.component'

package/src/libs/feature/editor/src/lib/+state/editor.facade.ts

@@ -3,14 +3,21 @@ import { select, Store } from '@ngrx/store'
 import * as EditorActions from './editor.actions'
 import * as EditorSelectors from './editor.selectors'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { filter, Observable } from 'rxjs'
+import { Actions, ofType } from '@ngrx/effects'
 
 @Injectable()
 export class EditorFacade {
   private readonly store = inject(Store)
+  private actions$ = inject(Actions)
 
   record$ = this.store.pipe(select(EditorSelectors.selectRecord))
   saving$ = this.store.pipe(select(EditorSelectors.selectRecordSaving))
-  saveError$ = this.store.pipe(select(EditorSelectors.selectRecordSaveError))
+  saveError$ = this.store.pipe(
+    select(EditorSelectors.selectRecordSaveError),
+    filter((error) => !!error)
+  )
+  saveSuccess$ = this.actions$.pipe(ofType(EditorActions.saveRecordSuccess))
   changedSinceSave$ = this.store.pipe(
     select(EditorSelectors.selectRecordChangedSinceSave)
   )

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/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/{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-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-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 gn-ui-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/feature/editor/src/lib/components/record-form/form-field/form-field.component.html

@@ -0,0 +1,92 @@
+<div class="flex flex-col h-full">
+  <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"
+    >
+      <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
+        #titleInput
+        class="grow text-3xl font-normal"
+        [gnUiEditableLabel]="true"
+        (editableLabelChanged)="formControl.setValue($event)"
+      >
+        {{ formControl.value }}
+      </h2>
+      <span
+        class="material-symbols-outlined gn-ui-icon-small m-2 cursor-pointer"
+        (click)="focusTitleInput()"
+        >edit</span
+      >
+      <span
+        class="material-symbols-outlined gn-ui-icon-small m-2"
+        [matTooltip]="config.hintKey | translate"
+        matTooltipPosition="above"
+      >
+        help
+      </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="isSimpleField">
+    <gn-ui-form-field-simple
+      [type]="simpleType"
+      [control]="formControl"
+      [readonly]="isFieldLocked"
+      [invalid]="isFieldInvalid"
+    ></gn-ui-form-field-simple>
+  </ng-container>
+  <ng-container *ngIf="isFileField">
+    <gn-ui-form-field-file
+      [control]="formControl"
+      [readonly]="isFieldLocked"
+      [invalid]="isFieldInvalid"
+    ></gn-ui-form-field-file>
+  </ng-container>
+  <ng-container *ngIf="isArrayField">
+    <gn-ui-form-field-array></gn-ui-form-field-array>
+  </ng-container>
+  <ng-container *ngIf="isObjectField">
+    <gn-ui-form-field-object></gn-ui-form-field-object>
+  </ng-container>
+  <ng-container *ngIf="isSpatialExtentField">
+    <gn-ui-form-field-spatial-extent></gn-ui-form-field-spatial-extent>
+  </ng-container>
+  <ng-container *ngIf="isTemporalExtentField">
+    <gn-ui-form-field-temporal-extent></gn-ui-form-field-temporal-extent>
+  </ng-container>
+  <div
+    *ngIf="isFieldInvalid && config.invalidHintKey"
+    class="mt-2 text-pink-500 text-sm field-invalid-hint"
+  >
+    {{ config.invalidHintKey | translate }}
+  </div>
+</ng-template>