geonetwork-ui 2.6.0-dev.582b4530a → 2.6.0-dev.600519f47

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

@@ -1,5 +1,8 @@
 import { Injectable } from '@angular/core'
-import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  DatasetOnlineResource,
+  ServiceOnlineResource,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
 import { getFileFormat } from './link-utils'
 
 export enum LinkUsage {
@@ -16,8 +19,11 @@ export enum LinkUsage {
   providedIn: 'root',
 })
 export class LinkClassifierService {
-  getUsagesForLink(link: DatasetOnlineResource): LinkUsage[] {
+  getUsagesForLink(
+    link: DatasetOnlineResource | ServiceOnlineResource
+  ): LinkUsage[] {
     switch (link.type) {
+      case 'endpoint':
       case 'service': {
         switch (link.accessServiceProtocol) {
           case 'esriRest':
@@ -25,7 +31,10 @@ export class LinkClassifierService {
             return [LinkUsage.API, LinkUsage.DOWNLOAD, LinkUsage.GEODATA]
           case 'wms':
           case 'wmts':
+          case 'tms':
             return [LinkUsage.API, LinkUsage.MAP_API]
+          case 'maplibre-style':
+            return [LinkUsage.GEODATA]
           case 'ogcFeatures':
             return [LinkUsage.API, LinkUsage.DOWNLOAD, LinkUsage.GEODATA]
           case 'GPFDL':
@@ -54,7 +63,10 @@ export class LinkClassifierService {
     }
   }
 
-  hasUsage(link: DatasetOnlineResource, usage: LinkUsage) {
+  hasUsage(
+    link: DatasetOnlineResource | ServiceOnlineResource,
+    usage: LinkUsage
+  ) {
     return this.getUsagesForLink(link).indexOf(usage) > -1
   }
 }

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

@@ -1,6 +1,7 @@
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 import {
   DatasetOnlineResource,
+  ServiceOnlineResource,
   ServiceProtocol,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import {
@@ -140,7 +141,9 @@ export function getFormatPriority(linkFormat: FileFormat): number {
   return 0
 }
 
-export function getLinkPriority(link: DatasetOnlineResource): number {
+export function getLinkPriority(
+  link: DatasetOnlineResource | ServiceOnlineResource
+): number {
   return getFormatPriority(getFileFormat(link))
 }
 
@@ -164,7 +167,9 @@ export function getFileFormatFromServiceOutput(
   return null
 }
 
-export function getFileFormat(link: DatasetOnlineResource): FileFormat {
+export function getFileFormat(
+  link: DatasetOnlineResource | ServiceOnlineResource
+): FileFormat {
   if ('mimeType' in link) {
     const mimeTypeFormat = mimeTypeToFormat(link.mimeType)
     if (mimeTypeFormat !== null) {
@@ -181,7 +186,7 @@ export function getFileFormat(link: DatasetOnlineResource): FileFormat {
 }
 
 export function isFormatInQueryParam(
-  link: DatasetOnlineResource,
+  link: DatasetOnlineResource | ServiceOnlineResource,
   alias: string
 ): boolean {
   const queryParams = link.url.searchParams
@@ -203,7 +208,7 @@ export function mimeTypeToFormat(mimeType: string): FileFormat {
 }
 
 export function checkFileFormat(
-  link: DatasetOnlineResource,
+  link: DatasetOnlineResource | ServiceOnlineResource,
   format: FileFormat
 ): boolean {
   return (
@@ -225,7 +230,9 @@ export function getBadgeColor(linkFormat: FileFormat): string {
   return 'var(--color-gray-700)' // Default color ?
 }
 
-export function getLinkLabel(link: DatasetOnlineResource): string {
+export function getLinkLabel(
+  link: DatasetOnlineResource | ServiceOnlineResource
+): string {
   let format = ''
   switch (link.type) {
     case 'service':
@@ -240,6 +247,9 @@ export function getLinkLabel(link: DatasetOnlineResource): string {
           case 'wmts':
             format = 'WMTS'
             break
+          case 'tms':
+            format = 'TMS'
+            break
           case 'esriRest':
             format = 'REST'
             break
@@ -249,7 +259,7 @@ export function getLinkLabel(link: DatasetOnlineResource): string {
     default:
       format = getFileFormat(link)
   }
-  const label = link.description || link.name
+  const label = link.description || ('name' in link ? link.name : '')
   return format ? `${label} (${format})` : label
 }
 
@@ -261,14 +271,25 @@ export async function getLayers(url: string, serviceProtocol: ServiceProtocol) {
     }
     case 'wfs': {
       const endpointWfs = await new WfsEndpoint(url).isReady()
-      return endpointWfs.getFeatureTypes()
+      const featureTypes = await endpointWfs.getFeatureTypes()
+      const layers = await Promise.all(
+        featureTypes.map(async (collection) => {
+          return await endpointWfs.getFeatureTypeFull(collection.name)
+        })
+      )
+      return layers
     }
     case 'wms': {
       const endpointWms = await new WmsEndpoint(url).isReady()
-      return endpointWms
-        .getLayers()
-        .flatMap(wmsLayerFlatten)
-        .filter((l) => l.name)
+      const layers = (
+        await endpointWms
+          .getLayers()
+          .flatMap(wmsLayerFlatten)
+          .filter((l) => l.name)
+      ).map((collection) => {
+        return endpointWms.getLayerByName(collection.name)
+      })
+      return layers
     }
     case 'wmts': {
       const endpointWmts = await new WmtsEndpoint(url).isReady()
@@ -279,7 +300,7 @@ export async function getLayers(url: string, serviceProtocol: ServiceProtocol) {
   }
 }
 
-function wmsLayerFlatten(layerFull) {
+export function wmsLayerFlatten(layerFull) {
   const layer = {
     title: layerFull.title,
     name: layerFull.name,

package/tailwind.base.config.js

@@ -1,6 +1,9 @@
 module.exports = {
   theme: {
     extend: {
+      screens: {
+        xs: '320px',
+      },
       colors: {
         'primary-white': 'var(--color-primary-white)',
         'primary-lightest': 'var(--color-primary-lightest)',

package/tailwind.base.css

@@ -66,15 +66,20 @@
   /* this is a base class, do not use it directly */
   .gn-ui-btn {
     --rounded: var(--gn-ui-button-rounded, 0.25em);
+    --border-width: var(--gn-ui-button-border-width, 1px);
     --padding: var(--gn-ui-button-padding, 1em);
     --width: var(--gn-ui-button-width, auto);
     --height: var(--gn-ui-button-height, auto);
-    --background: var(--gn-ui-button-background, --color-background);
+    --background: var(--gn-ui-button-background, var(--color-background));
+    --bg-hover: var(--gn-ui-button-bg-hover, var(--color-background));
     --font-size: var(--gn-ui-button-font-size, 1em);
+    --color: var(--gn-ui-button-color, var(--color-main));
     @apply flex flex-row items-center justify-center
       text-[length:--font-size] leading-none
+      text-[color:--color]
       p-[--padding] rounded-[--rounded] w-[--width] h-[--height] overflow-hidden
-      bg-[--background] transition-all duration-100
+      border-[length:--border-width] bg-[--background] transition-all duration-100
+      hover:bg-[--bg-hover] focus:bg-[--bg-hover] active:bg-[--background]
       outline-none
       relative
       disabled:opacity-50 disabled:pointer-events-none
@@ -89,60 +94,48 @@
 
   .gn-ui-btn-default {
     @apply gn-ui-btn text-white
-      bg-gray-700 hover:bg-gray-800 active:bg-gray-900
-      border border-gray-700 focus:ring-4 focus:ring-gray-200;
+      bg-gray-700 hover:bg-gray-800 hover:!text-white active:bg-gray-900
+      border-gray-700 focus:ring-4 focus:ring-gray-200 focus:text-gray-900;
   }
 
   .gn-ui-btn-primary {
     @apply gn-ui-btn text-white
       bg-primary hover:bg-primary-darker focus:bg-primary-darker active:bg-primary-darkest
-      border border-primary focus:ring-4 focus:ring-primary-lightest;
+      border-primary focus:ring-4 focus:ring-primary-lightest;
   }
 
   .gn-ui-btn-secondary {
     @apply gn-ui-btn text-white
       bg-secondary hover:bg-secondary-darker focus:bg-secondary-darker active:bg-secondary-darkest
-      border border-secondary focus:ring-4 focus:ring-secondary-lightest;
+      border-secondary focus:ring-4 focus:ring-secondary-lightest;
   }
 
   .gn-ui-btn-gray {
     @apply gn-ui-btn text-black
     bg-gray-100 hover:bg-gray-200 focus:bg-gray-200 active:bg-gray-300
-    border border-gray-100 focus:ring-4 focus:ring-gray-50;
+    border-gray-100 focus:ring-4 focus:ring-gray-50;
   }
 
   .gn-ui-btn-black {
     @apply gn-ui-btn text-white
     bg-black hover:bg-gray-950 focus:bg-gray-950 active:bg-gray-900
-    border border-black focus:ring-4 focus:ring-gray-300;
+    border-black focus:ring-4 focus:ring-gray-300;
   }
 
   .gn-ui-btn-outline {
-    @apply gn-ui-btn text-main
+    @apply gn-ui-btn
     hover:text-primary-darker focus:text-primary-darker active:text-primary-black
-    border border-gray-300 hover:border-primary-lighter focus:border-primary-lighter focus:ring-4 focus:ring-primary-lightest active:border-primary-darker;
+    border-gray-300 hover:border-primary-lighter focus:border-primary-lighter focus:ring-4 focus:ring-primary-lightest active:border-primary-darker;
   }
 
   .gn-ui-btn-light {
-    @apply gn-ui-btn text-main
+    @apply gn-ui-btn
       hover:bg-gray-50 focus:bg-gray-50 active:bg-gray-100
-      border border-white focus:ring-4 focus:ring-gray-300;
-  }
-
-  .gn-ui-card-xs {
-    @apply min-h-[68px] md:w-[487px];
+      bg-white border-white focus:ring-4 focus:ring-gray-300;
   }
 
   .gn-ui-card-s {
-    @apply min-h-[135px] md:w-80;
-  }
-
-  .gn-ui-card-m {
-    @apply min-h-[68px] md:w-[487px];
-  }
-
-  .gn-ui-card-l {
-    @apply min-h-[68px] md:w-[992px];
+    @apply min-h-[64px] w-full xs:min-w-[260px] xs:max-w-[280px] sm:min-w-[300px] sm:max-w-[500px] md:min-w-[230px];
   }
 
   .gn-ui-card-title {
@@ -225,7 +218,7 @@
 
   /* Section title */
   .gn-ui-section-title {
-    @apply text-title font-medium pt-9 text-[28px] container-lg px-4 lg:mx-auto;
+    @apply text-title font-medium pt-9 text-[28px];
   }
 }
 

package/translations/de.json

@@ -30,6 +30,7 @@
   "dashboard.labels.mySpace": "Mein Bereich",
   "dashboard.records.all": "Metadatenkatalog",
   "dashboard.records.hasDraft": "",
+  "dashboard.records.isMultilingual": "Dieser Eintrag ist mehrsprachig ({languages})",
   "dashboard.records.myDraft": "Meine Entwürfe",
   "dashboard.records.myRecords": "Meine Datensätze",
   "dashboard.records.search": "Suche nach \"{searchText}\"",
@@ -51,7 +52,7 @@
   "datafeeder.month.september": "September",
   "datafeeder.wizardSummarize.createdAt": "Erstellt am",
   "datafeeder.wizardSummarize.scale": "Maßstab",
-  "datahub.header.datasets": "Datensätze",
+  "datahub.header.datasets": "Katalog",
   "datahub.header.lastRecords": "Die neuesten",
   "datahub.header.myfavorites": "Meine Favoriten",
   "datahub.header.news": "Startseite",
@@ -63,7 +64,6 @@
   "datahub.news.contact.title": "Ein spezielles Bedürfnis?",
   "datahub.news.feed": "Nachrichtenfeed",
   "datahub.news.figures": "Indikatoren",
-  "datahub.record.addToFavorites": "Zu Favoriten hinzufügen",
   "datahub.search.back": "Zurück",
   "datahub.search.filter.all": "Alle",
   "datahub.search.filter.generatedByAPI": "Generiert durch eine API",
@@ -205,6 +205,13 @@
   "editor.record.form.license.odc-by": "",
   "editor.record.form.license.pddl": "",
   "editor.record.form.license.unknown": "",
+  "editor.record.form.multilingual.activate": "",
+  "editor.record.form.multilingual.default": "",
+  "editor.record.form.multilingual.enable": "",
+  "editor.record.form.multilingual.forbidden": "",
+  "editor.record.form.multilingual.open": "",
+  "editor.record.form.multilingual.title": "",
+  "editor.record.form.multilingual.validate": "",
   "editor.record.form.page.accessAndContact": "",
   "editor.record.form.page.description": "",
   "editor.record.form.page.resources": "",
@@ -234,7 +241,12 @@
   "editor.record.loadError.body": "Der Datensatz konnte nicht geladen werden:",
   "editor.record.loadError.closeMessage": "Verstanden",
   "editor.record.loadError.title": "Fehler beim Laden des Datensatzes",
+  "editor.record.lock.format": "",
   "editor.record.lock.reason": "",
+  "editor.record.multilingual.confirmation.cancelText": "",
+  "editor.record.multilingual.confirmation.confirmText": "",
+  "editor.record.multilingual.confirmation.message": "",
+  "editor.record.multilingual.confirmation.title": "",
   "editor.record.onlineResource.protocol.other": "",
   "editor.record.onlineResourceError.body": "",
   "editor.record.onlineResourceError.closeMessage": "",
@@ -293,23 +305,34 @@
   "input.image.dropFileLabel": "",
   "input.image.selectFileLabel": "",
   "input.image.uploadErrorLabel": "",
-  "input.image.uploadErrorRetry": "",
   "input.image.uploadProgressCancel": "",
   "input.image.uploadProgressLabel": "",
+  "language.ar": "",
+  "language.az": "",
   "language.ca": "Katalanisch",
   "language.cs": "Tschechisch",
+  "language.cy": "",
+  "language.da": "",
   "language.de": "Deutsch",
   "language.en": "Englisch",
   "language.es": "Spanisch",
   "language.fi": "Finnisch",
   "language.fr": "Französisch",
+  "language.hy": "",
   "language.is": "Isländisch",
   "language.it": "Italienisch",
+  "language.ka": "",
   "language.ko": "Koreanisch",
   "language.nl": "Niederländisch",
+  "language.no": "",
+  "language.pl": "",
   "language.pt": "Portugiesisch",
+  "language.rm": "",
   "language.ru": "Russisch",
   "language.sk": "Slowakisch",
+  "language.sv": "",
+  "language.tr": "",
+  "language.uk": "",
   "language.zh": "Chinesisch",
   "map.add.layer": "Eine Ebene hinzufügen",
   "map.add.layer.catalog": "Aus dem Katalog",
@@ -333,6 +356,7 @@
   "map.wms.urlInput.hint": "Geben Sie die WMS URL ein",
   "multiselect.filter.placeholder": "Suche",
   "nav.back": "Zurück",
+  "navbar.mobile.menuTitle": "Schnellzugriff",
   "next": "weiter",
   "ogc.unreachable.unknown": "Der Dienst konnte nicht erreicht werden",
   "organisation.filter.placeholder": "Ergebnisse filtern",
@@ -355,9 +379,12 @@
   "record.action.duplicate": "",
   "record.action.duplicating": "",
   "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": "",
   "record.feature.limit": "Die Vorschau wurde aufgrund zu vieler Elemente deaktiviert",
   "record.kind.dataset": "",
   "record.kind.reuse": "",
@@ -395,11 +422,13 @@
   "record.metadata.api.form.zoneTitle": "",
   "record.metadata.api.form.zoneTooltip": "",
   "record.metadata.api.gpfdl": "",
+  "record.metadata.capabilities": "",
   "record.metadata.catalog": "Katalog",
   "record.metadata.contact": "Kontakt",
   "record.metadata.creation": "Erstellungsdatum",
   "record.metadata.details": "Über die Daten",
   "record.metadata.download": "Downloads",
+  "record.metadata.feature.catalog": "",
   "record.metadata.formats": "Formate",
   "record.metadata.keywords": "Stichworte",
   "record.metadata.languages": "Sprachen",
@@ -431,20 +460,19 @@
   "record.metadata.quality.updateFrequency.failed": "Aktualisierungsfrequenz nicht angegeben",
   "record.metadata.quality.updateFrequency.success": "Aktualisierungsfrequenz angegeben",
   "record.metadata.related": "Ähnliche Datensätze",
-  "record.metadata.related.contents": "Verwandte Inhalte",
+  "record.metadata.related.contents": "",
   "record.metadata.ressources.and.links": "Ressourcen und Links",
   "record.metadata.sheet": "Weitere Informationen verfügbar unter:",
   "record.metadata.status": "Status",
   "record.metadata.status.notPublished": "",
   "record.metadata.status.published": "",
-  "record.metadata.technical": "Technische Informationen",
   "record.metadata.temporalExtent": "Zeitlicher Umfang",
   "record.metadata.temporalExtent.fromDateToDate": "Von {start} bis {end}",
   "record.metadata.temporalExtent.sinceDate": "Seit {start}",
   "record.metadata.temporalExtent.untilDate": "Bis {end}",
   "record.metadata.title": "Titel",
   "record.metadata.topics": "Kategorien",
-  "record.metadata.type": "Geographischer Datensatz",
+  "record.metadata.isGeographical": "Geographischer Datensatz",
   "record.metadata.uniqueId": "Eindeutige Kennung",
   "record.metadata.updateFrequency": "Aktualisierungsfrequenz der Daten",
   "record.metadata.updatedOn": "Geändert am",
@@ -474,6 +502,7 @@
   "results.sortBy.popularity": "Beliebtheit",
   "results.sortBy.qualityScore": "Qualitätsbewertung",
   "results.sortBy.relevancy": "Relevanz",
+  "reuse.metadata.access": "",
   "search.autocomplete.error": "Vorschläge konnten nicht abgerufen werden:",
   "search.error.couldNotReachApi": "Die API konnte nicht erreicht werden",
   "search.error.organizationHasNoDataset": "",
@@ -483,6 +512,7 @@
   "search.error.recordNotFound": "Der Datensatz mit der Kennung \"{ id }\" konnte nicht gefunden werden.",
   "search.field.any.placeholder": "Suche im katalog ...",
   "search.field.sortBy": "Sortieren nach:",
+  "search.filter.into.feature.catalog": "",
   "search.filters.availableServices.download": "",
   "search.filters.availableServices.view": "",
   "search.filters.changeDate": "Letzte Aktualisierung",
@@ -513,6 +543,10 @@
   "search.filters.producerOrg": "",
   "search.filters.publicationYear": "Veröffentlichungsjahr",
   "search.filters.publisherOrg": "",
+  "search.filters.recordKind.all": "Alle",
+  "search.filters.recordKind.dataset": "Datensätze",
+  "search.filters.recordKind.reuse": "Wiederverwendungen",
+  "search.filters.recordKind.service": "Dienste",
   "search.filters.representationType": "Repräsentationstyp",
   "search.filters.resourceType": "Ressourcentyp",
   "search.filters.standard": "Standard",
@@ -523,6 +557,27 @@
   "search.filters.useSpatialFilter": "Zuerst Datensätze im Interessenbereich anzeigen",
   "search.filters.useSpatialFilterHelp": "Wenn diese Option aktiviert ist, werden Datensätze im Bereich des Katalogs zuerst angezeigt. Datensätze außerhalb dieses Bereichs werden nicht angezeigt.",
   "search.filters.user": "Editor",
+  "service.metadata.capabilities": "",
+  "service.metadata.capabilities.abstract": "",
+  "service.metadata.capabilities.attribution": "",
+  "service.metadata.capabilities.availableCrs": "",
+  "service.metadata.capabilities.defaultCrs": "",
+  "service.metadata.capabilities.geometryName": "",
+  "service.metadata.capabilities.geometryType": "",
+  "service.metadata.capabilities.keywords": "",
+  "service.metadata.capabilities.name": "",
+  "service.metadata.capabilities.objectCount": "",
+  "service.metadata.capabilities.otherCrs": "",
+  "service.metadata.capabilities.outputFormats": "",
+  "service.metadata.capabilities.resourceLinks": "",
+  "service.metadata.capabilities.title": "",
+  "service.metadata.filter": "",
+  "service.metadata.filter.noLayers": "",
+  "service.metadata.other": "",
+  "service.metadata.question": "",
+  "service.metadata.search": "",
+  "service.metadata.search.clear": "",
+  "service.metadata.spatialExtent": "",
   "share.tab.permalink": "Teilen",
   "share.tab.webComponent": "Integrieren",
   "table.loading.data": "Daten werden geladen...",