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: sync in sub-frames for common-stores are broken

Browse Source 
Signed-off-by: Roman <ixrock@gmail.com>
This commit is contained in:
Roman 2020-08-20 19:40:58 +03:00
parent 86e1e23ccd
commit 7cf7756d27
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/base-store.ts
View File

@ -116,7 +116,8 @@ export class BaseStore<T = any> extends Singleton {
protected async onModelChange(model: T) { protected async onModelChange(model: T) {
if (ipcMain) { if (ipcMain) {
this.save(model); // save config file this.save(model); // save config file
broadcastIpc({ channel: this.syncChannel, args: [model] }); // broadcast to renderer views broadcastIpc({ channel: this.syncChannel, args: [model] }); // send to all windows (BrowserWindow, webContents)
this.syncInSubFrames(model); // send to all sub-frames (cluster-view is managed inside iframe)
} }
// send "update-request" to main-process // send "update-request" to main-process
if (ipcRenderer) { if (ipcRenderer) {
@ -124,6 +125,23 @@ export class BaseStore<T = any> extends Singleton {
} }
} }
protected async syncInSubFrames(model: T) {
const subFrames: number[] = [];
const { clusterStore } = await import("./cluster-store");
clusterStore.clustersList.forEach(cluster => {
if (cluster.frameId) {
subFrames.push(cluster.frameId)
}
});
subFrames.forEach(frameId => {
broadcastIpc({
channel: this.syncChannel,
frameId: frameId,
args: [model],
})
})
}
@action @action
protected fromStore(data: T) { protected fromStore(data: T) {
this.data = data; this.data = data;

2
src/common/cluster-ipc.ts
View File

@ -3,7 +3,7 @@ import { ClusterId, clusterStore } from "./cluster-store";
import { tracker } from "./tracker"; import { tracker } from "./tracker";
export const clusterIpc = { export const clusterIpc = {
init: createIpcChannel({ initView: createIpcChannel({
channel: "cluster:init", channel: "cluster:init",
handle: async (clusterId: ClusterId, frameId: number) => { handle: async (clusterId: ClusterId, frameId: number) => {
const cluster = clusterStore.getById(clusterId); const cluster = clusterStore.getById(clusterId);

5
src/renderer/components/app.tsx
View File

@ -38,10 +38,11 @@ import { webFrame } from "electron";
@observer @observer
export class App extends React.Component { export class App extends React.Component {
static async init() { static async init() {
const frameId = webFrame.routingId;
const clusterId = getHostedClusterId(); const clusterId = getHostedClusterId();
logger.info(`[APP]: Init dashboard, clusterId=${clusterId}`) logger.info(`[APP]: Init dashboard, clusterId=${clusterId}, frameId=${frameId}`)
await Terminal.preloadFonts() await Terminal.preloadFonts()
await clusterIpc.init.invokeFromRenderer(clusterId, webFrame.routingId); await clusterIpc.initView.invokeFromRenderer(clusterId, frameId);
await getHostedCluster().whenInitialized; await getHostedCluster().whenInitialized;
} }