DHFPROD-8379: Fix mapping related entities with same property name

ryanjdew · MarkLogic Builder · commit 1dd8b71b61e3 · 2022-03-08T15:48:50.000-08:00
diff --git a/marklogic-data-hub-central/ui/src/components/entities/mapping/entity-map-table/entity-map-table.tsx b/marklogic-data-hub-central/ui/src/components/entities/mapping/entity-map-table/entity-map-table.tsx
@@ -1272,7 +1272,7 @@ const EntityMapTable: React.FC<Props> = (props) => {
           }}
           dataTestid={`searchInput-entity`}
           placeholder={`Search name`}
-          value={searchedKeys[0]}
+          value={searchedKeys[0] || ""}
           onChange={e => setSearchedKeys(e.target.value ? [e.target.value] : [])}
           onPressEnter={(enter) => enter ? searchedKeys?.length > 0 ? "" : false : null}
           className={styles.searchInput}
diff --git a/marklogic-data-hub-central/ui/src/components/entities/mapping/mapping-step-detail/mapping-step-detail.tsx b/marklogic-data-hub-central/ui/src/components/entities/mapping/mapping-step-detail/mapping-step-detail.tsx
@@ -541,7 +541,7 @@ const MappingStepDetail: React.FC = () => {
       let entEntityTempData: any = [];
       let uriKey = EntityTableKeyIndex + 1;
       EntityTableKeyIndex++;
-      let nestedEntityProps = extractNestedEntityData(entProps, entEntityTempData);
+      let nestedEntityProps = extractNestedEntityData(entProps, entEntityTempData, rootEntityName);
       nestedEntityProps.unshift({key: uriKey, name: "URI", type: "", isProperty: false, filterName: "URI", filterMatch: false}); //add URI field to front of properties
       setEntityTypeProperties([...nestedEntityProps]);
       setTargetRelatedMappings(resp.data[0]["relatedEntityMappings"]);
@@ -555,7 +555,7 @@ const MappingStepDetail: React.FC = () => {
             let contextKey = EntityTableKeyIndex + 1;
             uriKey = contextKey + 1;
             EntityTableKeyIndex += 2;
-            let relatedEntityProps = extractNestedEntityData(relatedEntProps, relatedEntityTempData);
+            let relatedEntityProps = extractNestedEntityData(relatedEntProps, relatedEntityTempData, relatedEntityName);
             relatedEntityProps.unshift({key: uriKey, name: "URI", type: "", isProperty: false, filterName: "URI", filterMatch: false}); //add URI field to front of properties
             relatedEntityProps.unshift({key: contextKey, name: "Context", type: "", isProperty: false, filterName: "Context", filterMatch: false}); //add Context field to front of properties
             relatedEntities.push({entityType: entityObject.entityType, entityModel: entityObject.entityModel, entityLabel: entityObject.mappingTitle, entityMappingId: entityObject.entityMappingId, relatedEntityMappings: entityObject.relatedEntityMappings, entityProps: relatedEntityProps});
@@ -580,8 +580,7 @@ const MappingStepDetail: React.FC = () => {
   };
 
 
-  const extractNestedEntityData = (entProps, nestedEntityData: Array<any>, parentKey = "") => {
-
+  const extractNestedEntityData = (entProps, nestedEntityData: Array<any>, entityTitle: string, parentKey = "") => {
     Object.keys(entProps).forEach(key => {
       let val = entProps[key];
       let propty;
@@ -591,7 +590,7 @@ const MappingStepDetail: React.FC = () => {
         EntityTableKeyIndex = EntityTableKeyIndex + 1;
         if (val.$ref || val.items.$ref) {
           let ref = val.$ref ? val.$ref : val.items.$ref;
-          tgtRefs[parentKey] = ref;
+          tgtRefs[`${entityTitle ? entityTitle + "/": ""}${parentKey}`] = ref;
         }
 
         propty = {
@@ -604,7 +603,7 @@ const MappingStepDetail: React.FC = () => {
           children: []
         };
         nestedEntityData.push(propty);
-        extractNestedEntityData(val.subProperties, propty.children, parentKey);
+        extractNestedEntityData(val.subProperties, propty.children, entityTitle, parentKey);
         parentKey = (parentKey.indexOf("/") !== -1) ? parentKey.substring(0, parentKey.lastIndexOf("/")) : "";
 
       } else {
@@ -838,14 +837,14 @@ const MappingStepDetail: React.FC = () => {
     return obj;
   };
 
-  const getTgtEntityTypesInMap = (mapExp, parentKey = "") => {
+  const getTgtEntityTypesInMap = (mapExp, entityType: string, parentKey = "") => {
     Object.keys(mapExp).forEach(key => {
       let val = mapExp[key];
       if (val.constructor.name === "Object") {
         if (val.hasOwnProperty("properties")) {
           let tempKey = parentKey ? parentKey + "/" + key : key;
-          val["targetEntityType"] = tgtEntityReferences[tempKey];
-          getTgtEntityTypesInMap(val.properties, tempKey);
+          val["targetEntityType"] = tgtEntityReferences[`${entityType ? entityType + "/": ""}${tempKey}`];
+          getTgtEntityTypesInMap(val.properties, entityType, tempKey);
         }
       }
     });
@@ -974,7 +973,7 @@ const MappingStepDetail: React.FC = () => {
           }}
           dataTestid={`searchInput-source`}
           placeholder={`Search name`}
-          value={searchedKeys[0]}
+          value={searchedKeys[0] || ""}
           onChange={e => setSearchedKeys(e.target.value ? [e.target.value] : [])}
           onPressEnter={(enter) => enter ? searchedKeys?.length > 0 ? "" : false : null}
           className={styles.searchInput}
@@ -1253,10 +1252,11 @@ const MappingStepDetail: React.FC = () => {
 
   const saveMapping = async (mapObject, entityMappingId, updatedContext, updatedUri, relatedEntityModel) => {
     let obj = {};
+    let entityName = curationOptions.activeStep.entityName;
     Object.keys(mapObject).forEach(key => {
       convertMapExpToMapArt(obj, key, {"sourcedFrom": mapObject[key]});
     });
-    await getTgtEntityTypesInMap(obj);
+    await getTgtEntityTypesInMap(obj, entityName);
     let {lastUpdated, properties, ...dataPayload} = savedMappingArt;
     if (entityMappingId) {
       if (!dataPayload.relatedEntityMappings) {
@@ -1708,6 +1708,7 @@ const MappingStepDetail: React.FC = () => {
               />
               {relatedEntityTypeProperties.map((entity, i) => relatedEntitiesSelected.map(selectedEntity => selectedEntity.entityMappingId).includes(entity.entityMappingId) ?
                 <EntityMapTable
+                  key={`relatedEntity-${i}`}
                   setScrollRef={setRef}
                   executeScroll={executeScroll}
                   mapResp={mapResp}
diff --git a/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/mapping/mappingWithRelationships/setup.xqy b/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/mapping/mappingWithRelationships/setup.xqy
@@ -0,0 +1,23 @@
+xquery version "1.0-ml";
+import module namespace hub-test = "http://marklogic.com/data-hub/test" at "/test/data-hub-test-helper.xqy";
+hub-test:reset-hub()
+
+;
+
+xquery version "1.0-ml";
+import module namespace hub-test = "http://marklogic.com/data-hub/test" at "/test/data-hub-test-helper.xqy";
+import module namespace test = "http://marklogic.com/test" at "/test/test-helper.xqy";
+hub-test:load-entities($test:__CALLER_FILE__)
+
+;
+
+xquery version "1.0-ml";
+import module namespace hub-test = "http://marklogic.com/data-hub/test" at "/test/data-hub-test-helper.xqy";
+import module namespace test = "http://marklogic.com/test" at "/test/test-helper.xqy";
+hub-test:load-non-entities($test:__CALLER_FILE__)
+
+;
+
+xquery version "1.0-ml";
+import module namespace hub-test = "http://marklogic.com/data-hub/test" at "/test/data-hub-test-helper.xqy";
+hub-test:wait-for-indexes();
diff --git a/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/mapping/mappingWithRelationships/test-data/entities/Cat.entity.json b/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/mapping/mappingWithRelationships/test-data/entities/Cat.entity.json
@@ -0,0 +1,34 @@
+{
+  "info": {
+    "title": "Cat",
+    "draft": false,
+    "version": "1.0.0",
+    "baseUri": "http://example.org/"
+  },
+  "definitions": {
+    "Cat": {
+      "properties": {
+        "id": {
+          "datatype": "string",
+          "facetable": false,
+          "sortable": false,
+          "collation": "http://marklogic.com/collation/codepoint"
+        },
+        "favourite_food": {
+          "$ref": "#/definitions/CatFood"
+        }
+      },
+      "primaryKey": "id"
+    },
+    "CatFood": {
+      "properties": {
+        "brand": {
+          "datatype": "string",
+          "facetable": false,
+          "sortable": false,
+          "collation": "http://marklogic.com/collation/codepoint"
+        }
+      }
+    }
+  }
+}
diff --git a/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/mapping/mappingWithRelationships/test-data/entities/Dog.entity.json b/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/mapping/mappingWithRelationships/test-data/entities/Dog.entity.json
@@ -0,0 +1,44 @@
+{
+  "info": {
+    "title": "Dog",
+    "draft": false,
+    "version": "1.0.0",
+    "baseUri": "http://example.org/"
+  },
+  "definitions": {
+    "Dog": {
+      "properties": {
+        "id": {
+          "datatype": "string",
+          "facetable": false,
+          "sortable": false,
+          "collation": "http://marklogic.com/collation/codepoint"
+        },
+        "hates_cats": {
+          "datatype": "array",
+          "facetable": false,
+          "sortable": false,
+          "items": {
+            "datatype": "string",
+            "relatedEntityType": "http://example.org/Cat-1.0.0/Cat",
+            "joinPropertyName": "id"
+          }
+        },
+        "favourite_food": {
+          "$ref": "#/definitions/DogFood"
+        }
+      },
+      "primaryKey": "id"
+    },
+    "DogFood": {
+      "properties": {
+        "brand": {
+          "datatype": "string",
+          "facetable": false,
+          "sortable": false,
+          "collation": "http://marklogic.com/collation/codepoint"
+        }
+      }
+    }
+  }
+}
diff --git a/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/mapping/mappingWithRelationships/test-data/steps/mapping/MapCat.step.json b/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/mapping/mappingWithRelationships/test-data/steps/mapping/MapCat.step.json
@@ -0,0 +1,39 @@
+{
+  "collections": [
+    "MapCat",
+    "Cat"
+  ],
+  "additionalCollections": [ ],
+  "permissions": "data-hub-common,read,data-hub-common,update",
+  "batchSize": 100,
+  "validateEntity": "doNotValidate",
+  "targetFormat": "JSON",
+  "attachSourceDocument": false,
+  "sourceRecordScope": "instanceOnly",
+  "name": "MapCat",
+  "targetEntityType": "http://example.org/Cat-1.0.0/Cat",
+  "description": "",
+  "collection": "cat",
+  "selectedSource": "collection",
+  "sourceQuery": "cts.collectionQuery(['cat'])",
+  "targetDatabase": "data-hub-FINAL",
+  "headers": { },
+  "interceptors": [ ],
+  "provenanceGranularityLevel": "off",
+  "customHook": { },
+  "sourceDatabase": "data-hub-STAGING",
+  "stepDefinitionName": "entity-services-mapping",
+  "stepDefinitionType": "mapping",
+  "stepId": "MapCat-mapping",
+  "acceptsBatch": true,
+  "lastUpdated": "2022-01-24T15:30:01.026789Z",
+  "uriExpression": "$URI",
+  "properties": {
+    "id": {
+      "sourcedFrom": "id"
+    },
+    "favourite_food": {
+      "sourcedFrom": "food"
+    }
+  }
+}
diff --git a/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/mapping/mappingWithRelationships/test-data/steps/mapping/MapDog.step.json b/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/mapping/mappingWithRelationships/test-data/steps/mapping/MapDog.step.json
@@ -0,0 +1,39 @@
+{
+  "collections": [
+    "MapDog",
+    "Dog"
+  ],
+  "additionalCollections": [ ],
+  "permissions": "data-hub-common,read,data-hub-common,update",
+  "batchSize": 100,
+  "validateEntity": "doNotValidate",
+  "targetFormat": "JSON",
+  "attachSourceDocument": false,
+  "sourceRecordScope": "instanceOnly",
+  "name": "MapDog",
+  "targetEntityType": "http://example.org/Dog-1.0.0/Dog",
+  "description": "",
+  "collection": "dog",
+  "selectedSource": "collection",
+  "sourceQuery": "cts.collectionQuery(['dog'])",
+  "targetDatabase": "data-hub-FINAL",
+  "headers": { },
+  "interceptors": [ ],
+  "provenanceGranularityLevel": "off",
+  "customHook": { },
+  "sourceDatabase": "data-hub-STAGING",
+  "stepDefinitionName": "entity-services-mapping",
+  "stepDefinitionType": "mapping",
+  "stepId": "MapDog-mapping",
+  "acceptsBatch": true,
+  "lastUpdated": "2022-01-24T15:30:25.891426Z",
+  "uriExpression": "$URI",
+  "properties": {
+    "id": {
+      "sourcedFrom": "id"
+    },
+    "favourite_food": {
+      "sourcedFrom": "food"
+    }
+  }
+}
diff --git a/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/mapping/mappingWithRelationships/test.sjs b/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/mapping/mappingWithRelationships/test.sjs
@@ -0,0 +1,16 @@
+'use strict';
+
+const test = require("/test/test-helper.xqy");
+
+const esMappingLib = require("/data-hub/5/builtins/steps/mapping/entity-services/lib.sjs");
+let assertions = [];
+
+
+let output = esMappingLib.buildMappingXML(cts.doc("/steps/mapping/MapDog.step.json"), []);
+
+assertions.push(test.assertTrue(fn.exists(output)));
+output = esMappingLib.buildMappingXML(cts.doc("/steps/mapping/MapCat.step.json"), []);
+
+assertions.push(test.assertTrue(fn.exists(output)));
+
+assertions;
