From 3ae34403bd61722a7a7479a97159e5762d45228d Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Sun, 16 Feb 2025 05:06:01 -0800 Subject: [PATCH] Fix duplicate id in energy-devices-detail-graph-card (#24261) * Fix duplicate id in energy-devices-detail-graph-card * address compare * Update src/panels/lovelace/cards/energy/hui-energy-devices-detail-graph-card.ts Co-authored-by: Petar Petrov * prettier --------- Co-authored-by: Petar Petrov --- .../energy/hui-energy-devices-detail-graph-card.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/panels/lovelace/cards/energy/hui-energy-devices-detail-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-devices-detail-graph-card.ts index 42edcdaacc..82ae3d31a4 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-devices-detail-graph-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-devices-detail-graph-card.ts @@ -448,7 +448,15 @@ export class HuiEnergyDevicesDetailGraphCard }); }); return sorted_devices - .map((device) => data.find((d) => (d.id as string).includes(device))!) + .map( + (device) => + data.find((d) => { + const id = (d.id as string) + .replace(/^compare-/, "") // Remove compare- prefix + .replace(/-\d+$/, ""); // Remove numeric suffix + return id === device; + })! + ) .filter(Boolean); }