Catalog & Hotbar - initial groundwork (#2418)

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

src/common/__tests__/cluster-store.test.ts

@@ -3,7 +3,6 @@ import mockFs from "mock-fs";
 import yaml from "js-yaml";
 import { Cluster } from "../../main/cluster";
 import { ClusterStore, getClusterIdFromHost } from "../cluster-store";
-import { workspaceStore } from "../workspace-store";
 
 const testDataIcon = fs.readFileSync("test-data/cluster-store-migration-icon.png");
 const kubeconfig = `
@@ -77,8 +76,7 @@ describe("empty config", () => {
             icon: "data:image/jpeg;base64, iVBORw0KGgoAAAANSUhEUgAAA1wAAAKoCAYAAABjkf5",
             clusterName: "minikube"
           },
-          kubeConfigPath: ClusterStore.embedCustomKubeConfig("foo", kubeconfig),
-          workspace: workspaceStore.currentWorkspaceId
+          kubeConfigPath: ClusterStore.embedCustomKubeConfig("foo", kubeconfig)
         })
       );
     });
@@ -92,12 +90,6 @@ describe("empty config", () => {
       expect(storedCluster.enabled).toBe(true);
     });
 
-    it("adds cluster to default workspace", () => {
-      const storedCluster = clusterStore.getById("foo");
-
-      expect(storedCluster.workspace).toBe("default");
-    });
-
     it("removes cluster from store", async () => {
       await clusterStore.removeById("foo");
       expect(clusterStore.getById("foo")).toBeNull();
@@ -106,7 +98,6 @@ describe("empty config", () => {
     it("sets active cluster", () => {
       clusterStore.setActive("foo");
       expect(clusterStore.active.id).toBe("foo");
-      expect(workspaceStore.currentWorkspace.lastActiveClusterId).toBe("foo");
     });
   });
 
@@ -119,8 +110,7 @@ describe("empty config", () => {
           preferences: {
             clusterName: "prod"
           },
-          kubeConfigPath: ClusterStore.embedCustomKubeConfig("prod", kubeconfig),
-          workspace: "workstation"
+          kubeConfigPath: ClusterStore.embedCustomKubeConfig("prod", kubeconfig)
         }),
         new Cluster({
           id: "dev",
@@ -128,8 +118,7 @@ describe("empty config", () => {
           preferences: {
             clusterName: "dev"
           },
-          kubeConfigPath: ClusterStore.embedCustomKubeConfig("dev", kubeconfig),
-          workspace: "workstation"
+          kubeConfigPath: ClusterStore.embedCustomKubeConfig("dev", kubeconfig)
         })
       );
     });
@@ -139,51 +128,11 @@ describe("empty config", () => {
       expect(clusterStore.clusters.size).toBe(2);
     });
 
-    it("gets clusters by workspaces", () => {
-      const wsClusters = clusterStore.getByWorkspaceId("workstation");
-      const defaultClusters = clusterStore.getByWorkspaceId("default");
-
-      expect(defaultClusters.length).toBe(0);
-      expect(wsClusters.length).toBe(2);
-      expect(wsClusters[0].id).toBe("prod");
-      expect(wsClusters[1].id).toBe("dev");
-    });
-
     it("check if cluster's kubeconfig file saved", () => {
       const file = ClusterStore.embedCustomKubeConfig("boo", "kubeconfig");
 
       expect(fs.readFileSync(file, "utf8")).toBe("kubeconfig");
     });
-
-    it("check if reorderring works for same from and to", () => {
-      clusterStore.swapIconOrders("workstation", 1, 1);
-
-      const clusters = clusterStore.getByWorkspaceId("workstation");
-
-      expect(clusters[0].id).toBe("prod");
-      expect(clusters[0].preferences.iconOrder).toBe(0);
-      expect(clusters[1].id).toBe("dev");
-      expect(clusters[1].preferences.iconOrder).toBe(1);
-    });
-
-    it("check if reorderring works for different from and to", () => {
-      clusterStore.swapIconOrders("workstation", 0, 1);
-
-      const clusters = clusterStore.getByWorkspaceId("workstation");
-
-      expect(clusters[0].id).toBe("dev");
-      expect(clusters[0].preferences.iconOrder).toBe(0);
-      expect(clusters[1].id).toBe("prod");
-      expect(clusters[1].preferences.iconOrder).toBe(1);
-    });
-
-    it("check if after icon reordering, changing workspaces still works", () => {
-      clusterStore.swapIconOrders("workstation", 1, 1);
-      clusterStore.getById("prod").workspace = "default";
-
-      expect(clusterStore.getByWorkspaceId("workstation").length).toBe(1);
-      expect(clusterStore.getByWorkspaceId("default").length).toBe(1);
-    });
   });
 });
 
@@ -486,12 +435,6 @@ describe("for a pre 2.7.0-beta.0 config without a workspace", () => {
   afterEach(() => {
     mockFs.restore();
   });
-
-  it("adds cluster to default workspace", async () => {
-    const storedClusterData = clusterStore.clustersList[0];
-
-    expect(storedClusterData.workspace).toBe("default");
-  });
 });
 
 describe("pre 3.6.0-beta.1 config with an existing cluster", () => {

src/common/__tests__/workspace-store.test.ts

@@ -1,189 +0,0 @@
-import mockFs from "mock-fs";
-
-jest.mock("electron", () => {
-  return {
-    app: {
-      getVersion: () => "99.99.99",
-      getPath: () => "tmp",
-      getLocale: () => "en",
-      setLoginItemSettings: jest.fn(),
-    },
-    ipcMain: {
-      handle: jest.fn(),
-      on: jest.fn()
-    }
-  };
-});
-
-import { Workspace, WorkspaceStore } from "../workspace-store";
-
-describe("workspace store tests", () => {
-  describe("for an empty config", () => {
-    beforeEach(async () => {
-      WorkspaceStore.resetInstance();
-      mockFs({ tmp: { "lens-workspace-store.json": "{}" } });
-
-      await WorkspaceStore.getInstance<WorkspaceStore>().load();
-    });
-
-    afterEach(() => {
-      mockFs.restore();
-    });
-
-    it("default workspace should always exist", () => {
-      const ws = WorkspaceStore.getInstance<WorkspaceStore>();
-
-      expect(ws.workspaces.size).toBe(1);
-      expect(ws.getById(WorkspaceStore.defaultId)).not.toBe(null);
-    });
-
-    it("default workspace should be enabled", () => {
-      const ws = WorkspaceStore.getInstance<WorkspaceStore>();
-
-      expect(ws.workspaces.size).toBe(1);
-      expect(ws.getById(WorkspaceStore.defaultId).enabled).toBe(true);
-    });
-
-    it("cannot remove the default workspace", () => {
-      const ws = WorkspaceStore.getInstance<WorkspaceStore>();
-
-      expect(() => ws.removeWorkspaceById(WorkspaceStore.defaultId)).toThrowError("Cannot remove");
-    });
-
-    it("can update workspace description", () => {
-      const ws = WorkspaceStore.getInstance<WorkspaceStore>();
-      const workspace = ws.addWorkspace(new Workspace({
-        id: "foobar",
-        name: "foobar",
-      }));
-
-      workspace.description = "Foobar description";
-      ws.updateWorkspace(workspace);
-
-      expect(ws.getById("foobar").description).toBe("Foobar description");
-    });
-
-    it("can add workspaces", () => {
-      const ws = WorkspaceStore.getInstance<WorkspaceStore>();
-
-      ws.addWorkspace(new Workspace({
-        id: "123",
-        name: "foobar",
-      }));
-
-      const workspace = ws.getById("123");
-
-      expect(workspace.name).toBe("foobar");
-      expect(workspace.enabled).toBe(true);
-    });
-
-    it("cannot set a non-existent workspace to be active", () => {
-      const ws = WorkspaceStore.getInstance<WorkspaceStore>();
-
-      expect(() => ws.setActive("abc")).toThrow("doesn't exist");
-    });
-
-    it("can set a existent workspace to be active", () => {
-      const ws = WorkspaceStore.getInstance<WorkspaceStore>();
-
-      ws.addWorkspace(new Workspace({
-        id: "abc",
-        name: "foobar",
-      }));
-
-      expect(() => ws.setActive("abc")).not.toThrowError();
-    });
-
-    it("can remove a workspace", () => {
-      const ws = WorkspaceStore.getInstance<WorkspaceStore>();
-
-      ws.addWorkspace(new Workspace({
-        id: "123",
-        name: "foobar",
-      }));
-      ws.addWorkspace(new Workspace({
-        id: "1234",
-        name: "foobar 1",
-      }));
-      ws.removeWorkspaceById("123");
-
-      expect(ws.workspaces.size).toBe(2);
-    });
-
-    it("cannot create workspace with existent name", () => {
-      const ws = WorkspaceStore.getInstance<WorkspaceStore>();
-
-      ws.addWorkspace(new Workspace({
-        id: "someid",
-        name: "default",
-      }));
-
-      expect(ws.workspacesList.length).toBe(1);  // default workspace only
-    });
-
-    it("cannot create workspace with empty name", () => {
-      const ws = WorkspaceStore.getInstance<WorkspaceStore>();
-
-      ws.addWorkspace(new Workspace({
-        id: "random",
-        name: "",
-      }));
-
-      expect(ws.workspacesList.length).toBe(1);  // default workspace only
-    });
-
-    it("cannot create workspace with ' ' name", () => {
-      const ws = WorkspaceStore.getInstance<WorkspaceStore>();
-
-      ws.addWorkspace(new Workspace({
-        id: "random",
-        name: " ",
-      }));
-
-      expect(ws.workspacesList.length).toBe(1);  // default workspace only
-    });
-
-    it("trim workspace name", () => {
-      const ws = WorkspaceStore.getInstance<WorkspaceStore>();
-
-      ws.addWorkspace(new Workspace({
-        id: "random",
-        name: "default ",
-      }));
-
-      expect(ws.workspacesList.length).toBe(1);  // default workspace only
-    });
-  });
-
-  describe("for a non-empty config", () => {
-    beforeEach(async () => {
-      WorkspaceStore.resetInstance();
-      mockFs({
-        tmp: {
-          "lens-workspace-store.json": JSON.stringify({
-            currentWorkspace: "abc",
-            workspaces: [{
-              id: "abc",
-              name: "test"
-            }, {
-              id: "default",
-              name: "default"
-            }]
-          })
-        }
-      });
-
-      await WorkspaceStore.getInstance<WorkspaceStore>().load();
-    });
-
-    afterEach(() => {
-      mockFs.restore();
-    });
-
-    it("doesn't revert to default workspace", async () => {
-      const ws = WorkspaceStore.getInstance<WorkspaceStore>();
-
-      expect(ws.currentWorkspaceId).toBe("abc");
-    });
-  });
-});