Migrating Vue components to React and stores refactoring (#585)

Signed-off-by: Roman <ixrock@gmail.com>

Co-authored-by: Sebastian Malton <sebastian@malton.name>
Co-authored-by: Sebastian Malton <smalton@mirantis.com>
Co-authored-by: Lauri Nevala <lauri.nevala@gmail.com>
Co-authored-by: Alex Andreev <alex.andreev.email@gmail.com>

src/features/metrics.ts

@@ -27,7 +27,8 @@ export interface MetricsConfiguration {
 }
 
 export class MetricsFeature extends Feature {
-  name = 'metrics';
+  static id = 'metrics'
+  name = MetricsFeature.id;
   latestVersion = "v2.17.2-lens1"
 
   config: MetricsConfiguration = {
@@ -51,58 +52,49 @@ export class MetricsFeature extends Feature {
     storageClass: null,
   };
 
-  async install(cluster: Cluster): Promise<boolean> {
+  async install(cluster: Cluster): Promise<void> {
     // Check if there are storageclasses
-    const storageClient = cluster.proxyKubeconfig().makeApiClient(k8s.StorageV1Api)
+    const storageClient = cluster.getProxyKubeconfig().makeApiClient(k8s.StorageV1Api)
     const scs = await storageClient.listStorageClass();
-    scs.body.items.forEach(sc => {
-      if(sc.metadata.annotations &&
-          (sc.metadata.annotations['storageclass.kubernetes.io/is-default-class'] === 'true' || sc.metadata.annotations['storageclass.beta.kubernetes.io/is-default-class'] === 'true')) {
-        this.config.persistence.enabled = true;
-      }
-    });
+
+    this.config.persistence.enabled = scs.body.items.some(sc => (
+      sc.metadata?.annotations?.['storageclass.kubernetes.io/is-default-class'] === 'true' ||
+      sc.metadata?.annotations?.['storageclass.beta.kubernetes.io/is-default-class'] === 'true'
+    ));
 
     return super.install(cluster)
   }
 
-  async upgrade(cluster: Cluster): Promise<boolean> {
+  async upgrade(cluster: Cluster): Promise<void> {
     return this.install(cluster)
   }
 
   async featureStatus(kc: KubeConfig): Promise<FeatureStatus> {
-    return new Promise<FeatureStatus>( async (resolve, reject) => {
-      const client = kc.makeApiClient(AppsV1Api)
-      const status: FeatureStatus = {
-        currentVersion: null,
-        installed: false,
-        latestVersion: this.latestVersion,
-        canUpgrade: false, // Dunno yet
-      };
-      try {
-
-        const prometheus = (await client.readNamespacedStatefulSet('prometheus', 'lens-metrics')).body;
-        status.installed = true;
-        status.currentVersion = prometheus.spec.template.spec.containers[0].image.split(":")[1];
-        status.canUpgrade = semver.lt(status.currentVersion, this.latestVersion, true);
-        resolve(status)
-      } catch(error) {
-        resolve(status)
-      }
-    });
+    const client = kc.makeApiClient(AppsV1Api)
+    const status: FeatureStatus = {
+      currentVersion: null,
+      installed: false,
+      latestVersion: this.latestVersion,
+      canUpgrade: false, // Dunno yet
+    };
+    
+    try {
+      const prometheus = (await client.readNamespacedStatefulSet('prometheus', 'lens-metrics')).body;
+      status.installed = true;
+      status.currentVersion = prometheus.spec.template.spec.containers[0].image.split(":")[1];
+      status.canUpgrade = semver.lt(status.currentVersion, this.latestVersion, true);
+    } catch {
+      // ignore error
+    }
+ 
+    return status;
   }
 
-  async uninstall(cluster: Cluster): Promise<boolean> {
-    return new Promise<boolean>(async (resolve, reject) => {
-      const rbacClient = cluster.proxyKubeconfig().makeApiClient(RbacAuthorizationV1Api)
-      try {
-        await this.deleteNamespace(cluster.proxyKubeconfig(), "lens-metrics")
-        await rbacClient.deleteClusterRole("lens-prometheus");
-        await rbacClient.deleteClusterRoleBinding("lens-prometheus");
-        resolve(true);
-      } catch(error) {
-        reject(error);
-      }
-    });
+  async uninstall(cluster: Cluster): Promise<void> {
+    const rbacClient = cluster.getProxyKubeconfig().makeApiClient(RbacAuthorizationV1Api)
+   
+    await this.deleteNamespace(cluster.getProxyKubeconfig(), "lens-metrics")
+    await rbacClient.deleteClusterRole("lens-prometheus");
+    await rbacClient.deleteClusterRoleBinding("lens-prometheus");
   }
-
 }

src/features/user-mode.ts

@@ -3,48 +3,42 @@ import {KubeConfig, RbacAuthorizationV1Api} from "@kubernetes/client-node"
 import { Cluster } from "../main/cluster"
 
 export class UserModeFeature extends Feature {
-  name = 'user-mode';
+  static id = 'user-mode'
+  name = UserModeFeature.id;
   latestVersion = "v2.0.0"
 
-  async install(cluster: Cluster): Promise<boolean> {
+  async install(cluster: Cluster): Promise<void> {
     return super.install(cluster)
   }
 
-  async upgrade(cluster: Cluster): Promise<boolean> {
-    return true
+  async upgrade(cluster: Cluster): Promise<void> {
+    return;
   }
 
   async featureStatus(kc: KubeConfig): Promise<FeatureStatus> {
-    return new Promise<FeatureStatus>( async (resolve, reject) => {
-      const client = kc.makeApiClient(RbacAuthorizationV1Api)
-      const status: FeatureStatus = {
-        currentVersion: null,
-        installed: false,
-        latestVersion: this.latestVersion,
-        canUpgrade: false, // Dunno yet
-      };
-      try {
-        await client.readClusterRoleBinding("lens-user")
-        status.installed = true;
-        status.currentVersion = this.latestVersion
-        status.canUpgrade = false
-        resolve(status)
-      } catch(error) {
-        resolve(status)
-      }
-    });
+    const client = kc.makeApiClient(RbacAuthorizationV1Api)
+    const status: FeatureStatus = {
+      currentVersion: null,
+      installed: false,
+      latestVersion: this.latestVersion,
+      canUpgrade: false, // Dunno yet
+    };
+    
+    try {
+      await client.readClusterRoleBinding("lens-user")
+      status.installed = true;
+      status.currentVersion = this.latestVersion;
+      status.canUpgrade = false;
+    } catch {
+      // ignore error
+    }
+
+    return status;
   }
 
-  async uninstall(cluster: Cluster): Promise<boolean> {
-    return new Promise<boolean>(async (resolve, reject) => {
-      const rbacClient = cluster.proxyKubeconfig().makeApiClient(RbacAuthorizationV1Api)
-      try {
-        await rbacClient.deleteClusterRole("lens-user");
-        await rbacClient.deleteClusterRoleBinding("lens-user");
-        resolve(true);
-      } catch(error) {
-        reject(error);
-      }
-    });
+  async uninstall(cluster: Cluster): Promise<void> {
+    const rbacClient = cluster.getProxyKubeconfig().makeApiClient(RbacAuthorizationV1Api)
+    await rbacClient.deleteClusterRole("lens-user");
+    await rbacClient.deleteClusterRoleBinding("lens-user");
   }
 }