Merge pull request #213 from penguin-statistics/fix-personalmatrix

fix(personalmatrix): fix personalmatrix not working

src/App.vue

@@ -449,9 +449,9 @@ export default {
     logRouteEvent (newValue) {
       if (newValue.name === "StatsByStage_Selected") {
         // Console.log(this.$store.state.dataSource, newValue.params.stageId);
-        this.$ga.event('result', 'fetch_' + this.$store.state.dataSource, newValue.params.stageId, 1)
+        this.$ga.event('result', 'fetch_' + this.$store.getters['dataSource/source'], newValue.params.stageId, 1)
       } else if (newValue.name === "StatsByItem_Selected") {
-        this.$ga.event('result', 'fetch_' + this.$store.state.dataSource, newValue.params.itemId, 1)
+        this.$ga.event('result', 'fetch_' + this.$store.getters['dataSource/source'], newValue.params.itemId, 1)
       }
     }
   }

src/components/stats/DataSourceToggle.vue

@@ -112,9 +112,10 @@ export default {
   },
   computed: {
     ...mapGetters('auth', ['loggedIn']),
+    ...mapGetters('dataSource', ['source']),
     dataSource: {
       get() {
-        return this.$store.state.dataSource;
+        return this.source;
       },
       async set(value) {
         switch (value) {

src/store/modules/ajax.js

@@ -9,9 +9,6 @@ export default {
     }
   },
   actions: {
-    // ajaxNewState(state, payload) {
-    //   state.states.push(payload);
-    // },
     _getOrCreateState ({commit, state}, id) {
       let found = state.states.find(value => value.id === id);
       if (found) {

src/store/modules/dataSource.js

@@ -1,9 +1,14 @@
 export default {
   namespaced: true,
-  state: 'global',
+  state: {
+    source: 'global'
+  },
   mutations: {
-    switchDataSource: (state, value) => {
-      state = value;
+    switch: (state, value) => {
+      state.source = value;
     }
+  },
+  getters: {
+    source: state => state.source
   }
 };

src/utils/Console.js

@@ -1,4 +1,4 @@
-import Sentry from '@sentry/browser'
+import * as Sentry from "@sentry/browser";
 
 class Console {
   static debug (...content) {

src/utils/getters.js

@@ -22,15 +22,15 @@ Getters.limitations = {
 }
 Getters.statistics = {
   byItemId(itemId) {
-    const stats = store.state.data[`${store.state.dataSource}Matrix`];
+    const stats = store.state.data[`${store.getters['dataSource/source']}Matrix`];
     Console.debug(stats)
     if (!stats) return [];
     return stats.filter(el => {
       return el.itemId === itemId
     })
   },
   byStageId(stageId) {
-    const stats = store.state.data[`${store.state.dataSource}Matrix`];
+    const stats = store.state.data[`${store.getters['dataSource/source']}Matrix`];
     Console.debug(stats)
     if (!stats) return [];
     return stats.filter(el => {
@@ -94,7 +94,7 @@ Getters.trends = {
     return this.all() && this.all()[stageId];
   },
   all() {
-    if (store.state.dataSource !== 'global') {
+    if (store.getters['dataSource/source'] !== 'global') {
       return null;
     }
     return store.state.data && store.state.data.trends && store.state.data.trends.results