From 1707a95eef54c748da60ffa948e180650f739488 Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Fri, 26 Nov 2021 14:01:35 +0200
Subject: [PATCH] Fix merge conflicts

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
---
 src/common/k8s-api/api-manager.ts             |  6 +-----
 src/extensions/registries/base-registry.ts    |  6 +-----
 .../registries/kube-object-menu-registry.ts   |  7 ++-----
 src/main/cluster.ts                           |  8 +------
 .../kube-object-menu.test.tsx.snap            |  9 ++++++++
 .../dependencies/apiManager.injectable.ts     |  7 ++++---
 .../dependencies/cluster.injectable.ts        |  6 +++---
 .../dependencies/clusterName.injectable.ts    | 10 ++++-----
 .../editResourceTab.injectable.ts             |  4 ++--
 .../dependencies/hideDetails.injectable.ts    |  4 ++--
 .../kubeObjectMenuRegistry.injectable.ts      |  6 +++---
 .../kube-object-menu.injectable.tsx           |  4 ++--
 .../kube-object-menu.test.tsx                 | 21 +++++++++++--------
 .../kube-object-menu/kube-object-menu.tsx     |  8 +++----
 .../components/test-utils/renderFor.tsx       | 12 +++++------
 15 files changed, 57 insertions(+), 61 deletions(-)

diff --git a/src/common/k8s-api/api-manager.ts b/src/common/k8s-api/api-manager.ts
index b2befc4771..1dec033db3 100644
--- a/src/common/k8s-api/api-manager.ts
+++ b/src/common/k8s-api/api-manager.ts
@@ -27,11 +27,7 @@ import type { KubeApi } from "./kube-api";
 import type { KubeObject } from "./kube-object";
 import { IKubeObjectRef, parseKubeApi, createKubeApiURL } from "./kube-api-parse";
 
-export interface IApiManager {
-  getStore<TKubeObjectStore extends KubeObjectStore<KubeObject>>(api: string | KubeApi<KubeObject>): TKubeObjectStore | undefined;
-}
-
-export class ApiManager implements IApiManager {
+export class ApiManager {
   private apis = observable.map<string, KubeApi<KubeObject>>();
   private stores = observable.map<string, KubeObjectStore<KubeObject>>();
 
diff --git a/src/extensions/registries/base-registry.ts b/src/extensions/registries/base-registry.ts
index b76762671a..9b596172c9 100644
--- a/src/extensions/registries/base-registry.ts
+++ b/src/extensions/registries/base-registry.ts
@@ -24,11 +24,7 @@ import { action, observable, makeObservable } from "mobx";
 import { Singleton } from "../../common/utils";
 import { LensExtension } from "../lens-extension";
 
-export interface IBaseRegistry<T> {
-  add(items: T | T[], extension?: LensExtension): () => void;
-}
-
-export class BaseRegistry<T, I = T> extends Singleton implements IBaseRegistry<T> {
+export class BaseRegistry<T, I = T> extends Singleton {
   private items = observable.map<T, I>([], { deep: false });
 
   constructor() {
diff --git a/src/extensions/registries/kube-object-menu-registry.ts b/src/extensions/registries/kube-object-menu-registry.ts
index 58cd4ffc28..49309d06d8 100644
--- a/src/extensions/registries/kube-object-menu-registry.ts
+++ b/src/extensions/registries/kube-object-menu-registry.ts
@@ -20,7 +20,7 @@
  */
 
 import type React from "react";
-import { BaseRegistry, IBaseRegistry } from "./base-registry";
+import { BaseRegistry } from "./base-registry";
 
 export interface KubeObjectMenuComponents {
   MenuItem: React.ComponentType<any>;
@@ -32,11 +32,8 @@ export interface KubeObjectMenuRegistration {
   components: KubeObjectMenuComponents;
 }
 
-export interface IKubeObjectMenuRegistry extends IBaseRegistry<KubeObjectMenuRegistration> {
-  getItemsForKind(kind: string, apiVersion: string): any;
-}
 
-export class KubeObjectMenuRegistry extends BaseRegistry<KubeObjectMenuRegistration> implements IKubeObjectMenuRegistry {
+export class KubeObjectMenuRegistry extends BaseRegistry<KubeObjectMenuRegistration> {
   getItemsForKind = (kind: string, apiVersion: string) =>
     this.getItems().filter((item) =>
       item.kind === kind && item.apiVersions.includes(apiVersion),
diff --git a/src/main/cluster.ts b/src/main/cluster.ts
index 3aa66b562f..2ec97c792a 100644
--- a/src/main/cluster.ts
+++ b/src/main/cluster.ts
@@ -37,18 +37,12 @@ import { ClusterMetadataKey, initialNodeShellImage, ClusterStatus } from "../com
 import { disposer, storedKubeConfigFolder, toJS } from "../common/utils";
 import type { Response } from "request";
 
-export interface IHasClusterName {
-  name: string;
-}
-
-export interface ICluster extends IHasClusterName {}
-
 /**
  * Cluster
  *
  * @beta
  */
-export class Cluster implements ClusterModel, ClusterState, ICluster {
+export class Cluster implements ClusterModel, ClusterState {
   /** Unique id for a cluster */
   public readonly id: ClusterId;
   private kubeCtl: Kubectl;
diff --git a/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap b/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap
index 66d9f04861..c7b3a53142 100644
--- a/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap
+++ b/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap
@@ -6,6 +6,7 @@ exports[`kube-object-menu given kube object renders 1`] = `
     <div>
       <ul
         class="Animate opacity Menu MenuActions flex KubeObjectMenu toolbar gaps right bottom"
+        style="--enter-duration: 100ms; --leave-duration: 100ms;"
       >
         <li>
           Some menu item
@@ -39,6 +40,7 @@ exports[`kube-object-menu given kube object renders 1`] = `
   </div>
   <div
     class="Animate opacity-scale Dialog flex center ConfirmDialog modal"
+    style="--enter-duration: 100ms; --leave-duration: 100ms;"
   />
   <div
     class="Tooltip narrow invisible formatter"
@@ -54,6 +56,7 @@ exports[`kube-object-menu given kube object when removing kube object renders 1`
     <div>
       <ul
         class="Animate opacity Menu MenuActions flex KubeObjectMenu toolbar gaps right bottom"
+        style="--enter-duration: 100ms; --leave-duration: 100ms;"
       >
         <li>
           Some menu item
@@ -88,6 +91,7 @@ exports[`kube-object-menu given kube object when removing kube object renders 1`
   <div
     class="Animate opacity-scale Dialog flex center ConfirmDialog modal"
     data-testid="confirmation-dialog"
+    style="--enter-duration: 100ms; --leave-duration: 100ms;"
   >
     <div
       class="box"
@@ -155,6 +159,7 @@ exports[`kube-object-menu given kube object with namespace when removing kube ob
     <div>
       <ul
         class="Animate opacity Menu MenuActions flex KubeObjectMenu toolbar gaps right bottom"
+        style="--enter-duration: 100ms; --leave-duration: 100ms;"
       >
         <li>
           Some menu item
@@ -189,6 +194,7 @@ exports[`kube-object-menu given kube object with namespace when removing kube ob
   <div
     class="Animate opacity-scale Dialog flex center ConfirmDialog modal"
     data-testid="confirmation-dialog"
+    style="--enter-duration: 100ms; --leave-duration: 100ms;"
   >
     <div
       class="box"
@@ -256,6 +262,7 @@ exports[`kube-object-menu given kube object without namespace when removing kube
     <div>
       <ul
         class="Animate opacity Menu MenuActions flex KubeObjectMenu toolbar gaps right bottom"
+        style="--enter-duration: 100ms; --leave-duration: 100ms;"
       >
         <li>
           Some menu item
@@ -290,6 +297,7 @@ exports[`kube-object-menu given kube object without namespace when removing kube
   <div
     class="Animate opacity-scale Dialog flex center ConfirmDialog modal"
     data-testid="confirmation-dialog"
+    style="--enter-duration: 100ms; --leave-duration: 100ms;"
   >
     <div
       class="box"
@@ -356,6 +364,7 @@ exports[`kube-object-menu given no kube object, renders 1`] = `
   <div>
     <ul
       class="Animate opacity Menu MenuActions flex KubeObjectMenu toolbar gaps right bottom"
+      style="--enter-duration: 100ms; --leave-duration: 100ms;"
     />
   </div>
 </body>
diff --git a/src/renderer/components/kube-object-menu/dependencies/apiManager.injectable.ts b/src/renderer/components/kube-object-menu/dependencies/apiManager.injectable.ts
index a8ab6a1bc6..82bff6133e 100644
--- a/src/renderer/components/kube-object-menu/dependencies/apiManager.injectable.ts
+++ b/src/renderer/components/kube-object-menu/dependencies/apiManager.injectable.ts
@@ -18,10 +18,11 @@
  * 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 { IApiManager, apiManager } from "../../../../common/k8s-api/api-manager";
-import type { IInjectable } from "@ogre-tools/injectable";
+import { apiManager } from "../../../../common/k8s-api/api-manager";
+import type { ApiManager } from "../../../../common/k8s-api/api-manager";
+import type { Injectable } from "@ogre-tools/injectable";
 
-const apiManagerInjectable: IInjectable<IApiManager> = {
+const apiManagerInjectable: Injectable<ApiManager> = {
   getDependencies: () => ({}),
   instantiate: () => apiManager,
 };
diff --git a/src/renderer/components/kube-object-menu/dependencies/cluster.injectable.ts b/src/renderer/components/kube-object-menu/dependencies/cluster.injectable.ts
index b3d7467121..17c4bab8d3 100644
--- a/src/renderer/components/kube-object-menu/dependencies/cluster.injectable.ts
+++ b/src/renderer/components/kube-object-menu/dependencies/cluster.injectable.ts
@@ -20,11 +20,11 @@
  */
 import { getActiveClusterEntity } from "../../../api/catalog-entity-registry";
 
-import type { IInjectable } from "@ogre-tools/injectable";
+import type { Injectable } from "@ogre-tools/injectable";
 import { lifecycleEnum } from "@ogre-tools/injectable";
-import type { ICluster } from "../../../../main/cluster";
+import type { Cluster } from "../../../../main/cluster";
 
-const clusterInjectable: IInjectable<ICluster | null> = {
+const clusterInjectable: Injectable<Cluster | null> = {
   getDependencies: () => ({}),
   instantiate: () => getActiveClusterEntity(),
   lifecycle: lifecycleEnum.transient,
diff --git a/src/renderer/components/kube-object-menu/dependencies/clusterName.injectable.ts b/src/renderer/components/kube-object-menu/dependencies/clusterName.injectable.ts
index a2aa1df5d2..992ceb27be 100644
--- a/src/renderer/components/kube-object-menu/dependencies/clusterName.injectable.ts
+++ b/src/renderer/components/kube-object-menu/dependencies/clusterName.injectable.ts
@@ -19,16 +19,16 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+import type { Injectable } from "@ogre-tools/injectable";
 import { lifecycleEnum } from "@ogre-tools/injectable";
-import type { IHasClusterName } from "../../../../main/cluster";
-import type { IInjectable } from "@ogre-tools/injectable";
+import type { Cluster } from "../../../../main/cluster";
 import clusterInjectable from "./cluster.injectable";
 
-interface IDependencies {
-  cluster: IHasClusterName;
+interface Dependencies {
+  cluster: Cluster;
 }
 
-const clusterNameInjectable: IInjectable<string | undefined, IDependencies> = {
+const clusterNameInjectable: Injectable<string | undefined, Dependencies> = {
   getDependencies: di => ({
     cluster: di.inject(clusterInjectable),
   }),
diff --git a/src/renderer/components/kube-object-menu/dependencies/editResourceTab.injectable.ts b/src/renderer/components/kube-object-menu/dependencies/editResourceTab.injectable.ts
index aa3ef38095..c6a33ec07b 100644
--- a/src/renderer/components/kube-object-menu/dependencies/editResourceTab.injectable.ts
+++ b/src/renderer/components/kube-object-menu/dependencies/editResourceTab.injectable.ts
@@ -19,9 +19,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 import { editResourceTab } from "../../dock/edit-resource.store";
-import type { IInjectable } from "@ogre-tools/injectable";
+import type { Injectable } from "@ogre-tools/injectable";
 
-const editResourceTabInjectable: IInjectable<typeof editResourceTab> = {
+const editResourceTabInjectable: Injectable<typeof editResourceTab> = {
   getDependencies: () => ({}),
   instantiate: () => editResourceTab,
 };
diff --git a/src/renderer/components/kube-object-menu/dependencies/hideDetails.injectable.ts b/src/renderer/components/kube-object-menu/dependencies/hideDetails.injectable.ts
index fc25d7c178..126352350d 100644
--- a/src/renderer/components/kube-object-menu/dependencies/hideDetails.injectable.ts
+++ b/src/renderer/components/kube-object-menu/dependencies/hideDetails.injectable.ts
@@ -19,9 +19,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 import { hideDetails } from "../../kube-detail-params";
-import type { IInjectable } from "@ogre-tools/injectable";
+import type { Injectable } from "@ogre-tools/injectable";
 
-export const hideDetailsInjectable: IInjectable<typeof hideDetails> = {
+export const hideDetailsInjectable: Injectable<typeof hideDetails> = {
   getDependencies: () => ({}),
   instantiate: () => hideDetails,
 };
diff --git a/src/renderer/components/kube-object-menu/dependencies/kubeObjectMenuRegistry.injectable.ts b/src/renderer/components/kube-object-menu/dependencies/kubeObjectMenuRegistry.injectable.ts
index 9ee3ae70a2..fb171bf960 100644
--- a/src/renderer/components/kube-object-menu/dependencies/kubeObjectMenuRegistry.injectable.ts
+++ b/src/renderer/components/kube-object-menu/dependencies/kubeObjectMenuRegistry.injectable.ts
@@ -18,10 +18,10 @@
  * 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 { IKubeObjectMenuRegistry, KubeObjectMenuRegistry } from "../../../../extensions/registries";
-import type { IInjectable } from "@ogre-tools/injectable";
+import { KubeObjectMenuRegistry } from "../../../../extensions/registries";
+import type { Injectable } from "@ogre-tools/injectable";
 
-const kubeObjectMenuRegistryInjectable: IInjectable<IKubeObjectMenuRegistry> = {
+const kubeObjectMenuRegistryInjectable: Injectable<KubeObjectMenuRegistry> = {
   getDependencies: () => ({}),
   instantiate: () => KubeObjectMenuRegistry.getInstance(),
 };
diff --git a/src/renderer/components/kube-object-menu/kube-object-menu.injectable.tsx b/src/renderer/components/kube-object-menu/kube-object-menu.injectable.tsx
index 5bca3e457c..202c398690 100644
--- a/src/renderer/components/kube-object-menu/kube-object-menu.injectable.tsx
+++ b/src/renderer/components/kube-object-menu/kube-object-menu.injectable.tsx
@@ -28,14 +28,14 @@ import {
 } from "./kube-object-menu";
 
 import type { KubeObject } from "../../../common/k8s-api/kube-object";
-import type { IInjectable } from "@ogre-tools/injectable";
+import type { Injectable } from "@ogre-tools/injectable";
 import apiManagerInjectable from "./dependencies/apiManager.injectable";
 import clusterNameInjectable from "./dependencies/clusterName.injectable";
 import kubeObjectMenuRegistryInjectable from "./dependencies/kubeObjectMenuRegistry.injectable";
 import editResourceTabInjectable from "./dependencies/editResourceTab.injectable";
 import hideDetailsInjectable from "./dependencies/hideDetails.injectable";
 
-const KubeObjectMenuInjectable: IInjectable<
+const KubeObjectMenuInjectable: Injectable<
   JSX.Element,
   KubeObjectMenuDependencies<KubeObject>,
   KubeObjectMenuProps<KubeObject>
diff --git a/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx b/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx
index 18e0e5ac2e..bf7fb84137 100644
--- a/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx
+++ b/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx
@@ -24,7 +24,7 @@ import { screen } from "@testing-library/react";
 import "@testing-library/jest-dom/extend-expect";
 import { KubeObject } from "../../../common/k8s-api/kube-object";
 import userEvent from "@testing-library/user-event";
-import type { IConfigurableDependencyInjectionContainer } from "@ogre-tools/injectable";
+import type { ConfigurableDependencyInjectionContainer } from "@ogre-tools/injectable";
 import type { KubeObjectMenuRegistration } from "../../../extensions/registries";
 import { KubeObjectMenuRegistry } from "../../../extensions/registries";
 import { ConfirmDialog } from "../confirm-dialog";
@@ -33,18 +33,20 @@ import { getDiForUnitTesting } from "../getDiForUnitTesting";
 
 import { Inject } from "@ogre-tools/injectable-react";
 import clusterInjectable from "./dependencies/cluster.injectable";
-import apiManagerInjectable from "./dependencies/apiManager.injectable";
 import hideDetailsInjectable from "./dependencies/hideDetails.injectable";
 import editResourceTabInjectable from "./dependencies/editResourceTab.injectable";
 import { TabKind } from "../dock/dock.store";
 import KubeObjectMenuInjectable from "./kube-object-menu.injectable";
 import kubeObjectMenuRegistryInjectable from "./dependencies/kubeObjectMenuRegistry.injectable";
-import { renderFor, IDiRender } from "../test-utils/renderFor";
+import { renderFor, DiRender } from "../test-utils/renderFor";
+import type { Cluster } from "../../../main/cluster";
+import type { ApiManager } from "../../../common/k8s-api/api-manager";
+import apiManagerInjectable from "./dependencies/apiManager.injectable";
 
 describe("kube-object-menu", () => {
   let objectStub: KubeObject | null;
-  let di: IConfigurableDependencyInjectionContainer;
-  let render: IDiRender;
+  let di: ConfigurableDependencyInjectionContainer;
+  let render: DiRender;
 
   beforeEach(() => {
     di = getDiForUnitTesting();
@@ -57,11 +59,12 @@ describe("kube-object-menu", () => {
 
     di.override(clusterInjectable, {
       name: "Some name",
-    });
+    } as Cluster);
 
     di.override(apiManagerInjectable, {
-      getStore: () => undefined,
-    });
+      // eslint-disable-next-line unused-imports/no-unused-vars-ts
+      getStore: (api) => undefined,
+    } as ApiManager);
 
     di.override(hideDetailsInjectable, () => {});
 
@@ -282,7 +285,7 @@ const addDynamicMenuItem = ({
   apiVersions,
   kind,
 }: {
-  di: IConfigurableDependencyInjectionContainer;
+  di: ConfigurableDependencyInjectionContainer;
   apiVersions: string[];
   kind: string;
 }) => {
diff --git a/src/renderer/components/kube-object-menu/kube-object-menu.tsx b/src/renderer/components/kube-object-menu/kube-object-menu.tsx
index 27591ee790..b5a2c6e851 100644
--- a/src/renderer/components/kube-object-menu/kube-object-menu.tsx
+++ b/src/renderer/components/kube-object-menu/kube-object-menu.tsx
@@ -25,12 +25,12 @@ import type { KubeObject } from "../../../common/k8s-api/kube-object";
 import { MenuActions, MenuActionsProps } from "../menu";
 import identity from "lodash/identity";
 
-import type { IKubeObjectMenuRegistry } from "../../../extensions/registries";
-import type { IApiManager } from "../../../common/k8s-api/api-manager";
+import type { KubeObjectMenuRegistry } from "../../../extensions/registries";
+import type { ApiManager } from "../../../common/k8s-api/api-manager";
 
 export interface KubeObjectMenuDependencies<TKubeObject> {
-  apiManager: IApiManager;
-  kubeObjectMenuRegistry: IKubeObjectMenuRegistry;
+  apiManager: ApiManager;
+  kubeObjectMenuRegistry: KubeObjectMenuRegistry;
   clusterName: string;
   hideDetails: () => void;
   editResourceTab: (kubeObject: TKubeObject) => void;
diff --git a/src/renderer/components/test-utils/renderFor.tsx b/src/renderer/components/test-utils/renderFor.tsx
index 690d3d8332..d60032384d 100644
--- a/src/renderer/components/test-utils/renderFor.tsx
+++ b/src/renderer/components/test-utils/renderFor.tsx
@@ -25,17 +25,17 @@ import {
   RenderResult,
 } from "@testing-library/react";
 
-import type { IConfigurableDependencyInjectionContainer } from "@ogre-tools/injectable";
+import type { ConfigurableDependencyInjectionContainer } from "@ogre-tools/injectable";
 
 import { DiContextProvider } from "@ogre-tools/injectable-react";
 
-export type IDiRender = (ui: React.ReactElement) => RenderResult;
+export type DiRender = (ui: React.ReactElement) => RenderResult;
 
-type IDiRenderFor = (
-  di: IConfigurableDependencyInjectionContainer,
-) => IDiRender;
+type DiRenderFor = (
+  di: ConfigurableDependencyInjectionContainer,
+) => DiRender;
 
-export const renderFor: IDiRenderFor = di => ui =>
+export const renderFor: DiRenderFor = di => ui =>
   testingLibraryRender(
     <DiContextProvider value={{ di }}>{ui}</DiContextProvider>,
   );