Merge branch 'master' into extensions-api

src/common/base-store.ts

@@ -93,6 +93,10 @@ export class BaseStore<T = any> extends Singleton {
     }
   }
 
+  unregisterIpcListener() {
+    ipcRenderer.removeAllListeners(this.syncChannel)
+  }
+
   disableSync() {
     this.syncDisposers.forEach(dispose => dispose());
     this.syncDisposers.length = 0;

src/common/cluster-ipc.ts

@@ -9,7 +9,7 @@ export const clusterIpc = {
       const cluster = clusterStore.getById(clusterId);
       if (cluster) {
         if (frameId) cluster.frameId = frameId; // save cluster's webFrame.routingId to be able to send push-updates
-        return cluster.activate(true);
+        return cluster.activate();
       }
     },
   }),
@@ -58,4 +58,4 @@ export const clusterIpc = {
       return clusterStore.getById(clusterId)?.upgradeFeature(feature, config)
     }
   }),
-}
+}

src/common/cluster-store.ts

@@ -1,6 +1,6 @@
 import type { WorkspaceId } from "./workspace-store";
 import path from "path";
-import { app, ipcRenderer, remote } from "electron";
+import { app, ipcRenderer, remote, webFrame, webContents } from "electron";
 import { unlink } from "fs-extra";
 import { action, computed, observable, toJS } from "mobx";
 import { BaseStore } from "./base-store";
@@ -73,20 +73,27 @@ export class ClusterStore extends BaseStore<ClusterStoreModel> {
       accessPropertiesByDotNotation: false, // To make dots safe in cluster context names
       migrations: migrations,
     });
-    if (ipcRenderer) {
-      ipcRenderer.on("cluster:state", (event, model: ClusterState) => {
-        this.applyWithoutSync(() => {
-          logger.silly(`[CLUSTER-STORE]: received push-state at ${location.host}`, model);
-          this.getById(model.id)?.updateModel(model);
-        })
-      })
-    }
   }
 
   @observable activeClusterId: ClusterId;
   @observable removedClusters = observable.map<ClusterId, Cluster>();
   @observable clusters = observable.map<ClusterId, Cluster>();
 
+  registerIpcListener() {
+    logger.info(`[CLUSTER-STORE] start to listen (${webFrame.routingId})`)
+    ipcRenderer.on("cluster:state", (event, model: ClusterState) => {
+      this.applyWithoutSync(() => {
+        logger.silly(`[CLUSTER-STORE]: received push-state at ${location.host} (${webFrame.routingId})`, model);
+        this.getById(model.id)?.updateModel(model);
+      })
+    })
+  }
+
+  unregisterIpcListener() {
+    super.unregisterIpcListener()
+    ipcRenderer.removeAllListeners("cluster:state")
+  }
+
   @computed get activeCluster(): Cluster | null {
     return this.getById(this.activeClusterId);
   }
@@ -122,10 +129,6 @@ export class ClusterStore extends BaseStore<ClusterStoreModel> {
     return this.clusters.size > 0;
   }
 
-  hasContext(name: string) {
-    return this.clustersList.some(cluster => cluster.contextName === name);
-  }
-
   getById(id: ClusterId): Cluster {
     return this.clusters.get(id);
   }

src/common/cluster-store_test.ts

@@ -146,14 +146,22 @@ describe("config with existing clusters", () => {
               id: 'cluster1',
               kubeConfig: 'foo',
               contextName: 'foo',
-              preferences: { terminalCWD: '/foo' }
+              preferences: { terminalCWD: '/foo' },
+              workspace: 'default'
             },
             {
               id: 'cluster2',
               kubeConfig: 'foo2',
               contextName: 'foo2',
               preferences: { terminalCWD: '/foo2' }
-            }
+            },
+            {
+              id: 'cluster3',
+              kubeConfig: 'foo',
+              contextName: 'foo',
+              preferences: { terminalCWD: '/foo' },
+              workspace: 'foo'
+            },
           ]
         })
       }
@@ -183,10 +191,12 @@ describe("config with existing clusters", () => {
 
   it("allows getting all of the clusters", async () => {
     const storedClusters = clusterStore.clustersList;
+    expect(storedClusters.length).toBe(3)
     expect(storedClusters[0].id).toBe('cluster1')
     expect(storedClusters[0].preferences.terminalCWD).toBe('/foo')
     expect(storedClusters[1].id).toBe('cluster2')
     expect(storedClusters[1].preferences.terminalCWD).toBe('/foo2')
+    expect(storedClusters[2].id).toBe('cluster3')
   })
 })
 

src/common/prometheus-providers.ts

@@ -1,9 +1,10 @@
 import { PrometheusLens } from "../main/prometheus/lens";
 import { PrometheusHelm } from "../main/prometheus/helm";
 import { PrometheusOperator } from "../main/prometheus/operator";
+import { PrometheusStacklight } from "../main/prometheus/stacklight";
 import { PrometheusProviderRegistry } from "../main/prometheus/provider-registry";
 
-[PrometheusLens, PrometheusHelm, PrometheusOperator].forEach(providerClass => {
+[PrometheusLens, PrometheusHelm, PrometheusOperator, PrometheusStacklight].forEach(providerClass => {
   const provider = new providerClass()
   PrometheusProviderRegistry.registerProvider(provider.id, provider)
 });

src/common/user-store.ts

@@ -59,8 +59,6 @@ export class UserStore extends BaseStore<UserStoreModel> {
     colorTheme: UserStore.defaultTheme,
     downloadMirror: "default",
     downloadKubectlBinaries: true,  // Download kubectl binaries matching cluster version
-    downloadBinariesPath: this.getDefaultKubectlPath(),
-    kubectlBinariesPath: ""
   };
 
   get isNewVersion() {