diff --git a/src/renderer/components/status-bar/registered-status-bar-items.injectable.ts b/src/renderer/components/status-bar/registered-status-bar-items.injectable.ts deleted file mode 100644 index b9b9234089..0000000000 --- a/src/renderer/components/status-bar/registered-status-bar-items.injectable.ts +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getInjectable } from "@ogre-tools/injectable"; -import { computed } from "mobx"; -import rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable"; - -const registeredStatusBarItemsInjectable = getInjectable({ - id: "registered-status-bar-items", - - instantiate: (di) => { - const extensions = di.inject(rendererExtensionsInjectable); - - return computed(() => - extensions.get().flatMap((ext) => ext.statusBarItems), - ); - }, -}); - -export default registeredStatusBarItemsInjectable; diff --git a/src/renderer/components/status-bar/status-bar-item-registrator.injectable.tsx b/src/renderer/components/status-bar/status-bar-item-registrator.injectable.tsx index a2b8cf6330..3aa496b1e3 100644 --- a/src/renderer/components/status-bar/status-bar-item-registrator.injectable.tsx +++ b/src/renderer/components/status-bar/status-bar-item-registrator.injectable.tsx @@ -13,7 +13,7 @@ import type { StatusBarItem } from "./status-bar-item-injection-token"; import { statusBarItemInjectionToken } from "./status-bar-item-injection-token"; import type { StatusBarRegistration } from "./status-bar-registration"; import * as uuid from "uuid"; -import type React from "react"; +import React from "react"; const statusBarItemRegistratorInjectable = getInjectable({ id: "status-bar-item-registrator", diff --git a/src/renderer/components/status-bar/status-bar-items.injectable.tsx b/src/renderer/components/status-bar/status-bar-items.injectable.tsx index 1ed0a6a76a..210fa7c89b 100644 --- a/src/renderer/components/status-bar/status-bar-items.injectable.tsx +++ b/src/renderer/components/status-bar/status-bar-items.injectable.tsx @@ -6,7 +6,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import type { IComputedValue } from "mobx"; import { computed } from "mobx"; import type { StatusBarItemProps } from "./status-bar-registration"; -import { StatusBarItem, statusBarItemInjectionToken } from "./status-bar-item-injection-token"; +import type { StatusBarItem } from "./status-bar-item-injection-token"; +import { statusBarItemInjectionToken } from "./status-bar-item-injection-token"; export interface StatusBarItems { right: React.ComponentType[]; diff --git a/src/renderer/components/status-bar/status-bar.test.tsx b/src/renderer/components/status-bar/status-bar.test.tsx index 26483f7a2e..b797e35b77 100644 --- a/src/renderer/components/status-bar/status-bar.test.tsx +++ b/src/renderer/components/status-bar/status-bar.test.tsx @@ -12,8 +12,8 @@ import { renderFor } from "../test-utils/renderFor"; import type { IObservableArray } from "mobx"; import { computed, observable } from "mobx"; import type { DiContainer } from "@ogre-tools/injectable"; -import statusBarItemsInjectable from "./registered-status-bar-items.injectable"; -import type { StatusBarRegistration } from "./status-bar-registration"; +import type { StatusBarItems } from "./status-bar-items.injectable"; +import statusBarItemsInjectable from "./status-bar-items.injectable"; import { LensRendererExtension } from "../../../extensions/lens-renderer-extension"; import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable"; @@ -72,9 +72,10 @@ describe("", () => { const testId = "testId"; const text = "heee"; - di.override(statusBarItemsInjectable, () => computed(() => [ - { item: {text} }, - ] as StatusBarRegistration[])); + di.override(statusBarItemsInjectable, () => computed(() => ({ + right: [ () => {text} ], + left: [], + }) as StatusBarItems)); const { getByTestId } = render();