geonetwork-ui 2.7.0-dev.816935147 → 2.7.0-dev.86624532b

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(
@@ -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/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/platform/gn4-platform.service.ts

@@ -45,7 +45,7 @@ import {
   throwError,
 } from 'rxjs'
 import { TranslateService } from '@ngx-translate/core'
-import { getLang3FromLang2 } from '../../../../../../../libs/util/i18n/src'
+import { toLang3 } from '../../../../../../../libs/util/i18n/src'
 
 const minApiVersion = '4.2.2'
 
@@ -98,7 +98,7 @@ 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(

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

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)])
     )
   }
 }

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-inspire-field/form-field-inspire-theme.component.html

@@ -0,0 +1,20 @@
+<div class="flex flex-col gap-3">
+  <div class="flex flex-col gap-4">
+    <gn-ui-autocomplete
+      [placeholder]="'editor.record.form.inspire.placeholder' | translate"
+      [displayWithFn]="displayWithFn"
+      [action]="autoCompleteAction"
+      (itemSelected)="handleItemSelection($event)"
+      [minCharacterCount]="1"
+      [clearOnSelection]="true"
+    ></gn-ui-autocomplete>
+    <div class="flex gap-2 flex-wrap">
+      <gn-ui-badge
+        *ngFor="let theme of themes"
+        [removable]="true"
+        (badgeRemoveClicked)="removeTheme(theme)"
+        >{{ getTranslatedTheme(theme) }}
+      </gn-ui-badge>
+    </div>
+  </div>
+</div>

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-inspire-field/form-field-inspire-theme.component.ts

@@ -0,0 +1,85 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { AutocompleteComponent, BadgeComponent } from '../../../../../../../../../libs/ui/inputs/src'
+import { NgIconComponent } from '@ng-icons/core'
+import { INSPIRE_THEMES } from '../../../../fields.config'
+import { TranslatePipe, TranslateService } from '@ngx-translate/core'
+import { of } from 'rxjs'
+
+type AutocompleteItem = { title: string; value: string }
+
+@Component({
+  selector: 'gn-ui-form-field-inspire-theme',
+  standalone: true,
+  imports: [
+    CommonModule,
+    AutocompleteComponent,
+    NgIconComponent,
+    BadgeComponent,
+    TranslatePipe,
+  ],
+  templateUrl: './form-field-inspire-theme.component.html',
+  styleUrl: './form-field-inspire-theme.component.css',
+})
+export class FormFieldInspireThemeComponent {
+  themes = []
+  @Input() set value(themes: string[]) {
+    this.themes = themes
+  }
+  @Output() valueChange: EventEmitter<string[]> = new EventEmitter()
+  availableThemes = INSPIRE_THEMES
+
+  displayWithFn = (item: AutocompleteItem) => {
+    return item?.title ? `${item.title}` : ''
+  }
+
+  autoCompleteAction = (query: string) => {
+    return of(
+      this.availableThemes
+        .filter((theme) =>
+          theme.value.toLowerCase().includes(query.toLowerCase())
+        )
+        .sort((a, b) => {
+          const aStarts = a.value.startsWith(query)
+          const bStarts = b.value.startsWith(query)
+
+          if (aStarts && !bStarts) return -1
+          if (!aStarts && bStarts) return 1
+          return 0
+        })
+        .map((theme) => {
+          return {
+            title: this.translateService.instant(theme.label),
+            value: theme.value,
+          }
+        })
+    )
+  }
+
+  constructor(private translateService: TranslateService) {}
+
+  handleItemSelection(item: AutocompleteItem) {
+    this.addTheme(item.value)
+  }
+
+  addTheme(theme: string) {
+    const duplicatedTheme = this.themes.find((t) => t === theme)
+    if (!duplicatedTheme) {
+      this.themes = [...this.themes, theme]
+      this.valueChange.emit(this.themes)
+    }
+  }
+
+  removeTheme(theme: string) {
+    console.log(this.themes)
+    this.themes = this.themes.filter((t) => t !== theme)
+    this.valueChange.emit(this.themes)
+  }
+
+  getTranslatedTheme(theme: string) {
+    const themeKey = this.availableThemes.find(
+      (avail) => avail.value === theme
+    )?.label
+    return themeKey ? this.translateService.instant(themeKey) : ''
+  }
+}

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.html

@@ -109,6 +109,12 @@
         (valueChange)="valueChange.emit($event)"
       ></gn-ui-form-field-keywords>
     </ng-container>
+    <ng-container *ngSwitchCase="'topics'">
+      <gn-ui-form-field-inspire-theme
+        [value]="valueAsInspireTheme"
+        (valueChange)="valueChange.emit($event)"
+      ></gn-ui-form-field-inspire-theme>
+    </ng-container>
     <ng-container *ngSwitchCase="'licenses'">
       <gn-ui-form-field-license
         [label]="config.labelKey! | translate"

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.ts

@@ -45,6 +45,7 @@ import { FormFieldConstraintsShortcutsComponent } from './form-field-constraints
 import { FormFieldConstraintsComponent } from './form-field-constraints/form-field-constraints.component'
 import { TextFieldModule } from '@angular/cdk/text-field'
 import { FormFieldSpatialToggleComponent } from './form-field-spatial-toggle/form-field-spatial-toggle.component'
+import { FormFieldInspireThemeComponent } from './form-field-inspire-field/form-field-inspire-theme.component'
 
 @Component({
   selector: 'gn-ui-form-field',
@@ -73,6 +74,7 @@ import { FormFieldSpatialToggleComponent } from './form-field-spatial-toggle/for
     FormFieldConstraintsComponent,
     FormFieldConstraintsShortcutsComponent,
     FormFieldSpatialToggleComponent,
+    FormFieldInspireThemeComponent,
     TextFieldModule,
   ],
 })
@@ -128,6 +130,9 @@ export class FormFieldComponent {
   get valueAsKeywords() {
     return this.value as Array<Keyword>
   }
+  get valueAsInspireTheme() {
+    return this.value as Array<string>
+  }
   get valueAsConstraints() {
     return this.value as Array<Constraint>
   }

package/src/libs/feature/editor/src/lib/components/record-form/form-field/index.ts

@@ -10,3 +10,4 @@ export * from './form-field-array/form-field-array.component'
 export * from './form-field-spatial-extent/form-field-spatial-extent.component'
 export * from './form-field.component'
 export * from './form-field-constraints-shortcuts/constraints.utils'
+export * from './form-field-inspire-field/form-field-inspire-theme.component'

package/src/libs/feature/editor/src/lib/fields.config.ts

@@ -4,7 +4,10 @@ import {
   EditorField,
   EditorSection,
 } from './models/editor-config.model'
-import { Keyword } from '../../../../../libs/common/domain/src/lib/model/record'
+import {
+  INSPIRE_theme,
+  Keyword,
+} from '../../../../../libs/common/domain/src/lib/model/record'
 
 /**
  * This file contains the configuration of the fields that will be displayed in the editor.
@@ -64,6 +67,11 @@ export const RECORD_KEYWORDS_FIELD: EditorField = {
   formFieldConfig: {},
 }
 
+export const RECORD_TOPICS_FIELD: EditorField = {
+  model: 'topics',
+  formFieldConfig: {},
+}
+
 export const RECORD_RESOURCE_CREATED_FIELD: EditorField = {
   model: 'resourceCreated',
   formFieldConfig: {
@@ -235,6 +243,13 @@ export const CLASSIFICATION_SECTION: EditorSection = {
   fields: [RECORD_KEYWORDS_FIELD],
 }
 
+export const INSPIRE_SECTION: EditorSection = {
+  labelKey: marker('editor.record.form.section.inspire.label'),
+  descriptionKey: marker('editor.record.form.section.inspire.description'),
+  hidden: false,
+  fields: [RECORD_TOPICS_FIELD],
+}
+
 export const USE_AND_ACCESS_CONDITIONS_SECTION: EditorSection = {
   labelKey: marker('editor.record.form.section.useAndAccessConditions.label'),
   hidden: false,
@@ -274,6 +289,7 @@ export const DEFAULT_CONFIGURATION: EditorConfig = {
       sections: [
         TITLE_SECTION,
         CLASSIFICATION_SECTION,
+        INSPIRE_SECTION,
         ABOUT_SECTION,
         GEOGRAPHICAL_COVERAGE_SECTION,
       ],
@@ -341,3 +357,71 @@ export const SPATIAL_SCOPES: Keyword[] = [
     type: 'theme',
   },
 ]
+
+/************************************************************
+ ***************           INSPIRE THEMES            **************
+ ************************************************************
+ */
+
+export const INSPIRE_THEMES: INSPIRE_theme[] = [
+  { value: 'biota', label: 'editor.record.form.inspire.biota' },
+  { value: 'boundaries', label: 'editor.record.form.inspire.boundaries' },
+  {
+    value: 'climatologyMeteorologyAtmosphere',
+    label: 'editor.record.form.inspire.climatology',
+  },
+  { value: 'economy', label: 'editor.record.form.inspire.economy' },
+  { value: 'elevation', label: 'editor.record.form.inspire.elevation' },
+  { value: 'environment', label: 'editor.record.form.inspire.environnement' },
+  { value: 'farming', label: 'editor.record.form.inspire.farming' },
+  {
+    value: 'geoscientific information',
+    label: 'editor.record.form.inspire.geoscientific',
+  },
+  { value: 'health', label: 'editor.record.form.inspire.health' },
+  {
+    value: 'imageryBaseMapsEarthCover',
+    label: 'editor.record.form.inspire.imagery',
+  },
+  {
+    value: 'intelligenceMilitary',
+    label: 'editor.record.form.inspire.intelligence',
+  },
+  { value: 'Location', label: 'editor.record.form.inspire.location' },
+  { value: 'Oceans', label: 'editor.record.form.inspire.oceans' },
+  {
+    value: 'planningCadastre',
+    label: 'editor.record.form.inspire.planning',
+  },
+  { value: 'Society', label: 'editor.record.form.inspire.society' },
+  { value: 'Structure', label: 'editor.record.form.inspire.structure' },
+  {
+    value: 'Transportation',
+    label: 'editor.record.form.inspire.transportation',
+  },
+  {
+    value: 'utilitiesCommunication',
+    label: 'editor.record.form.inspire.utilities',
+  },
+  { value: 'inlandWaters', label: 'editor.record.form.inspire.waters' },
+]
+
+marker('editor.record.form.inspire.biota')
+marker('editor.record.form.inspire.boundaries')
+marker('editor.record.form.inspire.climatology')
+marker('editor.record.form.inspire.economy')
+marker('editor.record.form.inspire.elevation')
+marker('editor.record.form.inspire.environnement')
+marker('editor.record.form.inspire.farming')
+marker('editor.record.form.inspire.geoscientific')
+marker('editor.record.form.inspire.health')
+marker('editor.record.form.inspire.imagery')
+marker('editor.record.form.inspire.intelligence')
+marker('editor.record.form.inspire.location')
+marker('editor.record.form.inspire.oceans')
+marker('editor.record.form.inspire.planning')
+marker('editor.record.form.inspire.society')
+marker('editor.record.form.inspire.structure')
+marker('editor.record.form.inspire.transportation')
+marker('editor.record.form.inspire.utilities')
+marker('editor.record.form.inspire.waters')

package/src/libs/feature/router/src/lib/default/state/query-params.utils.ts

@@ -14,7 +14,10 @@ export function flattenQueryParams(
       Array.isArray(flattened[key]) &&
       (flattened[key] as string[]).length > 0
     ) {
-      flattened[key] = [(flattened[key] as string[]).join(',')]
+      const encoded = (flattened[key] as string[]).map((value) =>
+        typeof value === 'string' ? value.replace(/,/g, '%2C') : value
+      )
+      flattened[key] = [encoded.join(',')]
     } else if (isDateRange(flattened[key] as DateRange)) {
       const start = (flattened[key] as DateRange).start
       const end = (flattened[key] as DateRange).end
@@ -48,7 +51,7 @@ export function expandQueryParams(
           ...(end && { end: new Date(`${end}T00:00:00`) }),
         }
       } else {
-        expanded[key] = value.split(',')
+        expanded[key] = value.split(',').map((v) => v.replace(/%2C/g, ','))
       }
     }
   }

package/src/libs/feature/router/src/lib/default/state/router.facade.ts

@@ -63,7 +63,8 @@ export class RouterFacade {
   }
 
   goToOrganization(organizationName: string) {
-    const path = `${this.routerService.getOrganizationPageRoute()}/${organizationName}`
+    const safeOrgName = organizationName.replace(/\//g, '')
+    const path = `${this.routerService.getOrganizationPageRoute()}/${safeOrgName}`
     this.go({
       path,
       queryParamsHandling: '',

package/src/libs/ui/elements/src/lib/metadata-quality-item/metadata-quality-item.component.ts

@@ -6,16 +6,16 @@ import { matCheck, matWarningAmber } from '@ng-icons/material-icons/baseline'
 
 marker('record.metadata.quality.title.success')
 marker('record.metadata.quality.title.failed')
-marker('record.metadata.quality.description.success')
-marker('record.metadata.quality.description.failed')
-marker('record.metadata.quality.topic.success')
-marker('record.metadata.quality.topic.failed')
+marker('record.metadata.quality.abstract.success')
+marker('record.metadata.quality.abstract.failed')
+marker('record.metadata.quality.topics.success')
+marker('record.metadata.quality.topics.failed')
 marker('record.metadata.quality.keywords.success')
 marker('record.metadata.quality.keywords.failed')
 marker('record.metadata.quality.legalConstraints.success')
 marker('record.metadata.quality.legalConstraints.failed')
-marker('record.metadata.quality.contact.success')
-marker('record.metadata.quality.contact.failed')
+marker('record.metadata.quality.contacts.success')
+marker('record.metadata.quality.contacts.failed')
 marker('record.metadata.quality.updateFrequency.success')
 marker('record.metadata.quality.updateFrequency.failed')
 marker('record.metadata.quality.organisation.success')