Remove ClusterStore.removedClusters and correctly delete lens storage file (#4077)

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

@@ -116,6 +116,7 @@ export class DeleteClusterDialog extends React.Component {
       await requestMain(clusterDeleteHandler, cluster.id);
     } catch(error) {
       Notifications.error(`Cannot remove cluster, failed to process config file. ${error}`);
+    } finally {
       await requestMain(clusterClearDeletingHandler, cluster.id);
     }
 

src/renderer/utils/createStorage.ts

@@ -25,7 +25,6 @@ import path from "path";
 import { comparer, observable, reaction, toJS, when } from "mobx";
 import fse from "fs-extra";
 import { StorageHelper } from "./storageHelper";
-import { ClusterStore } from "../../common/cluster-store";
 import logger from "../../main/logger";
 import { getHostedClusterId, getPath } from "../../common/utils";
 import { isTestEnv } from "../../common/vars";
@@ -75,11 +74,6 @@ export function createAppStorage<T>(key: string, defaultValue: T, clusterId?: st
       equals: comparer.structural, // save only when something really changed
     });
 
-    // remove json-file when cluster deleted
-    if (clusterId !== undefined) {
-      when(() => ClusterStore.getInstance(false)?.removedClusters.has(clusterId)).then(removeFile);
-    }
-
     async function saveFile(state: Record<string, any> = {}) {
       logger.info(`${logPrefix} saving ${filePath}`);
 
@@ -92,11 +86,6 @@ export function createAppStorage<T>(key: string, defaultValue: T, clusterId?: st
         });
       }
     }
-
-    function removeFile() {
-      logger.debug(`${logPrefix} removing ${filePath}`);
-      fse.unlink(filePath).catch(Function);
-    }
   }
 
   return new StorageHelper<T>(key, {