cluster-view battling -- part 3

Signed-off-by: Roman <ixrock@gmail.com>
Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>

src/renderer/components/app.tsx

@@ -31,14 +31,13 @@ import { isAllowedResource } from "../../common/rbac";
 import { ClusterSettings, clusterSettingsRoute } from "./+cluster-settings";
 import { ErrorBoundary } from "./error-boundary";
 import { Terminal } from "./dock/terminal";
-import { getHostedClusterId } from "../../common/cluster-store";
-import { clusterIpc } from "../../common/cluster-ipc";
+import { getHostedCluster } from "../../common/cluster-store";
 
 @observer
 export class App extends React.Component {
   static async init() {
-    await clusterIpc.init.invokeFromRenderer(getHostedClusterId())
     await Terminal.preloadFonts()
+    await getHostedCluster().whenInitialized;
   }
 
   get startURL() {

src/renderer/components/cluster-manager/cluster-status.tsx

@@ -44,7 +44,7 @@ export class ClusterStatus extends React.Component<Props> {
         error: res.error,
       });
     })
-    await this.refreshClusterState();
+    // await this.refreshClusterState();
   }
 
   componentWillUnmount() {

src/renderer/components/cluster-manager/cluster-view.tsx

@@ -39,8 +39,10 @@ export class ClusterView extends React.Component {
     webview.setAttribute("src", `//${clusterId}.${location.host}`)
     webview.setAttribute("nodeintegration", "true")
     webview.setAttribute("enableremotemodule", "true")
+    // webview.addEventListener("did-start-loading", () => {
+    //   webview.openDevTools();
+    // });
     webview.addEventListener("did-finish-load", () => {
-      webview.openDevTools();
       webview.classList.add("loaded");
       ClusterView.isLoaded.set(clusterId, true)
     });
@@ -52,9 +54,11 @@ export class ClusterView extends React.Component {
   }
 
   activateView = async (clusterId: ClusterId) => {
+    const cluster = clusterStore.getById(clusterId);
     const view = ClusterView.views.get(clusterId);
     const isLoaded = ClusterView.isLoaded.has(clusterId);
     if (view && isLoaded && this.placeholder) {
+      cluster.pushState(); // fixme
       this.placeholder.replaceWith(view);
     }
   }