geonetwork-ui 2.6.0-dev.c4b99cdef → 2.6.0-dev.ceb4be4c1

package/src/libs/feature/record/src/lib/state/mdview.facade.ts

@@ -6,6 +6,7 @@ import {
   filter,
   map,
   mergeMap,
+  shareReplay,
   switchMap,
   toArray,
 } from 'rxjs/operators'
@@ -15,13 +16,11 @@ import { LinkClassifierService, LinkUsage } from '../../../../../../libs/util/sh
 import { DatavizConfigurationModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
 import {
   CatalogRecord,
-  DatasetServiceDistribution,
-  ServiceEndpoint,
   UserFeedback,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { AvatarServiceInterface } from '../../../../../../libs/api/repository/src'
 import { OgcApiRecord } from '@camptocamp/ogc-client'
-import { from, of } from 'rxjs'
+import { from, of, Observable } from 'rxjs'
 import { DataService } from '../../../../../../libs/feature/dataviz/src'
 
 @Injectable()
@@ -77,24 +76,24 @@ export class MdViewFacade {
 
   related$ = this.store.pipe(select(MdViewSelectors.getRelated))
 
+  sources$ = this.store.pipe(select(MdViewSelectors.getSources))
+
+  sourceOf$ = this.store.pipe(select(MdViewSelectors.getSourceOf))
+
   chartConfig$ = this.store.pipe(select(MdViewSelectors.getChartConfig))
 
   allLinks$ = this.metadata$.pipe(
-    map((record) => ('onlineResources' in record ? record.onlineResources : []))
+    map((record) =>
+      'onlineResources' in record ? record.onlineResources : []
+    ),
+    shareReplay(1)
   )
 
   apiLinks$ = this.allLinks$.pipe(
     map((links) =>
-      links
-        .filter((link) => this.linkClassifier.hasUsage(link, LinkUsage.API))
-        // Put links to IGN Géoplateforme first
-        .sort((dd1, dd2) => {
-          return (dd2 as DatasetServiceDistribution | ServiceEndpoint)
-            .accessServiceProtocol === 'GPFDL'
-            ? 1
-            : undefined // do not change the sorting otherwise
-        })
-    )
+      links.filter((link) => this.linkClassifier.hasUsage(link, LinkUsage.API))
+    ),
+    shareReplay(1)
   )
 
   mapApiLinks$ = this.allLinks$.pipe(
@@ -102,7 +101,8 @@ export class MdViewFacade {
       links.filter((link) =>
         this.linkClassifier.hasUsage(link, LinkUsage.MAP_API)
       )
-    )
+    ),
+    shareReplay(1)
   )
 
   downloadLinks$ = this.allLinks$.pipe(
@@ -216,4 +216,11 @@ export class MdViewFacade {
   loadUserFeedbacks(datasetUuid: string) {
     this.store.dispatch(MdViewActions.loadUserFeedbacks({ datasetUuid }))
   }
+
+  /**
+   * loadFeatureCatalog
+   */
+  loadFeatureCatalog(metadata: CatalogRecord) {
+    this.store.dispatch(MdViewActions.loadFeatureCatalog({ metadata }))
+  }
 }

package/src/libs/feature/record/src/lib/state/mdview.reducer.ts

@@ -14,6 +14,8 @@ export interface MetadataViewState {
   error: { notFound?: boolean; otherError?: string } | null
   metadata?: Partial<CatalogRecord>
   related?: CatalogRecord[]
+  sources?: CatalogRecord[]
+  sourceOf?: CatalogRecord[]
   userFeedbacks?: UserFeedback[]
   allUserFeedbacksLoading: boolean
   addUserFeedbackLoading: boolean
@@ -75,6 +77,16 @@ const metadataViewReducer = createReducer(
     related,
   })),
 
+  on(MetadataViewActions.setSources, (state, { sources }) => ({
+    ...state,
+    sources,
+  })),
+
+  on(MetadataViewActions.setSourceOf, (state, { sourceOf }) => ({
+    ...state,
+    sourceOf,
+  })),
+
   /*
     ChartConfig reducers
   */

package/src/libs/feature/record/src/lib/state/mdview.selectors.ts

@@ -41,6 +41,15 @@ export const getRelated = createSelector(
   (state: MetadataViewState) => state.related
 )
 
+export const getSources = createSelector(
+  getMdViewState,
+  (state: MetadataViewState) => state.sources
+)
+
+export const getSourceOf = createSelector(
+  getMdViewState,
+  (state: MetadataViewState) => state.sourceOf
+)
 /*
   Metadata selectors
 */

package/src/libs/feature/search/src/lib/constants.ts

@@ -12,6 +12,7 @@ export const FIELDS_SUMMARY: FieldName[] = [
   'overview',
   'logo',
   'codelist_status_text',
+  'link',
   'linkProtocol',
   'contactForResource*.organisation*',
   'contact*.organisation*',

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

@@ -55,8 +55,10 @@ export class ResultsListContainerComponent implements OnInit {
     @Optional()
     @Inject(RECORD_DATASET_URL_TOKEN)
     private recordDatasetUrlTemplate: string,
+    @Optional()
     @Inject(RECORD_SERVICE_URL_TOKEN)
     private recordServiceUrlTemplate: string,
+    @Optional()
     @Inject(RECORD_REUSE_URL_TOKEN)
     private recordReuseUrlTemplate: string
   ) {}

package/src/libs/ui/dataviz/src/lib/chart/chart.component.ts

@@ -57,6 +57,7 @@ export class ChartComponent implements OnChanges, AfterViewInit {
     this.dataRaw = value
   }
   @Input() labelProperty: string
+  @Input() prettyLabel: string
   @Input() valueProperty: string
   @Input() secondaryValueProperty: string
   @Input() type: InputChartType = 'bar'
@@ -95,7 +96,7 @@ export class ChartComponent implements OnChanges, AfterViewInit {
       labels: this.getDataProxy(this.labelProperty) as string[],
       datasets: [
         {
-          label: this.valueProperty,
+          label: this.prettyLabel,
           data,
         },
       ],

package/src/libs/ui/dataviz/src/lib/data-table/data-table.component.html

@@ -8,21 +8,24 @@
       [matSortDisableClear]="true"
       *ngrxLet="properties$ as properties"
     >
-      <ng-container *ngFor="let prop of properties" [matColumnDef]="prop">
+      <ng-container
+        *ngFor="let attr of _featureAttributes"
+        [matColumnDef]="attr.value"
+      >
         <th
           mat-header-cell
           *matHeaderCellDef
           mat-sort-header
           class="text-sm text-black bg-white"
         >
-          {{ prop }}
+          {{ attr.label }}
         </th>
         <td
           mat-cell
           *matCellDef="let element"
           class="whitespace-nowrap pr-1 truncate"
         >
-          {{ element[prop] }}
+          {{ element[attr.value] }}
         </td>
       </ng-container>
 

package/src/libs/ui/dataviz/src/lib/data-table/data-table.component.ts

@@ -61,13 +61,14 @@ export interface TableItemModel {
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class DataTableComponent implements OnInit, AfterViewInit, OnChanges {
+  _featureAttributes = []
+  @Input() set featureAttributes(value: { value: string; label: string }[]) {
+    this._featureAttributes = value
+    this.properties$.next(value.map((attr) => attr.value))
+  }
   @Input() set dataset(value: BaseReader) {
-    this.properties$.next(null)
     this.dataset_ = value
     this.dataset_.load()
-    this.dataset_.properties.then((properties) =>
-      this.properties$.next(properties.map((p) => p.name))
-    )
     this.dataset_.info.then((info) => (this.count = info.itemsCount))
   }
   @Input() activeId: TableItemId

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

@@ -5,6 +5,7 @@ export * from './lib/content-ghost/content-ghost.component'
 export * from './lib/download-item/download-item.component'
 export * from './lib/downloads-list/downloads-list.component'
 export * from './lib/error/error.component'
+export * from './lib/geo-data-badge/geo-data-badge.component'
 export * from './lib/image-input/image-input.component'
 export * from './lib/image-overlay-preview/image-overlay-preview.component'
 export * from './lib/kind-badge/kind-badge.component'
@@ -26,3 +27,4 @@ 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'
+export * from './lib/record-feature-catalog/feature-catalog-list/feature-catalog-list.component'

package/src/libs/ui/elements/src/lib/geo-data-badge/geo-data-badge.component.css

@@ -0,0 +1,4 @@
+:host {
+  --gn-ui-geo-data-badge-background-color: var(--color-primary-white);
+  --gn-ui-geo-data-badge-text-color: var(--color-primary-darkest);
+}

package/src/libs/ui/elements/src/lib/geo-data-badge/geo-data-badge.component.html

@@ -0,0 +1,13 @@
+<div
+  [class]="badgeClasses"
+  [title]="'record.metadata.isGeographical' | translate"
+  *ngIf="isGeodata()"
+>
+  <ng-icon
+    class="shrink-0 text-[0.75em]"
+    name="matLocationSearchingOutline"
+  ></ng-icon>
+  <span class="ml-1 hidden sm:inline-block shrink-0" *ngIf="showLabel" translate
+    >record.metadata.isGeographical</span
+  >
+</div>

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

@@ -0,0 +1,54 @@
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { matLocationSearchingOutline } from '@ng-icons/material-icons/outline'
+import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { CommonModule } from '@angular/common'
+import { TranslateModule } from '@ngx-translate/core'
+import { NgIcon, provideIcons } from '@ng-icons/core'
+import { LinkClassifierService, LinkUsage } from '../../../../../../libs/util/shared/src'
+
+@Component({
+  selector: 'gn-ui-geo-data-badge',
+  templateUrl: './geo-data-badge.component.html',
+  styleUrls: ['./geo-data-badge.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule, NgIcon, TranslateModule],
+  viewProviders: [
+    provideIcons({
+      matLocationSearchingOutline,
+    }),
+  ],
+})
+export class GeoDataBadgeComponent {
+  @Input() showLabel = true
+  @Input() styling = 'default'
+  @Input() record: CatalogRecord
+
+  isGeodata() {
+    const links =
+      'onlineResources' in this.record ? this.record.onlineResources : []
+    const hasMapApi = links.some((link) =>
+      this.linkClassifier.hasUsage(link, LinkUsage.MAP_API)
+    )
+    const hasGeoData = links.some((link) =>
+      this.linkClassifier.hasUsage(link, LinkUsage.GEODATA)
+    )
+    return hasMapApi || hasGeoData
+  }
+
+  get badgeClasses(): string {
+    const baseClasses =
+      'flex shrink-0 items-center badge-btn text-xs px-2 h-6 min-h-6'
+
+    switch (this.styling) {
+      case 'light':
+        return `${baseClasses} bg-primary-white text-primary-darkest`
+      case 'default':
+        return `${baseClasses} bg-primary-darker text-white`
+      default:
+        return 'flex shrink-0 items-center'
+    }
+  }
+
+  constructor(public linkClassifier: LinkClassifierService) {}
+}

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

@@ -1,156 +1,151 @@
-<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">
+<a [attr.href]="linkHref" [target]="linkTarget">
+  <div
+    class="group rounded-md bg-white hover:cursor-pointer hover:bg-slate-50 overflow-hidden w-full"
+    [ngClass]="cardClass"
+  >
     <div
-      *ngIf="shouldShowThumbnail"
-      [ngClass]="thumbnailContainerClass"
-      class="mr-4 flex flex-col"
+      class="flex flex-row md:gap-0 justify-between w-full"
+      [ngClass]="{ 'flex-wrap md:flex-nowrap gap-3': size === 'L' }"
     >
-      <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()"
+        *ngIf="shouldShowThumbnail"
+        [ngClass]="thumbnailContainerClass"
+        class="border mr-4 flex flex-col"
       >
-        {{ record.title }}
+        <gn-ui-thumbnail
+          class="w-full h-full object-cover"
+          [thumbnailUrl]="record.overviews?.[0]?.url?.toString() || ''"
+          [fit]="'cover'"
+        ></gn-ui-thumbnail>
       </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 class="grow flex flex-col gap-3">
+        <div class="flex items-center gap-2">
+          <div class="grow flex flex-wrap items-center gap-2">
+            <gn-ui-kind-badge
+              [styling]="'default'"
+              [kind]="record?.kind"
+            ></gn-ui-kind-badge>
+            <gn-ui-geo-data-badge
+              [showLabel]="size === 'L'"
+              [styling]="'light'"
+              [record]="record"
+            ></gn-ui-geo-data-badge>
+            <gn-ui-metadata-quality
+              class="flex items-center"
+              [smaller]="true"
+              [metadata]="record"
+              [metadataQualityDisplay]="metadataQualityDisplay"
+            ></gn-ui-metadata-quality>
           </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 *ngIf="size !== 'XS'" data-cy="recordFav">
+            <ng-container
+              [ngTemplateOutlet]="favoriteTemplate"
+              [ngTemplateOutletContext]="{ $implicit: record }"
+            ></ng-container>
           </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)"
+
+        <div class="grow flex flex-col gap-2">
+          <div
+            class="font-medium text-title group-hover:text-primary"
+            [title]="record.title"
+          >
+            <h4
+              class="mr-6 overflow-hidden"
+              [ngClass]="getTitleClass()"
+              data-cy="recordTitle"
+              [title]="record.title"
             >
-              <ng-icon name="iconoirInternet"></ng-icon>
-            </button>
+              {{ record.title }}
+            </h4>
           </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
+            *ngIf="size === 'L'"
+            class="mr-6 text-xs text-gray-900 line-clamp-2 overflow-hidden"
+            data-cy="recordAbstract"
+          >
+            <gn-ui-markdown-parser
+              [textContent]="abstract"
+              [whitoutStyles]="true"
+            ></gn-ui-markdown-parser>
           </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)"
+        </div>
+
+        <div
+          data-cy="recordOrg"
+          *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"
             >
-              <ng-icon name="matPhoneOutline"></ng-icon>
-            </button>
+              <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="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 *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>
-</div>
+</a>