geonetwork-ui 2.6.0-dev.502fa026d → 2.6.0-dev.70b25ba3b

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

@@ -1,39 +1,40 @@
 <a
   [href]="link.url"
   target="_blank"
-  class="flex flex-col justify-between group grow py-5 px-5 bg-white rounded border-gray-300 filter card-shadow overflow-hidden"
-  [ngClass]="{ 'h-40': !compact }"
+  class="group flex flex-row justify-between card-shadow cursor-pointer rounded overflow-hidden"
+  [ngClass]="cardClass"
   [title]="title"
 >
-  <ng-container *ngIf="!compact; else compactTpl">
-    <div class="max-h-24 overflow-hidden text-ellipsis">
-      <p
-        class="font-title font-medium text-21 text-black break-words mb-1 line-clamp-2"
-      >
-        {{ link.name }}
-      </p>
-      <p class="font-medium text-sm break-words">
-        {{ link.description }}
-      </p>
-      <p
-        *ngIf="!link.name && !link.description"
-        class="font-medium text-sm break-words truncate"
-      >
-        {{ link.url }}
-      </p>
+  <div class="flex flex-col justify-between flex-1 min-w-0">
+    <div class="gn-ui-card-title">
+      {{ link.description || link.name }}
     </div>
-    <div>
-      <ng-icon class="card-icon" name="matOpenInNew"></ng-icon>
+    <div class="gn-ui-card-detail">
+      {{ link.name }}
     </div>
-  </ng-container>
-  <ng-template #compactTpl>
-    <div class="flex items-center justify-between gap-4">
-      <p
-        class="overflow-hidden font-title font-medium text-21 text-black text-ellipsis whitespace-nowrap"
+    <p *ngIf="!link.name && !link.description" class="gn-ui-card-title">
+      {{ link.url }}
+    </p>
+    <div class="pt-1">
+      <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"
+        [style.background-color]="getLinkColor(link)"
+        data-cy="download-format"
+        >{{
+          getLinkFormat(link) || ('downloads.format.unknown' | translate)
+        }}</span
       >
-        {{ link.name || link.description }}
-      </p>
-      <ng-icon class="card-icon flex-shrink-0" name="matOpenInNew"></ng-icon>
     </div>
-  </ng-template>
+  </div>
+  <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"
+        name="matOpenInNew"
+      ></ng-icon>
+    </div>
+  </div>
 </a>

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

@@ -7,14 +7,17 @@ import {
   provideNgIconsConfig,
 } 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'
 
+type CardSize = 'L' | 'M' | 'S' | 'XS'
 @Component({
   selector: 'gn-ui-link-card',
   templateUrl: './link-card.component.html',
   styleUrls: ['./link-card.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, NgIconComponent],
+  imports: [CommonModule, NgIconComponent, TranslateModule],
   providers: [
     provideIcons({
       matOpenInNew,
@@ -23,8 +26,23 @@ import { matOpenInNew } from '@ng-icons/material-icons/baseline'
   ],
 })
 export class LinkCardComponent {
+  private _size: CardSize
   @Input() link: DatasetOnlineResource
-  @Input() compact = false
+  private readonly sizeClassMap: Record<CardSize, string> = {
+    L: 'gn-ui-card-l py-2 px-5',
+    M: 'gn-ui-card-m py-2 px-5',
+    S: 'gn-ui-card-s p-4',
+    XS: 'gn-ui-card-xs py-2 px-5',
+  }
+
+  @Input() set size(value: CardSize) {
+    this._size = value
+    this.cardClass = this.sizeClassMap[value]
+  }
+  get size(): CardSize {
+    return this._size
+  }
+  cardClass = ''
 
   get title() {
     if (this.link.name && this.link.description) {
@@ -32,4 +50,12 @@ export class LinkCardComponent {
     }
     return this.link.name || this.link.description || ''
   }
+
+  getLinkFormat(link: any) {
+    return getFileFormat(link)
+  }
+
+  getLinkColor(link: any) {
+    return getBadgeColor(getFileFormat(link))
+  }
 }

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

@@ -1,5 +1,5 @@
 <div>
-  <p class="text-gray-700 text-xs mb-3 uppercase" translate>
+  <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">

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"

package/src/libs/ui/elements/src/lib/record-api-form/record-api-form.component.ts

@@ -162,7 +162,7 @@ export class RecordApiFormComponent {
       limit: limit !== '-1' ? Number(limit) : -1,
       offset: offset !== '' ? Number(offset) : undefined,
       outputCrs:
-        format === ('application/json' || 'geojson') ? 'EPSG:4326' : undefined,
+        format.toLowerCase().indexOf('json') > -1 ? 'EPSG:4326' : undefined,
     }
 
     if (this.endpoint instanceof WfsEndpoint) {
@@ -170,6 +170,7 @@ export class RecordApiFormComponent {
       options.maxFeatures = limit !== '-1' ? Number(limit) : undefined
       return this.endpoint.getFeatureUrl(this.apiFeatureType, options)
     } else {
+      delete options.outputCrs
       return await this.endpoint.getCollectionItemsUrl(
         this.apiFeatureType,
         options

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: 512px">
+    <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>

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

@@ -0,0 +1,183 @@
+import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { TranslateModule, TranslateService } from '@ngx-translate/core'
+import { getLayers } from '../../../../../../libs/util/shared/src'
+import { ButtonComponent, TextInputComponent } from '../../../../../../libs/ui/inputs/src'
+import { NgIcon, provideIcons } from '@ng-icons/core'
+import { iconoirSearch } from '@ng-icons/iconoir'
+import { marker } from '@biesbjerg/ngx-translate-extract-marker'
+import { matInfoOutline } from '@ng-icons/material-icons/outline'
+import {
+  PopoverComponent,
+  SpinningLoaderComponent,
+} from '../../../../../../libs/ui/widgets/src'
+import {
+  WfsFeatureTypeFull,
+  WmsLayerFull,
+  WmtsLayer,
+} from '@camptocamp/ogc-client'
+
+marker(`service.metadata.search`)
+marker(`service.metadata.capabilities.title`)
+marker(`service.metadata.capabilities.abstract`)
+marker(`service.metadata.capabilities.name`)
+marker(`service.metadata.capabilities.defaultCrs`)
+marker(`service.metadata.capabilities.availableCrs`)
+marker(`service.metadata.capabilities.otherCrs`)
+marker(`service.metadata.capabilities.objectCount`)
+marker(`service.metadata.capabilities.geometryName`)
+marker(`service.metadata.capabilities.geometryType`)
+marker(`service.metadata.capabilities.keywords`)
+marker(`service.metadata.capabilities.outputFormats`)
+marker(`service.metadata.capabilities.resourceLinks`)
+marker(`service.metadata.capabilities.attribution`)
+
+@Component({
+  selector: 'gn-ui-service-capabilities',
+  standalone: true,
+  imports: [
+    CommonModule,
+    TranslateModule,
+    ButtonComponent,
+    TextInputComponent,
+    NgIcon,
+    PopoverComponent,
+    SpinningLoaderComponent,
+  ],
+  viewProviders: [
+    provideIcons({
+      iconoirSearch,
+      matInfoOutline,
+    }),
+  ],
+  templateUrl: './service-capabilities.component.html',
+  styleUrl: './service-capabilities.component.css',
+})
+export class ServiceCapabilitiesComponent implements OnInit {
+  @Input() apiLinks = []
+  availableLayers = []
+  filteredLayers = []
+  selectedLayer = null
+  layerInformation = []
+  searchQuery = ''
+  loading = false
+  searchActive
+
+  capabilitiesKeys = [
+    'title',
+    'abstract',
+    'name',
+    'defaultCrs',
+    'availableCrs',
+    'otherCrs',
+    'objectCount',
+    'geometryName',
+    'geometryType',
+    'keywords',
+    'outputFormats',
+    'resourceLinks',
+    'attribution',
+  ]
+
+  constructor(
+    private cdr: ChangeDetectorRef,
+    private translateService: TranslateService
+  ) {}
+
+  ngOnInit() {
+    this.loadLayers()
+  }
+
+  onSearchChange(event: Event) {
+    const input = event.target as HTMLInputElement
+    this.searchQuery = input.value
+    if (!input.value) {
+      this.searchActive = false
+      this.filteredLayers = this.availableLayers
+    }
+  }
+
+  onSearchEnter(event: KeyboardEvent) {
+    if (event.key === 'Enter') {
+      this.searchActive = true
+      this.searchLayers()
+    }
+  }
+
+  async loadLayers() {
+    if (
+      this.apiLinks.length > 0 &&
+      this.apiLinks[0].accessServiceProtocol !== 'ogcFeatures'
+    ) {
+      this.loading = true
+      this.availableLayers = await getLayers(
+        this.apiLinks[0].url.href,
+        this.apiLinks[0].accessServiceProtocol
+      )
+      this.loading = false
+      this.cdr.detectChanges()
+      this.filteredLayers = this.availableLayers
+    } else {
+      this.availableLayers = []
+    }
+  }
+
+  selectLayer(layer: WfsFeatureTypeFull | WmsLayerFull | WmtsLayer) {
+    if (layer === this.selectedLayer) {
+      this.selectedLayer = null
+      this.layerInformation = []
+      return
+    }
+
+    this.selectedLayer = layer
+    const filteredInfo = []
+    Object.keys(layer).map((key) => {
+      if (this.capabilitiesKeys.includes(key)) {
+        const displayName = this.translateService.instant(
+          `service.metadata.capabilities.${key}`
+        )
+        if (key in layer && layer[key]?.length) {
+          filteredInfo.push({ displayName, value: layer[key] })
+        }
+      }
+    })
+
+    this.layerInformation = filteredInfo
+  }
+
+  isList(value: string | string[]) {
+    return Array.isArray(value)
+  }
+
+  getExtraInputClass() {
+    if (this.searchActive) {
+      return 'h-14 border rounded-lg border-primary text-primary focus:border-primary hover:border-primary'
+    }
+    return 'h-14 border rounded-lg'
+  }
+
+  searchLayers() {
+    this.searchActive = true
+    this.filteredLayers = this.availableLayers.filter((layer) => {
+      const query = this.searchQuery.toLowerCase()
+      if (layer.title) {
+        return (
+          layer.title.toLowerCase().includes(query) ||
+          layer.abstract?.toLowerCase().includes(query)
+        )
+      } else {
+        return layer.name.toLowerCase().includes(query)
+      }
+    })
+    if (!this.filteredLayers.includes(this.selectedLayer)) {
+      this.selectedLayer = null
+      this.layerInformation = []
+    }
+  }
+
+  getExtraClass(layerItem) {
+    return layerItem.title === this.selectedLayer?.title
+      ? `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

@@ -16,10 +16,13 @@ import { TranslateModule } from '@ngx-translate/core'
 import { AvatarComponent } from './avatar/avatar.component'
 import { ImageInputComponent } from './image-input/image-input.component'
 import { MarkdownParserComponent } from './markdown-parser/markdown-parser.component'
+import { KindBadgeComponent } from './kind-badge/kind-badge.component'
 import { ThumbnailComponent } from './thumbnail/thumbnail.component'
 import { TimeSincePipe } from './user-feedback-item/time-since.pipe'
 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'
 
 @NgModule({
   imports: [
@@ -42,6 +45,9 @@ import { ApplicationBannerComponent } from './application-banner/application-ban
     TextInputComponent,
     ImageInputComponent,
     ApplicationBannerComponent,
+    InternalLinkCardComponent,
+    ServiceCapabilitiesComponent,
+    KindBadgeComponent,
   ],
   providers: [
     provideNgIconsConfig({
@@ -56,6 +62,9 @@ import { ApplicationBannerComponent } from './application-banner/application-ban
     MarkdownParserComponent,
     ImageInputComponent,
     ApplicationBannerComponent,
+    InternalLinkCardComponent,
+    ServiceCapabilitiesComponent,
+    KindBadgeComponent,
   ],
 })
 export class UiElementsModule {}

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

@@ -15,7 +15,7 @@ export * from './lib/dropdown-selector/dropdown-selector.model'
 export * from './lib/editable-label/editable-label.directive'
 export * from './lib/file-input/file-input.component'
 export * from './lib/files-drop/files-drop.directive'
-export * from './lib/navigation-button/navigation-button.component'
+export * from './lib/inline-filter/inline-filter.component'
 export * from './lib/search-input/search-input.component'
 export * from './lib/star-toggle/star-toggle.component'
 export * from './lib/switch-toggle/switch-toggle.component'

package/src/libs/ui/inputs/src/lib/dropdown-multiselect/dropdown-multiselect.component.html

@@ -59,7 +59,7 @@
     #overlayContainer
   >
     <div
-      class="border border-gray-300 rounded mb-2 mx-2 min-h-[44px] flex flex-row flex-wrap p-2 focus-within:rounded focus-within:border-2 focus-within:border-primary"
+      class="border border-gray-300 rounded mb-2 mx-2 min-h-[44px] flex flex-row gap-[2px] flex-wrap p-2 focus-within:rounded focus-within:border-2 focus-within:border-primary"
     >
       <button
         type="button"

package/src/libs/ui/inputs/src/lib/inline-filter/inline-filter.component.html

@@ -0,0 +1,23 @@
+<ul class="flex flex-wrap list-none gap-2">
+  <li *ngFor="let choice of choices">
+    <label
+      class=""
+      [ngClass]="{
+        selected: isSelected(choice),
+      }"
+    >
+      <input
+        class="hidden"
+        type="checkbox"
+        #checkBox
+        [checked]="isSelected(choice)"
+        (change)="select(choice, checkBox.checked)"
+        [attr.data-cy]="'inlineFilter-' + choice.value"
+      />
+      <ng-container
+        *ngTemplateOutlet="itemTemplate; context: { $implicit: choice }"
+      >
+      </ng-container>
+    </label>
+  </li>
+</ul>