geonetwork-ui 2.4.0-dev.d000fb89 → 2.4.0-dev.d3529f01

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/map/index.ts

@@ -0,0 +1 @@
+export * from './map-context.fixtures'

package/src/libs/common/fixtures/src/lib/map/map-context.fixtures.ts

@@ -0,0 +1,53 @@
+import { polygonFeatureCollectionFixture } from '../geojson.fixtures'
+import { Extent } from 'ol/extent'
+import type {
+  MapContext,
+  MapContextLayer,
+  MapContextView,
+} from '@geospatial-sdk/core'
+
+export const mapCtxLayerXyzFixture = (): MapContextLayer => ({
+  type: 'xyz',
+  url: 'https://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+  attributions: '<a href="https://www.openstreetmap.org/copyright">',
+})
+
+export const mapCtxLayerWmsFixture = (): MapContextLayer => ({
+  type: 'wms',
+  url: 'https://www.geograndest.fr/geoserver/region-grand-est/ows?REQUEST=GetCapabilities&SERVICE=WMS',
+  name: 'commune_actuelle_3857',
+})
+
+export const mapCtxLayerWfsFixture = (): MapContextLayer => ({
+  type: 'wfs',
+  url: 'https://www.geograndest.fr/geoserver/region-grand-est/ows?REQUEST=GetCapabilities&SERVICE=WFS&VERSION=1.1.0',
+  featureType: 'ms:commune_actuelle_3857',
+})
+
+export const mapCtxLayerGeojsonFixture = (): MapContextLayer => ({
+  type: 'geojson',
+  data: polygonFeatureCollectionFixture(),
+})
+
+export const mapCtxLayerGeojsonRemoteFixture = (): MapContextLayer => ({
+  type: 'geojson',
+  url: 'https://my.host.com/data/regions.json',
+})
+
+export const mapCtxViewFixture = (): MapContextView => ({
+  center: [7.75, 48.6],
+  zoom: 9,
+})
+
+export const mapCtxFixture = (): MapContext => ({
+  layers: [
+    mapCtxLayerXyzFixture(),
+    mapCtxLayerWmsFixture(),
+    mapCtxLayerGeojsonFixture(),
+  ],
+  view: mapCtxViewFixture(),
+})
+
+export const mapCtxExtentFixture = (): Extent => [
+  171083.69713494915, 6246047.945419401, 476970.39956295764, 6631079.362882684,
+]

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

@@ -28,6 +28,19 @@ export const barbieUserFixture = (): UserModel =>
       'https://www.gravatar.com/avatar/dbdffd183622800bcf8587328daf43a6?d=mp',
   })
 
+export const johnDoeUserFixture = (): UserModel =>
+  createUserFixture({
+    id: '12345',
+    profile: 'User',
+    username: 'johndoe',
+    name: 'John',
+    surname: 'Doe',
+    email: 'johndoe@email.com',
+    organisation: 'Doe Enterprises',
+    profileIcon:
+      'https://www.gravatar.com/avatar/5f6d74eabcb57186a12f7c8ba40b4c9f?d=mp',
+  })
+
 export const ghostUserFixture = (): UserModel =>
   createUserFixture({
     id: '161',

package/src/libs/feature/catalog/src/lib/feature-catalog.module.ts

@@ -1,6 +1,9 @@
 import { InjectionToken, NgModule } from '@angular/core'
 import { SiteTitleComponent } from './site-title/site-title.component'
-import { UiCatalogModule } from '../../../../../libs/ui/catalog/src'
+import {
+  OrganisationsFilterComponent,
+  UiCatalogModule,
+} from '../../../../../libs/ui/catalog/src'
 import {
   GroupsApiService,
   SearchApiService,
@@ -64,6 +67,7 @@ const organizationsServiceFactory = (
     UtilI18nModule,
     TranslateModule.forChild(),
     UiElementsModule,
+    OrganisationsFilterComponent,
   ],
   exports: [SiteTitleComponent, SourceLabelComponent, OrganisationsComponent],
   providers: [

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/feature-dataviz.module.ts

@@ -1,7 +1,10 @@
 import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { FeatureMapModule } from '../../../../../libs/feature/map/src'
-import { UiMapModule } from '../../../../../libs/ui/map/src'
+import {
+  FeatureDetailComponent,
+  MapContainerComponent,
+} from '../../../../../libs/ui/map/src'
 import { GeoTableViewComponent } from './geo-table-view/geo-table-view.component'
 import { FigureContainerComponent } from './figure/figure-container/figure-container.component'
 import {
@@ -19,7 +22,6 @@ import { UiInputsModule } from '../../../../../libs/ui/inputs/src'
   imports: [
     CommonModule,
     FeatureMapModule,
-    UiMapModule,
     UiDatavizModule,
     TableComponent,
     UiWidgetsModule,
@@ -27,6 +29,8 @@ import { UiInputsModule } from '../../../../../libs/ui/inputs/src'
     ChartComponent,
     UiInputsModule,
     PopupAlertComponent,
+    FeatureDetailComponent,
+    MapContainerComponent,
   ],
   declarations: [
     GeoTableViewComponent,

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

@@ -1,14 +1,17 @@
 <div class="flex flex-row h-full overflow-auto">
   <gn-ui-table
+    #table
     class="w-1/2 overflow-auto"
     [data]="tableData"
     [activeId]="selectionId"
     (selected)="onTableSelect($event)"
   ></gn-ui-table>
-  <gn-ui-map-context
+  <gn-ui-map-container
+    #mapContainer
     class="w-1/2 h-full"
     [context]="mapContext"
-  ></gn-ui-map-context>
+    (featuresClick)="onMapFeatureSelect($event)"
+  ></gn-ui-map-container>
   <gn-ui-feature-detail
     style="width: 300px"
     class="p-3 shrink-0 overflow-auto"