Fix kubeconfig-sync sometimes producing multiple identical entities (#5855)

src/main/electron-app/runnables/clean-up-deep-linking.injectable.ts

@@ -13,6 +13,7 @@ const cleanUpDeepLinkingInjectable = getInjectable({
     const lensProtocolRouterMain = di.inject(lensProtocolRouterMainInjectable);
 
     return {
+      id: "clean-up-deep-linking",
       run: () => {
         lensProtocolRouterMain.cleanup();
       },

src/main/electron-app/runnables/dock-visibility/hide-dock-for-last-closed-window.injectable.ts

@@ -16,6 +16,7 @@ const hideDockForLastClosedWindowInjectable = getInjectable({
     const getVisibleWindows = di.inject(getVisibleWindowsInjectable);
 
     return {
+      id: "hide-dock-when-there-are-no-windows",
       run: () => {
         const visibleWindows = getVisibleWindows();
 

src/main/electron-app/runnables/dock-visibility/show-dock-for-first-opened-window.injectable.ts

@@ -13,6 +13,7 @@ const showDockForFirstOpenedWindowInjectable = getInjectable({
     const app = di.inject(electronAppInjectable);
 
     return {
+      id: "show-dock-for-first-opened-window",
       run: () => {
         app.dock?.show();
       },

src/main/electron-app/runnables/enforce-single-application-instance.injectable.ts

@@ -15,6 +15,7 @@ const enforceSingleApplicationInstanceInjectable = getInjectable({
     const exitApp = di.inject(exitAppInjectable);
 
     return {
+      id: "enforce-single-application-instance",
       run: () => {
         if (!requestSingleInstanceLock()) {
           exitApp();

src/main/electron-app/runnables/setup-application-name.injectable.ts

@@ -15,6 +15,7 @@ const setupApplicationNameInjectable = getInjectable({
     const appName = di.inject(appNameInjectable);
 
     return {
+      id: "setup-application-name",
       run: () => {
         app.setName(appName);
       },

src/main/electron-app/runnables/setup-deep-linking.injectable.ts

@@ -26,6 +26,7 @@ const setupDeepLinkingInjectable = getInjectable({
     );
 
     return {
+      id: "setup-deep-linking",
       run: async () => {
         logger.info(`📟 Setting protocol client for lens://`);
 

src/main/electron-app/runnables/setup-developer-tools-in-development-environment.injectable.ts

@@ -13,6 +13,7 @@ const setupDeveloperToolsInDevelopmentEnvironmentInjectable = getInjectable({
     const logger = di.inject(loggerInjectable);
 
     return {
+      id: "setup-developer-tools-in-development-environment",
       run: () => {
         if (process.env.NODE_ENV !== "development") {
           return;

src/main/electron-app/runnables/setup-device-shutdown.injectable.ts

@@ -15,6 +15,7 @@ const setupDeviceShutdownInjectable = getInjectable({
     const exitApp = di.inject(exitAppInjectable);
 
     return {
+      id: "setup-device-shutdown",
       run: () => {
         powerMonitor.on("shutdown", async () => {
           exitApp();

src/main/electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts

@@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import directoryForLensLocalStorageInjectable from "../../../../common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable";
 import { setupIpcMainHandlers } from "./setup-ipc-main-handlers";
 import loggerInjectable from "../../../../common/logger.injectable";
-import clusterManagerInjectable from "../../../cluster-manager.injectable";
+import clusterManagerInjectable from "../../../cluster/manager.injectable";
 import applicationMenuItemsInjectable from "../../../menu/application-menu-items.injectable";
 import getAbsolutePathInjectable from "../../../../common/path/get-absolute-path.injectable";
 import clusterStoreInjectable from "../../../../common/cluster-store/cluster-store.injectable";
@@ -14,6 +14,7 @@ import { onLoadOfApplicationInjectionToken } from "../../../start-main-applicati
 import operatingSystemThemeInjectable from "../../../theme/operating-system-theme.injectable";
 import catalogEntityRegistryInjectable from "../../../catalog/entity-registry.injectable";
 import askUserForFilePathsInjectable from "../../../ipc/ask-user-for-file-paths.injectable";
+import clustersThatAreBeingDeletedInjectable from "../../../cluster/are-being-deleted.injectable";
 
 const setupIpcMainHandlersInjectable = getInjectable({
   id: "setup-ipc-main-handlers",
@@ -32,8 +33,10 @@ const setupIpcMainHandlersInjectable = getInjectable({
     const clusterStore = di.inject(clusterStoreInjectable);
     const operatingSystemTheme = di.inject(operatingSystemThemeInjectable);
     const askUserForFilePaths = di.inject(askUserForFilePathsInjectable);
+    const clustersThatAreBeingDeleted = di.inject(clustersThatAreBeingDeletedInjectable);
 
     return {
+      id: "setup-ipc-main-handlers",
       run: () => {
         logger.debug("[APP-MAIN] initializing ipc main handlers");
 
@@ -46,6 +49,7 @@ const setupIpcMainHandlersInjectable = getInjectable({
           clusterStore,
           operatingSystemTheme,
           askUserForFilePaths,
+          clustersThatAreBeingDeleted,
         });
       },
     };

src/main/electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.ts

@@ -12,10 +12,10 @@ import { appEventBus } from "../../../../common/app-event-bus/event-bus";
 import { broadcastMainChannel, broadcastMessage, ipcMainHandle, ipcMainOn } from "../../../../common/ipc";
 import type { CatalogEntityRegistry } from "../../../catalog";
 import { pushCatalogToRenderer } from "../../../catalog-pusher";
-import type { ClusterManager } from "../../../cluster-manager";
+import type { ClusterManager } from "../../../cluster/manager";
 import { ResourceApplier } from "../../../resource-applier";
 import { remove } from "fs-extra";
-import type { IComputedValue } from "mobx";
+import type { IComputedValue, ObservableSet } from "mobx";
 import type { GetAbsolutePath } from "../../../../common/path/get-absolute-path.injectable";
 import type { MenuItemOpts } from "../../../menu/application-menu-items.injectable";
 import { windowActionHandleChannel, windowLocationChangedChannel, windowOpenAppMenuAsContextMenuChannel } from "../../../../common/ipc/window";
@@ -34,9 +34,20 @@ interface Dependencies {
   clusterStore: ClusterStore;
   operatingSystemTheme: IComputedValue<Theme>;
   askUserForFilePaths: AskUserForFilePaths;
+  clustersThatAreBeingDeleted: ObservableSet<ClusterId>;
 }
 
-export const setupIpcMainHandlers = ({ applicationMenuItems, directoryForLensLocalStorage, getAbsolutePath, clusterManager, catalogEntityRegistry, clusterStore, operatingSystemTheme, askUserForFilePaths }: Dependencies) => {
+export const setupIpcMainHandlers = ({
+  applicationMenuItems,
+  directoryForLensLocalStorage,
+  getAbsolutePath,
+  clusterManager,
+  catalogEntityRegistry,
+  clusterStore,
+  operatingSystemTheme,
+  askUserForFilePaths,
+  clustersThatAreBeingDeleted,
+}: Dependencies) => {
   ipcMainHandle(clusterActivateHandler, (event, clusterId: ClusterId, force = false) => {
     return ClusterStore.getInstance()
       .getById(clusterId)
@@ -101,11 +112,11 @@ export const setupIpcMainHandlers = ({ applicationMenuItems, directoryForLensLoc
   });
 
   ipcMainHandle(clusterSetDeletingHandler, (event, clusterId: string) => {
-    clusterManager.deleting.add(clusterId);
+    clustersThatAreBeingDeleted.add(clusterId);
   });
 
   ipcMainHandle(clusterClearDeletingHandler, (event, clusterId: string) => {
-    clusterManager.deleting.delete(clusterId);
+    clustersThatAreBeingDeleted.delete(clusterId);
   });
 
   ipcMainHandle(clusterKubectlApplyAllHandler, async (event, clusterId: ClusterId, resources: string[], extraArgs: string[]) => {

src/main/electron-app/runnables/setup-main-window-visibility-after-activation.injectable.ts

@@ -17,6 +17,7 @@ const setupMainWindowVisibilityAfterActivationInjectable = getInjectable({
     const logger = di.inject(loggerInjectable);
 
     return {
+      id: "setup-main-window-visibility-after-activation",
       run: () => {
         app.on("activate", async (_, windowIsVisible) => {
           logger.info("APP:ACTIVATE", { hasVisibleWindows: windowIsVisible });

src/main/electron-app/runnables/setup-runnables-after-window-is-opened.injectable.ts

@@ -15,6 +15,7 @@ const setupRunnablesAfterWindowIsOpenedInjectable = getInjectable({
     const afterWindowIsOpened = runManyFor(di)(afterWindowIsOpenedInjectionToken);
 
     return {
+      id: "setup-runnables-after-window-is-opened",
       run: () => {
         const app = di.inject(electronAppInjectable);
 

src/main/electron-app/runnables/setup-runnables-before-closing-of-application.injectable.ts

@@ -26,6 +26,7 @@ const setupRunnablesBeforeClosingOfApplicationInjectable = getInjectable({
     );
 
     return {
+      id: "setup-closing-of-application",
       run: () => {
         const app = di.inject(electronAppInjectable);