From 387bc07dbc4372868388384f14525263fa9cc5fc Mon Sep 17 00:00:00 2001 From: Roman Date: Sun, 5 Jul 2020 20:32:00 +0300 Subject: [PATCH] fix errors Signed-off-by: Roman --- src/renderer/_vue/mixins/ClustersMixin.js | 8 ++++---- src/renderer/_vue/store/modules/kube-contexts.js | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/renderer/_vue/mixins/ClustersMixin.js b/src/renderer/_vue/mixins/ClustersMixin.js index f43302a2f0..f885bac957 100644 --- a/src/renderer/_vue/mixins/ClustersMixin.js +++ b/src/renderer/_vue/mixins/ClustersMixin.js @@ -1,14 +1,14 @@ export default { computed: { - clusters: function() { + clusters: function () { return this.$store.getters.clusters }, - newContexts: function() { - const seenContexts = this.seenContexts || this.$store.getters.seenContexts + newContexts: function () { + const seenContexts = this.seenContexts ? Array.from(this.seenContexts) : this.$store.getters.seenContexts const contextNamesFromKubeconfig = this.availableContexts.map(item => item.currentContext) return contextNamesFromKubeconfig.filter((item) => seenContexts.indexOf(item) < 0) }, - availableContexts: function() { + availableContexts: function () { // read available kubeconfigs from store on filter out configs already found in added clusters return this.$store.getters.availableKubeContexts.filter(item => !this.clusters.find((cluster) => cluster.contextName == item.currentContext)); }, diff --git a/src/renderer/_vue/store/modules/kube-contexts.js b/src/renderer/_vue/store/modules/kube-contexts.js index 9a75e7a33c..d1a8707024 100644 --- a/src/renderer/_vue/store/modules/kube-contexts.js +++ b/src/renderer/_vue/store/modules/kube-contexts.js @@ -7,6 +7,7 @@ const state = { const actions = { reloadAvailableKubeContexts({commit}, file) { + if(!file) return; let kc = new k8s.KubeConfig(); try { kc.loadFromFile(file);