hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Use enum for lens specific KubernetesCluster statuses in more places

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2021-10-14 09:10:22 -04:00
parent f21e4124b2
commit e429b91142
4 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/catalog-entities/index.ts
View File

@ -19,6 +19,9 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
export * from "./general";
export * from "./kubernetes-cluster";
export * from "./web-link";
export { KubernetesCluster, kubernetesClusterCategory } from "./kubernetes-cluster";
export { GeneralEntity } from "./general";
export { WebLink } from "./web-link";
export type { KubernetesClusterPrometheusMetrics, KubernetesClusterSpec, KubernetesClusterMetadata } from "./kubernetes-cluster";
export type { WebLinkSpec, WebLinkStatus, WebLinkStatusPhase } from "./web-link";

13
src/common/catalog-entities/kubernetes-cluster.ts
View File

@ -54,6 +54,13 @@ export interface KubernetesClusterSpec extends CatalogEntitySpec {
accessibleNamespaces?: string[];
}
export enum LensKubernetesClusterStatus {
DELETING = "deleting",
CONNECTING = "connecting",
CONNECTED = "connected",
DISCONNECTED = "disconnected"
}
export interface KubernetesClusterMetadata extends CatalogEntityMetadata {
distro?: string;
kubeVersion?: string;
@ -104,15 +111,15 @@ export class KubernetesCluster extends CatalogEntity<KubernetesClusterMetadata,
}
switch (this.status.phase) {
case "connected":
case "connecting":
case LensKubernetesClusterStatus.CONNECTED:
case LensKubernetesClusterStatus.CONNECTING:
context.menuItems.push({
title: "Disconnect",
icon: "link_off",
onClick: () => requestMain(clusterDisconnectHandler, this.metadata.uid)
});
break;
case "disconnected":
case LensKubernetesClusterStatus.DISCONNECTED:
context.menuItems.push({
title: "Connect",
icon: "link",

25
src/main/cluster-manager.ts
View File

@ -27,7 +27,7 @@ import logger from "./logger";
import { apiKubePrefix } from "../common/vars";
import { getClusterIdFromHost, Singleton } from "../common/utils";
import { catalogEntityRegistry } from "./catalog";
import { KubernetesCluster, KubernetesClusterPrometheusMetrics } from "../common/catalog-entities/kubernetes-cluster";
import { KubernetesCluster, KubernetesClusterPrometheusMetrics, LensKubernetesClusterStatus } from "../common/catalog-entities/kubernetes-cluster";
import { ipcMainOn } from "../common/ipc";
import { once } from "lodash";
import { ClusterStore } from "../common/cluster-store";
@ -35,14 +35,7 @@ import type { ClusterId } from "../common/cluster-types";
const logPrefix = "[CLUSTER-MANAGER]:";
enum LensClusterStatus {
DELETING = "deleting",
CONNECTING = "connecting",
CONNECTED = "connected",
DISCONNECTED = "disconnected"
}
const lensSpecificClusterStatuses: Set<string> = new Set(Object.values(LensClusterStatus));
const lensSpecificClusterStatuses: Set<string> = new Set(Object.values(LensKubernetesClusterStatus));
export class ClusterManager extends Singleton {
private store = ClusterStore.getInstance();
@ -155,20 +148,20 @@ export class ClusterManager extends Singleton {
@action
protected updateEntityStatus(entity: KubernetesCluster, cluster?: Cluster) {
if (this.deleting.has(entity.getId())) {
entity.status.phase = LensClusterStatus.DELETING;
entity.status.phase = LensKubernetesClusterStatus.DELETING;
entity.status.enabled = false;
} else {
entity.status.phase = (() => {
if (!cluster) {
return LensClusterStatus.DISCONNECTED;
return LensKubernetesClusterStatus.DISCONNECTED;
}
if (cluster.accessible) {
return LensClusterStatus.CONNECTED;
return LensKubernetesClusterStatus.CONNECTED;
}
if (!cluster.disconnected) {
return LensClusterStatus.CONNECTING;
return LensKubernetesClusterStatus.CONNECTING;
}
// Extensions are not allowed to use the Lens specific status phases
@ -176,7 +169,7 @@ export class ClusterManager extends Singleton {
return entity.status.phase;
}
return LensClusterStatus.DISCONNECTED;
return LensKubernetesClusterStatus.DISCONNECTED;
})();
entity.status.enabled = true;
@ -288,7 +281,9 @@ export function catalogEntityFromCluster(cluster: Cluster) {
icon: {}
},
status: {
phase: cluster.disconnected ? "disconnected" : "connected",
phase: cluster.disconnected
? LensKubernetesClusterStatus.DISCONNECTED
: LensKubernetesClusterStatus.CONNECTED,
reason: "",
message: "",
active: !cluster.disconnected

3
src/renderer/components/hotbar/hotbar-entity-icon.tsx
View File

@ -31,6 +31,7 @@ import { cssNames, IClassName } from "../../utils";
import { Icon } from "../icon";
import { HotbarIcon } from "./hotbar-icon";
import { HotbarStore } from "../../../common/hotbar-store";
import { LensKubernetesClusterStatus } from "../../../common/catalog-entities/kubernetes-cluster";
interface Props extends DOMAttributes<HTMLElement> {
entity: CatalogEntity;
@ -78,7 +79,7 @@ export class HotbarEntityIcon extends React.Component<Props> {
return null;
}
const className = cssNames("led", { online: this.props.entity.status.phase == "connected"}); // TODO: make it more generic
const className = cssNames("led", { online: this.props.entity.status.phase === LensKubernetesClusterStatus.CONNECTED}); // TODO: make it more generic
return <div className={className} />;
}