geonetwork-ui 2.3.0-dev.a288b23a → 2.3.0-dev.aef43725

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

@@ -6,11 +6,15 @@ import {
   RegistriesApiService,
   SiteApiService,
   ToolsApiService,
+  UserfeedbackApiService,
   UsersApiService,
 } from '../../../../../../../libs/data-access/gn4/src'
 import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { UserModel } from '../../../../../../../libs/common/domain/src/lib/model/user/user.model'
-import { Organization } from '../../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  Organization,
+  UserFeedback,
+} from '../../../../../../../libs/common/domain/src/lib/model/record'
 import { Gn4PlatformMapper } from './gn4-platform.mapper'
 import { ltr } from 'semver'
 import { ThesaurusModel } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus/thesaurus.model'
@@ -21,9 +25,9 @@ const minApiVersion = '4.2.2'
 @Injectable()
 export class Gn4PlatformService implements PlatformServiceInterface {
   private readonly type = 'GeoNetwork'
-  private me$: Observable<UserModel>
-  private users$: Observable<UserModel[]>
-  private isAnonymous$: Observable<boolean>
+  private readonly me$: Observable<UserModel>
+  private readonly users$: Observable<UserModel[]>
+  private readonly isUserAnonymous$: Observable<boolean>
 
   private keyTranslations$ = this.toolsApiService
     .getTranslationsPackage1('gnui')
@@ -65,13 +69,18 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     private mapper: Gn4PlatformMapper,
     private toolsApiService: ToolsApiService,
     private registriesApiService: RegistriesApiService,
-    private langService: LangService
+    private langService: LangService,
+    private userfeedbackApiService: UserfeedbackApiService
   ) {
     this.me$ = this.meApi.getMe().pipe(
       switchMap((apiUser) => this.mapper.userFromMeApi(apiUser)),
       shareReplay({ bufferSize: 1, refCount: true })
     )
-    this.isAnonymous$ = this.me$.pipe(map((user) => !user || !('id' in user)))
+
+    this.isUserAnonymous$ = this.me$.pipe(
+      map((user) => !user || !('id' in user))
+    )
+
     this.users$ = this.usersApi.getUsers().pipe(
       map((users) => users.map((user) => this.mapper.userFromApi(user))),
       shareReplay()
@@ -91,7 +100,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
   }
 
   isAnonymous(): Observable<boolean> {
-    return this.isAnonymous$
+    return this.isUserAnonymous$
   }
 
   getOrganizations(): Observable<Organization[]> {
@@ -148,6 +157,30 @@ export class Gn4PlatformService implements PlatformServiceInterface {
         ),
         shareReplay(1)
       )
+
     return this.thesauri[uri]
   }
+
+  getUserFeedbacks(uuid: string): Observable<UserFeedback[]> {
+    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),
+      catchError((error) => {
+        console.error('Error posting user feedback:', error)
+        return of(undefined)
+      })
+    )
+  }
 }

package/src/libs/common/domain/src/lib/model/record/index.ts

@@ -1,3 +1,4 @@
 export * from './contact.model'
 export * from './organization.model'
 export * from './metadata.model'
+export * from './user-feedbacks.model'

package/src/libs/common/domain/src/lib/model/record/user-feedbacks.model.ts

@@ -0,0 +1,15 @@
+export interface UserFeedback {
+  uuid: string
+  comment: string
+  metadataUUID: string
+  authorUserId: string
+  authorName: string
+  authorEmail: string
+  published: boolean
+  parentUuid?: string
+  date: Date
+}
+
+export interface UserFeedbackViewModel extends UserFeedback {
+  avatarUrl: string
+}

package/src/libs/common/domain/src/lib/platform.service.interface.ts

@@ -2,6 +2,7 @@ import type { Observable } from 'rxjs'
 import type { UserModel } from './model/user/user.model'
 import type { Organization } from './model/record/organization.model'
 import type { ThesaurusModel } from './model/thesaurus/'
+import { UserFeedback } from './model/record'
 
 export abstract class PlatformServiceInterface {
   abstract getType(): string
@@ -16,4 +17,6 @@ export abstract class PlatformServiceInterface {
   abstract getOrganizations(): Observable<Organization[]>
   abstract translateKey(key: string): Observable<string>
   abstract getThesaurusByUri(uri: string): Observable<ThesaurusModel>
+  abstract getUserFeedbacks(recordUuid: string): Observable<UserFeedback[]>
+  abstract postUserFeedbacks(recordUuid: UserFeedback): Observable<void>
 }

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/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.
@@ -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/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,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-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,
+        }
+      ),
+    },
+  ]
+}