geonetwork-ui 2.6.0-dev.9d3ad45e2 → 2.6.0-dev.a0bd52a21

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

@@ -60,8 +60,9 @@
             </h4>
           </div>
           <div
-            *ngIf="size === 'L'"
-            class="mr-6 text-xs text-gray-900 line-clamp-2 overflow-hidden"
+            *ngIf="displayAbstract()"
+            class="mr-6 text-xs text-gray-900 overflow-hidden"
+            [ngClass]="getAbstractClass()"
             data-cy="recordAbstract"
           >
             <gn-ui-markdown-parser
@@ -71,80 +72,11 @@
           </div>
         </div>
 
-        <div
-          data-cy="recordOrg"
+        <gn-ui-internal-link-card-contact
           *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
-                data-cy="recordOrgName"
-                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>
+          [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.ts

@@ -7,35 +7,20 @@ import {
   EventEmitter,
   ElementRef,
 } from '@angular/core'
-import {
-  CatalogRecord,
-  Organization,
-} from '../../../../../../libs/common/domain/src/lib/model/record'
+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 { KindBadgeComponent } from '../kind-badge/kind-badge.component'
 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 { 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'
 
 type CardSize = 'L' | 'M' | 'S' | 'XS'
 
@@ -45,22 +30,19 @@ type CardSize = 'L' | 'M' | 'S' | 'XS'
   imports: [
     NgClass,
     NgIf,
-    ThumbnailComponent,
     MetadataQualityComponent,
     NgTemplateOutlet,
-    NgIconComponent,
     TranslateModule,
     GeoDataBadgeComponent,
     KindBadgeComponent,
     MarkdownParserComponent,
+    InternalLinkCardContactComponent,
+    ThumbnailComponent,
   ],
   providers: [
     provideIcons({
       iconoirInternet,
       matLocationSearchingOutline,
-      matEmailOutline,
-      matPhoneOutline,
-      matLocationOnOutline,
     }),
     provideNgIconsConfig({
       size: '1.2em',
@@ -125,35 +107,22 @@ export class InternalLinkCardComponent implements OnInit {
     )
   }
 
-  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]
   }
-
-  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')
+  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()
   }
-
-  copyToClipboard(event: Event, text: string): void {
-    event.stopPropagation()
-    navigator.clipboard.writeText(text)
+  displayAbstract(): boolean {
+    return (
+      this.size === 'L' ||
+      (['M', 'S'].includes(this.size) && !this.record.ownerOrganization?.name)
+    )
   }
 
   get shouldShowThumbnail(): boolean {

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

@@ -0,0 +1,69 @@
+<div
+  data-cy="recordOrg"
+  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
+        data-cy="recordOrgName"
+        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>

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

@@ -0,0 +1,61 @@
+import { Component, Input } from '@angular/core'
+import { NgIf } from '@angular/common'
+import {
+  CatalogRecord,
+  Organization,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
+import { ThumbnailComponent } from '../thumbnail/thumbnail.component'
+import { NgIconComponent, provideIcons } from '@ng-icons/core'
+import {
+  matEmailOutline,
+  matPhoneOutline,
+  matLocationOnOutline,
+} from '@ng-icons/material-icons/outline'
+import { iconoirInternet } from '@ng-icons/iconoir'
+import { TranslateModule } from '@ngx-translate/core'
+
+@Component({
+  selector: 'gn-ui-internal-link-card-contact',
+  standalone: true,
+  imports: [NgIf, ThumbnailComponent, NgIconComponent, TranslateModule],
+  providers: [
+    provideIcons({
+      iconoirInternet,
+      matEmailOutline,
+      matPhoneOutline,
+      matLocationOnOutline,
+    }),
+  ],
+  templateUrl: './internal-link-card-contact.component.html',
+})
+export class InternalLinkCardContactComponent {
+  @Input() record: CatalogRecord
+  @Input() size: 'L' | 'M' | 'S' | 'XS' = 'M'
+
+  get organization(): Organization {
+    return this.record.ownerOrganization
+  }
+
+  get contacts() {
+    return (
+      (this.record.kind === 'dataset'
+        ? this.record.contactsForResource
+        : this.record.contacts) || []
+    )
+  }
+
+  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)
+  }
+}

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

@@ -20,6 +20,10 @@ import { NgIcon } from '@ng-icons/core'
 import { matInfoOutline } from '@ng-icons/material-icons/outline'
 import { provideIcons, provideNgIconsConfig } from '@ng-icons/core'
 
+type QualityChecks = {
+  [key: string]: (metadata: Partial<CatalogRecord>) => boolean
+}
+
 @Component({
   selector: 'gn-ui-metadata-quality',
   templateUrl: './metadata-quality.component.html',
@@ -69,18 +73,53 @@ export class MetadataQualityComponent implements OnChanges {
       this.items.push({ name, value })
     }
   }
+  hasGetCapabilities(url: string): boolean {
+    return url.toLowerCase().includes('capabilities')
+  }
+
+  private readonly COMMON_CHECKS: QualityChecks = {
+    title: (metadata) => !!metadata?.title,
+    description: (metadata) => !!metadata?.abstract,
+    keywords: (metadata) => (metadata?.keywords?.length ?? 0) > 0,
+    legalConstraints: (metadata) =>
+      (metadata?.legalConstraints?.length ?? 0) > 0,
+    contact: (metadata) => !!metadata?.contacts?.[0]?.email,
+  }
+
+  private readonly SPECIFIC_CHECKS: Record<string, QualityChecks> = {
+    dataset: {
+      updateFrequency: (metadata) => !!metadata?.updateFrequency,
+      topic: (metadata) => (metadata?.topics?.length ?? 0) > 0,
+      organisation: (metadata) => !!metadata?.contacts?.[0]?.organization?.name,
+    },
+    service: {
+      capabilities: (metadata) =>
+        (metadata?.onlineResources ?? []).some((resource) =>
+          this.hasGetCapabilities(resource?.url?.href ?? '')
+        ),
+    },
+    reuse: {
+      topic: (metadata) => (metadata?.topics?.length ?? 0) > 0,
+      organisation: (metadata) => !!metadata?.contacts?.[0]?.organization?.name,
+      source: (metadata) => !!metadata?.extras?.sourcesIdentifiers,
+    },
+  }
 
   initialize() {
-    const contact = this.metadata?.contacts?.[0]
     this.items = []
-    this.add('title', !!this.metadata?.title)
-    this.add('description', !!this.metadata?.abstract)
-    this.add('topic', this.metadata?.topics?.length > 0)
-    this.add('keywords', this.metadata?.keywords?.length > 0)
-    this.add('legalConstraints', this.metadata?.legalConstraints?.length > 0)
-    this.add('organisation', !!contact?.organization)
-    this.add('contact', !!contact?.email)
-    this.add('updateFrequency', !!this.metadata?.updateFrequency)
+
+    Object.entries(this.COMMON_CHECKS).forEach(([name, check]) => {
+      this.add(name, check(this.metadata))
+    })
+
+    const datasetType = this.metadata?.kind
+    if (datasetType && this.SPECIFIC_CHECKS[datasetType]) {
+      Object.entries(this.SPECIFIC_CHECKS[datasetType]).forEach(
+        ([name, check]) => {
+          this.add(name, check(this.metadata))
+        }
+      )
+    }
   }
 
   ngOnChanges(changes: SimpleChanges): void {

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

@@ -20,6 +20,10 @@ marker('record.metadata.quality.updateFrequency.success')
 marker('record.metadata.quality.updateFrequency.failed')
 marker('record.metadata.quality.organisation.success')
 marker('record.metadata.quality.organisation.failed')
+marker('record.metadata.quality.capabilities.success')
+marker('record.metadata.quality.capabilities.failed')
+marker('record.metadata.quality.source.success')
+marker('record.metadata.quality.source.failed')
 
 export interface MetadataQualityItem {
   name: string

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>