geonetwork-ui 2.6.0-dev.582b4530a → 2.6.0-dev.6681b0ab3

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

@@ -37,7 +37,7 @@ import { TranslateModule } from '@ngx-translate/core'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 import { fromEvent, Subscription } from 'rxjs'
 
-marker('record.kind.dataset')
+marker('record.kind.data')
 marker('record.kind.reuse')
 marker('record.kind.service')
 
@@ -178,7 +178,7 @@ export class InternalLinkCardComponent implements OnInit {
 
     switch (this.record.kind.toLowerCase()) {
       case 'dataset':
-        return { text: 'record.kind.dataset', icon: 'iconoirDatabase' }
+        return { text: 'record.kind.data', icon: 'iconoirDatabase' }
       case 'reuse':
         return { text: 'record.kind.reuse', icon: 'iconoirMap' }
       case 'service':

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,9 @@
+<ng-icon [name]="iconKind" class="mr-1"></ng-icon>
+
+<ng-container *ngIf="contentTemplate; else defaultContent">
+  <ng-container *ngTemplateOutlet="contentTemplate"></ng-container>
+</ng-container>
+
+<ng-template #defaultContent>
+  {{ kind | translate }}
+</ng-template>

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

@@ -0,0 +1,51 @@
+import { CommonModule } from '@angular/common'
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  TemplateRef,
+} from '@angular/core'
+import { provideIcons } from '@ng-icons/core'
+import {
+  iconoirAppleWallet,
+  iconoirAppleShortcuts,
+  iconoirCode,
+  iconoirCreditCard,
+} from '@ng-icons/iconoir'
+import { NgIconsModule } from '@ng-icons/core'
+import { BadgeComponent } from '../../../../../../libs/ui/inputs/src'
+import { TranslateModule } from '@ngx-translate/core'
+
+enum KindConfig {
+  all = 'iconoirAppleWallet', // (this one is for filter)
+  dataset = 'iconoirAppleShortcuts',
+  service = 'iconoirCode',
+  reuse = 'iconoirCreditCard',
+}
+
+@Component({
+  selector: 'gn-ui-kind-badge',
+  templateUrl: './kind-badge.component.html',
+  styleUrls: ['./kind-badge.component.css'],
+  viewProviders: [
+    provideIcons({
+      iconoirAppleWallet,
+      iconoirAppleShortcuts,
+      iconoirCode,
+      iconoirCreditCard,
+    }),
+  ],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [NgIconsModule, CommonModule, BadgeComponent, TranslateModule],
+})
+export class KindBadgeComponent {
+  @Input() contentTemplate: TemplateRef<unknown>
+  @Input() kind: string
+
+  hasProjectedContent = false
+
+  get iconKind() {
+    return KindConfig[this.kind] || KindConfig.dataset
+  }
+}

package/src/libs/ui/elements/src/lib/link-card/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

@@ -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,
@@ -30,7 +26,7 @@ type CardSize = 'L' | 'M' | 'S' | 'XS'
   ],
 })
 export class LinkCardComponent {
-  private _size: 'L' | 'M' | 'S' | 'XS'
+  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/metadata-catalog/metadata-catalog.component.html

@@ -1,8 +1,6 @@
-<div>
-  <p class="text-gray-900 text-xs mb-3 uppercase" translate>
-    record.metadata.catalog
-  </p>
-  <p class="text-primary font-title text-21 mb-1">
+<div class="text-black">
+  <p class="text-base mb-3" translate>record.metadata.catalog</p>
+  <p class="font-title text-21 mb-1">
     {{ sourceLabel }}
   </p>
 </div>

package/src/libs/ui/elements/src/lib/metadata-contact/metadata-contact.component.html

@@ -1,7 +1,10 @@
-<div class="py-5 px-5 rounded bg-gray-100 text-black mb-6">
+<div
+  class="py-5 px-5 rounded bg-gray-100 text-black"
+  data-cy="metadata-organization"
+>
   <div class="grid gap-3 overflow-hidden">
     <div>
-      <p class="text-sm font-medium" translate>record.metadata.contact</p>
+      <p class="text-base font-medium" translate>record.metadata.contact</p>
     </div>
     <div
       *ngIf="shownOrganization?.logoUrl?.href"
@@ -13,12 +16,12 @@
         fit="contain"
       ></gn-ui-thumbnail>
     </div>
-    <div class="grid gap-1">
+    <div class="grid grid-cols-1 gap-1">
       <div class="flex">
         <div
-          class="text-primary font-title text-21 mr-2 cursor-pointer hover:underline"
+          class="font-title text-21 mr-2 cursor-pointer hover:underline"
           (click)="onOrganizationClick()"
-          data-cy="organization-name"
+          data-cy="organization-name-link"
         >
           {{ shownOrganization?.name }}
         </div>
@@ -27,7 +30,7 @@
         <a
           [href]="shownOrganization.website"
           target="_blank"
-          class="contact-website text-primary text-sm cursor-pointer hover:underline transition-all"
+          class="contact-website text-sm cursor-pointer hover:underline transition-all"
           >{{ shownOrganization.website }}
           <ng-icon
             class="!w-[12px] !h-[12px] opacity-75 shrink-0"
@@ -36,7 +39,7 @@
         </a>
       </div>
     </div>
-    <div class="grid gap-5 py-3 overflow-hidden">
+    <div class="grid grid-cols-1 gap-5 py-3 overflow-hidden">
       <div *ngIf="contacts[0]?.phone">
         <div class="flex">
           <ng-icon
@@ -49,7 +52,7 @@
         </div>
       </div>
       <div *ngIf="contacts[0]?.email">
-        <div class="flex">
+        <div class="flex gap-2">
           <ng-icon
             class="!w-5 !h-5 !text-[20px] opacity-75 shrink-0"
             name="matMailOutline"
@@ -57,7 +60,7 @@
           <a
             *ngIf="contacts.length"
             [href]="'mailto:' + contacts[0].email"
-            class="text-sm hover:underline ml-2"
+            class="break-all text-sm hover:underline"
             target="_blank"
             data-cy="contact-email"
             >{{ contacts[0].email }}</a

package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.css

@@ -11,3 +11,12 @@
 :host ::ng-deep gn-ui-copy-text-button button ng-icon {
   transform: scale(0.8);
 }
+
+:host {
+  --gn-ui-badge-background-color: var(--color-primary-white);
+  --gn-ui-badge-text-color: var(--color-primary-darkest);
+}
+
+:host .metadata-info-keywords ::ng-deep gn-ui-badge:hover {
+  --gn-ui-badge-text-color: white;
+}

package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html

@@ -13,7 +13,7 @@
   </gn-ui-content-ghost>
 
   <p
-    class="mt-6 mb-3 font-medium text-primary text-sm"
+    class="mt-6 mb-3 font-medium text-black text-sm"
     translate
     *ngIf="!fieldReady('keywords') || metadata.keywords?.length"
   >
@@ -25,7 +25,7 @@
     [showContent]="fieldReady('keywords')"
   >
     <div *ngIf="metadata.keywords?.length">
-      <div class="sm:pb-4 flex flex-wrap gap-2">
+      <div class="metadata-info-keywords sm:pb-4 flex flex-wrap gap-2">
         <gn-ui-badge
           class="inline-block lowercase"
           (click)="onKeywordClick(keyword)"
@@ -46,6 +46,7 @@
     metadata.otherConstraints
   "
   [title]="'record.metadata.usage' | translate"
+  data-test="usage-panel"
 >
   <div class="flex flex-col gap-[10px] mr-4 py-[12px] rounded text-gray-900">
     <ng-container *ngFor="let license of licenses">
@@ -79,9 +80,12 @@
     </ng-container>
     <ng-container *ngIf="otherConstraints.length">
       <div gnUiLinkify *ngFor="let constraint of otherConstraints">
-        <h5 translate class="font-medium text-black text-sm mb-[2px] mt-[16px]">
+        <span
+          translate
+          class="font-medium text-black text-sm mb-[2px] mt-[16px]"
+        >
           record.metadata.otherConstraints
-        </h5>
+        </span>
         <div class="mb-6">
           <gn-ui-markdown-parser [textContent]="constraint">
           </gn-ui-markdown-parser>
@@ -96,12 +100,13 @@
 </gn-ui-expandable-panel>
 <gn-ui-expandable-panel
   *ngIf="
-    metadata.lineage ||
+    (metadata.kind === 'dataset' && metadata.lineage) ||
     metadata.resourceUpdated ||
     metadata.updateFrequency ||
-    metadata.status
+    (metadata.kind === 'dataset' && metadata.status)
   "
   [title]="'record.metadata.details' | translate"
+  data-test="details-panel"
 >
   <div *ngIf="metadata.lineage" class="text-gray-900 flex flex-col mt-4 gap-2">
     <p class="whitespace-pre-line break-words text-gray-900" gnUiLinkify>
@@ -225,9 +230,20 @@
     </div>
   </div>
 </gn-ui-expandable-panel>
+<gn-ui-expandable-panel
+  *ngIf="metadata.kind !== 'dataset' && metadata.spatialExtents"
+  [title]="'service.metadata.spatialExtent' | translate"
+  data-test="spatial-extent-panel"
+>
+  <gn-ui-spatial-extent
+    class="flex h-[271px] w-full rounded-lg border border-gray-100 mt-3 mb-6"
+    [spatialExtents]="metadata.spatialExtents"
+  ></gn-ui-spatial-extent>
+</gn-ui-expandable-panel>
 <gn-ui-expandable-panel
   *ngIf="metadata.landingPage"
-  [title]="'record.metadata.technical' | translate"
+  [title]="'service.metadata.other' | translate"
+  data-test="other-panel"
 >
   <div class="flex flex-col gap-4 mr-4 py-5 rounded text-gray-700">
     <div *ngIf="metadata.recordUpdated">
@@ -267,6 +283,7 @@
       <p class="text-sm mb-1" translate>record.metadata.topics</p>
       <div class="sm:pb-4 sm:pr-16">
         <gn-ui-badge
+          [clickable]="false"
           class="inline-block mr-2 mb-2 lowercase"
           *ngFor="let topic of metadata.topics"
           >{{ topic }}</gn-ui-badge

package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.ts

@@ -6,7 +6,7 @@ import {
   Output,
 } from '@angular/core'
 import {
-  DatasetRecord,
+  CatalogRecord,
   Keyword,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { DateService, getTemporalRangeUnion } from '../../../../../../libs/util/shared/src'
@@ -22,12 +22,17 @@ import {
 } from '../../../../../../libs/ui/inputs/src'
 import { ContentGhostComponent } from '../content-ghost/content-ghost.component'
 import { NgIcon, provideIcons } from '@ng-icons/core'
-import { CommonModule } from '@angular/common'
 import { matOpenInNew } from '@ng-icons/material-icons/baseline'
 import { matMailOutline } from '@ng-icons/material-icons/outline'
 import { ThumbnailComponent } from '../thumbnail/thumbnail.component'
 import { GnUiLinkifyDirective } from './linkify.directive'
 
+import { CommonModule } from '@angular/common'
+import {
+  MapContainerComponent,
+  SpatialExtentComponent,
+} from '../../../../../../libs/ui/map/src'
+
 @Component({
   selector: 'gn-ui-metadata-info',
   templateUrl: './metadata-info.component.html',
@@ -46,6 +51,8 @@ import { GnUiLinkifyDirective } from './linkify.directive'
     CopyTextButtonComponent,
     NgIcon,
     GnUiLinkifyDirective,
+    MapContainerComponent,
+    SpatialExtentComponent,
   ],
   viewProviders: [
     provideIcons({
@@ -55,7 +62,7 @@ import { GnUiLinkifyDirective } from './linkify.directive'
   ],
 })
 export class MetadataInfoComponent {
-  @Input() metadata: Partial<DatasetRecord>
+  @Input() metadata: Partial<CatalogRecord>
   @Input() incomplete: boolean
   @Output() keyword = new EventEmitter<Keyword>()
   updatedTimes: number
@@ -122,7 +129,8 @@ export class MetadataInfoComponent {
   }
 
   get temporalExtent(): { start: string; end: string } {
-    const temporalExtents = this.metadata.temporalExtents
+    const temporalExtents =
+      this.metadata.kind === 'dataset' ? this.metadata.temporalExtents : []
     return getTemporalRangeUnion(temporalExtents, this.dateService)
   }
 

package/src/libs/ui/elements/src/lib/metadata-quality/metadata-quality.component.html

@@ -1,9 +1,8 @@
 <div *ngIf="metadataQualityDisplay" class="metadata-quality">
   <div
     class="flex items-center"
-    [class]="
-      smaller ? 'leading-[8px] min-w-[120px] m-h-[120px]' : 'min-w-[200px]'
-    "
+    [class]="min - w - 0"
+    [ngClass]="{ '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

@@ -0,0 +1,48 @@
+<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"
+    >
+      <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"
+      >
+        <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"
+        >
+          {{ 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.border-l]="i > 0"
+            [class.border-gray-300]="i > 0"
+            *ngFor="let col of columns; let i = index"
+          >
+            <gn-ui-truncated-text
+              extraClass="py-3 px-2"
+              [text]="row[col.key]"
+            ></gn-ui-truncated-text>
+          </div>
+        </ng-container>
+      </div>
+    </gn-ui-expandable-panel>
+  </div>
+</div>

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

@@ -0,0 +1,52 @@
+import { Component, Input, OnInit } 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 {
+  ExpandablePanelComponent,
+  TruncatedTextComponent,
+} from '../../../../../../../libs/ui/layout/src'
+
+@Component({
+  selector: 'gn-ui-feature-catalog-list',
+  templateUrl: './feature-catalog-list.component.html',
+  standalone: true,
+  imports: [
+    CommonModule,
+    TranslateModule,
+    ExpandablePanelComponent,
+    TruncatedTextComponent,
+  ],
+})
+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%',
+    },
+  ]
+
+  gridTemplateColumns = ''
+
+  ngOnInit(): void {
+    this.gridTemplateColumns = this.columns.map((col) => col.width).join(' ')
+  }
+}

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

@@ -0,0 +1,96 @@
+<div style="height: 652px" id="preview" *ngIf="apiLinks.length > 0">
+  <div class="bg-primary-opacity-10 overflow-visible" style="height: 420px">
+    <div class="container-lg px-4 lg:mx-auto">
+      <div>
+        <div class="gn-ui-section-title mb-6" translate>
+          service.metadata.capabilities
+        </div>
+        <div
+          *ngIf="loading"
+          class="flex justify-center w-full h-[200px] items-center"
+        >
+          <gn-ui-spinning-loader></gn-ui-spinning-loader>
+        </div>
+        <div *ngIf="!loading">
+          <div class="flex flex-row gap-5">
+            <div class="h-14 md:w-2/5 w-full mb-4 flex flex-row relative">
+              <gn-ui-text-input
+                class="w-full"
+                [extraClass]="getExtraInputClass()"
+                [placeholder]="'service.metadata.search' | translate"
+                (input)="onSearchChange($event)"
+                (keydown.enter)="onSearchEnter($event)"
+              >
+              </gn-ui-text-input>
+              <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"
+                  (buttonClick)="searchLayers()"
+                >
+                  <ng-icon name="iconoirSearch"></ng-icon>
+                </gn-ui-button>
+              </div>
+            </div>
+            <gn-ui-popover
+              [content]="popoverItems"
+              theme="light"
+              class="w-14 h-14 border border-gray-300 rounded-lg flex justify-center items-center"
+            >
+              <ng-icon name="matInfoOutline" class="w-6 h-6 pt-0.5"></ng-icon>
+            </gn-ui-popover>
+          </div>
+          <div
+            style="height: 500px"
+            class="bg-white shadow-xl rounded p-0 flex md:flex-row flex-col"
+          >
+            <div
+              class="flex flex-col gap-2 bg-gray-100 md:w-1/2 md:h-full w-full h-1/2 rounded-l overflow-y-auto py-5 pr-1 pl-3"
+              data-test="layer-list"
+            >
+              <gn-ui-button
+                *ngFor="let layerItem of filteredLayers"
+                type="outline"
+                [extraClass]="getExtraClass(layerItem)"
+                (buttonClick)="selectLayer(layerItem)"
+              >
+                {{ layerItem.title || layerItem.name }}
+              </gn-ui-button>
+              <span *ngIf="filteredLayers.length === 0" class="text-gray-800">
+                {{ 'service.metadata.filter.noLayers' | translate }}
+              </span>
+            </div>
+            <div
+              data-test="layer-information"
+              class="flex flex-col gap-4 md:h-full md:w-1/2 w-full h-1/2 py-5 px-10 overflow-y-auto"
+            >
+              <div
+                *ngFor="let item of layerInformation"
+                class="flex flex-row gap-4 border-b border-gray-200"
+              >
+                <span class="font-semibold w-24">{{ item.displayName }}</span>
+                <div *ngIf="isList(item.value)">
+                  <div
+                    *ngFor="let subItem of item.value"
+                    class="flex flex-row break-words max-w-72"
+                  >
+                    {{ subItem }}
+                  </div>
+                </div>
+                <div class="break-words max-w-72" *ngIf="!isList(item.value)">
+                  {{ item.value }}
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<ng-template #popoverItems>
+  <div class="p-2 py-4">
+    <div translate>service.metadata.filter</div>
+  </div>
+</ng-template>