geonetwork-ui 2.6.0-dev.502fa026d → 2.6.0-dev.76a84fb05

package/src/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.ts

@@ -460,6 +460,11 @@ export class Gn4FieldMapper {
       ),
       selectField<string>(sourceLink, 'description')
     )
+    const descriptionLink = selectField<object>(sourceLink, 'descriptionObject')
+    const accessRestricted =
+      descriptionLink &&
+      'link' in descriptionLink &&
+      descriptionLink.link.toString().includes('#MD_RestrictionCode_restricted')
     // no url: fail early
     if (url === null) {
       // TODO: collect errors at the record level?
@@ -485,6 +490,7 @@ export class Gn4FieldMapper {
           type,
           url: url,
           accessServiceProtocol,
+          accessRestricted: accessRestricted,
         }
       case 'link':
         return {
@@ -503,8 +509,8 @@ export class Gn4FieldMapper {
         return {
           ...distribution,
           type,
-          endpointUrl: url,
-          protocol: accessServiceProtocol,
+          url: url,
+          accessServiceProtocol: accessServiceProtocol,
         }
     }
   }

package/src/libs/api/metadata-converter/src/lib/iso19139/read-parts.ts

@@ -965,8 +965,8 @@ export function extractServiceOnlineResources(): ChainableFunction<
         } else {
           return {
             type: 'endpoint',
-            endpointUrl: url,
-            protocol,
+            url: url,
+            accessServiceProtocol: protocol,
             ...(description && { description }),
             translations,
           }

package/src/libs/api/metadata-converter/src/lib/iso19139/write-parts.ts

@@ -1227,7 +1227,7 @@ export function writeLineage(record: DatasetRecord, rootEl: XmlElement) {
 }
 
 export function getServiceEndpointProtocol(endpoint: ServiceEndpoint): string {
-  switch (endpoint.protocol.toLowerCase()) {
+  switch (endpoint.accessServiceProtocol.toLowerCase()) {
     case 'wfs':
       return 'OGC:WFS'
     case 'wms':
@@ -1235,14 +1235,14 @@ export function getServiceEndpointProtocol(endpoint: ServiceEndpoint): string {
     case 'wps':
       return 'OGC:WPS'
     default:
-      return endpoint.protocol
+      return endpoint.accessServiceProtocol
   }
 }
 
 export function createOnlineResource(onlineResource: ServiceOnlineResource) {
   let linkageUrl, functionCode, protocol
   if (onlineResource.type === 'endpoint') {
-    linkageUrl = onlineResource.endpointUrl.toString()
+    linkageUrl = onlineResource.url.toString()
     protocol = getServiceEndpointProtocol(onlineResource)
     functionCode = 'download'
   } else {

package/src/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.ts

@@ -299,14 +299,6 @@ export class ElasticsearchService {
 
   private mustNotFilters(): Record<string, unknown>[] {
     return [
-      {
-        ...this.queryFilterOnValues('resourceType', [
-          'service',
-          'map',
-          'map/static',
-          'mapDigital',
-        ]),
-      },
       {
         query_string: {
           query:
@@ -429,7 +421,7 @@ export class ElasticsearchService {
           must_not: this.mustNotFilters(),
         },
       },
-      _source: ['resourceTitleObject', 'uuid'],
+      _source: ['resourceTitleObject', 'uuid', 'resourceType'],
       from: 0,
       size: 20,
     }

package/src/libs/api/repository/src/lib/gn4/gn4.provider.ts

@@ -2,6 +2,8 @@ import { Provider } from '@angular/core'
 import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { Gn4PlatformService } from './platform/gn4-platform.service'
 import { Gn4PlatformMapper } from './platform/gn4-platform.mapper'
+import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
+import { Gn4Repository } from './gn4-repository'
 
 export function provideGn4(): Provider[] {
   return [
@@ -9,6 +11,10 @@ export function provideGn4(): Provider[] {
       provide: PlatformServiceInterface,
       useClass: Gn4PlatformService,
     },
+    {
+      provide: RecordsRepositoryInterface,
+      useClass: Gn4Repository,
+    },
     Gn4PlatformMapper,
   ]
 }

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

@@ -164,6 +164,7 @@ export interface DatasetServiceDistribution {
   name?: string
   description?: string
   translations?: OnlineResourceTranslations
+  accessRestricted?: boolean
 }
 
 export interface DatasetDownloadDistribution {
@@ -178,6 +179,7 @@ export interface DatasetDownloadDistribution {
   description?: string
   accessServiceProtocol?: ServiceProtocol
   translations?: OnlineResourceTranslations
+  accessRestricted?: boolean
 }
 
 export interface OnlineLinkResource {
@@ -186,6 +188,8 @@ export interface OnlineLinkResource {
   name?: string
   description?: string
   translations?: OnlineResourceTranslations
+  mimeType?: string
+  accessRestricted?: boolean
 }
 
 export type DatasetOnlineResource = (
@@ -236,8 +240,8 @@ export type DatasetFeatureCatalog = {
 }
 
 export interface ServiceEndpoint {
-  endpointUrl: URL
-  protocol: string
+  url: URL
+  accessServiceProtocol: ServiceProtocol
   type: 'endpoint'
   description?: string
   translations?: OnlineResourceTranslations

package/src/libs/common/fixtures/src/lib/elasticsearch/metadata-links.fixtures.ts

@@ -1,146 +1,146 @@
 export const elasticLinkFixture = (): Record<string, unknown> => ({
   readmeLink: {
-    protocol: 'WWW:LINK',
+    accessServiceProtocol: 'WWW:LINK',
     description: 'Readme page',
     url: 'http://envlit.ifremer.fr/resultats/quadrige',
   },
   doiLink: {
-    protocol: 'WWW:DOI',
+    accessServiceProtocol: 'WWW:DOI',
     description: 'DOI for the resource',
     url: 'http://doi.org/123-456-678',
   },
   dataCsv: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Data in CSV format',
     name: 'abc.csv',
     url: 'http://my.server/files/abc.csv',
   },
   dataPdf: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Data in PDF format',
     name: 'abc.pdf',
     url: 'https://my.server/files/abc.pdf',
   },
   dataJpg: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Data in JPG format',
     name: 'abc.jpg',
     url: 'https://my.server/files/abc.jpg',
   },
   dataZip: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Data in ZIP format',
     name: 'abc.zip',
     url: 'https://my.server/files/abc.zip',
   },
   dataXls: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Data in XLS format',
     name: 'abc.xls',
     url: 'https://my.server/files/abc.xls',
   },
   dataXlsx: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Data in XLSX format',
     name: 'abc.XLSX',
     url: 'https://my.server/files/abc.XLSX',
   },
   dataJson: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Data in JSON format',
     name: 'abc.json',
     url: 'https://my.server/files/abc.json',
   },
   geodataJson: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Geographic data in GeoJSON format',
     name: 'dataset.geojson',
     url: 'http://my.server/files/geographic/dataset.geojson',
   },
   geodataJsonWithMimeType: {
-    protocol: 'WWW:DOWNLOAD:application/vnd.geo+json',
+    accessServiceProtocol: 'WWW:DOWNLOAD:application/vnd.geo+json',
     description: 'Geographic data in GeoJSON format',
     name: 'dataset.geojson',
     url: 'http://my.server/files/geographic/dataset',
     mimeType: 'application/vnd.geo+json',
   },
   geodataKml: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Geographic data in KML format',
     name: 'dataset.kml',
     url: 'http://my.server/files/geographic/dataset.kml',
   },
   geodataGpkg: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Geographic data in geopackage format',
     name: 'dataset.gpkg',
     url: 'http://my.server/files/geographic/dataset.gpkg',
   },
   geodataShp: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Geographic data in shapefile format',
     name: 'dataset.shp',
     url: 'http://my.server/files/geographic/dataset.zip',
   },
   geodataShpWithMimeType: {
-    protocol: 'WWW:DOWNLOAD:x-gis/x-shapefile',
+    accessServiceProtocol: 'WWW:DOWNLOAD:x-gis/x-shapefile',
     description: 'Geographic data in shapefile format',
     name: 'dataset',
     url: 'http://my.server/files/geographic/dataset.zip',
     mimeType: 'x-gis/x-shapefile',
   },
   geodataWms: {
-    protocol: 'OGC:WMS',
+    accessServiceProtocol: 'OGC:WMS',
     name: 'mylayer',
     url: 'https://my.ogc.server/wms',
   },
   geodataWmts: {
-    protocol: 'OGC:WMTS',
+    accessServiceProtocol: 'OGC:WMTS',
     name: 'mylayer',
     url: 'https://my.ogc.server/wmts',
   },
   geodataWfs: {
-    protocol: 'OGC:WFS',
+    accessServiceProtocol: 'OGC:WFS',
     name: 'mylayer',
     url: 'https://my.ogc.server/wfs',
   },
   geodataWms2: {
-    protocol: 'OGC:WMS',
+    accessServiceProtocol: 'OGC:WMS',
     name: 'myotherlayer',
     url: 'https://my.ogc.server/wms',
   },
   geodataWfs2: {
-    protocol: 'OGC:WFS',
+    accessServiceProtocol: 'OGC:WFS',
     name: 'myotherlayer',
     url: 'https://my.ogc.server/wfs',
   },
   geodataRest: {
-    protocol: 'ESRI:REST',
+    accessServiceProtocol: 'ESRI:REST',
     name: 'myrestlayer',
     url: 'https://my.esri.server/FeatureServer',
   },
   geodataRestWfs: {
-    protocol: 'OGC:WFS',
+    accessServiceProtocol: 'OGC:WFS',
     name: 'mywfsrestlayer',
     url: 'https://my.esri.server/WFSServer',
   },
   maplayerRest: {
-    protocol: 'ESRI:REST',
+    accessServiceProtocol: 'ESRI:REST',
     name: 'myotherrestlayer',
     url: 'https://my.esri.server/MapServer',
   },
   landingPage: {
-    protocol: 'WWW:LINK:LANDING_PAGE',
+    accessServiceProtocol: 'WWW:LINK:LANDING_PAGE',
     name: 'landingpage link',
     url: 'https://landing.page',
   },
   unknownFormat: {
-    protocol: 'WWW:DOWNLOAD-1.0-http--download',
+    accessServiceProtocol: 'WWW:DOWNLOAD-1.0-http--download',
     name: 'Vue HTML des métadonnées sur internet',
     url: 'http://catalogue.geo-ide.developpement-durable.gouv.fr/catalogue/srv/fre/catalog.search#/metadata/fr-120066022-jdd-199fd14c-2abb-4c14-b0f8-6c8d92e7b480',
   },
   geodataogcfeatures: {
-    protocol: 'OGC API - Features',
+    accessServiceProtocol: 'OGC API - Features',
     name: 'ogcapi features layer',
     url: 'https://mel.integration.apps.gs-fr-prod.camptocamp.com/data/ogcapi/collections/comptages_velo/items?',
   },

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

@@ -239,10 +239,10 @@ export const aSetOfLinksFixture = () => ({
     ({
       description:
         'https://services.geo.sg.ch/wss/service/SG00170_WMS/guest?request=GetCapabilities&service=WMS',
-      endpointUrl: new URL(
+      url: new URL(
         'https://services.geo.sg.ch/wss/service/SG00170_WMS/guest?request=GetCapabilities&service=WMS'
       ),
-      protocol: 'wms',
+      accessServiceProtocol: 'wms',
       type: 'endpoint',
     }) as ServiceEndpoint,
 })

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

@@ -1,26 +1,26 @@
 export const wmsRecordLinkFixture = () => ({
   description: 'Lieu de surveillance (point)',
   name: 'surval_parametre_point',
-  protocol: 'OGC:WMS',
+  accessServiceProtocol: 'OGC:WMS',
   url: 'https://www.ifremer.fr/services/wms/surveillance_littorale',
 })
 
 export const wpsRecordLinkFixture = () => ({
   description: "Extraction des données d'observation",
   name: 'r:survalextraction',
-  protocol: 'OGC:WPS',
+  accessServiceProtocol: 'OGC:WPS',
   url: 'https://www.ifremer.fr/services/wps/surval',
 })
 
 export const wwwRecordLinkFixture = () => ({
   description: '',
   name: 'La base de données Quadrige',
-  protocol: 'WWW:LINK',
+  praccessServiceProtocolotocol: 'WWW:LINK',
   url: 'http://envlit.ifremer.fr/resultats/quadrige',
 })
 
 export const doiRecordLinkFixture = () => ({
-  protocol: 'WWW:DOI',
+  accessServiceProtocol: 'WWW:DOI',
   description: 'DOI for the resource',
   url: 'http://doi.org/123-456-678',
 })
@@ -28,6 +28,6 @@ export const doiRecordLinkFixture = () => ({
 export const wfsRecordLinkFixture = () => ({
   description: 'Lieu de surveillance (point)',
   name: 'surval_parametre_point',
-  protocol: 'OGC:WFS',
+  accessServiceProtocol: 'OGC:WFS',
   url: 'https://www.ifremer.fr/services/wfs/surveillance_littorale',
 })

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

@@ -137,6 +137,10 @@ export class ChartViewComponent {
     switchMap((link) => {
       this.error = null
       this.loading = true
+      if (link.accessRestricted) {
+        this.handleError('dataset.error.restrictedAccess')
+        return EMPTY
+      }
       return this.dataService.getDataset(link, this.cacheActive).pipe(
         catchError((error) => {
           this.handleError(error)

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

@@ -46,6 +46,10 @@ export class TableViewComponent {
     switchMap((link) => {
       this.error = null
       if (!link) return of(undefined)
+      if (link.accessRestricted) {
+        this.handleError('dataset.error.restrictedAccess')
+        return of([])
+      }
       this.loading = true
       return this.getDatasetReader(link).pipe(
         catchError((error) => {

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

@@ -66,9 +66,8 @@ export class OnlineResourceCardComponent {
   get subtitle(): string {
     switch (this.onlineResource.type) {
       case 'service':
-        return `${this.onlineResource.accessServiceProtocol}`
       case 'endpoint':
-        return `${this.onlineResource.protocol}`
+        return `${this.onlineResource.accessServiceProtocol}`
       case 'link':
       case 'download':
         return this.getFormat(this.onlineResource)

package/src/libs/feature/editor/src/lib/components/online-service-resource-input/online-service-resource-input.component.ts

@@ -81,8 +81,8 @@ export class OnlineServiceResourceInputComponent {
   errorMessage = false
   resetUrlOnChange = Math.random()
 
-  layersSubject = new BehaviorSubject<{ name: string; title: string }[]>([])
-  layers$: Observable<{ name: string; title: string }[]> =
+  layersSubject = new BehaviorSubject<{ name?: string; title?: string }[]>([])
+  layers$: Observable<{ name?: string; title?: string }[]> =
     this.layersSubject.asObservable()
 
   protocolOptions: {

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-spatial-extent/form-field-spatial-extent.component.html

@@ -8,8 +8,8 @@
   >
   </gn-ui-generic-keywords>
   <div class="w-full h-96 mt-2">
-    <gn-ui-form-field-map-container
+    <gn-ui-spatial-extent
       [spatialExtents]="spatialExtents$ | async"
-    ></gn-ui-form-field-map-container>
+    ></gn-ui-spatial-extent>
   </div>
 </div>

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-spatial-extent/form-field-spatial-extent.component.ts

@@ -9,9 +9,9 @@ import { PlatformServiceInterface } from '../../../../../../../../../libs/common
 import { firstValueFrom, map, shareReplay } from 'rxjs'
 import { EditorFacade } from '../../../../+state/editor.facade'
 import { switchMap } from 'rxjs/operators'
-import { FormFieldMapContainerComponent } from '../form-field-map-container/form-field-map-container.component'
 import { TranslateModule, TranslateService } from '@ngx-translate/core'
 import { SPATIAL_SCOPES } from '../../../../fields.config'
+import { SpatialExtentComponent } from '../../../../../../../../../libs/ui/map/src'
 
 // This intermediary type will let us keep track of which keyword is bound to
 // which extent; these properties will not be persisted
@@ -35,8 +35,8 @@ type KeywordWithExtent = Keyword & {
   imports: [
     CommonModule,
     GenericKeywordsComponent,
-    FormFieldMapContainerComponent,
     TranslateModule,
+    SpatialExtentComponent,
   ],
 })
 export class FormFieldSpatialExtentComponent {

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

@@ -1,5 +1,4 @@
 export * from './lib/feature-record.module'
-export * from './lib/gn-ui-version.token'
 export * from './lib/state'
 export * from './lib/data-view-permalink/data-view-permalink.component'
 export * from './lib/data-view/data-view.component'

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

@@ -9,10 +9,10 @@ import {
 import { Configuration } from '../../../../../../libs/data-access/gn4/src'
 import { BehaviorSubject, combineLatest, map } from 'rxjs'
 import { MdViewFacade } from '../state'
-import { GN_UI_VERSION } from '../gn-ui-version.token'
 import { CopyTextButtonComponent } from '../../../../../../libs/ui/inputs/src'
 import { CommonModule } from '@angular/common'
 import { TranslateModule } from '@ngx-translate/core'
+import { GEONETWORK_UI_TAG_NAME } from '../../../../../../libs/util/shared/src'
 
 export const WEB_COMPONENT_EMBEDDER_URL = new InjectionToken<string>(
   'webComponentEmbedderUrl'
@@ -40,7 +40,7 @@ export class DataViewPermalinkComponent {
   ]).pipe(
     map(([viewType, config, metadata]) => {
       const url = new URL(`${this.wcEmbedderBaseUrl}`, window.location.origin)
-      url.searchParams.set('v', `${this.version}`)
+      url.searchParams.set('v', `${GEONETWORK_UI_TAG_NAME}`)
       if (viewType === 'chart') {
         if (config) {
           const { aggregation, xProperty, yProperty, chartType } = config
@@ -74,7 +74,6 @@ export class DataViewPermalinkComponent {
     @Optional()
     @Inject(WEB_COMPONENT_EMBEDDER_URL)
     protected wcEmbedderBaseUrl: string,
-    @Inject(GN_UI_VERSION) private version: string,
     private facade: MdViewFacade
   ) {}
 }

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

@@ -7,10 +7,10 @@ import {
 import { Configuration } from '../../../../../../libs/data-access/gn4/src'
 import { MdViewFacade } from '../state'
 import { BehaviorSubject, combineLatest, map } from 'rxjs'
-import { GN_UI_VERSION } from '../gn-ui-version.token'
 import { CopyTextButtonComponent } from '../../../../../../libs/ui/inputs/src'
 import { CommonModule } from '@angular/common'
 import { TranslateModule } from '@ngx-translate/core'
+import { GEONETWORK_UI_TAG_NAME } from '../../../../../../libs/util/shared/src'
 
 @Component({
   selector: 'gn-ui-data-view-web-component',
@@ -36,7 +36,7 @@ export class DataViewWebComponentComponent {
         if (config) {
           const { aggregation, xProperty, yProperty, chartType } = config
           return `<script src="https://cdn.jsdelivr.net/gh/geonetwork/geonetwork-ui@wc-dist-${
-            this.version
+            GEONETWORK_UI_TAG_NAME
           }/gn-wc.js"></script>
   <gn-dataset-view-chart
           api-url="${new URL(
@@ -59,7 +59,7 @@ export class DataViewWebComponentComponent {
         return ''
       } else if (viewType === 'table') {
         return `<script src="https://cdn.jsdelivr.net/gh/geonetwork/geonetwork-ui@wc-dist-${
-          this.version
+          GEONETWORK_UI_TAG_NAME
         }/gn-wc.js"></script>
   <gn-dataset-view-table
           api-url="${new URL(
@@ -76,7 +76,7 @@ export class DataViewWebComponentComponent {
   ></gn-dataset-view-table>`
       } else {
         return `<script src="https://cdn.jsdelivr.net/gh/geonetwork/geonetwork-ui@wc-dist-${
-          this.version
+          GEONETWORK_UI_TAG_NAME
         }/gn-wc.js"></script>
 <gn-dataset-view-map
         api-url="${new URL(
@@ -97,7 +97,6 @@ export class DataViewWebComponentComponent {
 
   constructor(
     @Inject(Configuration) private config: Configuration,
-    @Inject(GN_UI_VERSION) private version: string,
     private facade: MdViewFacade
   ) {}
 }

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

@@ -61,6 +61,7 @@ import { FetchError } from '../../../../../../libs/util/data-fetcher/src'
 
 marker('map.dropdown.placeholder')
 marker('wfs.feature.limit')
+marker('dataset.error.restrictedAccess')
 
 @Component({
   selector: 'gn-ui-map-view',
@@ -145,6 +146,10 @@ export class MapViewComponent implements AfterViewInit {
       this.hidePreview = false
       this.loading = true
       this.error = null
+      if (link.accessRestricted) {
+        this.handleError('dataset.error.restrictedAccess')
+        return of([])
+      }
       return this.getLayerFromLink(link).pipe(
         map((layer) => [layer]),
         catchError((e) => {

package/src/libs/feature/record/src/lib/record-meta/record-meta.component.ts

@@ -6,7 +6,7 @@ import {
   OnDestroy,
 } from '@angular/core'
 import { Meta } from '@angular/platform-browser'
-import { DatasetRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 @Component({
   selector: 'gn-ui-record-meta',
@@ -15,7 +15,7 @@ import { DatasetRecord } from '../../../../../../libs/common/domain/src/lib/mode
   standalone: true,
 })
 export class RecordMetaComponent implements OnDestroy, OnChanges {
-  @Input() metadata: DatasetRecord
+  @Input() metadata: CatalogRecord
 
   constructor(private meta: Meta) {}
 

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

@@ -1,16 +1,18 @@
 import { Injectable } from '@angular/core'
 import { Actions, createEffect, ofType } from '@ngrx/effects'
 import { exhaustMap, mergeMap, of } from 'rxjs'
-import { catchError, filter, map, switchMap, take } from 'rxjs/operators'
+import { catchError, filter, map, switchMap } from 'rxjs/operators'
 import * as MdViewActions from './mdview.actions'
 import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
+import { Router } from '@angular/router'
 @Injectable()
 export class MdViewEffects {
   constructor(
     private actions$: Actions,
     private recordsRepository: RecordsRepositoryInterface,
-    private platformServiceInterface: PlatformServiceInterface
+    private platformServiceInterface: PlatformServiceInterface,
+    private router: Router
   ) {}
 
   /*
@@ -21,7 +23,7 @@ export class MdViewEffects {
       ofType(MdViewActions.loadFullMetadata),
       switchMap(({ uuid }) => this.recordsRepository.getRecord(uuid)),
       map((record) => {
-        if (record === null) {
+        if (record === null || !this.router.url.includes(record.kind)) {
           return MdViewActions.loadFullMetadataFailure({ notFound: true })
         }
         return MdViewActions.loadFullMetadataSuccess({ full: record })

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

@@ -16,6 +16,7 @@ import { DatavizConfigurationModel } from '../../../../../../libs/common/domain/
 import {
   CatalogRecord,
   DatasetServiceDistribution,
+  ServiceEndpoint,
   UserFeedback,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { AvatarServiceInterface } from '../../../../../../libs/api/repository/src'
@@ -79,11 +80,7 @@ export class MdViewFacade {
   chartConfig$ = this.store.pipe(select(MdViewSelectors.getChartConfig))
 
   allLinks$ = this.metadata$.pipe(
-    map((record) =>
-      record.kind === 'dataset' && 'onlineResources' in record
-        ? record.onlineResources
-        : []
-    )
+    map((record) => ('onlineResources' in record ? record.onlineResources : []))
   )
 
   apiLinks$ = this.allLinks$.pipe(
@@ -92,8 +89,8 @@ export class MdViewFacade {
         .filter((link) => this.linkClassifier.hasUsage(link, LinkUsage.API))
         // Put links to IGN Géoplateforme first
         .sort((dd1, dd2) => {
-          return (dd2 as DatasetServiceDistribution).accessServiceProtocol ===
-            'GPFDL'
+          return (dd2 as DatasetServiceDistribution | ServiceEndpoint)
+            .accessServiceProtocol === 'GPFDL'
             ? 1
             : undefined // do not change the sorting otherwise
         })

package/src/libs/feature/router/src/lib/default/constants.ts

@@ -4,6 +4,8 @@ export const ROUTER_STATE_KEY = 'router'
 
 export const ROUTER_ROUTE_SEARCH = 'search'
 export const ROUTER_ROUTE_DATASET = 'dataset'
+export const ROUTER_ROUTE_SERVICE = 'service'
+export const ROUTER_ROUTE_REUSE = 'reuse'
 export const ROUTER_ROUTE_ORGANIZATION = 'organization'
 
 export enum ROUTE_PARAMS {