From 5c8dd89a88124c679acb13dc242d53c23d50bb8f Mon Sep 17 00:00:00 2001 From: Roman Date: Sun, 5 Jul 2020 23:00:19 +0300 Subject: [PATCH] incorrect seen context update -- fixed vue-store mutation Signed-off-by: Roman --- src/renderer/_vue/index.js | 2 -- src/renderer/_vue/store/index.js | 16 ++++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/renderer/_vue/index.js b/src/renderer/_vue/index.js index e5c149961e..fae0206b81 100644 --- a/src/renderer/_vue/index.js +++ b/src/renderer/_vue/index.js @@ -31,9 +31,7 @@ Vue.mixin({ // any initialization we want to do for app state setTimeout(async () => { await when(() => userStore.isReady); - await store.dispatch('init') - console.log("start vue") new Vue({ components: { App }, store, diff --git a/src/renderer/_vue/store/index.js b/src/renderer/_vue/store/index.js index b8838d30e8..1693a6604e 100644 --- a/src/renderer/_vue/store/index.js +++ b/src/renderer/_vue/store/index.js @@ -12,7 +12,7 @@ import { PromiseIpc } from 'electron-promise-ipc' Vue.use(Vuex); -const promiseIpc = new PromiseIpc( { maxTimeoutMs: 120000 } ); +const promiseIpc = new PromiseIpc({maxTimeoutMs: 120000}); export default new Vuex.Store({ modules: { @@ -30,9 +30,9 @@ export default new Vuex.Store({ lastSeenAppVersion: userStore.lastSeenAppVersion, }, mutations: { - storeSeenContexts(state, context) { - userStore.seenContexts.add(context); - state.seenContexts = Array.from(userStore.seenContexts); + storeSeenContexts(state, contexts) { + contexts.forEach(ctx => userStore.seenContexts.add(ctx)); + state.seenContexts = contexts; }, updateLastSeenAppVersion(state, appVersion) { state.lastSeenAppVersion = appVersion; @@ -60,7 +60,7 @@ export default new Vuex.Store({ await this.dispatch('refreshClusters', getters.currentWorkspace); return true; }, - async addSeenContexts({commit}, data){ + async addSeenContexts({commit}, data) { commit('storeSeenContexts', data); }, async updateLastSeenAppVersion({commit, state}) { @@ -68,13 +68,13 @@ export default new Vuex.Store({ commit("updateLastSeenAppVersion", getAppVersion()) } }, - getters : { + getters: { seenContexts: state => state.seenContexts, hud: state => state.hud, - isMenuVisible: function(state, getters){ + isMenuVisible: function (state, getters) { return state.hud.isMenuVisible && !getters.showWhatsNew; }, - showWhatsNew: function(state) { + showWhatsNew: function (state) { return semver.gt(getAppVersion(), state.lastSeenAppVersion); }, preferences: state => state.preferences,