Fix for earlier loading the frontend (#6094)

This commit is contained in:
Bram Kragten 2020-06-03 18:16:49 +02:00 committed by GitHub
parent 77bd7c37c1
commit 407f305d21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions

View File

@ -131,13 +131,13 @@ class PartialPanelResolver extends HassRouterPage {
hass: this.hass, hass: this.hass,
narrow: this.narrow, narrow: this.narrow,
route: this.routeTail, route: this.routeTail,
panel: hass.panels[hass.panelUrl], panel: hass.panels[this._currentPage],
}); });
} else { } else {
el.hass = hass; el.hass = hass;
el.narrow = this.narrow; el.narrow = this.narrow;
el.route = this.routeTail; el.route = this.routeTail;
el.panel = hass.panels[hass.panelUrl]; el.panel = hass.panels[this._currentPage];
} }
} }

View File

@ -22,18 +22,20 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
const oldHass = changedProperties.get("hass"); const oldHass = changedProperties.get("hass");
if ( if (
!changedProperties.has("hass") || !changedProperties.has("hass") ||
!oldHass?.config || oldHass?.config?.state === this.hass!.config.state
oldHass.config.state === this.hass!.config.state
) { ) {
return; return;
} }
if (this.hass!.config.state === STATE_NOT_RUNNING) { if (this.hass!.config.state === STATE_NOT_RUNNING) {
showToast(this, { showToast(this, {
message: this.hass!.localize("ui.notification_toast.starting"), message:
this.hass!.localize("ui.notification_toast.starting") ||
"Home Assistant is starting, not everything will be available until it is finished.",
duration: 0, duration: 0,
dismissable: false, dismissable: false,
}); });
} else if ( } else if (
oldHass?.config &&
oldHass.config.state === STATE_NOT_RUNNING && oldHass.config.state === STATE_NOT_RUNNING &&
(this.hass!.config.state === STATE_STARTING || (this.hass!.config.state === STATE_STARTING ||
this.hass!.config.state === STATE_RUNNING) this.hass!.config.state === STATE_RUNNING)
@ -47,7 +49,6 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
protected hassReconnected() { protected hassReconnected() {
super.hassReconnected(); super.hassReconnected();
showToast(this, { showToast(this, {
message: "", message: "",
duration: 1, duration: 1,