geonetwork-ui 2.8.0-dev.c77b0c7dd → 2.8.0-dev.ffdf0a281

package/src/libs/ui/elements/src/lib/external-link-card/external-link-card.component.ts

@@ -7,6 +7,7 @@ import {
   provideNgIconsConfig,
 } from '@ng-icons/core'
 import { matOpenInNew } from '@ng-icons/material-icons/baseline'
+import { iconoirDatabase } from '@ng-icons/iconoir'
 import { getBadgeColor, getFileFormat } from '../../../../../../libs/util/shared/src'
 import { TranslatePipe } from '@ngx-translate/core'
 
@@ -21,6 +22,7 @@ type CardSize = 'L' | 'M' | 'S' | 'XS'
   providers: [
     provideIcons({
       matOpenInNew,
+      iconoirDatabase,
     }),
     provideNgIconsConfig({ size: '1.5em' }),
   ],
@@ -37,7 +39,7 @@ export class ExternalLinkCardComponent {
 
   @Input() set size(value: CardSize) {
     this._size = value
-    this.cardClass = this.sizeClassMap[value]
+    this.cardClass = `group flex flex-row justify-between card-shadow rounded overflow-hidden ${this.sizeClassMap[value]}`
   }
   get size(): CardSize {
     return this._size
@@ -51,11 +53,18 @@ export class ExternalLinkCardComponent {
     return this.link.name || this.link.description || ''
   }
 
-  getLinkFormat(link: any) {
+  get isDatabase(): boolean {
+    return (
+      this.link.type === 'service' &&
+      this.link.accessServiceProtocol === 'postgis'
+    )
+  }
+
+  getLinkFormat(link: DatasetOnlineResource): string {
     return getFileFormat(link)
   }
 
-  getLinkColor(link: any) {
+  getLinkColor(link: DatasetOnlineResource): string {
     return getBadgeColor(getFileFormat(link))
   }
 }

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

@@ -24,7 +24,7 @@
     ghostClass="h-[31px] w-3/4"
     [showContent]="fieldReady('keywords')"
   >
-    <div *ngIf="metadata.keywords?.length">
+    <gn-ui-max-lines [maxLines]="7" *ngIf="metadata.keywords?.length">
       <div class="metadata-info-keywords sm:pb-4 flex flex-wrap gap-2">
         <gn-ui-badge
           class="inline-block lowercase"
@@ -34,7 +34,7 @@
           >{{ keyword.label }}</gn-ui-badge
         >
       </div>
-    </div>
+    </gn-ui-max-lines>
   </gn-ui-content-ghost>
 </div>
 

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

@@ -39,6 +39,8 @@ export class LinkClassifierService {
             return [LinkUsage.API, LinkUsage.DOWNLOAD, LinkUsage.GEODATA]
           case 'GPFDL':
             return [LinkUsage.API]
+          case 'postgis':
+            return [LinkUsage.UNKNOWN]
           default:
             return [LinkUsage.UNKNOWN]
         }

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

@@ -150,6 +150,12 @@ export const FORMATS = {
     color: '#5A9E6F',
     mimeTypes: ['image/webp'],
   },
+  postgis: {
+    extensions: ['postgis'],
+    priority: 18,
+    color: '#336791',
+    mimeTypes: [],
+  },
 } as const
 
 export type FileFormat = keyof typeof FORMATS
@@ -195,6 +201,11 @@ export function getFileFormatFromServiceOutput(
 export function getFileFormat(
   link: DatasetOnlineResource | ServiceOnlineResource
 ): FileFormat {
+  if ('accessServiceProtocol' in link) {
+    if (link.accessServiceProtocol in FORMATS) {
+      return link.accessServiceProtocol as FileFormat
+    }
+  }
   if ('mimeType' in link) {
     const mimeTypeFormat = mimeTypeToFormat(link.mimeType)
     if (mimeTypeFormat !== null) {

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

@@ -1,4 +1,4 @@
-import { Inject, Injectable, InjectionToken, Optional } from '@angular/core'
+import { Injectable, InjectionToken, Injector } from '@angular/core'
 import { Location } from '@angular/common'
 
 export const PROXY_PATH = new InjectionToken<string>('proxyPath')
@@ -7,8 +7,12 @@ export const PROXY_PATH = new InjectionToken<string>('proxyPath')
   providedIn: 'root',
 })
 export class ProxyService {
+  private get proxyPath(): string | null {
+    return this.injector.get(PROXY_PATH, null)
+  }
+
   constructor(
-    @Optional() @Inject(PROXY_PATH) private proxyPath: string,
+    private injector: Injector,
     private location: Location
   ) {}
 

package/translations/de.json

@@ -418,6 +418,7 @@
   "record.metadata.api.accessServiceProtocol.maplibre-style": "",
   "record.metadata.api.accessServiceProtocol.ogcFeatures": "",
   "record.metadata.api.accessServiceProtocol.other": "",
+  "record.metadata.api.accessServiceProtocol.postgis": "",
   "record.metadata.api.accessServiceProtocol.tms": "",
   "record.metadata.api.accessServiceProtocol.wfs": "",
   "record.metadata.api.accessServiceProtocol.wms": "",
@@ -466,6 +467,8 @@
   "record.metadata.keywords": "Stichworte",
   "record.metadata.languages": "Sprachen",
   "record.metadata.lastUpdate": "Zuletzt aktualisiert am {date}",
+  "record.metadata.link.postgis.table": "",
+  "record.metadata.link.postgis.tooltip": "",
   "record.metadata.linked.datasets": "Verknüpfte Datensätze",
   "record.metadata.linked.records": "Verknüpfte Inhalte",
   "record.metadata.linked.reuses": "Verknüpfte Wiederverwendungen",

package/translations/en.json

@@ -419,6 +419,7 @@
   "record.metadata.api.accessServiceProtocol.maplibre-style": "maplibre-style",
   "record.metadata.api.accessServiceProtocol.ogcFeatures": "ogcFeatures",
   "record.metadata.api.accessServiceProtocol.other": "other",
+  "record.metadata.api.accessServiceProtocol.postgis": "PostGIS",
   "record.metadata.api.accessServiceProtocol.tms": "tms",
   "record.metadata.api.accessServiceProtocol.wfs": "wfs",
   "record.metadata.api.accessServiceProtocol.wms": "wms",
@@ -467,6 +468,8 @@
   "record.metadata.keywords": "Keywords",
   "record.metadata.languages": "Languages",
   "record.metadata.lastUpdate": "Last updated on {date}",
+  "record.metadata.link.postgis.table": "table :",
+  "record.metadata.link.postgis.tooltip": "PostGIS resources do not have access links",
   "record.metadata.linked.datasets": "Associated datasets",
   "record.metadata.linked.records": "Associated content",
   "record.metadata.linked.reuses": "Associated reuses",
@@ -554,7 +557,7 @@
   "search.error.organizationHasNoDataset": "This organization has no records yet.",
   "search.error.organizationNotFound": "This organization could not be found.",
   "search.error.receivedError": "An error was received",
-  "search.error.recordHasnolink": "This record currently has no link yet, please come back later.",
+  "search.error.recordHasnolink": "This record currently has no link.",
   "search.error.recordNotFound": "The record with identifier \"{ id }\" could not be found.",
   "search.field.any.placeholder": "Search in the catalog ...",
   "search.field.sortBy": "Sort by:",

package/translations/es.json

@@ -418,6 +418,7 @@
   "record.metadata.api.accessServiceProtocol.maplibre-style": "",
   "record.metadata.api.accessServiceProtocol.ogcFeatures": "",
   "record.metadata.api.accessServiceProtocol.other": "",
+  "record.metadata.api.accessServiceProtocol.postgis": "",
   "record.metadata.api.accessServiceProtocol.tms": "",
   "record.metadata.api.accessServiceProtocol.wfs": "",
   "record.metadata.api.accessServiceProtocol.wms": "",
@@ -466,6 +467,8 @@
   "record.metadata.keywords": "",
   "record.metadata.languages": "",
   "record.metadata.lastUpdate": "",
+  "record.metadata.link.postgis.table": "",
+  "record.metadata.link.postgis.tooltip": "",
   "record.metadata.linked.datasets": "",
   "record.metadata.linked.records": "",
   "record.metadata.linked.reuses": "",

package/translations/fr.json

@@ -418,6 +418,7 @@
   "record.metadata.api.accessServiceProtocol.maplibre-style": "",
   "record.metadata.api.accessServiceProtocol.ogcFeatures": "",
   "record.metadata.api.accessServiceProtocol.other": "autre",
+  "record.metadata.api.accessServiceProtocol.postgis": "PostGIS",
   "record.metadata.api.accessServiceProtocol.tms": "",
   "record.metadata.api.accessServiceProtocol.wfs": "",
   "record.metadata.api.accessServiceProtocol.wms": "",
@@ -466,6 +467,8 @@
   "record.metadata.keywords": "Mots-clés",
   "record.metadata.languages": "Langues",
   "record.metadata.lastUpdate": "Mis à jour le {date}",
+  "record.metadata.link.postgis.table": "table :",
+  "record.metadata.link.postgis.tooltip": "Les ressources de type PostGIS n'ont pas de lien d'accès",
   "record.metadata.linked.datasets": "Jeux de données associés",
   "record.metadata.linked.records": "Contenus associés",
   "record.metadata.linked.reuses": "Réutilisations associées",
@@ -553,7 +556,7 @@
   "search.error.organizationHasNoDataset": "Cette organisation n'a pas encore de ressources.",
   "search.error.organizationNotFound": "L'organisation n'a pas pu être trouvée.",
   "search.error.receivedError": "Erreur retournée",
-  "search.error.recordHasnolink": "Cette ressource n'a pas encore de lien, réessayez plus tard s'il vous plaît.",
+  "search.error.recordHasnolink": "Cette ressource n'a actuellement aucun lien.",
   "search.error.recordNotFound": "La ressource dont l'identifiant est \"{ id }\" n'a pas pu être trouvée.",
   "search.field.any.placeholder": "Rechercher dans le catalogue...",
   "search.field.sortBy": "Trier par :",

package/translations/it.json

@@ -418,6 +418,7 @@
   "record.metadata.api.accessServiceProtocol.maplibre-style": "",
   "record.metadata.api.accessServiceProtocol.ogcFeatures": "",
   "record.metadata.api.accessServiceProtocol.other": "",
+  "record.metadata.api.accessServiceProtocol.postgis": "",
   "record.metadata.api.accessServiceProtocol.tms": "",
   "record.metadata.api.accessServiceProtocol.wfs": "",
   "record.metadata.api.accessServiceProtocol.wms": "",
@@ -466,6 +467,8 @@
   "record.metadata.keywords": "Parole chiave",
   "record.metadata.languages": "Lingue",
   "record.metadata.lastUpdate": "Ultimo aggiornamento il {date}",
+  "record.metadata.link.postgis.table": "",
+  "record.metadata.link.postgis.tooltip": "",
   "record.metadata.linked.datasets": "",
   "record.metadata.linked.records": "",
   "record.metadata.linked.reuses": "",
@@ -553,7 +556,7 @@
   "search.error.organizationHasNoDataset": "Questa organizzazione non ha ancora records.",
   "search.error.organizationNotFound": "Impossibile trovare l'organizzazione.",
   "search.error.receivedError": "Errore restituito",
-  "search.error.recordHasnolink": "Questo record non ha ancora alcun collegamento, riprova più tardi.",
+  "search.error.recordHasnolink": "Questo record non ha attualmente alcun collegamento.",
   "search.error.recordNotFound": "Impossibile trovare questi record.",
   "search.field.any.placeholder": "Cerca del catalogo...",
   "search.field.sortBy": "Ordina per:",

package/translations/nl.json

@@ -418,6 +418,7 @@
   "record.metadata.api.accessServiceProtocol.maplibre-style": "",
   "record.metadata.api.accessServiceProtocol.ogcFeatures": "",
   "record.metadata.api.accessServiceProtocol.other": "",
+  "record.metadata.api.accessServiceProtocol.postgis": "",
   "record.metadata.api.accessServiceProtocol.tms": "",
   "record.metadata.api.accessServiceProtocol.wfs": "",
   "record.metadata.api.accessServiceProtocol.wms": "",
@@ -466,6 +467,8 @@
   "record.metadata.keywords": "",
   "record.metadata.languages": "",
   "record.metadata.lastUpdate": "",
+  "record.metadata.link.postgis.table": "",
+  "record.metadata.link.postgis.tooltip": "",
   "record.metadata.linked.datasets": "",
   "record.metadata.linked.records": "",
   "record.metadata.linked.reuses": "",

package/translations/pt.json

@@ -418,6 +418,7 @@
   "record.metadata.api.accessServiceProtocol.maplibre-style": "",
   "record.metadata.api.accessServiceProtocol.ogcFeatures": "",
   "record.metadata.api.accessServiceProtocol.other": "",
+  "record.metadata.api.accessServiceProtocol.postgis": "",
   "record.metadata.api.accessServiceProtocol.tms": "",
   "record.metadata.api.accessServiceProtocol.wfs": "",
   "record.metadata.api.accessServiceProtocol.wms": "",
@@ -466,6 +467,8 @@
   "record.metadata.keywords": "",
   "record.metadata.languages": "",
   "record.metadata.lastUpdate": "",
+  "record.metadata.link.postgis.table": "",
+  "record.metadata.link.postgis.tooltip": "",
   "record.metadata.linked.datasets": "",
   "record.metadata.linked.records": "",
   "record.metadata.linked.reuses": "",

package/translations/sk.json

@@ -418,6 +418,7 @@
   "record.metadata.api.accessServiceProtocol.maplibre-style": "",
   "record.metadata.api.accessServiceProtocol.ogcFeatures": "",
   "record.metadata.api.accessServiceProtocol.other": "",
+  "record.metadata.api.accessServiceProtocol.postgis": "",
   "record.metadata.api.accessServiceProtocol.tms": "",
   "record.metadata.api.accessServiceProtocol.wfs": "",
   "record.metadata.api.accessServiceProtocol.wms": "",
@@ -466,6 +467,8 @@
   "record.metadata.keywords": "Kľúčové slová",
   "record.metadata.languages": "",
   "record.metadata.lastUpdate": "Posledná aktualizácia",
+  "record.metadata.link.postgis.table": "",
+  "record.metadata.link.postgis.tooltip": "",
   "record.metadata.linked.datasets": "",
   "record.metadata.linked.records": "",
   "record.metadata.linked.reuses": "",