geonetwork-ui 2.9.0-dev.be07527a4 → 2.9.0-dev.cf870d5a3

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/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/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/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:",
@@ -472,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:",
@@ -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:",
@@ -414,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",
@@ -472,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 :",
@@ -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 :",
@@ -414,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": "",
@@ -472,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 :",
@@ -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:",
@@ -414,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": "",
@@ -472,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": "",
@@ -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ť"
 }