chore: extract all condition-related properties to condition.json

camunda · Jan 19, 2024 · 2eb386d · 2eb386d
1 parent 132ea18
commit 2eb386d
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 34 deletions.
diff --git a/packages/element-templates-json-schema-shared/src/base-error-messages.json b/packages/element-templates-json-schema-shared/src/base-error-messages.json
@@ -139,8 +139,8 @@
       "allOf",
       0,
       "items",
-      "properties",
-      "condition",
+      "allOf",
+      1,
       "definitions",
       "condition"
     ],

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": [
@@ -80,7 +79,7 @@
               "description": "The value of a choice."
             },
             "condition": {
-              "$ref": "condition.json"
+              "$ref": "condition.json#/properties/condition"
             }
           },
           "required": [
@@ -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,12 +1,4 @@
 {
-  "$id": "#/condition",
-  "type": "object",
-  "description": "Condition(s) to activate the binding.",
-  "allOf": [
-    {
-      "$ref": "examples.json#/condition"
-    }
-  ],
   "definitions": {
     "condition": {
       "type": "object",
@@ -71,24 +63,39 @@
       ]
     }
   },
-  "oneOf": [
-    {
-      "$ref": "#/definitions/condition"
+  "properties": {
+    "id": {
+      "type": "string",
+      "description": "Unique identifier of the property."
     },
-    {
-      "properties": {
-        "allMatch": {
-          "$id": "#/allMatch",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/condition"
+    "condition": {
+      "type": "object",
+      "description": "Condition(s) to activate the binding.",
+      "allOf": [
+        {
+          "$ref": "examples.json#/condition"
+        }
+      ],
+      "oneOf": [
+        {
+          "$ref": "#/definitions/condition"
+        },
+        {
+          "properties": {
+            "allMatch": {
+              "$id": "#/allMatch",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/condition"
+              },
+              "minItems": 1
+            }
           },
-          "minItems": 1
+          "required": [
+            "allMatch"
+          ]
         }
-      },
-      "required": [
-        "allMatch"
       ]
     }
-  ]
-}
+  }
+}