geonetwork-ui 2.8.0-dev.c06b26576 → 2.8.0-dev.e9cfb9381

package/src/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.ts

@@ -1,12 +1,21 @@
+import { HttpClient, HttpEventType } from '@angular/common/http'
 import { Inject, Injectable, InjectionToken, Optional } from '@angular/core'
 import {
-  catchError,
-  filter,
-  map,
-  mergeMap,
-  shareReplay,
-  tap,
-} from 'rxjs/operators'
+  KeywordApiResponse,
+  ThesaurusApiResponse,
+} from '../../../../../../../libs/api/metadata-converter/src'
+import {
+  CatalogRecord,
+  Keyword,
+  Organization,
+  UserFeedback,
+} from '../../../../../../../libs/common/domain/src/lib/model/record'
+import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus'
+import { UserModel } from '../../../../../../../libs/common/domain/src/lib/model/user/user.model'
+import {
+  PlatformServiceInterface,
+  UploadEvent,
+} from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import {
   MeApiService,
   RecordsApiService,
@@ -15,26 +24,9 @@ import {
   UserfeedbackApiService,
   UsersApiService,
 } from '../../../../../../../libs/data-access/gn4/src'
-import {
-  PlatformServiceInterface,
-  UploadEvent,
-} from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
-import { UserModel } from '../../../../../../../libs/common/domain/src/lib/model/user/user.model'
-import {
-  CatalogRecord,
-  Keyword,
-  Organization,
-  UserFeedback,
-} from '../../../../../../../libs/common/domain/src/lib/model/record'
-import { Gn4PlatformMapper } from './gn4-platform.mapper'
-import { ltr } from 'semver'
-import { HttpClient, HttpEventType } from '@angular/common/http'
-import {
-  KeywordApiResponse,
-  ThesaurusApiResponse,
-} from '../../../../../../../libs/api/metadata-converter/src'
-import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus'
+import { toLang3 } from '../../../../../../../libs/util/i18n/src'
 import { noDuplicateFileName } from '../../../../../../../libs/util/shared/src'
+import { TranslateService } from '@ngx-translate/core'
 import {
   combineLatest,
   forkJoin,
@@ -43,9 +35,17 @@ import {
   switchMap,
   throwError,
 } from 'rxjs'
-import { TranslateService } from '@ngx-translate/core'
-import { toLang3 } from '../../../../../../../libs/util/i18n/src'
+import {
+  catchError,
+  filter,
+  map,
+  mergeMap,
+  shareReplay,
+  tap,
+} from 'rxjs/operators'
+import { ltr } from 'semver'
 import { Gn4SettingsService } from '../settings/gn4-settings.service'
+import { Gn4PlatformMapper } from './gn4-platform.mapper'
 
 const minApiVersion = '4.2.2'
 
@@ -56,7 +56,6 @@ export const DISABLE_AUTH = new InjectionToken<boolean>('gnDisableAuth', {
 @Injectable()
 export class Gn4PlatformService implements PlatformServiceInterface {
   private readonly type = 'GeoNetwork'
-  private readonly me$: Observable<UserModel>
   private readonly users$: Observable<UserModel[]>
   private readonly isUserAnonymous$: Observable<boolean>
   private readonly gnParseVersion = '4.2.5'
@@ -70,6 +69,15 @@ export class Gn4PlatformService implements PlatformServiceInterface {
       }),
       shareReplay(1)
     )
+
+  private me$ = this.disableAuth
+    ? of(null)
+    : of(true).pipe(
+        switchMap(() => this.meApi.getMe()),
+        switchMap((apiUser) => this.mapper.userFromMeApi(apiUser)),
+        shareReplay({ bufferSize: 1, refCount: true })
+      )
+
   /**
    * A map of already loaded thesauri (groups of keywords); the key is a URI
    * @private
@@ -93,13 +101,6 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     private settingsService: Gn4SettingsService,
     @Inject(DISABLE_AUTH) @Optional() private disableAuth: boolean
   ) {
-    this.me$ = this.disableAuth
-      ? of(null)
-      : this.meApi.getMe().pipe(
-          switchMap((apiUser) => this.mapper.userFromMeApi(apiUser)),
-          shareReplay({ bufferSize: 1, refCount: true })
-        )
-
     this.isUserAnonymous$ = this.me$.pipe(
       map((user) => !user || !('id' in user))
     )

package/src/libs/api/repository/src/lib/gn4/settings/gn4-settings.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core'
 import { SiteApiService } from '../../../../../../../libs/data-access/gn4/src'
+import { Observable, of, switchMap } from 'rxjs'
 import { map, shareReplay } from 'rxjs/operators'
-import { Observable } from 'rxjs'
 
 @Injectable({
   providedIn: 'root',
@@ -25,7 +25,8 @@ export class Gn4SettingsService {
   constructor(private siteApiService: SiteApiService) {}
 
   private getSettingsSetValueByKey(key: string) {
-    return this.siteApiService.getSettingsSet(null, [key]).pipe(
+    return of(true).pipe(
+      switchMap(() => this.siteApiService.getSettingsSet(null, [key])),
       map((v) => v[key]),
       shareReplay({ bufferSize: 1, refCount: true })
     )

package/src/libs/common/domain/src/index.ts

@@ -0,0 +1,2 @@
+export * from './lib/organizations.service.interface'
+export * from './lib/platform.service.interface'

package/src/libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model.ts

@@ -24,5 +24,5 @@ export interface DatavizConfigModel {
   view: string
   source: DatasetOnlineResource
   chartConfig?: DatavizChartConfigModel
-  styleTMSIndex: number
+  styleTMSIndex?: number
 }

package/src/libs/common/domain/src/lib/model/record/metadata.model.ts

@@ -163,6 +163,8 @@ export type ServiceProtocol =
   | 'GPFDL'
   | 'tms'
   | 'maplibre-style'
+  | 'postgis'
+  | 'stac'
   | 'other'
 
 marker('record.metadata.api.accessServiceProtocol.wms')
@@ -174,6 +176,8 @@ marker('record.metadata.api.accessServiceProtocol.ogcFeatures')
 marker('record.metadata.api.accessServiceProtocol.GPFDL')
 marker('record.metadata.api.accessServiceProtocol.tms')
 marker('record.metadata.api.accessServiceProtocol.maplibre-style')
+marker('record.metadata.api.accessServiceProtocol.postgis')
+marker('record.metadata.api.accessServiceProtocol.stac')
 marker('record.metadata.api.accessServiceProtocol.other')
 
 export type OnlineResourceType = 'service' | 'download' | 'link' | 'endpoint'

package/src/libs/common/domain/src/lib/model/search/sort-by.model.ts

@@ -6,4 +6,9 @@ export const SortByEnum: Record<string, SortByField> = {
   RELEVANCY: ['desc', '_score'],
   QUALITY_SCORE: ['desc', 'qualityScore'],
   CHANGE_DATE: ['desc', 'changeDate'],
+  RESOURCE_DATES: [
+    ['desc', 'revisionDateForResource'],
+    ['desc', 'publicationDateForResource'],
+    ['desc', 'creationDateForResource'],
+  ],
 }

package/src/libs/common/domain/src/lib/platform.service.interface.ts

@@ -45,6 +45,7 @@ export abstract class PlatformServiceInterface {
     thesaurusId: string
   ): Observable<Keyword[]>
 
+  abstract getFeedbacksAllowed(): Observable<boolean>
   abstract getUserFeedbacks(recordUuid: string): Observable<UserFeedback[]>
   abstract postUserFeedbacks(recordUuid: UserFeedback): Observable<void>
 
@@ -58,5 +59,4 @@ export abstract class PlatformServiceInterface {
     removeDuplicate?: boolean
   ): Observable<UploadEvent>
   abstract getFileContent(url: URL): Observable<any>
-  abstract getFeedbacksAllowed(): Observable<boolean>
 }

package/src/libs/common/fixtures/src/lib/elasticsearch/metadata-links.fixtures.ts

@@ -154,4 +154,9 @@ export const elasticLinkFixture = (): Record<string, unknown> => ({
     name: 'myothertmslayer',
     url: 'https://my.tms.server/MapServer',
   },
+  stacItems: {
+    accessServiceProtocol: 'STAC:Items',
+    name: 'stac layer',
+    url: '  https://stacapi-cdos.apps.okd.crocc.meso.umontpellier.fr/collections/lidarhd/items',
+  },
 })

package/src/libs/common/fixtures/src/lib/link.fixtures.ts

@@ -259,4 +259,23 @@ export const aSetOfLinksFixture = () => ({
       accessServiceProtocol: 'wms',
       type: 'endpoint',
     }) as ServiceEndpoint,
+  postgisLink: () =>
+    ({
+      name: 'France_Regions',
+      description:
+        'Boundaries for the administrative regions of metropolitan France.',
+      url: new URL('http://geo.local:5432/france_demo'),
+      type: 'service',
+      accessServiceProtocol: 'postgis',
+    }) as DatasetServiceDistribution,
+  stacLink: () =>
+    ({
+      name: 'Lidar HD point cloud (COPC)',
+      description: 'Lidar HD classified point clouds from IGN',
+      url: new URL(
+        'https://stacapi-cdos.apps.okd.crocc.meso.umontpellier.fr/collections/lidarhd/items'
+      ),
+      type: 'service',
+      accessServiceProtocol: 'stac',
+    }) as DatasetServiceDistribution,
 })

package/src/libs/feature/dataviz/src/index.ts

@@ -3,3 +3,4 @@ export * from './lib/chart-view/chart-view.component'
 export * from './lib/figure/figure-container/figure-container.component'
 export * from './lib/geo-table-view/geo-table-view.component'
 export * from './lib/table-view/table-view.component'
+export * from './lib/stac-view/stac-view.component'

package/src/libs/feature/dataviz/src/lib/chart-view/chart-view.component.ts

@@ -108,6 +108,7 @@ export class ChartViewComponent {
   chartType$ = new BehaviorSubject<InputChartType>('bar')
 
   @Input() set userChartConfig(config: DatavizChartConfigModel) {
+    if (!config) return
     this.aggregation$.next(config.aggregation)
     this.xProperty$.next(config.xProperty)
     this.yProperty$.next(config.yProperty)

package/src/libs/feature/dataviz/src/lib/stac-view/stac-view.component.html

@@ -0,0 +1,5 @@
+<div class="w-full h-full flex flex-col">
+  <div
+    class="relative h-full mt-6 bg-white border border-gray-300 rounded-lg overflow-hidden"
+  ></div>
+</div>

package/src/libs/feature/dataviz/src/lib/stac-view/stac-view.component.ts

@@ -0,0 +1,27 @@
+import { CommonModule } from '@angular/common'
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  OnDestroy,
+} from '@angular/core'
+import { DatasetServiceDistribution } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { TranslatePipe } from '@ngx-translate/core'
+import { Subscription } from 'rxjs'
+
+@Component({
+  selector: 'gn-ui-stac-view',
+  templateUrl: './stac-view.component.html',
+  styleUrls: ['./stac-view.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule, TranslatePipe],
+})
+export class StacViewComponent implements OnDestroy {
+  @Input() link: DatasetServiceDistribution
+  private subscription = new Subscription()
+
+  ngOnDestroy() {
+    this.subscription.unsubscribe()
+  }
+}

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

@@ -20,7 +20,7 @@ import {
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { AvatarServiceInterface } from '../../../../../../libs/api/repository/src'
 import { OgcApiRecord } from '@camptocamp/ogc-client'
-import { from, of, Observable } from 'rxjs'
+import { from, of } from 'rxjs'
 import { DataService } from '../../../../../../libs/feature/dataviz/src'
 
 @Injectable()
@@ -105,6 +105,16 @@ export class MdViewFacade {
     shareReplay(1)
   )
 
+  stacLinks$ = this.allLinks$.pipe(
+    map((links) =>
+      links.filter(
+        (link) =>
+          link.type === 'service' && link.accessServiceProtocol === 'stac'
+      )
+    ),
+    shareReplay(1)
+  )
+
   downloadLinks$ = this.allLinks$.pipe(
     map((links) =>
       links.filter((link) =>

package/src/libs/feature/router/src/lib/default/router.service.ts

@@ -8,6 +8,10 @@ import {
 } from '.'
 import { Router, Routes } from '@angular/router'
 import { ROUTER_CONFIG, RouterConfigModel } from './router.config'
+import {
+  SortByEnum,
+  SortByField,
+} from '../../../../../../libs/common/domain/src/lib/model/search'
 
 @Injectable({
   providedIn: 'root',
@@ -58,4 +62,8 @@ export class RouterService {
   getOrganizationPageRoute(): string {
     return ROUTER_ROUTE_ORGANIZATION
   }
+
+  getDefaultSort(): SortByField {
+    return SortByEnum.RESOURCE_DATES
+  }
 }

package/src/libs/feature/router/src/lib/default/state/router.effects.ts

@@ -9,10 +9,7 @@ import {
   SetFilters,
   SetSortBy,
 } from '../../../../../../../libs/feature/search/src'
-import {
-  FieldFilters,
-  SortByEnum,
-} from '../../../../../../../libs/common/domain/src/lib/model/search'
+import { FieldFilters } from '../../../../../../../libs/common/domain/src/lib/model/search'
 import { Actions, createEffect, ofType } from '@ngrx/effects'
 import { navigation } from '@ngrx/router-store/data-persistence'
 import { of, pairwise, startWith } from 'rxjs'
@@ -22,6 +19,7 @@ import { RouterFacade } from './router.facade'
 import { ROUTE_PARAMS } from '../constants'
 import { sortByFromString } from '../../../../../../../libs/util/shared/src'
 import { ROUTER_CONFIG, RouterConfigModel } from '../router.config'
+import { RouterService } from '../router.service'
 
 @Injectable()
 export class RouterEffects {
@@ -31,7 +29,8 @@ export class RouterEffects {
     private _location: Location,
     private facade: RouterFacade,
     @Inject(ROUTER_CONFIG) private routerConfig: RouterConfigModel,
-    private fieldsService: FieldsService
+    private fieldsService: FieldsService,
+    private routerService: RouterService
   ) {}
 
   navigate$ = createEffect(
@@ -61,7 +60,7 @@ export class RouterEffects {
         let sortBy =
           ROUTE_PARAMS.SORT in newParams
             ? sortByFromString(newParams[ROUTE_PARAMS.SORT])
-            : SortByEnum.CHANGE_DATE
+            : this.routerService.getDefaultSort()
         let pageNumber =
           ROUTE_PARAMS.PAGE in newParams
             ? parseInt(newParams[ROUTE_PARAMS.PAGE])
@@ -70,7 +69,7 @@ export class RouterEffects {
           const oldSort =
             ROUTE_PARAMS.SORT in oldParams
               ? sortByFromString(oldParams[ROUTE_PARAMS.SORT])
-              : SortByEnum.CHANGE_DATE
+              : this.routerService.getDefaultSort()
           if (JSON.stringify(sortBy) === JSON.stringify(oldSort)) {
             sortBy = null
           }

package/src/libs/feature/search/src/lib/sort-by/sort-by.component.ts

@@ -13,7 +13,7 @@ import { TranslatePipe } from '@ngx-translate/core'
 
 interface SortChoice {
   label: string
-  value: string
+  value: SortByField
 }
 
 @Component({
@@ -27,24 +27,20 @@ export class SortByComponent implements OnInit {
   choices: SortChoice[] = [
     {
       label: marker('results.sortBy.relevancy'),
-      value: SortByEnum.RELEVANCY.join(','),
+      value: SortByEnum.RELEVANCY,
     },
     {
       label: marker('results.sortBy.dateStamp'),
-      value: SortByEnum.CREATE_DATE.join(','),
-    },
-    {
-      label: marker('results.sortBy.changeDate'),
-      value: SortByEnum.CHANGE_DATE.join(','),
+      value: SortByEnum.RESOURCE_DATES,
     },
     {
       label: marker('results.sortBy.popularity'),
-      value: SortByEnum.POPULARITY.join(','),
+      value: SortByEnum.POPULARITY,
     },
   ]
   currentSortBy$ = this.facade.sortBy$.pipe(
     filter((sortBy) => !!sortBy),
-    map((sortBy) => sortBy.join(','))
+    map((sortBy) => sortBy)
   )
 
   constructor(
@@ -56,12 +52,12 @@ export class SortByComponent implements OnInit {
     if (this.isQualitySortable) {
       this.choices.push({
         label: marker('results.sortBy.qualityScore'),
-        value: SortByEnum.QUALITY_SCORE.join(','),
+        value: SortByEnum.QUALITY_SCORE,
       })
     }
   }
 
-  changeSortBy(criteriaAsString: string) {
-    this.searchService.setSortBy(criteriaAsString.split(',') as SortByField)
+  changeSortBy(criteria: SortByField): void {
+    this.searchService.setSortBy(criteria)
   }
 }

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

@@ -1,15 +1,48 @@
-<a
-  [href]="link.url"
-  target="_blank"
-  class="group flex flex-row justify-between card-shadow cursor-pointer rounded overflow-hidden"
-  [ngClass]="cardClass"
-  [title]="title"
->
+<ng-container *ngIf="isDatabase; else clickableLink">
+  <div [ngClass]="cardClass" [title]="title">
+    <ng-container *ngTemplateOutlet="cardContent"></ng-container>
+    <div
+      class="flex min-w-[32px]"
+      [ngClass]="size === 'S' ? 'items-end' : 'items-center'"
+    >
+      <div
+        class="gn-ui-card-icon"
+        [title]="'record.metadata.link.postgis.tooltip' | translate"
+      >
+        <ng-icon
+          class="inline-block card-icon align-middle"
+          name="iconoirDatabase"
+        ></ng-icon>
+      </div>
+    </div>
+  </div>
+</ng-container>
+
+<ng-template #clickableLink>
+  <a [href]="link.url" target="_blank" [ngClass]="cardClass" [title]="title">
+    <ng-container *ngTemplateOutlet="cardContent"></ng-container>
+    <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>
+</ng-template>
+<ng-template #cardContent>
   <div class="flex flex-col justify-between flex-1 min-w-0">
     <div class="gn-ui-card-title">
       {{ link.description || link.name }}
     </div>
     <div class="gn-ui-card-detail">
+      <ng-container *ngIf="isDatabase">
+        {{ 'record.metadata.link.postgis.table' | translate }}
+      </ng-container>
       {{ link.name }}
     </div>
     <p *ngIf="!link.name && !link.description" class="gn-ui-card-title">
@@ -20,21 +53,9 @@
         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
       >
+        {{ getLinkFormat(link) || ('downloads.format.unknown' | translate) }}
+      </span>
     </div>
   </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>
+</ng-template>

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

@@ -7,6 +7,7 @@ import {
   provideNgIconsConfig,
 } from '@ng-icons/core'
 import { matOpenInNew } from '@ng-icons/material-icons/baseline'
+import { iconoirDatabase } from '@ng-icons/iconoir'
 import { getBadgeColor, getFileFormat } from '../../../../../../libs/util/shared/src'
 import { TranslatePipe } from '@ngx-translate/core'
 
@@ -21,6 +22,7 @@ type CardSize = 'L' | 'M' | 'S' | 'XS'
   providers: [
     provideIcons({
       matOpenInNew,
+      iconoirDatabase,
     }),
     provideNgIconsConfig({ size: '1.5em' }),
   ],
@@ -37,7 +39,7 @@ export class ExternalLinkCardComponent {
 
   @Input() set size(value: CardSize) {
     this._size = value
-    this.cardClass = this.sizeClassMap[value]
+    this.cardClass = `group flex flex-row justify-between card-shadow rounded overflow-hidden ${this.sizeClassMap[value]}`
   }
   get size(): CardSize {
     return this._size
@@ -51,11 +53,18 @@ export class ExternalLinkCardComponent {
     return this.link.name || this.link.description || ''
   }
 
-  getLinkFormat(link: any) {
+  get isDatabase(): boolean {
+    return (
+      this.link.type === 'service' &&
+      this.link.accessServiceProtocol === 'postgis'
+    )
+  }
+
+  getLinkFormat(link: DatasetOnlineResource): string {
     return getFileFormat(link)
   }
 
-  getLinkColor(link: any) {
+  getLinkColor(link: DatasetOnlineResource): string {
     return getBadgeColor(getFileFormat(link))
   }
 }