From 581a803cc44d5df0c74b6eb0e6a744667cf36a9f Mon Sep 17 00:00:00 2001 From: Alexei Chetroi Date: Wed, 15 Jan 2020 14:05:05 -0500 Subject: [PATCH 1/5] Fix ZHA add device path. (#4486) --- src/panels/config/zha/zha-device-card.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/panels/config/zha/zha-device-card.ts b/src/panels/config/zha/zha-device-card.ts index db11c81568..ef96c070dc 100644 --- a/src/panels/config/zha/zha-device-card.ts +++ b/src/panels/config/zha/zha-device-card.ts @@ -376,7 +376,7 @@ class ZHADeviceCard extends LitElement { } private _onAddDevicesClick() { - navigate(this, "add/" + this.device!.ieee); + navigate(this, "/config/zha/add/" + this.device!.ieee); } static get styles(): CSSResult[] { From 8262d1617f1c2a27fb37879b96b19da7348a75a3 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Fri, 17 Jan 2020 17:13:00 +0100 Subject: [PATCH 2/5] Bumped version to 20200108.1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 82d26187a0..32a069244b 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name="home-assistant-frontend", - version="20200108.0", + version="20200108.1", description="The Home Assistant frontend", url="https://github.com/home-assistant/home-assistant-polymer", author="The Home Assistant Authors", From c391b19c0edf441e0e1901809abe7ef9b8ceb5c0 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Fri, 17 Jan 2020 22:41:09 +0100 Subject: [PATCH 3/5] fixes #4468 (#4508) --- src/panels/lovelace/components/hui-card-options.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/panels/lovelace/components/hui-card-options.ts b/src/panels/lovelace/components/hui-card-options.ts index cdcc59d197..f7029c7546 100644 --- a/src/panels/lovelace/components/hui-card-options.ts +++ b/src/panels/lovelace/components/hui-card-options.ts @@ -62,6 +62,7 @@ export class HuiCardOptions extends LitElement { horizontal-align="right" vertical-align="bottom" vertical-offset="40" + close-on-activate > Date: Fri, 17 Jan 2020 22:38:08 +0100 Subject: [PATCH 4/5] Don't use light card in generated Lovelace mode (#4505) * Don't make seperate card for grouped lights * Update generate-lovelace-config.ts * Don't use light group at all in generated UI --- src/panels/lovelace/common/generate-lovelace-config.ts | 5 +++-- .../lovelace/editor/card-editor/hui-dialog-suggest-card.ts | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/panels/lovelace/common/generate-lovelace-config.ts b/src/panels/lovelace/common/generate-lovelace-config.ts index 3c66447d3f..6cc8db7260 100644 --- a/src/panels/lovelace/common/generate-lovelace-config.ts +++ b/src/panels/lovelace/common/generate-lovelace-config.ts @@ -99,7 +99,8 @@ const splitByAreas = ( export const computeCards = ( states: Array<[string, HassEntity?]>, - entityCardOptions: Partial + entityCardOptions: Partial, + single = false ): LovelaceCardConfig[] => { const cards: LovelaceCardConfig[] = []; @@ -132,7 +133,7 @@ export const computeCards = ( title: stateObj.attributes.friendly_name, refresh_interval: stateObj.attributes.refresh, }); - } else if (domain === "light") { + } else if (domain === "light" && single) { cards.push({ type: "light", entity: entityId, 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 3fbf3d03e2..970a2993a2 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 @@ -49,7 +49,8 @@ export class HuiDialogSuggestCard extends LitElement { entityId, this.hass.states[entityId], ]), - {} + {}, + true ); if (this._dialog) { this._dialog.open(); From a082667c2490808f3aaa8a210cbbe122c5de3bfc Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Fri, 17 Jan 2020 22:42:48 +0100 Subject: [PATCH 5/5] Bumped version to 20200108.2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 32a069244b..70980f89aa 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name="home-assistant-frontend", - version="20200108.1", + version="20200108.2", description="The Home Assistant frontend", url="https://github.com/home-assistant/home-assistant-polymer", author="The Home Assistant Authors",