Merge pull request #11062 from rak-phillip/chore/refactor-store-modules

Chore/refactor store modules

shell/pages/diagnostic.vue

@@ -215,6 +215,7 @@ export default {
         'digitalocean',
         'linode',
         'targetRoute', // contains circular references, isn't useful (added later to store)
+        '$router', // also contains a circular reference to $store, not useful for diagnostics
       ];
 
       const clearListsKeys = [

shell/store/auth.js

@@ -344,7 +344,9 @@ export const actions = {
     }
   },
 
-  async logout({ dispatch, commit, getters }, options = {}) {
+  async logout({
+    dispatch, commit, getters, rootState
+  }, options = {}) {
     // So, we only do this check if auth has been initialized.
     //
     // It's possible to be logged in and visit auth/logout directly instead
@@ -362,7 +364,7 @@ export const actions = {
     }
 
     // Unload plugins - we will load again on login
-    await this.$plugin.logout();
+    await rootState.$plugin.logout();
 
     try {
       await dispatch('rancher/request', {

shell/store/index.js

@@ -247,6 +247,9 @@ export const state = () => {
     isRancherInHarvester:    false,
     targetRoute:             null,
     rootProduct:             undefined,
+    $router:                 undefined,
+    $route:                  undefined,
+    $plugin:                 undefined,
   };
 };
 
@@ -722,6 +725,18 @@ export const mutations = {
 
   targetRoute(state, route) {
     state.targetRoute = route;
+  },
+
+  setRouter(state, router) {
+    state.$router = router;
+  },
+
+  setRoute(state, route) {
+    state.$route = route;
+  },
+
+  setPlugin(state, pluginDefinition) {
+    state.$plugin = pluginDefinition;
   }
 };
 
@@ -1128,18 +1143,10 @@ export const actions = {
     }
   },
 
-  nuxtServerInit({ dispatch, rootState }, nuxt) {
-    // Models in SSR server mode have no way to get to the route or router, so hack one in...
-    Object.defineProperty(rootState, '$router', { value: nuxt.app.router });
-    Object.defineProperty(rootState, '$route', { value: nuxt.route });
-    dispatch('prefs/loadCookies');
-  },
-
-  nuxtClientInit({ dispatch, rootState }, nuxt) {
-    Object.defineProperty(rootState, '$router', { value: nuxt.app.router });
-    Object.defineProperty(rootState, '$route', { value: nuxt.route });
-    Object.defineProperty(rootState, '$plugin', { value: nuxt.app.$plugin });
-    Object.defineProperty(this, '$plugin', { value: nuxt.app.$plugin });
+  nuxtClientInit({ dispatch, commit, rootState }, nuxt) {
+    commit('setRouter', nuxt.app.router);
+    commit('setRoute', nuxt.route);
+    commit('setPlugin', nuxt.app.$plugin);
 
     dispatch('management/rehydrateSubscribe');
     dispatch('cluster/rehydrateSubscribe');