From 8c8de7d967615bcc6b50b8e15a161a8ec849a90b Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Wed, 27 Apr 2022 15:48:04 -0400 Subject: [PATCH] revert non-logging change Signed-off-by: Sebastian Malton --- src/main/cluster-manager.ts | 74 ++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/src/main/cluster-manager.ts b/src/main/cluster-manager.ts index a489a64566..776a73af99 100644 --- a/src/main/cluster-manager.ts +++ b/src/main/cluster-manager.ts @@ -5,7 +5,7 @@ import "../common/ipc/cluster"; import type http from "http"; -import { action, makeObservable, observable, observe, reaction, runInAction, toJS } from "mobx"; +import { action, makeObservable, observable, observe, reaction, toJS } from "mobx"; import type { Cluster } from "../common/cluster/cluster"; import logger from "./logger"; import { apiKubePrefix } from "../common/vars"; @@ -68,12 +68,7 @@ export class ClusterManager extends Singleton { observe(this.deleting, change => { if (change.type === "add") { - runInAction(() => { - const entity = catalogEntityRegistry.getById(change.newValue); - - entity.status.phase = LensKubernetesClusterStatus.DELETING; - entity.status.enabled = false; - }); + this.updateEntityStatus(catalogEntityRegistry.getById(change.newValue)); } }); @@ -142,39 +137,44 @@ export class ClusterManager extends Singleton { } @action - protected updateEntityStatus(entity: KubernetesCluster, cluster: Cluster) { - entity.status.phase = (() => { - if (!cluster) { - logger.debug(`${logPrefix} setting entity ${entity.getName()} to DISCONNECTED, reason="no cluster"`); + protected updateEntityStatus(entity: KubernetesCluster, cluster?: Cluster) { + if (this.deleting.has(entity.getId())) { + entity.status.phase = LensKubernetesClusterStatus.DELETING; + entity.status.enabled = false; + } else { + entity.status.phase = (() => { + if (!cluster) { + logger.debug(`${logPrefix} setting entity ${entity.getName()} to DISCONNECTED, reason="no cluster"`); + + return LensKubernetesClusterStatus.DISCONNECTED; + } + + if (cluster.accessible) { + logger.debug(`${logPrefix} setting entity ${entity.getName()} to CONNECTED, reason="cluster is accessible"`); + + return LensKubernetesClusterStatus.CONNECTED; + } + + if (!cluster.disconnected) { + logger.debug(`${logPrefix} setting entity ${entity.getName()} to CONNECTING, reason="cluster is not disconnected"`); + + return LensKubernetesClusterStatus.CONNECTING; + } + + // Extensions are not allowed to use the Lens specific status phases + if (!lensSpecificClusterStatuses.has(entity?.status?.phase)) { + logger.debug(`${logPrefix} not clearing entity ${entity.getName()} status, reason="custom string"`); + + return entity.status.phase; + } + + logger.debug(`${logPrefix} not clearing entity ${entity.getName()} DISCONNECTED, reason=""`); return LensKubernetesClusterStatus.DISCONNECTED; - } + })(); - if (cluster.accessible) { - logger.debug(`${logPrefix} setting entity ${entity.getName()} to CONNECTED, reason="cluster is accessible"`); - - return LensKubernetesClusterStatus.CONNECTED; - } - - if (!cluster.disconnected) { - logger.debug(`${logPrefix} setting entity ${entity.getName()} to CONNECTING, reason="cluster is not disconnected"`); - - return LensKubernetesClusterStatus.CONNECTING; - } - - // Extensions are not allowed to use the Lens specific status phases - if (!lensSpecificClusterStatuses.has(entity?.status?.phase)) { - logger.debug(`${logPrefix} not clearing entity ${entity.getName()} status, reason="custom string"`); - - return entity.status.phase; - } - - logger.debug(`${logPrefix} not clearing entity ${entity.getName()} DISCONNECTED, reason=""`); - - return LensKubernetesClusterStatus.DISCONNECTED; - })(); - - entity.status.enabled = true; + entity.status.enabled = true; + } } @action