geonetwork-ui 2.2.0-dev.6695ae4d → 2.2.0-dev.6f0f0ee9

package/libs/ui/inputs/src/lib/ui-inputs.module.d.ts

@@ -1,48 +1,48 @@
 import * as i0 from "@angular/core";
 import * as i1 from "./dropdown-selector/dropdown-selector.component";
 import * as i2 from "./autocomplete/autocomplete.component";
-import * as i3 from "./button/button.component";
-import * as i4 from "./text-input/text-input.component";
-import * as i5 from "./drag-and-drop-file-input/drag-and-drop-file-input.component";
-import * as i6 from "./text-area/text-area.component";
-import * as i7 from "./chips-input/chips-input.component";
-import * as i8 from "./navigation-button/navigation-button.component";
-import * as i9 from "./star-toggle/star-toggle.component";
-import * as i10 from "./dropdown-multiselect/dropdown-multiselect.component";
-import * as i11 from "./viewport-intersector/viewport-intersector.component";
-import * as i12 from "./form-field/form-field.component";
-import * as i13 from "./form-field/form-field-simple/form-field-simple.component";
-import * as i14 from "./form-field/form-field-array/form-field-array.component";
-import * as i15 from "./form-field/form-field-object/form-field-object.component";
-import * as i16 from "./form-field/form-field-rich/form-field-rich.component";
-import * as i17 from "./form-field/form-field-file/form-field-file.component";
-import * as i18 from "./form-field/form-field-spatial-extent/form-field-spatial-extent.component";
-import * as i19 from "./form-field/form-field-temporal-extent/form-field-temporal-extent.component";
-import * as i20 from "./check-toggle/check-toggle.component";
-import * as i21 from "./copy-text-button/copy-text-button.component";
-import * as i22 from "./checkbox/checkbox.component";
-import * as i23 from "./search-input/search-input.component";
-import * as i24 from "./date-range-picker/date-range-picker.component";
-import * as i25 from "@angular/common";
-import * as i26 from "@ngx-translate/core";
-import * as i27 from "ngx-dropzone";
-import * as i28 from "@angular/forms";
-import * as i29 from "ngx-chips";
-import * as i30 from "../../../../util/shared/src/lib/util-shared.module";
-import * as i31 from "@angular/material/autocomplete";
-import * as i32 from "@angular/material/icon";
-import * as i33 from "../../../widgets/src/lib/ui-widgets.module";
-import * as i34 from "@angular/cdk/overlay";
-import * as i35 from "@angular/material/checkbox";
-import * as i36 from "@angular/material/tooltip";
-import * as i37 from "@angular/material/form-field";
-import * as i38 from "@angular/material/input";
-import * as i39 from "@angular/material/datepicker";
-import * as i40 from "@angular/material/core";
-import * as i41 from "./editable-label/editable-label.directive";
+import * as i3 from "./text-input/text-input.component";
+import * as i4 from "./drag-and-drop-file-input/drag-and-drop-file-input.component";
+import * as i5 from "./chips-input/chips-input.component";
+import * as i6 from "./navigation-button/navigation-button.component";
+import * as i7 from "./star-toggle/star-toggle.component";
+import * as i8 from "./dropdown-multiselect/dropdown-multiselect.component";
+import * as i9 from "./viewport-intersector/viewport-intersector.component";
+import * as i10 from "./form-field/form-field.component";
+import * as i11 from "./form-field/form-field-simple/form-field-simple.component";
+import * as i12 from "./form-field/form-field-array/form-field-array.component";
+import * as i13 from "./form-field/form-field-object/form-field-object.component";
+import * as i14 from "./form-field/form-field-rich/form-field-rich.component";
+import * as i15 from "./form-field/form-field-file/form-field-file.component";
+import * as i16 from "./form-field/form-field-spatial-extent/form-field-spatial-extent.component";
+import * as i17 from "./form-field/form-field-temporal-extent/form-field-temporal-extent.component";
+import * as i18 from "./check-toggle/check-toggle.component";
+import * as i19 from "./copy-text-button/copy-text-button.component";
+import * as i20 from "./checkbox/checkbox.component";
+import * as i21 from "./search-input/search-input.component";
+import * as i22 from "./date-range-picker/date-range-picker.component";
+import * as i23 from "@angular/common";
+import * as i24 from "@ngx-translate/core";
+import * as i25 from "ngx-dropzone";
+import * as i26 from "@angular/forms";
+import * as i27 from "ngx-chips";
+import * as i28 from "../../../../util/shared/src/lib/util-shared.module";
+import * as i29 from "@angular/material/autocomplete";
+import * as i30 from "@angular/material/icon";
+import * as i31 from "../../../widgets/src/lib/ui-widgets.module";
+import * as i32 from "@angular/cdk/overlay";
+import * as i33 from "@angular/material/checkbox";
+import * as i34 from "@angular/material/tooltip";
+import * as i35 from "@angular/material/form-field";
+import * as i36 from "@angular/material/input";
+import * as i37 from "@angular/material/datepicker";
+import * as i38 from "@angular/material/core";
+import * as i39 from "./editable-label/editable-label.directive";
+import * as i40 from "./text-area/text-area.component";
+import * as i41 from "./button/button.component";
 export declare class UiInputsModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<UiInputsModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<UiInputsModule, [typeof i1.DropdownSelectorComponent, typeof i2.AutocompleteComponent, typeof i3.ButtonComponent, typeof i4.TextInputComponent, typeof i5.DragAndDropFileInputComponent, typeof i6.TextAreaComponent, typeof i7.ChipsInputComponent, typeof i8.NavigationButtonComponent, typeof i9.StarToggleComponent, typeof i10.DropdownMultiselectComponent, typeof i11.ViewportIntersectorComponent, typeof i12.FormFieldComponent, typeof i13.FormFieldSimpleComponent, typeof i14.FormFieldArrayComponent, typeof i15.FormFieldObjectComponent, typeof i16.FormFieldRichComponent, typeof i17.FormFieldFileComponent, typeof i18.FormFieldSpatialExtentComponent, typeof i19.FormFieldTemporalExtentComponent, typeof i20.CheckToggleComponent, typeof i21.CopyTextButtonComponent, typeof i22.CheckboxComponent, typeof i23.SearchInputComponent, typeof i24.DateRangePickerComponent], [typeof i25.CommonModule, typeof i26.TranslateModule, typeof i27.NgxDropzoneModule, typeof i28.FormsModule, typeof i28.ReactiveFormsModule, typeof i29.TagInputModule, typeof i30.UtilSharedModule, typeof i31.MatAutocompleteModule, typeof i32.MatIconModule, typeof i33.UiWidgetsModule, typeof i34.OverlayModule, typeof i35.MatCheckboxModule, typeof i36.MatTooltipModule, typeof i37.MatFormFieldModule, typeof i38.MatInputModule, typeof i39.MatDatepickerModule, typeof i40.MatNativeDateModule, typeof i41.EditableLabelDirective], [typeof i1.DropdownSelectorComponent, typeof i2.AutocompleteComponent, typeof i3.ButtonComponent, typeof i4.TextInputComponent, typeof i5.DragAndDropFileInputComponent, typeof i6.TextAreaComponent, typeof i7.ChipsInputComponent, typeof i8.NavigationButtonComponent, typeof i9.StarToggleComponent, typeof i10.DropdownMultiselectComponent, typeof i11.ViewportIntersectorComponent, typeof i12.FormFieldComponent, typeof i20.CheckToggleComponent, typeof i21.CopyTextButtonComponent, typeof i22.CheckboxComponent, typeof i23.SearchInputComponent, typeof i24.DateRangePickerComponent, typeof i41.EditableLabelDirective]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<UiInputsModule, [typeof i1.DropdownSelectorComponent, typeof i2.AutocompleteComponent, typeof i3.TextInputComponent, typeof i4.DragAndDropFileInputComponent, typeof i5.ChipsInputComponent, typeof i6.NavigationButtonComponent, typeof i7.StarToggleComponent, typeof i8.DropdownMultiselectComponent, typeof i9.ViewportIntersectorComponent, typeof i10.FormFieldComponent, typeof i11.FormFieldSimpleComponent, typeof i12.FormFieldArrayComponent, typeof i13.FormFieldObjectComponent, typeof i14.FormFieldRichComponent, typeof i15.FormFieldFileComponent, typeof i16.FormFieldSpatialExtentComponent, typeof i17.FormFieldTemporalExtentComponent, typeof i18.CheckToggleComponent, typeof i19.CopyTextButtonComponent, typeof i20.CheckboxComponent, typeof i21.SearchInputComponent, typeof i22.DateRangePickerComponent], [typeof i23.CommonModule, typeof i24.TranslateModule, typeof i25.NgxDropzoneModule, typeof i26.FormsModule, typeof i26.ReactiveFormsModule, typeof i27.TagInputModule, typeof i28.UtilSharedModule, typeof i29.MatAutocompleteModule, typeof i30.MatIconModule, typeof i31.UiWidgetsModule, typeof i32.OverlayModule, typeof i33.MatCheckboxModule, typeof i34.MatTooltipModule, typeof i35.MatFormFieldModule, typeof i36.MatInputModule, typeof i37.MatDatepickerModule, typeof i38.MatNativeDateModule, typeof i39.EditableLabelDirective, typeof i40.TextAreaComponent, typeof i41.ButtonComponent], [typeof i1.DropdownSelectorComponent, typeof i2.AutocompleteComponent, typeof i41.ButtonComponent, typeof i3.TextInputComponent, typeof i4.DragAndDropFileInputComponent, typeof i40.TextAreaComponent, typeof i5.ChipsInputComponent, typeof i6.NavigationButtonComponent, typeof i7.StarToggleComponent, typeof i8.DropdownMultiselectComponent, typeof i9.ViewportIntersectorComponent, typeof i10.FormFieldComponent, typeof i18.CheckToggleComponent, typeof i19.CopyTextButtonComponent, typeof i20.CheckboxComponent, typeof i21.SearchInputComponent, typeof i22.DateRangePickerComponent, typeof i39.EditableLabelDirective]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<UiInputsModule>;
 }
 //# sourceMappingURL=ui-inputs.module.d.ts.map

package/libs/ui/layout/src/lib/interactive-table/interactive-table-column/interactive-table-column.component.d.ts

@@ -6,7 +6,7 @@ export declare class InteractiveTableColumnComponent {
     grow: boolean;
     sortable: boolean;
     activeSort: 'asc' | 'desc' | null;
-    sortChange: EventEmitter<"desc" | "asc">;
+    sortChange: EventEmitter<"asc" | "desc">;
     handleSortChange(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<InteractiveTableColumnComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<InteractiveTableColumnComponent, "gn-ui-interactive-table-column", never, { "grow": { "alias": "grow"; "required": false; }; "sortable": { "alias": "sortable"; "required": false; }; "activeSort": { "alias": "activeSort"; "required": false; }; }, { "sortChange": "sortChange"; }, ["header", "cell"], never, true, never>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geonetwork-ui",
-  "version": "2.2.0-dev.6695ae4d",
+  "version": "2.2.0-dev.6f0f0ee9",
   "engines": {
     "node": ">=14.17.0"
   },

package/src/libs/api/metadata-converter/src/lib/fixtures/generic.records.ts

@@ -57,8 +57,61 @@ Cette section contient des *caractères internationaux* (ainsi que des "caractè
       url: new URL('http://my-org.net/two.png'),
     },
   ],
-  keywords: ['international', 'test', '_another_keyword_'],
-  themes: ['testData', 'exampleData'],
+  keywords: [
+    {
+      thesaurus: {
+        id: 'geonetwork.thesaurus.local',
+        name: 'geonetwork.thesaurus.local',
+      },
+      type: 'other',
+      label: 'international',
+    },
+    {
+      thesaurus: {
+        id: 'geonetwork.thesaurus.local',
+        name: 'geonetwork.thesaurus.local',
+      },
+      type: 'other',
+      label: 'test',
+    },
+    {
+      thesaurus: {
+        id: 'geonetwork.thesaurus.local',
+        name: 'geonetwork.thesaurus.local',
+      },
+      type: 'other',
+      label: '_another_keyword_',
+    },
+    {
+      thesaurus: {
+        id: 'geonetwork.thesaurus.theme',
+        name: 'geonetwork.thesaurus.theme',
+      },
+      type: 'theme',
+      label: 'test theme',
+    },
+    {
+      thesaurus: {
+        id: 'geonetwork.thesaurus.place',
+        name: 'geonetwork.thesaurus.place',
+      },
+      type: 'place',
+      label: 'test place',
+    },
+    {
+      type: 'theme',
+      label: 'themeNoThesaurus',
+    },
+    {
+      type: 'theme',
+      label: 'themeNoThesaurus 2',
+    },
+    {
+      type: 'temporal',
+      label: 'temporalNoThesaurus',
+    },
+  ],
+  topics: ['agriculture'],
   spatialRepresentation: 'grid',
   distributions: [
     {

package/src/libs/api/metadata-converter/src/lib/fixtures/geo2france.records.ts

@@ -38,13 +38,57 @@ Malgré l'attention portée à la création de ces données, il est rappelé que
     },
   ],
   keywords: [
-    'planification',
-    'PLU',
-    "Plan local d'urbanisme",
-    'données ouvertes',
-    'Avrigny*60036',
+    {
+      thesaurus: {
+        name: 'GEMET - INSPIRE themes, version 1.0',
+        id: 'geonetwork.thesaurus.external.theme.inspire-theme',
+        url: new URL(
+          'http://geo.compiegnois.fr/geonetwork/srv/eng/thesaurus.download?ref=external.theme.inspire-theme'
+        ),
+      },
+      type: 'theme',
+      label: 'Usage des sols',
+    },
+    {
+      thesaurus: {
+        name: 'GEMET - Concepts, version 2.4',
+        id: 'geonetwork.thesaurus.external.theme.gemet',
+        url: new URL(
+          'http://geo.compiegnois.fr/geonetwork/srv/eng/thesaurus.download?ref=external.theme.gemet'
+        ),
+      },
+      type: 'theme',
+      label: "document d'urbanisme",
+    },
+    {
+      type: 'other',
+      label: 'planification',
+    },
+    {
+      type: 'other',
+      label: 'PLU',
+    },
+    {
+      type: 'other',
+      label: "Plan local d'urbanisme",
+    },
+    {
+      type: 'other',
+      label: 'données ouvertes',
+    },
+    {
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.place.GeoCompiegnois',
+        name: 'Collectivités du Pays Compiégnois',
+        url: new URL(
+          'http://geo.compiegnois.fr/geonetwork/srv/eng/thesaurus.download?ref=external.place.GeoCompiegnois'
+        ),
+      },
+      type: 'place',
+      label: 'Avrigny*60036',
+    },
   ],
-  themes: ['Usage des sols', "document d'urbanisme"],
+  topics: ['planningCadastre'],
   spatialRepresentation: 'vector',
   distributions: [
     {

package/src/libs/api/metadata-converter/src/lib/fixtures/geocat-ch.records.ts

@@ -33,25 +33,185 @@ export const GEOCAT_CH_DATASET_RECORD: DatasetRecord = {
   title: 'Alpenkonvention',
   abstract: `Perimeter der Alpenkonvention in der Schweiz. Die Alpenkonvention ist ein völkerrechtlicher Vertrag zwischen den acht Alpenländern Deutschland, Frankreich, Italien, Liechtenstein, Monaco, Österreich, Schweiz, Slowenien sowie der Europäischen Union. Das Ziel des Übereinkommens ist der Schutz der Alpen durch eine sektorübergreifende, ganzheitliche und nachhaltige Politik.`,
   overviews: [],
-  themes: [
-    'Aufbewahrungs- und Archivierungsplanung AAP - Bund',
-    'Geobasisdaten',
-    'e-geo.ch',
-    'opendata.swiss',
-    'Nachhaltige Entwicklung',
-    'Raumplanung',
-    'Bergschutz',
-    'Bodenschutz',
-    'Umweltpolitik',
-    'Umweltpolitik',
-    'Verkehr',
-    'Verkehr',
-    'Verkehr',
-    'Umweltüberwachung',
-    'Verwaltungseinheiten',
-    'BGDI Bundesgeodaten-Infrastruktur',
+  topics: ['planningCadastre', 'planningCadastre_Planning'],
+  keywords: [
+    {
+      thesaurus: {
+        name: 'geocat.ch',
+        id: 'geonetwork.thesaurus.local.theme.geocat.ch',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+      label: 'Aufbewahrungs- und Archivierungsplanung AAP - Bund',
+    },
+    {
+      thesaurus: {
+        name: 'geocat.ch',
+        id: 'geonetwork.thesaurus.local.theme.geocat.ch',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+      label: 'Geobasisdaten',
+    },
+    {
+      thesaurus: {
+        name: 'geocat.ch',
+        id: 'geonetwork.thesaurus.local.theme.geocat.ch',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+      label: 'e-geo.ch',
+    },
+    {
+      label: 'opendata.swiss',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.local.theme.geocat.ch',
+        name: 'geocat.ch',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'Nachhaltige Entwicklung',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.gemet',
+        name: 'GEMET',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'Raumplanung',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.gemet',
+        name: 'GEMET',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'Bergschutz',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.gemet',
+        name: 'GEMET',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'Bodenschutz',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.gemet',
+        name: 'GEMET',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'Umweltpolitik',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.gemet',
+        name: 'GEMET',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'Umweltpolitik',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.gemet',
+        name: 'GEMET',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'Verkehr',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.gemet',
+        name: 'GEMET',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'Verkehr',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.gemet',
+        name: 'GEMET',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'Verkehr',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.gemet',
+        name: 'GEMET',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'Umweltüberwachung',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.inspire-theme',
+        name: 'GEMET - INSPIRE themes, version 1.0',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'Verwaltungseinheiten',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.inspire-theme',
+        name: 'GEMET - INSPIRE themes, version 1.0',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
+    {
+      label: 'BGDI Bundesgeodaten-Infrastruktur',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.local.theme.geocat.ch',
+        name: 'geocat.ch',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'theme',
+    },
   ],
-  keywords: [],
   spatialRepresentation: 'vector',
   distributions: [
     {
@@ -210,8 +370,31 @@ export const GEOCAT_CH_SERVICE_RECORD: ServiceRecord = {
       description: 'Vorschaubild',
     },
   ],
-  themes: [],
-  keywords: ['Verkehr', 'opendata.swiss'],
+  topics: [],
+  keywords: [
+    {
+      label: 'Verkehr',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.external.theme.gemet',
+        name: 'GEMET',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'other',
+    },
+    {
+      label: 'opendata.swiss',
+      thesaurus: {
+        id: 'geonetwork.thesaurus.local.theme.geocat.ch',
+        name: 'geocat.ch',
+        url: new URL(
+          'https://geocat-dev.dev.bgdi.ch/geonetwork/srv/api/registries/vocabularies/local.theme.geocat.ch'
+        ),
+      },
+      type: 'other',
+    },
+  ],
   onlineResources: [
     {
       type: 'link',

package/src/libs/api/metadata-converter/src/lib/gn4/atomic-operations.ts

@@ -3,6 +3,8 @@ import {
   Organization,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { getRoleFromRoleCode } from '../iso19139/codelists/role.mapper'
+import { Thesaurus } from './types'
+import { getKeywordTypeFromKeywordTypeCode } from '../iso19139/codelists/keyword.mapper'
 
 export type SourceWithUnknownProps = { [key: string]: unknown }
 
@@ -98,3 +100,30 @@ export const mapContact = (
     ...(phone && { phone }),
   }
 }
+
+export const mapKeywords = (thesauri: Thesaurus[], language: string) => {
+  const keywords = []
+  for (const thesaurusId in thesauri) {
+    const rawThesaurus = thesauri[thesaurusId]
+    let thesaurus = null
+    if (rawThesaurus.id) {
+      const thesaurusSource: SourceWithUnknownProps = { ...rawThesaurus }
+      const url = getAsUrl(selectField(thesaurusSource, 'link'))
+      const name = selectField(thesaurusSource, 'title')
+      thesaurus = {
+        id: rawThesaurus.id,
+        ...(name && { name }),
+        ...(url && { url }),
+      }
+    }
+    for (const keyword of rawThesaurus.keywords) {
+      keywords.push({
+        label: selectTranslatedValue<string>(keyword, language),
+        type: getKeywordTypeFromKeywordTypeCode(rawThesaurus.theme),
+        ...(thesaurus && { thesaurus }),
+      })
+    }
+  }
+
+  return keywords
+}

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

@@ -4,6 +4,7 @@ import {
   getAsUrl,
   getFirstValue,
   mapContact,
+  mapKeywords,
   selectFallback,
   selectFallbackFields,
   selectField,
@@ -28,6 +29,7 @@ import {
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { matchProtocol } from '../common/distribution.mapper'
 import { LangService } from '../../../../../../libs/util/i18n/src'
+import { Thesaurus } from './types'
 
 type ESResponseSource = SourceWithUnknownProps
 
@@ -92,8 +94,8 @@ export class Gn4FieldMapper {
     },
     cl_topic: (output, source) => ({
       ...output,
-      themes: [
-        ...(output.themes || []),
+      topics: [
+        ...(output.topics || []),
         ...getAsArray(
           selectField<SourceWithUnknownProps[]>(source, 'cl_topic')
         ).map((topic) => selectTranslatedValue<string>(topic, this.lang3)),
@@ -171,16 +173,17 @@ export class Gn4FieldMapper {
         output
       )
     },
-    tag: (output, source) => ({
+    allKeywords: (output, source) => ({
       ...output,
-      keywords: getAsArray(
-        selectField<SourceWithUnknownProps[]>(source, 'tag')
-      ).map((tag) => selectTranslatedValue<string>(tag, this.lang3)),
+      keywords: mapKeywords(
+        selectField<Thesaurus[]>(source, 'allKeywords'),
+        this.lang3
+      ),
     }),
     inspireTheme: (output, source) => ({
       ...output,
-      themes: [
-        ...(output.themes || []),
+      topics: [
+        ...(output.topics || []),
         ...getAsArray(selectField(source, 'inspireTheme_syn')),
       ],
     }),

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

@@ -32,7 +32,7 @@ export class Gn4MetadataMapper extends MetadataBaseMapper<Gn4Record> {
       contacts: [],
       contactsForResource: [],
       keywords: [],
-      themes: [],
+      topics: [],
       spatialExtents: [],
       temporalExtents: [],
       overviews: [],

package/src/libs/api/metadata-converter/src/lib/gn4/types/metadata.model.ts

@@ -56,15 +56,13 @@ interface SpecificationConformance {
   pass: BooleanString
 }
 
-type Keyword = MultilingualField
-type Keywords = Keyword[]
 type ThesaurusName = string
-interface Thesaurus {
+export interface Thesaurus {
   id?: string
   title?: string
   theme?: string
   link?: string
-  keywords: Keywords
+  keywords: MultilingualField[]
 }
 
 export interface Link {
@@ -175,7 +173,7 @@ export type MetadataObject = Partial<{
   specificationConformance: MaybeArray<SpecificationConformance>
   standardNameObject: MultilingualField
   standardVersionObject: MultilingualField
-  tag: Keywords
+  tag: MultilingualField[]
   tagNumber: string
   userSavedCount: string
   userinfo: string

package/src/libs/api/metadata-converter/src/lib/iso19139/codelists/keyword.mapper.ts

@@ -0,0 +1,16 @@
+import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/record'
+
+export function getKeywordTypeFromKeywordTypeCode(
+  typeCode: string
+): KeywordType {
+  if (!typeCode) return 'other'
+  switch (typeCode) {
+    case 'theme':
+    case 'place':
+    case 'temporal':
+    case 'other':
+      return typeCode
+    default:
+      return 'other'
+  }
+}