From a3ec83a684c64aae456af21e3820faf4b58edf2d Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 3 May 2023 11:47:58 +0200
Subject: [PATCH] Only count exposed entities with a state (#16391)

Only count entities with a state
---
 src/panels/config/voice-assistants/assist-pref.ts       | 6 ++++--
 src/panels/config/voice-assistants/cloud-alexa-pref.ts  | 6 ++++--
 src/panels/config/voice-assistants/cloud-google-pref.ts | 5 +++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/panels/config/voice-assistants/assist-pref.ts b/src/panels/config/voice-assistants/assist-pref.ts
index f16d13d11d..47149da4dd 100644
--- a/src/panels/config/voice-assistants/assist-pref.ts
+++ b/src/panels/config/voice-assistants/assist-pref.ts
@@ -51,8 +51,10 @@ export class AssistPref extends LitElement {
 
   private _exposedEntitiesCount = memoizeOne(
     (exposedEntities: Record<string, ExposeEntitySettings>) =>
-      Object.values(exposedEntities).filter((expose) => expose.conversation)
-        .length
+      Object.entries(exposedEntities).filter(
+        ([entityId, expose]) =>
+          expose.conversation && entityId in this.hass.states
+      ).length
   );
 
   protected render() {
diff --git a/src/panels/config/voice-assistants/cloud-alexa-pref.ts b/src/panels/config/voice-assistants/cloud-alexa-pref.ts
index a071eba07f..4f4eeef1cf 100644
--- a/src/panels/config/voice-assistants/cloud-alexa-pref.ts
+++ b/src/panels/config/voice-assistants/cloud-alexa-pref.ts
@@ -33,8 +33,10 @@ export class CloudAlexaPref extends LitElement {
 
   private _exposedEntitiesCount = memoizeOne(
     (exposedEntities: Record<string, ExposeEntitySettings>) =>
-      Object.values(exposedEntities).filter((expose) => expose["cloud.alexa"])
-        .length
+      Object.entries(exposedEntities).filter(
+        ([entityId, expose]) =>
+          expose["cloud.alexa"] && entityId in this.hass.states
+      ).length
   );
 
   protected willUpdate() {
diff --git a/src/panels/config/voice-assistants/cloud-google-pref.ts b/src/panels/config/voice-assistants/cloud-google-pref.ts
index 409319ffc9..ebdcdef163 100644
--- a/src/panels/config/voice-assistants/cloud-google-pref.ts
+++ b/src/panels/config/voice-assistants/cloud-google-pref.ts
@@ -45,8 +45,9 @@ export class CloudGooglePref extends LitElement {
 
   private _exposedEntitiesCount = memoizeOne(
     (exposedEntities: Record<string, ExposeEntitySettings>) =>
-      Object.values(exposedEntities).filter(
-        (expose) => expose["cloud.google_assistant"]
+      Object.entries(exposedEntities).filter(
+        ([entityId, expose]) =>
+          expose["cloud.google_assistant"] && entityId in this.hass.states
       ).length
   );