hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix default workspace remove (#242)

Browse Source 
Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Jari Kolehmainen 2020-04-13 18:21:25 +03:00 committed by GitHub
parent f12b2b6a99
commit 298636b8f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/workspace-store.ts
View File

@ -18,6 +18,7 @@ export class Workspace implements WorkspaceData {
} }
export class WorkspaceStore { export class WorkspaceStore {
public static defaultId = "default"
private static instance: WorkspaceStore; private static instance: WorkspaceStore;
public store: ElectronStore; public store: ElectronStore;
@ -39,6 +40,9 @@ export class WorkspaceStore {
} }
public removeWorkspace(workspace: Workspace) { public removeWorkspace(workspace: Workspace) {
if (workspace.id === WorkspaceStore.defaultId) {
throw new Error("Cannot remove default workspace")
}
const workspaces = this.getAllWorkspaces() const workspaces = this.getAllWorkspaces()
const index = workspaces.findIndex((w) => w.id === workspace.id) const index = workspaces.findIndex((w) => w.id === workspace.id)
if (index !== -1) { if (index !== -1) {
@ -64,9 +68,9 @@ export class WorkspaceStore {
const workspaceStore: WorkspaceStore = WorkspaceStore.getInstance() const workspaceStore: WorkspaceStore = WorkspaceStore.getInstance()
if (workspaceStore.getAllWorkspaces().length === 0) { if (!workspaceStore.getAllWorkspaces().find( ws => ws.id === WorkspaceStore.defaultId)) {
workspaceStore.storeWorkspace({ workspaceStore.storeWorkspace({
id: "default", id: WorkspaceStore.defaultId,
name: "default" name: "default"
}) })
} }

2
src/renderer/components/EditWorkspacePage.vue
View File

@ -37,7 +37,7 @@
<b-button variant="primary" type="submit"> <b-button variant="primary" type="submit">
Save Save
</b-button> </b-button>
<b-button v-b-modal.bv-modal-confirm> <b-button v-if="workspace.id !== 'default'" v-b-modal.bv-modal-confirm>
Delete Delete
</b-button> </b-button>
<b-modal id="bv-modal-confirm" @ok="deleteWorkspace" ok-title="Delete" ok-variant="danger" title-class="confirm-header" hide-backdrop title="Confirm workspace delete"> <b-modal id="bv-modal-confirm" @ok="deleteWorkspace" ok-title="Delete" ok-variant="danger" title-class="confirm-header" hide-backdrop title="Confirm workspace delete">