geonetwork-ui 2.9.0-dev.079fe7365 → 2.9.0-dev.083d7682e

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

@@ -1,6 +1,5 @@
-import { ModuleWithProviders, NgModule, inject } from '@angular/core'
+import { inject, ModuleWithProviders, NgModule } from '@angular/core'
 import { RouteReuseStrategy } from '@angular/router'
-import { EffectsModule } from '@ngrx/effects'
 import {
   FullRouterStateSerializer,
   routerReducer,
@@ -11,8 +10,9 @@ import { ROUTER_STATE_KEY } from './constants'
 import { RouterService } from './router.service'
 import { SearchRouteReuseStrategy } from './SearchRouteReuseStrategy'
 import { RouterFacade } from './state/router.facade'
-import { RouterEffects } from './state/router.effects'
 import { ROUTER_CONFIG, RouterConfigModel } from './router.config'
+import { RouterEffects } from './state/router.effects'
+import { EffectsModule } from '@ngrx/effects'
 
 @NgModule({
   imports: [

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

@@ -1,10 +1,10 @@
-import { Injectable, inject } from '@angular/core'
+import { inject, Injectable } from '@angular/core'
 import {
   ROUTER_ROUTE_DATASET,
   ROUTER_ROUTE_ORGANIZATION,
+  ROUTER_ROUTE_REUSE,
   ROUTER_ROUTE_SEARCH,
   ROUTER_ROUTE_SERVICE,
-  ROUTER_ROUTE_REUSE,
 } from '.'
 import { Router, Routes } from '@angular/router'
 import { ROUTER_CONFIG, RouterConfigModel } from './router.config'

package/src/libs/feature/search/src/lib/utils/service/fields.service.ts

@@ -138,9 +138,15 @@ export class FieldsService {
       )
     })
     return forkJoin(filtersByField$).pipe(
-      map((filters) =>
-        filters.reduce((prev, curr) => ({ ...prev, ...curr }), {})
-      )
+      map((filters) => {
+        if (typeof filters === 'string') {
+          return filters
+        }
+        return (filters as FieldFilters[]).reduce(
+          (prev, curr) => ({ ...prev, ...curr }),
+          {}
+        )
+      })
     )
   }
 

package/src/libs/feature/search/src/lib/utils/service/fields.ts

@@ -36,7 +36,7 @@ export abstract class AbstractSearchField {
   abstract getAvailableValues(): Observable<FieldAvailableValue[] | DateRange[]>
   abstract getFiltersForValues(
     values: FieldValue[] | DateRange[]
-  ): Observable<FieldFilters>
+  ): Observable<FieldFilters | string>
   abstract getValuesForFilter(
     filters: FieldFilters
   ): Observable<FieldValue[] | FieldValue | DateRange>
@@ -89,7 +89,7 @@ export class SimpleSearchField implements AbstractSearchField {
   }
   getFiltersForValues(
     values: FieldValue[] | DateRange[]
-  ): Observable<FieldFilters> {
+  ): Observable<FieldFilters | string> {
     // FieldValue[]
     if (this.getType() === 'values') {
       return of({
@@ -538,7 +538,7 @@ export class RecordKindField extends SimpleSearchField {
     ])
   }
 
-  getFiltersForValues(values: FieldValue[]): Observable<FieldFilters> {
+  getFiltersForValues(values: FieldValue[]): Observable<FieldFilters | string> {
     const filters: FieldFilters = {
       [this.esFieldName]: values.reduce((acc, value) => {
         if (value === '') return { ...acc, [value]: true }
@@ -552,8 +552,8 @@ export class RecordKindField extends SimpleSearchField {
 
     const presentationFormFilter = {}
     if (values.includes('reuse') && !values.includes('dataset')) {
-      presentationFormFilter['mapDigital'] = true
-      presentationFormFilter['mapHardcopy'] = true
+      filters['gn-ui-crossFieldFilter'] =
+        `(resourceType:("dataset" OR "document") AND cl_presentationForm.key:("mapDigital" OR "mapHardcopy")) OR resourceType:("application" OR "interactiveMap" OR "map" OR "map/static" OR "map/interactive" OR "map-interactive" OR "map-static" OR "mapDigital" OR "mapHardcopy" OR "staticMap")`
     } else if (values.includes('dataset') && !values.includes('reuse')) {
       presentationFormFilter['mapDigital'] = false
       presentationFormFilter['mapHardcopy'] = false

package/src/libs/ui/elements/src/lib/api-card/api-card.component.html

@@ -64,7 +64,7 @@
     <div class="flex flex-row gap-2.5 items-center pt-1">
       @if (link.accessServiceProtocol !== 'GPFDL') {
         <span
-          class="bg-primary-opacity-50 uppercase inline-flex items-center justify-center px-2 py-1 text-13 font-medium leading-none text-white rounded text-primary-lightest group-hover:bg-primary transition-colors"
+          class="bg-primary/50 uppercase inline-flex items-center justify-center px-2 py-1 text-13 font-medium leading-none text-white rounded text-primary-lightest group-hover:bg-primary transition-colors"
           [ngClass]="{
             '!bg-primary': currentlyActive,
           }"
@@ -76,7 +76,7 @@
       }
       @if (link.accessServiceProtocol === 'GPFDL') {
         <span
-          class="bg-primary-opacity-50 uppercase inline-flex items-center justify-center px-2 py-1 text-13 font-medium leading-none text-white rounded text-primary-lightest group-hover:bg-primary transition-colors"
+          class="bg-primary/50 uppercase inline-flex items-center justify-center px-2 py-1 text-13 font-medium leading-none text-white rounded text-primary-lightest group-hover:bg-primary transition-colors"
           [ngClass]="{
             '!bg-primary': currentlyActive,
           }"

package/src/libs/ui/elements/src/lib/application-banner/application-banner.component.ts

@@ -45,13 +45,12 @@ export class ApplicationBannerComponent {
         this.icon = 'matWarning'
         break
       case 'light':
-        this.msgClass =
-          'bg-primary-opacity-10 border-primary-lightest text-black'
+        this.msgClass = 'bg-primary/10 border-primary-lightest text-black'
         this.icon = 'matInfoOutline'
         break
       case 'secondary':
       default:
-        this.msgClass = 'bg-primary-opacity-50 border-primary-darker text-black'
+        this.msgClass = 'bg-primary/50 border-primary-darker text-black'
         this.icon = 'matWarningAmberOutline'
         break
     }

package/src/libs/ui/elements/src/lib/metadata-contact/metadata-contact.component.html

@@ -85,7 +85,7 @@
               class="!w-5 !h-5 !text-[20px] opacity-75 shrink-0"
               name="matPersonOutline"
             ></ng-icon>
-            <div class="flex flex-col ml-2">
+            <div class="flex flex-col ml-2" data-cy="contact-full-name">
               <p class="text-sm">
                 {{ contacts[0]?.firstName || '' }}
                 {{ contacts[0]?.lastName || '' }}

package/src/libs/ui/elements/src/lib/metadata-contact/metadata-contact.component.ts

@@ -52,9 +52,9 @@ export class MetadataContactComponent {
 
   get contacts() {
     return (
-      (this.metadata.kind === 'dataset'
-        ? this.metadata.contactsForResource
-        : this.metadata.contacts) || []
+      (this.metadata.kind === 'service'
+        ? this.metadata.contacts
+        : this.metadata.contactsForResource) || []
     )
   }
 

package/src/libs/ui/elements/src/lib/record-api-form/record-api-form.component.html

@@ -6,7 +6,7 @@
       </div>
       <button
         (click)="resetUrl()"
-        class="bg-primary-opacity-50 inline-flex items-center justify-center px-2 py-1 text-13 font-medium leading-none text-white rounded capitalize text-primary-lightest hover:bg-primary transition-colors"
+        class="bg-primary/50 inline-flex items-center justify-center px-2 py-1 text-13 font-medium leading-none text-white rounded capitalize text-primary-lightest hover:bg-primary transition-colors"
       >
         <p class="text-[13px] uppercase" translate>
           record.metadata.api.form.reset

package/src/libs/ui/elements/src/lib/service-capabilities/service-capabilities.component.html

@@ -1,6 +1,6 @@
 @if (apiLinks.length > 0) {
   <div style="height: 652px" id="preview">
-    <div class="bg-primary-opacity-10 overflow-visible" style="height: 420px">
+    <div class="bg-primary/10 overflow-visible" style="height: 420px">
       <div class="container-lg px-4 lg:mx-auto">
         <div>
           <div class="gn-ui-section-title mb-6" translate>

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

@@ -70,8 +70,11 @@ export function getCustomTranslations(langCode: string): CustomTranslations {
 
 let appConfigLoaded = false
 
-export function loadAppConfig() {
-  return fetch('assets/configuration/default.toml')
+export function loadAppConfig(configUrl = 'assets/configuration/default.toml') {
+  console.log(
+    `[geonetwork-ui] Loading application configuration from ${configUrl}`
+  )
+  return fetch(configUrl)
     .then((resp) => {
       if (!resp.ok) throw new Error('Configuration file could not be loaded')
       return resp.text()
@@ -229,6 +232,7 @@ export function loadAppConfig() {
           'record_kind_quick_filter',
           'filter_geometry_data',
           'filter_geometry_url',
+          'do_not_use_default_search_preset',
           'search_preset',
           'advanced_filters',
           'limit',
@@ -252,6 +256,8 @@ export function loadAppConfig() {
                 parsedSearchSection.record_kind_quick_filter,
               FILTER_GEOMETRY_DATA: parsedSearchSection.filter_geometry_data,
               FILTER_GEOMETRY_URL: parsedSearchSection.filter_geometry_url,
+              DO_NOT_USE_DEFAULT_SEARCH_PRESET:
+                !!parsedSearchSection.do_not_use_default_search_preset,
               SEARCH_PRESET: parsedSearchParams.map((param) => ({
                 sort: param.sort,
                 name: param.name,

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

@@ -40,6 +40,7 @@ fonts_stylesheet_url = "https://fonts.googleapis.com/css2?family=Open+Sans"
 [search]
 record_kind_quick_filter = false
 filter_geometry_url = 'https://my.domain.org/geom.json'
+do_not_use_default_search_preset = false
 advanced_filters = ['publicationYear', 'documentStandard', 'inspireKeyword', 'topic', 'license']
 
 [[search_preset]]

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

@@ -58,6 +58,7 @@ export interface SearchConfig {
   RECORD_KIND_QUICK_FILTER?: boolean
   FILTER_GEOMETRY_URL?: string
   FILTER_GEOMETRY_DATA?: string
+  DO_NOT_USE_DEFAULT_SEARCH_PRESET?: boolean
   SEARCH_PRESET?: SearchPreset[]
   ADVANCED_FILTERS?: []
   LIMIT?: number

package/src/libs/util/shared/src/lib/gn-ui-version.ts

@@ -2,7 +2,8 @@ import packageJson from '../../../../../package.json'
 
 export const GEONETWORK_UI_VERSION = packageJson.version
 
-export const GEONETWORK_UI_TAG_NAME =
-  GEONETWORK_UI_VERSION.split('-')[1] === 'dev'
-    ? 'main'
-    : `v${packageJson.version}`
+export const GEONETWORK_UI_TAG_NAME = GEONETWORK_UI_VERSION.split(
+  '-'
+)[1]?.startsWith('dev')
+  ? 'main'
+  : `v${packageJson.version}`

package/src/libs/util/shared/src/lib/services/theme.service.ts

@@ -10,26 +10,6 @@ export class ThemeService {
     return document.documentElement.style.getPropertyValue(`--color-${name}`)
   }
 
-  static generateBgOpacityClasses(
-    colorName,
-    colorValue,
-    opacities = [0, 10, 25, 50, 75]
-  ) {
-    const color = chroma(colorValue)
-    const styleElement = document.createElement('style')
-    styleElement.innerHTML = opacities.reduce((cssRules, opacity) => {
-      cssRules += `.bg-${colorName}-opacity-${opacity}{background-color:${color
-        .alpha(opacity / 100)
-        .css()};}`
-
-      cssRules += `.hover-bg-${colorName}-opacity-${opacity}:hover {background-color:${color
-        .alpha(opacity / 100)
-        .css()};}`
-      return cssRules
-    }, '')
-    document.getElementsByTagName('head')[0].appendChild(styleElement)
-  }
-
   static applyCssVariables(
     primaryColor: string,
     secondaryColor: string,
@@ -39,13 +19,19 @@ export class ThemeService {
     titleFont?: string,
     fontsStylesheetUrl?: string
   ) {
-    const applyColor = (name: string, color) => {
+    const applyColor = (name: string, color, includeRawValues?: boolean) => {
       document.documentElement.style.setProperty(`--color-${name}`, color.css())
+      if (includeRawValues) {
+        document.documentElement.style.setProperty(
+          `--color-raw-${name}`,
+          color.css().replace(/^rgba?\((.*)\)/, '$1')
+        )
+      }
     }
 
     const black = chroma('black')
     const white = chroma('white')
-    applyColor('primary', chroma(primaryColor))
+    applyColor('primary', chroma(primaryColor), true)
     applyColor(
       'primary-lighter',
       chroma.scale([primaryColor, white]).mode('lab')(0.3)
@@ -70,7 +56,7 @@ export class ThemeService {
       'primary-black',
       chroma.scale([primaryColor, black]).mode('lab')(0.85)
     )
-    applyColor('secondary', chroma(secondaryColor))
+    applyColor('secondary', chroma(secondaryColor), true)
     applyColor(
       'secondary-lighter',
       chroma.scale([secondaryColor, white]).mode('lab')(0.3)

package/tailwind.base.config.js

@@ -1,3 +1,4 @@
+/** @type {import('tailwindcss').Config} */
 module.exports = {
   theme: {
     extend: {
@@ -8,14 +9,14 @@ module.exports = {
         'primary-white': 'var(--color-primary-white)',
         'primary-lightest': 'var(--color-primary-lightest)',
         'primary-lighter': 'var(--color-primary-lighter)',
-        primary: 'var(--color-primary)',
+        primary: 'rgb(var(--color-raw-primary) / <alpha-value>)', // supports opacity
         'primary-darker': 'var(--color-primary-darker)',
         'primary-darkest': 'var(--color-primary-darkest)',
         'primary-black': 'var(--color-primary-black)',
         'secondary-white': 'var(--color-secondary-white)',
         'secondary-lightest': 'var(--color-secondary-lightest)',
         'secondary-lighter': 'var(--color-secondary-lighter)',
-        secondary: 'var(--color-secondary)',
+        secondary: 'rgb(var(--color-raw-secondary) / <alpha-value>)', // supports opacity
         'secondary-darker': 'var(--color-secondary-darker)',
         'secondary-darkest': 'var(--color-secondary-darkest)',
         'secondary-black': 'var(--color-secondary-black)',

package/translations/de.json

@@ -387,6 +387,7 @@
   "multiselect.filter.placeholder": "Suche",
   "nav.back": "Zurück",
   "navbar.mobile.menuTitle": "Schnellzugriff",
+  "ogc.geojson.notsupported": "Dieser OGC API-Dienst unterstützt das GeoJSON-Format nicht.",
   "ogc.unreachable.unknown": "Der Dienst konnte nicht erreicht werden",
   "organisation.filter.placeholder": "Ergebnisse filtern",
   "organisation.sort.sortBy": "Sortieren nach:",
@@ -662,7 +663,7 @@
   "wfs.feature.limit": "Zu viele Features, um den WFS-Layer anzuzeigen!",
   "wfs.featuretype.notfound": "Kein passender Feature-Typ wurde im Dienst gefunden",
   "wfs.geojsongml.notsupported": "Dieser Dienst unterstützt das GeoJSON- oder GML-Format nicht",
-  "wfs.unreachable.cors": "Der Dienst konnte aufgrund von CORS-Beschränkungen nicht erreicht werden",
+  "wfs.unreachable.cors": "Der Remote-Dienst ist nicht für den Datenempfang (CORS) konfiguriert",
   "wfs.unreachable.http": "Der Dienst hat einen HTTP-Fehler zurückgegeben",
   "wfs.unreachable.unknown": "Der Dienst konnte nicht erreicht werden"
 }

package/translations/en.json

@@ -387,6 +387,7 @@
   "multiselect.filter.placeholder": "Search",
   "nav.back": "Back",
   "navbar.mobile.menuTitle": "Quick access",
+  "ogc.geojson.notsupported": "This OGC API does not support the GeoJSON format",
   "ogc.unreachable.unknown": "The service could not be reached",
   "organisation.filter.placeholder": "Filter results",
   "organisation.sort.sortBy": "Sort by:",
@@ -662,7 +663,7 @@
   "wfs.feature.limit": "Too many features to display the WFS layer!",
   "wfs.featuretype.notfound": "No matching feature type was found in the service",
   "wfs.geojsongml.notsupported": "This service does not support the GeoJSON or GML format",
-  "wfs.unreachable.cors": "The service could not be reached due to CORS limitations",
+  "wfs.unreachable.cors": "The remote service is not configured to allow data retrieval (CORS)",
   "wfs.unreachable.http": "The service returned an HTTP error",
   "wfs.unreachable.unknown": "The service could not be reached"
 }

package/translations/es.json

@@ -387,6 +387,7 @@
   "multiselect.filter.placeholder": "",
   "nav.back": "",
   "navbar.mobile.menuTitle": "Acceso rápido",
+  "ogc.geojson.notsupported": "",
   "ogc.unreachable.unknown": "",
   "organisation.filter.placeholder": "",
   "organisation.sort.sortBy": "",

package/translations/fr.json

@@ -387,6 +387,7 @@
   "multiselect.filter.placeholder": "Rechercher",
   "nav.back": "Retour",
   "navbar.mobile.menuTitle": "Navigation rapide",
+  "ogc.geojson.notsupported": "Le service OGC API ne supporte pas le format GeoJSON",
   "ogc.unreachable.unknown": "Le service n'est pas accessible",
   "organisation.filter.placeholder": "Filtrer les résultats",
   "organisation.sort.sortBy": "Trier par :",
@@ -662,7 +663,7 @@
   "wfs.feature.limit": "Trop d'objets pour afficher la couche WFS !",
   "wfs.featuretype.notfound": "La classe d'objets n'a pas été trouvée dans le service",
   "wfs.geojsongml.notsupported": "Le service ne supporte pas le format GeoJSON ou GML",
-  "wfs.unreachable.cors": "Le service n'est pas accessible en raison de limitations CORS",
+  "wfs.unreachable.cors": "Le service distant n'est pas configuré pour autoriser la consommation des données (CORS)",
   "wfs.unreachable.http": "Le service a retourné une erreur HTTP",
   "wfs.unreachable.unknown": "Le service n'est pas accessible"
 }

package/translations/it.json

@@ -387,6 +387,7 @@
   "multiselect.filter.placeholder": "Cerca",
   "nav.back": "Indietro",
   "navbar.mobile.menuTitle": "Accesso rapido",
+  "ogc.geojson.notsupported": "Il servizio OGC API non supporta il formato GeoJSON.",
   "ogc.unreachable.unknown": "Il servizio non è accessibile",
   "organisation.filter.placeholder": "Filtra i risultati",
   "organisation.sort.sortBy": "Ordina per:",
@@ -662,7 +663,7 @@
   "wfs.feature.limit": "Troppi oggetti per visualizzare il WFS layer!",
   "wfs.featuretype.notfound": "La classe di oggetto non è stata trovata nel servizio",
   "wfs.geojsongml.notsupported": "Il servizio non supporta il formato GeoJSON o GML",
-  "wfs.unreachable.cors": "Il servizio non è accessibile a causa di limitazioni CORS",
+  "wfs.unreachable.cors": "Il servizio remoto non è configurato per consentire il consumo di dati (CORS)",
   "wfs.unreachable.http": "Il servizio ha restituito un errore HTTP",
   "wfs.unreachable.unknown": "Il servizio non è accessibile"
 }

package/translations/nl.json

@@ -387,6 +387,7 @@
   "multiselect.filter.placeholder": "",
   "nav.back": "",
   "navbar.mobile.menuTitle": "",
+  "ogc.geojson.notsupported": "",
   "ogc.unreachable.unknown": "",
   "organisation.filter.placeholder": "",
   "organisation.sort.sortBy": "",

package/translations/pt.json

@@ -387,6 +387,7 @@
   "multiselect.filter.placeholder": "",
   "nav.back": "",
   "navbar.mobile.menuTitle": "",
+  "ogc.geojson.notsupported": "",
   "ogc.unreachable.unknown": "",
   "organisation.filter.placeholder": "",
   "organisation.sort.sortBy": "",

package/translations/sk.json

@@ -387,6 +387,7 @@
   "multiselect.filter.placeholder": "Hľadať",
   "nav.back": "Späť",
   "navbar.mobile.menuTitle": "",
+  "ogc.geojson.notsupported": "",
   "ogc.unreachable.unknown": "So službou sa nedalo spojiť",
   "organisation.filter.placeholder": "Filtrovať výsledky",
   "organisation.sort.sortBy": "Zoradiť podľa:",
@@ -662,7 +663,7 @@
   "wfs.feature.limit": "",
   "wfs.featuretype.notfound": "V službe nebol nájdený žiadny zodpovedajúci typ funkcie",
   "wfs.geojsongml.notsupported": "Táto služba nepodporuje formát GeoJSON alebo GML",
-  "wfs.unreachable.cors": "Službu nemožno dosiahnuť z dôvodu obmedzení CORS",
+  "wfs.unreachable.cors": "Vzdialená služba nie je nakonfigurovaná tak, aby povoľovala spotrebu dát (CORS)",
   "wfs.unreachable.http": "Služba vrátila chybu HTTP",
   "wfs.unreachable.unknown": "So službou sa nedalo spojiť"
 }