-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: disallow condition depending on the containing property
Closes #125
- Loading branch information
Showing
8 changed files
with
287 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
195 changes: 125 additions & 70 deletions
195
packages/element-templates-json-schema-shared/src/defs/condition.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,94 +1,149 @@ | ||
| { | ||
| "$id": "#/condition", | ||
| "type": "object", | ||
| "description": "Condition(s) to activate the binding.", | ||
| "allOf": [ | ||
| { | ||
| "$ref": "examples.json#/condition" | ||
| "if": { | ||
| "required": [ | ||
| "id", | ||
| "condition" | ||
| ] | ||
| }, | ||
| "then": { | ||
| "not": { | ||
| "properties": { | ||
| "condition": { | ||
| "anyOf": [ | ||
| { | ||
| "required": [ | ||
| "property" | ||
| ], | ||
| "properties": { | ||
| "property": { | ||
| "const": { | ||
| "$data": "2/id" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "required": [ | ||
| "allMatch" | ||
| ], | ||
| "allMatch": { | ||
| "contains": { | ||
| "properties": { | ||
| "property": { | ||
| "const": { | ||
| "$data": "2/id" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "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" | ||
| ] | ||
| } | ||
| "$ref": "#/properties/condition/definitions/condition" | ||
| }, | ||
| "minItems": 1 | ||
| } | ||
| }, | ||
| "required": [ | ||
| "oneOf" | ||
| ] | ||
| }, | ||
| { | ||
| "properties": { | ||
| "isActive": { | ||
| "type": "boolean", | ||
| "description": "For `true`, activates the property when given property is active" | ||
| } | ||
| }, | ||
| "required": [ | ||
| "isActive" | ||
| "allMatch" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "oneOf": [ | ||
| { | ||
| "$ref": "#/definitions/condition" | ||
| }, | ||
| { | ||
| "properties": { | ||
| "allMatch": { | ||
| "$id": "#/allMatch", | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "#/definitions/condition" | ||
| }, | ||
| "minItems": 1 | ||
| } | ||
| }, | ||
| "required": [ | ||
| "allMatch" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
packages/zeebe-element-templates-json-schema/test/fixtures/condition-allMatch-on-itself.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| 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 = [ | ||
| { | ||
| keyword: 'errorMessage', | ||
| dataPath: '/properties/0', | ||
| schemaPath: '#/allOf/0/items/allOf/1/allOf/0/then/errorMessage', | ||
| params: { | ||
| errors: [ | ||
| { | ||
| keyword: 'not', | ||
| dataPath: '/properties/0', | ||
| schemaPath: '#/allOf/0/items/allOf/1/allOf/0/then/not', | ||
| params: {}, | ||
| message: 'should NOT be valid', | ||
| emUsed: true | ||
| } | ||
| ] | ||
| }, | ||
| message: 'Invalid condition.property, must be different than property.id' | ||
| }, | ||
| { | ||
| keyword: 'if', | ||
| dataPath: '/properties/0', | ||
| schemaPath: '#/allOf/0/items/allOf/1/allOf/0/if', | ||
| params: { failingKeyword: 'then' }, | ||
| message: 'should match "then" schema' | ||
| }, | ||
| { | ||
| keyword: 'type', | ||
| dataPath: '', | ||
| schemaPath: '#/oneOf/1/type', | ||
| params: { type: 'array' }, | ||
| message: 'should be array' | ||
| }, | ||
| { | ||
| keyword: 'oneOf', | ||
| dataPath: '', | ||
| schemaPath: '#/oneOf', | ||
| params: { passingSchemas: null }, | ||
| message: 'should match exactly one schema in oneOf' | ||
| } | ||
| ]; |
Oops, something went wrong.