resolved conflicts again

Author: Dean Ohashi

.gitignore

@@ -6,7 +6,8 @@ node_modules
 /src-cordova/node_modules
 /src-cordova/platforms
 /src-cordova/plugins
-/src-cordova/www
+/src-cordova/www\
+/test/jest/coverage
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*

src/store/mutations.js

@@ -207,7 +207,13 @@ 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_TO_COMPONENT_ACTIONS]: (state, payload) => {
+    state.componentMap[state.activeComponent].componentActions.push(payload)
+  },
+  [types.ADD_TO_COMPONENT_STATE]: (state, payload) => {
+    state.componentMap[state.activeComponent].componentState.push(payload)
+
   },
   [types.ADD_USER_ACTION]: (state, payload) => {
     if (typeof(payload)==='string') state.userActions.push(payload);

src/store/state/index.js

@@ -23,6 +23,8 @@ const newState = {
     HomeView: []
     // NewView: []
   },
+  userActions: [],
+  userState: {},
   /**
    *
    */

src/store/types.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_TO_COMPONENT_ACTIONS = 'ADD_TO_COMPONENT_ACTIONS'
+export const ADD_TO_COMPONENT_STATE = 'ADD_TO_COMPONENT_STATE'
 export const ADD_USER_ACTION = 'ADD_USER_ACTION'
 export const ADD_TO_USER_STORE = 'ADD_TO_USER_STORE'
 

test/jest/__tests__/App.spec.js

@@ -35,6 +35,36 @@ describe('Test mutations + actions to remove action from component and userActio
   })
 })
 
+describe('Adding actions and state to components', () => {
+  let state;
+  beforeEach(() => {
+    state = {
+      componentMap: {
+        testComponent: {
+          componentName: 'testComponent',
+          children: [],
+          htmlList: [],
+          componentActions: [],
+          componentState: []
+        }
+      },
+      activeComponent: 'testComponent'
+    }
+  })
+  describe('Adding actions to components', () => {
+    it('should add a single action to active component', () => {
+      mutations.ADD_TO_COMPONENT_ACTIONS(state, 'testAction')
+      expect(state.componentMap[state.activeComponent].componentActions).toEqual(['testAction'])
+    })
+  })
+  describe('Adding state to components', () => {
+    it('should add a single state string to active component', () => {
+      mutations.ADD_TO_COMPONENT_STATE(state, 'testState')
+      expect(state.componentMap[state.activeComponent].componentState).toEqual(['testState'])
+    })
+  })
+})
+
 describe('userActions mutation', () => {
   let actions;
   let store;

test/jest/coverage/clover.xml

@@ -432,7 +432,7 @@ <h1>
   font-size: 12px;
 }
 .codesnippet-container {
-  margin-bottom: 1rem;  
+  margin-bottom: 1rem;
 }
 ::-webkit-scrollbar {
     display: none;

test/jest/coverage/coverage-final.json

@@ -615,7 +615,7 @@ <h1>
     },
 <span class="fstat-no" title="function not covered" >    childList () {</span>
 <span class="cstat-no" title="statement not covered" >      return this.componentMap[componentData.componentName].children</span>
-    }, 
+    },
 <span class="fstat-no" title="function not covered" >    options () {</span>
       // PROBLEM: the objects on childrenmultiselectvalue are applied
 <span class="cstat-no" title="statement not covered" >      const routes = Object.keys(this.routes)</span>

test/jest/coverage/lcov-report/src/components/CodeSnippet.vue.html

@@ -456,11 +456,11 @@ <h1>
   background: #11120F;
 }
 .toolbar-background {
-  background: black;  
+  background: black;
 }
 .full-footer {
   // height: 100vh;
-  padding-bottom: 0px;  
+  padding-bottom: 0px;
 }
 &lt;/style&gt;
 &nbsp;</pre></td></tr>