Move hotbarManagerInjectable to different file

Signed-off-by: Sebastian Malton <sebastian@malton.name>

src/renderer/bootstrap.tsx

@@ -40,7 +40,7 @@ import { DefaultProps } from "./mui-base-theme";
 import configurePackages from "../common/configure-packages";
 import * as initializers from "./initializers";
 import logger from "../common/logger";
-import { HotbarStore } from "../common/hotbar-store.injectable";
+import { HotbarStore } from "../common/hotbar-store";
 import { WeblinkStore } from "../common/weblink-store";
 import { ExtensionsStore } from "../extensions/extensions-store";
 import { FilesystemProvisionerStore } from "../main/extension-filesystem";

src/renderer/components/+catalog/catalog.tsx

@@ -29,7 +29,7 @@ import { CatalogEntityStore } from "./catalog-entity.store";
 import { navigate } from "../../navigation";
 import { MenuItem, MenuActions } from "../menu";
 import type { CatalogEntityContextMenu, CatalogEntityContextMenuContext } from "../../api/catalog-entity";
-import { HotbarStore } from "../../../common/hotbar-store.injectable";
+import { HotbarStore } from "../../../common/hotbar-store";
 import { ConfirmDialog } from "../confirm-dialog";
 import { catalogCategoryRegistry, CatalogEntity } from "../../../common/catalog";
 import { CatalogAddButton } from "./catalog-add-button";

src/renderer/components/+catalog/hotbar-toggle-menu-item.tsx

@@ -20,7 +20,7 @@
  */
 import React, { ReactNode, useState } from "react";
 
-import { HotbarStore } from "../../../common/hotbar-store.injectable";
+import { HotbarStore } from "../../../common/hotbar-store";
 import { MenuItem } from "../menu";
 
 import type { CatalogEntity } from "../../api/catalog-entity";

src/renderer/components/delete-cluster-dialog/delete-cluster-dialog.tsx

@@ -31,7 +31,7 @@ import { saveKubeconfig } from "./save-config";
 import { requestMain } from "../../../common/ipc";
 import { clusterClearDeletingHandler, clusterDeleteHandler, clusterSetDeletingHandler } from "../../../common/cluster-ipc";
 import { Notifications } from "../notifications";
-import { HotbarStore } from "../../../common/hotbar-store.injectable";
+import { HotbarStore } from "../../../common/hotbar-store";
 import { boundMethod } from "autobind-decorator";
 import { Dialog } from "../dialog";
 import { Icon } from "../icon";

src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx

@@ -27,10 +27,11 @@ import { AppPaths } from "../../../../common/app-paths";
 import type { ConfigurableDependencyInjectionContainer } from "@ogre-tools/injectable";
 import { getDiForUnitTesting } from "../../../getDiForUnitTesting";
 import { type DiRender, renderFor } from "../../test-utils/renderFor";
-import hotbarManagerInjectable, { HotbarStore } from "../../../../common/hotbar-store.injectable";
+import hotbarManagerInjectable from "../../../../common/hotbar-store.injectable";
 import { UserStore } from "../../../../common/user-store";
 import { ThemeStore } from "../../../theme.store";
 import { ConfirmDialog } from "../../confirm-dialog";
+import type { HotbarStore } from "../../../../common/hotbar-store";
 
 jest.mock("electron", () => ({
   app: {

src/renderer/components/hotbar/hotbar-add-command.tsx

@@ -21,24 +21,20 @@
 
 import React from "react";
 import { observer } from "mobx-react";
-import hotbarManagerInjectable, { HotbarStore } from "../../../common/hotbar-store.injectable";
 import { Input, InputValidator } from "../input";
 import type { CreateHotbarData, CreateHotbarOptions } from "../../../common/hotbar-types";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import commandOverlayInjectable from "../command-palette/command-overlay.injectable";
-
-export const uniqueHotbarName: InputValidator = {
-  condition: ({ required }) => required,
-  message: () => "Hotbar with this name already exists",
-  validate: value => !HotbarStore.getInstance().getByName(value),
-};
+import hotbarManagerInjectable from "../../../common/hotbar-store.injectable";
+import uniqueHotbarNameInjectable from "../input/validators/unique-hotbar-name.injectable";
 
 interface Dependencies {
   closeCommandOverlay: () => void;
   addHotbar: (data: CreateHotbarData, { setActive }?: CreateHotbarOptions) => void;
+  uniqueHotbarName: InputValidator;
 }
 
-const NonInjectedHotbarAddCommand = observer(({ closeCommandOverlay, addHotbar }: Dependencies) => {
+const NonInjectedHotbarAddCommand = observer(({ closeCommandOverlay, addHotbar, uniqueHotbarName }: Dependencies) => {
   const onSubmit = (name: string) => {
     if (!name.trim()) {
       return;
@@ -71,6 +67,7 @@ export const HotbarAddCommand = withInjectables<Dependencies>(NonInjectedHotbarA
   getProps: (di, props) => ({
     closeCommandOverlay: di.inject(commandOverlayInjectable).close,
     addHotbar: di.inject(hotbarManagerInjectable).add,
+    uniqueHotbarName: di.inject(uniqueHotbarNameInjectable),
     ...props,
   }),
 });

src/renderer/components/hotbar/hotbar-menu.tsx

@@ -26,7 +26,7 @@ import { observer } from "mobx-react";
 import { HotbarEntityIcon } from "./hotbar-entity-icon";
 import { cssNames, IClassName } from "../../utils";
 import { catalogEntityRegistry } from "../../api/catalog-entity-registry";
-import { HotbarStore } from "../../../common/hotbar-store.injectable";
+import { HotbarStore } from "../../../common/hotbar-store";
 import type { CatalogEntity } from "../../api/catalog-entity";
 import { DragDropContext, Draggable, Droppable, DropResult } from "react-beautiful-dnd";
 import { HotbarSelector } from "./hotbar-selector";

src/renderer/components/hotbar/hotbar-rename-command.tsx

@@ -23,11 +23,11 @@ import React, { useState } from "react";
 import { observer } from "mobx-react";
 import { Select } from "../select";
 import hotbarManagerInjectable from "../../../common/hotbar-store.injectable";
-import { Input } from "../input";
-import { uniqueHotbarName } from "./hotbar-add-command";
+import { Input, InputValidator } from "../input";
 import type { Hotbar } from "../../../common/hotbar-types";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import commandOverlayInjectable from "../command-palette/command-overlay.injectable";
+import uniqueHotbarNameInjectable from "../input/validators/unique-hotbar-name.injectable";
 
 interface Dependencies {
   closeCommandOverlay: () => void;
@@ -37,9 +37,10 @@ interface Dependencies {
     setHotbarName: (id: string, name: string) => void;
     getDisplayLabel: (hotbar: Hotbar) => string;
   };
+  uniqueHotbarName: InputValidator;
 }
 
-const NonInjectedHotbarRenameCommand = observer(({ closeCommandOverlay, hotbarManager }: Dependencies) => {
+const NonInjectedHotbarRenameCommand = observer(({ closeCommandOverlay, hotbarManager, uniqueHotbarName }: Dependencies) => {
   const [hotbarId, setHotbarId] = useState("");
   const [hotbarName, setHotbarName] = useState("");
 
@@ -100,6 +101,7 @@ export const HotbarRenameCommand = withInjectables<Dependencies>(NonInjectedHotb
   getProps: (di, props) => ({
     closeCommandOverlay: di.inject(commandOverlayInjectable).close,
     hotbarManager: di.inject(hotbarManagerInjectable),
+    uniqueHotbarName: di.inject(uniqueHotbarNameInjectable),
     ...props,
   }),
 });

src/renderer/components/input/validators/unique-hotbar-name.injectable.ts

@@ -0,0 +1,35 @@
+/**
+ * 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 { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import hotbarManagerInjectable from "../../../../common/hotbar-store.injectable";
+import type { InputValidator } from "../input_validators";
+
+const uniqueHotbarNameInjectable = getInjectable({
+  instantiate: di => ({
+    condition: ({ required }) => required,
+    message: () => "Hotbar with this name already exists",
+    validate: value => !di.inject(hotbarManagerInjectable).getByName(value),
+  } as InputValidator),
+  lifecycle: lifecycleEnum.singleton,
+});
+
+export default uniqueHotbarNameInjectable;

src/renderer/components/layout/sidebar-cluster.tsx

@@ -22,7 +22,7 @@
 import styles from "./sidebar-cluster.module.scss";
 import { observable } from "mobx";
 import React, { useState } from "react";
-import { HotbarStore } from "../../../common/hotbar-store.injectable";
+import { HotbarStore } from "../../../common/hotbar-store";
 import { broadcastMessage } from "../../../common/ipc";
 import type { CatalogEntity, CatalogEntityContextMenu, CatalogEntityContextMenuContext } from "../../api/catalog-entity";
 import { IpcRendererNavigationEvents } from "../../navigation/events";