fix: ensure FEEL value is parsed when comparing changed properties

Related to camunda/camunda-modeler#4967

Author: jarekdanielak

src/cloud-element-templates/Helper.js

@@ -176,16 +176,25 @@ export function findZeebeSubscription(message) {
   return findExtension(message, 'zeebe:Subscription');
 }
 
-export function getDefaultValue(property) {
-
+/**
+ * Get the default value disregarding generated values.
+ */
+export function getDefaultFixedValue(property) {
   if (
     shouldCastToFeel(property) || property.feel === 'required'
   ) {
     return toFeelExpression(property.value, property.type);
   }
 
-  if (property.value !== undefined) {
-    return property.value;
+  return property.value;
+}
+
+export function getDefaultValue(property) {
+
+  const value = getDefaultFixedValue(property);
+
+  if (value !== undefined) {
+    return value;
   }
 
   if (property.generatedValue) {

src/cloud-element-templates/cmd/ChangeElementTemplateHandler.js

@@ -6,6 +6,7 @@ import {
 import {
   findExtension,
   findMessage,
+  getDefaultFixedValue,
   getDefaultValue,
   getTemplateVersion,
   getTemplateId,
@@ -1705,7 +1706,7 @@ function shouldKeepValue(element, oldProperty, newProperty) {
  * @returns {boolean}
  */
 function propertyChanged(element, oldProperty) {
-  const oldPropertyValue = oldProperty.value;
+  const oldPropertyValue = getDefaultFixedValue(oldProperty);
 
   return getPropertyValue(element, oldProperty) !== oldPropertyValue;
 }

test/spec/cloud-element-templates/behavior/ConditionalBehavior.dependent-dropdowns.json

@@ -82,6 +82,38 @@
       "constraints": {
         "notEmpty": true
       }
+    },
+    {
+      "id": "feel-value",
+      "label": "Broken FEEL",
+      "feel": "required",
+      "binding": {
+        "name": "feel-value",
+        "type": "property"
+      },
+      "condition": {
+        "property": "root",
+        "equals": "Root A",
+        "type": "simple"
+      },
+      "type": "Text",
+      "value": "broken"
+    },
+    {
+      "id": "feel-value",
+      "label": "Correct FEEL",
+      "feel": "required",
+      "binding": {
+        "name": "feel-value",
+        "type": "property"
+      },
+      "condition": {
+        "property": "root",
+        "equals": "Root B",
+        "type": "simple"
+      },
+      "type": "Text",
+      "value": "=correct"
     }
   ]
 }

test/spec/cloud-element-templates/behavior/ConditionalBehavior.spec.js

@@ -139,6 +139,33 @@ describe('provider/cloud-element-templates - ConditionalBehavior', function() {
     );
 
 
+    it('should update conditional feel property (missing equal sign)', inject(
+      async function(modeling) {
+
+        // given
+        const element = changeTemplate('Task_1', dependentDropdownsTemplate);
+        const businessObject = getBusinessObject(element);
+
+        modeling.updateModdleProperties(element, businessObject, {
+          root: 'Root A',
+        });
+
+        // assume
+        expect(businessObject.get('root')).to.eql('Root A');
+        expect(businessObject.get('feel-value')).to.eql('=broken');
+
+        // when
+        modeling.updateModdleProperties(element, businessObject, {
+          root: 'Root B',
+        });
+
+        // then
+        expect(businessObject.get('root')).to.eql('Root B');
+        expect(businessObject.get('feel-value')).to.eql('=correct');
+      })
+    );
+
+
     it('undo', inject(function(commandStack, modeling) {
 
       // given