From 3b272ae41116ff0fd80ac2b24a1a8f85d221cd61 Mon Sep 17 00:00:00 2001
From: karwosts <32912880+karwosts@users.noreply.github.com>
Date: Tue, 25 Feb 2025 13:37:31 -0800
Subject: [PATCH] Allow entity-filter-card to filter on other entity (#24396)

---
 src/panels/lovelace/common/validate-condition.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/panels/lovelace/common/validate-condition.ts b/src/panels/lovelace/common/validate-condition.ts
index cea0baec88..9f200e1d48 100644
--- a/src/panels/lovelace/common/validate-condition.ts
+++ b/src/panels/lovelace/common/validate-condition.ts
@@ -191,6 +191,9 @@ export function extractConditionEntityIds(
   const entityIds = new Set<string>();
   for (const condition of conditions) {
     if (condition.condition === "numeric_state") {
+      if (condition.entity) {
+        entityIds.add(condition.entity);
+      }
       if (
         typeof condition.above === "string" &&
         isValidEntityId(condition.above)
@@ -204,6 +207,9 @@ export function extractConditionEntityIds(
         entityIds.add(condition.below);
       }
     } else if (condition.condition === "state") {
+      if (condition.entity) {
+        entityIds.add(condition.entity);
+      }
       [
         ...(ensureArray(condition.state) ?? []),
         ...(ensureArray(condition.state_not) ?? []),
@@ -304,8 +310,8 @@ export function addEntityToCondition(
     condition.condition === "numeric_state"
   ) {
     return {
-      ...condition,
       entity: entityId,
+      ...condition,
     };
   }
   return condition;