geonetwork-ui 2.6.0-dev.f073bbb4e → 2.7.0-dev.32f2d4483

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

@@ -1,22 +1,33 @@
 <div
-  class="flex flex-wrap justify-between mt-8 mb-6 sm:mt-12 sm:mb-2"
+  class="flex flex-wrap justify-between items-center pb-4"
   *ngIf="links && links.length > 0"
 >
-  <p
-    class="font-title text-[28px] text-title font-medium mr-4 pb-4 text-center sm:text-left"
-    translate
-  >
-    record.metadata.download
-  </p>
+  <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 sm:pb-4"
+    class="flex flex-wrap justify-start sm:justify-end"
     data-cy="download-format-filters"
   >
     <gn-ui-button
       class="m-1 format-filter"
       [extraClass]="
         '!px-[12px] !py-[8px] !text-[15px]' +
-        (isFilterActive(format) ? ' opacity-100' : ' opacity-50')
+        (isFilterActive(format) ? ' opacity-100' : ' opacity-60')
       "
       (buttonClick)="toggleFilterFormat(format)"
       [attr.data-format]="format"
@@ -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/{link-card/link-card.component.html → external-link-card/external-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 → external-link-card/external-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,
@@ -12,16 +8,16 @@ 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({
-  selector: 'gn-ui-link-card',
-  templateUrl: './link-card.component.html',
-  styleUrls: ['./link-card.component.css'],
+  selector: 'gn-ui-external-link-card',
+  templateUrl: './external-link-card.component.html',
+  styleUrls: ['./external-link-card.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, NgIconComponent, TranslateModule],
+  imports: [CommonModule, NgIconComponent, TranslatePipe],
   providers: [
     provideIcons({
       matOpenInNew,
@@ -29,8 +25,8 @@ type CardSize = 'L' | 'M' | 'S' | 'XS'
     provideNgIconsConfig({ size: '1.5em' }),
   ],
 })
-export class LinkCardComponent {
-  private _size: 'L' | 'M' | 'S' | 'XS'
+export class ExternalLinkCardComponent {
+  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/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 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

@@ -0,0 +1,87 @@
+<a
+  [attr.href]="linkHref"
+  [target]="linkTarget"
+  class="record-card"
+  [ngClass]="cardClass"
+>
+  <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 }}
+      </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 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
+          >
+        </div>
+        <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-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
+            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>
+</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;
+  }
+}