From bd7b5b4477ac7f470663a478e8c3cf4badd1fd43 Mon Sep 17 00:00:00 2001
From: Roman <ixrock@gmail.com>
Date: Mon, 7 Sep 2020 14:42:42 +0300
Subject: [PATCH] master-merge fix

Signed-off-by: Roman <ixrock@gmail.com>
---
 src/common/cluster-store.ts                               | 5 ++---
 src/renderer/components/cluster-manager/clusters-menu.tsx | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/common/cluster-store.ts b/src/common/cluster-store.ts
index 45bcad4d6f..a30c4d7e94 100644
--- a/src/common/cluster-store.ts
+++ b/src/common/cluster-store.ts
@@ -1,4 +1,4 @@
-import { WorkspaceId, workspaceStore } from "./workspace-store";
+import type { WorkspaceId } from "./workspace-store";
 import path from "path";
 import { app, ipcRenderer, remote } from "electron";
 import { unlink } from "fs-extra";
@@ -13,7 +13,6 @@ import { saveToAppFiles } from "./utils/saveToAppFiles";
 import { KubeConfig } from "@kubernetes/client-node";
 import _ from "lodash";
 import move from "array-move";
-import { is } from "immer/dist/internal";
 
 export interface ClusterIconUpload {
   clusterId: string;
@@ -64,7 +63,7 @@ export class ClusterStore extends BaseStore<ClusterStoreModel> {
   static embedCustomKubeConfig(clusterId: ClusterId, kubeConfig: KubeConfig | string): string {
     const filePath = ClusterStore.getCustomKubeConfigPath(clusterId);
     const fileContents = typeof kubeConfig == "string" ? kubeConfig : dumpConfigYaml(kubeConfig);
-    saveToAppFiles(filePath, fileContents, { mode: 0o600});
+    saveToAppFiles(filePath, fileContents, { mode: 0o600 });
     return filePath;
   }
 
diff --git a/src/renderer/components/cluster-manager/clusters-menu.tsx b/src/renderer/components/cluster-manager/clusters-menu.tsx
index 5ca50f7ca4..495ce2176a 100644
--- a/src/renderer/components/cluster-manager/clusters-menu.tsx
+++ b/src/renderer/components/cluster-manager/clusters-menu.tsx
@@ -23,8 +23,6 @@ import { clusterViewURL, getMatchedClusterId } from "./cluster-view.route";
 import { DragDropContext, Droppable, Draggable, DropResult, DroppableProvided, DraggableProvided } from "react-beautiful-dnd";
 import { dynamicPages } from "./register-page";
 
-// fixme: allow to rearrange clusters with drag&drop
-
 interface Props {
   className?: IClassName;
 }