1
0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00

Restrict extension version of ClusterStore (#2256)

This commit is contained in:
Sebastian Malton 2021-03-30 10:13:15 -04:00
parent bfc36b4d1d
commit f401536efd
3 changed files with 14 additions and 14 deletions

View File

@ -99,7 +99,7 @@ describe("empty config", () => {
it("removes cluster from store", async () => {
await clusterStore.removeById("foo");
expect(clusterStore.getById("foo")).toBeUndefined();
expect(clusterStore.getById("foo")).toBeNull();
});
it("sets active cluster", () => {
@ -248,7 +248,7 @@ describe("config with existing clusters", () => {
expect(storedCluster).toBeTruthy();
const storedCluster2 = clusterStore.getById("cluster2");
expect(storedCluster2).toBeUndefined();
expect(storedCluster2).toBeNull();
});
it("allows getting all of the clusters", async () => {

View File

@ -218,8 +218,12 @@ export class ClusterStore extends BaseStore<ClusterStoreModel> {
}
@action
setActive(id: ClusterId) {
const clusterId = this.clusters.has(id) ? id : null;
setActive(clusterId: ClusterId) {
const cluster = this.clusters.get(clusterId);
if (!cluster?.enabled) {
clusterId = null;
}
this.activeCluster = clusterId;
workspaceStore.setLastActiveClusterId(clusterId);
@ -251,8 +255,8 @@ export class ClusterStore extends BaseStore<ClusterStoreModel> {
return this.clusters.size > 0;
}
getById(id: ClusterId): Cluster {
return this.clusters.get(id);
getById(id: ClusterId): Cluster | null {
return this.clusters.get(id) ?? null;
}
getByWorkspaceId(workspaceId: string): Cluster[] {

View File

@ -25,7 +25,7 @@ export class ClusterStore extends Singleton {
* Set active cluster id
*/
set activeClusterId(id : ClusterId) {
internalClusterStore.activeCluster = id;
internalClusterStore.setActive(id);
}
/**
@ -38,12 +38,8 @@ export class ClusterStore extends Singleton {
/**
* Get active cluster (a cluster which is currently visible)
*/
get activeCluster(): Cluster {
if (!this.activeClusterId) {
return null;
}
return this.getById(this.activeClusterId);
get activeCluster(): Cluster | null {
return internalClusterStore.active;
}
/**
@ -104,7 +100,7 @@ export class ClusterStore extends Singleton {
* @param model cluster
*/
async removeCluster(model: ClusterModel) {
return this.removeById(model.id);
return internalClusterStore.removeById(model.id);
}
/**