From 31aa3cb571810c7e4ca55be18c6a3fbff1eb2e28 Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Tue, 19 Jan 2021 06:30:05 +0200
Subject: [PATCH] Enable default workspace on first boot (#1965)

* enable default workspace on first boot

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

* refactor

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

* use get/set

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 src/common/__tests__/workspace-store.test.ts |  7 ++++
 src/common/workspace-store.ts                | 44 ++++++++++++--------
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/common/__tests__/workspace-store.test.ts b/src/common/__tests__/workspace-store.test.ts
index e69ebda0aa..355eb8b2ce 100644
--- a/src/common/__tests__/workspace-store.test.ts
+++ b/src/common/__tests__/workspace-store.test.ts
@@ -36,6 +36,13 @@ describe("workspace store tests", () => {
       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>();
 
diff --git a/src/common/workspace-store.ts b/src/common/workspace-store.ts
index 7688516af2..921a9126a9 100644
--- a/src/common/workspace-store.ts
+++ b/src/common/workspace-store.ts
@@ -58,14 +58,7 @@ export class Workspace implements WorkspaceModel, WorkspaceState {
    * @observable
    */
   @observable ownerRef?: string;
-  /**
-   * Is workspace enabled
-   *
-   * Workspaces that don't have ownerRef will be enabled by default. Workspaces with ownerRef need to explicitly enable a workspace.
-   *
-   * @observable
-   */
-  @observable enabled: boolean;
+
   /**
    * Last active cluster id
    *
@@ -73,6 +66,9 @@ export class Workspace implements WorkspaceModel, WorkspaceState {
    */
   @observable lastActiveClusterId?: ClusterId;
 
+
+  @observable private _enabled: boolean;
+
   constructor(data: WorkspaceModel) {
     Object.assign(this, data);
 
@@ -83,6 +79,21 @@ export class Workspace implements WorkspaceModel, WorkspaceState {
     }
   }
 
+  /**
+   * Is workspace enabled
+   *
+   * Workspaces that don't have ownerRef will be enabled by default. Workspaces with ownerRef need to explicitly enable a workspace.
+   *
+   * @observable
+   */
+  get enabled(): boolean {
+    return !this.isManaged || this._enabled;
+  }
+
+  set enabled(enabled: boolean) {
+    this._enabled = enabled;
+  }
+
   /**
    * Is workspace managed by an extension
    */
@@ -134,10 +145,18 @@ export class WorkspaceStore extends BaseStore<WorkspaceStoreModel> {
   static readonly defaultId: WorkspaceId = "default";
   private static stateRequestChannel = "workspace:states";
 
+  @observable currentWorkspaceId = WorkspaceStore.defaultId;
+  @observable workspaces = observable.map<WorkspaceId, Workspace>();
+
   private constructor() {
     super({
       configName: "lens-workspace-store",
     });
+
+    this.workspaces.set(WorkspaceStore.defaultId, new Workspace({
+      id: WorkspaceStore.defaultId,
+      name: "default"
+    }));
   }
 
   async load() {
@@ -186,15 +205,6 @@ export class WorkspaceStore extends BaseStore<WorkspaceStoreModel> {
     ipcRenderer.removeAllListeners("workspace:state");
   }
 
-  @observable currentWorkspaceId = WorkspaceStore.defaultId;
-
-  @observable workspaces = observable.map<WorkspaceId, Workspace>({
-    [WorkspaceStore.defaultId]: new Workspace({
-      id: WorkspaceStore.defaultId,
-      name: "default"
-    })
-  });
-
   @computed get currentWorkspace(): Workspace {
     return this.getById(this.currentWorkspaceId);
   }