diff --git a/packages/form-js-viewer/src/index.js b/packages/form-js-viewer/src/index.js index e5552b071..1be1568db 100644 --- a/packages/form-js-viewer/src/index.js +++ b/packages/form-js-viewer/src/index.js @@ -5,7 +5,7 @@ export * from './render'; export * from './util'; export * from './features'; -const schemaVersion = 13; +const schemaVersion = 14; export { Form, diff --git a/packages/form-js-viewer/src/util/index.js b/packages/form-js-viewer/src/util/index.js index c65dfef52..7a425ab61 100644 --- a/packages/form-js-viewer/src/util/index.js +++ b/packages/form-js-viewer/src/util/index.js @@ -23,7 +23,9 @@ const EXPRESSION_PROPERTIES = [ 'validate.minLength', 'validate.maxLength', 'valuesExpression', - 'url' + 'url', + 'dataSource', + 'columnsExpression' ]; const TEMPLATE_PROPERTIES = [ diff --git a/packages/form-js/test/spec/Form.spec.js b/packages/form-js/test/spec/Form.spec.js index ef3622ef1..6d636b8a5 100644 --- a/packages/form-js/test/spec/Form.spec.js +++ b/packages/form-js/test/spec/Form.spec.js @@ -128,7 +128,7 @@ describe('viewer exports', function() { it('should expose schemaVersion', function() { expect(typeof schemaVersion).to.eql('number'); - expect(schemaVersion).to.eql(13); + expect(schemaVersion).to.eql(14); }); diff --git a/packages/form-json-schema/README.md b/packages/form-json-schema/README.md index 87ba28d06..3e611975a 100644 --- a/packages/form-json-schema/README.md +++ b/packages/form-json-schema/README.md @@ -51,6 +51,7 @@ This schema is currently only compatible with following [form-js](https://github | JSON schema version | form-js schema version | |---|---| | >= 1.5.0 | <= 13 | +| >= 1.6.0 | <= 14 | ## License diff --git a/packages/form-json-schema/src/index.json b/packages/form-json-schema/src/index.json index 74382315a..a02e51cd8 100644 --- a/packages/form-json-schema/src/index.json +++ b/packages/form-json-schema/src/index.json @@ -25,7 +25,7 @@ "description": "The schema version of a form", "type": "integer", "minimum": 1, - "maximum": 13 + "maximum": 14 }, "executionPlatform": { "$id": "#/executionPlatform", @@ -57,8 +57,8 @@ ] } }, - "required": [ - "type", + "required": [ + "type", "components" ] } \ No newline at end of file diff --git a/packages/form-json-schema/test/fixtures/schemaVersion-not-supported.js b/packages/form-json-schema/test/fixtures/schemaVersion-not-supported.js index 6822e7980..e88534525 100644 --- a/packages/form-json-schema/test/fixtures/schemaVersion-not-supported.js +++ b/packages/form-json-schema/test/fixtures/schemaVersion-not-supported.js @@ -1,7 +1,7 @@ export const form = { type: 'default', components: [], - schemaVersion: 14 + schemaVersion: 15 }; export const errors = [ @@ -9,7 +9,7 @@ export const errors = [ instancePath: '/schemaVersion', schemaPath: '#/properties/schemaVersion/maximum', keyword: 'maximum', - params: { comparison: '<=', limit: 13 }, - message: 'must be <= 13' + params: { comparison: '<=', limit: 14 }, + message: 'must be <= 14' } ]; \ No newline at end of file