geonetwork-ui 2.6.0-dev.502fa026d → 2.6.0-dev.7be6567ef

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

@@ -1,39 +1,37 @@
 <a
   [href]="link.url"
   target="_blank"
-  class="flex flex-col justify-between group grow py-5 px-5 bg-white rounded border-gray-300 filter card-shadow overflow-hidden"
-  [ngClass]="{ 'h-40': !compact }"
+  class="group flex flex-row justify-between card-shadow cursor-pointer rounded overflow-hidden"
+  [ngClass]="cardClass"
   [title]="title"
 >
-  <ng-container *ngIf="!compact; else compactTpl">
-    <div class="max-h-24 overflow-hidden text-ellipsis">
-      <p
-        class="font-title font-medium text-21 text-black break-words mb-1 line-clamp-2"
-      >
-        {{ link.name }}
-      </p>
-      <p class="font-medium text-sm break-words">
-        {{ link.description }}
-      </p>
-      <p
-        *ngIf="!link.name && !link.description"
-        class="font-medium text-sm break-words truncate"
-      >
-        {{ link.url }}
-      </p>
+  <div class="flex flex-col justify-between">
+    <div class="gn-ui-card-title">
+      {{ link.description || link.name }}
     </div>
-    <div>
-      <ng-icon class="card-icon" name="matOpenInNew"></ng-icon>
+    <div class="gn-ui-card-detail">
+      {{ link.name }}
     </div>
-  </ng-container>
-  <ng-template #compactTpl>
-    <div class="flex items-center justify-between gap-4">
-      <p
-        class="overflow-hidden font-title font-medium text-21 text-black text-ellipsis whitespace-nowrap"
+    <p *ngIf="!link.name && !link.description" class="gn-ui-card-title">
+      {{ link.url }}
+    </p>
+    <div class="pt-1">
+      <span
+        class="inline-flex items-center justify-center px-2 py-1 text-13 font-medium leading-none text-white rounded transition-opacity opacity-70 group-hover:opacity-100"
+        [style.background-color]="getLinkColor(link)"
+        data-cy="download-format"
+        >{{
+          getLinkFormat(link) || ('downloads.format.unknown' | translate)
+        }}</span
       >
-        {{ link.name || link.description }}
-      </p>
-      <ng-icon class="card-icon flex-shrink-0" name="matOpenInNew"></ng-icon>
     </div>
-  </ng-template>
+  </div>
+  <div class="flex" [ngClass]="size === 'S' ? 'items-end' : 'items-center'">
+    <div class="gn-ui-card-icon">
+      <ng-icon
+        class="inline-block card-icon align-middle"
+        name="matOpenInNew"
+      ></ng-icon>
+    </div>
+  </div>
 </a>

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

@@ -1,5 +1,9 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
-import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  DatasetDownloadDistribution,
+  DatasetOnlineResource,
+  DatasetServiceDistribution,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
 import { CommonModule } from '@angular/common'
 import {
   NgIconComponent,
@@ -7,14 +11,17 @@ import {
   provideNgIconsConfig,
 } from '@ng-icons/core'
 import { matOpenInNew } from '@ng-icons/material-icons/baseline'
+import { getBadgeColor, getFileFormat } from '../../../../../../libs/util/shared/src'
+import { TranslateModule } from '@ngx-translate/core'
 
+type CardSize = 'L' | 'M' | 'S' | 'XS'
 @Component({
   selector: 'gn-ui-link-card',
   templateUrl: './link-card.component.html',
   styleUrls: ['./link-card.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, NgIconComponent],
+  imports: [CommonModule, NgIconComponent, TranslateModule],
   providers: [
     provideIcons({
       matOpenInNew,
@@ -23,8 +30,23 @@ import { matOpenInNew } from '@ng-icons/material-icons/baseline'
   ],
 })
 export class LinkCardComponent {
+  private _size: 'L' | 'M' | 'S' | 'XS'
   @Input() link: DatasetOnlineResource
-  @Input() compact = false
+  private readonly sizeClassMap: Record<CardSize, string> = {
+    L: 'gn-ui-card-l py-2 px-5',
+    M: 'gn-ui-card-m py-2 px-5',
+    S: 'gn-ui-card-s p-4',
+    XS: 'gn-ui-card-xs py-2 px-5',
+  }
+
+  @Input() set size(value: CardSize) {
+    this._size = value
+    this.cardClass = this.sizeClassMap[value]
+  }
+  get size(): 'L' | 'M' | 'S' | 'XS' {
+    return this._size
+  }
+  cardClass = ''
 
   get title() {
     if (this.link.name && this.link.description) {
@@ -32,4 +54,12 @@ export class LinkCardComponent {
     }
     return this.link.name || this.link.description || ''
   }
+
+  getLinkFormat(link: any) {
+    return getFileFormat(link)
+  }
+
+  getLinkColor(link: any) {
+    return getBadgeColor(getFileFormat(link))
+  }
 }

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

@@ -1,5 +1,5 @@
 <div>
-  <p class="text-gray-700 text-xs mb-3 uppercase" translate>
+  <p class="text-gray-900 text-xs mb-3 uppercase" translate>
     record.metadata.catalog
   </p>
   <p class="text-primary font-title text-21 mb-1">

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

@@ -162,7 +162,7 @@ export class RecordApiFormComponent {
       limit: limit !== '-1' ? Number(limit) : -1,
       offset: offset !== '' ? Number(offset) : undefined,
       outputCrs:
-        format === ('application/json' || 'geojson') ? 'EPSG:4326' : undefined,
+        format.toLowerCase().indexOf('json') > -1 ? 'EPSG:4326' : undefined,
     }
 
     if (this.endpoint instanceof WfsEndpoint) {
@@ -170,6 +170,7 @@ export class RecordApiFormComponent {
       options.maxFeatures = limit !== '-1' ? Number(limit) : undefined
       return this.endpoint.getFeatureUrl(this.apiFeatureType, options)
     } else {
+      delete options.outputCrs
       return await this.endpoint.getCollectionItemsUrl(
         this.apiFeatureType,
         options

package/src/libs/ui/layout/src/lib/carousel/carousel.component.css

@@ -1,7 +1,3 @@
-:host .carousel-container ::ng-deep > * {
-  flex-shrink: 0;
-}
-
 :host {
   position: relative;
   display: block;

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

@@ -16,7 +16,7 @@ export const FORMATS = {
   csv: {
     extensions: ['csv'],
     priority: 1,
-    color: '#a6d6c0',
+    color: '#F6A924',
     mimeTypes: ['text/csv', 'application/csv'],
   },
   excel: {
@@ -28,7 +28,7 @@ export const FORMATS = {
       'openxmlformats-officedocument',
     ],
     priority: 2,
-    color: '#acc5e4',
+    color: '#FFDE10',
     mimeTypes: [
       'application/vnd.ms-excel',
       'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
@@ -37,31 +37,31 @@ export const FORMATS = {
   geojson: {
     extensions: ['geojson'],
     priority: 3,
-    color: '#b3cde8',
+    color: '#293C6F',
     mimeTypes: ['application/geo+json', 'application/vnd.geo+json'],
   },
   json: {
     extensions: ['json'],
     priority: 3,
-    color: '#b3cde8',
+    color: '#84D0F0',
     mimeTypes: ['application/json'],
   },
   shp: {
     extensions: ['shp', 'shape', 'zipped-shapefile'],
     priority: 4,
-    color: '#b2d8ba',
+    color: '#009036',
     mimeTypes: ['x-gis/x-shapefile'],
   },
   gml: {
     extensions: ['gml'],
     priority: 5,
-    color: '#e3b3e5',
+    color: '#E75113',
     mimeTypes: ['application/gml+xml', 'text/xml; subtype=gml'],
   },
   kml: {
     extensions: ['kml', 'kmz'],
     priority: 6,
-    color: '#c1e6a0',
+    color: '#F4B5D0',
     mimeTypes: [
       'application/vnd.google-earth.kml+xml',
       'application/vnd.google-earth.kmz',
@@ -70,55 +70,55 @@ export const FORMATS = {
   gpkg: {
     extensions: ['gpkg', 'geopackage'],
     priority: 7,
-    color: '#f7cce6',
+    color: '#7D5D9F',
     mimeTypes: ['application/geopackage+sqlite3'],
   },
   zip: {
     extensions: ['zip', 'tar.gz'],
     priority: 8,
-    color: '#ffe7a3',
+    color: '#B0CB52',
     mimeTypes: ['application/zip', 'application/x-zip'],
   },
   pdf: {
     extensions: ['pdf'],
     priority: 9,
-    color: '#f5b2a3',
+    color: '#49579E',
     mimeTypes: ['application/pdf'],
   },
   jpg: {
     extensions: ['jpg', 'jpeg', 'jfif', 'pjpeg', 'pjp'],
     priority: 9,
-    color: '#d1c1e9',
+    color: '#C4A98F',
     mimeTypes: ['image/jpg'],
   },
   svg: {
     extensions: ['svg'],
     priority: 10,
-    color: '#f3c1c9',
+    color: '#EB6D82',
     mimeTypes: ['image/svg+xml'],
   },
   dxf: {
     extensions: ['dxf'],
     priority: 11,
-    color: '#f6ceac',
+    color: '#DCCD00',
     mimeTypes: ['application/x-dxf', 'image/x-dxf'],
   },
   html: {
     extensions: ['html', 'htm'],
     priority: 12,
-    color: '#FFF2CC',
+    color: '#C0C9B6',
     mimeTypes: ['text/html'],
   },
   fgb: {
     extensions: ['fgb', 'flatgeobuf'],
     priority: 13,
-    color: '#ffe7a3',
+    color: '#A8111C',
     mimeTypes: ['application/flatgeobuf'],
   },
   jsonfg: {
     extensions: ['jsonfg', 'jsonfgc'],
     priority: 14,
-    color: '#ffe7a3',
+    color: '#009EE0',
     mimeTypes: [
       'application/vnd.ogc.fg+json',
       'application/vnd.ogc.fg+json;compatibility=geojson',
@@ -207,9 +207,11 @@ export function checkFileFormat(
   format: FileFormat
 ): boolean {
   return (
-    ('name' in link && new RegExp(`[./]${format}`, 'i').test(link.name)) ||
+    ('name' in link &&
+      new RegExp(`[./]${format}`, 'i').test(link.name.toLowerCase())) ||
     ('url' in link &&
-      new RegExp(`[./]${format}`, 'i').test(link.url.toString()))
+      new RegExp(`[./]${format}`, 'i').test(link.url.toString())) ||
+    ('name' in link && link.name.toLowerCase().includes(format))
   )
 }
 

package/tailwind.base.css

@@ -129,6 +129,34 @@
       border border-white focus:ring-4 focus:ring-gray-300;
   }
 
+  .gn-ui-card-xs {
+    @apply min-h-[68px] md:w-[487px];
+  }
+
+  .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];
+  }
+
+  .gn-ui-card-title {
+    @apply font-title font-medium text-black text-ellipsis overflow-hidden break-words line-clamp-3;
+  }
+
+  .gn-ui-card-icon {
+    @apply flex border border-gray-300 rounded-lg py-1 px-2 align-middle;
+  }
+
+  .gn-ui-card-detail {
+    @apply font-medium text-gray-500 text-ellipsis break-words text-sm;
+  }
+
   /* DROPDOWN MULTISELECT CLASS */
   .gn-ui-multiselect-counter {
     --text-color: var(--gn-ui-multiselect-counter-text-color, white);
@@ -186,7 +214,7 @@
 
   /* TODO: add prefix */
   .card-icon {
-    @apply text-primary opacity-50 group-hover:text-secondary group-hover:opacity-100 transition-colors transition-opacity;
+    @apply text-black group-hover:text-primary-darkest transition-colors;
   }
 
   /* makes spinners appear in the right color */
@@ -194,6 +222,11 @@
   mat-progress-spinner circle {
     stroke: currentColor !important;
   }
+
+  /* Section title */
+  .gn-ui-section-title {
+    @apply text-title font-medium pt-9 text-[28px] container-lg px-4 lg:mx-auto;
+  }
 }
 
 html {

package/translations/de.json

@@ -425,6 +425,8 @@
   "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.ressources.and.links": "Ressourcen und Links",
   "record.metadata.sheet": "Weitere Informationen verfügbar unter:",
   "record.metadata.status": "Status",
   "record.metadata.status.notPublished": "",

package/translations/en.json

@@ -66,7 +66,7 @@
   "datahub.search.back": "Back",
   "datahub.search.filter.all": "All",
   "datahub.search.filter.generatedByAPI": "Generated by an API",
-  "datahub.search.filter.generatedByWfs": "",
+  "datahub.search.filter.generatedByWfs": "Generated by a WFS",
   "datahub.search.filter.others": "Others",
   "dataset.error.forbidden": "Access to this resource is restricted",
   "dataset.error.http": "The data could not be loaded because of an HTTP error: \"{ info }\"",
@@ -425,6 +425,8 @@
   "record.metadata.quality.updateFrequency.failed": "Update frequency is not specified",
   "record.metadata.quality.updateFrequency.success": "Update frequency is specified",
   "record.metadata.related": "Related datasets",
+  "record.metadata.related.contents": "Related contents",
+  "record.metadata.ressources.and.links": "Resources and links",
   "record.metadata.sheet": "Original metadata",
   "record.metadata.status": "Status",
   "record.metadata.status.notPublished": "Not published",

package/translations/es.json

@@ -425,6 +425,8 @@
   "record.metadata.quality.updateFrequency.failed": "",
   "record.metadata.quality.updateFrequency.success": "",
   "record.metadata.related": "",
+  "record.metadata.related.contents": "Contenidos relacionados",
+  "record.metadata.ressources.and.links": "Recursos y enlaces",
   "record.metadata.sheet": "",
   "record.metadata.status": "",
   "record.metadata.status.notPublished": "",

package/translations/fr.json

@@ -425,6 +425,8 @@
   "record.metadata.quality.updateFrequency.failed": "La fréquence de mise à jour n'est pas renseignée",
   "record.metadata.quality.updateFrequency.success": "La fréquence de mise à jour est renseignée",
   "record.metadata.related": "Voir aussi",
+  "record.metadata.related.contents": "Contenus associés",
+  "record.metadata.ressources.and.links": "Ressources et liens",
   "record.metadata.sheet": "Fiche de métadonnées d'origine",
   "record.metadata.status": "Statut",
   "record.metadata.status.notPublished": "Non publié",

package/translations/it.json

@@ -425,6 +425,8 @@
   "record.metadata.quality.updateFrequency.failed": "La frequenza di aggiornamento non è specificata",
   "record.metadata.quality.updateFrequency.success": "La frequenza di aggiornamento è specificata",
   "record.metadata.related": "Vedi anche",
+  "record.metadata.related.contents": "Contenuti correlati",
+  "record.metadata.ressources.and.links": "Risorse e collegamenti",
   "record.metadata.sheet": "Origine del metadata",
   "record.metadata.status": "Stato",
   "record.metadata.status.notPublished": "Non pubblicato",
@@ -532,7 +534,6 @@
   "tooltip.url.open": "Aprire l'URL",
   "ui.readLess": "Ridurre",
   "ui.readMore": "Leggere di più",
-  "wfs.aggregations.notsupported": "Aggregazioni non supportate per i servizi WFS",
   "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",

package/translations/nl.json

@@ -425,6 +425,8 @@
   "record.metadata.quality.updateFrequency.failed": "",
   "record.metadata.quality.updateFrequency.success": "",
   "record.metadata.related": "",
+  "record.metadata.related.contents": "Gerelateerde inhoud",
+  "record.metadata.ressources.and.links": "Bronnen en links",
   "record.metadata.sheet": "",
   "record.metadata.status": "",
   "record.metadata.status.notPublished": "",

package/translations/pt.json

@@ -425,6 +425,8 @@
   "record.metadata.quality.updateFrequency.failed": "",
   "record.metadata.quality.updateFrequency.success": "",
   "record.metadata.related": "",
+  "record.metadata.related.contents": "Conteúdos relacionados",
+  "record.metadata.ressources.and.links": "Recursos e links",
   "record.metadata.sheet": "",
   "record.metadata.status": "",
   "record.metadata.status.notPublished": "",

package/translations/sk.json

@@ -425,6 +425,8 @@
   "record.metadata.quality.updateFrequency.failed": "Frekvencia aktualizácie nie je určená",
   "record.metadata.quality.updateFrequency.success": "Frekvencia aktualizácie je určená",
   "record.metadata.related": "Súvisiace záznamy",
+  "record.metadata.related.contents": "Související obsah",
+  "record.metadata.ressources.and.links": "Prostředky a odkazy",
   "record.metadata.sheet": "Ďalšie metadáta sú k dispozícii na:",
   "record.metadata.status": "Stav",
   "record.metadata.status.notPublished": "",