geonetwork-ui 2.4.0-dev.503109c9 → 2.4.0-dev.575f30f2

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

@@ -1,198 +1,239 @@
-import { DatasetDistribution } from '../../../../../libs/common/domain/src/lib/model/record'
+import {
+  DatasetDownloadDistribution,
+  DatasetServiceDistribution,
+  OnlineLinkResource,
+  ServiceEndpoint,
+} from '../../../../../libs/common/domain/src/lib/model/record'
 
-export const someDataLinksFixture = (): DatasetDistribution[] => [
+export const someDataLinksFixture = () => [
   aSetOfLinksFixture().dataXls(),
   {
     description: 'CSV file',
     name: 'some_file_name.csv',
     url: new URL('https://test.org/some_file_name.csv'),
     type: 'download',
-  },
+  } as DatasetDownloadDistribution,
 ]
 
-export const someGeoDatalinksFixture = (): DatasetDistribution[] => [
+export const someGeoDatalinksFixture = () => [
   {
     description: 'Geojson file',
     name: 'some_file_name.geojson',
     url: new URL('https://test.org/some_file_name.geojson'),
     type: 'download',
-  },
+  } as DatasetDownloadDistribution,
   {
     description: 'Service WFS',
     name: 'abc:featureType',
     url: new URL('https://test.org/wfs'),
     type: 'service',
     accessServiceProtocol: 'wfs',
-  },
+  } as DatasetServiceDistribution,
 ]
 
-export const aSetOfLinksFixture = (): Record<
-  string,
-  () => DatasetDistribution
-> => ({
-  readmeLink: () => ({
-    description: 'Readme page',
-    type: 'link',
-    url: new URL('http://envlit.ifremer.fr/resultats/quadrige'),
-  }),
-  doiLink: () => ({
-    description: 'DOI for the resource',
-    type: 'link',
-    url: new URL('http://doi.org/123-456-678'),
-  }),
-  dataCsv: () => ({
-    name: 'abc.csv',
-    description: 'Data in CSV format',
-    type: 'download',
-    url: new URL('http://my.server/files/abc.csv'),
-  }),
-  dataPdf: () => ({
-    name: 'abc.pdf',
-    description: 'Data in PDF format',
-    type: 'download',
-    url: new URL('https://my.server/files/abc.pdf'),
-  }),
-  dataJpg: () => ({
-    name: 'abc.jpg',
-    description: 'Data in JPG format',
-    type: 'download',
-    url: new URL('https://my.server/files/abc.jpg'),
-  }),
-  dataZip: () => ({
-    name: 'abc.zip',
-    description: 'Data in ZIP format',
-    type: 'download',
-    url: new URL('https://my.server/files/abc.zip'),
-  }),
-  dataXls: () => ({
-    name: 'abc.xls',
-    description: 'Data in XLS format',
-    type: 'download',
-    url: new URL('https://my.server/files/abc.xls'),
-  }),
-  dataXlsx: () => ({
-    name: 'abc.XLSX',
-    description: 'Data in XLSX format',
-    type: 'download',
-    url: new URL('https://my.server/files/abc.XLSX'),
-  }),
-  dataJson: () => ({
-    name: 'abc.json',
-    description: 'Data in JSON format',
-    type: 'download',
-    url: new URL('https://my.server/files/abc.json'),
-  }),
-  geodataJson: () => ({
-    name: 'dataset.geojson',
-    description: 'Geographic data in GeoJSON format',
-    type: 'download',
-    url: new URL('http://my.server/files/geographic/dataset.geojson'),
-  }),
-  geodataJsonWithMimeType: () => ({
-    name: 'dataset.geojson',
-    description: 'Geographic data in GeoJSON format',
-    type: 'download',
-    url: new URL('http://my.server/files/geographic/dataset'),
-    mimeType: 'application/vnd.geo+json',
-  }),
-  geodataKml: () => ({
-    name: 'dataset.kml',
-    description: 'Geographic data in KML format',
-    type: 'download',
-    url: new URL('http://my.server/files/geographic/dataset.kml'),
-  }),
-  geodataGpkg: () => ({
-    name: 'dataset.gpkg',
-    description: 'Geographic data in geopackage format',
-    type: 'download',
-    url: new URL('http://my.server/files/geographic/dataset.gpkg'),
-  }),
-  geodataShp: () => ({
-    name: 'dataset.shp',
-    description: 'Geographic data in shapefile format',
-    type: 'download',
-    url: new URL('http://my.server/files/geographic/dataset.zip'),
-  }),
-  geodataShpWithMimeType: () => ({
-    name: 'dataset',
-    description: 'Geographic data in shapefile format',
-    type: 'download',
-    url: new URL('http://my.server/files/geographic/dataset.zip'),
-    mimeType: 'x-gis/x-shapefile',
-  }),
-  geodataWms: () => ({
-    name: 'mylayer',
-    type: 'service',
-    url: new URL('https://my.ogc.server/wms'),
-    accessServiceProtocol: 'wms',
-  }),
-  geodataWmts: () => ({
-    name: 'mylayer',
-    type: 'service',
-    url: new URL('https://my.ogc.server/wmts'),
-    accessServiceProtocol: 'wmts',
-  }),
-  geodataWfs: () => ({
-    name: 'mylayer',
-    type: 'service',
-    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',
-    url: new URL('https://my.ogc.server/wms'),
-    accessServiceProtocol: 'wms',
-  }),
-  geodataWfs2: () => ({
-    name: 'myotherlayer',
-    type: 'service',
-    url: new URL('https://my.ogc.server/wfs'),
-    accessServiceProtocol: 'wfs',
-  }),
-  geodataRest: () => ({
-    name: 'myrestlayer',
-    type: 'service',
-    url: new URL('https://my.esri.server/FeatureServer'),
-    accessServiceProtocol: 'esriRest',
-  }),
-  geodataRestWfs: () => ({
-    name: 'mywfsrestlayer',
-    type: 'service',
-    url: new URL('https://my.esri.server/WFSServer'),
-    accessServiceProtocol: 'wfs',
-  }),
-  maplayerRest: () => ({
-    name: 'myotherrestlayer',
-    type: 'link',
-    url: new URL('https://my.esri.server/MapServer'),
-  }),
-  landingPage: () => ({
-    name: 'landingpage link',
-    type: 'link',
-    url: new URL('https://landing.page'),
-  }),
-  unknownFormat: () => ({
-    name: 'Vue HTML des métadonnées sur internet',
-    type: 'download',
-    url: new URL(
-      'http://catalogue.geo-ide.developpement-durable.gouv.fr/catalogue/srv/fre/catalog.search#/metadata/fr-120066022-jdd-199fd14c-2abb-4c14-b0f8-6c8d92e7b480'
-    ),
-  }),
-  ogcApiFormat: () => ({
-    name: 'ogc api features layer',
-    type: 'service',
-    url: new URL(
-      'https://mel.integration.apps.gs-fr-prod.camptocamp.com/data/ogcapi/collections/comptages_velo/items?'
-    ),
-    accessServiceProtocol: 'ogcFeatures',
-  }),
+export const aSetOfLinksFixture = () => ({
+  readmeLink: () =>
+    ({
+      description: 'Readme page',
+      type: 'link',
+      url: new URL('http://envlit.ifremer.fr/resultats/quadrige'),
+    } as OnlineLinkResource),
+  doiLink: () =>
+    ({
+      description: 'DOI for the resource',
+      type: 'link',
+      url: new URL('http://doi.org/123-456-678'),
+    } as OnlineLinkResource),
+  dataCsv: () =>
+    ({
+      name: 'abc.csv',
+      description: 'Data in CSV format',
+      type: 'download',
+      sizeBytes: 1234567890,
+      url: new URL('http://my.server/files/abc.csv'),
+    } as DatasetDownloadDistribution),
+  dataPdf: () =>
+    ({
+      name: 'abc.pdf',
+      description: 'Data in PDF format',
+      type: 'download',
+      url: new URL('https://my.server/files/abc.pdf'),
+    } as DatasetDownloadDistribution),
+  dataJpg: () =>
+    ({
+      name: 'abc.jpg',
+      description: 'Data in JPG format',
+      type: 'download',
+      url: new URL('https://my.server/files/abc.jpg'),
+    } as DatasetDownloadDistribution),
+  dataZip: () =>
+    ({
+      name: 'abc.zip',
+      description: 'Data in ZIP format',
+      type: 'download',
+      url: new URL('https://my.server/files/abc.zip'),
+    } as DatasetDownloadDistribution),
+  dataXls: () =>
+    ({
+      name: 'abc.xls',
+      description: 'Data in XLS format',
+      type: 'download',
+      url: new URL('https://my.server/files/abc.xls'),
+    } as DatasetDownloadDistribution),
+  dataXlsx: () =>
+    ({
+      name: 'abc.XLSX',
+      description: 'Data in XLSX format',
+      type: 'download',
+      url: new URL('https://my.server/files/abc.XLSX'),
+    } as DatasetDownloadDistribution),
+  dataJson: () =>
+    ({
+      name: 'abc.json',
+      description: 'Data in JSON format',
+      type: 'download',
+      url: new URL('https://my.server/files/abc.json'),
+    } as DatasetDownloadDistribution),
+  geodataJson: () =>
+    ({
+      name: 'dataset.geojson',
+      description: 'Geographic data in GeoJSON format',
+      type: 'download',
+      url: new URL('http://my.server/files/geographic/dataset.geojson'),
+    } as DatasetDownloadDistribution),
+  geodataJsonWithMimeType: () =>
+    ({
+      name: 'dataset.geojson',
+      description: 'Geographic data in GeoJSON format',
+      type: 'download',
+      url: new URL('http://my.server/files/geographic/dataset'),
+      mimeType: 'application/vnd.geo+json',
+    } as DatasetDownloadDistribution),
+  geodataKml: () =>
+    ({
+      name: 'dataset.kml',
+      description: 'Geographic data in KML format',
+      type: 'download',
+      url: new URL('http://my.server/files/geographic/dataset.kml'),
+    } as DatasetDownloadDistribution),
+  geodataGpkg: () =>
+    ({
+      name: 'dataset.gpkg',
+      description: 'Geographic data in geopackage format',
+      type: 'download',
+      url: new URL('http://my.server/files/geographic/dataset.gpkg'),
+    } as DatasetDownloadDistribution),
+  geodataShp: () =>
+    ({
+      name: 'dataset.shp',
+      description: 'Geographic data in shapefile format',
+      type: 'download',
+      url: new URL('http://my.server/files/geographic/dataset.zip'),
+    } as DatasetDownloadDistribution),
+  geodataShpWithMimeType: () =>
+    ({
+      name: 'dataset',
+      description: 'Geographic data in shapefile format',
+      type: 'download',
+      url: new URL('http://my.server/files/geographic/dataset.zip'),
+      mimeType: 'x-gis/x-shapefile',
+    } as DatasetDownloadDistribution),
+  geodataWms: () =>
+    ({
+      name: 'mylayer',
+      identifierInService: 'mylayer',
+      type: 'service',
+      url: new URL('https://my.ogc.server/wms'),
+      accessServiceProtocol: 'wms',
+    } as DatasetServiceDistribution),
+  geodataWmts: () =>
+    ({
+      name: 'mylayer',
+      type: 'service',
+      url: new URL('https://my.ogc.server/wmts'),
+      accessServiceProtocol: 'wmts',
+    } as DatasetServiceDistribution),
+  geodataWfs: () =>
+    ({
+      name: 'mylayer',
+      type: 'service',
+      url: new URL('https://my.ogc.server/wfs'),
+      accessServiceProtocol: 'wfs',
+    } as DatasetServiceDistribution),
+  geodataWfsDownload: () =>
+    ({
+      name: 'mylayer',
+      type: 'download',
+      url: new URL(
+        'https://my.ogc.server/wfs?GetFeature&FeatureType=surval_parametre_ligne&format=csv'
+      ),
+      accessServiceProtocol: 'wfs',
+    } as DatasetDownloadDistribution),
+  geodataWms2: () =>
+    ({
+      name: 'myotherlayer',
+      type: 'service',
+      url: new URL('https://my.ogc.server/wms'),
+      accessServiceProtocol: 'wms',
+    } as DatasetServiceDistribution),
+  geodataWfs2: () =>
+    ({
+      name: 'myotherlayer',
+      type: 'service',
+      url: new URL('https://my.ogc.server/wfs'),
+      accessServiceProtocol: 'wfs',
+    } as DatasetServiceDistribution),
+  geodataRest: () =>
+    ({
+      name: 'myrestlayer',
+      type: 'service',
+      url: new URL('https://my.esri.server/FeatureServer'),
+      accessServiceProtocol: 'esriRest',
+    } as DatasetServiceDistribution),
+  geodataRestWfs: () =>
+    ({
+      name: 'mywfsrestlayer',
+      type: 'service',
+      url: new URL('https://my.esri.server/WFSServer'),
+      accessServiceProtocol: 'wfs',
+    } as DatasetServiceDistribution),
+  maplayerRest: () =>
+    ({
+      name: 'myotherrestlayer',
+      type: 'link',
+      url: new URL('https://my.esri.server/MapServer'),
+    } as OnlineLinkResource),
+  landingPage: () =>
+    ({
+      name: 'landingpage link',
+      type: 'link',
+      url: new URL('https://landing.page'),
+    } as OnlineLinkResource),
+  unknownFormat: () =>
+    ({
+      name: 'Vue HTML des métadonnées sur internet',
+      type: 'download',
+      url: new URL(
+        'http://catalogue.geo-ide.developpement-durable.gouv.fr/catalogue/srv/fre/catalog.search#/metadata/fr-120066022-jdd-199fd14c-2abb-4c14-b0f8-6c8d92e7b480'
+      ),
+    } as DatasetDownloadDistribution),
+  ogcApiFormat: () =>
+    ({
+      name: 'ogc api features layer',
+      type: 'service',
+      url: new URL(
+        'https://mel.integration.apps.gs-fr-prod.camptocamp.com/data/ogcapi/collections/comptages_velo/items?'
+      ),
+      accessServiceProtocol: 'ogcFeatures',
+    } as DatasetServiceDistribution),
+  wmsEndpoint: () =>
+    ({
+      description:
+        'https://services.geo.sg.ch/wss/service/SG00170_WMS/guest?request=GetCapabilities&service=WMS',
+      endpointUrl: new URL(
+        'https://services.geo.sg.ch/wss/service/SG00170_WMS/guest?request=GetCapabilities&service=WMS'
+      ),
+      protocol: 'wms',
+      type: 'endpoint',
+    } as ServiceEndpoint),
 })

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

@@ -87,7 +87,7 @@ Cette section contient des *caractères internationaux* (ainsi que des "caractè
     ],
     topics: ['testData', 'exampleData'],
     spatialRepresentation: 'grid',
-    distributions: [
+    onlineResources: [
       {
         type: 'download',
         url: new URL('http://my-org.net/download/1.zip'),
@@ -222,7 +222,7 @@ Malgré l'attention portée à la création de ces données, il est rappelé que
     ],
     topics: ['Usage des sols', "document d'urbanisme"],
     spatialRepresentation: 'vector',
-    distributions: [
+    onlineResources: [
       {
         type: 'download',
         url: new URL(
@@ -293,7 +293,7 @@ export const simpleDatasetRecordFixture = (): DatasetRecord => ({
   overviews: [],
   spatialExtents: [],
   temporalExtents: [],
-  distributions: [
+  onlineResources: [
     {
       type: 'download',
       url: new URL('http://my-org.net/download/1.zip'),

package/src/libs/feature/dataviz/src/lib/chart-view/chart-view.component.ts

@@ -25,7 +25,7 @@ import {
 } from 'rxjs/operators'
 import { DataService } from '../service/data.service'
 import { InputChartType } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
-import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { TranslateService } from '@ngx-translate/core'
 
 marker('chart.type.bar')
@@ -47,10 +47,10 @@ marker('chart.aggregation.count')
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ChartViewComponent {
-  @Input() set link(value: DatasetDistribution) {
+  @Input() set link(value: DatasetOnlineResource) {
     this.currentLink$.next(value)
   }
-  private currentLink$ = new BehaviorSubject<DatasetDistribution>(null)
+  private currentLink$ = new BehaviorSubject<DatasetOnlineResource>(null)
 
   @Input() set aggregation(value: FieldAggregation[0]) {
     this.aggregation$.next(value)

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

@@ -24,7 +24,7 @@ import type { FeatureCollection } from 'geojson'
 import { from, Observable, throwError } from 'rxjs'
 import { catchError, map, switchMap, tap } from 'rxjs/operators'
 import {
-  DatasetDistribution,
+  DatasetOnlineResource,
   DatasetServiceDistribution,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 
@@ -135,7 +135,7 @@ export class DataService {
 
   getDownloadLinksFromWfs(
     wfsLink: DatasetServiceDistribution
-  ): Observable<DatasetDistribution[]> {
+  ): Observable<DatasetOnlineResource[]> {
     // Pour DL toutes les données
     return this.getDownloadUrlsFromWfs(
       wfsLink.url.toString(),
@@ -157,7 +157,7 @@ export class DataService {
 
   async getDownloadLinksFromOgcApiFeatures(
     ogcApiLink: DatasetServiceDistribution
-  ): Promise<DatasetDistribution[]> {
+  ): Promise<DatasetOnlineResource[]> {
     const collectionInfo = await this.getDownloadUrlsFromOgcApi(
       ogcApiLink.url.href
     )
@@ -199,7 +199,7 @@ export class DataService {
 
   getDownloadLinksFromEsriRest(
     esriRestLink: DatasetServiceDistribution
-  ): DatasetDistribution[] {
+  ): DatasetOnlineResource[] {
     return ['json', 'geojson'].map((format) => ({
       ...esriRestLink,
       url: new URL(
@@ -209,7 +209,7 @@ export class DataService {
     }))
   }
 
-  readAsGeoJson(link: DatasetDistribution): Observable<FeatureCollection> {
+  readAsGeoJson(link: DatasetOnlineResource): Observable<FeatureCollection> {
     return this.getDataset(link).pipe(
       switchMap((dataset) => dataset.selectAll().read()),
       map((features) => ({
@@ -219,7 +219,7 @@ export class DataService {
     )
   }
 
-  getDataset(link: DatasetDistribution): Observable<BaseReader> {
+  getDataset(link: DatasetOnlineResource): Observable<BaseReader> {
     if (link.type === 'service' && link.accessServiceProtocol === 'wfs') {
       return this.getDownloadUrlsFromWfs(link.url.toString(), link.name).pipe(
         switchMap((urls) => {

package/src/libs/feature/dataviz/src/lib/table-view/table-view.component.ts

@@ -11,7 +11,7 @@ import {
 import { DataItem, FetchError } from '../../../../../../libs/util/data-fetcher/src'
 import { DataService } from '../service/data.service'
 import { TableItemModel } from '../../../../../../libs/ui/dataviz/src'
-import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { TranslateService } from '@ngx-translate/core'
 
 @Component({
@@ -21,10 +21,10 @@ import { TranslateService } from '@ngx-translate/core'
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class TableViewComponent {
-  @Input() set link(value: DatasetDistribution) {
+  @Input() set link(value: DatasetOnlineResource) {
     this.currentLink$.next(value)
   }
-  private currentLink$ = new BehaviorSubject<DatasetDistribution>(null)
+  private currentLink$ = new BehaviorSubject<DatasetOnlineResource>(null)
 
   loading = false
   error = null
@@ -59,7 +59,7 @@ export class TableViewComponent {
     private translateService: TranslateService
   ) {}
 
-  fetchData(link: DatasetDistribution): Observable<DataItem[]> {
+  fetchData(link: DatasetOnlineResource): Observable<DataItem[]> {
     return this.dataService
       .getDataset(link)
       .pipe(switchMap((dataset) => dataset.read()))

package/src/libs/feature/editor/src/index.ts

@@ -5,6 +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/components/import-record/import-record.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'

package/src/libs/feature/editor/src/lib/components/contact-card/contact-card.component.html

@@ -1,27 +1,15 @@
-<div class="flex flex-row gap-4 items-center">
-  <div class="flex flex-row border border-gray-200 rounded-xl p-4 gap-4 w-full">
-    <gn-ui-thumbnail
-      class="w-[56px] h-[56px] rounded-[4px]"
-      [thumbnailUrl]="contact.organization.logoUrl?.href"
-      [fit]="'contain'"
-    ></gn-ui-thumbnail>
-    <div class="flex flex-col w-full">
-      <div class="flex flex-row justify-between">
-        <span
-          class="flex flex-wrap font-bold w-full"
-          data-test="contactCardName"
-          >{{ contact.firstName }} {{ contact.lastName }}</span
-        >
-      </div>
-      <div data-test="contactCardEmail">{{ contact.email }}</div>
+<div class="gn-ui-card">
+  <gn-ui-thumbnail
+    class="w-[56px] h-[56px] rounded-[4px] overflow-hidden shrink-0"
+    [thumbnailUrl]="contact.organization.logoUrl?.href"
+    [fit]="'contain'"
+  ></gn-ui-thumbnail>
+  <div class="flex flex-col w-full overflow-hidden leading-snug">
+    <div class="text-[16px] font-bold text-main" data-test="contactCardName">
+      {{ contact.firstName }} {{ contact.lastName }}
+    </div>
+    <div class="text-[14px] text-gray-900" data-test="contactCardEmail">
+      {{ contact.email }}
     </div>
   </div>
-  <gn-ui-button
-    *ngIf="removable"
-    data-test="removeContactButton"
-    type="light"
-    extraClass="w-[20px] h-[20px] flex items-center justify-center"
-    (buttonClick)="removeContact(contact)"
-    ><span class="material-symbols-outlined"> close </span>
-  </gn-ui-button>
 </div>

package/src/libs/feature/editor/src/lib/components/contact-card/contact-card.component.ts

@@ -1,10 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  Component,
-  EventEmitter,
-  Input,
-  Output,
-} from '@angular/core'
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { Individual } from '../../../../../../../libs/common/domain/src/lib/model/record'
 import { MatIconModule } from '@angular/material/icon'
 import { CommonModule } from '@angular/common'
@@ -21,10 +15,4 @@ import { ThumbnailComponent } from '../../../../../../../libs/ui/elements/src'
 })
 export class ContactCardComponent {
   @Input() contact: Individual
-  @Input() removable = true
-  @Output() contactRemoved = new EventEmitter<Individual>()
-
-  removeContact(contact: Individual) {
-    this.contactRemoved.emit(contact)
-  }
 }

package/src/libs/feature/editor/src/lib/components/generic-keywords/generic-keywords.component.ts

@@ -41,6 +41,7 @@ export class GenericKeywordsComponent {
   @Input() keywords: Keyword[]
   @Input() keywordTypes: KeywordType[]
   @Input() placeholder: string
+  @Input() allowSubmit: boolean
   @Output() changedKeywords: EventEmitter<Keyword[]> = new EventEmitter()
   @Output() addedKeyword: EventEmitter<Keyword> = new EventEmitter()
   @Output() deletedKeyword: EventEmitter<Keyword> = new EventEmitter()