geonetwork-ui 2.7.0-dev.76c515d5b → 2.7.0-dev.77bbd685d

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 { getLang3FromLang2 } from '../../../../../../libs/util/i18n/src'
+import { toLang3 } from '../../../../../../libs/util/i18n/src'
 
 @Injectable({
   providedIn: 'root',
@@ -14,7 +14,7 @@ export class MetadataUrlService {
 
   getUrl(uuid: string, apiPath: string = this.apiConfiguration.basePath) {
     const prefix = `${apiPath}/../`
-    return `${prefix}${getLang3FromLang2(
+    return `${prefix}${toLang3(
       this.translate.currentLang
     )}/catalog.search#/metadata/${uuid}`
   }

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

@@ -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 { getLang2FromLang3 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
+import { toLang2 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
 import { getResourceType, getReuseType } from '../common/resource-types'
 
 export function readKind(rootEl: XmlElement): RecordKind {
@@ -370,7 +370,7 @@ export function readLocaleElement(): ChainableFunction<
   return pipe(
     findChildElement('lan:LanguageCode'),
     readAttribute('codeListValue'),
-    map((lang) => getLang2FromLang3(lang?.toLowerCase()) ?? lang)
+    map((lang) => toLang2(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 { getLang3FromLang2 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
+import { toLang3 } 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 = getLang3FromLang2(language.toLowerCase()) ?? language
+  const lang3 = toLang3(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 { getLang2FromLang3 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
+import { toLang2 } 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) => getLang2FromLang3(lang?.toLowerCase()) ?? lang)
+        map((lang) => toLang2(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 ? getLang2FromLang3(lang.toLowerCase()) : null))
+    map((lang) => (lang ? toLang2(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 { getLang3FromLang2 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
+import { toLang3 } from '../../../../../../libs/util/i18n/src/lib/language-codes'
 import { kindToCodeListValue } from '../common/resource-types'
 
 function writeLocalizedElement(
@@ -1300,7 +1300,7 @@ export function createOnlineResource(onlineResource: ServiceOnlineResource) {
 }
 
 export function appendDatasetOnlineResources(
-  record: DatasetRecord,
+  record: DatasetRecord | ReuseRecord,
   rootEl: XmlElement
 ) {
   appendChildren(
@@ -1319,7 +1319,7 @@ export function appendDatasetOnlineResources(
 }
 
 export function appendServiceOnlineResources(
-  record: ServiceRecord | ReuseRecord,
+  record: ServiceRecord,
   rootEl: XmlElement
 ) {
   appendChildren(...record.onlineResources.map(createOnlineResource))(rootEl)
@@ -1331,7 +1331,7 @@ export function writeOnlineResources(
 ) {
   removeOnlineResources()(rootEl)
 
-  if (record.kind === 'dataset') {
+  if (record.kind === 'dataset' || record.kind === 'reuse') {
     appendDatasetOnlineResources(record, rootEl)
     return
   }
@@ -1476,7 +1476,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', getLang3FromLang2(lang) ?? lang)
+      writeAttribute('codeListValue', toLang3(lang) ?? lang)
     )
 
   // add new languages (only if other than default one)
@@ -1490,7 +1490,7 @@ export function writeDefaultLanguage(
   record: DatasetRecord,
   rootEl: XmlElement
 ) {
-  const lang3 = getLang3FromLang2(record.defaultLanguage.toLowerCase())
+  const lang3 = toLang3(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/index.ts

@@ -1,3 +1,3 @@
-export * from './lib/metadata-language'
+export * from './lib/metadata-language.token'
 export * from './lib/repository-url'
 export * from './lib/gn4'

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 { getLang3FromLang2 } from '../../../../../../../libs/util/i18n/src'
+import { toLang2, toLang3 } from '../../../../../../../libs/util/i18n/src'
 import { TranslateService } from '@ngx-translate/core'
 import { Location } from '@angular/common'
 
@@ -35,8 +35,8 @@ export class AuthService {
         '${current_url}',
         new URL(this.location.path(), window.location.href).toString()
       )
-      .replace('${lang2}', this.translateService.currentLang)
-      .replace('${lang3}', getLang3FromLang2(this.translateService.currentLang))
+      .replace('${lang2}', toLang2(this.translateService.currentLang))
+      .replace('${lang3}', toLang3(this.translateService.currentLang))
   }
 
   get logoutUrl() {
@@ -46,7 +46,7 @@ export class AuthService {
   get settingsUrl() {
     return this.baseSettingsUrl.replace(
       '${lang3}',
-      getLang3FromLang2(this.translateService.currentLang)
+      toLang3(this.translateService.currentLang)
     )
   }
 

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

@@ -15,7 +15,7 @@ import {
   FiltersAggregationParams,
   SortByField,
 } from '../../../../../../../libs/common/domain/src/lib/model/search'
-import { METADATA_LANGUAGE } from '../../metadata-language'
+import { METADATA_LANGUAGE } from '../../metadata-language.token'
 import {
   AggregationResult,
   EsSearchParams,
@@ -26,9 +26,12 @@ import {
   SortParams,
   TermsAggregationResult,
 } from '../../../../../../../libs/api/metadata-converter/src'
-import { getLang3FromLang2 } from '../../../../../../../libs/util/i18n/src'
+import { toLang3 } from '../../../../../../../libs/util/i18n/src'
 import { formatDate, isDateRange } from './date-range.utils'
-import { CatalogRecord } from '../../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  CatalogRecord,
+  LanguageCode,
+} from '../../../../../../../libs/common/domain/src/lib/model/record'
 import { TranslateService } from '@ngx-translate/core'
 import { getGeometryBoundingBox } from '../../../../../../../libs/util/shared/src'
 import { getLength as getGeodesicLength } from 'ol/sphere'
@@ -45,11 +48,9 @@ export class ElasticsearchService {
   private runtimeFields: Record<string, string> = {}
 
   // 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)
+  private get metadataLang(): LanguageCode {
+    const mdLangValue = this.injector.get(METADATA_LANGUAGE, null)
+    return typeof mdLangValue === 'function' ? mdLangValue() : mdLangValue
   }
 
   constructor(
@@ -233,9 +234,12 @@ export class ElasticsearchService {
 
   private getQueryLang(): string {
     if (this.metadataLang) {
-      return this.isCurrentSearchLang()
-        ? `lang${this.lang3}`
-        : `lang${this.metadataLang}`
+      const lang3 = toLang3(
+        this.isCurrentSearchLang()
+          ? this.translateService.currentLang
+          : this.metadataLang
+      )
+      return `lang${lang3}`
     } else return '*'
   }
   private isCurrentSearchLang() {

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

@@ -48,7 +48,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 { toLang2 } from '../../../../../../libs/util/i18n/src'
 import { Gn4SettingsService } from './settings/gn4-settings.service'
 
 const minPublicationApiVersion = '4.2.5'
@@ -562,7 +562,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
       .pipe(
         map((languages) =>
           languages
-            .map((lang) => getLang2FromLang3(lang.id))
+            .map((lang) => toLang2(lang.id))
             .filter((code): code is string => !!code)
         )
       )

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

@@ -4,6 +4,18 @@ 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'
+import { AvatarServiceInterface, GravatarService } from './auth'
+import { OrganizationsServiceInterface } from '../../../../../../libs/common/domain/src/lib/organizations.service.interface'
+import {
+  ORGANIZATIONS_STRATEGY,
+  organizationsServiceFactory,
+} from './organizations'
+import { ElasticsearchService } from './elasticsearch'
+import {
+  GroupsApiService,
+  SearchApiService,
+} from '../../../../../../libs/data-access/gn4/src'
+import { TranslateService } from '@ngx-translate/core'
 
 export function provideGn4(): Provider[] {
   return [
@@ -16,5 +28,18 @@ export function provideGn4(): Provider[] {
       useClass: Gn4Repository,
     },
     Gn4PlatformMapper,
+    { provide: AvatarServiceInterface, useClass: GravatarService },
+    {
+      provide: OrganizationsServiceInterface,
+      useFactory: organizationsServiceFactory,
+      deps: [
+        ORGANIZATIONS_STRATEGY,
+        ElasticsearchService,
+        SearchApiService,
+        GroupsApiService,
+        TranslateService,
+        PlatformServiceInterface,
+      ],
+    },
   ]
 }

package/src/libs/api/repository/src/lib/gn4/organizations/index.ts

@@ -1,13 +1,4 @@
 export * from './organizations-from-metadata.service'
 export * from './organizations-from-groups.service'
-
-import { InjectionToken } from '@angular/core'
-
-export type OrganizationsStrategy = 'metadata' | 'groups'
-
-export const ORGANIZATIONS_STRATEGY = new InjectionToken<OrganizationsStrategy>(
-  'organizations-strategy',
-  {
-    factory: () => 'metadata',
-  }
-)
+export * from './organization-strategy.token'
+export * from './organizations-service.factory'

package/src/libs/api/repository/src/lib/gn4/organizations/organization-strategy.token.ts

@@ -0,0 +1,10 @@
+import { InjectionToken } from '@angular/core'
+
+export type OrganizationsStrategy = 'metadata' | 'groups'
+
+export const ORGANIZATIONS_STRATEGY = new InjectionToken<OrganizationsStrategy>(
+  'organizations-strategy',
+  {
+    factory: () => 'metadata',
+  }
+)

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 { getLang3FromLang2 } from '../../../../../../../libs/util/i18n/src'
+import { toLang3 } from '../../../../../../../libs/util/i18n/src'
 import { FieldFilters } from '../../../../../../../libs/common/domain/src/lib/model/search'
 import {
   CatalogRecord,
@@ -52,7 +52,7 @@ export class OrganizationsFromGroupsService
   organisationsCount$ = this.organisations$.pipe(map((orgs) => orgs.length))
 
   private get lang3() {
-    return getLang3FromLang2(this.translateService.currentLang)
+    return toLang3(this.translateService.currentLang)
   }
 
   constructor(

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

@@ -33,7 +33,7 @@ import {
   tap,
   withLatestFrom,
 } from 'rxjs/operators'
-import { getLocalizedIndexKey } from '../../../../../../../libs/util/i18n/src'
+import { toLang3 } 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'
@@ -126,7 +126,7 @@ export class OrganizationsFromMetadataService
   ) {}
 
   private get langIndex() {
-    return getLocalizedIndexKey(this.translateService.currentLang)
+    return `lang${toLang3(this.translateService.currentLang)}`
   }
 
   equalsNormalizedStrings(

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

@@ -0,0 +1,33 @@
+import {
+  GroupsApiService,
+  SearchApiService,
+} from '../../../../../../../libs/data-access/gn4/src'
+import { TranslateService } from '@ngx-translate/core'
+import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
+import { ElasticsearchService } from '../elasticsearch'
+import { OrganizationsStrategy } from './organization-strategy.token'
+import { OrganizationsFromGroupsService } from './organizations-from-groups.service'
+import { OrganizationsFromMetadataService } from './organizations-from-metadata.service'
+
+export const organizationsServiceFactory = (
+  strategy: OrganizationsStrategy,
+  esService: ElasticsearchService,
+  searchApiService: SearchApiService,
+  groupsApiService: GroupsApiService,
+  translateService: TranslateService,
+  platformService: PlatformServiceInterface
+) =>
+  strategy === 'groups'
+    ? new OrganizationsFromGroupsService(
+        esService,
+        searchApiService,
+        groupsApiService,
+        translateService
+      )
+    : new OrganizationsFromMetadataService(
+        esService,
+        searchApiService,
+        groupsApiService,
+        platformService,
+        translateService
+      )

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

@@ -11,7 +11,6 @@ import {
   MeApiService,
   RecordsApiService,
   RegistriesApiService,
-  SiteApiService,
   ToolsApiService,
   UserfeedbackApiService,
   UsersApiService,
@@ -45,7 +44,8 @@ import {
   throwError,
 } from 'rxjs'
 import { TranslateService } from '@ngx-translate/core'
-import { getLang3FromLang2 } from '../../../../../../../libs/util/i18n/src'
+import { toLang3 } from '../../../../../../../libs/util/i18n/src'
+import { Gn4SettingsService } from '../settings/gn4-settings.service'
 
 const minApiVersion = '4.2.2'
 
@@ -66,31 +66,6 @@ export class Gn4PlatformService implements PlatformServiceInterface {
       }),
       shareReplay(1)
     )
-
-  private settings$ = of(true).pipe(
-    switchMap(() => this.siteApiService.getSiteOrPortalDescription()),
-    shareReplay(1)
-  )
-
-  private readonly apiVersion$ = this.settings$.pipe(
-    map((info) => info['system/platform/version'] as string),
-    tap((version) => {
-      if (ltr(version, minApiVersion)) {
-        throw new Error(
-          `Gn4 API version is not compatible.\nMinimum: ${minApiVersion}\nYour version: ${version}`
-        )
-      }
-    }),
-    shareReplay(1)
-  )
-
-  private readonly allowEditHarvestedMd$ = this.settings$.pipe(
-    map((info) => {
-      return info['system/harvester/enableEditing'] as boolean
-    }),
-    shareReplay(1)
-  )
-
   /**
    * A map of already loaded thesauri (groups of keywords); the key is a URI
    * @private
@@ -98,11 +73,10 @@ export class Gn4PlatformService implements PlatformServiceInterface {
   private keywordsByThesauri: Record<string, Observable<Keyword[]>> = {}
 
   private get lang3() {
-    return getLang3FromLang2(this.translateService.currentLang)
+    return toLang3(this.translateService.currentLang)
   }
 
   constructor(
-    private siteApiService: SiteApiService,
     private meApi: MeApiService,
     private usersApi: UsersApiService,
     private mapper: Gn4PlatformMapper,
@@ -111,7 +85,8 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     private translateService: TranslateService,
     private userfeedbackApiService: UserfeedbackApiService,
     private httpClient: HttpClient,
-    private recordsApiService: RecordsApiService
+    private recordsApiService: RecordsApiService,
+    private settingsService: Gn4SettingsService
   ) {
     this.me$ = this.meApi.getMe().pipe(
       switchMap((apiUser) => this.mapper.userFromMeApi(apiUser)),
@@ -128,16 +103,28 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     )
   }
 
+  getFeedbacksAllowed(): Observable<boolean> {
+    return this.settingsService.allowFeedbacks$
+  }
+
+  getAllowEditHarvestedMd(): Observable<boolean> {
+    return this.settingsService.allowEditHarvested$
+  }
+
   getType(): string {
     return this.type
   }
 
   getApiVersion(): Observable<string> {
-    return this.apiVersion$
-  }
-
-  getAllowEditHarvestedMd(): Observable<boolean> {
-    return this.allowEditHarvestedMd$
+    return this.settingsService.apiVersion$.pipe(
+      tap((version) => {
+        if (ltr(version, minApiVersion)) {
+          throw new Error(
+            `Gn4 API version is not compatible.\nMinimum: ${minApiVersion}\nYour version: ${version}`
+          )
+        }
+      })
+    )
   }
 
   getMe(): Observable<UserModel> {

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

@@ -14,6 +14,14 @@ export class Gn4SettingsService {
   public allowEditHarvested$: Observable<boolean> =
     this.getSettingsSetValueByKey('system/harvester/enableEditing')
 
+  public allowFeedbacks$: Observable<boolean> = this.getSettingsSetValueByKey(
+    'system/userFeedback/enable'
+  )
+
+  public apiVersion$: Observable<string> = this.getSettingsSetValueByKey(
+    'system/platform/version'
+  )
+
   constructor(private siteApiService: SiteApiService) {}
 
   private getSettingsSetValueByKey(key: string) {

package/src/libs/api/repository/src/lib/metadata-language.token.ts

@@ -0,0 +1,8 @@
+import { InjectionToken } from '@angular/core'
+import { LanguageCode } from '../../../../../libs/common/domain/src/lib/model/record'
+
+export type LanguageCodeFactory = () => LanguageCode
+
+export const METADATA_LANGUAGE = new InjectionToken<
+  LanguageCode | LanguageCodeFactory
+>('metadata-language')

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

@@ -108,6 +108,11 @@ export interface Keyword {
   translations?: KeywordTranslations
 }
 
+export interface INSPIRE_theme {
+  value: string
+  label: string
+}
+
 export interface BaseRecord {
   uniqueIdentifier: Uuid
   ownerOrganization: Organization
@@ -160,6 +165,17 @@ export type ServiceProtocol =
   | 'maplibre-style'
   | 'other'
 
+marker('record.metadata.api.accessServiceProtocol.wms')
+marker('record.metadata.api.accessServiceProtocol.wfs')
+marker('record.metadata.api.accessServiceProtocol.wps')
+marker('record.metadata.api.accessServiceProtocol.wmts')
+marker('record.metadata.api.accessServiceProtocol.esriRest')
+marker('record.metadata.api.accessServiceProtocol.ogcFeatures')
+marker('record.metadata.api.accessServiceProtocol.GPFDL')
+marker('record.metadata.api.accessServiceProtocol.tms')
+marker('record.metadata.api.accessServiceProtocol.maplibre-style')
+marker('record.metadata.api.accessServiceProtocol.other')
+
 export type OnlineResourceType = 'service' | 'download' | 'link' | 'endpoint'
 
 export interface DatasetServiceDistribution {
@@ -258,7 +274,7 @@ export interface ServiceRecord extends BaseRecord {
 export interface ReuseRecord extends BaseRecord {
   kind: 'reuse'
   lineage: string // Explanation of the origin of this record (e.g: how, why)"
-  onlineResources: Array<OnlineLinkResource>
+  onlineResources: Array<DatasetOnlineResource>
   reuseType: ReuseType
   spatialExtents: Array<DatasetSpatialExtent>
   temporalExtents: Array<DatasetTemporalExtent>

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

@@ -57,4 +57,5 @@ export abstract class PlatformServiceInterface {
     removeDuplicate?: boolean
   ): Observable<UploadEvent>
   abstract getFileContent(url: URL): Observable<any>
+  abstract getFeedbacksAllowed(): Observable<boolean>
 }

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

@@ -1,4 +1,3 @@
-export * from './lib/feature-catalog.module'
 export * from './lib/organization-url.token'
 export * from './lib/sources/sources.service'
 export * from './lib/sources/sources.model'

package/src/libs/feature/catalog/src/lib/organization-url.token.ts

@@ -4,3 +4,8 @@ import { InjectionToken } from '@angular/core'
 export const ORGANIZATION_PAGE_URL_TOKEN = new InjectionToken<string>(
   'organization-page-url-token'
 )
+
+// expects the replacement key ${name}
+export const ORGANIZATION_URL_TOKEN = new InjectionToken<string>(
+  'organization-url-token'
+)

package/src/libs/feature/catalog/src/lib/site-title/site-title.component.ts

@@ -1,8 +1,10 @@
+import { CommonModule } from '@angular/common'
 import { ChangeDetectionStrategy, Component } from '@angular/core'
 import {
   SettingsListResponseApiModel,
   SiteApiService,
 } from '../../../../../../libs/data-access/gn4/src'
+import { CatalogTitleComponent } from '../../../../../../libs/ui/catalog/src'
 import { Observable } from 'rxjs'
 import { shareReplay } from 'rxjs/operators'
 
@@ -11,6 +13,8 @@ import { shareReplay } from 'rxjs/operators'
   templateUrl: './site-title.component.html',
   styleUrls: ['./site-title.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule, CatalogTitleComponent],
 })
 export class SiteTitleComponent {
   info$: Observable<SettingsListResponseApiModel>

package/src/libs/feature/catalog/src/lib/source-label/source-label.component.ts

@@ -1,12 +1,15 @@
 import { Component, ChangeDetectionStrategy, Input } from '@angular/core'
 import { Observable } from 'rxjs'
 import { SourcesService } from '../sources/sources.service'
+import { CommonModule } from '@angular/common'
 
 @Component({
   selector: 'gn-ui-source-label',
   templateUrl: './source-label.component.html',
   styleUrls: ['./source-label.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule],
 })
 export class SourceLabelComponent {
   sourceLabel$: Observable<string>

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

@@ -4,7 +4,7 @@ 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'
+import { toLang3 } from '../../../../../../libs/util/i18n/src'
 
 @Injectable({
   providedIn: 'root',
@@ -23,10 +23,7 @@ export class SourcesService {
     return this.sources$.pipe(
       map((sources) => sources.filter((source) => source.uuid === uuid)[0]),
       filter((source) => !!source),
-      map(
-        (source) =>
-          source.label[getLang3FromLang2(this.translateService.currentLang)]
-      )
+      map((source) => source.label[toLang3(this.translateService.currentLang)])
     )
   }
 }