From 1a594b9eacbfe3ccfbc50a2767b99aed164ed744 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Mon, 24 Oct 2022 12:25:49 -0400 Subject: [PATCH] Remove last use of legacy global getActiveClusterEntity Signed-off-by: Sebastian Malton --- src/renderer/api/catalog/entity/legacy-globals.ts | 12 ------------ .../+network-ingresses/ingress-details.tsx | 7 +++++-- 2 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 src/renderer/api/catalog/entity/legacy-globals.ts diff --git a/src/renderer/api/catalog/entity/legacy-globals.ts b/src/renderer/api/catalog/entity/legacy-globals.ts deleted file mode 100644 index 70a30f92f8..0000000000 --- a/src/renderer/api/catalog/entity/legacy-globals.ts +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { asLegacyGlobalFunctionForExtensionApi } from "../../../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api"; -import getActiveClusterEntityInjectable from "./get-active-cluster-entity.injectable"; - -/** - * @deprecated use `di.inject(getActiveClusterEntityInjectable)` instead - */ -export const getActiveClusterEntity = asLegacyGlobalFunctionForExtensionApi(getActiveClusterEntityInjectable); diff --git a/src/renderer/components/+network-ingresses/ingress-details.tsx b/src/renderer/components/+network-ingresses/ingress-details.tsx index e8b916cac2..00c02050b1 100644 --- a/src/renderer/components/+network-ingresses/ingress-details.tsx +++ b/src/renderer/components/+network-ingresses/ingress-details.tsx @@ -17,18 +17,20 @@ import type { KubeObjectDetailsProps } from "../kube-object-details"; import { IngressCharts } from "./ingress-charts"; import { KubeObjectMeta } from "../kube-object-meta"; import { computeRuleDeclarations } from "../../../common/k8s-api/endpoints/ingress.api"; -import { getActiveClusterEntity } from "../../api/catalog/entity/legacy-globals"; import { ClusterMetricsResourceType } from "../../../common/cluster-types"; import logger from "../../../common/logger"; import type { IngressMetricData, RequestIngressMetrics } from "../../../common/k8s-api/endpoints/metrics.api/request-ingress-metrics.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; import requestIngressMetricsInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-ingress-metrics.injectable"; +import type { GetActiveClusterEntity } from "../../api/catalog/entity/get-active-cluster-entity.injectable"; +import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable"; export interface IngressDetailsProps extends KubeObjectDetailsProps { } interface Dependencies { requestIngressMetrics: RequestIngressMetrics; + getActiveClusterEntity: GetActiveClusterEntity; } @observer @@ -124,7 +126,7 @@ class NonInjectedIngressDetails extends React.Component getProps: (di, props) => ({ ...props, requestIngressMetrics: di.inject(requestIngressMetricsInjectable), + getActiveClusterEntity: di.inject(getActiveClusterEntityInjectable), }), });