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

Remove usage of legacy global ClusterStore.getInstance

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2022-12-01 08:04:42 -05:00
parent bd47377dd1
commit 21039e2387
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/renderer/components/cluster-manager/cluster-view.tsx
View File

@ -11,7 +11,6 @@ import { disposeOnUnmount, observer } from "mobx-react";
import { ClusterStatus } from "./cluster-status"; import { ClusterStatus } from "./cluster-status";
import type { ClusterFrameHandler } from "./cluster-frame-handler"; import type { ClusterFrameHandler } from "./cluster-frame-handler";
import type { Cluster } from "../../../common/cluster/cluster"; import type { Cluster } from "../../../common/cluster/cluster";
import { ClusterStore } from "../../../common/cluster-store/cluster-store";
import { requestClusterActivation } from "../../ipc"; import { requestClusterActivation } from "../../ipc";
import { withInjectables } from "@ogre-tools/injectable-react"; import { withInjectables } from "@ogre-tools/injectable-react";
import type { NavigateToCatalog } from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; import type { NavigateToCatalog } from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
@ -20,18 +19,19 @@ import clusterViewRouteParametersInjectable from "./cluster-view-route-parameter
import clusterFrameHandlerInjectable from "./cluster-frame-handler.injectable"; import clusterFrameHandlerInjectable from "./cluster-frame-handler.injectable";
import type { CatalogEntityRegistry } from "../../api/catalog/entity/registry"; import type { CatalogEntityRegistry } from "../../api/catalog/entity/registry";
import catalogEntityRegistryInjectable from "../../api/catalog/entity/registry.injectable"; import catalogEntityRegistryInjectable from "../../api/catalog/entity/registry.injectable";
import type { GetClusterById } from "../../../common/cluster-store/get-by-id.injectable";
import getClusterByIdInjectable from "../../../common/cluster-store/get-by-id.injectable";
interface Dependencies { interface Dependencies {
clusterId: IComputedValue<string>; clusterId: IComputedValue<string>;
clusterFrames: ClusterFrameHandler; clusterFrames: ClusterFrameHandler;
navigateToCatalog: NavigateToCatalog; navigateToCatalog: NavigateToCatalog;
entityRegistry: CatalogEntityRegistry; entityRegistry: CatalogEntityRegistry;
getClusterById: GetClusterById;
} }
@observer @observer
class NonInjectedClusterView extends React.Component<Dependencies> { class NonInjectedClusterView extends React.Component<Dependencies> {
private readonly store = ClusterStore.getInstance();
constructor(props: Dependencies) { constructor(props: Dependencies) {
super(props); super(props);
makeObservable(this); makeObservable(this);
@ -42,7 +42,7 @@ class NonInjectedClusterView extends React.Component<Dependencies> {
} }
@computed get cluster(): Cluster | undefined { @computed get cluster(): Cluster | undefined {
return this.store.getById(this.clusterId); return this.props.getClusterById(this.clusterId);
} }
private readonly isViewLoaded = computed(() => this.props.clusterFrames.hasLoadedView(this.clusterId), { private readonly isViewLoaded = computed(() => this.props.clusterFrames.hasLoadedView(this.clusterId), {
@ -110,10 +110,11 @@ class NonInjectedClusterView extends React.Component<Dependencies> {
export const ClusterView = withInjectables<Dependencies>(NonInjectedClusterView, { export const ClusterView = withInjectables<Dependencies>(NonInjectedClusterView, {
getProps: (di) => ({ getProps: (di) => ({
clusterId: di.inject(clusterViewRouteParametersInjectable).clusterId, ...di.inject(clusterViewRouteParametersInjectable),
navigateToCatalog: di.inject(navigateToCatalogInjectable), navigateToCatalog: di.inject(navigateToCatalogInjectable),
clusterFrames: di.inject(clusterFrameHandlerInjectable), clusterFrames: di.inject(clusterFrameHandlerInjectable),
entityRegistry: di.inject(catalogEntityRegistryInjectable), entityRegistry: di.inject(catalogEntityRegistryInjectable),
getClusterById: di.inject(getClusterByIdInjectable),
}), }),
}); });