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

add computed isEnabled getter to Workspace, use it everywhere

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2021-01-15 11:02:17 -05:00
parent dfe6d72505
commit 52929d4886
3 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/__tests__/workspace-store.test.ts
View File

@ -66,7 +66,7 @@ describe("workspace store tests", () => {
const workspace = ws.getById("123"); const workspace = ws.getById("123");
expect(workspace.name).toBe("foobar"); expect(workspace.name).toBe("foobar");
expect(workspace.enabled).toBe(true); expect(workspace.isEnabled).toBe(true);
}); });
it("cannot set a non-existent workspace to be active", () => { it("cannot set a non-existent workspace to be active", () => {

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

@ -83,6 +83,13 @@ export class Workspace implements WorkspaceModel, WorkspaceState {
} }
} }
/**
* Is this workspace not manged by an extension or is it managed and explicitly enabled
*/
get isEnabled(): boolean {
return !this.isManaged || this.enabled;
}
/** /**
* Is workspace managed by an extension * Is workspace managed by an extension
*/ */
@ -204,7 +211,7 @@ export class WorkspaceStore extends BaseStore<WorkspaceStoreModel> {
} }
@computed get enabledWorkspacesList() { @computed get enabledWorkspacesList() {
return this.workspacesList.filter((w) => w.enabled); return this.workspacesList.filter((w) => w.isEnabled);
} }
pushState() { pushState() {
@ -244,10 +251,6 @@ export class WorkspaceStore extends BaseStore<WorkspaceStoreModel> {
} }
this.workspaces.set(id, workspace); this.workspaces.set(id, workspace);
if (!workspace.isManaged) {
workspace.enabled = true;
}
appEventBus.emit({name: "workspace", action: "add"}); appEventBus.emit({name: "workspace", action: "add"});
return workspace; return workspace;
@ -288,21 +291,13 @@ export class WorkspaceStore extends BaseStore<WorkspaceStoreModel> {
} }
@action @action
protected fromStore({ currentWorkspace, workspaces = [] }: WorkspaceStoreModel) { protected fromStore({ currentWorkspace, workspaces }: WorkspaceStoreModel) {
if (currentWorkspace) { if (currentWorkspace) {
this.currentWorkspaceId = currentWorkspace; this.currentWorkspaceId = currentWorkspace;
} }
if (workspaces.length) { if (workspaces?.length) {
this.workspaces.clear(); this.workspaces.replace(workspaces.map(ws => [ws.id, new Workspace(ws)]));
workspaces.forEach(ws => {
const workspace = new Workspace(ws);
if (!workspace.isManaged) {
workspace.enabled = true;
}
this.workspaces.set(workspace.id, workspace);
});
} }
} }

5
src/renderer/components/+workspaces/workspaces.tsx
View File

@ -129,12 +129,11 @@ export class Workspaces extends React.Component {
Workspaces Workspaces
</h2> </h2>
<div className="items flex column gaps"> <div className="items flex column gaps">
{this.workspaces.map(({ id: workspaceId, name, description, ownerRef }) => { {this.workspaces.map(({ id: workspaceId, name, description, isManaged}) => {
const isActive = workspaceStore.currentWorkspaceId === workspaceId; const isActive = workspaceStore.currentWorkspaceId === workspaceId;
const isDefault = workspaceStore.isDefault(workspaceId); const isDefault = workspaceStore.isDefault(workspaceId);
const isEditing = this.editingWorkspaces.has(workspaceId); const isEditing = this.editingWorkspaces.has(workspaceId);
const editingWorkspace = this.editingWorkspaces.get(workspaceId); const editingWorkspace = this.editingWorkspaces.get(workspaceId);
const managed = !!ownerRef;
const className = cssNames("workspace flex gaps align-center", { const className = cssNames("workspace flex gaps align-center", {
active: isActive, active: isActive,
editing: isEditing, editing: isEditing,
@ -154,7 +153,7 @@ export class Workspaces extends React.Component {
{isActive && <span> (current)</span>} {isActive && <span> (current)</span>}
</span> </span>
<span className="description">{description}</span> <span className="description">{description}</span>
{!isDefault && !managed && ( {!isDefault && !isManaged && (
<Fragment> <Fragment>
<Icon <Icon
material="edit" material="edit"