geonetwork-ui 2.6.0-dev.26001d617 → 2.6.0-dev.261a0cba1

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

@@ -1,46 +1,26 @@
 import {
   Component,
+  ElementRef,
+  EventEmitter,
   Input,
-  TemplateRef,
   OnInit,
   Output,
-  EventEmitter,
-  ElementRef,
+  TemplateRef,
 } from '@angular/core'
-import {
-  CatalogRecord,
-  Organization,
-} from '../../../../../../libs/common/domain/src/lib/model/record'
+import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { NgClass, NgIf, NgTemplateOutlet } from '@angular/common'
+import { GeoDataBadgeComponent } from '../geo-data-badge/geo-data-badge.component'
+import { KindBadgeComponent } from '../kind-badge/kind-badge.component'
 import { MarkdownParserComponent } from '../markdown-parser/markdown-parser.component'
 import { MetadataQualityComponent } from '../metadata-quality/metadata-quality.component'
 import { ThumbnailComponent } from '../thumbnail/thumbnail.component'
-import {
-  propagateToDocumentOnly,
-  removeWhitespace,
-  stripHtml,
-} from '../../../../../../libs/util/shared/src'
-import {
-  NgIconComponent,
-  provideIcons,
-  provideNgIconsConfig,
-} from '@ng-icons/core'
-import {
-  matLocationSearchingOutline,
-  matEmailOutline,
-  matPhoneOutline,
-  matLocationOnOutline,
-} from '@ng-icons/material-icons/outline'
-import { matCode } from '@ng-icons/material-icons/baseline'
-import { iconoirDatabase, iconoirMap, iconoirInternet } from '@ng-icons/iconoir'
-import { TranslateModule } from '@ngx-translate/core'
-import { marker } from '@biesbjerg/ngx-translate-extract-marker'
+import { removeWhitespace, stripHtml } from '../../../../../../libs/util/shared/src'
+import { provideIcons, provideNgIconsConfig } from '@ng-icons/core'
+import { matLocationSearchingOutline } from '@ng-icons/material-icons/outline'
+import { InternalLinkCardContactComponent } from '../internal-link-card-contact/internal-link-card-contact.component'
+import { iconoirInternet } from '@ng-icons/iconoir'
 import { fromEvent, Subscription } from 'rxjs'
 
-marker('record.kind.data')
-marker('record.kind.reuse')
-marker('record.kind.service')
-
 type CardSize = 'L' | 'M' | 'S' | 'XS'
 
 @Component({
@@ -49,23 +29,18 @@ type CardSize = 'L' | 'M' | 'S' | 'XS'
   imports: [
     NgClass,
     NgIf,
-    ThumbnailComponent,
     MetadataQualityComponent,
     NgTemplateOutlet,
-    NgIconComponent,
-    TranslateModule,
+    GeoDataBadgeComponent,
+    KindBadgeComponent,
     MarkdownParserComponent,
+    InternalLinkCardContactComponent,
+    ThumbnailComponent,
   ],
   providers: [
     provideIcons({
-      matLocationSearchingOutline,
-      matCode,
-      iconoirDatabase,
-      iconoirMap,
       iconoirInternet,
-      matEmailOutline,
-      matPhoneOutline,
-      matLocationOnOutline,
+      matLocationSearchingOutline,
     }),
     provideNgIconsConfig({
       size: '1.2em',
@@ -76,10 +51,10 @@ type CardSize = 'L' | 'M' | 'S' | 'XS'
 })
 export class InternalLinkCardComponent implements OnInit {
   @Input() record: CatalogRecord
+  @Input() linkTarget = '_blank'
+  @Input() linkHref: string = null
   @Input() metadataQualityDisplay: boolean
   @Input() favoriteTemplate: TemplateRef<{ $implicit: CatalogRecord }>
-  @Input() linkHref: string = null
-  @Input() isGeodata: boolean
   @Input() set size(value: CardSize) {
     this._size = value
     this.cardClass = this.sizeClassMap[value] || ''
@@ -99,24 +74,24 @@ export class InternalLinkCardComponent implements OnInit {
   private _size: CardSize = 'M'
 
   private readonly sizeClassMap: Record<CardSize, string> = {
-    L: 'min-h-[190px] md:w-[992px] py-3 px-3 flex items-start gap-5',
-    M: 'min-h-[140px] md:w-[570px] py-3 px-3 flex items-start gap-4',
-    S: 'min-h-[220px] md:w-[370px] py-3 px-3 flex gap-4',
-    XS: 'min-h-[108px] md:w-[570px] py-3 px-3 flex gap-4',
+    L: 'min-h-[190px] w-full py-3 px-3 flex items-start gap-5',
+    M: 'min-h-[140px] py-3 px-3 flex items-start gap-4',
+    S: 'min-h-[220px] py-3 px-3 flex gap-4',
+    XS: 'min-h-[108px] py-3 px-3 flex gap-4',
   }
 
   private readonly thumbnailSizeClassMap: Record<CardSize, string> = {
-    L: 'w-[190px] h-[180px] rounded-lg overflow-hidden shrink-0',
+    L: 'w-full md:w-[190px] h-[180px] rounded-lg overflow-hidden shrink-0',
     M: 'w-[110px] h-[140px] rounded-lg overflow-hidden shrink-0',
     S: 'hidden',
     XS: 'hidden',
   }
 
   private readonly titleClassMap: Record<CardSize, string> = {
-    L: 'text-xl line-clamp-2',
+    L: 'text-xl line-clamp-1',
     M: 'text-base line-clamp-2',
-    S: 'text-base line-clamp-3',
-    XS: 'text-base mt-3 line-clamp-2',
+    S: 'text-base line-clamp-3 ml-2',
+    XS: 'text-base line-clamp-1 ml-2',
   }
 
   constructor(protected elementRef: ElementRef) {}
@@ -124,67 +99,31 @@ export class InternalLinkCardComponent implements OnInit {
   ngOnInit(): void {
     this.abstract = removeWhitespace(stripHtml(this.record?.abstract))
     this.subscription.add(
-      fromEvent(this.elementRef.nativeElement, 'click').subscribe(
-        (event: Event) => {
-          event.preventDefault()
-          propagateToDocumentOnly(event)
-          this.mdSelect.emit(this.record)
-        }
+      fromEvent(this.elementRef.nativeElement, 'click').subscribe(() =>
+        this.mdSelect.emit(this.record)
       )
     )
   }
 
-  get organization(): Organization {
-    return this.record.ownerOrganization
+  getTitleClass() {
+    return this.titleClassMap[this._size]
   }
-
-  get contacts() {
-    return (
-      (this.record.kind === 'dataset'
-        ? this.record.contactsForResource
-        : this.record.contacts) || []
-    )
+  getAbstractClass(): string {
+    const marginClass = ['S', 'XS'].includes(this.size) ? 'ml-2' : ''
+    const clampClass =
+      this.size === 'L' && !this.record.ownerOrganization?.name
+        ? 'line-clamp-6'
+        : 'line-clamp-2'
+    return `${clampClass} ${marginClass}`.trim()
   }
-
-  getTitleClass() {
+  displayAbstract(): boolean {
     return (
-      this.titleClassMap[this._size] +
-        ' ' +
-        (this.record.ownerOrganization?.name ? '' : 'mt-3') || ''
+      this.size === 'L' ||
+      (['M', 'S'].includes(this.size) && !this.record.ownerOrganization?.name)
     )
   }
 
-  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)
-  }
-
   get shouldShowThumbnail(): boolean {
     return this.size === 'L' || this.size === 'M'
   }
-
-  getKindInfo(): { text: string; icon: string } {
-    if (!this.record?.kind) return { text: '', icon: '' }
-
-    switch (this.record.kind.toLowerCase()) {
-      case 'dataset':
-        return { text: 'record.kind.data', icon: 'iconoirDatabase' }
-      case 'reuse':
-        return { text: 'record.kind.reuse', icon: 'iconoirMap' }
-      case 'service':
-        return { text: 'record.kind.service', icon: 'matCode' }
-      default:
-        return { text: '', icon: '' }
-    }
-  }
 }

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,
+  matLocationOnOutline,
+  matPhoneOutline,
+} from '@ng-icons/material-icons/outline'
+import { iconoirInternet } from '@ng-icons/iconoir'
+import { TranslateDirective } from '@ngx-translate/core'
+
+@Component({
+  selector: 'gn-ui-internal-link-card-contact',
+  standalone: true,
+  imports: [NgIf, ThumbnailComponent, NgIconComponent, TranslateDirective],
+  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.html

@@ -1,9 +1,11 @@
-<ng-icon [name]="iconKind" class="mr-1"></ng-icon>
+<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>
+  <ng-container *ngIf="contentTemplate; else defaultContent">
+    <ng-container *ngTemplateOutlet="contentTemplate"></ng-container>
+  </ng-container>
+</div>
 
 <ng-template #defaultContent>
-  {{ kind | translate }}
+  {{ 'record.kind.' + kind | translate }}
 </ng-template>

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

@@ -5,16 +5,19 @@ import {
   Input,
   TemplateRef,
 } from '@angular/core'
-import { provideIcons } from '@ng-icons/core'
+import { NgIconComponent, provideIcons } from '@ng-icons/core'
 import {
-  iconoirAppleWallet,
   iconoirAppleShortcuts,
+  iconoirAppleWallet,
   iconoirCode,
   iconoirCreditCard,
 } from '@ng-icons/iconoir'
-import { NgIconsModule } from '@ng-icons/core'
-import { BadgeComponent } from '../../../../../../libs/ui/inputs/src'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslatePipe } 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)
@@ -37,9 +40,10 @@ enum KindConfig {
   ],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [NgIconsModule, CommonModule, BadgeComponent, TranslateModule],
+  imports: [NgIconComponent, CommonModule, TranslatePipe],
 })
 export class KindBadgeComponent {
+  @Input() styling = 'default'
   @Input() contentTemplate: TemplateRef<unknown>
   @Input() kind: string
 
@@ -48,4 +52,18 @@ export class KindBadgeComponent {
   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.ts

@@ -8,7 +8,7 @@ import {
 } 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'
+import { TranslatePipe } from '@ngx-translate/core'
 
 type CardSize = 'L' | 'M' | 'S' | 'XS'
 @Component({
@@ -17,7 +17,7 @@ type CardSize = 'L' | 'M' | 'S' | 'XS'
   styleUrls: ['./link-card.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, NgIconComponent, TranslateModule],
+  imports: [CommonModule, NgIconComponent, TranslatePipe],
   providers: [
     provideIcons({
       matOpenInNew,

package/src/libs/ui/elements/src/lib/markdown-editor/markdown-editor.component.ts

@@ -8,8 +8,7 @@ import {
 } from '@angular/core'
 import { FormsModule } from '@angular/forms'
 import { MarkdownParserComponent } from '../markdown-parser/markdown-parser.component'
-import { TranslateModule } from '@ngx-translate/core'
-import { ButtonComponent, TextAreaComponent } from '../../../../../../libs/ui/inputs/src'
+import { TextAreaComponent } from '../../../../../../libs/ui/inputs/src'
 import { MatTooltipModule } from '@angular/material/tooltip'
 
 @Component({
@@ -22,10 +21,8 @@ import { MatTooltipModule } from '@angular/material/tooltip'
     CommonModule,
     FormsModule,
     MatTooltipModule,
-    ButtonComponent,
     TextAreaComponent,
     MarkdownParserComponent,
-    TranslateModule,
   ],
 })
 export class MarkdownEditorComponent {

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

@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslateDirective } from '@ngx-translate/core'
 
 @Component({
   selector: 'gn-ui-metadata-catalog',
@@ -7,7 +7,7 @@ import { TranslateModule } from '@ngx-translate/core'
   styleUrls: ['./metadata-catalog.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [TranslateModule],
+  imports: [TranslateDirective],
 })
 export class MetadataCatalogComponent {
   @Input() sourceLabel: string

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

@@ -1,5 +1,8 @@
-<div class="py-5 px-5 rounded-lg bg-gray-100 text-black">
-  <div class="grid grid-cols-1 gap-3 overflow-hidden">
+<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-base font-medium" translate>record.metadata.contact</p>
     </div>
@@ -18,7 +21,7 @@
         <div
           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>

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

@@ -22,7 +22,7 @@ import {
   matLocationOnOutline,
 } from '@ng-icons/material-icons/outline'
 import { CommonModule } from '@angular/common'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslateDirective } from '@ngx-translate/core'
 
 @Component({
   selector: 'gn-ui-metadata-contact',
@@ -30,7 +30,7 @@ import { TranslateModule } from '@ngx-translate/core'
   styleUrls: ['./metadata-contact.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, ThumbnailComponent, NgIcon, TranslateModule],
+  imports: [CommonModule, ThumbnailComponent, NgIcon, TranslateDirective],
   viewProviders: [
     provideIcons({
       matOpenInNew,

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

@@ -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">
@@ -105,6 +106,7 @@
     (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>
@@ -231,6 +233,7 @@
 <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"
@@ -240,6 +243,7 @@
 <gn-ui-expandable-panel
   *ngIf="metadata.landingPage"
   [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">

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

@@ -15,7 +15,7 @@ import {
   ExpandablePanelComponent,
   MaxLinesComponent,
 } from '../../../../../../libs/ui/layout/src'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
 import {
   BadgeComponent,
   CopyTextButtonComponent,
@@ -28,10 +28,7 @@ import { ThumbnailComponent } from '../thumbnail/thumbnail.component'
 import { GnUiLinkifyDirective } from './linkify.directive'
 
 import { CommonModule } from '@angular/common'
-import {
-  MapContainerComponent,
-  SpatialExtentComponent,
-} from '../../../../../../libs/ui/map/src'
+import { SpatialExtentComponent } from '../../../../../../libs/ui/map/src'
 
 @Component({
   selector: 'gn-ui-metadata-info',
@@ -41,7 +38,8 @@ import {
   standalone: true,
   imports: [
     CommonModule,
-    TranslateModule,
+    TranslateDirective,
+    TranslatePipe,
     MarkdownParserComponent,
     ExpandablePanelComponent,
     BadgeComponent,
@@ -51,7 +49,6 @@ import {
     CopyTextButtonComponent,
     NgIcon,
     GnUiLinkifyDirective,
-    MapContainerComponent,
     SpatialExtentComponent,
   ],
   viewProviders: [

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

@@ -2,7 +2,7 @@
   <div
     class="flex items-center"
     [class]="min - w - 0"
-    [ngClass]="{ 'leading-[8px] m-h-[120px]': smaller }"
+    [ngClass]="{ 'text-xs leading-[8px] m-h-[120px]': smaller }"
   >
     <gn-ui-progress-bar
       tabindex="0"