fix: allow value type Number for Number fields

closes #138
camunda · Mar 4, 2024 · fcb5a16 · fcb5a16
1 parent 31969ba
commit fcb5a16
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 3 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,16 +24,41 @@
             "choices"
           ]
         }
-      },
+      },      
       {
         "$ref": "condition.json"
+      },
+      {
+        "if": {
+          "properties": {
+            "type": {
+              "not": {
+                "const": "Number"
+              }
+            }
+          },
+          "required": [
+            "type"
+          ]
+        },
+        "then": {
+          "properties": {
+            "value": {
+              "type": [
+                "string",
+                "boolean"
+              ]
+            }
+          }
+        }
       }
     ],
     "properties": {
       "value": {
         "$id": "#/properties/property/value",
         "type": [
           "string",
+          "number",
           "boolean"
         ],
         "description": "The value of a control field."

diff --git a/packages/element-templates-json-schema/test/fixtures/number-value.js b/packages/element-templates-json-schema/test/fixtures/number-value.js
@@ -21,7 +21,7 @@ export const errors = [
   {
     keyword: 'type',
     dataPath: '/properties/0/value',
-    schemaPath: '#/allOf/0/items/properties/value/type',
+    schemaPath: '#/allOf/0/items/allOf/2/then/properties/value/type',
     params: {
       type: [
         'string',
@@ -30,6 +30,15 @@ export const errors = [
     },
     message: 'should be string,boolean'
   },
+  {
+    dataPath: '/properties/0',
+    keyword: 'if',
+    message: 'should match "then" schema',
+    params: {
+      failingKeyword: 'then'
+    },
+    schemaPath: '#/allOf/0/items/allOf/2/if'
+  },
   {
     dataPath: '',
     keyword: 'type',

diff --git a/packages/zeebe-element-templates-json-schema/test/fixtures/number-value.js b/packages/zeebe-element-templates-json-schema/test/fixtures/number-value.js
@@ -13,6 +13,15 @@ export const template = {
         'type': 'property',
         'name': 'name'
       }
+    },
+    {
+      'label': 'Am I awesome?',
+      'type': 'Number',
+      'value': 50,
+      'binding': {
+        'type': 'zeebe:property',
+        'name': 'customProp'
+      }
     }
   ]
 };
@@ -21,7 +30,7 @@ export const errors = [
   {
     keyword: 'type',
     dataPath: '/properties/0/value',
-    schemaPath: '#/allOf/0/items/properties/value/type',
+    schemaPath: '#/allOf/0/items/allOf/2/then/properties/value/type',
     params: {
       type: [
         'string',
@@ -30,6 +39,15 @@ export const errors = [
     },
     message: 'should be string,boolean'
   },
+  {
+    dataPath: '/properties/0',
+    keyword: 'if',
+    message: 'should match "then" schema',
+    params: {
+      failingKeyword: 'then'
+    },
+    schemaPath: '#/allOf/0/items/allOf/2/if'
+  },
   {
     dataPath: '',
     keyword: 'type',