geonetwork-ui 2.6.0-dev.025a2f85d → 2.6.0-dev.02631a41f

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

@@ -0,0 +1,54 @@
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { matLocationSearchingOutline } from '@ng-icons/material-icons/outline'
+import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { CommonModule } from '@angular/common'
+import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
+import { NgIcon, provideIcons } from '@ng-icons/core'
+import { LinkClassifierService, LinkUsage } from '../../../../../../libs/util/shared/src'
+
+@Component({
+  selector: 'gn-ui-geo-data-badge',
+  templateUrl: './geo-data-badge.component.html',
+  styleUrls: ['./geo-data-badge.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule, NgIcon, TranslateDirective, TranslatePipe],
+  viewProviders: [
+    provideIcons({
+      matLocationSearchingOutline,
+    }),
+  ],
+})
+export class GeoDataBadgeComponent {
+  @Input() showLabel = true
+  @Input() styling = 'default'
+  @Input() record: CatalogRecord
+
+  isGeodata() {
+    const links =
+      'onlineResources' in this.record ? this.record.onlineResources : []
+    const hasMapApi = links.some((link) =>
+      this.linkClassifier.hasUsage(link, LinkUsage.MAP_API)
+    )
+    const hasGeoData = links.some((link) =>
+      this.linkClassifier.hasUsage(link, LinkUsage.GEODATA)
+    )
+    return hasMapApi || hasGeoData
+  }
+
+  get badgeClasses(): string {
+    const baseClasses =
+      'flex shrink-0 items-center badge-btn badge-btn text-xs px-2 h-6 min-h-6'
+
+    switch (this.styling) {
+      case 'light':
+        return `${baseClasses} bg-primary-white text-primary-darkest`
+      case 'default':
+        return `${baseClasses} bg-primary-darker text-white`
+      default:
+        return 'flex shrink-0 items-center'
+    }
+  }
+
+  constructor(public linkClassifier: LinkClassifierService) {}
+}

package/src/libs/ui/elements/src/lib/image-input/image-input.component.ts

@@ -30,7 +30,7 @@ import {
   iconoirMediaImageXmark,
   iconoirPlus,
 } from '@ng-icons/iconoir'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslatePipe } from '@ngx-translate/core'
 import { firstValueFrom } from 'rxjs'
 import { ImageOverlayPreviewComponent } from '../image-overlay-preview/image-overlay-preview.component'
 
@@ -45,7 +45,7 @@ import { ImageOverlayPreviewComponent } from '../image-overlay-preview/image-ove
     ButtonComponent,
     FilesDropDirective,
     MatProgressSpinnerModule,
-    TranslateModule,
+    TranslatePipe,
     UrlInputComponent,
     TextInputComponent,
     NgIconComponent,

package/src/libs/ui/elements/src/lib/image-overlay-preview/image-overlay-preview.component.html

@@ -5,7 +5,7 @@
   <div
     *ngIf="imageUrl"
     data-cy="record-thumbnail"
-    class="shrink-0 bg-gray-100 rounded-lg overflow-hidden border border-gray-300 group-hover:shadow-xl group-hover:border-0 h-full w-full"
+    class="shrink-0 rounded-lg overflow-hidden group-hover:shadow-xl group-hover:border-0 h-full w-full"
   >
     <gn-ui-thumbnail
       class="relative h-full w-full"

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

@@ -1,156 +1,87 @@
-<div
-  class="rounded-lg group card-shadow cursor-pointer overflow-hidden hover:bg-gray-50"
+<a
+  [attr.href]="linkHref"
+  [target]="linkTarget"
+  class="record-card"
   [ngClass]="cardClass"
 >
-  <div class="flex flex-row justify-between w-full">
-    <div
-      *ngIf="shouldShowThumbnail"
-      [ngClass]="thumbnailContainerClass"
-      class="mr-4 flex flex-col"
-    >
-      <gn-ui-thumbnail
-        class="w-full h-full object-cover"
-        [thumbnailUrl]="record.overviews?.[0]?.url?.toString() || ''"
-        [fit]="'cover'"
-      ></gn-ui-thumbnail>
-    </div>
-    <div
-      class="flex flex-col flex-1 relative"
-      [ngClass]="{
-        'justify-between': record.ownerOrganization?.name && size !== 'XS',
-      }"
-    >
-      <div class="flex items-center space-x-2">
-        <span
-          *ngIf="getKindInfo().text"
-          class="badge-btn text-white text-xs px-2 py-0.5 font-bold shrink-0 bg-primary leading-tight flex items-center justify-evenly h-6 min-h-6"
-        >
-          <ng-icon
-            class="text-[0.9em] text-white mr-1"
-            [name]="getKindInfo().icon"
-          ></ng-icon>
-          <span class="font-medium text-white text-xs" translate>
-            {{ getKindInfo().text }}
-          </span>
-        </span>
-        <span
-          *ngIf="isGeodata"
-          class="badge-btn text-black text-xs px-2 py-0.5 font-bold shrink-0 bg-primary-white leading-tight flex items-center justify-evenly h-6 min-h-6"
-          [ngClass]="size === 'L' ? 'w-[164px]' : 'w-8'"
-        >
-          <ng-icon
-            class="text-[0.9em] text-primary-darkest"
-            name="matLocationSearchingOutline"
-          ></ng-icon>
-          <ng-container *ngIf="size === 'L'">
-            <span
-              class="font-medium text-primary-darkest text-xs ml-1"
-              translate
-            >
-              record.metadata.type
-            </span>
-          </ng-container>
-        </span>
-        <div class="flex items-center">
-          <gn-ui-metadata-quality
-            [smaller]="true"
-            [metadata]="record"
-            [metadataQualityDisplay]="metadataQualityDisplay"
-          ></gn-ui-metadata-quality>
-        </div>
-        <div class="absolute top-0 right-0 items-center">
-          <ng-container
-            *ngIf="size !== 'XS'"
-            [ngTemplateOutlet]="favoriteTemplate"
-            [ngTemplateOutletContext]="{ $implicit: record }"
-          ></ng-container>
-        </div>
-      </div>
-      <div
-        class="font-medium text-title group-hover:text-primary overflow-hidden break-words"
-        [ngClass]="getTitleClass()"
+  <div *ngIf="shouldShowThumbnail" class="record-card__thumbnail">
+    <gn-ui-thumbnail
+      class="w-full h-full object-cover"
+      [thumbnailUrl]="record.overviews?.[0]?.url?.toString() || ''"
+      [fit]="'cover'"
+    ></gn-ui-thumbnail>
+  </div>
+  <div class="grow pt-1" [ngClass]="shouldShowThumbnail ? 'sm:w-0' : ''">
+    <div class="flex flex-col gap-2 h-full">
+      <h4
+        class="record-card__title"
+        data-cy="recordTitle"
+        [title]="record.title"
       >
         {{ record.title }}
-      </div>
-      <div
-        *ngIf="size === 'L'"
-        class="mt-1 mb-2 font-normal text-xs text-gray-900 line-clamp-2 overflow-hidden"
-      >
+      </h4>
+      <div class="grow">
         <gn-ui-markdown-parser
+          data-cy="recordAbstract"
           [textContent]="abstract"
           [whitoutStyles]="true"
+          class="record-card__abstract"
+          [title]="abstract"
         ></gn-ui-markdown-parser>
       </div>
-      <div
-        *ngIf="size !== 'XS' && record.ownerOrganization?.name"
-        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"
+      <div class="record-card__footer">
+        <div
+          data-cy="recordOrg"
+          *ngIf="record.ownerOrganization?.name"
+          class="grow flex flex-row gap-1 items-center text-primary-lighter"
+          [ngClass]="displayContactIconOnly ? 'justify-center' : ''"
+        >
+          <ng-icon
+            name="iconoirBank"
+            class="text-primary -translate-y-[0.5px] shrink-0"
+            [title]="record.ownerOrganization.name"
+          ></ng-icon>
+          <span
+            *ngIf="!displayContactIconOnly"
+            data-cy="recordOrgName"
+            class="line-clamp-1"
+            [title]="record.ownerOrganization.name"
+            >{{ record.ownerOrganization.name }}</span
           >
-            <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 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)"
+        <div class="record-card__footer__other">
+          <div
+            class="xs:border-r last:border-r-0 flex grow gap-4 px-4 last:pr-0"
+          >
+            <gn-ui-kind-badge
+              [extraClass]="'text-[1.2em]'"
+              [styling]="'gray'"
+              [kind]="record?.kind"
+              [contentTemplate]="customTemplate"
+              class="pt-1"
             >
-              <ng-icon name="matPhoneOutline"></ng-icon>
-            </button>
+              <ng-template #customTemplate></ng-template
+            ></gn-ui-kind-badge>
+            <gn-ui-metadata-quality
+              *ngIf="metadataQualityDisplay"
+              class="flex items-center min-w-[113px]"
+              [smaller]="true"
+              [metadata]="record"
+              [metadataQualityDisplay]="metadataQualityDisplay"
+            ></gn-ui-metadata-quality>
           </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
+            class="flex justify-center"
+            data-cy="recordFav"
+            [ngClass]="displayContactIconOnly ? 'px-1' : 'px-4'"
+          >
+            <ng-container
+              [ngTemplateOutlet]="favoriteTemplate"
+              [ngTemplateOutletContext]="{ $implicit: record }"
+            ></ng-container>
           </div>
         </div>
       </div>
     </div>
   </div>
-</div>
+</a>

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

@@ -0,0 +1,115 @@
+.record-card {
+  @apply rounded-md bg-white hover:cursor-pointer hover:bg-slate-50 overflow-hidden items-stretch flex flex-row md:gap-0 justify-between py-3 pl-3 pr-5;
+
+  &.size-L {
+    @apply w-full md:h-[208px] gap-5;
+  }
+
+  &.size-M {
+    @apply max-w-[940px] md:h-[231px] gap-4;
+  }
+
+  &.size-S {
+    @apply max-w-[572px] md:h-[315px] gap-4;
+  }
+
+  &.size-XS {
+    @apply max-w-[280px] md:h-[315px] gap-4;
+  }
+}
+
+.record-card:hover {
+  .record-card__title {
+    @apply text-primary;
+  }
+}
+
+.record-card__thumbnail {
+  @apply border rounded-lg overflow-hidden shrink-0;
+
+  .size-L & {
+    @apply w-full w-[190px] h-[184px];
+  }
+
+  .size-M & {
+    @apply w-full w-[138px] h-[207px];
+  }
+}
+
+.record-card__title {
+  @apply text-xl font-medium text-title leading-6;
+
+  .size-L & {
+    @apply line-clamp-2;
+  }
+
+  .size-M & {
+    @apply line-clamp-2 ml-2;
+  }
+
+  .size-S & {
+    @apply line-clamp-3 ml-2;
+  }
+
+  .size-XS & {
+    @apply line-clamp-3 ml-2;
+  }
+}
+
+.record-card__abstract {
+  @apply text-gray-900 overflow-hidden;
+
+  .size-L & {
+    @apply line-clamp-3;
+  }
+
+  .size-M & {
+    @apply line-clamp-3 ml-2;
+  }
+
+  .size-S & {
+    @apply line-clamp-4 ml-2;
+  }
+
+  .size-XS & {
+    @apply line-clamp-4 ml-2;
+  }
+}
+
+.record-card__footer {
+  @apply flex sm:flex-row flex-col flex-nowrap gap-3 justify-end items-center w-full border-t pt-1 overflow-hidden;
+
+  .size-S & {
+    @media (max-width: 450px) {
+      @apply flex-col items-stretch;
+    }
+  }
+
+  .size-XS & {
+    @apply flex-col items-stretch gap-2;
+  }
+}
+
+.record-card__footer__other {
+  @apply flex flex-col xs:flex-row flex-nowrap gap-3 xs:border-l first:border-l-0;
+
+  & > div {
+    @apply py-1;
+  }
+
+  .size-S &,
+  .size-S & > div {
+    @media (max-width: 450px) {
+      @apply border-0 px-0 py-0;
+    }
+  }
+
+  .size-XS &,
+  .size-XS & > div {
+    @apply border-0;
+  }
+
+  .size-XS & > div {
+    @apply px-0 py-0;
+  }
+}

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

@@ -1,45 +1,27 @@
 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 { NgClass, NgIf, NgTemplateOutlet } from '@angular/common'
-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 { fromEvent, Subscription } from 'rxjs'
+import { iconoirBank } from '@ng-icons/iconoir'
 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 { fromEvent, Subscription } from 'rxjs'
-
-marker('record.kind.data')
-marker('record.kind.reuse')
-marker('record.kind.service')
+import { matLocationSearchingOutline } from '@ng-icons/material-icons/outline'
+import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+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 { removeWhitespace, stripHtml } from '../../../../../../libs/util/shared/src'
 
 type CardSize = 'L' | 'M' | 'S' | 'XS'
 
@@ -49,41 +31,34 @@ type CardSize = 'L' | 'M' | 'S' | 'XS'
   imports: [
     NgClass,
     NgIf,
-    ThumbnailComponent,
+    NgIconComponent,
     MetadataQualityComponent,
     NgTemplateOutlet,
-    NgIconComponent,
-    TranslateModule,
+    KindBadgeComponent,
     MarkdownParserComponent,
+    ThumbnailComponent,
   ],
   providers: [
     provideIcons({
+      iconoirBank,
       matLocationSearchingOutline,
-      matCode,
-      iconoirDatabase,
-      iconoirMap,
-      iconoirInternet,
-      matEmailOutline,
-      matPhoneOutline,
-      matLocationOnOutline,
     }),
     provideNgIconsConfig({
       size: '1.2em',
     }),
   ],
   templateUrl: './internal-link-card.component.html',
-  styleUrls: ['./internal-link-card.component.css'],
+  styleUrls: ['./internal-link-card.component.scss'],
 })
 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] || ''
-    this.thumbnailContainerClass = this.thumbnailSizeClassMap[value] || 'hidden'
+    this.cardClass = `size-${value}`
   }
   get size(): CardSize {
     return this._size
@@ -92,99 +67,32 @@ export class InternalLinkCardComponent implements OnInit {
   subscription = new Subscription()
 
   abstract: string
+  cardClass: string
 
-  cardClass = ''
-  thumbnailContainerClass = ''
-
-  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',
-  }
-
-  private readonly thumbnailSizeClassMap: Record<CardSize, string> = {
-    L: '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',
-    M: 'text-base line-clamp-2',
-    S: 'text-base line-clamp-3',
-    XS: 'text-base mt-3 line-clamp-2',
-  }
+  private _size: CardSize = 'L'
 
   constructor(protected elementRef: ElementRef) {}
 
   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
-  }
-
-  get contacts() {
-    return (
-      (this.record.kind === 'dataset'
-        ? this.record.contactsForResource
-        : this.record.contacts) || []
-    )
-  }
-
-  getTitleClass() {
-    return (
-      this.titleClassMap[this._size] +
-        ' ' +
-        (this.record.ownerOrganization?.name ? '' : 'mt-3') || ''
-    )
-  }
-
-  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: '' }
-    }
+  get displayContactIconOnly() {
+    const cardWidth =
+      this.elementRef.nativeElement.getBoundingClientRect().width
+    return (
+      this.record.ownerOrganization?.name &&
+      this.metadataQualityDisplay &&
+      this.size === 'M' &&
+      cardWidth <= 490
+    )
   }
 }

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,15 @@
+<div
+  [class]="badgeClasses"
+  *ngIf="kind"
+  [title]="'record.kind.' + kind | translate"
+>
+  <ng-icon [name]="iconKind" [ngClass]="extraClass"></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>