1
0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00

Fix UI staleness after network issues (#1192) (#1306)

Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
Co-authored-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Lauri Nevala 2020-11-10 13:09:01 +02:00 committed by GitHub
parent ca8a28d58f
commit b4ded19341
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 47 additions and 5 deletions

View File

@ -1,5 +1,6 @@
import "../common/cluster-ipc"; import "../common/cluster-ipc";
import type http from "http" import type http from "http"
import { ipcMain } from "electron"
import { autorun } from "mobx"; import { autorun } from "mobx";
import { clusterStore, getClusterIdFromHost } from "../common/cluster-store" import { clusterStore, getClusterIdFromHost } from "../common/cluster-store"
import { Cluster } from "./cluster" import { Cluster } from "./cluster"
@ -30,6 +31,29 @@ export class ClusterManager {
}, { }, {
delay: 250 delay: 250
}); });
ipcMain.on("network:offline", () => { this.onNetworkOffline() })
ipcMain.on("network:online", () => { this.onNetworkOnline() })
}
protected onNetworkOffline() {
logger.info("[CLUSTER-MANAGER]: network is offline")
clusterStore.clustersList.forEach((cluster) => {
if (!cluster.disconnected) {
cluster.online = false
cluster.accessible = false
cluster.refreshConnectionStatus().catch((e) => e)
}
})
}
protected onNetworkOnline() {
logger.info("[CLUSTER-MANAGER]: network is online")
clusterStore.clustersList.forEach((cluster) => {
if (!cluster.disconnected) {
cluster.refreshConnectionStatus().catch((e) => e)
}
})
} }
stop() { stop() {

View File

@ -61,7 +61,7 @@ export class Cluster implements ClusterModel {
@observable accessible = false; @observable accessible = false;
@observable ready = false; @observable ready = false;
@observable reconnecting = false; @observable reconnecting = false;
@observable disconnected = true; @observable disconnected = true; // false if user has selected to connect
@observable failureReason: string; @observable failureReason: string;
@observable nodes = 0; @observable nodes = 0;
@observable version: string; @observable version: string;

View File

@ -109,17 +109,22 @@ export class KubeWatchApi {
} }
} }
protected async onRouteEvent({ type, url }: IKubeWatchRouteEvent) { protected async onRouteEvent(event: IKubeWatchRouteEvent) {
if (type === "STREAM_END") { if (event.type === "STREAM_END") {
this.disconnect(); this.disconnect();
const { apiBase, namespace } = KubeApi.parseApi(url); const { apiBase, namespace } = KubeApi.parseApi(event.url);
const api = apiManager.getApi(apiBase); const api = apiManager.getApi(apiBase);
if (api) { if (api) {
try { try {
await api.refreshResourceVersion({ namespace }); await api.refreshResourceVersion({ namespace });
this.reconnect(); this.reconnect();
} catch (error) { } catch (error) {
console.debug("failed to refresh resource version", error) console.error("failed to refresh resource version", error)
if (this.subscribers.size > 0) {
setTimeout(() => {
this.onRouteEvent(event)
}, 1000)
}
} }
} }
} }

View File

@ -46,6 +46,9 @@ export class App extends React.Component {
await Terminal.preloadFonts() await Terminal.preloadFonts()
await clusterIpc.setFrameId.invokeFromRenderer(clusterId, frameId); await clusterIpc.setFrameId.invokeFromRenderer(clusterId, frameId);
await getHostedCluster().whenReady; // cluster.activate() is done at this point await getHostedCluster().whenReady; // cluster.activate() is done at this point
window.addEventListener("online", () => {
window.location.reload()
})
} }
get startURL() { get startURL() {

View File

@ -1,5 +1,6 @@
import "../common/system-ca" import "../common/system-ca"
import React from "react"; import React from "react";
import { ipcRenderer } from "electron";
import { Route, Router, Switch } from "react-router"; import { Route, Router, Switch } from "react-router";
import { observer } from "mobx-react"; import { observer } from "mobx-react";
import { userStore } from "../common/user-store"; import { userStore } from "../common/user-store";
@ -14,6 +15,15 @@ import { ConfirmDialog } from "./components/confirm-dialog";
@observer @observer
export class LensApp extends React.Component { export class LensApp extends React.Component {
static async init() {
window.addEventListener("offline", () => {
ipcRenderer.send("network:offline")
})
window.addEventListener("online", () => {
ipcRenderer.send("network:online")
})
}
render() { render() {
return ( return (
<I18nProvider i18n={_i18n}> <I18nProvider i18n={_i18n}>