geonetwork-ui 2.6.0-dev.10c659821 → 2.6.0-dev.14c46265d

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

@@ -1,9 +1,12 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { CommonModule } from '@angular/common'
 
 @Component({
   selector: 'gn-ui-avatar',
   templateUrl: './avatar.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule],
 })
 export class AvatarComponent {
   @Input() avatarUrl?: string

package/src/libs/ui/elements/src/lib/confirmation-dialog/confirmation-dialog.component.html

@@ -1,10 +1,14 @@
 <h1 mat-dialog-title>{{ data.title }}</h1>
 <div mat-dialog-content>{{ data.message }}</div>
 <div mat-dialog-actions>
-  <gn-ui-button (buttonClick)="onCancel()">{{ data.cancelText }}</gn-ui-button>
+  <gn-ui-button
+    [attr.cdkFocusInitial]="focusCancel"
+    (buttonClick)="onCancel()"
+    >{{ data.cancelText }}</gn-ui-button
+  >
   <gn-ui-button
     (buttonClick)="onConfirm()"
-    cdkFocusInitial
+    [attr.cdkFocusInitial]="!focusCancel"
     class="ml-2"
     data-cy="confirm-button"
     >{{ data.confirmText }}</gn-ui-button

package/src/libs/ui/elements/src/lib/confirmation-dialog/confirmation-dialog.component.ts

@@ -7,6 +7,7 @@ import {
 import { ButtonComponent } from '../../../../../../libs/ui/inputs/src'
 
 export interface ConfirmationDialogData {
+  focusCancel: string
   title: string
   message: string
   confirmText: string
@@ -22,10 +23,13 @@ export interface ConfirmationDialogData {
   imports: [MatDialogModule, ButtonComponent],
 })
 export class ConfirmationDialogComponent {
+  focusCancel = null
   constructor(
     public dialogRef: MatDialogRef<ConfirmationDialogComponent>,
     @Inject(MAT_DIALOG_DATA) public data: ConfirmationDialogData
-  ) {}
+  ) {
+    this.focusCancel = data.focusCancel ? true : null
+  }
 
   onConfirm() {
     this.dialogRef.close(true)

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({

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

@@ -1,12 +1,10 @@
 import {
-  AfterViewInit,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
   Input,
-  ViewChild,
 } from '@angular/core'
-import { TranslateModule, TranslateService } from '@ngx-translate/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'
@@ -15,7 +13,6 @@ import { ButtonComponent } from '../../../../../../libs/ui/inputs/src'
 import { DownloadItemComponent } from '../download-item/download-item.component'
 import {
   BlockListComponent,
-  Paginable,
   PreviousNextButtonsComponent,
 } from '../../../../../../libs/ui/layout/src'
 
@@ -36,7 +33,7 @@ type FilterFormat = (typeof FILTER_FORMATS)[number]
     ButtonComponent,
     BlockListComponent,
     DownloadItemComponent,
-    TranslateModule,
+    TranslateDirective,
     PreviousNextButtonsComponent,
   ],
 })

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.ts → external-link-card/external-link-card.component.ts}

@@ -8,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,
@@ -25,7 +25,7 @@ type CardSize = 'L' | 'M' | 'S' | 'XS'
     provideNgIconsConfig({ size: '1.5em' }),
   ],
 })
-export class LinkCardComponent {
+export class ExternalLinkCardComponent {
   private _size: CardSize
   @Input() link: DatasetOnlineResource
   private readonly sizeClassMap: Record<CardSize, string> = {

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

@@ -2,7 +2,7 @@ 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 { TranslateModule } from '@ngx-translate/core'
+import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
 import { NgIcon, provideIcons } from '@ng-icons/core'
 import { LinkClassifierService, LinkUsage } from '../../../../../../libs/util/shared/src'
 
@@ -12,7 +12,7 @@ import { LinkClassifierService, LinkUsage } from '../../../../../../libs/util/sh
   styleUrls: ['./geo-data-badge.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, NgIcon, TranslateModule],
+  imports: [CommonModule, NgIcon, TranslateDirective, TranslatePipe],
   viewProviders: [
     provideIcons({
       matLocationSearchingOutline,
@@ -38,7 +38,7 @@ export class GeoDataBadgeComponent {
 
   get badgeClasses(): string {
     const baseClasses =
-      'flex shrink-0 items-center badge-btn text-xs px-2 h-6 min-h-6'
+      'flex shrink-0 items-center badge-btn badge-btn text-xs px-2 h-6 min-h-6'
 
     switch (this.styling) {
       case 'light':

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/internal-link-card/internal-link-card.component.html

@@ -1,82 +1,86 @@
-<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
-      class="flex flex-row md:gap-0 justify-between w-full"
-      [ngClass]="{ 'flex-wrap md:flex-nowrap gap-3': size === 'L' }"
-    >
-      <div
-        *ngIf="shouldShowThumbnail"
-        [ngClass]="thumbnailContainerClass"
-        class="border mr-4 flex flex-col"
+<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"
       >
-        <gn-ui-thumbnail
-          class="w-full h-full object-cover"
-          [thumbnailUrl]="record.overviews?.[0]?.url?.toString() || ''"
-          [fit]="'cover'"
-        ></gn-ui-thumbnail>
+        {{ 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="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">
+      <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
-              [styling]="'default'"
+              [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-geo-data-badge
-              [showLabel]="size === 'L'"
-              [styling]="'light'"
-              [record]="record"
-            ></gn-ui-geo-data-badge>
             <gn-ui-metadata-quality
-              class="flex items-center"
+              *ngIf="metadataQualityDisplay"
+              class="flex items-center min-w-[113px]"
               [smaller]="true"
               [metadata]="record"
               [metadataQualityDisplay]="metadataQualityDisplay"
             ></gn-ui-metadata-quality>
           </div>
-          <div *ngIf="size !== 'XS'" data-cy="recordFav">
+          <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 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"
-            >
-              {{ record.title }}
-            </h4>
-          </div>
-          <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>

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,26 +1,27 @@
 import {
   Component,
+  ElementRef,
+  EventEmitter,
   Input,
-  TemplateRef,
   OnInit,
   Output,
-  EventEmitter,
-  ElementRef,
+  TemplateRef,
 } from '@angular/core'
-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 { fromEvent, Subscription } from 'rxjs'
+import { iconoirBank } from '@ng-icons/iconoir'
+import {
+  NgIconComponent,
+  provideIcons,
+  provideNgIconsConfig,
+} from '@ng-icons/core'
+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 { InternalLinkCardContactComponent } from '../internal-link-card-contact/internal-link-card-contact.component'
-import { removeWhitespace, stripHtml } from '../../../../../../libs/util/shared/src'
-import { provideIcons, provideNgIconsConfig } from '@ng-icons/core'
-import { matLocationSearchingOutline } from '@ng-icons/material-icons/outline'
-import { iconoirInternet } from '@ng-icons/iconoir'
-import { TranslateModule } from '@ngx-translate/core'
-import { fromEvent, Subscription } from 'rxjs'
 import { ThumbnailComponent } from '../thumbnail/thumbnail.component'
+import { removeWhitespace, stripHtml } from '../../../../../../libs/util/shared/src'
 
 type CardSize = 'L' | 'M' | 'S' | 'XS'
 
@@ -30,18 +31,16 @@ type CardSize = 'L' | 'M' | 'S' | 'XS'
   imports: [
     NgClass,
     NgIf,
+    NgIconComponent,
     MetadataQualityComponent,
     NgTemplateOutlet,
-    TranslateModule,
-    GeoDataBadgeComponent,
     KindBadgeComponent,
     MarkdownParserComponent,
-    InternalLinkCardContactComponent,
     ThumbnailComponent,
   ],
   providers: [
     provideIcons({
-      iconoirInternet,
+      iconoirBank,
       matLocationSearchingOutline,
     }),
     provideNgIconsConfig({
@@ -49,7 +48,7 @@ type CardSize = 'L' | 'M' | 'S' | 'XS'
     }),
   ],
   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
@@ -59,8 +58,7 @@ export class InternalLinkCardComponent implements OnInit {
   @Input() favoriteTemplate: TemplateRef<{ $implicit: CatalogRecord }>
   @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
@@ -69,32 +67,9 @@ 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] 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-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-1',
-    M: 'text-base line-clamp-2',
-    S: 'text-base line-clamp-3 ml-2',
-    XS: 'text-base line-clamp-1 ml-2',
-  }
+  private _size: CardSize = 'L'
 
   constructor(protected elementRef: ElementRef) {}
 
@@ -106,26 +81,18 @@ export class InternalLinkCardComponent implements OnInit {
       )
     )
   }
-
-  getTitleClass() {
-    return this.titleClassMap[this._size]
-  }
-  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()
+  get shouldShowThumbnail(): boolean {
+    return this.size === 'L' || this.size === 'M'
   }
-  displayAbstract(): boolean {
+
+  get displayContactIconOnly() {
+    const cardWidth =
+      this.elementRef.nativeElement.getBoundingClientRect().width
     return (
-      this.size === 'L' ||
-      (['M', 'S'].includes(this.size) && !this.record.ownerOrganization?.name)
+      this.record.ownerOrganization?.name &&
+      this.metadataQualityDisplay &&
+      this.size === 'M' &&
+      cardWidth <= 490
     )
   }
-
-  get shouldShowThumbnail(): boolean {
-    return this.size === 'L' || this.size === 'M'
-  }
 }

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

@@ -1,5 +1,9 @@
-<div [class]="badgeClasses" *ngIf="kind">
-  <ng-icon [name]="iconKind" class="mr-1 text-[0.85em]"></ng-icon>
+<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>