From 56e176a6f1ea51144d2970c8ae1a3b45f1d0d3de Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 18 Mar 2020 21:29:09 +0100 Subject: [PATCH 1/5] Fix stack editor in conditional card (#5265) --- .../lovelace/editor/card-editor/hui-dialog-suggest-card.ts | 2 -- .../editor/config-elements/hui-conditional-card-editor.ts | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/panels/lovelace/editor/card-editor/hui-dialog-suggest-card.ts b/src/panels/lovelace/editor/card-editor/hui-dialog-suggest-card.ts index b478663aab..283cb9f4d3 100755 --- a/src/panels/lovelace/editor/card-editor/hui-dialog-suggest-card.ts +++ b/src/panels/lovelace/editor/card-editor/hui-dialog-suggest-card.ts @@ -13,9 +13,7 @@ import deepFreeze from "deep-freeze"; import { HomeAssistant } from "../../../../types"; import { LovelaceCardConfig } from "../../../../data/lovelace"; -import "./hui-card-editor"; import "./hui-card-preview"; -import "./hui-card-picker"; import { addCards } from "../config-util"; import "../../../../components/ha-yaml-editor"; diff --git a/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts index b1c83867ab..c05fdbd133 100644 --- a/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts @@ -78,6 +78,7 @@ export class HuiConditionalCardEditor extends LitElement ` From 220e4134b79a4cbe6ed3f4fb572cff34b95e6b44 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Wed, 18 Mar 2020 12:32:35 -0700 Subject: [PATCH 2/5] Fix calculating title if panels not loaded yet (#5262) --- src/common/const.ts | 3 --- src/components/ha-sidebar.ts | 10 ++++----- src/data/panel.ts | 38 ++++++++++++++++++++++------------ src/layouts/home-assistant.ts | 4 ++-- src/state/panel-title-mixin.ts | 27 ++++++++++++------------ 5 files changed, 45 insertions(+), 37 deletions(-) diff --git a/src/common/const.ts b/src/common/const.ts index a2dc5412f7..a17ecd29da 100644 --- a/src/common/const.ts +++ b/src/common/const.ts @@ -7,9 +7,6 @@ /** Icon to use when no icon specified for domain. */ export const DEFAULT_DOMAIN_ICON = "hass:bookmark"; -/** Panel to show when no panel is picked. */ -export const DEFAULT_PANEL = "lovelace"; - /** Domains that have a state card. */ export const DOMAINS_WITH_CARD = [ "climate", diff --git a/src/components/ha-sidebar.ts b/src/components/ha-sidebar.ts index 9e0eca09fe..321a703bda 100644 --- a/src/components/ha-sidebar.ts +++ b/src/components/ha-sidebar.ts @@ -18,7 +18,6 @@ import "../components/user/ha-user-badge"; import "../components/ha-menu-button"; import { HomeAssistant, PanelInfo } from "../types"; import { fireEvent } from "../common/dom/fire_event"; -import { DEFAULT_PANEL } from "../common/const"; import { getExternalConfig, ExternalConfig, @@ -33,6 +32,7 @@ import { classMap } from "lit-html/directives/class-map"; import { PaperIconItemElement } from "@polymer/paper-item/paper-icon-item"; import { computeRTL } from "../common/util/compute_rtl"; import { compare } from "../common/string/compare"; +import { getDefaultPanelUrlPath, getDefaultPanel } from "../data/panel"; const SHOW_AFTER_SPACER = ["config", "developer-tools", "hassio"]; @@ -77,7 +77,6 @@ const panelSorter = (a: PanelInfo, b: PanelInfo) => { // both not built in, sort by title return compare(a.title!, b.title!); }; -const DEFAULT_PAGE = localStorage.defaultPage || DEFAULT_PANEL; const computePanels = (hass: HomeAssistant): [PanelInfo[], PanelInfo[]] => { const panels = hass.panels; @@ -88,8 +87,10 @@ const computePanels = (hass: HomeAssistant): [PanelInfo[], PanelInfo[]] => { const beforeSpacer: PanelInfo[] = []; const afterSpacer: PanelInfo[] = []; + const defaultPage = getDefaultPanelUrlPath(); + Object.values(panels).forEach((panel) => { - if (!panel.title || panel.url_path === DEFAULT_PAGE) { + if (!panel.title || panel.url_path === defaultPage) { return; } (SHOW_AFTER_SPACER.includes(panel.url_path) @@ -142,8 +143,7 @@ class HaSidebar extends LitElement { } } - const defaultPanel = - this.hass.panels[DEFAULT_PAGE] || this.hass.panels[DEFAULT_PANEL]; + const defaultPanel = getDefaultPanel(hass.panels); return html`
diff --git a/src/data/panel.ts b/src/data/panel.ts index 67439e2d55..3ee88a7f96 100644 --- a/src/data/panel.ts +++ b/src/data/panel.ts @@ -1,23 +1,35 @@ import { HomeAssistant, PanelInfo } from "../types"; -import { DEFAULT_PANEL } from "../common/const"; + +/** Panel to show when no panel is picked. */ +const DEFAULT_PANEL = "lovelace"; + +export const getDefaultPanelUrlPath = () => + localStorage.defaultPage || DEFAULT_PANEL; + +export const getDefaultPanel = (panels: HomeAssistant["panels"]) => + panels[localStorage.defaultPage] || panels[DEFAULT_PANEL]; export const getPanelTitle = (hass: HomeAssistant): string | undefined => { - let title: string = ""; + if (!hass.panels) { + return; + } + const panel = Object.values(hass.panels).find( (p: PanelInfo): boolean => p.url_path === hass.panelUrl ); + if (!panel) { return; } - const defaultPanel = - hass.panels[localStorage.defaultPage || DEFAULT_PANEL] || - hass.panels[DEFAULT_PANEL]; - title = - panel.url_path === "profile" - ? hass.localize("panel.profile") - : hass.localize(`panel.${panel.title}`) || - panel.title || - defaultPanel.title || - hass.localize("panel.states"); - return title; + + if (panel.url_path === "profile") { + return hass.localize("panel.profile"); + } + + return ( + hass.localize(`panel.${panel.title}`) || + panel.title || + // default panel + (hass.panels[localStorage.defaultPage] || hass.panels[DEFAULT_PANEL]).title! + ); }; diff --git a/src/layouts/home-assistant.ts b/src/layouts/home-assistant.ts index c583092392..9aebd605dc 100644 --- a/src/layouts/home-assistant.ts +++ b/src/layouts/home-assistant.ts @@ -6,11 +6,11 @@ import "./ha-init-page"; import "../resources/ha-style"; import "../resources/custom-card-support"; import { registerServiceWorker } from "../util/register-service-worker"; -import { DEFAULT_PANEL } from "../common/const"; import { Route, HomeAssistant } from "../types"; import { navigate } from "../common/navigate"; import { HassElement } from "../state/hass-element"; +import { getDefaultPanelUrlPath } from "../data/panel"; export class HomeAssistantAppEl extends HassElement { @property() private _route?: Route; @@ -86,7 +86,7 @@ export class HomeAssistantAppEl extends HassElement { this._route === undefined && (route.path === "" || route.path === "/") ) { - navigate(window, `/${localStorage.defaultPage || DEFAULT_PANEL}`, true); + navigate(window, `/${getDefaultPanelUrlPath()}`, true); return; } diff --git a/src/state/panel-title-mixin.ts b/src/state/panel-title-mixin.ts index 0f24daeef5..b6f814a4ff 100644 --- a/src/state/panel-title-mixin.ts +++ b/src/state/panel-title-mixin.ts @@ -2,29 +2,28 @@ import { getPanelTitle } from "../data/panel"; import { HassBaseEl } from "./hass-base-mixin"; import { HomeAssistant, Constructor } from "../types"; +const setTitle = (title: string | undefined) => { + document.title = title ? `${title} - Home Assistant` : "Home Assistant"; +}; + export const panelTitleMixin = >( superClass: T ) => class extends superClass { - private _oldHass?: HomeAssistant; - protected updated(changedProps) { super.updated(changedProps); if (!changedProps.has("hass") || !this.hass) { return; } - if (!this._oldHass) { - this.setTitle(getPanelTitle(this.hass)); - } - this._oldHass = changedProps.get("hass") as HomeAssistant | undefined; - if (!this._oldHass || this._oldHass.panelUrl !== this.hass.panelUrl) { - this.setTitle(getPanelTitle(this.hass)); - } - } - private setTitle(title: string | undefined) { - document.title = title - ? `${title} - ${this.hass!.localize("domain.homeassistant")}` - : this.hass!.localize("domain.homeassistant"); + const oldHass = changedProps.get("hass") as HomeAssistant | undefined; + + if ( + !oldHass || + oldHass.panels !== this.hass.panels || + oldHass.panelUrl !== this.hass.panelUrl + ) { + setTitle(getPanelTitle(this.hass)); + } } }; From a3969fe2c8c83ce0c99c8c2e6d783f07495f2298 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 18 Mar 2020 20:51:00 +0100 Subject: [PATCH 3/5] Fix stack editor in stack editor (#5255) --- .../lovelace/editor/config-elements/hui-stack-card-editor.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts index 729bfdf906..c8abb4373d 100644 --- a/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts @@ -98,6 +98,7 @@ export class HuiStackCardEditor extends LitElement ` From 595d04c9228c9478b7769354b6888c7edb1c2e32 Mon Sep 17 00:00:00 2001 From: Zack Arnett Date: Wed, 18 Mar 2020 07:47:20 -0400 Subject: [PATCH 4/5] Fix theme update (#5246) --- src/panels/lovelace/cards/hui-thermostat-card.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/panels/lovelace/cards/hui-thermostat-card.ts b/src/panels/lovelace/cards/hui-thermostat-card.ts index 0570af89b2..24985d52b5 100644 --- a/src/panels/lovelace/cards/hui-thermostat-card.ts +++ b/src/panels/lovelace/cards/hui-thermostat-card.ts @@ -271,7 +271,12 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard { protected updated(changedProps: PropertyValues): void { super.updated(changedProps); - if (!this._config || !this.hass || !changedProps.has("hass")) { + + if ( + !this._config || + !this.hass || + (!changedProps.has("hass") && !changedProps.has("_config")) + ) { return; } From 254744cd7d1f897e6a60047cab3693b260f2cb38 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 18 Mar 2020 23:29:00 +0100 Subject: [PATCH 5/5] Bumped version to 20200318.1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 16d97920c3..1876a66b28 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name="home-assistant-frontend", - version="20200318.0", + version="20200318.1", description="The Home Assistant frontend", url="https://github.com/home-assistant/home-assistant-polymer", author="The Home Assistant Authors",