add store tests

src/components/Tab.vue

@@ -34,7 +34,7 @@
             :sql-result="result"
             :init-chart="initChart"
             ref="chart"
-            @update="$store.commit('updateTabState', { index: tabIndex, isUnsaved: true })"
+            @update="$store.commit('updateTab', { index: tabIndex, isUnsaved: true })"
           />
         </div>
       </template>
@@ -93,7 +93,7 @@ export default {
       }
     },
     query () {
-      this.$store.commit('updateTabState', { index: this.tabIndex, isUnsaved: true })
+      this.$store.commit('updateTab', { index: this.tabIndex, isUnsaved: true })
     }
   },
   methods: {

src/database.js

@@ -47,9 +47,10 @@ export default {
       worker.onmessage = (event) => {
         if (event.data.error) {
           reject(event.data.error)
+        } else {
+          // if it was more than one select - take only the first one
+          resolve(event.data.results[0])
         }
-        // if it was more than one select - take only the first one
-        resolve(event.data.results[0])
       }
       worker.postMessage({ action: 'exec', sql: commands })
     })

src/store/index.js

@@ -3,59 +3,55 @@ import Vuex from 'vuex'
 
 Vue.use(Vuex)
 
-export default new Vuex.Store({
-  state: {
-    schema: null,
-    dbFile: null,
-    dbName: null,
-    tabs: [],
-    currentTab: null,
-    currentTabId: null,
-    untitledLastIndex: 0,
-    predefinedQueries: []
+export const state = {
+  schema: null,
+  dbFile: null,
+  dbName: null,
+  tabs: [],
+  currentTab: null,
+  currentTabId: null,
+  untitledLastIndex: 0,
+  predefinedQueries: []
+}
+
+export const mutations = {
+  saveSchema (state, { dbName, schema }) {
+    state.dbName = dbName
+    state.schema = schema
   },
-  mutations: {
-    saveSchema (state, { dbName, schema }) {
-      state.dbName = dbName
-      state.schema = schema
-    },
-    saveDbFile (state, file) {
-      state.dbFile = file
-    },
-    addTab (state, tab) {
-      // add new tab only if was not already opened
-      if (!state.tabs.some(openedTab => openedTab.id === tab.id)) {
-        state.tabs.push(tab)
-        if (!tab.name) {
-          state.untitledLastIndex += 1
-        }
+  addTab (state, tab) {
+    // add new tab only if was not already opened
+    if (!state.tabs.some(openedTab => openedTab.id === tab.id)) {
+      state.tabs.push(tab)
+      if (!tab.name) {
+        state.untitledLastIndex += 1
       }
-    },
-    updateTab (state, { index, name, id, query, chart, isUnsaved }) {
-      const tab = state.tabs[index]
-      const oldId = tab.id
+    }
+  },
+  updateTab (state, { index, name, id, query, chart, isUnsaved }) {
+    const tab = state.tabs[index]
+    const oldId = tab.id
 
-      if (state.currentTabId === oldId) {
-        state.currentTabId = id
-      }
+    if (id && state.currentTabId === oldId) {
+      state.currentTabId = id
+    }
 
-      tab.id = id
-      if (name) { tab.name = name }
-      if (query) { tab.query = query }
-      if (chart) { tab.chart = chart }
-      if (isUnsaved !== undefined) { tab.isUnsaved = isUnsaved }
+    if (id) { tab.id = id }
+    if (name) { tab.name = name }
+    if (query) { tab.query = query }
+    if (chart) { tab.chart = chart }
+    if (isUnsaved !== undefined) { tab.isUnsaved = isUnsaved }
+    if (!isUnsaved) {
+      // Saved query is not predefined
       delete tab.isPredefined
+    }
 
-      Vue.set(state.tabs, index, tab)
-    },
-    updateTabState (state, { index, isUnsaved }) {
-      const tab = state.tabs[index]
-      tab.isUnsaved = isUnsaved
-      Vue.set(state.tabs, index, tab)
-    },
-    deleteTab (state, index) {
-      if (state.tabs[index].id !== state.currentTabId) {
-      } else if (index < state.tabs.length - 1) {
+    Vue.set(state.tabs, index, tab)
+  },
+  deleteTab (state, index) {
+    // If closing tab is the current opened
+    if (state.tabs[index].id === state.currentTabId) {
+      if (index < state.tabs.length - 1) {
         state.currentTabId = state.tabs[index + 1].id
       } else if (index > 0) {
         state.currentTabId = state.tabs[index - 1].id
@@ -64,22 +60,25 @@ export default new Vuex.Store({
         state.currentTab = null
         state.untitledLastIndex = 0
       }
-      state.tabs.splice(index, 1)
-    },
-    setCurrentTabId (state, id) {
-      state.currentTabId = id
-    },
-    setCurrentTab (state, tab) {
-      state.currentTab = tab
-    },
-    updatePredefinedQueries (state, queries) {
-      if (Array.isArray(queries)) {
-        state.predefinedQueries = queries
-      } else {
-        state.predefinedQueries = [queries]
-      }
     }
+    state.tabs.splice(index, 1)
   },
-  actions: {
+  setCurrentTabId (state, id) {
+    state.currentTabId = id
+  },
+  setCurrentTab (state, tab) {
+    state.currentTab = tab
+  },
+  updatePredefinedQueries (state, queries) {
+    if (Array.isArray(queries)) {
+      state.predefinedQueries = queries
+    } else {
+      state.predefinedQueries = [queries]
+    }
   }
+}
+
+export default new Vuex.Store({
+  state,
+  mutations
 })