guiUtils: Prefer defaults from top-level templates when merging allOf templates

Author: mstokes-f5

CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.17.0
+## Fixed
+* guiUtils: Prefer defaults from top-level templates when merging allOf templates
+
 # v0.16.0
 ## Fixed
 * schema_provider: Fix loading schema files with a '.' in the filename 

lib/gui_utils.js

@@ -112,25 +112,28 @@ const fixAllOfOrder = (schema, orderID) => {
 };
 
 const mergeAllOf = (schema) => {
+    const useObjValue = [
+        'title',
+        'description',
+        'default',
+        'propertyOrder'
+    ];
+
     if (!schema.allOf) {
         return schema;
     }
 
     schema.allOf.forEach(subSchema => mergeAllOf(subSchema));
 
     mergeWith(schema, ...schema.allOf, (objValue, srcValue, key) => {
-        if (key === 'title' || key === 'description') {
+        if (useObjValue.includes(key)) {
             return objValue;
         }
 
         if (key === 'required') {
             return Array.from(new Set([...(objValue || []), ...srcValue]));
         }
 
-        if (key === 'propertyOrder') {
-            return objValue;
-        }
-
         if (key === 'dependencies') {
             return mergeWith({}, objValue, srcValue, (dst, src) => {
                 if (Array.isArray(dst) && Array.isArray(src)) {

test/gui_utils.js

@@ -110,6 +110,32 @@ describe('GUI utils test', function () {
         // Preserve top-level title
         assert.strictEqual(schema.title, 'top level');
     });
+    it('all_of_defaults', function () {
+        let schema = {
+            title: 'extended',
+            properties: {
+                port: {
+                    default: 45
+                }
+            },
+            allOf: [
+                {
+                    title: 'base',
+                    properties: {
+                        port: {
+                            type: 'integer',
+                            default: 443
+                        }
+                    }
+                }
+            ]
+        };
+        schema = guiUtils.modSchemaForJSONEditor(schema);
+        console.log(JSON.stringify(schema, null, 2));
+
+        const props = schema.properties;
+        assert.strictEqual(props.port.default, 45);
+    });
     it('all_of_merge_dependencies', function () {
         let schema = {
             type: 'object',