From 2b3b40192a7fee0c9580c88be3dbcb66f599a9e4 Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Fri, 22 Oct 2021 13:19:26 +0300 Subject: [PATCH] Remove iframe completely on disconnect (#4116) Signed-off-by: Jari Kolehmainen --- src/renderer/components/app.tsx | 7 ------- src/renderer/components/cluster-manager/lens-views.ts | 8 +------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/renderer/components/app.tsx b/src/renderer/components/app.tsx index aff99d269e..b9e029e83c 100755 --- a/src/renderer/components/app.tsx +++ b/src/renderer/components/app.tsx @@ -111,13 +111,6 @@ export class App extends React.Component { window.location.reload(); }); - window.addEventListener("message", (ev: MessageEvent) => { - if (ev.data === "teardown") { - unmountComponentAtNode(rootElem); - window.location.href = "about:blank"; - } - }); - window.onbeforeunload = () => { logger.info(`[APP]: Unload dashboard, clusterId=${App.clusterId}, frameId=${frameId}`); diff --git a/src/renderer/components/cluster-manager/lens-views.ts b/src/renderer/components/cluster-manager/lens-views.ts index 830fe20cb3..b4f8415e71 100644 --- a/src/renderer/components/cluster-manager/lens-views.ts +++ b/src/renderer/components/cluster-manager/lens-views.ts @@ -79,13 +79,7 @@ export async function autoCleanOnRemove(clusterId: ClusterId, iframe: HTMLIFrame logger.info(`[LENS-VIEW]: remove dashboard, clusterId=${clusterId}`); lensViews.delete(clusterId); - // Keep frame in DOM to avoid possible bugs when same cluster re-created after being removed. - // In that case for some reasons `webFrame.routingId` returns some previous frameId (usage in app.tsx) - // Issue: https://github.com/lensapp/lens/issues/811 - iframe.style.display = "none"; - iframe.dataset.meta = `${iframe.name} was removed at ${new Date().toLocaleString()}`; - iframe.removeAttribute("name"); - iframe.contentWindow.postMessage("teardown", "*"); + iframe.parentNode.removeChild(iframe); } export function refreshViews(visibleClusterId?: string) {