Format state value in info

Anonym-tsk · Jan 13, 2024 · f194825 · f194825
1 parent 8fcb02f
commit f194825
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 11 deletions.
diff --git a/src/global.d.ts b/src/global.d.ts
@@ -1,20 +1,48 @@
 declare type StateValue = number | string | boolean;
 
-interface EntityState {
-    state: StateValue;
-    attributes: Record<string, StateValue>;
-}
-
 interface Entity {
     entity_id: string;
     device_id: string;
 }
 
+type Context = {
+  id: string;
+  user_id: string | null;
+  parent_id: string | null;
+};
+
+type HassEntityBase = {
+  entity_id: string;
+  state: string;
+  last_changed: string;
+  last_updated: string;
+  attributes: HassEntityAttributeBase;
+  context: Context;
+};
+
+type HassEntityAttributeBase = {
+  friendly_name?: string;
+  unit_of_measurement?: string;
+  icon?: string;
+  entity_picture?: string;
+  supported_features?: number;
+  hidden?: boolean;
+  assumed_state?: boolean;
+  device_class?: string;
+  state_class?: string;
+  restored?: boolean;
+};
+
+type HassEntity = HassEntityBase & {
+  attributes: { [key: string]: any };
+};
+
 interface Hass {
     language: string;
-    states: Record<string, EntityState>;
+    states: Record<string, HassEntity>;
     entities: Record<string, Entity>;
     callService: (event: string, action: string, data: { [key: string]: StateValue }) => void;
+    formatEntityState: (stateObj: HassEntity, state?: string) => '',
 }
 
 interface CustomCard {

diff --git a/src/ts/StarlineCard.ts b/src/ts/StarlineCard.ts
@@ -175,6 +175,15 @@ export class StarlineCard extends HTMLElement {
         return null;
     }
 
+    _getStateObject(entity_id: ConfigEntity): HassEntity | null {
+        const entityName = this._config.entities?.[entity_id];
+        if (!entityName || !this._hass) {
+            return null;
+        }
+
+        return this._hass.states[entityName];
+    }
+
     _getAttr(entity_id: ConfigEntity, name: string): StateValue | null {
         const entityName = this._config.entities?.[entity_id];
         if (!entityName) {
@@ -277,12 +286,16 @@ export class StarlineCard extends HTMLElement {
                 const state = this._getState(key);
                 visible = state !== null;
 
-                if (state !== null && state !== data.value) {
+                if (state !== null && state !== data.value && this._hass) {
                     this._info[key].value = state;
-                    // Не показываем 'satellites' для спутников
-                    const unit = key === 'gps' ? '' :
-                        this._getAttr(key, 'unit_of_measurement');
-                    this._info[key].element!.querySelector('.info-i-cnt')!.textContent = `${state} ${unit}`;
+
+                    const stateObj = this._getStateObject(key)!;
+                    if (key === 'gps') {
+                        // Не показываем 'satellites' для спутников
+                        stateObj.attributes.unit_of_measurement = '';
+                    }
+
+                    this._info[key].element!.querySelector('.info-i-cnt')!.textContent = this._hass.formatEntityState(stateObj);
                 }
             }