geonetwork-ui 2.8.0-dev.6ea037ab6 → 2.8.0-dev.6f988469c

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.ts

@@ -142,4 +142,34 @@ export class FormFieldComponent {
   get valueAsOnlineResources() {
     return this.value as Array<OnlineResource>
   }
+  get valueAsResourceIdentifierCode() {
+    const identifiers = this.value as Array<{
+      code: string
+      codeSpace?: string
+      url?: string
+    }>
+    return identifiers?.[0]?.code || ''
+  }
+
+  handleResourceIdentifierChange(code: string) {
+    const identifiers = this.value as Array<{
+      code: string
+      codeSpace?: string
+      url?: string
+    }>
+
+    if (!code) {
+      this.valueChange.emit(identifiers?.slice(1) || [])
+      return
+    }
+
+    if (identifiers?.[0]) {
+      this.valueChange.emit([
+        { ...identifiers[0], code },
+        ...identifiers.slice(1),
+      ])
+    } else {
+      this.valueChange.emit([{ code }])
+    }
+  }
 }

package/src/libs/feature/editor/src/lib/fields.config.ts

@@ -81,7 +81,7 @@ export const RECORD_RESOURCE_CREATED_FIELD: EditorField = {
 }
 
 export const RESOURCE_IDENTIFIER_FIELD: EditorField = {
-  model: 'resourceIdentifier',
+  model: 'resourceIdentifiers',
   formFieldConfig: {
     labelKey: marker('editor.record.form.field.resourceIdentifier'),
   },

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

@@ -8,3 +8,4 @@ export * from './lib/external-viewer-button/external-viewer-button.component'
 export * from './lib/gpf-api-dl/gpf-api-dl.component'
 export * from './lib/map-view/map-view.component'
 export * from './lib/record-meta/record-meta.component'
+export * from './lib/stac-view/stac-view.component'

package/src/libs/feature/record/src/lib/data-view-permalink/data-view-permalink.component.ts

@@ -12,7 +12,7 @@ import { MdViewFacade } from '../state'
 import { CopyTextButtonComponent } from '../../../../../../libs/ui/inputs/src'
 import { CommonModule } from '@angular/common'
 import { TranslatePipe } from '@ngx-translate/core'
-import { GEONETWORK_UI_TAG_NAME } from '../../../../../../libs/util/shared/src'
+import { GEONETWORK_UI_TAG_NAME, PROXY_PATH } from '../../../../../../libs/util/shared/src'
 
 export const WEB_COMPONENT_EMBEDDER_URL = new InjectionToken<string>(
   'webComponentEmbedderUrl'
@@ -60,6 +60,9 @@ export class DataViewPermalinkComponent {
         url.searchParams.append('e', `gn-dataset-view-map`)
       }
       url.searchParams.append('a', `api-url=${this.config.basePath}`)
+      if (this.proxyPath) {
+        url.searchParams.append('a', `proxy-path=${this.proxyPath}`)
+      }
       url.searchParams.append('a', `dataset-id=${metadata.uniqueIdentifier}`)
       url.searchParams.append('a', `primary-color=#0f4395`)
       url.searchParams.append('a', `secondary-color=#8bc832`)
@@ -72,6 +75,9 @@ export class DataViewPermalinkComponent {
   constructor(
     @Inject(Configuration) private config: Configuration,
     @Optional()
+    @Inject(PROXY_PATH)
+    private proxyPath: string,
+    @Optional()
     @Inject(WEB_COMPONENT_EMBEDDER_URL)
     protected wcEmbedderBaseUrl: string,
     private facade: MdViewFacade

package/src/libs/feature/record/src/lib/data-view-web-component/data-view-web-component.component.ts

@@ -3,6 +3,7 @@ import {
   Component,
   Inject,
   Input,
+  Optional,
 } from '@angular/core'
 import { Configuration } from '../../../../../../libs/data-access/gn4/src'
 import { MdViewFacade } from '../state'
@@ -10,7 +11,7 @@ import { BehaviorSubject, combineLatest, map } from 'rxjs'
 import { CopyTextButtonComponent } from '../../../../../../libs/ui/inputs/src'
 import { CommonModule } from '@angular/common'
 import { TranslatePipe } from '@ngx-translate/core'
-import { GEONETWORK_UI_TAG_NAME } from '../../../../../../libs/util/shared/src'
+import { GEONETWORK_UI_TAG_NAME, PROXY_PATH } from '../../../../../../libs/util/shared/src'
 
 @Component({
   selector: 'gn-ui-data-view-web-component',
@@ -42,7 +43,12 @@ export class DataViewWebComponentComponent {
           api-url="${new URL(
             this.config.basePath,
             window.location.origin
-          ).toString()}"
+          ).toString()}"${
+            this.proxyPath
+              ? `
+          proxy-path="${this.proxyPath}"`
+              : ''
+          }
           dataset-id="${metadata.uniqueIdentifier}"
           aggregation="${aggregation}"
           x-property="${xProperty}"
@@ -65,7 +71,12 @@ export class DataViewWebComponentComponent {
           api-url="${new URL(
             this.config.basePath,
             window.location.origin
-          ).toString()}"
+          ).toString()}"${
+            this.proxyPath
+              ? `
+          proxy-path="${this.proxyPath}"`
+              : ''
+          }
           dataset-id="${metadata.uniqueIdentifier}"
           primary-color="#0f4395"
           secondary-color="#8bc832"
@@ -82,7 +93,12 @@ export class DataViewWebComponentComponent {
         api-url="${new URL(
           this.config.basePath,
           window.location.origin
-        ).toString()}"
+        ).toString()}"${
+          this.proxyPath
+            ? `
+        proxy-path="${this.proxyPath}"`
+            : ''
+        }
         dataset-id="${metadata.uniqueIdentifier}"
         primary-color="#0f4395"
         secondary-color="#8bc832"
@@ -97,6 +113,9 @@ export class DataViewWebComponentComponent {
 
   constructor(
     @Inject(Configuration) private config: Configuration,
+    @Optional()
+    @Inject(PROXY_PATH)
+    private proxyPath: string,
     private facade: MdViewFacade
   ) {}
 }

package/src/libs/feature/record/src/lib/stac-view/stac-view.component.css

@@ -0,0 +1,3 @@
+:host {
+  --gn-ui-button-padding: 7px 8px;
+}

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

@@ -0,0 +1,68 @@
+<div class="mt-6 bg-white border border-gray-300 overflow-hidden rounded-lg">
+  <div
+    class="w-full min-h-[366px] flex md:flex-row flex-col border-b border-gray-300"
+  >
+    <div class="md:w-1/2 w-full flex-1 flex flex-col">
+      <gn-ui-date-range-inputs
+        [temporalExtent]="currentTemporalExtent$ | async"
+        (temporalExtentChange)="onTemporalExtentChange($event)"
+      ></gn-ui-date-range-inputs>
+
+      <div class="mt-auto mb-8 mx-8" *ngIf="isFilterModified">
+        <gn-ui-button
+          id="reset-filters-button"
+          type="light"
+          (buttonClick)="onResetFilters()"
+        >
+          <span translate>stac.filter.reset</span>
+          <ng-icon name="matDeleteOutline" class="ml-2"></ng-icon>
+        </gn-ui-button>
+      </div>
+    </div>
+
+    <div class="md:w-1/2 w-full min-h-[280px] flex items-center justify-center">
+      <span>Map...</span>
+    </div>
+  </div>
+  <div
+    class="relative mx-5 my-[30px] min-h-[274px] flex items-center justify-center flex-col"
+  >
+    <!-- Keep grid outside ngIf to keep items$ observable alive -->
+    <gn-ui-stac-items-result-grid
+      [items]="items$ | async"
+    ></gn-ui-stac-items-result-grid>
+    <div
+      *ngIf="(items$ | async)?.length > 0; else noResultsOrError"
+      class="mt-[20px] mx-auto flex justify-center"
+    >
+      <gn-ui-previous-next-buttons
+        [listComponent]="this"
+        [displayLabels]="true"
+      ></gn-ui-previous-next-buttons>
+    </div>
+    <ng-template #noResultsOrError>
+      <gn-ui-popup-alert
+        *ngIf="error"
+        type="warning"
+        icon="matErrorOutlineOutline"
+        class="absolute left-0 top-0 w-full block"
+      >
+        <span translate>{{ error }}</span>
+      </gn-ui-popup-alert>
+      <div
+        *ngIf="!error"
+        class="flex items-center justify-center flex-col h-full gap-[10px]"
+      >
+        <h2 class="text-center text-xl" translate>stac.results.noResults</h2>
+        <gn-ui-button
+          id="no-results-button"
+          type="secondary"
+          (buttonClick)="onResetFilters()"
+        >
+          <span translate>stac.filter.reset</span>
+          <ng-icon name="matDeleteOutline" class="ml-2"></ng-icon>
+        </gn-ui-button>
+      </div>
+    </ng-template>
+  </div>
+</div>

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

@@ -0,0 +1,190 @@
+import { CommonModule } from '@angular/common'
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'
+import {
+  DatasetRecord,
+  DatasetTemporalExtent,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
+import { StacItemsResultGridComponent } from '../../../../../../libs/ui/elements/src'
+import {
+  ButtonComponent,
+  DateRangeInputsComponent,
+} from '../../../../../../libs/ui/inputs/src'
+import { NgIconComponent, provideIcons } from '@ng-icons/core'
+import { matDeleteOutline } from '@ng-icons/material-icons/outline'
+import { TranslateDirective, TranslateService } from '@ngx-translate/core'
+import { DataService } from '../../../../../../libs/feature/dataviz/src'
+import {
+  BehaviorSubject,
+  catchError,
+  combineLatest,
+  debounceTime,
+  from,
+  map,
+  Observable,
+  of,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs'
+import { GetCollectionItemsOptions, StacItem } from '@camptocamp/ogc-client'
+import { MdViewFacade } from '../state'
+import { PreviousNextButtonsComponent } from '../../../../../../libs/ui/layout/src'
+import { FetchError } from '../../../../../../libs/util/data-fetcher/src'
+import { PopupAlertComponent } from '../../../../../../libs/ui/widgets/src'
+
+const STAC_ITEMS_PER_PAGE = 12
+const DEBOUNCE_TIME_MS = 500
+
+@Component({
+  selector: 'gn-ui-stac-view',
+  templateUrl: './stac-view.component.html',
+  styleUrls: ['./stac-view.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [
+    CommonModule,
+    NgIconComponent,
+    TranslateDirective,
+    StacItemsResultGridComponent,
+    DateRangeInputsComponent,
+    PreviousNextButtonsComponent,
+    PopupAlertComponent,
+    ButtonComponent,
+  ],
+  viewProviders: [provideIcons({ matDeleteOutline })],
+})
+export class StacViewComponent implements OnInit {
+  isFilterModified = false
+  error = null
+
+  initialTemporalExtent: DatasetTemporalExtent | null = null
+  currentTemporalExtent$ = new BehaviorSubject<DatasetTemporalExtent | null>(
+    null
+  )
+
+  initialPageUrl: string
+  previousPageUrl: string
+  nextPageUrl: string
+  currentPageUrl$ = new BehaviorSubject<string | null>(null)
+
+  items$: Observable<StacItem[]> = combineLatest([
+    this.currentPageUrl$,
+    this.currentTemporalExtent$,
+  ]).pipe(
+    debounceTime(DEBOUNCE_TIME_MS),
+    switchMap(([currentPageUrl, temporalExtent]) => {
+      this.error = null
+      const options: GetCollectionItemsOptions = {
+        limit: STAC_ITEMS_PER_PAGE,
+      }
+      if (temporalExtent && (temporalExtent.start || temporalExtent.end)) {
+        options.datetime = {
+          ...(temporalExtent.start && { start: temporalExtent.start }),
+          ...(temporalExtent.end && { end: temporalExtent.end }),
+        }
+      }
+      return from(
+        this.dataService.getItemsFromStacApi(currentPageUrl, options)
+      ).pipe(
+        tap((stacDocument) => {
+          this.previousPageUrl =
+            stacDocument.links.find((link) => link.rel === 'previous')?.href ||
+            null
+          this.nextPageUrl =
+            stacDocument.links.find((link) => link.rel === 'next')?.href || null
+        }),
+        map((stacDocument) => stacDocument.features),
+        catchError((err) => {
+          this.handleError(err)
+          return of([])
+        })
+      )
+    })
+  )
+
+  constructor(
+    private dataService: DataService,
+    private metadataViewFacade: MdViewFacade,
+    private translateService: TranslateService
+  ) {}
+
+  ngOnInit() {
+    this.metadataViewFacade.metadata$
+      .pipe(
+        take(1),
+        map((metadata) => {
+          const temporalExtents =
+            metadata?.kind === 'dataset'
+              ? (metadata as DatasetRecord).temporalExtents
+              : []
+
+          return temporalExtents.length > 0
+            ? temporalExtents[0]
+            : ({
+                start: null,
+                end: null,
+              } as DatasetTemporalExtent)
+        })
+      )
+      .subscribe((extent) => {
+        this.initialTemporalExtent = extent
+        this.currentTemporalExtent$.next(extent)
+      })
+
+    this.metadataViewFacade.stacLinks$
+      .pipe(
+        take(1),
+        map((links) => (links && links.length > 0 ? links[0] : null))
+      )
+      .subscribe((link) => {
+        if (link) {
+          this.initialPageUrl = link.url.href
+          this.currentPageUrl$.next(link.url.href)
+        }
+      })
+  }
+
+  onTemporalExtentChange(extent: DatasetTemporalExtent | null) {
+    this.currentTemporalExtent$.next(extent)
+    // make sure to use url without pagination token when temporal filter changes
+    this.currentPageUrl$.next(this.initialPageUrl)
+    this.isFilterModified = true
+  }
+
+  onResetFilters() {
+    this.currentTemporalExtent$.next(this.initialTemporalExtent)
+    this.isFilterModified = false
+  }
+
+  handleError(error: FetchError | Error | string) {
+    if (error instanceof FetchError) {
+      this.error = this.translateService.instant(
+        `dataset.error.${error.type}`,
+        {
+          info: error.info,
+        }
+      )
+      console.warn(error.message)
+    } else if (error instanceof Error) {
+      this.error = this.translateService.instant(error.message)
+      console.warn(error.stack || error)
+    } else {
+      this.error = this.translateService.instant(error)
+      console.warn(error)
+    }
+  }
+
+  // Paginable API
+  get isFirstPage() {
+    return this.previousPageUrl == null
+  }
+  get isLastPage() {
+    return this.nextPageUrl == null
+  }
+  goToNextPage() {
+    this.currentPageUrl$.next(this.nextPageUrl)
+  }
+  goToPrevPage() {
+    this.currentPageUrl$.next(this.previousPageUrl)
+  }
+}

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()
@@ -89,6 +89,25 @@ export class MdViewFacade {
     shareReplay(1)
   )
 
+  resourceDoi$ = this.metadata$.pipe(
+    map((record) => {
+      if (!record?.resourceIdentifiers?.length) return null
+      const doiIdentifier = record.resourceIdentifiers.find(
+        (id) =>
+          id.codeSpace?.toLowerCase().includes('doi.org') ||
+          id.code.startsWith('10.')
+      )
+
+      if (!doiIdentifier) return null
+
+      return {
+        code: doiIdentifier.code,
+        url: doiIdentifier.url ? doiIdentifier.url : null,
+      }
+    }),
+    shareReplay(1)
+  )
+
   apiLinks$ = this.allLinks$.pipe(
     map((links) =>
       links.filter((link) => this.linkClassifier.hasUsage(link, LinkUsage.API))
@@ -105,6 +124,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/search/src/lib/constants.ts

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

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

@@ -14,6 +14,7 @@ export * from './lib/markdown-editor/markdown-editor.component'
 export * from './lib/markdown-parser/markdown-parser.component'
 export * from './lib/metadata-catalog/metadata-catalog.component'
 export * from './lib/metadata-contact/metadata-contact.component'
+export * from './lib/metadata-doi/metadata-doi.component'
 export * from './lib/metadata-info/metadata-info.component'
 export * from './lib/metadata-quality-item/metadata-quality-item.component'
 export * from './lib/metadata-quality/metadata-quality.component'
@@ -26,3 +27,4 @@ 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'
+export * from './lib/stac-items-result-grid/stac-items-result-grid.component'

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

@@ -0,0 +1,31 @@
+<div
+  class="border border-gray-300 rounded-lg py-4 px-5 text-black flex justify-between items-center gap-4"
+>
+  <div class="overflow-hidden flex-1">
+    <p class="text-base font-medium mb-3">DOI</p>
+    <p
+      class="text-base font-medium overflow-hidden text-ellipsis whitespace-nowrap"
+      [title]="code"
+    >
+      {{ code }}
+    </p>
+  </div>
+  <div class="flex gap-2 items-start">
+    <gn-ui-copy-text-button
+      [text]="code"
+      [displayText]="false"
+      [tooltipText]="'record.metadata.doi.copy' | translate"
+      class="[&>div]:flex [&>div]:items-center [&>div]:justify-center [&_button]:w-[40px] [&_button]:h-[32px] [&_button]:flex [&_button]:items-center [&_button]:justify-center [&_button]:hover:bg-gray-100 [&_button]:rounded-lg [&_button]:transition-colors [&_button]:border [&_button]:border-gray-300 [&_button]:px-2 [&_button]:py-1 [&_ng-icon]:w-5 [&_ng-icon]:h-5"
+    ></gn-ui-copy-text-button>
+    <a
+      *ngIf="link"
+      [href]="link"
+      target="_blank"
+      rel="noopener noreferrer"
+      class="w-[40px] h-[32px] flex items-center justify-center hover:bg-gray-100 rounded-lg transition-colors border border-gray-300 px-2 py-1"
+      [matTooltip]="'record.metadata.doi.open' | translate"
+    >
+      <ng-icon name="matOpenInNew" size="20"></ng-icon>
+    </a>
+  </div>
+</div>

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

@@ -0,0 +1,30 @@
+import { Component, Input } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { NgIcon, provideIcons } from '@ng-icons/core'
+import { MatTooltipModule } from '@angular/material/tooltip'
+import { matOpenInNew } from '@ng-icons/material-icons/baseline'
+import { TranslatePipe } from '@ngx-translate/core'
+import { CopyTextButtonComponent } from '../../../../../../libs/ui/inputs/src'
+
+@Component({
+  selector: 'gn-ui-metadata-doi',
+  standalone: true,
+  imports: [
+    CommonModule,
+    MatTooltipModule,
+    NgIcon,
+    TranslatePipe,
+    CopyTextButtonComponent,
+  ],
+  templateUrl: './metadata-doi.component.html',
+  styleUrl: './metadata-doi.component.css',
+  viewProviders: [
+    provideIcons({
+      matOpenInNew,
+    }),
+  ],
+})
+export class MetadataDoiComponent {
+  @Input() code!: string
+  @Input() link?: string
+}