geonetwork-ui 2.8.2-dev.fa42c5152 → 2.9.0-dev.083d7682e

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

@@ -29,16 +29,19 @@
       </div>
       @if (shownOrganization?.website) {
         <div>
-          <a
-            [href]="shownOrganization.website"
-            target="_blank"
-            class="contact-website text-sm cursor-pointer hover:underline transition-all"
-            >{{ shownOrganization.website }}
+          <div class="flex items-center mt-1">
             <ng-icon
-              class="!w-[12px] !h-[12px] opacity-75 shrink-0"
+              class="!w-5 !h-5 !text-[20px] opacity-75 shrink-0"
               name="matOpenInNew"
             ></ng-icon>
-          </a>
+            <a
+              [href]="shownOrganization.website"
+              target="_blank"
+              class="contact-website text-sm cursor-pointer hover:underline transition-all ml-2"
+            >
+              {{ shownOrganization.website }}
+            </a>
+          </div>
         </div>
       }
     </div>

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'
-    ? '2.8.x'
-    : `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

@@ -473,7 +473,7 @@
   "record.metadata.download": "Herunterladen",
   "record.metadata.feature.catalog": "Attributkatalog",
   "record.metadata.formats": "Formate",
-  "record.metadata.isGeographical": "Geographischer Datensatz",
+  "record.metadata.isGeographical": "geographischer Datensatz",
   "record.metadata.keywords": "Stichworte",
   "record.metadata.languages": "Sprachen",
   "record.metadata.link.postgis.table": "Tabelle:",
@@ -663,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

@@ -415,9 +415,9 @@
   "record.feature.catalog.number.total.attribute": "Total amount of objects",
   "record.feature.catalog.number.total.object": "Total amount of attributes",
   "record.feature.limit": "Preview disabled due to too many elements",
-  "record.kind.dataset": "Dataset",
-  "record.kind.reuse": "Reuse",
-  "record.kind.service": "Service",
+  "record.kind.dataset": "dataset",
+  "record.kind.reuse": "reuse",
+  "record.kind.service": "service",
   "record.metadata.about": "Description",
   "record.metadata.api": "API",
   "record.metadata.api.accessServiceProtocol.GPFDL": "GPFDL",
@@ -473,7 +473,7 @@
   "record.metadata.download": "Downloads",
   "record.metadata.feature.catalog": "Feature catalog",
   "record.metadata.formats": "Formats",
-  "record.metadata.isGeographical": "Geographical dataset",
+  "record.metadata.isGeographical": "geographic dataset",
   "record.metadata.keywords": "Keywords",
   "record.metadata.languages": "Languages",
   "record.metadata.link.postgis.table": "table :",
@@ -663,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/fr.json

@@ -415,9 +415,9 @@
   "record.feature.catalog.number.total.attribute": "Nombre total d'attributs",
   "record.feature.catalog.number.total.object": "Nombre total d'objets",
   "record.feature.limit": "L’aperçu a été désactivé en raison d’un trop grand nombre d'éléments",
-  "record.kind.dataset": "Donnée",
-  "record.kind.reuse": "Réutilisation",
-  "record.kind.service": "Service",
+  "record.kind.dataset": "donnée",
+  "record.kind.reuse": "réutilisation",
+  "record.kind.service": "service",
   "record.metadata.about": "A propos",
   "record.metadata.api": "API",
   "record.metadata.api.accessServiceProtocol.GPFDL": "",
@@ -473,7 +473,7 @@
   "record.metadata.download": "Téléchargements",
   "record.metadata.feature.catalog": "Catalogue d'attributs",
   "record.metadata.formats": "Formats",
-  "record.metadata.isGeographical": "Donnée géographique",
+  "record.metadata.isGeographical": "donnée géographique",
   "record.metadata.keywords": "Mots-clés",
   "record.metadata.languages": "Langues",
   "record.metadata.link.postgis.table": "table :",
@@ -663,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

@@ -415,9 +415,9 @@
   "record.feature.catalog.number.total.attribute": "Quantità totale di oggetti",
   "record.feature.catalog.number.total.object": "Quantità totale di attributi",
   "record.feature.limit": "La visualizzazione è stata disabilitata a causa di troppi elementi ",
-  "record.kind.dataset": "Dataset",
-  "record.kind.reuse": "Riutilizzato",
-  "record.kind.service": "Servizio",
+  "record.kind.dataset": "dataset",
+  "record.kind.reuse": "riutilizzato",
+  "record.kind.service": "servizio",
   "record.metadata.about": "Descrizione",
   "record.metadata.api": "API",
   "record.metadata.api.accessServiceProtocol.GPFDL": "",
@@ -473,7 +473,7 @@
   "record.metadata.download": "Download",
   "record.metadata.feature.catalog": "Catalogo dei oggetti",
   "record.metadata.formats": "Formati",
-  "record.metadata.isGeographical": "Dati geografici",
+  "record.metadata.isGeographical": "dati geografici",
   "record.metadata.keywords": "Parole chiave",
   "record.metadata.languages": "Lingue",
   "record.metadata.link.postgis.table": "",
@@ -663,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/sk.json

@@ -663,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ť"
 }