Fix typings

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

src/main/shell-session/node-shell-session/open.injectable.ts

@@ -19,6 +19,7 @@ import appNameInjectable from "../../../common/vars/app-name.injectable";
 import buildVersionInjectable from "../../vars/build-version/build-version.injectable";
 import emitAppEventInjectable from "../../../common/app-event-bus/emit-event.injectable";
 import statInjectable from "../../../common/fs/stat.injectable";
+import createKubeApiInjectable from "../../../common/k8s-api/create-kube-api.injectable";
 
 export interface NodeShellSessionArgs {
   websocket: WebSocket;
@@ -45,6 +46,7 @@ const openNodeShellSessionInjectable = getInjectable({
       spawnPty: di.inject(spawnPtyInjectable),
       emitAppEvent: di.inject(emitAppEventInjectable),
       stat: di.inject(statInjectable),
+      createKubeApi: di.inject(createKubeApiInjectable),
     };
 
     return async (args) => {

src/renderer/api/__tests__/websocket-api.test.ts

@@ -3,6 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
+import { getDiForUnitTesting } from "../../getDiForUnitTesting";
+import defaultWebsocketApiParamsInjectable from "../default-websocket-api-params.injectable";
 import type { WebSocketEvents } from "../websocket-api";
 import { WebSocketApi } from "../websocket-api";
 
@@ -16,7 +18,11 @@ describe("WebsocketApi tests", () => {
   let api: TestWebSocketApi;
 
   beforeEach(() => {
-    api = new TestWebSocketApi({});
+    const di = getDiForUnitTesting({ doGeneralOverrides: true });
+
+    api = new TestWebSocketApi({
+      defaultParams: di.inject(defaultWebsocketApiParamsInjectable),
+    }, {});
   });
 
   describe("before connection", () => {

src/renderer/api/create-terminal-api.injectable.ts

@@ -6,6 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
 import loggerInjectable from "../../common/logger.injectable";
 import hostedClusterIdInjectable from "../cluster-frame-context/hosted-cluster-id.injectable";
+import defaultWebsocketApiParamsInjectable from "./default-websocket-api-params.injectable";
 import type { TerminalApiDependencies, TerminalApiQuery } from "./terminal-api";
 import { TerminalApi } from "./terminal-api";
 
@@ -17,6 +18,7 @@ const createTerminalApiInjectable = getInjectable({
     const hostedClusterId = di.inject(hostedClusterIdInjectable);
     const deps: Omit<TerminalApiDependencies, "hostedClusterId"> = {
       logger: di.inject(loggerInjectable),
+      defaultParams: di.inject(defaultWebsocketApiParamsInjectable),
     };
 
     return (query) => {

src/renderer/before-frame-starts/runnables/setup-kubernetes-cluster-context-menu-open.injectable.ts

@@ -42,7 +42,7 @@ const setupKubernetesClusterContextMenuOpenInjectable = getInjectable({
                 if (result.error) {
                   logger.error("[KUBERNETES-CLUSTER]: failed to parse kubeconfig file", result.error);
                 } else {
-                  openDeleteClusterDialog({ cluster, config: result.config });
+                  openDeleteClusterDialog(result.config, cluster);
                 }
               },
             });

src/renderer/components/+namespaces/store.ts

@@ -23,12 +23,7 @@ export class NamespaceStore extends KubeObjectStore<Namespace, NamespaceApi> {
     makeObservable(this);
     autoBind(this);
 
-    this.init();
+    // initialize allowed namespaces
-  }
-
-  private async init() {
-    await this.dependencies.storage.whenReady;
-
     const { allowedNamespaces } = this;
     const selectedNamespaces = this.dependencies.storage.get(); // raw namespaces, undefined on first load
 

src/renderer/components/+network-ingresses/ingress-class-store.injectable.ts

@@ -4,15 +4,13 @@
  */
 import assert from "assert";
 import { getInjectable } from "@ogre-tools/injectable";
-import {
+import { kubeObjectStoreInjectionToken } from "../../../common/k8s-api/api-manager/manager.injectable";
-  kubeObjectStoreInjectionToken,
+import ingressClassApiInjectable from "../../../common/k8s-api/endpoints/ingress-class.api.injectable";
-} from "../../../common/k8s-api/api-manager/manager.injectable";
-import ingressClassApiInjectable
-  from "../../../common/k8s-api/endpoints/ingress-class.api.injectable";
 import { IngressClassStore } from "./ingress-class-store";
-import clusterFrameContextForNamespacedResourcesInjectable
+
-  from "../../cluster-frame-context/for-namespaced-resources.injectable";
 import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable";
+import clusterFrameContextForClusterScopedResourcesInjectable from "../../cluster-frame-context/for-cluster-scoped-resources.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 
 const ingressClassStoreInjectable = getInjectable({
   id: "ingress-class-store",
@@ -23,7 +21,8 @@ const ingressClassStoreInjectable = getInjectable({
     const api = di.inject(ingressClassApiInjectable);
 
     return new IngressClassStore({
-      context: di.inject(clusterFrameContextForNamespacedResourcesInjectable),
+      context: di.inject(clusterFrameContextForClusterScopedResourcesInjectable),
+      logger: di.inject(loggerInjectable),
     }, api);
   },
 

src/renderer/components/dock/logs/tab-store.ts

@@ -6,7 +6,7 @@
 import { DockTabStore } from "../dock-tab-store/dock-tab.store";
 import type { TabId } from "../dock/store";
 import { logTabDataValidator } from "./log-tab-data.validator";
-import type { CreateStorage } from "../../../utils/create-storage/create-storage";
+import type { DockTabStoreDependencies } from  "../dock-tab-store/dock-tab.store";
 
 export interface LogTabOwnerRef {
   /**
@@ -56,12 +56,8 @@ export interface LogTabData {
   showPrevious: boolean;
 }
 
-interface Dependencies {
-  createStorage: CreateStorage;
-}
-
 export class LogTabStore extends DockTabStore<LogTabData> {
-  constructor(protected dependencies: Dependencies) {
+  constructor(dependencies: DockTabStoreDependencies) {
     super(dependencies, {
       storageKey: "pod_logs",
     });

src/renderer/port-forward/port-forward-store/port-forward-store.ts

@@ -34,8 +34,6 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
   }
 
   private async init() {
-    await this.dependencies.storage.whenReady;
-
     const savedPortForwards = this.dependencies.storage.get(); // undefined on first load
 
     if (Array.isArray(savedPortForwards) && savedPortForwards.length > 0) {