From 631826ac3afead1d276b5d471bf307bb6bf161a0 Mon Sep 17 00:00:00 2001
From: Roman <ixrock@gmail.com>
Date: Tue, 11 Aug 2020 01:41:51 +0300
Subject: [PATCH] clean up

Signed-off-by: Roman <ixrock@gmail.com>
Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
---
 src/common/cluster-store.ts      | 9 +++------
 src/common/ipc.ts                | 4 ++--
 src/main/routes/metrics-route.ts | 6 ++++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/common/cluster-store.ts b/src/common/cluster-store.ts
index 3ba08248ac..611b3b6c38 100644
--- a/src/common/cluster-store.ts
+++ b/src/common/cluster-store.ts
@@ -62,13 +62,10 @@ export class ClusterStore extends BaseStore<ClusterStoreModel> {
       migrations: migrations,
     });
     if (ipcRenderer) {
-      ipcRenderer.on("cluster:state", (event, state: ClusterState) => {
+      ipcRenderer.on("cluster:state", (event, model: ClusterState) => {
         this.applyWithoutSync(() => {
-          logger.debug(`[CLUSTER-STORE]: received push-state at ${location.host}`, state);
-          const cluster = this.getById(state.id);
-          if (cluster) {
-            cluster.updateModel(state)
-          }
+          logger.debug(`[CLUSTER-STORE]: received push-state at ${location.host}`, model);
+          this.getById(model.id)?.updateModel(model);
         })
       })
     }
diff --git a/src/common/ipc.ts b/src/common/ipc.ts
index 150d8acdef..3d4a878fd7 100644
--- a/src/common/ipc.ts
+++ b/src/common/ipc.ts
@@ -24,7 +24,7 @@ export interface IpcChannelResponse<T extends any[] = any, E = any> {
   error?: E;
 }
 
-export interface IpcChannelInit {
+export interface IpcChannelOptions {
   channel: IpcChannel; // main <-> renderer communication channel name
   mode?: IpcMode; // default: "async", use "sync" as last resort: https://www.electronjs.org/docs/api/ipc-renderer#ipcrenderersendsyncchannel-args
   handle?: (...args: any[]) => any; // main-process message handler
@@ -33,7 +33,7 @@ export interface IpcChannelInit {
   once?: boolean; // todo: add support
 }
 
-export function createIpcChannel({ autoBind = true, mode = IpcMode.ASYNC, timeout = 0, handle, channel }: IpcChannelInit) {
+export function createIpcChannel({ autoBind = true, mode = IpcMode.ASYNC, timeout = 0, handle, channel }: IpcChannelOptions) {
   channel = `${mode}:${channel}`
 
   const ipcChannel = {
diff --git a/src/main/routes/metrics-route.ts b/src/main/routes/metrics-route.ts
index 9cf4a280e2..2665fca5f2 100644
--- a/src/main/routes/metrics-route.ts
+++ b/src/main/routes/metrics-route.ts
@@ -16,8 +16,10 @@ class MetricsRoute extends LensApi {
     let prometheusPath: string
     let prometheusProvider: PrometheusProvider
     try {
-      prometheusPath = await cluster.contextHandler.getPrometheusPath()
-      prometheusProvider = await cluster.contextHandler.getPrometheusProvider()
+      [prometheusPath, prometheusProvider] = await Promise.all([
+        cluster.contextHandler.getPrometheusPath(),
+        cluster.contextHandler.getPrometheusProvider()
+      ])
     } catch {
       this.respondJson(response, {})
       return