geonetwork-ui 2.11.0-dev.8442dae6e → 2.11.0-dev.a2881de31

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.uniqueIdentifier && assoc.associationType)
+        .filter((assoc) => assoc.uuid && assoc.associationType)
         .map((assoc) =>
           pipe(
             createNestedElement(
@@ -608,7 +608,7 @@ export function writeAssociatedRecords(
               ),
               pipe(
                 createElement('mri:metadataReference'),
-                writeAttribute('uuidref', assoc.uniqueIdentifier)
+                writeAttribute('uuidref', assoc.uuid)
               )
             )
           )

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

@@ -51,7 +51,6 @@ 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'
@@ -932,22 +931,19 @@ export function readSourceRecords(rootEl: XmlElement): SourceRecord[] {
 export function extractAssociatedRecords(
   containerName: string,
   aggregateName: string,
-  readIdentifier: ChainableFunction<XmlElement, string>
+  readUuid: ChainableFunction<XmlElement, string>
 ): ChainableFunction<XmlElement, AssociatedRecord[]> {
   return pipe(
     findChildrenElement(containerName, false),
     mapArray((el) => {
       const aggregateEl = findChildElement(aggregateName, false)(el)
-      const uniqueIdentifier = readIdentifier(aggregateEl)
-      const associationTypeCode = pipe(
+      const uuid = readUuid(aggregateEl)
+      const associationType = pipe(
         findNestedElement('gmd:associationType', 'gmd:DS_AssociationTypeCode'),
         readAttribute('codeListValue')
       )(aggregateEl)
-      if (!uniqueIdentifier || !associationTypeCode) return null
-      return {
-        uniqueIdentifier,
-        associationType: getAssociationTypeFromCode(associationTypeCode),
-      }
+      if (!uuid || !associationType) return null
+      return { uuid, associationType }
     }),
     filterArray((r): r is AssociatedRecord => r !== null)
   )

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.uniqueIdentifier && assoc.associationType)
+        .filter((assoc) => assoc.uuid && assoc.associationType)
         .map((assoc) =>
           pipe(
             createNestedElement(
@@ -1290,7 +1290,7 @@ export function writeAssociatedRecords(
                   'gmd:MD_Identifier',
                   'gmd:code'
                 ),
-                writeCharacterString(assoc.uniqueIdentifier)
+                writeCharacterString(assoc.uuid)
               ),
               pipe(
                 createNestedElement(

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

@@ -260,28 +260,12 @@ 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 {
-  uniqueIdentifier: string
-  associationType: AssociationType
+  uuid: string
+  associationType: string
 }
 
 export interface DatasetRecord extends BaseRecord {

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

@@ -1,12 +0,0 @@
-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'
-}