From e2a9cf0d3c09b4e335ad70f66d3acb159db65737 Mon Sep 17 00:00:00 2001 From: Ian Richardson Date: Sat, 23 Mar 2019 13:09:30 -0500 Subject: [PATCH] Handle unavailable entity in conditional-card (#2996) * Handle unavailable entity in conditional-card * cleanup --- src/panels/lovelace/common/validate-condition.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/panels/lovelace/common/validate-condition.ts b/src/panels/lovelace/common/validate-condition.ts index 7775cafa40..e50707d871 100644 --- a/src/panels/lovelace/common/validate-condition.ts +++ b/src/panels/lovelace/common/validate-condition.ts @@ -11,13 +11,11 @@ export function checkConditionsMet( hass: HomeAssistant ): boolean { return conditions.every((c) => { - if (!(c.entity in hass.states)) { - return false; - } - if (c.state) { - return hass.states[c.entity].state === c.state; - } - return hass!.states[c.entity].state !== c.state_not; + const state = hass.states[c.entity] + ? hass!.states[c.entity].state + : "unavailable"; + + return c.state ? state === c.state : state !== c.state_not; }); }