From fd1cb89d94f0357929bad7efcc0dcb4af4453d38 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Wed, 16 Nov 2022 15:14:04 -0500 Subject: [PATCH] Fix type errors Signed-off-by: Sebastian Malton --- src/main/cluster/manager.injectable.ts | 2 ++ src/main/cluster/manager.ts | 5 ++--- .../cluster-manager/cluster-frame-handler.injectable.ts | 9 ++++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/cluster/manager.injectable.ts b/src/main/cluster/manager.injectable.ts index 13f04f16ac..e4c22f0e38 100644 --- a/src/main/cluster/manager.injectable.ts +++ b/src/main/cluster/manager.injectable.ts @@ -7,6 +7,7 @@ import clusterStoreInjectable from "../../common/cluster-store/cluster-store.inj import catalogEntityRegistryInjectable from "../catalog/entity-registry.injectable"; import clustersThatAreBeingDeletedInjectable from "./are-being-deleted.injectable"; import { ClusterManager } from "./manager"; +import visibleClusterInjectable from "./visible-cluster.injectable"; const clusterManagerInjectable = getInjectable({ id: "cluster-manager", @@ -15,6 +16,7 @@ const clusterManagerInjectable = getInjectable({ store: di.inject(clusterStoreInjectable), catalogEntityRegistry: di.inject(catalogEntityRegistryInjectable), clustersThatAreBeingDeleted: di.inject(clustersThatAreBeingDeletedInjectable), + visibleCluster: di.inject(visibleClusterInjectable), }), }); diff --git a/src/main/cluster/manager.ts b/src/main/cluster/manager.ts index 097829ac33..d5c06c0619 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 type { ObservableSet } from "mobx"; +import type { IObservableValue, ObservableSet } from "mobx"; import { action, makeObservable, observe, reaction, toJS } from "mobx"; import type { Cluster } from "../../common/cluster/cluster"; import logger from "../logger"; @@ -18,7 +18,6 @@ import { once } from "lodash"; import type { ClusterStore } from "../../common/cluster-store/cluster-store"; import type { ClusterId } from "../../common/cluster-types"; import type { CatalogEntityRegistry } from "../catalog"; -import type { ObservableValue } from "mobx/dist/internal"; const logPrefix = "[CLUSTER-MANAGER]:"; @@ -28,7 +27,7 @@ interface Dependencies { readonly store: ClusterStore; readonly catalogEntityRegistry: CatalogEntityRegistry; readonly clustersThatAreBeingDeleted: ObservableSet; - readonly visibleCluster: ObservableValue; + readonly visibleCluster: IObservableValue; } export class ClusterManager { diff --git a/src/renderer/components/cluster-manager/cluster-frame-handler.injectable.ts b/src/renderer/components/cluster-manager/cluster-frame-handler.injectable.ts index 19611f3117..3f40455527 100644 --- a/src/renderer/components/cluster-manager/cluster-frame-handler.injectable.ts +++ b/src/renderer/components/cluster-manager/cluster-frame-handler.injectable.ts @@ -3,11 +3,18 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; +import getClusterByIdInjectable from "../../../common/cluster-store/get-by-id.injectable"; +import loggerInjectable from "../../../common/logger.injectable"; import { ClusterFrameHandler } from "./cluster-frame-handler"; +import emitClusterVisibilityInjectable from "./emit-cluster-visibility.injectable"; const clusterFrameHandlerInjectable = getInjectable({ id: "cluster-frame-handler", - instantiate: () => new ClusterFrameHandler(), + instantiate: (di) => new ClusterFrameHandler({ + emitClusterVisibility: di.inject(emitClusterVisibilityInjectable), + getClusterById: di.inject(getClusterByIdInjectable), + logger: di.inject(loggerInjectable), + }), }); export default clusterFrameHandlerInjectable;