geonetwork-ui 2.2.0-dev.95b40cd8 → 2.2.0-dev.9d7dfa2e

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

@@ -36,6 +36,7 @@ export const GENERIC_DATASET_RECORD: DatasetRecord = {
   contactsForResource: [],
   status: 'ongoing',
   recordCreated: new Date('2022-02-01T15:12:00'),
+  recordPublished: new Date('2022-02-01T15:12:00'),
   recordUpdated: new Date('2022-02-01T15:12:00'),
   datasetCreated: new Date('2022-09-01T14:18:19'),
   datasetUpdated: new Date('2022-12-04T15:12:00'),
@@ -57,8 +58,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: [
     {
@@ -119,4 +173,5 @@ As such, **it is not very interesting at all.**`,
     updatedTimes: 3,
     per: 'month',
   },
+  languages: [],
 }

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

@@ -18,6 +18,7 @@ export const GEO2FRANCE_PLU_DATASET_RECORD: DatasetRecord = {
   ],
   contactsForResource: [],
   recordCreated: new Date('2022-04-15T14:18:19'),
+  recordPublished: new Date('2022-04-15T14:18:19'),
   recordUpdated: new Date('2022-04-15T14:18:19'),
   datasetUpdated: new Date('2022-03-29'),
   title:
@@ -38,13 +39,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: [
     {
@@ -74,4 +119,5 @@ Ce lot de données produit en 2019, a été numérisé à partir du PCI Vecteur
   temporalExtents: [],
   status: 'completed',
   updateFrequency: 'unknown',
+  languages: [],
 }

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

@@ -27,31 +27,192 @@ export const GEOCAT_CH_DATASET_RECORD: DatasetRecord = {
   ],
   contactsForResource: [],
   recordCreated: new Date('2022-02-22T19:40:06'),
+  recordPublished: new Date('2022-02-22T19:40:06'),
   recordUpdated: new Date('2022-02-22T19:40:06'),
   datasetCreated: new Date('1999-01-01T00:00:00'),
   datasetUpdated: new Date('2009-01-01'),
   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: [
     {
@@ -167,6 +328,7 @@ Die Quelle ist zu bezeichnen: „Quelle: Stadt Zürich“.`,
   temporalExtents: [],
   status: 'completed',
   updateFrequency: 'asNeeded',
+  languages: [],
 }
 
 export const GEOCAT_CH_SERVICE_RECORD: ServiceRecord = {
@@ -199,6 +361,7 @@ export const GEOCAT_CH_SERVICE_RECORD: ServiceRecord = {
     },
   ],
   recordCreated: new Date('2022-03-07T01:15:51+01:00'),
+  recordPublished: new Date('2022-03-07T01:15:51+01:00'),
   recordUpdated: new Date('2022-03-07T01:15:51+01:00'),
   title: 'Verkehrsregelungsanlagen (WMS)',
   abstract: `Diese Karte beinhaltet die Verkehrsregelungsanlagen des Kantons St.Gallen.`,
@@ -210,8 +373,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',
@@ -237,4 +423,5 @@ export const GEOCAT_CH_SERVICE_RECORD: ServiceRecord = {
   legalConstraints: [],
   securityConstraints: [],
   otherConstraints: [],
+  languages: [],
 }

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,
@@ -27,7 +28,8 @@ import {
   OnlineLinkResource,
 } 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'
+import { LANG_3_TO_2_MAPPER, LangService } from '../../../../../../libs/util/i18n/src'
 
 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)),
@@ -130,6 +132,22 @@ export class Gn4FieldMapper {
       ...output,
       recordUpdated: toDate(selectField<string>(source, 'changeDate')),
     }),
+    publicationDateForResource: (output, source) => ({
+      ...output,
+      recordPublished: toDate(
+        selectField<string>(source, 'publicationDateForResource')
+      ),
+    }),
+    resourceLanguage: (output, source) => {
+      const langList = getAsArray(
+        selectField<string>(source, 'resourceLanguage')
+      )
+      const languages = langList.map((lang) => LANG_3_TO_2_MAPPER[lang])
+      return {
+        ...output,
+        languages,
+      }
+    },
     link: (output, source) => {
       const rawLinks = getAsArray(
         selectField<SourceWithUnknownProps[]>(source, 'link')
@@ -171,16 +189,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')),
       ],
     }),
@@ -289,9 +308,9 @@ export class Gn4FieldMapper {
         ],
       }
     },
-    resourceTemporalDateRange: (output, source) => {
+    resourceTemporalExtentDateRange: (output, source) => {
       const ranges = getAsArray(
-        selectField(source, 'resourceTemporalDateRange')
+        selectField(source, 'resourceTemporalExtentDateRange')
       )
       return {
         ...output,

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

@@ -24,6 +24,7 @@ export class Gn4MetadataMapper extends MetadataBaseMapper<Gn4Record> {
       status: null,
       lineage: null,
       recordUpdated: null,
+      recordPublished: null,
       ownerOrganization: null,
       licenses: [],
       legalConstraints: [],
@@ -32,10 +33,11 @@ export class Gn4MetadataMapper extends MetadataBaseMapper<Gn4Record> {
       contacts: [],
       contactsForResource: [],
       keywords: [],
-      themes: [],
+      topics: [],
       spatialExtents: [],
       temporalExtents: [],
       overviews: [],
+      languages: [],
     }
     const record: CatalogRecord = Object.keys(_source).reduce(
       (prev, fieldName) =>

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 {
@@ -152,6 +150,7 @@ export type MetadataObject = Partial<{
   pointOfContactOrg: string
   pointOfContactOrgForResource: string
   popularity: number
+  publicationDateForResource: string
   rating: string
   record: string
   recordGroup: string
@@ -175,7 +174,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'
+  }
+}