geonetwork-ui 2.6.0-dev.0739ca76d → 2.6.0-dev.0cd426aa4

package/src/libs/ui/elements/src/lib/download-item/download-item.component.html

@@ -1,20 +1,20 @@
 <a
   href="{{ link.url }}"
   target="_blank"
-  class="group flex flex-row justify-between card-shadow cursor-pointer rounded overflow-hidden"
+  class="group flex flex-row justify-between card-shadow cursor-pointer rounded overflow-hidden w-full"
   rel="noopener"
   [ngClass]="cardClass"
 >
-  <div class="flex flex-col justify-between">
+  <div class="flex flex-col flex-1 justify-between min-w-0">
     <div class="gn-ui-card-title" [title]="link.description || link.name">
       {{ link.description || link.name }}
     </div>
     <div class="gn-ui-card-detail">
       {{ link.name }}
     </div>
-    <div class="flex flex-row gap-2 items-center pt-1">
+    <div class="flex flex-row gap-2 items-center pt-1 min-w-0">
       <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"
+        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 whitespace-nowrap"
         [style.background-color]="color"
         data-cy="download-format"
         >{{ format || ('downloads.format.unknown' | translate) }}</span
@@ -24,7 +24,10 @@
       >
     </div>
   </div>
-  <div class="flex" [ngClass]="size === 'S' ? 'items-end' : 'items-center'">
+  <div
+    class="flex min-w-[32px] flex-shrink-0"
+    [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/download-item/download-item.component.ts

@@ -6,7 +6,7 @@ import {
   Output,
 } from '@angular/core'
 import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
 import { CommonModule } from '@angular/common'
 import { NgIcon, provideIcons } from '@ng-icons/core'
 import { iconoirDownload } from '@ng-icons/iconoir'
@@ -18,7 +18,7 @@ type CardSize = 'L' | 'M' | 'S' | 'XS'
   templateUrl: './download-item.component.html',
   styleUrls: ['./download-item.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [CommonModule, TranslateModule, NgIcon],
+  imports: [CommonModule, TranslateDirective, TranslatePipe, NgIcon],
   standalone: true,
   viewProviders: [
     provideIcons({
@@ -27,7 +27,7 @@ type CardSize = 'L' | 'M' | 'S' | 'XS'
   ],
 })
 export class DownloadItemComponent {
-  private _size: 'L' | 'M' | 'S' | 'XS'
+  private _size: CardSize
   @Input() link: DatasetOnlineResource
   @Input() color: string
   @Input() format: string
@@ -43,7 +43,7 @@ export class DownloadItemComponent {
     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/downloads-list/downloads-list.component.html

@@ -2,12 +2,23 @@
   class="flex flex-wrap justify-between items-center pb-4"
   *ngIf="links && links.length > 0"
 >
-  <div
-    class="font-title text-xl text-title font-medium mr-4 text-center sm:text-left"
-    translate
-  >
-    record.metadata.download
+  <div class="flex flex-row items-center gap-x-4">
+    <div>
+      <h3
+        class="inline-block font-title text-xl text-title font-medium mr-4"
+        translate
+      >
+        record.metadata.download
+      </h3>
+      <span class="px-3">({{ linksCount }})</span>
+    </div>
+    <gn-ui-previous-next-buttons
+      class="md:block hidden"
+      *ngIf="_list?.pagesCount > 1"
+      [listComponent]="_list"
+    ></gn-ui-previous-next-buttons>
   </div>
+
   <div
     class="flex flex-wrap justify-start sm:justify-end"
     data-cy="download-format-filters"
@@ -26,9 +37,29 @@
     </gn-ui-button>
   </div>
 </div>
-<div class="mb-2 sm:mb-3" *ngFor="let link of filteredLinks">
+
+<ng-container>
+  <gn-ui-block-list
+    class="md:block hidden"
+    #blockList
+    (listChanges)="updateList($event)"
+    containerClass="gap-4 pt-5 pb-7"
+  >
+    <gn-ui-download-item
+      #block
+      *ngFor="let link of filteredLinks"
+      [link]="link"
+      [color]="getLinkColor(link)"
+      [format]="getLinkFormat(link)"
+      [isFromApi]="isFromApi(link)"
+      [size]="blockList.subComponentSize"
+    ></gn-ui-download-item>
+  </gn-ui-block-list>
+</ng-container>
+
+<div class="mb-5 md:hidden block" *ngFor="let link of filteredLinks">
   <gn-ui-download-item
-    size="L"
+    size="M"
     [link]="link"
     [color]="getLinkColor(link)"
     [format]="getLinkFormat(link)"

package/src/libs/ui/elements/src/lib/downloads-list/downloads-list.component.ts

@@ -1,11 +1,20 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
-import { TranslateModule, TranslateService } from '@ngx-translate/core'
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  Input,
+} from '@angular/core'
+import { TranslateDirective, TranslateService } from '@ngx-translate/core'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 import { getBadgeColor, getFileFormat } from '../../../../../../libs/util/shared/src'
 import { DatasetDownloadDistribution } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { CommonModule } from '@angular/common'
 import { ButtonComponent } from '../../../../../../libs/ui/inputs/src'
 import { DownloadItemComponent } from '../download-item/download-item.component'
+import {
+  BlockListComponent,
+  PreviousNextButtonsComponent,
+} from '../../../../../../libs/ui/layout/src'
 
 marker('datahub.search.filter.all')
 marker('datahub.search.filter.others')
@@ -22,17 +31,32 @@ type FilterFormat = (typeof FILTER_FORMATS)[number]
   imports: [
     CommonModule,
     ButtonComponent,
+    BlockListComponent,
     DownloadItemComponent,
-    TranslateModule,
+    TranslateDirective,
+    PreviousNextButtonsComponent,
   ],
 })
 export class DownloadsListComponent {
-  constructor(private translateService: TranslateService) {}
+  constructor(
+    private translateService: TranslateService,
+    private changeDetector: ChangeDetectorRef
+  ) {}
 
+  _list: BlockListComponent
   @Input() links: DatasetDownloadDistribution[]
 
+  get linksCount(): number {
+    return this.filteredLinks?.length || 0
+  }
+
   activeFilterFormats: FilterFormat[] = ['all']
 
+  updateList($event: BlockListComponent) {
+    this._list = $event
+    this.changeDetector.detectChanges()
+  }
+
   private removeDuplicateFormats(
     links: DatasetDownloadDistribution[]
   ): DatasetDownloadDistribution[] {

package/src/libs/ui/elements/src/lib/error/error.component.ts

@@ -7,7 +7,7 @@ import {
   matQuestionMark,
 } from '@ng-icons/material-icons/baseline'
 import { matComputerOutline } from '@ng-icons/material-icons/outline'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslateDirective } from '@ngx-translate/core'
 
 export enum ErrorType {
   COULD_NOT_REACH_API,
@@ -24,7 +24,7 @@ export enum ErrorType {
   styleUrls: ['./error.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, NgIcon, TranslateModule],
+  imports: [CommonModule, NgIcon, TranslateDirective],
   viewProviders: [
     provideIcons({
       matFace,

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

@@ -0,0 +1,4 @@
+:host {
+  --gn-ui-geo-data-badge-background-color: var(--color-primary-white);
+  --gn-ui-geo-data-badge-text-color: var(--color-primary-darkest);
+}

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

@@ -0,0 +1,13 @@
+<div
+  [class]="badgeClasses"
+  [title]="'record.metadata.isGeographical' | translate"
+  *ngIf="isGeodata()"
+>
+  <ng-icon
+    class="shrink-0 text-[0.75em]"
+    name="matLocationSearchingOutline"
+  ></ng-icon>
+  <span class="ml-1 hidden sm:inline-block shrink-0" *ngIf="showLabel" translate
+    >record.metadata.isGeographical</span
+  >
+</div>

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 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,83 @@
-<div
-  class="rounded-lg group card-shadow cursor-pointer overflow-hidden hover:bg-gray-50"
-  [ngClass]="cardClass"
->
-  <div class="flex flex-row justify-between w-full">
+<a [attr.href]="linkHref" [target]="linkTarget">
+  <div
+    class="group rounded-md bg-white hover:cursor-pointer hover:bg-slate-50 overflow-hidden w-full"
+    [ngClass]="cardClass"
+  >
     <div
-      *ngIf="shouldShowThumbnail"
-      [ngClass]="thumbnailContainerClass"
-      class="mr-4 flex flex-col"
+      class="flex flex-row md:gap-0 justify-between w-full"
+      [ngClass]="{ 'flex-wrap md:flex-nowrap gap-3': size === 'L' }"
     >
-      <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()"
-      >
-        {{ record.title }}
-      </div>
       <div
-        *ngIf="size === 'L'"
-        class="mt-1 mb-2 font-normal text-xs text-gray-900 line-clamp-2 overflow-hidden"
+        *ngIf="shouldShowThumbnail"
+        [ngClass]="thumbnailContainerClass"
+        class="border mr-4 flex flex-col"
       >
-        <gn-ui-markdown-parser
-          [textContent]="abstract"
-          [whitoutStyles]="true"
-        ></gn-ui-markdown-parser>
+        <gn-ui-thumbnail
+          class="w-full h-full object-cover"
+          [thumbnailUrl]="record.overviews?.[0]?.url?.toString() || ''"
+          [fit]="'cover'"
+        ></gn-ui-thumbnail>
       </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"
-          >
-            <gn-ui-thumbnail
-              [thumbnailUrl]="
-                record.ownerOrganization?.logoUrl?.toString() || ''
-              "
-              [fit]="'contain'"
-              class="w-full h-full rounded-lg"
-            ></gn-ui-thumbnail>
+      <div class="grow flex flex-col gap-3 w-0">
+        <div class="flex items-center gap-2">
+          <div class="grow flex flex-wrap items-center gap-2">
+            <gn-ui-kind-badge
+              [styling]="'default'"
+              [kind]="record?.kind"
+            ></gn-ui-kind-badge>
+            <gn-ui-geo-data-badge
+              [showLabel]="size === 'L'"
+              [styling]="'light'"
+              [record]="record"
+            ></gn-ui-geo-data-badge>
+            <gn-ui-metadata-quality
+              class="flex items-center"
+              [smaller]="true"
+              [metadata]="record"
+              [metadataQualityDisplay]="metadataQualityDisplay"
+            ></gn-ui-metadata-quality>
           </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 *ngIf="size !== 'XS'" data-cy="recordFav">
+            <ng-container
+              [ngTemplateOutlet]="favoriteTemplate"
+              [ngTemplateOutletContext]="{ $implicit: record }"
+            ></ng-container>
           </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="grow flex flex-col gap-2">
+          <div
+            class="font-medium text-title group-hover:text-primary"
+            [title]="record.title"
+          >
+            <h4
+              class="mr-6 overflow-hidden"
+              [ngClass]="getTitleClass()"
+              data-cy="recordTitle"
+              [title]="record.title"
             >
-              <ng-icon name="matPhoneOutline"></ng-icon>
-            </button>
+              {{ record.title }}
+            </h4>
           </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
+            *ngIf="displayAbstract()"
+            class="mr-6 text-xs text-gray-900 overflow-hidden"
+            [ngClass]="getAbstractClass()"
+            data-cy="recordAbstract"
+          >
+            <gn-ui-markdown-parser
+              [textContent]="abstract"
+              [whitoutStyles]="true"
+            ></gn-ui-markdown-parser>
           </div>
         </div>
+
+        <gn-ui-internal-link-card-contact
+          *ngIf="size !== 'XS' && record.ownerOrganization?.name"
+          [record]="record"
+          [size]="size"
+        ></gn-ui-internal-link-card-contact>
       </div>
     </div>
   </div>
-</div>
+</a>