Honor entity ordering in statistics graph card (#16504)

home-assistant · May 11, 2023 · ae8eafe · ae8eafe
1 parent 4505657
commit ae8eafe
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/panels/lovelace/cards/hui-statistics-graph-card.ts b/src/panels/lovelace/cards/hui-statistics-graph-card.ts
@@ -251,7 +251,7 @@ export class HuiStatisticsGraphCard extends LitElement implements LovelaceCard {
           : undefined;
       }
       const unitconfig = unitClass ? { [unitClass]: this._unit } : undefined;
-      this._statistics = await fetchStatistics(
+      const statistics = await fetchStatistics(
         this.hass!,
         startDate,
         undefined,
@@ -260,6 +260,13 @@ export class HuiStatisticsGraphCard extends LitElement implements LovelaceCard {
         unitconfig,
         this._statTypes
       );
+
+      this._statistics = {};
+      this._entities.forEach((id) => {
+        if (id in statistics) {
+          this._statistics![id] = statistics[id];
+        }
+      });
     } catch (err) {
       this._statistics = undefined;
     }