From 1f36e06cc83561847020ffecfcdd59a5870a6556 Mon Sep 17 00:00:00 2001
From: Steve Richards <srichards@mirantis.com>
Date: Thu, 24 Sep 2020 10:03:19 +0100
Subject: [PATCH] Changed to use ClusterModel when adding clusters

---
 src/main/cluster.ts      |  2 ++
 src/main/decc-manager.ts | 24 +++++++++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/main/cluster.ts b/src/main/cluster.ts
index 681fc19fc1..2d433fa49f 100644
--- a/src/main/cluster.ts
+++ b/src/main/cluster.ts
@@ -127,6 +127,8 @@ export class Cluster implements ClusterModel {
   async activate(init = false) {
     const clusterActivatedAt = new Date();
     logger.info(`[CLUSTER]: activate@${clusterActivatedAt.toString()}`, this.getMeta());
+    logger.info(`[CLUSTER]: activate eventDisposers length: ${this.eventDisposers.length}`);
+    logger.info(`[CLUSTER]: activate eventDisposers: ${this.eventDisposers}`);
     await this.whenInitialized;
     logger.info("[CLUSTER]: activate now initialized")
     logger.info(`[CLUSTER]: activate eventDisposers length: ${this.eventDisposers.length}`);
diff --git a/src/main/decc-manager.ts b/src/main/decc-manager.ts
index 6dd169cadd..56f6d34e75 100644
--- a/src/main/decc-manager.ts
+++ b/src/main/decc-manager.ts
@@ -138,7 +138,8 @@ export class DECCManager {
       //console.log(`Generated kubeconfig: ${YAML.stringify(jsConfig)}`)
 
       let newClusters: ClusterModel[] = [];
-      let newCluster = new Cluster({
+
+      let newCluster: ClusterModel = {
         id: deccCluster.metadata.uid,
         contextName: `${username}@${clusterPrefix}-${deccCluster.metadata.name}`,
         preferences: {
@@ -147,11 +148,28 @@ export class DECCManager {
         },
         kubeConfigPath: ClusterStore.embedCustomKubeConfig(deccCluster.metadata.uid, YAML.stringify(jsConfig)),
         workspace: workspace.id,
-      });
+      };
+
+      // let newCluster = new Cluster({
+      //   id: deccCluster.metadata.uid,
+      //   contextName: `${username}@${clusterPrefix}-${deccCluster.metadata.name}`,
+      //   preferences: {
+      //     clusterName: `${username}@${clusterPrefix}-${deccCluster.metadata.name}`,
+      //     httpsProxy: undefined,
+      //   },
+      //   kubeConfigPath: ClusterStore.embedCustomKubeConfig(deccCluster.metadata.uid, YAML.stringify(jsConfig)),
+      //   workspace: workspace.id,
+      // });
       
       newClusters.push(newCluster);
       clusterStore.addCluster(...newClusters);
-      logger.info(`addLensClusterToDECCWorkspace: Created Cluster Name: ${username}@${clusterPrefix}-${deccCluster.metadata.name}, Cluster UCP Dashboard URL: ${ucpDashboard}`)
+     
+      let createdCluster = clusterStore.getById(newCluster.id);
+      createdCluster.pushState();
+      clusterStore.load();
+
+      // clusterStore.setActive(newCluster.id);
+      logger.info(`addLensClusterToDECCWorkspace: Created Cluster Name: ${createdCluster.preferences.clusterName}, Cluster UCP Dashboard URL: ${ucpDashboard}`);
     };
   }