geonetwork-ui 2.4.0-dev.e97caaf2 → 2.4.0-dev.f5019723

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

@@ -1,7 +1,6 @@
 import { DatasetRecord } from '../../../../../libs/common/domain/src/lib/model/record'
-import { deepFreeze } from './utils'
 
-export const DATASET_RECORDS: DatasetRecord[] = deepFreeze([
+export const datasetRecordsFixture = () => [
   {
     uniqueIdentifier: 'my-dataset-001',
     kind: 'dataset',
@@ -88,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'),
@@ -223,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(
@@ -259,9 +258,9 @@ Ce lot de données produit en 2019, a été numérisé à partir du PCI Vecteur
     updateFrequency: 'unknown',
     languages: ['fr', 'de'],
   },
-])
+]
 
-export const DATASET_RECORD_SIMPLE: DatasetRecord = {
+export const simpleDatasetRecordFixture = (): DatasetRecord => ({
   uniqueIdentifier: 'my-dataset-001',
   kind: 'dataset',
   languages: [],
@@ -294,7 +293,7 @@ export const DATASET_RECORD_SIMPLE: DatasetRecord = {
   overviews: [],
   spatialExtents: [],
   temporalExtents: [],
-  distributions: [
+  onlineResources: [
     {
       type: 'download',
       url: new URL('http://my-org.net/download/1.zip'),
@@ -304,9 +303,10 @@ export const DATASET_RECORD_SIMPLE: DatasetRecord = {
     },
   ],
   updateFrequency: { per: 'month', updatedTimes: 3 },
-}
+})
 
-export const DATASET_RECORD_SIMPLE_AS_XML = `<?xml version="1.0" encoding="UTF-8"?>
+export const simpleDatasetRecordAsXmlFixture =
+  (): string => `<?xml version="1.0" encoding="UTF-8"?>
 <mdb:MD_Metadata xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/2.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/2.0" xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0" xmlns:mco="http://standards.iso.org/iso/19115/-3/mco/1.0" xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:mmi="http://standards.iso.org/iso/19115/-3/mmi/1.0" xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0" xmlns:mrl="http://standards.iso.org/iso/19115/-3/mrl/2.0">
     <mdb:metadataIdentifier>
         <mcc:MD_Identifier>

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

@@ -1,8 +1,8 @@
-import { deepFreeze } from './utils/freeze'
 import { SearchResults } from '../../../../../libs/common/domain/src/lib/model/search'
-import { DATASET_RECORDS } from './records.fixtures'
+import { datasetRecordsFixture } from './records.fixtures'
+import { CatalogRecord } from '../../../../../libs/common/domain/src/lib/model/record'
 
-export const SAMPLE_SEARCH_RESULTS: SearchResults = deepFreeze({
+export const searchResultsFixture = (): SearchResults => ({
   count: 123,
-  records: DATASET_RECORDS,
+  records: datasetRecordsFixture() as CatalogRecord[],
 })

package/src/libs/common/fixtures/src/lib/search/aggregations.ts

@@ -1,4 +1,3 @@
-import { deepFreeze } from '../utils/freeze'
 import {
   AggregationParams,
   Aggregations,
@@ -30,13 +29,13 @@ export const FILTERS_AGGREGATION: AggregationParams = {
     },
   },
 }
-export const SAMPLE_AGGREGATIONS_PARAMS: AggregationsParams = deepFreeze({
+export const SAMPLE_AGGREGATIONS_PARAMS = (): AggregationsParams => ({
   myField: TERMS_AGGREGATION,
   myValueField: HISTOGRAM_AGGREGATION,
   myFilters: FILTERS_AGGREGATION,
 })
 
-export const SAMPLE_AGGREGATIONS_RESULTS: Aggregations = deepFreeze({
+export const SAMPLE_AGGREGATIONS_RESULTS = (): Aggregations => ({
   myField: {
     buckets: [
       { term: 'Hungary', count: 20 },

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

@@ -1,7 +1,18 @@
 import { UserFeedback } from '../../../../../libs/common/domain/src/lib/model/record'
-import { deepFreeze } from './utils'
 
-export const SOME_USER_FEEDBACKS: UserFeedback[] = deepFreeze([
+export const userFeedbackFixture = (): UserFeedback => ({
+  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'),
+})
+
+export const someUserFeedbacksFixture = (): UserFeedback[] => [
   {
     uuid: '4ad03fb7-1728-424c-bdaa-aedd531b07a8',
     comment: 'A nice comment.',
@@ -68,16 +79,4 @@ export const SOME_USER_FEEDBACKS: UserFeedback[] = deepFreeze([
     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/common/fixtures/src/lib/user.fixtures.ts

@@ -1,6 +1,8 @@
 import { UserModel } from '../../../../../libs/common/domain/src/lib/model/user/user.model'
 
-export const USER_FIXTURE = (): UserModel => ({
+export const createUserFixture = (
+  overrides: Partial<UserModel> = {}
+): UserModel => ({
   id: '46798',
   profile: 'Administrator',
   username: 'Gravin',
@@ -10,23 +12,51 @@ export const USER_FIXTURE = (): UserModel => ({
   organisation: 'Région Hauts-de-France',
   profileIcon:
     'https://www.gravatar.com/avatar/dbdffd183622800bcf8587328daf43a6?d=mp',
+  ...overrides,
 })
 
-export const USER_FIXTURE_ANON = (): UserModel => ({
-  id: '161',
-  profile: 'Administrator',
-  username: 'ghost16',
-  name: 'Ghost',
-  surname: 'Old',
-  email: 'old.ghost@wiz.fr',
-  organisation: 'wizard-org',
-  profileIcon:
-    'https://www.gravatar.com/avatar/dbdffd183622800bcf8587328daf43a6?d=mp',
-})
+export const barbieUserFixture = (): UserModel =>
+  createUserFixture({
+    id: '46798',
+    profile: 'Administrator',
+    username: 'barbie',
+    name: 'Barbara',
+    surname: 'Roberts',
+    email: 'barbie@email.org',
+    organisation: 'Barbie Inc.',
+    profileIcon:
+      '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',
+    profile: 'Administrator',
+    username: 'ghost',
+    name: 'Ghost',
+    surname: 'Old',
+    email: 'old.ghost@wiz.fr',
+    organisation: 'wizard-org',
+    profileIcon:
+      'https://www.gravatar.com/avatar/dbdffd183622800bcf8587328daf43a6?d=mp',
+  })
 
-export const USERS_FIXTURE = (): UserModel[] => [
-  USER_FIXTURE(),
-  USER_FIXTURE_ANON(),
+export const someUsersFixture = (): UserModel[] => [
+  barbieUserFixture(),
+  ghostUserFixture(),
   {
     id: '1',
     profile: 'Editor',

package/src/libs/data-access/gn4/src/fixtures/site.fixtures.ts

@@ -1,12 +1,12 @@
-export const SITE_FIXTURES = {
+export const siteFixture = () => ({
   'system/platform/subVersion': 'alpha.2',
   'system/platform/version': '4.0.0',
   'system/site/name': 'GeoNetwork 4',
   'system/site/organization': 'titellus',
   'system/site/siteId': '04fe602b-fc46-4e6b-ac5a-138c6153eceb',
-}
+})
 
-export const SETTINGS_FIXTURES = {
+export const settingsFixture = () => ({
   'system/site/name': 'GeoNetwork 4',
   'system/site/siteId': '04fe602b-fc46-4e6b-ac5a-138c6153eceb',
   'system/site/organization': 'titellus',
@@ -62,4 +62,4 @@ export const SETTINGS_FIXTURES = {
   'system/publication/doi/doilandingpagetemplate':
     'http://localhost:8080/geonetwork/srv/resources/records/{{uuid}}',
   'system/feedback/mailServer/hostIsDefined': false,
-}
+})

package/src/libs/data-access/gn4/src/fixtures/ui.fixtures.ts

@@ -1,5 +1,5 @@
-export const UI_FIXTURES = {
+export const uiFixture = () => ({
   id: 'srv',
   configuration:
     '{"langDetector":{"fromHtmlTag":false,"regexp":"^(?:/.+)?/.+/([a-z]{2,3})/.+","default":"eng"},"nodeDetector":{"regexp":"^(?:/.+)?/(.+)/[a-z]{2,3}/.+","default":"srv"},"serviceDetector":{"regexp":"^(?:/.+)?/.+/[a-z]{2,3}/(.+)","default":"catalog.search"},"baseURLDetector":{"regexp":"^((?:/.+)?)+/.+/[a-z]{2,3}/.+","default":"/geonetwork"},"mods":{"global":{"humanizeDates":true},"footer":{"enabled":true,"showSocialBarInFooter":true},"header":{"enabled":true,"languages":{"eng":"en","dut":"nl","fre":"fr","ger":"de","kor":"ko","spa":"es","cze":"cs","cat":"ca","fin":"fi","ice":"is","ita":"it","por":"pt","rus":"ru","chi":"zh","slo":"sk"},"isLogoInHeader":false,"logoInHeaderPosition":"left","fluidHeaderLayout":true,"showGNName":true,"isHeaderFixed":false},"cookieWarning":{"enabled":true,"cookieWarningMoreInfoLink":"","cookieWarningRejectLink":""},"home":{"enabled":true,"appUrl":"../../{{node}}/{{lang}}/catalog.search#/home","showSocialBarInFooter":true,"fluidLayout":true,"facetConfig":{"inspireThemeUri":{"terms":{"field":"inspireThemeUri","size":34}},"topic_text":{"terms":{"field":"topic_text","size":20}},"codelist_hierarchyLevel_text":{"terms":{"field":"codelist_hierarchyLevel_text","size":10}}}},"search":{"enabled":true,"appUrl":"../../{{node}}/{{lang}}/catalog.search#/search","hitsperpageValues":[30,60,120],"paginationInfo":{"hitsPerPage":30},"queryBase":"${any} resourceTitleObject.default:(${any})^2","scoreConfig":{"boost":"5","functions":[{"filter":{"exists":{"field":"parentUuid"}},"weight":0.3},{"filter":{"match":{"codelist_status":"obsolete"}},"weight":0.3},{"gauss":{"dateStamp":{"scale":"365d","offset":"90d","decay":0.5}}}],"score_mode":"multiply"},"autocompleteConfig":{"query":{"bool":{"must":[{"multi_match":{"query":"","type":"bool_prefix","fields":["resourceTitleObject.*","resourceAbstractObject.*","tag","resourceIdentifier"]}}]}},"_source":["resourceTitleObject"],"from":0,"size":20},"moreLikeThisConfig":{"more_like_this":{"fields":["resourceTitleObject.default","resourceAbstractObject.default","tag.raw"],"like":null,"min_term_freq":1,"max_query_terms":12}},"facetTabField":"","facetConfig":{"codelist_hierarchyLevel_text":{"terms":{"field":"codelist_hierarchyLevel_text"},"aggs":{"format":{"terms":{"field":"format"}}}},"codelist_spatialRepresentationType":{"terms":{"field":"codelist_spatialRepresentationType","size":10}},"availableInServices":{"filters":{"filters":{"availableInViewService":{"query_string":{"query":"+linkProtocol:/OGC:WMS.*/"}},"availableInDownloadService":{"query_string":{"query":"+linkProtocol:/OGC:WFS.*/"}}}}},"thesaurus_geonetworkthesaurusexternalthemegemet_tree":{"terms":{"field":"thesaurus_geonetworkthesaurusexternalthemegemet_tree","size":100,"order":{"_key":"asc"},"include":"[^/]+/?[^/]+"}},"tag":{"terms":{"field":"tag","include":".*","size":10}},"thesaurus_geonetworkthesaurusexternalplaceregions_tree":{"terms":{"field":"thesaurus_geonetworkthesaurusexternalplaceregions_tree","size":100,"order":{"_key":"asc"}}},"resolutionScaleDenominator":{"collapsed":true,"terms":{"field":"resolutionScaleDenominator","size":10,"order":{"_key":"asc"}}},"creationYearForResource":{"collapsed":true,"terms":{"field":"creationYearForResource","size":10,"order":{"_key":"desc"}}},"OrgForResource":{"terms":{"field":"OrgForResource","size":15}},"codelist_maintenanceAndUpdateFrequency_text":{"collapsed":true,"terms":{"field":"codelist_maintenanceAndUpdateFrequency_text","size":10}},"codelist_status_text":{"terms":{"field":"codelist_status_text","size":10}},"dateStamp":{"userHasRole":"isReviewerOrMore","auto_date_histogram":{"field":"dateStamp","buckets":50}}},"filters":null,"sortbyValues":[{"sortBy":"relevance","sortOrder":""},{"sortBy":"dateStamp","sortOrder":"desc"},{"sortBy":"createDate","sortOrder":"desc"},{"sortBy":"resourceTitleObject.default.keyword","sortOrder":""},{"sortBy":"rating","sortOrder":"desc"},{"sortBy":"popularity","sortOrder":"desc"}],"sortBy":"relevance","resultViewTpls":[{"tplUrl":"../../catalog/components/search/resultsview/partials/viewtemplates/grid.html","tooltip":"Grid","icon":"fa-th"},{"tplUrl":"../../catalog/components/search/resultsview/partials/viewtemplates/list.html","tooltip":"List","icon":"fa-bars"}],"resultTemplate":"../../catalog/components/search/resultsview/partials/viewtemplates/grid.html","formatter":{"list":[{"label":"defaultView","url":""},{"label":"full","url":"/formatters/xsl-view?root=div&view=advanced"}],"defaultUrl":""},"downloadFormatter":[{"label":"exportMEF","url":"/formatters/zip?withRelated=false","class":"fa-file-zip-o"},{"label":"exportPDF","url":"/formatters/xsl-view?output=pdf&language=${lang}","class":"fa-file-pdf-o"},{"label":"exportXML","url":"/formatters/xml","class":"fa-file-code-o"}],"grid":{"related":["parent","children","services","datasets"]},"linkTypes":{"links":["LINK","kml"],"downloads":["DOWNLOAD"],"layers":["OGC","ESRI:REST"],"maps":["ows"]},"isFilterTagsDisplayedInSearch":true,"usersearches":{"enabled":false,"displayFeaturedSearchesPanel":false},"savedSelection":{"enabled":false}},"map":{"enabled":true,"appUrl":"../../{{node}}/{{lang}}/catalog.search#/map","externalViewer":{"enabled":false,"enabledViewAction":false,"baseUrl":"http://www.example.com/viewer","urlTemplate":"http://www.example.com/viewer?url=${service.url}&type=${service.type}&layer=${service.title}&lang=${iso2lang}&title=${md.defaultTitle}","openNewWindow":false,"valuesSeparator":","},"is3DModeAllowed":false,"isSaveMapInCatalogAllowed":true,"isExportMapAsImageEnabled":false,"storage":"sessionStorage","bingKey":"","listOfServices":{"wms":[],"wmts":[]},"projection":"EPSG:3857","projectionList":[{"code":"urn:ogc:def:crs:EPSG:6.6:4326","label":"WGS84 (EPSG:4326)"},{"code":"EPSG:3857","label":"Google mercator (EPSG:3857)"}],"switcherProjectionList":[{"code":"EPSG:3857","label":"Google mercator (EPSG:3857)"}],"disabledTools":{"processes":false,"addLayers":false,"projectionSwitcher":false,"layers":false,"legend":false,"filter":false,"contexts":false,"print":false,"mInteraction":false,"graticule":false,"mousePosition":true,"syncAllLayers":false,"drawVector":false},"graticuleOgcService":{},"map-viewer":{"context":"../../map/config-viewer.xml","extent":[0,0,0,0],"layers":[]},"map-search":{"context":"../../map/config-viewer.xml","extent":[0,0,0,0],"layers":[]},"map-editor":{"context":"","extent":[0,0,0,0],"layers":[{"type":"osm"}]},"autoFitOnLayer":false},"geocoder":{"enabled":true,"appUrl":"https://secure.geonames.org/searchJSON"},"recordview":{"enabled":true,"isSocialbarEnabled":true},"editor":{"enabled":true,"appUrl":"../../{{node}}/{{lang}}/catalog.edit","isUserRecordsOnly":false,"minUserProfileToCreateTemplate":"","isFilterTagsDisplayed":false,"fluidEditorLayout":true,"createPageTpl":"../../catalog/templates/editor/new-metadata-horizontal.html","editorIndentType":"","allowRemoteRecordLink":true,"facetConfig":{"resourceType":{"terms":{"field":"resourceType","size":20}},"codelist_status_text":{"terms":{"field":"codelist_status_text","size":15}},"sourceCatalogue":{"terms":{"field":"sourceCatalogue","size":15}},"isValid":{"terms":{"field":"isValid","size":10}},"isValidInspire":{"terms":{"field":"isValidInspire","size":10}},"groupOwner":{"terms":{"field":"groupOwner","size":10}},"recordOwner":{"terms":{"field":"recordOwner","size":10}},"groupPublished":{"terms":{"field":"groupPublished","size":10}},"documentStandard":{"terms":{"field":"documentStandard","size":10}},"isHarvested":{"terms":{"field":"isHarvested","size":2}},"isTemplate":{"terms":{"field":"isTemplate","size":5}},"isPublishedToAll":{"terms":{"field":"isPublishedToAll","size":2}}}},"admin":{"enabled":true,"appUrl":"../../{{node}}/{{lang}}/admin.console"},"signin":{"enabled":true,"appUrl":"../../{{node}}/{{lang}}/catalog.signin"},"signout":{"appUrl":"../../signout"},"page":{"enabled":true,"appUrl":"../../{{node}}/{{lang}}/catalog.search#/page"}}}',
-}
+})

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/catalog/src/lib/sources/sources.fixture.ts

@@ -1,4 +1,4 @@
-export const SOURCES_FIXTURE = [
+export const someSourcesFixture = () => [
   {
     type: 'harvester',
     logo: null,

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/figure/figure.fixtures.ts

@@ -1,4 +1,4 @@
-export const FIGURE_ITEM_FIXTURE = [
+export const someFigureItemFixture = () => [
   {
     name: 'name 1',
     id: 'id 1',
@@ -16,7 +16,7 @@ export const FIGURE_ITEM_FIXTURE = [
   },
 ]
 
-export const FIGURE_ITEM_FIXTURE_HAB = [
+export const someHabFigureItemFixture = () => [
   {
     name: 'France',
     id: '1',

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"

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

@@ -1,36 +1,21 @@
 import {
-  AfterViewInit,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
-  Inject,
   Input,
   OnDestroy,
   OnInit,
   ViewChild,
 } from '@angular/core'
-import {
-  FEATURE_MAP_OPTIONS,
-  FeatureInfoService,
-  MapContextLayerTypeEnum,
-  MapContextModel,
-  MapManagerService,
-  MapOptionsModel,
-} from '../../../../../../libs/feature/map/src'
 import {
   TableComponent,
   TableItemId,
   TableItemModel,
 } from '../../../../../../libs/ui/dataviz/src'
-import type { FeatureCollection } from 'geojson'
-import Map from 'ol/Map'
-import View from 'ol/View'
-import Feature from 'ol/Feature'
-import { Geometry } from 'ol/geom'
-import VectorLayer from 'ol/layer/Vector'
-import VectorSource from 'ol/source/Vector'
-import Style from 'ol/style/Style'
+import type { Feature, FeatureCollection } from 'geojson'
 import { Subscription } from 'rxjs'
+import { MapContext } from '@geospatial-sdk/core'
+import { MapContainerComponent } from '../../../../../../libs/ui/map/src'
 
 @Component({
   selector: 'gn-ui-geo-table-view',
@@ -38,50 +23,26 @@ import { Subscription } from 'rxjs'
   styleUrls: ['./geo-table-view.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class GeoTableViewComponent implements OnInit, AfterViewInit, OnDestroy {
+export class GeoTableViewComponent implements OnInit, OnDestroy {
   @Input() data: FeatureCollection = { type: 'FeatureCollection', features: [] }
-  @ViewChild(TableComponent) uiTable: TableComponent
-
-  private map: Map
-  private view: View
-  private vectorLayer: VectorLayer<VectorSource<Feature<Geometry>>>
-  private vectorSource: VectorSource<Feature<Geometry>>
-  private features: Feature<Geometry>[]
+  @ViewChild('table') uiTable: TableComponent
+  @ViewChild('mapContainer') mapContainer: MapContainerComponent
 
   tableData: TableItemModel[]
-  mapContext: MapContextModel
+  mapContext: MapContext
   selectionId: TableItemId
-  selection: Feature<Geometry>
+  selection: Feature
   private subscription = new Subscription()
 
-  constructor(
-    private manager: MapManagerService,
-    private featureInfo: FeatureInfoService,
-    private changeRef: ChangeDetectorRef,
-    @Inject(FEATURE_MAP_OPTIONS) private mapOptions: MapOptionsModel
-  ) {}
+  get features() {
+    return this.data.features
+  }
+
+  constructor(private changeRef: ChangeDetectorRef) {}
 
   ngOnInit(): void {
     this.tableData = this.geojsonToTableData(this.data)
     this.mapContext = this.initMapContext()
-    this.featureInfo.handleFeatureInfo()
-    this.subscription.add(
-      this.featureInfo.features$.subscribe((features) => {
-        this.onMapFeatureSelect(features)
-      })
-    )
-  }
-
-  ngAfterViewInit(): void {
-    const map = (this.map = this.manager.map)
-    this.view = map.getView()
-    this.vectorLayer = this.manager.map.getLayers().item(1) as VectorLayer<
-      VectorSource<Feature<Geometry>>
-    >
-    this.vectorLayer.setStyle(this.styleFn.bind(this))
-    this.vectorSource = this.vectorLayer.getSource()
-    this.features = this.vectorSource.getFeatures()
-    this.view.fit(this.vectorSource.getExtent())
   }
 
   onTableSelect(tableEntry: TableItemModel) {
@@ -93,12 +54,13 @@ export class GeoTableViewComponent implements OnInit, AfterViewInit, OnDestroy {
     }
   }
 
-  onMapFeatureSelect(features: Feature<Geometry>[]): void {
+  onMapFeatureSelect(features: Feature[]): void {
     this.selection = features?.length > 0 && features[0]
     if (this.selection) {
-      this.selectionId = this.selection.getId()
+      // FIXME: show styling for selection
+      this.selectionId = this.selection.id
       this.changeRef.detectChanges()
-      this.vectorLayer.changed()
+      // this.vectorLayer.changed()
       this.uiTable.scrollToItem(this.selectionId)
     }
   }
@@ -110,44 +72,42 @@ export class GeoTableViewComponent implements OnInit, AfterViewInit, OnDestroy {
     }))
   }
 
-  private initMapContext(): MapContextModel {
+  private initMapContext(): MapContext {
     return {
       layers: [
         {
-          type: MapContextLayerTypeEnum.XYZ,
+          type: 'xyz',
           url: 'https://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png',
         },
         {
-          type: MapContextLayerTypeEnum.GEOJSON,
+          type: 'geojson',
           data: this.data,
         },
       ],
+      view: {
+        center: [0, 0],
+        zoom: 2,
+      },
     }
   }
 
-  private animateToFeature(feature: Feature<Geometry>): void {
-    this.view.fit(feature.getGeometry().getExtent(), {
-      duration: 1000,
-      maxZoom: 11,
-    })
+  private animateToFeature(feature: Feature): void {
+    this.mapContext = {
+      ...this.mapContext,
+      view: {
+        geometry: feature.geometry,
+        maxZoom: 13,
+      },
+    }
+    // FIXME: animate the view
+    // this.view.fit(feature.getGeometry().getExtent(), {
+    //   duration: 1000,
+    //   maxZoom: 11,
+    // })
   }
 
   private getFeatureFromId(id: TableItemId) {
-    return this.features.find((feature) => feature.getId() === id)
-  }
-
-  private styleFn(
-    feature: Feature<Geometry>,
-    resolution: number
-  ): void | Style | Style[] {
-    if (
-      this.selectionId !== undefined &&
-      this.selectionId === feature.getId()
-    ) {
-      return this.mapOptions.hlStyle(feature, resolution)
-    } else {
-      return this.mapOptions.defaultStyle(feature, resolution)
-    }
+    return this.features.find((feature) => feature.id === id)
   }
 
   ngOnDestroy(): void {

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()))