From 1f161a41c393eefae0da211514e3a67850eb942a Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Thu, 6 Dec 2018 18:02:22 +0100
Subject: [PATCH] Force refresh on manual refresh

---
 src/data/lovelace.ts                     |  6 +++++-
 src/panels/lovelace/ha-panel-lovelace.js | 14 +++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/data/lovelace.ts b/src/data/lovelace.ts
index cd806b682bc8..054a79ce2691 100644
--- a/src/data/lovelace.ts
+++ b/src/data/lovelace.ts
@@ -51,9 +51,13 @@ export type ActionConfig =
   | MoreInfoActionConfig
   | NoActionConfig;
 
-export const fetchConfig = (hass: HomeAssistant): Promise<LovelaceConfig> =>
+export const fetchConfig = (
+  hass: HomeAssistant,
+  force: boolean
+): Promise<LovelaceConfig> =>
   hass.callWS({
     type: "lovelace/config",
+    force,
   });
 
 export const migrateConfig = (hass: HomeAssistant): Promise<void> =>
diff --git a/src/panels/lovelace/ha-panel-lovelace.js b/src/panels/lovelace/ha-panel-lovelace.js
index c7b8fa27a870..936b0e5d1acf 100644
--- a/src/panels/lovelace/ha-panel-lovelace.js
+++ b/src/panels/lovelace/ha-panel-lovelace.js
@@ -28,7 +28,7 @@ class Lovelace extends localizeMixin(PolymerElement) {
           route="[[route]]"
           config="[[_config]]"
           columns="[[_columns]]"
-          on-config-refresh="_fetchConfig"
+          on-config-refresh="_forceFetchConfig"
         ></hui-root>
       </template>
       <template
@@ -48,7 +48,7 @@ class Lovelace extends localizeMixin(PolymerElement) {
           narrow="[[narrow]]"
           show-menu="[[showMenu]]"
         >
-          <paper-button on-click="_fetchConfig"
+          <paper-button on-click="_forceFetchConfig"
             >Reload ui-lovelace.yaml</paper-button
           >
         </hass-error-screen>
@@ -96,7 +96,7 @@ class Lovelace extends localizeMixin(PolymerElement) {
   }
 
   ready() {
-    this._fetchConfig();
+    this._fetchConfig(false);
     this._updateColumns = this._updateColumns.bind(this);
     this.mqls = [300, 600, 900, 1200].map((width) => {
       const mql = matchMedia(`(min-width: ${width}px)`);
@@ -113,9 +113,13 @@ class Lovelace extends localizeMixin(PolymerElement) {
     this._columns = Math.max(1, matchColumns - (!this.narrow && this.showMenu));
   }
 
-  async _fetchConfig() {
+  _forceFetchConfig() {
+    this._fetchConfig(true);
+  }
+
+  async _fetchConfig(force) {
     try {
-      const conf = await fetchConfig(this.hass);
+      const conf = await fetchConfig(this.hass, force);
       this.setProperties({
         _config: conf,
         _state: "loaded",