From f054cdc9efcee15a2f64a19632a7232343464dd2 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Wed, 21 Nov 2018 21:11:00 +0100
Subject: [PATCH 01/69] Use overrideIcon via data binding (#2078)

---
 src/components/entity/state-badge.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/entity/state-badge.js b/src/components/entity/state-badge.js
index 783c36467a..ab3e0906ab 100644
--- a/src/components/entity/state-badge.js
+++ b/src/components/entity/state-badge.js
@@ -44,7 +44,7 @@ class StateBadge extends PolymerElement {
         id="icon"
         data-domain$="[[_computeDomain(stateObj)]]"
         data-state$="[[stateObj.state]]"
-        icon="[[_computeIcon(stateObj)]]"
+        icon="[[_computeIcon(stateObj, overrideIcon)]]"
       ></ha-icon>
     `;
   }
@@ -63,8 +63,8 @@ class StateBadge extends PolymerElement {
     return computeStateDomain(stateObj);
   }
 
-  _computeIcon(stateObj) {
-    return this.overrideIcon || stateIcon(stateObj);
+  _computeIcon(stateObj, overrideIcon) {
+    return overrideIcon || stateIcon(stateObj);
   }
 
   _updateIconAppearance(newVal) {

From a82561355c7a34e856933e7d0c0851629639873f Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Thu, 22 Nov 2018 04:15:22 +0100
Subject: [PATCH 02/69] Dont change config on init (#2044)

* dont change config on init

* set default title empty

* used firstUpdated instead of updated

* prevent double events

* check if val changed

* typing

* clean

* lint

* clean

* prettier is having a fight
---
 .../lovelace/components/hui-entity-editor.ts  |  4 +-
 .../components/hui-theme-select-editor.ts     |  7 ++-
 .../hui-entities-card-editor.ts               | 43 ++++++++------
 .../config-elements/hui-glance-card-editor.ts | 56 +++++++++++--------
 src/panels/lovelace/editor/hui-edit-card.ts   |  9 ++-
 5 files changed, 73 insertions(+), 46 deletions(-)

diff --git a/src/panels/lovelace/components/hui-entity-editor.ts b/src/panels/lovelace/components/hui-entity-editor.ts
index 886dc206a8..7c9212e3a1 100644
--- a/src/panels/lovelace/components/hui-entity-editor.ts
+++ b/src/panels/lovelace/components/hui-entity-editor.ts
@@ -52,7 +52,7 @@ export class HuiEntityEditor extends LitElement {
   private _addEntity() {
     const newConfigEntities = this.entities!.concat({ entity: "" });
 
-    fireEvent(this, "change", { entities: newConfigEntities });
+    fireEvent(this, "entities-changed", { entities: newConfigEntities });
   }
 
   private _valueChanged(ev: Event): void {
@@ -68,7 +68,7 @@ export class HuiEntityEditor extends LitElement {
       };
     }
 
-    fireEvent(this, "change", { entities: newConfigEntities });
+    fireEvent(this, "entities-changed", { entities: newConfigEntities });
   }
 
   private renderStyle(): TemplateResult {
diff --git a/src/panels/lovelace/components/hui-theme-select-editor.ts b/src/panels/lovelace/components/hui-theme-select-editor.ts
index 8c8a4b4de1..71c9017183 100644
--- a/src/panels/lovelace/components/hui-theme-select-editor.ts
+++ b/src/panels/lovelace/components/hui-theme-select-editor.ts
@@ -31,7 +31,7 @@ export class HuiThemeSelectionEditor extends hassLocalizeLitMixin(LitElement) {
       >
         <paper-listbox
           slot="dropdown-content"
-          .selected="${this.value || "Backend-selected"}"
+          .selected="${this.value}"
           attr-for-selected="theme"
         >
           ${
@@ -57,8 +57,11 @@ export class HuiThemeSelectionEditor extends hassLocalizeLitMixin(LitElement) {
   }
 
   private _changed(ev): void {
+    if (!this.hass || ev.target.value === "") {
+      return;
+    }
     this.value = ev.target.value;
-    fireEvent(this, "change");
+    fireEvent(this, "theme-changed");
   }
 }
 
diff --git a/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
index f4d761ddda..25452f64f2 100644
--- a/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
@@ -26,11 +26,15 @@ export class HuiEntitiesCardEditor extends hassLocalizeLitMixin(LitElement)
   private _configEntities?: ConfigEntity[];
 
   static get properties(): PropertyDeclarations {
-    return {
-      hass: {},
-      _config: {},
-      _configEntities: {},
-    };
+    return { hass: {}, _config: {}, _configEntities: {} };
+  }
+
+  get _title(): string {
+    return this._config!.title || "";
+  }
+
+  get _theme(): string {
+    return this._config!.theme || "Backend-selected";
   }
 
   public setConfig(config: Config): void {
@@ -47,20 +51,20 @@ export class HuiEntitiesCardEditor extends hassLocalizeLitMixin(LitElement)
       ${this.renderStyle()}
       <paper-input
         label="Title"
-        value="${this._config!.title || ""}"
+        value="${this._title}"
         .configValue="${"title"}"
         @value-changed="${this._valueChanged}"
       ></paper-input>
       <hui-theme-select-editor
         .hass="${this.hass}"
-        .value="${this._config!.theme}"
+        .value="${this._theme}"
         .configValue="${"theme"}"
-        @change="${this._valueChanged}"
+        @theme-changed="${this._valueChanged}"
       ></hui-theme-select-editor>
       <hui-entity-editor
         .hass="${this.hass}"
         .entities="${this._configEntities}"
-        @change="${this._valueChanged}"
+        @entities-changed="${this._valueChanged}"
       ></hui-entity-editor>
       <paper-checkbox
         ?checked="${this._config!.show_header_toggle !== false}"
@@ -77,21 +81,26 @@ export class HuiEntitiesCardEditor extends hassLocalizeLitMixin(LitElement)
     }
 
     const target = ev.target! as EditorTarget;
-    let newConfig = this._config;
+
+    if (
+      (target.configValue! === "title" && target.value === this._title) ||
+      (target.configValue! === "theme" && target.value === this._theme)
+    ) {
+      return;
+    }
 
     if (ev.detail && ev.detail.entities) {
-      newConfig.entities = ev.detail.entities;
-    } else {
-      newConfig = {
+      this._config.entities = ev.detail.entities;
+      this._configEntities = processEditorEntities(this._config.entities);
+    } else if (target.configValue) {
+      this._config = {
         ...this._config,
-        [target.configValue!]:
+        [target.configValue]:
           target.checked !== undefined ? target.checked : target.value,
       };
     }
 
-    fireEvent(this, "config-changed", {
-      config: newConfig,
-    });
+    fireEvent(this, "config-changed", { config: this._config });
   }
 
   private renderStyle(): TemplateResult {
diff --git a/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts
index 5b52e8f89b..dacbc481a0 100644
--- a/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts
@@ -25,19 +25,27 @@ export class HuiGlanceCardEditor extends hassLocalizeLitMixin(LitElement)
   private _config?: Config;
   private _configEntities?: ConfigEntity[];
 
-  static get properties(): PropertyDeclarations {
-    return {
-      hass: {},
-      _config: {},
-      _configEntities: {},
-    };
-  }
-
   public setConfig(config: Config): void {
     this._config = { type: "glance", ...config };
     this._configEntities = processEditorEntities(config.entities);
   }
 
+  static get properties(): PropertyDeclarations {
+    return { hass: {}, _config: {}, _configEntities: {} };
+  }
+
+  get _title(): string {
+    return this._config!.title || "";
+  }
+
+  get _theme(): string {
+    return this._config!.theme || "Backend-selected";
+  }
+
+  get _columns(): string {
+    return this._config!.columns ? String(this._config!.columns) : "";
+  }
+
   protected render(): TemplateResult {
     if (!this.hass) {
       return html``;
@@ -47,26 +55,26 @@ export class HuiGlanceCardEditor extends hassLocalizeLitMixin(LitElement)
       ${this.renderStyle()}
       <paper-input
         label="Title"
-        value="${this._config!.title}"
+        value="${this._title}"
         .configValue="${"title"}"
         @value-changed="${this._valueChanged}"
       ></paper-input>
       <hui-theme-select-editor
         .hass="${this.hass}"
-        .value="${this._config!.theme}"
+        .value="${this._theme}"
         .configValue="${"theme"}"
-        @change="${this._valueChanged}"
+        @theme-changed="${this._valueChanged}"
       ></hui-theme-select-editor>
       <paper-input
         label="Columns"
-        value="${this._config!.columns || ""}"
+        value="${this._columns}"
         .configValue="${"columns"}"
         @value-changed="${this._valueChanged}"
       ></paper-input>
       <hui-entity-editor
         .hass="${this.hass}"
         .entities="${this._configEntities}"
-        @change="${this._valueChanged}"
+        @entities-changed="${this._valueChanged}"
       ></hui-entity-editor>
       <paper-checkbox
         ?checked="${this._config!.show_name !== false}"
@@ -87,23 +95,27 @@ export class HuiGlanceCardEditor extends hassLocalizeLitMixin(LitElement)
     if (!this._config || !this.hass) {
       return;
     }
-
     const target = ev.target! as EditorTarget;
-    let newConfig = this._config;
+
+    if (
+      (target.configValue! === "title" && target.value === this._title) ||
+      (target.configValue! === "theme" && target.value === this._theme) ||
+      (target.configValue! === "columns" && target.value === this._columns)
+    ) {
+      return;
+    }
 
     if (ev.detail && ev.detail.entities) {
-      newConfig.entities = ev.detail.entities;
-    } else {
-      newConfig = {
+      this._config.entities = ev.detail.entities;
+      this._configEntities = processEditorEntities(this._config.entities);
+    } else if (target.configValue) {
+      this._config = {
         ...this._config,
         [target.configValue!]:
           target.checked !== undefined ? target.checked : target.value,
       };
     }
-
-    fireEvent(this, "config-changed", {
-      config: newConfig,
-    });
+    fireEvent(this, "config-changed", { config: this._config });
   }
 
   private renderStyle(): TemplateResult {
diff --git a/src/panels/lovelace/editor/hui-edit-card.ts b/src/panels/lovelace/editor/hui-edit-card.ts
index 3fd7022c82..2ffd9ff5cc 100644
--- a/src/panels/lovelace/editor/hui-edit-card.ts
+++ b/src/panels/lovelace/editor/hui-edit-card.ts
@@ -291,7 +291,6 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
   }
 
   private _handleUIConfigChanged(value: LovelaceConfig): void {
-    this._configElement!.setConfig(value);
     this._configValue = { format: "json", value };
     this._updatePreview(value);
   }
@@ -339,8 +338,11 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
   }
 
   private async _loadConfigElement(): Promise<void> {
+    if (!this._originalConfig) {
+      return;
+    }
     const conf = this._originalConfig;
-    const tag = conf!.type.startsWith(CUSTOM_TYPE_PREFIX)
+    const tag = conf.type.startsWith(CUSTOM_TYPE_PREFIX)
       ? conf!.type.substr(CUSTOM_TYPE_PREFIX.length)
       : `hui-${conf!.type}-card`;
 
@@ -362,8 +364,9 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
     configElement.addEventListener("config-changed", (ev) =>
       this._handleUIConfigChanged(ev.detail.config)
     );
-    this._configValue = { format: "json", value: conf! };
+    this._configValue = { format: "json", value: conf };
     this._configElement = configElement;
+    this._updatePreview(conf);
   }
 }
 

From 3497cb892e05c2981366e93270ed4b154098c687 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Thu, 22 Nov 2018 05:48:12 -0600
Subject: [PATCH 03/69] Convert toggle functions to TypeScript (#2082)

* Convert toggle functions to TypeScript

* Update hui-picture-glance-card.ts

* Update hui-picture-glance-card.ts
---
 .../lovelace/cards/hui-entity-button-card.ts      |  4 ++--
 src/panels/lovelace/cards/hui-glance-card.ts      |  4 ++--
 .../lovelace/cards/hui-picture-entity-card.js     |  2 +-
 .../lovelace/cards/hui-picture-glance-card.ts     |  4 ++--
 .../lovelace/common/entity/toggle-entity.js       |  7 -------
 .../lovelace/common/entity/toggle-entity.ts       | 10 ++++++++++
 ...on-off-entities.js => turn-on-off-entities.ts} | 15 +++++++++++----
 ...urn-on-off-entity.js => turn-on-off-entity.ts} | 11 ++++++++---
 src/panels/lovelace/common/handle-click.ts        |  4 ++--
 9 files changed, 38 insertions(+), 23 deletions(-)
 delete mode 100644 src/panels/lovelace/common/entity/toggle-entity.js
 create mode 100644 src/panels/lovelace/common/entity/toggle-entity.ts
 rename src/panels/lovelace/common/entity/{turn-on-off-entities.js => turn-on-off-entities.ts} (78%)
 rename src/panels/lovelace/common/entity/{turn-on-off-entity.js => turn-on-off-entity.ts} (65%)

diff --git a/src/panels/lovelace/cards/hui-entity-button-card.ts b/src/panels/lovelace/cards/hui-entity-button-card.ts
index 0f6d0f5c99..de0d81a2e4 100644
--- a/src/panels/lovelace/cards/hui-entity-button-card.ts
+++ b/src/panels/lovelace/cards/hui-entity-button-card.ts
@@ -10,12 +10,12 @@ import { styleMap } from "lit-html/directives/styleMap";
 
 import "../../../components/ha-card";
 
-import toggleEntity from "../common/entity/toggle-entity";
 import isValidEntityId from "../../../common/entity/valid_entity_id";
 import stateIcon from "../../../common/entity/state_icon";
 import computeStateDomain from "../../../common/entity/compute_state_domain";
 import computeStateName from "../../../common/entity/compute_state_name";
 import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
+import { toggleEntity } from "../common/entity/toggle-entity";
 import { HomeAssistant, LightEntity } from "../../../types";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
 import { LovelaceCard, LovelaceConfig } from "../types";
@@ -199,7 +199,7 @@ class HuiEntityButtonCard extends hassLocalizeLitMixin(LitElement)
     const action = hold ? config.hold_action : config.tap_action || "more-info";
     switch (action) {
       case "toggle":
-        toggleEntity(this.hass, entityId);
+        toggleEntity(this.hass!, entityId);
         break;
       case "call-service":
         if (!config.service) {
diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts
index 3a09b856ed..d3c40ee8ca 100644
--- a/src/panels/lovelace/cards/hui-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-glance-card.ts
@@ -13,12 +13,12 @@ import { HomeAssistant } from "../../../types";
 import { LovelaceCard, LovelaceConfig, LovelaceCardEditor } from "../types";
 import { longPress } from "../common/directives/long-press-directive";
 import { EntityConfig } from "../entity-rows/types";
+import { toggleEntity } from "../common/entity/toggle-entity";
 
 import computeStateDisplay from "../../../common/entity/compute_state_display";
 import computeStateName from "../../../common/entity/compute_state_name";
 import processConfigEntities from "../common/process-config-entities";
 import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
-import toggleEntity from "../common/entity/toggle-entity";
 
 import "../../../components/entity/state-badge";
 import "../../../components/ha-card";
@@ -245,7 +245,7 @@ export class HuiGlanceCard extends hassLocalizeLitMixin(LitElement)
     const action = hold ? config.hold_action : config.tap_action || "more-info";
     switch (action) {
       case "toggle":
-        toggleEntity(this.hass, entityId);
+        toggleEntity(this.hass!, entityId);
         break;
       case "call-service":
         const [domain, service] = config.service!.split(".", 2);
diff --git a/src/panels/lovelace/cards/hui-picture-entity-card.js b/src/panels/lovelace/cards/hui-picture-entity-card.js
index b16e9dab3e..03d6fa488c 100644
--- a/src/panels/lovelace/cards/hui-picture-entity-card.js
+++ b/src/panels/lovelace/cards/hui-picture-entity-card.js
@@ -7,10 +7,10 @@ import "../components/hui-image";
 import computeDomain from "../../../common/entity/compute_domain";
 import computeStateDisplay from "../../../common/entity/compute_state_display";
 import computeStateName from "../../../common/entity/compute_state_name";
-import toggleEntity from "../common/entity/toggle-entity";
 
 import EventsMixin from "../../../mixins/events-mixin";
 import LocalizeMixin from "../../../mixins/localize-mixin";
+import { toggleEntity } from "../common/entity/toggle-entity";
 import { longPressBind } from "../common/directives/long-press-directive";
 
 const UNAVAILABLE = "Unavailable";
diff --git a/src/panels/lovelace/cards/hui-picture-glance-card.ts b/src/panels/lovelace/cards/hui-picture-glance-card.ts
index e12e1c22e6..593567bf88 100644
--- a/src/panels/lovelace/cards/hui-picture-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-glance-card.ts
@@ -9,13 +9,13 @@ import { LovelaceCard, LovelaceConfig } from "../types";
 import { EntityConfig } from "../entity-rows/types";
 import { navigate } from "../../../common/navigate";
 import { HomeAssistant } from "../../../types";
+import { toggleEntity } from "../common/entity/toggle-entity";
 
 import computeStateDisplay from "../../../common/entity/compute_state_display";
 import computeStateName from "../../../common/entity/compute_state_name";
 import processConfigEntities from "../common/process-config-entities";
 import computeDomain from "../../../common/entity/compute_domain";
 import stateIcon from "../../../common/entity/state_icon";
-import toggleEntity from "../common/entity/toggle-entity";
 
 import "../../../components/ha-card";
 import "../../../components/ha-icon";
@@ -172,7 +172,7 @@ class HuiPictureGlanceCard extends hassLocalizeLitMixin(LitElement)
   }
 
   private _callService(ev: MouseEvent): void {
-    toggleEntity(this.hass, (ev.target as any).entity);
+    toggleEntity(this.hass!, (ev.target as any).entity);
   }
 
   private _handleImageClick(): void {
diff --git a/src/panels/lovelace/common/entity/toggle-entity.js b/src/panels/lovelace/common/entity/toggle-entity.js
deleted file mode 100644
index 91deadcd7b..0000000000
--- a/src/panels/lovelace/common/entity/toggle-entity.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { STATES_OFF } from "../../../../common/const";
-import turnOnOffEntity from "./turn-on-off-entity";
-
-export default function toggleEntity(hass, entityId) {
-  const turnOn = STATES_OFF.includes(hass.states[entityId].state);
-  turnOnOffEntity(hass, entityId, turnOn);
-}
diff --git a/src/panels/lovelace/common/entity/toggle-entity.ts b/src/panels/lovelace/common/entity/toggle-entity.ts
new file mode 100644
index 0000000000..873821127c
--- /dev/null
+++ b/src/panels/lovelace/common/entity/toggle-entity.ts
@@ -0,0 +1,10 @@
+import { STATES_OFF } from "../../../../common/const";
+import { turnOnOffEntity } from "./turn-on-off-entity";
+import { HomeAssistant } from "../../../../types";
+export const toggleEntity = (
+  hass: HomeAssistant,
+  entityId: string
+): Promise<void> => {
+  const turnOn = STATES_OFF.includes(hass.states[entityId].state);
+  return turnOnOffEntity(hass, entityId, turnOn);
+};
diff --git a/src/panels/lovelace/common/entity/turn-on-off-entities.js b/src/panels/lovelace/common/entity/turn-on-off-entities.ts
similarity index 78%
rename from src/panels/lovelace/common/entity/turn-on-off-entities.js
rename to src/panels/lovelace/common/entity/turn-on-off-entities.ts
index 7f46f4414b..495413e9d9 100644
--- a/src/panels/lovelace/common/entity/turn-on-off-entities.js
+++ b/src/panels/lovelace/common/entity/turn-on-off-entities.ts
@@ -1,7 +1,12 @@
-import { STATES_OFF } from "../../../../common/const";
 import computeDomain from "../../../../common/entity/compute_domain";
+import { STATES_OFF } from "../../../../common/const";
+import { HomeAssistant } from "../../../../types";
 
-export default function turnOnOffEntities(hass, entityIds, turnOn = true) {
+export const turnOnOffEntities = (
+  hass: HomeAssistant,
+  entityIds: string[],
+  turnOn = true
+): void => {
   const domainsToCall = {};
   entityIds.forEach((entityId) => {
     if (STATES_OFF.includes(hass.states[entityId].state) === turnOn) {
@@ -10,7 +15,9 @@ export default function turnOnOffEntities(hass, entityIds, turnOn = true) {
         ? stateDomain
         : "homeassistant";
 
-      if (!(serviceDomain in domainsToCall)) domainsToCall[serviceDomain] = [];
+      if (!(serviceDomain in domainsToCall)) {
+        domainsToCall[serviceDomain] = [];
+      }
       domainsToCall[serviceDomain].push(entityId);
     }
   });
@@ -31,4 +38,4 @@ export default function turnOnOffEntities(hass, entityIds, turnOn = true) {
     const entities = domainsToCall[domain];
     hass.callService(domain, service, { entity_id: entities });
   });
-}
+};
diff --git a/src/panels/lovelace/common/entity/turn-on-off-entity.js b/src/panels/lovelace/common/entity/turn-on-off-entity.ts
similarity index 65%
rename from src/panels/lovelace/common/entity/turn-on-off-entity.js
rename to src/panels/lovelace/common/entity/turn-on-off-entity.ts
index 6a19f0ad74..8823438bf3 100644
--- a/src/panels/lovelace/common/entity/turn-on-off-entity.js
+++ b/src/panels/lovelace/common/entity/turn-on-off-entity.ts
@@ -1,6 +1,11 @@
 import computeDomain from "../../../../common/entity/compute_domain";
+import { HomeAssistant } from "../../../../types";
 
-export default function turnOnOffEntity(hass, entityId, turnOn = true) {
+export const turnOnOffEntity = (
+  hass: HomeAssistant,
+  entityId: string,
+  turnOn = true
+): Promise<void> => {
   const stateDomain = computeDomain(entityId);
   const serviceDomain = stateDomain === "group" ? "homeassistant" : stateDomain;
 
@@ -16,5 +21,5 @@ export default function turnOnOffEntity(hass, entityId, turnOn = true) {
       service = turnOn ? "turn_on" : "turn_off";
   }
 
-  hass.callService(serviceDomain, service, { entity_id: entityId });
-}
+  return hass.callService(serviceDomain, service, { entity_id: entityId });
+};
diff --git a/src/panels/lovelace/common/handle-click.ts b/src/panels/lovelace/common/handle-click.ts
index c7d1321228..f420a0f39a 100644
--- a/src/panels/lovelace/common/handle-click.ts
+++ b/src/panels/lovelace/common/handle-click.ts
@@ -2,7 +2,7 @@ import { HomeAssistant } from "../../../types";
 import { LovelaceElementConfig } from "../elements/types";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { navigate } from "../../../common/navigate";
-import toggleEntity from "../../../../src/panels/lovelace/common/entity/toggle-entity";
+import { toggleEntity } from "../../../../src/panels/lovelace/common/entity/toggle-entity";
 
 export const handleClick = (
   node: HTMLElement,
@@ -28,7 +28,7 @@ export const handleClick = (
       navigate(node, config.navigation_path ? config.navigation_path : "");
       break;
     case "toggle":
-      toggleEntity(hass, config.entity);
+      toggleEntity(hass, config.entity!);
       break;
     case "call-service": {
       if (config.service) {

From 6885abd2348ab7b4cfe0529ddbee1da5b94f834b Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Fri, 23 Nov 2018 01:56:35 -0600
Subject: [PATCH 04/69] Convert shopping-list add item call to websockets
 (#2080)

---
 src/data/shopping-list.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/data/shopping-list.ts b/src/data/shopping-list.ts
index 14ff992abd..e2c57cdc78 100644
--- a/src/data/shopping-list.ts
+++ b/src/data/shopping-list.ts
@@ -36,6 +36,7 @@ export const addItem = (
   hass: HomeAssistant,
   name: string
 ): Promise<ShoppingListItem> =>
-  hass.callApi("POST", "shopping_list/item", {
+  hass.callWS({
+    type: "shopping_list/items/add",
     name,
   });

From 785ed6f9dbcd9fe7a6118108f38e046a842ff614 Mon Sep 17 00:00:00 2001
From: Simon Holzmayer <simon@holzmayer.me>
Date: Fri, 23 Nov 2018 11:52:48 +0100
Subject: [PATCH 05/69] add "for" input field to numeric_state in trigger
 editor (#2081)

---
 src/panels/config/js/trigger/numeric_state.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/panels/config/js/trigger/numeric_state.js b/src/panels/config/js/trigger/numeric_state.js
index 41cf07838d..cfa9ead60f 100644
--- a/src/panels/config/js/trigger/numeric_state.js
+++ b/src/panels/config/js/trigger/numeric_state.js
@@ -24,7 +24,18 @@ export default class NumericStateTrigger extends Component {
   /* eslint-disable camelcase */
   render({ trigger, hass, localize }) {
     const { value_template, entity_id, below, above } = trigger;
+    let trgFor = trigger.for;
 
+    if (trgFor && (trgFor.hours || trgFor.minutes || trgFor.seconds)) {
+      // If the trigger was defined using the yaml dict syntax, convert it to
+      // the equivalent string format
+      let { hours = 0, minutes = 0, seconds = 0 } = trgFor;
+      hours = hours.toString();
+      minutes = minutes.toString().padStart(2, "0");
+      seconds = seconds.toString().padStart(2, "0");
+
+      trgFor = `${hours}:${minutes}:${seconds}`;
+    }
     return (
       <div>
         <ha-entity-picker
@@ -57,6 +68,14 @@ export default class NumericStateTrigger extends Component {
           value={value_template}
           onvalue-changed={this.onChange}
         />
+        <paper-input
+          label={localize(
+            "ui.panel.config.automation.editor.triggers.type.state.for"
+          )}
+          name="for"
+          value={trgFor}
+          onvalue-changed={this.onChange}
+        />
       </div>
     );
   }

From d41a4cf78b8c6bb56ed987925ec049b689d62e56 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Fri, 23 Nov 2018 17:39:50 +0100
Subject: [PATCH 06/69] Generate Lovelace config on the fly (#2091)

* Generate Lovelace config on the fly

* Disable editing

* Fix domain name title rendering
---
 src/common/entity/extract_views.ts            |   9 +-
 src/common/entity/get_view_entities.ts        |   2 +-
 src/common/entity/split_by_groups.ts          |   7 +-
 .../common/generate-lovelace-config.ts        | 236 ++++++++++++++++++
 src/panels/lovelace/ha-panel-lovelace.js      |  21 +-
 src/panels/lovelace/hui-root.js               |   4 +
 6 files changed, 266 insertions(+), 13 deletions(-)
 create mode 100644 src/panels/lovelace/common/generate-lovelace-config.ts

diff --git a/src/common/entity/extract_views.ts b/src/common/entity/extract_views.ts
index bcc7084646..d5679e5518 100644
--- a/src/common/entity/extract_views.ts
+++ b/src/common/entity/extract_views.ts
@@ -1,14 +1,15 @@
-import { HassEntities, HassEntity } from "home-assistant-js-websocket";
+import { HassEntities } from "home-assistant-js-websocket";
 import { DEFAULT_VIEW_ENTITY_ID } from "../const";
+import { GroupEntity } from "../../types";
 
 // Return an ordered array of available views
-export default function extractViews(entities: HassEntities): HassEntity[] {
-  const views: HassEntity[] = [];
+export default function extractViews(entities: HassEntities): GroupEntity[] {
+  const views: GroupEntity[] = [];
 
   Object.keys(entities).forEach((entityId) => {
     const entity = entities[entityId];
     if (entity.attributes.view) {
-      views.push(entity);
+      views.push(entity as GroupEntity);
     }
   });
 
diff --git a/src/common/entity/get_view_entities.ts b/src/common/entity/get_view_entities.ts
index 62aa7e5d89..c3d249cfcd 100644
--- a/src/common/entity/get_view_entities.ts
+++ b/src/common/entity/get_view_entities.ts
@@ -8,7 +8,7 @@ import { GroupEntity } from "../../types";
 export default function getViewEntities(
   entities: HassEntities,
   view: GroupEntity
-) {
+): HassEntities {
   const viewEntities = {};
 
   view.attributes.entity_id.forEach((entityId) => {
diff --git a/src/common/entity/split_by_groups.ts b/src/common/entity/split_by_groups.ts
index a894472d8c..aed1ab7f0e 100644
--- a/src/common/entity/split_by_groups.ts
+++ b/src/common/entity/split_by_groups.ts
@@ -1,18 +1,19 @@
 import computeDomain from "./compute_domain";
-import { HassEntity, HassEntities } from "home-assistant-js-websocket";
+import { HassEntities } from "home-assistant-js-websocket";
+import { GroupEntity } from "../../types";
 
 // Split a collection into a list of groups and a 'rest' list of ungrouped
 // entities.
 // Returns { groups: [], ungrouped: {} }
 export default function splitByGroups(entities: HassEntities) {
-  const groups: HassEntity[] = [];
+  const groups: GroupEntity[] = [];
   const ungrouped: HassEntities = {};
 
   Object.keys(entities).forEach((entityId) => {
     const entity = entities[entityId];
 
     if (computeDomain(entityId) === "group") {
-      groups.push(entity);
+      groups.push(entity as GroupEntity);
     } else {
       ungrouped[entityId] = entity;
     }
diff --git a/src/panels/lovelace/common/generate-lovelace-config.ts b/src/panels/lovelace/common/generate-lovelace-config.ts
new file mode 100644
index 0000000000..ca8b4fd0e9
--- /dev/null
+++ b/src/panels/lovelace/common/generate-lovelace-config.ts
@@ -0,0 +1,236 @@
+import { HomeAssistant, GroupEntity } from "../../../types";
+import { HassEntity, HassEntities } from "home-assistant-js-websocket";
+import extractViews from "../../../common/entity/extract_views";
+import getViewEntities from "../../../common/entity/get_view_entities";
+import computeStateName from "../../../common/entity/compute_state_name";
+import splitByGroups from "../../../common/entity/split_by_groups";
+import computeObjectId from "../../../common/entity/compute_object_id";
+import computeStateDomain from "../../../common/entity/compute_state_domain";
+import { LocalizeFunc } from "../../../mixins/localize-base-mixin";
+
+interface CardConfig {
+  id?: string;
+  type: string;
+  [key: string]: any;
+}
+
+interface ViewConfig {
+  title?: string;
+  badges?: string[];
+  cards?: CardConfig[];
+  id?: string;
+  icon?: string;
+}
+
+interface LovelaceConfig {
+  _frontendAuto: boolean;
+  title?: string;
+  views: ViewConfig[];
+}
+
+const DEFAULT_VIEW_ENTITY_ID = "group.default_view";
+const DOMAINS_BADGES = [
+  "binary_sensor",
+  "device_tracker",
+  "mailbox",
+  "sensor",
+  "sun",
+  "timer",
+];
+const HIDE_DOMAIN = new Set(["persistent_notification", "configurator"]);
+
+const computeCards = (title: string, states: HassEntity[]): CardConfig[] => {
+  const cards: CardConfig[] = [];
+
+  // For entity card
+  const entities: string[] = [];
+
+  states.forEach((stateObj) => {
+    const domain = computeStateDomain(stateObj);
+    if (domain === "alarm_control_panel") {
+      cards.push({
+        type: "alarm-panel",
+        entity: stateObj.entity_id,
+      });
+    } else if (domain === "climate") {
+      cards.push({
+        type: "thermostat",
+        entity: stateObj.entity_id,
+      });
+    } else if (domain === "media_player") {
+      cards.push({
+        type: "media-control",
+        entity: stateObj.entity_id,
+      });
+    } else if (domain === "weather") {
+      cards.push({
+        type: "weather-forecast",
+        entity: stateObj.entity_id,
+      });
+    } else {
+      entities.push(stateObj.entity_id);
+    }
+  });
+
+  if (entities.length > 0) {
+    cards.unshift({
+      title,
+      type: "entities",
+      entities,
+    });
+  }
+
+  return cards;
+};
+
+const computeDefaultViewStates = (hass: HomeAssistant): HassEntities => {
+  const states = {};
+  Object.keys(hass.states).forEach((entityId) => {
+    const stateObj = hass.states[entityId];
+    if (
+      !stateObj.attributes.hidden &&
+      !HIDE_DOMAIN.has(computeStateDomain(stateObj))
+    ) {
+      states[entityId] = hass.states[entityId];
+    }
+  });
+  return states;
+};
+
+const generateViewConfig = (
+  localize: LocalizeFunc,
+  id: string,
+  title: string | undefined,
+  icon: string | undefined,
+  entities: HassEntities,
+  groupOrders: { [entityId: string]: number }
+): ViewConfig => {
+  const splitted = splitByGroups(entities);
+  splitted.groups.sort(
+    (gr1, gr2) => groupOrders[gr1.entity_id] - groupOrders[gr2.entity_id]
+  );
+
+  const badgeEntities: { [domain: string]: string[] } = {};
+  const ungroupedEntitites: { [domain: string]: string[] } = {};
+
+  // Organize ungrouped entities in badges/ungrouped things
+  Object.keys(splitted.ungrouped).forEach((entityId) => {
+    const state = splitted.ungrouped[entityId];
+    const domain = computeStateDomain(state);
+
+    const coll = DOMAINS_BADGES.includes(domain)
+      ? badgeEntities
+      : ungroupedEntitites;
+
+    if (!(domain in coll)) {
+      coll[domain] = [];
+    }
+
+    coll[domain].push(state.entity_id);
+  });
+
+  let badges: string[] = [];
+  DOMAINS_BADGES.forEach((domain) => {
+    if (domain in badgeEntities) {
+      badges = badges.concat(badgeEntities[domain]);
+    }
+  });
+
+  let cards: CardConfig[] = [];
+
+  splitted.groups.forEach((groupEntity) => {
+    cards = cards.concat(
+      computeCards(
+        computeStateName(groupEntity),
+        groupEntity.attributes.entity_id.map((entityId) => entities[entityId])
+      )
+    );
+  });
+
+  Object.keys(ungroupedEntitites)
+    .sort()
+    .forEach((domain) => {
+      cards = cards.concat(
+        computeCards(
+          localize(`domain.${domain}`),
+          ungroupedEntitites[domain].map((entityId) => entities[entityId])
+        )
+      );
+    });
+
+  return {
+    id,
+    title,
+    icon,
+    badges,
+    cards,
+  };
+};
+
+export const generateLovelaceConfig = (
+  hass: HomeAssistant,
+  localize: LocalizeFunc
+): LovelaceConfig => {
+  const viewEntities = extractViews(hass.states);
+
+  const views = viewEntities.map((viewEntity: GroupEntity) => {
+    const states = getViewEntities(hass.states, viewEntity);
+
+    // In the case of a normal view, we use group order as specified in view
+    const groupOrders = {};
+    Object.keys(states).forEach((entityId, idx) => {
+      groupOrders[entityId] = idx;
+    });
+
+    return generateViewConfig(
+      localize,
+      computeObjectId(viewEntity.entity_id),
+      computeStateName(viewEntity),
+      viewEntity.attributes.icon,
+      states,
+      groupOrders
+    );
+  });
+
+  let title = hass.config.location_name;
+
+  // User can override default view. If they didn't, we will add one
+  // that contains all entities.
+  if (
+    viewEntities.length === 0 ||
+    viewEntities[0].entity_id !== DEFAULT_VIEW_ENTITY_ID
+  ) {
+    const states = computeDefaultViewStates(hass);
+
+    // In the case of a default view, we want to use the group order attribute
+    const groupOrders = {};
+    Object.keys(states).forEach((entityId) => {
+      const stateObj = states[entityId];
+      if (stateObj.attributes.order) {
+        groupOrders[entityId] = stateObj.attributes.order;
+      }
+    });
+
+    views.unshift(
+      generateViewConfig(
+        localize,
+        "default_view",
+        "Home",
+        undefined,
+        states,
+        groupOrders
+      )
+    );
+
+    // Make sure we don't have Home as title and first tab.
+    if (views.length > 1 && title === "Home") {
+      title = "Home Assistant";
+    }
+  }
+
+  return {
+    _frontendAuto: true,
+    title,
+    views,
+  };
+};
diff --git a/src/panels/lovelace/ha-panel-lovelace.js b/src/panels/lovelace/ha-panel-lovelace.js
index a866a9eda9..f69434e714 100644
--- a/src/panels/lovelace/ha-panel-lovelace.js
+++ b/src/panels/lovelace/ha-panel-lovelace.js
@@ -5,8 +5,9 @@ import "@polymer/paper-button/paper-button";
 import "../../layouts/hass-loading-screen";
 import "../../layouts/hass-error-screen";
 import "./hui-root";
+import localizeMixin from "../../mixins/localize-mixin";
 
-class Lovelace extends PolymerElement {
+class Lovelace extends localizeMixin(PolymerElement) {
   static get template() {
     return html`
       <style>
@@ -116,10 +117,20 @@ class Lovelace extends PolymerElement {
         _state: "loaded",
       });
     } catch (err) {
-      this.setProperties({
-        _state: "error",
-        _errorMsg: err.message,
-      });
+      if (err.code === "file_not_found") {
+        const {
+          generateLovelaceConfig,
+        } = await import("./common/generate-lovelace-config");
+        this.setProperties({
+          _config: generateLovelaceConfig(this.hass, this.localize),
+          _state: "loaded",
+        });
+      } else {
+        this.setProperties({
+          _state: "error",
+          _errorMsg: err.message,
+        });
+      }
     }
   }
 
diff --git a/src/panels/lovelace/hui-root.js b/src/panels/lovelace/hui-root.js
index 4d52bc1850..c04fb9dedd 100644
--- a/src/panels/lovelace/hui-root.js
+++ b/src/panels/lovelace/hui-root.js
@@ -274,6 +274,10 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
   }
 
   _editModeEnable() {
+    if (this.config._frontendAuto) {
+      alert("Unable to edit automatic generated UI yet.");
+      return;
+    }
     this._editMode = true;
   }
 

From a7ab652dd37878f7ea3ae402be996a06938a0b9c Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Fri, 23 Nov 2018 19:38:28 +0100
Subject: [PATCH 07/69] Add support for timestamp device class (#2087)

---
 src/common/datetime/relative_time.ts          |  34 +++--
 .../lovelace/common/create-row-element.js     |   2 +
 .../components/hui-timestamp-display.ts       | 130 ++++++++++++++++++
 .../entity-rows/hui-error-entity-row.ts       |   5 +-
 .../entity-rows/hui-sensor-entity-row.ts      |  85 ++++++++++++
 5 files changed, 244 insertions(+), 12 deletions(-)
 create mode 100644 src/panels/lovelace/components/hui-timestamp-display.ts
 create mode 100644 src/panels/lovelace/entity-rows/hui-sensor-entity-row.ts

diff --git a/src/common/datetime/relative_time.ts b/src/common/datetime/relative_time.ts
index 7daabdc657..ef5a895df0 100644
--- a/src/common/datetime/relative_time.ts
+++ b/src/common/datetime/relative_time.ts
@@ -10,31 +10,43 @@ const langKey = ["second", "minute", "hour", "day"];
 
 export default function relativeTime(
   dateObj: Date,
-  localize: LocalizeFunc
+  localize: LocalizeFunc,
+  options: {
+    compareTime?: Date;
+    includeTense?: boolean;
+  } = {}
 ): string {
-  let delta = (new Date().getTime() - dateObj.getTime()) / 1000;
+  const compareTime = options.compareTime || new Date();
+  let delta = (compareTime.getTime() - dateObj.getTime()) / 1000;
   const tense = delta >= 0 ? "past" : "future";
   delta = Math.abs(delta);
 
+  let timeDesc;
+
   for (let i = 0; i < tests.length; i++) {
     if (delta < tests[i]) {
       delta = Math.floor(delta);
-      const timeDesc = localize(
+      timeDesc = localize(
         `ui.components.relative_time.duration.${langKey[i]}`,
         "count",
         delta
       );
-      return localize(`ui.components.relative_time.${tense}`, "time", timeDesc);
+      break;
     }
 
     delta /= tests[i];
   }
 
-  delta = Math.floor(delta);
-  const time = localize(
-    "ui.components.relative_time.duration.week",
-    "count",
-    delta
-  );
-  return localize(`ui.components.relative_time.${tense}`, "time", time);
+  if (timeDesc === undefined) {
+    delta = Math.floor(delta);
+    timeDesc = localize(
+      "ui.components.relative_time.duration.week",
+      "count",
+      delta
+    );
+  }
+
+  return options.includeTense === false
+    ? timeDesc
+    : localize(`ui.components.relative_time.${tense}`, "time", timeDesc);
 }
diff --git a/src/panels/lovelace/common/create-row-element.js b/src/panels/lovelace/common/create-row-element.js
index 00d9d36d17..9ec0a5efef 100644
--- a/src/panels/lovelace/common/create-row-element.js
+++ b/src/panels/lovelace/common/create-row-element.js
@@ -10,6 +10,7 @@ import "../entity-rows/hui-lock-entity-row";
 import "../entity-rows/hui-media-player-entity-row";
 import "../entity-rows/hui-scene-entity-row";
 import "../entity-rows/hui-script-entity-row";
+import "../entity-rows/hui-sensor-entity-row";
 import "../entity-rows/hui-text-entity-row";
 import "../entity-rows/hui-timer-entity-row";
 import "../entity-rows/hui-toggle-entity-row";
@@ -42,6 +43,7 @@ const DOMAIN_TO_ELEMENT_TYPE = {
   lock: "lock",
   scene: "scene",
   script: "script",
+  sensor: "sensor",
   timer: "timer",
   switch: "toggle",
   vacuum: "toggle",
diff --git a/src/panels/lovelace/components/hui-timestamp-display.ts b/src/panels/lovelace/components/hui-timestamp-display.ts
new file mode 100644
index 0000000000..d97b9abdd0
--- /dev/null
+++ b/src/panels/lovelace/components/hui-timestamp-display.ts
@@ -0,0 +1,130 @@
+import {
+  html,
+  LitElement,
+  PropertyDeclarations,
+  PropertyValues,
+} from "@polymer/lit-element";
+import { TemplateResult } from "lit-html";
+
+import { HomeAssistant } from "../../../types";
+import format_date from "../../../common/datetime/format_date";
+import format_date_time from "../../../common/datetime/format_date_time";
+import format_time from "../../../common/datetime/format_time";
+import relativeTime from "../../../common/datetime/relative_time";
+import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
+
+const FORMATS: { [key: string]: (ts: Date, lang: string) => string } = {
+  date: format_date,
+  datetime: format_date_time,
+  time: format_time,
+};
+const INTERVAL_FORMAT = ["relative", "total"];
+
+class HuiTimestampDisplay extends hassLocalizeLitMixin(LitElement) {
+  public hass?: HomeAssistant;
+  public ts?: Date;
+  public format?: "relative" | "total" | "date" | "datetime" | "time";
+  private _relative?: string;
+  private _connected?: boolean;
+  private _interval?: number;
+
+  static get properties(): PropertyDeclarations {
+    return {
+      ts: {},
+      hass: {},
+      format: {},
+      _relative: {},
+    };
+  }
+
+  public connectedCallback() {
+    super.connectedCallback();
+    this._connected = true;
+    this._startInterval();
+  }
+
+  public disconnectedCallback() {
+    super.disconnectedCallback();
+    this._connected = false;
+    this._clearInterval();
+  }
+
+  protected render(): TemplateResult {
+    if (!this.ts || !this.hass) {
+      return html``;
+    }
+
+    if (isNaN(this.ts.getTime())) {
+      return html`
+        Invalid date
+      `;
+    }
+
+    const format = this._format;
+
+    if (INTERVAL_FORMAT.includes(format)) {
+      return html`
+        ${this._relative}
+      `;
+    } else if (format in FORMATS) {
+      return html`
+        ${FORMATS[format](this.ts, this.hass.language)}
+      `;
+    } else {
+      return html`
+        Invalid format
+      `;
+    }
+  }
+
+  protected updated(changedProperties: PropertyValues) {
+    if (!changedProperties.has("format") || !this._connected) {
+      return;
+    }
+
+    if (INTERVAL_FORMAT.includes("relative")) {
+      this._startInterval();
+    } else {
+      this._clearInterval();
+    }
+  }
+
+  private get _format() {
+    return this.format || "relative";
+  }
+
+  private _startInterval() {
+    this._clearInterval();
+    if (this._connected && INTERVAL_FORMAT.includes(this._format)) {
+      this._updateRelative();
+      this._interval = window.setInterval(() => this._updateRelative(), 1000);
+    }
+  }
+
+  private _clearInterval() {
+    if (this._interval) {
+      clearInterval(this._interval);
+      this._interval = undefined;
+    }
+  }
+
+  private _updateRelative() {
+    if (this.ts && this.localize) {
+      this._relative =
+        this._format === "relative"
+          ? relativeTime(this.ts, this.localize)
+          : (this._relative = relativeTime(new Date(), this.localize, {
+              compareTime: this.ts,
+              includeTense: false,
+            }));
+    }
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "hui-timestamp-display": HuiTimestampDisplay;
+  }
+}
+
+customElements.define("hui-timestamp-display", HuiTimestampDisplay);
diff --git a/src/panels/lovelace/entity-rows/hui-error-entity-row.ts b/src/panels/lovelace/entity-rows/hui-error-entity-row.ts
index c235d4aac1..252ed1dfd6 100644
--- a/src/panels/lovelace/entity-rows/hui-error-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-error-entity-row.ts
@@ -3,16 +3,19 @@ import { TemplateResult } from "lit-html";
 
 class HuiErrorEntityRow extends LitElement {
   public entity?: string;
+  public error?: string;
 
   static get properties() {
     return {
+      error: {},
       entity: {},
     };
   }
 
   protected render(): TemplateResult {
     return html`
-      ${this.renderStyle()} Entity not available: ${this.entity || ""}
+      ${this.renderStyle()} ${this.error || "Entity not available"}:
+      ${this.entity || ""}
     `;
   }
 
diff --git a/src/panels/lovelace/entity-rows/hui-sensor-entity-row.ts b/src/panels/lovelace/entity-rows/hui-sensor-entity-row.ts
new file mode 100644
index 0000000000..79b1707774
--- /dev/null
+++ b/src/panels/lovelace/entity-rows/hui-sensor-entity-row.ts
@@ -0,0 +1,85 @@
+import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
+import { TemplateResult } from "lit-html";
+
+import "../components/hui-generic-entity-row";
+import "../components/hui-timestamp-display";
+import "./hui-error-entity-row";
+
+import { HomeAssistant } from "../../../types";
+import { EntityRow, EntityConfig } from "./types";
+
+interface SensorEntityConfig extends EntityConfig {
+  format?: "relative" | "date" | "time" | "datetime";
+}
+
+class HuiSensorEntityRow extends LitElement implements EntityRow {
+  public hass?: HomeAssistant;
+  private _config?: SensorEntityConfig;
+
+  static get properties(): PropertyDeclarations {
+    return {
+      hass: {},
+      _config: {},
+    };
+  }
+
+  public setConfig(config: SensorEntityConfig): void {
+    if (!config) {
+      throw new Error("Configuration error");
+    }
+    this._config = config;
+  }
+
+  protected render(): TemplateResult {
+    if (!this._config || !this.hass) {
+      return html``;
+    }
+
+    const stateObj = this.hass.states[this._config.entity];
+
+    if (!stateObj) {
+      return html`
+        <hui-error-entity-row
+          .entity="${this._config.entity}"
+        ></hui-error-entity-row>
+      `;
+    }
+
+    return html`
+      ${this.renderStyle()}
+      <hui-generic-entity-row .hass="${this.hass}" .config="${this._config}">
+        <div>
+          ${
+            stateObj.attributes.device_class === "timestamp"
+              ? html`
+                  <hui-timestamp-display
+                    .hass="${this.hass}"
+                    .ts="${new Date(stateObj.state)}"
+                    .format="${this._config.format}"
+                  ></hui-timestamp-display>
+                `
+              : stateObj.state
+          }
+        </div>
+      </hui-generic-entity-row>
+    `;
+  }
+
+  private renderStyle(): TemplateResult {
+    return html`
+      <style>
+        div {
+          text-align: right;
+        }
+      </style>
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "hui-sensor-entity-row": HuiSensorEntityRow;
+  }
+}
+
+customElements.define("hui-sensor-entity-row", HuiSensorEntityRow);

From 412b7595d2afc21da4b7b63dc3d3a7a7bf37cacc Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Fri, 23 Nov 2018 20:42:41 +0100
Subject: [PATCH 08/69] Handle non existing states (#2098)

---
 .../common/generate-lovelace-config.ts        | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/panels/lovelace/common/generate-lovelace-config.ts b/src/panels/lovelace/common/generate-lovelace-config.ts
index ca8b4fd0e9..aa5f912d28 100644
--- a/src/panels/lovelace/common/generate-lovelace-config.ts
+++ b/src/panels/lovelace/common/generate-lovelace-config.ts
@@ -7,6 +7,7 @@ import splitByGroups from "../../../common/entity/split_by_groups";
 import computeObjectId from "../../../common/entity/compute_object_id";
 import computeStateDomain from "../../../common/entity/compute_state_domain";
 import { LocalizeFunc } from "../../../mixins/localize-base-mixin";
+import computeDomain from "../../../common/entity/compute_domain";
 
 interface CardConfig {
   id?: string;
@@ -39,38 +40,42 @@ const DOMAINS_BADGES = [
 ];
 const HIDE_DOMAIN = new Set(["persistent_notification", "configurator"]);
 
-const computeCards = (title: string, states: HassEntity[]): CardConfig[] => {
+const computeCards = (
+  title: string,
+  states: Array<[string, HassEntity]>
+): CardConfig[] => {
   const cards: CardConfig[] = [];
 
   // For entity card
   const entities: string[] = [];
 
-  states.forEach((stateObj) => {
-    const domain = computeStateDomain(stateObj);
+  for (const [entityId /*, stateObj */] of states) {
+    const domain = computeDomain(entityId);
+
     if (domain === "alarm_control_panel") {
       cards.push({
         type: "alarm-panel",
-        entity: stateObj.entity_id,
+        entity: entityId,
       });
     } else if (domain === "climate") {
       cards.push({
         type: "thermostat",
-        entity: stateObj.entity_id,
+        entity: entityId,
       });
     } else if (domain === "media_player") {
       cards.push({
         type: "media-control",
-        entity: stateObj.entity_id,
+        entity: entityId,
       });
     } else if (domain === "weather") {
       cards.push({
         type: "weather-forecast",
-        entity: stateObj.entity_id,
+        entity: entityId,
       });
     } else {
-      entities.push(stateObj.entity_id);
+      entities.push(entityId);
     }
-  });
+  }
 
   if (entities.length > 0) {
     cards.unshift({
@@ -142,7 +147,9 @@ const generateViewConfig = (
     cards = cards.concat(
       computeCards(
         computeStateName(groupEntity),
-        groupEntity.attributes.entity_id.map((entityId) => entities[entityId])
+        groupEntity.attributes.entity_id.map(
+          (entityId): [string, HassEntity] => [entityId, entities[entityId]]
+        )
       )
     );
   });
@@ -153,7 +160,9 @@ const generateViewConfig = (
       cards = cards.concat(
         computeCards(
           localize(`domain.${domain}`),
-          ungroupedEntitites[domain].map((entityId) => entities[entityId])
+          ungroupedEntitites[domain].map(
+            (entityId): [string, HassEntity] => [entityId, entities[entityId]]
+          )
         )
       );
     });

From 101a364a83d2a20fa472e88a86102b037ed0f3d2 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Sat, 24 Nov 2018 14:03:54 +0100
Subject: [PATCH 09/69] Type LovelaceConfig -> LovelaceCardConfig (#2103)

* LovelaceConfig -> LovelaceCardConfig

* Typo
---
 .../lovelace/cards/hui-conditional-card.ts    |  6 ++--
 .../lovelace/cards/hui-entities-card.ts       |  4 +--
 .../lovelace/cards/hui-entity-button-card.ts  |  4 +--
 src/panels/lovelace/cards/hui-error-card.ts   |  8 ++---
 src/panels/lovelace/cards/hui-gauge-card.ts   |  4 +--
 src/panels/lovelace/cards/hui-glance-card.ts  |  4 +--
 src/panels/lovelace/cards/hui-iframe-card.ts  |  4 +--
 src/panels/lovelace/cards/hui-light-card.ts   |  4 +--
 .../lovelace/cards/hui-markdown-card.ts       |  4 +--
 src/panels/lovelace/cards/hui-picture-card.ts |  4 +--
 .../cards/hui-picture-elements-card.ts        |  4 +--
 .../lovelace/cards/hui-picture-glance-card.ts |  4 +--
 .../lovelace/cards/hui-shopping-list-card.ts  |  4 +--
 src/panels/lovelace/cards/hui-stack-card.ts   |  6 ++--
 .../lovelace/cards/hui-thermostat-card.ts     |  4 +--
 src/panels/lovelace/common/data.ts            |  4 +--
 .../common/generate-lovelace-config.ts        | 33 +++++--------------
 .../lovelace/components/hui-card-options.ts   |  4 +--
 .../lovelace/editor/hui-card-preview.ts       |  6 ++--
 .../lovelace/editor/hui-dialog-edit-card.ts   |  4 +--
 src/panels/lovelace/editor/hui-edit-card.ts   | 15 +++++----
 src/panels/lovelace/editor/types.ts           |  4 +--
 src/panels/lovelace/types.ts                  | 22 ++++++++++---
 23 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-conditional-card.ts b/src/panels/lovelace/cards/hui-conditional-card.ts
index 5111855b1a..4646b7386b 100644
--- a/src/panels/lovelace/cards/hui-conditional-card.ts
+++ b/src/panels/lovelace/cards/hui-conditional-card.ts
@@ -1,7 +1,7 @@
 import createCardElement from "../common/create-card-element";
 import { computeCardSize } from "../common/compute-card-size";
 import { HomeAssistant } from "../../../types";
-import { LovelaceCard, LovelaceConfig } from "../types";
+import { LovelaceCard, LovelaceCardConfig } from "../types";
 
 interface Condition {
   entity: string;
@@ -9,8 +9,8 @@ interface Condition {
   state_not?: string;
 }
 
-interface Config extends LovelaceConfig {
-  card: LovelaceConfig;
+interface Config extends LovelaceCardConfig {
+  card: LovelaceCardConfig;
   conditions: Condition[];
 }
 
diff --git a/src/panels/lovelace/cards/hui-entities-card.ts b/src/panels/lovelace/cards/hui-entities-card.ts
index 2689fa4ad9..cbb51e71a7 100644
--- a/src/panels/lovelace/cards/hui-entities-card.ts
+++ b/src/panels/lovelace/cards/hui-entities-card.ts
@@ -14,7 +14,7 @@ import { DOMAINS_HIDE_MORE_INFO } from "../../../common/const";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
 import { HomeAssistant } from "../../../types";
 import { EntityConfig, EntityRow } from "../entity-rows/types";
-import { LovelaceCard, LovelaceConfig, LovelaceCardEditor } from "../types";
+import { LovelaceCard, LovelaceCardConfig, LovelaceCardEditor } from "../types";
 import processConfigEntities from "../common/process-config-entities";
 import createRowElement from "../common/create-row-element";
 import computeDomain from "../../../common/entity/compute_domain";
@@ -29,7 +29,7 @@ export interface ConfigEntity extends EntityConfig {
   url?: string;
 }
 
-export interface Config extends LovelaceConfig {
+export interface Config extends LovelaceCardConfig {
   show_header_toggle?: boolean;
   title?: string;
   entities: ConfigEntity[];
diff --git a/src/panels/lovelace/cards/hui-entity-button-card.ts b/src/panels/lovelace/cards/hui-entity-button-card.ts
index de0d81a2e4..78c0320e26 100644
--- a/src/panels/lovelace/cards/hui-entity-button-card.ts
+++ b/src/panels/lovelace/cards/hui-entity-button-card.ts
@@ -18,11 +18,11 @@ import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
 import { toggleEntity } from "../common/entity/toggle-entity";
 import { HomeAssistant, LightEntity } from "../../../types";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
-import { LovelaceCard, LovelaceConfig } from "../types";
+import { LovelaceCard, LovelaceCardConfig } from "../types";
 import { longPress } from "../common/directives/long-press-directive";
 import { fireEvent } from "../../../common/dom/fire_event";
 
-interface Config extends LovelaceConfig {
+interface Config extends LovelaceCardConfig {
   entity: string;
   name?: string;
   icon?: string;
diff --git a/src/panels/lovelace/cards/hui-error-card.ts b/src/panels/lovelace/cards/hui-error-card.ts
index 5aa785d62d..6d89c406c9 100644
--- a/src/panels/lovelace/cards/hui-error-card.ts
+++ b/src/panels/lovelace/cards/hui-error-card.ts
@@ -1,11 +1,11 @@
 import { html, LitElement } from "@polymer/lit-element";
 
-import { LovelaceCard, LovelaceConfig } from "../types";
+import { LovelaceCard, LovelaceCardConfig } from "../types";
 import { TemplateResult } from "lit-html";
 
-interface Config extends LovelaceConfig {
+interface Config extends LovelaceCardConfig {
   error: string;
-  origConfig: LovelaceConfig;
+  origConfig: LovelaceCardConfig;
 }
 
 class HuiErrorCard extends LitElement implements LovelaceCard {
@@ -50,7 +50,7 @@ class HuiErrorCard extends LitElement implements LovelaceCard {
     `;
   }
 
-  private _toStr(config: LovelaceConfig): string {
+  private _toStr(config: LovelaceCardConfig): string {
     return JSON.stringify(config, null, 2);
   }
 }
diff --git a/src/panels/lovelace/cards/hui-gauge-card.ts b/src/panels/lovelace/cards/hui-gauge-card.ts
index 5fbfeece6f..e901f5d3cf 100644
--- a/src/panels/lovelace/cards/hui-gauge-card.ts
+++ b/src/panels/lovelace/cards/hui-gauge-card.ts
@@ -6,7 +6,7 @@ import {
 } from "@polymer/lit-element";
 import { TemplateResult } from "lit-html";
 
-import { LovelaceCard, LovelaceConfig } from "../types";
+import { LovelaceCard, LovelaceCardConfig } from "../types";
 import { HomeAssistant } from "../../../types";
 import { fireEvent } from "../../../common/dom/fire_event";
 
@@ -16,7 +16,7 @@ import { hasConfigOrEntityChanged } from "../common/has-changed";
 
 import "../../../components/ha-card";
 
-interface Config extends LovelaceConfig {
+interface Config extends LovelaceCardConfig {
   entity: string;
   title?: string;
   unit_of_measurement?: string;
diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts
index d3c40ee8ca..246a0e564d 100644
--- a/src/panels/lovelace/cards/hui-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-glance-card.ts
@@ -10,7 +10,7 @@ import { classMap } from "lit-html/directives/classMap";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
 import { HomeAssistant } from "../../../types";
-import { LovelaceCard, LovelaceConfig, LovelaceCardEditor } from "../types";
+import { LovelaceCard, LovelaceCardConfig, LovelaceCardEditor } from "../types";
 import { longPress } from "../common/directives/long-press-directive";
 import { EntityConfig } from "../entity-rows/types";
 import { toggleEntity } from "../common/entity/toggle-entity";
@@ -31,7 +31,7 @@ export interface ConfigEntity extends EntityConfig {
   service_data?: object;
 }
 
-export interface Config extends LovelaceConfig {
+export interface Config extends LovelaceCardConfig {
   show_name?: boolean;
   show_state?: boolean;
   title?: string;
diff --git a/src/panels/lovelace/cards/hui-iframe-card.ts b/src/panels/lovelace/cards/hui-iframe-card.ts
index 822f60f870..a964bcac90 100644
--- a/src/panels/lovelace/cards/hui-iframe-card.ts
+++ b/src/panels/lovelace/cards/hui-iframe-card.ts
@@ -2,11 +2,11 @@ import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
 
 import "../../../components/ha-card";
 
-import { LovelaceCard, LovelaceConfig } from "../types";
+import { LovelaceCard, LovelaceCardConfig } from "../types";
 import { TemplateResult } from "lit-html";
 import { styleMap } from "lit-html/directives/styleMap";
 
-interface Config extends LovelaceConfig {
+interface Config extends LovelaceCardConfig {
   aspect_ratio?: string;
   title?: string;
   url: string;
diff --git a/src/panels/lovelace/cards/hui-light-card.ts b/src/panels/lovelace/cards/hui-light-card.ts
index 1bbf158271..99e2c2c613 100644
--- a/src/panels/lovelace/cards/hui-light-card.ts
+++ b/src/panels/lovelace/cards/hui-light-card.ts
@@ -12,7 +12,7 @@ import { jQuery } from "../../../resources/jquery";
 import { roundSliderStyle } from "../../../resources/jquery.roundslider";
 import { HomeAssistant, LightEntity } from "../../../types";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
-import { LovelaceCard, LovelaceConfig } from "../types";
+import { LovelaceCard, LovelaceCardConfig } from "../types";
 import { longPress } from "../common/directives/long-press-directive";
 
 import stateIcon from "../../../common/entity/state_icon";
@@ -37,7 +37,7 @@ const lightConfig = {
   showTooltip: false,
 };
 
-interface Config extends LovelaceConfig {
+interface Config extends LovelaceCardConfig {
   entity: string;
   name?: string;
   theme?: string;
diff --git a/src/panels/lovelace/cards/hui-markdown-card.ts b/src/panels/lovelace/cards/hui-markdown-card.ts
index 5cedf5873b..99380293a8 100644
--- a/src/panels/lovelace/cards/hui-markdown-card.ts
+++ b/src/panels/lovelace/cards/hui-markdown-card.ts
@@ -4,10 +4,10 @@ import { classMap } from "lit-html/directives/classMap";
 import "../../../components/ha-card";
 import "../../../components/ha-markdown";
 
-import { LovelaceCard, LovelaceConfig } from "../types";
+import { LovelaceCard, LovelaceCardConfig } from "../types";
 import { TemplateResult } from "lit-html";
 
-interface Config extends LovelaceConfig {
+interface Config extends LovelaceCardConfig {
   content: string;
   title?: string;
 }
diff --git a/src/panels/lovelace/cards/hui-picture-card.ts b/src/panels/lovelace/cards/hui-picture-card.ts
index e988c0ea97..f5744a5c7f 100644
--- a/src/panels/lovelace/cards/hui-picture-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-card.ts
@@ -2,13 +2,13 @@ import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
 
 import "../../../components/ha-card";
 
-import { LovelaceCard, LovelaceConfig } from "../types";
+import { LovelaceCard, LovelaceCardConfig } from "../types";
 import { navigate } from "../../../common/navigate";
 import { HomeAssistant } from "../../../types";
 import { TemplateResult } from "lit-html";
 import { classMap } from "lit-html/directives/classMap";
 
-interface Config extends LovelaceConfig {
+interface Config extends LovelaceCardConfig {
   image?: string;
   navigation_path?: string;
   service?: string;
diff --git a/src/panels/lovelace/cards/hui-picture-elements-card.ts b/src/panels/lovelace/cards/hui-picture-elements-card.ts
index d99cdb3249..4d77fdaab8 100644
--- a/src/panels/lovelace/cards/hui-picture-elements-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-elements-card.ts
@@ -3,11 +3,11 @@ import { TemplateResult } from "lit-html";
 
 import createHuiElement from "../common/create-hui-element";
 
-import { LovelaceCard, LovelaceConfig } from "../types";
+import { LovelaceCard, LovelaceCardConfig } from "../types";
 import { HomeAssistant } from "../../../types";
 import { LovelaceElementConfig, LovelaceElement } from "../elements/types";
 
-interface Config extends LovelaceConfig {
+interface Config extends LovelaceCardConfig {
   title?: string;
   image: string;
   elements: LovelaceElementConfig[];
diff --git a/src/panels/lovelace/cards/hui-picture-glance-card.ts b/src/panels/lovelace/cards/hui-picture-glance-card.ts
index 593567bf88..776126ddb6 100644
--- a/src/panels/lovelace/cards/hui-picture-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-glance-card.ts
@@ -5,7 +5,7 @@ import { TemplateResult } from "lit-html";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { DOMAINS_TOGGLE } from "../../../common/const";
-import { LovelaceCard, LovelaceConfig } from "../types";
+import { LovelaceCard, LovelaceCardConfig } from "../types";
 import { EntityConfig } from "../entity-rows/types";
 import { navigate } from "../../../common/navigate";
 import { HomeAssistant } from "../../../types";
@@ -23,7 +23,7 @@ import "../components/hui-image";
 
 const STATES_OFF = new Set(["closed", "locked", "not_home", "off"]);
 
-interface Config extends LovelaceConfig {
+interface Config extends LovelaceCardConfig {
   entities: EntityConfig[];
   title?: string;
   navigation_path?: string;
diff --git a/src/panels/lovelace/cards/hui-shopping-list-card.ts b/src/panels/lovelace/cards/hui-shopping-list-card.ts
index a9191f1dcb..1930dfbdff 100644
--- a/src/panels/lovelace/cards/hui-shopping-list-card.ts
+++ b/src/panels/lovelace/cards/hui-shopping-list-card.ts
@@ -9,7 +9,7 @@ import "../../../components/ha-icon";
 
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
 import { HomeAssistant } from "../../../types";
-import { LovelaceCard, LovelaceConfig } from "../types";
+import { LovelaceCard, LovelaceCardConfig } from "../types";
 import {
   fetchItems,
   completeItem,
@@ -19,7 +19,7 @@ import {
   addItem,
 } from "../../../data/shopping-list";
 
-interface Config extends LovelaceConfig {
+interface Config extends LovelaceCardConfig {
   title?: string;
 }
 
diff --git a/src/panels/lovelace/cards/hui-stack-card.ts b/src/panels/lovelace/cards/hui-stack-card.ts
index 2bc6ca5022..cf2820cdc8 100644
--- a/src/panels/lovelace/cards/hui-stack-card.ts
+++ b/src/panels/lovelace/cards/hui-stack-card.ts
@@ -3,11 +3,11 @@ import { TemplateResult } from "lit-html";
 
 import createCardElement from "../common/create-card-element";
 
-import { LovelaceCard, LovelaceConfig } from "../types";
+import { LovelaceCard, LovelaceCardConfig } from "../types";
 import { HomeAssistant } from "../../../types";
 
-interface Config extends LovelaceConfig {
-  cards: LovelaceConfig[];
+interface Config extends LovelaceCardConfig {
+  cards: LovelaceCardConfig[];
 }
 
 export abstract class HuiStackCard extends LitElement implements LovelaceCard {
diff --git a/src/panels/lovelace/cards/hui-thermostat-card.ts b/src/panels/lovelace/cards/hui-thermostat-card.ts
index a9491043eb..e39376c32a 100644
--- a/src/panels/lovelace/cards/hui-thermostat-card.ts
+++ b/src/panels/lovelace/cards/hui-thermostat-card.ts
@@ -15,7 +15,7 @@ import { hasConfigOrEntityChanged } from "../common/has-changed";
 import { roundSliderStyle } from "../../../resources/jquery.roundslider";
 import { HomeAssistant, ClimateEntity } from "../../../types";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
-import { LovelaceCard, LovelaceConfig } from "../types";
+import { LovelaceCard, LovelaceCardConfig } from "../types";
 
 import "../../../components/ha-card";
 import "../../../components/ha-icon";
@@ -43,7 +43,7 @@ const modeIcons = {
   idle: "hass:power-sleep",
 };
 
-interface Config extends LovelaceConfig {
+interface Config extends LovelaceCardConfig {
   entity: string;
   theme?: string;
 }
diff --git a/src/panels/lovelace/common/data.ts b/src/panels/lovelace/common/data.ts
index 685c00c52b..373dccb4d6 100644
--- a/src/panels/lovelace/common/data.ts
+++ b/src/panels/lovelace/common/data.ts
@@ -1,5 +1,5 @@
 import { HomeAssistant } from "../../../types";
-import { LovelaceConfig } from "../types";
+import { LovelaceCardConfig } from "../types";
 
 export const getCardConfig = (
   hass: HomeAssistant,
@@ -13,7 +13,7 @@ export const getCardConfig = (
 export const updateCardConfig = (
   hass: HomeAssistant,
   cardId: string,
-  config: LovelaceConfig | string,
+  config: LovelaceCardConfig | string,
   configFormat: "json" | "yaml"
 ): Promise<void> =>
   hass.callWS({
diff --git a/src/panels/lovelace/common/generate-lovelace-config.ts b/src/panels/lovelace/common/generate-lovelace-config.ts
index aa5f912d28..6109b96fef 100644
--- a/src/panels/lovelace/common/generate-lovelace-config.ts
+++ b/src/panels/lovelace/common/generate-lovelace-config.ts
@@ -1,4 +1,9 @@
 import { HomeAssistant, GroupEntity } from "../../../types";
+import {
+  LovelaceConfig,
+  LovelaceCardConfig,
+  LovelaceViewConfig,
+} from "../types";
 import { HassEntity, HassEntities } from "home-assistant-js-websocket";
 import extractViews from "../../../common/entity/extract_views";
 import getViewEntities from "../../../common/entity/get_view_entities";
@@ -9,26 +14,6 @@ import computeStateDomain from "../../../common/entity/compute_state_domain";
 import { LocalizeFunc } from "../../../mixins/localize-base-mixin";
 import computeDomain from "../../../common/entity/compute_domain";
 
-interface CardConfig {
-  id?: string;
-  type: string;
-  [key: string]: any;
-}
-
-interface ViewConfig {
-  title?: string;
-  badges?: string[];
-  cards?: CardConfig[];
-  id?: string;
-  icon?: string;
-}
-
-interface LovelaceConfig {
-  _frontendAuto: boolean;
-  title?: string;
-  views: ViewConfig[];
-}
-
 const DEFAULT_VIEW_ENTITY_ID = "group.default_view";
 const DOMAINS_BADGES = [
   "binary_sensor",
@@ -43,8 +28,8 @@ const HIDE_DOMAIN = new Set(["persistent_notification", "configurator"]);
 const computeCards = (
   title: string,
   states: Array<[string, HassEntity]>
-): CardConfig[] => {
-  const cards: CardConfig[] = [];
+): LovelaceCardConfig[] => {
+  const cards: LovelaceCardConfig[] = [];
 
   // For entity card
   const entities: string[] = [];
@@ -109,7 +94,7 @@ const generateViewConfig = (
   icon: string | undefined,
   entities: HassEntities,
   groupOrders: { [entityId: string]: number }
-): ViewConfig => {
+): LovelaceViewConfig => {
   const splitted = splitByGroups(entities);
   splitted.groups.sort(
     (gr1, gr2) => groupOrders[gr1.entity_id] - groupOrders[gr2.entity_id]
@@ -141,7 +126,7 @@ const generateViewConfig = (
     }
   });
 
-  let cards: CardConfig[] = [];
+  let cards: LovelaceCardConfig[] = [];
 
   splitted.groups.forEach((groupEntity) => {
     cards = cards.concat(
diff --git a/src/panels/lovelace/components/hui-card-options.ts b/src/panels/lovelace/components/hui-card-options.ts
index 436cfa65c7..d1d6858c1c 100644
--- a/src/panels/lovelace/components/hui-card-options.ts
+++ b/src/panels/lovelace/components/hui-card-options.ts
@@ -2,12 +2,12 @@ import "@polymer/paper-button/paper-button";
 import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { HomeAssistant } from "../../../types";
-import { LovelaceConfig } from "../types";
+import { LovelaceCardConfig } from "../types";
 
 let registeredDialog = false;
 
 export class HuiCardOptions extends LitElement {
-  public cardConfig?: LovelaceConfig;
+  public cardConfig?: LovelaceCardConfig;
   protected hass?: HomeAssistant;
 
   static get properties(): PropertyDeclarations {
diff --git a/src/panels/lovelace/editor/hui-card-preview.ts b/src/panels/lovelace/editor/hui-card-preview.ts
index 57f4491fbd..31617da87d 100644
--- a/src/panels/lovelace/editor/hui-card-preview.ts
+++ b/src/panels/lovelace/editor/hui-card-preview.ts
@@ -3,7 +3,7 @@ import "@polymer/paper-input/paper-textarea";
 import createCardElement from "../common/create-card-element";
 import createErrorCardConfig from "../common/create-error-card-config";
 import { HomeAssistant } from "../../../types";
-import { LovelaceCard, LovelaceConfig } from "../types";
+import { LovelaceCard, LovelaceCardConfig } from "../types";
 import { ConfigError } from "./types";
 
 const CUSTOM_TYPE_PREFIX = "custom:";
@@ -28,7 +28,7 @@ export class HuiCardPreview extends HTMLElement {
     this._createCard(configValue);
   }
 
-  set config(configValue: LovelaceConfig) {
+  set config(configValue: LovelaceCardConfig) {
     if (!configValue) {
       return;
     }
@@ -49,7 +49,7 @@ export class HuiCardPreview extends HTMLElement {
     }
   }
 
-  private _createCard(configValue: LovelaceConfig): void {
+  private _createCard(configValue: LovelaceCardConfig): void {
     if (this._element) {
       this.removeChild(this._element);
     }
diff --git a/src/panels/lovelace/editor/hui-dialog-edit-card.ts b/src/panels/lovelace/editor/hui-dialog-edit-card.ts
index 478c0c1b48..6fb993517a 100644
--- a/src/panels/lovelace/editor/hui-dialog-edit-card.ts
+++ b/src/panels/lovelace/editor/hui-dialog-edit-card.ts
@@ -2,13 +2,13 @@ import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
 import { TemplateResult } from "lit-html";
 
 import { HomeAssistant } from "../../../types";
-import { LovelaceConfig } from "../types";
+import { LovelaceCardConfig } from "../types";
 import "./hui-edit-card";
 import "./hui-migrate-config";
 
 export class HuiDialogEditCard extends LitElement {
   protected _hass?: HomeAssistant;
-  private _cardConfig?: LovelaceConfig;
+  private _cardConfig?: LovelaceCardConfig;
   private _reloadLovelace?: () => void;
 
   static get properties(): PropertyDeclarations {
diff --git a/src/panels/lovelace/editor/hui-edit-card.ts b/src/panels/lovelace/editor/hui-edit-card.ts
index 2ffd9ff5cc..166b8913d1 100644
--- a/src/panels/lovelace/editor/hui-edit-card.ts
+++ b/src/panels/lovelace/editor/hui-edit-card.ts
@@ -21,7 +21,7 @@ import "./hui-card-preview";
 // This is not a duplicate import, one is for types, one is for element.
 // tslint:disable-next-line
 import { HuiCardPreview } from "./hui-card-preview";
-import { LovelaceCardEditor, LovelaceConfig } from "../types";
+import { LovelaceCardEditor, LovelaceCardConfig } from "../types";
 import { YamlChangedEvent, ConfigValue, ConfigError } from "./types";
 import { extYamlSchema } from "./yaml-ext-schema";
 
@@ -30,7 +30,7 @@ const CUSTOM_TYPE_PREFIX = "custom:";
 export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
   protected hass?: HomeAssistant;
   private _cardId?: string;
-  private _originalConfig?: LovelaceConfig;
+  private _originalConfig?: LovelaceCardConfig;
   private _configElement?: LovelaceCardEditor | null;
   private _uiEditor?: boolean;
   private _configValue?: ConfigValue;
@@ -59,7 +59,7 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
     this._saving = false;
   }
 
-  set cardConfig(cardConfig: LovelaceConfig) {
+  set cardConfig(cardConfig: LovelaceCardConfig) {
     this._originalConfig = cardConfig;
     if (String(cardConfig.id) !== this._cardId) {
       this._loading = true;
@@ -210,7 +210,8 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
           schema: extYamlSchema,
         }),
       };
-      this._configElement.setConfig(this._configValue!.value as LovelaceConfig);
+      this._configElement.setConfig(this._configValue!
+        .value as LovelaceCardConfig);
       this._uiEditor = !this._uiEditor;
     }
     this._resizeDialog();
@@ -274,7 +275,7 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
     try {
       const config = yaml.safeLoad(this._configValue.value, {
         schema: extYamlSchema,
-      }) as LovelaceConfig;
+      }) as LovelaceCardConfig;
       this._updatePreview(config);
       this._configState = "OK";
       if (!this._isToggleAvailable && this._configElement !== null) {
@@ -290,12 +291,12 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
     }
   }
 
-  private _handleUIConfigChanged(value: LovelaceConfig): void {
+  private _handleUIConfigChanged(value: LovelaceCardConfig): void {
     this._configValue = { format: "json", value };
     this._updatePreview(value);
   }
 
-  private _updatePreview(config: LovelaceConfig) {
+  private _updatePreview(config: LovelaceCardConfig) {
     if (!this._previewEl) {
       return;
     }
diff --git a/src/panels/lovelace/editor/types.ts b/src/panels/lovelace/editor/types.ts
index 3fbc360b47..c89ab3e10a 100644
--- a/src/panels/lovelace/editor/types.ts
+++ b/src/panels/lovelace/editor/types.ts
@@ -1,4 +1,4 @@
-import { LovelaceConfig } from "../types";
+import { LovelaceCardConfig } from "../types";
 import { EntityConfig } from "../entity-rows/types";
 
 export interface YamlChangedEvent extends Event {
@@ -9,7 +9,7 @@ export interface YamlChangedEvent extends Event {
 
 export interface ConfigValue {
   format: "json" | "yaml";
-  value?: string | LovelaceConfig;
+  value?: string | LovelaceCardConfig;
 }
 
 export interface ConfigError {
diff --git a/src/panels/lovelace/types.ts b/src/panels/lovelace/types.ts
index 7f3fabeaae..ca7a2e2d58 100644
--- a/src/panels/lovelace/types.ts
+++ b/src/panels/lovelace/types.ts
@@ -1,17 +1,31 @@
 import { HomeAssistant } from "../../types";
 
-export interface LovelaceConfig {
+export interface LovelaceCardConfig {
+  id?: string;
   type: string;
-  id: string;
+  [key: string]: any;
+}
+
+export interface LovelaceViewConfig {
+  title?: string;
+  badges?: string[];
+  cards?: LovelaceCardConfig[];
+  id?: string;
+  icon?: string;
+}
+export interface LovelaceConfig {
+  _frontendAuto: boolean;
+  title?: string;
+  views: LovelaceViewConfig[];
 }
 
 export interface LovelaceCard extends HTMLElement {
   hass?: HomeAssistant;
   getCardSize(): number;
-  setConfig(config: LovelaceConfig): void;
+  setConfig(config: LovelaceCardConfig): void;
 }
 
 export interface LovelaceCardEditor extends HTMLElement {
   hass?: HomeAssistant;
-  setConfig(config: LovelaceConfig): void;
+  setConfig(config: LovelaceCardConfig): void;
 }

From b939ae6ab4baffec14a552d53ca0171562a452e4 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Sun, 25 Nov 2018 15:18:41 +0100
Subject: [PATCH 10/69] Fix wrong import (#2106)

---
 src/panels/lovelace/components/hui-entities-toggle.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/panels/lovelace/components/hui-entities-toggle.js b/src/panels/lovelace/components/hui-entities-toggle.js
index fd5d80a109..9b52a8bc1d 100644
--- a/src/panels/lovelace/components/hui-entities-toggle.js
+++ b/src/panels/lovelace/components/hui-entities-toggle.js
@@ -3,7 +3,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import "@polymer/paper-toggle-button/paper-toggle-button";
 
 import { DOMAINS_TOGGLE } from "../../../common/const";
-import turnOnOffEntities from "../common/entity/turn-on-off-entities";
+import { turnOnOffEntities } from "../common/entity/turn-on-off-entities";
 
 class HuiEntitiesToggle extends PolymerElement {
   static get template() {

From 69df6179bb3014978d65e96579b75b784162d1fd Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Sun, 25 Nov 2018 20:09:32 +0100
Subject: [PATCH 11/69] Add dialog to save config (#2100)

* Add dialog to save config

* Change types

* Helper funcs for register dialog

* Clean up

* Migrate config after save

* Clean up

* Unused imports

* Comments

* Missed half...

* cardConfig cant be undefined
---
 src/panels/lovelace/common/data.ts            |  23 ++-
 .../lovelace/components/hui-card-options.ts   |  15 +-
 .../lovelace/editor/hui-dialog-edit-card.ts   |  70 +++++---
 .../lovelace/editor/hui-dialog-save-config.ts | 150 ++++++++++++++++++
 src/panels/lovelace/ha-panel-lovelace.js      |   7 +
 src/panels/lovelace/hui-root.js               |  10 +-
 src/panels/lovelace/types.ts                  |   1 +
 src/translations/en.json                      |   7 +
 8 files changed, 241 insertions(+), 42 deletions(-)
 create mode 100644 src/panels/lovelace/editor/hui-dialog-save-config.ts

diff --git a/src/panels/lovelace/common/data.ts b/src/panels/lovelace/common/data.ts
index 373dccb4d6..289e277b46 100644
--- a/src/panels/lovelace/common/data.ts
+++ b/src/panels/lovelace/common/data.ts
@@ -1,5 +1,21 @@
 import { HomeAssistant } from "../../../types";
-import { LovelaceCardConfig } from "../types";
+import { LovelaceConfig, LovelaceCardConfig } from "../types";
+
+export const migrateConfig = (hass: HomeAssistant): Promise<void> =>
+  hass.callWS({
+    type: "lovelace/config/migrate",
+  });
+
+export const saveConfig = (
+  hass: HomeAssistant,
+  config: LovelaceConfig | string,
+  configFormat: "json" | "yaml"
+): Promise<void> =>
+  hass.callWS({
+    type: "lovelace/config/save",
+    config,
+    format: configFormat,
+  });
 
 export const getCardConfig = (
   hass: HomeAssistant,
@@ -22,8 +38,3 @@ export const updateCardConfig = (
     card_config: config,
     format: configFormat,
   });
-
-export const migrateConfig = (hass: HomeAssistant): Promise<void> =>
-  hass.callWS({
-    type: "lovelace/config/migrate",
-  });
diff --git a/src/panels/lovelace/components/hui-card-options.ts b/src/panels/lovelace/components/hui-card-options.ts
index d1d6858c1c..ebd0767251 100644
--- a/src/panels/lovelace/components/hui-card-options.ts
+++ b/src/panels/lovelace/components/hui-card-options.ts
@@ -1,6 +1,10 @@
 import "@polymer/paper-button/paper-button";
 import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
 import { fireEvent } from "../../../common/dom/fire_event";
+import {
+  showEditCardDialog,
+  registerEditCardDialog,
+} from "../editor/hui-dialog-edit-card";
 import { HomeAssistant } from "../../../types";
 import { LovelaceCardConfig } from "../types";
 
@@ -18,11 +22,7 @@ export class HuiCardOptions extends LitElement {
     super.connectedCallback();
     if (!registeredDialog) {
       registeredDialog = true;
-      fireEvent(this, "register-dialog", {
-        dialogShowEvent: "show-edit-card",
-        dialogTag: "hui-dialog-edit-card",
-        dialogImport: () => import("../editor/hui-dialog-edit-card"),
-      });
+      registerEditCardDialog(this);
     }
   }
 
@@ -48,9 +48,8 @@ export class HuiCardOptions extends LitElement {
     `;
   }
   private _editCard() {
-    fireEvent(this, "show-edit-card", {
-      hass: this.hass,
-      cardConfig: this.cardConfig,
+    showEditCardDialog(this, {
+      cardConfig: this.cardConfig!,
       reloadLovelace: () => fireEvent(this, "config-refresh"),
     });
   }
diff --git a/src/panels/lovelace/editor/hui-dialog-edit-card.ts b/src/panels/lovelace/editor/hui-dialog-edit-card.ts
index 6fb993517a..b8cbe5b835 100644
--- a/src/panels/lovelace/editor/hui-dialog-edit-card.ts
+++ b/src/panels/lovelace/editor/hui-dialog-edit-card.ts
@@ -3,48 +3,66 @@ import { TemplateResult } from "lit-html";
 
 import { HomeAssistant } from "../../../types";
 import { LovelaceCardConfig } from "../types";
+import { fireEvent } from "../../../common/dom/fire_event";
 import "./hui-edit-card";
 import "./hui-migrate-config";
 
+const dialogShowEvent = "show-edit-card";
+const dialogTag = "hui-dialog-edit-config";
+
+export interface EditCardDialogParams {
+  cardConfig: LovelaceCardConfig;
+  reloadLovelace: () => void;
+}
+
+export const registerEditCardDialog = (element: HTMLElement) =>
+  fireEvent(element, "register-dialog", {
+    dialogShowEvent,
+    dialogTag,
+    dialogImport: () => import("./hui-dialog-edit-card"),
+  });
+
+export const showEditCardDialog = (
+  element: HTMLElement,
+  editCardDialogParams: EditCardDialogParams
+) => fireEvent(element, dialogShowEvent, editCardDialogParams);
+
 export class HuiDialogEditCard extends LitElement {
-  protected _hass?: HomeAssistant;
-  private _cardConfig?: LovelaceCardConfig;
-  private _reloadLovelace?: () => void;
+  protected hass?: HomeAssistant;
+  private _params?: EditCardDialogParams;
 
   static get properties(): PropertyDeclarations {
     return {
-      _hass: {},
+      hass: {},
       _cardConfig: {},
     };
   }
 
-  public async showDialog({ hass, cardConfig, reloadLovelace }): Promise<void> {
-    this._hass = hass;
-    this._cardConfig = cardConfig;
-    this._reloadLovelace = reloadLovelace;
+  public async showDialog(params: EditCardDialogParams): Promise<void> {
+    this._params = params;
     await this.updateComplete;
     (this.shadowRoot!.children[0] as any).showDialog();
   }
 
   protected render(): TemplateResult {
+    if (!this._params) {
+      return html``;
+    }
+    if (!this._params.cardConfig.id) {
+      return html`
+        <hui-migrate-config
+          .hass="${this.hass}"
+          @reload-lovelace="${this._params.reloadLovelace}"
+        ></hui-migrate-config>
+      `;
+    }
     return html`
-      ${
-        this._cardConfig!.id
-          ? html`
-              <hui-edit-card
-                .cardConfig="${this._cardConfig}"
-                .hass="${this._hass}"
-                @reload-lovelace="${this._reloadLovelace}"
-              >
-              </hui-edit-card>
-            `
-          : html`
-              <hui-migrate-config
-                .hass="${this._hass}"
-                @reload-lovelace="${this._reloadLovelace}"
-              ></hui-migrate-config>
-            `
-      }
+      <hui-edit-card
+        .cardConfig="${this._params.cardConfig}"
+        .hass="${this.hass}"
+        @reload-lovelace="${this._params.reloadLovelace}"
+      >
+      </hui-edit-card>
     `;
   }
 }
@@ -55,4 +73,4 @@ declare global {
   }
 }
 
-customElements.define("hui-dialog-edit-card", HuiDialogEditCard);
+customElements.define(dialogTag, HuiDialogEditCard);
diff --git a/src/panels/lovelace/editor/hui-dialog-save-config.ts b/src/panels/lovelace/editor/hui-dialog-save-config.ts
new file mode 100644
index 0000000000..e5c0f01985
--- /dev/null
+++ b/src/panels/lovelace/editor/hui-dialog-save-config.ts
@@ -0,0 +1,150 @@
+import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
+import { TemplateResult } from "lit-html";
+
+import "@polymer/paper-spinner/paper-spinner";
+import "@polymer/paper-dialog/paper-dialog";
+// This is not a duplicate import, one is for types, one is for element.
+// tslint:disable-next-line
+import { PaperDialogElement } from "@polymer/paper-dialog/paper-dialog";
+import "@polymer/paper-button/paper-button";
+
+import { HomeAssistant } from "../../../types";
+import { LovelaceConfig } from "../types";
+
+import { saveConfig, migrateConfig } from "../common/data";
+import { fireEvent } from "../../../common/dom/fire_event";
+import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
+
+const dialogShowEvent = "show-save-config";
+const dialogTag = "hui-dialog-save-config";
+
+export interface SaveDialogParams {
+  config: LovelaceConfig;
+  reloadLovelace: () => void;
+}
+
+export const registerSaveDialog = (element: HTMLElement) =>
+  fireEvent(element, "register-dialog", {
+    dialogShowEvent,
+    dialogTag,
+    dialogImport: () => import("./hui-dialog-save-config"),
+  });
+
+export const showSaveDialog = (
+  element: HTMLElement,
+  saveDialogParams: SaveDialogParams
+) => fireEvent(element, dialogShowEvent, saveDialogParams);
+
+export class HuiSaveConfig extends hassLocalizeLitMixin(LitElement) {
+  protected hass?: HomeAssistant;
+  private _params?: SaveDialogParams;
+  private _saving: boolean;
+
+  static get properties(): PropertyDeclarations {
+    return {
+      hass: {},
+      _params: {},
+      _saving: {},
+    };
+  }
+
+  protected constructor() {
+    super();
+    this._saving = false;
+  }
+
+  public async showDialog(params: SaveDialogParams): Promise<void> {
+    this._params = params;
+    await this.updateComplete;
+    this._dialog.open();
+  }
+
+  private get _dialog(): PaperDialogElement {
+    return this.shadowRoot!.querySelector("paper-dialog")!;
+  }
+
+  protected render(): TemplateResult {
+    return html`
+      ${this.renderStyle()}
+      <paper-dialog with-backdrop>
+        <h2>${this.localize("ui.panel.lovelace.editor.save_config.header")}</h2>
+        <paper-dialog-scrollable>
+          <p>${this.localize("ui.panel.lovelace.editor.save_config.para")}</p>
+          <p>
+            ${this.localize("ui.panel.lovelace.editor.save_config.para_sure")}
+          </p>
+        </paper-dialog-scrollable>
+        <div class="paper-dialog-buttons">
+          <paper-button @click="${this._closeDialog}"
+            >${
+              this.localize("ui.panel.lovelace.editor.save_config.cancel")
+            }</paper-button
+          >
+          <paper-button
+            ?disabled="${this._saving}"
+            @click="${this._saveConfig}"
+          >
+            <paper-spinner
+              ?active="${this._saving}"
+              alt="Saving"
+            ></paper-spinner>
+            ${
+              this.localize("ui.panel.lovelace.editor.save_config.save")
+            }</paper-button
+          >
+        </div>
+      </paper-dialog>
+    `;
+  }
+
+  private renderStyle(): TemplateResult {
+    return html`
+      <style>
+        paper-dialog {
+          width: 650px;
+        }
+        paper-spinner {
+          display: none;
+        }
+        paper-spinner[active] {
+          display: block;
+        }
+        paper-button paper-spinner {
+          width: 14px;
+          height: 14px;
+          margin-right: 20px;
+        }
+      </style>
+    `;
+  }
+
+  private _closeDialog(): void {
+    this._dialog.close();
+  }
+
+  private async _saveConfig(): Promise<void> {
+    if (!this.hass || !this._params) {
+      return;
+    }
+    this._saving = true;
+    delete this._params.config._frontendAuto;
+    try {
+      await saveConfig(this.hass, this._params.config, "json");
+      await migrateConfig(this.hass);
+      this._saving = false;
+      this._closeDialog();
+      this._params.reloadLovelace!();
+    } catch (err) {
+      alert(`Saving failed: ${err.message}`);
+      this._saving = false;
+    }
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "hui-dialog-save-config": HuiSaveConfig;
+  }
+}
+
+customElements.define(dialogTag, HuiSaveConfig);
diff --git a/src/panels/lovelace/ha-panel-lovelace.js b/src/panels/lovelace/ha-panel-lovelace.js
index f69434e714..2e7f4237de 100644
--- a/src/panels/lovelace/ha-panel-lovelace.js
+++ b/src/panels/lovelace/ha-panel-lovelace.js
@@ -2,11 +2,14 @@ import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 import "@polymer/paper-button/paper-button";
 
+import { registerSaveDialog } from "./editor/hui-dialog-save-config";
 import "../../layouts/hass-loading-screen";
 import "../../layouts/hass-error-screen";
 import "./hui-root";
 import localizeMixin from "../../mixins/localize-mixin";
 
+let registeredDialog = false;
+
 class Lovelace extends localizeMixin(PolymerElement) {
   static get template() {
     return html`
@@ -125,6 +128,10 @@ class Lovelace extends localizeMixin(PolymerElement) {
           _config: generateLovelaceConfig(this.hass, this.localize),
           _state: "loaded",
         });
+        if (!registeredDialog) {
+          registeredDialog = true;
+          registerSaveDialog(this);
+        }
       } else {
         this.setProperties({
           _state: "error",
diff --git a/src/panels/lovelace/hui-root.js b/src/panels/lovelace/hui-root.js
index c04fb9dedd..e6e25069cc 100644
--- a/src/panels/lovelace/hui-root.js
+++ b/src/panels/lovelace/hui-root.js
@@ -29,8 +29,8 @@ import "./components/notifications/hui-notifications-button";
 import "./hui-unused-entities";
 import "./hui-view";
 import debounce from "../../common/util/debounce";
-
 import createCardElement from "./common/create-card-element";
+import { showSaveDialog } from "./editor/hui-dialog-save-config";
 
 // CSS and JS should only be imported once. Modules and HTML are safe.
 const CSS_CACHE = {};
@@ -275,7 +275,13 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
 
   _editModeEnable() {
     if (this.config._frontendAuto) {
-      alert("Unable to edit automatic generated UI yet.");
+      showSaveDialog(this, {
+        config: this.config,
+        reloadLovelace: () => {
+          this.fire("config-refresh");
+          this._editMode = true;
+        },
+      });
       return;
     }
     this._editMode = true;
diff --git a/src/panels/lovelace/types.ts b/src/panels/lovelace/types.ts
index ca7a2e2d58..6ebd271676 100644
--- a/src/panels/lovelace/types.ts
+++ b/src/panels/lovelace/types.ts
@@ -13,6 +13,7 @@ export interface LovelaceViewConfig {
   id?: string;
   icon?: string;
 }
+
 export interface LovelaceConfig {
   _frontendAuto: boolean;
   title?: string;
diff --git a/src/translations/en.json b/src/translations/en.json
index b7e0846d2b..c8a14d9d28 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -772,6 +772,13 @@
             "save": "Save",
             "toggle_editor": "Toggle Editor"
           },
+          "save_config": {
+            "header": "Take control of your Lovelace UI",
+            "para": "By default Home Assistant will maintain your user interface, updating it when new entities or Lovelace components become available. If you take control we will no longer make changes automatically for you.",
+            "para_sure": "Are you sure you want to take control of your user interface?",
+            "cancel": "Never mind",
+            "save": "Take control"
+          },
           "migrate": {
             "header": "Configuration Incompatible",
             "para_no_id": "This element doesn't have an ID. Please add an ID to this element in 'ui-lovelace.yaml'.",

From 8ad5280501e3e5b91a48f740df39956bb3c11616 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Sun, 25 Nov 2018 20:47:29 +0100
Subject: [PATCH 12/69] Document types in fireEvent (#2108)

* Document types in fireEvent

* Fix more types for fireEvent

* Adjust new code to new fireEvent
---
 .../dom/{fire_event.js => fire_event.ts}      | 41 ++++++++++----
 src/layouts/app/dialog-manager-mixin.js       | 25 ---------
 src/layouts/app/dialog-manager-mixin.ts       | 56 +++++++++++++++++++
 src/layouts/app/home-assistant.js             |  4 +-
 .../lovelace/cards/hui-picture-glance-card.ts |  2 +-
 src/panels/lovelace/common/handle-click.ts    |  4 +-
 .../lovelace/components/hui-card-options.ts   | 10 ++++
 .../components/hui-theme-select-editor.ts     | 13 ++++-
 .../lovelace/editor/hui-dialog-edit-card.ts   | 16 +++++-
 .../lovelace/editor/hui-dialog-save-config.ts |  7 +++
 src/panels/lovelace/editor/hui-edit-card.ts   | 15 +++++
 src/polymer-types.ts                          | 15 +++++
 12 files changed, 166 insertions(+), 42 deletions(-)
 rename src/common/dom/{fire_event.js => fire_event.ts} (72%)
 delete mode 100644 src/layouts/app/dialog-manager-mixin.js
 create mode 100644 src/layouts/app/dialog-manager-mixin.ts
 create mode 100644 src/polymer-types.ts

diff --git a/src/common/dom/fire_event.js b/src/common/dom/fire_event.ts
similarity index 72%
rename from src/common/dom/fire_event.js
rename to src/common/dom/fire_event.ts
index c9e6785b2a..57ecbd02c3 100644
--- a/src/common/dom/fire_event.js
+++ b/src/common/dom/fire_event.ts
@@ -28,6 +28,17 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+declare global {
+  // tslint:disable-next-line
+  interface HASSDomEvents {}
+}
+
+export type ValidHassDomEvent = keyof HASSDomEvents;
+
+export interface HASSDomEvent<T> extends Event {
+  detail: T;
+}
+
 /**
  * Dispatches a custom event with an optional detail value.
  *
@@ -35,23 +46,33 @@
  * @param {*=} detail Detail value containing event-specific
  *   payload.
  * @param {{ bubbles: (boolean|undefined),
-             cancelable: (boolean|undefined),
-             composed: (boolean|undefined) }=}
-  *  options Object specifying options.  These may include:
-  *  `bubbles` (boolean, defaults to `true`),
-  *  `cancelable` (boolean, defaults to false), and
-  *  `node` on which to fire the event (HTMLElement, defaults to `this`).
-  * @return {Event} The new event that was fired.
-  */
-export const fireEvent = (node, type, detail, options) => {
+ *           cancelable: (boolean|undefined),
+ *           composed: (boolean|undefined) }=}
+ *  options Object specifying options.  These may include:
+ *  `bubbles` (boolean, defaults to `true`),
+ *  `cancelable` (boolean, defaults to false), and
+ *  `node` on which to fire the event (HTMLElement, defaults to `this`).
+ * @return {Event} The new event that was fired.
+ */
+export const fireEvent = <HassEvent extends ValidHassDomEvent>(
+  node: HTMLElement,
+  type: HassEvent,
+  detail?: HASSDomEvents[HassEvent],
+  options?: {
+    bubbles?: boolean;
+    cancelable?: boolean;
+    composed?: boolean;
+  }
+) => {
   options = options || {};
+  // @ts-ignore
   detail = detail === null || detail === undefined ? {} : detail;
   const event = new Event(type, {
     bubbles: options.bubbles === undefined ? true : options.bubbles,
     cancelable: Boolean(options.cancelable),
     composed: options.composed === undefined ? true : options.composed,
   });
-  event.detail = detail;
+  (event as any).detail = detail;
   node.dispatchEvent(event);
   return event;
 };
diff --git a/src/layouts/app/dialog-manager-mixin.js b/src/layouts/app/dialog-manager-mixin.js
deleted file mode 100644
index 7deeaa2fd0..0000000000
--- a/src/layouts/app/dialog-manager-mixin.js
+++ /dev/null
@@ -1,25 +0,0 @@
-export default (superClass) =>
-  class extends superClass {
-    ready() {
-      super.ready();
-      this.addEventListener("register-dialog", (e) =>
-        this.registerDialog(e.detail)
-      );
-    }
-
-    registerDialog({ dialogShowEvent, dialogTag, dialogImport }) {
-      let loaded = null;
-
-      this.addEventListener(dialogShowEvent, (showEv) => {
-        if (!loaded) {
-          loaded = dialogImport().then(() => {
-            const dialogEl = document.createElement(dialogTag);
-            this.shadowRoot.appendChild(dialogEl);
-            this.provideHass(dialogEl);
-            return dialogEl;
-          });
-        }
-        loaded.then((dialogEl) => dialogEl.showDialog(showEv.detail));
-      });
-    }
-  };
diff --git a/src/layouts/app/dialog-manager-mixin.ts b/src/layouts/app/dialog-manager-mixin.ts
new file mode 100644
index 0000000000..90295c3866
--- /dev/null
+++ b/src/layouts/app/dialog-manager-mixin.ts
@@ -0,0 +1,56 @@
+import { PolymerElement } from "@polymer/polymer";
+import { Constructor } from "@polymer/lit-element";
+import { HASSDomEvent, ValidHassDomEvent } from "../../common/dom/fire_event";
+
+interface RegisterDialogParams {
+  dialogShowEvent: keyof HASSDomEvents;
+  dialogTag: keyof HTMLElementTagNameMap;
+  dialogImport: () => Promise<unknown>;
+}
+
+interface HassDialog<T = HASSDomEvents[ValidHassDomEvent]> extends HTMLElement {
+  showDialog(params: T);
+}
+
+declare global {
+  // for fire event
+  interface HASSDomEvents {
+    "register-dialog": RegisterDialogParams;
+  }
+  // for add event listener
+  interface HTMLElementEventMap {
+    "register-dialog": HASSDomEvent<RegisterDialogParams>;
+  }
+}
+
+export const dialogManagerMixin = (superClass: Constructor<PolymerElement>) =>
+  class extends superClass {
+    public ready() {
+      super.ready();
+      this.addEventListener("register-dialog", (e) =>
+        this.registerDialog(e.detail)
+      );
+    }
+
+    private registerDialog({
+      dialogShowEvent,
+      dialogTag,
+      dialogImport,
+    }: RegisterDialogParams) {
+      let loaded: Promise<HassDialog<unknown>>;
+
+      this.addEventListener(dialogShowEvent, (showEv) => {
+        if (!loaded) {
+          loaded = dialogImport().then(() => {
+            const dialogEl = document.createElement(dialogTag) as HassDialog;
+            this.shadowRoot!.appendChild(dialogEl);
+            (this as any).provideHass(dialogEl);
+            return dialogEl;
+          });
+        }
+        loaded.then((dialogEl) =>
+          dialogEl.showDialog((showEv as HASSDomEvent<unknown>).detail)
+        );
+      });
+    }
+  };
diff --git a/src/layouts/app/home-assistant.js b/src/layouts/app/home-assistant.js
index 1d05e2bd1a..27983b1e3c 100644
--- a/src/layouts/app/home-assistant.js
+++ b/src/layouts/app/home-assistant.js
@@ -16,7 +16,7 @@ import TranslationsMixin from "./translations-mixin";
 import ThemesMixin from "./themes-mixin";
 import MoreInfoMixin from "./more-info-mixin";
 import SidebarMixin from "./sidebar-mixin";
-import DialogManagerMixin from "./dialog-manager-mixin";
+import { dialogManagerMixin } from "./dialog-manager-mixin";
 import ConnectionMixin from "./connection-mixin";
 import NotificationMixin from "./notification-mixin";
 import DisconnectToastMixin from "./disconnect-toast-mixin";
@@ -33,7 +33,7 @@ class HomeAssistant extends ext(PolymerElement, [
   DisconnectToastMixin,
   ConnectionMixin,
   NotificationMixin,
-  DialogManagerMixin,
+  dialogManagerMixin,
   HassBaseMixin,
 ]) {
   static get template() {
diff --git a/src/panels/lovelace/cards/hui-picture-glance-card.ts b/src/panels/lovelace/cards/hui-picture-glance-card.ts
index 776126ddb6..8853146118 100644
--- a/src/panels/lovelace/cards/hui-picture-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-glance-card.ts
@@ -180,7 +180,7 @@ class HuiPictureGlanceCard extends hassLocalizeLitMixin(LitElement)
       navigate(this, this._config!.navigation_path!);
     } else if (this._config!.camera_image) {
       fireEvent(this, "hass-more-info", {
-        entityId: this._config!.camera_image,
+        entityId: this._config!.camera_image!,
       });
     }
   }
diff --git a/src/panels/lovelace/common/handle-click.ts b/src/panels/lovelace/common/handle-click.ts
index f420a0f39a..714f4217eb 100644
--- a/src/panels/lovelace/common/handle-click.ts
+++ b/src/panels/lovelace/common/handle-click.ts
@@ -22,7 +22,9 @@ export const handleClick = (
 
   switch (action) {
     case "more-info":
-      fireEvent(node, "hass-more-info", { entityId: config.entity });
+      if (config.entity) {
+        fireEvent(node, "hass-more-info", { entityId: config.entity });
+      }
       break;
     case "navigate":
       navigate(node, config.navigation_path ? config.navigation_path : "");
diff --git a/src/panels/lovelace/components/hui-card-options.ts b/src/panels/lovelace/components/hui-card-options.ts
index ebd0767251..8cc1ab6a85 100644
--- a/src/panels/lovelace/components/hui-card-options.ts
+++ b/src/panels/lovelace/components/hui-card-options.ts
@@ -8,6 +8,16 @@ import {
 import { HomeAssistant } from "../../../types";
 import { LovelaceCardConfig } from "../types";
 
+declare global {
+  // for fire event
+  interface HASSDomEvents {
+    "show-edit-card": {
+      cardConfig: LovelaceCardConfig;
+      reloadLovelace: () => void;
+    };
+  }
+}
+
 let registeredDialog = false;
 
 export class HuiCardOptions extends LitElement {
diff --git a/src/panels/lovelace/components/hui-theme-select-editor.ts b/src/panels/lovelace/components/hui-theme-select-editor.ts
index 71c9017183..206919b213 100644
--- a/src/panels/lovelace/components/hui-theme-select-editor.ts
+++ b/src/panels/lovelace/components/hui-theme-select-editor.ts
@@ -3,9 +3,20 @@ import "@polymer/paper-button/paper-button";
 import { TemplateResult } from "lit-html";
 
 import { HomeAssistant } from "../../../types";
-import { fireEvent } from "../../../common/dom/fire_event";
+import { fireEvent, HASSDomEvent } from "../../../common/dom/fire_event";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
 
+declare global {
+  // for fire event
+  interface HASSDomEvents {
+    "theme-changed": undefined;
+  }
+  // for add event listener
+  interface HTMLElementEventMap {
+    "theme-changed": HASSDomEvent<undefined>;
+  }
+}
+
 export class HuiThemeSelectionEditor extends hassLocalizeLitMixin(LitElement) {
   public value?: string;
   protected hass?: HomeAssistant;
diff --git a/src/panels/lovelace/editor/hui-dialog-edit-card.ts b/src/panels/lovelace/editor/hui-dialog-edit-card.ts
index b8cbe5b835..741ac97497 100644
--- a/src/panels/lovelace/editor/hui-dialog-edit-card.ts
+++ b/src/panels/lovelace/editor/hui-dialog-edit-card.ts
@@ -2,11 +2,23 @@ import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
 import { TemplateResult } from "lit-html";
 
 import { HomeAssistant } from "../../../types";
+import { fireEvent, HASSDomEvent } from "../../../common/dom/fire_event";
 import { LovelaceCardConfig } from "../types";
-import { fireEvent } from "../../../common/dom/fire_event";
 import "./hui-edit-card";
 import "./hui-migrate-config";
 
+declare global {
+  // for fire event
+  interface HASSDomEvents {
+    "reload-lovelace": undefined;
+    "show-edit-card": EditCardDialogParams;
+  }
+  // for add event listener
+  interface HTMLElementEventMap {
+    "reload-lovelace": HASSDomEvent<undefined>;
+  }
+}
+
 const dialogShowEvent = "show-edit-card";
 const dialogTag = "hui-dialog-edit-config";
 
@@ -69,7 +81,7 @@ export class HuiDialogEditCard extends LitElement {
 
 declare global {
   interface HTMLElementTagNameMap {
-    "hui-dialog-edit-card": HuiDialogEditCard;
+    "hui-dialog-edit-config": HuiDialogEditCard;
   }
 }
 
diff --git a/src/panels/lovelace/editor/hui-dialog-save-config.ts b/src/panels/lovelace/editor/hui-dialog-save-config.ts
index e5c0f01985..de759c54cf 100644
--- a/src/panels/lovelace/editor/hui-dialog-save-config.ts
+++ b/src/panels/lovelace/editor/hui-dialog-save-config.ts
@@ -15,6 +15,13 @@ import { saveConfig, migrateConfig } from "../common/data";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
 
+declare global {
+  // for fire event
+  interface HASSDomEvents {
+    "show-save-config": SaveDialogParams;
+  }
+}
+
 const dialogShowEvent = "show-save-config";
 const dialogTag = "hui-dialog-save-config";
 
diff --git a/src/panels/lovelace/editor/hui-edit-card.ts b/src/panels/lovelace/editor/hui-edit-card.ts
index 166b8913d1..1814b62df8 100644
--- a/src/panels/lovelace/editor/hui-edit-card.ts
+++ b/src/panels/lovelace/editor/hui-edit-card.ts
@@ -24,6 +24,21 @@ import { HuiCardPreview } from "./hui-card-preview";
 import { LovelaceCardEditor, LovelaceCardConfig } from "../types";
 import { YamlChangedEvent, ConfigValue, ConfigError } from "./types";
 import { extYamlSchema } from "./yaml-ext-schema";
+import { EntityConfig } from "../entity-rows/types";
+
+declare global {
+  interface HASSDomEvents {
+    "yaml-changed": {
+      yaml: string;
+    };
+    "entities-changed": {
+      entities: EntityConfig[];
+    };
+    "config-changed": {
+      config: LovelaceCardConfig;
+    };
+  }
+}
 
 const CUSTOM_TYPE_PREFIX = "custom:";
 
diff --git a/src/polymer-types.ts b/src/polymer-types.ts
new file mode 100644
index 0000000000..d38ee79cc4
--- /dev/null
+++ b/src/polymer-types.ts
@@ -0,0 +1,15 @@
+// Force file to be a module to augment global scope.
+export {};
+
+declare global {
+  // for fire event
+  interface HASSDomEvents {
+    "iron-resize": undefined;
+    "config-refresh": undefined;
+    "ha-refresh-cloud-status": undefined;
+    "hass-more-info": {
+      entityId: string;
+    };
+    "location-changed": undefined;
+  }
+}

From 07b65f37dbba27eb05b079b0beb41cd959d473a4 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Mon, 26 Nov 2018 14:09:27 +0100
Subject: [PATCH 13/69] Add Cloud Webhook management (#2102)

* Add Cloud Webhook support

* Lint

* Tweak text

* Rename it to cloudhook

* Fix final type

* fix type

* Catch null
---
 src/data/cloud.ts                             |  19 ++
 src/data/webhook.ts                           |  12 +
 src/panels/config/cloud/cloud-alexa-pref.ts   |   4 +
 src/panels/config/cloud/cloud-google-pref.ts  |   6 +-
 .../cloud/cloud-webhook-manage-dialog.ts      | 142 +++++++++++
 src/panels/config/cloud/cloud-webhooks.ts     | 234 ++++++++++++++++++
 .../config/cloud/ha-config-cloud-account.js   |  28 ++-
 src/panels/config/cloud/types.ts              |  10 +
 src/resources/ha-style.js                     |  24 +-
 src/types.ts                                  |   5 +
 10 files changed, 472 insertions(+), 12 deletions(-)
 create mode 100644 src/data/cloud.ts
 create mode 100644 src/data/webhook.ts
 create mode 100644 src/panels/config/cloud/cloud-webhook-manage-dialog.ts
 create mode 100644 src/panels/config/cloud/cloud-webhooks.ts

diff --git a/src/data/cloud.ts b/src/data/cloud.ts
new file mode 100644
index 0000000000..150e92f731
--- /dev/null
+++ b/src/data/cloud.ts
@@ -0,0 +1,19 @@
+import { HomeAssistant } from "../types";
+
+export interface CloudWebhook {
+  webhook_id: string;
+  cloudhook_id: string;
+  cloudhook_url: string;
+}
+
+export const createCloudhook = (hass: HomeAssistant, webhookId: string) =>
+  hass.callWS<CloudWebhook>({
+    type: "cloud/cloudhook/create",
+    webhook_id: webhookId,
+  });
+
+export const deleteCloudhook = (hass: HomeAssistant, webhookId: string) =>
+  hass.callWS({
+    type: "cloud/cloudhook/delete",
+    webhook_id: webhookId,
+  });
diff --git a/src/data/webhook.ts b/src/data/webhook.ts
new file mode 100644
index 0000000000..98ae07495a
--- /dev/null
+++ b/src/data/webhook.ts
@@ -0,0 +1,12 @@
+import { HomeAssistant } from "../types";
+
+export interface Webhook {
+  webhook_id: string;
+  domain: string;
+  name: string;
+}
+
+export const fetchWebhooks = (hass: HomeAssistant): Promise<Webhook[]> =>
+  hass.callWS({
+    type: "webhook/list",
+  });
diff --git a/src/panels/config/cloud/cloud-alexa-pref.ts b/src/panels/config/cloud/cloud-alexa-pref.ts
index e92ac32296..149084acc8 100644
--- a/src/panels/config/cloud/cloud-alexa-pref.ts
+++ b/src/panels/config/cloud/cloud-alexa-pref.ts
@@ -24,6 +24,10 @@ export class CloudAlexaPref extends LitElement {
   }
 
   protected render(): TemplateResult {
+    if (!this.cloudStatus) {
+      return html``;
+    }
+
     const enabled = this.cloudStatus!.prefs.alexa_enabled;
 
     return html`
diff --git a/src/panels/config/cloud/cloud-google-pref.ts b/src/panels/config/cloud/cloud-google-pref.ts
index 5d39501927..015c5155c2 100644
--- a/src/panels/config/cloud/cloud-google-pref.ts
+++ b/src/panels/config/cloud/cloud-google-pref.ts
@@ -25,7 +25,11 @@ export class CloudGooglePref extends LitElement {
   }
 
   protected render(): TemplateResult {
-    const { google_enabled, google_allow_unlock } = this.cloudStatus!.prefs;
+    if (!this.cloudStatus) {
+      return html``;
+    }
+
+    const { google_enabled, google_allow_unlock } = this.cloudStatus.prefs;
 
     return html`
       ${this.renderStyle()}
diff --git a/src/panels/config/cloud/cloud-webhook-manage-dialog.ts b/src/panels/config/cloud/cloud-webhook-manage-dialog.ts
new file mode 100644
index 0000000000..610f916f24
--- /dev/null
+++ b/src/panels/config/cloud/cloud-webhook-manage-dialog.ts
@@ -0,0 +1,142 @@
+import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
+
+import "@polymer/paper-button/paper-button";
+import "@polymer/paper-input/paper-input";
+import "@polymer/paper-dialog-scrollable/paper-dialog-scrollable";
+import "@polymer/paper-dialog/paper-dialog";
+// This is not a duplicate import, one is for types, one is for element.
+// tslint:disable-next-line
+import { PaperDialogElement } from "@polymer/paper-dialog/paper-dialog";
+// tslint:disable-next-line
+import { PaperInputElement } from "@polymer/paper-input/paper-input";
+
+import { buttonLink } from "../../../resources/ha-style";
+
+import { HomeAssistant } from "../../../types";
+import { WebhookDialogParams } from "./types";
+
+const inputLabel = "Public URL – Click to copy to clipboard";
+
+export class CloudWebhookManageDialog extends LitElement {
+  protected hass?: HomeAssistant;
+  private _params?: WebhookDialogParams;
+
+  static get properties(): PropertyDeclarations {
+    return {
+      _params: {},
+    };
+  }
+
+  public async showDialog(params: WebhookDialogParams) {
+    this._params = params;
+    // Wait till dialog is rendered.
+    await this.updateComplete;
+    this._dialog.open();
+  }
+
+  protected render() {
+    if (!this._params) {
+      return html``;
+    }
+    const { webhook, cloudhook } = this._params;
+    const docsUrl =
+      webhook.domain === "automation"
+        ? "https://www.home-assistant.io/docs/automation/trigger/#webhook-trigger"
+        : `https://www.home-assistant.io/components/${webhook.domain}/`;
+    return html`
+      ${this._renderStyle()}
+      <paper-dialog with-backdrop>
+        <h2>Webhook for ${webhook.name}</h2>
+        <div>
+          <p>The webhook is available at the following url:</p>
+          <paper-input
+            label="${inputLabel}"
+            value="${cloudhook.cloudhook_url}"
+            @click="${this._copyClipboard}"
+            @blur="${this._restoreLabel}"
+          ></paper-input>
+          <p>
+            If you no longer want to use this webhook, you can
+            <button class="link" @click="${this._disableWebhook}">
+              disable it</button
+            >.
+          </p>
+        </div>
+
+        <div class="paper-dialog-buttons">
+          <a href="${docsUrl}" target="_blank"
+            ><paper-button>VIEW DOCUMENTATION</paper-button></a
+          >
+          <paper-button @click="${this._closeDialog}">CLOSE</paper-button>
+        </div>
+      </paper-dialog>
+    `;
+  }
+
+  private get _dialog(): PaperDialogElement {
+    return this.shadowRoot!.querySelector("paper-dialog")!;
+  }
+
+  private get _paperInput(): PaperInputElement {
+    return this.shadowRoot!.querySelector("paper-input")!;
+  }
+
+  private _closeDialog() {
+    this._dialog.close();
+  }
+
+  private async _disableWebhook() {
+    if (!confirm("Are you sure you want to disable this webhook?")) {
+      return;
+    }
+
+    this._params!.disableHook();
+    this._closeDialog();
+  }
+
+  private _copyClipboard(ev: FocusEvent) {
+    // paper-input -> iron-input -> input
+    const paperInput = ev.currentTarget as PaperInputElement;
+    const input = (paperInput.inputElement as any)
+      .inputElement as HTMLInputElement;
+    input.setSelectionRange(0, input.value.length);
+    try {
+      document.execCommand("copy");
+      paperInput.label = "COPIED TO CLIPBOARD";
+    } catch (err) {
+      // Copying failed. Oh no
+    }
+  }
+
+  private _restoreLabel() {
+    this._paperInput.label = inputLabel;
+  }
+
+  private _renderStyle() {
+    return html`
+      <style>
+        paper-dialog {
+          width: 650px;
+        }
+        paper-input {
+          margin-top: -8px;
+        }
+        ${buttonLink} button.link {
+          color: var(--primary-color);
+        }
+        paper-button {
+          color: var(--primary-color);
+          font-weight: 500;
+        }
+      </style>
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "cloud-webhook-manage-dialog": CloudWebhookManageDialog;
+  }
+}
+
+customElements.define("cloud-webhook-manage-dialog", CloudWebhookManageDialog);
diff --git a/src/panels/config/cloud/cloud-webhooks.ts b/src/panels/config/cloud/cloud-webhooks.ts
new file mode 100644
index 0000000000..bec6948ab3
--- /dev/null
+++ b/src/panels/config/cloud/cloud-webhooks.ts
@@ -0,0 +1,234 @@
+import {
+  html,
+  LitElement,
+  PropertyDeclarations,
+  PropertyValues,
+} from "@polymer/lit-element";
+import "@polymer/paper-toggle-button/paper-toggle-button";
+import "@polymer/paper-item/paper-item";
+import "@polymer/paper-item/paper-item-body";
+import "@polymer/paper-spinner/paper-spinner";
+import "../../../components/ha-card";
+
+import { fireEvent } from "../../../common/dom/fire_event";
+
+import { HomeAssistant, WebhookError } from "../../../types";
+import { WebhookDialogParams, CloudStatusLoggedIn } from "./types";
+import { Webhook, fetchWebhooks } from "../../../data/webhook";
+import {
+  createCloudhook,
+  deleteCloudhook,
+  CloudWebhook,
+} from "../../../data/cloud";
+
+declare global {
+  // for fire event
+  interface HASSDomEvents {
+    "manage-cloud-webhook": WebhookDialogParams;
+  }
+}
+
+export class CloudWebhooks extends LitElement {
+  public hass?: HomeAssistant;
+  public cloudStatus?: CloudStatusLoggedIn;
+  private _cloudHooks?: { [webhookId: string]: CloudWebhook };
+  private _localHooks?: Webhook[];
+  private _progress: string[];
+
+  static get properties(): PropertyDeclarations {
+    return {
+      hass: {},
+      cloudStatus: {},
+      _cloudHooks: {},
+      _localHooks: {},
+      _progress: {},
+    };
+  }
+
+  constructor() {
+    super();
+    this._progress = [];
+  }
+
+  public connectedCallback() {
+    super.connectedCallback();
+    this._fetchData();
+  }
+
+  protected render() {
+    return html`
+      ${this.renderStyle()}
+      <ha-card header="Webhooks">
+        <div class="body">
+          Anything that is configured to be triggered by a webhook can be given
+          a publicly accessible URL to allow you to send data back to Home
+          Assistant from anywhere, without exposing your instance to the
+          internet.
+        </div>
+
+        ${this._renderBody()}
+
+        <div class="footer">
+          <a href="https://www.nabucasa.com/config/webhooks" target="_blank">
+            Learn more about creating webhook-powered automations.
+          </a>
+        </div>
+      </ha-card>
+    `;
+  }
+
+  protected updated(changedProps: PropertyValues) {
+    if (changedProps.has("cloudStatus") && this.cloudStatus) {
+      this._cloudHooks = this.cloudStatus.prefs.cloudhooks || {};
+    }
+  }
+
+  private _renderBody() {
+    if (!this.cloudStatus || !this._localHooks || !this._cloudHooks) {
+      return html`
+        <div class="loading">Loading…</div>
+      `;
+    }
+
+    return this._localHooks.map(
+      (entry) => html`
+        <div class="webhook" .entry="${entry}">
+          <paper-item-body two-line>
+            <div>
+              ${entry.name}
+              ${
+                entry.domain === entry.name.toLowerCase()
+                  ? ""
+                  : ` (${entry.domain})`
+              }
+            </div>
+            <div secondary>${entry.webhook_id}</div>
+          </paper-item-body>
+          ${
+            this._progress.includes(entry.webhook_id)
+              ? html`
+                  <div class="progress">
+                    <paper-spinner active></paper-spinner>
+                  </div>
+                `
+              : this._cloudHooks![entry.webhook_id]
+              ? html`
+                  <paper-button @click="${this._handleManageButton}"
+                    >Manage</paper-button
+                  >
+                `
+              : html`
+                  <paper-toggle-button
+                    @click="${this._enableWebhook}"
+                  ></paper-toggle-button>
+                `
+          }
+        </div>
+      `
+    );
+  }
+
+  private _showDialog(webhookId: string) {
+    const webhook = this._localHooks!.find(
+      (ent) => ent.webhook_id === webhookId
+    );
+    const cloudhook = this._cloudHooks![webhookId];
+    const params: WebhookDialogParams = {
+      webhook: webhook!,
+      cloudhook,
+      disableHook: () => this._disableWebhook(webhookId),
+    };
+    fireEvent(this, "manage-cloud-webhook", params);
+  }
+
+  private _handleManageButton(ev: MouseEvent) {
+    const entry = (ev.currentTarget as any).parentElement.entry as Webhook;
+    this._showDialog(entry.webhook_id);
+  }
+
+  private async _enableWebhook(ev: MouseEvent) {
+    const entry = (ev.currentTarget as any).parentElement.entry;
+    this._progress = [...this._progress, entry.webhook_id];
+    let updatedWebhook;
+
+    try {
+      updatedWebhook = await createCloudhook(this.hass!, entry.webhook_id);
+    } catch (err) {
+      alert((err as WebhookError).message);
+      return;
+    } finally {
+      this._progress = this._progress.filter((wid) => wid !== entry.webhook_id);
+    }
+
+    this._cloudHooks = {
+      ...this._cloudHooks,
+      [entry.webhook_id]: updatedWebhook,
+    };
+
+    // Only open dialog if we're not also enabling others, otherwise it's confusing
+    if (this._progress.length === 0) {
+      this._showDialog(entry.webhook_id);
+    }
+  }
+
+  private async _disableWebhook(webhookId: string) {
+    this._progress = [...this._progress, webhookId];
+    try {
+      await deleteCloudhook(this.hass!, webhookId!);
+    } catch (err) {
+      alert(`Failed to disable webhook: ${(err as WebhookError).message}`);
+      return;
+    } finally {
+      this._progress = this._progress.filter((wid) => wid !== webhookId);
+    }
+
+    // Remove cloud related parts from entry.
+    const { [webhookId]: disabledHook, ...newHooks } = this._cloudHooks!;
+    this._cloudHooks = newHooks;
+  }
+
+  private async _fetchData() {
+    this._localHooks = await fetchWebhooks(this.hass!);
+  }
+
+  private renderStyle() {
+    return html`
+      <style>
+        .body {
+          padding: 0 16px 8px;
+        }
+        .loading {
+          padding: 0 16px;
+        }
+        .webhook {
+          display: flex;
+          padding: 4px 16px;
+        }
+        .progress {
+          margin-right: 16px;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+        }
+        paper-button {
+          font-weight: 500;
+          color: var(--primary-color);
+        }
+        .footer {
+          padding: 16px;
+        }
+        .footer a {
+          color: var(--primary-color);
+        }
+      </style>
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "cloud-webhooks": CloudWebhooks;
+  }
+}
+
+customElements.define("cloud-webhooks", CloudWebhooks);
diff --git a/src/panels/config/cloud/ha-config-cloud-account.js b/src/panels/config/cloud/ha-config-cloud-account.js
index 516bc0f3d1..b5305af2c7 100644
--- a/src/panels/config/cloud/ha-config-cloud-account.js
+++ b/src/panels/config/cloud/ha-config-cloud-account.js
@@ -10,15 +10,19 @@ import "../../../layouts/hass-subpage";
 import "../../../resources/ha-style";
 
 import "../ha-config-section";
+import "./cloud-webhooks";
 
 import formatDateTime from "../../../common/datetime/format_date_time";
 import EventsMixin from "../../../mixins/events-mixin";
 import LocalizeMixin from "../../../mixins/localize-mixin";
+import { fireEvent } from "../../../common/dom/fire_event";
 
 import { fetchSubscriptionInfo } from "./data";
 import "./cloud-alexa-pref";
 import "./cloud-google-pref";
 
+let registeredWebhookDialog = false;
+
 /*
  * @appliesMixin EventsMixin
  * @appliesMixin LocalizeMixin
@@ -129,6 +133,11 @@ class HaConfigCloudAccount extends EventsMixin(LocalizeMixin(PolymerElement)) {
               hass="[[hass]]"
               cloud-status="[[cloudStatus]]"
             ></cloud-google-pref>
+
+            <cloud-webhooks
+              hass="[[hass]]"
+              cloud-status="[[cloudStatus]]"
+            ></cloud-webhooks>
           </ha-config-section>
         </div>
       </hass-subpage>
@@ -152,9 +161,26 @@ class HaConfigCloudAccount extends EventsMixin(LocalizeMixin(PolymerElement)) {
     this._fetchSubscriptionInfo();
   }
 
+  connectedCallback() {
+    super.connectedCallback();
+
+    if (!registeredWebhookDialog) {
+      registeredWebhookDialog = true;
+      fireEvent(this, "register-dialog", {
+        dialogShowEvent: "manage-cloud-webhook",
+        dialogTag: "cloud-webhook-manage-dialog",
+        dialogImport: () => import("./cloud-webhook-manage-dialog"),
+      });
+    }
+  }
+
   async _fetchSubscriptionInfo() {
     this._subscription = await fetchSubscriptionInfo(this.hass);
-    if (this._subscription.provider && this.cloudStatus.cloud !== "connected") {
+    if (
+      this._subscription.provider &&
+      this.cloudStatus &&
+      this.cloudStatus.cloud !== "connected"
+    ) {
       this.fire("ha-refresh-cloud-status");
     }
   }
diff --git a/src/panels/config/cloud/types.ts b/src/panels/config/cloud/types.ts
index a42ab724b0..80affe7d3f 100644
--- a/src/panels/config/cloud/types.ts
+++ b/src/panels/config/cloud/types.ts
@@ -1,3 +1,6 @@
+import { CloudWebhook } from "../../../data/cloud";
+import { Webhook } from "../../../data/webhook";
+
 export interface EntityFilter {
   include_domains: string[];
   include_entities: string[];
@@ -19,6 +22,7 @@ export type CloudStatusLoggedIn = CloudStatusBase & {
     google_enabled: boolean;
     alexa_enabled: boolean;
     google_allow_unlock: boolean;
+    cloudhooks: { [webhookId: string]: CloudWebhook };
   };
 };
 
@@ -27,3 +31,9 @@ export type CloudStatus = CloudStatusBase | CloudStatusLoggedIn;
 export interface SubscriptionInfo {
   human_description: string;
 }
+
+export interface WebhookDialogParams {
+  webhook: Webhook;
+  cloudhook: CloudWebhook;
+  disableHook: () => void;
+}
diff --git a/src/resources/ha-style.js b/src/resources/ha-style.js
index 57c1e51a8d..b645210773 100644
--- a/src/resources/ha-style.js
+++ b/src/resources/ha-style.js
@@ -1,6 +1,19 @@
 import "@polymer/paper-styles/paper-styles";
 import "@polymer/polymer/polymer-legacy";
 
+export const buttonLink = `
+  button.link {
+    background: none;
+    color: inherit;
+    border: none;
+    padding: 0;
+    font: inherit;
+    text-align: left;
+    text-decoration: underline;
+    cursor: pointer;
+  }
+`;
+
 const documentContainer = document.createElement("template");
 documentContainer.setAttribute("style", "display: none;");
 
@@ -162,16 +175,7 @@ documentContainer.innerHTML = `<custom-style>
         @apply --paper-font-title;
       }
 
-      button.link {
-        background: none;
-        color: inherit;
-        border: none;
-        padding: 0;
-        font: inherit;
-        text-align: left;
-        text-decoration: underline;
-        cursor: pointer;
-      }
+      ${buttonLink}
 
       .card-actions a {
         text-decoration: none;
diff --git a/src/types.ts b/src/types.ts
index dad3f5ffd4..9fc4b9db09 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -15,6 +15,11 @@ declare global {
   var __VERSION__: string;
 }
 
+export interface WebhookError {
+  code: number;
+  message: string;
+}
+
 export interface Credential {
   auth_provider_type: string;
   auth_provider_id: string;

From 5ab419534c45bce359b3722d1a9ac70da63f21be Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Mon, 26 Nov 2018 14:10:01 +0100
Subject: [PATCH 14/69] Convert authorize page to lit (#2115)

* Convert authorize page to lit

* Don't use ha-markdown

* Simplify CSS
---
 src/auth/ha-auth-flow.js               |   4 +-
 src/auth/ha-authorize.js               | 154 ------------------------
 src/auth/ha-authorize.ts               | 158 +++++++++++++++++++++++++
 src/auth/ha-pick-auth-provider.js      |   4 +-
 src/data/auth.ts                       |   5 +
 src/mixins/lit-localize-lite-mixin.ts  |  60 ++++++++++
 src/mixins/localize-lite-base-mixin.ts |  44 +++++++
 src/mixins/localize-lite-mixin.js      |  72 -----------
 src/mixins/localize-lite-mixin.ts      |  40 +++++++
 src/onboarding/ha-onboarding.js        |   2 +-
 10 files changed, 312 insertions(+), 231 deletions(-)
 delete mode 100644 src/auth/ha-authorize.js
 create mode 100644 src/auth/ha-authorize.ts
 create mode 100644 src/data/auth.ts
 create mode 100644 src/mixins/lit-localize-lite-mixin.ts
 create mode 100644 src/mixins/localize-lite-base-mixin.ts
 delete mode 100644 src/mixins/localize-lite-mixin.js
 create mode 100644 src/mixins/localize-lite-mixin.ts

diff --git a/src/auth/ha-auth-flow.js b/src/auth/ha-auth-flow.js
index e872c04e97..469ff0df73 100644
--- a/src/auth/ha-auth-flow.js
+++ b/src/auth/ha-auth-flow.js
@@ -2,9 +2,9 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import "@polymer/paper-button/paper-button";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import "../components/ha-form";
-import LocalizeLiteMixin from "../mixins/localize-lite-mixin";
+import { localizeLiteMixin } from "../mixins/localize-lite-mixin";
 
-class HaAuthFlow extends LocalizeLiteMixin(PolymerElement) {
+class HaAuthFlow extends localizeLiteMixin(PolymerElement) {
   static get template() {
     return html`
       <style>
diff --git a/src/auth/ha-authorize.js b/src/auth/ha-authorize.js
deleted file mode 100644
index c4b85f9c7d..0000000000
--- a/src/auth/ha-authorize.js
+++ /dev/null
@@ -1,154 +0,0 @@
-import "@polymer/polymer/lib/elements/dom-if";
-import "@polymer/polymer/lib/elements/dom-repeat";
-import { html } from "@polymer/polymer/lib/utils/html-tag";
-import { PolymerElement } from "@polymer/polymer/polymer-element";
-
-import "../components/ha-markdown";
-
-import LocalizeLiteMixin from "../mixins/localize-lite-mixin";
-
-import "./ha-auth-flow";
-
-class HaAuthorize extends LocalizeLiteMixin(PolymerElement) {
-  static get template() {
-    return html`
-      <style>
-        ha-markdown {
-          display: block;
-          margin-bottom: 16px;
-        }
-        ha-markdown a {
-          color: var(--primary-color);
-        }
-        ha-markdown p:last-child {
-          margin-bottom: 0;
-        }
-        ha-pick-auth-provider {
-          display: block;
-          margin-top: 48px;
-        }
-      </style>
-
-      <template is="dom-if" if="[[!_authProviders]]">
-        <p>[[localize('ui.panel.page-authorize.initializing')]]</p>
-      </template>
-
-      <template is="dom-if" if="[[_authProviders]]">
-        <ha-markdown
-          content="[[_computeIntro(localize, clientId, _authProvider)]]"
-        ></ha-markdown>
-
-        <ha-auth-flow
-          resources="[[resources]]"
-          client-id="[[clientId]]"
-          redirect-uri="[[redirectUri]]"
-          oauth2-state="[[oauth2State]]"
-          auth-provider="[[_authProvider]]"
-          step="{{step}}"
-        ></ha-auth-flow>
-
-        <template is="dom-if" if="[[_computeMultiple(_authProviders)]]">
-          <ha-pick-auth-provider
-            resources="[[resources]]"
-            client-id="[[clientId]]"
-            auth-providers="[[_computeInactiveProvders(_authProvider, _authProviders)]]"
-            on-pick="_handleAuthProviderPick"
-          ></ha-pick-auth-provider>
-        </template>
-      </template>
-    `;
-  }
-
-  static get properties() {
-    return {
-      _authProvider: String,
-      _authProviders: Array,
-      clientId: String,
-      redirectUri: String,
-      oauth2State: String,
-      translationFragment: {
-        type: String,
-        value: "page-authorize",
-      },
-    };
-  }
-
-  async ready() {
-    super.ready();
-    const query = {};
-    const values = location.search.substr(1).split("&");
-    for (let i = 0; i < values.length; i++) {
-      const value = values[i].split("=");
-      if (value.length > 1) {
-        query[decodeURIComponent(value[0])] = decodeURIComponent(value[1]);
-      }
-    }
-    const props = {};
-    if (query.client_id) props.clientId = query.client_id;
-    if (query.redirect_uri) props.redirectUri = query.redirect_uri;
-    if (query.state) props.oauth2State = query.state;
-    this.setProperties(props);
-
-    import(/* webpackChunkName: "pick-auth-provider" */ "../auth/ha-pick-auth-provider");
-
-    // Fetch auth providers
-    try {
-      const response = await window.providersPromise;
-      const authProviders = await response.json();
-
-      // Forward to main screen which will redirect to right onboarding page.
-      if (
-        response.status === 400 &&
-        authProviders.code === "onboarding_required"
-      ) {
-        location.href = "/";
-        return;
-      }
-
-      if (authProviders.length === 0) {
-        alert("No auth providers returned. Unable to finish login.");
-        return;
-      }
-
-      this.setProperties({
-        _authProviders: authProviders,
-        _authProvider: authProviders[0],
-      });
-    } catch (err) {
-      // eslint-disable-next-line
-      console.error("Error loading auth providers", err);
-      this._state = "error-loading";
-    }
-  }
-
-  _computeMultiple(array) {
-    return array && array.length > 1;
-  }
-
-  async _handleAuthProviderPick(ev) {
-    this._authProvider = ev.detail;
-  }
-
-  _computeInactiveProvders(curProvider, providers) {
-    return providers.filter(
-      (prv) => prv.type !== curProvider.type || prv.id !== curProvider.id
-    );
-  }
-
-  _computeIntro(localize, clientId, authProvider) {
-    return (
-      localize(
-        "ui.panel.page-authorize.authorizing_client",
-        "clientId",
-        clientId
-      ) +
-      "\n\n" +
-      localize(
-        "ui.panel.page-authorize.logging_in_with",
-        "authProviderName",
-        authProvider.name
-      )
-    );
-  }
-}
-customElements.define("ha-authorize", HaAuthorize);
diff --git a/src/auth/ha-authorize.ts b/src/auth/ha-authorize.ts
new file mode 100644
index 0000000000..e93a992959
--- /dev/null
+++ b/src/auth/ha-authorize.ts
@@ -0,0 +1,158 @@
+import { litLocalizeLiteMixin } from "../mixins/lit-localize-lite-mixin";
+import { LitElement, html, PropertyDeclarations } from "@polymer/lit-element";
+import "./ha-auth-flow";
+import { AuthProvider } from "../data/auth";
+
+import(/* webpackChunkName: "pick-auth-provider" */ "../auth/ha-pick-auth-provider");
+
+interface QueryParams {
+  client_id?: string;
+  redirect_uri?: string;
+  state?: string;
+}
+
+class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
+  public clientId?: string;
+  public redirectUri?: string;
+  public oauth2State?: string;
+  private _authProvider?: AuthProvider;
+  private _authProviders?: AuthProvider[];
+
+  constructor() {
+    super();
+    this.translationFragment = "page-authorize";
+    const query: QueryParams = {};
+    const values = location.search.substr(1).split("&");
+    for (const item of values) {
+      const value = item.split("=");
+      if (value.length > 1) {
+        query[decodeURIComponent(value[0])] = decodeURIComponent(value[1]);
+      }
+    }
+    if (query.client_id) {
+      this.clientId = query.client_id;
+    }
+    if (query.redirect_uri) {
+      this.redirectUri = query.redirect_uri;
+    }
+    if (query.state) {
+      this.oauth2State = query.state;
+    }
+  }
+
+  static get properties(): PropertyDeclarations {
+    return {
+      _authProvider: {},
+      _authProviders: {},
+      clientId: {},
+      redirectUri: {},
+      oauth2State: {},
+    };
+  }
+
+  public render() {
+    if (!this._authProviders) {
+      return html`
+        <p>[[localize('ui.panel.page-authorize.initializing')]]</p>
+      `;
+    }
+
+    // We don't have a good approach yet to map text markup in localization.
+    // So we sanitize the translation with innerText and then inject
+    // the name with a bold tag.
+    const loggingInWith = document.createElement("div");
+    loggingInWith.innerText = this.localize(
+      "ui.panel.page-authorize.logging_in_with",
+      "authProviderName",
+      "NAME"
+    );
+    loggingInWith.innerHTML = loggingInWith.innerHTML.replace(
+      "**NAME**",
+      `<b>${this._authProvider!.name}</b>`
+    );
+
+    const inactiveProviders = this._authProviders.filter(
+      (prv) => prv !== this._authProvider
+    );
+
+    return html`
+      ${this.renderStyle()}
+      <p>
+        ${
+          this.localize(
+            "ui.panel.page-authorize.authorizing_client",
+            "clientId",
+            this.clientId
+          )
+        }
+      </p>
+      ${loggingInWith}
+
+      <ha-auth-flow
+        .resources="${this.resources}"
+        .clientId="${this.clientId}"
+        .redirectUri="${this.redirectUri}"
+        .oauth2State="${this.oauth2State}"
+        .authProvider="${this._authProvider}"
+        .step="{{step}}"
+      ></ha-auth-flow>
+
+      ${
+        inactiveProviders.length > 0
+          ? html`
+              <ha-pick-auth-provider
+                .resources="${this.resources}"
+                .clientId="${this.clientId}"
+                .authProviders="${inactiveProviders}"
+                @pick="${this._handleAuthProviderPick}"
+              ></ha-pick-auth-provider>
+            `
+          : ""
+      }
+    `;
+  }
+
+  public async firstUpdated() {
+    // Fetch auth providers
+    try {
+      const response = await (window as any).providersPromise;
+      const authProviders = await response.json();
+
+      // Forward to main screen which will redirect to right onboarding page.
+      if (
+        response.status === 400 &&
+        authProviders.code === "onboarding_required"
+      ) {
+        location.href = "/?";
+        return;
+      }
+
+      if (authProviders.length === 0) {
+        alert("No auth providers returned. Unable to finish login.");
+        return;
+      }
+
+      this._authProviders = authProviders;
+      this._authProvider = authProviders[0];
+    } catch (err) {
+      // tslint:disable-next-line
+      console.error("Error loading auth providers", err);
+    }
+  }
+
+  protected renderStyle() {
+    return html`
+      <style>
+        ha-pick-auth-provider {
+          display: block;
+          margin-top: 48px;
+        }
+      </style>
+    `;
+  }
+
+  private async _handleAuthProviderPick(ev) {
+    this._authProvider = ev.detail;
+  }
+}
+customElements.define("ha-authorize", HaAuthorize);
diff --git a/src/auth/ha-pick-auth-provider.js b/src/auth/ha-pick-auth-provider.js
index 3e31129069..6e63f3a1d5 100644
--- a/src/auth/ha-pick-auth-provider.js
+++ b/src/auth/ha-pick-auth-provider.js
@@ -4,13 +4,13 @@ import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 
 import EventsMixin from "../mixins/events-mixin";
-import LocalizeLiteMixin from "../mixins/localize-lite-mixin";
+import { localizeLiteMixin } from "../mixins/localize-lite-mixin";
 
 /*
  * @appliesMixin EventsMixin
  */
 class HaPickAuthProvider extends EventsMixin(
-  LocalizeLiteMixin(PolymerElement)
+  localizeLiteMixin(PolymerElement)
 ) {
   static get template() {
     return html`
diff --git a/src/data/auth.ts b/src/data/auth.ts
new file mode 100644
index 0000000000..52c3af9099
--- /dev/null
+++ b/src/data/auth.ts
@@ -0,0 +1,5 @@
+export interface AuthProvider {
+  name: string;
+  id: string;
+  type: string;
+}
diff --git a/src/mixins/lit-localize-lite-mixin.ts b/src/mixins/lit-localize-lite-mixin.ts
new file mode 100644
index 0000000000..4c6f4a25e5
--- /dev/null
+++ b/src/mixins/lit-localize-lite-mixin.ts
@@ -0,0 +1,60 @@
+import {
+  Constructor,
+  LitElement,
+  PropertyDeclarations,
+  PropertyValues,
+} from "@polymer/lit-element";
+import { HomeAssistant } from "../types";
+import { getActiveTranslation } from "../util/hass-translation";
+import { LocalizeFunc, LocalizeMixin } from "./localize-base-mixin";
+import { localizeLiteBaseMixin } from "./localize-lite-base-mixin";
+
+const empty = () => "";
+
+interface LitLocalizeLiteMixin {
+  language: string;
+  resources: {};
+  translationFragment: string;
+}
+
+export const litLocalizeLiteMixin = <T extends LitElement>(
+  superClass: Constructor<T>
+): Constructor<T & LocalizeMixin & LitLocalizeLiteMixin> =>
+  // @ts-ignore
+  class extends localizeLiteBaseMixin(superClass) {
+    protected hass?: HomeAssistant;
+    protected localize!: LocalizeFunc;
+
+    static get properties(): PropertyDeclarations {
+      return {
+        hass: {},
+        localize: {},
+        language: {},
+        resources: {},
+        translationFragment: {},
+      };
+    }
+
+    constructor() {
+      super();
+      // This will prevent undefined errors if called before connected to DOM.
+      this.localize = empty;
+      this.language = getActiveTranslation();
+    }
+
+    public connectedCallback(): void {
+      super.connectedCallback();
+      this._initializeLocalizeLite();
+      this.localize = this.__computeLocalize(this.language, this.resources);
+    }
+
+    public updated(changedProperties: PropertyValues) {
+      super.updated(changedProperties);
+      if (
+        changedProperties.has("language") ||
+        changedProperties.has("resources")
+      ) {
+        this.localize = this.__computeLocalize(this.language, this.resources);
+      }
+    }
+  };
diff --git a/src/mixins/localize-lite-base-mixin.ts b/src/mixins/localize-lite-base-mixin.ts
new file mode 100644
index 0000000000..d9fe1e2a58
--- /dev/null
+++ b/src/mixins/localize-lite-base-mixin.ts
@@ -0,0 +1,44 @@
+/**
+ * Lite base mixin to add localization without depending on the Hass object.
+ */
+import { localizeBaseMixin } from "./localize-base-mixin";
+import { getTranslation } from "../util/hass-translation";
+
+/**
+ * @polymerMixin
+ */
+export const localizeLiteBaseMixin = (superClass) =>
+  class extends localizeBaseMixin(superClass) {
+    protected _initializeLocalizeLite() {
+      if (this.resources) {
+        return;
+      }
+
+      if (!this.translationFragment) {
+        // In dev mode, we will issue a warning if after a second we are still
+        // not configured correctly.
+        if (__DEV__) {
+          setTimeout(
+            () =>
+              !this.resources &&
+              // tslint:disable-next-line
+              console.error(
+                "Forgot to pass in resources or set translationFragment for",
+                this.nodeName
+              ),
+            1000
+          );
+        }
+        return;
+      }
+
+      this._updateResources();
+    }
+
+    private async _updateResources() {
+      const { language, data } = await getTranslation(this.translationFragment);
+      this.resources = {
+        [language]: data,
+      };
+    }
+  };
diff --git a/src/mixins/localize-lite-mixin.js b/src/mixins/localize-lite-mixin.js
deleted file mode 100644
index 8df031b522..0000000000
--- a/src/mixins/localize-lite-mixin.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Lite mixin to add localization without depending on the Hass object.
- */
-import { dedupingMixin } from "@polymer/polymer/lib/utils/mixin";
-import { localizeBaseMixin } from "./localize-base-mixin";
-import { getActiveTranslation, getTranslation } from "../util/hass-translation";
-
-/**
- * @polymerMixin
- */
-export default dedupingMixin(
-  (superClass) =>
-    class extends localizeBaseMixin(superClass) {
-      static get properties() {
-        return {
-          language: {
-            type: String,
-            value: getActiveTranslation(),
-          },
-          resources: Object,
-          // The fragment to load.
-          translationFragment: String,
-          /**
-           * Translates a string to the current `language`. Any parameters to the
-           * string should be passed in order, as follows:
-           * `localize(stringKey, param1Name, param1Value, param2Name, param2Value)`
-           */
-          localize: {
-            type: Function,
-            computed: "__computeLocalize(language, resources, formats)",
-          },
-        };
-      }
-
-      ready() {
-        super.ready();
-
-        if (this.resources) {
-          return;
-        }
-
-        if (!this.translationFragment) {
-          // In dev mode, we will issue a warning if after a second we are still
-          // not configured correctly.
-          if (__DEV__) {
-            /* eslint-disable no-console */
-            setTimeout(
-              () =>
-                !this.resources &&
-                console.error(
-                  "Forgot to pass in resources or set translationFragment for",
-                  this.nodeName
-                ),
-              1000
-            );
-          }
-          return;
-        }
-
-        this._updateResources();
-      }
-
-      async _updateResources() {
-        const { language, data } = await getTranslation(
-          this.translationFragment
-        );
-        this.resources = {
-          [language]: data,
-        };
-      }
-    }
-);
diff --git a/src/mixins/localize-lite-mixin.ts b/src/mixins/localize-lite-mixin.ts
new file mode 100644
index 0000000000..16ffa615a1
--- /dev/null
+++ b/src/mixins/localize-lite-mixin.ts
@@ -0,0 +1,40 @@
+/**
+ * Lite mixin to add localization without depending on the Hass object.
+ */
+import { dedupingMixin } from "@polymer/polymer/lib/utils/mixin";
+import { getActiveTranslation } from "../util/hass-translation";
+import { localizeLiteBaseMixin } from "./localize-lite-base-mixin";
+
+/**
+ * @polymerMixin
+ */
+export const localizeLiteMixin = dedupingMixin(
+  (superClass) =>
+    class extends localizeLiteBaseMixin(superClass) {
+      static get properties() {
+        return {
+          language: {
+            type: String,
+            value: getActiveTranslation(),
+          },
+          resources: Object,
+          // The fragment to load.
+          translationFragment: String,
+          /**
+           * Translates a string to the current `language`. Any parameters to the
+           * string should be passed in order, as follows:
+           * `localize(stringKey, param1Name, param1Value, param2Name, param2Value)`
+           */
+          localize: {
+            type: Function,
+            computed: "__computeLocalize(language, resources, formats)",
+          },
+        };
+      }
+
+      public ready() {
+        super.ready();
+        this._initializeLocalizeLite();
+      }
+    }
+);
diff --git a/src/onboarding/ha-onboarding.js b/src/onboarding/ha-onboarding.js
index 3a30c3c8c5..ec9d8b2149 100644
--- a/src/onboarding/ha-onboarding.js
+++ b/src/onboarding/ha-onboarding.js
@@ -4,7 +4,7 @@ import "@polymer/paper-input/paper-input";
 import "@polymer/paper-button/paper-button";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
-import localizeLiteMixin from "../mixins/localize-lite-mixin";
+import { localizeLiteMixin } from "../mixins/localize-lite-mixin";
 
 class HaOnboarding extends localizeLiteMixin(PolymerElement) {
   static get template() {

From 278ea184cc21d594cff52c36798645930b26b36c Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 26 Nov 2018 14:39:01 +0100
Subject: [PATCH 15/69] Update translations

---
 translations/bg.json      |  2 +-
 translations/ca.json      | 25 ++++++++++++++++++++++-
 translations/cs.json      | 25 ++++++++++++++++++++++-
 translations/en.json      | 25 ++++++++++++++++++++++-
 translations/et.json      |  3 ++-
 translations/he.json      | 14 +++++++++++++
 translations/hu.json      | 20 +++++++++++++++++-
 translations/ko.json      | 25 ++++++++++++++++++++++-
 translations/lb.json      | 25 ++++++++++++++++++++++-
 translations/nl.json      | 24 +++++++++++++++++++++-
 translations/no.json      | 25 ++++++++++++++++++++++-
 translations/pl.json      | 43 ++++++++++++++++++++++++++++++---------
 translations/pt.json      | 25 ++++++++++++++++++++++-
 translations/ru.json      | 25 ++++++++++++++++++++++-
 translations/zh-Hant.json | 25 ++++++++++++++++++++++-
 15 files changed, 308 insertions(+), 23 deletions(-)

diff --git a/translations/bg.json b/translations/bg.json
index 93b883c4a1..123623a634 100644
--- a/translations/bg.json
+++ b/translations/bg.json
@@ -632,7 +632,7 @@
                 "abort_intro": "Входът е прекратен",
                 "form": {
                     "working": "Моля, изчакайте",
-                    "unknown_error": "Ся си е*а майката",
+                    "unknown_error": "Неочаквана грешка",
                     "providers": {
                         "homeassistant": {
                             "step": {
diff --git a/translations/ca.json b/translations/ca.json
index e7c9cf7b48..07321e0970 100644
--- a/translations/ca.json
+++ b/translations/ca.json
@@ -144,7 +144,8 @@
             "performance": "Rendiment",
             "high_demand": "Plena potència",
             "heat_pump": "Bomba de calor",
-            "gas": "Gas"
+            "gas": "Gas",
+            "manual": "Manual"
         },
         "configurator": {
             "configure": "Configurar",
@@ -712,6 +713,28 @@
                         "required_fields": "Ompliu tots els camps obligatoris"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "Elements seleccionats",
+                        "clear_items": "Esborra els elements seleccionats",
+                        "add_item": "Afegir element"
+                    }
+                },
+                "editor": {
+                    "edit": {
+                        "header": "Targeta de Configuració",
+                        "save": "Desa",
+                        "toggle_editor": "Commuta l'editor"
+                    },
+                    "migrate": {
+                        "header": "Configuració incompatible",
+                        "para_no_id": "Aquest element no té ID. Afegiu un ID per aquest element a 'ui-lovelace.yaml'.",
+                        "para_migrate": "Home Assistant pot afegir ID's a totes les vostres targetes i visualitzacions automàticament fent clic al botó \"Migrar la configuració\".",
+                        "migrate": "Migrar la configuració"
+                    }
+                }
             }
         },
         "sidebar": {
diff --git a/translations/cs.json b/translations/cs.json
index d570aba54e..c21c88a26b 100644
--- a/translations/cs.json
+++ b/translations/cs.json
@@ -144,7 +144,8 @@
             "performance": "Vysoký výkon",
             "high_demand": "Vysoký výkon",
             "heat_pump": "Tepelné čerpadlo",
-            "gas": "Plyn"
+            "gas": "Plyn",
+            "manual": "Ruční"
         },
         "configurator": {
             "configure": "Nakonfigurovat",
@@ -712,6 +713,28 @@
                         "required_fields": "Vyplňte všechna povinná pole"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "Označené položky",
+                        "clear_items": "Vymazat označené položky",
+                        "add_item": "Přidat položku"
+                    }
+                },
+                "editor": {
+                    "edit": {
+                        "header": "Konfigurace karty",
+                        "save": "Uložit",
+                        "toggle_editor": "Přepnout Editor"
+                    },
+                    "migrate": {
+                        "header": "Konfigurace není kompatibilní",
+                        "para_no_id": "Tento prvek nemá ID. Přidejte k tomuto prvku ID v 'ui-lovelace.yaml'.",
+                        "para_migrate": "Home Assistant může automaticky přidávat ID ke všem kartám a pohledům stisknutím tlačítka Migrate config.",
+                        "migrate": "Migrovat konfiguraci"
+                    }
+                }
             }
         },
         "sidebar": {
diff --git a/translations/en.json b/translations/en.json
index d70c46c649..722f9dd2e4 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -144,7 +144,8 @@
             "performance": "Performance",
             "high_demand": "High demand",
             "heat_pump": "Heat pump",
-            "gas": "Gas"
+            "gas": "Gas",
+            "manual": "Manual"
         },
         "configurator": {
             "configure": "Configure",
@@ -712,6 +713,28 @@
                         "required_fields": "Fill in all required fields"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "Checked items",
+                        "clear_items": "Clear checked items",
+                        "add_item": "Add item"
+                    }
+                },
+                "editor": {
+                    "edit": {
+                        "header": "Card Configuration",
+                        "save": "Save",
+                        "toggle_editor": "Toggle Editor"
+                    },
+                    "migrate": {
+                        "header": "Configuration Incompatible",
+                        "para_no_id": "This element doesn't have an ID. Please add an ID to this element in 'ui-lovelace.yaml'.",
+                        "para_migrate": "Home Assistant can add ID's to all your cards and views automatically for you by pressing the 'Migrate config' button.",
+                        "migrate": "Migrate config"
+                    }
+                }
             }
         },
         "sidebar": {
diff --git a/translations/et.json b/translations/et.json
index b13a870c86..8fb9950da7 100644
--- a/translations/et.json
+++ b/translations/et.json
@@ -144,7 +144,8 @@
             "performance": "Jõudlus",
             "high_demand": "Kõrge nõudlus",
             "heat_pump": "Soojuspump",
-            "gas": "Gaas"
+            "gas": "Gaas",
+            "manual": "Käsitsi"
         },
         "configurator": {
             "configure": "Seadista",
diff --git a/translations/he.json b/translations/he.json
index 04161f784b..5d411cf77f 100644
--- a/translations/he.json
+++ b/translations/he.json
@@ -712,6 +712,20 @@
                         "required_fields": "מלא את כל השדות הדרושים"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "פריטים מסומנים",
+                        "clear_items": "נקה פריטים מסומנים",
+                        "add_item": "הוסף פריט"
+                    }
+                },
+                "editor": {
+                    "edit": {
+                        "save": "שמור"
+                    }
+                }
             }
         },
         "sidebar": {
diff --git a/translations/hu.json b/translations/hu.json
index 14d43a3970..db1edd1404 100644
--- a/translations/hu.json
+++ b/translations/hu.json
@@ -144,7 +144,8 @@
             "performance": "Teljesítmény",
             "high_demand": "Magas igénybevétel",
             "heat_pump": "Hőszivattyú",
-            "gas": "Gáz"
+            "gas": "Gáz",
+            "manual": "Kézikönyv"
         },
         "configurator": {
             "configure": "Beállítás",
@@ -712,6 +713,23 @@
                         "required_fields": "Töltsd ki az összes szükséges mezőt"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "Ellenőrzött elemek ",
+                        "clear_items": "Ellenőrzött elemek ",
+                        "add_item": "Elem hozzáadása"
+                    }
+                },
+                "editor": {
+                    "edit": {
+                        "save": "Mentés"
+                    },
+                    "migrate": {
+                        "header": "Inkompatibilis konfiguráció!"
+                    }
+                }
             }
         },
         "sidebar": {
diff --git a/translations/ko.json b/translations/ko.json
index 07ed2e3e1e..05e4707f96 100644
--- a/translations/ko.json
+++ b/translations/ko.json
@@ -144,7 +144,8 @@
             "performance": "고효율",
             "high_demand": "고성능",
             "heat_pump": "순환펌프",
-            "gas": "가스"
+            "gas": "가스",
+            "manual": "수동"
         },
         "configurator": {
             "configure": "설정",
@@ -712,6 +713,28 @@
                         "required_fields": "필수 입력란을 모두 채워주세요"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "선택한 항목",
+                        "clear_items": "선택한 항목 삭제",
+                        "add_item": "항목 추가"
+                    }
+                },
+                "editor": {
+                    "edit": {
+                        "header": "카드 구성",
+                        "save": "저장하기",
+                        "toggle_editor": "에디터 전환"
+                    },
+                    "migrate": {
+                        "header": "설정이 호환되지 않습니다",
+                        "para_no_id": "이 구성요소에는 ID가 없습니다. 'ui-lovelace.yaml' 에 구성요소의 ID를 추가해주세요.",
+                        "para_migrate": "Home Assistant 는 '설정 마이그레이션' 버튼을 눌러 자동으로 모든 카드와 보기에 ID를 추가 할 수 있습니다.",
+                        "migrate": "설정 마이그레이션"
+                    }
+                }
             }
         },
         "sidebar": {
diff --git a/translations/lb.json b/translations/lb.json
index be103f45c2..0e80d80684 100644
--- a/translations/lb.json
+++ b/translations/lb.json
@@ -144,7 +144,8 @@
             "performance": "Leeschtung",
             "high_demand": "Héich Ufro",
             "heat_pump": "Heizung",
-            "gas": "Gas"
+            "gas": "Gas",
+            "manual": "Manuell"
         },
         "configurator": {
             "configure": "Astellen",
@@ -712,6 +713,28 @@
                         "required_fields": "Fëllt all néideg Felder aus"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "Markéiert Elementer",
+                        "clear_items": "Markéiert Elementer läschen",
+                        "add_item": "Element dobäisetzen"
+                    }
+                },
+                "editor": {
+                    "edit": {
+                        "header": "Kaart Konfiguratioun",
+                        "save": "Späicheren",
+                        "toggle_editor": "Editeur ëmschalten"
+                    },
+                    "migrate": {
+                        "header": "Konfiguratioun net kompatibel",
+                        "para_no_id": "Dëst Element huet keng ID. Definéiert w.e.g. eng ID fir dëst Element am 'ui-lovelace.yaml'.",
+                        "para_migrate": "Home Assistant kann ID's zu all äre Kaarten automatesch dobäisetzen andeem dir de Knäppche 'Konfiguratioun migréieren' dréckt.",
+                        "migrate": "Konfiguratioun migréieren"
+                    }
+                }
             }
         },
         "sidebar": {
diff --git a/translations/nl.json b/translations/nl.json
index 6ec0c54658..9b06bc384f 100644
--- a/translations/nl.json
+++ b/translations/nl.json
@@ -144,7 +144,8 @@
             "performance": "Prestatie",
             "high_demand": "Hoge vraag",
             "heat_pump": "Warmtepomp",
-            "gas": "Gas"
+            "gas": "Gas",
+            "manual": "Handmatig"
         },
         "configurator": {
             "configure": "Configureer",
@@ -712,6 +713,27 @@
                         "required_fields": "Vul alle verplichte velden in"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "Geselecteerde items",
+                        "clear_items": "Geselecteerde items wissen",
+                        "add_item": "Item toevoegen"
+                    }
+                },
+                "editor": {
+                    "edit": {
+                        "header": "Kaart configuratie",
+                        "save": "Opslaan"
+                    },
+                    "migrate": {
+                        "header": "Configuratie incompatibel",
+                        "para_no_id": "Dit element heeft geen ID. Voeg een ID toe aan dit element in 'ui-lovelace.yaml'.",
+                        "para_migrate": "Home Assistant kan ID's voor al je kaarten en weergaven automatisch voor je toevoegen door op de knop 'Migrate config' te klikken.",
+                        "migrate": "Configuratie migreren"
+                    }
+                }
             }
         },
         "sidebar": {
diff --git a/translations/no.json b/translations/no.json
index 0a9c04958f..85b03c5eda 100644
--- a/translations/no.json
+++ b/translations/no.json
@@ -144,7 +144,8 @@
             "performance": "Ytelse",
             "high_demand": "Høy etterspørsel",
             "heat_pump": "Varmepumpe",
-            "gas": "Gass"
+            "gas": "Gass",
+            "manual": "Manuell"
         },
         "configurator": {
             "configure": "Konfigurer",
@@ -712,6 +713,28 @@
                         "required_fields": "Fyll ut alle nødvendige felt"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "Merkede elementer",
+                        "clear_items": "Fjern merkede elementer",
+                        "add_item": "Legg til"
+                    }
+                },
+                "editor": {
+                    "edit": {
+                        "header": "Kortkonfigurasjon",
+                        "save": "Lagre",
+                        "toggle_editor": "Bytt redigering"
+                    },
+                    "migrate": {
+                        "header": "Konfigurasjon inkompatibel",
+                        "para_no_id": "Dette elementet har ingen ID. Vennligst legg til en ID til dette elementet i 'ui-lovelace.yaml'.",
+                        "para_migrate": "Home Assistant kan legge til ID-er til alle dine kort og visninger automatisk for deg ved å trykke på 'Overfør konfigurasjon' knappen.",
+                        "migrate": "Overfør konfigurasjon"
+                    }
+                }
             }
         },
         "sidebar": {
diff --git a/translations/pl.json b/translations/pl.json
index 8548c00b03..a15fd8f3fa 100644
--- a/translations/pl.json
+++ b/translations/pl.json
@@ -45,8 +45,8 @@
                 "on": "włączony"
             },
             "moisture": {
-                "off": "sucho",
-                "on": "wilgotno"
+                "off": "brak wilgoci",
+                "on": "wilgoć"
             },
             "gas": {
                 "off": "brak",
@@ -144,7 +144,8 @@
             "performance": "wydajność",
             "high_demand": "duży rozbiór",
             "heat_pump": "pompa ciepła",
-            "gas": "gaz"
+            "gas": "gaz",
+            "manual": "manualnie"
         },
         "configurator": {
             "configure": "Skonfiguruj",
@@ -386,8 +387,8 @@
                                 "homeassistant": {
                                     "label": "Home Assistant",
                                     "event": "Zdarzenie:",
-                                    "start": "Początek",
-                                    "shutdown": "Zamknięcie systemu"
+                                    "start": "uruchomienie",
+                                    "shutdown": "zakończenie"
                                 },
                                 "mqtt": {
                                     "label": "MQTT",
@@ -403,8 +404,8 @@
                                 "sun": {
                                     "label": "Słońce",
                                     "event": "Zdarzenie:",
-                                    "sunrise": "Wschód słońca",
-                                    "sunset": "Zachód słońca",
+                                    "sunrise": "wschód słońca",
+                                    "sunset": "zachód słońca",
                                     "offset": "Przesunięcie (opcjonalnie)"
                                 },
                                 "template": {
@@ -451,8 +452,8 @@
                                     "after": "Po:",
                                     "before_offset": "Przed przesunięciem (opcjonalnie)",
                                     "after_offset": "Po przesunięciu (opcjonalnie)",
-                                    "sunrise": "Wschód słońca",
-                                    "sunset": "Zachód słońca"
+                                    "sunrise": "wschód słońca",
+                                    "sunset": "zachód słońca"
                                 },
                                 "template": {
                                     "label": "Szablon",
@@ -712,6 +713,28 @@
                         "required_fields": "Wypełnij wszystkie wymagane pola"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "Pozycje zaznaczone",
+                        "clear_items": "Wyczyść zaznaczone pozycje",
+                        "add_item": "Dodaj pozycję"
+                    }
+                },
+                "editor": {
+                    "edit": {
+                        "header": "Konfiguracja karty",
+                        "save": "Zapisz",
+                        "toggle_editor": "Przełącz edytor"
+                    },
+                    "migrate": {
+                        "header": "Konfiguracja niekompatybilna",
+                        "para_no_id": "Ten element nie ma ID. Dodaj ID do tego elementu w \"ui-lovelace.yaml\".",
+                        "para_migrate": "Home Assistant może automatycznie dodać ID do wszystkich twoich kart i widoków, po kliknięciu przycisku \"Migracja konfiguracji\".",
+                        "migrate": "Migracja konfiguracji"
+                    }
+                }
             }
         },
         "sidebar": {
@@ -745,7 +768,7 @@
                 "activate": "Aktywuj"
             },
             "script": {
-                "execute": "Wykonaj"
+                "execute": "Uruchom"
             },
             "weather": {
                 "attributes": {
diff --git a/translations/pt.json b/translations/pt.json
index 0c67c902a2..af46894bb3 100644
--- a/translations/pt.json
+++ b/translations/pt.json
@@ -144,7 +144,8 @@
             "performance": "Desempenho",
             "high_demand": "Necessidade alta",
             "heat_pump": "Bomba de calor",
-            "gas": "Gás"
+            "gas": "Gás",
+            "manual": "Manual"
         },
         "configurator": {
             "configure": "Configurar",
@@ -712,6 +713,28 @@
                         "required_fields": "Preencha todos os campos obrigatórios"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "Itens marcados",
+                        "clear_items": "Limpar itens marcados",
+                        "add_item": "Adicionar Item"
+                    }
+                },
+                "editor": {
+                    "edit": {
+                        "header": "Configuração do cartão",
+                        "save": "Guardar",
+                        "toggle_editor": "Alterar para editor"
+                    },
+                    "migrate": {
+                        "header": "Configuração Incompatível",
+                        "para_no_id": "Este elemento não possui um ID. Por favor adicione um ID a este elemento em 'ui-lovelace.yaml'.",
+                        "para_migrate": "O Home Assistant pode adicionar IDs a todos os seus cartões e vistas automaticamente clicando no botão 'Migrar configuração'.",
+                        "migrate": "Migrar configuração"
+                    }
+                }
             }
         },
         "sidebar": {
diff --git a/translations/ru.json b/translations/ru.json
index 4bd1bfc937..e852c409af 100644
--- a/translations/ru.json
+++ b/translations/ru.json
@@ -144,7 +144,8 @@
             "performance": "Производительность",
             "high_demand": "Большая нагрузка",
             "heat_pump": "Тепловой насос",
-            "gas": "Газовый"
+            "gas": "Газовый",
+            "manual": "Руководство"
         },
         "configurator": {
             "configure": "Настроить",
@@ -712,6 +713,28 @@
                         "required_fields": "Заполните все обязательные поля"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "Отмеченные элементы",
+                        "clear_items": "Очистить отмеченные элементы",
+                        "add_item": "Добавить элемент"
+                    }
+                },
+                "editor": {
+                    "edit": {
+                        "header": "Конфигурация карты",
+                        "save": "Сохранить",
+                        "toggle_editor": "Переключить редактор"
+                    },
+                    "migrate": {
+                        "header": "Конфигурация несовместима",
+                        "para_no_id": "Этот элемент не имеет ID. Добавьте ID для этого элемента в 'ui-lovelace.yaml'.",
+                        "para_migrate": "Home Assistant может добавить ID для всех ваших карт и представлений автоматически, если нажать кнопку 'Миграция конфигурации'.",
+                        "migrate": "Миграция конфигурации"
+                    }
+                }
             }
         },
         "sidebar": {
diff --git a/translations/zh-Hant.json b/translations/zh-Hant.json
index 05b409bbdf..dab37a0daa 100644
--- a/translations/zh-Hant.json
+++ b/translations/zh-Hant.json
@@ -144,7 +144,8 @@
             "performance": "效能",
             "high_demand": "高用量",
             "heat_pump": "暖氣",
-            "gas": "瓦斯模式"
+            "gas": "瓦斯模式",
+            "manual": "手動"
         },
         "configurator": {
             "configure": "設定",
@@ -712,6 +713,28 @@
                         "required_fields": "填寫所有所需欄位"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "已選取項目",
+                        "clear_items": "清除已選取項目",
+                        "add_item": "新增項目"
+                    }
+                },
+                "editor": {
+                    "edit": {
+                        "header": "卡片設定",
+                        "save": "儲存",
+                        "toggle_editor": "切換編輯器"
+                    },
+                    "migrate": {
+                        "header": "設定不相容",
+                        "para_no_id": "該元件未含 ID，請於「ui-lovelace.yaml」中為該元件新增 ID。",
+                        "para_migrate": "Home Assistant 能於您點選「遷移設定」按鈕後，自動新增 ID 與視圖至所有卡片。",
+                        "migrate": "遷移設定"
+                    }
+                }
             }
         },
         "sidebar": {

From bb8ec4b2ef89b8b31ab92714006c6a91fe2fa840 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 26 Nov 2018 14:39:06 +0100
Subject: [PATCH 16/69] Bumped version to 20181126.0

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 17eb385449..24233b1bb6 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="home-assistant-frontend",
-    version="20181121.0",
+    version="20181126.0",
     description="The Home Assistant frontend",
     url="https://github.com/home-assistant/home-assistant-polymer",
     author="The Home Assistant Authors",

From 21be35bc461eb16fb51d0fc64d6f4a6a3b50cce6 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Mon, 26 Nov 2018 07:46:40 -0600
Subject: [PATCH 17/69] Conert shopping-list update to WebSockets (#2114)

---
 src/data/shopping-list.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/data/shopping-list.ts b/src/data/shopping-list.ts
index e2c57cdc78..ff156469d4 100644
--- a/src/data/shopping-list.ts
+++ b/src/data/shopping-list.ts
@@ -16,7 +16,9 @@ export const saveEdit = (
   itemId: number,
   name: string
 ): Promise<ShoppingListItem> =>
-  hass.callApi("POST", "shopping_list/item/" + itemId, {
+  hass.callWS({
+    type: "shopping_list/items/update",
+    item_id: itemId,
     name,
   });
 
@@ -25,7 +27,9 @@ export const completeItem = (
   itemId: number,
   complete: boolean
 ): Promise<void> =>
-  hass.callApi("POST", "shopping_list/item/" + itemId, {
+  hass.callWS({
+    type: "shopping_list/items/update",
+    item_id: itemId,
     complete,
   });
 

From 3752530f965a30548ac0e18dc5b48d8de6a5fbf6 Mon Sep 17 00:00:00 2001
From: Zack Arnett <arnett.zackary@gmail.com>
Date: Mon, 26 Nov 2018 15:01:07 -0500
Subject: [PATCH 18/69] Update UI in the config Elements (#2117)

* UpdateUI

* Updating continues

* Update name of file
---
 .../config-elements/config-elements-style.ts  | 16 ++++
 .../hui-entities-card-editor.ts               | 54 ++++++------
 .../config-elements/hui-glance-card-editor.ts | 82 +++++++++----------
 src/panels/lovelace/editor/hui-edit-card.ts   | 12 ++-
 4 files changed, 89 insertions(+), 75 deletions(-)
 create mode 100644 src/panels/lovelace/editor/config-elements/config-elements-style.ts

diff --git a/src/panels/lovelace/editor/config-elements/config-elements-style.ts b/src/panels/lovelace/editor/config-elements/config-elements-style.ts
new file mode 100644
index 0000000000..0d44339055
--- /dev/null
+++ b/src/panels/lovelace/editor/config-elements/config-elements-style.ts
@@ -0,0 +1,16 @@
+import { html } from "@polymer/lit-element";
+
+export const configElementStyle = html`
+  <style>
+    paper-toggle-button {
+      padding-top: 16px;
+    }
+    .side-by-side {
+      display: flex;
+    }
+    .side-by-side > * {
+      flex: 1;
+      padding-right: 4px;
+    }
+  </style>
+`;
diff --git a/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
index 25452f64f2..eebdd38494 100644
--- a/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
@@ -1,9 +1,9 @@
 import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
 import { TemplateResult } from "lit-html";
-import "@polymer/paper-checkbox/paper-checkbox";
 import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-listbox/paper-listbox";
+import "@polymer/paper-toggle-button/paper-toggle-button";
 
 import { processEditorEntities } from "../process-editor-entities";
 import { EntitiesEditorEvent, EditorTarget } from "../types";
@@ -12,6 +12,7 @@ import { HomeAssistant } from "../../../../types";
 import { LovelaceCardEditor } from "../../types";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { Config, ConfigEntity } from "../../cards/hui-entities-card";
+import { configElementStyle } from "./config-elements-style";
 
 import "../../../../components/entity/state-badge";
 import "../../components/hui-theme-select-editor";
@@ -48,30 +49,32 @@ export class HuiEntitiesCardEditor extends hassLocalizeLitMixin(LitElement)
     }
 
     return html`
-      ${this.renderStyle()}
-      <paper-input
-        label="Title"
-        value="${this._title}"
-        .configValue="${"title"}"
-        @value-changed="${this._valueChanged}"
-      ></paper-input>
-      <hui-theme-select-editor
-        .hass="${this.hass}"
-        .value="${this._theme}"
-        .configValue="${"theme"}"
-        @theme-changed="${this._valueChanged}"
-      ></hui-theme-select-editor>
+      ${configElementStyle}
+      <div class="card-config">
+        <paper-input
+          label="Title"
+          value="${this._title}"
+          .configValue="${"title"}"
+          @value-changed="${this._valueChanged}"
+        ></paper-input>
+        <hui-theme-select-editor
+          .hass="${this.hass}"
+          .value="${this._theme}"
+          .configValue="${"theme"}"
+          @theme-changed="${this._valueChanged}"
+        ></hui-theme-select-editor>
+        <paper-toggle-button
+          ?checked="${this._config!.show_header_toggle !== false}"
+          .configValue="${"show_header_toggle"}"
+          @change="${this._valueChanged}"
+          >Show Header Toggle?</paper-toggle-button
+        >
+      </div>
       <hui-entity-editor
         .hass="${this.hass}"
         .entities="${this._configEntities}"
         @entities-changed="${this._valueChanged}"
       ></hui-entity-editor>
-      <paper-checkbox
-        ?checked="${this._config!.show_header_toggle !== false}"
-        .configValue="${"show_header_toggle"}"
-        @change="${this._valueChanged}"
-        >Show Header Toggle?</paper-checkbox
-      >
     `;
   }
 
@@ -102,17 +105,6 @@ export class HuiEntitiesCardEditor extends hassLocalizeLitMixin(LitElement)
 
     fireEvent(this, "config-changed", { config: this._config });
   }
-
-  private renderStyle(): TemplateResult {
-    return html`
-      <style>
-        paper-checkbox {
-          display: block;
-          padding-top: 16px;
-        }
-      </style>
-    `;
-  }
 }
 
 declare global {
diff --git a/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts
index dacbc481a0..0f6cc2fdfe 100644
--- a/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts
@@ -1,9 +1,9 @@
 import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
 import { TemplateResult } from "lit-html";
-import "@polymer/paper-checkbox/paper-checkbox";
 import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-listbox/paper-listbox";
+import "@polymer/paper-toggle-button/paper-toggle-button";
 
 import { processEditorEntities } from "../process-editor-entities";
 import { EntitiesEditorEvent, EditorTarget } from "../types";
@@ -12,6 +12,7 @@ import { HomeAssistant } from "../../../../types";
 import { LovelaceCardEditor } from "../../types";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { Config, ConfigEntity } from "../../cards/hui-glance-card";
+import { configElementStyle } from "./config-elements-style";
 
 import "../../../../components/entity/state-badge";
 import "../../components/hui-theme-select-editor";
@@ -52,42 +53,48 @@ export class HuiGlanceCardEditor extends hassLocalizeLitMixin(LitElement)
     }
 
     return html`
-      ${this.renderStyle()}
-      <paper-input
-        label="Title"
-        value="${this._title}"
-        .configValue="${"title"}"
-        @value-changed="${this._valueChanged}"
-      ></paper-input>
-      <hui-theme-select-editor
-        .hass="${this.hass}"
-        .value="${this._theme}"
-        .configValue="${"theme"}"
-        @theme-changed="${this._valueChanged}"
-      ></hui-theme-select-editor>
-      <paper-input
-        label="Columns"
-        value="${this._columns}"
-        .configValue="${"columns"}"
-        @value-changed="${this._valueChanged}"
-      ></paper-input>
+      ${configElementStyle}
+      <div class="card-config">
+        <paper-input
+          label="Title"
+          value="${this._title}"
+          .configValue="${"title"}"
+          @value-changed="${this._valueChanged}"
+        ></paper-input>
+        <div class="side-by-side">
+          <hui-theme-select-editor
+            .hass="${this.hass}"
+            .value="${this._theme}"
+            .configValue="${"theme"}"
+            @theme-changed="${this._valueChanged}"
+          ></hui-theme-select-editor>
+          <paper-input
+            label="Columns"
+            value="${this._columns}"
+            .configValue="${"columns"}"
+            @value-changed="${this._valueChanged}"
+          ></paper-input>
+        </div>
+        <div class="side-by-side">
+          <paper-toggle-button
+            ?checked="${this._config!.show_name !== false}"
+            .configValue="${"show_name"}"
+            @change="${this._valueChanged}"
+            >Show Entity's Name?</paper-toggle-button
+          >
+          <paper-toggle-button
+            ?checked="${this._config!.show_state !== false}"
+            .configValue="${"show_state"}"
+            @change="${this._valueChanged}"
+            >Show Entity's State Text?</paper-toggle-button
+          >
+        </div>
+      </div>
       <hui-entity-editor
         .hass="${this.hass}"
         .entities="${this._configEntities}"
         @entities-changed="${this._valueChanged}"
       ></hui-entity-editor>
-      <paper-checkbox
-        ?checked="${this._config!.show_name !== false}"
-        .configValue="${"show_name"}"
-        @change="${this._valueChanged}"
-        >Show Entity's Name?</paper-checkbox
-      >
-      <paper-checkbox
-        ?checked="${this._config!.show_state !== false}"
-        .configValue="${"show_state"}"
-        @change="${this._valueChanged}"
-        >Show Entity's State Text?</paper-checkbox
-      >
     `;
   }
 
@@ -117,17 +124,6 @@ export class HuiGlanceCardEditor extends hassLocalizeLitMixin(LitElement)
     }
     fireEvent(this, "config-changed", { config: this._config });
   }
-
-  private renderStyle(): TemplateResult {
-    return html`
-      <style>
-        paper-checkbox {
-          display: block;
-          padding-top: 16px;
-        }
-      </style>
-    `;
-  }
 }
 
 declare global {
diff --git a/src/panels/lovelace/editor/hui-edit-card.ts b/src/panels/lovelace/editor/hui-edit-card.ts
index 1814b62df8..6b7114e654 100644
--- a/src/panels/lovelace/editor/hui-edit-card.ts
+++ b/src/panels/lovelace/editor/hui-edit-card.ts
@@ -131,6 +131,7 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
                   ></hui-yaml-editor>
                 `
           }
+          <hr />
           <hui-card-preview .hass="${this.hass}"></hui-card-preview>
         </paper-dialog-scrollable>
         ${
@@ -197,7 +198,16 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
           display: none;
         }
         .element-editor {
-          margin-bottom: 16px;
+          margin-bottom: 8px;
+        }
+        hr {
+          color: #000;
+          opacity: 0.12;
+        }
+        hui-card-preview {
+          padding-top: 8px;
+          margin-bottom: 4px;
+          display: block;
         }
       </style>
     `;

From 1cc6e099531c16eee9179bed70c657cf3240bebb Mon Sep 17 00:00:00 2001
From: cdce8p <30130371+cdce8p@users.noreply.github.com>
Date: Mon, 26 Nov 2018 23:27:00 +0100
Subject: [PATCH 19/69] Add html to LitElement.prototype (#2120)

---
 src/layouts/app/home-assistant.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/layouts/app/home-assistant.js b/src/layouts/app/home-assistant.js
index 27983b1e3c..f8f5f939de 100644
--- a/src/layouts/app/home-assistant.js
+++ b/src/layouts/app/home-assistant.js
@@ -4,6 +4,7 @@ import "@polymer/iron-flex-layout/iron-flex-layout-classes";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 import { afterNextRender } from "@polymer/polymer/lib/utils/render-status";
+import { html as litHtml, LitElement } from "@polymer/lit-element";
 
 import "../home-assistant-main";
 import "../ha-init-page";
@@ -21,6 +22,8 @@ import ConnectionMixin from "./connection-mixin";
 import NotificationMixin from "./notification-mixin";
 import DisconnectToastMixin from "./disconnect-toast-mixin";
 
+LitElement.prototype.html = litHtml;
+
 const ext = (baseClass, mixins) =>
   mixins.reduceRight((base, mixin) => mixin(base), baseClass);
 

From 97f5d8e7e2b5b646fcd05bf68ae1c3539bdcdb11 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Tue, 27 Nov 2018 10:05:33 +0100
Subject: [PATCH 20/69] Move lovelace data to /src/data/lovelace.ts (#2119)

* move lovelace data

* move types

* change imports from cards
---
 .../common/data.ts => data/lovelace.ts}       | 28 +++++++++++++++++--
 .../lovelace/cards/hui-conditional-card.ts    |  3 +-
 .../lovelace/cards/hui-entities-card.ts       |  3 +-
 .../lovelace/cards/hui-entity-button-card.ts  |  3 +-
 src/panels/lovelace/cards/hui-error-card.ts   |  3 +-
 src/panels/lovelace/cards/hui-gauge-card.ts   |  3 +-
 src/panels/lovelace/cards/hui-glance-card.ts  |  3 +-
 src/panels/lovelace/cards/hui-iframe-card.ts  |  3 +-
 src/panels/lovelace/cards/hui-light-card.ts   |  3 +-
 .../lovelace/cards/hui-markdown-card.ts       |  3 +-
 src/panels/lovelace/cards/hui-picture-card.ts |  3 +-
 .../cards/hui-picture-elements-card.ts        |  3 +-
 .../lovelace/cards/hui-picture-glance-card.ts |  3 +-
 .../lovelace/cards/hui-shopping-list-card.ts  |  3 +-
 src/panels/lovelace/cards/hui-stack-card.ts   |  3 +-
 .../lovelace/cards/hui-thermostat-card.ts     |  3 +-
 .../common/generate-lovelace-config.ts        |  2 +-
 .../lovelace/components/hui-card-options.ts   |  2 +-
 .../lovelace/editor/hui-card-preview.ts       |  3 +-
 .../lovelace/editor/hui-dialog-edit-card.ts   |  2 +-
 .../lovelace/editor/hui-dialog-save-config.ts |  7 +++--
 src/panels/lovelace/editor/hui-edit-card.ts   |  4 +--
 .../lovelace/editor/hui-migrate-config.ts     |  2 +-
 src/panels/lovelace/editor/hui-yaml-editor.ts |  2 +-
 src/panels/lovelace/editor/types.ts           |  2 +-
 src/panels/lovelace/ha-panel-lovelace.js      |  3 +-
 src/panels/lovelace/types.ts                  | 21 +-------------
 27 files changed, 74 insertions(+), 49 deletions(-)
 rename src/{panels/lovelace/common/data.ts => data/lovelace.ts} (61%)

diff --git a/src/panels/lovelace/common/data.ts b/src/data/lovelace.ts
similarity index 61%
rename from src/panels/lovelace/common/data.ts
rename to src/data/lovelace.ts
index 289e277b46..9aac8076ab 100644
--- a/src/panels/lovelace/common/data.ts
+++ b/src/data/lovelace.ts
@@ -1,5 +1,29 @@
-import { HomeAssistant } from "../../../types";
-import { LovelaceConfig, LovelaceCardConfig } from "../types";
+import { HomeAssistant } from "../types";
+
+export interface LovelaceConfig {
+  _frontendAuto: boolean;
+  title?: string;
+  views: LovelaceViewConfig[];
+}
+
+export interface LovelaceViewConfig {
+  title?: string;
+  badges?: string[];
+  cards?: LovelaceCardConfig[];
+  id?: string;
+  icon?: string;
+}
+
+export interface LovelaceCardConfig {
+  id?: string;
+  type: string;
+  [key: string]: any;
+}
+
+export const fetchConfig = (hass: HomeAssistant): Promise<LovelaceConfig> =>
+  hass.callWS({
+    type: "lovelace/config",
+  });
 
 export const migrateConfig = (hass: HomeAssistant): Promise<void> =>
   hass.callWS({
diff --git a/src/panels/lovelace/cards/hui-conditional-card.ts b/src/panels/lovelace/cards/hui-conditional-card.ts
index 4646b7386b..0f2e6329cc 100644
--- a/src/panels/lovelace/cards/hui-conditional-card.ts
+++ b/src/panels/lovelace/cards/hui-conditional-card.ts
@@ -1,7 +1,8 @@
 import createCardElement from "../common/create-card-element";
 import { computeCardSize } from "../common/compute-card-size";
 import { HomeAssistant } from "../../../types";
-import { LovelaceCard, LovelaceCardConfig } from "../types";
+import { LovelaceCard } from "../types";
+import { LovelaceCardConfig } from "../../../data/lovelace";
 
 interface Condition {
   entity: string;
diff --git a/src/panels/lovelace/cards/hui-entities-card.ts b/src/panels/lovelace/cards/hui-entities-card.ts
index cbb51e71a7..182c26aac5 100644
--- a/src/panels/lovelace/cards/hui-entities-card.ts
+++ b/src/panels/lovelace/cards/hui-entities-card.ts
@@ -14,7 +14,8 @@ import { DOMAINS_HIDE_MORE_INFO } from "../../../common/const";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
 import { HomeAssistant } from "../../../types";
 import { EntityConfig, EntityRow } from "../entity-rows/types";
-import { LovelaceCard, LovelaceCardConfig, LovelaceCardEditor } from "../types";
+import { LovelaceCard, LovelaceCardEditor } from "../types";
+import { LovelaceCardConfig } from "../../../data/lovelace";
 import processConfigEntities from "../common/process-config-entities";
 import createRowElement from "../common/create-row-element";
 import computeDomain from "../../../common/entity/compute_domain";
diff --git a/src/panels/lovelace/cards/hui-entity-button-card.ts b/src/panels/lovelace/cards/hui-entity-button-card.ts
index 78c0320e26..4bc9d08e5d 100644
--- a/src/panels/lovelace/cards/hui-entity-button-card.ts
+++ b/src/panels/lovelace/cards/hui-entity-button-card.ts
@@ -18,7 +18,8 @@ import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
 import { toggleEntity } from "../common/entity/toggle-entity";
 import { HomeAssistant, LightEntity } from "../../../types";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
-import { LovelaceCard, LovelaceCardConfig } from "../types";
+import { LovelaceCard } from "../types";
+import { LovelaceCardConfig } from "../../../data/lovelace";
 import { longPress } from "../common/directives/long-press-directive";
 import { fireEvent } from "../../../common/dom/fire_event";
 
diff --git a/src/panels/lovelace/cards/hui-error-card.ts b/src/panels/lovelace/cards/hui-error-card.ts
index 6d89c406c9..4cbcedb3eb 100644
--- a/src/panels/lovelace/cards/hui-error-card.ts
+++ b/src/panels/lovelace/cards/hui-error-card.ts
@@ -1,6 +1,7 @@
 import { html, LitElement } from "@polymer/lit-element";
 
-import { LovelaceCard, LovelaceCardConfig } from "../types";
+import { LovelaceCard } from "../types";
+import { LovelaceCardConfig } from "../../../data/lovelace";
 import { TemplateResult } from "lit-html";
 
 interface Config extends LovelaceCardConfig {
diff --git a/src/panels/lovelace/cards/hui-gauge-card.ts b/src/panels/lovelace/cards/hui-gauge-card.ts
index e901f5d3cf..aea51d6419 100644
--- a/src/panels/lovelace/cards/hui-gauge-card.ts
+++ b/src/panels/lovelace/cards/hui-gauge-card.ts
@@ -6,7 +6,8 @@ import {
 } from "@polymer/lit-element";
 import { TemplateResult } from "lit-html";
 
-import { LovelaceCard, LovelaceCardConfig } from "../types";
+import { LovelaceCard } from "../types";
+import { LovelaceCardConfig } from "../../../data/lovelace";
 import { HomeAssistant } from "../../../types";
 import { fireEvent } from "../../../common/dom/fire_event";
 
diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts
index 246a0e564d..0fefb11001 100644
--- a/src/panels/lovelace/cards/hui-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-glance-card.ts
@@ -10,7 +10,8 @@ import { classMap } from "lit-html/directives/classMap";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
 import { HomeAssistant } from "../../../types";
-import { LovelaceCard, LovelaceCardConfig, LovelaceCardEditor } from "../types";
+import { LovelaceCard, LovelaceCardEditor } from "../types";
+import { LovelaceCardConfig } from "../../../data/lovelace";
 import { longPress } from "../common/directives/long-press-directive";
 import { EntityConfig } from "../entity-rows/types";
 import { toggleEntity } from "../common/entity/toggle-entity";
diff --git a/src/panels/lovelace/cards/hui-iframe-card.ts b/src/panels/lovelace/cards/hui-iframe-card.ts
index a964bcac90..93a643fc53 100644
--- a/src/panels/lovelace/cards/hui-iframe-card.ts
+++ b/src/panels/lovelace/cards/hui-iframe-card.ts
@@ -2,7 +2,8 @@ import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
 
 import "../../../components/ha-card";
 
-import { LovelaceCard, LovelaceCardConfig } from "../types";
+import { LovelaceCard } from "../types";
+import { LovelaceCardConfig } from "../../../data/lovelace";
 import { TemplateResult } from "lit-html";
 import { styleMap } from "lit-html/directives/styleMap";
 
diff --git a/src/panels/lovelace/cards/hui-light-card.ts b/src/panels/lovelace/cards/hui-light-card.ts
index 99e2c2c613..11204aa5fc 100644
--- a/src/panels/lovelace/cards/hui-light-card.ts
+++ b/src/panels/lovelace/cards/hui-light-card.ts
@@ -12,7 +12,8 @@ import { jQuery } from "../../../resources/jquery";
 import { roundSliderStyle } from "../../../resources/jquery.roundslider";
 import { HomeAssistant, LightEntity } from "../../../types";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
-import { LovelaceCard, LovelaceCardConfig } from "../types";
+import { LovelaceCard } from "../types";
+import { LovelaceCardConfig } from "../../../data/lovelace";
 import { longPress } from "../common/directives/long-press-directive";
 
 import stateIcon from "../../../common/entity/state_icon";
diff --git a/src/panels/lovelace/cards/hui-markdown-card.ts b/src/panels/lovelace/cards/hui-markdown-card.ts
index 99380293a8..e30fadaa40 100644
--- a/src/panels/lovelace/cards/hui-markdown-card.ts
+++ b/src/panels/lovelace/cards/hui-markdown-card.ts
@@ -4,7 +4,8 @@ import { classMap } from "lit-html/directives/classMap";
 import "../../../components/ha-card";
 import "../../../components/ha-markdown";
 
-import { LovelaceCard, LovelaceCardConfig } from "../types";
+import { LovelaceCard } from "../types";
+import { LovelaceCardConfig } from "../../../data/lovelace";
 import { TemplateResult } from "lit-html";
 
 interface Config extends LovelaceCardConfig {
diff --git a/src/panels/lovelace/cards/hui-picture-card.ts b/src/panels/lovelace/cards/hui-picture-card.ts
index f5744a5c7f..a638da66a2 100644
--- a/src/panels/lovelace/cards/hui-picture-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-card.ts
@@ -2,7 +2,8 @@ import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
 
 import "../../../components/ha-card";
 
-import { LovelaceCard, LovelaceCardConfig } from "../types";
+import { LovelaceCard } from "../types";
+import { LovelaceCardConfig } from "../../../data/lovelace";
 import { navigate } from "../../../common/navigate";
 import { HomeAssistant } from "../../../types";
 import { TemplateResult } from "lit-html";
diff --git a/src/panels/lovelace/cards/hui-picture-elements-card.ts b/src/panels/lovelace/cards/hui-picture-elements-card.ts
index 4d77fdaab8..16e22e1bb6 100644
--- a/src/panels/lovelace/cards/hui-picture-elements-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-elements-card.ts
@@ -3,7 +3,8 @@ import { TemplateResult } from "lit-html";
 
 import createHuiElement from "../common/create-hui-element";
 
-import { LovelaceCard, LovelaceCardConfig } from "../types";
+import { LovelaceCard } from "../types";
+import { LovelaceCardConfig } from "../../../data/lovelace";
 import { HomeAssistant } from "../../../types";
 import { LovelaceElementConfig, LovelaceElement } from "../elements/types";
 
diff --git a/src/panels/lovelace/cards/hui-picture-glance-card.ts b/src/panels/lovelace/cards/hui-picture-glance-card.ts
index 8853146118..816148aa86 100644
--- a/src/panels/lovelace/cards/hui-picture-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-glance-card.ts
@@ -5,7 +5,8 @@ import { TemplateResult } from "lit-html";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { DOMAINS_TOGGLE } from "../../../common/const";
-import { LovelaceCard, LovelaceCardConfig } from "../types";
+import { LovelaceCard } from "../types";
+import { LovelaceCardConfig } from "../../../data/lovelace";
 import { EntityConfig } from "../entity-rows/types";
 import { navigate } from "../../../common/navigate";
 import { HomeAssistant } from "../../../types";
diff --git a/src/panels/lovelace/cards/hui-shopping-list-card.ts b/src/panels/lovelace/cards/hui-shopping-list-card.ts
index 1930dfbdff..05a53d88e0 100644
--- a/src/panels/lovelace/cards/hui-shopping-list-card.ts
+++ b/src/panels/lovelace/cards/hui-shopping-list-card.ts
@@ -9,7 +9,8 @@ import "../../../components/ha-icon";
 
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
 import { HomeAssistant } from "../../../types";
-import { LovelaceCard, LovelaceCardConfig } from "../types";
+import { LovelaceCard } from "../types";
+import { LovelaceCardConfig } from "../../../data/lovelace";
 import {
   fetchItems,
   completeItem,
diff --git a/src/panels/lovelace/cards/hui-stack-card.ts b/src/panels/lovelace/cards/hui-stack-card.ts
index cf2820cdc8..f246ed8c74 100644
--- a/src/panels/lovelace/cards/hui-stack-card.ts
+++ b/src/panels/lovelace/cards/hui-stack-card.ts
@@ -3,7 +3,8 @@ import { TemplateResult } from "lit-html";
 
 import createCardElement from "../common/create-card-element";
 
-import { LovelaceCard, LovelaceCardConfig } from "../types";
+import { LovelaceCard } from "../types";
+import { LovelaceCardConfig } from "../../../data/lovelace";
 import { HomeAssistant } from "../../../types";
 
 interface Config extends LovelaceCardConfig {
diff --git a/src/panels/lovelace/cards/hui-thermostat-card.ts b/src/panels/lovelace/cards/hui-thermostat-card.ts
index e39376c32a..c2f5f5fab4 100644
--- a/src/panels/lovelace/cards/hui-thermostat-card.ts
+++ b/src/panels/lovelace/cards/hui-thermostat-card.ts
@@ -15,7 +15,8 @@ import { hasConfigOrEntityChanged } from "../common/has-changed";
 import { roundSliderStyle } from "../../../resources/jquery.roundslider";
 import { HomeAssistant, ClimateEntity } from "../../../types";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
-import { LovelaceCard, LovelaceCardConfig } from "../types";
+import { LovelaceCard } from "../types";
+import { LovelaceCardConfig } from "../../../data/lovelace";
 
 import "../../../components/ha-card";
 import "../../../components/ha-icon";
diff --git a/src/panels/lovelace/common/generate-lovelace-config.ts b/src/panels/lovelace/common/generate-lovelace-config.ts
index 6109b96fef..ec53061460 100644
--- a/src/panels/lovelace/common/generate-lovelace-config.ts
+++ b/src/panels/lovelace/common/generate-lovelace-config.ts
@@ -3,7 +3,7 @@ import {
   LovelaceConfig,
   LovelaceCardConfig,
   LovelaceViewConfig,
-} from "../types";
+} from "../../../data/lovelace";
 import { HassEntity, HassEntities } from "home-assistant-js-websocket";
 import extractViews from "../../../common/entity/extract_views";
 import getViewEntities from "../../../common/entity/get_view_entities";
diff --git a/src/panels/lovelace/components/hui-card-options.ts b/src/panels/lovelace/components/hui-card-options.ts
index 8cc1ab6a85..5b8126e206 100644
--- a/src/panels/lovelace/components/hui-card-options.ts
+++ b/src/panels/lovelace/components/hui-card-options.ts
@@ -6,7 +6,7 @@ import {
   registerEditCardDialog,
 } from "../editor/hui-dialog-edit-card";
 import { HomeAssistant } from "../../../types";
-import { LovelaceCardConfig } from "../types";
+import { LovelaceCardConfig } from "../../../data/lovelace";
 
 declare global {
   // for fire event
diff --git a/src/panels/lovelace/editor/hui-card-preview.ts b/src/panels/lovelace/editor/hui-card-preview.ts
index 31617da87d..4cedeec537 100644
--- a/src/panels/lovelace/editor/hui-card-preview.ts
+++ b/src/panels/lovelace/editor/hui-card-preview.ts
@@ -3,7 +3,8 @@ import "@polymer/paper-input/paper-textarea";
 import createCardElement from "../common/create-card-element";
 import createErrorCardConfig from "../common/create-error-card-config";
 import { HomeAssistant } from "../../../types";
-import { LovelaceCard, LovelaceCardConfig } from "../types";
+import { LovelaceCardConfig } from "../../../data/lovelace";
+import { LovelaceCard } from "../types";
 import { ConfigError } from "./types";
 
 const CUSTOM_TYPE_PREFIX = "custom:";
diff --git a/src/panels/lovelace/editor/hui-dialog-edit-card.ts b/src/panels/lovelace/editor/hui-dialog-edit-card.ts
index 741ac97497..7907098a47 100644
--- a/src/panels/lovelace/editor/hui-dialog-edit-card.ts
+++ b/src/panels/lovelace/editor/hui-dialog-edit-card.ts
@@ -3,7 +3,7 @@ import { TemplateResult } from "lit-html";
 
 import { HomeAssistant } from "../../../types";
 import { fireEvent, HASSDomEvent } from "../../../common/dom/fire_event";
-import { LovelaceCardConfig } from "../types";
+import { LovelaceCardConfig } from "../../../data/lovelace";
 import "./hui-edit-card";
 import "./hui-migrate-config";
 
diff --git a/src/panels/lovelace/editor/hui-dialog-save-config.ts b/src/panels/lovelace/editor/hui-dialog-save-config.ts
index de759c54cf..9b7bc343ff 100644
--- a/src/panels/lovelace/editor/hui-dialog-save-config.ts
+++ b/src/panels/lovelace/editor/hui-dialog-save-config.ts
@@ -9,9 +9,12 @@ import { PaperDialogElement } from "@polymer/paper-dialog/paper-dialog";
 import "@polymer/paper-button/paper-button";
 
 import { HomeAssistant } from "../../../types";
-import { LovelaceConfig } from "../types";
 
-import { saveConfig, migrateConfig } from "../common/data";
+import {
+  saveConfig,
+  migrateConfig,
+  LovelaceConfig,
+} from "../../../data/lovelace";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
 
diff --git a/src/panels/lovelace/editor/hui-edit-card.ts b/src/panels/lovelace/editor/hui-edit-card.ts
index 6b7114e654..5e69084d92 100644
--- a/src/panels/lovelace/editor/hui-edit-card.ts
+++ b/src/panels/lovelace/editor/hui-edit-card.ts
@@ -12,7 +12,7 @@ import "@polymer/paper-button/paper-button";
 import "@polymer/paper-input/paper-textarea";
 import "@polymer/paper-dialog-scrollable/paper-dialog-scrollable";
 import { HomeAssistant } from "../../../types";
-import { updateCardConfig } from "../common/data";
+import { updateCardConfig, LovelaceCardConfig } from "../../../data/lovelace";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
 
@@ -21,7 +21,7 @@ import "./hui-card-preview";
 // This is not a duplicate import, one is for types, one is for element.
 // tslint:disable-next-line
 import { HuiCardPreview } from "./hui-card-preview";
-import { LovelaceCardEditor, LovelaceCardConfig } from "../types";
+import { LovelaceCardEditor } from "../types";
 import { YamlChangedEvent, ConfigValue, ConfigError } from "./types";
 import { extYamlSchema } from "./yaml-ext-schema";
 import { EntityConfig } from "../entity-rows/types";
diff --git a/src/panels/lovelace/editor/hui-migrate-config.ts b/src/panels/lovelace/editor/hui-migrate-config.ts
index 078a8a53cc..63d42786d6 100644
--- a/src/panels/lovelace/editor/hui-migrate-config.ts
+++ b/src/panels/lovelace/editor/hui-migrate-config.ts
@@ -11,7 +11,7 @@ import { fireEvent } from "../../../common/dom/fire_event";
 
 import { HomeAssistant } from "../../../types";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
-import { migrateConfig } from "../common/data";
+import { migrateConfig } from "../../../data/lovelace";
 
 export class HuiMigrateConfig extends hassLocalizeLitMixin(LitElement) {
   protected hass?: HomeAssistant;
diff --git a/src/panels/lovelace/editor/hui-yaml-editor.ts b/src/panels/lovelace/editor/hui-yaml-editor.ts
index da8f322cbf..6dcb47b70c 100644
--- a/src/panels/lovelace/editor/hui-yaml-editor.ts
+++ b/src/panels/lovelace/editor/hui-yaml-editor.ts
@@ -5,7 +5,7 @@ import "@polymer/paper-spinner/paper-spinner";
 
 import { HomeAssistant } from "../../../types";
 import { fireEvent } from "../../../common/dom/fire_event";
-import { getCardConfig } from "../common/data";
+import { getCardConfig } from "../../../data/lovelace";
 
 export class HuiYAMLEditor extends LitElement {
   public cardId?: string;
diff --git a/src/panels/lovelace/editor/types.ts b/src/panels/lovelace/editor/types.ts
index c89ab3e10a..8c929f37a5 100644
--- a/src/panels/lovelace/editor/types.ts
+++ b/src/panels/lovelace/editor/types.ts
@@ -1,4 +1,4 @@
-import { LovelaceCardConfig } from "../types";
+import { LovelaceCardConfig } from "../../../data/lovelace";
 import { EntityConfig } from "../entity-rows/types";
 
 export interface YamlChangedEvent extends Event {
diff --git a/src/panels/lovelace/ha-panel-lovelace.js b/src/panels/lovelace/ha-panel-lovelace.js
index 2e7f4237de..c7b8fa27a8 100644
--- a/src/panels/lovelace/ha-panel-lovelace.js
+++ b/src/panels/lovelace/ha-panel-lovelace.js
@@ -3,6 +3,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import "@polymer/paper-button/paper-button";
 
 import { registerSaveDialog } from "./editor/hui-dialog-save-config";
+import { fetchConfig } from "../../data/lovelace";
 import "../../layouts/hass-loading-screen";
 import "../../layouts/hass-error-screen";
 import "./hui-root";
@@ -114,7 +115,7 @@ class Lovelace extends localizeMixin(PolymerElement) {
 
   async _fetchConfig() {
     try {
-      const conf = await this.hass.callWS({ type: "lovelace/config" });
+      const conf = await fetchConfig(this.hass);
       this.setProperties({
         _config: conf,
         _state: "loaded",
diff --git a/src/panels/lovelace/types.ts b/src/panels/lovelace/types.ts
index 6ebd271676..141f12c86f 100644
--- a/src/panels/lovelace/types.ts
+++ b/src/panels/lovelace/types.ts
@@ -1,24 +1,5 @@
 import { HomeAssistant } from "../../types";
-
-export interface LovelaceCardConfig {
-  id?: string;
-  type: string;
-  [key: string]: any;
-}
-
-export interface LovelaceViewConfig {
-  title?: string;
-  badges?: string[];
-  cards?: LovelaceCardConfig[];
-  id?: string;
-  icon?: string;
-}
-
-export interface LovelaceConfig {
-  _frontendAuto: boolean;
-  title?: string;
-  views: LovelaceViewConfig[];
-}
+import { LovelaceCardConfig } from "../../data/lovelace";
 
 export interface LovelaceCard extends HTMLElement {
   hass?: HomeAssistant;

From 4487c3dc1a99ca55868a58d428cba91f13b322ca Mon Sep 17 00:00:00 2001
From: Zack Arnett <arnett.zackary@gmail.com>
Date: Tue, 27 Nov 2018 11:17:59 -0500
Subject: [PATCH 21/69] Removes Height, Light Width and Line Color from Sensor
 (#2122)

* Sensor fix

* SVG prettified - Use Accent Color only - Dont Calc height

* Prettier
---
 src/panels/lovelace/cards/hui-sensor-card.js | 26 +++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-sensor-card.js b/src/panels/lovelace/cards/hui-sensor-card.js
index 58890b3b50..58a8c96574 100755
--- a/src/panels/lovelace/cards/hui-sensor-card.js
+++ b/src/panels/lovelace/cards/hui-sensor-card.js
@@ -42,15 +42,11 @@ class HuiSensorCard extends EventsMixin(LitElement) {
     const cardConfig = {
       detail: 1,
       icon: false,
-      height: 100,
       hours_to_show: 24,
-      line_color: "var(--accent-color)",
-      line_width: 5,
       ...config,
     };
     cardConfig.hours_to_show = Number(cardConfig.hours_to_show);
     cardConfig.height = Number(cardConfig.height);
-    cardConfig.line_width = Number(cardConfig.line_width);
     cardConfig.detail =
       cardConfig.detail === 1 || cardConfig.detail === 2
         ? cardConfig.detail
@@ -64,7 +60,7 @@ class HuiSensorCard extends EventsMixin(LitElement) {
     return change;
   }
 
-  render({ _config, _entity, _line } = this) {
+  render({ _entity, _line } = this) {
     return html`
       ${this._style()}
       <ha-card @click="${this._handleClick}">
@@ -85,11 +81,17 @@ class HuiSensorCard extends EventsMixin(LitElement) {
             ${
               _line
                 ? svg`
-            <svg width='100%' height='100%' viewBox='0 0 500 ${_config.height}'>
-              <path d=${_line} fill='none' stroke=${_config.line_color}
-                stroke-width=${_config.line_width}
-                stroke-linecap='round' stroke-linejoin='round' />
-            </svg>`
+                    <svg width="100%" height="100%" viewBox="0 0 500 100">
+                      <path
+                        d="${_line}"
+                        fill="none"
+                        stroke="var(--accent-color)"
+                        stroke-width="5"
+                        stroke-linecap="round"
+                        stroke-linejoin="round"
+                      />
+                    </svg>
+                  `
                 : ""
             }
           </div>
@@ -144,8 +146,8 @@ class HuiSensorCard extends EventsMixin(LitElement) {
 
   _calcPoints(history, hours, width, detail = 1) {
     const coords = [];
-    const margin = this._config.line_width;
-    const height = this._config.height - margin * 4;
+    const margin = 5;
+    const height = 80;
     width -= margin * 2;
     let yRatio = (this._max - this._min) / height;
     yRatio = yRatio !== 0 ? yRatio : height;

From ffc7f9706dca41e679d440c682fd94bb84047be5 Mon Sep 17 00:00:00 2001
From: Zack Arnett <arnett.zackary@gmail.com>
Date: Tue, 27 Nov 2018 11:48:41 -0500
Subject: [PATCH 22/69] Update Aspect Ratio on Map card (#2126)

* Update Aspect Ratio

* Update Card Size
---
 src/panels/lovelace/cards/hui-map-card.js | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-map-card.js b/src/panels/lovelace/cards/hui-map-card.js
index d49686e2c4..76034be484 100644
--- a/src/panels/lovelace/cards/hui-map-card.js
+++ b/src/panels/lovelace/cards/hui-map-card.js
@@ -10,6 +10,7 @@ import processConfigEntities from "../common/process-config-entities";
 import computeStateDomain from "../../../common/entity/compute_state_domain";
 import computeStateName from "../../../common/entity/compute_state_name";
 import debounce from "../../../common/util/debounce";
+import parseAspectRatio from "../../../common/util/parse-aspect-ratio";
 
 Leaflet.Icon.Default.imagePath = "/static/images/leaflet";
 
@@ -97,7 +98,15 @@ class HuiMapCard extends PolymerElement {
       return;
     }
 
-    this.$.root.style.paddingTop = this._config.aspect_ratio || "100%";
+    const ratio = parseAspectRatio(this._config.aspect_ratio);
+
+    if (ratio && ratio.w > 0 && ratio.h > 0) {
+      this.$.root.style.paddingBottom = `${((100 * ratio.h) / ratio.w).toFixed(
+        2
+      )}%`;
+    } else {
+      this.$.root.style.paddingBottom = "100%";
+    }
   }
 
   setConfig(config) {
@@ -110,8 +119,13 @@ class HuiMapCard extends PolymerElement {
   }
 
   getCardSize() {
-    let ar = this._config.aspect_ratio || "100%";
-    ar = ar.substr(0, ar.length - 1);
+    const ratio = parseAspectRatio(this._config.aspect_ratio);
+    let ar;
+    if (ratio && ratio.w > 0 && ratio.h > 0) {
+      ar = `${((100 * ratio.h) / ratio.w).toFixed(2)}`;
+    } else {
+      ar = "100";
+    }
     return 1 + Math.floor(ar / 25) || 3;
   }
 

From 8757dbb66408f5dc9bbe3ed60f9ab8179285483c Mon Sep 17 00:00:00 2001
From: Zack Arnett <arnett.zackary@gmail.com>
Date: Tue, 27 Nov 2018 14:22:53 -0500
Subject: [PATCH 23/69] Plant add name (#2130)

---
 src/cards/ha-plant-card.js                           | 3 ++-
 src/panels/lovelace/cards/hui-legacy-wrapper-card.js | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/cards/ha-plant-card.js b/src/cards/ha-plant-card.js
index 2cb91c762d..f1a4fcbbdd 100644
--- a/src/cards/ha-plant-card.js
+++ b/src/cards/ha-plant-card.js
@@ -103,6 +103,7 @@ class HaPlantCard extends EventsMixin(PolymerElement) {
     return {
       hass: Object,
       stateObj: Object,
+      config: Object,
     };
   }
 
@@ -118,7 +119,7 @@ class HaPlantCard extends EventsMixin(PolymerElement) {
   }
 
   computeTitle(stateObj) {
-    return computeStateName(stateObj);
+    return this.config.name || computeStateName(stateObj);
   }
 
   computeAttributes(data) {
diff --git a/src/panels/lovelace/cards/hui-legacy-wrapper-card.js b/src/panels/lovelace/cards/hui-legacy-wrapper-card.js
index b9957c41bb..cdd4de0554 100644
--- a/src/panels/lovelace/cards/hui-legacy-wrapper-card.js
+++ b/src/panels/lovelace/cards/hui-legacy-wrapper-card.js
@@ -34,6 +34,7 @@ export default class LegacyWrapperCard extends HTMLElement {
       this._ensureElement(this._tag);
       this.lastChild.hass = hass;
       this.lastChild.stateObj = hass.states[entityId];
+      this.lastChild.config = this._config;
     } else {
       this._ensureElement("HUI-ERROR-CARD");
       this.lastChild.setConfig(

From f04f58ac882d41d71c4c4fce09f3bd11e01447da Mon Sep 17 00:00:00 2001
From: Zack Arnett <arnett.zackary@gmail.com>
Date: Tue, 27 Nov 2018 14:25:52 -0500
Subject: [PATCH 24/69] Change Title to Name (#2129)

---
 src/panels/lovelace/cards/hui-alarm-panel-card.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-alarm-panel-card.js b/src/panels/lovelace/cards/hui-alarm-panel-card.js
index 49015fbf1a..3d1e858f43 100644
--- a/src/panels/lovelace/cards/hui-alarm-panel-card.js
+++ b/src/panels/lovelace/cards/hui-alarm-panel-card.js
@@ -209,8 +209,8 @@ class HuiAlarmPanelCard extends LocalizeMixin(EventsMixin(PolymerElement)) {
 
   _computeHeader(localize, stateObj) {
     if (!stateObj) return "";
-    return this._config.title
-      ? this._config.title
+    return this._config.name
+      ? this._config.name
       : this._label(localize, stateObj.state);
   }
 

From d2741af24b39e0d5fe8a0c59de93e9a9c99b8c1a Mon Sep 17 00:00:00 2001
From: Zack Arnett <arnett.zackary@gmail.com>
Date: Tue, 27 Nov 2018 14:26:56 -0500
Subject: [PATCH 25/69] Add name to config (#2128)

---
 src/panels/lovelace/cards/hui-thermostat-card.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/panels/lovelace/cards/hui-thermostat-card.ts b/src/panels/lovelace/cards/hui-thermostat-card.ts
index c2f5f5fab4..792f68134f 100644
--- a/src/panels/lovelace/cards/hui-thermostat-card.ts
+++ b/src/panels/lovelace/cards/hui-thermostat-card.ts
@@ -47,6 +47,7 @@ const modeIcons = {
 interface Config extends LovelaceCardConfig {
   entity: string;
   theme?: string;
+  name?: string;
 }
 
 function formatTemp(temps: string[]): string {
@@ -97,7 +98,8 @@ export class HuiThermostatCard extends hassLocalizeLitMixin(LitElement)
         <div id="root">
           <div id="thermostat"></div>
           <div id="tooltip">
-            <div class="title">${computeStateName(stateObj)}</div>
+            <div class="title">${this._config.name ||
+              computeStateName(stateObj)}</div>
             <div class="current-temperature">
               <span class="current-temperature-text">
                 ${stateObj.attributes.current_temperature}

From bf69c8ce4680b46ea6b304227d7f76e780db7048 Mon Sep 17 00:00:00 2001
From: Zack Arnett <arnett.zackary@gmail.com>
Date: Tue, 27 Nov 2018 14:30:22 -0500
Subject: [PATCH 26/69] Title to Name (#2127)

---
 src/panels/lovelace/cards/hui-gauge-card.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-gauge-card.ts b/src/panels/lovelace/cards/hui-gauge-card.ts
index aea51d6419..d19610d33f 100644
--- a/src/panels/lovelace/cards/hui-gauge-card.ts
+++ b/src/panels/lovelace/cards/hui-gauge-card.ts
@@ -10,16 +10,17 @@ import { LovelaceCard } from "../types";
 import { LovelaceCardConfig } from "../../../data/lovelace";
 import { HomeAssistant } from "../../../types";
 import { fireEvent } from "../../../common/dom/fire_event";
+import { hasConfigOrEntityChanged } from "../common/has-changed";
 
 import isValidEntityId from "../../../common/entity/valid_entity_id";
 import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
-import { hasConfigOrEntityChanged } from "../common/has-changed";
+import computeStateName from "../../../common/entity/compute_state_name";
 
 import "../../../components/ha-card";
 
 interface Config extends LovelaceCardConfig {
   entity: string;
-  title?: string;
+  name?: string;
   unit_of_measurement?: string;
   min?: number;
   max?: number;
@@ -93,7 +94,9 @@ class HuiGaugeCard extends LitElement implements LovelaceCard {
                           ""
                       }
                     </div>
-                    <div id="title">${this._config.title}</div>
+                    <div id="name">
+                      ${this._config.name || computeStateName(stateObj)}
+                    </div>
                   </div>
                 </div>
               `
@@ -211,7 +214,7 @@ class HuiGaugeCard extends LitElement implements LovelaceCard {
         .gauge-data #percent {
           font-size: calc(var(--base-unit) * 0.55);
         }
-        .gauge-data #title {
+        .gauge-data #name {
           padding-top: calc(var(--base-unit) * 0.15);
           font-size: calc(var(--base-unit) * 0.3);
         }

From b37ea482d312c54528c8b425b5ba08270d4f2a5d Mon Sep 17 00:00:00 2001
From: Zack Arnett <arnett.zackary@gmail.com>
Date: Tue, 27 Nov 2018 15:06:51 -0500
Subject: [PATCH 27/69] Add name variable - Weather Card (#2131)

* Add name variable

* Update to state name
---
 src/cards/ha-weather-card.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/cards/ha-weather-card.js b/src/cards/ha-weather-card.js
index 163663923f..bb87f7f9e5 100644
--- a/src/cards/ha-weather-card.js
+++ b/src/cards/ha-weather-card.js
@@ -1,6 +1,8 @@
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 
+import { computeStateName } from "../common/entity/compute_state_name";
+
 import "../components/ha-card";
 import "../components/ha-icon";
 
@@ -106,7 +108,7 @@ class HaWeatherCard extends LocalizeMixin(EventsMixin(PolymerElement)) {
       <ha-card>
         <div class="header">
           [[computeState(stateObj.state, localize)]]
-          <div class="name">[[stateObj.attributes.friendly_name]]</div>
+          <div class="name">[[computeName(stateObj)]]</div>
         </div>
         <div class="content">
           <div class="now">
@@ -271,6 +273,10 @@ class HaWeatherCard extends LocalizeMixin(EventsMixin(PolymerElement)) {
     return localize(`state.weather.${state}`) || state;
   }
 
+  computeName(stateObj) {
+    return this.config.name || computeStateName(stateObj);
+  }
+
   showWeatherIcon(condition) {
     return condition in this.weatherIcons;
   }

From 230ec51de5ae27490d22a7498522a702ba876832 Mon Sep 17 00:00:00 2001
From: Zack Arnett <arnett.zackary@gmail.com>
Date: Tue, 27 Nov 2018 15:35:41 -0500
Subject: [PATCH 28/69] Fixes: #2084 : Fix for extra padding (#2133)

* Fix for extra padding

* Easy fix
---
 src/components/ha-cards.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ha-cards.js b/src/components/ha-cards.js
index 587b41a0d7..f88e1bb72e 100644
--- a/src/components/ha-cards.js
+++ b/src/components/ha-cards.js
@@ -123,7 +123,7 @@ class HaCards extends PolymerElement {
       </style>
 
       <div id="main">
-        <template is="dom-if" if="[[cards.badges]]">
+        <template is="dom-if" if="[[cards.badges.length]]">
           <div class="badges">
             <template is="dom-if" if="[[cards.demo]]">
               <ha-demo-badge></ha-demo-badge>

From 49be2ad0137e61ed7b1cdf2e612d25cb61162d6f Mon Sep 17 00:00:00 2001
From: Zack Arnett <arnett.zackary@gmail.com>
Date: Tue, 27 Nov 2018 21:49:22 -0500
Subject: [PATCH 29/69] Unit PAtch (#2134)

---
 src/panels/lovelace/cards/hui-gauge-card.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-gauge-card.ts b/src/panels/lovelace/cards/hui-gauge-card.ts
index d19610d33f..65508b542e 100644
--- a/src/panels/lovelace/cards/hui-gauge-card.ts
+++ b/src/panels/lovelace/cards/hui-gauge-card.ts
@@ -21,7 +21,7 @@ import "../../../components/ha-card";
 interface Config extends LovelaceCardConfig {
   entity: string;
   name?: string;
-  unit_of_measurement?: string;
+  unit?: string;
   min?: number;
   max?: number;
   severity?: object;
@@ -89,7 +89,7 @@ class HuiGaugeCard extends LitElement implements LovelaceCard {
                     <div id="percent">
                       ${stateObj.state}
                       ${
-                        this._config.unit_of_measurement ||
+                        this._config.unit ||
                           stateObj.attributes.unit_of_measurement ||
                           ""
                       }

From afe9056725f77d8ae0b16704016d5f43d62d984f Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Wed, 28 Nov 2018 03:14:45 -0600
Subject: [PATCH 30/69] Combine edit and complete shopping-list calls (#2135)

---
 src/data/shopping-list.ts                     | 20 ++++++-------------
 .../lovelace/cards/hui-shopping-list-card.ts  | 15 +++++++-------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/src/data/shopping-list.ts b/src/data/shopping-list.ts
index ff156469d4..db9dd35709 100644
--- a/src/data/shopping-list.ts
+++ b/src/data/shopping-list.ts
@@ -11,26 +11,18 @@ export const fetchItems = (hass: HomeAssistant): Promise<ShoppingListItem[]> =>
     type: "shopping_list/items",
   });
 
-export const saveEdit = (
+export const updateItem = (
   hass: HomeAssistant,
   itemId: number,
-  name: string
+  item: {
+    name?: string;
+    complete?: boolean;
+  }
 ): Promise<ShoppingListItem> =>
   hass.callWS({
     type: "shopping_list/items/update",
     item_id: itemId,
-    name,
-  });
-
-export const completeItem = (
-  hass: HomeAssistant,
-  itemId: number,
-  complete: boolean
-): Promise<void> =>
-  hass.callWS({
-    type: "shopping_list/items/update",
-    item_id: itemId,
-    complete,
+    ...item,
   });
 
 export const clearItems = (hass: HomeAssistant): Promise<void> =>
diff --git a/src/panels/lovelace/cards/hui-shopping-list-card.ts b/src/panels/lovelace/cards/hui-shopping-list-card.ts
index 05a53d88e0..547386901b 100644
--- a/src/panels/lovelace/cards/hui-shopping-list-card.ts
+++ b/src/panels/lovelace/cards/hui-shopping-list-card.ts
@@ -13,8 +13,7 @@ import { LovelaceCard } from "../types";
 import { LovelaceCardConfig } from "../../../data/lovelace";
 import {
   fetchItems,
-  completeItem,
-  saveEdit,
+  updateItem,
   ShoppingListItem,
   clearItems,
   addItem,
@@ -257,15 +256,15 @@ class HuiShoppingListCard extends hassLocalizeLitMixin(LitElement)
   }
 
   private _completeItem(ev): void {
-    completeItem(this.hass!, ev.target.itemId, ev.target.checked).catch(() =>
-      this._fetchData()
-    );
+    updateItem(this.hass!, ev.target.itemId, {
+      complete: ev.target.checked,
+    }).catch(() => this._fetchData());
   }
 
   private _saveEdit(ev): void {
-    saveEdit(this.hass!, ev.target.itemId, ev.target.value).catch(() =>
-      this._fetchData()
-    );
+    updateItem(this.hass!, ev.target.itemId, {
+      name: ev.target.value,
+    }).catch(() => this._fetchData());
 
     ev.target.blur();
   }

From 7a0b2060d40b36bfb83090be22f84a7b407f1cba Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 28 Nov 2018 12:34:53 +0100
Subject: [PATCH 31/69] Add delete card func (#2116)

* Add delete card button

* Add delete card button

* fix the non-sense

* lovelace data was moved
---
 src/data/lovelace.ts                          |  9 ++++++
 .../lovelace/components/hui-card-options.ts   | 30 +++++++++++++++++--
 src/panels/lovelace/editor/delete-card.ts     | 18 +++++++++++
 .../lovelace/editor/hui-dialog-edit-card.ts   |  2 +-
 .../lovelace/editor/hui-migrate-config.ts     |  1 +
 5 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 src/panels/lovelace/editor/delete-card.ts

diff --git a/src/data/lovelace.ts b/src/data/lovelace.ts
index 9aac8076ab..f7b3a461bb 100644
--- a/src/data/lovelace.ts
+++ b/src/data/lovelace.ts
@@ -62,3 +62,12 @@ export const updateCardConfig = (
     card_config: config,
     format: configFormat,
   });
+
+export const deleteCard = (
+  hass: HomeAssistant,
+  cardId: string
+): Promise<void> =>
+  hass.callWS({
+    type: "lovelace/config/card/delete",
+    card_id: cardId,
+  });
diff --git a/src/panels/lovelace/components/hui-card-options.ts b/src/panels/lovelace/components/hui-card-options.ts
index 5b8126e206..9f8ced06c4 100644
--- a/src/panels/lovelace/components/hui-card-options.ts
+++ b/src/panels/lovelace/components/hui-card-options.ts
@@ -5,6 +5,8 @@ import {
   showEditCardDialog,
   registerEditCardDialog,
 } from "../editor/hui-dialog-edit-card";
+
+import { confDeleteCard } from "../editor/delete-card";
 import { HomeAssistant } from "../../../types";
 import { LovelaceCardConfig } from "../../../data/lovelace";
 
@@ -52,17 +54,39 @@ export class HuiCardOptions extends LitElement {
           color: var(--primary-color);
           font-weight: 500;
         }
+        paper-button.warning:not([disabled]) {
+          color: var(--google-red-500);
+        }
       </style>
       <slot></slot>
-      <div><paper-button @click="${this._editCard}">EDIT</paper-button></div>
+      <div>
+        <paper-button class="warning" @click="${this._deleteCard}"
+          >DELETE</paper-button
+        ><paper-button @click="${this._editCard}">EDIT</paper-button>
+      </div>
     `;
   }
-  private _editCard() {
+  private _editCard(): void {
+    if (!this.cardConfig) {
+      return;
+    }
     showEditCardDialog(this, {
-      cardConfig: this.cardConfig!,
+      cardConfig: this.cardConfig,
       reloadLovelace: () => fireEvent(this, "config-refresh"),
     });
   }
+  private _deleteCard(): void {
+    if (!this.cardConfig) {
+      return;
+    }
+    if (!this.cardConfig.id) {
+      this._editCard();
+      return;
+    }
+    confDeleteCard(this.hass!, this.cardConfig.id, () =>
+      fireEvent(this, "config-refresh")
+    );
+  }
 }
 
 declare global {
diff --git a/src/panels/lovelace/editor/delete-card.ts b/src/panels/lovelace/editor/delete-card.ts
new file mode 100644
index 0000000000..9a2ed8fd6e
--- /dev/null
+++ b/src/panels/lovelace/editor/delete-card.ts
@@ -0,0 +1,18 @@
+import { deleteCard } from "../../../data/lovelace";
+import { HomeAssistant } from "../../../types";
+
+export async function confDeleteCard(
+  hass: HomeAssistant,
+  cardId: string,
+  reloadLovelace: () => void
+): Promise<void> {
+  if (!confirm("Are you sure you want to delete this card?")) {
+    return;
+  }
+  try {
+    await deleteCard(hass, cardId);
+    reloadLovelace();
+  } catch (err) {
+    alert(`Deleting failed: ${err.message}`);
+  }
+}
diff --git a/src/panels/lovelace/editor/hui-dialog-edit-card.ts b/src/panels/lovelace/editor/hui-dialog-edit-card.ts
index 7907098a47..a686e91b82 100644
--- a/src/panels/lovelace/editor/hui-dialog-edit-card.ts
+++ b/src/panels/lovelace/editor/hui-dialog-edit-card.ts
@@ -46,7 +46,7 @@ export class HuiDialogEditCard extends LitElement {
   static get properties(): PropertyDeclarations {
     return {
       hass: {},
-      _cardConfig: {},
+      _params: {},
     };
   }
 
diff --git a/src/panels/lovelace/editor/hui-migrate-config.ts b/src/panels/lovelace/editor/hui-migrate-config.ts
index 63d42786d6..e9f32f52e1 100644
--- a/src/panels/lovelace/editor/hui-migrate-config.ts
+++ b/src/panels/lovelace/editor/hui-migrate-config.ts
@@ -95,6 +95,7 @@ export class HuiMigrateConfig extends hassLocalizeLitMixin(LitElement) {
     try {
       await migrateConfig(this.hass!);
       this._closeDialog();
+      this._migrating = false;
       fireEvent(this, "reload-lovelace");
     } catch (err) {
       alert(`Migration failed: ${err.message}`);

From c02b7a33fe8346bb42c2017326a9ce58a5004e7a Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Wed, 28 Nov 2018 20:59:14 -0600
Subject: [PATCH 32/69] Resolve warning (#2142)

---
 src/cards/ha-weather-card.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cards/ha-weather-card.js b/src/cards/ha-weather-card.js
index bb87f7f9e5..ef9e086c02 100644
--- a/src/cards/ha-weather-card.js
+++ b/src/cards/ha-weather-card.js
@@ -1,7 +1,7 @@
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 
-import { computeStateName } from "../common/entity/compute_state_name";
+import computeStateName from "../common/entity/compute_state_name";
 
 import "../components/ha-card";
 import "../components/ha-icon";

From 913cd2b3d49b6c428be9881c8f2c0cc431eed6c2 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Thu, 29 Nov 2018 11:24:30 +0100
Subject: [PATCH 33/69] Automatically detect plants (#2146)

---
 src/panels/lovelace/common/generate-lovelace-config.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/panels/lovelace/common/generate-lovelace-config.ts b/src/panels/lovelace/common/generate-lovelace-config.ts
index ec53061460..1be6e0bfba 100644
--- a/src/panels/lovelace/common/generate-lovelace-config.ts
+++ b/src/panels/lovelace/common/generate-lovelace-config.ts
@@ -52,6 +52,11 @@ const computeCards = (
         type: "media-control",
         entity: entityId,
       });
+    } else if (domain === "plant") {
+      cards.push({
+        type: "plant-status",
+        entity: entityId,
+      });
     } else if (domain === "weather") {
       cards.push({
         type: "weather-forecast",

From 8ecfd9780f6d21ca1e9f13033d7595b4c136c624 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Thu, 29 Nov 2018 04:52:22 -0600
Subject: [PATCH 34/69] Convert hui-entities-toggle to TypeScript/LitElement
 (#2144)

* Convert hui-entities-toggle to TypeScript/LitElement

* Assign types to _callService
---
 .../components/hui-entities-toggle.js         | 60 -------------
 .../components/hui-entities-toggle.ts         | 84 +++++++++++++++++++
 2 files changed, 84 insertions(+), 60 deletions(-)
 delete mode 100644 src/panels/lovelace/components/hui-entities-toggle.js
 create mode 100644 src/panels/lovelace/components/hui-entities-toggle.ts

diff --git a/src/panels/lovelace/components/hui-entities-toggle.js b/src/panels/lovelace/components/hui-entities-toggle.js
deleted file mode 100644
index 9b52a8bc1d..0000000000
--- a/src/panels/lovelace/components/hui-entities-toggle.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import { html } from "@polymer/polymer/lib/utils/html-tag";
-import { PolymerElement } from "@polymer/polymer/polymer-element";
-import "@polymer/paper-toggle-button/paper-toggle-button";
-
-import { DOMAINS_TOGGLE } from "../../../common/const";
-import { turnOnOffEntities } from "../common/entity/turn-on-off-entities";
-
-class HuiEntitiesToggle extends PolymerElement {
-  static get template() {
-    return html`
-      <style>
-        :host {
-          width: 38px;
-          display: block;
-        }
-        paper-toggle-button {
-          cursor: pointer;
-          --paper-toggle-button-label-spacing: 0;
-          padding: 13px 5px;
-          margin: -4px -5px;
-        }
-      </style>
-      <template is="dom-if" if="[[_toggleEntities.length]]">
-        <paper-toggle-button
-          checked="[[_computeIsChecked(hass, _toggleEntities)]]"
-          on-change="_callService"
-        ></paper-toggle-button>
-      </template>
-    `;
-  }
-
-  static get properties() {
-    return {
-      hass: Object,
-      entities: Array,
-      _toggleEntities: {
-        type: Array,
-        computed: "_computeToggleEntities(hass, entities)",
-      },
-    };
-  }
-
-  _computeToggleEntities(hass, entityIds) {
-    return entityIds.filter(
-      (entityId) =>
-        entityId in hass.states && DOMAINS_TOGGLE.has(entityId.split(".", 1)[0])
-    );
-  }
-
-  _computeIsChecked(hass, entityIds) {
-    return entityIds.some((entityId) => hass.states[entityId].state === "on");
-  }
-
-  _callService(ev) {
-    const turnOn = ev.target.checked;
-    turnOnOffEntities(this.hass, this._toggleEntities, turnOn);
-  }
-}
-
-customElements.define("hui-entities-toggle", HuiEntitiesToggle);
diff --git a/src/panels/lovelace/components/hui-entities-toggle.ts b/src/panels/lovelace/components/hui-entities-toggle.ts
new file mode 100644
index 0000000000..95d1559766
--- /dev/null
+++ b/src/panels/lovelace/components/hui-entities-toggle.ts
@@ -0,0 +1,84 @@
+import {
+  html,
+  LitElement,
+  PropertyDeclarations,
+  PropertyValues,
+} from "@polymer/lit-element";
+import { TemplateResult } from "lit-html";
+import { PaperToggleButtonElement } from "@polymer/paper-toggle-button/paper-toggle-button";
+
+import { DOMAINS_TOGGLE } from "../../../common/const";
+import { turnOnOffEntities } from "../common/entity/turn-on-off-entities";
+import { HomeAssistant } from "../../../types";
+
+class HuiEntitiesToggle extends LitElement {
+  public entities?: string[];
+  protected hass?: HomeAssistant;
+  private _toggleEntities?: string[];
+
+  static get properties(): PropertyDeclarations {
+    return {
+      hass: {},
+      entities: {},
+      _toggleEntities: {},
+    };
+  }
+
+  public updated(changedProperties: PropertyValues) {
+    if (changedProperties.has("entities")) {
+      this._toggleEntities = this.entities!.filter(
+        (entityId) =>
+          entityId in this.hass!.states &&
+          DOMAINS_TOGGLE.has(entityId.split(".", 1)[0])
+      );
+    }
+  }
+
+  protected render(): TemplateResult {
+    if (!this._toggleEntities) {
+      return html``;
+    }
+
+    return html`
+      ${this.renderStyle()}
+      <paper-toggle-button
+        ?checked="${
+          this._toggleEntities!.some(
+            (entityId) => this.hass!.states[entityId].state === "on"
+          )
+        }"
+        @change="${this._callService}"
+      ></paper-toggle-button>
+    `;
+  }
+
+  private renderStyle(): TemplateResult {
+    return html`
+      <style>
+        :host {
+          width: 38px;
+          display: block;
+        }
+        paper-toggle-button {
+          cursor: pointer;
+          --paper-toggle-button-label-spacing: 0;
+          padding: 13px 5px;
+          margin: -4px -5px;
+        }
+      </style>
+    `;
+  }
+
+  private _callService(ev: MouseEvent): void {
+    const turnOn = (ev.target as PaperToggleButtonElement).checked;
+    turnOnOffEntities(this.hass!, this._toggleEntities!, turnOn!);
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "hui-entities-toggle": HuiEntitiesToggle;
+  }
+}
+
+customElements.define("hui-entities-toggle", HuiEntitiesToggle);

From a2492892112fa038f15a8ffa5f84c79a7085614d Mon Sep 17 00:00:00 2001
From: Jan Castermans <jancastermans@razzi.be>
Date: Thu, 29 Nov 2018 11:53:04 +0100
Subject: [PATCH 35/69] Display alert entity row as a toggle (#2138)

* Update create-row-element.js

In the default UI alerts where displayed as toggles, this change makes this also the default behaviour in Lovelace

* Change the order to keep the alphabetic order
---
 src/panels/lovelace/common/create-row-element.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/panels/lovelace/common/create-row-element.js b/src/panels/lovelace/common/create-row-element.js
index 9ec0a5efef..c9d1fa072c 100644
--- a/src/panels/lovelace/common/create-row-element.js
+++ b/src/panels/lovelace/common/create-row-element.js
@@ -29,6 +29,7 @@ const SPECIAL_TYPES = new Set([
   "weblink",
 ]);
 const DOMAIN_TO_ELEMENT_TYPE = {
+  alert: "toggle",
   automation: "toggle",
   climate: "climate",
   cover: "cover",

From e4cac8669096d2da5ce49cbe7835a7a456159df1 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Thu, 29 Nov 2018 04:53:30 -0600
Subject: [PATCH 36/69] Convert shopping-list clear to WebSockets (#2141)

---
 src/data/shopping-list.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/data/shopping-list.ts b/src/data/shopping-list.ts
index db9dd35709..d3dbdd8327 100644
--- a/src/data/shopping-list.ts
+++ b/src/data/shopping-list.ts
@@ -26,7 +26,9 @@ export const updateItem = (
   });
 
 export const clearItems = (hass: HomeAssistant): Promise<void> =>
-  hass.callApi("POST", "shopping_list/clear_completed");
+  hass.callWS({
+    type: "shopping_list/items/clear",
+  });
 
 export const addItem = (
   hass: HomeAssistant,

From 5e43d9b6b70de8360bd111f04fe9d9680431500a Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Thu, 29 Nov 2018 04:57:29 -0600
Subject: [PATCH 37/69] Convert hui-media-player-entity-row to
 TypeScript/LitElement (#2136)

* Convert hui-media-player-entity-row to TypeScript/LitElement

* Add types

* Address review comments
---
 .../hui-media-player-entity-row.js            | 165 -----------------
 .../hui-media-player-entity-row.ts            | 171 ++++++++++++++++++
 2 files changed, 171 insertions(+), 165 deletions(-)
 delete mode 100644 src/panels/lovelace/entity-rows/hui-media-player-entity-row.js
 create mode 100644 src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts

diff --git a/src/panels/lovelace/entity-rows/hui-media-player-entity-row.js b/src/panels/lovelace/entity-rows/hui-media-player-entity-row.js
deleted file mode 100644
index c123618852..0000000000
--- a/src/panels/lovelace/entity-rows/hui-media-player-entity-row.js
+++ /dev/null
@@ -1,165 +0,0 @@
-import "@polymer/paper-icon-button/paper-icon-button";
-import { html } from "@polymer/polymer/lib/utils/html-tag";
-import { PolymerElement } from "@polymer/polymer/polymer-element";
-
-import "../components/hui-generic-entity-row";
-
-import LocalizeMixin from "../../../mixins/localize-mixin";
-
-const SUPPORT_PAUSE = 1;
-const SUPPORT_NEXT_TRACK = 32;
-const SUPPORTS_PLAY = 16384;
-const OFF_STATES = ["off", "idle"];
-
-/*
- * @appliesMixin LocalizeMixin
- */
-class HuiMediaPlayerEntityRow extends LocalizeMixin(PolymerElement) {
-  static get template() {
-    return html`
-      ${this.styleTemplate}
-      <hui-generic-entity-row
-        hass="[[hass]]"
-        config="[[_config]]"
-        show-secondary="false"
-      >
-        ${this.mediaPlayerControlTemplate}
-      </hui-generic-entity-row>
-    `;
-  }
-
-  static get styleTemplate() {
-    return html`
-      <style>
-        .controls {
-          white-space: nowrap;
-        }
-      </style>
-    `;
-  }
-
-  static get mediaPlayerControlTemplate() {
-    return html`
-      <template is="dom-if" if="[[!_isOff(_stateObj.state)]]">
-        <div class="controls">
-          <template is="dom-if" if="[[_computeControlIcon(_stateObj)]]">
-            <paper-icon-button
-              icon="[[_computeControlIcon(_stateObj)]]"
-              on-click="_playPause"
-            ></paper-icon-button>
-          </template>
-          <template is="dom-if" if="[[_supportsNext(_stateObj)]]">
-            <paper-icon-button
-              icon="hass:skip-next"
-              on-click="_nextTrack"
-            ></paper-icon-button>
-          </template>
-        </div>
-      </template>
-      <template is="dom-if" if="[[_isOff(_stateObj.state)]]">
-        <div>[[_computeState(_stateObj.state)]]</div>
-      </template>
-
-      <div slot="secondary">[[_computeMediaTitle(_stateObj)]]</div>
-    `;
-  }
-
-  static get properties() {
-    return {
-      hass: Object,
-      _config: Object,
-      _stateObj: {
-        type: Object,
-        computed: "_computeStateObj(hass.states, _config.entity)",
-      },
-    };
-  }
-
-  _computeStateObj(states, entityId) {
-    return states && entityId in states ? states[entityId] : null;
-  }
-
-  setConfig(config) {
-    if (!config || !config.entity) {
-      throw new Error("Entity not configured.");
-    }
-    this._config = config;
-  }
-
-  _computeControlIcon(stateObj) {
-    if (!stateObj) return null;
-
-    if (stateObj.state !== "playing") {
-      return stateObj.attributes.supported_features & SUPPORTS_PLAY
-        ? "hass:play"
-        : "";
-    }
-
-    return stateObj.attributes.supported_features & SUPPORT_PAUSE
-      ? "hass:pause"
-      : "hass:stop";
-  }
-
-  _computeMediaTitle(stateObj) {
-    if (!stateObj || this._isOff(stateObj.state)) return null;
-
-    let prefix;
-    let suffix;
-
-    switch (stateObj.attributes.media_content_type) {
-      case "music":
-        prefix = stateObj.attributes.media_artist;
-        suffix = stateObj.attributes.media_title;
-        break;
-      case "tvshow":
-        prefix = stateObj.attributes.media_series_title;
-        suffix = stateObj.attributes.media_title;
-        break;
-      default:
-        prefix =
-          stateObj.attributes.media_title ||
-          stateObj.attributes.app_name ||
-          stateObj.state;
-        suffix = "";
-    }
-
-    return prefix && suffix ? `${prefix}: ${suffix}` : prefix || suffix || "";
-  }
-
-  _computeState(state) {
-    return (
-      this.localize(`state.media_player.${state}`) ||
-      this.localize(`state.default.${state}`) ||
-      state
-    );
-  }
-
-  _callService(service) {
-    this.hass.callService("media_player", service, {
-      entity_id: this._config.entity,
-    });
-  }
-
-  _playPause(event) {
-    event.stopPropagation();
-    this._callService("media_play_pause");
-  }
-
-  _nextTrack(event) {
-    event.stopPropagation();
-    if (this._stateObj.attributes.supported_features & SUPPORT_NEXT_TRACK) {
-      this._callService("media_next_track");
-    }
-  }
-
-  _isOff(state) {
-    return OFF_STATES.includes(state);
-  }
-
-  _supportsNext(stateObj) {
-    return (
-      stateObj && stateObj.attributes.supported_features & SUPPORT_NEXT_TRACK
-    );
-  }
-}
-customElements.define("hui-media-player-entity-row", HuiMediaPlayerEntityRow);
diff --git a/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts b/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts
new file mode 100644
index 0000000000..10c3860b67
--- /dev/null
+++ b/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts
@@ -0,0 +1,171 @@
+import { html, LitElement } from "@polymer/lit-element";
+import { TemplateResult } from "lit-html";
+import "@polymer/paper-icon-button/paper-icon-button";
+
+import "../components/hui-generic-entity-row";
+
+import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
+import { EntityRow, EntityConfig } from "./types";
+import { HomeAssistant } from "../../../types";
+import { HassEntity } from "home-assistant-js-websocket";
+
+const SUPPORT_PAUSE = 1;
+const SUPPORT_NEXT_TRACK = 32;
+const SUPPORTS_PLAY = 16384;
+const OFF_STATES = ["off", "idle"];
+
+class HuiMediaPlayerEntityRow extends hassLocalizeLitMixin(LitElement)
+  implements EntityRow {
+  public hass?: HomeAssistant;
+  private _config?: EntityConfig;
+
+  static get properties() {
+    return {
+      hass: {},
+      _config: {},
+    };
+  }
+
+  public setConfig(config: EntityConfig): void {
+    if (!config || !config.entity) {
+      throw new Error("Invalid Configuration: 'entity' required");
+    }
+
+    this._config = config;
+  }
+
+  protected render(): TemplateResult {
+    if (!this.hass || !this._config) {
+      return html``;
+    }
+
+    const stateObj = this.hass.states[this._config.entity];
+
+    if (!stateObj) {
+      return html`
+        <hui-error-entity-row
+          .entity="${this._config.entity}"
+        ></hui-error-entity-row>
+      `;
+    }
+
+    const supportsPlay =
+      // tslint:disable-next-line:no-bitwise
+      stateObj.attributes.supported_features! & SUPPORTS_PLAY;
+    const supportsNext =
+      // tslint:disable-next-line:no-bitwise
+      stateObj.attributes.supported_features! & SUPPORT_NEXT_TRACK;
+
+    return html`
+      ${this.renderStyle()}
+      <hui-generic-entity-row
+        .hass="${this.hass}"
+        .config="${this._config}"
+        .showSecondary="false"
+      >
+        ${
+          OFF_STATES.includes(stateObj.state)
+            ? html`
+                <div>
+                  ${
+                    this.localize(`state.media_player.${stateObj.state}`) ||
+                      this.localize(`state.default.${stateObj.state}`) ||
+                      stateObj.state
+                  }
+                </div>
+              `
+            : html`
+                <div class="controls">
+                  ${
+                    stateObj.state !== "playing" && !supportsPlay
+                      ? ""
+                      : html`
+                          <paper-icon-button
+                            icon="${this._computeControlIcon(stateObj)}"
+                            @click="${this._playPause}"
+                          ></paper-icon-button>
+                        `
+                  }
+                  ${
+                    supportsNext
+                      ? html`
+                          <paper-icon-button
+                            icon="hass:skip-next"
+                            @click="${this._nextTrack}"
+                          ></paper-icon-button>
+                        `
+                      : ""
+                  }
+                </div>
+                <div slot="secondary">${this._computeMediaTitle(stateObj)}</div>
+              `
+        }
+      </hui-generic-entity-row>
+    `;
+  }
+
+  private renderStyle(): TemplateResult {
+    return html`
+      <style>
+        .controls {
+          white-space: nowrap;
+        }
+      </style>
+    `;
+  }
+
+  private _computeControlIcon(stateObj: HassEntity): string {
+    if (stateObj.state !== "playing") {
+      return "hass:play";
+    }
+
+    // tslint:disable-next-line:no-bitwise
+    return stateObj.attributes.supported_features! & SUPPORT_PAUSE
+      ? "hass:pause"
+      : "hass:stop";
+  }
+
+  private _computeMediaTitle(stateObj: HassEntity): string {
+    let prefix;
+    let suffix;
+
+    switch (stateObj.attributes.media_content_type) {
+      case "music":
+        prefix = stateObj.attributes.media_artist;
+        suffix = stateObj.attributes.media_title;
+        break;
+      case "tvshow":
+        prefix = stateObj.attributes.media_series_title;
+        suffix = stateObj.attributes.media_title;
+        break;
+      default:
+        prefix =
+          stateObj.attributes.media_title ||
+          stateObj.attributes.app_name ||
+          stateObj.state;
+        suffix = "";
+    }
+
+    return prefix && suffix ? `${prefix}: ${suffix}` : prefix || suffix || "";
+  }
+
+  private _playPause(): void {
+    this.hass!.callService("media_player", "media_play_pause", {
+      entity_id: this._config!.entity,
+    });
+  }
+
+  private _nextTrack(): void {
+    this.hass!.callService("media_player", "media_next_track", {
+      entity_id: this._config!.entity,
+    });
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "hui-media-player-entity-row": HuiMediaPlayerEntityRow;
+  }
+}
+
+customElements.define("hui-media-player-entity-row", HuiMediaPlayerEntityRow);

From 90cea56a1ee394cb7207165a6994ae86415480c2 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Thu, 29 Nov 2018 15:00:30 +0100
Subject: [PATCH 38/69] Check if config is compatible with UI editor (#2137)

* Check config on loading UI editor

* Clean up

* Add theme and reload editor on reopen

* Reload config element on card type change

* Clean

* Clean

* Add superstruct for config validation

* Take content logic out off return edit-card

* Reverse  logic to prevent unnecessary yaml load
---
 package.json                                  |  1 +
 .../hui-entities-card-editor.ts               | 22 +++++
 .../lovelace/editor/hui-dialog-edit-card.ts   |  4 +-
 src/panels/lovelace/editor/hui-edit-card.ts   | 86 +++++++++++++------
 yarn.lock                                     | 42 ++++++++-
 5 files changed, 127 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 6baea313b5..e42662bcc7 100644
--- a/package.json
+++ b/package.json
@@ -87,6 +87,7 @@
     "react-big-calendar": "^0.19.2",
     "regenerator-runtime": "^0.12.1",
     "round-slider": "^1.3.2",
+    "superstruct": "^0.6.0",
     "unfetch": "^4.0.1",
     "web-animations-js": "^2.3.1",
     "xss": "^1.0.3"
diff --git a/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
index eebdd38494..e51dd1b526 100644
--- a/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
@@ -1,11 +1,13 @@
 import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
 import { TemplateResult } from "lit-html";
+import { struct } from "superstruct";
 import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-listbox/paper-listbox";
 import "@polymer/paper-toggle-button/paper-toggle-button";
 
 import { processEditorEntities } from "../process-editor-entities";
+
 import { EntitiesEditorEvent, EditorTarget } from "../types";
 import { hassLocalizeLitMixin } from "../../../../mixins/lit-localize-mixin";
 import { HomeAssistant } from "../../../../types";
@@ -20,6 +22,24 @@ import "../../components/hui-entity-editor";
 import "../../../../components/ha-card";
 import "../../../../components/ha-icon";
 
+const entitiesConfigStruct = struct.union([
+  {
+    entity: "string",
+    name: "string?",
+    icon: "string?",
+  },
+  "string",
+]);
+
+const cardConfigStruct = struct({
+  type: "string",
+  id: "string|number",
+  title: "string|number?",
+  theme: "string?",
+  show_header_toggle: "boolean?",
+  entities: [entitiesConfigStruct],
+});
+
 export class HuiEntitiesCardEditor extends hassLocalizeLitMixin(LitElement)
   implements LovelaceCardEditor {
   public hass?: HomeAssistant;
@@ -39,6 +59,8 @@ export class HuiEntitiesCardEditor extends hassLocalizeLitMixin(LitElement)
   }
 
   public setConfig(config: Config): void {
+    config = cardConfigStruct(config);
+
     this._config = { type: "entities", ...config };
     this._configEntities = processEditorEntities(config.entities);
   }
diff --git a/src/panels/lovelace/editor/hui-dialog-edit-card.ts b/src/panels/lovelace/editor/hui-dialog-edit-card.ts
index a686e91b82..306fe59f18 100644
--- a/src/panels/lovelace/editor/hui-dialog-edit-card.ts
+++ b/src/panels/lovelace/editor/hui-dialog-edit-card.ts
@@ -20,7 +20,7 @@ declare global {
 }
 
 const dialogShowEvent = "show-edit-card";
-const dialogTag = "hui-dialog-edit-config";
+const dialogTag = "hui-dialog-edit-card";
 
 export interface EditCardDialogParams {
   cardConfig: LovelaceCardConfig;
@@ -81,7 +81,7 @@ export class HuiDialogEditCard extends LitElement {
 
 declare global {
   interface HTMLElementTagNameMap {
-    "hui-dialog-edit-config": HuiDialogEditCard;
+    "hui-dialog-edit-card": HuiDialogEditCard;
   }
 }
 
diff --git a/src/panels/lovelace/editor/hui-edit-card.ts b/src/panels/lovelace/editor/hui-edit-card.ts
index 5e69084d92..92e9a23962 100644
--- a/src/panels/lovelace/editor/hui-edit-card.ts
+++ b/src/panels/lovelace/editor/hui-edit-card.ts
@@ -53,6 +53,8 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
   private _loading?: boolean;
   private _isToggleAvailable?: boolean;
   private _saving: boolean;
+  private _errorMsg?: TemplateResult;
+  private _cardType?: string;
 
   static get properties(): PropertyDeclarations {
     return {
@@ -62,6 +64,7 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
       _configElement: {},
       _configValue: {},
       _configState: {},
+      _errorMsg: {},
       _uiEditor: {},
       _saving: {},
       _loading: {},
@@ -77,14 +80,11 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
   set cardConfig(cardConfig: LovelaceCardConfig) {
     this._originalConfig = cardConfig;
     if (String(cardConfig.id) !== this._cardId) {
-      this._loading = true;
-      this._uiEditor = true;
-      this._configElement = undefined;
       this._configValue = { format: "yaml", value: undefined };
       this._configState = "OK";
-      this._isToggleAvailable = false;
+      this._uiEditor = true;
       this._cardId = String(cardConfig.id);
-      this._loadConfigElement();
+      this._loadConfigElement(cardConfig);
     }
   }
 
@@ -105,6 +105,24 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
   }
 
   protected render(): TemplateResult {
+    let content;
+    if (!this._configElement !== undefined) {
+      if (this._uiEditor) {
+        content = html`
+          <div class="element-editor">${this._configElement}</div>
+        `;
+      } else {
+        content = html`
+          <hui-yaml-editor
+            .hass="${this.hass}"
+            .cardId="${this._cardId}"
+            .yaml="${this._configValue!.value}"
+            @yaml-changed="${this._handleYamlChanged}"
+          ></hui-yaml-editor>
+        `;
+      }
+    }
+
     return html`
       ${this.renderStyle()}
       <paper-dialog with-backdrop>
@@ -118,19 +136,13 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
           class="${classMap({ hidden: this._loading! })}"
         >
           ${
-            this._uiEditor && this._configElement !== null
+            this._errorMsg
               ? html`
-                  <div class="element-editor">${this._configElement}</div>
-                `
-              : html`
-                  <hui-yaml-editor
-                    .hass="${this.hass}"
-                    .cardId="${this._cardId}"
-                    .yaml="${this._configValue!.value}"
-                    @yaml-changed="${this._handleYamlChanged}"
-                  ></hui-yaml-editor>
+                  <div class="error">${this._errorMsg}</div>
                 `
+              : ""
           }
+          ${content}
           <hr />
           <hui-card-preview .hass="${this.hass}"></hui-card-preview>
         </paper-dialog-scrollable>
@@ -164,7 +176,7 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
                   >
                 </div>
               `
-            : html``
+            : ""
         }
       </paper-dialog>
     `;
@@ -200,6 +212,10 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
         .element-editor {
           margin-bottom: 8px;
         }
+        .error {
+          color: #ef5350;
+          border-bottom: 1px solid #ef5350;
+        }
         hr {
           color: #000;
           opacity: 0.12;
@@ -213,7 +229,7 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
     `;
   }
 
-  private _toggleEditor(): void {
+  private async _toggleEditor(): Promise<void> {
     if (!this._isToggleAvailable) {
       alert("You can't switch editor.");
       return;
@@ -235,9 +251,13 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
           schema: extYamlSchema,
         }),
       };
-      this._configElement.setConfig(this._configValue!
-        .value as LovelaceCardConfig);
       this._uiEditor = !this._uiEditor;
+      const cardConfig = this._configValue!.value! as LovelaceCardConfig;
+      if (cardConfig.type !== this._cardType) {
+        await this._loadConfigElement(cardConfig);
+        this._cardType = cardConfig.type;
+      }
+      this._configElement.setConfig(cardConfig);
     }
     this._resizeDialog();
   }
@@ -263,6 +283,7 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
   }
 
   private _closeDialog(): void {
+    this._cardId = undefined;
     this._dialog.close();
   }
 
@@ -363,11 +384,16 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
     return JSON.stringify(configValue) !== JSON.stringify(this._originalConfig);
   }
 
-  private async _loadConfigElement(): Promise<void> {
-    if (!this._originalConfig) {
+  private async _loadConfigElement(conf: LovelaceCardConfig): Promise<void> {
+    if (!conf) {
       return;
     }
-    const conf = this._originalConfig;
+
+    this._errorMsg = undefined;
+    this._loading = true;
+    this._configElement = undefined;
+    this._isToggleAvailable = false;
+
     const tag = conf.type.startsWith(CUSTOM_TYPE_PREFIX)
       ? conf!.type.substr(CUSTOM_TYPE_PREFIX.length)
       : `hui-${conf!.type}-card`;
@@ -378,20 +404,30 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
     try {
       configElement = await elClass.getConfigElement();
     } catch (err) {
-      this._configElement = null;
       this._uiEditor = false;
+      this._configElement = null;
       return;
     }
 
-    this._isToggleAvailable = true;
+    try {
+      configElement.setConfig(conf);
+    } catch (err) {
+      this._errorMsg = html`
+        Your config is not supported by the UI editor:<br /><b>${err.message}</b
+        ><br />Falling back to YAML editor.
+      `;
+      this._uiEditor = false;
+      this._configElement = null;
+      return;
+    }
 
-    configElement.setConfig(conf);
     configElement.hass = this.hass;
     configElement.addEventListener("config-changed", (ev) =>
       this._handleUIConfigChanged(ev.detail.config)
     );
     this._configValue = { format: "json", value: conf };
     this._configElement = configElement;
+    this._isToggleAvailable = true;
     this._updatePreview(conf);
   }
 }
diff --git a/yarn.lock b/yarn.lock
index c2efe9bb1e..645bdfbaf0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4226,6 +4226,16 @@ clone-buffer@^1.0.0:
   resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
   integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
 
+clone-deep@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
+  integrity sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==
+  dependencies:
+    for-own "^1.0.0"
+    is-plain-object "^2.0.4"
+    kind-of "^6.0.0"
+    shallow-clone "^1.0.0"
+
 clone-stats@^0.0.1, clone-stats@~0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
@@ -6452,6 +6462,11 @@ follow-redirects@^1.0.0:
   dependencies:
     debug "=3.1.0"
 
+for-in@^0.1.3:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
+  integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=
+
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -8556,7 +8571,7 @@ kind-of@^5.0.0:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
   integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
-kind-of@^6.0.0, kind-of@^6.0.2:
+kind-of@^6.0.0, kind-of@^6.0.1, kind-of@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
   integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
@@ -9716,6 +9731,14 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
+mixin-object@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
+  integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=
+  dependencies:
+    for-in "^0.1.3"
+    is-extendable "^0.1.1"
+
 mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
@@ -12267,6 +12290,15 @@ shady-css-parser@^0.1.0:
   resolved "https://registry.yarnpkg.com/shady-css-parser/-/shady-css-parser-0.1.0.tgz#534dc79c8ca5884c5ed92a4e5a13d6d863bca428"
   integrity sha512-irfJUUkEuDlNHKZNAp2r7zOyMlmbfVJ+kWSfjlCYYUx/7dJnANLCyTzQZsuxy5NJkvtNwSxY5Gj8MOlqXUQPyA==
 
+shallow-clone@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571"
+  integrity sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==
+  dependencies:
+    is-extendable "^0.1.1"
+    kind-of "^5.0.0"
+    mixin-object "^2.0.1"
+
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -12903,6 +12935,14 @@ strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
+superstruct@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/superstruct/-/superstruct-0.6.0.tgz#20d2073526cf683a57f258695e009c4a19134ad0"
+  integrity sha512-6Y+bh5oFXCMUmGGzcdwd8M2qXMWn9aH3Qu2wV8Cg/Lxu+3fTxJ0dTx54nKd/Sm3lSz3i901xVatzev7c/xN8Lg==
+  dependencies:
+    clone-deep "^2.0.1"
+    kind-of "^6.0.1"
+
 supports-color@3.1.2, supports-color@5.4.0, supports-color@^0.2.0, supports-color@^2.0.0, supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"

From 6b730b7c403675bc6a3035fc67a9b30723b8c270 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Thu, 29 Nov 2018 09:44:39 -0600
Subject: [PATCH 39/69] Allow for state_image and camera_image in
 picture-elements card (#2143)

* Allow for state_image and camera_image in picture-elements card

* Address review comments

* Remove unneccesary div
---
 .../cards/hui-picture-elements-card.ts        | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-picture-elements-card.ts b/src/panels/lovelace/cards/hui-picture-elements-card.ts
index 16e22e1bb6..96140c94f8 100644
--- a/src/panels/lovelace/cards/hui-picture-elements-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-elements-card.ts
@@ -10,7 +10,11 @@ import { LovelaceElementConfig, LovelaceElement } from "../elements/types";
 
 interface Config extends LovelaceCardConfig {
   title?: string;
-  image: string;
+  image?: string;
+  camera_image?: string;
+  state_image?: {};
+  aspect_ratio?: string;
+  entity?: string;
   elements: LovelaceElementConfig[];
 }
 
@@ -39,7 +43,10 @@ class HuiPictureElementsCard extends LitElement implements LovelaceCard {
   public setConfig(config: Config): void {
     if (!config) {
       throw new Error("Invalid Configuration");
-    } else if (!config.image) {
+    } else if (
+      !(config.image || config.camera_image || config.state_image) ||
+      (config.state_image && !config.entity)
+    ) {
       throw new Error("Invalid Configuration: image required");
     } else if (!Array.isArray(config.elements)) {
       throw new Error("Invalid Configuration: elements required");
@@ -56,13 +63,19 @@ class HuiPictureElementsCard extends LitElement implements LovelaceCard {
     return html`
       ${this.renderStyle()}
       <ha-card .header="${this._config.title}">
-        <div id="root">
-          <img src="${this._config.image}" /> ${
-            this._config.elements.map((elementConfig: LovelaceElementConfig) =>
-              this._createHuiElement(elementConfig)
-            )
-          }
-        </div>
+        <hui-image
+          .hass="${this._hass}"
+          .image="${this._config.image}"
+          .stateImage="${this._config.state_image}"
+          .cameraImage="${this._config.camera_image}"
+          .entity="${this._config.entity}"
+          .aspectRatio="${this._config.aspect_ratio}"
+        ></hui-image>
+        ${
+          this._config.elements.map((elementConfig: LovelaceElementConfig) =>
+            this._createHuiElement(elementConfig)
+          )
+        }
       </ha-card>
     `;
   }
@@ -72,14 +85,7 @@ class HuiPictureElementsCard extends LitElement implements LovelaceCard {
       <style>
         ha-card {
           overflow: hidden;
-        }
-        #root {
           position: relative;
-          overflow: hidden;
-        }
-        #root img {
-          display: block;
-          width: 100%;
         }
         .element {
           position: absolute;

From 023d8ad8937f211b7843103441808a59e6ac4ef3 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Fri, 30 Nov 2018 13:45:50 +0100
Subject: [PATCH 40/69] Upgrade deps (#2156)

* Update TypeScript

* Update webcomponentsjs and shadycss

* Upgrade vaadin
---
 package.json |   20 +-
 yarn.lock    | 1243 +++++++++++++++++++++++---------------------------
 2 files changed, 582 insertions(+), 681 deletions(-)

diff --git a/package.json b/package.json
index e42662bcc7..732dcc03b3 100644
--- a/package.json
+++ b/package.json
@@ -64,10 +64,10 @@
     "@polymer/paper-toggle-button": "^3.0.1",
     "@polymer/paper-tooltip": "^3.0.1",
     "@polymer/polymer": "^3.0.5",
-    "@vaadin/vaadin-combo-box": "^4.2.0-beta2",
-    "@vaadin/vaadin-date-picker": "^3.3.0",
-    "@webcomponents/shadycss": "^1.5.2",
-    "@webcomponents/webcomponentsjs": "^2.1.3",
+    "@vaadin/vaadin-combo-box": "^4.2.0",
+    "@vaadin/vaadin-date-picker": "^3.3.1",
+    "@webcomponents/shadycss": "^1.6.0",
+    "@webcomponents/webcomponentsjs": "^2.2.0",
     "chart.js": "~2.7.2",
     "chartjs-chart-timeline": "^0.2.1",
     "es6-object-assign": "^1.1.0",
@@ -153,15 +153,11 @@
     "workbox-webpack-plugin": "^3.5.0"
   },
   "resolutions": {
-    "inherits": "2.0.3",
-    "samsam": "1.1.3",
-    "supports-color": "3.1.2",
-    "type-detect": "1.0.0",
     "@polymer/polymer": "3.1.0",
-    "@webcomponents/webcomponentsjs": "2.1.3",
-    "@webcomponents/shadycss": "^1.5.2",
-    "@vaadin/vaadin-overlay": "3.2.0-alpha3",
-    "@vaadin/vaadin-lumo-styles": "1.2.0",
+    "@webcomponents/webcomponentsjs": "2.2.1",
+    "@webcomponents/shadycss": "^1.6.0",
+    "@vaadin/vaadin-overlay": "3.2.2",
+    "@vaadin/vaadin-lumo-styles": "1.3.0",
     "fecha": "https://github.com/taylorhakes/fecha/archive/5e8fe08d982647fdb19fb403459838b02647813c.tar.gz",
     "lit-html": "0.12.0",
     "@polymer/lit-element": "0.6.2"
diff --git a/yarn.lock b/yarn.lock
index 645bdfbaf0..d8f8a49567 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,7 +9,27 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/core@^7.0.0", "@babel/core@^7.1.2":
+"@babel/core@^7.0.0":
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.1.6.tgz#3733cbee4317429bc87c62b29cf8587dba7baeb3"
+  integrity sha512-Hz6PJT6e44iUNpAn8AoyAs6B3bl60g7MJQaI0rZEar6ECzh6+srYO1xlIdssio34mPaUtAb1y+XlkkSJzok3yw==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/generator" "^7.1.6"
+    "@babel/helpers" "^7.1.5"
+    "@babel/parser" "^7.1.6"
+    "@babel/template" "^7.1.2"
+    "@babel/traverse" "^7.1.6"
+    "@babel/types" "^7.1.6"
+    convert-source-map "^1.1.0"
+    debug "^4.1.0"
+    json5 "^2.1.0"
+    lodash "^4.17.10"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
+"@babel/core@^7.1.2":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.1.2.tgz#f8d2a9ceb6832887329a7b60f9d035791400ba4e"
   integrity sha512-IFeSSnjXdhDaoysIlev//UzHZbdEmm7D0EIH2qtse9xK7mXEZQpYjs2P00XlP1qYsYvid79p+Zgg6tz1mp6iVw==
@@ -29,23 +49,12 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0.tgz#1efd58bffa951dc846449e58ce3a1d7f02d393aa"
-  integrity sha512-/BM2vupkpbZXq22l1ALO7MqXJZH2k8bKVv8Y+pABFnzWdztDB/ZLveP5At21vLz5c2YtSE6p7j2FZEsqafMz5Q==
+"@babel/generator@^7.0.0-beta.42", "@babel/generator@^7.1.2", "@babel/generator@^7.1.6":
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.1.6.tgz#001303cf87a5b9d093494a4bf251d7b5d03d3999"
+  integrity sha512-brwPBtVvdYdGxtenbQgfCdDPmtkmUBZPjUoK5SXJEBuHaA5BCubh9ly65fzXz7R6o5rA76Rs22ES8Z+HCc0YIQ==
   dependencies:
-    "@babel/types" "^7.0.0"
-    jsesc "^2.5.1"
-    lodash "^4.17.10"
-    source-map "^0.5.0"
-    trim-right "^1.0.1"
-
-"@babel/generator@^7.0.0-beta.42", "@babel/generator@^7.1.2", "@babel/generator@^7.1.3":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.1.3.tgz#2103ec9c42d9bdad9190a6ad5ff2d456fd7b8673"
-  integrity sha512-ZoCZGcfIJFJuZBqxcY9OjC1KW2lWK64qrX1o4UYL3yshVhwKFYgzpWZ0vvtGMNJdTlvkw0W+HR1VnYN8q3QPFQ==
-  dependencies:
-    "@babel/types" "^7.1.3"
+    "@babel/types" "^7.1.6"
     jsesc "^2.5.1"
     lodash "^4.17.10"
     source-map "^0.5.0"
@@ -214,14 +223,14 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helpers@^7.1.2":
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.1.2.tgz#ab752e8c35ef7d39987df4e8586c63b8846234b5"
-  integrity sha512-Myc3pUE8eswD73aWcartxB16K6CGmHDv9KxOmD2CeOs/FaEAQodr3VYGmlvOmog60vNQ2w8QbatuahepZwrHiA==
+"@babel/helpers@^7.1.2", "@babel/helpers@^7.1.5":
+  version "7.1.5"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.1.5.tgz#68bfc1895d685f2b8f1995e788dbfe1f6ccb1996"
+  integrity sha512-2jkcdL02ywNBry1YNFAH/fViq4fXG0vdckHqeJk+75fpQ2OH+Az6076tX/M0835zA45E0Cqa6pV5Kiv9YOqjEg==
   dependencies:
     "@babel/template" "^7.1.2"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.1.2"
+    "@babel/traverse" "^7.1.5"
+    "@babel/types" "^7.1.5"
 
 "@babel/highlight@^7.0.0":
   version "7.0.0"
@@ -232,15 +241,15 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0":
+"@babel/parser@^7.0.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.0.tgz#a7cd42cb3c12aec52e24375189a47b39759b783e"
   integrity sha512-SmjnXCuPAlai75AFtzv+KCBcJ3sDDWbIn+WytKw1k+wAtEy6phqI2RqKh/zAnw53i1NR8su3Ep/UoqaKcimuLg==
 
-"@babel/parser@^7.1.2", "@babel/parser@^7.1.3":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz#2c92469bac2b7fbff810b67fca07bd138b48af77"
-  integrity sha512-gqmspPZOMW3MIRb9HlrnbZHXI1/KHTOroBwN1NcLL6pWxzqzEKGvRTq0W/PxS45OtQGbaFikSQpkS5zbnsQm2w==
+"@babel/parser@^7.1.2", "@babel/parser@^7.1.6":
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.6.tgz#16e97aca1ec1062324a01c5a6a7d0df8dd189854"
+  integrity sha512-dWP6LJm9nKT6ALaa+bnL247GHHMWir3vSlZ2+IHgHgktZQx0L3Uvq2uAWcuzIe+fujRsYWBW2q622C5UvGK9iQ==
 
 "@babel/plugin-external-helpers@^7.0.0":
   version "7.0.0"
@@ -371,9 +380,9 @@
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-block-scoping@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0.tgz#1745075edffd7cdaf69fab2fb6f9694424b7e9bc"
-  integrity sha512-GWEMCrmHQcYWISilUrk9GDqH4enf3UmhOEbNbNrlNAX1ssH3MsS1xLOS6rdjRVPgA7XXVPn87tRkdTEoA/dxEg==
+  version "7.1.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.1.5.tgz#3e8e0bc9a5104519923302a24f748f72f2f61f37"
+  integrity sha512-jlYcDrz+5ayWC7mxgpn1Wj8zj0mmjCT2w0mPIMSwO926eXBRxpEgoN/uQVRBfjtr8ayjcmS+xk2G1jaP8JjMJQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     lodash "^4.17.10"
@@ -641,16 +650,7 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-transform-typescript" "^7.1.0"
 
-"@babel/template@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.0.tgz#58cc9572e1bfe24fe1537fdf99d839d53e517e22"
-  integrity sha512-yZ948B/pJrwWGY6VxG6XRFsVTee3IQ7bihq9zFpM00Vydu6z5Xwg0C3J644kxI9WOTzd+62xcIsQ+AT1MGhqhA==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/template@^7.1.2":
+"@babel/template@^7.1.0", "@babel/template@^7.1.2":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.2.tgz#090484a574fef5a2d2d7726a674eceda5c5b5644"
   integrity sha512-SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag==
@@ -659,49 +659,25 @@
     "@babel/parser" "^7.1.2"
     "@babel/types" "^7.1.2"
 
-"@babel/traverse@^7.0.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.1.0.tgz#503ec6669387efd182c3888c4eec07bcc45d91b2"
-  integrity sha512-bwgln0FsMoxm3pLOgrrnGaXk18sSM9JNf1/nHC/FksmNGFbYnPWY4GYCfLxyP1KRmfsxqkRpfoa6xr6VuuSxdw==
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.0.0-beta.42", "@babel/traverse@^7.1.0", "@babel/traverse@^7.1.5", "@babel/traverse@^7.1.6":
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.1.6.tgz#c8db9963ab4ce5b894222435482bd8ea854b7b5c"
+  integrity sha512-CXedit6GpISz3sC2k2FsGCUpOhUqKdyL0lqNrImQojagnUMXf8hex4AxYFRuMkNGcvJX5QAFGzB5WJQmSv8SiQ==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.0.0"
+    "@babel/generator" "^7.1.6"
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    debug "^3.1.0"
+    "@babel/parser" "^7.1.6"
+    "@babel/types" "^7.1.6"
+    debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.10"
 
-"@babel/traverse@^7.0.0-beta.42", "@babel/traverse@^7.1.0":
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.1.4.tgz#f4f83b93d649b4b2c91121a9087fa2fa949ec2b4"
-  integrity sha512-my9mdrAIGdDiSVBuMjpn/oXYpva0/EZwWL3sm3Wcy/AVWO2eXnsoZruOT9jOGNRXU8KbCIu5zsKnXcAJ6PcV6Q==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.1.3"
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/parser" "^7.1.3"
-    "@babel/types" "^7.1.3"
-    debug "^3.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.10"
-
-"@babel/types@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0.tgz#6e191793d3c854d19c6749989e3bc55f0e962118"
-  integrity sha512-5tPDap4bGKTLPtci2SUl/B7Gv8RnuJFuQoWx26RJobS0fFrz4reUA3JnwIM+HVHEmWE0C1mzKhDtTp8NsWY02Q==
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.10"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.0.0-beta.42", "@babel/types@^7.1.2", "@babel/types@^7.1.3":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.1.3.tgz#3a767004567060c2f40fca49a304712c525ee37d"
-  integrity sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==
+"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.42", "@babel/types@^7.1.2", "@babel/types@^7.1.5", "@babel/types@^7.1.6":
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.1.6.tgz#0adb330c3a281348a190263aceb540e10f04bcce"
+  integrity sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w==
   dependencies:
     esutils "^2.0.2"
     lodash "^4.17.10"
@@ -714,6 +690,20 @@
   dependencies:
     base64-js "^1.3.0"
 
+"@iamstarkov/listr-update-renderer@0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@iamstarkov/listr-update-renderer/-/listr-update-renderer-0.4.1.tgz#d7c48092a2dcf90fd672b6c8b458649cb350c77e"
+  integrity sha512-IJyxQWsYDEkf8C8QthBn5N8tIUR9V9je6j3sMIpAkonaadjbvxmRC6RAhpa3RKxndhNnU2M6iNbtJwd7usQYIA==
+  dependencies:
+    chalk "^1.1.3"
+    cli-truncate "^0.2.1"
+    elegant-spinner "^1.0.1"
+    figures "^1.7.0"
+    indent-string "^3.0.0"
+    log-symbols "^1.0.2"
+    log-update "^2.3.0"
+    strip-ansi "^3.0.1"
+
 "@material/animation@^0.40.1":
   version "0.40.1"
   resolved "https://registry.yarnpkg.com/@material/animation/-/animation-0.40.1.tgz#c5ff31e7d7e17324a0045e889d3530b150b9fcec"
@@ -769,10 +759,10 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@nodelib/fs.stat@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.2.tgz#54c5a964462be3d4d78af631363c18d6fa91ac26"
-  integrity sha512-yprFYuno9FtNsSHVlSWd+nRlmGoAbqbeCwOryP6sC/zoCjhpArcRMYp19EvpSUSizJAlsXEwJv+wcWS9XaXdMw==
+"@nodelib/fs.stat@^1.1.2":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
+  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
 "@polymer/app-layout@^3.0.1":
   version "3.0.1"
@@ -984,7 +974,7 @@
   dependencies:
     "@polymer/polymer" "^3.0.0"
 
-"@polymer/iron-overlay-behavior@^3.0.0-pre.18", "@polymer/iron-overlay-behavior@^3.0.0-pre.27":
+"@polymer/iron-overlay-behavior@^3.0.0-pre.27":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@polymer/iron-overlay-behavior/-/iron-overlay-behavior-3.0.1.tgz#04746be26c7f0ac3b4e80ef363fcb478425dd677"
   integrity sha512-7XDaPVmH90G/hiyWdwv0VG+E4B2xpiWGhql8ghHg7Ik1E4gNCZ7pdeTvjnawfycjrsod0ZezhKOFavYWAaXVxA==
@@ -1423,9 +1413,9 @@
   integrity sha512-+3bMuktcY4a70a0KZc8aPJlEOArPuAKQYHU5ErjkOqGJdx8xuEEVK6nWogqigBOJ8nKPxRpyCUDTCPmZ3bUxGA==
 
 "@types/babylon@^6.16.2":
-  version "6.16.3"
-  resolved "https://registry.yarnpkg.com/@types/babylon/-/babylon-6.16.3.tgz#c2937813a89fcb5e79a00062fc4a8b143e7237bb"
-  integrity sha512-lyJ8sW1PbY3uwuvpOBZ9zMYKshMnQpXmeDHh8dj9j2nJm/xrW0FgB5gLSYOArj5X0IfaXnmhFoJnhS4KbqIMug==
+  version "6.16.4"
+  resolved "https://registry.yarnpkg.com/@types/babylon/-/babylon-6.16.4.tgz#d3df72518b34a6a015d0dc58745cd238b5bb8ad2"
+  integrity sha512-8dZMcGPno3g7pJ/d0AyJERo+lXh9i1JhDuCUs+4lNIN9eUe5Yh6UCLrpgSEi05Ve2JMLauL2aozdvKwNL0px1Q==
   dependencies:
     "@types/babel-types" "*"
 
@@ -1672,19 +1662,19 @@
     "@types/node" "*"
 
 "@types/node@*":
-  version "10.12.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.1.tgz#da61b64a2930a80fa708e57c45cd5441eb379d5b"
-  integrity sha512-i1sl+WCX2OCHeUi9oi7PiCNUtYFrpWhpcx878vpeq/tlZTKzcFdHePlyFHVbWqeuKN0SRPl/9ZFDSTsfv9h7VQ==
+  version "10.12.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.10.tgz#4fa76e6598b7de3f0cb6ec3abacc4f59e5b3a2ce"
+  integrity sha512-8xZEYckCbUVgK8Eg7lf5Iy4COKJ5uXlnIOnePN0WUwSQggy9tolM+tDJf7wMOnT/JT/W9xDYIaYggt3mRV2O5w==
 
 "@types/node@^4.0.30", "@types/node@^4.2.3":
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-4.9.0.tgz#5f90c43115a25ecdb945377001fdf6285cf3b2c3"
-  integrity sha512-xUFkZ+er9gUGw0x9qyfmr/Th0LuX6IB0m7HrRMB6sO6vcBVRFZ/3YV1EeiOC2fG50RX09avDfKwGBHOnPVxFeg==
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-4.9.1.tgz#af192bbb33b7c54f987b42b021d535bb9e641a69"
+  integrity sha512-+LRWWDiB4SGY3FG8Cb8R8n9GJQ/rsoZr17zz+v95f7fdiQitk3bvZnjxhcl9T+DBuQ3exfW/3uvEHmLylYDWaw==
 
 "@types/node@^9.6.4":
-  version "9.6.35"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.35.tgz#197dd535c094362a7c95f0b78f07583d6681ed26"
-  integrity sha512-h5zvHS8wXHGa+Gcqs9K8vqCgOtqjr0+NqG/DDJmQIX1wpR9HivAfgV8bjcD3mGM4bPfQw5Aneb2Pn8355L83jA==
+  version "9.6.40"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.40.tgz#2d69cefbc090cb0bb824542a4c575b14dde7d3aa"
+  integrity sha512-M3HHoXXndsho/sTbQML2BJr7/uwNhMg8P0D4lb+UsM65JQZx268faiz9hKpY4FpocWqpwlLwa8vevw8hLtKjOw==
 
 "@types/opn@^3.0.28":
   version "3.0.28"
@@ -1978,10 +1968,10 @@
     "@vaadin/vaadin-material-styles" "^1.1.0-beta1"
     "@vaadin/vaadin-themable-mixin" "^1.2.1"
 
-"@vaadin/vaadin-combo-box@^4.2.0-beta2":
-  version "4.2.0-beta2"
-  resolved "https://registry.yarnpkg.com/@vaadin/vaadin-combo-box/-/vaadin-combo-box-4.2.0-beta2.tgz#da21287cd981afcafe50ca30252153248306f4e5"
-  integrity sha512-jHG5GYoxe//nwiMFPP2XK34FI5AkWLei0rrD2cVLFa+fMrz9+y7/d8GKluUcMM0CMSofgvV4FmPSOaXFOkXDkw==
+"@vaadin/vaadin-combo-box@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@vaadin/vaadin-combo-box/-/vaadin-combo-box-4.2.0.tgz#c79a7f53faf2d3b851aa481d3656833787174dea"
+  integrity sha512-K6+sCnHHoOVZEDHhRYrfDhs9Ot2o2hulr+yuIqB3B4WSLDChDB4SIDxIu32dhS1JGVrYrxBxEvQ8b0uW4mP7rw==
   dependencies:
     "@polymer/iron-a11y-announcer" "^3.0.0-pre.18"
     "@polymer/iron-a11y-keys-behavior" "^3.0.0-pre.18"
@@ -2004,10 +1994,10 @@
   dependencies:
     "@polymer/polymer" "^3.0.0"
 
-"@vaadin/vaadin-date-picker@^3.3.0":
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/@vaadin/vaadin-date-picker/-/vaadin-date-picker-3.3.0.tgz#1c8e61e910fb49bc5ee2fa0dbcbafec1dab75196"
-  integrity sha512-uWt66I7PTEIL2P8FxFE0uR057LWfyBHoamVPjhtr3VbW7I3+eo9kjp4f2Lq/OafsxF1O2oALRcCPgJDLE8CooQ==
+"@vaadin/vaadin-date-picker@^3.3.1":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/@vaadin/vaadin-date-picker/-/vaadin-date-picker-3.3.1.tgz#349e1309a7e233bcff55455f7998f1e4d26fd7de"
+  integrity sha512-ja8/d24iLXpQ9BGciVqwKpr8R2y58WSG3SJ+7Jn3UCap1ZmhviBna5LuhmaGq/ZmVc+hequc5ptI57rsebSu/w==
   dependencies:
     "@polymer/iron-a11y-announcer" "^3.0.0-pre.18"
     "@polymer/iron-a11y-keys-behavior" "^3.0.0-pre.18"
@@ -2047,31 +2037,30 @@
     "@vaadin/vaadin-material-styles" "^1.1.0"
     "@vaadin/vaadin-themable-mixin" "^1.2.1"
 
-"@vaadin/vaadin-lumo-styles@1.2.0", "@vaadin/vaadin-lumo-styles@^1.1.0", "@vaadin/vaadin-lumo-styles@^1.1.0-beta1", "@vaadin/vaadin-lumo-styles@^1.1.1":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@vaadin/vaadin-lumo-styles/-/vaadin-lumo-styles-1.2.0.tgz#a1b5993282015412115529dad1348b0ed7b780cb"
-  integrity sha512-7hGT+vvIiEc3k+LpGSRlghu+JhVwvne77Rb4e57BoD47M49h1y/MzE55b/x6lemwPCe9ID3hRuiK2L5qWu4vBQ==
+"@vaadin/vaadin-lumo-styles@1.3.0", "@vaadin/vaadin-lumo-styles@^1.1.0", "@vaadin/vaadin-lumo-styles@^1.1.0-beta1", "@vaadin/vaadin-lumo-styles@^1.1.1", "@vaadin/vaadin-lumo-styles@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@vaadin/vaadin-lumo-styles/-/vaadin-lumo-styles-1.3.0.tgz#a7192cef4eae9c79f1e3cc17451c936cfa9daa6a"
+  integrity sha512-JS8Ls8LZtbNRP7kfgsvc3BxMWRua+Lpw8JvAoZ7jUcXvG43SFhk6rbdueTy5uanh1zta4LwrnFtAhNFtoM3GFg==
   dependencies:
     "@polymer/iron-icon" "^3.0.0-pre.18"
     "@polymer/iron-iconset-svg" "^3.0.0-pre.18"
     "@polymer/polymer" "^3.0.0"
 
-"@vaadin/vaadin-material-styles@^1.1.0", "@vaadin/vaadin-material-styles@^1.1.0-beta1", "@vaadin/vaadin-material-styles@^1.1.2":
+"@vaadin/vaadin-material-styles@^1.1.0", "@vaadin/vaadin-material-styles@^1.1.0-beta1", "@vaadin/vaadin-material-styles@^1.1.2", "@vaadin/vaadin-material-styles@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@vaadin/vaadin-material-styles/-/vaadin-material-styles-1.2.0.tgz#8ac6056b30617a789ff806017ec14e779a1e0252"
   integrity sha512-H46YlNxrG+pvFqzYdVB+LM5PE4WpW38dwagHA13RNIHO52mpqZvaRz8U7YNJ+zjqoy9btz7jk7m9QSpgcNLy2w==
   dependencies:
     "@polymer/polymer" "^3.0.0"
 
-"@vaadin/vaadin-overlay@3.2.0-alpha3", "@vaadin/vaadin-overlay@^3.2.0", "@vaadin/vaadin-overlay@^3.2.0-alpha3":
-  version "3.2.0-alpha3"
-  resolved "https://registry.yarnpkg.com/@vaadin/vaadin-overlay/-/vaadin-overlay-3.2.0-alpha3.tgz#925fd1b2fc2ec8d1e8963247cdfe7c6a06d08839"
-  integrity sha512-JgupF+hAIOUUm6m9ZDwJMsWsEZzwCeTXGdX04NJZesO4uw1czlP6qRIiAWVZQvOEUO8suAM55D25l7lzMvG9IQ==
+"@vaadin/vaadin-overlay@3.2.2", "@vaadin/vaadin-overlay@^3.2.0", "@vaadin/vaadin-overlay@^3.2.0-alpha3":
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/@vaadin/vaadin-overlay/-/vaadin-overlay-3.2.2.tgz#ea72cd66637dc6dc0da50508bf2d6a52b6729ee8"
+  integrity sha512-bWXRe0y33WbAoVg22OmN/qhGhJyBsy0cTSd/0hi+c3t5a/7jwYmrRgbK+gsmngnWPeOJVJBmXjBgANny4ArN8w==
   dependencies:
-    "@polymer/iron-overlay-behavior" "^3.0.0-pre.18"
     "@polymer/polymer" "^3.0.0"
-    "@vaadin/vaadin-lumo-styles" "^1.1.0-beta1"
-    "@vaadin/vaadin-material-styles" "^1.1.0-beta1"
+    "@vaadin/vaadin-lumo-styles" "^1.3.0"
+    "@vaadin/vaadin-material-styles" "^1.2.0"
     "@vaadin/vaadin-themable-mixin" "^1.2.1"
 
 "@vaadin/vaadin-text-field@^2.1.1", "@vaadin/vaadin-text-field@^2.1.2":
@@ -2243,15 +2232,15 @@
     "@webassemblyjs/wast-parser" "1.7.8"
     "@xtuc/long" "4.2.1"
 
-"@webcomponents/shadycss@^1.5.2":
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/@webcomponents/shadycss/-/shadycss-1.5.2.tgz#ad72f43000c39ba4ac61e625131f34f4b7cfe55f"
-  integrity sha512-0OyrmVc7S+INtzoqP2ofAo+OdVn2Nj0Qvq4wD9FEGN7nMmLRxaD2mzy6hD6EslzxUSuGH302CDU4KXiY66SEqg==
+"@webcomponents/shadycss@^1.5.2", "@webcomponents/shadycss@^1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@webcomponents/shadycss/-/shadycss-1.6.0.tgz#2aeb0703983137a733bdb5c06fff125aa1f8c5c1"
+  integrity sha512-iURGZZU6BaiRJtGgjMn208QxPkY11QwT/VmuHNa4Yb+kJxU/WODe4C8b0LDOtnk4KJzJg50hCfwvPRAjePEzbA==
 
-"@webcomponents/webcomponentsjs@2.1.3", "@webcomponents/webcomponentsjs@^1.0.7", "@webcomponents/webcomponentsjs@^2.0.0", "@webcomponents/webcomponentsjs@^2.1.3":
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.1.3.tgz#f7430c6efe52ab06f69d219fddd32afd2758f683"
-  integrity sha512-0UHJNY88lR3pnEYtBVT7F8cuuxOiITQGWJa0LxoELqkBSB7IabzJFOj5K99PajD3CGAsWpjB0CAeijfe376Y1w==
+"@webcomponents/webcomponentsjs@2.2.1", "@webcomponents/webcomponentsjs@^1.0.7", "@webcomponents/webcomponentsjs@^2.0.0", "@webcomponents/webcomponentsjs@^2.2.0":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.2.1.tgz#bf28cdad466aaf85d88ee56aebed32c83f4c1328"
+  integrity sha512-lZZ+Lkke6JhsJcQQqSVk1Pny6/8y4qhJ98LO7a/MwBSRO8WqHqK1X2vscfeL8vOnYGFnmBUyVG95lwYv/AXyLQ==
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
@@ -2295,32 +2284,30 @@ acorn-jsx@^3.0.0:
   dependencies:
     acorn "^3.0.4"
 
-acorn-jsx@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-4.1.1.tgz#e8e41e48ea2fe0c896740610ab6a4ffd8add225e"
-  integrity sha512-JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw==
-  dependencies:
-    acorn "^5.0.3"
+acorn-jsx@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e"
+  integrity sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==
 
 acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
   integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
 
-acorn@^5.0.0, acorn@^5.0.3, acorn@^5.5.3, acorn@^5.6.0, acorn@^5.6.2:
+acorn@^5.0.0, acorn@^5.5.0, acorn@^5.5.3, acorn@^5.6.2:
   version "5.7.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
   integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
-acorn@^5.5.0:
-  version "5.5.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
-  integrity sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==
+acorn@^6.0.2:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.4.tgz#77377e7353b72ec5104550aa2d2097a2fd40b754"
+  integrity sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==
 
 adm-zip@~0.4.3:
-  version "0.4.11"
-  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.11.tgz#2aa54c84c4b01a9d0fb89bb11982a51f13e3d62a"
-  integrity sha512-L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA==
+  version "0.4.13"
+  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.13.tgz#597e2f8cc3672151e1307d3e95cddbc75672314a"
+  integrity sha512-fERNJX8sOXfel6qCBCMPvZLzENBEhZTzKqg6vrOW5pvoEaQuJhRU4ndTAh6lHOxn1I6jnz2NHra56ZODM751uw==
 
 after@0.8.2:
   version "0.8.2"
@@ -2347,35 +2334,25 @@ ajv-errors@^1.0.0:
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59"
   integrity sha1-7PAh+hCP0X37Xms4Py3SM+Mf/Fk=
 
-ajv-keywords@^3.0.0, ajv-keywords@^3.1.0:
+ajv-keywords@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
   integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
 
-ajv@^5.1.0, ajv@^5.3.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
-ajv@^6.0.1, ajv@^6.5.3:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9"
-  integrity sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==
+ajv@^6.1.0:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.4.tgz#247d5274110db653706b550fcc2b797ca28cfc59"
+  integrity sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^6.1.0:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.4.tgz#247d5274110db653706b550fcc2b797ca28cfc59"
-  integrity sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==
+ajv@^6.5.3, ajv@^6.5.5, ajv@^6.6.1:
+  version "6.6.1"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.1.tgz#6360f5ed0d80f232cc2b294c362d5dc2e538dd61"
+  integrity sha512-ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
@@ -2751,6 +2728,11 @@ ast-types@0.9.6:
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
   integrity sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=
 
+astral-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
+  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
+
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
@@ -2805,7 +2787,7 @@ aws-sign2@~0.7.0:
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
-aws4@^1.6.0, aws4@^1.8.0:
+aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
   integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
@@ -3468,10 +3450,10 @@ binary-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14"
   integrity sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==
 
-binaryextensions@2:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.1.1.tgz#3209a51ca4a4ad541a3b8d3d6a6d5b83a2485935"
-  integrity sha512-XBaoWE9RW8pPdPQNibZsW2zh8TW6gcarXp1FZPwT8Uop8ScSNldJEWf2k9l3HeTqdrEwsOsFcq74RiJECW34yA==
+binaryextensions@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.1.2.tgz#c83c3d74233ba7674e4f313cb2a2b70f54e94b7c"
+  integrity sha512-xVNN69YGDghOqCCtA6FI7avYrr02mTJjOgB0/f1VPD3pJC8QEvjTKWc4epDx8AqxxA75NI0QpVM2gPJXUbE4Tg==
 
 bl@^1.0.0:
   version "1.2.2"
@@ -3481,10 +3463,10 @@ bl@^1.0.0:
     readable-stream "^2.3.5"
     safe-buffer "^5.1.1"
 
-blob@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
-  integrity sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=
+blob@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
+  integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
 
 bluebird@^3.5.1:
   version "3.5.2"
@@ -3545,20 +3527,6 @@ boolbase@~1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
-boom@4.x.x:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-  integrity sha1-T4owBctKfjiJ90kDD9JbluAdLjE=
-  dependencies:
-    hoek "4.x.x"
-
-boom@5.x.x:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-  integrity sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==
-  dependencies:
-    hoek "4.x.x"
-
 bower-config@^1.4.0, bower-config@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/bower-config/-/bower-config-1.4.1.tgz#85fd9df367c2b8dbbd0caa4c5f2bad40cd84c2cc"
@@ -3665,9 +3633,9 @@ brorand@^1.0.1:
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
 browser-capabilities@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/browser-capabilities/-/browser-capabilities-1.1.2.tgz#713119f642aa72a4bb5b518699a7957e3ad903d9"
-  integrity sha512-T9BTu9Lmdrh9XZe0XnUY3jGiBlB0jAkl4M9qvt+1SszqlckgcUTzJuBwD6HNNKjdiDA+18KfiIUJEVxTY2W24g==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/browser-capabilities/-/browser-capabilities-1.1.3.tgz#abb304cf34ddaa11a57f53e91848613a2019d504"
+  integrity sha512-mdpQfV436YU8kzFtvvlVGnSJNSoUIzQZRIlYOfjB0y/M/b0R9Hc8os0XIPXdluimJRUIIn3YePtYJjHGFXC24Q==
   dependencies:
     "@types/ua-parser-js" "^0.7.31"
     ua-parser-js "^0.7.15"
@@ -3769,7 +3737,7 @@ buffer-alloc-unsafe@^1.1.0:
   resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
   integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
 
-buffer-alloc@^1.1.0, buffer-alloc@^1.2.0:
+buffer-alloc@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
   integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
@@ -3901,6 +3869,13 @@ call-me-maybe@^1.0.1:
   resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
   integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
 
+caller-callsite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
+  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
+  dependencies:
+    callsites "^2.0.0"
+
 caller-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
@@ -3908,6 +3883,13 @@ caller-path@^0.1.0:
   dependencies:
     callsites "^0.2.0"
 
+caller-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
+  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
+  dependencies:
+    caller-callsite "^2.0.0"
+
 callsite@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
@@ -3918,6 +3900,11 @@ callsites@^0.2.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
   integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
 
+callsites@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
+
 camel-case@3.0.x:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
@@ -4027,10 +4014,10 @@ chalk@~0.4.0:
     has-color "~0.1.0"
     strip-ansi "~0.1.0"
 
-chardet@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.5.0.tgz#fe3ac73c00c3d865ffcc02a0682e2c20b6a06029"
-  integrity sha512-9ZTaoBaePSCFvNlNGrsyI8ZVACP2svUtq0DkM7t4K2ClAa96sqOIRjAzDTc8zXzFt1cZR46rRzLTiHFSJ+Qw0g==
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
 charenc@~0.0.1:
   version "0.0.2"
@@ -4109,7 +4096,7 @@ chokidar@^2.0.0, chokidar@^2.0.2:
   optionalDependencies:
     fsevents "^1.2.2"
 
-chownr@^1.0.1:
+chownr@^1.0.1, chownr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
   integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
@@ -4178,7 +4165,7 @@ cli-boxes@^1.0.0:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
   integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM=
 
-cli-cursor@^1.0.1, cli-cursor@^1.0.2:
+cli-cursor@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
   integrity sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=
@@ -4275,11 +4262,6 @@ cloneable-readable@^1.0.0:
     process-nextick-args "^2.0.0"
     readable-stream "^2.3.5"
 
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
-
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -4305,11 +4287,16 @@ color-convert@^1.9.0, color-convert@^1.9.1:
   dependencies:
     color-name "1.1.3"
 
-color-name@1.1.3, color-name@^1.0.0:
+color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
+color-name@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
 color-string@^1.5.2:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc"
@@ -4354,7 +4341,7 @@ colorspace@1.1.x:
     color "3.0.x"
     text-hex "1.0.x"
 
-combined-stream@^1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6:
+combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
   integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
@@ -4457,11 +4444,11 @@ compress-commons@^1.2.0:
     readable-stream "^2.0.0"
 
 compressible@~2.0.14:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.14.tgz#326c5f507fbb055f54116782b969a81b67a29da7"
-  integrity sha1-MmxfUH+7BV9UEWeCuWmoG2einac=
+  version "2.0.15"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.15.tgz#857a9ab0a7e5a07d8d837ed43fe2defff64fe212"
+  integrity sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==
   dependencies:
-    mime-db ">= 1.34.0 < 2"
+    mime-db ">= 1.36.0 < 2"
 
 compression-webpack-plugin@^2.0.0:
   version "2.0.0"
@@ -4630,7 +4617,7 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
-cosmiconfig@^5.0.2, cosmiconfig@^5.0.6:
+cosmiconfig@5.0.6:
   version "5.0.6"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz#dca6cf680a0bd03589aff684700858c81abeeb39"
   integrity sha512-6DWfizHriCrFWURP1/qyhsiFvYdlJzbCzmtFWh744+KyWsJo5+kPzUZZaMRSSItoYc0pxFX7gEO7ZC1/gN/7AQ==
@@ -4639,6 +4626,16 @@ cosmiconfig@^5.0.2, cosmiconfig@^5.0.6:
     js-yaml "^3.9.0"
     parse-json "^4.0.0"
 
+cosmiconfig@^5.0.6:
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04"
+  integrity sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==
+  dependencies:
+    import-fresh "^2.0.0"
+    is-directory "^0.3.1"
+    js-yaml "^3.9.0"
+    parse-json "^4.0.0"
+
 crc32-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz#e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"
@@ -4722,13 +4719,6 @@ crypt@~0.0.1:
   resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
   integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
 
-cryptiles@3.x.x:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
-  integrity sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=
-  dependencies:
-    boom "5.x.x"
-
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -4882,7 +4872,7 @@ debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.0, debug@^4.0.1:
+debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@~4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
   integrity sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==
@@ -5009,19 +4999,6 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
-del@^2.0.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
-  integrity sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=
-  dependencies:
-    globby "^5.0.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    rimraf "^2.2.8"
-
 del@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
@@ -5337,11 +5314,19 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-editions@^1.3.3:
+editions@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
   integrity sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==
 
+editions@^2.0.2:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/editions/-/editions-2.1.0.tgz#5c6f6341ef19ee362a3bcbb907fe68e696dbc69e"
+  integrity sha512-yKrimWcvOXcYXtqsOeebbMLynm9qbYVd0005wveGU2biPxJaJoxA0jtaZrxiMe3mAanLr5lxoYFVz5zjv9JdnA==
+  dependencies:
+    errlop "^1.0.3"
+    semver "^5.6.0"
+
 ee-first@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.0.tgz#6a0d7c6221e490feefd92ec3f441c9ce8cd097f4"
@@ -5428,10 +5413,10 @@ ends-with@^0.2.0:
   resolved "https://registry.yarnpkg.com/ends-with/-/ends-with-0.2.0.tgz#2f9da98d57a50cfda4571ce4339000500f4e6b8a"
   integrity sha1-L52pjVelDP2kVxzkM5AAUA9Oa4o=
 
-engine.io-client@~3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36"
-  integrity sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==
+engine.io-client@~3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.3.1.tgz#afedb4a07b2ea48b7190c3136bfea98fdd4f0f03"
+  integrity sha512-q66JBFuQcy7CSlfAz9L3jH+v7DTT3i6ZEadYcVj2pOs8/0uJHLxKX3WBkGTvULJMdz0tUCyJag0aKT/dpXL9BQ==
   dependencies:
     component-emitter "1.2.1"
     component-inherit "0.0.3"
@@ -5441,32 +5426,32 @@ engine.io-client@~3.2.0:
     indexof "0.0.1"
     parseqs "0.0.5"
     parseuri "0.0.5"
-    ws "~3.3.1"
+    ws "~6.1.0"
     xmlhttprequest-ssl "~1.5.4"
     yeast "0.1.2"
 
 engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.2.tgz#4c0f4cff79aaeecbbdcfdea66a823c6085409196"
-  integrity sha512-dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw==
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.3.tgz#757ab970fbf2dfb32c7b74b033216d5739ef79a6"
+  integrity sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==
   dependencies:
     after "0.8.2"
     arraybuffer.slice "~0.0.7"
     base64-arraybuffer "0.1.5"
-    blob "0.0.4"
+    blob "0.0.5"
     has-binary2 "~1.0.2"
 
-engine.io@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.0.tgz#54332506f42f2edc71690d2f2a42349359f3bf7d"
-  integrity sha512-mRbgmAtQ4GAlKwuPnnAvXXwdPhEx+jkc0OBCLrXuD/CRvwNK3AxRSnqK4FSqmAMRRHryVJP8TopOvmEaA64fKw==
+engine.io@~3.3.1:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.3.2.tgz#18cbc8b6f36e9461c5c0f81df2b830de16058a59"
+  integrity sha512-AsaA9KG7cWPXWHp5FvHdDWY3AMWeZ8x+2pUVLcn71qE5AtAzgGbxuclOytygskw8XGmiQafTmnI9Bix3uihu2w==
   dependencies:
     accepts "~1.3.4"
     base64id "1.0.0"
     cookie "0.3.1"
     debug "~3.1.0"
     engine.io-parser "~2.1.0"
-    ws "~3.3.1"
+    ws "~6.1.0"
 
 enhanced-resolve@^4.0.0:
   version "4.0.0"
@@ -5505,6 +5490,13 @@ env-variable@0.0.x:
   resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.5.tgz#913dd830bef11e96a039c038d4130604eba37f88"
   integrity sha512-zoB603vQReOFvTg5xMl9I1P2PnHsHQQKTEowsKKD7nseUfJq6UWzK+4YtlWUO1nhiQUxe6XMkk+JleSZD1NZFA==
 
+errlop@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/errlop/-/errlop-1.0.3.tgz#dba29c90cf832c3d2ce469fe515d7e5eef2c6676"
+  integrity sha512-5VTnt0yikY4LlQEfCXVSqfE6oLj1HVM4zVSvAKMnoYjL/zrb6nqiLowZS4XlG7xENfyj7lpYWvT+wfSCr6dtlA==
+  dependencies:
+    editions "^1.3.4"
+
 errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
@@ -5512,14 +5504,7 @@ errno@^0.1.3, errno@~0.1.7:
   dependencies:
     prr "~1.0.1"
 
-error-ex@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
-  integrity sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=
-  dependencies:
-    is-arrayish "^0.2.1"
-
-error-ex@^1.3.1:
+error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
@@ -5625,9 +5610,9 @@ eslint-config-airbnb-base@^13.1.0:
     object.entries "^1.0.4"
 
 eslint-config-prettier@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.1.0.tgz#2c26d2cdcfa3a05f0642cd7e6e4ef3316cdabfa2"
-  integrity sha512-QYGfmzuc4q4J6XIhlp8vRKdI/fI0tQfQPy1dME3UOLprE+v4ssH/3W9LM2Q7h5qBcy5m0ehCrBDU2YF8q6OY8w==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.3.0.tgz#41afc8d3b852e757f06274ed6c44ca16f939a57d"
+  integrity sha512-Bc3bh5bAcKNvs3HOpSi6EfGA2IIp7EzWcg2tS4vP7stnXu/J1opihHDM7jI9JCIckyIDTgZLSWn7J3HY0j2JfA==
   dependencies:
     get-stdin "^6.0.0"
 
@@ -5737,15 +5722,15 @@ eslint-visitor-keys@^1.0.0:
   integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
 
 eslint@^5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.6.0.tgz#b6f7806041af01f71b3f1895cbb20971ea4b6223"
-  integrity sha512-/eVYs9VVVboX286mBK7bbKnO1yamUy2UCRjiY6MryhQL2PaaXCExsCQ2aO83OeYRhU2eCU/FMFP+tVMoOrzNrA==
+  version "5.9.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.9.0.tgz#b234b6d15ef84b5849c6de2af43195a2d59d408e"
+  integrity sha512-g4KWpPdqN0nth+goDNICNXGfJF7nNnepthp46CAlJoJtC5K/cLu3NgCM3AHu1CkJ5Hzt9V0Y0PBAO6Ay/gGb+w==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     ajv "^6.5.3"
     chalk "^2.1.0"
     cross-spawn "^6.0.5"
-    debug "^3.1.0"
+    debug "^4.0.1"
     doctrine "^2.1.0"
     eslint-scope "^4.0.0"
     eslint-utils "^1.3.1"
@@ -5772,12 +5757,12 @@ eslint@^5.6.0:
     path-is-inside "^1.0.2"
     pluralize "^7.0.0"
     progress "^2.0.0"
-    regexpp "^2.0.0"
+    regexpp "^2.0.1"
     require-uncached "^1.0.3"
     semver "^5.5.1"
     strip-ansi "^4.0.0"
     strip-json-comments "^2.0.1"
-    table "^4.0.3"
+    table "^5.0.2"
     text-table "^0.2.0"
 
 espree@^3.5.2:
@@ -5789,12 +5774,13 @@ espree@^3.5.2:
     acorn-jsx "^3.0.0"
 
 espree@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-4.0.0.tgz#253998f20a0f82db5d866385799d912a83a36634"
-  integrity sha512-kapdTCt1bjmspxStVKX6huolXVV5ZfyZguY1lcfhVVZstce3bqxH9mcLzNn3/mlgW6wQ732+0fuG9v7h0ZQoKg==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-4.1.0.tgz#728d5451e0fd156c04384a7ad89ed51ff54eb25f"
+  integrity sha512-I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w==
   dependencies:
-    acorn "^5.6.0"
-    acorn-jsx "^4.1.1"
+    acorn "^6.0.2"
+    acorn-jsx "^5.0.0"
+    eslint-visitor-keys "^1.0.0"
 
 esprima@^4.0.0:
   version "4.0.1"
@@ -5898,19 +5884,6 @@ execa@^0.7.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-execa@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.9.0.tgz#adb7ce62cf985071f60580deb4a88b9e34712d01"
-  integrity sha512-BbUMBiX4hqiHZUA5+JujIjNb6TyAlp2D5KLheMjMluwOuzcnylDL4AxZYLLn1n2AGB49eSWwyKvvEQoRpnAtmA==
-  dependencies:
-    cross-spawn "^5.0.1"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 execa@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
@@ -6081,7 +6054,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@3, extend@^3.0.0, extend@~3.0.0, extend@~3.0.1, extend@~3.0.2:
+extend@3, extend@^3.0.0, extend@~3.0.0, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -6096,12 +6069,12 @@ external-editor@^1.1.0:
     tmp "^0.0.29"
 
 external-editor@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.0.tgz#dc35c48c6f98a30ca27a20e9687d7f3c77704bb6"
-  integrity sha512-mpkfj0FEdxrIhOC04zk85X7StNtr0yXnG7zCb+8ikO8OJi2jsHh5YGoknNTyXgsbHOf1WOOcVU3kPFWT2WgCkQ==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
+  integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
   dependencies:
-    chardet "^0.5.0"
-    iconv-lite "^0.4.22"
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
 extglob@^0.3.1:
@@ -6149,11 +6122,6 @@ fancy-log@^1.1.0:
     color-support "^1.1.3"
     time-stamp "^1.0.0"
 
-fast-deep-equal@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
-  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
-
 fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
@@ -6170,15 +6138,15 @@ fast-diff@^1.1.2:
   integrity sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==
 
 fast-glob@^2.0.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.3.tgz#d09d378e9ef6b0076a0fa1ba7519d9d4d9699c28"
-  integrity sha512-NiX+JXjnx43RzvVFwRWfPKo4U+1BrK5pJPsHQdKMlLoFHrrGktXglQhHliSihWAq+m1z6fHk3uwGHrtRbS9vLA==
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.4.tgz#e54f4b66d378040e0e4d6a68ec36bbc5b04363c0"
+  integrity sha512-FjK2nCGI/McyzgNtTESqaWP3trPvHyRyoyY70hxjc3oKPNmDe8taohLZpoVKoUjW85tbU5txaYUZCNtVzygl1g==
   dependencies:
     "@mrmlnc/readdir-enhanced" "^2.2.1"
-    "@nodelib/fs.stat" "^1.0.1"
+    "@nodelib/fs.stat" "^1.1.2"
     glob-parent "^3.1.0"
     is-glob "^4.0.0"
-    merge2 "^1.2.1"
+    merge2 "^1.2.3"
     micromatch "^3.1.10"
 
 fast-json-stable-stringify@^2.0.0:
@@ -6430,13 +6398,13 @@ flagged-respawn@^0.3.2:
   integrity sha1-/xke3c1wiKZ1smEP/8l2vpuAdLU=
 
 flat-cache@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
-  integrity sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.4.tgz#2c2ef77525cc2929007dfffa1dd314aa9c9dee6f"
+  integrity sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==
   dependencies:
     circular-json "^0.3.1"
-    del "^2.0.2"
     graceful-fs "^4.1.2"
+    rimraf "~2.6.2"
     write "^0.2.1"
 
 flush-write-stream@^1.0.0:
@@ -6456,9 +6424,9 @@ follow-redirects@0.0.7:
     stream-consume "^0.1.0"
 
 follow-redirects@^1.0.0:
-  version "1.5.9"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.9.tgz#c9ed9d748b814a39535716e531b9196a845d89c6"
-  integrity sha512-Bh65EZI/RU8nx0wbYF9shkFZlqLP+6WT/5FnA3cE/djNSuKNHJEinGGZgu/cQEkeeb2GdFOgenAmn8qaqYke2w==
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
+  integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
   dependencies:
     debug "=3.1.0"
 
@@ -6501,7 +6469,7 @@ fork-stream@^0.0.4:
   resolved "https://registry.yarnpkg.com/fork-stream/-/fork-stream-0.0.4.tgz#db849fce77f6708a5f8f386ae533a0907b54ae70"
   integrity sha1-24Sfznf2cIpfjzhq5TOgkHtUrnA=
 
-form-data@~2.3.1, form-data@~2.3.2:
+form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
   integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
@@ -6917,15 +6885,10 @@ global-prefix@^1.0.1:
     is-windows "^1.0.1"
     which "^1.2.14"
 
-globals@^11.1.0:
-  version "11.8.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.8.0.tgz#c1ef45ee9bed6badf0663c5cb90e8d1adec1321d"
-  integrity sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==
-
-globals@^11.7.0:
-  version "11.7.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"
-  integrity sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==
+globals@^11.1.0, globals@^11.7.0:
+  version "11.9.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249"
+  integrity sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg==
 
 globals@^9.18.0:
   version "9.18.0"
@@ -6944,18 +6907,6 @@ globby@^4.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-globby@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
-  integrity sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=
-  dependencies:
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
 globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
@@ -7073,7 +7024,12 @@ graceful-fs@^3.0.0:
   dependencies:
     natives "^1.1.0"
 
-graceful-fs@^4.0.0, graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6:
+graceful-fs@^4.0.0, graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3:
+  version "4.1.15"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
+  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
+
+graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
   integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
@@ -7280,20 +7236,12 @@ har-schema@^2.0.0:
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
-  dependencies:
-    ajv "^5.1.0"
-    har-schema "^2.0.0"
-
 har-validator@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
-  integrity sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
   dependencies:
-    ajv "^5.3.0"
+    ajv "^6.5.5"
     har-schema "^2.0.0"
 
 has-ansi@^0.1.0:
@@ -7332,6 +7280,11 @@ has-flag@^1.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
   integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
 
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
 has-gulplog@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
@@ -7422,16 +7375,6 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-hawk@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-  integrity sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==
-  dependencies:
-    boom "4.x.x"
-    cryptiles "3.x.x"
-    hoek "4.x.x"
-    sntp "2.x.x"
-
 he@1.1.1, he@1.1.x:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
@@ -7660,12 +7603,12 @@ https-proxy-agent@^2.2.1:
     debug "^3.1.0"
 
 husky@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-1.1.2.tgz#574c2bb16958db8a8120b63306efaff110525c23"
-  integrity sha512-9TdkUpBeEOjz0AnFdUN4i3w8kEbOsVs9/WSeJqWLq2OO6bcKQhVW64Zi+pVd/AMRLpN3QTINb6ZXiELczvdmqQ==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-1.2.0.tgz#d631dda1e4a9ee8ba69a10b0c51a0e2c66e711e5"
+  integrity sha512-/ib3+iycykXC0tYIxsyqierikVa9DA2DrT32UEirqNEFVqOj1bFMTgP3jAz8HM7FgC/C8pc/BTUa9MV2GEkZaA==
   dependencies:
     cosmiconfig "^5.0.6"
-    execa "^0.9.0"
+    execa "^1.0.0"
     find-up "^3.0.0"
     get-stdin "^6.0.0"
     is-ci "^1.2.1"
@@ -7680,14 +7623,14 @@ iconv-lite@0.4.19, iconv-lite@~0.4.13:
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
   integrity sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==
 
-iconv-lite@0.4.23, iconv-lite@^0.4.22:
+iconv-lite@0.4.23:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
   integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.4.4:
+iconv-lite@^0.4.24, iconv-lite@^0.4.4:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -7728,6 +7671,14 @@ immutability-helper@^2.7.1:
   dependencies:
     invariant "^2.2.0"
 
+import-fresh@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
+  integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY=
+  dependencies:
+    caller-path "^2.0.0"
+    resolve-from "^3.0.0"
+
 import-lazy@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
@@ -7784,11 +7735,21 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@1, inherits@2, inherits@2.0.1, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+inherits@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
+  integrity sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=
+
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
+inherits@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
+
 ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
@@ -7814,26 +7775,7 @@ inquirer@^1.0.2:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
-inquirer@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.0.0.tgz#e8c20303ddc15bbfc2c12a6213710ccd9e1413d8"
-  integrity sha512-tISQWRwtcAgrz+SHPhTH7d3e73k31gsOy6i1csonLc0u1dVK/wYvuOnFeiWqC5OXFIYbmrIFInef31wbT8MEJg==
-  dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^3.0.0"
-    figures "^2.0.0"
-    lodash "^4.3.0"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rxjs "^6.1.0"
-    string-width "^2.1.0"
-    strip-ansi "^4.0.0"
-    through "^2.3.6"
-
-inquirer@^6.1.0:
+inquirer@^6.0.0, inquirer@^6.1.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
   integrity sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==
@@ -8351,13 +8293,13 @@ isstream@0.1.x, isstream@~0.1.2:
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
 istextorbinary@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.2.1.tgz#a5231a08ef6dd22b268d0895084cf8d58b5bec53"
-  integrity sha512-TS+hoFl8Z5FAFMK38nhBkdLt44CclNRgDHWeMgsV8ko3nDlr/9UI2Sf839sW7enijf8oKsZYXRvM8g0it9Zmcw==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.3.0.tgz#29458d7b10edcb52f4db9c57945bb67cd20cc4fd"
+  integrity sha512-xs+IFjzw1/5n45nMYUh2ipLWGarmE0bDVR85WAiYUXzawc8NYn1WW0qaq2rSEFIR3NoNkaAvOr3FVMojFz5uUg==
   dependencies:
-    binaryextensions "2"
-    editions "^1.3.3"
-    textextensions "2"
+    binaryextensions "^2.1.2"
+    editions "^2.0.2"
+    textextensions "^2.4.0"
 
 isurl@^1.0.0-alpha5:
   version "1.0.0"
@@ -8435,9 +8377,9 @@ jsesc@^1.3.0:
   integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
 
 jsesc@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
-  integrity sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
 jsesc@~0.5.0:
   version "0.5.0"
@@ -8449,11 +8391,6 @@ json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
-
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -8498,6 +8435,13 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
+json5@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
+  integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==
+  dependencies:
+    minimist "^1.2.0"
+
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -8667,13 +8611,14 @@ lines-and-columns@^1.1.6:
   integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
 
 lint-staged@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.0.2.tgz#b17df8534713071826c2a576c9bdf84b2a535f30"
-  integrity sha512-k8HKT/eIIOpqVLrrNbLDaTn4Vnqan6Y8EZIrxrxtlbArJ76RWcD5hyPqB5f3cLDMb+MjDlOkCWpLpZLHwZw7Fg==
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.1.0.tgz#dbc3ae2565366d8f20efb9f9799d076da64863f2"
+  integrity sha512-yfSkyJy7EuVsaoxtUSEhrD81spdJOe/gMTGea3XaV7HyoRhTb9Gdlp6/JppRZERvKSEYXP9bjcmq6CA5oL2lYQ==
   dependencies:
+    "@iamstarkov/listr-update-renderer" "0.4.1"
     chalk "^2.3.1"
     commander "^2.14.1"
-    cosmiconfig "^5.0.2"
+    cosmiconfig "5.0.6"
     debug "^3.1.0"
     dedent "^0.7.0"
     del "^3.0.0"
@@ -8684,7 +8629,6 @@ lint-staged@^8.0.2:
     is-windows "^1.0.2"
     jest-validate "^23.5.0"
     listr "^0.14.2"
-    listr-update-renderer "https://github.com/okonet/listr-update-renderer/tarball/upgrade-log-update"
     lodash "^4.17.5"
     log-symbols "^2.2.0"
     micromatch "^3.1.8"
@@ -8693,7 +8637,7 @@ lint-staged@^8.0.2:
     path-is-inside "^1.0.2"
     pify "^3.0.0"
     please-upgrade-node "^3.0.2"
-    staged-git-files "1.1.1"
+    staged-git-files "1.1.2"
     string-argv "^0.0.2"
     stringify-object "^3.2.2"
 
@@ -8702,9 +8646,10 @@ listr-silent-renderer@^1.1.1:
   resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
   integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=
 
-listr-update-renderer@^0.4.0, "listr-update-renderer@https://github.com/okonet/listr-update-renderer/tarball/upgrade-log-update":
-  version "0.4.0"
-  resolved "https://github.com/okonet/listr-update-renderer/tarball/upgrade-log-update#06073fa93166277607a7814f4e1f83960081414c"
+listr-update-renderer@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz#4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2"
+  integrity sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==
   dependencies:
     chalk "^1.1.3"
     cli-truncate "^0.2.1"
@@ -8715,30 +8660,30 @@ listr-update-renderer@^0.4.0, "listr-update-renderer@https://github.com/okonet/l
     log-update "^2.3.0"
     strip-ansi "^3.0.1"
 
-listr-verbose-renderer@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz#8206f4cf6d52ddc5827e5fd14989e0e965933a35"
-  integrity sha1-ggb0z21S3cWCfl/RSYng6WWTOjU=
+listr-verbose-renderer@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz#f1132167535ea4c1261102b9f28dac7cba1e03db"
+  integrity sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==
   dependencies:
-    chalk "^1.1.3"
-    cli-cursor "^1.0.2"
+    chalk "^2.4.1"
+    cli-cursor "^2.1.0"
     date-fns "^1.27.2"
-    figures "^1.7.0"
+    figures "^2.0.0"
 
 listr@^0.14.2:
-  version "0.14.2"
-  resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.2.tgz#cbe44b021100a15376addfc2d79349ee430bfe14"
-  integrity sha512-vmaNJ1KlGuGWShHI35X/F8r9xxS0VTHh9GejVXwSN20fG5xpq3Jh4bJbnumoT6q5EDM/8/YP1z3YMtQbFmhuXw==
+  version "0.14.3"
+  resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz#2fea909604e434be464c50bddba0d496928fa586"
+  integrity sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==
   dependencies:
     "@samverschueren/stream-to-observable" "^0.3.0"
     is-observable "^1.1.0"
     is-promise "^2.1.0"
     is-stream "^1.1.0"
     listr-silent-renderer "^1.1.1"
-    listr-update-renderer "^0.4.0"
-    listr-verbose-renderer "^0.4.0"
-    p-map "^1.1.1"
-    rxjs "^6.1.0"
+    listr-update-renderer "^0.5.0"
+    listr-verbose-renderer "^0.5.0"
+    p-map "^2.0.0"
+    rxjs "^6.3.3"
 
 lit-html@0.12.0, lit-html@^0.12.0:
   version "0.12.0"
@@ -9221,25 +9166,20 @@ lodash.values@~2.4.1:
   dependencies:
     lodash.keys "~2.4.1"
 
-lodash@4.17.10, lodash@^4.11.1, lodash@^4.17.10, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.3.0:
-  version "4.17.10"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-  integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
+lodash@4.17.11, lodash@^4.11.1, lodash@^4.16.6, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.8.0:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
 lodash@^3.0.0, lodash@^3.10.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
   integrity sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=
 
-lodash@^4.16.6, lodash@^4.8.0:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
-  integrity sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=
-
-lodash@^4.17.5:
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
-  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
+lodash@^4.17.3:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+  integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
 
 lodash@~1.0.1:
   version "1.0.2"
@@ -9342,7 +9282,15 @@ lru-cache@2:
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
   integrity sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=
 
-lru-cache@^4.0.1, lru-cache@^4.0.2, lru-cache@^4.1.1, lru-cache@^4.1.3:
+lru-cache@^4.0.1, lru-cache@^4.0.2:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
+lru-cache@^4.1.1, lru-cache@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
   integrity sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==
@@ -9514,7 +9462,7 @@ merge-stream@^1.0.0, merge-stream@^1.0.1:
   dependencies:
     readable-stream "^2.0.1"
 
-merge2@^1.2.1:
+merge2@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
   integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
@@ -9570,12 +9518,7 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-"mime-db@>= 1.34.0 < 2":
-  version "1.35.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.35.0.tgz#0569d657466491283709663ad379a99b90d9ab47"
-  integrity sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==
-
-mime-db@^1.28.0, mime-db@~1.37.0:
+"mime-db@>= 1.36.0 < 2", mime-db@^1.28.0, mime-db@~1.37.0:
   version "1.37.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
   integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==
@@ -9603,9 +9546,9 @@ mime@^1.2.11:
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mime@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
-  integrity sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
+  integrity sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
@@ -9676,7 +9619,7 @@ minimist@~0.0.1:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
   integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
-minipass@^2.2.1, minipass@^2.3.3:
+minipass@^2.2.1, minipass@^2.3.4:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
   integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
@@ -9684,7 +9627,7 @@ minipass@^2.2.1, minipass@^2.3.3:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
-minizlib@^1.1.0:
+minizlib@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.1.tgz#6734acc045a46e61d596a43bb9d9cd326e19cc42"
   integrity sha512-TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg==
@@ -10139,11 +10082,6 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-oauth-sign@~0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
-
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
@@ -10458,6 +10396,11 @@ p-map@^1.1.1:
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
   integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
 
+p-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.0.0.tgz#be18c5a5adeb8e156460651421aceca56c213a50"
+  integrity sha512-GO107XdrSUmtHxVoi60qc9tUl/KkNKm+X2CF4P9amalpGxv5YqVPJNfSb0wcA+syCopkZvYYIzW8OVTQW59x/w==
+
 p-timeout@^1.1.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.1.tgz#5eb3b353b7fce99f101a1038880bb054ebbea386"
@@ -10842,7 +10785,7 @@ plylog@^1.0.0:
     winston "^3.0.0"
     winston-transport "^4.2.0"
 
-polymer-analyzer@^3.0.0, polymer-analyzer@^3.0.1, polymer-analyzer@^3.1.2, polymer-analyzer@^3.1.3:
+polymer-analyzer@^3.0.0, polymer-analyzer@^3.1.2, polymer-analyzer@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/polymer-analyzer/-/polymer-analyzer-3.1.3.tgz#05a9015043c6d38decd799166cda7680a84e49fd"
   integrity sha512-PU2gp7I4PT9/oNweNaDOS/g8mnfxarDSvUCHJ/ThJSH/gkIeqtDr6v/35Eky8G/5NjE7rPHbY+l+PGXlTKAC9w==
@@ -10885,10 +10828,10 @@ polymer-analyzer@^3.0.0, polymer-analyzer@^3.0.1, polymer-analyzer@^3.1.2, polym
     vscode-uri "^1.0.1"
     whatwg-url "^6.4.0"
 
-polymer-build@^3.0.3, polymer-build@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/polymer-build/-/polymer-build-3.1.0.tgz#13534ac3c68f59f4acf5d6947e3f7acbf41eb0bf"
-  integrity sha512-DwSiOtd1ERpGPfVCqi7SdSjW97yg4oGeUBtg2tnD/ZyEANNFSBCrkEtOFchKm/H5gCCjSEpLqqchTPrqZAYNcw==
+polymer-build@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/polymer-build/-/polymer-build-3.1.1.tgz#43ce5df887caa47745721e7c1c489a5ea3f930c4"
+  integrity sha512-aODeAJQm3HxDuv7Z+swdsZGgQdOcHH2V7huFPLc7PGjZaIpXTacQUC6W+PP8/hHkzX+u0Wxha+MPjWBr3C/Gow==
   dependencies:
     "@babel/core" "^7.0.0"
     "@babel/plugin-external-helpers" "^7.0.0"
@@ -10956,7 +10899,7 @@ polymer-build@^3.0.3, polymer-build@^3.1.0:
     vinyl "^1.2.0"
     vinyl-fs "^2.4.4"
 
-polymer-bundler@^4.0.1, polymer-bundler@^4.0.2, polymer-bundler@^4.0.3:
+polymer-bundler@^4.0.2, polymer-bundler@^4.0.3:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/polymer-bundler/-/polymer-bundler-4.0.4.tgz#ea2ece5739dc9022f85d950a2e205ee71449b8b2"
   integrity sha512-XrTn//eNxushnirhM/+mLpUYEHGwZRh0w79J8rnFjocdoAttGvEK74G2oYkSAIWJYKGfpwqUZGrNUsNXvf/EvQ==
@@ -10980,9 +10923,9 @@ polymer-bundler@^4.0.1, polymer-bundler@^4.0.2, polymer-bundler@^4.0.3:
     vscode-uri "^1.0.1"
 
 polymer-cli@^1.8.0:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/polymer-cli/-/polymer-cli-1.8.1.tgz#95d72fc42a23250d54a490552be3ecf24e87ea66"
-  integrity sha512-EX4GwTy5lQYpBbx69d8o7n3GjbGewkotNO9QwXki+vmClyT4jdjKn9OTOwJ9IuJbO7cVrCsZ3f/eBqyto39JhQ==
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/polymer-cli/-/polymer-cli-1.9.1.tgz#8dbd971fdf253bfb9b67c7515fa97bef7d4d70f6"
+  integrity sha512-d6PueDs682zc9Bl/5R+/DnZ8pUnSPR93osJRZ+ysSbsp2DV6ANyPd24pbbERoq0XCnXbYz9CUq/9PjW8XMwXnw==
   dependencies:
     "@types/chalk" "^0.4.31"
     "@types/del" "^3.0.0"
@@ -11016,13 +10959,13 @@ polymer-cli@^1.8.0:
     inquirer "^1.0.2"
     merge-stream "^1.0.1"
     mz "^2.6.0"
-    plylog "^0.5.0"
-    polymer-analyzer "^3.0.1"
-    polymer-build "^3.0.3"
-    polymer-bundler "^4.0.1"
+    plylog "^1.0.0"
+    polymer-analyzer "^3.1.3"
+    polymer-build "^3.1.0"
+    polymer-bundler "^4.0.3"
     polymer-linter "^3.0.0"
     polymer-project-config "^4.0.1"
-    polyserve "^0.27.11"
+    polyserve "^0.27.13"
     request "^2.72.0"
     rimraf "^2.6.1"
     semver "^5.3.0"
@@ -11032,7 +10975,7 @@ polymer-cli@^1.8.0:
     validate-element-name "^2.1.1"
     vinyl "^1.1.1"
     vinyl-fs "^2.4.3"
-    web-component-tester "^6.7.1"
+    web-component-tester "^6.9.0"
     yeoman-environment "^1.5.2"
     yeoman-generator "^3.1.1"
 
@@ -11171,9 +11114,9 @@ prettier-linter-helpers@^1.0.0:
     fast-diff "^1.1.2"
 
 prettier@^1.14.3:
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.1.tgz#06c67106afb1b40e74b002353b2079cc7e0e67bf"
-  integrity sha512-4rgV2hyc/5Pk0XHH4VjJWHRgVjgRbpMfLQjREAhHBtyW1UvTFkjJEsueGYNYYZd9mn97K+1qv0EBwm11zoaSgA==
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.3.tgz#1feaac5bdd181237b54dbe65d874e02a1472786a"
+  integrity sha512-gAU9AGAPMaKb3NNSUUuhhFAS7SCO4ALTN4nRIn6PJ075Qd28Yn2Ig2ahEJWdJwJmlEBTUfC7mMUSFy8MwsOCfg==
 
 pretty-bytes@^4.0.2:
   version "4.0.2"
@@ -11226,10 +11169,10 @@ process@^0.11.10:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
-progress@2.0.0, progress@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
-  integrity sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=
+progress@2.0.1, progress@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.1.tgz#c9242169342b1c29d275889c95734621b1952e31"
+  integrity sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==
 
 promise-inflight@^1.0.1:
   version "1.0.1"
@@ -11373,7 +11316,7 @@ qs@6.5.1:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
   integrity sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==
 
-qs@6.5.2, qs@~6.5.1, qs@~6.5.2:
+qs@6.5.2, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
@@ -11577,7 +11520,7 @@ read-pkg@^4.0.1:
     parse-json "^4.0.0"
     pify "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -11693,10 +11636,10 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexpp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.0.tgz#b2a7534a85ca1b033bcf5ce9ff8e56d4e0755365"
-  integrity sha512-g2FAVtR8Uh8GO1Nv5wpxW7VFVwHcCEr4wyA8/MHiRkO8uHoR5ntAA8Uq3P1vvMTX/BeQiRVSpDGLd+Wn5HNOTA==
+regexpp@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
+  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
 
 regexpu-core@^4.1.3, regexpu-core@^4.2.0:
   version "4.2.0"
@@ -11793,34 +11736,6 @@ replace-ext@^1.0.0:
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
   integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
 
-request@2.85.0:
-  version "2.85.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
-  integrity sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    hawk "~6.0.2"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
 request@2.88.0, request@^2.72.0, request@^2.85.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
@@ -11960,7 +11875,7 @@ ret@~0.1.10:
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
-rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
@@ -12019,7 +11934,7 @@ rx@^4.1.0:
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
   integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=
 
-rxjs@^6.1.0:
+rxjs@^6.1.0, rxjs@^6.3.3:
   version "6.3.3"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
   integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
@@ -12048,7 +11963,12 @@ safe-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-samsam@1.1.2, samsam@1.1.3, samsam@1.x, samsam@^1.1.3, samsam@~1.1:
+samsam@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.2.tgz#bec11fdc83a9fda063401210e40176c3024d1567"
+  integrity sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc=
+
+samsam@1.x, samsam@^1.1.3, samsam@~1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.3.tgz#9f5087419b4d091f232571e7fa52e90b0f552621"
   integrity sha1-n1CHQZtNCR8jJXHn+lLpCw9VJiE=
@@ -12097,9 +12017,9 @@ select-hose@^2.0.0:
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
 selenium-standalone@^6.7.0:
-  version "6.15.3"
-  resolved "https://registry.yarnpkg.com/selenium-standalone/-/selenium-standalone-6.15.3.tgz#c89e676f6e5acf54a212bcea985d02880564b008"
-  integrity sha512-BFzdXRB8yYPfCRcLxpJDBLWM0akTBP/x0hB0g+8AR7N/PEvbW39dM/hq0Yp1R0hihVQTPI3KkAJpW6h/f41S4g==
+  version "6.15.4"
+  resolved "https://registry.yarnpkg.com/selenium-standalone/-/selenium-standalone-6.15.4.tgz#9f9056f625bd7d2558483562b3e8be80947e9faf"
+  integrity sha512-J4FZzbkgnQ0D148ZgR9a+SqdnXPyKEhWLHP4pg5dP8b3U0CZmfzXL2gp/R4c1FrmXujosueVE57XO9//l4sEaA==
   dependencies:
     async "^2.1.4"
     commander "^2.9.0"
@@ -12108,9 +12028,9 @@ selenium-standalone@^6.7.0:
     lodash "^4.17.4"
     minimist "^1.2.0"
     mkdirp "^0.5.1"
-    progress "2.0.0"
+    progress "2.0.1"
     request "2.88.0"
-    tar-stream "1.6.1"
+    tar-stream "1.6.2"
     urijs "^1.18.4"
     which "^1.2.12"
     yauzl "^2.5.0"
@@ -12134,7 +12054,7 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
+"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
@@ -12144,16 +12064,6 @@ semver@^4.1.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
   integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=
 
-semver@^5.0.3, semver@^5.1.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
-  integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
-
-semver@^5.5.1:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
-  integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
-
 semver@~5.0.1:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a"
@@ -12312,9 +12222,9 @@ shebang-regex@^1.0.0:
   integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
 shelljs@^0.8.0:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.2.tgz#345b7df7763f4c2340d584abb532c5f752ca9e35"
-  integrity sha512-pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ==
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.3.tgz#a7f3319520ebf09ee81275b2368adb286659b097"
+  integrity sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==
   dependencies:
     glob "^7.0.0"
     interpret "^1.0.0"
@@ -12331,9 +12241,9 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
 simple-git@^1.85.0:
-  version "1.106.0"
-  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.106.0.tgz#81024c7c22fafd0c386a2b338031cc60b3568b9c"
-  integrity sha512-LaxKq4X9Om7bb16Cpinc36hT1YLHMM9KDQMSWJVv4Y1TGDEUuZbs+0lAk2JSKkCEO3xFjcMSx5OjvZo+i4eJvQ==
+  version "1.107.0"
+  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.107.0.tgz#12cffaf261c14d6f450f7fdb86c21ccee968b383"
+  integrity sha512-t4OK1JRlp4ayKRfcW6owrWcRVLyHRUlhGd0uN6ZZTqfDq8a5XpcUdOKiGRNobHEuMtNqzp0vcJNvhYWwh5PsQA==
   dependencies:
     debug "^4.0.1"
 
@@ -12403,11 +12313,13 @@ slice-ansi@0.0.4:
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
   integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=
 
-slice-ansi@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
-  integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==
+slice-ansi@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.0.0.tgz#5373bdb8559b45676e8541c66916cdd6251612e7"
+  integrity sha512-4j2WTWjp3GsZ+AOagyzVbzp4vWGtZ0hEZ/gDY/uTvm6MTxUfTUIsnMIFb1bn8o0RuXiqUw15H1bue8f22Vw2oQ==
   dependencies:
+    ansi-styles "^3.2.0"
+    astral-regex "^1.0.0"
     is-fullwidth-code-point "^2.0.0"
 
 slide@^1.1.5:
@@ -12445,58 +12357,51 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-sntp@2.x.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
-  integrity sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==
-  dependencies:
-    hoek "4.x.x"
-
 socket.io-adapter@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
   integrity sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=
 
-socket.io-client@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz#dcb38103436ab4578ddb026638ae2f21b623671f"
-  integrity sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==
+socket.io-client@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.2.0.tgz#84e73ee3c43d5020ccc1a258faeeb9aec2723af7"
+  integrity sha512-56ZrkTDbdTLmBIyfFYesgOxsjcLnwAKoN4CiPyTVkMQj3zTUh0QAx3GbvIvLpFEOvQWu92yyWICxB0u7wkVbYA==
   dependencies:
     backo2 "1.0.2"
     base64-arraybuffer "0.1.5"
     component-bind "1.0.0"
     component-emitter "1.2.1"
     debug "~3.1.0"
-    engine.io-client "~3.2.0"
+    engine.io-client "~3.3.1"
     has-binary2 "~1.0.2"
     has-cors "1.1.0"
     indexof "0.0.1"
     object-component "0.0.3"
     parseqs "0.0.5"
     parseuri "0.0.5"
-    socket.io-parser "~3.2.0"
+    socket.io-parser "~3.3.0"
     to-array "0.1.4"
 
-socket.io-parser@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz#e7c6228b6aa1f814e6148aea325b51aa9499e077"
-  integrity sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==
+socket.io-parser@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.0.tgz#2b52a96a509fdf31440ba40fed6094c7d4f1262f"
+  integrity sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==
   dependencies:
     component-emitter "1.2.1"
     debug "~3.1.0"
     isarray "2.0.1"
 
 socket.io@^2.0.3:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz#a069c5feabee3e6b214a75b40ce0652e1cfb9980"
-  integrity sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.2.0.tgz#f0f633161ef6712c972b307598ecd08c9b1b4d5b"
+  integrity sha512-wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w==
   dependencies:
-    debug "~3.1.0"
-    engine.io "~3.2.0"
+    debug "~4.1.0"
+    engine.io "~3.3.1"
     has-binary2 "~1.0.2"
     socket.io-adapter "~1.1.0"
-    socket.io-client "2.1.1"
-    socket.io-parser "~3.2.0"
+    socket.io-client "2.2.0"
+    socket.io-parser "~3.3.0"
 
 sockjs-client@1.1.5:
   version "1.1.5"
@@ -12613,14 +12518,14 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz#e2a303236cac54b04031fa7a5a79c7e701df852f"
-  integrity sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.2.tgz#a59efc09784c2a5bada13cfeaf5c75dd214044d2"
+  integrity sha512-qky9CVt0lVIECkEsYbNILVnPvycuEBkXoMFLRWsREkomQLevYhtRKC+R91a5TOAQ3bCMjikRwhyaRqj1VYatYg==
 
 spdy-transport@^2.0.18:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-2.1.0.tgz#4bbb15aaffed0beefdd56ad61dbdc8ba3e2cb7a1"
-  integrity sha512-bpUeGpZcmZ692rrTiqf9/2EUakI6/kXX1Rpe0ib/DyOzbiexVfXkw6GnvI9hVGvIwVaUhkaBojjCZwLNRGQg1g==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-2.1.1.tgz#c54815d73858aadd06ce63001e7d25fa6441623b"
+  integrity sha512-q7D8c148escoB3Z7ySCASadkegMmUZW8Wb/Q1u0/XBgDKMO880rLQDj8Twiew/tYi7ghemKUi/whSYOwE17f5Q==
   dependencies:
     debug "^2.6.8"
     detect-node "^2.0.3"
@@ -12701,10 +12606,10 @@ stacky@^1.3.1:
     chalk "^1.1.1"
     lodash "^3.0.0"
 
-staged-git-files@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-1.1.1.tgz#37c2218ef0d6d26178b1310719309a16a59f8f7b"
-  integrity sha512-H89UNKr1rQJvI1c/PIR3kiAMBV23yvR7LItZiV74HWZwzt7f3YHuujJ9nJZlt58WlFox7XQsOahexwk7nTe69A==
+staged-git-files@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-1.1.2.tgz#4326d33886dc9ecfa29a6193bf511ba90a46454b"
+  integrity sha512-0Eyrk6uXW6tg9PYkhi/V/J4zHp33aNyi2hOCmhFLqLTIhbgqWn5jlSzI+IU0VqrZq6+DbHcabQl/WP6P3BG0QA==
 
 standalone-react-addons-pure-render-mixin@^0.1.1:
   version "0.1.1"
@@ -12838,11 +12743,6 @@ stringify-object@^3.2.2:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-stringstream@~0.0.5:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
-  integrity sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==
-
 strip-ansi@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220"
@@ -12943,13 +12843,37 @@ superstruct@^0.6.0:
     clone-deep "^2.0.1"
     kind-of "^6.0.1"
 
-supports-color@3.1.2, supports-color@5.4.0, supports-color@^0.2.0, supports-color@^2.0.0, supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0:
+supports-color@3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
   integrity sha1-cqJiiU2dQIuVbKBf83su2KbiotU=
   dependencies:
     has-flag "^1.0.0"
 
+supports-color@5.4.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
+  integrity sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
+  integrity sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+
+supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
 sw-precache@^5.1.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/sw-precache/-/sw-precache-5.2.1.tgz#06134f319eec68f3b9583ce9a7036b1c119f7179"
@@ -12990,16 +12914,14 @@ table-layout@^0.4.3:
     typical "^2.6.1"
     wordwrapjs "^3.0.0"
 
-table@^4.0.3:
-  version "4.0.3"
-  resolved "http://registry.npmjs.org/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc"
-  integrity sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==
+table@^5.0.2:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/table/-/table-5.1.1.tgz#92030192f1b7b51b6eeab23ed416862e47b70837"
+  integrity sha512-NUjapYb/qd4PeFW03HnAuOJ7OMcBkJlqeClWxeNlQ0lXGSb52oZXGzkO0/I0ARegQ2eUT1g2VDJH0eUxDRcHmw==
   dependencies:
-    ajv "^6.0.1"
-    ajv-keywords "^3.0.0"
-    chalk "^2.1.0"
-    lodash "^4.17.4"
-    slice-ansi "1.0.0"
+    ajv "^6.6.1"
+    lodash "^4.17.11"
+    slice-ansi "2.0.0"
     string-width "^2.1.1"
 
 tapable@^0.1.8:
@@ -13022,20 +12944,7 @@ tar-fs@^1.12.0:
     pump "^1.0.0"
     tar-stream "^1.1.2"
 
-tar-stream@1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.1.tgz#f84ef1696269d6223ca48f6e1eeede3f7e81f395"
-  integrity sha512-IFLM5wp3QrJODQFPm6/to3LJZrONdBY/otxcvDIQzu217zKye6yVR3hhi9lAjrC2Z+m/j5oDxMPb1qcd8cIvpA==
-  dependencies:
-    bl "^1.0.0"
-    buffer-alloc "^1.1.0"
-    end-of-stream "^1.0.0"
-    fs-constants "^1.0.0"
-    readable-stream "^2.3.0"
-    to-buffer "^1.1.0"
-    xtend "^4.0.0"
-
-tar-stream@^1.1.2, tar-stream@^1.5.0:
+tar-stream@1.6.2, tar-stream@^1.1.2, tar-stream@^1.5.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
   integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
@@ -13049,14 +12958,14 @@ tar-stream@^1.1.2, tar-stream@^1.5.0:
     xtend "^4.0.0"
 
 tar@^4:
-  version "4.4.6"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
-  integrity sha512-tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg==
+  version "4.4.8"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
+  integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==
   dependencies:
-    chownr "^1.0.1"
+    chownr "^1.1.1"
     fs-minipass "^1.2.5"
-    minipass "^2.3.3"
-    minizlib "^1.1.0"
+    minipass "^2.3.4"
+    minizlib "^1.1.1"
     mkdirp "^0.5.0"
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
@@ -13109,10 +13018,10 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
-textextensions@2:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.2.0.tgz#38ac676151285b658654581987a0ce1a4490d286"
-  integrity sha512-j5EMxnryTvKxwH2Cq+Pb43tsf6sdEgw6Pdwxk83mPaq0ToeFJt6WE4J3s5BqY7vmjlLgkgXvhtXUxo80FyBhCA==
+textextensions@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.4.0.tgz#6a143a985464384cc2cff11aea448cd5b018e72b"
+  integrity sha512-qftQXnX1DzpSV8EddtHIT0eDDEiBF8ywhFYR2lI9xrGtxqKN+CvLXhACeCIGbCpQfxxERbrkZEFb8cZcDKbVZA==
 
 thenify-all@^1.0.0:
   version "1.6.0"
@@ -13153,11 +13062,11 @@ through2@^0.6.0, through2@^0.6.1, through2@~0.6.3, through2@~0.6.5:
     xtend ">=4.0.0 <4.1.0-0"
 
 through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-  integrity sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
   dependencies:
-    readable-stream "^2.1.5"
+    readable-stream "~2.3.6"
     xtend "~4.0.1"
 
 through@^2.3.6, through@^2.3.8, through@~2.3.6:
@@ -13230,7 +13139,7 @@ to-arraybuffer@^1.0.0:
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
   integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
-to-buffer@^1.1.0, to-buffer@^1.1.1:
+to-buffer@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
   integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==
@@ -13282,13 +13191,6 @@ toposort@^1.0.0:
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
   integrity sha1-LmhELZ9k7HILjMieZEOsbKqVACk=
 
-tough-cookie@~2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
-  integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
-  dependencies:
-    punycode "^1.4.1"
-
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
@@ -13364,9 +13266,9 @@ tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
 tslint-config-prettier@^1.15.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.15.0.tgz#76b9714399004ab6831fdcf76d89b73691c812cf"
-  integrity sha512-06CgrHJxJmNYVgsmeMoa1KXzQRoOdvfkqnJth6XUkNeOz707qxN0WfxfhYwhL5kXHHbYJRby2bqAPKwThlZPhw==
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.17.0.tgz#946ed6117f98f3659a65848279156d87628c33dc"
+  integrity sha512-NKWNkThwqE4Snn4Cm6SZB7lV5RMDDFsBwz6fWUkTxOKGjMx8ycOHnjIbhn7dZd5XmssW3CwqUjlANR6EhP9YQw==
 
 tslint-eslint-rules@^5.4.0:
   version "5.4.0"
@@ -13442,7 +13344,17 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-type-detect@0.1.1, type-detect@1.0.0, type-detect@4.0.8, type-detect@^1.0.0, type-detect@^4.0.0, type-detect@^4.0.5, type-detect@^4.0.8:
+type-detect@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"
+  integrity sha1-C6XsKohWQORw6k6FBZcZANrFiCI=
+
+type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5, type-detect@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
+  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
+
+type-detect@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
   integrity sha1-diIXzAbbJY7EiQihKY6LlRIejqI=
@@ -13461,9 +13373,9 @@ typedarray@^0.0.6:
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
 typescript@^3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.4.tgz#c74ef7b3c2da65beff548b903022cb8c3cd997ed"
-  integrity sha512-JZHJtA6ZL15+Q3Dqkbh8iCUmvxD3iJ7ujXS+fVkKnwIVAdHc5BJTDNM0aTrnr2luKulFjU7W+SRhDZvi66Ru7Q==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.1.tgz#0b7a04b8cf3868188de914d9568bd030f0c56192"
+  integrity sha512-jw7P2z/h6aPT4AENXDGjcfHTu5CSqzsbZc6YlUIebTyBAq8XaKp78x7VcSh30xwSCcsu5irZkYZUSFP1MrAMbg==
 
 typical@^2.6.1:
   version "2.6.1"
@@ -13518,11 +13430,6 @@ uglifyjs-webpack-plugin@^1.2.4:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
-ultron@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
-  integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
-
 unc-path-regex@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
@@ -13804,7 +13711,7 @@ uuid@^2.0.1:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
   integrity sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=
 
-uuid@^3.0.1, uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2:
+uuid@^3.0.1, uuid@^3.2.1, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
@@ -14063,16 +13970,16 @@ wct-sauce@^2.0.2:
     uuid "^3.2.1"
 
 wd@^1.2.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/wd/-/wd-1.11.0.tgz#b610deea7f79f5a520a573c09e047e42d31433f9"
-  integrity sha512-h2EBfJvmsWocIjOOg5BsHh9IJKrqZDG4Az4jEZhFugEH7sOPcX6feZQ30aFuktqDI0jquarZJmNpA6V0A0Q7Mg==
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/wd/-/wd-1.11.1.tgz#21a33e21977ad20522bb189f6529c3b55ac3862c"
+  integrity sha512-XNK6EbOrXF7cG8f3pbps6mb/+xPGZH2r1AL1zGJluGynA/Xt6ip1Tvqj2AkavyDFworreaGXoe+0AP/r7EX9pg==
   dependencies:
     archiver "2.1.1"
     async "2.0.1"
-    lodash "4.17.10"
+    lodash "4.17.11"
     mkdirp "^0.5.1"
     q "1.4.1"
-    request "2.85.0"
+    request "2.88.0"
     vargs "0.1.0"
 
 web-animations-js@^2.3.1:
@@ -14080,41 +13987,6 @@ web-animations-js@^2.3.1:
   resolved "https://registry.yarnpkg.com/web-animations-js/-/web-animations-js-2.3.1.tgz#3a6d9bc15196377a90f8e2803fa5262165b04510"
   integrity sha1-Om2bwVGWN3qQ+OKAP6UmIWWwRRA=
 
-web-component-tester@^6.7.1:
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/web-component-tester/-/web-component-tester-6.9.0.tgz#9666b9054d4ce76cc769195be9a0ff72b23ea47b"
-  integrity sha512-l5KzzhlHJQ+I2qtVlo5cdUZdXenfb70mNJdHdOXc9YdgpUdkT1kQ9cRKWguaVpXQmphcpWjw8KOgkf5oUkafUw==
-  dependencies:
-    "@polymer/sinonjs" "^1.14.1"
-    "@polymer/test-fixture" "^0.0.3"
-    "@webcomponents/webcomponentsjs" "^1.0.7"
-    accessibility-developer-tools "^2.12.0"
-    async "^2.4.1"
-    body-parser "^1.17.2"
-    bower-config "^1.4.0"
-    chalk "^1.1.3"
-    cleankill "^2.0.0"
-    express "^4.15.3"
-    findup-sync "^2.0.0"
-    glob "^7.1.2"
-    lodash "^3.10.1"
-    multer "^1.3.0"
-    nomnom "^1.8.1"
-    polyserve "^0.27.13"
-    resolve "^1.5.0"
-    semver "^5.3.0"
-    send "^0.11.1"
-    server-destroy "^1.0.1"
-    sinon "^2.3.5"
-    sinon-chai "^2.10.0"
-    socket.io "^2.0.3"
-    stacky "^1.3.1"
-    wd "^1.2.0"
-  optionalDependencies:
-    update-notifier "^2.2.0"
-    wct-local "^2.1.1"
-    wct-sauce "^2.0.2"
-
 web-component-tester@^6.8.0:
   version "6.8.0"
   resolved "https://registry.yarnpkg.com/web-component-tester/-/web-component-tester-6.8.0.tgz#400afc10571a2f2e1a6031b6527659d6bcb453f0"
@@ -14150,6 +14022,41 @@ web-component-tester@^6.8.0:
     wct-local "^2.1.1"
     wct-sauce "^2.0.2"
 
+web-component-tester@^6.9.0:
+  version "6.9.0"
+  resolved "https://registry.yarnpkg.com/web-component-tester/-/web-component-tester-6.9.0.tgz#9666b9054d4ce76cc769195be9a0ff72b23ea47b"
+  integrity sha512-l5KzzhlHJQ+I2qtVlo5cdUZdXenfb70mNJdHdOXc9YdgpUdkT1kQ9cRKWguaVpXQmphcpWjw8KOgkf5oUkafUw==
+  dependencies:
+    "@polymer/sinonjs" "^1.14.1"
+    "@polymer/test-fixture" "^0.0.3"
+    "@webcomponents/webcomponentsjs" "^1.0.7"
+    accessibility-developer-tools "^2.12.0"
+    async "^2.4.1"
+    body-parser "^1.17.2"
+    bower-config "^1.4.0"
+    chalk "^1.1.3"
+    cleankill "^2.0.0"
+    express "^4.15.3"
+    findup-sync "^2.0.0"
+    glob "^7.1.2"
+    lodash "^3.10.1"
+    multer "^1.3.0"
+    nomnom "^1.8.1"
+    polyserve "^0.27.13"
+    resolve "^1.5.0"
+    semver "^5.3.0"
+    send "^0.11.1"
+    server-destroy "^1.0.1"
+    sinon "^2.3.5"
+    sinon-chai "^2.10.0"
+    socket.io "^2.0.3"
+    stacky "^1.3.1"
+    wd "^1.2.0"
+  optionalDependencies:
+    update-notifier "^2.2.0"
+    wct-local "^2.1.1"
+    wct-sauce "^2.0.2"
+
 webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
@@ -14565,14 +14472,12 @@ write@^0.2.1:
   dependencies:
     mkdirp "^0.5.1"
 
-ws@~3.3.1:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
-  integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
+ws@~6.1.0:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.2.tgz#3cc7462e98792f0ac679424148903ded3b9c3ad8"
+  integrity sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==
   dependencies:
     async-limiter "~1.0.0"
-    safe-buffer "~5.1.0"
-    ultron "~1.1.0"
 
 xdg-basedir@^2.0.0:
   version "2.0.0"
@@ -14635,9 +14540,9 @@ yallist@^2.1.2:
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
 yallist@^3.0.0, yallist@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
-  integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
+  integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
 
 yargs-parser@^10.1.0:
   version "10.1.0"
@@ -14696,9 +14601,9 @@ yeoman-environment@^1.5.2:
     untildify "^2.0.0"
 
 yeoman-environment@^2.0.5:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-2.3.3.tgz#1bd9720714cc49036e901503a789d809df8f51bf"
-  integrity sha512-HBpXdNw8V66EwqIFt01rNhSgX33BOzgVb9CxpIvESvCI4ELeOSniB6gV6RXwrBur8kmHZCIAkYQYpib7Qxx8FQ==
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-2.3.4.tgz#ae156147a1b85de939366e5438b00cb3eb54c3e9"
+  integrity sha512-KLxE5ft/74Qj7h3AsQZv8G6MEEHYJwmD5F99nfOVaep3rBzCtbrJKkdqWc7bDV141Nr8UZZsIXmzc3IcCm6E2w==
   dependencies:
     chalk "^2.4.1"
     cross-spawn "^6.0.5"

From 8e9ff46bab6e93da35be9137aa3ba5f7a3e18e5a Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Fri, 30 Nov 2018 07:17:52 -0600
Subject: [PATCH 41/69] Extract media-player constants to src/data (#2149)

---
 src/data/media-player.ts                              |  4 ++++
 .../entity-rows/hui-media-player-entity-row.ts        | 11 ++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 src/data/media-player.ts

diff --git a/src/data/media-player.ts b/src/data/media-player.ts
new file mode 100644
index 0000000000..7d89d4d544
--- /dev/null
+++ b/src/data/media-player.ts
@@ -0,0 +1,4 @@
+export const SUPPORT_PAUSE = 1;
+export const SUPPORT_NEXT_TRACK = 32;
+export const SUPPORTS_PLAY = 16384;
+export const OFF_STATES = ["off", "idle"];
diff --git a/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts b/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts
index 10c3860b67..907255ed3b 100644
--- a/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts
@@ -8,11 +8,12 @@ import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
 import { EntityRow, EntityConfig } from "./types";
 import { HomeAssistant } from "../../../types";
 import { HassEntity } from "home-assistant-js-websocket";
-
-const SUPPORT_PAUSE = 1;
-const SUPPORT_NEXT_TRACK = 32;
-const SUPPORTS_PLAY = 16384;
-const OFF_STATES = ["off", "idle"];
+import {
+  SUPPORTS_PLAY,
+  SUPPORT_NEXT_TRACK,
+  OFF_STATES,
+  SUPPORT_PAUSE,
+} from "../../../data/media-player";
 
 class HuiMediaPlayerEntityRow extends hassLocalizeLitMixin(LitElement)
   implements EntityRow {

From 22eb6c6a8decfdd2d1a1b4424f4e461896af342f Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Fri, 30 Nov 2018 16:24:13 +0100
Subject: [PATCH 42/69] Remove special char

---
 src/html/onboarding.html.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/html/onboarding.html.template b/src/html/onboarding.html.template
index 78b76f3a44..cb3587d302 100644
--- a/src/html/onboarding.html.template
+++ b/src/html/onboarding.html.template
@@ -33,7 +33,7 @@
         Home Assistant
       </div>
 
-      <ha-onboarding>Initializing…</ha-onboarding>
+      <ha-onboarding>Initializing</ha-onboarding>
     </div>
     <% if (!latestBuild) { %>
       <script src="/static/custom-elements-es5-adapter.js"></script>

From 882c503fa92a1b39a9cca1530446d70c74cb4b4f Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Fri, 30 Nov 2018 09:37:44 -0600
Subject: [PATCH 43/69] Extract Supported features into own funciton (#2151)

* External function to check if entity supports a feature

* Typo

* Update hass-media-player-model.js
---
 src/common/entity/can_toggle_state.ts         |  4 +-
 src/common/entity/feature_class_names.ts      |  6 +--
 src/common/entity/supports-feature.ts         |  9 +++++
 .../more-info/controls/more-info-climate.js   | 19 ++++-----
 .../more-info/controls/more-info-vacuum.js    | 35 ++++++++--------
 .../controls/more-info-water_heater.js        |  7 ++--
 .../hui-media-player-entity-row.ts            | 15 +++----
 src/util/cover-model.js                       | 40 +++++++++----------
 src/util/hass-media-player-model.js           | 30 +++++++-------
 9 files changed, 81 insertions(+), 84 deletions(-)
 create mode 100644 src/common/entity/supports-feature.ts

diff --git a/src/common/entity/can_toggle_state.ts b/src/common/entity/can_toggle_state.ts
index 71a1b5d6c8..d990f363cb 100644
--- a/src/common/entity/can_toggle_state.ts
+++ b/src/common/entity/can_toggle_state.ts
@@ -2,6 +2,7 @@ import { HassEntity } from "home-assistant-js-websocket";
 import canToggleDomain from "./can_toggle_domain";
 import computeStateDomain from "./compute_state_domain";
 import { HomeAssistant } from "../../types";
+import { supportsFeature } from "./supports-feature";
 
 export default function canToggleState(
   hass: HomeAssistant,
@@ -12,8 +13,7 @@ export default function canToggleState(
     return stateObj.state === "on" || stateObj.state === "off";
   }
   if (domain === "climate") {
-    // tslint:disable-next-line
-    return (stateObj.attributes.supported_features! & 4096) !== 0;
+    return supportsFeature(stateObj, 4096);
   }
 
   return canToggleDomain(hass, domain);
diff --git a/src/common/entity/feature_class_names.ts b/src/common/entity/feature_class_names.ts
index d2d0cac26e..768e025a93 100644
--- a/src/common/entity/feature_class_names.ts
+++ b/src/common/entity/feature_class_names.ts
@@ -1,4 +1,5 @@
 import { HassEntity } from "home-assistant-js-websocket";
+import { supportsFeature } from "./supports-feature";
 
 // Expects classNames to be an object mapping feature-bit -> className
 export default function featureClassNames(
@@ -9,12 +10,9 @@ export default function featureClassNames(
     return "";
   }
 
-  const features = stateObj.attributes.supported_features;
-
   return Object.keys(classNames)
     .map((feature) =>
-      // tslint:disable-next-line
-      (features & Number(feature)) !== 0 ? classNames[feature] : ""
+      supportsFeature(stateObj, Number(feature)) ? classNames[feature] : ""
     )
     .filter((attr) => attr !== "")
     .join(" ");
diff --git a/src/common/entity/supports-feature.ts b/src/common/entity/supports-feature.ts
new file mode 100644
index 0000000000..9aa833c035
--- /dev/null
+++ b/src/common/entity/supports-feature.ts
@@ -0,0 +1,9 @@
+import { HassEntity } from "home-assistant-js-websocket";
+
+export const supportsFeature = (
+  stateObj: HassEntity,
+  feature: number
+): boolean => {
+  // tslint:disable-next-line:no-bitwise
+  return (stateObj.attributes.supported_features! & feature) !== 0;
+};
diff --git a/src/dialogs/more-info/controls/more-info-climate.js b/src/dialogs/more-info/controls/more-info-climate.js
index bde53875c2..27d29d228b 100644
--- a/src/dialogs/more-info/controls/more-info-climate.js
+++ b/src/dialogs/more-info/controls/more-info-climate.js
@@ -13,6 +13,7 @@ import "../../../components/ha-paper-slider";
 
 import attributeClassNames from "../../../common/entity/attribute_class_names";
 import featureClassNames from "../../../common/entity/feature_class_names";
+import { supportsFeature } from "../../../common/entity/supports-feature";
 
 import EventsMixin from "../../../mixins/events-mixin";
 import LocalizeMixin from "../../../mixins/localize-mixin";
@@ -385,45 +386,45 @@ class MoreInfoClimate extends LocalizeMixin(EventsMixin(PolymerElement)) {
 
   supportsTemperature(stateObj) {
     return (
-      (stateObj.attributes.supported_features & 1) !== 0 &&
+      supportsFeature(stateObj, 1) &&
       typeof stateObj.attributes.temperature === "number"
     );
   }
 
   supportsTemperatureRange(stateObj) {
     return (
-      (stateObj.attributes.supported_features & 6) !== 0 &&
+      supportsFeature(stateObj, 6) &&
       (typeof stateObj.attributes.target_temp_low === "number" ||
         typeof stateObj.attributes.target_temp_high === "number")
     );
   }
 
   supportsHumidity(stateObj) {
-    return (stateObj.attributes.supported_features & 8) !== 0;
+    return supportsFeature(stateObj, 8);
   }
 
   supportsFanMode(stateObj) {
-    return (stateObj.attributes.supported_features & 64) !== 0;
+    return supportsFeature(stateObj, 64);
   }
 
   supportsOperationMode(stateObj) {
-    return (stateObj.attributes.supported_features & 128) !== 0;
+    return supportsFeature(stateObj, 128);
   }
 
   supportsSwingMode(stateObj) {
-    return (stateObj.attributes.supported_features & 512) !== 0;
+    return supportsFeature(stateObj, 512);
   }
 
   supportsAwayMode(stateObj) {
-    return (stateObj.attributes.supported_features & 1024) !== 0;
+    return supportsFeature(stateObj, 1024);
   }
 
   supportsAuxHeat(stateObj) {
-    return (stateObj.attributes.supported_features & 2048) !== 0;
+    return supportsFeature(stateObj, 2048);
   }
 
   supportsOn(stateObj) {
-    return (stateObj.attributes.supported_features & 4096) !== 0;
+    return supportsFeature(stateObj, 4096);
   }
 
   computeClassNames(stateObj) {
diff --git a/src/dialogs/more-info/controls/more-info-vacuum.js b/src/dialogs/more-info/controls/more-info-vacuum.js
index e822a53b14..d46a699788 100644
--- a/src/dialogs/more-info/controls/more-info-vacuum.js
+++ b/src/dialogs/more-info/controls/more-info-vacuum.js
@@ -8,6 +8,7 @@ import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 
 import "../../../components/ha-attributes";
+import { supportsFeature } from "../../../common/entity/supports-feature";
 
 class MoreInfoVacuum extends PolymerElement {
   static get template() {
@@ -158,57 +159,53 @@ class MoreInfoVacuum extends PolymerElement {
     };
   }
 
-  /* eslint-disable no-bitwise */
-
   supportsPause(stateObj) {
-    return (stateObj.attributes.supported_features & 4) !== 0;
+    return supportsFeature(stateObj, 4);
   }
 
   supportsStop(stateObj) {
-    return (stateObj.attributes.supported_features & 8) !== 0;
+    return supportsFeature(stateObj, 8);
   }
 
   supportsReturnHome(stateObj) {
-    return (stateObj.attributes.supported_features & 16) !== 0;
+    return supportsFeature(stateObj, 16);
   }
 
   supportsFanSpeed(stateObj) {
-    return (stateObj.attributes.supported_features & 32) !== 0;
+    return supportsFeature(stateObj, 32);
   }
 
   supportsBattery(stateObj) {
-    return (stateObj.attributes.supported_features & 64) !== 0;
+    return supportsFeature(stateObj, 64);
   }
 
   supportsStatus(stateObj) {
-    return (stateObj.attributes.supported_features & 128) !== 0;
+    return supportsFeature(stateObj, 128);
   }
 
   supportsLocate(stateObj) {
-    return (stateObj.attributes.supported_features & 512) !== 0;
+    return supportsFeature(stateObj, 512);
   }
 
   supportsCleanSpot(stateObj) {
-    return (stateObj.attributes.supported_features & 1024) !== 0;
+    return supportsFeature(stateObj, 1024);
   }
 
   supportsStart(stateObj) {
-    return (stateObj.attributes.supported_features & 8192) !== 0;
+    return supportsFeature(stateObj, 8192);
   }
 
   supportsCommandBar(stateObj) {
     return (
-      ((stateObj.attributes.supported_features & 4) !== 0) |
-      ((stateObj.attributes.supported_features & 8) !== 0) |
-      ((stateObj.attributes.supported_features & 16) !== 0) |
-      ((stateObj.attributes.supported_features & 512) !== 0) |
-      ((stateObj.attributes.supported_features & 1024) !== 0) |
-      ((stateObj.attributes.supported_features & 8192) !== 0)
+      supportsFeature(stateObj, 4) |
+      supportsFeature(stateObj, 8) |
+      supportsFeature(stateObj, 16) |
+      supportsFeature(stateObj, 512) |
+      supportsFeature(stateObj, 1024) |
+      supportsFeature(stateObj, 8192)
     );
   }
 
-  /* eslint-enable no-bitwise */
-
   fanSpeedChanged(fanSpeedIndex) {
     var fanSpeedInput;
     // Selected Option will transition to '' before transitioning to new value
diff --git a/src/dialogs/more-info/controls/more-info-water_heater.js b/src/dialogs/more-info/controls/more-info-water_heater.js
index e74fb7a1e6..475d338c62 100644
--- a/src/dialogs/more-info/controls/more-info-water_heater.js
+++ b/src/dialogs/more-info/controls/more-info-water_heater.js
@@ -12,6 +12,7 @@ import "../../../components/ha-water_heater-control";
 import "../../../components/ha-paper-slider";
 
 import featureClassNames from "../../../common/entity/feature_class_names";
+import { supportsFeature } from "../../../common/entity/supports-feature";
 
 import EventsMixin from "../../../mixins/events-mixin";
 import LocalizeMixin from "../../../mixins/localize-mixin";
@@ -198,17 +199,17 @@ class MoreInfoWaterHeater extends LocalizeMixin(EventsMixin(PolymerElement)) {
 
   supportsTemperature(stateObj) {
     return (
-      (stateObj.attributes.supported_features & 1) !== 0 &&
+      supportsFeature(stateObj, 1) &&
       typeof stateObj.attributes.temperature === "number"
     );
   }
 
   supportsOperationMode(stateObj) {
-    return (stateObj.attributes.supported_features & 2) !== 0;
+    return supportsFeature(stateObj, 2);
   }
 
   supportsAwayMode(stateObj) {
-    return (stateObj.attributes.supported_features & 4) !== 0;
+    return supportsFeature(stateObj, 4);
   }
 
   computeClassNames(stateObj) {
diff --git a/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts b/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts
index 907255ed3b..7707991a96 100644
--- a/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts
@@ -8,6 +8,7 @@ import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
 import { EntityRow, EntityConfig } from "./types";
 import { HomeAssistant } from "../../../types";
 import { HassEntity } from "home-assistant-js-websocket";
+import { supportsFeature } from "../../../common/entity/supports-feature";
 import {
   SUPPORTS_PLAY,
   SUPPORT_NEXT_TRACK,
@@ -50,13 +51,6 @@ class HuiMediaPlayerEntityRow extends hassLocalizeLitMixin(LitElement)
       `;
     }
 
-    const supportsPlay =
-      // tslint:disable-next-line:no-bitwise
-      stateObj.attributes.supported_features! & SUPPORTS_PLAY;
-    const supportsNext =
-      // tslint:disable-next-line:no-bitwise
-      stateObj.attributes.supported_features! & SUPPORT_NEXT_TRACK;
-
     return html`
       ${this.renderStyle()}
       <hui-generic-entity-row
@@ -78,7 +72,8 @@ class HuiMediaPlayerEntityRow extends hassLocalizeLitMixin(LitElement)
             : html`
                 <div class="controls">
                   ${
-                    stateObj.state !== "playing" && !supportsPlay
+                    stateObj.state !== "playing" &&
+                    !supportsFeature(stateObj, SUPPORTS_PLAY)
                       ? ""
                       : html`
                           <paper-icon-button
@@ -88,7 +83,7 @@ class HuiMediaPlayerEntityRow extends hassLocalizeLitMixin(LitElement)
                         `
                   }
                   ${
-                    supportsNext
+                    supportsFeature(stateObj, SUPPORT_NEXT_TRACK)
                       ? html`
                           <paper-icon-button
                             icon="hass:skip-next"
@@ -121,7 +116,7 @@ class HuiMediaPlayerEntityRow extends hassLocalizeLitMixin(LitElement)
     }
 
     // tslint:disable-next-line:no-bitwise
-    return stateObj.attributes.supported_features! & SUPPORT_PAUSE
+    return supportsFeature(stateObj, SUPPORT_PAUSE)
       ? "hass:pause"
       : "hass:stop";
   }
diff --git a/src/util/cover-model.js b/src/util/cover-model.js
index 45de4ad911..eae1007cf8 100644
--- a/src/util/cover-model.js
+++ b/src/util/cover-model.js
@@ -1,3 +1,5 @@
+import { supportsFeature } from "../common/entity/supports-feature";
+
 /* eslint-enable no-bitwise */
 export default class CoverEntity {
   constructor(hass, stateObj) {
@@ -37,38 +39,36 @@ export default class CoverEntity {
     return this.stateObj.state === "closing";
   }
 
-  /* eslint-disable no-bitwise */
-
   get supportsOpen() {
-    return (this._feat & 1) !== 0;
+    return supportsFeature(this.stateObj, 1);
   }
 
   get supportsClose() {
-    return (this._feat & 2) !== 0;
+    return supportsFeature(this.stateObj, 2);
   }
 
   get supportsSetPosition() {
-    return (this._feat & 4) !== 0;
+    return supportsFeature(this.stateObj, 4);
   }
 
   get supportsStop() {
-    return (this._feat & 8) !== 0;
+    return supportsFeature(this.stateObj, 8);
   }
 
   get supportsOpenTilt() {
-    return (this._feat & 16) !== 0;
+    return supportsFeature(this.stateObj, 16);
   }
 
   get supportsCloseTilt() {
-    return (this._feat & 32) !== 0;
+    return supportsFeature(this.stateObj, 32);
   }
 
   get supportsStopTilt() {
-    return (this._feat & 64) !== 0;
+    return supportsFeature(this.stateObj, 64);
   }
 
   get supportsSetTiltPosition() {
-    return (this._feat & 128) !== 0;
+    return supportsFeature(this.stateObj, 128);
   }
 
   get isTiltOnly() {
@@ -121,24 +121,22 @@ export default class CoverEntity {
   }
 }
 
-const support = (stateObj, feature) =>
-  (stateObj.attributes.supported_features & feature) !== 0;
+export const supportsOpen = (stateObj) => supportsFeature(stateObj, 1);
 
-export const supportsOpen = (stateObj) => support(stateObj, 1);
+export const supportsClose = (stateObj) => supportsFeature(stateObj, 2);
 
-export const supportsClose = (stateObj) => support(stateObj, 2);
+export const supportsSetPosition = (stateObj) => supportsFeature(stateObj, 4);
 
-export const supportsSetPosition = (stateObj) => support(stateObj, 4);
+export const supportsStop = (stateObj) => supportsFeature(stateObj, 8);
 
-export const supportsStop = (stateObj) => support(stateObj, 8);
+export const supportsOpenTilt = (stateObj) => supportsFeature(stateObj, 16);
 
-export const supportsOpenTilt = (stateObj) => support(stateObj, 16);
+export const supportsCloseTilt = (stateObj) => supportsFeature(stateObj, 32);
 
-export const supportsCloseTilt = (stateObj) => support(stateObj, 32);
+export const supportsStopTilt = (stateObj) => supportsFeature(stateObj, 64);
 
-export const supportsStopTilt = (stateObj) => support(stateObj, 64);
-
-export const supportsSetTiltPosition = (stateObj) => support(stateObj, 128);
+export const supportsSetTiltPosition = (stateObj) =>
+  supportsFeature(stateObj, 128);
 
 export function isTiltOnly(stateObj) {
   const supportsCover =
diff --git a/src/util/hass-media-player-model.js b/src/util/hass-media-player-model.js
index 9f8f53b0a4..10c32fc09d 100644
--- a/src/util/hass-media-player-model.js
+++ b/src/util/hass-media-player-model.js
@@ -1,3 +1,5 @@
+import { supportsFeature } from "../common/entity/supports-feature";
+
 export default class MediaPlayerEntity {
   constructor(hass, stateObj) {
     this.hass = hass;
@@ -62,58 +64,54 @@ export default class MediaPlayerEntity {
     return progress;
   }
 
-  /* eslint-disable no-bitwise */
-
   get supportsPause() {
-    return (this._feat & 1) !== 0;
+    return supportsFeature(this.stateObj, 1);
   }
 
   get supportsVolumeSet() {
-    return (this._feat & 4) !== 0;
+    return supportsFeature(this.stateObj, 4);
   }
 
   get supportsVolumeMute() {
-    return (this._feat & 8) !== 0;
+    return supportsFeature(this.stateObj, 8);
   }
 
   get supportsPreviousTrack() {
-    return (this._feat & 16) !== 0;
+    return supportsFeature(this.stateObj, 16);
   }
 
   get supportsNextTrack() {
-    return (this._feat & 32) !== 0;
+    return supportsFeature(this.stateObj, 32);
   }
 
   get supportsTurnOn() {
-    return (this._feat & 128) !== 0;
+    return supportsFeature(this.stateObj, 128);
   }
 
   get supportsTurnOff() {
-    return (this._feat & 256) !== 0;
+    return supportsFeature(this.stateObj, 256);
   }
 
   get supportsPlayMedia() {
-    return (this._feat & 512) !== 0;
+    return supportsFeature(this.stateObj, 512);
   }
 
   get supportsVolumeButtons() {
-    return (this._feat & 1024) !== 0;
+    return supportsFeature(this.stateObj, 1024);
   }
 
   get supportsSelectSource() {
-    return (this._feat & 2048) !== 0;
+    return supportsFeature(this.stateObj, 2048);
   }
 
   get supportsSelectSoundMode() {
-    return (this._feat & 65536) !== 0;
+    return supportsFeature(this.stateObj, 65536);
   }
 
   get supportsPlay() {
-    return (this._feat & 16384) !== 0;
+    return supportsFeature(this.stateObj, 16384);
   }
 
-  /* eslint-enable no-bitwise */
-
   get primaryTitle() {
     return this._attr.media_title;
   }

From 0e6f6ddbdaaa187ebec89e5f234cf147e4de33a1 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Fri, 30 Nov 2018 19:35:55 +0100
Subject: [PATCH 44/69] Add own types + add config validation to glances
 (#2150)

* Add own types + add config validation to glances

* Cleanup
---
 .../lovelace/common/structs/is-entity-id.ts   |  9 ++++++++
 src/panels/lovelace/common/structs/is-icon.ts |  9 ++++++++
 src/panels/lovelace/common/structs/struct.ts  | 10 ++++++++
 .../hui-entities-card-editor.ts               |  8 +++----
 .../config-elements/hui-glance-card-editor.ts | 23 +++++++++++++++++++
 5 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 src/panels/lovelace/common/structs/is-entity-id.ts
 create mode 100644 src/panels/lovelace/common/structs/is-icon.ts
 create mode 100644 src/panels/lovelace/common/structs/struct.ts

diff --git a/src/panels/lovelace/common/structs/is-entity-id.ts b/src/panels/lovelace/common/structs/is-entity-id.ts
new file mode 100644
index 0000000000..da04c298a8
--- /dev/null
+++ b/src/panels/lovelace/common/structs/is-entity-id.ts
@@ -0,0 +1,9 @@
+export function isEntityId(value: any): string | boolean {
+  if (typeof value !== "string") {
+    return "entity id should be a string";
+  }
+  if (!value.includes(".")) {
+    return "entity id should be in the format 'domain.entity'";
+  }
+  return true;
+}
diff --git a/src/panels/lovelace/common/structs/is-icon.ts b/src/panels/lovelace/common/structs/is-icon.ts
new file mode 100644
index 0000000000..30addc012e
--- /dev/null
+++ b/src/panels/lovelace/common/structs/is-icon.ts
@@ -0,0 +1,9 @@
+export function isIcon(value: any): string | boolean {
+  if (typeof value !== "string") {
+    return "icon should be a string";
+  }
+  if (!value.includes(":")) {
+    return "icon should be in the format 'mdi:icon'";
+  }
+  return true;
+}
diff --git a/src/panels/lovelace/common/structs/struct.ts b/src/panels/lovelace/common/structs/struct.ts
new file mode 100644
index 0000000000..9ce805975c
--- /dev/null
+++ b/src/panels/lovelace/common/structs/struct.ts
@@ -0,0 +1,10 @@
+import { superstruct } from "superstruct";
+import { isEntityId } from "./is-entity-id";
+import { isIcon } from "./is-icon";
+
+export const struct = superstruct({
+  types: {
+    "entity-id": isEntityId,
+    icon: isIcon,
+  },
+});
diff --git a/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
index e51dd1b526..a091070cb1 100644
--- a/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
@@ -1,6 +1,6 @@
 import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
 import { TemplateResult } from "lit-html";
-import { struct } from "superstruct";
+import { struct } from "../../common/structs/struct";
 import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-listbox/paper-listbox";
@@ -24,11 +24,11 @@ import "../../../../components/ha-icon";
 
 const entitiesConfigStruct = struct.union([
   {
-    entity: "string",
+    entity: "entity-id",
     name: "string?",
-    icon: "string?",
+    icon: "icon?",
   },
-  "string",
+  "entity-id",
 ]);
 
 const cardConfigStruct = struct({
diff --git a/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts
index 0f6cc2fdfe..672b8b6775 100644
--- a/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts
@@ -1,5 +1,6 @@
 import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
 import { TemplateResult } from "lit-html";
+import { struct } from "../../common/structs/struct";
 import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-listbox/paper-listbox";
@@ -20,6 +21,26 @@ import "../../components/hui-entity-editor";
 import "../../../../components/ha-card";
 import "../../../../components/ha-icon";
 
+const entitiesConfigStruct = struct.union([
+  {
+    entity: "entity-id",
+    name: "string?",
+    icon: "icon?",
+  },
+  "entity-id",
+]);
+
+const cardConfigStruct = struct({
+  type: "string",
+  id: "string|number",
+  title: "string|number?",
+  theme: "string?",
+  columns: "number?",
+  show_name: "boolean?",
+  show_state: "boolean?",
+  entities: [entitiesConfigStruct],
+});
+
 export class HuiGlanceCardEditor extends hassLocalizeLitMixin(LitElement)
   implements LovelaceCardEditor {
   public hass?: HomeAssistant;
@@ -27,6 +48,8 @@ export class HuiGlanceCardEditor extends hassLocalizeLitMixin(LitElement)
   private _configEntities?: ConfigEntity[];
 
   public setConfig(config: Config): void {
+    config = cardConfigStruct(config);
+
     this._config = { type: "glance", ...config };
     this._configEntities = processEditorEntities(config.entities);
   }

From 8ae03dd1ffda68babed9329504c11374ae41f3f5 Mon Sep 17 00:00:00 2001
From: Zack Arnett <arnett.zackary@gmail.com>
Date: Fri, 30 Nov 2018 22:50:21 -0500
Subject: [PATCH 45/69] Convert Sensor Card to Typescript (#2140)

* Sensor Convert

* Types

* Forgot to check stateobj

* Review updates

* lint

* Update for hass and add error handling

* Review Updates

* Graph only shown if graph: line - Breaking Change

* Only rendering when updated

* Date.Now()

* Forgot to reset the date

* Lint

* Review updates

* Forgot to take this out

* Bram the god

* Update to render right things

* Check if line is being drawn

* Make graph if's more readable
---
 src/panels/lovelace/cards/hui-sensor-card.js | 322 ---------------
 src/panels/lovelace/cards/hui-sensor-card.ts | 404 +++++++++++++++++++
 2 files changed, 404 insertions(+), 322 deletions(-)
 delete mode 100755 src/panels/lovelace/cards/hui-sensor-card.js
 create mode 100755 src/panels/lovelace/cards/hui-sensor-card.ts

diff --git a/src/panels/lovelace/cards/hui-sensor-card.js b/src/panels/lovelace/cards/hui-sensor-card.js
deleted file mode 100755
index 58a8c96574..0000000000
--- a/src/panels/lovelace/cards/hui-sensor-card.js
+++ /dev/null
@@ -1,322 +0,0 @@
-import { LitElement, html, svg } from "@polymer/lit-element";
-
-import "../../../components/ha-card";
-import "../../../components/ha-icon";
-
-import computeStateName from "../../../common/entity/compute_state_name";
-import stateIcon from "../../../common/entity/state_icon";
-
-import EventsMixin from "../../../mixins/events-mixin";
-
-class HuiSensorCard extends EventsMixin(LitElement) {
-  set hass(hass) {
-    this._hass = hass;
-    const entity = hass.states[this._config.entity];
-    if (entity && this._entity !== entity) {
-      this._entity = entity;
-      if (
-        this._config.graph !== "none" &&
-        entity.attributes.unit_of_measurement
-      ) {
-        this._getHistory();
-      }
-    }
-  }
-
-  static get properties() {
-    return {
-      _hass: {},
-      _config: {},
-      _entity: {},
-      _line: String,
-      _min: Number,
-      _max: Number,
-    };
-  }
-
-  setConfig(config) {
-    if (!config.entity || config.entity.split(".")[0] !== "sensor") {
-      throw new Error("Specify an entity from within the sensor domain.");
-    }
-
-    const cardConfig = {
-      detail: 1,
-      icon: false,
-      hours_to_show: 24,
-      ...config,
-    };
-    cardConfig.hours_to_show = Number(cardConfig.hours_to_show);
-    cardConfig.height = Number(cardConfig.height);
-    cardConfig.detail =
-      cardConfig.detail === 1 || cardConfig.detail === 2
-        ? cardConfig.detail
-        : 1;
-
-    this._config = cardConfig;
-  }
-
-  shouldUpdate(changedProps) {
-    const change = changedProps.has("_entity") || changedProps.has("_line");
-    return change;
-  }
-
-  render({ _entity, _line } = this) {
-    return html`
-      ${this._style()}
-      <ha-card @click="${this._handleClick}">
-        <div class="flex">
-          <div class="icon">
-            <ha-icon .icon="${this._computeIcon(_entity)}"></ha-icon>
-          </div>
-          <div class="header">
-            <span class="name">${this._computeName(_entity)}</span>
-          </div>
-        </div>
-        <div class="flex info">
-          <span id="value">${_entity.state}</span>
-          <span id="measurement">${this._computeUom(_entity)}</span>
-        </div>
-        <div class="graph">
-          <div>
-            ${
-              _line
-                ? svg`
-                    <svg width="100%" height="100%" viewBox="0 0 500 100">
-                      <path
-                        d="${_line}"
-                        fill="none"
-                        stroke="var(--accent-color)"
-                        stroke-width="5"
-                        stroke-linecap="round"
-                        stroke-linejoin="round"
-                      />
-                    </svg>
-                  `
-                : ""
-            }
-          </div>
-        </div>
-      </ha-card>
-    `;
-  }
-
-  _handleClick() {
-    this.fire("hass-more-info", { entityId: this._config.entity });
-  }
-
-  _computeIcon(item) {
-    return this._config.icon || stateIcon(item);
-  }
-
-  _computeName(item) {
-    return this._config.name || computeStateName(item);
-  }
-
-  _computeUom(item) {
-    return this._config.unit || item.attributes.unit_of_measurement;
-  }
-
-  _coordinates(history, hours, width, detail = 1) {
-    history = history.filter((item) => !Number.isNaN(Number(item.state)));
-    this._min = Math.min.apply(Math, history.map((item) => Number(item.state)));
-    this._max = Math.max.apply(Math, history.map((item) => Number(item.state)));
-    const now = new Date().getTime();
-
-    const reduce = (res, item, min = false) => {
-      const age = now - new Date(item.last_changed).getTime();
-      let key = Math.abs(age / (1000 * 3600) - hours);
-      if (min) {
-        key = (key - Math.floor(key)) * 60;
-        key = (Math.round(key / 10) * 10).toString()[0];
-      } else {
-        key = Math.floor(key);
-      }
-      if (!res[key]) res[key] = [];
-      res[key].push(item);
-      return res;
-    };
-    history = history.reduce((res, item) => reduce(res, item), []);
-    if (detail > 1) {
-      history = history.map((entry) =>
-        entry.reduce((res, item) => reduce(res, item, true), [])
-      );
-    }
-    return this._calcPoints(history, hours, width, detail);
-  }
-
-  _calcPoints(history, hours, width, detail = 1) {
-    const coords = [];
-    const margin = 5;
-    const height = 80;
-    width -= margin * 2;
-    let yRatio = (this._max - this._min) / height;
-    yRatio = yRatio !== 0 ? yRatio : height;
-    let xRatio = width / (hours - (detail === 1 ? 1 : 0));
-    xRatio = isFinite(xRatio) ? xRatio : width;
-    const getCoords = (item, i, offset = 0, depth = 1) => {
-      if (depth > 1)
-        return item.forEach((subItem, index) =>
-          getCoords(subItem, i, index, depth - 1)
-        );
-      const average =
-        item.reduce((sum, entry) => sum + parseFloat(entry.state), 0) /
-        item.length;
-
-      const x = xRatio * (i + offset / 6) + margin;
-      const y = height - (average - this._min) / yRatio + margin * 2;
-      return coords.push([x, y]);
-    };
-
-    history.forEach((item, i) => getCoords(item, i, 0, detail));
-    if (coords.length === 1) coords[1] = [width + margin, coords[0][1]];
-    coords.push([width + margin, coords[coords.length - 1][1]]);
-    return coords;
-  }
-
-  _getPath(coords) {
-    let next;
-    let Z;
-    const X = 0;
-    const Y = 1;
-    let path = "";
-    let last = coords.filter(Boolean)[0];
-
-    path += `M ${last[X]},${last[Y]}`;
-
-    for (let i = 0; i < coords.length; i++) {
-      next = coords[i];
-      Z = this._midPoint(last[X], last[Y], next[X], next[Y]);
-      path += ` ${Z[X]},${Z[Y]}`;
-      path += ` Q${next[X]},${next[Y]}`;
-      last = next;
-    }
-
-    path += ` ${next[X]},${next[Y]}`;
-    return path;
-  }
-
-  _midPoint(Ax, Ay, Bx, By) {
-    const Zx = (Ax - Bx) / 2 + Bx;
-    const Zy = (Ay - By) / 2 + By;
-    return [Zx, Zy];
-  }
-
-  async _getHistory() {
-    const endTime = new Date();
-    const startTime = new Date();
-    startTime.setHours(endTime.getHours() - this._config.hours_to_show);
-    const stateHistory = await this._fetchRecent(
-      this._config.entity,
-      startTime,
-      endTime
-    );
-
-    if (stateHistory[0].length < 1) return;
-    const coords = this._coordinates(
-      stateHistory[0],
-      this._config.hours_to_show,
-      500,
-      this._config.detail
-    );
-    this._line = this._getPath(coords);
-  }
-
-  async _fetchRecent(entityId, startTime, endTime) {
-    let url = "history/period";
-    if (startTime) url += "/" + startTime.toISOString();
-    url += "?filter_entity_id=" + entityId;
-    if (endTime) url += "&end_time=" + endTime.toISOString();
-
-    return await this._hass.callApi("GET", url);
-  }
-
-  getCardSize() {
-    return 3;
-  }
-
-  _style() {
-    return html`
-      <style>
-        :host {
-          display: flex;
-          flex-direction: column;
-        }
-        ha-card {
-          display: flex;
-          flex-direction: column;
-          flex: 1;
-          padding: 16px;
-          position: relative;
-          cursor: pointer;
-        }
-        .flex {
-          display: flex;
-        }
-        .header {
-          align-items: center;
-          display: flex;
-          min-width: 0;
-          opacity: 0.8;
-          position: relative;
-        }
-        .name {
-          display: block;
-          display: -webkit-box;
-          font-size: 1.2rem;
-          font-weight: 500;
-          max-height: 1.4rem;
-          margin-top: 2px;
-          opacity: 0.8;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          -webkit-line-clamp: 1;
-          -webkit-box-orient: vertical;
-          word-wrap: break-word;
-          word-break: break-all;
-        }
-        .icon {
-          color: var(--paper-item-icon-color, #44739e);
-          display: inline-block;
-          flex: 0 0 40px;
-          line-height: 40px;
-          position: relative;
-          text-align: center;
-          width: 40px;
-        }
-        .info {
-          flex-wrap: wrap;
-          margin: 16px 0 16px 8px;
-        }
-        #value {
-          display: inline-block;
-          font-size: 2rem;
-          font-weight: 400;
-          line-height: 1em;
-          margin-right: 4px;
-        }
-        #measurement {
-          align-self: flex-end;
-          display: inline-block;
-          font-size: 1.3rem;
-          line-height: 1.2em;
-          margin-top: 0.1em;
-          opacity: 0.6;
-          vertical-align: bottom;
-        }
-        .graph {
-          align-self: flex-end;
-          margin: auto;
-          margin-bottom: 0px;
-          position: relative;
-          width: 100%;
-        }
-        .graph > div {
-          align-self: flex-end;
-          margin: auto 8px;
-        }
-      </style>
-    `;
-  }
-}
-
-customElements.define("hui-sensor-card", HuiSensorCard);
diff --git a/src/panels/lovelace/cards/hui-sensor-card.ts b/src/panels/lovelace/cards/hui-sensor-card.ts
new file mode 100755
index 0000000000..86b2159082
--- /dev/null
+++ b/src/panels/lovelace/cards/hui-sensor-card.ts
@@ -0,0 +1,404 @@
+import {
+  html,
+  svg,
+  LitElement,
+  PropertyDeclarations,
+  PropertyValues,
+} from "@polymer/lit-element";
+import { TemplateResult } from "lit-html";
+import "@polymer/paper-spinner/paper-spinner";
+
+import { LovelaceCard } from "../types";
+import { LovelaceCardConfig } from "../../../data/lovelace";
+import { HomeAssistant } from "../../../types";
+import { fireEvent } from "../../../common/dom/fire_event";
+
+import computeStateName from "../../../common/entity/compute_state_name";
+import stateIcon from "../../../common/entity/state_icon";
+
+import "../../../components/ha-card";
+import "../../../components/ha-icon";
+import { fetchRecent } from "../../../data/history";
+
+const midPoint = (
+  _Ax: number,
+  _Ay: number,
+  _Bx: number,
+  _By: number
+): number[] => {
+  const _Zx = (_Ax - _Bx) / 2 + _Bx;
+  const _Zy = (_Ay - _By) / 2 + _By;
+  return [_Zx, _Zy];
+};
+
+const getPath = (coords: number[][]): string => {
+  let next;
+  let Z;
+  const X = 0;
+  const Y = 1;
+  let path = "";
+  let last = coords.filter(Boolean)[0];
+
+  path += `M ${last[X]},${last[Y]}`;
+
+  for (const coord of coords) {
+    next = coord;
+    Z = midPoint(last[X], last[Y], next[X], next[Y]);
+    path += ` ${Z[X]},${Z[Y]}`;
+    path += ` Q${next[X]},${next[Y]}`;
+    last = next;
+  }
+
+  path += ` ${next[X]},${next[Y]}`;
+  return path;
+};
+
+const calcPoints = (
+  history: any,
+  hours: number,
+  width: number,
+  detail: number,
+  min: number,
+  max: number
+): number[][] => {
+  const coords = [] as number[][];
+  const margin = 5;
+  const height = 80;
+  width -= 10;
+  let yRatio = (max - min) / height;
+  yRatio = yRatio !== 0 ? yRatio : height;
+  let xRatio = width / (hours - (detail === 1 ? 1 : 0));
+  xRatio = isFinite(xRatio) ? xRatio : width;
+  const getCoords = (item, i, offset = 0, depth = 1) => {
+    if (depth > 1) {
+      return item.forEach((subItem, index) =>
+        getCoords(subItem, i, index, depth - 1)
+      );
+    }
+    const average =
+      item.reduce((sum, entry) => sum + parseFloat(entry.state), 0) /
+      item.length;
+
+    const x = xRatio * (i + offset / 6) + margin;
+    const y = height - (average - min) / yRatio + margin * 2;
+    return coords.push([x, y]);
+  };
+
+  history.forEach((item, i) => getCoords(item, i, 0, detail));
+  if (coords.length === 1) {
+    coords[1] = [width + margin, coords[0][1]];
+  }
+
+  coords.push([width + margin, coords[coords.length - 1][1]]);
+  return coords;
+};
+
+const coordinates = (
+  history: any,
+  hours: number,
+  width: number,
+  detail: number
+): number[][] => {
+  history.forEach((item) => (item.state = Number(item.state)));
+  history = history.filter((item) => !Number.isNaN(item.state));
+
+  const min = Math.min.apply(Math, history.map((item) => item.state));
+  const max = Math.max.apply(Math, history.map((item) => item.state));
+  const now = new Date().getTime();
+
+  const reduce = (res, item, point) => {
+    const age = now - new Date(item.last_changed).getTime();
+
+    let key = Math.abs(age / (1000 * 3600) - hours);
+    if (point) {
+      key = (key - Math.floor(key)) * 60;
+      key = Number((Math.round(key / 10) * 10).toString()[0]);
+    } else {
+      key = Math.floor(key);
+    }
+    if (!res[key]) {
+      res[key] = [];
+    }
+    res[key].push(item);
+    return res;
+  };
+
+  history = history.reduce((res, item) => reduce(res, item, false), []);
+  if (detail > 1) {
+    history = history.map((entry) =>
+      entry.reduce((res, item) => reduce(res, item, true), [])
+    );
+  }
+  return calcPoints(history, hours, width, detail, min, max);
+};
+
+interface Config extends LovelaceCardConfig {
+  entity: string;
+  name?: string;
+  icon?: string;
+  graph?: string;
+  unit?: string;
+  detail?: number;
+  hours_to_show?: number;
+}
+
+class HuiSensorCard extends LitElement implements LovelaceCard {
+  public hass?: HomeAssistant;
+  private _config?: Config;
+  private _history?: any;
+  private _date?: Date;
+
+  static get properties(): PropertyDeclarations {
+    return {
+      hass: {},
+      _config: {},
+      _history: {},
+    };
+  }
+
+  public setConfig(config: Config): void {
+    if (!config.entity || config.entity.split(".")[0] !== "sensor") {
+      throw new Error("Specify an entity from within the sensor domain.");
+    }
+
+    const cardConfig = {
+      detail: 1,
+      hours_to_show: 24,
+      ...config,
+    };
+
+    cardConfig.hours_to_show = Number(cardConfig.hours_to_show);
+    cardConfig.detail =
+      cardConfig.detail === 1 || cardConfig.detail === 2
+        ? cardConfig.detail
+        : 1;
+
+    this._config = cardConfig;
+  }
+
+  public getCardSize(): number {
+    return 3;
+  }
+
+  protected render(): TemplateResult {
+    if (!this._config || !this.hass) {
+      return html``;
+    }
+
+    const stateObj = this.hass.states[this._config.entity];
+
+    let graph;
+
+    if (this._config.graph === "line") {
+      if (!stateObj.attributes.unit_of_measurement) {
+        graph = html`
+          <div class="not-found">
+            Entity: ${this._config.entity} - Has no Unit of Measurement and
+            therefore can not display a line graph.
+          </div>
+        `;
+      } else if (!this._history) {
+        graph = svg`
+          <svg width="100%" height="100%" viewBox="0 0 500 100"></svg>
+        `;
+      } else {
+        graph = svg`
+          <svg width="100%" height="100%" viewBox="0 0 500 100">
+            <path
+              d="${this._history}"
+              fill="none"
+              stroke="var(--accent-color)"
+              stroke-width="5"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+            />
+          </svg>
+        `;
+      }
+    } else {
+      graph = "";
+    }
+    return html`
+      ${this.renderStyle()}
+      <ha-card @click="${this._handleClick}">
+        ${
+          !stateObj
+            ? html`
+                <div class="not-found">
+                  Entity not available: ${this._config.entity}
+                </div>
+              `
+            : html`
+                <div class="flex">
+                  <div class="icon">
+                    <ha-icon
+                      .icon="${this._config.icon || stateIcon(stateObj)}"
+                    ></ha-icon>
+                  </div>
+                  <div class="header">
+                    <span class="name"
+                      >${this._config.name || computeStateName(stateObj)}</span
+                    >
+                  </div>
+                </div>
+                <div class="flex info">
+                  <span id="value">${stateObj.state}</span>
+                  <span id="measurement"
+                    >${
+                      this._config.unit ||
+                        stateObj.attributes.unit_of_measurement
+                    }</span
+                  >
+                </div>
+                <div class="graph"><div>${graph}</div></div>
+              `
+        }
+      </ha-card>
+    `;
+  }
+
+  protected firstUpdated(): void {
+    this._date = new Date();
+  }
+
+  protected updated(changedProps: PropertyValues) {
+    if (this._config && this._config.graph !== "line") {
+      return;
+    }
+
+    const minute = 60000;
+    if (changedProps.has("_config")) {
+      this._getHistory();
+    } else if (Date.now() - this._date!.getTime() >= minute) {
+      this._getHistory();
+    }
+  }
+
+  private _handleClick(): void {
+    fireEvent(this, "hass-more-info", { entityId: this._config!.entity });
+  }
+
+  private async _getHistory(): Promise<void> {
+    const endTime = new Date();
+    const startTime = new Date();
+    startTime.setHours(endTime.getHours() - this._config!.hours_to_show!);
+
+    const stateHistory = await fetchRecent(
+      this.hass,
+      this._config!.entity,
+      startTime,
+      endTime
+    );
+
+    if (stateHistory[0].length < 1) {
+      return;
+    }
+
+    const coords = coordinates(
+      stateHistory[0],
+      this._config!.hours_to_show!,
+      500,
+      this._config!.detail!
+    );
+
+    this._history = getPath(coords);
+    this._date = new Date();
+  }
+
+  private renderStyle(): TemplateResult {
+    return html`
+      <style>
+        :host {
+          display: flex;
+          flex-direction: column;
+        }
+        ha-card {
+          display: flex;
+          flex-direction: column;
+          flex: 1;
+          padding: 16px;
+          position: relative;
+          cursor: pointer;
+        }
+        .flex {
+          display: flex;
+        }
+        .header {
+          align-items: center;
+          display: flex;
+          min-width: 0;
+          opacity: 0.8;
+          position: relative;
+        }
+        .name {
+          display: block;
+          display: -webkit-box;
+          font-size: 1.2rem;
+          font-weight: 500;
+          max-height: 1.4rem;
+          margin-top: 2px;
+          opacity: 0.8;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          -webkit-line-clamp: 1;
+          -webkit-box-orient: vertical;
+          word-wrap: break-word;
+          word-break: break-all;
+        }
+        .icon {
+          color: var(--paper-item-icon-color, #44739e);
+          display: inline-block;
+          flex: 0 0 40px;
+          line-height: 40px;
+          position: relative;
+          text-align: center;
+          width: 40px;
+        }
+        .info {
+          flex-wrap: wrap;
+          margin: 16px 0 16px 8px;
+        }
+        #value {
+          display: inline-block;
+          font-size: 2rem;
+          font-weight: 400;
+          line-height: 1em;
+          margin-right: 4px;
+        }
+        #measurement {
+          align-self: flex-end;
+          display: inline-block;
+          font-size: 1.3rem;
+          line-height: 1.2em;
+          margin-top: 0.1em;
+          opacity: 0.6;
+          vertical-align: bottom;
+        }
+        .graph {
+          align-self: flex-end;
+          margin: auto;
+          margin-bottom: 0px;
+          position: relative;
+          width: 100%;
+        }
+        .graph > div {
+          align-self: flex-end;
+          margin: auto 8px;
+        }
+        .not-found {
+          flex: 1;
+          background-color: yellow;
+          padding: 8px;
+        }
+      </style>
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "hui-sensor-card": HuiSensorCard;
+  }
+}
+
+customElements.define("hui-sensor-card", HuiSensorCard);

From f3b8d66f4f04a112484ca52e8c1dbc79365f3d54 Mon Sep 17 00:00:00 2001
From: Aephir <waldenb@gmail.com>
Date: Sat, 1 Dec 2018 09:41:52 +0100
Subject: [PATCH 46/69] Update demo-hui-glance-card.js (#2157)

* Update demo-hui-glance-card.js

Fixed updated syntax

* Update gallery/src/demos/demo-hui-glance-card.js

Co-Authored-By: Aephir <waldenb@gmail.com>
---
 gallery/src/demos/demo-hui-glance-card.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gallery/src/demos/demo-hui-glance-card.js b/gallery/src/demos/demo-hui-glance-card.js
index 554e84d819..d0ff3abf6f 100644
--- a/gallery/src/demos/demo-hui-glance-card.js
+++ b/gallery/src/demos/demo-hui-glance-card.js
@@ -89,10 +89,10 @@ const CONFIGS = [
     `,
   },
   {
-    heading: "Custom column width",
+    heading: "Custom number of columns",
     config: `
 - type: glance
-  column_width: calc(100% / 7)
+  columns: 7
   entities:
     - device_tracker.demo_paulus
     - media_player.living_room

From f7e3f4a8285fc8f2f8505cd21babf641e316bdd5 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 2 Dec 2018 10:26:32 +0100
Subject: [PATCH 47/69] Hass.io: Show ANSI color codes in logs (#2155)

* Hass.io: Show ANSI color codes in logs

* Use innerHTML and color classes

* Refactor ANSI function

* Readability

* Make green text black in supervisor logs

* Use assigning while loop
---
 hassio/src/addon-view/hassio-addon-logs.js |  14 +-
 hassio/src/ansi-to-html.js                 | 203 +++++++++++++++++++++
 hassio/src/system/hassio-supervisor-log.js |  24 ++-
 3 files changed, 230 insertions(+), 11 deletions(-)
 create mode 100644 hassio/src/ansi-to-html.js

diff --git a/hassio/src/addon-view/hassio-addon-logs.js b/hassio/src/addon-view/hassio-addon-logs.js
index 8784689e05..d93be1750e 100644
--- a/hassio/src/addon-view/hassio-addon-logs.js
+++ b/hassio/src/addon-view/hassio-addon-logs.js
@@ -2,6 +2,7 @@ import "@polymer/paper-button/paper-button";
 import "@polymer/paper-card/paper-card";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
+import { ANSI_HTML_STYLE, parseTextToColoredPre } from "../ansi-to-html";
 
 import "../../../src/resources/ha-style";
 
@@ -15,10 +16,13 @@ class HassioAddonLogs extends PolymerElement {
         }
         pre {
           overflow-x: auto;
+          white-space: pre-wrap;
+          overflow-wrap: break-word;
         }
       </style>
+      ${ANSI_HTML_STYLE}
       <paper-card heading="Log">
-        <div class="card-content"><pre>[[log]]</pre></div>
+        <div class="card-content" id="content"></div>
         <div class="card-actions">
           <paper-button on-click="refresh">Refresh</paper-button>
         </div>
@@ -33,7 +37,6 @@ class HassioAddonLogs extends PolymerElement {
         type: String,
         observer: "addonSlugChanged",
       },
-      log: String,
     };
   }
 
@@ -51,8 +54,11 @@ class HassioAddonLogs extends PolymerElement {
   refresh() {
     this.hass
       .callApi("get", `hassio/addons/${this.addonSlug}/logs`)
-      .then((info) => {
-        this.log = info;
+      .then((text) => {
+        while (this.$.content.lastChild) {
+          this.$.content.removeChild(this.$.content.lastChild);
+        }
+        this.$.content.appendChild(parseTextToColoredPre(text));
       });
   }
 }
diff --git a/hassio/src/ansi-to-html.js b/hassio/src/ansi-to-html.js
new file mode 100644
index 0000000000..d9ab04a690
--- /dev/null
+++ b/hassio/src/ansi-to-html.js
@@ -0,0 +1,203 @@
+import { html } from "@polymer/polymer/lib/utils/html-tag";
+
+export const ANSI_HTML_STYLE = html`
+  <style>
+    .bold {
+      font-weight: bold;
+    }
+    .italic {
+      font-style: italic;
+    }
+    .underline {
+      text-decoration: underline;
+    }
+    .strikethrough {
+      text-decoration: line-through;
+    }
+    .underline.strikethrough {
+      text-decoration: underline line-through;
+    }
+    .fg-red {
+      color: rgb(222, 56, 43);
+    }
+    .fg-green {
+      color: rgb(57, 181, 74);
+    }
+    .fg-yellow {
+      color: rgb(255, 199, 6);
+    }
+    .fg-blue {
+      color: rgb(0, 111, 184);
+    }
+    .fg-magenta {
+      color: rgb(118, 38, 113);
+    }
+    .fg-cyan {
+      color: rgb(44, 181, 233);
+    }
+    .fg-white {
+      color: rgb(204, 204, 204);
+    }
+    .bg-black {
+      background-color: rgb(0, 0, 0);
+    }
+    .bg-red {
+      background-color: rgb(222, 56, 43);
+    }
+    .bg-green {
+      background-color: rgb(57, 181, 74);
+    }
+    .bg-yellow {
+      background-color: rgb(255, 199, 6);
+    }
+    .bg-blue {
+      background-color: rgb(0, 111, 184);
+    }
+    .bg-magenta {
+      background-color: rgb(118, 38, 113);
+    }
+    .bg-cyan {
+      background-color: rgb(44, 181, 233);
+    }
+    .bg-white {
+      background-color: rgb(204, 204, 204);
+    }
+  </style>
+`;
+
+export function parseTextToColoredPre(text) {
+  const pre = document.createElement("pre");
+  const re = /\033(?:\[(.*?)[@-~]|\].*?(?:\007|\033\\))/g;
+  let i = 0;
+
+  const state = {
+    bold: false,
+    italic: false,
+    underline: false,
+    strikethrough: false,
+    foregroundColor: null,
+    backgroundColor: null,
+  };
+
+  const addSpan = (content) => {
+    const span = document.createElement("span");
+    if (state.bold) span.classList.add("bold");
+    if (state.italic) span.classList.add("italic");
+    if (state.underline) span.classList.add("underline");
+    if (state.strikethrough) span.classList.add("strikethrough");
+    if (state.foregroundColor !== null)
+      span.classList.add(`fg-${state.foregroundColor}`);
+    if (state.backgroundColor !== null)
+      span.classList.add(`bg-${state.backgroundColor}`);
+    span.appendChild(document.createTextNode(content));
+    pre.appendChild(span);
+  };
+
+  /* eslint-disable no-cond-assign */
+  let match;
+  while ((match = re.exec(text)) !== null) {
+    const j = match.index;
+    addSpan(text.substring(i, j));
+    i = j + match[0].length;
+
+    if (match[1] === undefined) continue;
+
+    for (const colorCode of match[1].split(";")) {
+      switch (parseInt(colorCode)) {
+        case 0:
+          // reset
+          state.bold = false;
+          state.italic = false;
+          state.underline = false;
+          state.strikethrough = false;
+          state.foregroundColor = null;
+          state.backgroundColor = null;
+          break;
+        case 1:
+          state.bold = true;
+          break;
+        case 3:
+          state.italic = true;
+          break;
+        case 4:
+          state.underline = true;
+          break;
+        case 9:
+          state.strikethrough = true;
+          break;
+        case 22:
+          state.bold = false;
+          break;
+        case 23:
+          state.italic = false;
+          break;
+        case 24:
+          state.underline = false;
+          break;
+        case 29:
+          state.strikethrough = false;
+          break;
+        case 30:
+          // foreground black
+          state.foregroundColor = null;
+          break;
+        case 31:
+          state.foregroundColor = "red";
+          break;
+        case 32:
+          state.foregroundColor = "green";
+          break;
+        case 33:
+          state.foregroundColor = "yellow";
+          break;
+        case 34:
+          state.foregroundColor = "blue";
+          break;
+        case 35:
+          state.foregroundColor = "magenta";
+          break;
+        case 36:
+          state.foregroundColor = "cyan";
+          break;
+        case 37:
+          state.foregroundColor = "white";
+          break;
+        case 39:
+          // foreground reset
+          state.foregroundColor = null;
+          break;
+        case 40:
+          state.backgroundColor = "black";
+          break;
+        case 41:
+          state.backgroundColor = "red";
+          break;
+        case 42:
+          state.backgroundColor = "green";
+          break;
+        case 43:
+          state.backgroundColor = "yellow";
+          break;
+        case 44:
+          state.backgroundColor = "blue";
+          break;
+        case 45:
+          state.backgroundColor = "magenta";
+          break;
+        case 46:
+          state.backgroundColor = "cyan";
+          break;
+        case 47:
+          state.backgroundColor = "white";
+          break;
+        case 49:
+          // background reset
+          state.backgroundColor = null;
+          break;
+      }
+    }
+  }
+  addSpan(text.substring(i));
+
+  return pre;
+}
diff --git a/hassio/src/system/hassio-supervisor-log.js b/hassio/src/system/hassio-supervisor-log.js
index 26a3a6a078..985cc2372c 100644
--- a/hassio/src/system/hassio-supervisor-log.js
+++ b/hassio/src/system/hassio-supervisor-log.js
@@ -2,6 +2,7 @@ import "@polymer/paper-button/paper-button";
 import "@polymer/paper-card/paper-card";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
+import { ANSI_HTML_STYLE, parseTextToColoredPre } from "../ansi-to-html";
 
 class HassioSupervisorLog extends PolymerElement {
   static get template() {
@@ -12,12 +13,18 @@ class HassioSupervisorLog extends PolymerElement {
         }
         pre {
           overflow-x: auto;
+          white-space: pre-wrap;
+          overflow-wrap: break-word;
+        }
+        .fg-green {
+          color: var(--primary-text-color) !important;
         }
       </style>
+      ${ANSI_HTML_STYLE}
       <paper-card>
-        <div class="card-content"><pre>[[log]]</pre></div>
+        <div class="card-content" id="content"></div>
         <div class="card-actions">
-          <paper-button on-click="refreshTapped">Refresh</paper-button>
+          <paper-button on-click="refresh">Refresh</paper-button>
         </div>
       </paper-card>
     `;
@@ -26,7 +33,6 @@ class HassioSupervisorLog extends PolymerElement {
   static get properties() {
     return {
       hass: Object,
-      log: String,
     };
   }
 
@@ -37,16 +43,20 @@ class HassioSupervisorLog extends PolymerElement {
 
   loadData() {
     this.hass.callApi("get", "hassio/supervisor/logs").then(
-      (info) => {
-        this.log = info;
+      (text) => {
+        while (this.$.content.lastChild) {
+          this.$.content.removeChild(this.$.content.lastChild);
+        }
+        this.$.content.appendChild(parseTextToColoredPre(text));
       },
       () => {
-        this.log = "Error fetching logs";
+        this.$.content.innerHTML =
+          '<span class="fg-red bold">Error fetching logs</span>';
       }
     );
   }
 
-  refreshTapped() {
+  refresh() {
     this.loadData();
   }
 }

From d015fe51609606d0b038b1064ca7b1c92d1905b5 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Sun, 2 Dec 2018 20:35:05 -0600
Subject: [PATCH 48/69] Remove .ts extensions (#2169)

---
 .../lovelace/common/create-card-element.js    | 20 +++++++++----------
 src/panels/lovelace/hui-unused-entities.js    |  2 +-
 src/panels/lovelace/hui-view.js               |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/panels/lovelace/common/create-card-element.js b/src/panels/lovelace/common/create-card-element.js
index c4cbc406a2..60ff05659f 100644
--- a/src/panels/lovelace/common/create-card-element.js
+++ b/src/panels/lovelace/common/create-card-element.js
@@ -1,18 +1,18 @@
 import { fireEvent } from "../../../common/dom/fire_event";
 
 import "../cards/hui-alarm-panel-card";
-import "../cards/hui-conditional-card.ts";
-import "../cards/hui-entities-card.ts";
-import "../cards/hui-entity-button-card.ts";
+import "../cards/hui-conditional-card";
+import "../cards/hui-entities-card";
+import "../cards/hui-entity-button-card";
 import "../cards/hui-entity-filter-card";
-import "../cards/hui-error-card.ts";
-import "../cards/hui-glance-card.ts";
+import "../cards/hui-error-card";
+import "../cards/hui-glance-card";
 import "../cards/hui-history-graph-card";
-import "../cards/hui-horizontal-stack-card.ts";
-import "../cards/hui-iframe-card.ts";
+import "../cards/hui-horizontal-stack-card";
+import "../cards/hui-iframe-card";
 import "../cards/hui-light-card";
 import "../cards/hui-map-card";
-import "../cards/hui-markdown-card.ts";
+import "../cards/hui-markdown-card";
 import "../cards/hui-media-control-card";
 import "../cards/hui-picture-card";
 import "../cards/hui-picture-elements-card";
@@ -20,9 +20,9 @@ import "../cards/hui-picture-entity-card";
 import "../cards/hui-picture-glance-card";
 import "../cards/hui-plant-status-card";
 import "../cards/hui-sensor-card";
-import "../cards/hui-vertical-stack-card.ts";
+import "../cards/hui-vertical-stack-card";
 import "../cards/hui-shopping-list-card";
-import "../cards/hui-thermostat-card.ts";
+import "../cards/hui-thermostat-card";
 import "../cards/hui-weather-forecast-card";
 import "../cards/hui-gauge-card";
 
diff --git a/src/panels/lovelace/hui-unused-entities.js b/src/panels/lovelace/hui-unused-entities.js
index d2b84f59d1..80b207624c 100644
--- a/src/panels/lovelace/hui-unused-entities.js
+++ b/src/panels/lovelace/hui-unused-entities.js
@@ -4,7 +4,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import computeUnusedEntities from "./common/compute-unused-entities";
 import createCardElement from "./common/create-card-element";
 
-import "./cards/hui-entities-card.ts";
+import "./cards/hui-entities-card";
 
 class HuiUnusedEntities extends PolymerElement {
   static get template() {
diff --git a/src/panels/lovelace/hui-view.js b/src/panels/lovelace/hui-view.js
index 92c6b5d074..5c717968f5 100644
--- a/src/panels/lovelace/hui-view.js
+++ b/src/panels/lovelace/hui-view.js
@@ -2,7 +2,7 @@ import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 
 import "../../components/entity/ha-state-label-badge";
-import "./components/hui-card-options.ts";
+import "./components/hui-card-options";
 
 import applyThemesOnElement from "../../common/dom/apply_themes_on_element";
 

From 57b5db4f43d87adbac8426184176de9d75a2345e Mon Sep 17 00:00:00 2001
From: Ronen Hayun <ronen.hayun@gmail.com>
Date: Mon, 3 Dec 2018 11:54:29 +0200
Subject: [PATCH 49/69] Move computeRTL to a separate file and add RTL support
 in state-info (#2165)

* RTL support (POC)

* restore yarn.lock

* Move computeRTL to a separate file and add RTL support in state-info

* Move import to top after failed CI

* Replace var to const

* Change HassEntity to HomeAssistant object

* Support RTL in state info and state card display

* Support for RTL in more-info-controls:

* Update src/common/util/compute_rtl.ts

Co-Authored-By: rhayun <ronen.hayun@gmail.com>

* remove default from export

* prefix all computeRTL with underscroe for privately uses
---
 src/common/util/compute_rtl.ts              |  9 +++++++++
 src/components/entity/state-info.js         | 20 ++++++++++++++++++++
 src/dialogs/more-info/more-info-controls.js | 15 +++++++++++++++
 src/layouts/home-assistant-main.js          | 11 ++++-------
 src/state-summary/state-card-display.js     | 21 +++++++++++++++++++++
 5 files changed, 69 insertions(+), 7 deletions(-)
 create mode 100644 src/common/util/compute_rtl.ts

diff --git a/src/common/util/compute_rtl.ts b/src/common/util/compute_rtl.ts
new file mode 100644
index 0000000000..62be0a1c7e
--- /dev/null
+++ b/src/common/util/compute_rtl.ts
@@ -0,0 +1,9 @@
+import { HomeAssistant } from "../../types";
+
+export function computeRTL(hass: HomeAssistant) {
+  const lang = hass.language || "en";
+  if (hass.translationMetadata.translations[lang]) {
+    return hass.translationMetadata.translations[lang].isRTL || false;
+  }
+  return false;
+}
diff --git a/src/components/entity/state-info.js b/src/components/entity/state-info.js
index 64b67da2e5..d2859d15d5 100644
--- a/src/components/entity/state-info.js
+++ b/src/components/entity/state-info.js
@@ -4,6 +4,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import "../ha-relative-time";
 import "./state-badge";
 import computeStateName from "../../common/entity/compute_state_name";
+import { computeRTL } from "../../common/util/compute_rtl";
 
 class StateInfo extends PolymerElement {
   static get template() {
@@ -25,10 +26,20 @@ class StateInfo extends PolymerElement {
           float: left;
         }
 
+        :host([rtl]) state-badge {
+          float: right;
+        }
+
         .info {
           margin-left: 56px;
         }
 
+        :host([rtl]) .info {
+          margin-right: 56px;
+          margin-left: 0;
+          text-align: right;
+        }
+
         .name {
           @apply --paper-font-common-nowrap;
           color: var(--primary-text-color);
@@ -87,12 +98,21 @@ class StateInfo extends PolymerElement {
       hass: Object,
       stateObj: Object,
       inDialog: Boolean,
+      rtl: {
+        type: Boolean,
+        reflectToAttribute: true,
+        computed: "computeRTL(hass)",
+      },
     };
   }
 
   computeStateName(stateObj) {
     return computeStateName(stateObj);
   }
+
+  computeRTL(hass) {
+    return computeRTL(hass);
+  }
 }
 
 customElements.define("state-info", StateInfo);
diff --git a/src/dialogs/more-info/more-info-controls.js b/src/dialogs/more-info/more-info-controls.js
index fc639af560..e608b5e9dd 100644
--- a/src/dialogs/more-info/more-info-controls.js
+++ b/src/dialogs/more-info/more-info-controls.js
@@ -16,6 +16,7 @@ import computeStateDomain from "../../common/entity/compute_state_domain";
 import isComponentLoaded from "../../common/config/is_component_loaded";
 import { DOMAINS_MORE_INFO_NO_HISTORY } from "../../common/const";
 import EventsMixin from "../../mixins/events-mixin";
+import { computeRTL } from "../../common/util/compute_rtl";
 
 const DOMAINS_NO_INFO = ["camera", "configurator", "history_graph"];
 /*
@@ -58,6 +59,11 @@ class MoreInfoControls extends EventsMixin(PolymerElement) {
         :host([domain="camera"]) paper-dialog-scrollable {
           margin: 0 -24px -21px;
         }
+
+        :host([rtl]) app-toolbar {
+          direction: rtl;
+          text-align: right;
+        }
       </style>
 
       <app-toolbar>
@@ -147,6 +153,11 @@ class MoreInfoControls extends EventsMixin(PolymerElement) {
           hoursToShow: 24,
         },
       },
+      rtl: {
+        type: Boolean,
+        reflectToAttribute: true,
+        computed: "_computeRTL(hass)",
+      },
     };
   }
 
@@ -190,5 +201,9 @@ class MoreInfoControls extends EventsMixin(PolymerElement) {
   _gotoSettings() {
     this.fire("more-info-page", { page: "settings" });
   }
+
+  _computeRTL(hass) {
+    return computeRTL(hass);
+  }
 }
 customElements.define("more-info-controls", MoreInfoControls);
diff --git a/src/layouts/home-assistant-main.js b/src/layouts/home-assistant-main.js
index 61a38b7bdc..624c2ad558 100644
--- a/src/layouts/home-assistant-main.js
+++ b/src/layouts/home-assistant-main.js
@@ -12,6 +12,7 @@ import "./partial-cards";
 import "./partial-panel-resolver";
 import EventsMixin from "../mixins/events-mixin";
 import NavigateMixin from "../mixins/navigate-mixin";
+import { computeRTL } from "../common/util/compute_rtl";
 
 import(/* webpackChunkName: "ha-sidebar" */ "../components/ha-sidebar");
 import(/* webpackChunkName: "voice-command-dialog" */ "../dialogs/ha-voice-command-dialog");
@@ -115,7 +116,7 @@ class HomeAssistantMain extends NavigateMixin(EventsMixin(PolymerElement)) {
       rtl: {
         type: Boolean,
         reflectToAttribute: true,
-        computed: "computeRTL(hass)",
+        computed: "_computeRTL(hass)",
       },
     };
   }
@@ -175,12 +176,8 @@ class HomeAssistantMain extends NavigateMixin(EventsMixin(PolymerElement)) {
     return NON_SWIPABLE_PANELS.indexOf(hass.panelUrl) !== -1;
   }
 
-  computeRTL(hass) {
-    var lang = hass.selectedLanguage || hass.language;
-    if (hass.translationMetadata.translations[lang]) {
-      return hass.translationMetadata.translations[lang].isRTL || false;
-    }
-    return false;
+  _computeRTL(hass) {
+    return computeRTL(hass);
   }
 }
 
diff --git a/src/state-summary/state-card-display.js b/src/state-summary/state-card-display.js
index 7414666cd2..050a093c2c 100644
--- a/src/state-summary/state-card-display.js
+++ b/src/state-summary/state-card-display.js
@@ -7,6 +7,7 @@ import LocalizeMixin from "../mixins/localize-mixin";
 
 import computeStateDisplay from "../common/entity/compute_state_display";
 import attributeClassNames from "../common/entity/attribute_class_names";
+import { computeRTL } from "../common/util/compute_rtl";
 
 /*
  * @appliesMixin LocalizeMixin
@@ -21,6 +22,11 @@ class StateCardDisplay extends LocalizeMixin(PolymerElement) {
           @apply --layout-baseline;
         }
 
+        :host([rtl]) {
+          direction: rtl;
+          text-align: right;
+        }
+
         state-info {
           flex: 1 1 auto;
           min-width: 0;
@@ -33,6 +39,12 @@ class StateCardDisplay extends LocalizeMixin(PolymerElement) {
           max-width: 40%;
           flex: 0 0 auto;
         }
+        :host([rtl]) .state {
+          margin-right: 16px;
+          margin-left: 0;
+          text-align: left;
+        }
+
         .state.has-unit_of_measurement {
           white-space: nowrap;
         }
@@ -63,6 +75,11 @@ class StateCardDisplay extends LocalizeMixin(PolymerElement) {
         type: Boolean,
         value: false,
       },
+      rtl: {
+        type: Boolean,
+        reflectToAttribute: true,
+        computed: "_computeRTL(hass)",
+      },
     };
   }
 
@@ -77,5 +94,9 @@ class StateCardDisplay extends LocalizeMixin(PolymerElement) {
     ];
     return classes.join(" ");
   }
+
+  _computeRTL(hass) {
+    return computeRTL(hass);
+  }
 }
 customElements.define("state-card-display", StateCardDisplay);

From f461ad6d310754b192e4e1dfe199a994e7723ab9 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Mon, 3 Dec 2018 14:11:46 +0100
Subject: [PATCH 50/69] Add card functionality (#2160)

* MVP add card

* WIP

* Added stub config

* Little bit of cleanup

* Add all card

* At least it works now...

* clean up and bug fixes

* Fix for switching editor
---
 src/common/util/uid.ts                        |   9 +
 src/data/lovelace.ts                          |  21 +-
 .../lovelace/cards/hui-entities-card.ts       |   5 +
 src/panels/lovelace/cards/hui-glance-card.ts  |   3 +
 .../lovelace/common/get-card-element-tag.ts   |   7 +
 .../lovelace/components/hui-card-options.ts   |  22 +-
 .../hui-entities-card-editor.ts               |   8 +-
 src/panels/lovelace/editor/hui-card-picker.ts | 110 +++++++
 .../lovelace/editor/hui-card-preview.ts       |   7 +-
 .../lovelace/editor/hui-dialog-edit-card.ts   |  35 ++-
 src/panels/lovelace/editor/hui-edit-card.ts   | 282 +++++++++++-------
 src/panels/lovelace/editor/types.ts           |  10 +
 src/panels/lovelace/hui-view.js               |  34 ++-
 13 files changed, 409 insertions(+), 144 deletions(-)
 create mode 100644 src/common/util/uid.ts
 create mode 100644 src/panels/lovelace/common/get-card-element-tag.ts
 create mode 100644 src/panels/lovelace/editor/hui-card-picker.ts

diff --git a/src/common/util/uid.ts b/src/common/util/uid.ts
new file mode 100644
index 0000000000..f52a03e0cd
--- /dev/null
+++ b/src/common/util/uid.ts
@@ -0,0 +1,9 @@
+function s4() {
+  return Math.floor((1 + Math.random()) * 0x10000)
+    .toString(16)
+    .substring(1);
+}
+
+export function uid() {
+  return s4() + s4() + s4() + s4() + s4();
+}
diff --git a/src/data/lovelace.ts b/src/data/lovelace.ts
index f7b3a461bb..cfb4489bb6 100644
--- a/src/data/lovelace.ts
+++ b/src/data/lovelace.ts
@@ -33,12 +33,12 @@ export const migrateConfig = (hass: HomeAssistant): Promise<void> =>
 export const saveConfig = (
   hass: HomeAssistant,
   config: LovelaceConfig | string,
-  configFormat: "json" | "yaml"
+  format: "json" | "yaml"
 ): Promise<void> =>
   hass.callWS({
     type: "lovelace/config/save",
     config,
-    format: configFormat,
+    format,
   });
 
 export const getCardConfig = (
@@ -54,13 +54,13 @@ export const updateCardConfig = (
   hass: HomeAssistant,
   cardId: string,
   config: LovelaceCardConfig | string,
-  configFormat: "json" | "yaml"
+  format: "json" | "yaml"
 ): Promise<void> =>
   hass.callWS({
     type: "lovelace/config/card/update",
     card_id: cardId,
     card_config: config,
-    format: configFormat,
+    format,
   });
 
 export const deleteCard = (
@@ -71,3 +71,16 @@ export const deleteCard = (
     type: "lovelace/config/card/delete",
     card_id: cardId,
   });
+
+export const addCard = (
+  hass: HomeAssistant,
+  viewId: string,
+  config: LovelaceCardConfig | string,
+  format: "json" | "yaml"
+): Promise<void> =>
+  hass.callWS({
+    type: "lovelace/config/card/add",
+    view_id: viewId,
+    card_config: config,
+    format,
+  });
diff --git a/src/panels/lovelace/cards/hui-entities-card.ts b/src/panels/lovelace/cards/hui-entities-card.ts
index 182c26aac5..2afd44ad37 100644
--- a/src/panels/lovelace/cards/hui-entities-card.ts
+++ b/src/panels/lovelace/cards/hui-entities-card.ts
@@ -43,6 +43,11 @@ class HuiEntitiesCard extends hassLocalizeLitMixin(LitElement)
     await import("../editor/config-elements/hui-entities-card-editor");
     return document.createElement("hui-entities-card-editor");
   }
+
+  public static getStubConfig(): object {
+    return { entities: [] };
+  }
+
   protected _hass?: HomeAssistant;
   protected _config?: Config;
   protected _configEntities?: ConfigEntity[];
diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts
index 0fefb11001..51c8edea87 100644
--- a/src/panels/lovelace/cards/hui-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-glance-card.ts
@@ -47,6 +47,9 @@ export class HuiGlanceCard extends hassLocalizeLitMixin(LitElement)
     await import("../editor/config-elements/hui-glance-card-editor");
     return document.createElement("hui-glance-card-editor");
   }
+  public static getStubConfig(): object {
+    return { entities: [] };
+  }
 
   public hass?: HomeAssistant;
   private _config?: Config;
diff --git a/src/panels/lovelace/common/get-card-element-tag.ts b/src/panels/lovelace/common/get-card-element-tag.ts
new file mode 100644
index 0000000000..ee80d760a1
--- /dev/null
+++ b/src/panels/lovelace/common/get-card-element-tag.ts
@@ -0,0 +1,7 @@
+const CUSTOM_TYPE_PREFIX = "custom:";
+
+export function getCardElementTag(type: string): string {
+  return type.startsWith(CUSTOM_TYPE_PREFIX)
+    ? type.substr(CUSTOM_TYPE_PREFIX.length)
+    : `hui-${type}-card`;
+}
diff --git a/src/panels/lovelace/components/hui-card-options.ts b/src/panels/lovelace/components/hui-card-options.ts
index 9f8ced06c4..d64ed72ea0 100644
--- a/src/panels/lovelace/components/hui-card-options.ts
+++ b/src/panels/lovelace/components/hui-card-options.ts
@@ -1,10 +1,7 @@
-import "@polymer/paper-button/paper-button";
 import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
+import "@polymer/paper-button/paper-button";
 import { fireEvent } from "../../../common/dom/fire_event";
-import {
-  showEditCardDialog,
-  registerEditCardDialog,
-} from "../editor/hui-dialog-edit-card";
+import { showEditCardDialog } from "../editor/hui-dialog-edit-card";
 
 import { confDeleteCard } from "../editor/delete-card";
 import { HomeAssistant } from "../../../types";
@@ -14,14 +11,14 @@ declare global {
   // for fire event
   interface HASSDomEvents {
     "show-edit-card": {
-      cardConfig: LovelaceCardConfig;
+      cardConfig?: LovelaceCardConfig;
+      viewId?: string | number;
+      add: boolean;
       reloadLovelace: () => void;
     };
   }
 }
 
-let registeredDialog = false;
-
 export class HuiCardOptions extends LitElement {
   public cardConfig?: LovelaceCardConfig;
   protected hass?: HomeAssistant;
@@ -30,14 +27,6 @@ export class HuiCardOptions extends LitElement {
     return { hass: {} };
   }
 
-  public connectedCallback() {
-    super.connectedCallback();
-    if (!registeredDialog) {
-      registeredDialog = true;
-      registerEditCardDialog(this);
-    }
-  }
-
   protected render() {
     return html`
       <style>
@@ -72,6 +61,7 @@ export class HuiCardOptions extends LitElement {
     }
     showEditCardDialog(this, {
       cardConfig: this.cardConfig,
+      add: false,
       reloadLovelace: () => fireEvent(this, "config-refresh"),
     });
   }
diff --git a/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
index a091070cb1..16614a117f 100644
--- a/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
@@ -42,10 +42,6 @@ const cardConfigStruct = struct({
 
 export class HuiEntitiesCardEditor extends hassLocalizeLitMixin(LitElement)
   implements LovelaceCardEditor {
-  public hass?: HomeAssistant;
-  private _config?: Config;
-  private _configEntities?: ConfigEntity[];
-
   static get properties(): PropertyDeclarations {
     return { hass: {}, _config: {}, _configEntities: {} };
   }
@@ -58,6 +54,10 @@ export class HuiEntitiesCardEditor extends hassLocalizeLitMixin(LitElement)
     return this._config!.theme || "Backend-selected";
   }
 
+  public hass?: HomeAssistant;
+  private _config?: Config;
+  private _configEntities?: ConfigEntity[];
+
   public setConfig(config: Config): void {
     config = cardConfigStruct(config);
 
diff --git a/src/panels/lovelace/editor/hui-card-picker.ts b/src/panels/lovelace/editor/hui-card-picker.ts
new file mode 100644
index 0000000000..18fb90d21f
--- /dev/null
+++ b/src/panels/lovelace/editor/hui-card-picker.ts
@@ -0,0 +1,110 @@
+import { html, LitElement } from "@polymer/lit-element";
+import { TemplateResult } from "lit-html";
+import "@polymer/paper-button/paper-button";
+
+import { HomeAssistant } from "../../../types";
+import { fireEvent } from "../../../common/dom/fire_event";
+import { LovelaceCardConfig } from "../../../data/lovelace";
+import { getCardElementTag } from "../common/get-card-element-tag";
+import { CardPickTarget } from "./types";
+import { uid } from "../../../common/util/uid";
+
+declare global {
+  interface HASSDomEvents {
+    "card-picked": {
+      config: LovelaceCardConfig;
+    };
+  }
+}
+
+const cards = [
+  { name: "Alarm panel", type: "alarm-panel" },
+  { name: "Conditional", type: "conditional" },
+  { name: "Entities", type: "entities" },
+  { name: "Entity Button", type: "entity-button" },
+  { name: "Entity Filter", type: "entity-filter" },
+  { name: "Gauge", type: "gauge" },
+  { name: "Glance", type: "glance" },
+  { name: "History Graph", type: "history-graph" },
+  { name: "Horizontal Stack", type: "horizontal-graph" },
+  { name: "iFrame", type: "iframe" },
+  { name: "Light", type: "light" },
+  { name: "Map", type: "map" },
+  { name: "Markdown", type: "markdown" },
+  { name: "Media Control", type: "media-control" },
+  { name: "Picture", type: "picture" },
+  { name: "Picture Elements", type: "picture-elements" },
+  { name: "Picture Entity", type: "picture-entity" },
+  { name: "Picture Glance", type: "picture-glance" },
+  { name: "Plant Status", type: "plant-status" },
+  { name: "Sensor", type: "sensor" },
+  { name: "Shopping List", type: "shopping-list" },
+  { name: "Thermostat", type: "thermostat" },
+  { name: "Vertical Stack", type: "vertical-stack" },
+  { name: "Weather Forecast", type: "weather-forecast" },
+];
+
+export class HuiCardPicker extends LitElement {
+  protected hass?: HomeAssistant;
+
+  protected render(): TemplateResult {
+    return html`
+      ${this.renderStyle()}
+      <h3>Pick the card you want to add:</h3>
+      <div class="cards-container">
+        ${
+          cards.map((card) => {
+            return html`
+              <paper-button
+                raised
+                @click="${this._cardPicked}"
+                .type="${card.type}"
+                >${card.name}</paper-button
+              >
+            `;
+          })
+        }
+      </div>
+    `;
+  }
+
+  private renderStyle(): TemplateResult {
+    return html`
+      <style>
+        .cards-container {
+          display: flex;
+          flex-wrap: wrap;
+          margin-bottom: 10px;
+        }
+        .cards-container paper-button {
+          flex: 1 0 25%;
+        }
+      </style>
+    `;
+  }
+
+  private _cardPicked(ev: Event): void {
+    const type = (ev.currentTarget! as CardPickTarget).type;
+    const tag = getCardElementTag(type);
+
+    const elClass = customElements.get(tag);
+    let config: LovelaceCardConfig = { type, id: uid() };
+
+    if (elClass && elClass.getStubConfig) {
+      const cardConfig = elClass.getStubConfig(this.hass);
+      config = { ...config, ...cardConfig };
+    }
+
+    fireEvent(this, "card-picked", {
+      config,
+    });
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "hui-card-picker": HuiCardPicker;
+  }
+}
+
+customElements.define("hui-card-picker", HuiCardPicker);
diff --git a/src/panels/lovelace/editor/hui-card-preview.ts b/src/panels/lovelace/editor/hui-card-preview.ts
index 4cedeec537..4abeeb21a6 100644
--- a/src/panels/lovelace/editor/hui-card-preview.ts
+++ b/src/panels/lovelace/editor/hui-card-preview.ts
@@ -6,8 +6,7 @@ import { HomeAssistant } from "../../../types";
 import { LovelaceCardConfig } from "../../../data/lovelace";
 import { LovelaceCard } from "../types";
 import { ConfigError } from "./types";
-
-const CUSTOM_TYPE_PREFIX = "custom:";
+import { getCardElementTag } from "../common/get-card-element-tag";
 
 export class HuiCardPreview extends HTMLElement {
   private _hass?: HomeAssistant;
@@ -39,9 +38,7 @@ export class HuiCardPreview extends HTMLElement {
       return;
     }
 
-    const tag = configValue.type.startsWith(CUSTOM_TYPE_PREFIX)
-      ? configValue.type.substr(CUSTOM_TYPE_PREFIX.length)
-      : `hui-${configValue.type}-card`;
+    const tag = getCardElementTag(configValue.type);
 
     if (tag.toUpperCase() === this._element.tagName) {
       this._element.setConfig(configValue);
diff --git a/src/panels/lovelace/editor/hui-dialog-edit-card.ts b/src/panels/lovelace/editor/hui-dialog-edit-card.ts
index 306fe59f18..0516753e64 100644
--- a/src/panels/lovelace/editor/hui-dialog-edit-card.ts
+++ b/src/panels/lovelace/editor/hui-dialog-edit-card.ts
@@ -19,15 +19,18 @@ declare global {
   }
 }
 
+let registeredDialog = false;
 const dialogShowEvent = "show-edit-card";
 const dialogTag = "hui-dialog-edit-card";
 
 export interface EditCardDialogParams {
-  cardConfig: LovelaceCardConfig;
+  cardConfig?: LovelaceCardConfig;
+  viewId?: string | number;
+  add: boolean;
   reloadLovelace: () => void;
 }
 
-export const registerEditCardDialog = (element: HTMLElement) =>
+const registerEditCardDialog = (element: HTMLElement) =>
   fireEvent(element, "register-dialog", {
     dialogShowEvent,
     dialogTag,
@@ -37,7 +40,13 @@ export const registerEditCardDialog = (element: HTMLElement) =>
 export const showEditCardDialog = (
   element: HTMLElement,
   editCardDialogParams: EditCardDialogParams
-) => fireEvent(element, dialogShowEvent, editCardDialogParams);
+) => {
+  if (!registeredDialog) {
+    registeredDialog = true;
+    registerEditCardDialog(element);
+  }
+  fireEvent(element, dialogShowEvent, editCardDialogParams);
+};
 
 export class HuiDialogEditCard extends LitElement {
   protected hass?: HomeAssistant;
@@ -60,7 +69,12 @@ export class HuiDialogEditCard extends LitElement {
     if (!this._params) {
       return html``;
     }
-    if (!this._params.cardConfig.id) {
+    if (
+      (!this._params.add &&
+        this._params.cardConfig &&
+        !this._params.cardConfig.id) ||
+      (this._params.add && !this._params.viewId)
+    ) {
       return html`
         <hui-migrate-config
           .hass="${this.hass}"
@@ -70,13 +84,24 @@ export class HuiDialogEditCard extends LitElement {
     }
     return html`
       <hui-edit-card
-        .cardConfig="${this._params.cardConfig}"
         .hass="${this.hass}"
+        .viewId="${this._params.viewId}"
+        .cardConfig="${this._params.cardConfig}"
         @reload-lovelace="${this._params.reloadLovelace}"
+        @cancel-edit-card="${this._cancel}"
       >
       </hui-edit-card>
     `;
   }
+
+  private _cancel() {
+    this._params = {
+      add: false,
+      reloadLovelace: () => {
+        return;
+      },
+    };
+  }
 }
 
 declare global {
diff --git a/src/panels/lovelace/editor/hui-edit-card.ts b/src/panels/lovelace/editor/hui-edit-card.ts
index 92e9a23962..f8fe186f28 100644
--- a/src/panels/lovelace/editor/hui-edit-card.ts
+++ b/src/panels/lovelace/editor/hui-edit-card.ts
@@ -1,4 +1,9 @@
-import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
+import {
+  html,
+  LitElement,
+  PropertyDeclarations,
+  PropertyValues,
+} from "@polymer/lit-element";
 import { classMap } from "lit-html/directives/classMap";
 import { TemplateResult } from "lit-html";
 import yaml from "js-yaml";
@@ -12,19 +17,30 @@ import "@polymer/paper-button/paper-button";
 import "@polymer/paper-input/paper-textarea";
 import "@polymer/paper-dialog-scrollable/paper-dialog-scrollable";
 import { HomeAssistant } from "../../../types";
-import { updateCardConfig, LovelaceCardConfig } from "../../../data/lovelace";
+import {
+  addCard,
+  updateCardConfig,
+  LovelaceCardConfig,
+} from "../../../data/lovelace";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
 
 import "./hui-yaml-editor";
+import "./hui-card-picker";
 import "./hui-card-preview";
 // This is not a duplicate import, one is for types, one is for element.
 // tslint:disable-next-line
 import { HuiCardPreview } from "./hui-card-preview";
 import { LovelaceCardEditor } from "../types";
-import { YamlChangedEvent, ConfigValue, ConfigError } from "./types";
+import {
+  YamlChangedEvent,
+  CardPickedEvent,
+  ConfigValue,
+  ConfigError,
+} from "./types";
 import { extYamlSchema } from "./yaml-ext-schema";
 import { EntityConfig } from "../entity-rows/types";
+import { getCardElementTag } from "../common/get-card-element-tag";
 
 declare global {
   interface HASSDomEvents {
@@ -37,30 +53,17 @@ declare global {
     "config-changed": {
       config: LovelaceCardConfig;
     };
+    "cancel-edit-card": {};
   }
 }
 
-const CUSTOM_TYPE_PREFIX = "custom:";
-
 export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
-  protected hass?: HomeAssistant;
-  private _cardId?: string;
-  private _originalConfig?: LovelaceCardConfig;
-  private _configElement?: LovelaceCardEditor | null;
-  private _uiEditor?: boolean;
-  private _configValue?: ConfigValue;
-  private _configState?: string;
-  private _loading?: boolean;
-  private _isToggleAvailable?: boolean;
-  private _saving: boolean;
-  private _errorMsg?: TemplateResult;
-  private _cardType?: string;
-
   static get properties(): PropertyDeclarations {
     return {
-      _hass: {},
+      hass: {},
+      cardConfig: {},
+      viewId: {},
       _cardId: {},
-      _originalConfig: {},
       _configElement: {},
       _configValue: {},
       _configState: {},
@@ -68,34 +71,9 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
       _uiEditor: {},
       _saving: {},
       _loading: {},
-      _isToggleAvailable: {},
     };
   }
 
-  protected constructor() {
-    super();
-    this._saving = false;
-  }
-
-  set cardConfig(cardConfig: LovelaceCardConfig) {
-    this._originalConfig = cardConfig;
-    if (String(cardConfig.id) !== this._cardId) {
-      this._configValue = { format: "yaml", value: undefined };
-      this._configState = "OK";
-      this._uiEditor = true;
-      this._cardId = String(cardConfig.id);
-      this._loadConfigElement(cardConfig);
-    }
-  }
-
-  public async showDialog(): Promise<void> {
-    // Wait till dialog is rendered.
-    if (this._dialog == null) {
-      await this.updateComplete;
-    }
-    this._dialog.open();
-  }
-
   private get _dialog(): PaperDialogElement {
     return this.shadowRoot!.querySelector("paper-dialog")!;
   }
@@ -104,9 +82,64 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
     return this.shadowRoot!.querySelector("hui-card-preview")!;
   }
 
+  public cardConfig?: LovelaceCardConfig;
+  public viewId?: string | number;
+  protected hass?: HomeAssistant;
+  private _cardId?: string;
+  private _configElement?: LovelaceCardEditor | null;
+  private _uiEditor?: boolean;
+  private _configValue?: ConfigValue;
+  private _configState?: string;
+  private _loading?: boolean;
+  private _saving: boolean;
+  private _errorMsg?: TemplateResult;
+  private _cardType?: string;
+
+  protected constructor() {
+    super();
+    this._saving = false;
+  }
+
+  public async showDialog(): Promise<void> {
+    // Wait till dialog is rendered.
+    if (this._dialog == null) {
+      await this.updateComplete;
+    }
+    this._dialog.open();
+  }
+
+  protected async updated(changedProperties: PropertyValues): Promise<void> {
+    super.updated(changedProperties);
+    if (
+      !changedProperties.has("cardConfig") &&
+      !changedProperties.has("viewId")
+    ) {
+      return;
+    }
+
+    this._configValue = { format: "yaml", value: undefined };
+    this._configState = "OK";
+    this._uiEditor = true;
+    this._errorMsg = undefined;
+    this._configElement = undefined;
+
+    if (this.cardConfig && String(this.cardConfig.id) !== this._cardId) {
+      this._loading = true;
+      this._cardId = String(this.cardConfig.id);
+      this._loadConfigElement(this.cardConfig);
+    } else {
+      this._cardId = undefined;
+    }
+
+    if (this.viewId && !this.cardConfig) {
+      this._resizeDialog();
+    }
+  }
+
   protected render(): TemplateResult {
     let content;
-    if (!this._configElement !== undefined) {
+    let preview;
+    if (this._configElement !== undefined) {
       if (this._uiEditor) {
         content = html`
           <div class="element-editor">${this._configElement}</div>
@@ -121,6 +154,17 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
           ></hui-yaml-editor>
         `;
       }
+      preview = html`
+        <hr />
+        <hui-card-preview .hass="${this.hass}"> </hui-card-preview>
+      `;
+    } else if (this.viewId && !this.cardConfig) {
+      content = html`
+        <hui-card-picker
+          .hass="${this.hass}"
+          @card-picked="${this._handleCardPicked}"
+        ></hui-card-picker>
+      `;
     }
 
     return html`
@@ -142,16 +186,17 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
                 `
               : ""
           }
-          ${content}
-          <hr />
-          <hui-card-preview .hass="${this.hass}"></hui-card-preview>
+          ${content} ${preview}
         </paper-dialog-scrollable>
         ${
           !this._loading
             ? html`
                 <div class="paper-dialog-buttons">
                   <paper-button
-                    ?disabled="${!this._isToggleAvailable}"
+                    ?hidden="${!this._configValue || !this._configValue.value}"
+                    ?disabled="${
+                      this._configElement === null || this._configState !== "OK"
+                    }"
                     @click="${this._toggleEditor}"
                     >${
                       this.localize(
@@ -163,7 +208,8 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
                     >${this.localize("ui.common.cancel")}</paper-button
                   >
                   <paper-button
-                    ?disabled="${this._saving}"
+                    ?hidden="${!this._configValue || !this._configValue.value}"
+                    ?disabled="${this._saving || this._configState !== "OK"}"
                     @click="${this._save}"
                   >
                     <paper-spinner
@@ -229,39 +275,6 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
     `;
   }
 
-  private async _toggleEditor(): Promise<void> {
-    if (!this._isToggleAvailable) {
-      alert("You can't switch editor.");
-      return;
-    }
-    if (this._uiEditor && this._configValue!.format === "json") {
-      if (this._isConfigChanged()) {
-        this._configValue = {
-          format: "yaml",
-          value: yaml.safeDump(this._configValue!.value),
-        };
-      } else {
-        this._configValue = { format: "yaml", value: undefined };
-      }
-      this._uiEditor = !this._uiEditor;
-    } else if (this._configElement && this._configValue!.format === "yaml") {
-      this._configValue = {
-        format: "json",
-        value: yaml.safeLoad(this._configValue!.value, {
-          schema: extYamlSchema,
-        }),
-      };
-      this._uiEditor = !this._uiEditor;
-      const cardConfig = this._configValue!.value! as LovelaceCardConfig;
-      if (cardConfig.type !== this._cardType) {
-        await this._loadConfigElement(cardConfig);
-        this._cardType = cardConfig.type;
-      }
-      this._configElement.setConfig(cardConfig);
-    }
-    this._resizeDialog();
-  }
-
   private _save(): void {
     this._saving = true;
     this._updateConfigInBackend();
@@ -283,7 +296,9 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
   }
 
   private _closeDialog(): void {
-    this._cardId = undefined;
+    this.cardConfig = undefined;
+    this.viewId = undefined;
+    fireEvent(this, "cancel-edit-card");
     this._dialog.close();
   }
 
@@ -301,21 +316,39 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
     }
 
     try {
-      await updateCardConfig(
-        this.hass!,
-        this._cardId!,
-        this._configValue!.value!,
-        this._configValue!.format
-      );
+      if (this.viewId) {
+        await addCard(
+          this.hass!,
+          String(this.viewId),
+          this._configValue!.value!,
+          this._configValue!.format
+        );
+      } else {
+        await updateCardConfig(
+          this.hass!,
+          this._cardId!,
+          this._configValue!.value!,
+          this._configValue!.format
+        );
+      }
       this._closeDialog();
       this._saveDone();
-      fireEvent(this, "reload-lovelace");
     } catch (err) {
       alert(`Saving failed: ${err.message}`);
       this._saveDone();
     }
   }
 
+  private async _handleCardPicked(ev: CardPickedEvent): Promise<void> {
+    const succes = await this._loadConfigElement(ev.detail.config);
+    if (!succes) {
+      this._configValue = {
+        format: "yaml",
+        value: yaml.safeDump(ev.detail.config),
+      };
+    }
+  }
+
   private _handleYamlChanged(ev: YamlChangedEvent): void {
     this._configValue = { format: "yaml", value: ev.detail.yaml };
     try {
@@ -324,11 +357,7 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
       }) as LovelaceCardConfig;
       this._updatePreview(config);
       this._configState = "OK";
-      if (!this._isToggleAvailable && this._configElement !== null) {
-        this._isToggleAvailable = true;
-      }
     } catch (err) {
-      this._isToggleAvailable = false;
       this._configState = "YAML_ERROR";
       this._setPreviewError({
         type: "YAML Error",
@@ -365,8 +394,42 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
     this._resizeDialog();
   }
 
+  private async _toggleEditor(): Promise<void> {
+    if (this._uiEditor && this._configValue!.format === "json") {
+      if (this._isConfigChanged()) {
+        this._configValue = {
+          format: "yaml",
+          value: yaml.safeDump(this._configValue!.value),
+        };
+      } else {
+        this._configValue = { format: "yaml", value: undefined };
+      }
+      this._uiEditor = !this._uiEditor;
+    } else if (this._configElement && this._configValue!.format === "yaml") {
+      const yamlConfig = this._configValue!.value;
+      const cardConfig = yaml.safeLoad(yamlConfig, {
+        schema: extYamlSchema,
+      }) as LovelaceCardConfig;
+      this._uiEditor = !this._uiEditor;
+      if (cardConfig.type !== this._cardType) {
+        const succes = await this._loadConfigElement(cardConfig);
+        if (!succes) {
+          this._loadedDialog();
+        }
+        this._cardType = cardConfig.type;
+      } else {
+        this._configValue = {
+          format: "json",
+          value: cardConfig,
+        };
+        this._configElement.setConfig(cardConfig);
+      }
+    }
+    this._resizeDialog();
+  }
+
   private _isConfigValid() {
-    if (!this._cardId || !this._configValue || !this._configValue.value) {
+    if (!this._configValue || !this._configValue.value) {
       return false;
     }
     if (this._configState === "OK") {
@@ -377,36 +440,36 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
   }
 
   private _isConfigChanged(): boolean {
+    if (this.viewId) {
+      return true;
+    }
     const configValue =
       this._configValue!.format === "yaml"
         ? yaml.safeDump(this._configValue!.value)
         : this._configValue!.value;
-    return JSON.stringify(configValue) !== JSON.stringify(this._originalConfig);
+    return JSON.stringify(configValue) !== JSON.stringify(this.cardConfig);
   }
 
-  private async _loadConfigElement(conf: LovelaceCardConfig): Promise<void> {
+  private async _loadConfigElement(conf: LovelaceCardConfig): Promise<boolean> {
     if (!conf) {
-      return;
+      return false;
     }
 
     this._errorMsg = undefined;
     this._loading = true;
     this._configElement = undefined;
-    this._isToggleAvailable = false;
 
-    const tag = conf.type.startsWith(CUSTOM_TYPE_PREFIX)
-      ? conf!.type.substr(CUSTOM_TYPE_PREFIX.length)
-      : `hui-${conf!.type}-card`;
+    const tag = getCardElementTag(conf.type);
 
     const elClass = customElements.get(tag);
     let configElement;
 
-    try {
+    if (elClass && elClass.getConfigElement) {
       configElement = await elClass.getConfigElement();
-    } catch (err) {
+    } else {
       this._uiEditor = false;
       this._configElement = null;
-      return;
+      return false;
     }
 
     try {
@@ -418,7 +481,7 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
       `;
       this._uiEditor = false;
       this._configElement = null;
-      return;
+      return false;
     }
 
     configElement.hass = this.hass;
@@ -427,8 +490,9 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
     );
     this._configValue = { format: "json", value: conf };
     this._configElement = configElement;
-    this._isToggleAvailable = true;
+    await this.updateComplete;
     this._updatePreview(conf);
+    return true;
   }
 }
 
diff --git a/src/panels/lovelace/editor/types.ts b/src/panels/lovelace/editor/types.ts
index 8c929f37a5..c814cc8ded 100644
--- a/src/panels/lovelace/editor/types.ts
+++ b/src/panels/lovelace/editor/types.ts
@@ -7,6 +7,12 @@ export interface YamlChangedEvent extends Event {
   };
 }
 
+export interface CardPickedEvent extends Event {
+  detail: {
+    config: LovelaceCardConfig;
+  };
+}
+
 export interface ConfigValue {
   format: "json" | "yaml";
   value?: string | LovelaceCardConfig;
@@ -30,3 +36,7 @@ export interface EditorTarget extends EventTarget {
   checked?: boolean;
   configValue?: string;
 }
+
+export interface CardPickTarget extends EventTarget {
+  type: string;
+}
diff --git a/src/panels/lovelace/hui-view.js b/src/panels/lovelace/hui-view.js
index 5c717968f5..59af019449 100644
--- a/src/panels/lovelace/hui-view.js
+++ b/src/panels/lovelace/hui-view.js
@@ -1,15 +1,18 @@
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 
+import "@polymer/paper-fab/paper-fab";
 import "../../components/entity/ha-state-label-badge";
 import "./components/hui-card-options";
 
 import applyThemesOnElement from "../../common/dom/apply_themes_on_element";
 
+import EventsMixin from "../../mixins/events-mixin";
 import createCardElement from "./common/create-card-element";
 import { computeCardSize } from "./common/compute-card-size";
+import { showEditCardDialog } from "./editor/hui-dialog-edit-card";
 
-class HUIView extends PolymerElement {
+class HUIView extends EventsMixin(PolymerElement) {
   static get template() {
     return html`
       <style>
@@ -44,6 +47,18 @@ class HUIView extends PolymerElement {
           margin: 4px 4px 8px;
         }
 
+        paper-fab {
+          position: sticky;
+          float: right;
+          bottom: 16px;
+          right: 16px;
+          z-index: 1;
+        }
+
+        paper-fab[hidden] {
+          display: none;
+        }
+
         @media (max-width: 500px) {
           :host {
             padding-left: 0;
@@ -64,6 +79,13 @@ class HUIView extends PolymerElement {
       </style>
       <div id="badges"></div>
       <div id="columns"></div>
+      <paper-fab
+        hidden$="{{!editMode}}"
+        elevated="2"
+        icon="hass:plus"
+        title="Add Card"
+        on-click="_addCard"
+      ></paper-fab>
     `;
   }
 
@@ -93,6 +115,16 @@ class HUIView extends PolymerElement {
     this._badges = [];
   }
 
+  _addCard() {
+    showEditCardDialog(this, {
+      viewId: this.config.id,
+      add: true,
+      reloadLovelace: () => {
+        this.fire("config-refresh");
+      },
+    });
+  }
+
   _createBadges(config) {
     const root = this.$.badges;
     while (root.lastChild) {

From 5dc05129efecde97c29bfd181b94bbd3ca6bfa6f Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Tue, 4 Dec 2018 03:01:13 -0600
Subject: [PATCH 51/69] Convert process-config-entities to TypeScript (#2113)

* Convert process-config-entities to TypeScript

* Address review comments but have issues

* Resolve merge conflicts

* Address review comments

Still a typing error which seems like it shouldn't exist

* Hack to bypass type assertion
---
 .../lovelace/cards/hui-entities-card.ts       |  2 +-
 .../lovelace/cards/hui-entity-filter-card.js  |  2 +-
 src/panels/lovelace/cards/hui-glance-card.ts  |  4 +-
 .../lovelace/cards/hui-history-graph-card.js  |  2 +-
 src/panels/lovelace/cards/hui-map-card.js     |  2 +-
 .../lovelace/cards/hui-picture-glance-card.ts |  2 +-
 .../common/process-config-entities.js         | 38 ---------------
 .../common/process-config-entities.ts         | 48 +++++++++++++++++++
 8 files changed, 55 insertions(+), 45 deletions(-)
 delete mode 100644 src/panels/lovelace/common/process-config-entities.js
 create mode 100644 src/panels/lovelace/common/process-config-entities.ts

diff --git a/src/panels/lovelace/cards/hui-entities-card.ts b/src/panels/lovelace/cards/hui-entities-card.ts
index 2afd44ad37..188c8a15ae 100644
--- a/src/panels/lovelace/cards/hui-entities-card.ts
+++ b/src/panels/lovelace/cards/hui-entities-card.ts
@@ -16,7 +16,7 @@ import { HomeAssistant } from "../../../types";
 import { EntityConfig, EntityRow } from "../entity-rows/types";
 import { LovelaceCard, LovelaceCardEditor } from "../types";
 import { LovelaceCardConfig } from "../../../data/lovelace";
-import processConfigEntities from "../common/process-config-entities";
+import { processConfigEntities } from "../common/process-config-entities";
 import createRowElement from "../common/create-row-element";
 import computeDomain from "../../../common/entity/compute_domain";
 import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
diff --git a/src/panels/lovelace/cards/hui-entity-filter-card.js b/src/panels/lovelace/cards/hui-entity-filter-card.js
index 25403b9582..841dfaa0c5 100644
--- a/src/panels/lovelace/cards/hui-entity-filter-card.js
+++ b/src/panels/lovelace/cards/hui-entity-filter-card.js
@@ -1,7 +1,7 @@
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 
 import createCardElement from "../common/create-card-element";
-import processConfigEntities from "../common/process-config-entities";
+import { processConfigEntities } from "../common/process-config-entities";
 
 function getEntities(hass, filterState, entities) {
   return entities.filter((entityConf) => {
diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts
index 51c8edea87..b342c15ddf 100644
--- a/src/panels/lovelace/cards/hui-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-glance-card.ts
@@ -15,10 +15,10 @@ import { LovelaceCardConfig } from "../../../data/lovelace";
 import { longPress } from "../common/directives/long-press-directive";
 import { EntityConfig } from "../entity-rows/types";
 import { toggleEntity } from "../common/entity/toggle-entity";
+import { processConfigEntities } from "../common/process-config-entities";
 
 import computeStateDisplay from "../../../common/entity/compute_state_display";
 import computeStateName from "../../../common/entity/compute_state_name";
-import processConfigEntities from "../common/process-config-entities";
 import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
 
 import "../../../components/entity/state-badge";
@@ -71,7 +71,7 @@ export class HuiGlanceCard extends hassLocalizeLitMixin(LitElement)
 
   public setConfig(config: Config): void {
     this._config = { theme: "default", ...config };
-    const entities = processConfigEntities(config.entities);
+    const entities = processConfigEntities<ConfigEntity>(config.entities);
 
     for (const entity of entities) {
       if (
diff --git a/src/panels/lovelace/cards/hui-history-graph-card.js b/src/panels/lovelace/cards/hui-history-graph-card.js
index 5a50a8c0d1..9def759e5a 100644
--- a/src/panels/lovelace/cards/hui-history-graph-card.js
+++ b/src/panels/lovelace/cards/hui-history-graph-card.js
@@ -5,7 +5,7 @@ import "../../../components/ha-card";
 import "../../../components/state-history-charts";
 import "../../../data/ha-state-history-data";
 
-import processConfigEntities from "../common/process-config-entities";
+import { processConfigEntities } from "../common/process-config-entities";
 
 class HuiHistoryGraphCard extends PolymerElement {
   static get template() {
diff --git a/src/panels/lovelace/cards/hui-map-card.js b/src/panels/lovelace/cards/hui-map-card.js
index 76034be484..cb52efe46d 100644
--- a/src/panels/lovelace/cards/hui-map-card.js
+++ b/src/panels/lovelace/cards/hui-map-card.js
@@ -6,7 +6,7 @@ import Leaflet from "leaflet";
 import "../../map/ha-entity-marker";
 
 import setupLeafletMap from "../../../common/dom/setup-leaflet-map";
-import processConfigEntities from "../common/process-config-entities";
+import { processConfigEntities } from "../common/process-config-entities";
 import computeStateDomain from "../../../common/entity/compute_state_domain";
 import computeStateName from "../../../common/entity/compute_state_name";
 import debounce from "../../../common/util/debounce";
diff --git a/src/panels/lovelace/cards/hui-picture-glance-card.ts b/src/panels/lovelace/cards/hui-picture-glance-card.ts
index 816148aa86..cbd4543663 100644
--- a/src/panels/lovelace/cards/hui-picture-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-glance-card.ts
@@ -14,7 +14,7 @@ import { toggleEntity } from "../common/entity/toggle-entity";
 
 import computeStateDisplay from "../../../common/entity/compute_state_display";
 import computeStateName from "../../../common/entity/compute_state_name";
-import processConfigEntities from "../common/process-config-entities";
+import { processConfigEntities } from "../common/process-config-entities";
 import computeDomain from "../../../common/entity/compute_domain";
 import stateIcon from "../../../common/entity/state_icon";
 
diff --git a/src/panels/lovelace/common/process-config-entities.js b/src/panels/lovelace/common/process-config-entities.js
deleted file mode 100644
index 68e6e248c2..0000000000
--- a/src/panels/lovelace/common/process-config-entities.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Parse array of entity objects from config
-import isValidEntityId from "../../../common/entity/valid_entity_id";
-
-export default function processConfigEntities(entities) {
-  if (!entities || !Array.isArray(entities)) {
-    throw new Error("Entities need to be an array");
-  }
-
-  return entities.map((entityConf, index) => {
-    if (
-      typeof entityConf === "object" &&
-      !Array.isArray(entityConf) &&
-      entityConf.type
-    ) {
-      return entityConf;
-    }
-
-    if (typeof entityConf === "string") {
-      entityConf = { entity: entityConf };
-    } else if (typeof entityConf === "object" && !Array.isArray(entityConf)) {
-      if (!entityConf.entity) {
-        throw new Error(
-          `Entity object at position ${index} is missing entity field.`
-        );
-      }
-    } else {
-      throw new Error(`Invalid entity specified at position ${index}.`);
-    }
-
-    if (!isValidEntityId(entityConf.entity)) {
-      throw new Error(
-        `Invalid entity ID at position ${index}: ${entityConf.entity}`
-      );
-    }
-
-    return entityConf;
-  });
-}
diff --git a/src/panels/lovelace/common/process-config-entities.ts b/src/panels/lovelace/common/process-config-entities.ts
new file mode 100644
index 0000000000..3b13ce4938
--- /dev/null
+++ b/src/panels/lovelace/common/process-config-entities.ts
@@ -0,0 +1,48 @@
+// Parse array of entity objects from config
+import isValidEntityId from "../../../common/entity/valid_entity_id";
+import { EntityConfig } from "../entity-rows/types";
+
+export const processConfigEntities = <T extends EntityConfig>(
+  entities: Array<T | string>
+): T[] => {
+  if (!entities || !Array.isArray(entities)) {
+    throw new Error("Entities need to be an array");
+  }
+
+  return entities.map(
+    (entityConf, index): T => {
+      if (
+        typeof entityConf === "object" &&
+        !Array.isArray(entityConf) &&
+        entityConf.type
+      ) {
+        return entityConf;
+      }
+
+      let config: T;
+
+      if (typeof entityConf === "string") {
+        // tslint:disable-next-line:no-object-literal-type-assertion
+        config = { entity: entityConf } as T;
+      } else if (typeof entityConf === "object" && !Array.isArray(entityConf)) {
+        if (!entityConf.entity) {
+          throw new Error(
+            `Entity object at position ${index} is missing entity field.`
+          );
+        }
+      } else {
+        throw new Error(`Invalid entity specified at position ${index}.`);
+      }
+
+      config = entityConf as T;
+
+      if (!isValidEntityId(config.entity)) {
+        throw new Error(
+          `Invalid entity ID at position ${index}: ${config.entity}`
+        );
+      }
+
+      return config;
+    }
+  );
+};

From 5fec881c399d5ae0ea45c16421a32086aa4e32e7 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Tue, 4 Dec 2018 03:04:59 -0600
Subject: [PATCH 52/69] Convert hui-picture-entity-card to
 TypeScript/LitElement (#2168)

* Convert hui-picture-entity-card to TypeScript/LitElement

click/hold are not working on my Chrome dev env

* typo

* Address review comments

Still having issues with clicks/holds on lots of cards on my system

* Add explicit navigate option

* Fixed after testing with touchevents

* Simplify
---
 src/data/entity.ts                            |   1 +
 .../lovelace/cards/hui-picture-entity-card.js | 197 ------------------
 .../lovelace/cards/hui-picture-entity-card.ts | 175 ++++++++++++++++
 src/panels/lovelace/common/handle-click.ts    |   3 +-
 4 files changed, 178 insertions(+), 198 deletions(-)
 create mode 100644 src/data/entity.ts
 delete mode 100644 src/panels/lovelace/cards/hui-picture-entity-card.js
 create mode 100644 src/panels/lovelace/cards/hui-picture-entity-card.ts

diff --git a/src/data/entity.ts b/src/data/entity.ts
new file mode 100644
index 0000000000..69028008b9
--- /dev/null
+++ b/src/data/entity.ts
@@ -0,0 +1 @@
+export const UNAVAILABLE = "unavailable";
diff --git a/src/panels/lovelace/cards/hui-picture-entity-card.js b/src/panels/lovelace/cards/hui-picture-entity-card.js
deleted file mode 100644
index 03d6fa488c..0000000000
--- a/src/panels/lovelace/cards/hui-picture-entity-card.js
+++ /dev/null
@@ -1,197 +0,0 @@
-import { html } from "@polymer/polymer/lib/utils/html-tag";
-import { PolymerElement } from "@polymer/polymer/polymer-element";
-
-import "../../../components/ha-card";
-import "../components/hui-image";
-
-import computeDomain from "../../../common/entity/compute_domain";
-import computeStateDisplay from "../../../common/entity/compute_state_display";
-import computeStateName from "../../../common/entity/compute_state_name";
-
-import EventsMixin from "../../../mixins/events-mixin";
-import LocalizeMixin from "../../../mixins/localize-mixin";
-import { toggleEntity } from "../common/entity/toggle-entity";
-import { longPressBind } from "../common/directives/long-press-directive";
-
-const UNAVAILABLE = "Unavailable";
-
-/*
- * @appliesMixin LocalizeMixin
- * @appliesMixin EventsMixin
- */
-class HuiPictureEntityCard extends EventsMixin(LocalizeMixin(PolymerElement)) {
-  static get template() {
-    return html`
-      <style>
-        ha-card {
-          min-height: 75px;
-          overflow: hidden;
-          position: relative;
-        }
-        ha-card.canInteract {
-          cursor: pointer;
-        }
-        .footer {
-          @apply --paper-font-common-nowrap;
-          position: absolute;
-          left: 0;
-          right: 0;
-          bottom: 0;
-          background-color: rgba(0, 0, 0, 0.3);
-          padding: 16px;
-          font-size: 16px;
-          line-height: 16px;
-          color: white;
-        }
-        .both {
-          display: flex;
-          justify-content: space-between;
-        }
-        .state {
-          text-align: right;
-        }
-      </style>
-
-      <ha-card id="card">
-        <hui-image
-          hass="[[hass]]"
-          image="[[_config.image]]"
-          state-image="[[_config.state_image]]"
-          camera-image="[[_getCameraImage(_config)]]"
-          entity="[[_config.entity]]"
-          aspect-ratio="[[_config.aspect_ratio]]"
-        ></hui-image>
-        <template is="dom-if" if="[[_showNameAndState(_config)]]">
-          <div class="footer both">
-            <div>[[_name]]</div>
-            <div>[[_state]]</div>
-          </div>
-        </template>
-        <template is="dom-if" if="[[_showName(_config)]]">
-          <div class="footer">[[_name]]</div>
-        </template>
-        <template is="dom-if" if="[[_showState(_config)]]">
-          <div class="footer state">[[_state]]</div>
-        </template>
-      </ha-card>
-    `;
-  }
-
-  static get properties() {
-    return {
-      hass: {
-        type: Object,
-        observer: "_hassChanged",
-      },
-      _config: Object,
-      _name: String,
-      _state: String,
-    };
-  }
-
-  getCardSize() {
-    return 3;
-  }
-
-  setConfig(config) {
-    if (!config || !config.entity) {
-      throw new Error("Error in card configuration.");
-    }
-
-    this._entityDomain = computeDomain(config.entity);
-    if (
-      this._entityDomain !== "camera" &&
-      (!config.image && !config.state_image && !config.camera_image)
-    ) {
-      throw new Error("No image source configured.");
-    }
-
-    this._config = config;
-  }
-
-  ready() {
-    super.ready();
-    const card = this.shadowRoot.querySelector("#card");
-    longPressBind(card);
-    card.addEventListener("ha-click", () => this._cardClicked(false));
-    card.addEventListener("ha-hold", () => this._cardClicked(true));
-  }
-
-  _hassChanged(hass) {
-    const config = this._config;
-    const entityId = config.entity;
-    const stateObj = hass.states[entityId];
-
-    // Nothing changed
-    if (
-      (!stateObj && this._oldState === UNAVAILABLE) ||
-      (stateObj && stateObj.state === this._oldState)
-    ) {
-      return;
-    }
-
-    let name;
-    let state;
-    let stateLabel;
-    let available;
-
-    if (stateObj) {
-      name = config.name || computeStateName(stateObj);
-      state = stateObj.state;
-      stateLabel = computeStateDisplay(this.localize, stateObj);
-      available = true;
-    } else {
-      name = config.name || entityId;
-      state = UNAVAILABLE;
-      stateLabel = this.localize("state.default.unavailable");
-      available = false;
-    }
-
-    this.setProperties({
-      _name: name,
-      _state: stateLabel,
-      _oldState: state,
-    });
-
-    this.$.card.classList.toggle("canInteract", available);
-  }
-
-  _showNameAndState(config) {
-    return config.show_name !== false && config.show_state !== false;
-  }
-
-  _showName(config) {
-    return config.show_name !== false && config.show_state === false;
-  }
-
-  _showState(config) {
-    return config.show_name === false && config.show_state !== false;
-  }
-
-  _cardClicked(hold) {
-    const config = this._config;
-    const entityId = config.entity;
-
-    if (!(entityId in this.hass.states)) return;
-
-    const action = hold ? config.hold_action : config.tap_action || "more-info";
-
-    switch (action) {
-      case "toggle":
-        toggleEntity(this.hass, entityId);
-        break;
-      case "more-info":
-        this.fire("hass-more-info", { entityId });
-        break;
-      default:
-    }
-  }
-
-  _getCameraImage(config) {
-    return this._entityDomain === "camera"
-      ? config.entity
-      : config.camera_image;
-  }
-}
-
-customElements.define("hui-picture-entity-card", HuiPictureEntityCard);
diff --git a/src/panels/lovelace/cards/hui-picture-entity-card.ts b/src/panels/lovelace/cards/hui-picture-entity-card.ts
new file mode 100644
index 0000000000..8c2e1cde12
--- /dev/null
+++ b/src/panels/lovelace/cards/hui-picture-entity-card.ts
@@ -0,0 +1,175 @@
+import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
+import { TemplateResult } from "lit-html/lib/shady-render";
+import { classMap } from "lit-html/directives/classMap";
+
+import "../../../components/ha-card";
+import "../components/hui-image";
+
+import computeDomain from "../../../common/entity/compute_domain";
+import computeStateDisplay from "../../../common/entity/compute_state_display";
+import computeStateName from "../../../common/entity/compute_state_name";
+
+import { longPress } from "../common/directives/long-press-directive";
+import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
+import { HomeAssistant } from "../../../types";
+import { LovelaceCardConfig } from "../../../data/lovelace";
+import { LovelaceCard } from "../types";
+import { handleClick } from "../common/handle-click";
+import { UNAVAILABLE } from "../../../data/entity";
+
+interface Config extends LovelaceCardConfig {
+  entity: string;
+  name?: string;
+  navigation_path?: string;
+  image?: string;
+  camera_image?: string;
+  state_image?: {};
+  aspect_ratio?: string;
+  tap_action?: "toggle" | "call-service" | "more-info" | "navigate";
+  hold_action?: "toggle" | "call-service" | "more-info" | "navigate";
+  service?: string;
+  service_data?: object;
+  show_name?: boolean;
+  show_state?: boolean;
+}
+
+class HuiPictureEntityCard extends hassLocalizeLitMixin(LitElement)
+  implements LovelaceCard {
+  public hass?: HomeAssistant;
+  private _config?: Config;
+
+  static get properties(): PropertyDeclarations {
+    return {
+      hass: {},
+      _config: {},
+    };
+  }
+
+  public getCardSize(): number {
+    return 3;
+  }
+
+  public setConfig(config: Config): void {
+    if (!config || !config.entity) {
+      throw new Error("Invalid Configuration: 'entity' required");
+    }
+
+    if (
+      computeDomain(config.entity) !== "camera" &&
+      (!config.image && !config.state_image && !config.camera_image)
+    ) {
+      throw new Error("No image source configured.");
+    }
+
+    this._config = { show_name: true, show_state: true, ...config };
+  }
+
+  protected render(): TemplateResult {
+    if (!this._config || !this.hass || !this.hass.states[this._config.entity]) {
+      return html``;
+    }
+
+    const stateObj = this.hass.states[this._config.entity];
+    const name = this._config.name || computeStateName(stateObj);
+    const state = computeStateDisplay(
+      this.localize,
+      stateObj,
+      this.hass.language
+    );
+
+    let footer: TemplateResult | string = "";
+    if (this._config.show_name && this._config.show_state) {
+      footer = html`
+        <div class="footer both">
+          <div>${name}</div>
+          <div>${state}</div>
+        </div>
+      `;
+    } else if (this._config.show_name) {
+      footer = html`
+        <div class="footer">${name}</div>
+      `;
+    } else if (this._config.show_state) {
+      footer = html`
+        <div class="footer state">${state}</div>
+      `;
+    }
+
+    return html`
+      ${this.renderStyle()}
+      <ha-card>
+        <hui-image
+          .hass="${this.hass}"
+          .image="${this._config.image}"
+          .stateImage="${this._config.state_image}"
+          .cameraImage="${
+            computeDomain(this._config.entity) === "camera"
+              ? this._config.entity
+              : this._config.camera_image
+          }"
+          .entity="${this._config.entity}"
+          .aspectRatio="${this._config.aspect_ratio}"
+          @ha-click="${this._handleClick}"
+          @ha-hold="${this._handleHold}"
+          .longPress="${longPress()}"
+          class="${
+            classMap({
+              clickable: stateObj.state !== UNAVAILABLE,
+            })
+          }"
+        ></hui-image>
+        ${footer}
+      </ha-card>
+    `;
+  }
+
+  private renderStyle(): TemplateResult {
+    return html`
+      <style>
+        ha-card {
+          min-height: 75px;
+          overflow: hidden;
+          position: relative;
+        }
+        hui-image.clickable {
+          cursor: pointer;
+        }
+        .footer {
+          @apply --paper-font-common-nowrap;
+          position: absolute;
+          left: 0;
+          right: 0;
+          bottom: 0;
+          background-color: rgba(0, 0, 0, 0.3);
+          padding: 16px;
+          font-size: 16px;
+          line-height: 16px;
+          color: white;
+        }
+        .both {
+          display: flex;
+          justify-content: space-between;
+        }
+        .state {
+          text-align: right;
+        }
+      </style>
+    `;
+  }
+
+  private _handleClick() {
+    handleClick(this, this.hass!, this._config!, false);
+  }
+
+  private _handleHold() {
+    handleClick(this, this.hass!, this._config!, true);
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "hui-picture-entity-card": HuiPictureEntityCard;
+  }
+}
+
+customElements.define("hui-picture-entity-card", HuiPictureEntityCard);
diff --git a/src/panels/lovelace/common/handle-click.ts b/src/panels/lovelace/common/handle-click.ts
index 714f4217eb..f6f654f744 100644
--- a/src/panels/lovelace/common/handle-click.ts
+++ b/src/panels/lovelace/common/handle-click.ts
@@ -3,11 +3,12 @@ import { LovelaceElementConfig } from "../elements/types";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { navigate } from "../../../common/navigate";
 import { toggleEntity } from "../../../../src/panels/lovelace/common/entity/toggle-entity";
+import { LovelaceCardConfig } from "../../../data/lovelace";
 
 export const handleClick = (
   node: HTMLElement,
   hass: HomeAssistant,
-  config: LovelaceElementConfig,
+  config: LovelaceElementConfig | LovelaceCardConfig,
   hold: boolean
 ): void => {
   let action = config.tap_action || "more-info";

From f1a61226991cf8757fd668d9fd7366a82466a596 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Tue, 4 Dec 2018 05:57:15 -0600
Subject: [PATCH 53/69] Convert hui-unused-entities to TypeScript/LitElement
 (#2173)

---
 src/panels/lovelace/hui-root.js            |  2 +-
 src/panels/lovelace/hui-unused-entities.js | 61 ---------------
 src/panels/lovelace/hui-unused-entities.ts | 87 ++++++++++++++++++++++
 3 files changed, 88 insertions(+), 62 deletions(-)
 delete mode 100644 src/panels/lovelace/hui-unused-entities.js
 create mode 100644 src/panels/lovelace/hui-unused-entities.ts

diff --git a/src/panels/lovelace/hui-root.js b/src/panels/lovelace/hui-root.js
index e6e25069cc..d5fbf11282 100644
--- a/src/panels/lovelace/hui-root.js
+++ b/src/panels/lovelace/hui-root.js
@@ -318,7 +318,7 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
 
     if (viewIndex === "unused") {
       view = document.createElement("hui-unused-entities");
-      view.config = this.config;
+      view.setConfig(this.config);
     } else {
       const viewConfig = this.config.views[this._curView];
       if (viewConfig.panel) {
diff --git a/src/panels/lovelace/hui-unused-entities.js b/src/panels/lovelace/hui-unused-entities.js
deleted file mode 100644
index 80b207624c..0000000000
--- a/src/panels/lovelace/hui-unused-entities.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import { html } from "@polymer/polymer/lib/utils/html-tag";
-import { PolymerElement } from "@polymer/polymer/polymer-element";
-
-import computeUnusedEntities from "./common/compute-unused-entities";
-import createCardElement from "./common/create-card-element";
-
-import "./cards/hui-entities-card";
-
-class HuiUnusedEntities extends PolymerElement {
-  static get template() {
-    return html`
-      <style>
-        #root {
-          max-width: 600px;
-          margin: 0 auto;
-          padding: 8px 0;
-        }
-      </style>
-      <div id="root"></div>
-    `;
-  }
-
-  static get properties() {
-    return {
-      hass: {
-        type: Object,
-        observer: "_hassChanged",
-      },
-      config: {
-        type: Object,
-        observer: "_configChanged",
-      },
-    };
-  }
-
-  _configChanged(config) {
-    const root = this.$.root;
-    if (root.lastChild) root.removeChild(root.lastChild);
-
-    const entities = computeUnusedEntities(this.hass, config).map((entity) => ({
-      entity,
-      secondary_info: "entity-id",
-    }));
-    const cardConfig = {
-      type: "entities",
-      title: "Unused entities",
-      entities,
-      show_header_toggle: false,
-    };
-    const element = createCardElement(cardConfig);
-    element.hass = this.hass;
-    root.appendChild(element);
-  }
-
-  _hassChanged(hass) {
-    const root = this.$.root;
-    if (!root.lastChild) return;
-    root.lastChild.hass = hass;
-  }
-}
-customElements.define("hui-unused-entities", HuiUnusedEntities);
diff --git a/src/panels/lovelace/hui-unused-entities.ts b/src/panels/lovelace/hui-unused-entities.ts
new file mode 100644
index 0000000000..9548c44bec
--- /dev/null
+++ b/src/panels/lovelace/hui-unused-entities.ts
@@ -0,0 +1,87 @@
+import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
+
+import "./cards/hui-entities-card";
+
+import computeUnusedEntities from "./common/compute-unused-entities";
+import createCardElement from "./common/create-card-element";
+import { HomeAssistant } from "../../types";
+import { TemplateResult } from "lit-html";
+import { LovelaceCard } from "./types";
+
+export class HuiUnusedEntities extends LitElement {
+  private _hass?: HomeAssistant;
+  private _config?: object;
+  private _element?: LovelaceCard;
+
+  static get properties(): PropertyDeclarations {
+    return {
+      _hass: {},
+      _config: {},
+    };
+  }
+
+  set hass(hass: HomeAssistant) {
+    this._hass = hass;
+    if (!this._element) {
+      this._createElement();
+      return;
+    }
+    this._element.hass = this._hass;
+  }
+
+  public setConfig(config: object): void {
+    if (!config) {
+      throw new Error("Card config incorrect");
+    }
+    this._config = config;
+    this._createElement();
+  }
+
+  protected render(): TemplateResult {
+    if (!this._config || !this._hass) {
+      return html``;
+    }
+
+    return html`
+      ${this.renderStyle()}
+      <div id="root">${this._element}</div>
+    `;
+  }
+
+  private renderStyle(): TemplateResult {
+    return html`
+      <style>
+        #root {
+          max-width: 600px;
+          margin: 0 auto;
+          padding: 8px 0;
+        }
+      </style>
+    `;
+  }
+
+  private _createElement(): void {
+    if (this._hass) {
+      const entities = computeUnusedEntities(this._hass, this._config).map(
+        (entity) => ({
+          entity,
+          secondary_info: "entity-id",
+        })
+      );
+      this._element = createCardElement({
+        type: "entities",
+        title: "Unused entities",
+        entities,
+        show_header_toggle: false,
+      });
+      this._element!.hass = this._hass;
+    }
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "hui-unused-entities": HuiUnusedEntities;
+  }
+}
+customElements.define("hui-unused-entities", HuiUnusedEntities);

From 77711ea71128ded03b83014c052ed9d2f1465cb8 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Tue, 4 Dec 2018 05:57:43 -0600
Subject: [PATCH 54/69] Stop MouseEvent from reach parent element (#2174)

---
 .../lovelace/entity-rows/hui-media-player-entity-row.ts     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts b/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts
index 7707991a96..0181c068ae 100644
--- a/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts
@@ -145,13 +145,15 @@ class HuiMediaPlayerEntityRow extends hassLocalizeLitMixin(LitElement)
     return prefix && suffix ? `${prefix}: ${suffix}` : prefix || suffix || "";
   }
 
-  private _playPause(): void {
+  private _playPause(ev: MouseEvent): void {
+    ev.stopPropagation();
     this.hass!.callService("media_player", "media_play_pause", {
       entity_id: this._config!.entity,
     });
   }
 
-  private _nextTrack(): void {
+  private _nextTrack(ev: MouseEvent): void {
+    ev.stopPropagation();
     this.hass!.callService("media_player", "media_next_track", {
       entity_id: this._config!.entity,
     });

From f680832f781e6a6294ad4712596c227b62025531 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Tue, 4 Dec 2018 16:49:12 +0100
Subject: [PATCH 55/69] Add edit/add/delete view (#2172)

* Add edit/add/delete view

* Add delete

* Comments

* Lint

* Fix delete with numeric ids

* fix translations

* add translations
---
 src/data/lovelace.ts                          |  34 +++
 .../lovelace/components/hui-card-options.ts   |  13 +-
 src/panels/lovelace/editor/delete-card.ts     |   2 +-
 src/panels/lovelace/editor/delete-view.ts     |  18 ++
 src/panels/lovelace/editor/hui-card-picker.ts |   6 +-
 .../lovelace/editor/hui-dialog-edit-view.ts   | 101 +++++++
 src/panels/lovelace/editor/hui-edit-card.ts   |  12 +-
 src/panels/lovelace/editor/hui-edit-view.ts   | 264 ++++++++++++++++++
 src/panels/lovelace/hui-root.js               |  85 +++++-
 src/panels/lovelace/hui-view.js               |   5 +-
 src/translations/en.json                      |  20 +-
 11 files changed, 535 insertions(+), 25 deletions(-)
 create mode 100644 src/panels/lovelace/editor/delete-view.ts
 create mode 100644 src/panels/lovelace/editor/hui-dialog-edit-view.ts
 create mode 100644 src/panels/lovelace/editor/hui-edit-view.ts

diff --git a/src/data/lovelace.ts b/src/data/lovelace.ts
index cfb4489bb6..c731360321 100644
--- a/src/data/lovelace.ts
+++ b/src/data/lovelace.ts
@@ -12,6 +12,7 @@ export interface LovelaceViewConfig {
   cards?: LovelaceCardConfig[];
   id?: string;
   icon?: string;
+  theme?: string;
 }
 
 export interface LovelaceCardConfig {
@@ -84,3 +85,36 @@ export const addCard = (
     card_config: config,
     format,
   });
+
+export const updateViewConfig = (
+  hass: HomeAssistant,
+  viewId: string,
+  config: LovelaceViewConfig | string,
+  format: "json" | "yaml"
+): Promise<void> =>
+  hass.callWS({
+    type: "lovelace/config/view/update",
+    view_id: viewId,
+    view_config: config,
+    format,
+  });
+
+export const deleteView = (
+  hass: HomeAssistant,
+  viewId: string
+): Promise<void> =>
+  hass.callWS({
+    type: "lovelace/config/view/delete",
+    view_id: viewId,
+  });
+
+export const addView = (
+  hass: HomeAssistant,
+  config: LovelaceViewConfig | string,
+  format: "json" | "yaml"
+): Promise<void> =>
+  hass.callWS({
+    type: "lovelace/config/view/add",
+    view_config: config,
+    format,
+  });
diff --git a/src/panels/lovelace/components/hui-card-options.ts b/src/panels/lovelace/components/hui-card-options.ts
index d64ed72ea0..d66297d7fe 100644
--- a/src/panels/lovelace/components/hui-card-options.ts
+++ b/src/panels/lovelace/components/hui-card-options.ts
@@ -3,6 +3,7 @@ import "@polymer/paper-button/paper-button";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { showEditCardDialog } from "../editor/hui-dialog-edit-card";
 
+import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
 import { confDeleteCard } from "../editor/delete-card";
 import { HomeAssistant } from "../../../types";
 import { LovelaceCardConfig } from "../../../data/lovelace";
@@ -19,7 +20,7 @@ declare global {
   }
 }
 
-export class HuiCardOptions extends LitElement {
+export class HuiCardOptions extends hassLocalizeLitMixin(LitElement) {
   public cardConfig?: LovelaceCardConfig;
   protected hass?: HomeAssistant;
 
@@ -50,8 +51,14 @@ export class HuiCardOptions extends LitElement {
       <slot></slot>
       <div>
         <paper-button class="warning" @click="${this._deleteCard}"
-          >DELETE</paper-button
-        ><paper-button @click="${this._editCard}">EDIT</paper-button>
+          >${
+            this.localize("ui.panel.lovelace.editor.edit_card.delete")
+          }</paper-button
+        ><paper-button @click="${this._editCard}"
+          >${
+            this.localize("ui.panel.lovelace.editor.edit_card.edit")
+          }</paper-button
+        >
       </div>
     `;
   }
diff --git a/src/panels/lovelace/editor/delete-card.ts b/src/panels/lovelace/editor/delete-card.ts
index 9a2ed8fd6e..11646605cc 100644
--- a/src/panels/lovelace/editor/delete-card.ts
+++ b/src/panels/lovelace/editor/delete-card.ts
@@ -10,7 +10,7 @@ export async function confDeleteCard(
     return;
   }
   try {
-    await deleteCard(hass, cardId);
+    await deleteCard(hass, String(cardId));
     reloadLovelace();
   } catch (err) {
     alert(`Deleting failed: ${err.message}`);
diff --git a/src/panels/lovelace/editor/delete-view.ts b/src/panels/lovelace/editor/delete-view.ts
new file mode 100644
index 0000000000..740c00ede6
--- /dev/null
+++ b/src/panels/lovelace/editor/delete-view.ts
@@ -0,0 +1,18 @@
+import { deleteView } from "../../../data/lovelace";
+import { HomeAssistant } from "../../../types";
+
+export async function confDeleteView(
+  hass: HomeAssistant,
+  viewId: string,
+  reloadLovelace: () => void
+): Promise<void> {
+  if (!confirm("Are you sure you want to delete this view?")) {
+    return;
+  }
+  try {
+    await deleteView(hass, String(viewId));
+    reloadLovelace();
+  } catch (err) {
+    alert(`Deleting failed: ${err.message}`);
+  }
+}
diff --git a/src/panels/lovelace/editor/hui-card-picker.ts b/src/panels/lovelace/editor/hui-card-picker.ts
index 18fb90d21f..af8950750c 100644
--- a/src/panels/lovelace/editor/hui-card-picker.ts
+++ b/src/panels/lovelace/editor/hui-card-picker.ts
@@ -7,6 +7,8 @@ import { fireEvent } from "../../../common/dom/fire_event";
 import { LovelaceCardConfig } from "../../../data/lovelace";
 import { getCardElementTag } from "../common/get-card-element-tag";
 import { CardPickTarget } from "./types";
+import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
+
 import { uid } from "../../../common/util/uid";
 
 declare global {
@@ -44,13 +46,13 @@ const cards = [
   { name: "Weather Forecast", type: "weather-forecast" },
 ];
 
-export class HuiCardPicker extends LitElement {
+export class HuiCardPicker extends hassLocalizeLitMixin(LitElement) {
   protected hass?: HomeAssistant;
 
   protected render(): TemplateResult {
     return html`
       ${this.renderStyle()}
-      <h3>Pick the card you want to add:</h3>
+      <h3>${this.localize("ui.panel.lovelace.editor.edit_card.pick_card")}</h3>
       <div class="cards-container">
         ${
           cards.map((card) => {
diff --git a/src/panels/lovelace/editor/hui-dialog-edit-view.ts b/src/panels/lovelace/editor/hui-dialog-edit-view.ts
new file mode 100644
index 0000000000..f962e4d43e
--- /dev/null
+++ b/src/panels/lovelace/editor/hui-dialog-edit-view.ts
@@ -0,0 +1,101 @@
+import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
+import { TemplateResult } from "lit-html";
+
+import { HomeAssistant } from "../../../types";
+import { fireEvent, HASSDomEvent } from "../../../common/dom/fire_event";
+import { LovelaceViewConfig } from "../../../data/lovelace";
+import "./hui-edit-view";
+import "./hui-migrate-config";
+
+declare global {
+  // for fire event
+  interface HASSDomEvents {
+    "reload-lovelace": undefined;
+    "show-edit-view": EditViewDialogParams;
+  }
+  // for add event listener
+  interface HTMLElementEventMap {
+    "reload-lovelace": HASSDomEvent<undefined>;
+  }
+}
+
+let registeredDialog = false;
+const dialogShowEvent = "show-edit-view";
+const dialogTag = "hui-dialog-edit-view";
+
+export interface EditViewDialogParams {
+  viewConfig?: LovelaceViewConfig;
+  add?: boolean;
+  reloadLovelace: () => void;
+}
+
+const registerEditViewDialog = (element: HTMLElement) =>
+  fireEvent(element, "register-dialog", {
+    dialogShowEvent,
+    dialogTag,
+    dialogImport: () => import("./hui-dialog-edit-view"),
+  });
+
+export const showEditViewDialog = (
+  element: HTMLElement,
+  editViewDialogParams: EditViewDialogParams
+) => {
+  if (!registeredDialog) {
+    registeredDialog = true;
+    registerEditViewDialog(element);
+  }
+  fireEvent(element, dialogShowEvent, editViewDialogParams);
+};
+
+export class HuiDialogEditView extends LitElement {
+  protected hass?: HomeAssistant;
+  private _params?: EditViewDialogParams;
+
+  static get properties(): PropertyDeclarations {
+    return {
+      hass: {},
+      _params: {},
+    };
+  }
+
+  public async showDialog(params: EditViewDialogParams): Promise<void> {
+    this._params = params;
+    await this.updateComplete;
+    (this.shadowRoot!.children[0] as any).showDialog();
+  }
+
+  protected render(): TemplateResult {
+    if (!this._params) {
+      return html``;
+    }
+    if (
+      !this._params.add &&
+      this._params.viewConfig &&
+      !this._params.viewConfig.id
+    ) {
+      return html`
+        <hui-migrate-config
+          .hass="${this.hass}"
+          @reload-lovelace="${this._params.reloadLovelace}"
+        ></hui-migrate-config>
+      `;
+    }
+    return html`
+      <hui-edit-view
+        .hass="${this.hass}"
+        .viewConfig="${this._params.viewConfig}"
+        .add="${this._params.add}"
+        .reloadLovelace="${this._params.reloadLovelace}"
+      >
+      </hui-edit-view>
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "hui-dialog-edit-view": HuiDialogEditView;
+  }
+}
+
+customElements.define(dialogTag, HuiDialogEditView);
diff --git a/src/panels/lovelace/editor/hui-edit-card.ts b/src/panels/lovelace/editor/hui-edit-card.ts
index f8fe186f28..5a523617c9 100644
--- a/src/panels/lovelace/editor/hui-edit-card.ts
+++ b/src/panels/lovelace/editor/hui-edit-card.ts
@@ -14,7 +14,6 @@ import "@polymer/paper-dialog/paper-dialog";
 // tslint:disable-next-line
 import { PaperDialogElement } from "@polymer/paper-dialog/paper-dialog";
 import "@polymer/paper-button/paper-button";
-import "@polymer/paper-input/paper-textarea";
 import "@polymer/paper-dialog-scrollable/paper-dialog-scrollable";
 import { HomeAssistant } from "../../../types";
 import {
@@ -108,7 +107,7 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
     this._dialog.open();
   }
 
-  protected async updated(changedProperties: PropertyValues): Promise<void> {
+  protected updated(changedProperties: PropertyValues): void {
     super.updated(changedProperties);
     if (
       !changedProperties.has("cardConfig") &&
@@ -170,7 +169,7 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
     return html`
       ${this.renderStyle()}
       <paper-dialog with-backdrop>
-        <h2>${this.localize("ui.panel.lovelace.editor.edit.header")}</h2>
+        <h2>${this.localize("ui.panel.lovelace.editor.edit_card.header")}</h2>
         <paper-spinner
           ?active="${this._loading}"
           alt="Loading"
@@ -200,7 +199,7 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
                     @click="${this._toggleEditor}"
                     >${
                       this.localize(
-                        "ui.panel.lovelace.editor.edit.toggle_editor"
+                        "ui.panel.lovelace.editor.edit_card.toggle_editor"
                       )
                     }</paper-button
                   >
@@ -216,9 +215,7 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
                       ?active="${this._saving}"
                       alt="Saving"
                     ></paper-spinner>
-                    ${
-                      this.localize("ui.panel.lovelace.editor.edit.save")
-                    }</paper-button
+                    ${this.localize("ui.common.save")}</paper-button
                   >
                 </div>
               `
@@ -331,6 +328,7 @@ export class HuiEditCard extends hassLocalizeLitMixin(LitElement) {
           this._configValue!.format
         );
       }
+      fireEvent(this, "reload-lovelace");
       this._closeDialog();
       this._saveDone();
     } catch (err) {
diff --git a/src/panels/lovelace/editor/hui-edit-view.ts b/src/panels/lovelace/editor/hui-edit-view.ts
new file mode 100644
index 0000000000..cf9a75a40b
--- /dev/null
+++ b/src/panels/lovelace/editor/hui-edit-view.ts
@@ -0,0 +1,264 @@
+import {
+  html,
+  LitElement,
+  PropertyDeclarations,
+  PropertyValues,
+} from "@polymer/lit-element";
+import { TemplateResult } from "lit-html";
+
+import "@polymer/paper-spinner/paper-spinner";
+import "@polymer/paper-dialog/paper-dialog";
+// This is not a duplicate import, one is for types, one is for element.
+// tslint:disable-next-line
+import { PaperDialogElement } from "@polymer/paper-dialog/paper-dialog";
+import "@polymer/paper-button/paper-button";
+import "@polymer/paper-dialog-scrollable/paper-dialog-scrollable";
+import "../components/hui-theme-select-editor";
+import { HomeAssistant } from "../../../types";
+import {
+  addView,
+  updateViewConfig,
+  LovelaceViewConfig,
+} from "../../../data/lovelace";
+import { fireEvent } from "../../../common/dom/fire_event";
+import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
+import { EditorTarget } from "./types";
+
+export class HuiEditView extends hassLocalizeLitMixin(LitElement) {
+  static get properties(): PropertyDeclarations {
+    return {
+      hass: {},
+      viewConfig: {},
+      add: {},
+      _config: {},
+      _saving: {},
+    };
+  }
+
+  public viewConfig?: LovelaceViewConfig;
+  public add?: boolean;
+  public reloadLovelace?: () => {};
+  protected hass?: HomeAssistant;
+  private _config?: LovelaceViewConfig;
+  private _saving: boolean;
+
+  protected constructor() {
+    super();
+    this._saving = false;
+  }
+
+  public async showDialog(): Promise<void> {
+    // Wait till dialog is rendered.
+    if (this._dialog == null) {
+      await this.updateComplete;
+    }
+    this._dialog.open();
+  }
+
+  protected updated(changedProperties: PropertyValues): void {
+    super.updated(changedProperties);
+    if (!changedProperties.has("viewConfig") && !changedProperties.has("add")) {
+      return;
+    }
+    if (
+      this.viewConfig &&
+      (!changedProperties.get("viewConfig") ||
+        this.viewConfig.id !==
+          (changedProperties.get("viewConfig") as LovelaceViewConfig).id)
+    ) {
+      this._config = this.viewConfig;
+    } else if (changedProperties.has("add")) {
+      this._config = { cards: [] };
+    }
+    this._resizeDialog();
+  }
+
+  private get _dialog(): PaperDialogElement {
+    return this.shadowRoot!.querySelector("paper-dialog")!;
+  }
+
+  get _id(): string {
+    if (!this._config) {
+      return "";
+    }
+    return this._config.id || "";
+  }
+
+  get _title(): string {
+    if (!this._config) {
+      return "";
+    }
+    return this._config.title || "";
+  }
+
+  get _icon(): string {
+    if (!this._config) {
+      return "";
+    }
+    return this._config.icon || "";
+  }
+
+  get _theme(): string {
+    if (!this._config) {
+      return "";
+    }
+    return this._config.theme || "Backend-selected";
+  }
+
+  protected render(): TemplateResult {
+    return html`
+      ${this.renderStyle()}
+      <paper-dialog with-backdrop>
+        <h2>${this.localize("ui.panel.lovelace.editor.edit_view.header")}</h2>
+        <paper-dialog-scrollable>
+          <div class="card-config">
+            <paper-input
+              label="ID"
+              value="${this._id}"
+              .configValue="${"id"}"
+              @value-changed="${this._valueChanged}"
+            ></paper-input>
+            <paper-input
+              label="Title"
+              value="${this._title}"
+              .configValue="${"title"}"
+              @value-changed="${this._valueChanged}"
+            ></paper-input>
+            <paper-input
+              label="Icon"
+              value="${this._icon}"
+              .configValue="${"icon"}"
+              @value-changed="${this._valueChanged}"
+            ></paper-input>
+            <hui-theme-select-editor
+              .hass="${this.hass}"
+              .value="${this._theme}"
+              .configValue="${"theme"}"
+              @theme-changed="${this._valueChanged}"
+            ></hui-theme-select-editor>
+          </div>
+        </paper-dialog-scrollable>
+        <div class="paper-dialog-buttons">
+          <paper-button @click="${this._closeDialog}"
+            >${this.localize("ui.common.cancel")}</paper-button
+          >
+          <paper-button
+            ?disabled="${!this._config || this._saving}"
+            @click="${this._save}"
+          >
+            <paper-spinner
+              ?active="${this._saving}"
+              alt="Saving"
+            ></paper-spinner>
+            ${this.localize("ui.common.save")}</paper-button
+          >
+        </div>
+      </paper-dialog>
+    `;
+  }
+
+  private renderStyle(): TemplateResult {
+    return html`
+      <style>
+        paper-dialog {
+          width: 650px;
+        }
+        paper-button paper-spinner {
+          width: 14px;
+          height: 14px;
+          margin-right: 20px;
+        }
+        paper-spinner {
+          display: none;
+        }
+        paper-spinner[active] {
+          display: block;
+        }
+        .hidden {
+          display: none;
+        }
+        .error {
+          color: #ef5350;
+          border-bottom: 1px solid #ef5350;
+        }
+      </style>
+    `;
+  }
+
+  private _save(): void {
+    this._saving = true;
+    this._updateConfigInBackend();
+  }
+
+  private async _resizeDialog(): Promise<void> {
+    await this.updateComplete;
+    fireEvent(this._dialog, "iron-resize");
+  }
+
+  private _closeDialog(): void {
+    this._config = { cards: [] };
+    this.viewConfig = undefined;
+    this._dialog.close();
+  }
+
+  private async _updateConfigInBackend(): Promise<void> {
+    if (!this._isConfigChanged()) {
+      this._closeDialog();
+      this._saving = false;
+      return;
+    }
+
+    try {
+      if (this.add) {
+        await addView(this.hass!, this._config!, "json");
+      } else {
+        await updateViewConfig(
+          this.hass!,
+          this.viewConfig!.id!,
+          this._config!,
+          "json"
+        );
+      }
+      this.reloadLovelace!();
+      this._closeDialog();
+      this._saving = false;
+    } catch (err) {
+      alert(`Saving failed: ${err.message}`);
+      this._saving = false;
+    }
+  }
+
+  private _valueChanged(ev: Event): void {
+    if (!this._config || !this.hass) {
+      return;
+    }
+
+    const target = ev.currentTarget! as EditorTarget;
+
+    if (this[`_${target.configValue}`] === target.value) {
+      return;
+    }
+
+    if (target.configValue) {
+      this._config = {
+        ...this._config,
+        [target.configValue]: target.value,
+      };
+    }
+  }
+
+  private _isConfigChanged(): boolean {
+    if (!this.add) {
+      return true;
+    }
+    return JSON.stringify(this._config) !== JSON.stringify(this.viewConfig);
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "hui-edit-view": HuiEditView;
+  }
+}
+
+customElements.define("hui-edit-view", HuiEditView);
diff --git a/src/panels/lovelace/hui-root.js b/src/panels/lovelace/hui-root.js
index d5fbf11282..a20864fb27 100644
--- a/src/panels/lovelace/hui-root.js
+++ b/src/panels/lovelace/hui-root.js
@@ -4,6 +4,7 @@ import "@polymer/app-layout/app-scroll-effects/effects/waterfall";
 import "@polymer/app-layout/app-toolbar/app-toolbar";
 import "@polymer/app-route/app-route";
 import "@polymer/paper-icon-button/paper-icon-button";
+import "@polymer/paper-button/paper-button";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-listbox/paper-listbox";
 import "@polymer/paper-menu-button/paper-menu-button";
@@ -16,6 +17,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import scrollToTarget from "../../common/dom/scroll-to-target";
 
 import EventsMixin from "../../mixins/events-mixin";
+import localizeMixin from "../../mixins/localize-mixin";
 import NavigateMixin from "../../mixins/navigate-mixin";
 
 import "../../layouts/ha-app-layout";
@@ -31,12 +33,16 @@ import "./hui-view";
 import debounce from "../../common/util/debounce";
 import createCardElement from "./common/create-card-element";
 import { showSaveDialog } from "./editor/hui-dialog-save-config";
+import { showEditViewDialog } from "./editor/hui-dialog-edit-view";
+import { confDeleteView } from "./editor/delete-view";
 
 // CSS and JS should only be imported once. Modules and HTML are safe.
 const CSS_CACHE = {};
 const JS_CACHE = {};
 
-class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
+class HUIRoot extends NavigateMixin(
+  EventsMixin(localizeMixin(PolymerElement))
+) {
   static get template() {
     return html`
     <style include='ha-style'>
@@ -54,9 +60,24 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
         --paper-tabs-selection-bar-color: var(--text-primary-color, #FFF);
         text-transform: uppercase;
       }
+      #add-view {
+        background: var(--paper-fab-background, var(--accent-color));
+        position: absolute;
+        height: 44px;
+      }
       app-toolbar a {
         color: var(--text-primary-color, white);
       }
+      paper-button.warning:not([disabled]) {
+        color: var(--google-red-500);
+      }
+      app-toolbar.secondary {
+        background-color: var(--light-primary-color);
+        color: var(--primary-text-color, #333);
+        font-size: 14px;
+        font-weight: 500;
+        height: auto;
+      }
       #view {
         min-height: calc(100vh - 112px);
         /**
@@ -103,7 +124,7 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
               <paper-listbox on-iron-select="_deselect" slot="dropdown-content">
                 <paper-item on-click="_handleRefresh">Refresh</paper-item>
                 <paper-item on-click="_handleUnusedEntities">Unused entities</paper-item>
-                <paper-item on-click="_editModeEnable">Configure UI (alpha)</paper-item>
+                <paper-item on-click="_editModeEnable">[[localize("ui.panel.lovelace.editor.configure_ui")]] (alpha)</paper-item>
                 <paper-item on-click="_handleHelp">Help</paper-item>
               </paper-listbox>
             </paper-menu-button>
@@ -115,7 +136,7 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
               icon='hass:close'
               on-click='_editModeDisable'
             ></paper-icon-button>
-            <div main-title>Edit UI</div>
+            <div main-title>[[localize("ui.panel.lovelace.editor.header")]]</div>
           </app-toolbar>
         </template>
 
@@ -131,10 +152,20 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
                 </template>
               </paper-tab>
             </template>
+            <template is='dom-if' if="[[_editMode]]">
+              <paper-button id="add-view" on-click="_addView">
+                <ha-icon title=[[localize("ui.panel.lovelace.editor.edit_view.add")]] icon="hass:plus"></ha-icon>
+              </paper-button>
+            </template>
           </paper-tabs>
         </div>
       </app-header>
-
+      <template is='dom-if' if="[[_editMode]]">
+        <app-toolbar class="secondary">
+          <paper-button on-click="_editView">[[localize("ui.panel.lovelace.editor.edit_view.edit")]]</paper-button>
+          <paper-button class="warning" on-click="_deleteView">[[localize("ui.panel.lovelace.editor.edit_view.delete")]]</paper-button>
+        </app-toolbar>
+      </template>
       <div id='view' on-rebuild-view='_debouncedConfigChanged'></div>
     </app-header-layout>
     `;
@@ -295,10 +326,52 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
     this._selectView(this._curView);
   }
 
+  _editView() {
+    const { cards, badges, ...viewConfig } = this.config.views[this._curView];
+    showEditViewDialog(this, {
+      viewConfig,
+      add: false,
+      reloadLovelace: () => {
+        this.fire("config-refresh");
+      },
+    });
+  }
+
+  _addView() {
+    showEditViewDialog(this, {
+      add: true,
+      reloadLovelace: () => {
+        this.fire("config-refresh");
+      },
+    });
+  }
+
+  _deleteView() {
+    const viewConfig = this.config.views[this._curView];
+    if (viewConfig.cards && viewConfig.cards.length > 0) {
+      alert(
+        "You can't delete a view that has card in them. Remove the cards first."
+      );
+      return;
+    }
+    if (!viewConfig.id) {
+      this._editView();
+      return;
+    }
+    confDeleteView(this.hass, viewConfig.id, () => {
+      this.fire("config-refresh");
+      this._navigateView(0);
+    });
+  }
+
   _handleViewSelected(ev) {
     const index = ev.detail.selected;
-    if (index !== this._curView) {
-      const id = this.config.views[index].id || index;
+    this._navigateView(index);
+  }
+
+  _navigateView(viewIndex) {
+    if (viewIndex !== this._curView) {
+      const id = this.config.views[viewIndex].id || viewIndex;
       this.navigate(`/lovelace/${id}`);
     }
     scrollToTarget(this, this.$.layout.header.scrollTarget);
diff --git a/src/panels/lovelace/hui-view.js b/src/panels/lovelace/hui-view.js
index 59af019449..d78dca3bcf 100644
--- a/src/panels/lovelace/hui-view.js
+++ b/src/panels/lovelace/hui-view.js
@@ -8,11 +8,12 @@ import "./components/hui-card-options";
 import applyThemesOnElement from "../../common/dom/apply_themes_on_element";
 
 import EventsMixin from "../../mixins/events-mixin";
+import localizeMixin from "../../mixins/localize-mixin";
 import createCardElement from "./common/create-card-element";
 import { computeCardSize } from "./common/compute-card-size";
 import { showEditCardDialog } from "./editor/hui-dialog-edit-card";
 
-class HUIView extends EventsMixin(PolymerElement) {
+class HUIView extends localizeMixin(EventsMixin(PolymerElement)) {
   static get template() {
     return html`
       <style>
@@ -83,7 +84,7 @@ class HUIView extends EventsMixin(PolymerElement) {
         hidden$="{{!editMode}}"
         elevated="2"
         icon="hass:plus"
-        title="Add Card"
+        title=[[localize("ui.panel.lovelace.editor.edit_card.add")]]
         on-click="_addCard"
       ></paper-fab>
     `;
diff --git a/src/translations/en.json b/src/translations/en.json
index c8a14d9d28..7059894f28 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -442,7 +442,8 @@
     },
     "common": {
       "loading": "Loading",
-      "cancel": "Cancel"
+      "cancel": "Cancel",
+      "save": "Save"
     },
     "components": {
       "entity": {
@@ -767,10 +768,21 @@
           }
         },
         "editor": {
-          "edit": {
+          "header": "Edit UI",
+          "configure_ui": "Configure UI",
+          "edit_view": {
+            "header": "View Configuration",
+            "add": "Add view",
+            "edit": "Edit view",
+            "delete": "Delete view"
+          },
+          "edit_card": {
             "header": "Card Configuration",
-            "save": "Save",
-            "toggle_editor": "Toggle Editor"
+            "pick_card": "Pick the card you want to add.",
+            "toggle_editor": "Toggle Editor",
+            "add": "Add Card",
+            "edit": "Edit",
+            "delete": "Delete"
           },
           "save_config": {
             "header": "Take control of your Lovelace UI",

From 1d7f574b9be70f5745adc20388f87a24cd5b20a7 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Tue, 4 Dec 2018 18:43:03 +0100
Subject: [PATCH 56/69] Fix process entity (#2177)

---
 src/panels/lovelace/common/process-config-entities.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/panels/lovelace/common/process-config-entities.ts b/src/panels/lovelace/common/process-config-entities.ts
index 3b13ce4938..adb91cd09c 100644
--- a/src/panels/lovelace/common/process-config-entities.ts
+++ b/src/panels/lovelace/common/process-config-entities.ts
@@ -30,12 +30,11 @@ export const processConfigEntities = <T extends EntityConfig>(
             `Entity object at position ${index} is missing entity field.`
           );
         }
+        config = entityConf as T;
       } else {
         throw new Error(`Invalid entity specified at position ${index}.`);
       }
 
-      config = entityConf as T;
-
       if (!isValidEntityId(config.entity)) {
         throw new Error(
           `Invalid entity ID at position ${index}: ${config.entity}`

From 82742842941ef6ed8d41d20e3d169d0465361783 Mon Sep 17 00:00:00 2001
From: Zack Arnett <arnett.zackary@gmail.com>
Date: Tue, 4 Dec 2018 13:49:46 -0500
Subject: [PATCH 57/69] Theme Addition (#2178)

---
 src/panels/lovelace/cards/hui-sensor-card.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/panels/lovelace/cards/hui-sensor-card.ts b/src/panels/lovelace/cards/hui-sensor-card.ts
index 86b2159082..2434527bcb 100755
--- a/src/panels/lovelace/cards/hui-sensor-card.ts
+++ b/src/panels/lovelace/cards/hui-sensor-card.ts
@@ -13,6 +13,7 @@ import { LovelaceCardConfig } from "../../../data/lovelace";
 import { HomeAssistant } from "../../../types";
 import { fireEvent } from "../../../common/dom/fire_event";
 
+import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
 import computeStateName from "../../../common/entity/compute_state_name";
 import stateIcon from "../../../common/entity/state_icon";
 
@@ -139,6 +140,7 @@ interface Config extends LovelaceCardConfig {
   graph?: string;
   unit?: string;
   detail?: number;
+  theme?: string;
   hours_to_show?: number;
 }
 
@@ -163,6 +165,7 @@ class HuiSensorCard extends LitElement implements LovelaceCard {
 
     const cardConfig = {
       detail: 1,
+      theme: "default",
       hours_to_show: 24,
       ...config,
     };
@@ -262,10 +265,15 @@ class HuiSensorCard extends LitElement implements LovelaceCard {
   }
 
   protected updated(changedProps: PropertyValues) {
-    if (this._config && this._config.graph !== "line") {
+    if (!this._config || this._config.graph !== "line" || !this.hass) {
       return;
     }
 
+    const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
+    if (!oldHass || oldHass.themes !== this.hass.themes) {
+      applyThemesOnElement(this, this.hass.themes, this._config!.theme);
+    }
+
     const minute = 60000;
     if (changedProps.has("_config")) {
       this._getHistory();

From e2e002b9a95f686ab3e1af8ab78d7b494c8ee618 Mon Sep 17 00:00:00 2001
From: Zack Arnett <arnett.zackary@gmail.com>
Date: Wed, 5 Dec 2018 06:31:54 -0500
Subject: [PATCH 58/69] Fixes Color not being overwritten by themes for cards
 (#2179)

---
 src/components/ha-card.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/ha-card.js b/src/components/ha-card.js
index 36cd9f760f..f497d69d02 100644
--- a/src/components/ha-card.js
+++ b/src/components/ha-card.js
@@ -12,6 +12,7 @@ class HaCard extends PolymerElement {
           border-radius: 2px;
           transition: all 0.3s ease-out;
           background-color: var(--paper-card-background-color, white);
+          color: var(--primary-text-color);
         }
         .header {
           @apply --paper-font-headline;

From 16cc3adcffe611bb243b25d39943b0e77aedc909 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 5 Dec 2018 12:39:04 +0100
Subject: [PATCH 59/69] Add badges to view editor (#2176)

* Badges

* Fix entity picker

* Make editor own element
---
 .../editor/config-elements/hui-view-editor.ts | 128 ++++++++++++++
 src/panels/lovelace/editor/hui-edit-view.ts   | 167 ++++++++++--------
 src/panels/lovelace/editor/types.ts           |   8 +-
 src/panels/lovelace/hui-root.js               |   3 +-
 src/panels/lovelace/hui-view.js               |   1 +
 5 files changed, 226 insertions(+), 81 deletions(-)
 create mode 100644 src/panels/lovelace/editor/config-elements/hui-view-editor.ts

diff --git a/src/panels/lovelace/editor/config-elements/hui-view-editor.ts b/src/panels/lovelace/editor/config-elements/hui-view-editor.ts
new file mode 100644
index 0000000000..872c776663
--- /dev/null
+++ b/src/panels/lovelace/editor/config-elements/hui-view-editor.ts
@@ -0,0 +1,128 @@
+import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
+import { TemplateResult } from "lit-html";
+import "@polymer/paper-input/paper-input";
+
+import { EditorTarget } from "../types";
+import { hassLocalizeLitMixin } from "../../../../mixins/lit-localize-mixin";
+import { HomeAssistant } from "../../../../types";
+import { fireEvent } from "../../../../common/dom/fire_event";
+import { configElementStyle } from "./config-elements-style";
+
+import "../../components/hui-theme-select-editor";
+import { LovelaceViewConfig } from "../../../../data/lovelace";
+
+declare global {
+  interface HASSDomEvents {
+    "view-config-changed": {
+      config: LovelaceViewConfig;
+    };
+  }
+}
+
+export class HuiViewEditor extends hassLocalizeLitMixin(LitElement) {
+  static get properties(): PropertyDeclarations {
+    return { hass: {}, _config: {} };
+  }
+
+  get _id(): string {
+    if (!this._config) {
+      return "";
+    }
+    return this._config.id || "";
+  }
+
+  get _title(): string {
+    if (!this._config) {
+      return "";
+    }
+    return this._config.title || "";
+  }
+
+  get _icon(): string {
+    if (!this._config) {
+      return "";
+    }
+    return this._config.icon || "";
+  }
+
+  get _theme(): string {
+    if (!this._config) {
+      return "";
+    }
+    return this._config.theme || "Backend-selected";
+  }
+
+  public hass?: HomeAssistant;
+  private _config?: LovelaceViewConfig;
+
+  set config(config: LovelaceViewConfig) {
+    this._config = config;
+  }
+
+  protected render(): TemplateResult {
+    if (!this.hass) {
+      return html``;
+    }
+
+    return html`
+      ${configElementStyle}
+      <div class="card-config">
+        <paper-input
+          label="ID"
+          value="${this._id}"
+          .configValue="${"id"}"
+          @value-changed="${this._valueChanged}"
+        ></paper-input>
+        <paper-input
+          label="Title"
+          value="${this._title}"
+          .configValue="${"title"}"
+          @value-changed="${this._valueChanged}"
+        ></paper-input>
+        <paper-input
+          label="Icon"
+          value="${this._icon}"
+          .configValue="${"icon"}"
+          @value-changed="${this._valueChanged}"
+        ></paper-input>
+        <hui-theme-select-editor
+          .hass="${this.hass}"
+          .value="${this._theme}"
+          .configValue="${"theme"}"
+          @theme-changed="${this._valueChanged}"
+        ></hui-theme-select-editor>
+      </div>
+    `;
+  }
+
+  private _valueChanged(ev: Event): void {
+    if (!this._config || !this.hass) {
+      return;
+    }
+
+    const target = ev.currentTarget! as EditorTarget;
+
+    if (this[`_${target.configValue}`] === target.value) {
+      return;
+    }
+
+    let newConfig;
+
+    if (target.configValue) {
+      newConfig = {
+        ...this._config,
+        [target.configValue]: target.value,
+      };
+    }
+
+    fireEvent(this, "view-config-changed", { config: newConfig });
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "hui-view-editor": HuiViewEditor;
+  }
+}
+
+customElements.define("hui-view-editor", HuiViewEditor);
diff --git a/src/panels/lovelace/editor/hui-edit-view.ts b/src/panels/lovelace/editor/hui-edit-view.ts
index cf9a75a40b..85502fe22c 100644
--- a/src/panels/lovelace/editor/hui-edit-view.ts
+++ b/src/panels/lovelace/editor/hui-edit-view.ts
@@ -7,13 +7,16 @@ import {
 import { TemplateResult } from "lit-html";
 
 import "@polymer/paper-spinner/paper-spinner";
+import "@polymer/paper-tabs/paper-tab";
+import "@polymer/paper-tabs/paper-tabs";
 import "@polymer/paper-dialog/paper-dialog";
 // This is not a duplicate import, one is for types, one is for element.
 // tslint:disable-next-line
 import { PaperDialogElement } from "@polymer/paper-dialog/paper-dialog";
 import "@polymer/paper-button/paper-button";
 import "@polymer/paper-dialog-scrollable/paper-dialog-scrollable";
-import "../components/hui-theme-select-editor";
+import "../components/hui-entity-editor";
+import "./config-elements/hui-view-editor";
 import { HomeAssistant } from "../../../types";
 import {
   addView,
@@ -22,7 +25,9 @@ import {
 } from "../../../data/lovelace";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
-import { EditorTarget } from "./types";
+import { EntitiesEditorEvent, ViewEditEvent } from "./types";
+import { processEditorEntities } from "./process-editor-entities";
+import { EntityConfig } from "../entity-rows/types";
 
 export class HuiEditView extends hassLocalizeLitMixin(LitElement) {
   static get properties(): PropertyDeclarations {
@@ -31,7 +36,9 @@ export class HuiEditView extends hassLocalizeLitMixin(LitElement) {
       viewConfig: {},
       add: {},
       _config: {},
+      _badges: {},
       _saving: {},
+      _curTab: {},
     };
   }
 
@@ -40,11 +47,15 @@ export class HuiEditView extends hassLocalizeLitMixin(LitElement) {
   public reloadLovelace?: () => {};
   protected hass?: HomeAssistant;
   private _config?: LovelaceViewConfig;
+  private _badges?: EntityConfig[];
   private _saving: boolean;
+  private _curTabIndex: number;
+  private _curTab?: string;
 
   protected constructor() {
     super();
     this._saving = false;
+    this._curTabIndex = 0;
   }
 
   public async showDialog(): Promise<void> {
@@ -66,9 +77,12 @@ export class HuiEditView extends hassLocalizeLitMixin(LitElement) {
         this.viewConfig.id !==
           (changedProperties.get("viewConfig") as LovelaceViewConfig).id)
     ) {
-      this._config = this.viewConfig;
+      const { cards, badges, ...viewConfig } = this.viewConfig;
+      this._badges = processEditorEntities(badges);
+      this._config = viewConfig;
     } else if (changedProperties.has("add")) {
-      this._config = { cards: [] };
+      this._config = {};
+      this._badges = [];
     }
     this._resizeDialog();
   }
@@ -77,67 +91,47 @@ export class HuiEditView extends hassLocalizeLitMixin(LitElement) {
     return this.shadowRoot!.querySelector("paper-dialog")!;
   }
 
-  get _id(): string {
-    if (!this._config) {
-      return "";
-    }
-    return this._config.id || "";
-  }
-
-  get _title(): string {
-    if (!this._config) {
-      return "";
-    }
-    return this._config.title || "";
-  }
-
-  get _icon(): string {
-    if (!this._config) {
-      return "";
-    }
-    return this._config.icon || "";
-  }
-
-  get _theme(): string {
-    if (!this._config) {
-      return "";
-    }
-    return this._config.theme || "Backend-selected";
-  }
-
   protected render(): TemplateResult {
+    let content;
+    switch (this._curTab) {
+      case "tab-settings":
+        content = html`
+          <hui-view-editor
+            .hass="${this.hass}"
+            .config="${this._config}"
+            @view-config-changed="${this._viewConfigChanged}"
+          ></hui-view-editor>
+        `;
+        break;
+      case "tab-badges":
+        content = html`
+          <hui-entity-editor
+            .hass="${this.hass}"
+            .entities="${this._badges}"
+            @entities-changed="${this._badgesChanged}"
+          ></hui-entity-editor>
+        `;
+        break;
+      case "tab-cards":
+        content = html`
+          Cards
+        `;
+        break;
+    }
     return html`
       ${this.renderStyle()}
       <paper-dialog with-backdrop>
         <h2>${this.localize("ui.panel.lovelace.editor.edit_view.header")}</h2>
-        <paper-dialog-scrollable>
-          <div class="card-config">
-            <paper-input
-              label="ID"
-              value="${this._id}"
-              .configValue="${"id"}"
-              @value-changed="${this._valueChanged}"
-            ></paper-input>
-            <paper-input
-              label="Title"
-              value="${this._title}"
-              .configValue="${"title"}"
-              @value-changed="${this._valueChanged}"
-            ></paper-input>
-            <paper-input
-              label="Icon"
-              value="${this._icon}"
-              .configValue="${"icon"}"
-              @value-changed="${this._valueChanged}"
-            ></paper-input>
-            <hui-theme-select-editor
-              .hass="${this.hass}"
-              .value="${this._theme}"
-              .configValue="${"theme"}"
-              @theme-changed="${this._valueChanged}"
-            ></hui-theme-select-editor>
-          </div>
-        </paper-dialog-scrollable>
+        <paper-tabs
+          scrollable
+          hide-scroll-buttons
+          .selected="${this._curTabIndex}"
+          @selected-item-changed="${this._handleTabSelected}"
+        >
+          <paper-tab id="tab-settings">Settings</paper-tab>
+          <paper-tab id="tab-badges">Badges</paper-tab>
+        </paper-tabs>
+        <paper-dialog-scrollable> ${content} </paper-dialog-scrollable>
         <div class="paper-dialog-buttons">
           <paper-button @click="${this._closeDialog}"
             >${this.localize("ui.common.cancel")}</paper-button
@@ -163,6 +157,10 @@ export class HuiEditView extends hassLocalizeLitMixin(LitElement) {
         paper-dialog {
           width: 650px;
         }
+        paper-tabs {
+          --paper-tabs-selection-bar-color: var(--primary-color);
+          text-transform: uppercase;
+        }
         paper-button paper-spinner {
           width: 14px;
           height: 14px;
@@ -196,26 +194,45 @@ export class HuiEditView extends hassLocalizeLitMixin(LitElement) {
   }
 
   private _closeDialog(): void {
-    this._config = { cards: [] };
+    this._curTabIndex = 0;
+    this._config = {};
+    this._badges = [];
     this.viewConfig = undefined;
     this._dialog.close();
   }
 
+  private _handleTabSelected(ev: CustomEvent): void {
+    if (!ev.detail.value) {
+      return;
+    }
+    this._curTab = ev.detail.value.id;
+    this._resizeDialog();
+  }
+
   private async _updateConfigInBackend(): Promise<void> {
+    if (!this._config) {
+      return;
+    }
     if (!this._isConfigChanged()) {
       this._closeDialog();
       this._saving = false;
       return;
     }
 
+    if (this._badges) {
+      this._config.badges = this._badges.map((entityConf) => {
+        return entityConf.entity;
+      });
+    }
+
     try {
       if (this.add) {
-        await addView(this.hass!, this._config!, "json");
+        await addView(this.hass!, this._config, "json");
       } else {
         await updateViewConfig(
           this.hass!,
           this.viewConfig!.id!,
-          this._config!,
+          this._config,
           "json"
         );
       }
@@ -228,23 +245,17 @@ export class HuiEditView extends hassLocalizeLitMixin(LitElement) {
     }
   }
 
-  private _valueChanged(ev: Event): void {
-    if (!this._config || !this.hass) {
+  private _viewConfigChanged(ev: ViewEditEvent): void {
+    if (ev.detail && ev.detail.config) {
+      this._config = ev.detail.config;
+    }
+  }
+
+  private _badgesChanged(ev: EntitiesEditorEvent): void {
+    if (!this._badges || !this.hass || !ev.detail || !ev.detail.entities) {
       return;
     }
-
-    const target = ev.currentTarget! as EditorTarget;
-
-    if (this[`_${target.configValue}`] === target.value) {
-      return;
-    }
-
-    if (target.configValue) {
-      this._config = {
-        ...this._config,
-        [target.configValue]: target.value,
-      };
-    }
+    this._badges = ev.detail.entities;
   }
 
   private _isConfigChanged(): boolean {
diff --git a/src/panels/lovelace/editor/types.ts b/src/panels/lovelace/editor/types.ts
index c814cc8ded..fe76d20ece 100644
--- a/src/panels/lovelace/editor/types.ts
+++ b/src/panels/lovelace/editor/types.ts
@@ -1,4 +1,4 @@
-import { LovelaceCardConfig } from "../../../data/lovelace";
+import { LovelaceCardConfig, LovelaceViewConfig } from "../../../data/lovelace";
 import { EntityConfig } from "../entity-rows/types";
 
 export interface YamlChangedEvent extends Event {
@@ -13,6 +13,12 @@ export interface CardPickedEvent extends Event {
   };
 }
 
+export interface ViewEditEvent extends Event {
+  detail: {
+    config: LovelaceViewConfig;
+  };
+}
+
 export interface ConfigValue {
   format: "json" | "yaml";
   value?: string | LovelaceCardConfig;
diff --git a/src/panels/lovelace/hui-root.js b/src/panels/lovelace/hui-root.js
index a20864fb27..33ffb3177b 100644
--- a/src/panels/lovelace/hui-root.js
+++ b/src/panels/lovelace/hui-root.js
@@ -327,9 +327,8 @@ class HUIRoot extends NavigateMixin(
   }
 
   _editView() {
-    const { cards, badges, ...viewConfig } = this.config.views[this._curView];
     showEditViewDialog(this, {
-      viewConfig,
+      viewConfig: this.config.views[this._curView],
       add: false,
       reloadLovelace: () => {
         this.fire("config-refresh");
diff --git a/src/panels/lovelace/hui-view.js b/src/panels/lovelace/hui-view.js
index d78dca3bcf..0f75b0d75c 100644
--- a/src/panels/lovelace/hui-view.js
+++ b/src/panels/lovelace/hui-view.js
@@ -22,6 +22,7 @@ class HUIView extends localizeMixin(EventsMixin(PolymerElement)) {
           padding: 4px 4px 0;
           transform: translateZ(0);
           position: relative;
+          min-height: calc(100vh - 155px);
         }
 
         #badges {

From 0f895fd3a1dfc2c3eb934084cccc5f73f85e6d44 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 5 Dec 2018 14:14:53 +0100
Subject: [PATCH 60/69] Make Lovelace the default! (#2181)

* Make Lovelace the default!

* Move states panel to panels
---
 src/components/ha-cards.js                    | 17 ++-----
 src/layouts/app/home-assistant.js             |  2 +-
 src/layouts/home-assistant-main.js            | 45 +++++--------------
 src/layouts/partial-panel-resolver.js         |  4 ++
 src/panels/dev-info/ha-panel-dev-info.js      | 10 ++---
 src/panels/kiosk/ha-panel-kiosk.js            |  6 +--
 .../states/ha-panel-states.js}                | 36 ++++++++-------
 7 files changed, 47 insertions(+), 73 deletions(-)
 rename src/{layouts/partial-cards.js => panels/states/ha-panel-states.js} (93%)

diff --git a/src/components/ha-cards.js b/src/components/ha-cards.js
index f88e1bb72e..c5ecbac486 100644
--- a/src/components/ha-cards.js
+++ b/src/components/ha-cards.js
@@ -159,7 +159,6 @@ class HaCards extends PolymerElement {
       },
 
       states: Object,
-      panelVisible: Boolean,
 
       viewVisible: {
         type: Boolean,
@@ -173,19 +172,11 @@ class HaCards extends PolymerElement {
   }
 
   static get observers() {
-    return [
-      "updateCards(columns, states, panelVisible, viewVisible, orderedGroupEntities)",
-    ];
+    return ["updateCards(columns, states, viewVisible, orderedGroupEntities)"];
   }
 
-  updateCards(
-    columns,
-    states,
-    panelVisible,
-    viewVisible,
-    orderedGroupEntities
-  ) {
-    if (!panelVisible || !viewVisible) {
+  updateCards(columns, states, viewVisible, orderedGroupEntities) {
+    if (!viewVisible) {
       if (this.$.main.parentNode) {
         this.$.main._parentNode = this.$.main.parentNode;
         this.$.main.parentNode.removeChild(this.$.main);
@@ -200,7 +191,7 @@ class HaCards extends PolymerElement {
       timeOut.after(10),
       () => {
         // Things might have changed since it got scheduled.
-        if (this.panelVisible && this.viewVisible) {
+        if (this.viewVisible) {
           this.cards = this.computeCards(columns, states, orderedGroupEntities);
         }
       }
diff --git a/src/layouts/app/home-assistant.js b/src/layouts/app/home-assistant.js
index f8f5f939de..75f0722d49 100644
--- a/src/layouts/app/home-assistant.js
+++ b/src/layouts/app/home-assistant.js
@@ -94,7 +94,7 @@ class HomeAssistant extends ext(PolymerElement, [
   }
 
   computePanelUrl(routeData) {
-    return (routeData && routeData.panel) || "states";
+    return (routeData && routeData.panel) || "lovelace";
   }
 
   panelUrlChanged(newPanelUrl) {
diff --git a/src/layouts/home-assistant-main.js b/src/layouts/home-assistant-main.js
index 624c2ad558..06eeaf113c 100644
--- a/src/layouts/home-assistant-main.js
+++ b/src/layouts/home-assistant-main.js
@@ -2,13 +2,11 @@ import "@polymer/app-layout/app-drawer-layout/app-drawer-layout";
 import "@polymer/app-layout/app-drawer/app-drawer";
 import "@polymer/app-route/app-route";
 import "@polymer/iron-media-query/iron-media-query";
-import "@polymer/iron-pages/iron-pages";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 
 import "../util/ha-url-sync";
 
-import "./partial-cards";
 import "./partial-panel-resolver";
 import EventsMixin from "../mixins/events-mixin";
 import NavigateMixin from "../mixins/navigate-mixin";
@@ -31,21 +29,16 @@ class HomeAssistantMain extends NavigateMixin(EventsMixin(PolymerElement)) {
         :host([rtl]) {
           direction: rtl;
         }
-        iron-pages,
+        partial-panel-resolver,
         ha-sidebar {
           /* allow a light tap highlight on the actual interface elements  */
           -webkit-tap-highlight-color: rgba(0, 0, 0, 0.1);
         }
-        iron-pages {
+        partial-panel-resolver {
           height: 100%;
         }
       </style>
       <ha-url-sync hass="[[hass]]"></ha-url-sync>
-      <app-route
-        route="{{route}}"
-        pattern="/states"
-        tail="{{statesRouteTail}}"
-      ></app-route>
       <ha-voice-command-dialog
         hass="[[hass]]"
         id="voiceDialog"
@@ -73,29 +66,12 @@ class HomeAssistantMain extends NavigateMixin(EventsMixin(PolymerElement)) {
           ></ha-sidebar>
         </app-drawer>
 
-        <iron-pages
-          attr-for-selected="id"
-          fallback-selection="panel-resolver"
-          selected="[[hass.panelUrl]]"
-          selected-attribute="panel-visible"
-        >
-          <partial-cards
-            id="states"
-            narrow="[[narrow]]"
-            hass="[[hass]]"
-            show-menu="[[dockedSidebar]]"
-            route="[[statesRouteTail]]"
-            show-tabs=""
-          ></partial-cards>
-
-          <partial-panel-resolver
-            id="panel-resolver"
-            narrow="[[narrow]]"
-            hass="[[hass]]"
-            route="[[route]]"
-            show-menu="[[dockedSidebar]]"
-          ></partial-panel-resolver>
-        </iron-pages>
+        <partial-panel-resolver
+          narrow="[[narrow]]"
+          hass="[[hass]]"
+          route="[[route]]"
+          show-menu="[[dockedSidebar]]"
+        ></partial-panel-resolver>
       </app-drawer-layout>
     `;
   }
@@ -108,7 +84,6 @@ class HomeAssistantMain extends NavigateMixin(EventsMixin(PolymerElement)) {
         type: Object,
         observer: "_routeChanged",
       },
-      statesRouteTail: Object,
       dockedSidebar: {
         type: Boolean,
         computed: "computeDockedSidebar(hass)",
@@ -123,7 +98,7 @@ class HomeAssistantMain extends NavigateMixin(EventsMixin(PolymerElement)) {
 
   ready() {
     super.ready();
-    this._defaultPage = localStorage.defaultPage || "states";
+    this._defaultPage = localStorage.defaultPage || "lovelace";
     this.addEventListener("hass-open-menu", () => this.handleOpenMenu());
     this.addEventListener("hass-close-menu", () => this.handleCloseMenu());
     this.addEventListener("hass-start-voice", (ev) =>
@@ -160,7 +135,7 @@ class HomeAssistantMain extends NavigateMixin(EventsMixin(PolymerElement)) {
   connectedCallback() {
     super.connectedCallback();
     if (document.location.pathname === "/") {
-      this.navigate(`/${localStorage.defaultPage || "states"}`, true);
+      this.navigate(`/${localStorage.defaultPage || "lovelace"}`, true);
     }
   }
 
diff --git a/src/layouts/partial-panel-resolver.js b/src/layouts/partial-panel-resolver.js
index 1a36a1df76..24d05e2ace 100644
--- a/src/layouts/partial-panel-resolver.js
+++ b/src/layouts/partial-panel-resolver.js
@@ -54,6 +54,10 @@ function ensureLoaded(panel) {
       imported = import(/* webpackChunkName: "panel-lovelace" */ "../panels/lovelace/ha-panel-lovelace");
       break;
 
+    case "states":
+      imported = import(/* webpackChunkName: "panel-states" */ "../panels/states/ha-panel-states");
+      break;
+
     case "history":
       imported = import(/* webpackChunkName: "panel-history" */ "../panels/history/ha-panel-history");
       break;
diff --git a/src/panels/dev-info/ha-panel-dev-info.js b/src/panels/dev-info/ha-panel-dev-info.js
index bd827a6e4a..8ac30304dd 100644
--- a/src/panels/dev-info/ha-panel-dev-info.js
+++ b/src/panels/dev-info/ha-panel-dev-info.js
@@ -164,7 +164,7 @@ class HaPanelDevInfo extends EventsMixin(LocalizeMixin(PolymerElement)) {
             </template>
           </p>
           <p>
-            <a href='/lovelace'>Try out the new Lovelace UI (experimental)</a>
+            <a href='/states'>Go back to the old states page</a>
             <div id="love" style="cursor:pointer;" on-click="_toggleDefaultPage">[[_defaultPageText()]]</div
           </p>
         </div>
@@ -364,15 +364,15 @@ class HaPanelDevInfo extends EventsMixin(LocalizeMixin(PolymerElement)) {
 
   _defaultPageText() {
     return `>> ${
-      localStorage.defaultPage === "lovelace" ? "Remove" : "Set"
-    } lovelace as default page on this device <<`;
+      localStorage.defaultPage === "states" ? "Remove" : "Set"
+    } the old states as default page on this device <<`;
   }
 
   _toggleDefaultPage() {
-    if (localStorage.defaultPage === "lovelace") {
+    if (localStorage.defaultPage === "states") {
       delete localStorage.defaultPage;
     } else {
-      localStorage.defaultPage = "lovelace";
+      localStorage.defaultPage = "states";
     }
     this.$.love.innerText = this._defaultPageText();
   }
diff --git a/src/panels/kiosk/ha-panel-kiosk.js b/src/panels/kiosk/ha-panel-kiosk.js
index e106aa035e..50fef88b1d 100644
--- a/src/panels/kiosk/ha-panel-kiosk.js
+++ b/src/panels/kiosk/ha-panel-kiosk.js
@@ -1,18 +1,18 @@
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 
-import "../../layouts/partial-cards";
+import "../states/ha-panel-states";
 
 class HaPanelKiosk extends PolymerElement {
   static get template() {
     return html`
-      <partial-cards
+      <ha-panel-states
         id="kiosk-states"
         hass="[[hass]]"
         show-menu
         route="[[route]]"
         panel-visible
-      ></partial-cards>
+      ></ha-panel-states>
     `;
   }
 
diff --git a/src/layouts/partial-cards.js b/src/panels/states/ha-panel-states.js
similarity index 93%
rename from src/layouts/partial-cards.js
rename to src/panels/states/ha-panel-states.js
index b473c30b6c..1f1eb6a537 100644
--- a/src/layouts/partial-cards.js
+++ b/src/panels/states/ha-panel-states.js
@@ -1,3 +1,5 @@
+import { html } from "@polymer/polymer/lib/utils/html-tag";
+import { PolymerElement } from "@polymer/polymer/polymer-element";
 import "@polymer/app-layout/app-header/app-header";
 import "@polymer/app-layout/app-scroll-effects/effects/waterfall";
 import "@polymer/app-layout/app-toolbar/app-toolbar";
@@ -6,23 +8,21 @@ import "@polymer/iron-flex-layout/iron-flex-layout-classes";
 import "@polymer/iron-pages/iron-pages";
 import "@polymer/paper-tabs/paper-tab";
 import "@polymer/paper-tabs/paper-tabs";
-import { html } from "@polymer/polymer/lib/utils/html-tag";
-import { PolymerElement } from "@polymer/polymer/polymer-element";
 
-import "../components/ha-cards";
-import "../components/ha-icon";
-import "../components/ha-menu-button";
-import "../components/ha-start-voice-button";
+import "../../components/ha-cards";
+import "../../components/ha-icon";
+import "../../components/ha-menu-button";
+import "../../components/ha-start-voice-button";
 
-import "./ha-app-layout";
+import "../../layouts/ha-app-layout";
 
-import extractViews from "../common/entity/extract_views";
-import getViewEntities from "../common/entity/get_view_entities";
-import computeStateName from "../common/entity/compute_state_name";
-import computeStateDomain from "../common/entity/compute_state_domain";
-import computeLocationName from "../common/config/location_name";
-import NavigateMixin from "../mixins/navigate-mixin";
-import EventsMixin from "../mixins/events-mixin";
+import extractViews from "../../common/entity/extract_views";
+import getViewEntities from "../../common/entity/get_view_entities";
+import computeStateName from "../../common/entity/compute_state_name";
+import computeStateDomain from "../../common/entity/compute_state_domain";
+import computeLocationName from "../../common/config/location_name";
+import NavigateMixin from "../../mixins/navigate-mixin";
+import EventsMixin from "../../mixins/events-mixin";
 
 const DEFAULT_VIEW_ENTITY_ID = "group.default_view";
 const ALWAYS_SHOW_DOMAIN = ["persistent_notification", "configurator"];
@@ -46,6 +46,10 @@ class PartialCards extends EventsMixin(NavigateMixin(PolymerElement)) {
           background-color: var(--secondary-background-color, #e5e5e5);
         }
 
+        iron-pages {
+          height: 100%;
+        }
+
         paper-tabs {
           margin-left: 12px;
           --paper-tabs-selection-bar-color: var(--text-primary-color, #fff);
@@ -205,7 +209,7 @@ class PartialCards extends EventsMixin(NavigateMixin(PolymerElement)) {
 
       showTabs: {
         type: Boolean,
-        value: false,
+        value: true,
       },
     };
   }
@@ -416,4 +420,4 @@ class PartialCards extends EventsMixin(NavigateMixin(PolymerElement)) {
   }
 }
 
-customElements.define("partial-cards", PartialCards);
+customElements.define("ha-panel-states", PartialCards);

From de3a4676974518e1cbd32c76d41ccd9349de6e8c Mon Sep 17 00:00:00 2001
From: Zack Arnett <arnett.zackary@gmail.com>
Date: Wed, 5 Dec 2018 08:27:22 -0500
Subject: [PATCH 61/69] Update Hold/Tap Actions to Objects (#2182)

* Update Action to Object for entity-button

* Update Actions to Object for Glance Card

* Update to use HandleClick function

* Add navigation

* Updating to use navigation path from Action Config

* Type handle events in glance

* Update Service checks

* Update Picture elements

* oops

* Adding nav back until we convert picture

* Extend typing
---
 src/data/lovelace.ts                          | 30 ++++++++++++
 .../lovelace/cards/hui-entity-button-card.ts  | 49 +++++--------------
 src/panels/lovelace/cards/hui-glance-card.ts  | 48 +++++++-----------
 .../lovelace/cards/hui-picture-entity-card.ts | 12 ++---
 src/panels/lovelace/common/compute-tooltip.ts |  2 +-
 src/panels/lovelace/common/handle-click.ts    | 42 +++++++++-------
 .../lovelace/elements/hui-icon-element.ts     | 12 ++++-
 .../lovelace/elements/hui-image-element.ts    |  9 ++--
 .../elements/hui-state-label-element.ts       | 12 ++++-
 src/panels/lovelace/elements/types.ts         |  7 +--
 10 files changed, 122 insertions(+), 101 deletions(-)

diff --git a/src/data/lovelace.ts b/src/data/lovelace.ts
index c731360321..cd806b682b 100644
--- a/src/data/lovelace.ts
+++ b/src/data/lovelace.ts
@@ -21,6 +21,36 @@ export interface LovelaceCardConfig {
   [key: string]: any;
 }
 
+export interface ToggleActionConfig {
+  action: "toggle";
+}
+
+export interface CallServiceActionConfig {
+  action: "call-service";
+  service: string;
+  service_data?: { [key: string]: any };
+}
+
+export interface NavigateActionConfig {
+  action: "navigate";
+  navigation_path: string;
+}
+
+export interface MoreInfoActionConfig {
+  action: "more-info";
+}
+
+export interface NoActionConfig {
+  action: "none";
+}
+
+export type ActionConfig =
+  | ToggleActionConfig
+  | CallServiceActionConfig
+  | NavigateActionConfig
+  | MoreInfoActionConfig
+  | NoActionConfig;
+
 export const fetchConfig = (hass: HomeAssistant): Promise<LovelaceConfig> =>
   hass.callWS({
     type: "lovelace/config",
diff --git a/src/panels/lovelace/cards/hui-entity-button-card.ts b/src/panels/lovelace/cards/hui-entity-button-card.ts
index 4bc9d08e5d..fbb074b0b4 100644
--- a/src/panels/lovelace/cards/hui-entity-button-card.ts
+++ b/src/panels/lovelace/cards/hui-entity-button-card.ts
@@ -15,23 +15,20 @@ import stateIcon from "../../../common/entity/state_icon";
 import computeStateDomain from "../../../common/entity/compute_state_domain";
 import computeStateName from "../../../common/entity/compute_state_name";
 import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
-import { toggleEntity } from "../common/entity/toggle-entity";
 import { HomeAssistant, LightEntity } from "../../../types";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
 import { LovelaceCard } from "../types";
-import { LovelaceCardConfig } from "../../../data/lovelace";
+import { LovelaceCardConfig, ActionConfig } from "../../../data/lovelace";
 import { longPress } from "../common/directives/long-press-directive";
-import { fireEvent } from "../../../common/dom/fire_event";
+import { handleClick } from "../common/handle-click";
 
 interface Config extends LovelaceCardConfig {
   entity: string;
   name?: string;
   icon?: string;
   theme?: string;
-  tap_action?: "toggle" | "call-service" | "more-info";
-  hold_action?: "toggle" | "call-service" | "more-info";
-  service?: string;
-  service_data?: object;
+  tap_action?: ActionConfig;
+  hold_action?: ActionConfig;
 }
 
 class HuiEntityButtonCard extends hassLocalizeLitMixin(LitElement)
@@ -82,8 +79,8 @@ class HuiEntityButtonCard extends hassLocalizeLitMixin(LitElement)
     return html`
       ${this.renderStyle()}
       <ha-card
-        @ha-click="${() => this.handleClick(false)}"
-        @ha-hold="${() => this.handleClick(true)}"
+        @ha-click="${this._handleTap}"
+        @ha-hold="${this._handleHold}"
         .longPress="${longPress()}"
       >
         ${
@@ -187,34 +184,12 @@ class HuiEntityButtonCard extends hassLocalizeLitMixin(LitElement)
     return `hsl(${hue}, 100%, ${100 - sat / 2}%)`;
   }
 
-  private handleClick(hold: boolean): void {
-    const config = this._config;
-    if (!config) {
-      return;
-    }
-    const stateObj = this.hass!.states[config.entity];
-    if (!stateObj) {
-      return;
-    }
-    const entityId = stateObj.entity_id;
-    const action = hold ? config.hold_action : config.tap_action || "more-info";
-    switch (action) {
-      case "toggle":
-        toggleEntity(this.hass!, entityId);
-        break;
-      case "call-service":
-        if (!config.service) {
-          return;
-        }
-        const [domain, service] = config.service.split(".", 2);
-        const serviceData = { entity_id: entityId, ...config.service_data };
-        this.hass!.callService(domain, service, serviceData);
-        break;
-      case "more-info":
-        fireEvent(this, "hass-more-info", { entityId });
-        break;
-      default:
-    }
+  private _handleTap() {
+    handleClick(this, this.hass!, this._config!, false);
+  }
+
+  private _handleHold() {
+    handleClick(this, this.hass!, this._config!, true);
   }
 }
 
diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts
index b342c15ddf..ff74e0dc0f 100644
--- a/src/panels/lovelace/cards/hui-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-glance-card.ts
@@ -7,14 +7,12 @@ import {
 import { TemplateResult } from "lit-html";
 import { classMap } from "lit-html/directives/classMap";
 
-import { fireEvent } from "../../../common/dom/fire_event";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
 import { HomeAssistant } from "../../../types";
 import { LovelaceCard, LovelaceCardEditor } from "../types";
-import { LovelaceCardConfig } from "../../../data/lovelace";
+import { LovelaceCardConfig, ActionConfig } from "../../../data/lovelace";
 import { longPress } from "../common/directives/long-press-directive";
 import { EntityConfig } from "../entity-rows/types";
-import { toggleEntity } from "../common/entity/toggle-entity";
 import { processConfigEntities } from "../common/process-config-entities";
 
 import computeStateDisplay from "../../../common/entity/compute_state_display";
@@ -24,12 +22,11 @@ import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
 import "../../../components/entity/state-badge";
 import "../../../components/ha-card";
 import "../../../components/ha-icon";
+import { handleClick } from "../common/handle-click";
 
 export interface ConfigEntity extends EntityConfig {
-  tap_action?: "toggle" | "call-service" | "more-info";
-  hold_action?: "toggle" | "call-service" | "more-info";
-  service?: string;
-  service_data?: object;
+  tap_action?: ActionConfig;
+  hold_action?: ActionConfig;
 }
 
 export interface Config extends LovelaceCardConfig {
@@ -75,9 +72,12 @@ export class HuiGlanceCard extends hassLocalizeLitMixin(LitElement)
 
     for (const entity of entities) {
       if (
-        (entity.tap_action === "call-service" ||
-          entity.hold_action === "call-service") &&
-        !entity.service
+        (entity.tap_action &&
+          entity.tap_action.action === "call-service" &&
+          !entity.tap_action.service) ||
+        (entity.hold_action &&
+          entity.hold_action.action === "call-service" &&
+          !entity.hold_action.service)
       ) {
         throw new Error(
           'Missing required property "service" when tap_action or hold_action is call-service'
@@ -203,8 +203,8 @@ export class HuiGlanceCard extends hassLocalizeLitMixin(LitElement)
       <div
         class="entity"
         .entityConf="${entityConf}"
-        @ha-click="${(ev) => this.handleClick(ev, false)}"
-        @ha-hold="${(ev) => this.handleClick(ev, true)}"
+        @ha-click="${this._handleTap}"
+        @ha-hold="${this._handleHold}"
         .longPress="${longPress()}"
       >
         ${
@@ -243,24 +243,14 @@ export class HuiGlanceCard extends hassLocalizeLitMixin(LitElement)
     `;
   }
 
-  private handleClick(ev: MouseEvent, hold: boolean): void {
+  private _handleTap(ev: MouseEvent) {
     const config = (ev.currentTarget as any).entityConf as ConfigEntity;
-    const entityId = config.entity;
-    const action = hold ? config.hold_action : config.tap_action || "more-info";
-    switch (action) {
-      case "toggle":
-        toggleEntity(this.hass!, entityId);
-        break;
-      case "call-service":
-        const [domain, service] = config.service!.split(".", 2);
-        const serviceData = { entity_id: entityId, ...config.service_data };
-        this.hass!.callService(domain, service, serviceData);
-        break;
-      case "more-info":
-        fireEvent(this, "hass-more-info", { entityId });
-        break;
-      default:
-    }
+    handleClick(this, this.hass!, config, false);
+  }
+
+  private _handleHold(ev: MouseEvent) {
+    const config = (ev.currentTarget as any).entityConf as ConfigEntity;
+    handleClick(this, this.hass!, config, true);
   }
 }
 
diff --git a/src/panels/lovelace/cards/hui-picture-entity-card.ts b/src/panels/lovelace/cards/hui-picture-entity-card.ts
index 8c2e1cde12..64580368e7 100644
--- a/src/panels/lovelace/cards/hui-picture-entity-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-entity-card.ts
@@ -12,7 +12,7 @@ import computeStateName from "../../../common/entity/compute_state_name";
 import { longPress } from "../common/directives/long-press-directive";
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
 import { HomeAssistant } from "../../../types";
-import { LovelaceCardConfig } from "../../../data/lovelace";
+import { LovelaceCardConfig, ActionConfig } from "../../../data/lovelace";
 import { LovelaceCard } from "../types";
 import { handleClick } from "../common/handle-click";
 import { UNAVAILABLE } from "../../../data/entity";
@@ -25,10 +25,8 @@ interface Config extends LovelaceCardConfig {
   camera_image?: string;
   state_image?: {};
   aspect_ratio?: string;
-  tap_action?: "toggle" | "call-service" | "more-info" | "navigate";
-  hold_action?: "toggle" | "call-service" | "more-info" | "navigate";
-  service?: string;
-  service_data?: object;
+  tap_action?: ActionConfig;
+  hold_action?: ActionConfig;
   show_name?: boolean;
   show_state?: boolean;
 }
@@ -109,7 +107,7 @@ class HuiPictureEntityCard extends hassLocalizeLitMixin(LitElement)
           }"
           .entity="${this._config.entity}"
           .aspectRatio="${this._config.aspect_ratio}"
-          @ha-click="${this._handleClick}"
+          @ha-click="${this._handleTap}"
           @ha-hold="${this._handleHold}"
           .longPress="${longPress()}"
           class="${
@@ -157,7 +155,7 @@ class HuiPictureEntityCard extends hassLocalizeLitMixin(LitElement)
     `;
   }
 
-  private _handleClick() {
+  private _handleTap() {
     handleClick(this, this.hass!, this._config!, false);
   }
 
diff --git a/src/panels/lovelace/common/compute-tooltip.ts b/src/panels/lovelace/common/compute-tooltip.ts
index 59920ec8e1..7ab9830223 100644
--- a/src/panels/lovelace/common/compute-tooltip.ts
+++ b/src/panels/lovelace/common/compute-tooltip.ts
@@ -20,7 +20,7 @@ export const computeTooltip = (
         : config.entity;
   }
 
-  switch (config.tap_action) {
+  switch (config.tap_action && config.tap_action.action) {
     case "navigate":
       tooltip = `Navigate to ${config.navigation_path}`;
       break;
diff --git a/src/panels/lovelace/common/handle-click.ts b/src/panels/lovelace/common/handle-click.ts
index f6f654f744..ba463d2025 100644
--- a/src/panels/lovelace/common/handle-click.ts
+++ b/src/panels/lovelace/common/handle-click.ts
@@ -1,47 +1,55 @@
 import { HomeAssistant } from "../../../types";
-import { LovelaceElementConfig } from "../elements/types";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { navigate } from "../../../common/navigate";
 import { toggleEntity } from "../../../../src/panels/lovelace/common/entity/toggle-entity";
-import { LovelaceCardConfig } from "../../../data/lovelace";
+import { ActionConfig } from "../../../data/lovelace";
 
 export const handleClick = (
   node: HTMLElement,
   hass: HomeAssistant,
-  config: LovelaceElementConfig | LovelaceCardConfig,
+  config: {
+    entity?: string;
+    hold_action?: ActionConfig;
+    tap_action?: ActionConfig;
+  },
   hold: boolean
 ): void => {
-  let action = config.tap_action || "more-info";
+  let actionConfig: ActionConfig | undefined;
 
   if (hold && config.hold_action) {
-    action = config.hold_action;
+    actionConfig = config.hold_action;
+  } else if (!hold && config.tap_action) {
+    actionConfig = config.tap_action;
   }
 
-  if (action === "none") {
-    return;
+  if (!actionConfig) {
+    actionConfig = {
+      action: "more-info",
+    };
   }
 
-  switch (action) {
+  switch (actionConfig.action) {
     case "more-info":
       if (config.entity) {
         fireEvent(node, "hass-more-info", { entityId: config.entity });
       }
       break;
     case "navigate":
-      navigate(node, config.navigation_path ? config.navigation_path : "");
+      if (actionConfig.navigation_path) {
+        navigate(node, actionConfig.navigation_path);
+      }
       break;
     case "toggle":
-      toggleEntity(hass, config.entity!);
+      if (config.entity) {
+        toggleEntity(hass, config.entity!);
+      }
       break;
     case "call-service": {
-      if (config.service) {
-        const [domain, service] = config.service.split(".", 2);
-        const serviceData = {
-          entity_id: config.entity,
-          ...config.service_data,
-        };
-        hass.callService(domain, service, serviceData);
+      if (!actionConfig.service) {
+        return;
       }
+      const [domain, service] = actionConfig.service.split(".", 2);
+      hass.callService(domain, service, actionConfig.service_data);
     }
   }
 };
diff --git a/src/panels/lovelace/elements/hui-icon-element.ts b/src/panels/lovelace/elements/hui-icon-element.ts
index ea45b16ba0..ee398c3c84 100644
--- a/src/panels/lovelace/elements/hui-icon-element.ts
+++ b/src/panels/lovelace/elements/hui-icon-element.ts
@@ -41,13 +41,21 @@ export class HuiIconElement extends hassLocalizeLitMixin(LitElement)
       <ha-icon
         .icon="${this._config.icon}"
         .title="${computeTooltip(this.hass!, this._config)}"
-        @ha-click="${() => handleClick(this, this.hass!, this._config!, false)}"
-        @ha-hold="${() => handleClick(this, this.hass!, this._config!, true)}"
+        @ha-click="${this._handleTap}"
+        @ha-hold="${this._handleHold}"
         .longPress="${longPress()}"
       ></ha-icon>
     `;
   }
 
+  private _handleTap() {
+    handleClick(this, this.hass!, this._config!, false);
+  }
+
+  private _handleHold() {
+    handleClick(this, this.hass!, this._config!, true);
+  }
+
   private renderStyle(): TemplateResult {
     return html`
       <style>
diff --git a/src/panels/lovelace/elements/hui-image-element.ts b/src/panels/lovelace/elements/hui-image-element.ts
index 5a673c651a..af47ba04ef 100644
--- a/src/panels/lovelace/elements/hui-image-element.ts
+++ b/src/panels/lovelace/elements/hui-image-element.ts
@@ -33,7 +33,10 @@ export class HuiImageElement extends hassLocalizeLitMixin(LitElement)
       throw Error("Error in element configuration");
     }
 
-    this.classList.toggle("clickable", config.tap_action !== "none");
+    this.classList.toggle(
+      "clickable",
+      config.tap_action && config.tap_action.action !== "none"
+    );
     this._config = config;
   }
 
@@ -54,7 +57,7 @@ export class HuiImageElement extends hassLocalizeLitMixin(LitElement)
         .stateFilter="${this._config.state_filter}"
         .title="${computeTooltip(this.hass!, this._config)}"
         .aspectRatio="${this._config.aspect_ratio}"
-        @ha-click="${this._handleClick}"
+        @ha-click="${this._handleTap}"
         @ha-hold="${this._handleHold}"
         .longPress="${longPress()}"
       ></hui-image>
@@ -76,7 +79,7 @@ export class HuiImageElement extends hassLocalizeLitMixin(LitElement)
     `;
   }
 
-  private _handleClick() {
+  private _handleTap() {
     handleClick(this, this.hass!, this._config!, false);
   }
 
diff --git a/src/panels/lovelace/elements/hui-state-label-element.ts b/src/panels/lovelace/elements/hui-state-label-element.ts
index e0bd4c0f04..6a6f8233f4 100644
--- a/src/panels/lovelace/elements/hui-state-label-element.ts
+++ b/src/panels/lovelace/elements/hui-state-label-element.ts
@@ -43,8 +43,8 @@ class HuiStateLabelElement extends hassLocalizeLitMixin(LitElement)
       ${this.renderStyle()}
       <div
         .title="${computeTooltip(this.hass!, this._config)}"
-        @ha-click="${() => handleClick(this, this.hass!, this._config!, false)}"
-        @ha-hold="${() => handleClick(this, this.hass!, this._config!, true)}"
+        @ha-click="${this._handleTap}"
+        @ha-hold="${this._handleHold}"
         .longPress="${longPress()}"
       >
         ${this._config.prefix}${
@@ -56,6 +56,14 @@ class HuiStateLabelElement extends hassLocalizeLitMixin(LitElement)
     `;
   }
 
+  private _handleTap() {
+    handleClick(this, this.hass!, this._config!, false);
+  }
+
+  private _handleHold() {
+    handleClick(this, this.hass!, this._config!, true);
+  }
+
   private renderStyle(): TemplateResult {
     return html`
       <style>
diff --git a/src/panels/lovelace/elements/types.ts b/src/panels/lovelace/elements/types.ts
index 105ac3d2d9..0eb49c5308 100644
--- a/src/panels/lovelace/elements/types.ts
+++ b/src/panels/lovelace/elements/types.ts
@@ -1,14 +1,15 @@
 import { HomeAssistant } from "../../../types";
+import { ActionConfig } from "../../../data/lovelace";
 
 export interface LovelaceElementConfig {
   type: string;
   style: object;
   entity?: string;
-  hold_action?: string;
-  navigation_path?: string;
+  hold_action?: ActionConfig;
   service?: string;
   service_data?: object;
-  tap_action?: string;
+  navigation_path?: string;
+  tap_action?: ActionConfig;
   title?: string;
 }
 

From bfef3a96c82dfb00ad959d7e26bbdc8fc7602b8f Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 5 Dec 2018 16:42:22 +0100
Subject: [PATCH 62/69] Catch errors in preview and fix entity picker (#2183)

* Catch errors in preview and fix entity picker

* Replace add button with entity-picker
---
 .../lovelace/components/hui-entity-editor.ts  | 19 +++++++++++++------
 .../lovelace/editor/hui-card-preview.ts       |  6 +++++-
 src/panels/lovelace/editor/hui-edit-view.ts   |  1 +
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/panels/lovelace/components/hui-entity-editor.ts b/src/panels/lovelace/components/hui-entity-editor.ts
index 7c9212e3a1..d612d60bb7 100644
--- a/src/panels/lovelace/components/hui-entity-editor.ts
+++ b/src/panels/lovelace/components/hui-entity-editor.ts
@@ -42,16 +42,23 @@ export class HuiEntityEditor extends LitElement {
             `;
           })
         }
+        <ha-entity-picker
+          .hass="${this.hass}"
+          @change="${this._addEntity}"
+        ></ha-entity-picker>
       </div>
-      <paper-button noink raised @click="${this._addEntity}"
-        >Add Entity</paper-button
-      >
     `;
   }
 
-  private _addEntity() {
-    const newConfigEntities = this.entities!.concat({ entity: "" });
-
+  private _addEntity(ev: Event): void {
+    const target = ev.target! as EditorTarget;
+    if (target.value === "") {
+      return;
+    }
+    const newConfigEntities = this.entities!.concat({
+      entity: target.value as string,
+    });
+    target.value = "";
     fireEvent(this, "entities-changed", { entities: newConfigEntities });
   }
 
diff --git a/src/panels/lovelace/editor/hui-card-preview.ts b/src/panels/lovelace/editor/hui-card-preview.ts
index 4abeeb21a6..08933f84f5 100644
--- a/src/panels/lovelace/editor/hui-card-preview.ts
+++ b/src/panels/lovelace/editor/hui-card-preview.ts
@@ -41,7 +41,11 @@ export class HuiCardPreview extends HTMLElement {
     const tag = getCardElementTag(configValue.type);
 
     if (tag.toUpperCase() === this._element.tagName) {
-      this._element.setConfig(configValue);
+      try {
+        this._element.setConfig(configValue);
+      } catch (err) {
+        this._createCard(createErrorCardConfig(err.message, configValue));
+      }
     } else {
       this._createCard(configValue);
     }
diff --git a/src/panels/lovelace/editor/hui-edit-view.ts b/src/panels/lovelace/editor/hui-edit-view.ts
index 85502fe22c..273df58052 100644
--- a/src/panels/lovelace/editor/hui-edit-view.ts
+++ b/src/panels/lovelace/editor/hui-edit-view.ts
@@ -160,6 +160,7 @@ export class HuiEditView extends hassLocalizeLitMixin(LitElement) {
         paper-tabs {
           --paper-tabs-selection-bar-color: var(--primary-color);
           text-transform: uppercase;
+          border-bottom: 1px solid rgba(0, 0, 0, 0.1);
         }
         paper-button paper-spinner {
           width: 14px;

From 3f113da056e1b52eddcba6900de488bb6f6db868 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 5 Dec 2018 17:25:43 +0100
Subject: [PATCH 63/69] Fix: View should have cards (#2184)

* View should have cards

* Don't need CardConfig yet
---
 src/panels/lovelace/editor/hui-edit-view.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/panels/lovelace/editor/hui-edit-view.ts b/src/panels/lovelace/editor/hui-edit-view.ts
index 273df58052..a6ed38966d 100644
--- a/src/panels/lovelace/editor/hui-edit-view.ts
+++ b/src/panels/lovelace/editor/hui-edit-view.ts
@@ -78,8 +78,8 @@ export class HuiEditView extends hassLocalizeLitMixin(LitElement) {
           (changedProperties.get("viewConfig") as LovelaceViewConfig).id)
     ) {
       const { cards, badges, ...viewConfig } = this.viewConfig;
-      this._badges = processEditorEntities(badges);
       this._config = viewConfig;
+      this._badges = processEditorEntities(badges);
     } else if (changedProperties.has("add")) {
       this._config = {};
       this._badges = [];
@@ -228,6 +228,7 @@ export class HuiEditView extends hassLocalizeLitMixin(LitElement) {
 
     try {
       if (this.add) {
+        this._config.cards = [];
         await addView(this.hass!, this._config, "json");
       } else {
         await updateViewConfig(

From 7e584402ea18699478553b8cba393fed8698a004 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Wed, 5 Dec 2018 20:32:36 +0100
Subject: [PATCH 64/69] Add gallery demo for Long Press directive (#2189)

* Convert gallery to TS

* Add long press demo
---
 ...l-card.js => demo-hui-alarm-panel-card.ts} |  2 +-
 ...l-card.js => demo-hui-conditional-card.ts} |  2 +-
 ...ties-card.js => demo-hui-entities-card.ts} |  2 +-
 ...card.js => demo-hui-entity-button-card.ts} |  2 +-
 ...card.js => demo-hui-entity-filter-card.ts} |  2 +-
 ...i-gauge-card.js => demo-hui-gauge-card.ts} |  0
 ...glance-card.js => demo-hui-glance-card.ts} |  2 +-
 ...iframe-card.js => demo-hui-iframe-card.ts} |  0
 ...i-light-card.js => demo-hui-light-card.ts} |  2 +-
 ...o-hui-map-card.js => demo-hui-map-card.ts} |  2 +-
 ...down-card.js => demo-hui-markdown-card.ts} |  0
 ...-rows.js => demo-hui-media-player-rows.ts} |  2 +-
 ...d.js => demo-hui-picture-elements-card.ts} |  2 +-
 ...ard.js => demo-hui-picture-entity-card.ts} |  0
 ...ard.js => demo-hui-picture-glance-card.ts} |  0
 ...card.js => demo-hui-shopping-list-card.ts} |  2 +-
 ...i-stack-card.js => demo-hui-stack-card.ts} |  2 +-
 ...at-card.js => demo-hui-thermostat-card.ts} |  2 +-
 ...-info-light.js => demo-more-info-light.ts} | 13 +--
 gallery/src/demos/demo-util-long-press.ts     | 79 +++++++++++++++++++
 gallery/src/ha-gallery.js                     | 28 ++++++-
 src/data/light.ts                             |  7 ++
 22 files changed, 127 insertions(+), 26 deletions(-)
 rename gallery/src/demos/{demo-hui-alarm-panel-card.js => demo-hui-alarm-panel-card.ts} (98%)
 rename gallery/src/demos/{demo-hui-conditional-card.js => demo-hui-conditional-card.ts} (98%)
 rename gallery/src/demos/{demo-hui-entities-card.js => demo-hui-entities-card.ts} (99%)
 rename gallery/src/demos/{demo-hui-entity-button-card.js => demo-hui-entity-button-card.ts} (98%)
 rename gallery/src/demos/{demo-hui-entity-filter-card.js => demo-hui-entity-filter-card.ts} (99%)
 rename gallery/src/demos/{demo-hui-gauge-card.js => demo-hui-gauge-card.ts} (100%)
 rename gallery/src/demos/{demo-hui-glance-card.js => demo-hui-glance-card.ts} (99%)
 rename gallery/src/demos/{demo-hui-iframe-card.js => demo-hui-iframe-card.ts} (100%)
 rename gallery/src/demos/{demo-hui-light-card.js => demo-hui-light-card.ts} (98%)
 rename gallery/src/demos/{demo-hui-map-card.js => demo-hui-map-card.ts} (99%)
 rename gallery/src/demos/{demo-hui-markdown-card.js => demo-hui-markdown-card.ts} (100%)
 rename gallery/src/demos/{demo-hui-media-player-rows.js => demo-hui-media-player-rows.ts} (99%)
 rename gallery/src/demos/{demo-hui-picture-elements-card.js => demo-hui-picture-elements-card.ts} (99%)
 rename gallery/src/demos/{demo-hui-picture-entity-card.js => demo-hui-picture-entity-card.ts} (100%)
 rename gallery/src/demos/{demo-hui-picture-glance-card.js => demo-hui-picture-glance-card.ts} (100%)
 rename gallery/src/demos/{demo-hui-shopping-list-card.js => demo-hui-shopping-list-card.ts} (98%)
 rename gallery/src/demos/{demo-hui-stack-card.js => demo-hui-stack-card.ts} (99%)
 rename gallery/src/demos/{demo-hui-thermostat-card.js => demo-hui-thermostat-card.ts} (99%)
 rename gallery/src/demos/{demo-more-info-light.js => demo-more-info-light.ts} (82%)
 create mode 100644 gallery/src/demos/demo-util-long-press.ts
 create mode 100644 src/data/light.ts

diff --git a/gallery/src/demos/demo-hui-alarm-panel-card.js b/gallery/src/demos/demo-hui-alarm-panel-card.ts
similarity index 98%
rename from gallery/src/demos/demo-hui-alarm-panel-card.js
rename to gallery/src/demos/demo-hui-alarm-panel-card.ts
index fb943186d6..11feab3b9a 100644
--- a/gallery/src/demos/demo-hui-alarm-panel-card.js
+++ b/gallery/src/demos/demo-hui-alarm-panel-card.ts
@@ -69,7 +69,7 @@ class DemoAlarmPanelEntity extends PolymerElement {
     };
   }
 
-  ready() {
+  public ready() {
     super.ready();
     const hass = provideHass(this.$.demos);
     hass.addEntities(ENTITIES);
diff --git a/gallery/src/demos/demo-hui-conditional-card.js b/gallery/src/demos/demo-hui-conditional-card.ts
similarity index 98%
rename from gallery/src/demos/demo-hui-conditional-card.js
rename to gallery/src/demos/demo-hui-conditional-card.ts
index c3dc1193eb..6a774061ac 100644
--- a/gallery/src/demos/demo-hui-conditional-card.js
+++ b/gallery/src/demos/demo-hui-conditional-card.ts
@@ -74,7 +74,7 @@ class DemoConditional extends PolymerElement {
     };
   }
 
-  ready() {
+  public ready() {
     super.ready();
     const hass = provideHass(this.$.demos);
     hass.addEntities(ENTITIES);
diff --git a/gallery/src/demos/demo-hui-entities-card.js b/gallery/src/demos/demo-hui-entities-card.ts
similarity index 99%
rename from gallery/src/demos/demo-hui-entities-card.js
rename to gallery/src/demos/demo-hui-entities-card.ts
index 006df1653f..32f137d6e1 100644
--- a/gallery/src/demos/demo-hui-entities-card.js
+++ b/gallery/src/demos/demo-hui-entities-card.ts
@@ -188,7 +188,7 @@ class DemoEntities extends PolymerElement {
     };
   }
 
-  ready() {
+  public ready() {
     super.ready();
     const hass = provideHass(this.$.demos);
     hass.addEntities(ENTITIES);
diff --git a/gallery/src/demos/demo-hui-entity-button-card.js b/gallery/src/demos/demo-hui-entity-button-card.ts
similarity index 98%
rename from gallery/src/demos/demo-hui-entity-button-card.js
rename to gallery/src/demos/demo-hui-entity-button-card.ts
index d88627121a..1b201734a4 100644
--- a/gallery/src/demos/demo-hui-entity-button-card.js
+++ b/gallery/src/demos/demo-hui-entity-button-card.ts
@@ -89,7 +89,7 @@ class DemoEntityButtonEntity extends PolymerElement {
     };
   }
 
-  ready() {
+  public ready() {
     super.ready();
     const hass = provideHass(this.$.demos);
     hass.addEntities(ENTITIES);
diff --git a/gallery/src/demos/demo-hui-entity-filter-card.js b/gallery/src/demos/demo-hui-entity-filter-card.ts
similarity index 99%
rename from gallery/src/demos/demo-hui-entity-filter-card.js
rename to gallery/src/demos/demo-hui-entity-filter-card.ts
index 92d8731ff6..3f8f07ce99 100644
--- a/gallery/src/demos/demo-hui-entity-filter-card.js
+++ b/gallery/src/demos/demo-hui-entity-filter-card.ts
@@ -105,7 +105,7 @@ class DemoFilter extends PolymerElement {
     };
   }
 
-  ready() {
+  public ready() {
     super.ready();
     const hass = provideHass(this.$.demos);
     hass.addEntities(ENTITIES);
diff --git a/gallery/src/demos/demo-hui-gauge-card.js b/gallery/src/demos/demo-hui-gauge-card.ts
similarity index 100%
rename from gallery/src/demos/demo-hui-gauge-card.js
rename to gallery/src/demos/demo-hui-gauge-card.ts
diff --git a/gallery/src/demos/demo-hui-glance-card.js b/gallery/src/demos/demo-hui-glance-card.ts
similarity index 99%
rename from gallery/src/demos/demo-hui-glance-card.js
rename to gallery/src/demos/demo-hui-glance-card.ts
index d0ff3abf6f..844b7c4656 100644
--- a/gallery/src/demos/demo-hui-glance-card.js
+++ b/gallery/src/demos/demo-hui-glance-card.ts
@@ -230,7 +230,7 @@ class DemoPicEntity extends PolymerElement {
     };
   }
 
-  ready() {
+  public ready() {
     super.ready();
     const hass = provideHass(this.$.demos);
     hass.addEntities(ENTITIES);
diff --git a/gallery/src/demos/demo-hui-iframe-card.js b/gallery/src/demos/demo-hui-iframe-card.ts
similarity index 100%
rename from gallery/src/demos/demo-hui-iframe-card.js
rename to gallery/src/demos/demo-hui-iframe-card.ts
diff --git a/gallery/src/demos/demo-hui-light-card.js b/gallery/src/demos/demo-hui-light-card.ts
similarity index 98%
rename from gallery/src/demos/demo-hui-light-card.js
rename to gallery/src/demos/demo-hui-light-card.ts
index a2d359565d..642f095da6 100644
--- a/gallery/src/demos/demo-hui-light-card.js
+++ b/gallery/src/demos/demo-hui-light-card.ts
@@ -38,7 +38,7 @@ class DemoLightEntity extends PolymerElement {
     };
   }
 
-  ready() {
+  public ready() {
     super.ready();
     const hass = provideHass(this.$.demos);
     hass.addEntities(ENTITIES);
diff --git a/gallery/src/demos/demo-hui-map-card.js b/gallery/src/demos/demo-hui-map-card.ts
similarity index 99%
rename from gallery/src/demos/demo-hui-map-card.js
rename to gallery/src/demos/demo-hui-map-card.ts
index ec6890b2aa..a402d80024 100644
--- a/gallery/src/demos/demo-hui-map-card.js
+++ b/gallery/src/demos/demo-hui-map-card.ts
@@ -139,7 +139,7 @@ class DemoMap extends PolymerElement {
     };
   }
 
-  ready() {
+  public ready() {
     super.ready();
     const hass = provideHass(this.$.demos);
     hass.addEntities(ENTITIES);
diff --git a/gallery/src/demos/demo-hui-markdown-card.js b/gallery/src/demos/demo-hui-markdown-card.ts
similarity index 100%
rename from gallery/src/demos/demo-hui-markdown-card.js
rename to gallery/src/demos/demo-hui-markdown-card.ts
diff --git a/gallery/src/demos/demo-hui-media-player-rows.js b/gallery/src/demos/demo-hui-media-player-rows.ts
similarity index 99%
rename from gallery/src/demos/demo-hui-media-player-rows.js
rename to gallery/src/demos/demo-hui-media-player-rows.ts
index d3f2e00700..e657881915 100644
--- a/gallery/src/demos/demo-hui-media-player-rows.js
+++ b/gallery/src/demos/demo-hui-media-player-rows.ts
@@ -95,7 +95,7 @@ class DemoHuiMediaPlayerRows extends PolymerElement {
     };
   }
 
-  ready() {
+  public ready() {
     super.ready();
     const hass = provideHass(this.$.demos);
     hass.addEntities(ENTITIES);
diff --git a/gallery/src/demos/demo-hui-picture-elements-card.js b/gallery/src/demos/demo-hui-picture-elements-card.ts
similarity index 99%
rename from gallery/src/demos/demo-hui-picture-elements-card.js
rename to gallery/src/demos/demo-hui-picture-elements-card.ts
index 9f5ebe90e0..53cb27f585 100644
--- a/gallery/src/demos/demo-hui-picture-elements-card.js
+++ b/gallery/src/demos/demo-hui-picture-elements-card.ts
@@ -93,7 +93,7 @@ class DemoPicElements extends PolymerElement {
     };
   }
 
-  ready() {
+  public ready() {
     super.ready();
     const hass = provideHass(this.$.demos);
     hass.addEntities(ENTITIES);
diff --git a/gallery/src/demos/demo-hui-picture-entity-card.js b/gallery/src/demos/demo-hui-picture-entity-card.ts
similarity index 100%
rename from gallery/src/demos/demo-hui-picture-entity-card.js
rename to gallery/src/demos/demo-hui-picture-entity-card.ts
diff --git a/gallery/src/demos/demo-hui-picture-glance-card.js b/gallery/src/demos/demo-hui-picture-glance-card.ts
similarity index 100%
rename from gallery/src/demos/demo-hui-picture-glance-card.js
rename to gallery/src/demos/demo-hui-picture-glance-card.ts
diff --git a/gallery/src/demos/demo-hui-shopping-list-card.js b/gallery/src/demos/demo-hui-shopping-list-card.ts
similarity index 98%
rename from gallery/src/demos/demo-hui-shopping-list-card.js
rename to gallery/src/demos/demo-hui-shopping-list-card.ts
index d79e2f839d..b290bd7e9b 100644
--- a/gallery/src/demos/demo-hui-shopping-list-card.js
+++ b/gallery/src/demos/demo-hui-shopping-list-card.ts
@@ -36,7 +36,7 @@ class DemoShoppingListEntity extends PolymerElement {
     };
   }
 
-  ready() {
+  public ready() {
     super.ready();
     const hass = provideHass(this.$.demos);
 
diff --git a/gallery/src/demos/demo-hui-stack-card.js b/gallery/src/demos/demo-hui-stack-card.ts
similarity index 99%
rename from gallery/src/demos/demo-hui-stack-card.js
rename to gallery/src/demos/demo-hui-stack-card.ts
index 1dce40ecfa..257d753d4a 100644
--- a/gallery/src/demos/demo-hui-stack-card.js
+++ b/gallery/src/demos/demo-hui-stack-card.ts
@@ -104,7 +104,7 @@ class DemoStack extends PolymerElement {
     };
   }
 
-  ready() {
+  public ready() {
     super.ready();
     const hass = provideHass(this.$.demos);
     hass.addEntities(ENTITIES);
diff --git a/gallery/src/demos/demo-hui-thermostat-card.js b/gallery/src/demos/demo-hui-thermostat-card.ts
similarity index 99%
rename from gallery/src/demos/demo-hui-thermostat-card.js
rename to gallery/src/demos/demo-hui-thermostat-card.ts
index cbc667c874..740f8c9471 100644
--- a/gallery/src/demos/demo-hui-thermostat-card.js
+++ b/gallery/src/demos/demo-hui-thermostat-card.ts
@@ -75,7 +75,7 @@ class DemoThermostatEntity extends PolymerElement {
     };
   }
 
-  ready() {
+  public ready() {
     super.ready();
     const hass = provideHass(this.$.demos);
     hass.addEntities(ENTITIES);
diff --git a/gallery/src/demos/demo-more-info-light.js b/gallery/src/demos/demo-more-info-light.ts
similarity index 82%
rename from gallery/src/demos/demo-more-info-light.js
rename to gallery/src/demos/demo-more-info-light.ts
index 25708dd584..88a5cf7d6b 100644
--- a/gallery/src/demos/demo-more-info-light.js
+++ b/gallery/src/demos/demo-more-info-light.ts
@@ -8,16 +8,7 @@ import getEntity from "../data/entity";
 import provideHass from "../data/provide_hass";
 
 import "../components/demo-more-infos";
-
-/* eslint-disable no-unused-vars */
-
-const SUPPORT_BRIGHTNESS = 1;
-const SUPPORT_COLOR_TEMP = 2;
-const SUPPORT_EFFECT = 4;
-const SUPPORT_FLASH = 8;
-const SUPPORT_COLOR = 16;
-const SUPPORT_TRANSITION = 32;
-const SUPPORT_WHITE_VALUE = 128;
+import { SUPPORT_BRIGHTNESS } from "../../../src/data/light";
 
 const ENTITIES = [
   getEntity("light", "bed_light", "on", {
@@ -49,7 +40,7 @@ class DemoMoreInfoLight extends PolymerElement {
     };
   }
 
-  ready() {
+  public ready() {
     super.ready();
     const hass = provideHass(this);
     hass.addEntities(ENTITIES);
diff --git a/gallery/src/demos/demo-util-long-press.ts b/gallery/src/demos/demo-util-long-press.ts
new file mode 100644
index 0000000000..9e790fed50
--- /dev/null
+++ b/gallery/src/demos/demo-util-long-press.ts
@@ -0,0 +1,79 @@
+import { html, LitElement } from "@polymer/lit-element";
+import { TemplateResult } from "lit-html";
+import "@polymer/paper-button/paper-button";
+
+import "../../../src/components/ha-card";
+import { longPress } from "../../../src/panels/lovelace/common/directives/long-press-directive";
+
+export class DemoUtilLongPress extends LitElement {
+  public render(): TemplateResult {
+    return html`
+      ${this.renderStyle()}
+      ${
+        [1, 2, 3].map(
+          () => html`
+            <ha-card>
+              <paper-button
+                @ha-click="${this._handleTap}"
+                @ha-hold="${this._handleHold}"
+                .longPress="${longPress()}"
+              >
+                (long) press me!
+              </paper-button>
+
+              <textarea></textarea>
+
+              <div>(try pressing and scrolling too!)</div>
+            </ha-card>
+          `
+        )
+      }
+    `;
+  }
+
+  private _handleTap(ev: Event) {
+    this._addValue(ev, "tap");
+  }
+
+  private _handleHold(ev: Event) {
+    this._addValue(ev, "hold");
+  }
+
+  private _addValue(ev: Event, value: string) {
+    const area = (ev.currentTarget as HTMLElement)
+      .nextElementSibling! as HTMLTextAreaElement;
+    const now = new Date().toTimeString().split(" ")[0];
+    area.value += `${now}: ${value}\n`;
+    area.scrollTop = area.scrollHeight;
+  }
+
+  private renderStyle() {
+    return html`
+      <style>
+        ha-card {
+          width: 200px;
+          margin: calc(42vh - 140px) auto;
+          padding: 8px;
+          text-align: center;
+        }
+        ha-card:first-of-type {
+          margin-top: 16px;
+        }
+        ha-card:last-of-type {
+          margin-bottom: 16px;
+        }
+
+        paper-button {
+          font-weight: bold;
+          color: var(--primary-color);
+        }
+
+        textarea {
+          height: 50px;
+        }
+      </style>
+    `;
+  }
+}
+
+customElements.define("demo-util-long-press", DemoUtilLongPress);
diff --git a/gallery/src/ha-gallery.js b/gallery/src/ha-gallery.js
index 73c3e666d6..08af976940 100644
--- a/gallery/src/ha-gallery.js
+++ b/gallery/src/ha-gallery.js
@@ -11,7 +11,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 
 import "../../src/managers/notification-manager";
 
-const DEMOS = require.context("./demos", true, /^(.*\.(js$))[^.]*$/im);
+const DEMOS = require.context("./demos", true, /^(.*\.(ts$))[^.]*$/im);
 
 const fixPath = (path) => path.substr(2, path.length - 5);
 
@@ -118,6 +118,22 @@ class HaGallery extends PolymerElement {
                   </a>
                 </template>
               </paper-card>
+
+              <paper-card heading="Util demos">
+                <div class='card-content intro'>
+                  <p>
+                    Test pages for our utility functions.
+                  </p>
+                </div>
+                <template is='dom-repeat' items='[[_utilDemos]]'>
+                  <a href='#[[item]]'>
+                    <paper-item>
+                      <paper-item-body>{{ item }}</paper-item-body>
+                      <iron-icon icon="hass:chevron-right"></iron-icon>
+                    </paper-item>
+                  </a>
+                </template>
+              </paper-card>
             </div>
           </template>
         </div>
@@ -145,6 +161,10 @@ class HaGallery extends PolymerElement {
         type: Array,
         computed: "_computeMoreInfos(_demos)",
       },
+      _utilDemos: {
+        type: Array,
+        computed: "_computeUtil(_demos)",
+      },
     };
   }
 
@@ -178,7 +198,7 @@ class HaGallery extends PolymerElement {
     while (root.lastChild) root.removeChild(root.lastChild);
 
     if (demo) {
-      DEMOS(`./${demo}.js`);
+      DEMOS(`./${demo}.ts`);
       const el = document.createElement(demo);
       root.appendChild(el);
     }
@@ -199,6 +219,10 @@ class HaGallery extends PolymerElement {
   _computeMoreInfos(demos) {
     return demos.filter((demo) => demo.includes("more-info"));
   }
+
+  _computeUtil(demos) {
+    return demos.filter((demo) => demo.includes("util"));
+  }
 }
 
 customElements.define("ha-gallery", HaGallery);
diff --git a/src/data/light.ts b/src/data/light.ts
new file mode 100644
index 0000000000..8d0a701d29
--- /dev/null
+++ b/src/data/light.ts
@@ -0,0 +1,7 @@
+export const SUPPORT_BRIGHTNESS = 1;
+export const SUPPORT_COLOR_TEMP = 2;
+export const SUPPORT_EFFECT = 4;
+export const SUPPORT_FLASH = 8;
+export const SUPPORT_COLOR = 16;
+export const SUPPORT_TRANSITION = 32;
+export const SUPPORT_WHITE_VALUE = 128;

From 5947bd6d746e033ceec243d3a49b68123f45e328 Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Wed, 5 Dec 2018 15:00:04 -0600
Subject: [PATCH 65/69] Align `picture-glance` card tap/hold actions (#2187)

Removed unneccessary `force_dialog` config.
Updated `handleClick` to use `entity` or `camera_image` for `more-info` dialog
---
 .../lovelace/cards/hui-picture-glance-card.ts | 47 ++++++++++---------
 src/panels/lovelace/common/handle-click.ts    |  7 ++-
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-picture-glance-card.ts b/src/panels/lovelace/cards/hui-picture-glance-card.ts
index cbd4543663..1a98be568a 100644
--- a/src/panels/lovelace/cards/hui-picture-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-glance-card.ts
@@ -3,37 +3,37 @@ import { classMap } from "lit-html/directives/classMap";
 import { TemplateResult } from "lit-html";
 
 import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin";
-import { fireEvent } from "../../../common/dom/fire_event";
 import { DOMAINS_TOGGLE } from "../../../common/const";
 import { LovelaceCard } from "../types";
-import { LovelaceCardConfig } from "../../../data/lovelace";
+import { LovelaceCardConfig, ActionConfig } from "../../../data/lovelace";
 import { EntityConfig } from "../entity-rows/types";
-import { navigate } from "../../../common/navigate";
 import { HomeAssistant } from "../../../types";
-import { toggleEntity } from "../common/entity/toggle-entity";
-
+import { longPress } from "../common/directives/long-press-directive";
+import { processConfigEntities } from "../common/process-config-entities";
 import computeStateDisplay from "../../../common/entity/compute_state_display";
 import computeStateName from "../../../common/entity/compute_state_name";
-import { processConfigEntities } from "../common/process-config-entities";
 import computeDomain from "../../../common/entity/compute_domain";
 import stateIcon from "../../../common/entity/state_icon";
 
 import "../../../components/ha-card";
 import "../../../components/ha-icon";
 import "../components/hui-image";
+import { handleClick } from "../common/handle-click";
+import { fireEvent } from "../../../common/dom/fire_event";
+import { toggleEntity } from "../common/entity/toggle-entity";
 
 const STATES_OFF = new Set(["closed", "locked", "not_home", "off"]);
 
 interface Config extends LovelaceCardConfig {
   entities: EntityConfig[];
   title?: string;
-  navigation_path?: string;
   image?: string;
   camera_image?: string;
   state_image?: {};
   aspect_ratio?: string;
   entity?: string;
-  force_dialog?: boolean;
+  tap_action?: ActionConfig;
+  hold_action?: ActionConfig;
 }
 
 class HuiPictureGlanceCard extends hassLocalizeLitMixin(LitElement)
@@ -88,19 +88,22 @@ class HuiPictureGlanceCard extends hassLocalizeLitMixin(LitElement)
       return html``;
     }
 
-    const isClickable =
-      this._config.navigation_path || this._config.camera_image;
-
     return html`
       ${this.renderStyle()}
       <ha-card>
         <hui-image
           class="${
             classMap({
-              clickable: Boolean(isClickable),
+              clickable: Boolean(
+                this._config.tap_action ||
+                  this._config.hold_action ||
+                  this._config.camera_image
+              ),
             })
           }"
-          @click="${this._handleImageClick}"
+          @ha-click="${this._handleTap}"
+          @ha-hold="${this._handleHold}"
+          .longPress="${longPress()}"
           .hass="${this.hass}"
           .image="${this._config.image}"
           .stateImage="${this._config.state_image}"
@@ -168,6 +171,14 @@ class HuiPictureGlanceCard extends hassLocalizeLitMixin(LitElement)
     `;
   }
 
+  private _handleTap() {
+    handleClick(this, this.hass!, this._config!, false);
+  }
+
+  private _handleHold() {
+    handleClick(this, this.hass!, this._config!, true);
+  }
+
   private _openDialog(ev: MouseEvent): void {
     fireEvent(this, "hass-more-info", { entityId: (ev.target as any).entity });
   }
@@ -176,16 +187,6 @@ class HuiPictureGlanceCard extends hassLocalizeLitMixin(LitElement)
     toggleEntity(this.hass!, (ev.target as any).entity);
   }
 
-  private _handleImageClick(): void {
-    if (this._config!.navigation_path) {
-      navigate(this, this._config!.navigation_path!);
-    } else if (this._config!.camera_image) {
-      fireEvent(this, "hass-more-info", {
-        entityId: this._config!.camera_image!,
-      });
-    }
-  }
-
   private renderStyle(): TemplateResult {
     return html`
       <style>
diff --git a/src/panels/lovelace/common/handle-click.ts b/src/panels/lovelace/common/handle-click.ts
index ba463d2025..bf1e3c149d 100644
--- a/src/panels/lovelace/common/handle-click.ts
+++ b/src/panels/lovelace/common/handle-click.ts
@@ -9,6 +9,7 @@ export const handleClick = (
   hass: HomeAssistant,
   config: {
     entity?: string;
+    camera_image?: string;
     hold_action?: ActionConfig;
     tap_action?: ActionConfig;
   },
@@ -30,8 +31,10 @@ export const handleClick = (
 
   switch (actionConfig.action) {
     case "more-info":
-      if (config.entity) {
-        fireEvent(node, "hass-more-info", { entityId: config.entity });
+      if (config.entity || config.camera_image) {
+        fireEvent(node, "hass-more-info", {
+          entityId: config.entity ? config.entity! : config.camera_image!,
+        });
       }
       break;
     case "navigate":

From fb180c7b9b1c3097e7822945b23515edc1450c0b Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Wed, 5 Dec 2018 15:00:52 -0600
Subject: [PATCH 66/69] Align `picture` card tap/hold actions (#2186)

Also removed unneccessary `navigation_path` config from `picture-entity`
---
 src/panels/lovelace/cards/hui-picture-card.ts | 30 +++++++++----------
 .../lovelace/cards/hui-picture-entity-card.ts |  1 -
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-picture-card.ts b/src/panels/lovelace/cards/hui-picture-card.ts
index a638da66a2..43ddd1a14e 100644
--- a/src/panels/lovelace/cards/hui-picture-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-card.ts
@@ -3,17 +3,17 @@ import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
 import "../../../components/ha-card";
 
 import { LovelaceCard } from "../types";
-import { LovelaceCardConfig } from "../../../data/lovelace";
-import { navigate } from "../../../common/navigate";
+import { LovelaceCardConfig, ActionConfig } from "../../../data/lovelace";
 import { HomeAssistant } from "../../../types";
 import { TemplateResult } from "lit-html";
 import { classMap } from "lit-html/directives/classMap";
+import { handleClick } from "../common/handle-click";
+import { longPress } from "../common/directives/long-press-directive";
 
 interface Config extends LovelaceCardConfig {
   image?: string;
-  navigation_path?: string;
-  service?: string;
-  service_data?: object;
+  tap_action?: ActionConfig;
+  hold_action?: ActionConfig;
 }
 
 export class HuiPictureCard extends LitElement implements LovelaceCard {
@@ -46,11 +46,13 @@ export class HuiPictureCard extends LitElement implements LovelaceCard {
     return html`
       ${this.renderStyle()}
       <ha-card
-        @click="${this.handleClick}"
+        @ha-click="${this._handleTap}"
+        @ha-hold="${this._handleHold}"
+        .longPress="${longPress()}"
         class="${
           classMap({
             clickable: Boolean(
-              this._config.navigation_path || this._config.service
+              this._config.tap_action || this._config.hold_action
             ),
           })
         }"
@@ -77,14 +79,12 @@ export class HuiPictureCard extends LitElement implements LovelaceCard {
     `;
   }
 
-  private handleClick(): void {
-    if (this._config!.navigation_path) {
-      navigate(this, this._config!.navigation_path!);
-    }
-    if (this._config!.service) {
-      const [domain, service] = this._config!.service!.split(".", 2);
-      this.hass!.callService(domain, service, this._config!.service_data);
-    }
+  private _handleTap() {
+    handleClick(this, this.hass!, this._config!, false);
+  }
+
+  private _handleHold() {
+    handleClick(this, this.hass!, this._config!, true);
   }
 }
 
diff --git a/src/panels/lovelace/cards/hui-picture-entity-card.ts b/src/panels/lovelace/cards/hui-picture-entity-card.ts
index 64580368e7..81be371ed9 100644
--- a/src/panels/lovelace/cards/hui-picture-entity-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-entity-card.ts
@@ -20,7 +20,6 @@ import { UNAVAILABLE } from "../../../data/entity";
 interface Config extends LovelaceCardConfig {
   entity: string;
   name?: string;
-  navigation_path?: string;
   image?: string;
   camera_image?: string;
   state_image?: {};

From 9711068f8bf39837e14046345386307a2291bf3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= <thomasloven@gmail.com>
Date: Wed, 5 Dec 2018 22:05:51 +0100
Subject: [PATCH 67/69] Handle mouse events on touchscreens. Fix #2085 (#2170)

* Handle mouse events on touchscreens. Fix #2085

* Some more fixes. Makes listeners non-passive!

* Only prevent preventable events.

* Different approach

* Some travis fixes

* Try to avoid clicking while scrolling
---
 .../common/directives/long-press-directive.ts | 39 ++++++++++++-------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/panels/lovelace/common/directives/long-press-directive.ts b/src/panels/lovelace/common/directives/long-press-directive.ts
index 2b59a84d63..718ccbafab 100644
--- a/src/panels/lovelace/common/directives/long-press-directive.ts
+++ b/src/panels/lovelace/common/directives/long-press-directive.ts
@@ -19,6 +19,8 @@ class LongPress extends HTMLElement implements LongPress {
   protected ripple: any;
   protected timer: number | undefined;
   protected held: boolean;
+  protected cooldownStart: boolean;
+  protected cooldownEnd: boolean;
 
   constructor() {
     super();
@@ -26,6 +28,8 @@ class LongPress extends HTMLElement implements LongPress {
     this.ripple = document.createElement("mwc-ripple");
     this.timer = undefined;
     this.held = false;
+    this.cooldownStart = false;
+    this.cooldownEnd = false;
   }
 
   public connectedCallback() {
@@ -41,7 +45,8 @@ class LongPress extends HTMLElement implements LongPress {
     this.ripple.primary = true;
 
     [
-      isTouch ? "touchcancel" : "mouseout",
+      "touchcancel",
+      "mouseout",
       "mouseup",
       "touchmove",
       "mousewheel",
@@ -80,6 +85,9 @@ class LongPress extends HTMLElement implements LongPress {
     });
 
     const clickStart = (ev: Event) => {
+      if (this.cooldownStart) {
+        return;
+      }
       this.held = false;
       let x;
       let y;
@@ -94,30 +102,35 @@ class LongPress extends HTMLElement implements LongPress {
         this.startAnimation(x, y);
         this.held = true;
       }, this.holdTime);
+
+      this.cooldownStart = true;
+      window.setTimeout(() => (this.cooldownStart = false), 100);
     };
 
-    const clickEnd = () => {
-      clearTimeout(this.timer);
-      this.stopAnimation();
-      if (isTouch && this.timer === undefined) {
+    const clickEnd = (ev: Event) => {
+      if (
+        this.cooldownEnd ||
+        (ev instanceof TouchEvent && this.timer === undefined)
+      ) {
         return;
       }
+      clearTimeout(this.timer);
+      this.stopAnimation();
       this.timer = undefined;
       if (this.held) {
         element.dispatchEvent(new Event("ha-hold"));
       } else {
         element.dispatchEvent(new Event("ha-click"));
       }
+      this.cooldownEnd = true;
+      window.setTimeout(() => (this.cooldownEnd = false), 100);
     };
 
-    if (isTouch) {
-      element.addEventListener("touchstart", clickStart, { passive: true });
-      element.addEventListener("touchend", clickEnd);
-      element.addEventListener("touchcancel", clickEnd);
-    } else {
-      element.addEventListener("mousedown", clickStart, { passive: true });
-      element.addEventListener("click", clickEnd);
-    }
+    element.addEventListener("touchstart", clickStart, { passive: true });
+    element.addEventListener("touchend", clickEnd);
+    element.addEventListener("touchcancel", clickEnd);
+    element.addEventListener("mousedown", clickStart, { passive: true });
+    element.addEventListener("click", clickEnd);
   }
 
   private startAnimation(x: number, y: number) {

From 2d0f14d0785dc4de64a9d4402bace0068d51a990 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Wed, 5 Dec 2018 22:07:34 +0100
Subject: [PATCH 68/69] Update translations

---
 translations/ca.json      |  14 +-
 translations/cs.json      |   4 +-
 translations/de.json      |  22 ++-
 translations/en.json      |   2 +-
 translations/es-419.json  |  25 +++-
 translations/es.json      |  27 +++-
 translations/fi.json      |  35 ++++-
 translations/fr.json      |  25 +++-
 translations/gsw.json     |   8 +
 translations/he.json      |   2 +-
 translations/hr.json      | 300 +++++++++++++++++++++++++++++++++++---
 translations/hu.json      |  21 ++-
 translations/it.json      |  35 ++++-
 translations/ko.json      |   6 +-
 translations/lb.json      |  40 ++---
 translations/nl.json      |   7 +-
 translations/nn.json      |   2 +-
 translations/no.json      |   2 +-
 translations/pl.json      |   4 +-
 translations/pt-BR.json   |  31 +++-
 translations/pt.json      |   2 +-
 translations/ro.json      |  14 +-
 translations/ru.json      |  72 ++++-----
 translations/sl.json      |  63 +++++---
 translations/sv.json      |  27 +++-
 translations/tr.json      | 195 ++++++++++++++++++++++++-
 translations/uk.json      |  10 +-
 translations/zh-Hans.json |  25 +++-
 translations/zh-Hant.json |   4 +-
 29 files changed, 857 insertions(+), 167 deletions(-)

diff --git a/translations/ca.json b/translations/ca.json
index 07321e0970..a3e9102958 100644
--- a/translations/ca.json
+++ b/translations/ca.json
@@ -232,7 +232,7 @@
             "default": {
                 "initializing": "Inicialitzant",
                 "dead": "No disponible",
-                "sleeping": "En espera",
+                "sleeping": "Dormint",
                 "ready": "A punt"
             },
             "query_stage": {
@@ -297,11 +297,11 @@
                 "microphone_tip": "Toqueu el micròfon a la part superior dreta i dieu \"Add candy to my shopping list\""
             },
             "history": {
-                "showing_entries": "S'estan mostrant entrades per a",
+                "showing_entries": "Mostrant entrades de",
                 "period": "Període"
             },
             "logbook": {
-                "showing_entries": "S'estan mostrant entrades per a"
+                "showing_entries": "Mostrant entrades de"
             },
             "mailbox": {
                 "empty": "No teniu missatges",
@@ -537,7 +537,7 @@
                     "caption": "Integracions",
                     "description": "Gestioneu dispositius i serveis connectats",
                     "discovered": "Descobert",
-                    "configured": "Configurat",
+                    "configured": "Configurades",
                     "new": "Configureu una nova integració",
                     "configure": "Configurar",
                     "none": "Encara no hi ha res configurat",
@@ -723,7 +723,7 @@
                     }
                 },
                 "editor": {
-                    "edit": {
+                    "edit_card": {
                         "header": "Targeta de Configuració",
                         "save": "Desa",
                         "toggle_editor": "Commuta l'editor"
@@ -746,8 +746,8 @@
             "cancel": "Cancel·lar"
         },
         "duration": {
-            "day": "{count} {count, plural,\none {dia}\nother {dies}\n}",
-            "week": "{count} {count, plural,\none {setmana}\nother {setmanes}\n}",
+            "day": "{count} {count, plural,\n  one {dia}\n  other {dies}\n}",
+            "week": "{count} {count, plural,\n  one {setmana}\n  other {setmanes}\n}",
             "second": "{count} {count, plural,\none {segon}\nother {segons}\n}",
             "minute": "{count} {count, plural,\none {minut}\nother {minuts}\n}",
             "hour": "{count} {count, plural,\none {hora}\nother {hores}\n}"
diff --git a/translations/cs.json b/translations/cs.json
index c21c88a26b..c8d3940366 100644
--- a/translations/cs.json
+++ b/translations/cs.json
@@ -579,7 +579,7 @@
                     "description": "Každý obnovovací token představuje relaci přihlášení. Aktualizační tokeny budou automaticky odstraněny po klepnutí na tlačítko Odhlásit. Následující tokeny obnovení jsou v současné době aktivní pro váš účet.",
                     "token_title": "Obnovit token pro {clientId}",
                     "created_at": "Vytvořeno {date}",
-                    "confirm_delete": "Opravdu že chcete odstranit token pro {název}?",
+                    "confirm_delete": "Opravdu že chcete odstranit token pro {name}?",
                     "delete_failed": "Nepodařilo se smazat token.",
                     "last_used": "Naposledy použito {date} z {location}",
                     "not_used": "Nikdy nebylo použito",
@@ -723,7 +723,7 @@
                     }
                 },
                 "editor": {
-                    "edit": {
+                    "edit_card": {
                         "header": "Konfigurace karty",
                         "save": "Uložit",
                         "toggle_editor": "Přepnout Editor"
diff --git a/translations/de.json b/translations/de.json
index 688a55e94c..f480228937 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -144,7 +144,8 @@
             "performance": "Leistung",
             "high_demand": "Hoher Verbrauch",
             "heat_pump": "Wärmepumpe",
-            "gas": "Gas"
+            "gas": "Gas",
+            "manual": "Handbuch"
         },
         "configurator": {
             "configure": "Konfigurieren",
@@ -712,6 +713,25 @@
                         "required_fields": "Fülle alle Pflichtfelder aus."
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "Markierte Items",
+                        "clear_items": "Markierte Elemente löschen",
+                        "add_item": "Item hinzufügen"
+                    }
+                },
+                "editor": {
+                    "edit_card": {
+                        "save": "Speichern",
+                        "toggle_editor": "Editor umschalten"
+                    },
+                    "migrate": {
+                        "header": "Konfiguration inkompatibel",
+                        "para_no_id": "Dieses Element hat keine ID. Bitte füge diesem Element eine ID in 'ui-lovelace.yaml' hinzu."
+                    }
+                }
             }
         },
         "sidebar": {
diff --git a/translations/en.json b/translations/en.json
index 722f9dd2e4..015430a1ab 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -723,7 +723,7 @@
                     }
                 },
                 "editor": {
-                    "edit": {
+                    "edit_card": {
                         "header": "Card Configuration",
                         "save": "Save",
                         "toggle_editor": "Toggle Editor"
diff --git a/translations/es-419.json b/translations/es-419.json
index 6a878a5635..3e6c5f07a9 100644
--- a/translations/es-419.json
+++ b/translations/es-419.json
@@ -144,7 +144,8 @@
             "performance": "Rendimiento",
             "high_demand": "Alta Demanda",
             "heat_pump": "Bomba de Calor",
-            "gas": "Gas"
+            "gas": "Gas",
+            "manual": "Manual"
         },
         "configurator": {
             "configure": "Configurar",
@@ -712,6 +713,28 @@
                         "required_fields": "Completar todos los campos requeridos"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "lementos marcados",
+                        "clear_items": "Borrar elementos marcados",
+                        "add_item": "Agregar elemento"
+                    }
+                },
+                "editor": {
+                    "edit_card": {
+                        "header": "Configuración de la tarjeta",
+                        "save": "Guardar",
+                        "toggle_editor": "Cambiar editor"
+                    },
+                    "migrate": {
+                        "header": "Configuración inválida",
+                        "para_no_id": "Este elemento no tiene un ID. Por favor agregue uno a este elemento en 'ui-lovelace.yaml'.",
+                        "para_migrate": "Home Assistant puede agregar ID a todas sus tarjetas y vistas automáticamente por usted presionando el botón 'Migrar configuración'.",
+                        "migrate": "Migrar configuración"
+                    }
+                }
             }
         },
         "sidebar": {
diff --git a/translations/es.json b/translations/es.json
index cca9adf21d..07e1f98cac 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -144,7 +144,8 @@
             "performance": "Rendimiento",
             "high_demand": "Alta demanda",
             "heat_pump": "Bomba de calor",
-            "gas": "Gas"
+            "gas": "Gas",
+            "manual": "Manual"
         },
         "configurator": {
             "configure": "Configurar",
@@ -589,7 +590,7 @@
                     "description": "Crea tokens de acceso de larga duración para permitir que tus scripts interactúen con tu Home Assistant. Cada token será válido por 10 años desde la creación. Los siguientes tokens de acceso de larga duración están actualmente activos.",
                     "learn_auth_requests": "Aprenda a realizar solicitudes autenticadas.",
                     "created_at": "Creado el {date}",
-                    "confirm_delete": "¿Está seguro de que desea eliminar el token de acceso para {nombre}?",
+                    "confirm_delete": "¿Está seguro de que desea eliminar el token de acceso para {name}?",
                     "delete_failed": "Error al eliminar el token de acceso.",
                     "create": "Crear Token",
                     "create_failed": "No se ha podido crear el token de acceso.",
@@ -712,6 +713,28 @@
                         "required_fields": "Complete todos los campos requeridos"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "Elementos marcados",
+                        "clear_items": "Borrar elementos marcados",
+                        "add_item": "Añadir artículo"
+                    }
+                },
+                "editor": {
+                    "edit_card": {
+                        "header": "Configuración de la tarjeta",
+                        "save": "Guardar",
+                        "toggle_editor": "Alternar editor"
+                    },
+                    "migrate": {
+                        "header": "Configuración incompatible",
+                        "para_no_id": "Este elemento no tiene un ID. Por favor agregue uno  este elemento en 'ui-lovelace.yaml'.",
+                        "para_migrate": "Home Assistant puede agregar ID a todas sus tarjetas y vistas automáticamente por usted presionando el botón 'Migrar configuración'.",
+                        "migrate": "Migrar configuración"
+                    }
+                }
             }
         },
         "sidebar": {
diff --git a/translations/fi.json b/translations/fi.json
index 69c48b27c4..a1c5304b1c 100644
--- a/translations/fi.json
+++ b/translations/fi.json
@@ -144,7 +144,8 @@
             "performance": "Tehokas",
             "high_demand": "Täysi teho",
             "heat_pump": "Lämpöpumppu",
-            "gas": "Kaasu"
+            "gas": "Kaasu",
+            "manual": "käsisäätöinen"
         },
         "configurator": {
             "configure": "Määrittele",
@@ -619,7 +620,8 @@
             },
             "page-authorize": {
                 "initializing": "Alustetaan",
-                "logging_in_with": "Kirjaudutaan sisään",
+                "authorizing_client": "Olet antamassa pääsyn {clientId} Home Assistant ympäristöösi.",
+                "logging_in_with": "Kirjaudutaan sisään **{authProviderName}**.",
                 "pick_auth_provider": "Tai kirjaudu sisään joillakin seuraavista",
                 "abort_intro": "Kirjautuminen on keskeytetty",
                 "form": {
@@ -681,6 +683,9 @@
                                     },
                                     "description": "Valitse käyttäjä, jolla haluat kirjautua:"
                                 }
+                            },
+                            "abort": {
+                                "not_whitelisted": "Tietokonettasi ei ole sallittu."
                             }
                         }
                     }
@@ -701,6 +706,28 @@
                         "required_fields": "Täytä kaikki pakolliset kentät"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "Valitut",
+                        "clear_items": "Tyhjää valitut",
+                        "add_item": "Lisää"
+                    }
+                },
+                "editor": {
+                    "edit_card": {
+                        "header": "Kortti-asetukset",
+                        "save": "Tallenna",
+                        "toggle_editor": "Vaihda editori"
+                    },
+                    "migrate": {
+                        "header": "Epäkelvot asetukset",
+                        "para_no_id": "Elementillä ei ole ID. Lisää ID elementille 'ui-lovelace.yaml'-tiedostossa.",
+                        "para_migrate": "Home Assistant voi lisätä ID:t kaikkiin kortteihisi ja näkymiin automaattisesti painamalla 'Tuo vanhat asetukset'-nappia.",
+                        "migrate": "Tuo vanhat asetukset"
+                    }
+                }
             }
         },
         "sidebar": {
@@ -769,7 +796,9 @@
                 "clear_code": "Tyhjennä",
                 "disarm": "Poista hälytys",
                 "arm_home": "Viritä (kotona)",
-                "arm_away": "Viritä (poissa)"
+                "arm_away": "Viritä (poissa)",
+                "arm_night": "Viritä yöksi",
+                "armed_custom_bypass": "Mukautettu ohitus"
             },
             "automation": {
                 "last_triggered": "Viimeksi käynnistetty",
diff --git a/translations/fr.json b/translations/fr.json
index f9d2311c54..2d1782d341 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -144,7 +144,8 @@
             "performance": "Performance",
             "high_demand": "Forte demande",
             "heat_pump": "Pompe à chaleur",
-            "gas": "Gaz"
+            "gas": "Gaz",
+            "manual": "Manuel"
         },
         "configurator": {
             "configure": "Configurer",
@@ -712,6 +713,26 @@
                         "required_fields": "Remplissez tous les champs requis"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "Éléments cochés",
+                        "add_item": "Ajouter un élément"
+                    }
+                },
+                "editor": {
+                    "edit_card": {
+                        "save": "Enregistrer",
+                        "toggle_editor": "Activer\/désactiver l’éditeur"
+                    },
+                    "migrate": {
+                        "header": "Configuration incompatible",
+                        "para_no_id": "Cet élément n'a pas d'identifiant. Veuillez ajouter un identifiant à cet élément dans 'ui-lovelace.yaml'.",
+                        "para_migrate": "Home Assistant peut ajouter automatiquement des identifiants à toutes vos cartes et vues en appuyant sur le bouton «Migrer la configuration».",
+                        "migrate": "Migrer la configuration"
+                    }
+                }
             }
         },
         "sidebar": {
@@ -849,7 +870,7 @@
                 "service": "Service"
             },
             "relative_time": {
-                "past": "{time} auparavant",
+                "past": "Il y a {time}",
                 "future": "Dans {time}",
                 "never": "Jamais",
                 "duration": {
diff --git a/translations/gsw.json b/translations/gsw.json
index 069cb85b0e..dd0543b2d4 100644
--- a/translations/gsw.json
+++ b/translations/gsw.json
@@ -348,6 +348,7 @@
                         },
                         "actions": {
                             "header": "Aktione",
+                            "unsupported_action": "Nicht unterstützte Aktion: {action}",
                             "type": {
                                 "delay": {
                                     "label": "Vrzögerig"
@@ -410,6 +411,13 @@
                 "mfa": {
                     "disable": "Deaktiviert"
                 }
+            },
+            "lovelace": {
+                "editor": {
+                    "edit_card": {
+                        "save": "Speichern"
+                    }
+                }
             }
         },
         "login-form": {
diff --git a/translations/he.json b/translations/he.json
index 5d411cf77f..cae9ad84b7 100644
--- a/translations/he.json
+++ b/translations/he.json
@@ -722,7 +722,7 @@
                     }
                 },
                 "editor": {
-                    "edit": {
+                    "edit_card": {
                         "save": "שמור"
                     }
                 }
diff --git a/translations/hr.json b/translations/hr.json
index 9f4cc0f783..ff5c500471 100644
--- a/translations/hr.json
+++ b/translations/hr.json
@@ -99,6 +99,17 @@
                 "off": "Zatvoreno",
                 "on": "Otvori"
             },
+            "garage_door": {
+                "off": "Zatvoren",
+                "on": "Otvoreno"
+            },
+            "heat": {
+                "off": "Normalno"
+            },
+            "window": {
+                "off": "Zatvoreno",
+                "on": "Otvoreno"
+            },
             "lock": {
                 "off": "Zaključano",
                 "on": "Otključano"
@@ -127,7 +138,8 @@
             "performance": "Performanse",
             "high_demand": "Velike potražnje",
             "heat_pump": "Toplinska pumpa",
-            "gas": "Plin"
+            "gas": "Plin",
+            "manual": "Priručnik"
         },
         "configurator": {
             "configure": "Konfiguriranje",
@@ -223,15 +235,27 @@
             }
         },
         "weather": {
+            "clear-night": "Vedro, noć",
             "cloudy": "Oblačno",
             "fog": "Magla",
             "lightning": "Munja",
+            "lightning-rainy": "Munja, kišna",
             "partlycloudy": "Djelomično oblačno",
             "pouring": "Lije",
             "rainy": "Kišovito",
             "snowy": "Snježno",
+            "snowy-rainy": "Snježno, kišno",
             "sunny": "Sunčano",
-            "windy": "Vjetrovito"
+            "windy": "Vjetrovito",
+            "windy-variant": "Vjetrovito"
+        },
+        "vacuum": {
+            "cleaning": "Čišćenje",
+            "error": "Greška",
+            "idle": "Besposlen",
+            "off": "Ugašeno",
+            "on": "Upaljeno",
+            "paused": "Pauzirano"
         }
     },
     "state_badge": {
@@ -263,53 +287,209 @@
                 "add_item": "Dodaj stavku",
                 "microphone_tip": "Dodirnite mikrofon u gornjem desnom kutu i recite “Add candy to my shopping list”"
             },
+            "history": {
+                "showing_entries": "Prikazivanje stavki za",
+                "period": "Razdoblje"
+            },
             "logbook": {
                 "showing_entries": "Prikaži entitete za"
             },
+            "mailbox": {
+                "empty": "Nemate nijednu poruku",
+                "playback_title": "Reprodukcija poruke",
+                "delete_prompt": "Izbrisati ovu poruku?",
+                "delete_button": "Izbrisati"
+            },
             "config": {
+                "header": "Konfigurirajte Home Assistant",
                 "core": {
+                    "caption": "Općenito",
                     "section": {
                         "core": {
-                            "header": "Konfiguracija i kontrola poslužitelja"
+                            "header": "Konfiguracija i kontrola poslužitelja",
+                            "validation": {
+                                "check_config": "Provjerite konfiguraciju",
+                                "valid": "Konfiguracija valjana!",
+                                "invalid": "Konfiguracija nije važeća"
+                            },
+                            "reloading": {
+                                "core": "Ponovno učitati jezgru",
+                                "group": "Ponovno učitajte grupe",
+                                "automation": "Ponovo učitajte automatizacije"
+                            },
+                            "server_management": {
+                                "heading": "Upravljanje poslužiteljem",
+                                "introduction": "Kontrolirajte vaš Home Assistant server ... iz Home Assistant.",
+                                "restart": "Ponovno pokretanje"
+                            }
                         }
                     }
                 },
-                "zwave": {
-                    "caption": "Z-Wave"
+                "customize": {
+                    "description": "Prilagodite entitete"
                 },
                 "automation": {
+                    "caption": "Automatizacija",
+                    "description": "Stvaranje i uređivanje automatizacija",
                     "picker": {
-                        "header": "Urednik Automatizacije "
+                        "header": "Urednik Automatizacije ",
+                        "introduction": "Automatizacijski urednik omogućuje stvaranje i uređivanje automatizacije. Molimo pročitajte [upute] (https:\/\/home-assistant.io\/docs\/automation\/editor\/) kako biste bili sigurni da ste ispravno konfigurirali Home Assistant.",
+                        "pick_automation": "Odaberite automatizaciju za uređivanje",
+                        "no_automations": "Nismo mogli pronaći nikakve automatizirane uređaje",
+                        "add_automation": "Dodaj automatizaciju"
                     },
                     "editor": {
+                        "introduction": "Upotrijebite automatizaciju kako bi vaš dom oživio",
+                        "default_name": "Nova automatizacija",
+                        "save": "Spremi",
+                        "unsaved_confirm": "Imate nespremljene izmjene. Jeste li sigurni da želite napustiti?",
+                        "alias": "Ime",
+                        "triggers": {
+                            "introduction": "Okidači su ono što pokreće obradu pravila o automatizaciji. Moguće je odrediti više okidača za isto pravilo. Kada pokrenete okidač, Home Assistant provjerit će uvjete, ako ih ima i pozvati akciju. \n\n [Saznajte više o pokretačima.] (Https:\/\/home-assistant.io\/docs\/automation\/trigger\/)",
+                            "delete": "Obriši",
+                            "unsupported_platform": "Nepodržana platforma: {platform}",
+                            "type": {
+                                "state": {
+                                    "from": "Od",
+                                    "for": "Za"
+                                },
+                                "homeassistant": {
+                                    "label": "Home Assistant",
+                                    "event": "Događaj:",
+                                    "start": "Početak",
+                                    "shutdown": "Ugasiti"
+                                },
+                                "mqtt": {
+                                    "label": "MQTT",
+                                    "topic": "Tema"
+                                },
+                                "numeric_state": {
+                                    "label": "Numeričko stanje",
+                                    "above": "Iznad",
+                                    "below": "Ispod",
+                                    "value_template": "Predložak vrijednosti (nije obavezno)"
+                                },
+                                "sun": {
+                                    "label": "Sunce",
+                                    "event": "Event:",
+                                    "sunrise": "Izlazak sunca",
+                                    "sunset": "Zalazak sunca",
+                                    "offset": "Offset (nije obavezno)"
+                                },
+                                "template": {
+                                    "label": "Predložak",
+                                    "value_template": "Predložak vrijednosti"
+                                },
+                                "time": {
+                                    "label": "Vrijeme",
+                                    "at": "U"
+                                },
+                                "zone": {
+                                    "label": "Zona",
+                                    "entity": "Entitet s lokacijom",
+                                    "zone": "Zona",
+                                    "event": "Event:",
+                                    "enter": "Unesite",
+                                    "leave": "Napustiti"
+                                }
+                            }
+                        },
+                        "conditions": {
+                            "header": "Uvjeti",
+                            "introduction": "Uvjeti su neobvezni dio pravila o automatizaciji i mogu se upotrebljavati kako bi se spriječilo da se neka akcija dogodi prilikom pokretanja. Uvjeti izgledaju vrlo slični pokretačima, ali su vrlo različiti. Okidač će pogledati događaje koji se događaju u sustavu, a stanje samo gleda kako sustav izgleda upravo sada. Okidač može primijetiti da je prekidač uključen. Stanje može vidjeti samo ako je uključen ili isključen prekidač. \n\n [Saznajte više o uvjetima.] (Https:\/\/home-assistant.io\/docs\/scripts\/conditions\/)",
+                            "add": "Dodaj uvjet",
+                            "duplicate": "Dupliciran",
+                            "delete": "Obriši",
+                            "delete_confirm": "Sigurno želite pobrisati?",
+                            "unsupported_condition": "Nepodržano stanje: {condition}",
+                            "type_select": "Vrsta uvjeta",
+                            "type": {
+                                "state": {
+                                    "label": "Stanje",
+                                    "state": "Stanje"
+                                },
+                                "numeric_state": {
+                                    "label": "Numeričko stanje",
+                                    "above": "Iznad",
+                                    "below": "Ispod",
+                                    "value_template": "Predložak vrijednosti (opciono)"
+                                },
+                                "sun": {
+                                    "label": "Sunce",
+                                    "before": "Prije:",
+                                    "after": "Nakon:",
+                                    "before_offset": "Prije pomaka (izborno)",
+                                    "after_offset": "Nakon pomaka (izborno)",
+                                    "sunrise": "Izlazak sunca",
+                                    "sunset": "Zalazak sunca"
+                                },
+                                "template": {
+                                    "label": "Predložak",
+                                    "value_template": "Predložak vrijednosti"
+                                },
+                                "time": {
+                                    "label": "Vrijeme",
+                                    "after": "Nakon",
+                                    "before": "Prije"
+                                },
+                                "zone": {
+                                    "label": "Zona",
+                                    "entity": "Entitet sa lokacijom",
+                                    "zone": "Zona"
+                                }
+                            }
+                        },
                         "actions": {
+                            "header": "Akcije",
+                            "introduction": "Radnje su ono što će Home Assistant učiniti kada se aktivira automatizacija. \n\n [Saznajte više o radnjama.] (Https:\/\/home-assistant.io\/docs\/automation\/action\/)",
+                            "add": "Dodajte radnju",
                             "duplicate": "Dupliciraj",
                             "delete": "Obriši",
                             "delete_confirm": "Sigurno želite pobrisati?",
                             "unsupported_action": "Nepodržana radnja: {action}",
+                            "type_select": "Vrsta akcije",
                             "type": {
+                                "service": {
+                                    "label": "Zovi servis",
+                                    "service_data": "Podaci o usluzi"
+                                },
                                 "delay": {
+                                    "label": "Odgoditi",
                                     "delay": "Odgodi"
                                 },
+                                "wait_template": {
+                                    "label": "Čekaj",
+                                    "wait_template": "Čekaj predložak",
+                                    "timeout": "Vremensko ograničenje (opcionalno)"
+                                },
+                                "condition": {
+                                    "label": "Stanje"
+                                },
                                 "event": {
                                     "label": "Pokreni događaj",
                                     "event": "Event:",
                                     "service_data": "Servisni podaci"
                                 }
                             }
-                        },
-                        "triggers": {
-                            "type": {
-                                "state": {
-                                    "for": "Za"
-                                }
-                            }
                         }
                     }
                 },
+                "zwave": {
+                    "caption": "Z-Wave"
+                },
                 "users": {
                     "caption": "Korisnici",
-                    "description": "Upravljanje korisnicima"
+                    "description": "Upravljanje korisnicima",
+                    "picker": {
+                        "title": "Korisnici"
+                    },
+                    "editor": {
+                        "rename_user": "Preimenuj korisnika",
+                        "change_password": "Promijeni lozinku",
+                        "activate_user": "Aktivirajte korisnika",
+                        "deactivate_user": "Deaktivirajte korisnika",
+                        "delete_user": "Izbriši korisnika"
+                    }
                 },
                 "cloud": {
                     "caption": "Home Assistant Cloud",
@@ -422,7 +602,8 @@
                             "step": {
                                 "init": {
                                     "data": {
-                                        "username": "Korisničko ime"
+                                        "username": "Korisničko ime",
+                                        "password": "Lozinka"
                                     }
                                 },
                                 "mfa": {
@@ -433,6 +614,7 @@
                                 }
                             },
                             "error": {
+                                "invalid_auth": "Neispravno korisničko ime ili lozinka",
                                 "invalid_code": "Pogrešan kod za provjeru autentičnosti "
                             },
                             "abort": {
@@ -442,26 +624,49 @@
                         "legacy_api_password": {
                             "step": {
                                 "init": {
+                                    "data": {
+                                        "password": "API lozinka"
+                                    },
                                     "description": "Unesite API lozinku u svoj http config:"
+                                },
+                                "mfa": {
+                                    "data": {
+                                        "code": "Kôd autentifikacije s dva faktora"
+                                    }
                                 }
                             },
+                            "error": {
+                                "invalid_auth": "Nevažeća lozinka za API",
+                                "invalid_code": "Nevažeći kôd za autentifikaciju"
+                            },
                             "abort": {
+                                "no_api_password_set": "Nemate konfiguriranu lozinku za API.",
                                 "login_expired": "Sesija istekla, molim vas prijavite se ponovno."
                             }
                         },
                         "trusted_networks": {
                             "step": {
                                 "init": {
+                                    "data": {
+                                        "user": "Korisnik"
+                                    },
                                     "description": "Odaberite korisnika kojim se želite prijaviti:"
                                 }
+                            },
+                            "abort": {
+                                "not_whitelisted": "Računalo nije na popisu dopuštenih."
                             }
                         }
                     }
                 }
             },
             "page-onboarding": {
+                "intro": "Jeste li spremni probuditi svoj dom, vratiti svoju privatnost i pridružiti se svjetskoj zajednici tinkerera?",
                 "user": {
+                    "intro": "Započnimo stvaranjem korisničkog računa.",
+                    "required_field": "Potreban",
                     "data": {
+                        "name": "Ime",
                         "username": "Korisničko ime",
                         "password": "Lozinka"
                     },
@@ -470,18 +675,52 @@
                         "required_fields": "Ispunite sva potrebna polja"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "Označene stavke",
+                        "clear_items": "Izbrišite označene stavke",
+                        "add_item": "Dodaj stavku"
+                    }
+                },
+                "editor": {
+                    "edit_card": {
+                        "header": "Konfiguracija Kartice ",
+                        "save": "Spremi",
+                        "toggle_editor": "Uključi uređivač"
+                    },
+                    "migrate": {
+                        "header": "Konfiguracija nije kompatibilna",
+                        "para_no_id": "Ovaj element nema ID. Dodajte ID ovom elementu u 'ui-lovelace.yaml'.",
+                        "para_migrate": "Home Assistant može dodati ID-ove na sve vaše kartice i pogleda automatski za vas pritiskom na gumb 'Migriraj konfiguriranje'.",
+                        "migrate": "Migriraj konfiguraciju"
+                    }
+                }
             }
         },
         "sidebar": {
             "log_out": "Odjava",
             "developer_tools": "Razvojni alati"
         },
+        "common": {
+            "loading": "Učitavam",
+            "cancel": "Otkazati"
+        },
         "duration": {
             "day": "{count} {count, plural,\n  one {dan}\n  other {dani}\n}",
             "week": "{count} {count, plural,\n  one {tjedan}\n  other {tjedni}\n}",
-            "second": "{count} {count, plural,\n  one {sekunde}\n  other {sekunde}\n}"
+            "second": "{count} {count, plural,\n  one {sekunde}\n  other {sekunde}\n}",
+            "minute": "{broj} {broj, množina, jedna {minuta} druge {minute}}",
+            "hour": "{broj} {broj, množina, jedan {sat} drugi {sati}}"
+        },
+        "login-form": {
+            "password": "Lozinka"
         },
         "card": {
+            "camera": {
+                "not_available": "Slika nije dostupna"
+            },
             "scene": {
                 "activate": "Aktivirati"
             },
@@ -497,14 +736,24 @@
                     "wind_speed": "Brzina vjetra"
                 },
                 "cardinal_direction": {
-                    "n": "N"
+                    "ese": "ESE",
+                    "n": "N",
+                    "ne": "NE",
+                    "nne": "NNE",
+                    "nw": "NW"
                 }
             },
             "alarm_control_panel": {
-                "code": "Kod"
+                "code": "Kod",
+                "disarm": "Deaktiviraj",
+                "arm_home": "Aktiviran doma",
+                "arm_away": "Aktiviran odsutno",
+                "arm_night": "Aktiviran nočni",
+                "armed_custom_bypass": "Prilagođena obilaznica"
             },
             "fan": {
                 "speed": "Brzina",
+                "oscillate": "Oscilirati",
                 "direction": "Smjer"
             },
             "light": {
@@ -549,6 +798,14 @@
             }
         },
         "components": {
+            "entity": {
+                "entity-picker": {
+                    "entity": "Entitet"
+                }
+            },
+            "relative_time": {
+                "past": "{vrijeme} prije"
+            },
             "history_charts": {
                 "loading_history": "Učitavanje povijesti stanja ...",
                 "no_history_found": "Nije pronađena povijest stanja."
@@ -607,5 +864,12 @@
         "updater": "Ažuriranje",
         "weblink": "WebLink",
         "zwave": "Z-Wave"
+    },
+    "attribute": {
+        "weather": {
+            "humidity": "Vlažnost",
+            "visibility": "Vidljivost",
+            "wind_speed": "Brzina vjetra"
+        }
     }
 }
\ No newline at end of file
diff --git a/translations/hu.json b/translations/hu.json
index db1edd1404..37ac3d1fab 100644
--- a/translations/hu.json
+++ b/translations/hu.json
@@ -145,7 +145,7 @@
             "high_demand": "Magas igénybevétel",
             "heat_pump": "Hőszivattyú",
             "gas": "Gáz",
-            "manual": "Kézikönyv"
+            "manual": "Manuális"
         },
         "configurator": {
             "configure": "Beállítás",
@@ -600,7 +600,7 @@
                     "last_used": "Utolsó használat ideje: {date}, helye: {location}",
                     "not_used": "Sosem használt"
                 },
-                "current_user": "Jelenleg bejelentkezve mint {fullName}.",
+                "current_user": "Jelenleg {fullName} felhasználóként vagy bejelentkezve.",
                 "is_owner": "Tulajdonos vagy.",
                 "logout": "Kijelentkezés",
                 "change_password": {
@@ -717,17 +717,22 @@
             "lovelace": {
                 "cards": {
                     "shopping-list": {
-                        "checked_items": "Ellenőrzött elemek ",
-                        "clear_items": "Ellenőrzött elemek ",
-                        "add_item": "Elem hozzáadása"
+                        "checked_items": "Kijelölt tételek",
+                        "clear_items": "Kijelölt tételek törlése",
+                        "add_item": "Tétel hozzáadása"
                     }
                 },
                 "editor": {
-                    "edit": {
-                        "save": "Mentés"
+                    "edit_card": {
+                        "header": "Kártya Konfiguráció",
+                        "save": "Mentés",
+                        "toggle_editor": "Szerkesztő"
                     },
                     "migrate": {
-                        "header": "Inkompatibilis konfiguráció!"
+                        "header": "Inkompatibilis Konfiguráció",
+                        "para_no_id": "Ez az elem nem rendelkezik azonosítóval. Kérlek, adj hozzá egyet az 'ui-lovelace.yaml' fájlban!",
+                        "para_migrate": "A Home Assistant a 'Konfiguráció áttelepítése' gomb megnyomásával az összes kártyához és nézethez automatikusan létre tud hozni azonosítókat.",
+                        "migrate": "Konfiguráció áttelepítése"
                     }
                 }
             }
diff --git a/translations/it.json b/translations/it.json
index faa011978b..60fc3a16db 100644
--- a/translations/it.json
+++ b/translations/it.json
@@ -144,7 +144,8 @@
             "performance": "Prestazioni",
             "high_demand": "Forte richiesta",
             "heat_pump": "Pompa di calore",
-            "gas": "Gas"
+            "gas": "Gas",
+            "manual": "Manuale"
         },
         "configurator": {
             "configure": "Configura",
@@ -545,9 +546,9 @@
                         "no_device": "Entità senza dispositivi",
                         "delete_confirm": "Sei sicuro di voler eliminare questa integrazione?",
                         "restart_confirm": "Riavvia Home Assistant per terminare la rimozione di questa integrazione",
-                        "manuf": "da {produttore}",
+                        "manuf": "da {manufacturer}",
                         "hub": "Connesso via",
-                        "firmware": "Firmware: {versione}",
+                        "firmware": "Firmware: {version}",
                         "device_unavailable": "dispositivo non disponibile",
                         "entity_unavailable": "entità non disponibile"
                     }
@@ -712,6 +713,28 @@
                         "required_fields": "Compila tutti i campi richiesti"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "Elementi selezionati",
+                        "clear_items": "Cancella gli elementi selezionati",
+                        "add_item": "Aggiungi elemento"
+                    }
+                },
+                "editor": {
+                    "edit_card": {
+                        "header": "Configurazione della scheda",
+                        "save": "Salva",
+                        "toggle_editor": "Attiva \/ disattiva l'editor"
+                    },
+                    "migrate": {
+                        "header": "Configurazione incompatibile",
+                        "para_no_id": "Questo elemento non ha un ID. Aggiungi un ID a questo elemento in 'ui-lovelace.yaml'.",
+                        "para_migrate": "Home Assistant può aggiungere automaticamente gli ID a tutte le tue schede e visualizzazioni automaticamente premendo il pulsante \"Eporta configurazione\".",
+                        "migrate": "Esporta configurazione"
+                    }
+                }
             }
         },
         "sidebar": {
@@ -794,7 +817,7 @@
             },
             "fan": {
                 "speed": "Velocità",
-                "oscillate": "Oscillante",
+                "oscillate": "Oscillazione",
                 "direction": "Direzione"
             },
             "light": {
@@ -836,9 +859,9 @@
             "water_heater": {
                 "currently": "Attualmente",
                 "on_off": "Acceso \/ Spento",
-                "target_temperature": "Temperatura di riferimento",
+                "target_temperature": "Temperatura da raggiungere",
                 "operation": "Operazione",
-                "away_mode": "Modalità Assente"
+                "away_mode": "Modalità fuori casa"
             }
         },
         "components": {
diff --git a/translations/ko.json b/translations/ko.json
index 05e4707f96..f0dfd5350b 100644
--- a/translations/ko.json
+++ b/translations/ko.json
@@ -365,7 +365,7 @@
                         "alias": "이름",
                         "triggers": {
                             "header": "트리거",
-                            "introduction": "트리거는 자동화 규칙을 처리하는 시작점 입니다. 같은 자동화 규칙에 여러 개의 트리거를 지정할 수 있습니다. 트리거가 발동되면 Home Assistant는 조건을 확인하고 동작을 호출합니다. \n\n [트리거에 대해 자세히 알아보기](https:\/\/home-assistant.io\/docs\/automation\/trigger\/)",
+                            "introduction": "트리거는 자동화 규칙을 처리하는 시작점 입니다. 같은 자동화 규칙에 여러 개의 트리거를 지정할 수 있습니다. 트리거가 발동되면 Home Assistant는 조건을 확인하고 동작을 호출합니다. \n\n[트리거에 대해 자세히 알아보기](https:\/\/home-assistant.io\/docs\/automation\/trigger\/)",
                             "add": "트리거 추가",
                             "duplicate": "복제",
                             "delete": "삭제",
@@ -428,7 +428,7 @@
                         },
                         "conditions": {
                             "header": "조건",
-                            "introduction": "조건은 자동화 규칙의 선택사항이며 트리거 될 때 발생하는 동작을 방지하는 데 사용할 수 있습니다. 조건은 트리거와 비슷해 보이지만 매우 다릅니다. 트리거는 시스템에서 발생하는 이벤트를 검사하고 조건은 시스템의 현재 상태를 검사합니다. 스위치를 예로 들면, 트리거는 스위치가 켜지는 것(이벤트)을, 조건은 스위치가 현재 켜져 있는지 혹은 꺼져 있는지(상태)를 검사합니다. \n\n [조건에 대해 자세히 알아보기](https:\/\/home-assistant.io\/docs\/scripts\/conditions\/)",
+                            "introduction": "조건은 자동화 규칙의 선택사항이며 트리거 될 때 발생하는 동작을 방지하는 데 사용할 수 있습니다. 조건은 트리거와 비슷해 보이지만 매우 다릅니다. 트리거는 시스템에서 발생하는 이벤트를 검사하고 조건은 시스템의 현재 상태를 검사합니다. 스위치를 예로 들면, 트리거는 스위치가 켜지는 것(이벤트)을, 조건은 스위치가 현재 켜져 있는지 혹은 꺼져 있는지(상태)를 검사합니다. \n\n[조건에 대해 자세히 알아보기](https:\/\/home-assistant.io\/docs\/scripts\/conditions\/)",
                             "add": "조건 추가",
                             "duplicate": "복제",
                             "delete": "삭제",
@@ -723,7 +723,7 @@
                     }
                 },
                 "editor": {
-                    "edit": {
+                    "edit_card": {
                         "header": "카드 구성",
                         "save": "저장하기",
                         "toggle_editor": "에디터 전환"
diff --git a/translations/lb.json b/translations/lb.json
index 0e80d80684..446d93937d 100644
--- a/translations/lb.json
+++ b/translations/lb.json
@@ -575,30 +575,30 @@
                     "dropdown_label": "Thema"
                 },
                 "refresh_tokens": {
-                    "header": "Tokeny Odświeżenia",
+                    "header": "Token erneieren",
                     "description": "All Sessioun Token representéiert eng Login Sessioun. Sessioun's Token ginn automatesch gelëscht wann dir op auslogge klickt. Folgend Sessioun's Token si fir de Moment fir Ären Account aktiv.",
-                    "token_title": "Token odświeżenia dla {clientId}",
-                    "created_at": "Utworzono {date}",
-                    "confirm_delete": "Jesteś pewien że chcesz usunąć token odświeżenia dla {name}?",
-                    "delete_failed": "Nie udało się usunąć tokena odświeżenia.",
-                    "last_used": "Ostatnio użyty {date} z miejsca {location}",
-                    "not_used": "Nigdy nie został użyty",
-                    "current_token_tooltip": "Nie można usunąć obecnego tokena odświeżenia."
+                    "token_title": "Token erneiren fir {clientId}",
+                    "created_at": "Erstallt um {date}",
+                    "confirm_delete": "Sécher fir den Erneierungs Token fir {name} ze läsche?",
+                    "delete_failed": "Fehler beim läschen vum Erneierungs Token",
+                    "last_used": "Läscht benotz um {date} vun {location}",
+                    "not_used": "Nach nie benotzt ginn",
+                    "current_token_tooltip": "Fehler beim läschen vum aktuellen Erneierungs Token"
                 },
                 "long_lived_access_tokens": {
                     "header": "Lang gëlteg Access Token",
                     "description": "Erstellt laang gëlteg Access Token déi et äre Skripten erlabe mat ärem Home Assistant z'interagéieren. All eenzelen Token ass gëlteg fir 10 Joer. Folgend Access Token sinn am Moment aktiv.",
-                    "learn_auth_requests": "Naucz się robić uwierzytelnione żądania.",
-                    "created_at": "Utworzono {date}",
-                    "confirm_delete": "Jesteś pewien że chcesz usunąć token dostępu dla {name}?",
-                    "delete_failed": "Nie udało się usunąć tokena dostępu.",
-                    "create": "Utwórz Token",
-                    "create_failed": "Nie udało się utworzyć tokena dostępu.",
-                    "prompt_name": "Nazwa?",
-                    "prompt_copy_token": "Zapisz swój token dostępu. Nie zostanie więcej pokazany.",
-                    "empty_state": "Nie posiadasz jeszcze długoterminowych tokenów dostępu.",
-                    "last_used": "Ostatnio użyty {date} z miejsca {location}",
-                    "not_used": "Nigdy nie został użyty"
+                    "learn_auth_requests": "Leiert wéi een \"authenticated requests\" erstellt.",
+                    "created_at": "Erstallt um {date}",
+                    "confirm_delete": "Sécher fir den Access Token fir {name} ze läsche?",
+                    "delete_failed": "Fehler beim läschen vum Access Token",
+                    "create": "Token erstellen",
+                    "create_failed": "Fehler beim erstellen vum Access Token",
+                    "prompt_name": "Numm?",
+                    "prompt_copy_token": "Kopéiert den Access Token. E gëtt nie méi ugewisen.",
+                    "empty_state": "Et ginn nach keng laang gëlteg Access Token.",
+                    "last_used": "Fir d'Läscht benotzt um {date} vun {location}",
+                    "not_used": "Nach nie benotzt ginn"
                 },
                 "current_user": "Dir sidd aktuell ageloggt als {fullName}.",
                 "is_owner": "Dir sidd Proprietär.",
@@ -723,7 +723,7 @@
                     }
                 },
                 "editor": {
-                    "edit": {
+                    "edit_card": {
                         "header": "Kaart Konfiguratioun",
                         "save": "Späicheren",
                         "toggle_editor": "Editeur ëmschalten"
diff --git a/translations/nl.json b/translations/nl.json
index 9b06bc384f..f8c4c8c005 100644
--- a/translations/nl.json
+++ b/translations/nl.json
@@ -723,9 +723,10 @@
                     }
                 },
                 "editor": {
-                    "edit": {
+                    "edit_card": {
                         "header": "Kaart configuratie",
-                        "save": "Opslaan"
+                        "save": "Opslaan",
+                        "toggle_editor": "Toggle Editor"
                     },
                     "migrate": {
                         "header": "Configuratie incompatibel",
@@ -748,7 +749,7 @@
             "day": "{count} {count, plural,\none {dag}\nother {dagen}\n}",
             "week": "{count} {count, plural,\none {week}\nother {weken}\n}",
             "second": "{count} {count, plural,\none {seconde}\nother {seconden}\n}",
-            "minute": "{count} {count, plural,\néén {minuut}\nandere {minuten}\n}",
+            "minute": "{count} {count, plural,\none {minuut}\nother {minuten}\n}",
             "hour": "{count} {count, plural,\none {uur}\nother {uur}\n}"
         },
         "login-form": {
diff --git a/translations/nn.json b/translations/nn.json
index b67f0e4d73..7a08a4a236 100644
--- a/translations/nn.json
+++ b/translations/nn.json
@@ -477,7 +477,7 @@
                             "duplicate": "Dupliser",
                             "delete": "Slett",
                             "delete_confirm": "Er du sikker på at du vil slette?",
-                            "unsupported_action": "Ikkjestøtta handling: {action}",
+                            "unsupported_action": "Ikkje støtta handling: {action}",
                             "type_select": "Handlingstype",
                             "type": {
                                 "service": {
diff --git a/translations/no.json b/translations/no.json
index 85b03c5eda..8eafc5251a 100644
--- a/translations/no.json
+++ b/translations/no.json
@@ -723,7 +723,7 @@
                     }
                 },
                 "editor": {
-                    "edit": {
+                    "edit_card": {
                         "header": "Kortkonfigurasjon",
                         "save": "Lagre",
                         "toggle_editor": "Bytt redigering"
diff --git a/translations/pl.json b/translations/pl.json
index a15fd8f3fa..e61774b8c0 100644
--- a/translations/pl.json
+++ b/translations/pl.json
@@ -331,7 +331,7 @@
                                 "introduction": "Niektóre części Home Assistant'a można przeładować bez konieczności ponownego uruchomienia. Kliknięcie przeładuj spowoduje ponowne wczytanie konfiguracji.",
                                 "core": "Przeładuj rdzeń",
                                 "group": "Przeładuj grupy",
-                                "automation": "Przeładuj reguły automatyzacji",
+                                "automation": "Przeładuj automatyzacje",
                                 "script": "Przeładuj skrypty"
                             },
                             "server_management": {
@@ -723,7 +723,7 @@
                     }
                 },
                 "editor": {
-                    "edit": {
+                    "edit_card": {
                         "header": "Konfiguracja karty",
                         "save": "Zapisz",
                         "toggle_editor": "Przełącz edytor"
diff --git a/translations/pt-BR.json b/translations/pt-BR.json
index 1e4e56623a..d41350931c 100644
--- a/translations/pt-BR.json
+++ b/translations/pt-BR.json
@@ -144,7 +144,8 @@
             "performance": "Desempenho",
             "high_demand": "Alta demanda",
             "heat_pump": "Bomba de calor",
-            "gas": "Gás"
+            "gas": "Gás",
+            "manual": "Manual"
         },
         "configurator": {
             "configure": "Configurar",
@@ -580,7 +581,7 @@
                     "created_at": "Criado em {date}",
                     "confirm_delete": "Tem certeza de que deseja excluir o token de acesso para {name} ?",
                     "delete_failed": "Falha ao excluir o token de acesso.",
-                    "last_used": "Usado pela última vez em {data} em {localização}",
+                    "last_used": "Usado pela última vez em {date} em {location}",
                     "not_used": "Nunca foi usado",
                     "current_token_tooltip": "Não é possível excluir o token de atualização atual"
                 },
@@ -596,7 +597,7 @@
                     "prompt_name": "Nome?",
                     "prompt_copy_token": "Copie seu token de acesso. Ele não será mostrado novamente.",
                     "empty_state": "Você ainda não tem tokens de acesso de longa duração.",
-                    "last_used": "Usado pela última vez em {data} em {localização}",
+                    "last_used": "Usado pela última vez em {date} em {location}",
                     "not_used": "Nunca foi usado"
                 },
                 "current_user": "Você está logado como {fullName} .",
@@ -712,6 +713,28 @@
                         "required_fields": "Preencha todos os campos obrigatórios"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "Itens marcados",
+                        "clear_items": "Limpar itens marcados",
+                        "add_item": "Adicionar item"
+                    }
+                },
+                "editor": {
+                    "edit_card": {
+                        "header": "Configuração de cartão",
+                        "save": "Salvar",
+                        "toggle_editor": "Alternar Editor"
+                    },
+                    "migrate": {
+                        "header": "Configuração Incompatível",
+                        "para_no_id": "Este elemento não possui um ID. Por favor adicione um ID a este elemento em 'ui-lovelace.yaml'.",
+                        "para_migrate": "O Home Assistant pode adicionar IDs a todos os seus cards e visualizações automaticamente clicando no botão 'Migrar config'.",
+                        "migrate": "Migrar configuração"
+                    }
+                }
             }
         },
         "sidebar": {
@@ -901,7 +924,7 @@
         "climate": "Clima",
         "configurator": "Configurador",
         "conversation": "Conversação",
-        "cover": "Cortina",
+        "cover": "Cobertura",
         "device_tracker": "Rastreador de dispositivo",
         "fan": "Ventilador",
         "history_graph": "Gráfico de histórico",
diff --git a/translations/pt.json b/translations/pt.json
index af46894bb3..5a44af4799 100644
--- a/translations/pt.json
+++ b/translations/pt.json
@@ -723,7 +723,7 @@
                     }
                 },
                 "editor": {
-                    "edit": {
+                    "edit_card": {
                         "header": "Configuração do cartão",
                         "save": "Guardar",
                         "toggle_editor": "Alterar para editor"
diff --git a/translations/ro.json b/translations/ro.json
index 342862511d..c01020907e 100644
--- a/translations/ro.json
+++ b/translations/ro.json
@@ -369,7 +369,7 @@
                             "duplicate": "Dublura",
                             "delete": "Ștergeți",
                             "delete_confirm": "Sigur doriți să ștergeți?",
-                            "unsupported_platform": "Platformă neacceptată: {platforma}",
+                            "unsupported_platform": "Platformă neacceptată: {platform}",
                             "type_select": "Tip acțiune",
                             "type": {
                                 "event": {
@@ -577,8 +577,8 @@
                     "header": "Tokenuri de innoire",
                     "description": "Fiecare token de innoire reprezinta o sesiune de logare. Tokenuriile de innoire vor fi inlaturate cand se da click pe log out. Urmatoarele tokenuri de innoire sunt active in contul dumneavoastra.",
                     "token_title": "înnoirea token pentru {clientId}",
-                    "created_at": "Creat in {data}",
-                    "confirm_delete": "Sigur doriti sa stergeti tokenul de acces pentru {nume}?",
+                    "created_at": "Creat in {date}",
+                    "confirm_delete": "Sigur doriti sa stergeti tokenul de acces pentru {name}?",
                     "delete_failed": "Ştergerea tokenului de acces eşuată",
                     "last_used": "Ultima utilizate la {data} din {locaţie}",
                     "not_used": "Nu a fost utilizat niciodata",
@@ -588,8 +588,8 @@
                     "header": "Tokenuri de acces de lunga durata",
                     "description": "Creați tokenuri de acces cu durată lungă de viață pentru a permite script-urilor dvs. să interacționeze cu instanța dvs. Home Assistant. Fiecare token va fi valabil timp de 10 ani de la creatie. Următoarele tokenuri de acces de lungă durată sunt active la ora actuala.",
                     "learn_auth_requests": "Aflați cum să faceți cereri autentificate.",
-                    "created_at": "Creat in {data}",
-                    "confirm_delete": "Sigur doriti sa stergeti tokenul de acces pentru {nume}?",
+                    "created_at": "Creat in {date}",
+                    "confirm_delete": "Sigur doriti sa stergeti tokenul de acces pentru {name}?",
                     "delete_failed": "Ştergerea tokenului de acces eşuată",
                     "create": "Creaza un Token",
                     "create_failed": "Crearea tokenului de acces eşuată",
@@ -726,8 +726,8 @@
             "day": "{count}{count, plural,\n  one { zi }\n  other { zile }\n}",
             "week": "{count}{count, plural,\n  one { săptămână }\n  other { săptămâni }\n}",
             "second": "{count} {count, plural,\none {secunda}\nother {secunde}\n}",
-            "minute": "{count}{count, plural,\n  un { minute }\n  alte { minutes }\n}",
-            "hour": "{count}{count, plural,\n  o { hour }\n  alte { hours }\n}"
+            "minute": "{count} {count, plural,\n  one { minute }\n  other { minutes }\n}",
+            "hour": "{count}{count, plural,\n  one { zi }\n  other { zile }\n}"
         },
         "login-form": {
             "password": "Parola",
diff --git a/translations/ru.json b/translations/ru.json
index e852c409af..55e9ed8bb1 100644
--- a/translations/ru.json
+++ b/translations/ru.json
@@ -36,13 +36,13 @@
             "armed_custom_bypass": "Охрана с исключениями"
         },
         "automation": {
-            "off": "Выключено",
-            "on": "Включено"
+            "off": "Выкл",
+            "on": "Вкл"
         },
         "binary_sensor": {
             "default": {
-                "off": "Выключено",
-                "on": "Включено"
+                "off": "Выкл",
+                "on": "Вкл"
             },
             "moisture": {
                 "off": "Сухо",
@@ -101,12 +101,12 @@
                 "on": "Охлаждение"
             },
             "door": {
-                "off": "Закрыта",
-                "on": "Открыта"
+                "off": "Закрыто",
+                "on": "Открыто"
             },
             "garage_door": {
-                "off": "Закрыта",
-                "on": "Открыта"
+                "off": "Закрыто",
+                "on": "Открыто"
             },
             "heat": {
                 "off": "Норма",
@@ -122,8 +122,8 @@
             }
         },
         "calendar": {
-            "off": "Выключено",
-            "on": "Включено"
+            "off": "Выкл",
+            "on": "Вкл"
         },
         "camera": {
             "recording": "Запись",
@@ -131,9 +131,9 @@
             "idle": "Бездействие"
         },
         "climate": {
-            "off": "Выключено",
-            "on": "Включено",
-            "heat": "Обогрев",
+            "off": "Выкл",
+            "on": "Вкл",
+            "heat": "Нагрев",
             "cool": "Охлаждение",
             "idle": "Бездействие",
             "auto": "Авто",
@@ -145,40 +145,40 @@
             "high_demand": "Большая нагрузка",
             "heat_pump": "Тепловой насос",
             "gas": "Газовый",
-            "manual": "Руководство"
+            "manual": "Ручной режим"
         },
         "configurator": {
             "configure": "Настроить",
             "configured": "Настроено"
         },
         "cover": {
-            "open": "Открыта",
+            "open": "Открыто",
             "opening": "Открывается",
-            "closed": "Закрыта",
+            "closed": "Закрыто",
             "closing": "Закрывается",
-            "stopped": "Остановлена"
+            "stopped": "Остановлено"
         },
         "device_tracker": {
             "home": "Дома",
             "not_home": "Отсутствует"
         },
         "fan": {
-            "off": "Выключен",
-            "on": "Включен"
+            "off": "Выкл",
+            "on": "Вкл"
         },
         "group": {
-            "off": "Выключено",
-            "on": "Включено",
+            "off": "Выкл",
+            "on": "Вкл",
             "home": "Дома",
             "not_home": "Отсутствует",
             "open": "Открыто",
             "opening": "Открывается",
             "closed": "Закрыто",
             "closing": "Закрывается",
-            "stopped": "Остановлена",
+            "stopped": "Остановлено",
             "locked": "Заблокирована",
             "unlocked": "Разблокирована",
-            "ok": "OK",
+            "ok": "ОК",
             "problem": "Проблема"
         },
         "input_boolean": {
@@ -213,12 +213,12 @@
             "scening": "Переход к сцене"
         },
         "script": {
-            "off": "Выключен",
-            "on": "Включен"
+            "off": "Выкл",
+            "on": "Вкл"
         },
         "sensor": {
-            "off": "Выключен",
-            "on": "Включен"
+            "off": "Выкл",
+            "on": "Вкл"
         },
         "sun": {
             "above_horizon": "Над горизонтом",
@@ -237,7 +237,7 @@
             },
             "query_stage": {
                 "initializing": "Инициализация ({query_stage})",
-                "dead": "Неисправен ({query_stage})"
+                "dead": "Неисправно ({query_stage})"
             }
         },
         "weather": {
@@ -282,7 +282,7 @@
             "arming": "Постановка на охрану",
             "disarming": "Снятие с охраны",
             "triggered": "Тревога",
-            "armed_custom_bypass": "Под охраной"
+            "armed_custom_bypass": "Охрана"
         },
         "device_tracker": {
             "home": "Дома",
@@ -490,7 +490,7 @@
                                     "delay": "Задержка"
                                 },
                                 "wait_template": {
-                                    "label": "Ожидать",
+                                    "label": "Ожидание",
                                     "wait_template": "Шаблон ожидания",
                                     "timeout": "Тайм-аут (опционально)"
                                 },
@@ -542,11 +542,11 @@
                     "configure": "Настроить",
                     "none": "Пока ничего не настроено",
                     "config_entry": {
-                        "no_devices": "Эта интеграция не имеет устройств.",
+                        "no_devices": "Эта интеграция не имеет устройств",
                         "no_device": "Объекты без устройств",
                         "delete_confirm": "Вы уверены, что хотите удалить эту интеграцию?",
                         "restart_confirm": "Перезапустите Home Assistant, чтобы завершить удаление этой интеграции",
-                        "manuf": "от {manufacturer}",
+                        "manuf": "Производитель: {manufacturer}",
                         "hub": "Подключено через",
                         "firmware": "Прошивка: {version}",
                         "device_unavailable": "устройство недоступно",
@@ -723,16 +723,16 @@
                     }
                 },
                 "editor": {
-                    "edit": {
-                        "header": "Конфигурация карты",
+                    "edit_card": {
+                        "header": "Настройка карточки",
                         "save": "Сохранить",
                         "toggle_editor": "Переключить редактор"
                     },
                     "migrate": {
                         "header": "Конфигурация несовместима",
                         "para_no_id": "Этот элемент не имеет ID. Добавьте ID для этого элемента в 'ui-lovelace.yaml'.",
-                        "para_migrate": "Home Assistant может добавить ID для всех ваших карт и представлений автоматически, если нажать кнопку 'Миграция конфигурации'.",
-                        "migrate": "Миграция конфигурации"
+                        "para_migrate": "Home Assistant может автоматически добавить ID для всех карточек и видов, если нажать кнопку 'Перенести настройки'.",
+                        "migrate": "Перенести настройки"
                     }
                 }
             }
diff --git a/translations/sl.json b/translations/sl.json
index 77cdf04e24..9265400143 100644
--- a/translations/sl.json
+++ b/translations/sl.json
@@ -36,13 +36,13 @@
             "armed_custom_bypass": "Vklopljen izjeme po meri"
         },
         "automation": {
-            "off": "Izklopljena",
-            "on": "Vklopljena"
+            "off": "Izključen",
+            "on": "Vklopljen"
         },
         "binary_sensor": {
             "default": {
-                "off": "Izklopljeno",
-                "on": "Vklopljeno"
+                "off": "Izključen",
+                "on": "Vklopljen"
             },
             "moisture": {
                 "off": "Suho",
@@ -57,12 +57,12 @@
                 "on": "Zaznano"
             },
             "occupancy": {
-                "off": "Prosto",
-                "on": "Zasedeno"
+                "off": "Čisto",
+                "on": "Zaznano"
             },
             "smoke": {
                 "off": "Čisto",
-                "on": "Zaznan"
+                "on": "Zaznano"
             },
             "sound": {
                 "off": "Čisto",
@@ -144,7 +144,8 @@
             "performance": "Učinkovitost",
             "high_demand": "Visoka poraba",
             "heat_pump": "Toplotna črpalka",
-            "gas": "Plin"
+            "gas": "Plin",
+            "manual": "Ročno"
         },
         "configurator": {
             "configure": "Konfiguriraj",
@@ -216,16 +217,16 @@
             "on": "On"
         },
         "sensor": {
-            "off": "Off",
-            "on": "On"
+            "off": "Izključen",
+            "on": "Vklopljen"
         },
         "sun": {
             "above_horizon": "Nad obzorjem",
             "below_horizon": "Pod obzorjem"
         },
         "switch": {
-            "off": "Off",
-            "on": "On"
+            "off": "Izključen",
+            "on": "Vklopljen"
         },
         "zwave": {
             "default": {
@@ -281,7 +282,7 @@
             "arming": "Vklapljam",
             "disarming": "Izklopi",
             "triggered": "Sprožen",
-            "armed_custom_bypass": "Vklopljen"
+            "armed_custom_bypass": "Aktiven"
         },
         "device_tracker": {
             "home": "Doma",
@@ -430,8 +431,8 @@
                             "introduction": "Pogoji so neobvezni del pravila za avtomatizacijo in jih je mogoče uporabiti za preprečitev, da bi se dejanje zgodilo ob sprožitvi. Pogoji so zelo podobni sprožilcem, vendar so zelo različni. Sprožilec bo pogledal dogodke, ki se dogajajo v sistemu, medtem ko pogoj gleda samo na to, kako sistem trenutno izgleda. Sprožilec lahko opazi, da je stikalo vklopljeno. Pogoj lahko vidi le, če je stikalo trenutno vklopljeno ali izklopljeno. \n\n [Več o pogojih.] (Https:\/\/home-assistant.io\/docs\/scripts\/conditions\/)",
                             "add": "Dodaj pogoj",
                             "duplicate": "Podvoji",
-                            "delete": "Briši",
-                            "delete_confirm": "Ste sigurni, da želite pobrisati?",
+                            "delete": "Izbriši",
+                            "delete_confirm": "Ste prepričani, da želite izbrisati?",
                             "unsupported_condition": "Nepodprti pogoj: {condition}",
                             "type_select": "Vrsta pogoja",
                             "type": {
@@ -443,7 +444,7 @@
                                     "label": "Numerično stanje",
                                     "above": "Nad",
                                     "below": "Pod",
-                                    "value_template": "Vrednostna predloga"
+                                    "value_template": "Vrednostna predloga (neobvezno)"
                                 },
                                 "sun": {
                                     "label": "Sonce",
@@ -465,7 +466,7 @@
                                 },
                                 "zone": {
                                     "label": "Območje",
-                                    "entity": "Subjekti z lokacijo",
+                                    "entity": "Subjekt z lokacijo",
                                     "zone": "Območje"
                                 }
                             }
@@ -475,8 +476,8 @@
                             "introduction": "Akcije so, kaj bo storil Home Assistent, ko se sproži avtomatizacija. \n\n [Več o dejavnostih.] (Https:\/\/home-assistant.io\/docs\/automation\/action\/)",
                             "add": "Dodaj akcijo",
                             "duplicate": "Podvoji",
-                            "delete": "Briši",
-                            "delete_confirm": "Res želite pobrisati?",
+                            "delete": "Izbriši",
+                            "delete_confirm": "Ste prepričani, da želite izbrisati?",
                             "unsupported_action": "Nepodprta akcija: {action}",
                             "type_select": "Vrsta ukrepa",
                             "type": {
@@ -556,7 +557,7 @@
             "profile": {
                 "push_notifications": {
                     "header": "Push obvestila",
-                    "description": "Prikazuj obvestila na tej napravi",
+                    "description": "Pošiljaj obvestila tej napravi",
                     "error_load_platform": "Konfiguriraj notify.html5 (push obvestila).",
                     "error_use_https": "Zahteva SSL za Frontend.",
                     "push_notifications": "Push obvestila",
@@ -712,6 +713,28 @@
                         "required_fields": "Izpolnite vsa zahtevana polja"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "Označeni predmeti",
+                        "clear_items": "Počisti označene elemente",
+                        "add_item": "Dodaj element"
+                    }
+                },
+                "editor": {
+                    "edit_card": {
+                        "header": "Konfiguracija kartice",
+                        "save": "Shrani",
+                        "toggle_editor": "Preklop na urejevalnik"
+                    },
+                    "migrate": {
+                        "header": "Konfiguracija Nezdružljiva",
+                        "para_no_id": "Ta element nima ID-ja. Prosimo, dodajte ID tega elementa v 'ui-lovelace.yaml'.",
+                        "para_migrate": "Home Assistant lahko doda ID-je vsem vašim karticam in pogledom samodejno s pritiskom gumba »Migriraj nastavitve«.",
+                        "migrate": "Migriraj nastavitve"
+                    }
+                }
             }
         },
         "sidebar": {
diff --git a/translations/sv.json b/translations/sv.json
index 0ad503267c..419a226696 100644
--- a/translations/sv.json
+++ b/translations/sv.json
@@ -144,7 +144,8 @@
             "performance": "Prestanda",
             "high_demand": "Hög efterfrågan",
             "heat_pump": "Värmepump",
-            "gas": "Gas"
+            "gas": "Gas",
+            "manual": "Manuell"
         },
         "configurator": {
             "configure": "Konfigurera",
@@ -589,7 +590,7 @@
                     "description": "Skapa långlivade åtkomsttokens för att låta dina skript interagera med din hemassistentenhet. Varje token kommer att vara giltig i 10 år från skapandet. Följande långlivade åtkomsttoken är för närvarande aktiva.",
                     "learn_auth_requests": "Lär dig hur du gör autentiserade förfrågningar.",
                     "created_at": "Skapades den {date}",
-                    "confirm_delete": "Är du säker du vill radera åtkomsttoken för {namn}?",
+                    "confirm_delete": "Är du säker du vill radera åtkomsttoken för {name}?",
                     "delete_failed": "Det gick inte att ta bort åtkomsttoken.",
                     "create": "Skapa token",
                     "create_failed": "Det gick inte att skapa åtkomsttoken.",
@@ -712,6 +713,28 @@
                         "required_fields": "Fyll i alla fält som krävs"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "Markerade objekt",
+                        "clear_items": "Rensa avbockade objekt",
+                        "add_item": "Lägg till objekt"
+                    }
+                },
+                "editor": {
+                    "edit_card": {
+                        "header": "Kortkonfiguration",
+                        "save": "Spara",
+                        "toggle_editor": "Visa \/ Dölj redigerare"
+                    },
+                    "migrate": {
+                        "header": "Konfigurationen är inte giltig",
+                        "para_no_id": "Det här elementet har inget ID. Lägg till ett ID till det här elementet i \"ui-lovelace.yaml\".",
+                        "para_migrate": "Home Assistant kan automatiskt lägga till IDn till alla dina kort och vyer genom att du klickar på \"Migrera konfiguration\".",
+                        "migrate": "Migrera konfigurationen"
+                    }
+                }
             }
         },
         "sidebar": {
diff --git a/translations/tr.json b/translations/tr.json
index 79bcdf1f22..352d618ee5 100644
--- a/translations/tr.json
+++ b/translations/tr.json
@@ -13,6 +13,7 @@
         "dev-templates": "Taslaklar",
         "dev-mqtt": "MQTT",
         "dev-info": "Bilgi",
+        "calendar": "Takvim",
         "profile": "Profil"
     },
     "state": {
@@ -139,7 +140,8 @@
             "performance": "Performans",
             "high_demand": "Yüksek talep",
             "heat_pump": "Isı pompası",
-            "gas": "Gaz"
+            "gas": "Gaz",
+            "manual": "Manuel"
         },
         "configurator": {
             "configure": "Ayarla",
@@ -233,6 +235,25 @@
                 "initializing": "Başlatılıyor ({query_stage})",
                 "dead": "Ölü ({query_stage})"
             }
+        },
+        "weather": {
+            "clear-night": "Açık, gece",
+            "cloudy": "Bulutlu",
+            "fog": "Sis",
+            "lightning": "Yıldırım",
+            "lightning-rainy": "Yıldırım, yağmurlu",
+            "partlycloudy": "Parçalı bulutlu",
+            "rainy": "Yağmurlu",
+            "snowy": "Karlı",
+            "snowy-rainy": "Karlı, yağmurlu",
+            "sunny": "Güneşli",
+            "windy": "Rüzgarlı",
+            "windy-variant": "Rüzgarlı"
+        },
+        "vacuum": {
+            "error": "Hata",
+            "off": "Kapalı",
+            "on": "Açık"
         }
     },
     "state_badge": {
@@ -322,6 +343,9 @@
                         "header": "Otomasyon Düzenleyici"
                     },
                     "editor": {
+                        "save": "Kaydet",
+                        "unsaved_confirm": "Kaydedilmemiş değişiklikleriniz var. Çıkmak istediğinize emin misiniz?",
+                        "alias": "İsim",
                         "triggers": {
                             "delete": "Sil",
                             "type": {
@@ -330,7 +354,9 @@
                                 },
                                 "zone": {
                                     "zone": "Bölge",
-                                    "event": "Olay:"
+                                    "event": "Olay:",
+                                    "enter": "Girince",
+                                    "leave": "Çıkınca"
                                 },
                                 "state": {
                                     "for": "İçin"
@@ -354,27 +380,39 @@
                                     "value_template": "Değer şablonu (isteğe bağlı)"
                                 },
                                 "sun": {
-                                    "label": "Güneş"
+                                    "label": "Güneş",
+                                    "before": "Önce:",
+                                    "after": "Sonra:",
+                                    "sunrise": "Gün Doğumu",
+                                    "sunset": "Gün Batımı"
                                 },
                                 "template": {
                                     "label": "Şablon",
                                     "value_template": "Değer şablonu"
                                 },
                                 "time": {
-                                    "label": "Zaman"
+                                    "label": "Zaman",
+                                    "after": "Sonra",
+                                    "before": "Önce"
                                 },
                                 "zone": {
-                                    "entity": "Konumlu girdi"
+                                    "label": "Bölge",
+                                    "entity": "Konumlu girdi",
+                                    "zone": "Bölge"
                                 }
                             }
                         },
                         "actions": {
                             "duplicate": "Kopya",
                             "delete": "Sil",
+                            "delete_confirm": "Silmek istediğinize emin misiniz?",
                             "type": {
                                 "delay": {
                                     "delay": "Gecikme"
                                 },
+                                "condition": {
+                                    "label": "Durum"
+                                },
                                 "event": {
                                     "event": "Olay:",
                                     "service_data": "Hizmet verisi"
@@ -391,6 +429,18 @@
                     "caption": "Z-Wave",
                     "description": "Z-Wave ağınızı yönetin"
                 },
+                "users": {
+                    "caption": "Kullanıcılar",
+                    "description": "Kullanıcıları yönet",
+                    "picker": {
+                        "title": "Kullanıcılar"
+                    },
+                    "editor": {
+                        "rename_user": "Kullanıcıyı yeniden adlandır",
+                        "change_password": "Parolayı değiştir",
+                        "delete_user": "Kullanıcıyı sil"
+                    }
+                },
                 "cloud": {
                     "caption": "Home Assistant Cloud",
                     "description_login": "{email} olarak oturum açtınız",
@@ -419,14 +469,22 @@
             },
             "profile": {
                 "push_notifications": {
-                    "description": "Bu cihaza bildirimler gönder"
+                    "description": "Bu cihaza bildirimler gönder",
+                    "link_promo": "Daha fazla bilgi edinin"
                 },
                 "refresh_tokens": {
-                    "description": "Her yenileme jetonu bir oturum açma oturumunu temsil eder. Yenileme jetonları, çıkış yapmak istediğinizde otomatik olarak kaldırılacaktır. Aşağıdaki yenileme jetonları hesabınız için şu anda aktif."
+                    "description": "Her yenileme jetonu bir oturum açma oturumunu temsil eder. Yenileme jetonları, çıkış yapmak istediğinizde otomatik olarak kaldırılacaktır. Aşağıdaki yenileme jetonları hesabınız için şu anda aktif.",
+                    "created_at": "{date} tarihinde oluşturuldu",
+                    "last_used": "En son {date} tarihinde {location} konumundan kullanıldı",
+                    "not_used": "Hiç kullanılmadı"
                 },
                 "long_lived_access_tokens": {
+                    "created_at": "{date} tarihinde oluşturuldu",
+                    "prompt_name": "Ad?",
+                    "last_used": "En son {date} tarihinde {location} konumundan kullanıldı",
                     "not_used": "Hiç kullanılmamış"
                 },
+                "current_user": "{fullName} olarak giriş yaptınız.",
                 "logout": "Çıkış yap",
                 "change_password": {
                     "header": "Parolayı Değiştir",
@@ -449,6 +507,77 @@
                     "close": "Kapat",
                     "submit": "Gönder"
                 }
+            },
+            "page-authorize": {
+                "form": {
+                    "working": "Lütfen bekleyin",
+                    "unknown_error": "Bir şeyler ters gitti",
+                    "providers": {
+                        "homeassistant": {
+                            "step": {
+                                "init": {
+                                    "data": {
+                                        "username": "Kullanıcı Adı",
+                                        "password": "Parola"
+                                    }
+                                }
+                            },
+                            "error": {
+                                "invalid_auth": "Geçersiz kullanıcı adı ya da parola"
+                            },
+                            "abort": {
+                                "login_expired": "Oturum süresi doldu, lütfen tekrar giriş yapın."
+                            }
+                        },
+                        "legacy_api_password": {
+                            "step": {
+                                "init": {
+                                    "data": {
+                                        "password": "API Parolası"
+                                    }
+                                }
+                            },
+                            "error": {
+                                "invalid_auth": "Geçersiz API parolası"
+                            }
+                        },
+                        "trusted_networks": {
+                            "step": {
+                                "init": {
+                                    "data": {
+                                        "user": "Kullanıcı"
+                                    },
+                                    "description": "Lütfen giriş yapmak istediğiniz bir kullanıcı seçin:"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "page-onboarding": {
+                "user": {
+                    "intro": "Bir kullanıcı hesabı oluşturarak başlayalım.",
+                    "required_field": "Gerekli",
+                    "data": {
+                        "name": "Ad",
+                        "username": "Kullanıcı Adı",
+                        "password": "Parola"
+                    },
+                    "create_account": "Hesap Oluştur"
+                }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "clear_items": "Seçili ögeleri temizle",
+                        "add_item": "Öge Ekle"
+                    }
+                },
+                "editor": {
+                    "edit_card": {
+                        "save": "Kaydet"
+                    }
+                }
             }
         },
         "sidebar": {
@@ -476,6 +605,46 @@
             "persistent_notification": {
                 "dismiss": "Kapat"
             },
+            "weather": {
+                "attributes": {
+                    "air_pressure": "Hava basıncı",
+                    "humidity": "Nem",
+                    "temperature": "Sıcaklık",
+                    "visibility": "Görünürlük",
+                    "wind_speed": "Rüzgar hızı"
+                }
+            },
+            "fan": {
+                "speed": "Hız",
+                "oscillate": "Salınım",
+                "direction": "Yön"
+            },
+            "light": {
+                "brightness": "Parlaklık",
+                "effect": "Efekt"
+            },
+            "climate": {
+                "on_off": "Açık \/ kapalı",
+                "target_temperature": "Hedef sıcaklık",
+                "target_humidity": "Hedef nem",
+                "fan_mode": "Fan modu",
+                "swing_mode": "Salınım modu",
+                "away_mode": "Dışarıda modu"
+            },
+            "lock": {
+                "code": "Kod",
+                "lock": "Kilitle",
+                "unlock": "Kilidi aç"
+            },
+            "media_player": {
+                "source": "Kaynak"
+            },
+            "vacuum": {
+                "actions": {
+                    "turn_on": "Aç",
+                    "turn_off": "Kapat"
+                }
+            },
             "water_heater": {
                 "currently": "Güncel olarak",
                 "on_off": "Açık \/ kapalı",
@@ -484,8 +653,20 @@
                 "away_mode": "Dışarıda modu"
             }
         },
+        "dialogs": {
+            "more_info_settings": {
+                "save": "Kaydet",
+                "name": "Ad"
+            }
+        },
         "auth_store": {
+            "ask": "Bu girişi kaydetmek istiyor musunuz?",
+            "decline": "Hayır teşekkürler",
             "confirm": "Girişi kaydet"
+        },
+        "notification_drawer": {
+            "empty": "Bildirim bulunmamakta",
+            "title": "Bildirimler"
         }
     },
     "domain": {
diff --git a/translations/uk.json b/translations/uk.json
index 79879b6dae..a989d37c0b 100644
--- a/translations/uk.json
+++ b/translations/uk.json
@@ -73,7 +73,7 @@
                 "on": "Виявлено"
             },
             "opening": {
-                "off": "Закритий",
+                "off": "Закрито",
                 "on": "Відкритий"
             },
             "safety": {
@@ -101,11 +101,11 @@
                 "on": "Охолодження"
             },
             "door": {
-                "off": "Зачинено",
-                "on": "Відкрито"
+                "off": "Зачинені",
+                "on": "Відчинені"
             },
             "garage_door": {
-                "off": "Зачинено",
+                "off": "ЗачиненІ",
                 "on": "Відкрито"
             },
             "heat": {
@@ -114,7 +114,7 @@
             },
             "window": {
                 "off": "Зачинено",
-                "on": "Відкрито"
+                "on": "Відчинене"
             },
             "lock": {
                 "off": "Заблоковано",
diff --git a/translations/zh-Hans.json b/translations/zh-Hans.json
index 53959b9bf3..2b831f8973 100644
--- a/translations/zh-Hans.json
+++ b/translations/zh-Hans.json
@@ -144,7 +144,8 @@
             "performance": "性能",
             "high_demand": "高需求",
             "heat_pump": "热泵",
-            "gas": "燃气"
+            "gas": "燃气",
+            "manual": "手动"
         },
         "configurator": {
             "configure": "设置",
@@ -712,6 +713,28 @@
                         "required_fields": "请填写所有必填字段"
                     }
                 }
+            },
+            "lovelace": {
+                "cards": {
+                    "shopping-list": {
+                        "checked_items": "已完成项目",
+                        "clear_items": "清除已完成项目",
+                        "add_item": "新增项目"
+                    }
+                },
+                "editor": {
+                    "edit_card": {
+                        "header": "卡片配置",
+                        "save": "保存",
+                        "toggle_editor": "切换编辑器"
+                    },
+                    "migrate": {
+                        "header": "配置不兼容",
+                        "para_no_id": "此元素没有 ID。请在 'ui-lovelace.yaml' 中为此元素添加 ID。",
+                        "para_migrate": "通过点击“迁移配置”按钮，Home Assistant 可以自动为您的所有卡片和视图添加 ID。",
+                        "migrate": "迁移配置"
+                    }
+                }
             }
         },
         "sidebar": {
diff --git a/translations/zh-Hant.json b/translations/zh-Hant.json
index dab37a0daa..8941ebf990 100644
--- a/translations/zh-Hant.json
+++ b/translations/zh-Hant.json
@@ -557,7 +557,7 @@
             "profile": {
                 "push_notifications": {
                     "header": "通知推送",
-                    "description": "傳送通知推送至此裝置",
+                    "description": "傳送通知推送至此裝置。",
                     "error_load_platform": "設定 notify.html5。",
                     "error_use_https": "需要啟用前端 SSL 加密。",
                     "push_notifications": "通知推送",
@@ -723,7 +723,7 @@
                     }
                 },
                 "editor": {
-                    "edit": {
+                    "edit_card": {
                         "header": "卡片設定",
                         "save": "儲存",
                         "toggle_editor": "切換編輯器"

From 0cd4980f44290e418468cbf242029486718a2e7c Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Wed, 5 Dec 2018 22:07:41 +0100
Subject: [PATCH 69/69] Bumped version to 20181205.0

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 24233b1bb6..5c2d1ff135 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="home-assistant-frontend",
-    version="20181126.0",
+    version="20181205.0",
     description="The Home Assistant frontend",
     url="https://github.com/home-assistant/home-assistant-polymer",
     author="The Home Assistant Authors",