From 67377af52ea7abbcb751d281bbb6c7c4c63a1ae0 Mon Sep 17 00:00:00 2001
From: Roman <ixrock@gmail.com>
Date: Tue, 14 Jul 2020 19:51:35 +0300
Subject: [PATCH] cluster-store-3.6.0 migration regression fix

Signed-off-by: Roman <ixrock@gmail.com>
---
 src/common/base-store.ts                     | 11 +++++------
 src/migrations/cluster-store/3.6.0-beta.1.ts |  2 ++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/common/base-store.ts b/src/common/base-store.ts
index f5e6e7d02e..2293b85faf 100644
--- a/src/common/base-store.ts
+++ b/src/common/base-store.ts
@@ -74,14 +74,14 @@ export class BaseStore<T = any> extends Singleton {
     );
     if (ipcMain) {
       ipcMain.on(this.syncEvent, (event, model: T) => {
-        logger.info(`[STORE]: ${this.name} sync update from renderer`, model);
+        logger.debug(`[STORE]: ${this.name} sync update from renderer`, model);
         this.onSync(model);
       });
       this.syncDisposers.push(() => ipcMain.removeAllListeners(this.syncEvent));
     }
     if (ipcRenderer) {
       ipcRenderer.on(this.syncEvent, (event, model: T) => {
-        logger.info(`[STORE]: ${this.name} sync update from main`, model);
+        logger.debug(`[STORE]: ${this.name} sync update from main`, model);
         this.onSync(model);
       });
       this.syncDisposers.push(() => ipcRenderer.removeAllListeners(this.syncEvent));
@@ -95,18 +95,17 @@ export class BaseStore<T = any> extends Singleton {
 
   protected onSync(model: T) {
     if (!isEqual(this.toJSON(), model)) {
-      logger.info(`[STORE]: ${this.name} received update from main`, model);
       this.fromStore(model);
     }
   }
 
   protected async onModelChange(model: T) {
-    // update views and save to config file
     if (ipcMain) {
-      broadcastMessage(this.syncEvent, model);
+      broadcastMessage(this.syncEvent, model); // send updates to renderer views
+
       // fixme: https://github.com/sindresorhus/conf/issues/114
       Object.entries(model).forEach(([key, value]) => {
-        this.storeConfig.set(key, value);
+        this.storeConfig.set(key, value); // save update to config file
       });
     }
     // sends "update-request" event to main-process
diff --git a/src/migrations/cluster-store/3.6.0-beta.1.ts b/src/migrations/cluster-store/3.6.0-beta.1.ts
index 8aaf1f3e1b..bf230d6a0b 100644
--- a/src/migrations/cluster-store/3.6.0-beta.1.ts
+++ b/src/migrations/cluster-store/3.6.0-beta.1.ts
@@ -6,6 +6,7 @@ import { migration } from "../migration-wrapper";
 import { ensureDirSync } from "fs-extra"
 import { writeEmbeddedKubeConfig } from "../../common/utils/kubeconfig"
 import { ClusterModel } from "../../common/cluster-store";
+import { loadConfig } from "../../main/k8s";
 
 export default migration({
   version: "3.6.0-beta.1",
@@ -22,6 +23,7 @@ export default migration({
       try {
         // take the embedded kubeconfig and dump it into a file
         cluster.kubeConfigPath = writeEmbeddedKubeConfig(cluster.id, cluster.kubeConfig)
+        cluster.contextName = loadConfig(cluster.kubeConfigPath).getCurrentContext();
         delete cluster.kubeConfig;
         migratedClusters.push(cluster)
       } catch (error) {