From 6ba6b821f59c71780b0b8d3ec95d79494c244c66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 7 Sep 2021 10:21:51 +0300 Subject: [PATCH] Use SENSOR_DEVICE_CLASS_* constants more (#9982) --- src/common/entity/sensor_icon.ts | 3 ++- src/panels/lovelace/cards/hui-glance-card.ts | 4 +++- src/state-summary/state-card-display.ts | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/common/entity/sensor_icon.ts b/src/common/entity/sensor_icon.ts index 16d5b5c065..fa9bed83ce 100644 --- a/src/common/entity/sensor_icon.ts +++ b/src/common/entity/sensor_icon.ts @@ -2,6 +2,7 @@ import { HassEntity } from "home-assistant-js-websocket"; import { FIXED_DEVICE_CLASS_ICONS, UNIT_C, UNIT_F } from "../const"; import { batteryIcon } from "./battery_icon"; +import { SENSOR_DEVICE_CLASS_BATTERY } from "../../data/sensor"; export const sensorIcon = (stateObj?: HassEntity): string | undefined => { const dclass = stateObj?.attributes.device_class; @@ -10,7 +11,7 @@ export const sensorIcon = (stateObj?: HassEntity): string | undefined => { return FIXED_DEVICE_CLASS_ICONS[dclass]; } - if (dclass === "battery") { + if (dclass === SENSOR_DEVICE_CLASS_BATTERY) { return stateObj ? batteryIcon(stateObj) : "hass:battery"; } diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts index d308df7b4e..d0a4b7bc95 100644 --- a/src/panels/lovelace/cards/hui-glance-card.ts +++ b/src/panels/lovelace/cards/hui-glance-card.ts @@ -23,6 +23,7 @@ import { CallServiceActionConfig, MoreInfoActionConfig, } from "../../../data/lovelace"; +import { SENSOR_DEVICE_CLASS_TIMESTAMP } from "../../../data/sensor"; import { HomeAssistant } from "../../../types"; import { actionHandler } from "../common/directives/action-handler-directive"; import { findEntities } from "../common/find-entities"; @@ -316,7 +317,8 @@ export class HuiGlanceCard extends LitElement implements LovelaceCard { ? html`
${computeDomain(entityConf.entity) === "sensor" && - stateObj.attributes.device_class === "timestamp" && + stateObj.attributes.device_class === + SENSOR_DEVICE_CLASS_TIMESTAMP && !UNAVAILABLE_STATES.includes(stateObj.state) ? html` ${computeDomain(this.stateObj.entity_id) === "sensor" && - this.stateObj.attributes.device_class === "timestamp" && + this.stateObj.attributes.device_class === + SENSOR_DEVICE_CLASS_TIMESTAMP && !UNAVAILABLE_STATES.includes(this.stateObj.state) ? html`