From 763189b27dc909bf9f4600dddddc831a2865e5f3 Mon Sep 17 00:00:00 2001 From: Roman Date: Thu, 6 Aug 2020 19:14:59 +0300 Subject: [PATCH] cluster-view battling -- part 1 (iframe failing support nodeintegration) Signed-off-by: Roman --- .../cluster-manager/cluster-manager.scss | 1 + .../cluster-manager/cluster-view.scss | 2 +- .../cluster-manager/cluster-view.tsx | 23 ++++++++++++++----- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/renderer/components/cluster-manager/cluster-manager.scss b/src/renderer/components/cluster-manager/cluster-manager.scss index ae6916d147..d6c1c842cc 100644 --- a/src/renderer/components/cluster-manager/cluster-manager.scss +++ b/src/renderer/components/cluster-manager/cluster-manager.scss @@ -8,6 +8,7 @@ #lens-view { position: relative; grid-area: lens-view; + display: flex; } .ClustersMenu { diff --git a/src/renderer/components/cluster-manager/cluster-view.scss b/src/renderer/components/cluster-manager/cluster-view.scss index 66867ffdd8..8839e8cca1 100644 --- a/src/renderer/components/cluster-manager/cluster-view.scss +++ b/src/renderer/components/cluster-manager/cluster-view.scss @@ -5,6 +5,6 @@ //display: none; &.loaded { - display: block; + display: flex; } } diff --git a/src/renderer/components/cluster-manager/cluster-view.tsx b/src/renderer/components/cluster-manager/cluster-view.tsx index 8b6ee45e12..df4981055b 100644 --- a/src/renderer/components/cluster-manager/cluster-view.tsx +++ b/src/renderer/components/cluster-manager/cluster-view.tsx @@ -1,13 +1,16 @@ +import "./cluster-view.scss" import React from "react"; +import { WebviewTag } from "electron" import { autorun, computed, observable } from "mobx"; import { disposeOnUnmount, observer } from "mobx-react"; import { ClusterId, clusterStore } from "../../../common/cluster-store"; import { getMatchedClusterId } from "./cluster-view.route"; import { Cluster } from "../../../main/cluster"; +import { ClusterStatus } from "./cluster-status"; @observer export class ClusterView extends React.Component { - static views = observable.map() + static views = observable.map() static isLoaded = observable.map() @computed get cluster() { @@ -24,23 +27,31 @@ export class ClusterView extends React.Component { ]) } + // fixme activateView = (cluster: Cluster) => { if (!cluster || ClusterView.views.has(cluster.id)) { return; } const view = document.createElement("webview"); view.className = "ClusterView" - view.src = `${location.protocol}://${cluster.id}.${location.host}` - view.onload = () => console.log('CLUSTER VIEW READY!', cluster); + view.setAttribute("nodeintegration", "true") + view.setAttribute("enableremotemodule", "true") + view.addEventListener("did-finish-load", () => { + console.log('CLUSTER VIEW READY!', cluster) + view.openDevTools() + }); + view.addEventListener("did-fail-load", event => { + // todo: handle + }); + view.src = `${location.protocol}//${cluster.id}.${location.host}` document.body.appendChild(view); ClusterView.views.set(cluster.id, view); } render() { const { cluster } = this; - if (cluster && cluster.accessible) { - + if (cluster) { + return } - return ""; } }