fix(schema): allow rows to be empty in form schema

bpmn-io · Nov 1, 2023 · f98a235 · f98a235
1 parent 2220f19
commit f98a235
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 6 deletions.
diff --git a/packages/form-js/CHANGELOG.md b/packages/form-js/CHANGELOG.md
@@ -2,10 +2,16 @@
 
 All notable changes to [form-js](https://github.com/bpmn-io/form-js) are documented here. We use [semantic versioning](http://semver.org/) for releases.
 
-## 1.4.0
+## Unreleased
 
 ___Note:__ Yet to be released changes appear here._
 
+### JSON Schema
+
+* `FEAT`: initial release, moved from https://github.com/pinussilvestrus/form-json-schema
+
+## 1.4.0
+
 ### General 
 
 * `FEAT`: support custom form fields ([#123](https://github.com/bpmn-io/form-js/issues/123))
@@ -35,10 +41,6 @@ ___Note:__ Yet to be released changes appear here._
 
 `FEAT`: provide `additionalModules` to both viewer and editor ([#776](https://github.com/bpmn-io/form-js/pull/776))
 
-### JSON Schema
-
-* `FEAT`: initial release, moved from https://github.com/pinussilvestrus/form-json-schema
-
 ## 1.3.3
 
 ## General

diff --git a/packages/form-json-schema/src/defs/layout.json b/packages/form-json-schema/src/defs/layout.json
@@ -6,7 +6,7 @@
   "properties": {
     "row": {
       "$id": "/#component/layout/row",
-      "type": "string",
+      "type": [ "string", "null" ],
       "description": "Row in which a form field is placed."
     },
     "columns": {

diff --git a/packages/form-json-schema/test/fixtures/layout-empty-row.js b/packages/form-json-schema/test/fixtures/layout-empty-row.js
@@ -0,0 +1,15 @@
+export const form = {
+  type: 'default',
+  components: [
+    {
+      type: 'textfield',
+      key: 'firstName',
+      layout: {
+        row: null,
+        columns: 12
+      }
+    }
+  ]
+};
+
+export const errors = null;
diff --git a/.../form-json-schema/test/spec/schemaSpec.js → ...form-json-schema/test/spec/schema.spec.js b/.../form-json-schema/test/spec/schemaSpec.js → ...form-json-schema/test/spec/schema.spec.js
diff --git a/...m-json-schema/test/spec/validationSpec.js → ...-json-schema/test/spec/validation.spec.js b/...m-json-schema/test/spec/validationSpec.js → ...-json-schema/test/spec/validation.spec.js
@@ -102,6 +102,9 @@ describe('validation', function() {
   testForm('validate-validationType');
 
 
+  testForm('layout-empty-row');
+
+
   describe('rules - required properties', function() {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -102,6 +102,9 @@ describe('validation', function() {
		testForm('validate-validationType');


		testForm('layout-empty-row');


		describe('rules - required properties', function() {


Expand Down