geonetwork-ui 2.10.3-dev.4154db07d → 2.11.0-dev.0559cfd9d

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

@@ -164,69 +164,49 @@ As such, **it is not very interesting at all.**`,
     extras: {
       isPublishedToAll: true,
       edit: true,
-      featureTypes: [
-        {
-          attributeTable: [
-            {
-              code: 'OBJECTID',
-              name: 'OBJECTID',
-              link: '',
-              definition: 'Object identifier',
-              type: 'OID',
-            },
-            {
-              code: 'NOM',
-              name: 'Nom',
-              link: '',
-              definition: 'Nom de la rue',
-              type: 'String (48)',
-              values: [
-                {
-                  code: 'Pomme',
-                  label: 'Les Pommiers',
-                  description: 'Sous les pommiers',
-                },
-                {
-                  code: 'Cotton',
-                  label: 'Rue Cotton',
-                  description: 'Rue Cotton',
-                },
-                { code: "Passage de l'échiquier" },
-                { description: 'Rue du Charlieu' },
-              ],
-            },
-            {
-              code: 'RUE',
-              name: 'Rue',
-              link: '',
-              definition: '',
-              type: 'String (50)',
-            },
-          ],
-          code: '',
-          aliases: '',
-          typeName: "Catalogue d'attributs N°1",
-          definition: 'Définition du catalogue d attributs N°1',
-          isAbstract: 'false',
-        },
-        {
-          attributeTable: [
-            {
-              code: 'UniqueObject',
-              name: 'unique object ',
-              link: '',
-              definition: 'this is the only object of this catalog',
-              type: 'String (50)',
-            },
-          ],
-          code: '',
-          aliases: '',
-          typeName: "Catalogue d'attributs N°2",
-          definition: 'Définition du catalogue d attributs N°2',
-          isAbstract: 'false',
-        },
-      ],
     },
+    featureTypeDescriptions: [
+      {
+        name: "Catalogue d'attributs N°1",
+        description: 'Définition du catalogue d attributs N°1',
+        attributes: [
+          {
+            name: 'OBJECTID',
+            description: 'Object identifier',
+            code: 'OBJECTID',
+            type: 'OID',
+          },
+          {
+            name: 'Nom',
+            description: 'Nom de la rue',
+            code: 'NOM',
+            type: 'String (48)',
+            values: [
+              { value: 'Pomme', label: 'Les Pommiers' },
+              { value: 'Cotton', label: 'Rue Cotton' },
+              { value: "Passage de l'échiquier" },
+            ],
+          },
+          {
+            name: 'Rue',
+            code: 'RUE',
+            type: 'String (50)',
+          },
+        ],
+      },
+      {
+        name: "Catalogue d'attributs N°2",
+        description: 'Définition du catalogue d attributs N°2',
+        attributes: [
+          {
+            name: 'unique object ',
+            description: 'this is the only object of this catalog',
+            code: 'UniqueObject',
+            type: 'String (50)',
+          },
+        ],
+      },
+    ],
   },
   {
     uniqueIdentifier: '7d002c4c-92ef-4b9f-a568-d732f740b99e',

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

@@ -2,9 +2,9 @@ import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
+  inject,
   Input,
   Output,
-  inject,
 } from '@angular/core'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 import {
@@ -183,7 +183,7 @@ export class ChartViewComponent {
   yChoices$ = this.properties$.pipe(
     map((properties) =>
       properties
-        .filter((prop) => prop.type === 'number' || prop.type === 'date')
+        .filter((prop) => prop.type === 'number')
         .map((prop) => ({ value: prop.name, label: prop.label || prop.name }))
     ),
     tap((choices) => {
@@ -222,6 +222,7 @@ export class ChartViewComponent {
     switchMap(([dataset, xProp, yProp, aggregation]) => {
       const fieldAgg: FieldAggregation =
         aggregation === 'count' ? ['count'] : [aggregation, yProp]
+      this.loading = true
       return dataset
         .groupBy(['distinct', xProp])
         .aggregate(fieldAgg)

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

@@ -2,11 +2,11 @@ import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
+  inject,
   Input,
   OnDestroy,
   OnInit,
   ViewChild,
-  inject,
 } from '@angular/core'
 import {
   DataTableComponent,
@@ -75,6 +75,7 @@ export class GeoTableViewComponent implements OnInit, OnDestroy {
   }
 
   private async initMapContext(): Promise<MapContext> {
+    this.dataset.load()
     this.dataset.selectAll()
     return {
       layers: [

package/src/libs/feature/dataviz/src/lib/service/data.service.ts

@@ -1,15 +1,15 @@
-import { Injectable, inject } from '@angular/core'
+import { inject, Injectable } from '@angular/core'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 import {
+  GetCollectionItemsOptions,
   OgcApiCollectionInfo,
   OgcApiEndpoint,
   OgcApiRecord,
-  WfsEndpoint,
-  WfsVersion,
-  TmsEndpoint,
   StacEndpoint,
-  GetCollectionItemsOptions,
   StacItemsDocument,
+  TmsEndpoint,
+  WfsEndpoint,
+  WfsVersion,
 } from '@camptocamp/ogc-client'
 import {
   BaseReader,
@@ -26,7 +26,7 @@ import {
 } from '../../../../../../libs/util/shared/src'
 import type { FeatureCollection } from 'geojson'
 import { from, Observable, throwError } from 'rxjs'
-import { catchError, map, switchMap, tap } from 'rxjs/operators'
+import { catchError, map, switchMap } from 'rxjs/operators'
 import {
   DatasetOnlineResource,
   DatasetServiceDistribution,
@@ -209,7 +209,8 @@ export class DataService {
     ogcApiLink: DatasetServiceDistribution
   ): Promise<DatasetOnlineResource[]> {
     const collectionInfo = await this.getDownloadUrlsFromOgcApi(
-      ogcApiLink.url.href
+      ogcApiLink.url.href,
+      ogcApiLink.name
     )
 
     return Object.keys(collectionInfo.bulkDownloadLinks).map((mimeType) => {
@@ -229,31 +230,41 @@ export class DataService {
     })
   }
 
-  async getDownloadUrlsFromOgcApi(url: string): Promise<OgcApiCollectionInfo> {
+  private async getTargetCollectionId(
+    endpoint: OgcApiEndpoint,
+    collectionId?: string
+  ): Promise<string | undefined> {
+    const collections = await endpoint.featureCollections
+    return collections.length === 1 && !collectionId
+      ? collections[0]
+      : collectionId
+  }
+
+  async getDownloadUrlsFromOgcApi(
+    url: string,
+    collectionId?: string
+  ): Promise<OgcApiCollectionInfo> {
     const endpoint = new OgcApiEndpoint(url)
-    return await endpoint.featureCollections
-      .then((collections) => {
-        return endpoint.getCollectionInfo(collections[0])
-      })
-      .catch((error) => {
-        throw new Error(`ogc.unreachable.unknown`)
-      })
+    try {
+      const id = await this.getTargetCollectionId(endpoint, collectionId)
+      return await endpoint.getCollectionInfo(id)
+    } catch {
+      throw new Error('ogc.unreachable.unknown')
+    }
   }
 
   async getItemsFromOgcApi(
     url: string,
+    collectionId?: string,
     limit?: number
   ): Promise<OgcApiRecord[]> {
     const endpoint = new OgcApiEndpoint(url)
-    return await endpoint.featureCollections
-      .then((collections) => {
-        return collections.length
-          ? endpoint.getCollectionItems(collections[0], limit)
-          : null
-      })
-      .catch(() => {
-        throw new Error(`ogc.unreachable.unknown`)
-      })
+    try {
+      const id = await this.getTargetCollectionId(endpoint, collectionId)
+      return await endpoint.getCollectionItems(id, limit)
+    } catch {
+      throw new Error('ogc.unreachable.unknown')
+    }
   }
 
   async getItemsFromStacApi(
@@ -347,14 +358,11 @@ export class DataService {
     if (link.type === 'service' && link.accessServiceProtocol === 'wfs') {
       const wfsUrlEndpoint = this.proxy.getProxiedUrl(link.url.toString())
       return from(
-        openDataset(
-          wfsUrlEndpoint,
-          'wfs',
-          {
-            wfsFeatureType: link.name,
-          },
-          cacheActive
-        )
+        openDataset(wfsUrlEndpoint, {
+          typeHint: 'wfs',
+          wfsFeatureType: link.name,
+          enableCache: cacheActive,
+        })
       )
     } else if (link.type === 'download') {
       const linkProxifiedUrl = this.proxy.getProxiedUrl(link.url.toString())
@@ -364,7 +372,10 @@ export class DataService {
           ? (format as SupportedType)
           : undefined
       return from(
-        openDataset(linkProxifiedUrl, supportedType, undefined, cacheActive)
+        openDataset(linkProxifiedUrl, {
+          typeHint: supportedType,
+          enableCache: cacheActive,
+        })
       ).pipe()
     } else if (
       link.type === 'service' &&
@@ -374,12 +385,16 @@ export class DataService {
         link.url.toString(),
         'geojson'
       )
-      return from(openDataset(url, 'geojson', undefined, cacheActive)).pipe()
+      return from(
+        openDataset(url, { typeHint: 'geojson', enableCache: cacheActive })
+      ).pipe()
     } else if (
       link.type === 'service' &&
       link.accessServiceProtocol === 'ogcFeatures'
     ) {
-      return from(this.getDownloadUrlsFromOgcApi(link.url.href)).pipe(
+      return from(
+        this.getDownloadUrlsFromOgcApi(link.url.href, link.name)
+      ).pipe(
         switchMap((collectionInfo) => {
           const isMimeTypeJson = (mimeType: string): boolean => {
             return mimeType.toLowerCase().indexOf('json') > -1
@@ -395,12 +410,10 @@ export class DataService {
           }
           const urlWithoutLimit = new URL(geojsonUrl)
           urlWithoutLimit.searchParams.delete('limit')
-          return openDataset(
-            urlWithoutLimit.toString(),
-            'geojson',
-            undefined,
-            cacheActive
-          )
+          return openDataset(urlWithoutLimit.toString(), {
+            typeHint: 'geojson',
+            enableCache: cacheActive,
+          })
         })
       )
     }

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

@@ -0,0 +1,33 @@
+<div class="flex flex-col gap-2">
+  <gn-ui-check-toggle
+    [label]="'editor.record.form.field.parentLink' | translate"
+    [value]="hasParentLink"
+    (toggled)="onToggle($event)"
+    data-cy="associated-record-toggle"
+  ></gn-ui-check-toggle>
+  @if (hasParentLink) {
+    <gn-ui-form-field-wrapper
+      [label]="'editor.record.form.field.parentIdentifier' | translate"
+    >
+      <gn-ui-text-input
+        [value]="uniqueIdentifier"
+        (valueChange)="onUniqueIdentifierChange($event)"
+        placeholder=""
+        data-cy="associated-record-identifier"
+      ></gn-ui-text-input>
+    </gn-ui-form-field-wrapper>
+    <gn-ui-form-field-wrapper
+      [label]="'editor.record.form.field.parentType' | translate"
+    >
+      <gn-ui-dropdown-selector
+        [title]="'editor.record.form.field.parentType' | translate"
+        [showTitle]="false"
+        [choices]="choices"
+        [selected]="selectedType"
+        (selectValue)="onTypeChange($event)"
+        [extraBtnClass]="'input-as-button gn-ui-text-input'"
+        data-cy="associated-record-type"
+      ></gn-ui-dropdown-selector>
+    </gn-ui-form-field-wrapper>
+  }
+</div>

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

@@ -0,0 +1,94 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core'
+import {
+  AssociatedRecord,
+  AssociationType,
+  associationTypeValues,
+} from '../../../../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  CheckToggleComponent,
+  DropdownChoice,
+  DropdownSelectorComponent,
+  TextInputComponent,
+} from '../../../../../../../../../libs/ui/inputs/src'
+import { FormFieldWrapperComponent } from '../../../../../../../../../libs/ui/layout/src'
+import { TranslatePipe } from '@ngx-translate/core'
+
+@Component({
+  selector: 'gn-ui-form-field-associated-records',
+  templateUrl: './form-field-associated-records.component.html',
+  styleUrls: ['./form-field-associated-records.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [
+    CheckToggleComponent,
+    TextInputComponent,
+    DropdownSelectorComponent,
+    FormFieldWrapperComponent,
+    TranslatePipe,
+  ],
+})
+export class FormFieldAssociatedRecordsComponent {
+  @Input() value?: AssociatedRecord[]
+  @Output() valueChange = new EventEmitter<AssociatedRecord[]>()
+
+  private get list() {
+    return this.value ?? []
+  }
+  private get first() {
+    return this.list[0]
+  }
+  private get rest() {
+    return this.list.slice(1)
+  }
+
+  get hasParentLink() {
+    return this.list.length > 0
+  }
+  get uniqueIdentifier() {
+    return this.first?.uniqueIdentifier ?? ''
+  }
+  get selectedType() {
+    return this.first?.associationType
+  }
+  get choices(): DropdownChoice[] {
+    return associationTypeValues.map((value) => ({
+      value,
+      label: `domain.record.associationType.${value}`,
+    }))
+  }
+
+  onToggle(checked: boolean) {
+    this.valueChange.emit(
+      checked
+        ? [
+            {
+              uniqueIdentifier: '',
+              associationType: associationTypeValues[0],
+            },
+            ...this.rest,
+          ]
+        : this.rest
+    )
+  }
+
+  onUniqueIdentifierChange(uniqueIdentifier: string) {
+    this.valueChange.emit(
+      uniqueIdentifier
+        ? [{ ...this.first, uniqueIdentifier }, ...this.rest]
+        : this.rest
+    )
+  }
+
+  onTypeChange(associationType: DropdownChoice['value']) {
+    this.valueChange.emit([
+      { ...this.first, associationType: associationType as AssociationType },
+      ...this.rest,
+    ])
+  }
+}

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

@@ -1,17 +1,21 @@
-<div class="flex gap-2 mb-2">
-  @for (addOption of addOptions$ | async; track addOption) {
-    <gn-ui-button type="gray" (buttonClick)="onAdd(addOption.eventName)">
-      <ng-icon name="iconoirPlus" class="text-primary"></ng-icon> &nbsp;{{
-        addOption.buttonLabel
-      }}</gn-ui-button
-    >
+<div class="flex flex-col gap-2">
+  <div class="flex gap-2">
+    @for (addOption of addOptions$ | async; track addOption) {
+      <gn-ui-button type="gray" (buttonClick)="onAdd(addOption.eventName)">
+        <ng-icon name="iconoirPlus" class="text-primary"></ng-icon> &nbsp;{{
+          addOption.buttonLabel
+        }}</gn-ui-button
+      >
+    }
+  </div>
+  @if (extents.length) {
+    <gn-ui-sortable-list
+      [items]="extents"
+      (itemsOrderChange)="onItemsOrderChange($event)"
+      [elementTemplate]="template"
+    ></gn-ui-sortable-list>
   }
 </div>
-<gn-ui-sortable-list
-  [items]="extents"
-  (itemsOrderChange)="onItemsOrderChange($event)"
-  [elementTemplate]="template"
-></gn-ui-sortable-list>
 <ng-template #template let-extent let-index="index">
   @if (extent.end === undefined) {
     <div class="border rounded-lg px-4 pb-4">

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

@@ -98,6 +98,12 @@
         [recordKind]="recordKind"
       ></gn-ui-form-field-update-frequency>
     </ng-container>
+    <ng-container *ngSwitchCase="'associatedRecords'">
+      <gn-ui-form-field-associated-records
+        [value]="valueAsAssociatedRecords"
+        (valueChange)="valueChange.emit($event)"
+      ></gn-ui-form-field-associated-records>
+    </ng-container>
     <ng-container *ngSwitchCase="'temporalExtents'">
       <gn-ui-form-field-temporal-extents
         [value]="valueAsTemporalExtents"

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

@@ -11,6 +11,7 @@ import {
 } from '@angular/core'
 import { MatTooltipModule } from '@angular/material/tooltip'
 import {
+  AssociatedRecord,
   CatalogRecordKeys,
   Constraint,
   DatasetTemporalExtent,
@@ -39,6 +40,7 @@ import {
   FormFieldComponentName,
   FormFieldConfig,
 } from '../../../models'
+import { FormFieldAssociatedRecordsComponent } from './form-field-associated-records/form-field-associated-records.component'
 import { FormFieldContactsForResourceComponent } from './form-field-contacts-for-resource/form-field-contacts-for-resource.component'
 import { FormFieldContactsComponent } from './form-field-contacts/form-field-contacts.component'
 import { FormFieldKeywordsComponent } from './form-field-keywords/form-field-keywords.component'
@@ -70,6 +72,7 @@ import { FormFieldTopicsComponent } from './form-field-topics/form-field-topics.
     FormFieldLicenseComponent,
     FormFieldDateComponent,
     FormFieldUpdateFrequencyComponent,
+    FormFieldAssociatedRecordsComponent,
     FormFieldTemporalExtentsComponent,
     FormFieldSimpleComponent,
     FormFieldRichComponent,
@@ -140,6 +143,9 @@ export class FormFieldComponent {
   get valueAsUpdateFrequency() {
     return this.value as UpdateFrequency
   }
+  get valueAsAssociatedRecords() {
+    return this.value as Array<AssociatedRecord>
+  }
   get valueAsTemporalExtents() {
     return this.value as Array<DatasetTemporalExtent>
   }

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

@@ -134,6 +134,11 @@ export const DEFAULT_CONFIGURATION: EditorConfig = {
               },
               hidden: '${record.kind == "service"}',
             },
+            {
+              model: 'associatedRecords',
+              formFieldConfig: {},
+              hidden: '${record.kind == "service"}',
+            },
           ],
         },
 

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

@@ -6,8 +6,6 @@ export * from './lib/feature-map.module'
 export * from './lib/map-state-container/map-state-container.component'
 export * from './lib/constant'
 export * from './lib/utils'
-export * from './lib/style'
 export * from './lib/layers-panel/layers-panel.component'
 export * from './lib/add-layer-from-catalog/add-layer-from-catalog.component'
 export * from './lib/add-layer-from-catalog/add-layer-record-preview/add-layer-record-preview.component'
-export * from './lib/geocoding/geocoding.component'

package/src/libs/feature/map/src/lib/add-layer-from-file/add-layer-from-file.component.html

@@ -5,6 +5,7 @@
         (fileChange)="handleFileChange($event)"
         [accept]="acceptedMimeType.join(',')"
         [placeholder]="'map.addFromFile.placeholder' | translate"
+        textClass="text-gray-900 pl-2 py-2"
         class="placeholder-grey"
       ></gn-ui-drag-and-drop-file-input>
     </div>

package/src/libs/feature/map/src/lib/feature-map.module.ts

@@ -2,18 +2,11 @@ import { NgModule } from '@angular/core'
 import { StoreModule } from '@ngrx/store'
 import * as fromMap from './+state/map.reducer'
 import { MapFacade } from './+state/map.facade'
-import { GEOCODING_PROVIDER, GeocodingProvider } from './geocoding.service'
 
 @NgModule({
   imports: [
     StoreModule.forFeature(fromMap.MAP_FEATURE_KEY, fromMap.mapReducer),
   ],
-  providers: [
-    MapFacade,
-    {
-      provide: GEOCODING_PROVIDER,
-      useValue: ['geonames', { maxRows: 5 }] as GeocodingProvider,
-    },
-  ],
+  providers: [MapFacade],
 })
 export class FeatureMapModule {}

package/src/libs/feature/notifications/src/lib/notifications.service.ts

@@ -18,10 +18,12 @@ export class NotificationsService {
     error && console.error(error)
     const id = Math.floor(Math.random() * 1000000)
     this.notifications$.next([...this.notifications$.value, { ...content, id }])
-    if (typeof timeoutMs === 'undefined') return
-    setTimeout(() => {
-      this.removeNotificationById(id)
-    }, timeoutMs)
+    if (typeof timeoutMs !== 'undefined') {
+      setTimeout(() => {
+        this.removeNotificationById(id)
+      }, timeoutMs)
+    }
+    return id
   }
 
   removeNotificationById(id: number) {

package/src/libs/feature/notify-reuse/src/lib/notify-reuse-form/notify-reuse-form.component.ts

@@ -33,7 +33,6 @@ import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain
 import { NOT_KNOWN_CONSTRAINT } from '../../../../../../libs/feature/editor/src'
 import { NotificationsService } from '../../../../../../libs/feature/notifications/src'
 import { ButtonComponent, TextInputComponent } from '../../../../../../libs/ui/inputs/src'
-import { getOptionalEditorConfig } from '../../../../../../libs/util/app-config/src'
 import { NgIcon, provideIcons, provideNgIconsConfig } from '@ng-icons/core'
 import { iconoirAppWindow, iconoirPlusCircle } from '@ng-icons/iconoir'
 import { matCloseOutline } from '@ng-icons/material-icons/outline'
@@ -48,6 +47,10 @@ marker('notify.reuse.form.error.title')
 marker('notify.reuse.form.error.body')
 
 export const REUSE_FORM_URL = new InjectionToken<string>('reuseFormUrl')
+// language assigned to the created reuse record; falls back to the current UI language
+export const NEW_RECORD_DEFAULT_LANGUAGE = new InjectionToken<string>(
+  'newRecordDefaultLanguage'
+)
 
 @Component({
   selector: 'gn-ui-notify-reuse-form',
@@ -86,6 +89,9 @@ export class NotifyReuseFormComponent implements OnDestroy {
   private readonly notificationsService = inject(NotificationsService)
   private readonly platformServiceInterface = inject(PlatformServiceInterface)
   reuseFormUrl = inject(REUSE_FORM_URL, { optional: true })
+  private newRecordDefaultLanguage = inject(NEW_RECORD_DEFAULT_LANGUAGE, {
+    optional: true,
+  })
   private locationStrategy = inject(LocationStrategy)
 
   me = toSignal(this.platformServiceInterface.getMe())
@@ -158,8 +164,7 @@ export class NotifyReuseFormComponent implements OnDestroy {
   submit() {
     if (!this.isFormValid()) return
     const defaultLang =
-      getOptionalEditorConfig()?.NEW_RECORD_DEFAULT_LANGUAGE ??
-      this.translate.currentLang
+      this.newRecordDefaultLanguage ?? this.translate.currentLang
     const onlineResource: OnlineLinkResource = {
       type: 'link',
       url: new URL(this.url()),

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

@@ -3,6 +3,7 @@ import { createAction, props } from '@ngrx/store'
 import {
   CatalogRecord,
   DatasetFeatureCatalog,
+  LinkedRecord,
   UserFeedback,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 
@@ -54,14 +55,9 @@ export const setRelated = createAction(
   props<{ related: CatalogRecord[] }>()
 )
 
-export const setSources = createAction(
-  '[Metadata view] Set sources',
-  props<{ sources: CatalogRecord[] }>()
-)
-
-export const setSourceOf = createAction(
-  '[Metadata view] Set has sources',
-  props<{ sourceOf: CatalogRecord[] }>()
+export const setLinkedRecords = createAction(
+  '[Metadata view] Set associated records',
+  props<{ linkedRecords: LinkedRecord[] }>()
 )
 
 /*