geonetwork-ui 2.6.0-dev.6681b0ab3 → 2.6.0-dev.6de4ab642

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/gn4/types/metadata.model.ts

@@ -164,7 +164,6 @@ export type MetadataObject = Partial<{
   resourceDate: ResourceDate[]
   resourceEdition: string
   resourceIdentifier: ResourceIdentifier[]
-  resourceLanguage: string[]
   resourceTemporalDateRange: ResourceTemporalDateRange[]
   resourceTemporalExtentDateRange: ResourceTemporalDateRange[]
   resourceTitleObject: MultilingualField

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 {
@@ -363,11 +363,14 @@ export function readOnlineResources(rootEl: XmlElement): OnlineResource[] {
   )(rootEl)
 }
 
-function readLocaleElement(): ChainableFunction<XmlElement, LanguageCode> {
+export function readLocaleElement(): ChainableFunction<
+  XmlElement,
+  LanguageCode
+> {
   return pipe(
     findChildElement('lan:LanguageCode'),
     readAttribute('codeListValue'),
-    map((lang) => (lang ? LANG_3_TO_2_MAPPER[lang.toLowerCase()] : null))
+    map((lang) => getLang2FromLang3(lang?.toLowerCase()) ?? lang)
   )
 }
 
@@ -381,6 +384,9 @@ export function readDefaultLanguage(rootEl: XmlElement): LanguageCode {
 export function readOtherLanguages(rootEl: XmlElement): LanguageCode[] {
   return pipe(
     findChildrenElement('mdb:otherLocale', false),
-    mapArray(readLocaleElement())
+    mapArray(readLocaleElement()),
+    map((languages) =>
+      languages.filter((lang): lang is LanguageCode => lang !== null)
+    )
   )(rootEl)
 }

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,7 +529,7 @@ export function writeOnlineResources(
 }
 
 function writeLocaleElement(language: LanguageCode) {
-  const lang3 = LANG_2_TO_3_MAPPER[language.toLowerCase()]
+  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<
@@ -65,7 +65,8 @@ export function extractCharacterString(): ChainableFunction<
   return pipe(
     fallback(
       findChildElement('gco:CharacterString', false),
-      findChildElement('gmx:Anchor', false)
+      findChildElement('gmx:Anchor', false),
+      findChildElement('gmx:MimeFileType', false)
     ),
     readText()
   )
@@ -1161,11 +1162,14 @@ export function readOtherLanguages(rootEl: XmlElement): LanguageCode[] {
     findChildrenElement('gmd:locale', false),
     mapArray(
       pipe(
-        findChildElement('gmd:LanguageCode'),
+        findChildElement('lan:LanguageCode'),
         readAttribute('codeListValue'),
-        map((lang) => LANG_3_TO_2_MAPPER[lang.toLowerCase()])
+        map((lang) => getLang2FromLang3(lang?.toLowerCase()) ?? lang)
       )
     ),
+    map((languages) =>
+      languages.filter((lang): lang is LanguageCode => lang !== null)
+    ),
     map((languages) => (languages.length ? languages : [defaultLanguage]))
   )(rootEl)
 }
@@ -1173,9 +1177,9 @@ export function readOtherLanguages(rootEl: XmlElement): LanguageCode[] {
 export function readDefaultLanguage(rootEl: XmlElement): LanguageCode {
   return pipe(
     findChildElement('gmd:language', false),
-    findChildElement('gmd:LanguageCode'),
+    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,7 +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_2_TO_3_MAPPER[lang])
+      writeAttribute('codeListValue', getLang3FromLang2(lang) ?? lang)
     )
 
   // add new languages (only if other than default one)
@@ -1485,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/constant.ts

@@ -8,6 +8,7 @@ export const ES_SOURCE_SUMMARY = [
   'overview',
   'logo',
   'codelist_status_text',
+  'link',
   'linkProtocol',
   'contactForResource.organisation',
   'contact.organisation',
@@ -17,8 +18,10 @@ export const ES_SOURCE_SUMMARY = [
   'cl_topic',
   'cl_maintenanceAndUpdateFrequency',
   'tag',
-  'MD_LegalConstraintsUseLimitationObject',
+  'MD_LegalConstraints*Object',
   'qualityScore',
+  'allKeywords',
+  'recordLink',
 ]
 
 export type EsQueryFieldsPriorityType = Record<string, number>

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(
@@ -124,11 +132,11 @@ export class ElasticsearchService {
     this.runtimeFields[fieldName] = expression
   }
 
-  getMetadataByIdPayload(uuid: string): EsSearchParams {
+  getMetadataByIdsPayload(uuids: string[]): EsSearchParams {
     return {
       query: {
         ids: {
-          values: [uuid],
+          values: uuids,
         },
       },
     }
@@ -137,7 +145,7 @@ export class ElasticsearchService {
   getRelatedRecordPayload(
     record: CatalogRecord,
     size = 6,
-    _source = [...ES_SOURCE_SUMMARY, 'allKeywords', 'createDate']
+    _source = [...ES_SOURCE_SUMMARY, 'createDate']
   ): EsSearchParams {
     return {
       query: {

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

@@ -14,8 +14,8 @@ import {
 import { PublicationVersionError } from '../../../../../../libs/common/domain/src/lib/model/error'
 import {
   CatalogRecord,
-  DatasetFeatureType,
   DatasetFeatureCatalog,
+  DatasetFeatureType,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import {
   Aggregations,
@@ -29,9 +29,9 @@ import {
 import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 import {
+  LanguagesApiService,
   RecordsApiService,
   SearchApiService,
-  FeatureResponseApiModel,
 } from '../../../../../../libs/data-access/gn4/src'
 import {
   combineLatest,
@@ -47,6 +47,8 @@ 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'
 
@@ -65,7 +67,9 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     private gn4SearchHelper: ElasticsearchService,
     private gn4Mapper: Gn4Converter,
     private gn4RecordsApi: RecordsApiService,
-    private platformService: PlatformServiceInterface
+    private platformService: PlatformServiceInterface,
+    private gn4LanguagesApi: LanguagesApiService,
+    private settingsService: Gn4SettingsService
   ) {}
 
   search({
@@ -129,9 +133,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 +146,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 {
@@ -150,12 +175,21 @@ export class Gn4Repository implements RecordsRepositoryInterface {
         name: featureType.typeName || '',
         definition: featureType.definition || '',
         attributes: Array.isArray(featureType.attributeTable)
-          ? featureType.attributeTable.map((attr) => ({
-              name: attr.name,
-              code: attr.code,
-              title: attr.definition,
-              type: attr.type,
-            }))
+          ? featureType.attributeTable.map((attr) => {
+              const values = attr.values
+                ?.filter((v) => v.code || v.label)
+                .map((v) => ({
+                  code: v.code,
+                  label: v.label,
+                }))
+              return {
+                name: attr.name,
+                code: attr.code,
+                definition: attr.definition,
+                type: attr.type,
+                ...(values?.length > 0 ? { values } : {}),
+              }
+            })
           : [],
       })),
     }
@@ -203,6 +237,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({})
@@ -255,14 +307,46 @@ export class Gn4Repository implements RecordsRepositoryInterface {
       : of(true)
   }
 
-  canEditRecord(uniqueIdentifier: string): Observable<boolean> {
-    return this.getRecord(uniqueIdentifier).pipe(
-      map((record) => {
-        return record.extras['edit'] as boolean
+  canDuplicate(record: CatalogRecord): boolean {
+    return record.kind === 'dataset'
+  }
+
+  canDelete(record: CatalogRecord): Observable<boolean> {
+    return this.settingsService.allowEditHarvested$.pipe(
+      map((allowEditHarvested) => {
+        return (
+          record.extras['edit'] &&
+          (!record.extras['isHarvested'] || allowEditHarvested)
+        )
       })
     )
   }
 
+  private canEdit(record: CatalogRecord, allowEditHarvested: boolean): boolean {
+    return (
+      record.kind === 'dataset' &&
+      record.extras['edit'] &&
+      (!record.extras['isHarvested'] || allowEditHarvested)
+    )
+  }
+
+  canEditRecord(uniqueIdentifier: string): Observable<boolean> {
+    return combineLatest([
+      this.getRecord(uniqueIdentifier),
+      this.settingsService.allowEditHarvested$,
+    ]).pipe(
+      map(([record, allowEditHarvested]) =>
+        record ? this.canEdit(record, allowEditHarvested) : false
+      )
+    )
+  }
+
+  canEditIndexedRecord(record: CatalogRecord): Observable<boolean> {
+    return this.settingsService.allowEditHarvested$.pipe(
+      map((allowEditHarvested) => this.canEdit(record, allowEditHarvested))
+    )
+  }
+
   openRecordForEdition(
     uniqueIdentifier: string
   ): Observable<[CatalogRecord, string, boolean] | null> {
@@ -365,9 +449,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) => {
@@ -468,6 +555,18 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     )
   }
 
+  getApplicationLanguages(): Observable<string[]> {
+    return this.gn4LanguagesApi
+      .getApplicationLanguages()
+      .pipe(
+        map((languages) =>
+          languages
+            .map((lang) => getLang2FromLang3(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/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)