geonetwork-ui 2.6.0-dev.6681b0ab3 → 2.6.0-dev.6e0b3d33d

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

@@ -13,8 +13,12 @@ import {
   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 { 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 +41,10 @@ enum KindConfig {
   ],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [NgIconsModule, CommonModule, BadgeComponent, TranslateModule],
+  imports: [NgIconsModule, CommonModule, TranslateModule],
 })
 export class KindBadgeComponent {
+  @Input() styling = 'default'
   @Input() contentTemplate: TemplateRef<unknown>
   @Input() kind: string
 
@@ -48,4 +53,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/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"

package/src/libs/ui/elements/src/lib/record-feature-catalog/feature-catalog-list/feature-catalog-list.component.html

@@ -1,48 +1,107 @@
-<div class="flex flex-col gap-2 py-5 px-5 h-[562px] overflow-y-auto">
-  <div
-    *ngFor="let featureType of filteredFeatureCatalog?.featureTypes"
-    class="rounded shadow bg-white"
-  >
-    <gn-ui-expandable-panel
-      [collapsed]="filteredFeatureCatalog?.featureTypes?.length !== 1"
-      iconColor="black"
+<div
+  cdkScrollable
+  class="h-[562px] relative overflow-y-auto overflow-hidden"
+  data-cy="feat-catalog-scrollable"
+>
+  <div #scrollContainer class="flex flex-col gap-2 py-5 px-5">
+    <div
+      *ngFor="let featureType of filteredFeatureCatalog?.featureTypes"
+      class="rounded shadow bg-white"
     >
-      <ng-template #titleTemplate>
-        <div class="px-2">
-          <div class="text-lg font-bold">{{ featureType.name }}</div>
-          <div class="text-sm" *ngIf="featureType.definition">
-            {{ featureType.definition }}
-          </div>
-        </div>
-      </ng-template>
-      <div
-        class="grid gap-0"
-        [style.grid-template-columns]="gridTemplateColumns"
-        data-cy="feature-type-content"
+      <gn-ui-expandable-panel
+        #expanel
+        [collapsed]="filteredFeatureCatalog?.featureTypes?.length !== 1"
+        iconColor="black"
       >
+        <ng-template #titleTemplate>
+          <div class="px-2">
+            <div class="text-lg font-bold">{{ featureType.name }}</div>
+            <div class="text-sm" *ngIf="featureType.definition">
+              {{ featureType.definition }}
+            </div>
+          </div>
+        </ng-template>
         <div
-          class="py-1 px-2 text-sm font-bold text-left border-t"
-          [class.border-l]="i > 0"
-          [class.border-gray-300]="i > 0"
-          *ngFor="let col of columns; let i = index"
-          data-test="column-label"
+          *ngIf="expanel && !expanel.collapsed"
+          class="grid gap-0"
+          [style.grid-template-columns]="
+            getGridTemplateColumns(featureType.attributes)
+          "
+          data-cy="feature-type-content"
         >
-          {{ col.label | translate }}
-        </div>
-        <ng-container *ngFor="let row of featureType.attributes">
           <div
-            class="bg-white text-sm font-normal text-left border-t"
+            class="py-1 px-2 text-sm font-bold text-left border-t break-all"
             [class.border-l]="i > 0"
             [class.border-gray-300]="i > 0"
-            *ngFor="let col of columns; let i = index"
+            [ngClass]="col.class || ''"
+            *ngFor="
+              let col of getColumnsDefinition(featureType.attributes);
+              trackBy: trackByColumn;
+              let i = index
+            "
+            data-test="column-label"
           >
-            <gn-ui-truncated-text
-              extraClass="py-3 px-2"
-              [text]="row[col.key]"
-            ></gn-ui-truncated-text>
+            {{ 'feature.catalog.attribute.' + col.key | translate }}
           </div>
-        </ng-container>
-      </div>
-    </gn-ui-expandable-panel>
+          <ng-container *ngIf="expanel && !expanel.collapsed">
+            <ng-container *ngFor="let row of featureType.attributes">
+              <div
+                class="bg-white text-sm font-normal text-left border-t"
+                [class.border-l]="i > 0"
+                [class.border-gray-300]="i > 0"
+                *ngFor="
+                  let col of getColumnsDefinition(featureType.attributes);
+                  trackBy: trackByColumn;
+                  let i = index
+                "
+                data-test="cell-content"
+              >
+                <ng-container
+                  *ngIf="col.key === 'values'; then tplValues; else defaultTpl"
+                ></ng-container>
+
+                <ng-template #defaultTpl>
+                  <gn-ui-truncated-text
+                    [scrollContainer]="scrollContainer"
+                    [cdkScrollContainer]="scrollable"
+                    [text]="row[col.key]"
+                  ></gn-ui-truncated-text>
+                </ng-template>
+
+                <ng-template #tplValues>
+                  <gn-ui-cell-popin
+                    #popinRef
+                    [scrollContainer]="scrollContainer"
+                    [cdkScrollContainer]="scrollable"
+                    *ngIf="row.values?.length > 0"
+                  >
+                    <div cellContent data-cy="values-cell-popin-trigger">
+                      <gn-ui-button
+                        type="light"
+                        extraClass="bg-transparent border-none"
+                        (buttonClick)="popinRef.openOverlay()"
+                      >
+                        <ng-icon name="iconoirList" size="24"></ng-icon>
+                      </gn-ui-button>
+                    </div>
+                    <div
+                      popinContent
+                      class="max-h-60 overflow-y-auto min-w-64 py-4 px-6"
+                      style="scrollbar-width: thin"
+                    >
+                      <ul class="list-disc list-inside mr-4">
+                        <li *ngFor="let v of row.values">
+                          {{ v.label || v.code }}
+                        </li>
+                      </ul>
+                    </div>
+                  </gn-ui-cell-popin>
+                </ng-template>
+              </div>
+            </ng-container>
+          </ng-container>
+        </div>
+      </gn-ui-expandable-panel>
+    </div>
   </div>
 </div>

package/src/libs/ui/elements/src/lib/record-feature-catalog/feature-catalog-list/feature-catalog-list.component.ts

@@ -1,52 +1,83 @@
-import { Component, Input, OnInit } from '@angular/core'
+import { Component, ElementRef, Input, ViewChild } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { TranslateModule } from '@ngx-translate/core'
-import { DatasetFeatureCatalog } from '../../../../../../../libs/common/domain/src/lib/model/record'
+import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 import {
+  DatasetFeatureAttribute,
+  DatasetFeatureCatalog,
+} from '../../../../../../../libs/common/domain/src/lib/model/record'
+import { ButtonComponent } from '../../../../../../../libs/ui/inputs/src'
+import {
+  CellPopinComponent,
   ExpandablePanelComponent,
   TruncatedTextComponent,
 } from '../../../../../../../libs/ui/layout/src'
+import { CdkScrollable, ScrollingModule } from '@angular/cdk/scrolling'
+import { provideIcons, NgIconComponent } from '@ng-icons/core'
+import { iconoirList } from '@ng-icons/iconoir'
+
+marker('feature.catalog.attribute.type')
+marker('feature.catalog.attribute.name')
+marker('feature.catalog.attribute.code')
+marker('feature.catalog.attribute.definition')
+marker('feature.catalog.attribute.values')
+
+interface ColumnDefinition {
+  key: string
+  width: string
+  class?: string
+}
 
 @Component({
   selector: 'gn-ui-feature-catalog-list',
   templateUrl: './feature-catalog-list.component.html',
+  styleUrls: [],
   standalone: true,
   imports: [
+    ButtonComponent,
+    CellPopinComponent,
     CommonModule,
     TranslateModule,
     ExpandablePanelComponent,
     TruncatedTextComponent,
+    NgIconComponent,
+    ScrollingModule,
   ],
+  providers: [provideIcons({ iconoirList })],
 })
-export class FeatureCatalogListComponent implements OnInit {
-  @Input() filteredFeatureCatalog: DatasetFeatureCatalog
-
-  columns = [
-    {
-      key: 'type',
-      label: 'feature.catalog.attribute.type',
-      width: '19%',
-    },
-    {
-      key: 'name',
-      label: 'feature.catalog.attribute.name',
-      width: '32%',
-    },
-    {
-      key: 'code',
-      label: 'feature.catalog.attribute.code',
-      width: '24%',
-    },
-    {
-      key: 'title',
-      label: 'feature.catalog.attribute.description',
-      width: '25%',
-    },
+export class FeatureCatalogListComponent {
+  @Input() filteredFeatureCatalog!: DatasetFeatureCatalog
+
+  @ViewChild('scrollContainer') scrollContainer!: ElementRef
+  @ViewChild(CdkScrollable, { static: true }) scrollable!: CdkScrollable
+  @ViewChild('expanel', { read: ExpandablePanelComponent, static: true })
+  panelComponent: ExpandablePanelComponent
+
+  readonly COLUMNS_DEFAULT: ColumnDefinition[] = [
+    { key: 'type', width: '17%' },
+    { key: 'name', width: '32%' },
+    { key: 'code', width: '17%' },
+    { key: 'definition', width: 'minmax(0px, 1fr)' },
   ]
 
-  gridTemplateColumns = ''
+  readonly COLUMN_VALUES: ColumnDefinition = {
+    key: 'values',
+    width: '73px',
+    class: 'text-center',
+  }
+
+  getColumnsDefinition(attrs: DatasetFeatureAttribute[]): ColumnDefinition[] {
+    const hasValues = attrs.some((a) => a.values?.length > 0)
+    return [...this.COLUMNS_DEFAULT, ...(hasValues ? [this.COLUMN_VALUES] : [])]
+  }
+
+  getGridTemplateColumns(attributes: DatasetFeatureAttribute[]) {
+    return this.getColumnsDefinition(attributes)
+      .map((col) => col.width)
+      .join(' ')
+  }
 
-  ngOnInit(): void {
-    this.gridTemplateColumns = this.columns.map((col) => col.width).join(' ')
+  trackByColumn(_i: number, col: { key: string }) {
+    return col.key
   }
 }

package/src/libs/ui/elements/src/lib/related-record-card/related-record-card.component.html

@@ -1,30 +1,9 @@
-<a
-  [class]="classList"
-  [routerLink]="['/dataset', record.uniqueIdentifier]"
-  target="_blank"
+<gn-ui-internal-link-card
+  [linkHref]="linkHref"
+  [linkTarget]="'_blank'"
+  [record]="record"
+  [favoriteTemplate]="favoriteTemplate"
+  [metadataQualityDisplay]="metadataQualityDisplay"
+  [size]="size"
 >
-  <div class="h-52 bg-gray-100">
-    <gn-ui-thumbnail
-      class="h-52 w-full object-cover"
-      [thumbnailUrl]="record.overviews?.[0]?.url.toString()"
-    ></gn-ui-thumbnail>
-  </div>
-  <div class="flex flex-col justify-between h-44 px-5 pt-4 pb-6">
-    <h4
-      class="max-h-24 font-title text-21 text-black text-ellipsis overflow-hidden"
-    >
-      {{ record.title }}
-    </h4>
-    <div>
-      <button
-        [matTooltip]="'tooltip.url.open' | translate"
-        matTooltipPosition="above"
-      >
-        <ng-icon
-          class="align-middle text-secondary"
-          name="matOpenInNew"
-        ></ng-icon>
-      </button>
-    </div>
-  </div>
-</a>
+</gn-ui-internal-link-card>

package/src/libs/ui/elements/src/lib/related-record-card/related-record-card.component.ts

@@ -1,11 +1,19 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { ThumbnailComponent } from '../thumbnail/thumbnail.component'
+import { InternalLinkCardComponent } from '../internal-link-card/internal-link-card.component'
 import { RouterLink } from '@angular/router'
 import { MatTooltipModule } from '@angular/material/tooltip'
 import { NgIcon, provideIcons } from '@ng-icons/core'
 import { TranslateModule } from '@ngx-translate/core'
 import { matOpenInNew } from '@ng-icons/material-icons/baseline'
+import { TemplateRef } from '@angular/core'
 
 @Component({
   selector: 'gn-ui-related-record-card',
@@ -13,6 +21,7 @@ import { matOpenInNew } from '@ng-icons/material-icons/baseline'
   styleUrls: ['./related-record-card.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
+    InternalLinkCardComponent,
     ThumbnailComponent,
     RouterLink,
     MatTooltipModule,
@@ -25,8 +34,12 @@ import { matOpenInNew } from '@ng-icons/material-icons/baseline'
 export class RelatedRecordCardComponent {
   private readonly baseClasses: string
 
+  @Input() linkHref: string = null
   @Input() record: CatalogRecord
   @Input() extraClass = ''
+  @Input() favoriteTemplate: TemplateRef<{ $implicit: CatalogRecord }>
+  @Input() metadataQualityDisplay: boolean
+  @Input() size: string
 
   constructor() {
     this.baseClasses = [

package/src/libs/ui/elements/src/lib/service-capabilities/service-capabilities.component.html

@@ -16,17 +16,31 @@
             <div class="h-14 md:w-2/5 w-full mb-4 flex flex-row relative">
               <gn-ui-text-input
                 class="w-full"
+                [(value)]="searchQuery"
                 [extraClass]="getExtraInputClass()"
                 [placeholder]="'service.metadata.search' | translate"
                 (input)="onSearchChange($event)"
                 (keydown.enter)="onSearchEnter($event)"
               >
               </gn-ui-text-input>
+              <div
+                class="absolute right-14 h-14 w-14 flex items-center justify-center"
+              >
+                <button
+                  #inputBtn
+                  *ngIf="searchQuery"
+                  [aria-label]="'service.metadata.search.clear' | translate"
+                  (click)="clearSearch()"
+                  class="h-12 w-12 border-0 flex items-center justify-center"
+                >
+                  <ng-icon name="matClose"></ng-icon>
+                </button>
+              </div>
               <div class="border-l absolute border-gray-200 right-0 h-14 w-14">
                 <gn-ui-button
                   #inputBtn
                   type="outline"
-                  extraClass="h-12 w-12 border-0 absolute right-1 top-1"
+                  extraClass="h-12 w-12 border-0 absolute right-1 top-1 bg-white"
                   (buttonClick)="searchLayers()"
                 >
                   <ng-icon name="iconoirSearch"></ng-icon>

package/src/libs/ui/elements/src/lib/service-capabilities/service-capabilities.component.ts

@@ -16,6 +16,7 @@ import {
   WmsLayerFull,
   WmtsLayer,
 } from '@camptocamp/ogc-client'
+import { matClose } from '@ng-icons/material-icons/baseline'
 
 marker(`service.metadata.search`)
 marker(`service.metadata.capabilities.title`)
@@ -48,6 +49,7 @@ marker(`service.metadata.capabilities.attribution`)
     provideIcons({
       iconoirSearch,
       matInfoOutline,
+      matClose,
     }),
   ],
   templateUrl: './service-capabilities.component.html',
@@ -104,6 +106,12 @@ export class ServiceCapabilitiesComponent implements OnInit {
     }
   }
 
+  clearSearch() {
+    this.searchActive = false
+    this.searchQuery = ''
+    this.filteredLayers = this.availableLayers
+  }
+
   async loadLayers() {
     if (
       this.apiLinks.length > 0 &&
@@ -176,7 +184,7 @@ export class ServiceCapabilitiesComponent implements OnInit {
   }
 
   getExtraClass(layerItem) {
-    return layerItem.title === this.selectedLayer?.title
+    return layerItem === this.selectedLayer
       ? `h-8 rounded-lg bg-primary-darker text-white hover:text-primary-darker hover:bg-white`
       : `h-8 rounded-lg`
   }

package/src/libs/ui/elements/src/lib/ui-elements.module.ts

@@ -15,6 +15,7 @@ import { provideNgIconsConfig } from '@ng-icons/core'
 import { TranslateModule } from '@ngx-translate/core'
 import { AvatarComponent } from './avatar/avatar.component'
 import { ImageInputComponent } from './image-input/image-input.component'
+import { GeoDataBadgeComponent } from './geo-data-badge/geo-data-badge.component'
 import { MarkdownParserComponent } from './markdown-parser/markdown-parser.component'
 import { KindBadgeComponent } from './kind-badge/kind-badge.component'
 import { ThumbnailComponent } from './thumbnail/thumbnail.component'
@@ -23,6 +24,7 @@ import { UserPreviewComponent } from './user-preview/user-preview.component'
 import { ApplicationBannerComponent } from './application-banner/application-banner.component'
 import { InternalLinkCardComponent } from './internal-link-card/internal-link-card.component'
 import { ServiceCapabilitiesComponent } from './service-capabilities/service-capabilities.component'
+import { ScrollingModule } from '@angular/cdk/scrolling'
 @NgModule({
   imports: [
     CommonModule,
@@ -47,6 +49,8 @@ import { ServiceCapabilitiesComponent } from './service-capabilities/service-cap
     InternalLinkCardComponent,
     ServiceCapabilitiesComponent,
     KindBadgeComponent,
+    GeoDataBadgeComponent,
+    ScrollingModule,
   ],
   providers: [
     provideNgIconsConfig({
@@ -64,6 +68,7 @@ import { ServiceCapabilitiesComponent } from './service-capabilities/service-cap
     InternalLinkCardComponent,
     ServiceCapabilitiesComponent,
     KindBadgeComponent,
+    GeoDataBadgeComponent,
   ],
 })
 export class UiElementsModule {}

package/src/libs/ui/inputs/src/lib/autocomplete/autocomplete.component.html

@@ -79,7 +79,7 @@
   <mat-option
     *ngFor="let suggestion of suggestions$ | async"
     [value]="suggestion"
-    class="p-2 suggestion"
+    class="p-2 suggestion text-start"
   >
     {{ displayWithFnInternal(suggestion) }}
   </mat-option>

package/src/libs/ui/inputs/src/lib/star-toggle/star-toggle.component.html

@@ -1,8 +1,7 @@
-<div class="inline-block relative align-middle" style="line-height: 0.7em">
+<div class="inline-block relative align-middle">
   <gn-ui-button
     [type]="'outline'"
     [disabled]="disabled"
-    class="-m-[8px] p-[8px]"
     (buttonClick)="toggle($event)"
     [ngClass]="{
       enabled: toggled,

package/src/libs/ui/layout/src/index.ts

@@ -1,5 +1,6 @@
 export * from './lib/anchor-link/anchor-link.directive'
 export * from './lib/carousel/carousel.component'
+export * from './lib/cell-popin/cell-popin.component'
 export * from './lib/expandable-panel-button/expandable-panel-button.component'
 export * from './lib/expandable-panel/expandable-panel.component'
 export * from './lib/form-field-wrapper/form-field-wrapper.component'

package/src/libs/ui/layout/src/lib/cell-popin/cell-popin.component.html

@@ -0,0 +1,40 @@
+<div
+  class="h-full flex items-center justify-center"
+  cdkOverlayOrigin
+  #anchorRef
+  #trigger="cdkOverlayOrigin"
+  [class]="extraClass"
+  data-cy="cell-popin"
+>
+  <ng-content select="[cellContent]"></ng-content>
+  <ng-template
+    *ngIf="activePopin"
+    cdkConnectedOverlay
+    [cdkConnectedOverlayPush]="false"
+    [cdkConnectedOverlayOrigin]="trigger"
+    [cdkConnectedOverlayOpen]="isOpen"
+    [cdkConnectedOverlayPositions]="overlayPositions"
+    [cdkConnectedOverlayWidth]="'auto'"
+    [cdkConnectedOverlayFlexibleDimensions]="true"
+    [cdkConnectedOverlayGrowAfterOpen]="true"
+    (detach)="closeOverlay()"
+  >
+    <div
+      *ngIf="activePopin && isVisible"
+      class="bg-white shadow-lg border border-gray-300 relative"
+      data-cy="cell-popin-content"
+    >
+      <ng-content select="[popinContent]"></ng-content>
+      <gn-ui-button
+        data-cy="cell-popin-close"
+        [style.--gn-ui-button-background]="'bg-transparent'"
+        class="absolute top-2 right-2"
+        type="light"
+        (buttonClick)="closeOverlay()"
+        extraClass="w-10 h-8 px-1"
+      >
+        <ng-icon name="iconoirReduce" size="24"></ng-icon>
+      </gn-ui-button>
+    </div>
+  </ng-template>
+</div>