cleaning form before submission

Author: samuelcolvin

src/main.js

@@ -5,7 +5,7 @@ import VueRouter from 'vue-router'
 import app from './app'
 import grid from './components/grid'
 import con_modal from './components/con-modal'
-import {to_markdown} from './utils'
+import {to_markdown, clean} from './utils'
 
 let dsn = process.env.NODE_ENV === 'production' && 'https://[email protected]/128441'
 Raven.config(dsn, {release: process.env.RELEASE}).addPlugin(RavenVue, Vue).install()
@@ -177,7 +177,7 @@ response text:   "${xhr.responseText}"`)
         }
       },
       submit_enquiry: function (callback) {
-        let data = JSON.stringify(this.enquiry_data)
+        let data = JSON.stringify(clean(this.enquiry_data))
         let xhr = new window.XMLHttpRequest()
         let url = `${config.api_root}/${public_key}/enquiry`
         xhr.open('POST', url)

src/utils.js

@@ -13,4 +13,17 @@ function to_markdown (t) {
     return marked(t)
   }
 }
-export { to_markdown }
+
+const clean = (obj) => {
+  let new_obj = {}
+  for (let [k, v] of Object.entries(obj)) {
+    if (typeof v === 'object') {
+      new_obj[k] = clean(v)
+    } else if (v !== null && v !== undefined && v !== '') {
+      new_obj[k] = v
+    }
+  }
+  return new_obj
+}
+
+export { to_markdown, clean }

test/unit/specs/main.js

@@ -165,27 +165,38 @@ describe('main.js', () => {
     server.respondWith('/public-key/contractors', dft_response)
     server.respondWith('/public-key/enquiry',
         [200, {'Content-Type': 'application/json'}, JSON.stringify(enquiry_options)])
-    server.respondWith('POST', '/public-key/enquiry',
-        [201, {'Content-Type': 'application/json'}, '{"response": "ok"}'])
+    server.respondWith('POST', '/public-key/enquiry', (xhr, id) => {
+      let obj = JSON.parse(xhr.requestBody)
+      expect(obj).to.deep.equal({first_field: 'foobar', attributes: {foo: 'X'}})
+      xhr.respond(201, {'Content-Type': 'application/json'}, '{"response": "ok"}')
+    })
   })
   after(() => { server.restore() })
 
-  it('should post enquiry data', done => {
+  it('should post enquiry data', async () => {
     let el = document.createElement('div')
     el.setAttribute('id', 'socket')
     document.body.appendChild(el)
 
     const vm = socket('public-key')
     vm.get_enquiry()
 
-    setTimeout(() => {
-      vm.$set(vm.enquiry_data, 'first_field', 'foobar')
-      expect(vm.enquiry_data).to.deep.equal({first_field: 'foobar'})
+    await sleep(50)
+    vm.enquiry_data = {
+      first_field: 'foobar',
+      another_field: '',
+      attributes: {
+        foo: 'X',
+        bar: '',
+      }
+    }
+    expect(vm.enquiry_data).to.not.deep.equal({})
+    await new Promise((resolve, reject) => {
       let callback = () => {
         expect(vm.enquiry_data).to.deep.equal({})
-        done()
+        resolve()
       }
       vm.submit_enquiry(callback)
-    }, 50)
+    })
   })
 })