geonetwork-ui 2.1.0-initial → 2.2.0-dev.0f95f702

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

@@ -5,3 +5,4 @@ export * from './lib/records/records.service'
 export * from './lib/organisations/organisations.component'
 export * from './lib/site-title/site-title.component'
 export * from './lib/source-label/source-label.component'
+export * from './lib/my-org/my-org.service'

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

@@ -21,6 +21,7 @@ import {
   OrganizationsFromMetadataService,
   OrganizationsStrategy,
 } from '../../../../../libs/api/repository/src/lib/gn4'
+import { PlatformServiceInterface } from '../../../../../libs/common/domain/src/lib/platform.service.interface'
 
 // expects the replacement key ${name}
 export const ORGANIZATION_URL_TOKEN = new InjectionToken<string>(
@@ -33,7 +34,7 @@ const organizationsServiceFactory = (
   searchApiService: SearchApiService,
   groupsApiService: GroupsApiService,
   translateService: TranslateService,
-  siteApiService: SiteApiService,
+  platformService: PlatformServiceInterface,
   langService: LangService
 ) =>
   strategy === 'groups'
@@ -47,7 +48,7 @@ const organizationsServiceFactory = (
         esService,
         searchApiService,
         groupsApiService,
-        siteApiService,
+        platformService,
         langService
       )
 
@@ -76,7 +77,7 @@ const organizationsServiceFactory = (
         SearchApiService,
         GroupsApiService,
         TranslateService,
-        SiteApiService,
+        PlatformServiceInterface,
         LangService,
       ],
     },

package/src/libs/feature/catalog/src/lib/my-org/my-org.service.ts

@@ -0,0 +1,61 @@
+import { Injectable } from '@angular/core'
+import { OrganizationsServiceInterface } from '../../../../../../libs/common/domain/src/lib/organizations.service.interface'
+import { BehaviorSubject, combineLatest, map, Observable } from 'rxjs'
+import { UserModel } from '../../../../../../libs/common/domain/src/lib/model/user/user.model'
+import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
+
+@Injectable({
+  providedIn: 'root',
+})
+export class MyOrgService {
+  myOrgData$: Observable<{
+    orgName: string
+    logoUrl: string
+    recordCount: number
+    userCount: number
+    userList: UserModel[]
+  }>
+
+  private myOrgDataSubject = new BehaviorSubject<{
+    orgName: string
+    logoUrl: string
+    recordCount: number
+    userCount: number
+    userList: UserModel[]
+  }>({
+    orgName: '',
+    logoUrl: '',
+    recordCount: 0,
+    userCount: 0,
+    userList: [],
+  })
+
+  constructor(
+    private platformService: PlatformServiceInterface,
+    private orgService: OrganizationsServiceInterface
+  ) {
+    this.myOrgData$ = combineLatest([
+      this.platformService.getMe(),
+      this.platformService.getUsers(),
+      this.orgService.organisations$,
+    ]).pipe(
+      map(([user, allUsers, orgs]) => {
+        const orgName = user.organisation
+        const org = orgs.find((org) => org.name === orgName)
+        const logoUrl = org?.logoUrl?.toString()
+        const recordCount = org?.recordCount
+        const userList = allUsers.filter(
+          (user) => user.organisation === orgName
+        )
+        const userCount = userList.length
+        return {
+          orgName,
+          logoUrl,
+          recordCount,
+          userList,
+          userCount,
+        }
+      })
+    )
+  }
+}

package/src/libs/feature/catalog/src/lib/organisations/organisations.component.html

@@ -1,6 +1,14 @@
-<gn-ui-organisations-sort
+<gn-ui-organisations-filter
   (sortBy)="setSortBy($event)"
-></gn-ui-organisations-sort>
+  (filterBy)="setFilterBy($event)"
+></gn-ui-organisations-filter>
+<div class="mt-6 rounded-lg text-gray-800 p-4 bg-slate-100">
+  <gn-ui-organisations-result
+    *ngIf="organisationsTotal$ | async"
+    [hits]="organisationResults"
+    [total]="organisationsTotal$ | async"
+  ></gn-ui-organisations-result>
+</div>
 <div
   class="grid grid-cols-1 mt-6 gap-x-6 gap-y-8 sm:grid-cols-2 lg:grid-cols-3"
 >

package/src/libs/feature/catalog/src/lib/organisations/organisations.component.ts

@@ -7,12 +7,12 @@ import {
   Optional,
   Output,
 } from '@angular/core'
-import { Organization } from '../../../../../../libs/common/domain/src/lib/record'
+import { Organization } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { BehaviorSubject, combineLatest, Observable } from 'rxjs'
 import { map, startWith, tap } from 'rxjs/operators'
 import { ORGANIZATION_URL_TOKEN } from '../feature-catalog.module'
 import { OrganizationsServiceInterface } from '../../../../../../libs/common/domain/src/lib/organizations.service.interface'
-import { SortByField } from '../../../../../../libs/common/domain/src/lib/search'
+import { SortByField } from '../../../../../../libs/common/domain/src/lib/model/search'
 
 @Component({
   selector: 'gn-ui-organisations',
@@ -33,27 +33,34 @@ export class OrganisationsComponent {
 
   totalPages: number
   currentPage$ = new BehaviorSubject(1)
+  organisationResults: number
   sortBy$: BehaviorSubject<SortByField> = new BehaviorSubject(['asc', 'name'])
-
-  organisationsSorted$: Observable<Organization[]> = combineLatest([
+  filterBy$: BehaviorSubject<string> = new BehaviorSubject('')
+  organisationsTotal$ = this.organisationsService.organisationsCount$
+  organisationsFilteredAndSorted$: Observable<Organization[]> = combineLatest([
     this.organisationsService.organisations$.pipe(
       startWith(Array(this.itemsOnPage).fill({}))
     ),
     this.sortBy$,
+    this.filterBy$,
   ]).pipe(
-    map(([organisations, sortBy]) =>
-      this.sortOrganisations(organisations, sortBy)
-    )
+    map(([organisations, sortBy, filterBy]) => {
+      const filteredOrganisations = this.filterOrganisations(
+        organisations,
+        filterBy
+      )
+      return this.sortOrganisations(filteredOrganisations, sortBy)
+    })
   )
 
   organisations$: Observable<Organization[]> = combineLatest([
-    this.organisationsSorted$,
+    this.organisationsFilteredAndSorted$,
     this.currentPage$,
   ]).pipe(
-    tap(
-      ([organisations]) =>
-        (this.totalPages = Math.ceil(organisations.length / this.itemsOnPage))
-    ),
+    tap(([organisations]) => {
+      this.organisationResults = organisations.length
+      this.totalPages = Math.ceil(organisations.length / this.itemsOnPage)
+    }),
     map(([organisations, page]) =>
       organisations.slice(
         (page - 1) * this.itemsOnPage,
@@ -66,10 +73,36 @@ export class OrganisationsComponent {
     this.currentPage$.next(page)
   }
 
+  protected setFilterBy(value: string): void {
+    this.currentPage$.next(1)
+    this.filterBy$.next(value)
+  }
+
   protected setSortBy(value: SortByField): void {
     this.sortBy$.next(value)
   }
 
+  private filterOrganisations(organisations: Organization[], filterBy: string) {
+    if (!filterBy) return organisations
+    const filterRegex = new RegExp(
+      this.normalizeString(filterBy) //ignore accents and case
+        .replace(/[^a-z0-9\s]/g, ' ') //ignore special characters (also without spaces like l')
+        .replace(/\s(?=.)/g, '.*') //replace whitespaces by "AND" separator
+        .replace(/\s/g, ''), //remove potential whitespaces left
+      'i'
+    )
+    return [...organisations].filter((org) => {
+      return this.normalizeString(org.name).match(filterRegex)
+    })
+  }
+
+  private normalizeString(str: string) {
+    return str
+      .normalize('NFD')
+      .replace(/[\u0300-\u036f]/g, '')
+      .toLowerCase()
+  }
+
   private sortOrganisations(
     organisations: Organization[],
     sortBy: SortByField

package/src/libs/feature/catalog/src/lib/records/records.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core'
 import { Observable, of } from 'rxjs'
 import { catchError, shareReplay } from 'rxjs/operators'
-import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/records-repository.interface'
+import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 
 @Injectable({
   providedIn: 'root',

package/src/libs/feature/catalog/src/lib/sources/sources.service.ts

@@ -9,9 +9,9 @@ import { CatalogSource } from './sources.model'
   providedIn: 'root',
 })
 export class SourcesService {
-  sources$: Observable<CatalogSource[]> = this.sourcesApiService
-    .getSources1()
-    .pipe(shareReplay())
+  sources$: Observable<CatalogSource[]> = (
+    this.sourcesApiService.getSubPortals1() as Observable<CatalogSource[]>
+  ).pipe(shareReplay())
 
   constructor(
     private sourcesApiService: SourcesApiService,

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

@@ -24,8 +24,8 @@ import {
   tap,
 } from 'rxjs/operators'
 import { DataService } from '../service/data.service'
-import { InputChartType } from '../../../../../../libs/common/domain/src/lib/dataviz-configuration.model'
-import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/record'
+import { InputChartType } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
+import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { TranslateService } from '@ngx-translate/core'
 
 marker('chart.type.bar')

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

@@ -44,8 +44,8 @@ export class GeoTableViewComponent implements OnInit, AfterViewInit, OnDestroy {
 
   private map: Map
   private view: View
-  private vectorLayer: VectorLayer<VectorSource<Geometry>>
-  private vectorSource: VectorSource<Geometry>
+  private vectorLayer: VectorLayer<VectorSource<Feature<Geometry>>>
+  private vectorSource: VectorSource<Feature<Geometry>>
   private features: Feature<Geometry>[]
 
   tableData: TableItemModel[]
@@ -76,7 +76,7 @@ export class GeoTableViewComponent implements OnInit, AfterViewInit, OnDestroy {
     const map = (this.map = this.manager.map)
     this.view = map.getView()
     this.vectorLayer = this.manager.map.getLayers().item(1) as VectorLayer<
-      VectorSource<Geometry>
+      VectorSource<Feature<Geometry>>
     >
     this.vectorLayer.setStyle(this.styleFn.bind(this))
     this.vectorSource = this.vectorLayer.getSource()

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

@@ -20,7 +20,7 @@ import { catchError, map, switchMap, tap } from 'rxjs/operators'
 import {
   DatasetDistribution,
   DatasetServiceDistribution,
-} from '../../../../../../libs/common/domain/src/lib/record'
+} from '../../../../../../libs/common/domain/src/lib/model/record'
 
 marker('wfs.unreachable.cors')
 marker('wfs.unreachable.http')

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/record'
+import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { TranslateService } from '@ngx-translate/core'
 
 @Component({

package/src/libs/feature/editor/src/lib/components/wizard-field/wizard-field.component.ts

@@ -1,5 +1,7 @@
 import {
   AfterViewInit,
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
   Component,
   Input,
   OnDestroy,
@@ -66,6 +68,7 @@ export const MY_FORMATS = {
     },
     { provide: MAT_DATE_FORMATS, useValue: MY_FORMATS },
   ],
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class WizardFieldComponent implements AfterViewInit, OnDestroy {
   @Input() wizardFieldConfig: WizardFieldModel
@@ -108,10 +111,14 @@ export class WizardFieldComponent implements AfterViewInit, OnDestroy {
     }
   }
 
-  constructor(private wizardService: WizardService) {}
+  constructor(
+    private wizardService: WizardService,
+    private cdr: ChangeDetectorRef
+  ) {}
 
   ngAfterViewInit() {
     this.initializeListeners()
+    this.cdr.detectChanges()
   }
 
   ngOnDestroy() {
@@ -196,6 +203,17 @@ export class WizardFieldComponent implements AfterViewInit, OnDestroy {
   }
 
   private initializeDropdownListener() {
+    if (
+      this.wizardService.getWizardFieldData(this.wizardFieldConfig.id) ===
+        undefined &&
+      !!this.dropdown.selected
+    ) {
+      this.wizardService.setWizardFieldData(
+        this.wizardFieldConfig.id,
+        this.dropdown.selected
+      )
+    }
+
     this.subs.add(
       this.dropdown.selectValue.subscribe((value) => {
         this.wizardService.onWizardWizardFieldDataChanged(

package/src/libs/feature/editor/src/lib/services/editor.service.ts

@@ -5,7 +5,7 @@ import { BehaviorSubject, Observable } from 'rxjs'
 import { finalize, map, switchMap, take, tap } from 'rxjs/operators'
 import { HttpClient } from '@angular/common/http'
 import { FormFieldConfig } from '../../../../../../libs/ui/inputs/src'
-import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/record'
+import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 export interface FormField {
   config: FormFieldConfig

package/src/libs/feature/map/src/lib/add-layer-from-catalog/add-layer-record-preview/add-layer-record-preview.component.ts

@@ -16,7 +16,7 @@ import {
 import {
   DatasetDistribution,
   DatasetRecord,
-} from '../../../../../../../libs/common/domain/src/lib/record'
+} from '../../../../../../../libs/common/domain/src/lib/model/record'
 
 @Component({
   selector: 'gn-ui-add-layer-record-preview',
@@ -59,12 +59,7 @@ export class AddLayerRecordPreviewComponent extends RecordPreviewComponent {
         name: link.name,
       })
     } else if (link.accessServiceProtocol === 'wmts') {
-      return this.mapUtils.getWmtsOptionsFromCapabilities(link).pipe(
-        map((options) => ({
-          type: MapContextLayerTypeEnum.WMTS,
-          options: options,
-        }))
-      )
+      return this.mapUtils.getWmtsLayerFromCapabilities(link)
     }
     return throwError(() => 'protocol not supported')
   }

package/src/libs/feature/map/src/lib/map-context/map-context.model.ts

@@ -25,6 +25,7 @@ export interface MapContextLayerWmsModel {
 export interface MapContextLayerWmtsModel {
   type: 'wmts'
   options: Options
+  extent?: Extent
 }
 
 interface MapContextLayerWfsModel {

package/src/libs/feature/map/src/lib/map-context/map-context.service.ts

@@ -23,6 +23,8 @@ import { FeatureCollection } from 'geojson'
 import { fromLonLat } from 'ol/proj'
 import WMTS from 'ol/source/WMTS'
 import { removeSearchParams } from '../../../../../../libs/util/shared/src'
+import { Geometry } from 'ol/geom'
+import Feature from 'ol/Feature'
 
 export const DEFAULT_BASELAYER_CONTEXT: MapContextLayerXyzModel = {
   type: MapContextLayerTypeEnum.XYZ,
@@ -136,7 +138,7 @@ export class MapContextService {
           }
           const features = this.mapUtils.readFeatureCollection(
             geojson as FeatureCollection
-          )
+          ) as Feature<Geometry>[]
           return new VectorLayer({
             source: new VectorSource({
               features,

package/src/libs/feature/map/src/lib/utils/map-utils-wms.service.ts

@@ -3,8 +3,12 @@ import { WmsEndpoint, WmsLayerFull } from '@camptocamp/ogc-client'
 import { MapContextLayerWmsModel } from '../map-context/map-context.model'
 import { ProxyService } from '../../../../../../libs/util/shared/src'
 import { from, Observable } from 'rxjs'
-import { map } from 'rxjs/operators'
+import { map, switchMap } from 'rxjs/operators'
 import { LONLAT_CRS_CODES } from './projections'
+import { fromEPSGCode, register } from 'ol/proj/proj4'
+import { Extent } from 'ol/extent'
+import proj4 from 'proj4/dist/proj4'
+import { transformExtent } from 'ol/proj'
 
 @Injectable({
   providedIn: 'root',
@@ -24,17 +28,31 @@ export class MapUtilsWMSService {
 
   getLayerLonLatBBox(layer: MapContextLayerWmsModel) {
     return this.getLayerFull(layer).pipe(
-      map((wmsLayerFull) => this.getLonLatBBox(wmsLayerFull))
+      switchMap((wmsLayerFull) => from(this.getLonLatBBox(wmsLayerFull)))
     )
   }
 
-  getLonLatBBox(wmsLayerFull: WmsLayerFull) {
+  async getLonLatBBox(wmsLayerFull: WmsLayerFull): Promise<Extent> {
     const { boundingBoxes } = wmsLayerFull
     const lonLatCRS = Object.keys(boundingBoxes)?.find((crs) =>
       LONLAT_CRS_CODES.includes(crs)
     )
     if (lonLatCRS) {
       return boundingBoxes[lonLatCRS]
+    } else {
+      const availableEPSGCode = Object.keys(boundingBoxes)[0]
+      register(proj4)
+      const proj = await fromEPSGCode(availableEPSGCode)
+      proj4.defs(availableEPSGCode, proj)
+
+      const bboxWithFiniteNumbers = [
+        parseFloat(boundingBoxes[availableEPSGCode][0]),
+        parseFloat(boundingBoxes[availableEPSGCode][1]),
+        parseFloat(boundingBoxes[availableEPSGCode][2]),
+        parseFloat(boundingBoxes[availableEPSGCode][3]),
+      ]
+      const extent = transformExtent(bboxWithFiniteNumbers, proj, 'EPSG:4326')
+      return extent
     }
   }
 }

package/src/libs/feature/map/src/lib/utils/map-utils.service.ts

@@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http'
 import { Injectable } from '@angular/core'
 import type { FeatureCollection } from 'geojson'
 import { extend, Extent, isEmpty } from 'ol/extent'
-import OlFeature from 'ol/Feature'
+import OlFeature, { FeatureLike } from 'ol/Feature'
 import GeoJSON from 'ol/format/GeoJSON'
 import { Geometry } from 'ol/geom'
 import Layer from 'ol/layer/Layer'
@@ -23,11 +23,15 @@ import {
 import WMTSCapabilities from 'ol/format/WMTSCapabilities'
 import { from, Observable, of } from 'rxjs'
 import { map } from 'rxjs/operators'
-import { MapContextLayerModel } from '../map-context/map-context.model'
+import {
+  MapContextLayerModel,
+  MapContextLayerTypeEnum,
+  MapContextLayerWmtsModel,
+} from '../map-context/map-context.model'
 import { MapUtilsWMSService } from './map-utils-wms.service'
 import Collection from 'ol/Collection'
 import MapBrowserEvent from 'ol/MapBrowserEvent'
-import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/record'
+import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 const FEATURE_PROJECTION = 'EPSG:3857'
 const DATA_PROJECTION = 'EPSG:4326'
@@ -50,7 +54,7 @@ export class MapUtilsService {
     featureCollection: FeatureCollection,
     featureProjection = FEATURE_PROJECTION,
     dataProjection = DATA_PROJECTION
-  ): OlFeature<Geometry>[] => {
+  ): FeatureLike[] => {
     const olFeatures = new GeoJSON().readFeatures(featureCollection, {
       featureProjection,
       dataProjection,
@@ -150,7 +154,11 @@ export class MapUtilsService {
     } else if (layer && layer.type === 'wms') {
       geographicExtent = this.wmsUtils.getLayerLonLatBBox(layer)
     } else if (layer && layer.type === 'wmts') {
-      return of(layer.options.tileGrid.getExtent())
+      if (layer.extent) {
+        geographicExtent = of(layer.extent)
+      } else {
+        return of(layer.options.tileGrid.getExtent())
+      }
     } else {
       return of(null)
     }
@@ -163,9 +171,9 @@ export class MapUtilsService {
     )
   }
 
-  getWmtsOptionsFromCapabilities(
+  getWmtsLayerFromCapabilities(
     link: DatasetDistribution
-  ): Observable<Options> {
+  ): Observable<MapContextLayerWmtsModel> {
     const getCapabilitiesUrl = new URL(link.url, window.location.toString())
     getCapabilitiesUrl.searchParams.set('SERVICE', 'WMTS')
     getCapabilitiesUrl.searchParams.set('REQUEST', 'GetCapabilities')
@@ -183,10 +191,20 @@ ${await response.text()}`)
         .then(function (text) {
           try {
             const result = new WMTSCapabilities().read(text)
-            return optionsFromCapabilities(result, {
+            const options = optionsFromCapabilities(result, {
               layer: link.name,
               matrixSet: 'EPSG:3857',
             })
+            const layerCap = result?.Contents?.Layer.find(
+              (layer) => layer.Identifier === link.name
+            )
+            return {
+              options,
+              type: MapContextLayerTypeEnum.WMTS as 'wmts',
+              ...(layerCap?.WGS84BoundingBox
+                ? { extent: layerCap.WGS84BoundingBox }
+                : {}),
+            }
           } catch (e: any) {
             throw new Error(`WMTS GetCapabilities parsing failed:
 ${e.stack || e.message || e}`)

package/src/libs/feature/record/src/lib/data-view/data-view.component.ts

@@ -8,8 +8,8 @@ import { getLinkLabel, getLinkPriority } from '../../../../../../libs/util/share
 import { BehaviorSubject, combineLatest } from 'rxjs'
 import { map, tap } from 'rxjs/operators'
 import { MdViewFacade } from '../state'
-import { DatavizConfigurationModel } from '../../../../../../libs/common/domain/src/lib/dataviz-configuration.model'
-import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/record'
+import { DatavizConfigurationModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
+import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 @Component({
   selector: 'gn-ui-data-view',

package/src/libs/feature/record/src/lib/external-viewer-button/external-viewer-button.component.ts

@@ -1,6 +1,11 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { MapConfig } from '../../../../../../libs/util/app-config/src'
-import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/record'
+import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { marker } from '@biesbjerg/ngx-translate-extract-marker'
+import { TranslateService } from '@ngx-translate/core'
+import { getFileFormat } from '../../../../../../libs/util/shared/src'
+
+marker('externalviewer.dataset.unnamed')
 
 @Component({
   selector: 'gn-ui-external-viewer-button',
@@ -31,14 +36,24 @@ export class ExternalViewerButtonComponent {
       if (this.link.accessServiceProtocol === 'wfs') {
         return 'wfs'
       }
+    } else if (
+      this.link.type === 'download' &&
+      getFileFormat(this.link) === 'geojson'
+    ) {
+      return 'geojson'
     }
     return null
   }
 
+  constructor(private translateService: TranslateService) {}
+
   openInExternalViewer() {
     const templateUrl = this.mapConfig.EXTERNAL_VIEWER_URL_TEMPLATE
+    const layerName = this.link.name
+      ? this.link.name
+      : this.translateService.instant('externalviewer.dataset.unnamed')
     const url = templateUrl
-      .replace('${layer_name}', `${this.link.name}`)
+      .replace('${layer_name}', `${layerName}`)
       .replace(
         '${service_url}',
         `${encodeURIComponent(this.link.url.toString())}`

package/src/libs/feature/record/src/lib/map-view/map-view.component.ts

@@ -37,7 +37,7 @@ import {
 } from 'rxjs/operators'
 import { MdViewFacade } from '../state/mdview.facade'
 import { DataService } from '../../../../../../libs/feature/dataviz/src'
-import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/record'
+import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 @Component({
   selector: 'gn-ui-map-view',
@@ -173,12 +173,7 @@ export class MapViewComponent implements OnInit, OnDestroy {
       link.type === 'service' &&
       link.accessServiceProtocol === 'wmts'
     ) {
-      return this.mapUtils.getWmtsOptionsFromCapabilities(link).pipe(
-        map((options) => ({
-          type: MapContextLayerTypeEnum.WMTS,
-          options: options,
-        }))
-      )
+      return this.mapUtils.getWmtsLayerFromCapabilities(link)
     } else if (
       (link.type === 'service' &&
         (link.accessServiceProtocol === 'wfs' ||

package/src/libs/feature/record/src/lib/state/mdview.actions.ts

@@ -1,6 +1,6 @@
-import { DatavizConfigurationModel } from '../../../../../../libs/common/domain/src/lib/dataviz-configuration.model'
+import { DatavizConfigurationModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
 import { createAction, props } from '@ngrx/store'
-import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/record'
+import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 export const loadFullMetadata = createAction(
   '[Metadata view] Load full metadata',

package/src/libs/feature/record/src/lib/state/mdview.effects.ts

@@ -3,7 +3,7 @@ import { Actions, createEffect, ofType } from '@ngrx/effects'
 import { of } from 'rxjs'
 import { catchError, map, switchMap } from 'rxjs/operators'
 import * as MdViewActions from './mdview.actions'
-import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/records-repository.interface'
+import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 
 @Injectable()
 export class MdViewEffects {

package/src/libs/feature/record/src/lib/state/mdview.facade.ts

@@ -4,8 +4,8 @@ import { filter, map } from 'rxjs/operators'
 import * as MdViewActions from './mdview.actions'
 import * as MdViewSelectors from './mdview.selectors'
 import { LinkClassifierService, LinkUsage } from '../../../../../../libs/util/shared/src'
-import { DatavizConfigurationModel } from '../../../../../../libs/common/domain/src/lib/dataviz-configuration.model'
-import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/record'
+import { DatavizConfigurationModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
+import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 @Injectable()
 /**