geonetwork-ui 2.6.0-dev.86c0fa7b5 → 2.6.0-dev.87d6e6c1b

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

@@ -26,8 +26,12 @@ import {
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { matchProtocol } from '../common/distribution.mapper'
 import { Thesaurus } from './types'
-import { LANG_3_TO_2_MAPPER, LangService } from '../../../../../../libs/util/i18n/src'
 import { getResourceType, getReuseType } from '../common/resource-types'
+import { TranslateService } from '@ngx-translate/core'
+import {
+  getLang2FromLang3,
+  getLocalizedIndexKey,
+} from '../../../../../../libs/util/i18n/src'
 
 type ESResponseSource = SourceWithUnknownProps
 
@@ -42,10 +46,12 @@ type EsFieldMapperFn = (
 export class Gn4FieldMapper {
   constructor(
     private metadataUrlService: MetadataUrlService,
-    private langService: LangService
+    private translateService: TranslateService
   ) {}
 
-  private lang3 = this.langService.gnLang
+  private get lang3() {
+    return getLocalizedIndexKey(this.translateService.currentLang)
+  }
 
   protected fields: Record<string, EsFieldMapperFn> = {
     id: (output, source) =>
@@ -150,7 +156,7 @@ export class Gn4FieldMapper {
       const langList = getAsArray(
         selectField<string>(source, 'resourceLanguage')
       )
-      const languages = langList.map((lang) => LANG_3_TO_2_MAPPER[lang])
+      const languages = langList.map(getLang2FromLang3)
       const defaultLanguage = output.defaultLanguage ?? languages[0] ?? null // set the first language as main one as fallback
 
       return {
@@ -160,7 +166,7 @@ export class Gn4FieldMapper {
     },
     otherLanguage: (output, source) => {
       const langList = getAsArray(selectField<string>(source, 'otherLanguage'))
-      const languages = langList.map((lang) => LANG_3_TO_2_MAPPER[lang])
+      const languages = langList.map(getLang2FromLang3)
       const defaultLanguage = output.defaultLanguage ?? languages[0] ?? null
       const otherLanguages = languages.filter(
         (lang) => lang !== defaultLanguage
@@ -175,7 +181,7 @@ export class Gn4FieldMapper {
       const language = selectField<string>(source, 'mainLanguage')
       return {
         ...output,
-        defaultLanguage: language ? LANG_3_TO_2_MAPPER[language] : null,
+        defaultLanguage: language ? getLang2FromLang3(language) : null,
       }
     },
     link: (output, source) => {

package/src/libs/api/metadata-converter/src/lib/gn4/metadata-url.service.ts

@@ -1,7 +1,7 @@
 import { Inject, Injectable } from '@angular/core'
 import { Configuration } from '../../../../../../libs/data-access/gn4/src'
 import { TranslateService } from '@ngx-translate/core'
-import { LANG_2_TO_3_MAPPER } from '../../../../../../libs/util/i18n/src'
+import { getLang3FromLang2 } from '../../../../../../libs/util/i18n/src'
 
 @Injectable({
   providedIn: 'root',
@@ -14,8 +14,8 @@ export class MetadataUrlService {
 
   getUrl(uuid: string, apiPath: string = this.apiConfiguration.basePath) {
     const prefix = `${apiPath}/../`
-    return `${prefix}${
-      LANG_2_TO_3_MAPPER[this.translate.currentLang]
-    }/catalog.search#/metadata/${uuid}`
+    return `${prefix}${getLang3FromLang2(
+      this.translate.currentLang
+    )}/catalog.search#/metadata/${uuid}`
   }
 }

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

@@ -22,9 +22,9 @@ import {
   extractDatasetOnlineResources,
   extractDateTime,
   extractLocalizedCharacterString,
+  extractReuseOnlineResources,
   extractRole,
   extractServiceOnlineResources,
-  extractReuseOnlineResources,
   extractUrl,
   findIdentification,
 } from '../iso19139/read-parts'
@@ -41,7 +41,7 @@ import {
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { matchMimeType } from '../common/distribution.mapper'
 import { fullNameToParts } from '../iso19139/utils/individual-name'
-import { LANG_3_TO_2_MAPPER } from '../../../../../../libs/util/i18n/src/lib/language-codes'
+import { getLang2FromLang3 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
 import { getResourceType, getReuseType } from '../common/resource-types'
 
 export function readKind(rootEl: XmlElement): RecordKind {
@@ -370,11 +370,7 @@ export function readLocaleElement(): ChainableFunction<
   return pipe(
     findChildElement('lan:LanguageCode'),
     readAttribute('codeListValue'),
-    map((lang) => {
-      const normalized = lang?.toLowerCase()
-      const iso2Lang = LANG_3_TO_2_MAPPER[normalized]
-      return iso2Lang ?? lang
-    })
+    map((lang) => getLang2FromLang3(lang?.toLowerCase()) ?? lang)
   )
 }
 

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

@@ -49,7 +49,7 @@ import {
 } from '../iso19139/write-parts'
 import { findIdentification } from '../iso19139/read-parts'
 import { namePartsToFull } from '../iso19139/utils/individual-name'
-import { LANG_2_TO_3_MAPPER } from '../../../../../../libs/util/i18n/src/lib/language-codes'
+import { getLang3FromLang2 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
 import { kindToCodeListValue } from '../common/resource-types'
 
 export function writeUniqueIdentifier(
@@ -529,11 +529,7 @@ export function writeOnlineResources(
 }
 
 function writeLocaleElement(language: LanguageCode) {
-  const normalizedLang = language.toLowerCase()
-  const lang3 =
-    normalizedLang.length === 2
-      ? LANG_2_TO_3_MAPPER[normalizedLang]
-      : normalizedLang
+  const lang3 = getLang3FromLang2(language.toLowerCase()) ?? language
   return pipe(
     findChildOrCreate('lan:PT_Locale'),
     writeAttribute('id', language.toUpperCase()),

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

@@ -55,7 +55,7 @@ import { getKeywordTypeFromKeywordTypeCode } from './utils/keyword.mapper'
 import { getRoleFromRoleCode } from './utils/role.mapper'
 import { getStatusFromStatusCode } from './utils/status.mapper'
 import { getUpdateFrequencyFromFrequencyCode } from './utils/update-frequency.mapper'
-import { LANG_3_TO_2_MAPPER } from '../../../../../../libs/util/i18n/src/lib/language-codes'
+import { getLang2FromLang3 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
 import { getResourceType, getReuseType } from '../common/resource-types'
 
 export function extractCharacterString(): ChainableFunction<
@@ -1164,7 +1164,7 @@ export function readOtherLanguages(rootEl: XmlElement): LanguageCode[] {
       pipe(
         findChildElement('lan:LanguageCode'),
         readAttribute('codeListValue'),
-        map((lang) => LANG_3_TO_2_MAPPER[lang.toLowerCase()] ?? lang)
+        map((lang) => getLang2FromLang3(lang?.toLowerCase()) ?? lang)
       )
     ),
     map((languages) =>
@@ -1179,7 +1179,7 @@ export function readDefaultLanguage(rootEl: XmlElement): LanguageCode {
     findChildElement('gmd:language', false),
     findChildElement('lan:LanguageCode'),
     readAttribute('codeListValue'),
-    map((lang) => (lang ? LANG_3_TO_2_MAPPER[lang.toLowerCase()] : null))
+    map((lang) => (lang ? getLang2FromLang3(lang.toLowerCase()) : null))
   )(rootEl)
 }
 

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

@@ -53,7 +53,7 @@ import {
 import { readKind } from './read-parts'
 import { writeGeometry } from './utils/geometry'
 import { namePartsToFull } from './utils/individual-name'
-import { LANG_2_TO_3_MAPPER } from '../../../../../../libs/util/i18n/src/lib/language-codes'
+import { getLang3FromLang2 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
 import { kindToCodeListValue } from '../common/resource-types'
 
 function writeLocalizedElement(
@@ -1471,10 +1471,7 @@ export function writeLanguages(record: DatasetRecord, rootEl: XmlElement) {
       writeAttribute('id', lang.toUpperCase()),
       createNestedChild('gmd:languageCode', 'gmd:LanguageCode'),
       writeAttribute('codeList', 'http://www.loc.gov/standards/iso639-2/'),
-      writeAttribute(
-        'codeListValue',
-        lang.length === 2 ? LANG_2_TO_3_MAPPER[lang] : lang
-      )
+      writeAttribute('codeListValue', getLang3FromLang2(lang) ?? lang)
     )
 
   // add new languages (only if other than default one)
@@ -1488,7 +1485,7 @@ export function writeDefaultLanguage(
   record: DatasetRecord,
   rootEl: XmlElement
 ) {
-  const lang3 = LANG_2_TO_3_MAPPER[record.defaultLanguage.toLowerCase()]
+  const lang3 = getLang3FromLang2(record.defaultLanguage.toLowerCase())
   return pipe(
     findNestedChildOrCreate('gmd:language', 'gmd:LanguageCode'),
     writeAttribute('codeList', 'http://www.loc.gov/standards/iso639-2/'),

package/src/libs/api/repository/src/lib/gn4/auth/auth.service.ts

@@ -1,5 +1,5 @@
 import { Inject, Injectable, InjectionToken, Optional } from '@angular/core'
-import { LANG_2_TO_3_MAPPER } from '../../../../../../../libs/util/i18n/src'
+import { getLang3FromLang2 } from '../../../../../../../libs/util/i18n/src'
 import { TranslateService } from '@ngx-translate/core'
 import { Location } from '@angular/common'
 
@@ -36,10 +36,7 @@ export class AuthService {
         new URL(this.location.path(), window.location.href).toString()
       )
       .replace('${lang2}', this.translateService.currentLang)
-      .replace(
-        '${lang3}',
-        LANG_2_TO_3_MAPPER[this.translateService.currentLang]
-      )
+      .replace('${lang3}', getLang3FromLang2(this.translateService.currentLang))
   }
 
   get logoutUrl() {
@@ -49,7 +46,7 @@ export class AuthService {
   get settingsUrl() {
     return this.baseSettingsUrl.replace(
       '${lang3}',
-      LANG_2_TO_3_MAPPER[this.translateService.currentLang]
+      getLang3FromLang2(this.translateService.currentLang)
     )
   }
 

package/src/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.ts

@@ -1,4 +1,4 @@
-import { Inject, Injectable, Optional } from '@angular/core'
+import { Injectable, Injector } from '@angular/core'
 import { Geometry } from 'geojson'
 import {
   ES_QUERY_FIELDS_PRIORITY,
@@ -26,9 +26,10 @@ import {
   SortParams,
   TermsAggregationResult,
 } from '../../../../../../../libs/api/metadata-converter/src'
-import { LangService } from '../../../../../../../libs/util/i18n/src'
+import { getLang3FromLang2 } from '../../../../../../../libs/util/i18n/src'
 import { formatDate, isDateRange } from './date-range.utils'
 import { CatalogRecord } from '../../../../../../../libs/common/domain/src/lib/model/record'
+import { TranslateService } from '@ngx-translate/core'
 
 export type DateRange = { start?: Date; end?: Date }
 
@@ -39,11 +40,18 @@ export class ElasticsearchService {
   // runtime fields are computed using a Painless script
   // see: https://www.elastic.co/guide/en/elasticsearch/reference/current/runtime-mapping-fields.html
   private runtimeFields: Record<string, string> = {}
-  private lang3 = this.langService.iso3
+
+  // we're using getters in case the defined languages change over time
+  private get lang3() {
+    return getLang3FromLang2(this.translateService.currentLang)
+  }
+  private get metadataLang() {
+    return this.injector.get(METADATA_LANGUAGE, null)
+  }
 
   constructor(
-    private langService: LangService,
-    @Optional() @Inject(METADATA_LANGUAGE) private metadataLang: string
+    private translateService: TranslateService,
+    private injector: Injector
   ) {}
 
   getSearchRequestBody(

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

@@ -33,7 +33,6 @@ import {
   RecordsApiService,
   SearchApiService,
 } from '../../../../../../libs/data-access/gn4/src'
-import { LANG_3_TO_2_MAPPER } from '../../../../../../libs/util/i18n/src'
 import {
   combineLatest,
   exhaustMap,
@@ -48,6 +47,7 @@ import {
 import { catchError, map, tap } from 'rxjs/operators'
 import { lt } from 'semver'
 import { ElasticsearchService } from './elasticsearch'
+import { getLang2FromLang3 } from '../../../../../../libs/util/i18n/src'
 import { Gn4SettingsService } from './settings/gn4-settings.service'
 
 const minPublicationApiVersion = '4.2.5'
@@ -561,7 +561,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
       .pipe(
         map((languages) =>
           languages
-            .map((lang) => LANG_3_TO_2_MAPPER[lang.id ?? ''])
+            .map((lang) => getLang2FromLang3(lang.id))
             .filter((code): code is string => !!code)
         )
       )

package/src/libs/api/repository/src/lib/gn4/organizations/organizations-from-groups.service.ts

@@ -7,7 +7,7 @@ import {
 import { forkJoin, Observable, of } from 'rxjs'
 import { map, shareReplay } from 'rxjs/operators'
 import { TranslateService } from '@ngx-translate/core'
-import { LANG_2_TO_3_MAPPER } from '../../../../../../../libs/util/i18n/src'
+import { getLang3FromLang2 } from '../../../../../../../libs/util/i18n/src'
 import { FieldFilters } from '../../../../../../../libs/common/domain/src/lib/model/search'
 import {
   CatalogRecord,
@@ -51,6 +51,10 @@ export class OrganizationsFromGroupsService
   )
   organisationsCount$ = this.organisations$.pipe(map((orgs) => orgs.length))
 
+  private get lang3() {
+    return getLang3FromLang2(this.translateService.currentLang)
+  }
+
   constructor(
     private esService: ElasticsearchService,
     private searchApiService: SearchApiService,
@@ -72,9 +76,8 @@ export class OrganizationsFromGroupsService
   }
 
   private mapOrgFromGroup(group: GroupApiModel) {
-    const lang3 = LANG_2_TO_3_MAPPER[this.translateService.currentLang]
     return {
-      name: group.label[lang3],
+      name: group.label[this.lang3],
       ...(group.description && { description: group.description }),
       ...(group.email && { email: group.email }),
       ...(group.logo && {
@@ -89,9 +92,8 @@ export class OrganizationsFromGroupsService
   getFiltersForOrgs(orgs: Organization[]): Observable<FieldFilters> {
     return this.groups$.pipe(
       map((allGroups) => {
-        const lang3 = LANG_2_TO_3_MAPPER[this.translateService.currentLang]
         const groups = orgs.map((org) =>
-          allGroups.find((group) => group.label[lang3] === org.name)
+          allGroups.find((group) => group.label[this.lang3] === org.name)
         )
         return {
           groupOwner: groups.reduce(
@@ -108,10 +110,9 @@ export class OrganizationsFromGroupsService
     return forkJoin([this.groups$, this.organisations$]).pipe(
       map(([groups, orgs]) => {
         const groupIds = Object.keys(filters['groupOwner'])
-        const lang3 = LANG_2_TO_3_MAPPER[this.translateService.currentLang]
         return groupIds.map((id) => {
           const group = groups.find((group) => group.id.toString() === id)
-          return orgs.find((org) => org.name === group.label[lang3])
+          return orgs.find((org) => org.name === group.label[this.lang3])
         })
       })
     )

package/src/libs/api/repository/src/lib/gn4/organizations/organizations-from-metadata.service.ts

@@ -33,9 +33,10 @@ import {
   tap,
   withLatestFrom,
 } from 'rxjs/operators'
-import { LangService } from '../../../../../../../libs/util/i18n/src'
+import { getLocalizedIndexKey } from '../../../../../../../libs/util/i18n/src'
 import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { coerce, satisfies, valid } from 'semver'
+import { TranslateService } from '@ngx-translate/core'
 
 const IMAGE_URL = '/geonetwork/images/harvesting/'
 
@@ -121,10 +122,12 @@ export class OrganizationsFromMetadataService
     private searchApiService: SearchApiService,
     private groupsApiService: GroupsApiService,
     private platformService: PlatformServiceInterface,
-    private langService: LangService
+    private translateService: TranslateService
   ) {}
 
-  private lang3 = this.langService.gnLang
+  private get langIndex() {
+    return getLocalizedIndexKey(this.translateService.currentLang)
+  }
 
   equalsNormalizedStrings(
     str1: string,
@@ -287,19 +290,23 @@ export class OrganizationsFromMetadataService
   ): Observable<CatalogRecord> {
     const contacts: SourceWithUnknownProps[] = getAsArray(
       selectFallback(
-        selectTranslatedField(source, 'contactObject', this.lang3),
+        selectTranslatedField(source, 'contactObject', this.langIndex),
         selectField(source, 'contact')
       )
     )
     const resourceContacts: SourceWithUnknownProps[] = getAsArray(
       selectFallback(
-        selectTranslatedField(source, 'contactForResourceObject', this.lang3),
+        selectTranslatedField(
+          source,
+          'contactForResourceObject',
+          this.langIndex
+        ),
         selectField(source, 'contactForResource')
       )
     )
     const allContactOrgs = resourceContacts
       .concat(contacts)
-      .map((contact) => mapOrganization(contact, this.lang3))
+      .map((contact) => mapOrganization(contact, this.langIndex))
 
     if (!allContactOrgs.length) return of(record)
 

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

@@ -29,7 +29,6 @@ import {
 } from '../../../../../../../libs/common/domain/src/lib/model/record'
 import { Gn4PlatformMapper } from './gn4-platform.mapper'
 import { ltr } from 'semver'
-import { LangService } from '../../../../../../../libs/util/i18n/src'
 import { HttpClient, HttpEventType } from '@angular/common/http'
 import {
   KeywordApiResponse,
@@ -45,6 +44,8 @@ import {
   switchMap,
   throwError,
 } from 'rxjs'
+import { TranslateService } from '@ngx-translate/core'
+import { getLang3FromLang2 } from '../../../../../../../libs/util/i18n/src'
 
 const minApiVersion = '4.2.2'
 
@@ -95,6 +96,10 @@ export class Gn4PlatformService implements PlatformServiceInterface {
    */
   private keywordsByThesauri: Record<string, Observable<Keyword[]>> = {}
 
+  private get lang3() {
+    return getLang3FromLang2(this.translateService.currentLang)
+  }
+
   constructor(
     private siteApiService: SiteApiService,
     private meApi: MeApiService,
@@ -102,7 +107,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     private mapper: Gn4PlatformMapper,
     private toolsApiService: ToolsApiService,
     private registriesApiService: RegistriesApiService,
-    private langService: LangService,
+    private translateService: TranslateService,
     private userfeedbackApiService: UserfeedbackApiService,
     private httpClient: HttpClient,
     private recordsApiService: RecordsApiService
@@ -198,7 +203,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
 
         return this.registriesApiService.searchKeywords(
           query,
-          this.langService.iso3,
+          this.lang3,
           10,
           0,
           null,
@@ -211,11 +216,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
 
     return combineLatest([keywords$, this.allThesaurus$]).pipe(
       map(([keywords, thesaurus]) => {
-        return this.mapper.keywordsFromApi(
-          keywords,
-          thesaurus,
-          this.langService.iso3
-        )
+        return this.mapper.keywordsFromApi(keywords, thesaurus, this.lang3)
       })
     )
   }
@@ -226,7 +227,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     }
     const keywords$ = this.registriesApiService.searchKeywords(
       null,
-      this.langService.iso3,
+      this.lang3,
       1000,
       0,
       null,
@@ -240,11 +241,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
       this.allThesaurus$,
     ]).pipe(
       map(([keywords, thesaurus]) => {
-        return this.mapper.keywordsFromApi(
-          keywords,
-          thesaurus,
-          this.langService.iso3
-        )
+        return this.mapper.keywordsFromApi(keywords, thesaurus, this.lang3)
       }),
       shareReplay(1)
     )
@@ -264,7 +261,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
         return this.registriesApiService
           .searchKeywords(
             query,
-            this.langService.iso3,
+            this.lang3,
             100,
             0,
             null,
@@ -273,11 +270,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
           )
           .pipe(
             map((keywords: KeywordApiResponse[]) =>
-              this.mapper.keywordsFromApi(
-                keywords,
-                thesauri,
-                this.langService.iso3
-              )
+              this.mapper.keywordsFromApi(keywords, thesauri, this.lang3)
             )
           )
       })

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.ts

@@ -33,7 +33,7 @@ import {
   DatasetFeatureCatalog,
   DatasetOnlineResource,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
-import { TranslateModule, TranslateService } from '@ngx-translate/core'
+import { TranslatePipe, TranslateService } from '@ngx-translate/core'
 import { CommonModule } from '@angular/common'
 import { ChartComponent } from '../../../../../../libs/ui/dataviz/src'
 import {
@@ -61,10 +61,10 @@ marker('chart.aggregation.count')
   imports: [
     CommonModule,
     DropdownSelectorComponent,
-    TranslateModule,
     ChartComponent,
     LoadingMaskComponent,
     PopupAlertComponent,
+    TranslatePipe,
   ],
   standalone: true,
 })

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/table-view/table-view.component.ts

@@ -15,7 +15,7 @@ import {
   DatasetFeatureCatalog,
   DatasetOnlineResource,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
-import { TranslateModule, TranslateService } from '@ngx-translate/core'
+import { TranslatePipe, TranslateService } from '@ngx-translate/core'
 import {
   LoadingMaskComponent,
   PopupAlertComponent,
@@ -32,7 +32,7 @@ import { CommonModule } from '@angular/common'
     DataTableComponent,
     LoadingMaskComponent,
     PopupAlertComponent,
-    TranslateModule,
+    TranslatePipe,
   ],
   standalone: true,
 })

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

@@ -7,8 +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'