Merge pull request jdorn#728 from tohosaku/Fix_remove_empty_properties

Fix jdorn#725 remove_empty_properties

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - AbstractEditor, AbstractTheme, AbstractIconlib had been removed, re-expose them
 - fix static property #724 #723
+- fix option remove_empty_properties #725 #728
 
 ### 2.2.0
 

src/editors/object.js

@@ -1049,20 +1049,19 @@ export class ObjectEditor extends AbstractEditor {
       return undefined
     }
     const result = super.getValue()
-    const isEmpty = i => typeof result[i] === 'undefined' || result[i] === '' ||
+    const isEmpty = obj => typeof obj === 'undefined' || obj === '' ||
     (
-      result[i] === Object(result[i]) &&
-      Object.keys(result[i]).length === 0 &&
-      result[i].constructor === Object
+      obj === Object(obj) &&
+      Object.keys(obj).length === 0 &&
+      obj.constructor === Object
     )
-    if (this.jsoneditor.options.remove_empty_properties || this.options.remove_empty_properties) {
-      Object.keys(result).forEach(i => {
-        if (isEmpty(i)) {
-          delete result[i]
+    if (result && (this.jsoneditor.options.remove_empty_properties || this.options.remove_empty_properties)) {
+      Object.keys(result).forEach(key => {
+        if (isEmpty(result[key])) {
+          delete result[key]
         }
       })
     }
-
     return result
   }
 

tests/unit/editors/object.spec.js

@@ -0,0 +1,79 @@
+import { JSONEditor } from '../../../src/core'
+
+const fixture = [
+  {
+    title: 'Object Editor Test',
+    schema: {
+      type: 'object',
+      required: [
+        'name'
+      ],
+      properties: {
+        name: {
+          type: 'string',
+          default: 'Jeremy Dorn'
+        }
+      }
+    },
+    value: {
+      name: 'Jeremy Dorn'
+    }
+  },
+  {
+    title: 'remove_empty_properties test',
+    schema: {
+      type: 'object',
+      required: [
+        'name'
+      ],
+      properties: {
+        name: {
+          type: 'string',
+          default: 'Jeremy Dorn'
+        },
+        location: {
+          type: 'object',
+          properties: {
+            city: {
+              type: 'string'
+            }
+          },
+          options: {
+            remove_empty_properties: true
+          }
+        }
+      },
+      options: {
+        remove_empty_properties: true
+      }
+    },
+    value: {
+      name: 'Jeremy Dorn'
+    }
+  }
+]
+
+describe('Object Editor', () => {
+  let element
+  let editor
+
+  beforeEach(() => {
+    document.body.insertAdjacentHTML(
+      'afterbegin',
+      '<div id="fixture"></div>')
+    element = document.getElementById('fixture')
+  })
+
+  afterEach(() => {
+    editor.destroy()
+  })
+
+  fixture.forEach(spec => {
+    it(spec.title, () => {
+      editor = new JSONEditor(element, {
+        schema: spec.schema
+      })
+      expect(editor.getValue()).toEqual(spec.value)
+    })
+  })
+})