fix: person attributes typing

home-assistant · May 16, 2024 · 53476d6 · 53476d6
1 parent d84a4ee
commit 53476d6
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 8 deletions.
diff --git a/gallery/src/pages/lovelace/picture-elements-card.ts b/gallery/src/pages/lovelace/picture-elements-card.ts
@@ -27,7 +27,7 @@ const ENTITIES = [
   }),
   getEntity("person", "paulus", "home", {
     friendly_name: "Paulus",
-    picture: "/images/paulus.jpg",
+    entity_picture: "/images/paulus.jpg",
   }),
   getEntity("sensor", "battery", 35, {
     device_class: "battery",

diff --git a/gallery/src/pages/lovelace/picture-entity-card.ts b/gallery/src/pages/lovelace/picture-entity-card.ts
@@ -14,7 +14,7 @@ const ENTITIES = [
   }),
   getEntity("person", "paulus", "home", {
     friendly_name: "Paulus",
-    picture: "/images/paulus.jpg",
+    entity_picture: "/images/paulus.jpg",
   }),
 ];
 

diff --git a/gallery/src/pages/lovelace/picture-glance-card.ts b/gallery/src/pages/lovelace/picture-glance-card.ts
@@ -22,7 +22,7 @@ const ENTITIES = [
   }),
   getEntity("person", "paulus", "home", {
     friendly_name: "Paulus",
-    picture: "/images/paulus.jpg",
+    entity_picture: "/images/paulus.jpg",
   }),
   getEntity("sensor", "battery", 35, {
     device_class: "battery",

diff --git a/src/data/person.ts b/src/data/person.ts
@@ -1,4 +1,7 @@
-import { HassEntityBase } from "home-assistant-js-websocket";
+import {
+  HassEntityAttributeBase,
+  HassEntityBase,
+} from "home-assistant-js-websocket";
 import { HomeAssistant } from "../types";
 
 export interface BasePerson {
@@ -19,8 +22,18 @@ export interface PersonMutableParams {
   picture: string | null;
 }
 
+interface PersonEntityAttributes extends HassEntityAttributeBase {
+  id: string;
+  user_id?: string;
+  device_trackers?: string[];
+  editable?: boolean;
+  gps_accuracy?: number;
+  latitude?: number;
+  longitude?: number;
+}
+
 export interface PersonEntity extends HassEntityBase {
-  attributes: Person;
+  attributes: PersonEntityAttributes;
 }
 
 export const fetchPersons = (hass: HomeAssistant) =>

diff --git a/src/panels/lovelace/cards/hui-picture-elements-card.ts b/src/panels/lovelace/cards/hui-picture-elements-card.ts
@@ -136,7 +136,7 @@ class HuiPictureElementsCard extends LitElement implements LovelaceCard {
             .image=${domain === "image"
               ? computeImageUrl(stateObj as ImageEntity)
               : domain === "person"
-                ? (stateObj as PersonEntity).attributes.picture
+                ? (stateObj as PersonEntity).attributes.entity_picture
                 : this._config.image}
             .stateImage=${this._config.state_image}
             .stateFilter=${this._config.state_filter}

diff --git a/src/panels/lovelace/cards/hui-picture-entity-card.ts b/src/panels/lovelace/cards/hui-picture-entity-card.ts
@@ -149,7 +149,7 @@ class HuiPictureEntityCard extends LitElement implements LovelaceCard {
           .image=${domain === "image"
             ? computeImageUrl(stateObj as ImageEntity)
             : domain === "person"
-              ? (stateObj as PersonEntity).attributes.picture
+              ? (stateObj as PersonEntity).attributes.entity_picture
               : this._config.image}
           .stateImage=${this._config.state_image}
           .stateFilter=${this._config.state_filter}

diff --git a/src/panels/lovelace/cards/hui-picture-glance-card.ts b/src/panels/lovelace/cards/hui-picture-glance-card.ts
@@ -219,7 +219,7 @@ class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
           .image=${domain === "image"
             ? computeImageUrl(stateObj as ImageEntity)
             : domain === "person"
-              ? (stateObj as PersonEntity).attributes.picture
+              ? (stateObj as PersonEntity).attributes.entity_picture
               : this._config.image}
           .stateImage=${this._config.state_image}
           .stateFilter=${this._config.state_filter}