elyra-ai#2028 default_value condition not run when setting property v…

…alues (elyra-ai#2029) Signed-off-by: Carita Ou <[email protected]>
veenas1 · Jun 20, 2024 · 830bfe3 · 830bfe3
1 parent 3f43a0f
commit 830bfe3
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 1 deletion.
diff --git a/canvas_modules/common-canvas/__tests__/common-properties/properties-controller-test.js b/canvas_modules/common-canvas/__tests__/common-properties/properties-controller-test.js
@@ -1241,6 +1241,14 @@ describe("Properties Controller handlers", () => {
 		expect(propertyListener.calledWith({
 			action: "SET_PROPERTIES"
 		})).to.be.true;
+
+		// Verify default_value condition is run when calling setPropertyValues() with setDefaultValues === true
+		expect(controller.getPropertyValues()).to.have.property("checkbox_null", null);
+		controller.setPropertyValues({
+			"checkbox_error": true,
+			"checkbox_warning": true
+		}, { setDefaultValues: true });
+		expect(controller.getPropertyValues()).to.have.property("checkbox_null", true);
 	});
 	it("should set default values having 0 or ' ' when setPropertyValues() is called with option { setDefaultValues: true }", () => {
 		const renderedObject = testUtils.flyoutEditorForm(oneofselectParamDef);

diff --git a/canvas_modules/common-canvas/__tests__/test_resources/paramDefs/checkbox_paramDef.json b/canvas_modules/common-canvas/__tests__/test_resources/paramDefs/checkbox_paramDef.json
@@ -309,6 +309,30 @@
     ]
   },
   "conditions": [
+    {
+      "default_value": {
+        "parameter_ref": "checkbox_null",
+        "value": true,
+        "evaluate": {
+          "and": [
+            {
+              "condition": {
+                "parameter_ref": "checkbox_error",
+                "op": "equals",
+                "value": true
+              }
+            },
+            {
+              "condition": {
+                "parameter_ref": "checkbox_warning",
+                "op": "equals",
+                "value": true
+              }
+            }
+          ]
+        }
+      }
+    },
     {
       "validation": {
         "fail_message": {

diff --git a/canvas_modules/common-canvas/src/common-properties/properties-controller.js b/canvas_modules/common-canvas/src/common-properties/properties-controller.js
@@ -1260,7 +1260,7 @@ export default class PropertiesController {
 
 		this.propertiesStore.setPropertyValues(inValues);
 
-		if (options && options.isInitProps) {
+		if (options?.isInitProps || options?.setDefaultValues) {
 			// Evaluate conditional defaults based on current_parameters upon loading of view
 			// For a given parameter_ref, if multiple conditions evaluate to true only the first one is used.
 			const conditionalDefaultValues = {};

diff --git a/canvas_modules/harness/test_resources/parameterDefs/checkbox_paramDef.json b/canvas_modules/harness/test_resources/parameterDefs/checkbox_paramDef.json
@@ -303,6 +303,30 @@
     ]
   },
   "conditions": [
+    {
+      "default_value": {
+        "parameter_ref": "checkbox_null",
+        "value": true,
+        "evaluate": {
+          "and": [
+            {
+              "condition": {
+                "parameter_ref": "checkbox_error",
+                "op": "equals",
+                "value": true
+              }
+            },
+            {
+              "condition": {
+                "parameter_ref": "checkbox_warning",
+                "op": "equals",
+                "value": true
+              }
+            }
+          ]
+        }
+      }
+    },
     {
       "validation": {
         "fail_message": {