From 3ebe6027be64763d83064597351fab236c60ac35 Mon Sep 17 00:00:00 2001
From: karwosts <32912880+karwosts@users.noreply.github.com>
Date: Mon, 13 May 2024 09:41:51 -0700
Subject: [PATCH] Minor fixes to energy sources behavior (#20785)

---
 src/panels/energy/strategies/energy-view-strategy.ts        | 6 ++++--
 .../lovelace/cards/energy/hui-energy-sources-table-card.ts  | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/panels/energy/strategies/energy-view-strategy.ts b/src/panels/energy/strategies/energy-view-strategy.ts
index d41ea668ba..8fd05b0412 100644
--- a/src/panels/energy/strategies/energy-view-strategy.ts
+++ b/src/panels/energy/strategies/energy-view-strategy.ts
@@ -47,7 +47,9 @@ export class EnergyViewStrategy extends ReactiveElement {
     view.type = "sidebar";
 
     const hasGrid = prefs.energy_sources.find(
-      (source) => source.type === "grid"
+      (source) =>
+        source.type === "grid" &&
+        (source.flow_from?.length || source.flow_to?.length)
     ) as GridSourceTypeEnergyPreference;
     const hasReturn = hasGrid && hasGrid.flow_to.length;
     const hasSolar = prefs.energy_sources.some(
@@ -110,7 +112,7 @@ export class EnergyViewStrategy extends ReactiveElement {
       });
     }
 
-    if (hasGrid || hasSolar) {
+    if (hasGrid || hasSolar || hasGas || hasWater) {
       view.cards!.push({
         title: hass.localize(
           "ui.panel.energy.cards.energy_sources_table_title"
diff --git a/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts b/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts
index 4373c30bd1..1a9ffb235e 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts
@@ -694,7 +694,9 @@ export class HuiEnergySourcesTableCard
                     </tr>`;
                   })}`
               )}
-              ${types.grid
+              ${types.grid &&
+              (types.grid?.[0].flow_from?.length ||
+                types.grid?.[0].flow_to?.length)
                 ? html` <tr class="mdc-data-table__row total">
                     <td class="mdc-data-table__cell"></td>
                     <th class="mdc-data-table__cell" scope="row">