From f6fb2e4b1d2ca1eb427771ef99c8970ad94a55ba Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 22 Jul 2020 14:16:25 +0200
Subject: [PATCH] Missed the entities in the editors (#6443)

---
 .../lovelace/cards/hui-history-graph-card.ts  | 25 +++++++++++++------
 .../hui-entities-card-editor.ts               |  3 ++-
 .../config-elements/hui-glance-card-editor.ts |  3 ++-
 .../hui-history-graph-card-editor.ts          |  2 +-
 .../config-elements/hui-map-card-editor.ts    |  3 ++-
 .../hui-picture-glance-card-editor.ts         |  3 ++-
 6 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-history-graph-card.ts b/src/panels/lovelace/cards/hui-history-graph-card.ts
index af5ba94891..ab74d1cf0a 100644
--- a/src/panels/lovelace/cards/hui-history-graph-card.ts
+++ b/src/panels/lovelace/cards/hui-history-graph-card.ts
@@ -61,6 +61,8 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard {
 
   private _interval?: number;
 
+  private _fetching = false;
+
   public getCardSize(): number {
     return 4;
   }
@@ -138,6 +140,7 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard {
         >
           <state-history-charts
             .hass=${this.hass}
+            .isLoadingData=${!this._stateHistory}
             .historyData=${this._stateHistory}
             .names=${this._names}
             .upToNow=${true}
@@ -149,13 +152,21 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard {
   }
 
   private async _getStateHistory(): Promise<void> {
-    this._stateHistory = await getRecentWithCache(
-      this.hass!,
-      this._cacheConfig!.cacheKey,
-      this._cacheConfig!,
-      this.hass!.localize,
-      this.hass!.language
-    );
+    if (this._fetching) {
+      return;
+    }
+    this._fetching = true;
+    try {
+      this._stateHistory = await getRecentWithCache(
+        this.hass!,
+        this._cacheConfig!.cacheKey,
+        this._cacheConfig!,
+        this.hass!.localize,
+        this.hass!.language
+      );
+    } finally {
+      this._fetching = false;
+    }
   }
 
   private _clearInterval(): void {
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 b2642b2a09..cc7d38c669 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
@@ -135,7 +135,8 @@ export class HuiEntitiesCardEditor extends LitElement
     }
 
     if (ev.detail && ev.detail.entities) {
-      this._config.entities = ev.detail.entities;
+      this._config = { ...this._config, entities: ev.detail.entities };
+
       this._configEntities = processEditorEntities(this._config.entities);
     } else if (target.configValue) {
       if (target.value === "") {
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 bca304e179..b8bde70faf 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
@@ -193,7 +193,8 @@ export class HuiGlanceCardEditor extends LitElement
       return;
     }
     if (ev.detail && ev.detail.entities) {
-      this._config.entities = ev.detail.entities;
+      this._config = { ...this._config, entities: ev.detail.entities };
+
       this._configEntities = processEditorEntities(this._config.entities);
     } else if (target.configValue) {
       if (
diff --git a/src/panels/lovelace/editor/config-elements/hui-history-graph-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-history-graph-card-editor.ts
index ed6193bf82..71e7838190 100644
--- a/src/panels/lovelace/editor/config-elements/hui-history-graph-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-history-graph-card-editor.ts
@@ -136,7 +136,7 @@ export class HuiHistoryGraphCardEditor extends LitElement
     }
 
     if (ev.detail && ev.detail.entities) {
-      this._config.entities = ev.detail.entities;
+      this._config = { ...this._config, entities: ev.detail.entities };
       this._configEntities = processEditorEntities(this._config.entities);
     } else if (target.configValue) {
       if (target.value === "") {
diff --git a/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts
index 3ec82725c5..bf9291131e 100644
--- a/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts
@@ -184,7 +184,8 @@ export class HuiMapCardEditor extends LitElement implements LovelaceCardEditor {
       return;
     }
     if (ev.detail && ev.detail.entities) {
-      this._config.entities = ev.detail.entities;
+      this._config = { ...this._config, entities: ev.detail.entities };
+
       this._configEntities = processEditorEntities(this._config.entities);
       fireEvent(this, "config-changed", { config: this._config });
     }
diff --git a/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts
index 1c54bac8e6..bb88e01772 100644
--- a/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts
@@ -251,7 +251,8 @@ export class HuiPictureGlanceCardEditor extends LitElement
     }
 
     if (ev.detail && ev.detail.entities) {
-      this._config.entities = ev.detail.entities;
+      this._config = { ...this._config, entities: ev.detail.entities };
+
       this._configEntities = processEditorEntities(this._config.entities);
     } else if (target.configValue) {
       if (