From 1d747c0901b73272a1811eecac944aa267260388 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Wed, 12 Mar 2025 02:31:12 -0400
Subject: [PATCH] Simplify CO2Signal check (#24566)

* Simplify CO2Signal check

* Remove more references.

* Update energy.ts
---
 src/data/energy.ts | 39 +++++++++++++--------------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/src/data/energy.ts b/src/data/energy.ts
index b60b299ae4..de4e014409 100644
--- a/src/data/energy.ts
+++ b/src/data/energy.ts
@@ -21,8 +21,6 @@ import {
 import { formatTime24h } from "../common/datetime/format_time";
 import { groupBy } from "../common/util/group-by";
 import type { HomeAssistant } from "../types";
-import type { ConfigEntry } from "./config_entries";
-import { getConfigEntries } from "./config_entries";
 import type {
   Statistics,
   StatisticsMetaData,
@@ -270,7 +268,6 @@ export interface EnergyData {
   stats: Statistics;
   statsMetadata: Record<string, StatisticsMetaData>;
   statsCompare: Statistics;
-  co2SignalConfigEntry?: ConfigEntry;
   co2SignalEntity?: string;
   fossilEnergyConsumption?: FossilEnergyConsumption;
   fossilEnergyConsumptionCompare?: FossilEnergyConsumption;
@@ -348,31 +345,22 @@ const getEnergyData = async (
   end?: Date,
   compare?: boolean
 ): Promise<EnergyData> => {
-  const [configEntries, info] = await Promise.all([
-    getConfigEntries(hass, { domain: "co2signal" }),
-    getEnergyInfo(hass),
-  ]);
-
-  const co2SignalConfigEntry = configEntries.length
-    ? configEntries[0]
-    : undefined;
+  const info = await getEnergyInfo(hass);
 
   let co2SignalEntity: string | undefined;
-  if (co2SignalConfigEntry) {
-    for (const entity of Object.values(hass.entities)) {
-      if (entity.platform !== "co2signal") {
-        continue;
-      }
-
-      // The integration offers 2 entities. We want the % one.
-      const co2State = hass.states[entity.entity_id];
-      if (!co2State || co2State.attributes.unit_of_measurement !== "%") {
-        continue;
-      }
-
-      co2SignalEntity = co2State.entity_id;
-      break;
+  for (const entity of Object.values(hass.entities)) {
+    if (entity.platform !== "co2signal") {
+      continue;
     }
+
+    // The integration offers 2 entities. We want the % one.
+    const co2State = hass.states[entity.entity_id];
+    if (!co2State || co2State.attributes.unit_of_measurement !== "%") {
+      continue;
+    }
+
+    co2SignalEntity = co2State.entity_id;
+    break;
   }
 
   const consumptionStatIDs: string[] = [];
@@ -562,7 +550,6 @@ const getEnergyData = async (
     stats,
     statsMetadata,
     statsCompare,
-    co2SignalConfigEntry,
     co2SignalEntity,
     fossilEnergyConsumption,
     fossilEnergyConsumptionCompare,