geonetwork-ui 2.6.0-dev.f073bbb4e → 2.7.0-dev.30c4f9cfa

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

@@ -2,9 +2,7 @@ import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
-  Inject,
   Input,
-  Optional,
   Output,
 } from '@angular/core'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
@@ -13,6 +11,7 @@ import {
   FetchError,
   FieldAggregation,
   getJsonDataItemsProxy,
+  PropertyInfo,
 } from '../../../../../../libs/util/data-fetcher/src'
 import {
   DropdownChoice,
@@ -30,8 +29,11 @@ import {
 } from 'rxjs/operators'
 import { DataService } from '../service/data.service'
 import { InputChartType } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
-import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
-import { TranslateModule, TranslateService } from '@ngx-translate/core'
+import {
+  DatasetFeatureCatalog,
+  DatasetOnlineResource,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
+import { TranslatePipe, TranslateService } from '@ngx-translate/core'
 import { CommonModule } from '@angular/common'
 import { ChartComponent } from '../../../../../../libs/ui/dataviz/src'
 import {
@@ -59,17 +61,26 @@ marker('chart.aggregation.count')
   imports: [
     CommonModule,
     DropdownSelectorComponent,
-    TranslateModule,
     ChartComponent,
     LoadingMaskComponent,
     PopupAlertComponent,
+    TranslatePipe,
   ],
   standalone: true,
 })
 export class ChartViewComponent {
+  public featureCatalog$ = new BehaviorSubject<DatasetFeatureCatalog | null>(
+    null
+  )
+  @Input() set featureCatalog(value: DatasetFeatureCatalog) {
+    this.featureCatalog$.next(value)
+  }
   @Input() cacheActive = true
   @Input() set link(value: DatasetOnlineResource) {
     this.currentLink$.next(value)
+    if (value) {
+      this.aggregation$.next('sum')
+    }
   }
   private currentLink$ = new BehaviorSubject<DatasetOnlineResource>(null)
 
@@ -137,6 +148,10 @@ export class ChartViewComponent {
     switchMap((link) => {
       this.error = null
       this.loading = true
+      if (link.accessRestricted) {
+        this.handleError('dataset.error.restrictedAccess')
+        return EMPTY
+      }
       return this.dataService.getDataset(link, this.cacheActive).pipe(
         catchError((error) => {
           this.handleError(error)
@@ -146,13 +161,8 @@ export class ChartViewComponent {
     }),
     shareReplay(1)
   )
-  properties$ = this.dataset$.pipe(
-    switchMap((dataset) =>
-      dataset.properties.catch((error) => {
-        this.handleError(error)
-        return []
-      })
-    ),
+  properties$ = combineLatest([this.dataset$, this.featureCatalog$]).pipe(
+    switchMap(([dataset, catalog]) => this.setProperties(dataset, catalog)),
     shareReplay(1)
   )
   yChoices$ = this.properties$.pipe(
@@ -193,6 +203,7 @@ export class ChartViewComponent {
     this.yProperty$.pipe(filter((value) => value !== undefined)),
     this.aggregation$,
   ]).pipe(
+    filter(([_, x, y]) => !!x || !!y),
     switchMap(([dataset, xProp, yProp, aggregation]) => {
       const fieldAgg: FieldAggregation =
         aggregation === 'count' ? ['count'] : [aggregation, yProp]
@@ -213,6 +224,18 @@ export class ChartViewComponent {
     shareReplay(1)
   )
 
+  prettyLabel$ = combineLatest([
+    this.aggregation$,
+    this.properties$,
+    this.yProperty$,
+  ]).pipe(
+    map(([aggregation, properties, yProperty]) => {
+      if (aggregation === 'count') return 'count()'
+      const prop = properties.find((p) => p.name === yProperty)
+      return prop ? `${aggregation}(${prop.label})` : ''
+    })
+  )
+
   get labelProperty() {
     if (!this.xProperty$.value) return ''
     return `distinct(${this.xProperty$.value})`
@@ -231,6 +254,31 @@ export class ChartViewComponent {
     private translateService: TranslateService
   ) {}
 
+  setProperties(
+    dataset: BaseReader,
+    catalog: DatasetFeatureCatalog
+  ): Promise<PropertyInfo[]> {
+    return dataset.properties
+      .then((properties) => {
+        return properties.map((p) => {
+          if (catalog) {
+            const featureAttributes = catalog?.featureTypes[0]?.attributes ?? []
+            const matchingAttribute = featureAttributes.find(
+              (attr) => attr.name === p.label
+            )
+            if (matchingAttribute?.code) {
+              return { ...p, label: matchingAttribute.code }
+            }
+            return p
+          }
+          return p
+        })
+      })
+      .catch((error) => {
+        this.handleError(error)
+        return []
+      })
+  }
   handleError(error: FetchError | Error | string) {
     if (error instanceof FetchError) {
       this.error = this.translateService.instant(

package/src/libs/feature/dataviz/src/lib/figure/figure-container/figure-container.component.ts

@@ -4,7 +4,7 @@ import {
   Input,
   OnChanges,
 } from '@angular/core'
-import { TableItemModel, UiDatavizModule } from '../../../../../../../libs/ui/dataviz/src'
+import { FigureComponent, TableItemModel } from '../../../../../../../libs/ui/dataviz/src'
 import { FigureService } from '../figure.service'
 
 @Component({
@@ -13,7 +13,7 @@ import { FigureService } from '../figure.service'
   styleUrls: ['./figure-container.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [UiDatavizModule],
+  imports: [FigureComponent],
 })
 export class FigureContainerComponent implements OnChanges {
   @Input() dataset: TableItemModel[]

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

@@ -6,6 +6,7 @@ import {
   OgcApiRecord,
   WfsEndpoint,
   WfsVersion,
+  TmsEndpoint,
 } from '@camptocamp/ogc-client'
 import {
   BaseReader,
@@ -27,6 +28,7 @@ import {
   DatasetOnlineResource,
   DatasetServiceDistribution,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { DatavizConfigModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
 
 marker('wfs.unreachable.cors')
 marker('wfs.unreachable.http')
@@ -226,11 +228,49 @@ export class DataService {
           ? endpoint.getCollectionItem(collections[0], '1')
           : null
       })
-      .catch((error) => {
+      .catch(() => {
         throw new Error(`ogc.unreachable.unknown`)
       })
   }
 
+  async getGeodataLinksFromTms(
+    tmsLink: DatasetServiceDistribution,
+    keepOriginalLink = false
+  ): Promise<DatasetServiceDistribution[]> {
+    const endpoint = new TmsEndpoint(tmsLink.url.toString())
+    const tileMaps = await endpoint.allTileMaps.catch(() => {
+      throw new Error(`ogc.unreachable.unknown`)
+    })
+    if (!tileMaps?.length) return null
+
+    // TODO: at some point use the identifierInService field if more that one layers in the TMS service
+    const tileMapInfo = await endpoint.getTileMapInfo(tileMaps[0].href)
+
+    // case 1: no styles; return a plain TMS link
+    if (!tileMapInfo?.metadata?.length) return [tmsLink]
+
+    // case 2: styles present; return each as a separate link
+    const styleLinks = tileMapInfo.metadata
+      .filter((meta) => meta.href)
+      .map((meta) => {
+        const fileName = meta.href.split('/').pop() || ''
+        const linkName =
+          tmsLink.description || ('name' in tmsLink ? tmsLink.name : '')
+        const styleName = fileName.split('.')[0]
+        const name = `${linkName} - ${styleName}`
+        return {
+          type: 'service',
+          url: new URL(meta.href),
+          name,
+          accessServiceProtocol: 'maplibre-style',
+        } as DatasetServiceDistribution
+      })
+    if (keepOriginalLink) {
+      styleLinks.unshift(tmsLink)
+    }
+    return styleLinks
+  }
+
   getDownloadLinksFromEsriRest(
     esriRestLink: DatasetServiceDistribution
   ): DatasetOnlineResource[] {
@@ -256,6 +296,14 @@ export class DataService {
     )
   }
 
+  writeConfigAsJSON(config: DatavizConfigModel): File {
+    const jsonContent = JSON.stringify(config, null, 2)
+    const blob = new Blob([jsonContent], { type: 'application/json' })
+    return new File([blob], 'datavizConfig.json', {
+      type: 'application/json',
+    })
+  }
+
   getDataset(
     link: DatasetOnlineResource,
     cacheActive: boolean

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

@@ -4,6 +4,7 @@
       *ngIf="tableData$ | async as dataset"
       class="overflow-auto grow"
       [dataset]="dataset"
+      [featureAttributes]="featureAttributes"
       (selected)="onTableSelect($event)"
     ></gn-ui-data-table>
     <gn-ui-loading-mask

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

@@ -6,12 +6,16 @@ import {
   shareReplay,
   startWith,
   switchMap,
+  tap,
 } from 'rxjs/operators'
 import { BaseReader, FetchError } from '../../../../../../libs/util/data-fetcher/src'
 import { DataService } from '../service/data.service'
 import { DataTableComponent } from '../../../../../../libs/ui/dataviz/src'
-import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
-import { TranslateModule, TranslateService } from '@ngx-translate/core'
+import {
+  DatasetFeatureCatalog,
+  DatasetOnlineResource,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
+import { TranslatePipe, TranslateService } from '@ngx-translate/core'
 import {
   LoadingMaskComponent,
   PopupAlertComponent,
@@ -28,11 +32,13 @@ import { CommonModule } from '@angular/common'
     DataTableComponent,
     LoadingMaskComponent,
     PopupAlertComponent,
-    TranslateModule,
+    TranslatePipe,
   ],
   standalone: true,
 })
 export class TableViewComponent {
+  featureAttributes = []
+  @Input() featureCatalog: DatasetFeatureCatalog
   @Input() cacheActive = true
   @Input() set link(value: DatasetOnlineResource) {
     this.currentLink$.next(value)
@@ -46,8 +52,13 @@ export class TableViewComponent {
     switchMap((link) => {
       this.error = null
       if (!link) return of(undefined)
+      if (link.accessRestricted) {
+        this.handleError('dataset.error.restrictedAccess')
+        return of([])
+      }
       this.loading = true
       return this.getDatasetReader(link).pipe(
+        tap((dataset: BaseReader) => this.setProperties(dataset)),
         catchError((error) => {
           this.handleError(error)
           return of(undefined)
@@ -92,4 +103,23 @@ export class TableViewComponent {
     }
     this.loading = false
   }
+
+  setProperties(dataset: BaseReader) {
+    dataset.properties.then((properties) => {
+      const updatedProperties = properties.map((p) => {
+        let label = p.name
+        if (this.featureCatalog) {
+          const attributes = this.featureCatalog.featureTypes[0].attributes
+          const matchingAttribute = attributes.find(
+            (attr) => attr.name === p.name
+          )
+          if (matchingAttribute && matchingAttribute.code) {
+            label = matchingAttribute.code
+          }
+        }
+        return { value: p.name, label }
+      })
+      this.featureAttributes = updatedProperties
+    })
+  }
 }

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

@@ -7,7 +7,5 @@ export * from './lib/feature-editor.module'
 export * from './lib/services/editor.service'
 export * from './lib/components/import-record/import-record.component'
 export * from './lib/components/record-form/record-form.component'
-export * from './lib/components/wizard/wizard.component'
-export * from './lib/components/wizard-field/wizard-field.component'
-export * from './lib/components/wizard-summarize/wizard-summarize.component'
 export * from './lib/components/record-form/form-field'
+export * from './lib/components/multilingual-panel/multilingual-panel.component'

package/src/libs/feature/editor/src/lib/+state/editor.actions.ts

@@ -1,5 +1,8 @@
 import { createAction, props } from '@ngrx/store'
-import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  CatalogRecord,
+  LanguageCode,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
 import { SaveRecordError } from './editor.models'
 import { EditorFieldIdentification } from '../models'
 
@@ -16,6 +19,11 @@ export const updateRecordField = createAction(
   props<{ field: string; value: unknown }>()
 )
 
+export const updateRecordLanguages = createAction(
+  '[Editor] Update record languages',
+  props<{ defaultLanguage: LanguageCode; otherLanguages: LanguageCode[] }>()
+)
+
 export const markRecordAsChanged = createAction(
   '[Editor] Mark record as changed'
 )

package/src/libs/feature/editor/src/lib/+state/editor.effects.ts

@@ -4,7 +4,7 @@ import { debounceTime, EMPTY, filter, of, withLatestFrom } from 'rxjs'
 import { catchError, map, switchMap } from 'rxjs/operators'
 import * as EditorActions from './editor.actions'
 import { EditorService } from '../services/editor.service'
-import { Store } from '@ngrx/store'
+import { Action, Store } from '@ngrx/store'
 import {
   selectEditorConfig,
   selectRecord,
@@ -31,15 +31,20 @@ export class EditorEffects {
       ),
       switchMap(([, record, recordSource, fieldsConfig]) =>
         this.editorService.saveRecord(record, recordSource, fieldsConfig).pipe(
-          switchMap(([record, recordSource]) =>
-            of(
-              EditorActions.saveRecordSuccess(),
-              EditorActions.openRecord({
-                record,
-                recordSource,
-              })
-            )
-          ),
+          switchMap(([savedRecord, savedRecordSource]) => {
+            const actions: Action[] = [EditorActions.saveRecordSuccess()]
+
+            if (!record?.uniqueIdentifier) {
+              actions.push(
+                EditorActions.openRecord({
+                  record: savedRecord,
+                  recordSource: savedRecordSource,
+                })
+              )
+            }
+
+            return of(...actions)
+          }),
           catchError((error) =>
             of(
               EditorActions.saveRecordFailure({
@@ -78,14 +83,20 @@ export class EditorEffects {
 
   markAsChanged$ = createEffect(() =>
     this.actions$.pipe(
-      ofType(EditorActions.updateRecordField),
+      ofType(
+        EditorActions.updateRecordField,
+        EditorActions.updateRecordLanguages
+      ),
       map(() => EditorActions.markRecordAsChanged())
     )
   )
 
   saveRecordDraft$ = createEffect(() =>
     this.actions$.pipe(
-      ofType(EditorActions.updateRecordField),
+      ofType(
+        EditorActions.updateRecordField,
+        EditorActions.updateRecordLanguages
+      ),
       debounceTime(1000),
       withLatestFrom(
         this.store.select(selectRecord),

package/src/libs/feature/editor/src/lib/+state/editor.facade.ts

@@ -2,7 +2,10 @@ import { inject, Injectable } from '@angular/core'
 import { select, Store } from '@ngrx/store'
 import * as EditorActions from './editor.actions'
 import * as EditorSelectors from './editor.selectors'
-import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  CatalogRecord,
+  LanguageCode,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
 import { filter } from 'rxjs'
 import { Actions, ofType } from '@ngrx/effects'
 import { EditorFieldIdentification } from '../models'
@@ -57,6 +60,15 @@ export class EditorFacade {
     this.store.dispatch(EditorActions.updateRecordField({ field, value }))
   }
 
+  updateRecordLanguages(
+    defaultLanguage: LanguageCode,
+    otherLanguages: LanguageCode[]
+  ) {
+    this.store.dispatch(
+      EditorActions.updateRecordLanguages({ defaultLanguage, otherLanguages })
+    )
+  }
+
   setCurrentPage(page: number) {
     this.store.dispatch(EditorActions.setCurrentPage({ page }))
   }

package/src/libs/feature/editor/src/lib/+state/editor.reducer.ts

@@ -4,6 +4,7 @@ import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/mode
 import { SaveRecordError } from './editor.models'
 import { EditorConfig } from '../models'
 import { DEFAULT_CONFIGURATION } from '../fields.config'
+import { updateLanguages } from '../../../../../../libs/util/shared/src'
 
 export const EDITOR_FEATURE_KEY = 'editor'
 
@@ -116,7 +117,14 @@ const reducer = createReducer(
   on(EditorActions.canEditRecord, (state, { canEditRecord }) => ({
     ...state,
     canEditRecord: canEditRecord,
-  }))
+  })),
+  on(
+    EditorActions.updateRecordLanguages,
+    (state, { defaultLanguage, otherLanguages }) => ({
+      ...state,
+      record: updateLanguages(state.record, defaultLanguage, otherLanguages),
+    })
+  )
 )
 
 export function editorReducer(state: EditorState | undefined, action: Action) {

package/src/libs/feature/editor/src/lib/components/constraint-card/constraint-card.component.ts

@@ -6,11 +6,10 @@ import {
   Output,
 } from '@angular/core'
 import { CommonModule } from '@angular/common'
-import { MarkdownEditorComponent } from '../../../../../../../libs/ui/elements/src'
 import { FormFieldRichComponent } from '../record-form/form-field/form-field-rich/form-field-rich.component'
 import { ButtonComponent, UrlInputComponent } from '../../../../../../../libs/ui/inputs/src'
 import { MatIconModule } from '@angular/material/icon'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
 import { Constraint } from '../../../../../../../libs/common/domain/src/lib/model/record'
 import {
   NgIconComponent,
@@ -25,12 +24,12 @@ import { marker } from '@biesbjerg/ngx-translate-extract-marker'
   standalone: true,
   imports: [
     CommonModule,
-    MarkdownEditorComponent,
     FormFieldRichComponent,
     UrlInputComponent,
     ButtonComponent,
     MatIconModule,
-    TranslateModule,
+    TranslateDirective,
+    TranslatePipe,
     NgIconComponent,
   ],
   providers: [

package/src/libs/feature/editor/src/lib/components/generic-keywords/generic-keywords.component.ts

@@ -7,21 +7,12 @@ import {
   Output,
 } from '@angular/core'
 import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
-import {
-  AutocompleteComponent,
-  DropdownSelectorComponent,
-  UiInputsModule,
-} from '../../../../../../../libs/ui/inputs/src'
-import { UiWidgetsModule } from '../../../../../../../libs/ui/widgets/src'
+import { AutocompleteComponent, BadgeComponent } from '../../../../../../../libs/ui/inputs/src'
 import { map } from 'rxjs'
 import { Keyword } from '../../../../../../../libs/common/domain/src/lib/model/record'
 import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus'
-import { TranslateModule } from '@ngx-translate/core'
-import {
-  NgIconComponent,
-  provideIcons,
-  provideNgIconsConfig,
-} from '@ng-icons/core'
+import { TranslatePipe } from '@ngx-translate/core'
+import { NgIconComponent, provideIcons } from '@ng-icons/core'
 import { matWarningAmberOutline } from '@ng-icons/material-icons/outline'
 
 type AutocompleteItem = { title: string; value: Keyword }
@@ -33,13 +24,11 @@ type AutocompleteItem = { title: string; value: Keyword }
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    DropdownSelectorComponent,
-    UiInputsModule,
     CommonModule,
-    UiWidgetsModule,
     AutocompleteComponent,
-    TranslateModule,
     NgIconComponent,
+    BadgeComponent,
+    TranslatePipe,
   ],
   providers: [
     provideIcons({

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

@@ -7,8 +7,11 @@ import {
 } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { ButtonComponent, UrlInputComponent } from '../../../../../../../libs/ui/inputs/src'
-import { ThumbnailComponent } from '../../../../../../../libs/ui/elements/src'
-import { TranslateModule, TranslateService } from '@ngx-translate/core'
+import {
+  TranslateDirective,
+  TranslatePipe,
+  TranslateService,
+} from '@ngx-translate/core'
 import { NotificationsService } from '../../../../../../../libs/feature/notifications/src'
 import { RecordsRepositoryInterface } from '../../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 import { Router } from '@angular/router'
@@ -19,7 +22,6 @@ import {
 } from '@ng-icons/core'
 import {
   iconoirArrowLeft,
-  iconoirAttachment,
   iconoirImport,
   iconoirLightBulbOn,
 } from '@ng-icons/iconoir'
@@ -43,9 +45,9 @@ type ImportMenuPage = 'mainMenu' | 'importExternalFile'
   imports: [
     CommonModule,
     ButtonComponent,
-    ThumbnailComponent,
     UrlInputComponent,
-    TranslateModule,
+    TranslateDirective,
+    TranslatePipe,
     NgIconComponent,
   ],
   providers: [