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

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 = (
@@ -228,17 +233,9 @@ export interface DatasetRecord extends BaseRecord {
   spatialRepresentation?: SpatialRepresentationType
 }
 
-export type DatasetFeatureCatalog = {
-  featureTypes: Array<{
-    name: string
-    definition: string
-    attributes: Array<{ name: string; title: string }>
-  }>
-}
-
 export interface ServiceEndpoint {
-  endpointUrl: URL
-  protocol: string
+  url: URL
+  accessServiceProtocol: ServiceProtocol
   type: 'endpoint'
   description?: string
   translations?: OnlineResourceTranslations
@@ -263,13 +260,32 @@ export interface ReuseRecord extends BaseRecord {
   temporalExtents: Array<DatasetTemporalExtent>
 }
 
+export type DatasetFeatureCatalog = {
+  featureTypes: Array<{
+    name: string
+    definition: string
+    attributes: DatasetFeatureAttribute[]
+  }>
+}
+export interface DatasetFeatureAttributeValue {
+  code?: string
+  definition?: string
+  label?: string
+}
+export interface DatasetFeatureAttribute {
+  name: string
+  definition: string
+  type: string
+  code: string
+  values?: Array<DatasetFeatureAttributeValue>
+}
 export interface DatasetFeatureType {
   aliases: string
   code: string
   isAbstract: string
   typeName: string
   definition: string
-  attributeTable: Array<{ name: string; definition: string }>
+  attributeTable: Array<DatasetFeatureAttribute>
 }
 
 export type ReuseType = 'application' | 'map' | 'other'

package/src/libs/common/domain/src/lib/platform.service.interface.ts

@@ -52,6 +52,7 @@ export abstract class PlatformServiceInterface {
   abstract cleanRecordAttachments(recordUuid: CatalogRecord): Observable<void>
   abstract attachFileToRecord(
     recordUuid: string,
-    file: File
+    file: File,
+    removeDuplicate?: boolean
   ): Observable<UploadEvent>
 }

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

@@ -6,7 +6,11 @@ import {
   SearchParams,
   SearchResults,
 } from '../model/search'
-import { CatalogRecord, DatasetFeatureCatalog } from '../model/record'
+import {
+  CatalogRecord,
+  DatasetFeatureCatalog,
+  LanguageCode,
+} from '../model/record'
 
 export abstract class RecordsRepositoryInterface {
   abstract search(params: SearchParams): Observable<SearchResults>
@@ -19,8 +23,13 @@ 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 canDuplicate(record: CatalogRecord): boolean
+  abstract canDelete(record: CatalogRecord): Observable<boolean>
   abstract canEditRecord(uniqueIdentifier: string): Observable<boolean>
+  abstract canEditIndexedRecord(record: CatalogRecord): Observable<boolean>
   /**
    * This emits once:
    * - record object; if a draft exists, this will return it
@@ -95,4 +104,5 @@ export abstract class RecordsRepositoryInterface {
     localRecord: CatalogRecord
   ): Observable<{ user: string; date: Date }>
   abstract getRecordPublicationStatus(uuid: string): Observable<boolean>
+  abstract getApplicationLanguages(): Observable<LanguageCode[]>
 }

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

@@ -3,6 +3,7 @@ import {
   DatasetRecord,
   DatasetSpatialExtent,
   Keyword,
+  ServiceRecord,
 } from '../../../../../libs/common/domain/src/lib/model/record'
 
 export const datasetRecordsFixture: () => CatalogRecord[] = () => [
@@ -176,6 +177,20 @@ As such, **it is not very interesting at all.**`,
               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',
@@ -231,7 +246,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.
@@ -811,6 +826,52 @@ export const importDatasetRecordAsXmlFixture = (): string => `
 	</gmd:identificationInfo>
 </gmd:MD_Metadata>`
 
+export const simpleServiceRecordFixture = (): ServiceRecord => ({
+  abstract: `Ce service de visualisation WMS permet de consulter la série de couches de données "Sites de gestion des déchets miniers - Série".`,
+  kind: 'service',
+  recordUpdated: new Date('2023-03-17T07:38:08.875Z'),
+  recordPublished: null,
+  ownerOrganization: null,
+  licenses: [],
+  legalConstraints: [],
+  securityConstraints: [],
+  otherConstraints: [],
+  contacts: [],
+  contactsForResource: [],
+  keywords: [],
+  topics: [],
+  spatialExtents: [],
+  overviews: [],
+  defaultLanguage: null,
+  otherLanguages: [],
+  title: 'Sites de gestion des déchets miniers - Service de visualisation WMS',
+  onlineResources: [
+    {
+      name: 'Rapport de disponibilité du service WMS',
+      description:
+        'Ce service de visualisation WMS permet de consulter la série de couches de données "Sites de gestion des déchets miniers - Série".',
+      mimeType: 'text/html',
+      type: 'link',
+      url: new URL(
+        'https://geoservices.wallonie.be/rapportDisponibilite/wms/sites_de_gestion_des_dechets_miniers_srie.html'
+      ),
+      accessRestricted: false,
+    },
+  ],
+  uniqueIdentifier: '00b22798-ec8e-4500-89e8-90eeeda45919',
+  landingPage: new URL(
+    'http://localhost:4200/geonetwork/srv/fre/catalog.search#/metadata/00b22798-ec8e-4500-89e8-90eeeda45919'
+  ),
+  extras: {
+    isPublishedToAll: true,
+    id: '723',
+    isHarvested: true,
+    ownerInfo: 'admin|admin|admin|Administrator',
+    edit: true,
+  },
+  recordCreated: new Date('2023-03-17T07:38:08.875Z'),
+})
+
 export const NATIONAL_KEYWORD = {
   key: 'http://inspire.ec.europa.eu/metadata-codelist/SpatialScope/national',
   label: 'National',
@@ -909,3 +970,55 @@ export const SAMPLE_RECORD = {
     ...SAMPLE_PLACE_KEYWORDS_FROM_XML,
   ],
 }
+
+export const multilingualDatasetFixture: () => DatasetRecord = () => ({
+  kind: 'dataset',
+  defaultLanguage: 'en',
+  otherLanguages: ['fr', 'de'],
+  title: 'English Title',
+  abstract: 'English Abstract',
+  lineage: 'English Lineage',
+  translations: {
+    title: { fr: 'Titre Français', de: 'Titel DE' },
+    abstract: { fr: 'Résumé Français', de: 'Beschreibung DE' },
+    lineage: { fr: 'Généalogie Français', de: 'Lineage DE' },
+  },
+  keywords: [
+    {
+      label: 'Keyword EN',
+      description: 'Keyword Desc EN',
+      type: 'theme',
+      translations: {
+        label: { fr: 'Mot-clé FR', de: 'Schlusselwort DE' },
+        description: { fr: 'Description FR', de: 'Schlusselwort DE' },
+      },
+    },
+  ],
+  onlineResources: [],
+  licenses: [],
+  legalConstraints: [],
+  securityConstraints: [],
+  otherConstraints: [],
+  contacts: [],
+  contactsForResource: [],
+  ownerOrganization: {
+    name: 'Org EN',
+    translations: {
+      name: { fr: 'Org FR', de: 'Org DE' },
+    },
+  },
+  spatialExtents: [
+    {
+      description: 'Extent EN',
+      translations: {
+        description: { fr: 'Étendue FR', de: 'Bereich DE' },
+      },
+    },
+  ],
+  temporalExtents: [],
+  status: 'ongoing',
+  uniqueIdentifier: 'ABCD-EFGH',
+  overviews: [],
+  topics: [],
+  recordUpdated: null,
+})

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

@@ -10,10 +10,7 @@ import {
 } from '../../../../../libs/data-access/gn4/src'
 import { CommonModule } from '@angular/common'
 import { SourceLabelComponent } from './source-label/source-label.component'
-import { LangService, UtilI18nModule } from '../../../../../libs/util/i18n/src'
-import { UiLayoutModule } from '../../../../../libs/ui/layout/src'
-import { TranslateModule, TranslateService } from '@ngx-translate/core'
-import { UiElementsModule } from '../../../../../libs/ui/elements/src'
+import { TranslateService } from '@ngx-translate/core'
 import { OrganizationsServiceInterface } from '../../../../../libs/common/domain/src/lib/organizations.service.interface'
 import {
   ElasticsearchService,
@@ -35,8 +32,7 @@ const organizationsServiceFactory = (
   searchApiService: SearchApiService,
   groupsApiService: GroupsApiService,
   translateService: TranslateService,
-  platformService: PlatformServiceInterface,
-  langService: LangService
+  platformService: PlatformServiceInterface
 ) =>
   strategy === 'groups'
     ? new OrganizationsFromGroupsService(
@@ -50,20 +46,12 @@ const organizationsServiceFactory = (
         searchApiService,
         groupsApiService,
         platformService,
-        langService
+        translateService
       )
 
 @NgModule({
   declarations: [SiteTitleComponent, SourceLabelComponent],
-  imports: [
-    UiLayoutModule,
-    CommonModule,
-    UtilI18nModule,
-    TranslateModule.forChild(),
-    UiElementsModule,
-    OrganisationsFilterComponent,
-    CatalogTitleComponent,
-  ],
+  imports: [CommonModule, OrganisationsFilterComponent, CatalogTitleComponent],
   exports: [SiteTitleComponent, SourceLabelComponent],
   providers: [
     {
@@ -76,7 +64,6 @@ const organizationsServiceFactory = (
         GroupsApiService,
         TranslateService,
         PlatformServiceInterface,
-        LangService,
       ],
     },
   ],

package/src/libs/feature/catalog/src/lib/sources/sources.service.ts

@@ -1,9 +1,10 @@
 import { Injectable } from '@angular/core'
 import { SourcesApiService } from '../../../../../../libs/data-access/gn4/src'
-import { LangService } from '../../../../../../libs/util/i18n/src'
 import { Observable } from 'rxjs'
 import { filter, map, shareReplay } from 'rxjs/operators'
 import { CatalogSource } from './sources.model'
+import { TranslateService } from '@ngx-translate/core'
+import { getLang3FromLang2 } from '../../../../../../libs/util/i18n/src'
 
 @Injectable({
   providedIn: 'root',
@@ -15,14 +16,17 @@ export class SourcesService {
 
   constructor(
     private sourcesApiService: SourcesApiService,
-    private langService: LangService
+    private translateService: TranslateService
   ) {}
 
   getSourceLabel(uuid: string): Observable<string> {
     return this.sources$.pipe(
       map((sources) => sources.filter((source) => source.uuid === uuid)[0]),
       filter((source) => !!source),
-      map((source) => source.label[this.langService.iso3])
+      map(
+        (source) =>
+          source.label[getLang3FromLang2(this.translateService.currentLang)]
+      )
     )
   }
 }

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>