DHFPROD-7452: Restrict property warnings to property being edited

ryanjdew · MarkLogic Builder · commit 2c5111606df6 · 2021-06-29T16:15:28.000-07:00
diff --git a/marklogic-data-hub-central/src/main/java/com/marklogic/hub/central/controllers/steps/MergingStepController.java b/marklogic-data-hub-central/src/main/java/com/marklogic/hub/central/controllers/steps/MergingStepController.java
@@ -88,8 +88,8 @@ public ResponseEntity<JsonNode> calculateMergingActivity(@PathVariable String st
     @ResponseBody
     @ApiOperation(value = "Validate the merging step")
     @Secured("ROLE_readMerging")
-    public ResponseEntity<JsonNode> validateMatchingStep(@PathVariable String stepName, @RequestParam(required = false, defaultValue = "settings") String view) {
-        return ResponseEntity.ok(MasteringService.on(getHubClient().getFinalClient()).validateMergingStep(stepName, view));
+    public ResponseEntity<JsonNode> validateMergingStep(@PathVariable String stepName, @RequestParam(required = false, defaultValue = "settings") String view, @RequestParam(required = false) String entityPropertyPath) {
+        return ResponseEntity.ok(MasteringService.on(getHubClient().getFinalClient()).validateMergingStep(stepName, view, entityPropertyPath));
     }
 
     private StepService newService() {
diff --git a/marklogic-data-hub-central/ui/e2e/cypress/integration/curation/curate/mergeWarnings.spec.tsx b/marklogic-data-hub-central/ui/e2e/cypress/integration/curation/curate/mergeWarnings.spec.tsx
@@ -111,33 +111,36 @@ describe("Validate Merge warnings", () => {
     cy.contains(mergeStep1);
   });
   it("Click on merge rule Address and validate warnings", () => {
-    cy.findByText("Address").click();
+    cy.findAllByText("Address").first().click();
     cy.get("[name=\"maxValues\"]").first().check();
     mergeRuleModal.saveButton().click();
-    mergeRuleModal.alertMessage().should("have.text", "Warning: The current merge settings might produce merged documents that are inconsistent with the entity type\nIn the entity type Person, the property or properties Address, DateOfBirth, ZipCode, id, SSN, lname, desc, fname allows only a single value.\nIn every merge rule for the property Address, DateOfBirth, ZipCode, id, SSN, lname, desc, fname set Max Values or Max Sources to 1.");
+    mergeRuleModal.alertMessage().should("have.text", "Warning: The current merge settings might produce merged documents that are inconsistent with the entity type\nIn the entity type Person, the property or properties Address allows only a single value.\nIn every merge rule for the property Address set Max Values or Max Sources to 1.");
     mergeRuleModal.alertDescription().should("have.text", "Please set max values for property to 1 on merge to avoid an invalid entity instance.");
     mergeRuleModal.ruleMaxValuesInput("1");
     mergeRuleModal.saveButton().click();
-    mergeRuleModal.alertMessage().should("have.text", "Warning: The current merge settings might produce merged documents that are inconsistent with the entity type\nIn the entity type Person, the property or properties DateOfBirth, ZipCode, id, SSN, lname, desc, fname allows only a single value.\nIn every merge rule for the property DateOfBirth, ZipCode, id, SSN, lname, desc, fname set Max Values or Max Sources to 1.");
-    mergeRuleModal.alertDescription().should("have.text", "Please set max values for property to 1 on merge to avoid an invalid entity instance.");
+    curatePage.alertMessage().should("not.exist");
+    cy.findAllByText("Address").first().click();
+    cy.get("[name=\"maxValues\"]").first().check();
     mergeRuleModal.ruleMaxValuesInput("0");
     mergeRuleModal.ruleMaxScoreInput("1");
     mergeRuleModal.saveButton().click();
-    mergeRuleModal.alertMessage().should("have.text", "Warning: The current merge settings might produce merged documents that are inconsistent with the entity type\nIn the entity type Person, the property or properties DateOfBirth, ZipCode, id, SSN, lname, desc, fname allows only a single value.\nIn every merge rule for the property DateOfBirth, ZipCode, id, SSN, lname, desc, fname set Max Values or Max Sources to 1.");
-    mergeRuleModal.alertDescription().should("have.text", "Please set max values for property to 1 on merge to avoid an invalid entity instance.");
+    curatePage.alertMessage().should("not.exist");
+    cy.findAllByText("Address").first().click();
+    cy.get("[name=\"maxValues\"]").first().check();
     mergeRuleModal.ruleMaxScoreInput("0");
     mergeRuleModal.saveButton().click();
-    mergeRuleModal.alertMessage().should("have.text", "Warning: The current merge settings might produce merged documents that are inconsistent with the entity type\nIn the entity type Person, the property or properties Address, DateOfBirth, ZipCode, id, SSN, lname, desc, fname allows only a single value.\nIn every merge rule for the property Address, DateOfBirth, ZipCode, id, SSN, lname, desc, fname set Max Values or Max Sources to 1.");
+    mergeRuleModal.alertMessage().should("have.text", "Warning: The current merge settings might produce merged documents that are inconsistent with the entity type\nIn the entity type Person, the property or properties Address allows only a single value.\nIn every merge rule for the property Address set Max Values or Max Sources to 1.");
     mergeRuleModal.alertDescription().should("have.text", "Please set max values for property to 1 on merge to avoid an invalid entity instance.");
     mergeRuleModal.ruleMaxValuesInput("1");
     mergeRuleModal.ruleMaxScoreInput("2");
     mergeRuleModal.saveButton().click();
-    mergeRuleModal.alertMessage().should("have.text", "Warning: The current merge settings might produce merged documents that are inconsistent with the entity type\nIn the entity type Person, the property or properties DateOfBirth, ZipCode, id, SSN, lname, desc, fname allows only a single value.\nIn every merge rule for the property DateOfBirth, ZipCode, id, SSN, lname, desc, fname set Max Values or Max Sources to 1.");
-    mergeRuleModal.alertDescription().should("have.text", "Please set max values for property to 1 on merge to avoid an invalid entity instance.");
+    curatePage.alertMessage().should("not.exist");
+    cy.findAllByText("Address").first().click();
+    cy.get("[name=\"maxValues\"]").first().check();
     mergeRuleModal.ruleMaxValuesInput("2");
     mergeRuleModal.ruleMaxScoreInput("2");
     mergeRuleModal.saveButton().click();
-    mergeRuleModal.alertMessage().should("have.text", "Warning: The current merge settings might produce merged documents that are inconsistent with the entity type\nIn the entity type Person, the property or properties Address, DateOfBirth, ZipCode, id, SSN, lname, desc, fname allows only a single value.\nIn every merge rule for the property Address, DateOfBirth, ZipCode, id, SSN, lname, desc, fname set Max Values or Max Sources to 1.");
+    mergeRuleModal.alertMessage().should("have.text", "Warning: The current merge settings might produce merged documents that are inconsistent with the entity type\nIn the entity type Person, the property or properties Address allows only a single value.\nIn every merge rule for the property Address set Max Values or Max Sources to 1.");
     mergeRuleModal.alertDescription().should("have.text", "Please set max values for property to 1 on merge to avoid an invalid entity instance.");
     //Will uncomment once DHFPROD-7452 is fixed
     /* mergeRuleModal.selectMergeTypeDropdown("Strategy");
@@ -160,7 +163,7 @@ describe("Validate Merge warnings", () => {
     cy.findByText("Address").click();
     mergeRuleModal.alertMessage().should("not.exist");
     mergeRuleModal.saveButton().click();
-    mergeRuleModal.alertMessage().should("have.text", "Warning: The current merge settings might produce merged documents that are inconsistent with the entity type\nIn the entity type Person, the property or properties Address, DateOfBirth, id, SSN, lname, desc, fname allows only a single value.\nIn every merge rule for the property Address, DateOfBirth, id, SSN, lname, desc, fname set Max Values or Max Sources to 1.");
+    mergeRuleModal.alertMessage().should("have.text", "Warning: The current merge settings might produce merged documents that are inconsistent with the entity type\nIn the entity type Person, the property or properties Address allows only a single value.\nIn every merge rule for the property Address set Max Values or Max Sources to 1.");
     mergeRuleModal.alertDescription().should("have.text", "Please set max values for property to 1 on merge to avoid an invalid entity instance.");
     mergeRuleModal.cancelButton().click();
     cy.findAllByText("retain-single-value").eq(0).click();
@@ -170,7 +173,7 @@ describe("Validate Merge warnings", () => {
     cy.wait(1000);
     cy.findByText("Address").click();
     mergeRuleModal.saveButton().click();
-    mergeRuleModal.alertMessage().should("have.text", "Warning: The current merge settings might produce merged documents that are inconsistent with the entity type\nIn the entity type Person, the property or properties Address, DateOfBirth, ZipCode, id, SSN, lname, desc, fname allows only a single value.\nIn every merge rule for the property Address, DateOfBirth, ZipCode, id, SSN, lname, desc, fname set Max Values or Max Sources to 1.");
+    mergeRuleModal.alertMessage().should("have.text", "Warning: The current merge settings might produce merged documents that are inconsistent with the entity type\nIn the entity type Person, the property or properties Address allows only a single value.\nIn every merge rule for the property Address set Max Values or Max Sources to 1.");
     mergeRuleModal.alertDescription().should("have.text", "Please set max values for property to 1 on merge to avoid an invalid entity instance.");
     mergeRuleModal.cancelButton().click();
   });
diff --git a/marklogic-data-hub-central/ui/src/api/merging.ts b/marklogic-data-hub-central/ui/src/api/merging.ts
@@ -15,9 +15,10 @@ export const updateMergingArtifact = async (merging) => {
   }
 };
 
-export const getMergingRulesWarnings = async (merging) => {
+export const getMergingRulesWarnings = async (merging, newMergeRule) => {
   try {
-    let warningResponse = await axios.get(`/api/steps/merging/${merging.name}/validate?view=rules`);
+    let filter = `&entityPropertyPath=${newMergeRule.entityPropertyPath}`;
+    let warningResponse = await axios.get(`/api/steps/merging/${merging.name}/validate?view=rules${filter}`);
     if (warningResponse.status === 200) {
       return warningResponse;
     } else {
diff --git a/marklogic-data-hub-central/ui/src/components/entities/merging/add-merge-rule/merge-rule-dialog.tsx b/marklogic-data-hub-central/ui/src/components/entities/merging/add-merge-rule/merge-rule-dialog.tsx
@@ -469,7 +469,7 @@ const MergeRuleDialog: React.FC<Props> = (props) => {
       newStepArtifact.mergeRules[index] = newMergeRules;
       await updateMergingArtifact(newStepArtifact);
       updateActiveStepArtifact(newStepArtifact);
-      let warnings= await getMergingRulesWarnings(newStepArtifact);
+      let warnings= await getMergingRulesWarnings(newStepArtifact, newMergeRules);
       if (warnings !== undefined) { setValidationWarnings(warnings.data); }
     }
   };
diff --git a/marklogic-data-hub-central/ui/src/components/entities/merging/merging-step-detail/merging-step-detail.tsx b/marklogic-data-hub-central/ui/src/components/entities/merging/merging-step-detail/merging-step-detail.tsx
@@ -226,15 +226,17 @@ const MergingStepDetail: React.FC = () => {
   ];
 
   for (let key of mergingStep.mergeRules) {
-    for (let key1 of mergingStep.mergeStrategies) {
-      if (key.mergeStrategyName === key1.strategyName && commonStrategyNames.indexOf(key.mergeStrategyName)=== -1) {
-        commonStrategyNames.push(key.mergeStrategyName);
+    if (mergingStep.mergeStrategies) {
+      for (let key1 of mergingStep.mergeStrategies) {
+        if (key.mergeStrategyName === key1.strategyName && commonStrategyNames.indexOf(key.mergeStrategyName) === -1) {
+          commonStrategyNames.push(key.mergeStrategyName);
+        }
       }
     }
   }
 
 
-  mergingStep && mergingStep.mergeStrategies.length > 0 && mergingStep.mergeStrategies.forEach((i) => {
+  mergingStep && mergingStep.mergeStrategies && mergingStep.mergeStrategies.length > 0 && mergingStep.mergeStrategies.forEach((i) => {
     mergeStrategiesData.push(
       {
         strategyName: i["strategyName"],
diff --git a/marklogic-data-hub/src/main/java/com/marklogic/hub/dataservices/MasteringService.java b/marklogic-data-hub/src/main/java/com/marklogic/hub/dataservices/MasteringService.java
@@ -188,17 +188,18 @@ private com.fasterxml.jackson.databind.JsonNode getDefaultCollections(BaseProxy.
             }
 
             @Override
-            public com.fasterxml.jackson.databind.JsonNode validateMergingStep(String stepName, String view) {
+            public com.fasterxml.jackson.databind.JsonNode validateMergingStep(String stepName, String view, String entityPropertyPath) {
                 return validateMergingStep(
-                    this.req_validateMergingStep.on(this.dbClient), stepName, view
+                    this.req_validateMergingStep.on(this.dbClient), stepName, view, entityPropertyPath
                     );
             }
-            private com.fasterxml.jackson.databind.JsonNode validateMergingStep(BaseProxy.DBFunctionRequest request, String stepName, String view) {
+            private com.fasterxml.jackson.databind.JsonNode validateMergingStep(BaseProxy.DBFunctionRequest request, String stepName, String view, String entityPropertyPath) {
               return BaseProxy.JsonDocumentType.toJsonNode(
                 request
                       .withParams(
                           BaseProxy.atomicParam("stepName", false, BaseProxy.StringType.fromString(stepName)),
-                          BaseProxy.atomicParam("view", false, BaseProxy.StringType.fromString(view))
+                          BaseProxy.atomicParam("view", false, BaseProxy.StringType.fromString(view)),
+                          BaseProxy.atomicParam("entityPropertyPath", true, BaseProxy.StringType.fromString(entityPropertyPath))
                           ).responseSingle(false, Format.JSON)
                 );
             }
@@ -271,8 +272,9 @@ private com.fasterxml.jackson.databind.JsonNode validateMergingStep(BaseProxy.DB
    *
    * @param stepName	provides input
    * @param view	Designates the view the messages are for. Valid values are 'settings' or 'rules'
+   * @param entityPropertyPath	Restricts property warnings to a given entity property path
    * @return	Returns an array of zero or more warning objects; each object has "level" and "message" properties
    */
-    com.fasterxml.jackson.databind.JsonNode validateMergingStep(String stepName, String view);
+    com.fasterxml.jackson.databind.JsonNode validateMergingStep(String stepName, String view, String entityPropertyPath);
 
 }
diff --git a/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/data-services/mastering/validateMergingStep.api b/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/data-services/mastering/validateMergingStep.api
@@ -10,6 +10,12 @@
       "name": "view",
       "desc": "Designates the view the messages are for. Valid values are 'settings' or 'rules'",
       "datatype": "string"
+    },
+    {
+      "name": "entityPropertyPath",
+      "desc": "Restricts property warnings to a given entity property path",
+      "datatype": "string",
+      "nullable": true
     }
   ],
   "return": {
diff --git a/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/data-services/mastering/validateMergingStep.sjs b/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/data-services/mastering/validateMergingStep.sjs
@@ -17,7 +17,7 @@
 
 const validateMergeLib = require("/data-hub/5/data-services/mastering/validateMergingStepLib.sjs");
 
-var stepName, view;
+var stepName, view, entityPropertyPath;
 
 xdmp.securityAssert("http://marklogic.com/data-hub/privileges/read-match-merge", "execute");
 
@@ -52,7 +52,7 @@ if (view === "settings") {
         }
     }
 } else if (view === "rules") {
-    let propertyWarnings = validateMergeLib.propertiesWarning(step);
+    let propertyWarnings = validateMergeLib.propertiesWarning(step, entityPropertyPath);
     if (propertyWarnings) {
         warnings.push(propertyWarnings);
     }
diff --git a/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/data-services/mastering/validateMergingStepLib.sjs b/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/data-services/mastering/validateMergingStepLib.sjs
@@ -18,14 +18,19 @@
 const mergingOptions = require("/com.marklogic.smart-mastering/survivorship/merging/options.xqy");
 const common = require("/data-hub/5/data-services/mastering/validateStepCommonLib.sjs");
 
-function propertiesWarning(mergeStep) {
+function propertiesWarning(mergeStep, entityPropertyPath) {
     let compiledOptions = mergingOptions.compileMergeOptions(mergeStep, true);
     let mergeRulesInfo = compiledOptions.mergeRulesInfo ? Sequence.from([compiledOptions.mergeRulesInfo]).toArray() : [];
     let nonCompliantRules = mergeRulesInfo.filter((ruleInfo) => {
         let allowsMultipleValues = ruleInfo.allowsMultipleValues;
         let ruleObject = ruleInfo.mergeRule ? ruleInfo.mergeRule.toObject() : null;
-        let valuesLimitedToOne = ruleObject && (ruleObject.maxValues === "1" || ruleObject.maxSources === "1");
-        return !(allowsMultipleValues || valuesLimitedToOne);
+        let valuesLimitedToOne = ruleObject && (fn.string(ruleObject.maxValues) === "1" || fn.string(ruleObject.maxSources) === "1");
+        let ruleFilteredOut = false;
+        if (entityPropertyPath) {
+            let ruleEntityPropertyPath = ruleObject ? ruleObject.entityPropertyPath : "";
+            ruleFilteredOut = ruleEntityPropertyPath !== entityPropertyPath;
+        }
+        return !(ruleFilteredOut || allowsMultipleValues || valuesLimitedToOne);
     });
     let nonCompliantRuleProperties = nonCompliantRules.map((ruleInfo) => {
         return ruleInfo.propertyName;
diff --git a/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/data-services/mastering/previewMatchingActivity/setup.xqy b/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/data-services/mastering/previewMatchingActivity/setup.xqy
@@ -16,4 +16,4 @@ xdmp:sleep(250);
 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-artifacts($test:__CALLER_FILE__)
+hub-test:load-artifacts($test:__CALLER_FILE__);
diff --git a/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/data-services/mastering/validateSteps/test-data/entities/validateMergeEntity.entity.json b/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/data-services/mastering/validateSteps/test-data/entities/validateMergeEntity.entity.json
@@ -10,6 +10,12 @@
       "properties": {
         "property1": {
           "datatype": "string"
+        },
+        "property2": {
+          "datatype": "string"
+        },
+        "property3": {
+          "datatype": "string"
         }
       }
     }
diff --git a/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/data-services/mastering/validateSteps/test-data/steps/merging/propertiesCount-mismatch.step.json b/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/data-services/mastering/validateSteps/test-data/steps/merging/propertiesCount-mismatch.step.json
@@ -12,7 +12,22 @@
   "targetFormat" : "json",
   "targetEntityType" : "validateMergeEntity",
   "stepId" : "propertiesCount-mismatch-merging",
+  "mergeStrategies": [
+    {
+      "strategyName": "only-one",
+      "maxValues": 1,
+      "maxSources": "All"
+    }
+  ],
   "mergeRules" : [ {
-    "entityPropertyPath": "property1"
-  } ]
+      "entityPropertyPath": "property1"
+    },
+    {
+      "entityPropertyPath": "property2"
+    },
+    {
+      "entityPropertyPath": "property3",
+      "mergeStrategyName": "only-one"
+    }
+  ]
 }
diff --git a/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/data-services/mastering/validateSteps/validateMergingStep.sjs b/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/data-services/mastering/validateSteps/validateMergingStep.sjs
@@ -1,9 +1,9 @@
 const test = require("/test/test-helper.xqy");
 
-function invokeService(stepName, view) {
+function invokeService(stepName, view, entityPropertyPath) {
   return fn.head(xdmp.invoke(
     "/data-hub/5/data-services/mastering/validateMergingStep.sjs",
-    {"stepName": stepName, "view": view }
+    { stepName, view, entityPropertyPath }
   ));
 }
 
@@ -13,8 +13,12 @@ function invokeService(stepName, view) {
     invokeService("targetEntityType-in-additionalCollections", "settings"), "targetEntityType-in-additionalCollections warning does not match"),
   test.assertEqual([{"level":"warn","message":"Warning: Target Collections includes the source collection dataHubMatchSummary-validateMergeEntity"}],
       invokeService("sourceCollection-in-additionalCollections", "settings"), "sourceCollection-in-additionalCollections warning does not match"),
-  test.assertEqual([{"level":"warn","message":"Warning: The current merge settings might produce merged documents that are inconsistent with the entity type\nIn the entity type validateMergeEntity, the property or properties property1 allows only a single value.\nIn every merge rule for the property property1 set Max Values or Max Sources to 1."}],
+  // test "rules" view for properties
+  test.assertEqual([{"level":"warn","message":"Warning: The current merge settings might produce merged documents that are inconsistent with the entity type\nIn the entity type validateMergeEntity, the property or properties property1, property2 allows only a single value.\nIn every merge rule for the property property1, property2 set Max Values or Max Sources to 1."}],
     invokeService("propertiesCount-mismatch", "rules"), `propertiesCount-mismatch warning does not match.`),
+  test.assertEqual([{"level":"warn","message":"Warning: The current merge settings might produce merged documents that are inconsistent with the entity type\nIn the entity type validateMergeEntity, the property or properties property1 allows only a single value.\nIn every merge rule for the property property1 set Max Values or Max Sources to 1."}],
+    invokeService("propertiesCount-mismatch", "rules", "property1"), `propertiesCount-mismatch warning does not match when filtering by entity property path.`),
+  test.assertEqual([], invokeService("propertiesCount-mismatch", "rules", "property3"), `propertiesCount-mismatch warning shouldn't show for property3 limited by strategy.`),
   test.assertEqual([], invokeService("propertiesCount-mismatch", "settings"), `propertiesCount-mismatch warning shouldn't show for 'settings' view.`),
   test.assertEqual([{"level":"warn","message":"Warning: Target Collections includes temporal collection(s): myTemporalCollection"}],
     invokeService("temporal-collection-in-additionalCollections", "settings"), "temporal-collection-in-additionalCollections warning does not match"),

Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,7 @@ const MergeRuleDialog: React.FC<Props> = (props) => {`
`469`	`469`	`newStepArtifact.mergeRules[index] = newMergeRules;`
`470`	`470`	`await updateMergingArtifact(newStepArtifact);`
`471`	`471`	`updateActiveStepArtifact(newStepArtifact);`
`472`		`- let warnings= await getMergingRulesWarnings(newStepArtifact);`
	`472`	`+ let warnings= await getMergingRulesWarnings(newStepArtifact, newMergeRules);`
`473`	`473`	`if (warnings !== undefined) { setValidationWarnings(warnings.data); }`
`474`	`474`	`}`
`475`	`475`	`};`
Original file line number	Diff line number	Diff line change
`@@ -226,15 +226,17 @@ const MergingStepDetail: React.FC = () => {`
`226`	`226`	`];`
`227`	`227`
`228`	`228`	`for (let key of mergingStep.mergeRules) {`
`229`		`- for (let key1 of mergingStep.mergeStrategies) {`
`230`		`- if (key.mergeStrategyName === key1.strategyName && commonStrategyNames.indexOf(key.mergeStrategyName)=== -1) {`
`231`		`- commonStrategyNames.push(key.mergeStrategyName);`
	`229`	`+ if (mergingStep.mergeStrategies) {`
	`230`	`+ for (let key1 of mergingStep.mergeStrategies) {`
	`231`	`+ if (key.mergeStrategyName === key1.strategyName && commonStrategyNames.indexOf(key.mergeStrategyName) === -1) {`
	`232`	`+ commonStrategyNames.push(key.mergeStrategyName);`
	`233`	`+ }`
`232`	`234`	`}`
`233`	`235`	`}`
`234`	`236`	`}`
`235`	`237`
`236`	`238`
`237`		`- mergingStep && mergingStep.mergeStrategies.length > 0 && mergingStep.mergeStrategies.forEach((i) => {`
	`239`	`+ mergingStep && mergingStep.mergeStrategies && mergingStep.mergeStrategies.length > 0 && mergingStep.mergeStrategies.forEach((i) => {`
`238`	`240`	`mergeStrategiesData.push(`
`239`	`241`	`{`
`240`	`242`	`strategyName: i["strategyName"],`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`
`18`	`18`	`const validateMergeLib = require("/data-hub/5/data-services/mastering/validateMergingStepLib.sjs");`
`19`	`19`
`20`		`-var stepName, view;`
	`20`	`+var stepName, view, entityPropertyPath;`
`21`	`21`
`22`	`22`	`xdmp.securityAssert("http://marklogic.com/data-hub/privileges/read-match-merge", "execute");`
`23`	`23`
`@@ -52,7 +52,7 @@ if (view === "settings") {`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`	`} else if (view === "rules") {`
`55`		`- let propertyWarnings = validateMergeLib.propertiesWarning(step);`
	`55`	`+ let propertyWarnings = validateMergeLib.propertiesWarning(step, entityPropertyPath);`
`56`	`56`	`if (propertyWarnings) {`
`57`	`57`	`warnings.push(propertyWarnings);`
`58`	`58`	`}`