geonetwork-ui 2.6.0-dev.0716b5712 → 2.6.0-dev.0739ca76d

package/src/libs/feature/search/src/lib/feature-search.module.ts

@@ -26,8 +26,6 @@ import {
   SpinningLoaderComponent,
   UiWidgetsModule,
 } from '../../../../../libs/ui/widgets/src'
-import { RecordsRepositoryInterface } from '../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
-import { Gn4Repository } from '../../../../../libs/api/repository/src'
 import { FavoriteStarComponent } from './favorites/favorite-star/favorite-star.component'
 
 @NgModule({
@@ -72,11 +70,5 @@ import { FavoriteStarComponent } from './favorites/favorite-star/favorite-star.c
     SearchStateContainerDirective,
     FilterDropdownComponent,
   ],
-  providers: [
-    {
-      provide: RecordsRepositoryInterface,
-      useClass: Gn4Repository,
-    },
-  ],
 })
 export class FeatureSearchModule {}

package/src/libs/feature/search/src/lib/record-url.token.ts

@@ -1,4 +1,13 @@
 import { InjectionToken } from '@angular/core'
 
 // expects the replacement key ${uuid}
-export const RECORD_URL_TOKEN = new InjectionToken<string>('record-url-token')
+export const RECORD_DATASET_URL_TOKEN = new InjectionToken<string>(
+  'record-dataset-url-token'
+)
+export const RECORD_SERVICE_URL_TOKEN = new InjectionToken<string>(
+  'record-service-url-token'
+)
+
+export const RECORD_REUSE_URL_TOKEN = new InjectionToken<string>(
+  'record-reuse-url-token'
+)

package/src/libs/feature/search/src/lib/results-list/results-list.container.component.css

@@ -0,0 +1,6 @@
+:host {
+  --gn-ui-button-height: 24px;
+  --gn-ui-button-width: 24px;
+  --gn-ui-button-color: var(--color-secondary);
+  --gn-ui-button-border-width: 0px;
+}

package/src/libs/feature/search/src/lib/results-list/results-list.container.component.html

@@ -16,6 +16,7 @@
         type="secondary"
         (buttonClick)="onShowMore()"
         extraClass="m-auto !p-[22px]"
+        [style.--gn-ui-button-width]="!auto"
       >
         <span class="uppercase font-medium tracking-widest" translate
           >results.showMore</span

package/src/libs/feature/search/src/lib/results-list/results-list.container.component.ts

@@ -17,7 +17,11 @@ import {
   ResultsLayoutConfigItem,
   ResultsLayoutConfigModel,
 } from '../../../../../../libs/ui/search/src'
-import { RECORD_URL_TOKEN } from '../record-url.token'
+import {
+  RECORD_DATASET_URL_TOKEN,
+  RECORD_SERVICE_URL_TOKEN,
+  RECORD_REUSE_URL_TOKEN,
+} from '../record-url.token'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 export type ResultsListShowMoreStrategy = 'auto' | 'button' | 'none'
@@ -49,8 +53,12 @@ export class ResultsListContainerComponent implements OnInit {
     @Inject(RESULTS_LAYOUT_CONFIG)
     private resultsLayoutConfig: ResultsLayoutConfigModel,
     @Optional()
-    @Inject(RECORD_URL_TOKEN)
-    private recordUrlTemplate: string
+    @Inject(RECORD_DATASET_URL_TOKEN)
+    private recordDatasetUrlTemplate: string,
+    @Inject(RECORD_SERVICE_URL_TOKEN)
+    private recordServiceUrlTemplate: string,
+    @Inject(RECORD_REUSE_URL_TOKEN)
+    private recordReuseUrlTemplate: string
   ) {}
 
   ngOnInit(): void {
@@ -103,7 +111,18 @@ export class ResultsListContainerComponent implements OnInit {
   }
 
   getRecordUrl(metadata: CatalogRecord) {
-    if (!this.recordUrlTemplate) return null
-    return this.recordUrlTemplate.replace('${uuid}', metadata.uniqueIdentifier)
+    const tokenMap = {
+      dataset: this.recordDatasetUrlTemplate,
+      service: this.recordServiceUrlTemplate,
+      reuse: this.recordReuseUrlTemplate,
+    }
+    if (
+      !this.recordDatasetUrlTemplate &&
+      !this.recordServiceUrlTemplate &&
+      !this.recordReuseUrlTemplate
+    )
+      return null
+    const urlKind = tokenMap[metadata.kind]
+    return urlKind.replace('${uuid}', metadata.uniqueIdentifier)
   }
 }

package/src/libs/ui/catalog/src/lib/language-switcher/language-switcher.component.html

@@ -5,6 +5,6 @@
   [selected]="currentLang"
   ariaName="languages"
   [showTitle]="false"
-  extraBtnClass="bg-transparent flex justify-items-center !pl-2 !py-1"
+  extraBtnClass="bg-transparent flex justify-items-center !pl-2 !py-1 rounded-lg"
 >
 </gn-ui-dropdown-selector>

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

@@ -23,3 +23,5 @@ export * from './lib/ui-elements.module'
 export * from './lib/user-feedback-item/user-feedback-item.component'
 export * from './lib/user-preview/user-preview.component'
 export * from './lib/application-banner/application-banner.component'
+export * from './lib/internal-link-card/internal-link-card.component'
+export * from './lib/service-capabilities/service-capabilities.component'

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

@@ -0,0 +1,156 @@
+<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">
+    <div
+      *ngIf="shouldShowThumbnail"
+      [ngClass]="thumbnailContainerClass"
+      class="mr-4 flex flex-col"
+    >
+      <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"
+      >
+        <gn-ui-markdown-parser
+          [textContent]="abstract"
+          [whitoutStyles]="true"
+        ></gn-ui-markdown-parser>
+      </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>
+          <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>
+        </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)"
+            >
+              <ng-icon name="matPhoneOutline"></ng-icon>
+            </button>
+          </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>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,190 @@
+import {
+  Component,
+  Input,
+  TemplateRef,
+  OnInit,
+  Output,
+  EventEmitter,
+  ElementRef,
+} from '@angular/core'
+import {
+  CatalogRecord,
+  Organization,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
+import { NgClass, NgIf, NgTemplateOutlet } from '@angular/common'
+import { MarkdownParserComponent } from '../markdown-parser/markdown-parser.component'
+import { MetadataQualityComponent } from '../metadata-quality/metadata-quality.component'
+import { ThumbnailComponent } from '../thumbnail/thumbnail.component'
+import {
+  propagateToDocumentOnly,
+  removeWhitespace,
+  stripHtml,
+} from '../../../../../../libs/util/shared/src'
+import {
+  NgIconComponent,
+  provideIcons,
+  provideNgIconsConfig,
+} from '@ng-icons/core'
+import {
+  matLocationSearchingOutline,
+  matEmailOutline,
+  matPhoneOutline,
+  matLocationOnOutline,
+} from '@ng-icons/material-icons/outline'
+import { matCode } from '@ng-icons/material-icons/baseline'
+import { iconoirDatabase, iconoirMap, iconoirInternet } from '@ng-icons/iconoir'
+import { TranslateModule } from '@ngx-translate/core'
+import { marker } from '@biesbjerg/ngx-translate-extract-marker'
+import { fromEvent, Subscription } from 'rxjs'
+
+marker('record.kind.data')
+marker('record.kind.reuse')
+marker('record.kind.service')
+
+type CardSize = 'L' | 'M' | 'S' | 'XS'
+
+@Component({
+  selector: 'gn-ui-internal-link-card',
+  standalone: true,
+  imports: [
+    NgClass,
+    NgIf,
+    ThumbnailComponent,
+    MetadataQualityComponent,
+    NgTemplateOutlet,
+    NgIconComponent,
+    TranslateModule,
+    MarkdownParserComponent,
+  ],
+  providers: [
+    provideIcons({
+      matLocationSearchingOutline,
+      matCode,
+      iconoirDatabase,
+      iconoirMap,
+      iconoirInternet,
+      matEmailOutline,
+      matPhoneOutline,
+      matLocationOnOutline,
+    }),
+    provideNgIconsConfig({
+      size: '1.2em',
+    }),
+  ],
+  templateUrl: './internal-link-card.component.html',
+  styleUrls: ['./internal-link-card.component.css'],
+})
+export class InternalLinkCardComponent implements OnInit {
+  @Input() record: CatalogRecord
+  @Input() metadataQualityDisplay: boolean
+  @Input() favoriteTemplate: TemplateRef<{ $implicit: CatalogRecord }>
+  @Input() linkHref: string = null
+  @Input() isGeodata: boolean
+  @Input() set size(value: CardSize) {
+    this._size = value
+    this.cardClass = this.sizeClassMap[value] || ''
+    this.thumbnailContainerClass = this.thumbnailSizeClassMap[value] || 'hidden'
+  }
+  get size(): CardSize {
+    return this._size
+  }
+  @Output() mdSelect = new EventEmitter<CatalogRecord>()
+  subscription = new Subscription()
+
+  abstract: string
+
+  cardClass = ''
+  thumbnailContainerClass = ''
+
+  private _size: CardSize = 'M'
+
+  private readonly sizeClassMap: Record<CardSize, string> = {
+    L: 'min-h-[190px] md:w-[992px] py-3 px-3 flex items-start gap-5',
+    M: 'min-h-[140px] md:w-[570px] py-3 px-3 flex items-start gap-4',
+    S: 'min-h-[220px] md:w-[370px] py-3 px-3 flex gap-4',
+    XS: 'min-h-[108px] md:w-[570px] py-3 px-3 flex gap-4',
+  }
+
+  private readonly thumbnailSizeClassMap: Record<CardSize, string> = {
+    L: '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-2',
+    M: 'text-base line-clamp-2',
+    S: 'text-base line-clamp-3',
+    XS: 'text-base mt-3 line-clamp-2',
+  }
+
+  constructor(protected elementRef: ElementRef) {}
+
+  ngOnInit(): void {
+    this.abstract = removeWhitespace(stripHtml(this.record?.abstract))
+    this.subscription.add(
+      fromEvent(this.elementRef.nativeElement, 'click').subscribe(
+        (event: Event) => {
+          event.preventDefault()
+          propagateToDocumentOnly(event)
+          this.mdSelect.emit(this.record)
+        }
+      )
+    )
+  }
+
+  get organization(): Organization {
+    return this.record.ownerOrganization
+  }
+
+  get contacts() {
+    return (
+      (this.record.kind === 'dataset'
+        ? this.record.contactsForResource
+        : this.record.contacts) || []
+    )
+  }
+
+  getTitleClass() {
+    return (
+      this.titleClassMap[this._size] +
+        ' ' +
+        (this.record.ownerOrganization?.name ? '' : 'mt-3') || ''
+    )
+  }
+
+  openExternalUrl(event: Event, url: URL): void {
+    event.stopPropagation()
+    window.open(url, '_blank')
+  }
+
+  openMailto(event: Event, email: string): void {
+    event.stopPropagation()
+    window.open(`mailto:${email}`, '_blank')
+  }
+
+  copyToClipboard(event: Event, text: string): void {
+    event.stopPropagation()
+    navigator.clipboard.writeText(text)
+  }
+
+  get shouldShowThumbnail(): boolean {
+    return this.size === 'L' || this.size === 'M'
+  }
+
+  getKindInfo(): { text: string; icon: string } {
+    if (!this.record?.kind) return { text: '', icon: '' }
+
+    switch (this.record.kind.toLowerCase()) {
+      case 'dataset':
+        return { text: 'record.kind.data', icon: 'iconoirDatabase' }
+      case 'reuse':
+        return { text: 'record.kind.reuse', icon: 'iconoirMap' }
+      case 'service':
+        return { text: 'record.kind.service', icon: 'matCode' }
+      default:
+        return { text: '', icon: '' }
+    }
+  }
+}

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

@@ -1,4 +1,4 @@
-<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">
   <div class="grid gap-3 overflow-hidden">
     <div>
       <p class="text-sm font-medium" translate>record.metadata.contact</p>

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 ::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"
   >
@@ -96,10 +96,10 @@
 </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"
 >
@@ -225,9 +225,18 @@
     </div>
   </div>
 </gn-ui-expandable-panel>
+<gn-ui-expandable-panel
+  *ngIf="metadata.kind !== 'dataset' && metadata.spatialExtents"
+  [title]="'service.metadata.spatialExtent' | translate"
+>
+  <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"
 >
   <div class="flex flex-col gap-4 mr-4 py-5 rounded text-gray-700">
     <div *ngIf="metadata.recordUpdated">

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