resolved conflicts

Author: Dean Ohashi

package-lock.json

@@ -207,6 +207,14 @@ const mutations = {
   [types.REMOVE_ACTION_FROM_COMPONENT]: (state, payload) => {
     let index = state.componentMap[state.activeComponent].mapActions.indexOf(payload)
     state.componentMap[state.activeComponent].mapActions.splice(index, 1)
+    
+  },
+  [types.ADD_USER_ACTION]: (state, payload) => {
+    if (typeof(payload)==='string') state.userActions.push(payload);
+  },
+  [types.ADD_TO_USER_STORE]: (state, payload) => {
+    const key = Object.keys(payload);
+    state.userStore[key] = payload[key];
   }
 }
 

src/store/mutations.js

@@ -43,6 +43,8 @@ export const DELETE_ROUTE = 'DELETE_ROUTE'
 export const DELETE_COMPONENT = 'DELETE_COMPONENT'
 export const DELETE_USER_ACTIONS = 'DELETE_USER_ACTIONS'
 export const REMOVE_ACTION_FROM_COMPONENT = 'REMOVE_ACTION_FROM_COMPONENT'
+export const ADD_USER_ACTION = 'ADD_USER_ACTION'
+export const ADD_TO_USER_STORE = 'ADD_TO_USER_STORE'
 
 // Actions
 export const registerComponent = 'registerComponent'
@@ -79,4 +81,6 @@ export const deleteRoute = 'deleteRoute'
 export const deleteComponent = 'deleteComponent'
 
 export const deleteUserActions = 'deleteUserActions'
-export const removeActionFromComponent = 'removeActionFromComponent'
+export const removeActionFromComponent = 'removeActionFromComponent'
+export const addUserAction = 'addUserAction'
+export const addToUserStore = 'addToUserStore'

src/store/types.js

@@ -2,12 +2,10 @@
 /**
  * @jest-environment jsdom
  */
-
+import mutations from '../../../src/store/mutations';
 import { mount, createLocalVue, shallowMount } from '@vue/test-utils'
 import * as All from 'quasar'
 const { Quasar, date } = All
-
-import mutations from '../../../src/store/mutations'
 import actions from '../../../src/store/actions'
 
 describe('Test mutations + actions to remove action from component and userActions', () => {
@@ -43,3 +41,51 @@ describe('Test mutations + actions to remove action from component and userActio
   //   expect(state.userActions.length).toBe(0)
   // })
 })
+
+describe('userActions mutation', () => {
+  let actions;
+  let store;
+  beforeEach(() => {
+  store = {
+    userActions: []
+    }
+  })
+  it ('should push user defined action to end of userActions array', () => {
+    mutations.ADD_USER_ACTION(store, 'actionnnn')
+    expect(store.userActions[store.userActions.length-1]).toBe('actionnnn');
+  })
+  it ('should only push to array if payload is of type string', () => {
+    mutations.ADD_USER_ACTION(store, 66)
+    expect(store.userActions).toStrictEqual([])
+  })
+});
+
+describe('userStore mutation', () => {
+  let actions;
+  let store;
+    store = {
+      userStore : {}
+    }
+  it ('should be able to update store with a key defined by the user and a value of type object', () => {
+    mutations.ADD_TO_USER_STORE(store, {'dummyKey': {}})
+    // console.log('store.userStore.dummyKey', store.userStore.dummyKey);
+    expect(store.userStore.dummyKey).toStrictEqual({})
+  })
+  it ('should update user store with a key value pair with value strictly equal to empty array', () => {
+    mutations.ADD_TO_USER_STORE(store, {'dummyKey': []})
+    expect(store.userStore.dummyKey).toStrictEqual([]);
+  })
+  it ('should be able to store booleans in the store as the key', () => {
+    mutations.ADD_TO_USER_STORE(store, {boolean: true})
+    expect (store.userStore.boolean).toBe(true)
+  })
+  it ('should add to userStore a key with a value of type number', () => {
+    mutations.ADD_TO_USER_STORE(store, { number:696 })
+    expect (store.userStore.number).toBe(696)
+  })
+
+  it ('should work with strings too', () => {
+    mutations.ADD_TO_USER_STORE(store, { string: 'string'})
+    expect(store.userStore.string).toBe('string')
+  })
+});