From 7c221112a095c829aa961a02ac59516e37211ddd Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Mon, 5 Dec 2022 13:40:27 -0500
Subject: [PATCH] Fix injecting before app paths are set up

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 ...es-cluster-context-menu-open.injectable.ts | 70 +++++++++----------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/renderer/before-frame-starts/runnables/setup-kubernetes-cluster-context-menu-open.injectable.ts b/src/renderer/before-frame-starts/runnables/setup-kubernetes-cluster-context-menu-open.injectable.ts
index 9524c84e26..f1175f1416 100644
--- a/src/renderer/before-frame-starts/runnables/setup-kubernetes-cluster-context-menu-open.injectable.ts
+++ b/src/renderer/before-frame-starts/runnables/setup-kubernetes-cluster-context-menu-open.injectable.ts
@@ -8,50 +8,50 @@ import getClusterByIdInjectable from "../../../common/cluster-store/get-by-id.in
 import readFileInjectable from "../../../common/fs/read-file.injectable";
 import { loadConfigFromString } from "../../../common/kube-helpers";
 import loggerInjectable from "../../../common/logger.injectable";
+import setupAppPathsInjectable from "../../app-paths/setup-app-paths.injectable";
 import openDeleteClusterDialogInjectable from "../../components/delete-cluster-dialog/open.injectable";
 import { beforeFrameStartsInjectionToken } from "../tokens";
 
 const setupKubernetesClusterContextMenuOpenInjectable = getInjectable({
   id: "setup-kubernetes-cluster-context-menu-open",
-  instantiate: (di) => {
-    const catalogCategoryRegistry = di.inject(catalogCategoryRegistryInjectable);
-    const openDeleteClusterDialog = di.inject(openDeleteClusterDialogInjectable);
-    const readFile = di.inject(readFileInjectable);
-    const getClusterById = di.inject(getClusterByIdInjectable);
-    const logger = di.inject(loggerInjectable);
+  instantiate: (di) => ({
+    id: "setup-kubernetes-cluster-context-menu-open",
+    run: () => {
+      const catalogCategoryRegistry = di.inject(catalogCategoryRegistryInjectable);
+      const openDeleteClusterDialog = di.inject(openDeleteClusterDialogInjectable);
+      const readFile = di.inject(readFileInjectable);
+      const getClusterById = di.inject(getClusterByIdInjectable);
+      const logger = di.inject(loggerInjectable);
 
-    return {
-      id: "setup-kubernetes-cluster-context-menu-open",
-      run: () => {
-        catalogCategoryRegistry
-          .getForGroupKind("entity.k8slens.dev", "KubernetesCluster")
-          ?.on("contextMenuOpen", (entity, context) => {
-            if (entity.metadata?.source == "local") {
-              context.menuItems.push({
-                title: "Remove",
-                icon: "delete",
-                onClick: async () => {
-                  const clusterId = entity.getId();
-                  const cluster = getClusterById(entity.getId());
+      catalogCategoryRegistry
+        .getForGroupKind("entity.k8slens.dev", "KubernetesCluster")
+        ?.on("contextMenuOpen", (entity, context) => {
+          if (entity.metadata?.source == "local") {
+            context.menuItems.push({
+              title: "Remove",
+              icon: "delete",
+              onClick: async () => {
+                const clusterId = entity.getId();
+                const cluster = getClusterById(entity.getId());
 
-                  if (!cluster) {
-                    return logger.warn("[KUBERNETES-CLUSTER]: cannot delete cluster, does not exist in store", { clusterId });
-                  }
+                if (!cluster) {
+                  return logger.warn("[KUBERNETES-CLUSTER]: cannot delete cluster, does not exist in store", { clusterId });
+                }
 
-                  const result = loadConfigFromString(await readFile(cluster.kubeConfigPath));
+                const result = loadConfigFromString(await readFile(cluster.kubeConfigPath));
 
-                  if (result.error) {
-                    logger.error("[KUBERNETES-CLUSTER]: failed to parse kubeconfig file", result.error);
-                  } else {
-                    openDeleteClusterDialog({ cluster, config: result.config });
-                  }
-                },
-              });
-            }
-          });
-      },
-    };
-  },
+                if (result.error) {
+                  logger.error("[KUBERNETES-CLUSTER]: failed to parse kubeconfig file", result.error);
+                } else {
+                  openDeleteClusterDialog({ cluster, config: result.config });
+                }
+              },
+            });
+          }
+        });
+    },
+    runAfter: di.inject(setupAppPathsInjectable),
+  }),
   injectionToken: beforeFrameStartsInjectionToken,
 });