Merge branch 'fix-set-in-element' into 'master'

Fix setInElement on API errors from ListElementEntities

Closes #694 and #729

See merge request !1011

js/store/entity.js

@@ -34,6 +34,13 @@ export const mutations = {
     state.elements = clone(elements)
   },
   setInElement (state, { id, ...data }) {
+    // Empty object: remove instead of setting
+    if (!Object.keys(data).length) {
+      const newInElement = { ...state.inElement }
+      delete newInElement[id]
+      state.inElement = newInElement
+      return
+    }
     state.inElement = {
       ...state.inElement,
       [id]: data
@@ -124,7 +131,7 @@ export const actions = {
       const data = await api.listElementEntities(id)
       commit('setInElement', { id, ...data })
     } catch (err) {
-      commit('setInElement', null)
+      commit('setInElement', { id })
       commit('notifications/notify', { type: 'error', text: errorParser(err) }, { root: true })
     }
   },

test/store/entity.js

@@ -38,14 +38,23 @@ describe('entity', () => {
       assert.deepStrictEqual(state.elements, elementSample)
     })
 
-    it('setInElement', () => {
-      const state = initialState()
-      mutations.setInElement(state, {
-        id: 'elementid',
-        ...entitiesInElementSample
+    describe('setInElement', () => {
+      it('sets the elements of an entity', () => {
+        const state = initialState()
+        mutations.setInElement(state, {
+          id: 'elementid',
+          ...entitiesInElementSample
+        })
+        assert.deepStrictEqual(state.inElement, {
+          elementid: entitiesInElementSample
+        })
       })
-      assert.deepStrictEqual(state.inElement, {
-        elementid: entitiesInElementSample
+
+      it('deletes the elements of an entity', () => {
+        const state = initialState()
+        state.inElement.elementid = entitiesInElementSample
+        mutations.setInElement(state, { id: 'elementid' })
+        assert.deepStrictEqual(state.inElement, {})
       })
     })