From 93bc8fcb867c51e71507850c8114afcd041909d3 Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Wed, 18 Nov 2020 14:54:29 +0200 Subject: [PATCH] tweak Signed-off-by: Jari Kolehmainen --- src/common/cluster-ipc.ts | 16 +++++++++++----- src/extensions/cluster-feature.ts | 3 ++- .../+cluster-settings/cluster-settings.tsx | 5 +++-- src/renderer/components/app.tsx | 3 ++- .../cluster-manager/cluster-status.tsx | 3 ++- .../components/cluster-manager/clusters-menu.tsx | 3 ++- 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/common/cluster-ipc.ts b/src/common/cluster-ipc.ts index 38a25e8a75..15f4fef584 100644 --- a/src/common/cluster-ipc.ts +++ b/src/common/cluster-ipc.ts @@ -4,15 +4,21 @@ import { appEventBus } from "./event-bus" import { ResourceApplier } from "../main/resource-applier"; import { ipcMain } from "electron"; +export const clusterActivateHandler = "cluster:activate" +export const clusterSetFrameIdHandler = "cluster:set-frame-id" +export const clusterRefreshHandler = "cluster:refresh" +export const clusterDisconnectHandler = "cluster:disconnect" +export const clusterKubectlApplyAllHandler = "cluster:kubectl-apply-all" + if (ipcMain) { - handleRequest("cluster:activate", (event, clusterId: ClusterId, force = false) => { + handleRequest(clusterActivateHandler, (event, clusterId: ClusterId, force = false) => { const cluster = clusterStore.getById(clusterId); if (cluster) { return cluster.activate(force); } }) - handleRequest("cluster:set-frame-id", (event, clusterId: ClusterId, frameId?: number) => { + handleRequest(clusterSetFrameIdHandler, (event, clusterId: ClusterId, frameId?: number) => { const cluster = clusterStore.getById(clusterId); if (cluster) { if (frameId) cluster.frameId = frameId; // save cluster's webFrame.routingId to be able to send push-updates @@ -20,17 +26,17 @@ if (ipcMain) { } }) - handleRequest("cluster:refresh", (event, clusterId: ClusterId) => { + handleRequest(clusterRefreshHandler, (event, clusterId: ClusterId) => { const cluster = clusterStore.getById(clusterId); if (cluster) return cluster.refresh({ refreshMetadata: true }) }) - handleRequest("cluster:disconnect", (event, clusterId: ClusterId) => { + handleRequest(clusterDisconnectHandler, (event, clusterId: ClusterId) => { appEventBus.emit({name: "cluster", action: "stop"}); return clusterStore.getById(clusterId)?.disconnect(); }) - handleRequest("cluster:kubectl-apply-all", (event, clusterId: ClusterId, resources: string[]) => { + handleRequest(clusterKubectlApplyAllHandler, (event, clusterId: ClusterId, resources: string[]) => { appEventBus.emit({name: "cluster", action: "kubectl-apply-all"}) const cluster = clusterStore.getById(clusterId); if (cluster) { diff --git a/src/extensions/cluster-feature.ts b/src/extensions/cluster-feature.ts index efb26aba43..90cbd3a0a9 100644 --- a/src/extensions/cluster-feature.ts +++ b/src/extensions/cluster-feature.ts @@ -7,6 +7,7 @@ import { Cluster } from "../main/cluster"; import logger from "../main/logger"; import { app } from "electron" import { requestMain } from "../common/ipc"; +import { clusterKubectlApplyAllHandler } from "../common/cluster-ipc"; export interface ClusterFeatureStatus { currentVersion: string; @@ -39,7 +40,7 @@ export abstract class ClusterFeature { if (app) { await new ResourceApplier(cluster).kubectlApplyAll(resources) } else { - await requestMain("cluster:kubectl-apply-all", cluster.id, resources) + await requestMain(clusterKubectlApplyAllHandler, cluster.id, resources) } } diff --git a/src/renderer/components/+cluster-settings/cluster-settings.tsx b/src/renderer/components/+cluster-settings/cluster-settings.tsx index ecf5b982b0..55f4bb5ec4 100644 --- a/src/renderer/components/+cluster-settings/cluster-settings.tsx +++ b/src/renderer/components/+cluster-settings/cluster-settings.tsx @@ -14,6 +14,7 @@ import { IClusterSettingsRouteParams } from "./cluster-settings.route"; import { clusterStore } from "../../../common/cluster-store"; import { PageLayout } from "../layout/page-layout"; import { requestMain } from "../../../common/ipc"; +import { clusterActivateHandler, clusterRefreshHandler } from "../../../common/cluster-ipc" interface Props extends RouteComponentProps { } @@ -41,8 +42,8 @@ export class ClusterSettings extends React.Component { refreshCluster = async () => { if (this.cluster) { - await requestMain("cluster:activate", this.cluster.id) - await requestMain("cluster:refresh", this.cluster.id) + await requestMain(clusterActivateHandler, this.cluster.id) + await requestMain(clusterRefreshHandler, this.cluster.id) } } diff --git a/src/renderer/components/app.tsx b/src/renderer/components/app.tsx index cb00b4afea..f05ec8a7a8 100755 --- a/src/renderer/components/app.tsx +++ b/src/renderer/components/app.tsx @@ -39,6 +39,7 @@ import { extensionLoader } from "../../extensions/extension-loader"; import { appEventBus } from "../../common/event-bus" import { requestMain } from "../../common/ipc"; import whatInput from 'what-input'; +import { clusterSetFrameIdHandler } from "../../common/cluster-ipc"; @observer export class App extends React.Component { @@ -48,7 +49,7 @@ export class App extends React.Component { logger.info(`[APP]: Init dashboard, clusterId=${clusterId}, frameId=${frameId}`) await Terminal.preloadFonts() - await requestMain("cluster:set-frame-id", clusterId, frameId) + await requestMain(clusterSetFrameIdHandler, clusterId, frameId) await getHostedCluster().whenReady; // cluster.activate() is done at this point extensionLoader.loadOnClusterRenderer(); appEventBus.emit({ diff --git a/src/renderer/components/cluster-manager/cluster-status.tsx b/src/renderer/components/cluster-manager/cluster-status.tsx index c64c8f9f84..f8d76395bc 100644 --- a/src/renderer/components/cluster-manager/cluster-status.tsx +++ b/src/renderer/components/cluster-manager/cluster-status.tsx @@ -12,6 +12,7 @@ import { cssNames, IClassName } from "../../utils"; import { Cluster } from "../../../main/cluster"; import { ClusterId, clusterStore } from "../../../common/cluster-store"; import { CubeSpinner } from "../spinner"; +import { clusterActivateHandler } from "../../../common/cluster-ipc"; interface Props { className?: IClassName; @@ -48,7 +49,7 @@ export class ClusterStatus extends React.Component { } activateCluster = async (force = false) => { - await requestMain("cluster:activate", this.props.clusterId, force) + await requestMain(clusterActivateHandler, this.props.clusterId, force) } reconnect = async () => { diff --git a/src/renderer/components/cluster-manager/clusters-menu.tsx b/src/renderer/components/cluster-manager/clusters-menu.tsx index 3777aa9a1b..f3b390a198 100644 --- a/src/renderer/components/cluster-manager/clusters-menu.tsx +++ b/src/renderer/components/cluster-manager/clusters-menu.tsx @@ -23,6 +23,7 @@ import { Tooltip } from "../tooltip"; import { ConfirmDialog } from "../confirm-dialog"; import { clusterViewURL } from "./cluster-view.route"; import { getExtensionPageUrl, globalPageMenuRegistry, globalPageRegistry } from "../../../extensions/registries"; +import { clusterDisconnectHandler } from "../../../common/cluster-ipc"; interface Props { className?: IClassName; @@ -60,7 +61,7 @@ export class ClustersMenu extends React.Component { navigate(landingURL()); clusterStore.setActive(null); } - await requestMain("cluster:disconnect", cluster.id) + await requestMain(clusterDisconnectHandler, cluster.id) } })) }