geonetwork-ui 2.6.0-dev.b306f1194 → 2.6.0-dev.c49d02679

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

@@ -0,0 +1,69 @@
+<div
+  data-cy="recordOrg"
+  class="flex items-center justify-evenly bg-gray-50 rounded-lg h-[53px] px-2"
+>
+  <div class="flex items-center flex-1 min-w-0">
+    <div class="w-[45px] h-[45px] rounded-lg overflow-hidden shrink-0 mr-3">
+      <gn-ui-thumbnail
+        [thumbnailUrl]="record.ownerOrganization?.logoUrl?.toString() || ''"
+        [fit]="'contain'"
+        class="w-full h-full rounded-lg"
+      ></gn-ui-thumbnail>
+    </div>
+    <div *ngIf="organization?.name" class="flex-1 w-0 overflow-hidden">
+      <div
+        class="text-xs text-black font-normal leading-tight truncate"
+        translate
+      >
+        record.card.metadata.contact
+      </div>
+      <div
+        data-cy="recordOrgName"
+        class="text-xl text-primary-black font-medium truncate"
+      >
+        {{ organization.name }}
+      </div>
+    </div>
+  </div>
+  <div *ngIf="size === 'L'" class="ml-2 flex space-x-2">
+    <div *ngIf="organization?.website" class="flex">
+      <button
+        [title]="organization.website"
+        class="w-[40px] h-[32px] flex items-center justify-center rounded-lg border border-[#D4D3D7] px-[8px] py-[4px] hover:bg-primary-lightest"
+        (click)="openExternalUrl($event, organization.website)"
+      >
+        <ng-icon name="iconoirInternet"></ng-icon>
+      </button>
+    </div>
+    <div *ngIf="contacts[0]?.email" class="flex">
+      <button
+        [title]="contacts[0].email"
+        class="w-[40px] h-[32px] flex items-center justify-center rounded-lg border border-[#D4D3D7] px-[8px] py-[4px] hover:bg-primary-lightest"
+        data-cy="contact-email"
+        (click)="openMailto($event, contacts[0].email)"
+      >
+        <ng-icon name="matEmailOutline"></ng-icon>
+      </button>
+    </div>
+    <div *ngIf="contacts[0]?.phone" class="flex">
+      <button
+        [title]="'Copy to clipboard'"
+        class="w-[40px] h-[32px] flex items-center justify-center rounded-lg border border-[#D4D3D7] px-[8px] py-[4px] hover:bg-primary-lightest relative group"
+        data-cy="contact-phone"
+        (click)="copyToClipboard($event, contacts[0].phone)"
+      >
+        <ng-icon name="matPhoneOutline"></ng-icon>
+      </button>
+    </div>
+    <div *ngIf="contacts[0]?.address" class="flex">
+      <button
+        [title]="'Copy to clipboard'"
+        class="w-[40px] h-[32px] flex items-center justify-center rounded-lg border border-[#D4D3D7] px-[8px] py-[4px] hover:bg-primary-lightest relative group"
+        data-cy="contact-phone"
+        (click)="copyToClipboard($event, contacts[0].address)"
+      >
+        <ng-icon name="matLocationOnOutline"></ng-icon>
+      </button>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,61 @@
+import { Component, Input } from '@angular/core'
+import { NgIf } from '@angular/common'
+import {
+  CatalogRecord,
+  Organization,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
+import { ThumbnailComponent } from '../thumbnail/thumbnail.component'
+import { NgIconComponent, provideIcons } from '@ng-icons/core'
+import {
+  matEmailOutline,
+  matPhoneOutline,
+  matLocationOnOutline,
+} from '@ng-icons/material-icons/outline'
+import { iconoirInternet } from '@ng-icons/iconoir'
+import { TranslateModule } from '@ngx-translate/core'
+
+@Component({
+  selector: 'gn-ui-internal-link-card-contact',
+  standalone: true,
+  imports: [NgIf, ThumbnailComponent, NgIconComponent, TranslateModule],
+  providers: [
+    provideIcons({
+      iconoirInternet,
+      matEmailOutline,
+      matPhoneOutline,
+      matLocationOnOutline,
+    }),
+  ],
+  templateUrl: './internal-link-card-contact.component.html',
+})
+export class InternalLinkCardContactComponent {
+  @Input() record: CatalogRecord
+  @Input() size: 'L' | 'M' | 'S' | 'XS' = 'M'
+
+  get organization(): Organization {
+    return this.record.ownerOrganization
+  }
+
+  get contacts() {
+    return (
+      (this.record.kind === 'dataset'
+        ? this.record.contactsForResource
+        : this.record.contacts) || []
+    )
+  }
+
+  openExternalUrl(event: Event, url: URL): void {
+    event.stopPropagation()
+    window.open(url, '_blank')
+  }
+
+  openMailto(event: Event, email: string): void {
+    event.stopPropagation()
+    window.open(`mailto:${email}`, '_blank')
+  }
+
+  copyToClipboard(event: Event, text: string): void {
+    event.stopPropagation()
+    navigator.clipboard.writeText(text)
+  }
+}

package/src/libs/ui/elements/src/lib/kind-badge/kind-badge.component.css

@@ -0,0 +1,6 @@
+:host gn-ui-badge ng-icon {
+  font-size: 1.2rem;
+  width: 1.2rem;
+  height: 1.2rem;
+  transform: translateY(-2px);
+}

package/src/libs/ui/elements/src/lib/kind-badge/kind-badge.component.html

@@ -0,0 +1,11 @@
+<div [class]="badgeClasses" *ngIf="kind">
+  <ng-icon [name]="iconKind" class="mr-1 text-[0.85em]"></ng-icon>
+
+  <ng-container *ngIf="contentTemplate; else defaultContent">
+    <ng-container *ngTemplateOutlet="contentTemplate"></ng-container>
+  </ng-container>
+</div>
+
+<ng-template #defaultContent>
+  {{ 'record.kind.' + kind | translate }}
+</ng-template>

package/src/libs/ui/elements/src/lib/kind-badge/kind-badge.component.ts

@@ -0,0 +1,70 @@
+import { CommonModule } from '@angular/common'
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  TemplateRef,
+} from '@angular/core'
+import { provideIcons } from '@ng-icons/core'
+import {
+  iconoirAppleWallet,
+  iconoirAppleShortcuts,
+  iconoirCode,
+  iconoirCreditCard,
+} from '@ng-icons/iconoir'
+import { NgIconsModule } from '@ng-icons/core'
+import { TranslateModule } from '@ngx-translate/core'
+import { marker } from '@biesbjerg/ngx-translate-extract-marker'
+
+marker('record.kind.dataset')
+marker('record.kind.reuse')
+marker('record.kind.service')
+
+enum KindConfig {
+  all = 'iconoirAppleWallet', // (this one is for filter)
+  dataset = 'iconoirAppleShortcuts',
+  service = 'iconoirCode',
+  reuse = 'iconoirCreditCard',
+}
+
+@Component({
+  selector: 'gn-ui-kind-badge',
+  templateUrl: './kind-badge.component.html',
+  styleUrls: ['./kind-badge.component.css'],
+  viewProviders: [
+    provideIcons({
+      iconoirAppleWallet,
+      iconoirAppleShortcuts,
+      iconoirCode,
+      iconoirCreditCard,
+    }),
+  ],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [NgIconsModule, CommonModule, TranslateModule],
+})
+export class KindBadgeComponent {
+  @Input() styling = 'default'
+  @Input() contentTemplate: TemplateRef<unknown>
+  @Input() kind: string
+
+  hasProjectedContent = false
+
+  get iconKind() {
+    return KindConfig[this.kind] || KindConfig.dataset
+  }
+
+  get badgeClasses(): string {
+    const baseClasses =
+      'badge-btn text-white text-xs px-2 font-bold shrink-0 flex items-center h-6 min-h-6'
+
+    switch (this.styling) {
+      case 'outline':
+        return `${baseClasses} bg-transparent border border-white py-1.5`
+      case 'default':
+        return `${baseClasses} bg-primary py-0.5`
+      default:
+        return 'flex items-center'
+    }
+  }
+}

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

@@ -5,7 +5,7 @@
   [ngClass]="cardClass"
   [title]="title"
 >
-  <div class="flex flex-col justify-between">
+  <div class="flex flex-col justify-between flex-1 min-w-0">
     <div class="gn-ui-card-title">
       {{ link.description || link.name }}
     </div>
@@ -26,7 +26,10 @@
       >
     </div>
   </div>
-  <div class="flex" [ngClass]="size === 'S' ? 'items-end' : 'items-center'">
+  <div
+    class="flex min-w-[32px]"
+    [ngClass]="size === 'S' ? 'items-end' : 'items-center'"
+  >
     <div class="gn-ui-card-icon">
       <ng-icon
         class="inline-block card-icon align-middle"

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

@@ -1,9 +1,5 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
-import {
-  DatasetDownloadDistribution,
-  DatasetOnlineResource,
-  DatasetServiceDistribution,
-} from '../../../../../../libs/common/domain/src/lib/model/record'
+import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { CommonModule } from '@angular/common'
 import {
   NgIconComponent,
@@ -30,7 +26,7 @@ type CardSize = 'L' | 'M' | 'S' | 'XS'
   ],
 })
 export class LinkCardComponent {
-  private _size: 'L' | 'M' | 'S' | 'XS'
+  private _size: CardSize
   @Input() link: DatasetOnlineResource
   private readonly sizeClassMap: Record<CardSize, string> = {
     L: 'gn-ui-card-l py-2 px-5',
@@ -43,7 +39,7 @@ export class LinkCardComponent {
     this._size = value
     this.cardClass = this.sizeClassMap[value]
   }
-  get size(): 'L' | 'M' | 'S' | 'XS' {
+  get size(): CardSize {
     return this._size
   }
   cardClass = ''

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

@@ -1,8 +1,6 @@
-<div>
-  <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">
+<div class="text-black">
+  <p class="text-base mb-3" translate>record.metadata.catalog</p>
+  <p class="font-title text-21 mb-1">
     {{ sourceLabel }}
   </p>
 </div>

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

@@ -1,7 +1,10 @@
-<div class="py-5 px-5 rounded bg-gray-100 text-black mb-6">
+<div
+  class="py-5 px-5 rounded bg-gray-100 text-black"
+  data-cy="metadata-organization"
+>
   <div class="grid gap-3 overflow-hidden">
     <div>
-      <p class="text-sm font-medium" translate>record.metadata.contact</p>
+      <p class="text-base font-medium" translate>record.metadata.contact</p>
     </div>
     <div
       *ngIf="shownOrganization?.logoUrl?.href"
@@ -13,12 +16,12 @@
         fit="contain"
       ></gn-ui-thumbnail>
     </div>
-    <div class="grid gap-1">
+    <div class="grid grid-cols-1 gap-1">
       <div class="flex">
         <div
-          class="text-primary font-title text-21 mr-2 cursor-pointer hover:underline"
+          class="font-title text-21 mr-2 cursor-pointer hover:underline"
           (click)="onOrganizationClick()"
-          data-cy="organization-name"
+          data-cy="organization-name-link"
         >
           {{ shownOrganization?.name }}
         </div>
@@ -27,7 +30,7 @@
         <a
           [href]="shownOrganization.website"
           target="_blank"
-          class="contact-website text-primary text-sm cursor-pointer hover:underline transition-all"
+          class="contact-website text-sm cursor-pointer hover:underline transition-all"
           >{{ shownOrganization.website }}
           <ng-icon
             class="!w-[12px] !h-[12px] opacity-75 shrink-0"
@@ -36,7 +39,7 @@
         </a>
       </div>
     </div>
-    <div class="grid gap-5 py-3 overflow-hidden">
+    <div class="grid grid-cols-1 gap-5 py-3 overflow-hidden">
       <div *ngIf="contacts[0]?.phone">
         <div class="flex">
           <ng-icon
@@ -49,7 +52,7 @@
         </div>
       </div>
       <div *ngIf="contacts[0]?.email">
-        <div class="flex">
+        <div class="flex gap-2">
           <ng-icon
             class="!w-5 !h-5 !text-[20px] opacity-75 shrink-0"
             name="matMailOutline"
@@ -57,7 +60,7 @@
           <a
             *ngIf="contacts.length"
             [href]="'mailto:' + contacts[0].email"
-            class="text-sm hover:underline ml-2"
+            class="break-all text-sm hover:underline"
             target="_blank"
             data-cy="contact-email"
             >{{ contacts[0].email }}</a

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

@@ -11,3 +11,12 @@
 :host ::ng-deep gn-ui-copy-text-button button ng-icon {
   transform: scale(0.8);
 }
+
+:host {
+  --gn-ui-badge-background-color: var(--color-primary-white);
+  --gn-ui-badge-text-color: var(--color-primary-darkest);
+}
+
+:host .metadata-info-keywords ::ng-deep gn-ui-badge:hover {
+  --gn-ui-badge-text-color: white;
+}

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

@@ -13,7 +13,7 @@
   </gn-ui-content-ghost>
 
   <p
-    class="mt-6 mb-3 font-medium text-primary text-sm"
+    class="mt-6 mb-3 font-medium text-black text-sm"
     translate
     *ngIf="!fieldReady('keywords') || metadata.keywords?.length"
   >
@@ -25,7 +25,7 @@
     [showContent]="fieldReady('keywords')"
   >
     <div *ngIf="metadata.keywords?.length">
-      <div class="sm:pb-4 flex flex-wrap gap-2">
+      <div class="metadata-info-keywords sm:pb-4 flex flex-wrap gap-2">
         <gn-ui-badge
           class="inline-block lowercase"
           (click)="onKeywordClick(keyword)"
@@ -46,6 +46,7 @@
     metadata.otherConstraints
   "
   [title]="'record.metadata.usage' | translate"
+  data-test="usage-panel"
 >
   <div class="flex flex-col gap-[10px] mr-4 py-[12px] rounded text-gray-900">
     <ng-container *ngFor="let license of licenses">
@@ -79,9 +80,12 @@
     </ng-container>
     <ng-container *ngIf="otherConstraints.length">
       <div gnUiLinkify *ngFor="let constraint of otherConstraints">
-        <h5 translate class="font-medium text-black text-sm mb-[2px] mt-[16px]">
+        <span
+          translate
+          class="font-medium text-black text-sm mb-[2px] mt-[16px]"
+        >
           record.metadata.otherConstraints
-        </h5>
+        </span>
         <div class="mb-6">
           <gn-ui-markdown-parser [textContent]="constraint">
           </gn-ui-markdown-parser>
@@ -96,12 +100,13 @@
 </gn-ui-expandable-panel>
 <gn-ui-expandable-panel
   *ngIf="
-    metadata.lineage ||
+    (metadata.kind === 'dataset' && metadata.lineage) ||
     metadata.resourceUpdated ||
     metadata.updateFrequency ||
-    metadata.status
+    (metadata.kind === 'dataset' && metadata.status)
   "
   [title]="'record.metadata.details' | translate"
+  data-test="details-panel"
 >
   <div *ngIf="metadata.lineage" class="text-gray-900 flex flex-col mt-4 gap-2">
     <p class="whitespace-pre-line break-words text-gray-900" gnUiLinkify>
@@ -225,9 +230,20 @@
     </div>
   </div>
 </gn-ui-expandable-panel>
+<gn-ui-expandable-panel
+  *ngIf="metadata.kind !== 'dataset' && metadata.spatialExtents"
+  [title]="'service.metadata.spatialExtent' | translate"
+  data-test="spatial-extent-panel"
+>
+  <gn-ui-spatial-extent
+    class="flex h-[271px] w-full rounded-lg border border-gray-100 mt-3 mb-6"
+    [spatialExtents]="metadata.spatialExtents"
+  ></gn-ui-spatial-extent>
+</gn-ui-expandable-panel>
 <gn-ui-expandable-panel
   *ngIf="metadata.landingPage"
-  [title]="'record.metadata.technical' | translate"
+  [title]="'service.metadata.other' | translate"
+  data-test="other-panel"
 >
   <div class="flex flex-col gap-4 mr-4 py-5 rounded text-gray-700">
     <div *ngIf="metadata.recordUpdated">
@@ -267,6 +283,7 @@
       <p class="text-sm mb-1" translate>record.metadata.topics</p>
       <div class="sm:pb-4 sm:pr-16">
         <gn-ui-badge
+          [clickable]="false"
           class="inline-block mr-2 mb-2 lowercase"
           *ngFor="let topic of metadata.topics"
           >{{ topic }}</gn-ui-badge

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

@@ -6,7 +6,7 @@ import {
   Output,
 } from '@angular/core'
 import {
-  DatasetRecord,
+  CatalogRecord,
   Keyword,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { DateService, getTemporalRangeUnion } from '../../../../../../libs/util/shared/src'
@@ -22,12 +22,17 @@ import {
 } from '../../../../../../libs/ui/inputs/src'
 import { ContentGhostComponent } from '../content-ghost/content-ghost.component'
 import { NgIcon, provideIcons } from '@ng-icons/core'
-import { CommonModule } from '@angular/common'
 import { matOpenInNew } from '@ng-icons/material-icons/baseline'
 import { matMailOutline } from '@ng-icons/material-icons/outline'
 import { ThumbnailComponent } from '../thumbnail/thumbnail.component'
 import { GnUiLinkifyDirective } from './linkify.directive'
 
+import { CommonModule } from '@angular/common'
+import {
+  MapContainerComponent,
+  SpatialExtentComponent,
+} from '../../../../../../libs/ui/map/src'
+
 @Component({
   selector: 'gn-ui-metadata-info',
   templateUrl: './metadata-info.component.html',
@@ -46,6 +51,8 @@ import { GnUiLinkifyDirective } from './linkify.directive'
     CopyTextButtonComponent,
     NgIcon,
     GnUiLinkifyDirective,
+    MapContainerComponent,
+    SpatialExtentComponent,
   ],
   viewProviders: [
     provideIcons({
@@ -55,7 +62,7 @@ import { GnUiLinkifyDirective } from './linkify.directive'
   ],
 })
 export class MetadataInfoComponent {
-  @Input() metadata: Partial<DatasetRecord>
+  @Input() metadata: Partial<CatalogRecord>
   @Input() incomplete: boolean
   @Output() keyword = new EventEmitter<Keyword>()
   updatedTimes: number
@@ -122,7 +129,8 @@ export class MetadataInfoComponent {
   }
 
   get temporalExtent(): { start: string; end: string } {
-    const temporalExtents = this.metadata.temporalExtents
+    const temporalExtents =
+      this.metadata.kind === 'dataset' ? this.metadata.temporalExtents : []
     return getTemporalRangeUnion(temporalExtents, this.dateService)
   }
 

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

@@ -1,9 +1,8 @@
 <div *ngIf="metadataQualityDisplay" class="metadata-quality">
   <div
     class="flex items-center"
-    [class]="
-      smaller ? 'leading-[8px] min-w-[120px] m-h-[120px]' : 'min-w-[200px]'
-    "
+    [class]="min - w - 0"
+    [ngClass]="{ 'text-xs leading-[8px] m-h-[120px]': smaller }"
   >
     <gn-ui-progress-bar
       tabindex="0"

package/src/libs/ui/elements/src/lib/metadata-quality/metadata-quality.component.ts

@@ -20,6 +20,10 @@ import { NgIcon } from '@ng-icons/core'
 import { matInfoOutline } from '@ng-icons/material-icons/outline'
 import { provideIcons, provideNgIconsConfig } from '@ng-icons/core'
 
+type QualityChecks = {
+  [key: string]: (metadata: Partial<CatalogRecord>) => boolean
+}
+
 @Component({
   selector: 'gn-ui-metadata-quality',
   templateUrl: './metadata-quality.component.html',
@@ -69,18 +73,53 @@ export class MetadataQualityComponent implements OnChanges {
       this.items.push({ name, value })
     }
   }
+  hasGetCapabilities(url: string): boolean {
+    return url.toLowerCase().includes('capabilities')
+  }
+
+  private readonly COMMON_CHECKS: QualityChecks = {
+    title: (metadata) => !!metadata?.title,
+    description: (metadata) => !!metadata?.abstract,
+    keywords: (metadata) => (metadata?.keywords?.length ?? 0) > 0,
+    legalConstraints: (metadata) =>
+      (metadata?.legalConstraints?.length ?? 0) > 0,
+    contact: (metadata) => !!metadata?.contacts?.[0]?.email,
+  }
+
+  private readonly SPECIFIC_CHECKS: Record<string, QualityChecks> = {
+    dataset: {
+      updateFrequency: (metadata) => !!metadata?.updateFrequency,
+      topic: (metadata) => (metadata?.topics?.length ?? 0) > 0,
+      organisation: (metadata) => !!metadata?.contacts?.[0]?.organization?.name,
+    },
+    service: {
+      capabilities: (metadata) =>
+        (metadata?.onlineResources ?? []).some((resource) =>
+          this.hasGetCapabilities(resource?.url?.href ?? '')
+        ),
+    },
+    reuse: {
+      topic: (metadata) => (metadata?.topics?.length ?? 0) > 0,
+      organisation: (metadata) => !!metadata?.contacts?.[0]?.organization?.name,
+      source: (metadata) => !!metadata?.extras?.sourcesIdentifiers,
+    },
+  }
 
   initialize() {
-    const contact = this.metadata?.contacts?.[0]
     this.items = []
-    this.add('title', !!this.metadata?.title)
-    this.add('description', !!this.metadata?.abstract)
-    this.add('topic', this.metadata?.topics?.length > 0)
-    this.add('keywords', this.metadata?.keywords?.length > 0)
-    this.add('legalConstraints', this.metadata?.legalConstraints?.length > 0)
-    this.add('organisation', !!contact?.organization)
-    this.add('contact', !!contact?.email)
-    this.add('updateFrequency', !!this.metadata?.updateFrequency)
+
+    Object.entries(this.COMMON_CHECKS).forEach(([name, check]) => {
+      this.add(name, check(this.metadata))
+    })
+
+    const datasetType = this.metadata?.kind
+    if (datasetType && this.SPECIFIC_CHECKS[datasetType]) {
+      Object.entries(this.SPECIFIC_CHECKS[datasetType]).forEach(
+        ([name, check]) => {
+          this.add(name, check(this.metadata))
+        }
+      )
+    }
   }
 
   ngOnChanges(changes: SimpleChanges): void {

package/src/libs/ui/elements/src/lib/metadata-quality-item/metadata-quality-item.component.ts

@@ -20,6 +20,10 @@ marker('record.metadata.quality.updateFrequency.success')
 marker('record.metadata.quality.updateFrequency.failed')
 marker('record.metadata.quality.organisation.success')
 marker('record.metadata.quality.organisation.failed')
+marker('record.metadata.quality.capabilities.success')
+marker('record.metadata.quality.capabilities.failed')
+marker('record.metadata.quality.source.success')
+marker('record.metadata.quality.source.failed')
 
 export interface MetadataQualityItem {
   name: string