geonetwork-ui 2.4.0-dev.344a92f2 → 2.4.0-dev.3b6b95eb

package/src/libs/api/metadata-converter/src/lib/fixtures/vlaanderen.dcat-ap.records.ts

@@ -0,0 +1,73 @@
+import { DatasetRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+
+export const VLAANDEREN_DATASET_RECORD: DatasetRecord = {
+  uniqueIdentifier: 'f3bd3e9b-cec1-38de-bb16-d063edace486',
+  title: 'Fish damage at pump stations',
+  abstract: `Fish damage at pump stations is a sampling event dataset published by the Research Institute for Nature and Forest (INBO). It contains 7319 occurrences, recorded during 120 events as well as lengths and weights of the fish that were recorded. Issues with the dataset can be reported at https://github.com/inbo/data-publication/issues
+                    We have released this dataset to the public domain under a Creative Commons Zero waiver. We would appreciate it if you follow the INBO norms for data use (https://www.inbo.be/en/norms-data-use) when using the data. If you have any questions regarding this dataset, don't hesitate to contact us via the contact information provided in the metadata or via opendata@inbo.be.`,
+  contacts: [],
+  contactsForResource: [
+    {
+      firstName: 'David',
+      lastName: 'Buysse',
+      email: 'david.buysse@inbo.be',
+      role: 'point_of_contact',
+    },
+  ],
+  ownerOrganization: {
+    name: 'Research Institute for Nature and Forest (INBO)',
+  },
+  landingPage: new URL('https://ipt.inbo.be/resource?r=visschade-occurrences'),
+  onlineResources: [
+    {
+      description: 'Darwin Core Archive',
+      name: 'Darwin Core Archive of Fish damage at pump stations',
+      type: 'download',
+      url: new URL('https://ipt.inbo.be/archive.do?r=visschade-occurrences'),
+    },
+  ],
+  keywords: [
+    { label: 'fish', type: 'theme' },
+    { label: 'pumping station', type: 'theme' },
+    { label: 'migration', type: 'theme' },
+    { label: 'Samplingevent', type: 'theme' },
+    { label: 'mortality', type: 'theme' },
+  ],
+  kind: 'dataset',
+  languages: [],
+  legalConstraints: [],
+  licenses: [
+    {
+      text: 'Creative Commons CC-0',
+      url: new URL(
+        'https://creativecommons.org/publicdomain/zero/1.0/legalcode'
+      ),
+    },
+  ],
+  otherConstraints: [],
+  overviews: [],
+  securityConstraints: [],
+  spatialExtents: [
+    {
+      geometry: {
+        type: 'Polygon',
+        coordinates: [
+          [
+            [3.768, 51.072],
+            [3.768, 51.31],
+            [4.202, 51.31],
+            [4.202, 51.072],
+            [3.768, 51.072],
+          ],
+        ],
+      },
+    },
+  ],
+  temporalExtents: [],
+  topics: ['biodiversity'],
+  lineage: '',
+  recordUpdated: new Date('2024-09-19T01:15:09.732Z'),
+  resourceUpdated: new Date('2021-04-14T11:15+02:00'),
+  status: 'completed',
+  updateFrequency: 'unknown',
+}

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

@@ -22,7 +22,6 @@ import {
   writeLandingPage,
   writeLineage,
   writeOnlineResources,
-  writeOwnerOrganization,
   writeRecordCreated,
   writeRecordPublished,
   writeRecordUpdated,
@@ -60,7 +59,7 @@ export class Iso191153Converter extends Iso19139Converter {
     this.writers['resourcePublished'] = writeResourcePublished
     this.writers['contacts'] = writeContacts
     this.writers['contactsForResource'] = writeContactsForResource
-    this.writers['ownerOrganization'] = writeOwnerOrganization
+    this.writers['ownerOrganization'] = () => undefined // fixme: find a way to store this value properly
     this.writers['landingPage'] = writeLandingPage
     this.writers['lineage'] = writeLineage
     this.writers['onlineResources'] = writeOnlineResources

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

@@ -17,7 +17,6 @@ import {
   findNestedElement,
   findNestedElements,
   readAttribute,
-  removeAllChildren,
   removeChildren,
   removeChildrenByName,
   setTextContent,
@@ -125,7 +124,7 @@ export function writeRecordUpdated(record: CatalogRecord, rootEl: XmlElement) {
 
 export function writeRecordCreated(record: CatalogRecord, rootEl: XmlElement) {
   removeRecordDate('creation')(rootEl)
-  if (!('recordCreated' in record)) return
+  if (!record.recordCreated) return
   appendRecordDate(record.recordCreated, 'creation')(rootEl)
 }
 
@@ -134,14 +133,14 @@ export function writeRecordPublished(
   rootEl: XmlElement
 ) {
   removeRecordDate('publication')(rootEl)
-  if (!('recordPublished' in record)) return
+  if (!record.recordPublished) return
   appendRecordDate(record.recordPublished, 'publication')(rootEl)
 }
 
 function removeResourceDate(type: 'revision' | 'creation' | 'publication') {
   return pipe(
-    findIdentification(),
-    findNestedElement('mri:citation', 'cit:CI_Citation'),
+    findOrCreateIdentification(),
+    findNestedChildOrCreate('mri:citation', 'cit:CI_Citation'),
     removeChildren(
       pipe(
         findChildrenElement('cit:date', false),
@@ -191,7 +190,7 @@ export function writeResourceUpdated(
   rootEl: XmlElement
 ) {
   removeResourceDate('revision')(rootEl)
-  if (!('resourceUpdated' in record)) return
+  if (!record.resourceUpdated) return
   appendResourceDate(record.resourceUpdated, 'revision')(rootEl)
 }
 
@@ -200,7 +199,7 @@ export function writeResourceCreated(
   rootEl: XmlElement
 ) {
   removeResourceDate('creation')(rootEl)
-  if (!('resourceCreated' in record)) return
+  if (!record.resourceCreated) return
   appendResourceDate(record.resourceCreated, 'creation')(rootEl)
 }
 
@@ -209,37 +208,10 @@ export function writeResourcePublished(
   rootEl: XmlElement
 ) {
   removeResourceDate('publication')(rootEl)
-  if (!('resourcePublished' in record)) return
+  if (!record.resourcePublished) return
   appendResourceDate(record.resourcePublished, 'publication')(rootEl)
 }
 
-export function writeOwnerOrganization(
-  record: CatalogRecord,
-  rootEl: XmlElement
-) {
-  // if no contact matches the owner org, create an empty one
-  const ownerContact: Individual = record.contacts.find(
-    (contact) => contact.organization.name === record.ownerOrganization.name
-  )
-  pipe(
-    findChildOrCreate('mdb:contact'),
-    removeAllChildren(),
-    appendResponsibleParty(
-      ownerContact
-        ? {
-            ...ownerContact,
-            // owner responsible party is always point of contact
-            role: 'point_of_contact',
-          }
-        : {
-            organization: record.ownerOrganization,
-            email: 'missing@missing.com',
-            role: 'point_of_contact',
-          }
-    )
-  )(rootEl)
-}
-
 export function appendResponsibleParty(contact: Individual) {
   const fullName = namePartsToFull(contact.firstName, contact.lastName)
 

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

@@ -53,7 +53,6 @@ import {
   writeLineage,
   writeOnlineResources,
   writeOtherConstraints,
-  writeOwnerOrganization,
   writeRecordUpdated,
   writeResourceCreated,
   writeResourcePublished,
@@ -113,7 +112,7 @@ export class Iso19139Converter extends BaseConverter<string> {
   > = {
     uniqueIdentifier: writeUniqueIdentifier,
     kind: writeKind,
-    ownerOrganization: writeOwnerOrganization,
+    ownerOrganization: () => undefined, // fixme: find a way to store this value properly
     recordUpdated: writeRecordUpdated,
     recordCreated: () => undefined, // not supported in ISO19139
     recordPublished: () => undefined, // not supported in ISO19139

package/src/libs/api/metadata-converter/src/lib/iso19139/write-parts.ts

@@ -19,9 +19,7 @@ import format from 'date-fns/format'
 import { Geometry } from 'geojson'
 import {
   ChainableFunction,
-  fallback,
   filterArray,
-  getAtIndex,
   map,
   mapArray,
   noop,
@@ -33,10 +31,10 @@ import {
   appendChildren,
   createChild,
   createElement,
-  findChildElement,
   findChildOrCreate,
   findChildrenElement,
   findNestedChildOrCreate,
+  findNestedElement,
   findNestedElements,
   readAttribute,
   removeAllChildren,
@@ -84,11 +82,9 @@ export function writeAnchor(
 export function writeDateTime(
   date: Date
 ): ChainableFunction<XmlElement, XmlElement> {
-  return tap(
-    pipe(
-      findChildOrCreate('gco:DateTime'),
-      setTextContent(format(date, "yyyy-MM-dd'T'HH:mm:ss"))
-    )
+  return pipe(
+    findChildOrCreate('gco:DateTime'),
+    setTextContent(format(date, "yyyy-MM-dd'T'HH:mm:ss"))
   )
 }
 
@@ -242,7 +238,7 @@ export function getISODuration(updateFrequency: UpdateFrequencyCustom): string {
   return `P${duration.years}Y${duration.months}M${duration.days}D${hours}`
 }
 
-export function appendResponsibleParty(contact: Individual) {
+function appendResponsibleParty(contact: Individual) {
   const fullName = namePartsToFull(contact.firstName, contact.lastName)
 
   const createAddress = pipe(
@@ -278,7 +274,7 @@ export function appendResponsibleParty(contact: Individual) {
         )
       : noop,
     appendChildren(createAddress),
-    'website' in contact.organization
+    contact.organization?.website
       ? appendChildren(
           pipe(
             createElement('gmd:onlineResource'),
@@ -308,11 +304,16 @@ export function appendResponsibleParty(contact: Individual) {
             )
           )
         : noop,
+
+      contact.organization?.name
+        ? appendChildren(
+            pipe(
+              createElement('gmd:organisationName'),
+              writeCharacterString(contact.organization.name)
+            )
+          )
+        : noop,
       appendChildren(
-        pipe(
-          createElement('gmd:organisationName'),
-          writeCharacterString(contact.organization.name)
-        ),
         createContact,
         pipe(
           createElement('gmd:role'),
@@ -328,50 +329,6 @@ export function appendResponsibleParty(contact: Individual) {
   )
 }
 
-export function updateCitationDate(
-  date: Date,
-  type: 'revision' | 'creation' | 'publication'
-) {
-  return pipe(
-    findNestedElements('gmd:date', 'gmd:CI_Date'),
-    filterArray(
-      pipe(
-        findChildElement('gmd:CI_DateTypeCode'),
-        readAttribute('codeListValue'),
-        map((value) => value === type)
-      )
-    ),
-    getAtIndex(0),
-    findChildElement('gmd:date'),
-    removeAllChildren(),
-    writeDateTime(date)
-  )
-}
-
-export function appendCitationDate(
-  date: Date,
-  type: 'revision' | 'creation' | 'publication'
-) {
-  return appendChildren(
-    pipe(
-      createElement('gmd:date'),
-      createChild('gmd:CI_Date'),
-      appendChildren(
-        pipe(createElement('gmd:date'), writeDateTime(date)),
-        pipe(
-          createElement('gmd:dateType'),
-          createChild('gmd:CI_DateTypeCode'),
-          addAttribute(
-            'codeList',
-            'http://standards.iso.org/iso/19139/resources/gmxCodelists.xml#CI_DateTypeCode'
-          ),
-          addAttribute('codeListValue', type)
-        )
-      )
-    )
-  )
-}
-
 export function removeKeywords() {
   return removeChildren(pipe(findNestedElements('gmd:descriptiveKeywords')))
 }
@@ -745,41 +702,6 @@ export function writeKind(record: CatalogRecord, rootEl: XmlElement) {
   )(rootEl)
 }
 
-export function writeOwnerOrganization(
-  record: CatalogRecord,
-  rootEl: XmlElement
-) {
-  // if no contact matches the owner org, create an empty one
-  const ownerContact: Individual = record.contacts.find(
-    (contact) => contact.organization.name === record.ownerOrganization.name
-  )
-  pipe(
-    findChildOrCreate('gmd:contact'),
-    removeAllChildren(),
-    appendResponsibleParty(
-      ownerContact
-        ? {
-            ...ownerContact,
-            // owner responsible party is always point of contact
-            role: 'point_of_contact',
-          }
-        : {
-            organization: record.ownerOrganization,
-            email: '',
-            role: 'point_of_contact',
-          }
-    )
-  )(rootEl)
-}
-
-export function writeRecordUpdated(record: CatalogRecord, rootEl: XmlElement) {
-  pipe(
-    findChildOrCreate('gmd:dateStamp'),
-    removeAllChildren(),
-    writeDateTime(record.recordUpdated)
-  )(rootEl)
-}
-
 export function writeTitle(record: CatalogRecord, rootEl: XmlElement) {
   pipe(
     findOrCreateIdentification(),
@@ -939,49 +861,92 @@ export function writeUpdateFrequency(
   )(rootEl)
 }
 
-export function writeResourceCreated(
-  record: DatasetRecord,
-  rootEl: XmlElement
-) {
-  if (!('resourceCreated' in record)) return
+export function writeRecordUpdated(record: CatalogRecord, rootEl: XmlElement) {
   pipe(
+    findChildOrCreate('gmd:dateStamp'),
+    removeAllChildren(),
+    writeDateTime(record.recordUpdated)
+  )(rootEl)
+}
+
+export function removeResourceDate(
+  type: 'revision' | 'creation' | 'publication'
+) {
+  return pipe(
     findOrCreateIdentification(),
     findNestedChildOrCreate('gmd:citation', 'gmd:CI_Citation'),
-    fallback(
-      updateCitationDate(record.resourceCreated, 'creation'),
-      appendCitationDate(record.resourceCreated, 'creation')
+    removeChildren(
+      pipe(
+        findNestedElements('gmd:date'),
+        filterArray(
+          pipe(
+            findNestedElement(
+              'gmd:CI_Date',
+              'gmd:dateType',
+              'gmd:CI_DateTypeCode'
+            ),
+            readAttribute('codeListValue'),
+            map((value) => value === type)
+          )
+        )
+      )
     )
-  )(rootEl)
+  )
 }
 
-export function writeResourceUpdated(
-  record: DatasetRecord,
-  rootEl: XmlElement
+export function appendResourceDate(
+  date: Date,
+  type: 'revision' | 'creation' | 'publication'
 ) {
-  if (!('resourceUpdated' in record)) return
-  pipe(
+  return pipe(
     findOrCreateIdentification(),
     findNestedChildOrCreate('gmd:citation', 'gmd:CI_Citation'),
-    fallback(
-      updateCitationDate(record.resourceUpdated, 'revision'),
-      appendCitationDate(record.resourceUpdated, 'revision')
+    appendChildren(
+      pipe(
+        createElement('gmd:date'),
+        createChild('gmd:CI_Date'),
+        appendChildren(
+          pipe(createElement('gmd:date'), writeDateTime(date)),
+          pipe(
+            createElement('gmd:dateType'),
+            createChild('gmd:CI_DateTypeCode'),
+            addAttribute(
+              'codeList',
+              'http://standards.iso.org/iso/19139/resources/gmxCodelists.xml#CI_DateTypeCode'
+            ),
+            addAttribute('codeListValue', type)
+          )
+        )
+      )
     )
-  )(rootEl)
+  )
+}
+
+export function writeResourceCreated(
+  record: DatasetRecord,
+  rootEl: XmlElement
+) {
+  removeResourceDate('creation')(rootEl)
+  if (!record.resourceCreated) return
+  appendResourceDate(record.resourceCreated, 'creation')(rootEl)
+}
+
+export function writeResourceUpdated(
+  record: DatasetRecord,
+  rootEl: XmlElement
+) {
+  removeResourceDate('revision')(rootEl)
+  if (!record.resourceUpdated) return
+  appendResourceDate(record.resourceUpdated, 'revision')(rootEl)
 }
 
 export function writeResourcePublished(
   record: DatasetRecord,
   rootEl: XmlElement
 ) {
-  if (!('resourcePublished' in record)) return
-  pipe(
-    findOrCreateIdentification(),
-    findNestedChildOrCreate('gmd:citation', 'gmd:CI_Citation'),
-    fallback(
-      updateCitationDate(record.resourcePublished, 'publication'),
-      appendCitationDate(record.resourcePublished, 'publication')
-    )
-  )(rootEl)
+  removeResourceDate('publication')(rootEl)
+  if (!record.resourcePublished) return
+  appendResourceDate(record.resourcePublished, 'publication')(rootEl)
 }
 
 export function writeSpatialRepresentation(

package/src/libs/api/metadata-converter/src/lib/xml-utils.ts

@@ -36,7 +36,8 @@ export function createDocument(rootEl: XmlElement): XmlDocument {
     if (namespace === 'xmlns' || namespace === null) return
     if (rootEl.attributes[`xmlns:${namespace}`]) return
     if (!NAMESPACES[namespace]) {
-      throw new Error(`No known URI for namespace ${namespace}`)
+      // the namespace is unknown but it might still be declared correctly: ignore it
+      return
     }
     rootEl.attributes[`xmlns:${namespace}`] = NAMESPACES[namespace]
   }
@@ -248,7 +249,7 @@ function extractNamespace(name: string): string | null {
   return colon > -1 ? name.substring(0, colon) : null
 }
 
-const NAMESPACES = {
+export const NAMESPACES = {
   gmd: 'http://www.isotc211.org/2005/gmd',
   gco: 'http://www.isotc211.org/2005/gco',
   gfc: 'http://www.isotc211.org/2005/gfc',
@@ -283,6 +284,22 @@ const NAMESPACES = {
   cat: 'http://standards.iso.org/iso/19115/-3/cat/1.0',
   lan: 'http://standards.iso.org/iso/19115/-3/lan/1.0',
   mrc: 'http://standards.iso.org/iso/19115/-3/mrc/2.0',
+  rdf: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
+  rdfs: 'http://www.w3.org/2000/01/rdf-schema#',
+  foaf: 'http://xmlns.com/foaf/0.1/',
+  xsd: 'http://www.w3.org/2001/XMLSchema#',
+  dcat: 'http://www.w3.org/ns/dcat#',
+  dct: 'http://purl.org/dc/terms/',
+  skos: 'http://www.w3.org/2004/02/skos/core#',
+  schema_org: 'http://schema.org/',
+  spdx: 'https://spdx.org/rdf/terms/#',
+  adms: 'http://www.w3.org/ns/adms#',
+  dqv: 'http://www.w3.org/ns/dqv#',
+  owl: 'http://www.w3.org/2002/07/owl#',
+  vcard: 'http://www.w3.org/2006/vcard/ns#',
+  time: 'http://www.w3.org/2006/time#',
+  locn: 'http://www.w3.org/ns/locn#',
+  mdcat: 'https://data.vlaanderen.be/ns/metadata-dcat#',
 }
 
 /**
@@ -456,3 +473,21 @@ export function renameElements(
   doReplace(rootElement)
   return rootElement
 }
+
+/**
+ * This function use the DOMParser to check if the given xmlString is a valid XML file or throw an error
+ * (Generated by chatGPT)
+ * @param xmlString
+ */
+export function assertValidXml(xmlString: string): Document {
+  const parser = new DOMParser()
+  const xmlDoc = parser.parseFromString(xmlString, 'application/xml')
+  const parserError = xmlDoc.querySelector('parsererror')
+
+  if (parserError) {
+    console.error(parserError)
+    throw new Error('File is not a valid XML.')
+  }
+
+  return xmlDoc
+}