wip

camunda · Jan 15, 2024 · f2cce3c · f2cce3c
1 parent 4d6aa3b
commit f2cce3c
Show file tree

Hide file tree

Showing 6 changed files with 117 additions and 83 deletions.
diff --git a/packages/element-templates-json-schema-shared/src/defs/base-properties.json b/packages/element-templates-json-schema-shared/src/defs/base-properties.json
@@ -24,13 +24,12 @@
             "choices"
           ]
         }
+      },
+      {
+        "$ref": "condition.json"
       }
     ],
     "properties": {
-      "id": {
-        "type": "string",
-        "description": "Unique identifier of the property."
-      },
       "value": {
         "$id": "#/properties/property/value",
         "type": [
@@ -143,9 +142,6 @@
         "$id": "#/properties/property/group",
         "type": "string",
         "description": "The custom group of a control field."
-      },
-      "condition": {
-        "$ref": "condition.json"
       }
     }
   }

diff --git a/packages/element-templates-json-schema-shared/src/defs/condition.json b/packages/element-templates-json-schema-shared/src/defs/condition.json
@@ -1,94 +1,101 @@
 {
-  "$id": "#/condition",
-  "type": "object",
-  "description": "Condition(s) to activate the binding.",
-  "allOf": [
-    {
-      "$ref": "examples.json#/condition"
-    }
-  ],
-  "definitions": {
+  "properties": {
+    "id": {
+      "type": "string",
+      "description": "Unique identifier of the property."
+    },
     "condition": {
       "type": "object",
-      "required": [
-        "property"
-      ],
-      "properties": {
-        "type": {
-          "$id": "#/condition/type",
-          "const": "simple",
-          "description": "The type of the condition.",
-          "default": "simple"
-        },
-        "property": {
-          "$id": "#/condition/property",
-          "type": "string",
-          "description": "The id of the property to check."
-        }
-      },
-      "oneOf": [
+      "description": "Condition(s) to activate the binding.",
+      "allOf": [
         {
+          "$ref": "examples.json#/condition"
+        }
+      ],
+      "definitions": {
+        "condition": {
+          "type": "object",
+          "required": [
+            "property"
+          ],
           "properties": {
-            "equals": {
-              "type": [
-                "string",
-                "number",
-                "boolean"
-              ]
+            "type": {
+              "$id": "#/condition/type",
+              "const": "simple",
+              "description": "The type of the condition.",
+              "default": "simple"
+            },
+            "property": {
+              "$id": "#/condition/property",
+              "type": "string",
+              "description": "The id of the property to check."
             }
           },
-          "required": [
-            "equals"
+          "oneOf": [
+            {
+              "properties": {
+                "equals": {
+                  "type": [
+                    "string",
+                    "number",
+                    "boolean"
+                  ]
+                }
+              },
+              "required": [
+                "equals"
+              ]
+            },
+            {
+              "properties": {
+                "oneOf": {
+                  "type": "array",
+                  "items": {
+                    "type": [
+                      "string",
+                      "number"
+                    ]
+                  }
+                }
+              },
+              "required": [
+                "oneOf"
+              ]
+            },
+            {
+              "properties": {
+                "isActive": {
+                  "type": "boolean",
+                  "description": "For `true`, activates the property when given property is active"
+                }
+              },
+              "required": [
+                "isActive"
+              ]
+            }
           ]
+        }
+      },
+      "oneOf": [
+        {
+          "$ref": "#/properties/condition/definitions/condition"
         },
         {
           "properties": {
-            "oneOf": {
+            "allMatch": {
+              "$id": "#/allMatch",
               "type": "array",
               "items": {
-                "type": [
-                  "string",
-                  "number"
-                ]
-              }
-            }
-          },
-          "required": [
-            "oneOf"
-          ]
-        },
-        {
-          "properties": {
-            "isActive": {
-              "type": "boolean",
-              "description": "For `true`, activates the property when given property is active"
+                "$ref": "#/properties/condition/definitions/condition"
+              },
+              "minItems": 1
             }
           },
           "required": [
-            "isActive"
+            "allMatch"
           ]
         }
       ]
     }
-  },
-  "oneOf": [
-    {
-      "$ref": "#/definitions/condition"
-    },
-    {
-      "properties": {
-        "allMatch": {
-          "$id": "#/allMatch",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/condition"
-          },
-          "minItems": 1
-        }
-      },
-      "required": [
-        "allMatch"
-      ]
-    }
-  ]
-}
+  }
+}
diff --git a/packages/element-templates-json-schema-shared/test/helpers/index.js b/packages/element-templates-json-schema-shared/test/helpers/index.js
@@ -15,7 +15,8 @@ function createValidator(schema, errors) {
 
   const ajv = new Ajv({
     allErrors: true,
-    strict: false
+    strict: false,
+    $data: true
   });
 
   AjvErrors(ajv);

diff --git a/packages/zeebe-element-templates-json-schema/test/fixtures/condition-on-itself.js b/packages/zeebe-element-templates-json-schema/test/fixtures/condition-on-itself.js
@@ -0,0 +1,24 @@
+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': {
+        property: 'myId',
+        equals: 'text'
+      }
+    }
+  ]
+};
+
+export const errors = [];
diff --git a/packages/zeebe-element-templates-json-schema/test/fixtures/condition.js b/packages/zeebe-element-templates-json-schema/test/fixtures/condition.js
@@ -80,6 +80,7 @@ export const template = {
       }
     },
     {
+      'id': 'someId',
       'label': 'default condition type',
       'type': 'String',
       'condition': {

diff --git a/packages/zeebe-element-templates-json-schema/test/spec/validationSpec.js b/packages/zeebe-element-templates-json-schema/test/spec/validationSpec.js
@@ -48,6 +48,8 @@ describe('validation', function() {
         errors
       } = validateTemplate(template);
 
+      printNested(errors);
+
       // then
       expect(errors).to.eql(expectedErrors);
     });
@@ -258,7 +260,7 @@ describe('validation', function() {
 
     describe('condition', function() {
 
-      testTemplate('condition');
+      testOnly('condition');
 
 
       testTemplate('condition-missing-property');
@@ -289,6 +291,9 @@ describe('validation', function() {
 
 
       testTemplate('condition-dropdown-choices-invalid');
+
+
+      testOnly('condition-on-itself');
     });