geonetwork-ui 2.6.0-dev.b306f1194 → 2.6.0-dev.c5432f39f

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

@@ -31,7 +31,7 @@ import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain
 import {
   RecordsApiService,
   SearchApiService,
-  FeatureResponseApiModel,
+  LanguagesApiService,
 } from '../../../../../../libs/data-access/gn4/src'
 import {
   combineLatest,
@@ -47,6 +47,7 @@ import {
 import { catchError, map, tap } from 'rxjs/operators'
 import { lt } from 'semver'
 import { ElasticsearchService } from './elasticsearch'
+import { LANG_3_TO_2_MAPPER } from '../../../../../../libs/util/i18n/src'
 
 const minPublicationApiVersion = '4.2.5'
 
@@ -65,7 +66,8 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     private gn4SearchHelper: ElasticsearchService,
     private gn4Mapper: Gn4Converter,
     private gn4RecordsApi: RecordsApiService,
-    private platformService: PlatformServiceInterface
+    private platformService: PlatformServiceInterface,
+    private gn4LanguagesApi: LanguagesApiService
   ) {}
 
   search({
@@ -129,9 +131,9 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     return this.gn4SearchApi
       .search(
         'bucket',
-        ['fcats'],
+        ['fcats', 'hassources'],
         JSON.stringify(
-          this.gn4SearchHelper.getMetadataByIdPayload(uniqueIdentifier)
+          this.gn4SearchHelper.getMetadataByIdsPayload([uniqueIdentifier])
         )
       )
       .pipe(
@@ -142,6 +144,27 @@ export class Gn4Repository implements RecordsRepositoryInterface {
       )
   }
 
+  getMultipleRecords(
+    uniqueIdentifiers: string[]
+  ): Observable<CatalogRecord[] | null> {
+    return this.gn4SearchApi
+      .search(
+        'bucket',
+        undefined,
+        JSON.stringify(
+          this.gn4SearchHelper.getMetadataByIdsPayload(uniqueIdentifiers)
+        )
+      )
+      .pipe(
+        map((results: Gn4SearchResults) => results.hits.hits),
+        switchMap((records) =>
+          records && records.length > 0
+            ? this.gn4Mapper.readRecords(records)
+            : of(null)
+        )
+      )
+  }
+
   private mapEmbeddedFeatureCatalog(
     featureTypes: Array<DatasetFeatureType>
   ): DatasetFeatureCatalog {
@@ -152,7 +175,9 @@ export class Gn4Repository implements RecordsRepositoryInterface {
         attributes: Array.isArray(featureType.attributeTable)
           ? featureType.attributeTable.map((attr) => ({
               name: attr.name,
+              code: attr.code,
               title: attr.definition,
+              type: attr.type,
             }))
           : [],
       })),
@@ -164,7 +189,8 @@ export class Gn4Repository implements RecordsRepositoryInterface {
   ): Observable<DatasetFeatureCatalog | null> {
     if (
       record.extras?.['featureTypes'] &&
-      Array.isArray(record.extras['featureTypes'])
+      Array.isArray(record.extras['featureTypes']) &&
+      record.extras['featureTypes'].length > 0
     ) {
       return of(this.mapEmbeddedFeatureCatalog(record.extras['featureTypes']))
     }
@@ -200,6 +226,24 @@ export class Gn4Repository implements RecordsRepositoryInterface {
       )
   }
 
+  getSources(record: CatalogRecord): Observable<CatalogRecord[]> {
+    const sourcesIdentifiers = record.extras?.['sourcesIdentifiers'] as string[]
+    if (sourcesIdentifiers && sourcesIdentifiers.length > 0) {
+      return this.getMultipleRecords(sourcesIdentifiers)
+    }
+    return of(null)
+  }
+
+  getSourceOf(record: CatalogRecord): Observable<CatalogRecord[]> {
+    const sourceOfIdentifiers = record.extras?.[
+      'sourceOfIdentifiers'
+    ] as string[]
+    if (sourceOfIdentifiers && sourceOfIdentifiers.length > 0) {
+      return this.getMultipleRecords(sourceOfIdentifiers)
+    }
+    return of(null)
+  }
+
   aggregate(params: AggregationsParams): Observable<Aggregations> {
     // if aggregations are empty, return an empty object right away
     if (Object.keys(params).length === 0) return of({})
@@ -362,9 +406,12 @@ export class Gn4Repository implements RecordsRepositoryInterface {
         const record = await converter.readRecord(fetchedRecordAsXml)
 
         record.title = `${record.title} (Copy)`
-        await converter.writeRecord(record, fetchedRecordAsXml)
+        const recordAsXml = await converter.writeRecord(
+          record,
+          fetchedRecordAsXml
+        )
 
-        return this.saveRecord(record, '', false)
+        return this.saveRecord(record, recordAsXml, false)
       }),
       exhaustMap((uuidObservable: Observable<string>) => uuidObservable),
       catchError((error: HttpErrorResponse) => {
@@ -465,6 +512,18 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     )
   }
 
+  getApplicationLanguages(): Observable<string[]> {
+    return this.gn4LanguagesApi
+      .getApplicationLanguages()
+      .pipe(
+        map((languages) =>
+          languages
+            .map((lang) => LANG_3_TO_2_MAPPER[lang.id ?? ''])
+            .filter((code): code is string => !!code)
+        )
+      )
+  }
+
   private getRecordAsXml(uniqueIdentifier: string): Observable<string | null> {
     return this.gn4RecordsApi
       .getRecordAs(

package/src/libs/api/repository/src/lib/gn4/gn4.provider.ts

@@ -2,6 +2,8 @@ import { Provider } from '@angular/core'
 import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { Gn4PlatformService } from './platform/gn4-platform.service'
 import { Gn4PlatformMapper } from './platform/gn4-platform.mapper'
+import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
+import { Gn4Repository } from './gn4-repository'
 
 export function provideGn4(): Provider[] {
   return [
@@ -9,6 +11,10 @@ export function provideGn4(): Provider[] {
       provide: PlatformServiceInterface,
       useClass: Gn4PlatformService,
     },
+    {
+      provide: RecordsRepositoryInterface,
+      useClass: Gn4Repository,
+    },
     Gn4PlatformMapper,
   ]
 }

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

@@ -152,6 +152,8 @@ export type ServiceProtocol =
   | 'esriRest'
   | 'ogcFeatures'
   | 'GPFDL'
+  | 'tms'
+  | 'maplibre-style'
   | 'other'
 
 export type OnlineResourceType = 'service' | 'download' | 'link' | 'endpoint'
@@ -164,6 +166,7 @@ export interface DatasetServiceDistribution {
   name?: string
   description?: string
   translations?: OnlineResourceTranslations
+  accessRestricted?: boolean
 }
 
 export interface DatasetDownloadDistribution {
@@ -178,6 +181,7 @@ export interface DatasetDownloadDistribution {
   description?: string
   accessServiceProtocol?: ServiceProtocol
   translations?: OnlineResourceTranslations
+  accessRestricted?: boolean
 }
 
 export interface OnlineLinkResource {
@@ -187,6 +191,7 @@ export interface OnlineLinkResource {
   description?: string
   translations?: OnlineResourceTranslations
   mimeType?: string
+  accessRestricted?: boolean
 }
 
 export type DatasetOnlineResource = (
@@ -232,13 +237,13 @@ export type DatasetFeatureCatalog = {
   featureTypes: Array<{
     name: string
     definition: string
-    attributes: Array<{ name: string; title: string }>
+    attributes: Array<{ name: string; title: string; code: string }>
   }>
 }
 
 export interface ServiceEndpoint {
-  endpointUrl: URL
-  protocol: string
+  url: URL
+  accessServiceProtocol: ServiceProtocol
   type: 'endpoint'
   description?: string
   translations?: OnlineResourceTranslations
@@ -269,7 +274,12 @@ export interface DatasetFeatureType {
   isAbstract: string
   typeName: string
   definition: string
-  attributeTable: Array<{ name: string; definition: string }>
+  attributeTable: Array<{
+    name: string
+    definition: string
+    type: string
+    code: string
+  }>
 }
 
 export type ReuseType = 'application' | 'map' | 'other'

package/src/libs/common/domain/src/lib/repository/records-repository.interface.ts

@@ -19,6 +19,8 @@ export abstract class RecordsRepositoryInterface {
   abstract getSimilarRecords(
     similarTo: CatalogRecord
   ): Observable<CatalogRecord[]>
+  abstract getSources(record: CatalogRecord): Observable<CatalogRecord[]>
+  abstract getSourceOf(record: CatalogRecord): Observable<CatalogRecord[]>
   abstract fuzzySearch(query: string): Observable<SearchResults>
   abstract canEditRecord(uniqueIdentifier: string): Observable<boolean>
   /**
@@ -95,4 +97,5 @@ export abstract class RecordsRepositoryInterface {
     localRecord: CatalogRecord
   ): Observable<{ user: string; date: Date }>
   abstract getRecordPublicationStatus(uuid: string): Observable<boolean>
+  abstract getApplicationLanguages(): Observable<string[]>
 }

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

@@ -1,147 +1,157 @@
 export const elasticLinkFixture = (): Record<string, unknown> => ({
   readmeLink: {
-    protocol: 'WWW:LINK',
+    accessServiceProtocol: 'WWW:LINK',
     description: 'Readme page',
     url: 'http://envlit.ifremer.fr/resultats/quadrige',
   },
   doiLink: {
-    protocol: 'WWW:DOI',
+    accessServiceProtocol: 'WWW:DOI',
     description: 'DOI for the resource',
     url: 'http://doi.org/123-456-678',
   },
   dataCsv: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Data in CSV format',
     name: 'abc.csv',
     url: 'http://my.server/files/abc.csv',
   },
   dataPdf: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Data in PDF format',
     name: 'abc.pdf',
     url: 'https://my.server/files/abc.pdf',
   },
   dataJpg: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Data in JPG format',
     name: 'abc.jpg',
     url: 'https://my.server/files/abc.jpg',
   },
   dataZip: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Data in ZIP format',
     name: 'abc.zip',
     url: 'https://my.server/files/abc.zip',
   },
   dataXls: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Data in XLS format',
     name: 'abc.xls',
     url: 'https://my.server/files/abc.xls',
   },
   dataXlsx: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Data in XLSX format',
     name: 'abc.XLSX',
     url: 'https://my.server/files/abc.XLSX',
   },
   dataJson: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Data in JSON format',
     name: 'abc.json',
     url: 'https://my.server/files/abc.json',
   },
   geodataJson: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Geographic data in GeoJSON format',
     name: 'dataset.geojson',
     url: 'http://my.server/files/geographic/dataset.geojson',
   },
   geodataJsonWithMimeType: {
-    protocol: 'WWW:DOWNLOAD:application/vnd.geo+json',
+    accessServiceProtocol: 'WWW:DOWNLOAD:application/vnd.geo+json',
     description: 'Geographic data in GeoJSON format',
     name: 'dataset.geojson',
     url: 'http://my.server/files/geographic/dataset',
     mimeType: 'application/vnd.geo+json',
   },
   geodataKml: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Geographic data in KML format',
     name: 'dataset.kml',
     url: 'http://my.server/files/geographic/dataset.kml',
   },
   geodataGpkg: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Geographic data in geopackage format',
     name: 'dataset.gpkg',
     url: 'http://my.server/files/geographic/dataset.gpkg',
   },
   geodataShp: {
-    protocol: 'WWW:DOWNLOAD',
+    accessServiceProtocol: 'WWW:DOWNLOAD',
     description: 'Geographic data in shapefile format',
     name: 'dataset.shp',
     url: 'http://my.server/files/geographic/dataset.zip',
   },
   geodataShpWithMimeType: {
-    protocol: 'WWW:DOWNLOAD:x-gis/x-shapefile',
+    accessServiceProtocol: 'WWW:DOWNLOAD:x-gis/x-shapefile',
     description: 'Geographic data in shapefile format',
     name: 'dataset',
     url: 'http://my.server/files/geographic/dataset.zip',
     mimeType: 'x-gis/x-shapefile',
   },
   geodataWms: {
-    protocol: 'OGC:WMS',
+    accessServiceProtocol: 'OGC:WMS',
     name: 'mylayer',
     url: 'https://my.ogc.server/wms',
   },
   geodataWmts: {
-    protocol: 'OGC:WMTS',
+    accessServiceProtocol: 'OGC:WMTS',
     name: 'mylayer',
     url: 'https://my.ogc.server/wmts',
   },
   geodataWfs: {
-    protocol: 'OGC:WFS',
+    accessServiceProtocol: 'OGC:WFS',
     name: 'mylayer',
     url: 'https://my.ogc.server/wfs',
   },
   geodataWms2: {
-    protocol: 'OGC:WMS',
+    accessServiceProtocol: 'OGC:WMS',
     name: 'myotherlayer',
     url: 'https://my.ogc.server/wms',
   },
   geodataWfs2: {
-    protocol: 'OGC:WFS',
+    accessServiceProtocol: 'OGC:WFS',
     name: 'myotherlayer',
     url: 'https://my.ogc.server/wfs',
   },
   geodataRest: {
-    protocol: 'ESRI:REST',
+    accessServiceProtocol: 'ESRI:REST',
     name: 'myrestlayer',
     url: 'https://my.esri.server/FeatureServer',
   },
   geodataRestWfs: {
-    protocol: 'OGC:WFS',
+    accessServiceProtocol: 'OGC:WFS',
     name: 'mywfsrestlayer',
     url: 'https://my.esri.server/WFSServer',
   },
   maplayerRest: {
-    protocol: 'ESRI:REST',
+    accessServiceProtocol: 'ESRI:REST',
     name: 'myotherrestlayer',
     url: 'https://my.esri.server/MapServer',
   },
   landingPage: {
-    protocol: 'WWW:LINK:LANDING_PAGE',
+    accessServiceProtocol: 'WWW:LINK:LANDING_PAGE',
     name: 'landingpage link',
     url: 'https://landing.page',
   },
   unknownFormat: {
-    protocol: 'WWW:DOWNLOAD-1.0-http--download',
+    accessServiceProtocol: 'WWW:DOWNLOAD-1.0-http--download',
     name: 'Vue HTML des métadonnées sur internet',
     url: 'http://catalogue.geo-ide.developpement-durable.gouv.fr/catalogue/srv/fre/catalog.search#/metadata/fr-120066022-jdd-199fd14c-2abb-4c14-b0f8-6c8d92e7b480',
   },
   geodataogcfeatures: {
-    protocol: 'OGC API - Features',
+    accessServiceProtocol: 'OGC API - Features',
     name: 'ogcapi features layer',
     url: 'https://mel.integration.apps.gs-fr-prod.camptocamp.com/data/ogcapi/collections/comptages_velo/items?',
   },
+  maplayerTms: {
+    accessServiceProtocol: 'TMS',
+    name: 'mytmslayer',
+    url: 'https://my.tms.server/MapServer',
+  },
+  maplayerTms2: {
+    accessServiceProtocol: 'OSGeo:TMS',
+    name: 'myothertmslayer',
+    url: 'https://my.tms.server/MapServer',
+  },
 })

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

@@ -185,6 +185,20 @@ export const aSetOfLinksFixture = () => ({
       url: new URL('https://my.ogc.server/wms'),
       accessServiceProtocol: 'wms',
     }) as DatasetServiceDistribution,
+  geodataTms: () =>
+    ({
+      name: 'mytmslayer',
+      type: 'service',
+      url: new URL('https://my.ogc.server/tms'),
+      accessServiceProtocol: 'tms',
+    }) as DatasetServiceDistribution,
+  geodataAsMaplibreStyle: () =>
+    ({
+      name: 'mytmslayerAsMaplibreJson',
+      type: 'service',
+      url: new URL('https://my.ogc.server/tms/layer/style.json'),
+      accessServiceProtocol: 'maplibre-style',
+    }) as DatasetServiceDistribution,
   geodataWfs2: () =>
     ({
       name: 'myotherlayer',
@@ -239,10 +253,10 @@ export const aSetOfLinksFixture = () => ({
     ({
       description:
         'https://services.geo.sg.ch/wss/service/SG00170_WMS/guest?request=GetCapabilities&service=WMS',
-      endpointUrl: new URL(
+      url: new URL(
         'https://services.geo.sg.ch/wss/service/SG00170_WMS/guest?request=GetCapabilities&service=WMS'
       ),
-      protocol: 'wms',
+      accessServiceProtocol: 'wms',
       type: 'endpoint',
     }) as ServiceEndpoint,
 })

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

@@ -1,26 +1,26 @@
 export const wmsRecordLinkFixture = () => ({
   description: 'Lieu de surveillance (point)',
   name: 'surval_parametre_point',
-  protocol: 'OGC:WMS',
+  accessServiceProtocol: 'OGC:WMS',
   url: 'https://www.ifremer.fr/services/wms/surveillance_littorale',
 })
 
 export const wpsRecordLinkFixture = () => ({
   description: "Extraction des données d'observation",
   name: 'r:survalextraction',
-  protocol: 'OGC:WPS',
+  accessServiceProtocol: 'OGC:WPS',
   url: 'https://www.ifremer.fr/services/wps/surval',
 })
 
 export const wwwRecordLinkFixture = () => ({
   description: '',
   name: 'La base de données Quadrige',
-  protocol: 'WWW:LINK',
+  praccessServiceProtocolotocol: 'WWW:LINK',
   url: 'http://envlit.ifremer.fr/resultats/quadrige',
 })
 
 export const doiRecordLinkFixture = () => ({
-  protocol: 'WWW:DOI',
+  accessServiceProtocol: 'WWW:DOI',
   description: 'DOI for the resource',
   url: 'http://doi.org/123-456-678',
 })
@@ -28,6 +28,6 @@ export const doiRecordLinkFixture = () => ({
 export const wfsRecordLinkFixture = () => ({
   description: 'Lieu de surveillance (point)',
   name: 'surval_parametre_point',
-  protocol: 'OGC:WFS',
+  accessServiceProtocol: 'OGC:WFS',
   url: 'https://www.ifremer.fr/services/wfs/surveillance_littorale',
 })

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

@@ -231,7 +231,7 @@ As such, **it is not very interesting at all.**`,
     recordUpdated: new Date('2022-04-15T14:18:19'),
     resourceUpdated: new Date('2022-03-29'),
     title:
-      "Plan local d'urbanisme (PLU) dématérialisé - commune d'Avrigny - approbation du 29/03/2022",
+      "Plan local d'urbanisme (PLU) dématérialisé - commune d'Avrigny - approbation du 29/03/2022 (Ce lot informe du droit à bâtir sur la commune d'Avrigny)",
     abstract: `Plan local d'urbanisme (PLU) dématérialisé - commune d'Avrigny - approbation du 29/03/2022.
 
 Ce lot informe du droit à bâtir sur la commune d'Avrigny.

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

@@ -18,15 +18,17 @@
       [selected]="xProperty$.value"
       [title]="'chart.dropdown.xProperty' | translate"
     ></gn-ui-dropdown-selector>
-    <gn-ui-dropdown-selector
-      class="basis-1/4"
-      *ngIf="!isCountAggregation"
-      [choices]="yChoices$ | async"
-      (selectValue)="yProperty$.next($event)"
-      [selected]="yProperty$.value"
-      [title]="'chart.dropdown.yProperty' | translate"
-      class="select-y-prop"
-    ></gn-ui-dropdown-selector>
+    <ng-container *ngIf="yChoices$ | async as yChoices">
+      <gn-ui-dropdown-selector
+        class="basis-1/4"
+        *ngIf="!isCountAggregation"
+        [choices]="yChoices"
+        (selectValue)="yProperty$.next($event)"
+        [selected]="yProperty$.value"
+        [title]="'chart.dropdown.yProperty' | translate"
+        class="select-y-prop"
+      ></gn-ui-dropdown-selector>
+    </ng-container>
     <gn-ui-dropdown-selector
       class="basis-1/4"
       [choices]="aggregationChoices"
@@ -43,6 +45,7 @@
       *ngIf="!error"
       [data]="chartData$ | async"
       [type]="chartType$.value"
+      [prettyLabel]="prettyLabel$ | async"
       [labelProperty]="labelProperty"
       [valueProperty]="valueProperty"
     ></gn-ui-chart>

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,7 +29,10 @@ 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 {
+  DatasetFeatureCatalog,
+  DatasetOnlineResource,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
 import { TranslateModule, TranslateService } from '@ngx-translate/core'
 import { CommonModule } from '@angular/common'
 import { ChartComponent } from '../../../../../../libs/ui/dataviz/src'
@@ -67,9 +69,18 @@ marker('chart.aggregation.count')
   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(