geonetwork-ui 2.8.0-dev.5745b522e → 2.8.0-dev.630bb6618

package/src/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.ts

@@ -451,6 +451,32 @@ export class Gn4FieldMapper {
         }),
       }
     },
+    resourceIdentifier: (output, source) => {
+      const identifiers = getAsArray(selectField(source, 'resourceIdentifier'))
+
+      if (!identifiers.length) return output
+
+      const mappedIdentifiers = identifiers
+        .map((id) => {
+          const code = selectField<string>(id, 'code')
+          const codeSpace = selectField<string>(id, 'codeSpace')
+          const link = selectField<string>(id, 'link')
+
+          return {
+            code,
+            ...(codeSpace && { codeSpace }),
+            ...(link && { url: link }),
+          }
+        })
+        .filter((id) => id !== null)
+
+      if (!mappedIdentifiers.length) return output
+
+      return {
+        ...output,
+        resourceIdentifiers: mappedIdentifiers,
+      }
+    },
   }
 
   private genericField = (output) => output

package/src/libs/api/metadata-converter/src/lib/iso19139/iso19139.converter.ts

@@ -92,7 +92,7 @@ export class Iso19139Converter extends BaseConverter<string> {
     recordUpdated: readRecordUpdated,
     recordCreated: () => undefined, // not supported in ISO19139
     recordPublished: () => undefined, // not supported in ISO19139
-    resourceIdentifier: readResourceIdentifier,
+    resourceIdentifiers: readResourceIdentifier,
     resourceUpdated: readResourceUpdated,
     resourceCreated: readResourceCreated,
     resourcePublished: readResourcePublished,
@@ -133,7 +133,7 @@ export class Iso19139Converter extends BaseConverter<string> {
     recordUpdated: writeRecordUpdated,
     recordCreated: () => undefined, // not supported in ISO19139
     recordPublished: () => undefined, // not supported in ISO19139
-    resourceIdentifier: writeResourceIdentifier,
+    resourceIdentifiers: writeResourceIdentifier,
     resourceUpdated: writeResourceUpdated,
     resourceCreated: writeResourceCreated,
     resourcePublished: writeResourcePublished,
@@ -240,12 +240,19 @@ export class Iso19139Converter extends BaseConverter<string> {
     const onlineResources = this.readers['onlineResources'](rootEl, tr)
     const otherLanguages = this.readers['otherLanguages'](rootEl, tr)
     const defaultLanguage = this.readers['defaultLanguage'](rootEl, tr)
-    const resourceIdentifier = this.readers['resourceIdentifier'](rootEl, tr)
+    const resourceIdentifiers = this.readers['resourceIdentifiers'](
+      rootEl,
+      tr
+    ) as Array<{
+      code: string
+      codeSpace?: string
+      url?: string
+    }>
     const spatialExtents = this.readers['spatialExtents'](rootEl, tr)
 
     return {
       uniqueIdentifier,
-      ...(resourceIdentifier && { resourceIdentifier }),
+      ...(resourceIdentifiers?.length > 0 && { resourceIdentifiers }),
       kind,
       otherLanguages,
       defaultLanguage,
@@ -388,8 +395,8 @@ export class Iso19139Converter extends BaseConverter<string> {
       this.writers['otherConstraints'](record, rootEl)
     fieldChanged('onlineResources') &&
       this.writers['onlineResources'](record, rootEl)
-    fieldChanged('resourceIdentifier') &&
-      this.writers['resourceIdentifier'](record, rootEl)
+    fieldChanged('resourceIdentifiers') &&
+      this.writers['resourceIdentifiers'](record, rootEl)
 
     if (record.kind === 'dataset') {
       fieldChanged('status') && this.writers['status'](record, rootEl)

package/src/libs/api/metadata-converter/src/lib/iso19139/read-parts.ts

@@ -1183,8 +1183,10 @@ export function readDefaultLanguage(rootEl: XmlElement): LanguageCode {
   )(rootEl)
 }
 
-export function readResourceIdentifier(rootEl: XmlElement): string {
-  return pipe(
+export function readResourceIdentifier(
+  rootEl: XmlElement
+): Array<{ code: string; codeSpace?: string; url?: string }> {
+  const code = pipe(
     findIdentification(),
     findNestedElement(
       'gmd:citation',
@@ -1195,4 +1197,6 @@ export function readResourceIdentifier(rootEl: XmlElement): string {
     ),
     extractCharacterString()
   )(rootEl)
+
+  return code ? [{ code }] : []
 }

package/src/libs/api/metadata-converter/src/lib/iso19139/write-parts.ts

@@ -1502,14 +1502,16 @@ export function writeResourceIdentifier(
   record: DatasetRecord,
   rootEl: XmlElement
 ) {
+  const firstIdentifier = record.resourceIdentifiers?.[0]?.code
+
   pipe(
     findOrCreateIdentification(),
     findNestedChildOrCreate('gmd:citation', 'gmd:CI_Citation'),
     removeChildrenByName('gmd:identifier'),
-    record.resourceIdentifier
+    firstIdentifier
       ? pipe(
           createNestedChild('gmd:identifier', 'gmd:MD_Identifier', 'gmd:code'),
-          writeCharacterString(record.resourceIdentifier)
+          writeCharacterString(firstIdentifier)
         )
       : noop
   )(rootEl)

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

@@ -113,6 +113,12 @@ export interface INSPIRE_topic {
   label: string
 }
 
+export interface ResourceIdentifier {
+  code: string
+  codeSpace?: string
+  url?: string
+}
+
 export interface BaseRecord {
   uniqueIdentifier: Uuid
   ownerOrganization: Organization
@@ -135,7 +141,8 @@ export interface BaseRecord {
   updateFrequency?: UpdateFrequency
 
   // information related to the resource (dataset, service)
-  resourceIdentifier?: string
+
+  resourceIdentifiers?: Array<ResourceIdentifier>
   contactsForResource: Array<Individual>
   resourceCreated?: Date
   resourcePublished?: Date

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/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/service/data.service.ts

@@ -97,16 +97,27 @@ export class DataService {
         if (!featureType) {
           throw new Error('wfs.featuretype.notfound')
         }
+
+        const wfsVersion = endpoint.getVersion()
+        const addSrsName = wfsVersion === '1.1.0' || wfsVersion === '2.0.0'
+        const defaultCrs = featureType.defaultCrs
+
+        const shouldAddOutputCrs = addSrsName && defaultCrs
+
         return {
-          all: featureType.outputFormats.reduce(
-            (prev, curr) => ({
+          all: featureType.outputFormats.reduce((prev, curr) => {
+            const isJsonFormat = curr.toLowerCase().includes('json')
+            return {
               ...prev,
               [curr]: endpoint.getFeatureUrl(featureType.name, {
                 outputFormat: curr,
+                ...(shouldAddOutputCrs &&
+                  !isJsonFormat && {
+                    outputCrs: defaultCrs,
+                  }),
               }),
-            }),
-            {}
-          ),
+            }
+          }, {}),
           geojson: endpoint.supportsJson(featureType.name)
             ? endpoint.getFeatureUrl(featureType.name, {
                 asJson: true,

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

@@ -0,0 +1,40 @@
+<div
+  class="w-full h-full flex flex-row mt-6 bg-white border border-gray-300 rounded-lg overflow-hidden"
+>
+  <div class="flex-1 flex flex-col">
+    <div class="m-8">
+      <p class="mb-4" translate>stac.filter.period</p>
+      <p translate>stac.filter.from</p>
+      <gn-ui-date-picker
+        id="start-date-picker"
+        [date]="currentTemporalExtent?.start"
+        (dateChange)="onStartDateChange($event)"
+      />
+      <p class="mt-4" translate>stac.filter.to</p>
+      <gn-ui-date-picker
+        id="end-date-picker"
+        [date]="currentTemporalExtent?.end"
+        (dateChange)="onEndDateChange($event)"
+      />
+    </div>
+
+    <div class="mt-auto mb-8 mx-8" *ngIf="isTemporalFilterModified">
+      <button
+        id="reset-filters-button"
+        type="button"
+        class="flex items-center"
+        (click)="onResetFilters()"
+      >
+        <span translate>stac.filter.reset</span>
+        <ng-icon
+          name="matDeleteOutline"
+          class="pointer-events-none ml-2"
+        ></ng-icon>
+      </button>
+    </div>
+  </div>
+
+  <div class="w-[655px] flex-shrink-0 flex items-center justify-center">
+    <span>Map...</span>
+  </div>
+</div>

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

@@ -0,0 +1,62 @@
+import { CommonModule } from '@angular/common'
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core'
+import {
+  DatasetServiceDistribution,
+  DatasetTemporalExtent,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
+import { DatePickerComponent } from '../../../../../../libs/ui/inputs/src'
+import { NgIconComponent, provideIcons } from '@ng-icons/core'
+import { matDeleteOutline } from '@ng-icons/material-icons/outline'
+import { TranslateDirective } from '@ngx-translate/core'
+
+@Component({
+  selector: 'gn-ui-stac-view',
+  templateUrl: './stac-view.component.html',
+  styleUrls: ['./stac-view.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [
+    CommonModule,
+    DatePickerComponent,
+    NgIconComponent,
+    TranslateDirective,
+  ],
+  viewProviders: [provideIcons({ matDeleteOutline })],
+})
+export class StacViewComponent implements OnInit {
+  @Input() link: DatasetServiceDistribution
+  @Input() initialTemporalExtent: DatasetTemporalExtent | null
+
+  currentTemporalExtent: DatasetTemporalExtent | null = null
+  isTemporalFilterModified = false
+
+  onStartDateChange(date: Date) {
+    this.currentTemporalExtent = {
+      ...this.currentTemporalExtent,
+      start: date,
+    }
+    this.isTemporalFilterModified = true
+  }
+
+  onEndDateChange(date: Date) {
+    this.currentTemporalExtent = {
+      ...this.currentTemporalExtent,
+      end: date,
+    }
+    this.isTemporalFilterModified = true
+  }
+
+  onResetFilters() {
+    this.currentTemporalExtent = this.initialTemporalExtent
+    this.isTemporalFilterModified = false
+  }
+
+  ngOnInit() {
+    this.currentTemporalExtent = this.initialTemporalExtent
+  }
+}

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

@@ -69,11 +69,11 @@
         (valueChange)="valueChange.emit($event)"
       ></gn-ui-form-field-overviews>
     </ng-container>
-    <ng-container *ngSwitchCase="'resourceIdentifier'">
+    <ng-container *ngSwitchCase="'resourceIdentifiers'">
       <gn-ui-form-field-simple
         [type]="'text'"
-        [value]="valueAsString"
-        (valueChange)="valueChange.emit($event)"
+        [value]="valueAsResourceIdentifierCode"
+        (valueChange)="handleResourceIdentifierChange($event)"
       ></gn-ui-form-field-simple>
     </ng-container>
     <ng-container *ngSwitchCase="'resourceCreated'">

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/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/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/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'

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
+}