Ensure a section Column Size is not subsequently overwritten when a child card's column size is configured.

Author: Sabantu

src/formBuilder/FormBuilder.test.js

@@ -297,6 +297,104 @@ describe('FormBuilder', () => {
     expect(errors).toEqual([]);
   });
 
+  it('supports column size on sections', () => {
+    const jsonSchema = {
+      definitions: {
+        first_names: {
+          title: 'First Names',
+          type: 'string',
+        },
+        last_names: {
+          title: 'Last Names',
+          type: 'string',
+        },
+        residential_address: {
+          title: 'Residential Address',
+          type: 'object',
+          properties: {
+            country: {
+              title: 'Country',
+              type: 'string',
+            },
+            street_address_line: {
+              title: 'Street Address Line',
+              type: 'string',
+            },
+          },
+          dependencies: {},
+          required: [],
+        },
+      },
+      properties: {
+        user_first_names: {
+          $ref: '#/definitions/first_names',
+          title: 'User First Names',
+          description: '',
+        },
+        user_last_name: {
+          $ref: '#/definitions/last_names',
+          title: 'User Last Name',
+          description: '',
+        },
+        user_residential_address: {
+          $ref: '#/definitions/residential_address',
+          title: 'User Residential Address',
+          description: '',
+        },
+      },
+      dependencies: {},
+      required: [],
+      type: 'object',
+    };
+
+    const uischema = {
+      definitions: {
+        residential_address: {
+          'ui:order': ['country', 'street_address_line'],
+        },
+      },
+      'ui:order': [
+        'user_first_names',
+        'user_last_name',
+        'user_residential_address',
+      ],
+      user_first_names: {
+        'ui:column': '25',
+      },
+      user_last_name: {
+        'ui:column': '25',
+      },
+      user_residential_address: {
+        'ui:order': ['country', 'address_line'],
+        'ui:column': '50',
+        country: {
+          'ui:column': '30',
+        },
+        street_address_line: {
+          'ui:column': '70',
+        },
+      },
+    };
+
+    const props = {
+      schema: JSON.stringify(jsonSchema),
+      uiSchema: JSON.stringify(uischema),
+      onChange: jest.fn(() => {}),
+      mods: {},
+      className: 'my-form-builder',
+    };
+
+    const div = document.createElement('div');
+    document.body.appendChild(div);
+    const wrapper = mount(<FormBuilder {...props} />, { attachTo: div });
+    const errors = wrapper
+      .find('.alert-warning')
+      .first()
+      .find('li')
+      .map((error) => error.text());
+    expect(errors).toEqual([]);
+  });
+
   it('validates additionalProperties as a valid property', () => {
     const jsonSchema = {
       $schema: `http://json-schema.org/draft-07/schema#`,

src/formBuilder/utils.js

@@ -864,12 +864,9 @@ export function updateSchemas(
   },
 ) {
   const { schema, uischema, onChange, definitionUi } = parameters;
-  const definedUi = (uischema || {}).definitions
-    ? { definitions: uischema.definitions }
-    : {};
 
   const newUiSchema = Object.assign(
-    definedUi,
+    { ...uischema },
     generateUiSchemaFromElementProps(elementArr, definitionUi),
   );
   const newSchema = Object.assign(
@@ -879,7 +876,6 @@ export function updateSchemas(
 
   // mandate that the type is an object if not already done
   newSchema.type = 'object';
-
   onChange(newSchema, newUiSchema);
 }