geonetwork-ui 2.10.0 → 2.11.0-dev.8442dae6e

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

@@ -587,7 +587,7 @@ export function writeAssociatedRecords(
     removeChildrenByName('mri:associatedResource'),
     appendChildren(
       ...record.associatedRecords
-        .filter((assoc) => assoc.uuid && assoc.associationType)
+        .filter((assoc) => assoc.uniqueIdentifier && assoc.associationType)
         .map((assoc) =>
           pipe(
             createNestedElement(
@@ -608,7 +608,7 @@ export function writeAssociatedRecords(
               ),
               pipe(
                 createElement('mri:metadataReference'),
-                writeAttribute('uuidref', assoc.uuid)
+                writeAttribute('uuidref', assoc.uniqueIdentifier)
               )
             )
           )

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

@@ -51,6 +51,7 @@ import {
   readText,
   XmlElement,
 } from '../xml-utils'
+import { getAssociationTypeFromCode } from './utils/association-type.mapper'
 import { readGeometry } from './utils/geometry'
 import { fullNameToParts } from './utils/individual-name'
 import { getKeywordTypeFromKeywordTypeCode } from './utils/keyword.mapper'
@@ -931,19 +932,22 @@ export function readSourceRecords(rootEl: XmlElement): SourceRecord[] {
 export function extractAssociatedRecords(
   containerName: string,
   aggregateName: string,
-  readUuid: ChainableFunction<XmlElement, string>
+  readIdentifier: ChainableFunction<XmlElement, string>
 ): ChainableFunction<XmlElement, AssociatedRecord[]> {
   return pipe(
     findChildrenElement(containerName, false),
     mapArray((el) => {
       const aggregateEl = findChildElement(aggregateName, false)(el)
-      const uuid = readUuid(aggregateEl)
-      const associationType = pipe(
+      const uniqueIdentifier = readIdentifier(aggregateEl)
+      const associationTypeCode = pipe(
         findNestedElement('gmd:associationType', 'gmd:DS_AssociationTypeCode'),
         readAttribute('codeListValue')
       )(aggregateEl)
-      if (!uuid || !associationType) return null
-      return { uuid, associationType }
+      if (!uniqueIdentifier || !associationTypeCode) return null
+      return {
+        uniqueIdentifier,
+        associationType: getAssociationTypeFromCode(associationTypeCode),
+      }
     }),
     filterArray((r): r is AssociatedRecord => r !== null)
   )

package/src/libs/api/metadata-converter/src/lib/iso19139/utils/association-type.mapper.ts

@@ -0,0 +1,12 @@
+import {
+  AssociationType,
+  associationTypeValues,
+} from '../../../../../../../libs/common/domain/src/lib/model/record'
+
+export function getAssociationTypeFromCode(
+  associationTypeCode: string
+): AssociationType {
+  return associationTypeValues.includes(associationTypeCode as AssociationType)
+    ? (associationTypeCode as AssociationType)
+    : 'crossReference'
+}

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

@@ -1276,7 +1276,7 @@ export function writeAssociatedRecords(
     removeChildrenByName('gmd:aggregationInfo'),
     appendChildren(
       ...record.associatedRecords
-        .filter((assoc) => assoc.uuid && assoc.associationType)
+        .filter((assoc) => assoc.uniqueIdentifier && assoc.associationType)
         .map((assoc) =>
           pipe(
             createNestedElement(
@@ -1290,7 +1290,7 @@ export function writeAssociatedRecords(
                   'gmd:MD_Identifier',
                   'gmd:code'
                 ),
-                writeCharacterString(assoc.uuid)
+                writeCharacterString(assoc.uniqueIdentifier)
               ),
               pipe(
                 createNestedElement(

package/src/libs/common/domain/src/lib/model/record/metadata.model.ts

@@ -260,12 +260,28 @@ export interface SourceRecord {
   href?: string
 }
 
+// DS_AssociationTypeCode values of the ISO19115-3 codelist, any unrecognized value
+// being mapped to 'crossReference'
+export const associationTypeValues = [
+  'crossReference',
+  'largerWorkCitation',
+  'partOfSeamlessDatabase',
+  'stereoMate',
+  'isComposedOf',
+  'collectiveTitle',
+  'series',
+  'dependency',
+  'revisionOf',
+] as const
+
+export type AssociationType = (typeof associationTypeValues)[number]
+
 /**
  * Represents another record associated with this one (e.g. a parent/sibling dataset).
  */
 export interface AssociatedRecord {
-  uuid: string
-  associationType: string
+  uniqueIdentifier: string
+  associationType: AssociationType
 }
 
 export interface DatasetRecord extends BaseRecord {