diff --git a/src/renderer/bootstrap.tsx b/src/renderer/bootstrap.tsx index b9f48b2b8c..db9755206f 100644 --- a/src/renderer/bootstrap.tsx +++ b/src/renderer/bootstrap.tsx @@ -131,9 +131,6 @@ export async function bootstrap(comp: () => Promise, di: Dependenc logger.info(`${logPrefix} initializing IpcRendererListeners`); initializers.initIpcRendererListeners(extensionLoader); - logger.info(`${logPrefix} initializing StatusBarRegistry`); - initializers.initStatusBarRegistry(); - extensionLoader.init(); ExtensionDiscovery.createInstance(extensionLoader).init(); diff --git a/src/renderer/components/cluster-manager/active-hotbar-name.tsx b/src/renderer/components/cluster-manager/active-hotbar-name.tsx deleted file mode 100644 index 344299c110..0000000000 --- a/src/renderer/components/cluster-manager/active-hotbar-name.tsx +++ /dev/null @@ -1,52 +0,0 @@ -/** - * Copyright (c) 2021 OpenLens Authors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -import React from "react"; -import { observer } from "mobx-react"; -import { Icon } from "../icon"; -import hotbarManagerInjectable from "../../../common/hotbar-store.injectable"; -import { HotbarSwitchCommand } from "../hotbar/hotbar-switch-command"; -import { withInjectables } from "@ogre-tools/injectable-react"; -import commandOverlayInjectable from "../command-palette/command-overlay.injectable"; - -interface Dependencies { - openCommandOverlay: (component: React.ReactElement) => void; - activeHotbarName: () => string | undefined; -} - -const NonInjectedActiveHotbarName = observer(({ openCommandOverlay, activeHotbarName }: Dependencies) => ( -
openCommandOverlay()} - > - - {activeHotbarName()} -
-)); - -export const ActiveHotbarName = withInjectables(NonInjectedActiveHotbarName, { - getProps: (di, props) => ({ - activeHotbarName: () => di.inject(hotbarManagerInjectable).getActive()?.name, - openCommandOverlay: di.inject(commandOverlayInjectable).open, - ...props, - }), -}); diff --git a/src/renderer/components/cluster-manager/bottom-bar.test.tsx b/src/renderer/components/cluster-manager/bottom-bar.test.tsx index 0733747a97..466395591e 100644 --- a/src/renderer/components/cluster-manager/bottom-bar.test.tsx +++ b/src/renderer/components/cluster-manager/bottom-bar.test.tsx @@ -20,66 +20,24 @@ */ import React from "react"; -import mockFs from "mock-fs"; -import { fireEvent } from "@testing-library/react"; +import { render } from "@testing-library/react"; import "@testing-library/jest-dom/extend-expect"; import { BottomBar } from "./bottom-bar"; import { StatusBarRegistry } from "../../../extensions/registries"; -import hotbarManagerInjectable from "../../../common/hotbar-store.injectable"; -import { AppPaths } from "../../../common/app-paths"; -import { HotbarSwitchCommand } from "../hotbar/hotbar-switch-command"; -import { ActiveHotbarName } from "./active-hotbar-name"; -import { getDiForUnitTesting } from "../../getDiForUnitTesting"; -import { DiRender, renderFor } from "../test-utils/renderFor"; -import type { ConfigurableDependencyInjectionContainer } from "@ogre-tools/injectable"; -import commandOverlayInjectable from "../command-palette/command-overlay.injectable"; -import { getEmptyHotbar } from "../../../common/hotbar-types"; - -AppPaths.init(); jest.mock("electron", () => ({ app: { - getName: () => "lens", - setName: jest.fn(), - setPath: jest.fn(), - getPath: () => "tmp", - }, - ipcMain: { - handle: jest.fn(), - on: jest.fn(), - removeAllListeners: jest.fn(), - off: jest.fn(), - send: jest.fn(), + getPath: () => "/foo", }, })); -const foobarHotbar = getEmptyHotbar("foobar"); - describe("", () => { - let di: ConfigurableDependencyInjectionContainer; - let render: DiRender; - beforeEach(() => { - const mockOpts = { - "tmp": { - "test-store.json": JSON.stringify({}), - }, - }; - - di = getDiForUnitTesting(); - render = renderFor(di); - - mockFs(mockOpts); StatusBarRegistry.createInstance(); - - di.override(hotbarManagerInjectable, () => ({ - getActive: () => foobarHotbar, - } as any)); }); afterEach(() => { StatusBarRegistry.resetInstance(); - mockFs.restore(); }); it("renders w/o errors", () => { @@ -125,33 +83,6 @@ describe("", () => { expect(getByTestId(testId)).toHaveTextContent(text); }); - it("shows active hotbar name", () => { - StatusBarRegistry.getInstance().getItems = jest.fn().mockImplementationOnce(() => [ - { item: () => }, - ]); - const { getByTestId } = render(); - - expect(getByTestId("current-hotbar-name")).toHaveTextContent("foobar"); - }); - - it("opens command palette on click", () => { - const mockOpen = jest.fn(); - - di.override(commandOverlayInjectable, () => ({ - open: mockOpen, - }) as any); - - StatusBarRegistry.getInstance().getItems = jest.fn().mockImplementationOnce(() => [ - { item: () => }, - ]); - const { getByTestId } = render(); - const activeHotbar = getByTestId("current-hotbar-name"); - - fireEvent.click(activeHotbar); - - - expect(mockOpen).toHaveBeenCalledWith(); - }); it("sort positioned items properly", () => { StatusBarRegistry.getInstance().getItems = jest.fn().mockImplementationOnce(() => [ diff --git a/src/renderer/initializers/status-bar-registry.tsx b/src/renderer/initializers/status-bar-registry.tsx deleted file mode 100644 index e2c7bc561e..0000000000 --- a/src/renderer/initializers/status-bar-registry.tsx +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Copyright (c) 2021 OpenLens Authors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -import React from "react"; -import { StatusBarRegistry } from "../../extensions/registries"; -import { ActiveHotbarName } from "../components/cluster-manager/active-hotbar-name"; - -export function initStatusBarRegistry() { - StatusBarRegistry.getInstance().add([ - { - components: { - Item: () => , - position: "left", - }, - }, - ]); -}