geonetwork-ui 2.7.0-dev.f29e01b0d → 2.7.0-dev.fd871c105

package/src/libs/ui/elements/src/lib/service-capabilities/service-capabilities.component.ts

@@ -136,12 +136,6 @@ export class ServiceCapabilitiesComponent implements OnInit {
   }
 
   selectLayer(layer: WfsFeatureTypeFull | WmsLayerFull | WmtsLayer) {
-    if (layer === this.selectedLayer) {
-      this.selectedLayer = null
-      this.layerInformation = []
-      return
-    }
-
     this.selectedLayer = layer
     const filteredInfo = []
     Object.keys(layer).map((key) => {

package/src/libs/ui/inputs/src/lib/search-feature-catalog/search-feature-catalog.component.html

@@ -1,5 +1,8 @@
 <div
   class="flex items-center justify-between p-3 mt-8 bg-white rounded-lg border-b solid border-gray-300"
+  *ngIf="
+    (isMobile$ | async) === false || featureCatalog?.featureTypes?.length > 1
+  "
 >
   <div
     class="relative shrink-0"
@@ -17,7 +20,10 @@
       name="iconoirSearch"
     ></ng-icon>
   </div>
-  <div class="text-sm px-1 ml-auto hidden sm:inline">
+  <div
+    *ngIf="(isMobile$ | async) === false"
+    class="text-sm px-1 ml-auto inline"
+  >
     <ng-container *ngIf="featureCatalog?.featureTypes?.length > 1">
       <span
         class="text-sm font-medium text-gray-900"

package/src/libs/ui/inputs/src/lib/search-feature-catalog/search-feature-catalog.component.ts

@@ -6,7 +6,7 @@ import { DatasetFeatureCatalog } from '../../../../../../libs/common/domain/src/
 import { FormsModule } from '@angular/forms'
 import { of } from 'rxjs'
 import { debounceTime, distinctUntilChanged, tap } from 'rxjs/operators'
-import { createFuzzyFilter } from '../../../../../../libs/util/shared/src'
+import { createFuzzyFilter, getIsMobile } from '../../../../../../libs/util/shared/src'
 import { iconoirSearch } from '@ng-icons/iconoir'
 
 @Component({
@@ -39,6 +39,8 @@ export class SearchFeatureCatalogComponent {
     return this._featureCatalog
   }
 
+  isMobile$ = getIsMobile()
+
   @Output() filteredFeatureCatalogChange =
     new EventEmitter<DatasetFeatureCatalog>()
   filteredFeatureCatalog: DatasetFeatureCatalog

package/src/libs/ui/inputs/src/lib/star-toggle/star-toggle.component.ts

@@ -8,7 +8,7 @@ import {
   ViewChild,
 } from '@angular/core'
 import { propagateToDocumentOnly } from '../../../../../../libs/util/shared/src'
-import { NgIcon, provideIcons } from '@ng-icons/core'
+import { NgIcon, provideIcons, provideNgIconsConfig } from '@ng-icons/core'
 import { CommonModule } from '@angular/common'
 import { matStar, matStarBorder } from '@ng-icons/material-icons/baseline'
 import { ButtonComponent } from '../button/button.component'
@@ -21,7 +21,12 @@ import { TranslateDirective } from '@ngx-translate/core'
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [CommonModule, NgIcon, ButtonComponent, TranslateDirective],
-  viewProviders: [provideIcons({ matStar, matStarBorder })],
+  viewProviders: [
+    provideIcons({ matStar, matStarBorder }),
+    provideNgIconsConfig({
+      size: '1.5em',
+    }),
+  ],
 })
 export class StarToggleComponent {
   @Input() toggled!: boolean

package/src/libs/ui/search/src/index.ts

@@ -1,10 +1,8 @@
-export { FacetsModule as UiFacetsModule } from './lib/facets/facets.module'
 export * from './lib/facets/facets.model'
 export * from './lib/facets/fixtures'
 export * from './lib/facets/facet-block/facet-block.component'
 export * from './lib/facets/facet-list/facet-list.component'
 export * from './lib/facets/facet-item/facet-item.component'
-export * from './lib/ui-search.module'
 export * from './lib/results-list/results-layout.config'
 export * from './lib/results-list/results-list.component'
 export * from './lib/record-preview/record-preview.component'

package/src/libs/ui/search/src/lib/facets/facet-block/facet-block.component.ts

@@ -20,12 +20,24 @@ import {
   ModelBlock,
   ModelItem,
 } from '../facets.model'
+import { FacetItemComponent } from '../facet-item/facet-item.component'
+import { CommonModule } from '@angular/common'
+import { FormsModule } from '@angular/forms'
+import { TranslateModule, TranslatePipe } from '@ngx-translate/core'
 
 @Component({
   selector: 'gn-ui-facet-block',
   templateUrl: './facet-block.component.html',
   styleUrls: ['./facet-block.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [
+    FacetItemComponent,
+    CommonModule,
+    FormsModule,
+    TranslateModule,
+    TranslatePipe,
+  ],
 })
 export class FacetBlockComponent
   implements OnInit, AfterViewInit, OnDestroy, OnChanges
@@ -125,14 +137,3 @@ export class FacetBlockComponent
     }
   }
 }
-
-@Component({ selector: 'gn-ui-facet-block', template: '' })
-export class FacetBlockStubComponent implements Partial<FacetBlockComponent> {
-  @Input() title: string
-  @Input() model: ModelBlock
-  @Input() selectedPaths: string[][]
-
-  @Output() filterChange = new EventEmitter<string>()
-  @Output() itemSelected = new EventEmitter<string[]>()
-  @Output() itemUnselected = new EventEmitter<string[]>()
-}

package/src/libs/ui/search/src/lib/facets/facet-item/facet-item.component.ts

@@ -1,9 +1,14 @@
+import { CommonModule } from '@angular/common'
 import { Component, EventEmitter, Input, Output } from '@angular/core'
+import { FormsModule } from '@angular/forms'
+import { TranslateModule, TranslatePipe } from '@ngx-translate/core'
 
 @Component({
   selector: 'gn-ui-facet-item',
   templateUrl: './facet-item.component.html',
   styleUrls: ['./facet-item.component.css'],
+  standalone: true,
+  imports: [CommonModule, FormsModule, TranslateModule, TranslatePipe],
 })
 export class FacetItemComponent {
   @Input() label: string
@@ -27,14 +32,3 @@ export class FacetItemComponent {
     this.onInvertedChange(this.inverted)
   }
 }
-
-@Component({ selector: 'gn-ui-facet-item', template: '' })
-export class FacetItemStubComponent implements Partial<FacetItemComponent> {
-  @Input() label: string
-  @Input() count: number
-  @Input() selected: boolean
-  @Input() inverted: boolean
-
-  @Output() selectedChange = new EventEmitter<boolean>()
-  @Output() invertedChange = new EventEmitter<boolean>()
-}

package/src/libs/ui/search/src/lib/facets/facet-list/facet-list.component.ts

@@ -3,11 +3,17 @@ import { FacetSelectEvent, ModelBlock } from '../facets.model'
 // Revisit facets: these should not use the ES formats!
 // eslint-disable-next-line @nx/enforce-module-boundaries
 import { EsRequestAggTerm } from '../../../../../../../libs/api/metadata-converter/src'
+import { FacetBlockComponent } from '../facet-block/facet-block.component'
+import { CommonModule } from '@angular/common'
+import { FormsModule } from '@angular/forms'
+import { TranslateModule } from '@ngx-translate/core'
 
 @Component({
   selector: 'gn-ui-facet-list',
   templateUrl: './facet-list.component.html',
   styleUrls: ['./facet-list.component.css'],
+  standalone: true,
+  imports: [FacetBlockComponent, CommonModule, FormsModule, TranslateModule],
 })
 export class FacetListComponent {
   @Input() models: ModelBlock[]

package/src/libs/ui/search/src/lib/record-metric/record-metric.component.ts

@@ -1,3 +1,4 @@
+import { CommonModule } from '@angular/common'
 import {
   ChangeDetectionStrategy,
   Component,
@@ -5,12 +6,15 @@ import {
   OnInit,
 } from '@angular/core'
 import { ThemeService } from '../../../../../../libs/util/shared/src'
+import { TranslateDirective } from '@ngx-translate/core'
 
 @Component({
   selector: 'gn-ui-record-metric',
   templateUrl: './record-metric.component.html',
   styleUrls: ['./record-metric.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule, TranslateDirective],
 })
 export class RecordMetricComponent implements OnInit {
   @Input() count: number

package/src/libs/ui/search/src/lib/record-preview/record-preview.component.ts

@@ -20,10 +20,13 @@ import {
   Individual,
   Organization,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { CommonModule } from '@angular/common'
 
 @Component({
   selector: 'gn-ui-record-preview',
   template: '',
+  standalone: true,
+  imports: [CommonModule],
 })
 export class RecordPreviewComponent implements OnInit, OnDestroy {
   @Input() record: CatalogRecord

package/src/libs/ui/search/src/lib/record-preview-card/record-preview-card.component.ts

@@ -1,10 +1,14 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core'
 import { RecordPreviewComponent } from '../record-preview/record-preview.component'
+import { ThumbnailComponent } from '../../../../../../libs/ui/elements/src'
+import { CommonModule } from '@angular/common'
 
 @Component({
   selector: 'gn-ui-record-preview-card',
   templateUrl: './record-preview-card.component.html',
   styleUrls: ['./record-preview-card.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule, RecordPreviewComponent, ThumbnailComponent],
 })
 export class RecordPreviewCardComponent extends RecordPreviewComponent {}

package/src/libs/ui/search/src/lib/record-preview-feed/record-preview-feed.component.ts

@@ -1,8 +1,20 @@
 import { ChangeDetectionStrategy, Component, ElementRef } from '@angular/core'
 import { RecordPreviewComponent } from '../record-preview/record-preview.component'
-import { TranslateService } from '@ngx-translate/core'
+import { TranslateDirective, TranslateService } from '@ngx-translate/core'
 import Duration from 'duration-relativetimeformat'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
+import { NgIcon, provideIcons, provideNgIconsConfig } from '@ng-icons/core'
+import {
+  matCloudDownloadOutline,
+  matHomeWorkOutline,
+  matMapOutline,
+} from '@ng-icons/material-icons/outline'
+import { matFace } from '@ng-icons/material-icons/baseline'
+import {
+  MarkdownParserComponent,
+  ThumbnailComponent,
+} from '../../../../../../libs/ui/elements/src'
+import { CommonModule } from '@angular/common'
 
 marker('record.was.created.time')
 
@@ -11,6 +23,26 @@ marker('record.was.created.time')
   templateUrl: './record-preview-feed.component.html',
   styleUrls: ['./record-preview-feed.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [
+    CommonModule,
+    RecordPreviewComponent,
+    NgIcon,
+    ThumbnailComponent,
+    MarkdownParserComponent,
+    TranslateDirective,
+  ],
+  viewProviders: [
+    provideIcons({
+      matMapOutline,
+      matCloudDownloadOutline,
+      matFace,
+      matHomeWorkOutline,
+    }),
+    provideNgIconsConfig({
+      size: '1.5em',
+    }),
+  ],
 })
 export class RecordPreviewFeedComponent extends RecordPreviewComponent {
   timeFormat = new Duration(this.translate.currentLang, {})

package/src/libs/ui/search/src/lib/record-preview-list/record-preview-list.component.ts

@@ -1,10 +1,20 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core'
 import { RecordPreviewComponent } from '../record-preview/record-preview.component'
+import { ThumbnailComponent } from '../../../../../../libs/ui/elements/src'
+import { CommonModule } from '@angular/common'
+import { TranslateDirective } from '@ngx-translate/core'
 
 @Component({
   selector: 'gn-ui-record-preview-list',
   templateUrl: './record-preview-list.component.html',
   styleUrls: ['./record-preview-list.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [
+    CommonModule,
+    RecordPreviewComponent,
+    ThumbnailComponent,
+    TranslateDirective,
+  ],
 })
 export class RecordPreviewListComponent extends RecordPreviewComponent {}

package/src/libs/ui/search/src/lib/record-preview-row/record-preview-row.component.ts

@@ -5,12 +5,16 @@ import {
   HostListener,
 } from '@angular/core'
 import { RecordPreviewComponent } from '../record-preview/record-preview.component'
+import { InternalLinkCardComponent } from '../../../../../../libs/ui/elements/src'
+import { CommonModule } from '@angular/common'
 
 @Component({
   selector: 'gn-ui-record-preview-row',
   templateUrl: './record-preview-row.component.html',
   styleUrls: ['./record-preview-row.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule, RecordPreviewComponent, InternalLinkCardComponent],
 })
 export class RecordPreviewRowComponent extends RecordPreviewComponent {
   size = 'L'

package/src/libs/ui/search/src/lib/record-preview-text/record-preview-text.component.ts

@@ -1,10 +1,14 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core'
 import { RecordPreviewComponent } from '../record-preview/record-preview.component'
+import { CommonModule } from '@angular/common'
+import { TranslateDirective } from '@ngx-translate/core'
 
 @Component({
   selector: 'gn-ui-record-preview-text',
   templateUrl: './record-preview-text.component.html',
   styleUrls: ['./record-preview-text.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule, RecordPreviewComponent, TranslateDirective],
 })
 export class RecordPreviewTextComponent extends RecordPreviewComponent {}

package/src/libs/ui/search/src/lib/record-preview-title/record-preview-title.component.ts

@@ -1,10 +1,14 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core'
 import { RecordPreviewComponent } from '../record-preview/record-preview.component'
+import { ThumbnailComponent } from '../../../../../../libs/ui/elements/src'
+import { CommonModule } from '@angular/common'
 
 @Component({
   selector: 'gn-ui-record-preview-title',
   templateUrl: './record-preview-title.component.html',
   styleUrls: ['./record-preview-title.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule, RecordPreviewComponent, ThumbnailComponent],
 })
 export class RecordPreviewTitleComponent extends RecordPreviewComponent {}

package/src/libs/ui/search/src/lib/results-hits-number/results-hits-number.component.ts

@@ -1,8 +1,12 @@
+import { CommonModule } from '@angular/common'
 import { Component, Input } from '@angular/core'
+import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
 
 @Component({
   selector: 'gn-ui-results-hits-number',
   templateUrl: './results-hits-number.component.html',
+  standalone: true,
+  imports: [CommonModule, TranslatePipe, TranslateDirective],
 })
 export class ResultsHitsNumberComponent {
   @Input() hits: number

package/src/libs/ui/search/src/lib/results-hits-search-kind/results-hits-search-kind.component.ts

@@ -1,3 +1,4 @@
+import { CommonModule } from '@angular/common'
 import {
   Component,
   EventEmitter,
@@ -6,11 +7,20 @@ import {
   SimpleChanges,
   Output,
 } from '@angular/core'
-import { Choice } from '../../../../../../libs/ui/inputs/src'
+import { KindBadgeComponent } from '../../../../../../libs/ui/elements/src'
+import { Choice, InlineFilterComponent } from '../../../../../../libs/ui/inputs/src'
+import { TranslatePipe } from '@ngx-translate/core'
 
 @Component({
   selector: 'gn-ui-results-hits-search-kind',
   templateUrl: './results-hits-search-kind.component.html',
+  standalone: true,
+  imports: [
+    CommonModule,
+    InlineFilterComponent,
+    KindBadgeComponent,
+    TranslatePipe,
+  ],
 })
 export class ResultsHitsSearchKindComponent implements OnChanges {
   @Input() selected: string[] = []

package/src/libs/ui/search/src/lib/results-list/results-layout.config.ts

@@ -20,9 +20,6 @@ export class ResultsLayoutConfigItem {
 }
 export type ResultsLayoutConfigModel = Record<string, ResultsLayoutConfigItem>
 
-export const RESULTS_LAYOUT_CONFIG =
-  new InjectionToken<ResultsLayoutConfigModel>('results-layout.config')
-
 export const DEFAULT_RESULTS_LAYOUT_CONFIG: ResultsLayoutConfigModel = {
   CARD: new ResultsLayoutConfigItem(
     RecordPreviewCardComponent,
@@ -46,3 +43,8 @@ export const DEFAULT_RESULTS_LAYOUT_CONFIG: ResultsLayoutConfigModel = {
   TEXT: new ResultsLayoutConfigItem(RecordPreviewTextComponent),
   TITLE: new ResultsLayoutConfigItem(RecordPreviewTitleComponent),
 }
+
+export const RESULTS_LAYOUT_CONFIG =
+  new InjectionToken<ResultsLayoutConfigModel>('results-layout.config', {
+    factory: () => DEFAULT_RESULTS_LAYOUT_CONFIG,
+  })

package/src/libs/ui/search/src/lib/results-list/results-list.component.ts

@@ -11,12 +11,16 @@ import {
   ResultsLayoutConfigItem,
 } from './results-layout.config'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { ResultsListItemComponent } from '../results-list-item/results-list-item.component'
+import { CommonModule } from '@angular/common'
 
 @Component({
   selector: 'gn-ui-results-list',
   templateUrl: './results-list.component.html',
   styleUrls: ['./results-list.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule, ResultsListItemComponent],
 })
 export class ResultsListComponent {
   @Input() records: CatalogRecord[]

package/src/libs/ui/search/src/lib/results-list-item/results-list-item.component.ts

@@ -14,12 +14,15 @@ import {
 import { RecordPreviewComponent } from '../record-preview/record-preview.component'
 import { ResultsLayoutConfigItem } from '../results-list/results-layout.config'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { CommonModule } from '@angular/common'
 
 @Component({
   selector: 'gn-ui-results-list-item',
   templateUrl: './results-list-item.component.html',
   styleUrls: ['./results-list-item.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule, RecordPreviewComponent],
 })
 export class ResultsListItemComponent implements OnChanges, AfterViewInit {
   @Input() layoutConfig: ResultsLayoutConfigItem

package/src/libs/ui/widgets/src/lib/popup-alert/popup-alert.component.ts

@@ -22,7 +22,12 @@ import { matErrorOutlineOutline } from '@ng-icons/material-icons/outline'
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [CommonModule, NgIconComponent],
-  providers: [provideIcons({ matErrorOutlineOutline })],
+  providers: [
+    provideIcons({ matErrorOutlineOutline }),
+    provideNgIconsConfig({
+      size: '1.5em',
+    }),
+  ],
 })
 export class PopupAlertComponent implements OnInit {
   @Input() icon: string

package/src/libs/util/app-config/src/lib/app-config.ts

@@ -231,6 +231,7 @@ export function loadAppConfig() {
           'filter_geometry_url',
           'search_preset',
           'advanced_filters',
+          'limit',
         ],
         warnings,
         errors
@@ -257,6 +258,7 @@ export function loadAppConfig() {
                 filters: param.filters,
               })),
               ADVANCED_FILTERS: parsedSearchSection.advanced_filters,
+              LIMIT: parsedSearchSection.limit,
             } as SearchConfig)
 
       const parsedMetadataQualitySection = parseConfigSection(

package/src/libs/util/app-config/src/lib/fixtures.ts

@@ -124,7 +124,7 @@ export const wrongLanguageCodeConfigFixture = () => `
 [global]
 geonetwork4_api_url = "/geonetwork/srv/api"
 proxy_path = "/proxy/?url="
-metadata_language = "fra"
+metadata_language = "abc"
 
 [map]
 

package/src/libs/util/app-config/src/lib/model.ts

@@ -60,6 +60,7 @@ export interface SearchConfig {
   FILTER_GEOMETRY_DATA?: string
   SEARCH_PRESET?: SearchPreset[]
   ADVANCED_FILTERS?: []
+  LIMIT?: number
 }
 
 export interface MetadataQualityConfig {

package/src/libs/util/app-config/src/lib/parse-utils.ts

@@ -1,4 +1,4 @@
-import { LANGUAGE_CODES_ISO_3 } from './constants'
+import { toLang2 } from '../../../../../libs/util/i18n/src'
 
 const flatten = (
   base: string,
@@ -129,13 +129,10 @@ export function checkMetadataLanguage(
   parsedConfigSection: any,
   outWarnings: string[]
 ) {
-  if (
-    LANGUAGE_CODES_ISO_3.indexOf(
-      parsedConfigSection.metadata_language.toLowerCase()
-    ) === -1
-  ) {
+  const lang2 = toLang2(parsedConfigSection.metadata_language.toLowerCase())
+  if (lang2?.length !== 2) {
     outWarnings.push(
-      `In the [global] section: metadata_language = "${parsedConfigSection.metadata_language}" is not in ISO 639-2/B format`
+      `In the [global] section: metadata_language = "${parsedConfigSection.metadata_language}" is not a recognized ISO 639 language code`
     )
   }
   return parsedConfigSection

package/src/libs/util/i18n/src/lib/language-codes.ts

@@ -1,20 +1,32 @@
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 
+/**
+ * Taken from https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes
+ * Note: some languages have multiple 3-char codes, like 'fre' and 'fra'; in that case, the one to be used
+ * in priority is the one defined last
+ */
 const LANG_3_TO_2_MAPPER = {
   eng: 'en',
+  nld: 'nl', // duplicate for "dut"
   dut: 'nl',
+  fra: 'fr', // duplicate for "fre"
   fre: 'fr',
+  deu: 'de', // duplicate for "ger"
   ger: 'de',
   kor: 'ko',
   spa: 'es',
+  ces: 'cs', // duplicate for "cze"
   cze: 'cs',
   cat: 'ca',
   fin: 'fi',
+  isl: 'is', // duplicate for "ice"
   ice: 'is',
   ita: 'it',
   por: 'pt',
   rus: 'ru',
+  zho: 'zh', // duplicate for "chi"
   chi: 'zh',
+  slk: 'sk', // duplicate for "slo"
   slo: 'sk',
   roh: 'rm',
   ara: 'ar',
@@ -25,10 +37,12 @@ const LANG_3_TO_2_MAPPER = {
   tur: 'tr',
   arm: 'hy',
   aze: 'az',
+  kat: 'ka', // duplicate for "geo"
   geo: 'ka',
   ukr: 'uk',
+  cym: 'cy', // duplicate for "wel"
   wel: 'cy',
-}
+} as const
 
 export const LANGUAGE_NAMES = {
   en: 'English',
@@ -58,26 +72,63 @@ export const LANGUAGE_NAMES = {
   ka: 'ქართული',
   uk: 'українська',
   wel: 'Cymraeg',
-}
+} as const
+
+export type LanguageCode3 = keyof typeof LANG_3_TO_2_MAPPER
+export type LanguageCode2 = (typeof LANG_3_TO_2_MAPPER)[LanguageCode3]
 
 export const LANG_2_TO_3_MAPPER = Object.entries(LANG_3_TO_2_MAPPER).reduce(
   (mapperObject, langEntry) => {
     return { ...mapperObject, [langEntry[1]]: langEntry[0] }
   },
   {}
-)
+) as Record<LanguageCode2, LanguageCode3>
 
-export function getLang3FromLang2(lang2: string): string {
-  return LANG_2_TO_3_MAPPER[lang2] ?? lang2
-}
+/**
+ * This can be:
+ * - an ISO 639-2 language code in 3 characters (e.g. 'eng', 'fre', 'ger')
+ * - an ISO 639-1 language code in 2 characters (e.g. 'en', 'fr', 'de')
+ * - a 2-character language code with locale (e.g. 'fr_FR', 'fr_CA')
+ */
+export type LanguageCodeLike = LanguageCode2 | LanguageCode3 | string
 
-export function getLang2FromLang3(lang3: string): string {
-  return LANG_3_TO_2_MAPPER[lang3] ?? lang3
+/**
+ * Converts a language code in any format to the ISO 639-2 format (3 characters)
+ * Returns the given string if the corresponding language code could not be recognized
+ */
+export function toLang3(lang: LanguageCodeLike): LanguageCode3 | string {
+  if (!lang) {
+    // also handle falsy values just in case
+    return lang
+  }
+  if (lang.length === 3) {
+    return LANG_2_TO_3_MAPPER[LANG_3_TO_2_MAPPER[lang.toLowerCase()]] ?? lang
+  }
+  const lang2 = lang.toLowerCase().substring(0, 2)
+  return LANG_2_TO_3_MAPPER[lang2] ?? lang
 }
 
-export function getLocalizedIndexKey(lang2: string): string {
-  const lang3 = getLang3FromLang2(lang2)
-  return lang3 ? `lang${lang3}` : null
+/**
+ * Converts a language code in any format to the ISO 639-1 format (2 characters)
+ * Returns the given string if the corresponding language code could not be recognized
+ */
+export function toLang2(lang: LanguageCodeLike): LanguageCode2 | string {
+  if (!lang) {
+    // also handle falsy values just in case
+    return lang
+  }
+  if (lang.length === 3) {
+    return LANG_3_TO_2_MAPPER[lang.toLowerCase()] ?? lang
+  }
+  const lang2 = lang.toLowerCase().substring(0, 2)
+  if (lang2 in LANG_2_TO_3_MAPPER) {
+    return lang2
+  }
+  if (lang.match(/[a-z]{2}_[A-Z]{2}/)) {
+    // remove locale code even if the language code is not known
+    return lang2
+  }
+  return lang
 }
 
 marker('language.en')

package/src/libs/util/shared/src/lib/links/link-utils.ts

@@ -23,8 +23,8 @@ export const FORMATS = {
   excel: {
     extensions: [
       'excel',
-      'xls',
       'xlsx',
+      'xls',
       'ms-excel',
       'openxmlformats-officedocument',
     ],
@@ -190,6 +190,7 @@ export function isFormatInQueryParam(
   alias: string
 ): boolean {
   const queryParams = link.url.searchParams
+  if (!queryParams) return false
   for (const [key, value] of queryParams.entries()) {
     if (key === 'format' || key === 'f') {
       return value === alias