gracefully use the default config.image if the person don't have an i…

…mage (that works)
home-assistant · Jul 22, 2024 · 0eb8b77 · 0eb8b77
1 parent 349b116
commit 0eb8b77
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/src/panels/lovelace/cards/hui-picture-card.ts b/src/panels/lovelace/cards/hui-picture-card.ts
@@ -115,8 +115,10 @@ export class HuiPictureCard extends LitElement implements LovelaceCard {
         case "image":
           image = computeImageUrl(stateObj as ImageEntity);
           break;
-        case "person" && (stateObj as PersonEntity).attributes.entity_picture:
-          image = (stateObj as PersonEntity).attributes.entity_picture;
+        case "person":
+          if ((stateObj as PersonEntity).attributes.entity_picture) {
+            image = (stateObj as PersonEntity).attributes.entity_picture;
+          }
           break;
       }
     }

diff --git a/src/panels/lovelace/cards/hui-picture-elements-card.ts b/src/panels/lovelace/cards/hui-picture-elements-card.ts
@@ -127,8 +127,10 @@ class HuiPictureElementsCard extends LitElement implements LovelaceCard {
         case "image":
           image = computeImageUrl(stateObj as ImageEntity);
           break;
-        case "person" && (stateObj as PersonEntity).attributes.entity_picture:
-          image = (stateObj as PersonEntity).attributes.entity_picture;
+        case "person":
+          if ((stateObj as PersonEntity).attributes.entity_picture) {
+            image = (stateObj as PersonEntity).attributes.entity_picture;
+          }
           break;
       }
     }

diff --git a/src/panels/lovelace/cards/hui-picture-entity-card.ts b/src/panels/lovelace/cards/hui-picture-entity-card.ts
@@ -144,8 +144,10 @@ class HuiPictureEntityCard extends LitElement implements LovelaceCard {
       case "image":
         image = computeImageUrl(stateObj as ImageEntity);
         break;
-      case "person" && (stateObj as PersonEntity).attributes.entity_picture:
-        image = (stateObj as PersonEntity).attributes.entity_picture;
+      case "person":
+        if ((stateObj as PersonEntity).attributes.entity_picture) {
+          image = (stateObj as PersonEntity).attributes.entity_picture;
+        }
         break;
     }
 

diff --git a/src/panels/lovelace/cards/hui-picture-glance-card.ts b/src/panels/lovelace/cards/hui-picture-glance-card.ts
@@ -193,8 +193,10 @@ class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
         case "image":
           image = computeImageUrl(stateObj as ImageEntity);
           break;
-        case "person" && (stateObj as PersonEntity).attributes.entity_picture:
-          image = (stateObj as PersonEntity).attributes.entity_picture;
+        case "person":
+          if ((stateObj as PersonEntity).attributes.entity_picture) {
+            image = (stateObj as PersonEntity).attributes.entity_picture;
+          }
           break;
       }
     }