feat: disallow depending on itself for allMatch condition

camunda · Jan 16, 2024 · e4438d1 · e4438d1
1 parent 4a0e2b6
commit e4438d1
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 9 deletions.
diff --git a/packages/element-templates-json-schema-shared/src/defs/condition.json b/packages/element-templates-json-schema-shared/src/defs/condition.json
@@ -11,16 +11,36 @@
         "not": {
           "properties": {
             "condition": {
-              "required": [
-                "property"
-              ],
-              "properties": {
-                "property": {
-                  "const": {
-                    "$data": "2/id"
+              "anyOf": [
+                {
+                  "required": [
+                    "property"
+                  ],
+                  "properties": {
+                    "property": {
+                      "const": {
+                        "$data": "2/id"
+                      }
+                    }
+                  }
+                },
+                {
+                  "required": [
+                    "allMatch"
+                  ],
+                  "allMatch": {
+                    "contains": {
+                      "properties": {
+                        "property": {
+                          "const": {
+                            "$data": "2/id"
+                          }
+                        }
+                      }
+                    }
                   }
                 }
-              }
+              ]
             }
           }
         }

diff --git a/packages/zeebe-element-templates-json-schema/test/fixtures/condition-allMatch-on-itself.js b/packages/zeebe-element-templates-json-schema/test/fixtures/condition-allMatch-on-itself.js
@@ -0,0 +1,29 @@
+export const template = {
+  'name': 'Condition',
+  'id': 'example.com.condition',
+  'appliesTo': [
+    'bpmn:ServiceTask'
+  ],
+  'properties': [
+    {
+      'id': 'myId',
+      'label': 'input 1',
+      'type': 'String',
+      'binding': {
+        'type': 'property',
+        'name': 'input1'
+      },
+      'condition': {
+        'allMatch': [
+          {
+            'type': 'simple',
+            property: 'myId',
+            equals: 'text'
+          }
+        ]
+      }
+    }
+  ]
+};
+
+export const errors = [];
diff --git a/packages/zeebe-element-templates-json-schema/test/spec/validationSpec.js b/packages/zeebe-element-templates-json-schema/test/spec/validationSpec.js
@@ -278,7 +278,7 @@ describe('validation', function() {
       testTemplate('condition-wrong-type');
 
 
-      testTemplate('condition-multiple');
+      testOnly('condition-multiple');
 
 
       testTemplate('condition-empty-allMatch');
@@ -294,6 +294,9 @@ describe('validation', function() {
 
 
       testOnly('condition-on-itself');
+
+
+      testOnly('condition-allMatch-on-itself');
     });