geonetwork-ui 2.7.0-dev.30c4f9cfa → 2.7.0-dev.3d703fd88

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

@@ -9,7 +9,7 @@ import {
   ViewChild,
 } from '@angular/core'
 import { MapUtilsService } from '../../../../../../libs/feature/map/src'
-import { getLinkLabel } from '../../../../../../libs/util/shared/src'
+import { getLinkId, getLinkLabel } from '../../../../../../libs/util/shared/src'
 import {
   BehaviorSubject,
   combineLatest,
@@ -100,15 +100,28 @@ export class MapViewComponent implements AfterViewInit {
   @Input() set exceedsLimit(value: boolean) {
     this.excludeWfs$.next(value)
   }
+  linkFromConfig$ = new BehaviorSubject(null)
+  _selectedChoice = null
+  _styleFromConfig = null
+
+  linkMap: Map<string, DatasetOnlineResource> = new Map()
   @Input() set selectedView(value: string) {
-    if (value === 'map') {
-      this.selectedLink$.pipe(take(1)).subscribe((link) => {
-        this.linkSelected.emit(link)
-      })
+    this.selectedView$.next(value)
+  }
+  @Input() set datavizConfig(value: any) {
+    if (value.view === 'map') {
+      this.selectedView$.next(value.view)
+      if (value.styleTMSIndex) {
+        this._styleFromConfig = value.styleTMSIndex
+      }
+      if (value.source) {
+        this.linkFromConfig$.next(value.source)
+      }
     }
   }
   @Input() displaySource = true
   @Output() linkSelected = new EventEmitter<DatasetOnlineResource>()
+  @Output() styleSelected = new EventEmitter<number>()
   @ViewChild('mapContainer') mapContainer: MapContainerComponent
 
   excludeWfs$ = new BehaviorSubject(false)
@@ -119,12 +132,13 @@ export class MapViewComponent implements AfterViewInit {
   loading = false
   error = null
 
-  selectLinkToDisplay(i: number) {
-    this.selectedLinkIndex$.next(i)
+  selectLinkToDisplay(id: string) {
+    this.selectedLinkId$.next(id)
   }
 
   selectStyleToDisplay(i: number) {
-    this.selectedStyleIndex$.next(i)
+    this.selectedStyleId$.next(i)
+    this.styleSelected.emit(i)
   }
 
   toggleLegend() {
@@ -146,29 +160,54 @@ export class MapViewComponent implements AfterViewInit {
   )
 
   dropdownChoices$ = this.compatibleMapLinks$.pipe(
-    map((links) =>
-      links.length
-        ? links.map((link, index) => ({
+    map((links) => {
+      this.linkMap.clear()
+      links.forEach((link: DatasetOnlineResource) =>
+        this.linkMap.set(getLinkId(link), link)
+      )
+      return links.length
+        ? links.map((link) => ({
             label: getLinkLabel(link),
-            value: index,
+            value: getLinkId(link),
           }))
-        : [{ label: 'map.dropdown.placeholder', value: 0 }]
-    )
+        : [{ label: 'map.dropdown.placeholder', value: '' }]
+    })
   )
 
-  selectedLinkIndex$ = new BehaviorSubject(0)
-  private selectedStyleIndex$ = new BehaviorSubject(0)
+  selectedView$ = new BehaviorSubject(null)
+  selectedLinkId$ = new BehaviorSubject(null)
+  selectedStyleId$ = new BehaviorSubject(null)
 
   selectedSourceLink$ = combineLatest([
     this.compatibleMapLinks$,
-    this.selectedLinkIndex$.pipe(distinctUntilChanged()),
+    this.linkFromConfig$,
+    this.selectedLinkId$.pipe(distinctUntilChanged()),
+    this.selectedView$,
   ]).pipe(
     tap(() => {
       this.error = null
     }),
-    map(([links, index]) => {
-      this.linkSelected.emit(links[index])
-      return links[index]
+    map(([compatibleLinks, configLink, id, view]) => {
+      if (view === 'map') {
+        if (
+          configLink &&
+          !id &&
+          compatibleLinks.some(
+            (link) => getLinkId(link) === getLinkId(configLink)
+          )
+        ) {
+          this._selectedChoice = getLinkId(configLink)
+          this.linkSelected.emit(configLink)
+          return configLink
+        } else if (id) {
+          this._selectedChoice = id
+          this.linkSelected.emit(this.linkMap.get(id))
+          return this.linkMap.get(id)
+        } else {
+          this.linkSelected.emit(compatibleLinks[0])
+          return compatibleLinks[0]
+        }
+      }
     })
   )
 
@@ -205,7 +244,13 @@ export class MapViewComponent implements AfterViewInit {
       }
       return of([])
     }),
-    tap(() => this.selectedStyleIndex$.next(0)),
+    tap((styles) => {
+      if (this._styleFromConfig && this._styleFromConfig <= styles.length) {
+        this.selectedStyleId$.next(this._styleFromConfig)
+      } else {
+        this.selectedStyleId$.next(0)
+      }
+    }),
     shareReplay(1)
   )
 
@@ -228,7 +273,7 @@ export class MapViewComponent implements AfterViewInit {
   selectedLink$ = combineLatest([
     this.selectedSourceLink$,
     this.styleLinks$,
-    this.selectedStyleIndex$.pipe(distinctUntilChanged()),
+    this.selectedStyleId$.pipe(distinctUntilChanged()),
   ]).pipe(
     map(([src, styles, styleIdx]) => (styles.length ? styles[styleIdx] : src)),
     shareReplay(1)

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

@@ -23,7 +23,11 @@ export class MdViewEffects {
       ofType(MdViewActions.loadFullMetadata),
       switchMap(({ uuid }) => this.recordsRepository.getRecord(uuid)),
       map((record) => {
-        if (record === null || !this.router.url.includes(record.kind)) {
+        if (
+          record === null ||
+          (this.router.url !== '/' && // FIXME: special case for WC, find a better way
+            !this.router.url.includes(record.kind))
+        ) {
           return MdViewActions.loadFullMetadataFailure({ notFound: true })
         }
         return MdViewActions.loadFullMetadataSuccess({ full: record })

package/src/libs/ui/dataviz/src/lib/data-table/data-table.component.ts

@@ -14,7 +14,11 @@ import {
 } from '@angular/core'
 import { MatSort, MatSortModule } from '@angular/material/sort'
 import { MatTableModule } from '@angular/material/table'
-import { TranslatePipe, TranslateService } from '@ngx-translate/core'
+import {
+  TranslateDirective,
+  TranslatePipe,
+  TranslateService,
+} from '@ngx-translate/core'
 import { DataTableDataSource } from './data-table.data.source'
 import { BaseReader, FetchError } from '../../../../../../libs/util/data-fetcher/src'
 import {
@@ -53,6 +57,7 @@ export interface TableItemModel {
     PopupAlertComponent,
     LetDirective,
     TranslatePipe,
+    TranslateDirective,
   ],
   providers: [{ provide: MatPaginatorIntl, useClass: CustomMatPaginatorIntl }],
   selector: 'gn-ui-data-table',

package/src/libs/ui/map/src/lib/components/map-legend/map-legend.component.ts

@@ -27,7 +27,7 @@ export class MapLegendComponent implements OnChanges {
   async ngOnChanges(changes: SimpleChanges) {
     if ('context' in changes) {
       const mapContext = changes['context'].currentValue
-      if (mapContext.layers && mapContext.layers.length > 0) {
+      if (mapContext?.layers && mapContext.layers.length > 0) {
         const mapContextLayer = mapContext.layers[0]
         this.legendHTML = await createLegendFromLayer(mapContextLayer)
         if (this.legendHTML) {

package/src/libs/util/app-config/src/lib/app-config.ts

@@ -102,6 +102,7 @@ export function loadAppConfig() {
           'web_component_embedder_url',
           'languages',
           'contact_email',
+          'reuse_form_url',
         ],
         warnings,
         errors
@@ -131,6 +132,7 @@ export function loadAppConfig() {
                 parsedGlobalSection.web_component_embedder_url,
               LANGUAGES: parsedGlobalSection.languages,
               CONTACT_EMAIL: parsedGlobalSection.contact_email,
+              REUSE_FORM_URL: parsedGlobalSection.reuse_form_url,
             } as GlobalConfig)
 
       const parsedLayersSections = parseMultiConfigSection(

package/src/libs/util/app-config/src/lib/model.ts

@@ -11,6 +11,7 @@ export interface GlobalConfig {
   WEB_COMPONENT_EMBEDDER_URL?: string
   LANGUAGES?: string[]
   CONTACT_EMAIL?: string
+  REUSE_FORM_URL?: string
 }
 
 export interface LayerConfig {

package/src/libs/util/shared/src/lib/links/link-utils.ts

@@ -230,6 +230,15 @@ export function getBadgeColor(linkFormat: FileFormat): string {
   return 'var(--color-gray-700)' // Default color ?
 }
 
+export function getLinkId(link: DatasetOnlineResource): string {
+  const href = link.url.href ?? link.url
+  return `${getLinkLabel(link)
+    .replace(/é/g, 'e')
+    .replace(/è/g, 'e')
+    .normalize('NFD')
+    .replace(/[\u0300-\u036f]/g, '')}-${href}`
+}
+
 export function getLinkLabel(
   link: DatasetOnlineResource | ServiceOnlineResource
 ): string {

package/translations/de.json

@@ -340,6 +340,7 @@
   "map.layer.add": "Hinzufügen",
   "map.layers.available": "Verfügbare Layer",
   "map.layers.list": "Ebenen",
+  "map.legend.title": "Legende",
   "map.loading.data": "Kartendaten werden geladen...",
   "map.loading.service": "Dienst wird geladen...",
   "map.navigation.message": "Bitte verwenden Sie STRG + Maus (oder zwei Finger auf einem Mobilgerät), um die Karte zu navigieren",
@@ -373,7 +374,6 @@
   "record.action.rollback": "",
   "record.action.switchLang": "",
   "record.action.view": "Anzeigen",
-  "record.card.metadata.contact": "",
   "record.externalViewer.open": "In externem Kartenviewer öffnen",
   "record.feature.catalog.number.total.attribute": "",
   "record.feature.catalog.number.total.object": "",
@@ -579,6 +579,7 @@
   "service.metadata.filter.noLayers": "",
   "service.metadata.other": "",
   "service.metadata.question": "",
+  "service.metadata.reuse": "",
   "service.metadata.search": "",
   "service.metadata.search.clear": "",
   "service.metadata.spatialExtent": "",

package/translations/en.json

@@ -340,6 +340,7 @@
   "map.layer.add": "Add",
   "map.layers.available": "Available Layers",
   "map.layers.list": "Layers",
+  "map.legend.title": "Legend",
   "map.loading.data": "Loading map data...",
   "map.loading.service": "Loading service...",
   "map.navigation.message": "Please use CTRL + mouse (or two fingers on mobile) to navigate the map",
@@ -373,7 +374,6 @@
   "record.action.rollback": "Rollback",
   "record.action.switchLang": "Switch to default",
   "record.action.view": "View",
-  "record.card.metadata.contact": "Metadata Contact",
   "record.externalViewer.open": "Open in the external map viewer",
   "record.feature.catalog.number.total.attribute": "Total amount of objects",
   "record.feature.catalog.number.total.object": "Total amount of attributes",
@@ -579,6 +579,7 @@
   "service.metadata.filter.noLayers": "No layer matches your search",
   "service.metadata.other": "Other information",
   "service.metadata.question": "Ask a question",
+  "service.metadata.reuse": "Declare a reuse",
   "service.metadata.search": "Search through the layer list",
   "service.metadata.search.clear": "Clear the layer search",
   "service.metadata.spatialExtent": "Spatial extent",

package/translations/es.json

@@ -340,6 +340,7 @@
   "map.layer.add": "",
   "map.layers.available": "",
   "map.layers.list": "",
+  "map.legend.title": "",
   "map.loading.data": "",
   "map.loading.service": "",
   "map.navigation.message": "",
@@ -373,7 +374,6 @@
   "record.action.rollback": "",
   "record.action.switchLang": "",
   "record.action.view": "",
-  "record.card.metadata.contact": "",
   "record.externalViewer.open": "",
   "record.feature.catalog.number.total.attribute": "",
   "record.feature.catalog.number.total.object": "",
@@ -579,6 +579,7 @@
   "service.metadata.filter.noLayers": "",
   "service.metadata.other": "",
   "service.metadata.question": "",
+  "service.metadata.reuse": "",
   "service.metadata.search": "",
   "service.metadata.search.clear": "",
   "service.metadata.spatialExtent": "",

package/translations/fr.json

@@ -340,6 +340,7 @@
   "map.layer.add": "Ajouter",
   "map.layers.available": "Couches disponibles",
   "map.layers.list": "Couches",
+  "map.legend.title": "Légende",
   "map.loading.data": "Chargement des données...",
   "map.loading.service": "Chargement du service...",
   "map.navigation.message": "Veuillez utiliser CTRL + souris (ou deux doigts sur mobile) pour naviguer sur la carte",
@@ -373,7 +374,6 @@
   "record.action.rollback": "Restaurer",
   "record.action.switchLang": "Marquer par défaut",
   "record.action.view": "Voir",
-  "record.card.metadata.contact": "Contact de la métadonnée ",
   "record.externalViewer.open": "Ouvrir dans le visualiseur externe",
   "record.feature.catalog.number.total.attribute": "Nombre total d'attributs",
   "record.feature.catalog.number.total.object": "Nombre total d'objets",
@@ -579,6 +579,7 @@
   "service.metadata.filter.noLayers": "Aucune couche ne correspond à votre recherche",
   "service.metadata.other": "Autres informations",
   "service.metadata.question": "Poser une question",
+  "service.metadata.reuse": "Déclarer une réutilisation",
   "service.metadata.search": "Rechercher dans la liste des couches",
   "service.metadata.search.clear": "Effacer la recherche des couches",
   "service.metadata.spatialExtent": "Etendue spatiale",

package/translations/it.json

@@ -340,6 +340,7 @@
   "map.layer.add": "Aggiungi",
   "map.layers.available": "Layer disponibili",
   "map.layers.list": "Layers",
+  "map.legend.title": "",
   "map.loading.data": "Caricamento dati...",
   "map.loading.service": "Caricamento del servizio...",
   "map.navigation.message": "Si prega di utilizzare CTRL + mouse (o due dita su mobile) per navigare sulla mappa",
@@ -373,7 +374,6 @@
   "record.action.rollback": "Annulla",
   "record.action.switchLang": "",
   "record.action.view": "Visualizza",
-  "record.card.metadata.contact": "Contatto del metadata",
   "record.externalViewer.open": "Aprire nel visualizzatore esterno",
   "record.feature.catalog.number.total.attribute": "Quantità totale di oggetti",
   "record.feature.catalog.number.total.object": "Quantità totale di attributi",
@@ -579,6 +579,7 @@
   "service.metadata.filter.noLayers": "Nessun layer abbina la ricerca",
   "service.metadata.other": "Altri informazioni",
   "service.metadata.question": "Fare una domanda",
+  "service.metadata.reuse": "",
   "service.metadata.search": "Cerca nella lista del layers",
   "service.metadata.search.clear": "Cancella la ricerca del layers",
   "service.metadata.spatialExtent": "Estensione spaziale",

package/translations/nl.json

@@ -340,6 +340,7 @@
   "map.layer.add": "",
   "map.layers.available": "",
   "map.layers.list": "",
+  "map.legend.title": "",
   "map.loading.data": "",
   "map.loading.service": "",
   "map.navigation.message": "",
@@ -373,7 +374,6 @@
   "record.action.rollback": "",
   "record.action.switchLang": "",
   "record.action.view": "",
-  "record.card.metadata.contact": "",
   "record.externalViewer.open": "",
   "record.feature.catalog.number.total.attribute": "",
   "record.feature.catalog.number.total.object": "",
@@ -579,6 +579,7 @@
   "service.metadata.filter.noLayers": "",
   "service.metadata.other": "",
   "service.metadata.question": "",
+  "service.metadata.reuse": "",
   "service.metadata.search": "",
   "service.metadata.search.clear": "",
   "service.metadata.spatialExtent": "",

package/translations/pt.json

@@ -340,6 +340,7 @@
   "map.layer.add": "",
   "map.layers.available": "",
   "map.layers.list": "",
+  "map.legend.title": "",
   "map.loading.data": "",
   "map.loading.service": "",
   "map.navigation.message": "",
@@ -373,7 +374,6 @@
   "record.action.rollback": "",
   "record.action.switchLang": "",
   "record.action.view": "",
-  "record.card.metadata.contact": "",
   "record.externalViewer.open": "",
   "record.feature.catalog.number.total.attribute": "",
   "record.feature.catalog.number.total.object": "",
@@ -579,6 +579,7 @@
   "service.metadata.filter.noLayers": "",
   "service.metadata.other": "",
   "service.metadata.question": "",
+  "service.metadata.reuse": "",
   "service.metadata.search": "",
   "service.metadata.search.clear": "",
   "service.metadata.spatialExtent": "",

package/translations/sk.json

@@ -340,6 +340,7 @@
   "map.layer.add": "Pridať",
   "map.layers.available": "Dostupné vrsty",
   "map.layers.list": "Vrstvy",
+  "map.legend.title": "",
   "map.loading.data": "Načítavanie dát mapy...",
   "map.loading.service": "Načítavanie služieb...",
   "map.navigation.message": "Použite prosím CTRL + myš (alebo dva prsty na mobilnom zariadení) na navigáciu po mape",
@@ -373,7 +374,6 @@
   "record.action.rollback": "",
   "record.action.switchLang": "",
   "record.action.view": "Zobraziť",
-  "record.card.metadata.contact": "",
   "record.externalViewer.open": "Otvoriť v externom mapovom prehliadači",
   "record.feature.catalog.number.total.attribute": "",
   "record.feature.catalog.number.total.object": "",
@@ -579,6 +579,7 @@
   "service.metadata.filter.noLayers": "",
   "service.metadata.other": "",
   "service.metadata.question": "",
+  "service.metadata.reuse": "",
   "service.metadata.search": "",
   "service.metadata.search.clear": "",
   "service.metadata.spatialExtent": "",