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 race condition in LensViews.handleVisibleClusterChange

Browse Source 
- Clear the previous when() disposer as soon as possible so that it
  won't fire, even in the no-cluster case

Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2021-11-19 08:36:59 -05:00
parent 885af07d0b
commit ef8bb4b774
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/renderer/components/cluster-manager/lens-views.ts
View File

@ -19,7 +19,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
import { action, IReactionDisposer, makeObservable, observable, reaction, when } from "mobx"; import { action, IReactionDisposer, makeObservable, observable, when } from "mobx";
import logger from "../../../main/logger"; import logger from "../../../main/logger";
import { clusterVisibilityHandler } from "../../../common/cluster-ipc"; import { clusterVisibilityHandler } from "../../../common/cluster-ipc";
import { ClusterStore } from "../../../common/cluster-store"; import { ClusterStore } from "../../../common/cluster-store";
@ -34,12 +34,10 @@ export interface LensView {
export class ClusterFrameHandler extends Singleton { export class ClusterFrameHandler extends Singleton {
private views = observable.map<string, LensView>(); private views = observable.map<string, LensView>();
@observable private visibleCluster: string | null = null;
constructor() { constructor() {
super(); super();
makeObservable(this); makeObservable(this);
reaction(() => this.visibleCluster, this.handleVisibleClusterChange);
} }
public hasLoadedView(clusterId: string): boolean { public hasLoadedView(clusterId: string): boolean {
@ -97,39 +95,34 @@ export class ClusterFrameHandler extends Singleton {
); );
} }
public setVisibleCluster(clusterId: ClusterId) {
this.visibleCluster = clusterId;
}
public clearVisibleCluster() {
this.visibleCluster = null;
}
private prevVisibleClusterChange?: IReactionDisposer; private prevVisibleClusterChange?: IReactionDisposer;
private handleVisibleClusterChange = (clusterId: ClusterId | undefined) => { public setVisibleCluster(clusterId: ClusterId | null) {
// Clear the previous when ASAP
this.prevVisibleClusterChange?.();
logger.info(`[LENS-VIEW]: refreshing iframe views, visible cluster id=${clusterId}`); logger.info(`[LENS-VIEW]: refreshing iframe views, visible cluster id=${clusterId}`);
ipcRenderer.send(clusterVisibilityHandler); ipcRenderer.send(clusterVisibilityHandler);
const cluster = ClusterStore.getInstance().getById(clusterId);
for (const { frame: view } of this.views.values()) { for (const { frame: view } of this.views.values()) {
view.style.display = "none"; view.style.display = "none";
} }
if (cluster) { const cluster = ClusterStore.getInstance().getById(clusterId);
const lensView = this.views.get(clusterId);
this.prevVisibleClusterChange?.(); if (cluster) {
this.prevVisibleClusterChange = when( this.prevVisibleClusterChange = when(
() => cluster.available && cluster.ready && lensView.isLoaded, () => cluster.available && cluster.ready && this.views.get(clusterId)?.isLoaded,
() => { () => {
logger.info(`[LENS-VIEW]: cluster id=${clusterId} should now be visible`); logger.info(`[LENS-VIEW]: cluster id=${clusterId} should now be visible`);
lensView.frame.style.display = "flex"; this.views.get(clusterId).frame.style.display = "flex";
ipcRenderer.send(clusterVisibilityHandler, clusterId); ipcRenderer.send(clusterVisibilityHandler, clusterId);
}, },
); );
} }
}; }
public clearVisibleCluster() {
this.setVisibleCluster(null);
}
} }