From c3467abe34988ed9cbbf932b1ac0c8b84dc0b66f Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Tue, 16 Mar 2021 10:53:14 -0400 Subject: [PATCH] revert addWorkspace, change to unexported symbol function Signed-off-by: Sebastian Malton --- src/common/workspace-store.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/common/workspace-store.ts b/src/common/workspace-store.ts index 5c5983f60a..45bc857da2 100644 --- a/src/common/workspace-store.ts +++ b/src/common/workspace-store.ts @@ -26,6 +26,8 @@ export interface WorkspaceState { enabled: boolean; } +const updateFromModel = Symbol("updateFromModel"); + /** * Workspace * @@ -130,7 +132,7 @@ export class Workspace implements WorkspaceModel, WorkspaceState { Object.assign(this, state); } - @action updateModel(model: WorkspaceModel) { + @action [updateFromModel](model: WorkspaceModel) { Object.assign(this, model); } @@ -251,10 +253,9 @@ export class WorkspaceStore extends BaseStore { @action addWorkspace(workspace: Workspace) { - workspace.name = workspace.name.trim(); const { id, name } = workspace; - if (!name || this.getByName(name)) { + if (!name.trim() || this.getByName(name.trim())) { return; } this.workspaces.set(id, workspace); @@ -312,7 +313,7 @@ export class WorkspaceStore extends BaseStore { const oldWorkspace = this.workspaces.get(workspaceModel.id); if (oldWorkspace) { - oldWorkspace.updateModel(workspaceModel); + oldWorkspace[updateFromModel](workspaceModel); } else { this.workspaces.set(workspaceModel.id, new Workspace(workspaceModel)); }