Remove global version of appEventBus (#6096)

* Remove global version of appEventBus

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Introduce a temporary but better shape of ExecFileInjectable error

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>

src/renderer/components/+add-cluster/add-cluster.tsx

@@ -12,7 +12,6 @@ import { action, computed, makeObservable, observable } from "mobx";
 import { observer } from "mobx-react";
 import React from "react";
 import * as uuid from "uuid";
-import { appEventBus } from "../../../common/app-event-bus/event-bus";
 import { loadConfigFromString, splitConfig } from "../../../common/kube-helpers";
 import { docsUrl } from "../../../common/vars";
 import { isDefined, iter } from "../../utils";
@@ -24,6 +23,8 @@ import { withInjectables } from "@ogre-tools/injectable-react";
 import getCustomKubeConfigDirectoryInjectable from "../../../common/app-paths/get-custom-kube-config-directory/get-custom-kube-config-directory.injectable";
 import type { NavigateToCatalog } from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
 import navigateToCatalogInjectable from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
+import type { EmitAppEvent } from "../../../common/app-event-bus/emit-event.injectable";
+import emitAppEventInjectable from "../../../common/app-event-bus/emit-event.injectable";
 import type { GetDirnameOfPath } from "../../../common/path/get-dirname.injectable";
 import getDirnameOfPathInjectable from "../../../common/path/get-dirname.injectable";
 
@@ -36,6 +37,7 @@ interface Dependencies {
   getCustomKubeConfigDirectory: (directoryName: string) => string;
   navigateToCatalog: NavigateToCatalog;
   getDirnameOfPath: GetDirnameOfPath;
+  emitAppEvent: EmitAppEvent;
 }
 
 function getContexts(config: KubeConfig): Map<string, Option> {
@@ -55,13 +57,13 @@ class NonInjectedAddCluster extends React.Component<Dependencies> {
   @observable isWaiting = false;
   @observable errors: string[] = [];
 
-  constructor(dependencies: Dependencies) {
-    super(dependencies);
+  constructor(props: Dependencies) {
+    super(props);
     makeObservable(this);
   }
 
   componentDidMount() {
-    appEventBus.emit({ name: "cluster-add", action: "start" });
+    this.props.emitAppEvent({ name: "cluster-add", action: "start" });
   }
 
   @computed get allErrors(): string[] {
@@ -87,7 +89,7 @@ class NonInjectedAddCluster extends React.Component<Dependencies> {
 
   addClusters = action(async () => {
     this.isWaiting = true;
-    appEventBus.emit({ name: "cluster-add", action: "click" });
+    this.props.emitAppEvent({ name: "cluster-add", action: "click" });
 
     try {
       const absPath = this.props.getCustomKubeConfigDirectory(uuid.v4());
@@ -160,5 +162,6 @@ export const AddCluster = withInjectables<Dependencies>(NonInjectedAddCluster, {
     getCustomKubeConfigDirectory: di.inject(getCustomKubeConfigDirectoryInjectable),
     navigateToCatalog: di.inject(navigateToCatalogInjectable),
     getDirnameOfPath: di.inject(getDirnameOfPathInjectable),
+    emitAppEvent: di.inject(emitAppEventInjectable),
   }),
 });

src/renderer/components/+catalog/catalog.test.tsx

@@ -57,7 +57,7 @@ describe("<Catalog />", () => {
   let di: DiContainer;
   let catalogEntityStore: CatalogEntityStore;
   let catalogEntityRegistry: CatalogEntityRegistry;
-  let emitEvent: (event: AppEvent) => void;
+  let appEventListener: jest.MockedFunction<(event: AppEvent) => void>;
   let onRun: jest.MockedFunction<(context: CatalogEntityActionContext) => void | Promise<void>>;
   let catalogEntityItem: MockCatalogEntity;
   let render: DiRender;
@@ -78,11 +78,8 @@ describe("<Catalog />", () => {
     catalogEntityItem = createMockCatalogEntity(onRun);
     catalogEntityRegistry = di.inject(catalogEntityRegistryInjectable);
 
-    emitEvent = jest.fn();
-
-    di.override(appEventBusInjectable, () => ({
-      emit: emitEvent,
-    }));
+    appEventListener = jest.fn();
+    di.inject(appEventBusInjectable).addListener(appEventListener);
 
     catalogEntityStore = di.inject(catalogEntityStoreInjectable);
     Object.assign(catalogEntityStore, {
@@ -204,24 +201,20 @@ describe("<Catalog />", () => {
   });
 
   it("emits catalog open AppEvent", () => {
-    render(
-      <Catalog />,
-    );
+    render(<Catalog />);
 
-    expect(emitEvent).toHaveBeenCalledWith( {
+    expect(appEventListener).toHaveBeenCalledWith( {
       action: "open",
       name: "catalog",
     });
   });
 
   it("emits catalog change AppEvent when changing the category", () => {
-    render(
-      <Catalog />,
-    );
+    render(<Catalog />);
 
     userEvent.click(screen.getByText("Web Links"));
 
-    expect(emitEvent).toHaveBeenLastCalledWith({
+    expect(appEventListener).toHaveBeenCalledWith({
       action: "change-category",
       name: "catalog",
       params: {

src/renderer/components/+catalog/catalog.tsx

@@ -37,8 +37,6 @@ import type { NavigateToCatalog } from "../../../common/front-end-routing/routes
 import navigateToCatalogInjectable from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
 import catalogRouteParametersInjectable from "./catalog-route-parameters.injectable";
 import { browseCatalogTab } from "./catalog-browse-tab";
-import type { AppEvent } from "../../../common/app-event-bus/event-bus";
-import appEventBusInjectable from "../../../common/app-event-bus/app-event-bus.injectable";
 import hotbarStoreInjectable from "../../../common/hotbars/store.injectable";
 import type { HotbarStore } from "../../../common/hotbars/store";
 import type { VisitEntityContextMenu } from "../../../common/catalog/visit-entity-context-menu.injectable";
@@ -48,13 +46,15 @@ import type { Navigate } from "../../navigation/navigate.injectable";
 import navigateInjectable from "../../navigation/navigate.injectable";
 import type { NormalizeCatalogEntityContextMenu } from "../../catalog/normalize-menu-item.injectable";
 import normalizeCatalogEntityContextMenuInjectable from "../../catalog/normalize-menu-item.injectable";
+import type { EmitAppEvent } from "../../../common/app-event-bus/emit-event.injectable";
+import emitAppEventInjectable from "../../../common/app-event-bus/emit-event.injectable";
 
 interface Dependencies {
   catalogPreviousActiveTabStorage: StorageLayer<string | null>;
   catalogEntityStore: CatalogEntityStore;
   getCategoryColumns: (params: GetCategoryColumnsParams) => CategoryColumns;
   customCategoryViews: IComputedValue<Map<string, Map<string, RegisteredCustomCategoryViewDecl>>>;
-  emitEvent: (event: AppEvent) => void;
+  emitEvent: EmitAppEvent;
   routeParameters: {
     group: IComputedValue<string>;
     kind: IComputedValue<string>;
@@ -356,7 +356,7 @@ export const Catalog = withInjectables<Dependencies>(NonInjectedCatalog, {
     customCategoryViews: di.inject(customCategoryViewsInjectable),
     routeParameters: di.inject(catalogRouteParametersInjectable),
     navigateToCatalog: di.inject(navigateToCatalogInjectable),
-    emitEvent: di.inject(appEventBusInjectable).emit,
+    emitEvent: di.inject(emitAppEventInjectable),
     hotbarStore: di.inject(hotbarStoreInjectable),
     catalogCategoryRegistry: di.inject(catalogCategoryRegistryInjectable),
     visitEntityContextMenu: di.inject(visitEntityContextMenuInjectable),

src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable.ts

@@ -8,9 +8,9 @@ import extensionLoaderInjectable from "../../../../extensions/extension-loader/e
 import catalogEntityRegistryInjectable from "../../../api/catalog/entity/registry.injectable";
 import frameRoutingIdInjectable from "./frame-routing-id/frame-routing-id.injectable";
 import hostedClusterInjectable from "../../../cluster-frame-context/hosted-cluster.injectable";
-import appEventBusInjectable from "../../../../common/app-event-bus/app-event-bus.injectable";
 import clusterFrameContextInjectable from "../../../cluster-frame-context/cluster-frame-context.injectable";
 import assert from "assert";
+import emitAppEventInjectable from "../../../../common/app-event-bus/emit-event.injectable";
 
 const initClusterFrameInjectable = getInjectable({
   id: "init-cluster-frame",
@@ -25,7 +25,7 @@ const initClusterFrameInjectable = getInjectable({
       loadExtensions: di.inject(extensionLoaderInjectable).loadOnClusterRenderer,
       catalogEntityRegistry: di.inject(catalogEntityRegistryInjectable),
       frameRoutingId: di.inject(frameRoutingIdInjectable),
-      emitEvent: di.inject(appEventBusInjectable).emit,
+      emitAppEvent: di.inject(emitAppEventInjectable),
       clusterFrameContext: di.inject(clusterFrameContextInjectable),
     });
   },

src/renderer/frames/cluster-frame/init-cluster-frame/init-cluster-frame.ts

@@ -7,19 +7,19 @@ import type { CatalogEntityRegistry } from "../../../api/catalog/entity/registry
 import logger from "../../../../main/logger";
 import type { KubernetesCluster } from "../../../../common/catalog-entities";
 import { Notifications } from "../../../components/notifications";
-import type { AppEvent } from "../../../../common/app-event-bus/event-bus";
 import type { CatalogEntity } from "../../../../common/catalog";
 import { when } from "mobx";
 import type { ClusterFrameContext } from "../../../cluster-frame-context/cluster-frame-context";
 import { KubeObjectStore } from "../../../../common/k8s-api/kube-object.store";
 import { requestSetClusterFrameId } from "../../../ipc";
+import type { EmitAppEvent } from "../../../../common/app-event-bus/emit-event.injectable";
 
 interface Dependencies {
   hostedCluster: Cluster;
   loadExtensions: (getCluster: () => CatalogEntity) => void;
   catalogEntityRegistry: CatalogEntityRegistry;
   frameRoutingId: number;
-  emitEvent: (event: AppEvent) => void;
+  emitAppEvent: EmitAppEvent;
 
   // TODO: This dependency belongs to KubeObjectStore
   clusterFrameContext: ClusterFrameContext;
@@ -32,7 +32,7 @@ export const initClusterFrame = ({
   loadExtensions,
   catalogEntityRegistry,
   frameRoutingId,
-  emitEvent,
+  emitAppEvent,
   clusterFrameContext,
 }: Dependencies) =>
   async (unmountRoot: () => void) => {
@@ -70,7 +70,7 @@ export const initClusterFrame = ({
     );
 
     setTimeout(() => {
-      emitEvent({
+      emitAppEvent({
         name: "cluster",
         action: "open",
         params: {