move stateObj.entity_id check to render since it's not defined on set…

…Config

src/classes/service-call-button.ts

@@ -1,7 +1,9 @@
 import { HomeAssistant } from 'custom-card-helpers';
+
 import { LitElement, TemplateResult, html, css } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { styleMap } from 'lit/directives/style-map.js';
+
 import { IEntry } from '../models/interfaces';
 
 @customElement('service-call-button')

src/service-call-tile-feature.ts

@@ -14,12 +14,9 @@ console.info(
 );
 
 class ServiceCallTileFeature extends LitElement {
-	@property({ attribute: false })
-	hass!: HomeAssistant;
-	@property({ attribute: false })
-	private config!: IConfig;
-	@property({ attribute: false })
-	private stateObj!: HassEntity;
+	@property({ attribute: false }) hass!: HomeAssistant;
+	@property({ attribute: false }) private config!: IConfig;
+	@property({ attribute: false }) private stateObj!: HassEntity;
 
 	constructor() {
 		super();
@@ -56,15 +53,6 @@ class ServiceCallTileFeature extends LitElement {
 				...(entry.target || {}),
 			};
 
-			// Set entity ID to tile card entity ID if no other ID is present
-			if (
-				!('entity_id' in entry.data) &&
-				!('device_id' in entry.data) &&
-				!('area_id' in entry.data)
-			) {
-				entry.data['entity_id'] = this.stateObj.entity_id;
-			}
-
 			// Set entry type to button if not present
 			if (!('type' in entry)) {
 				(entry as IEntry).type = 'button';
@@ -159,6 +147,15 @@ class ServiceCallTileFeature extends LitElement {
 		for (const [itemid, entry] of this.config.entries.entries()) {
 			let renderedEntry: TemplateResult;
 
+			// Set entity ID to tile card entity ID if no other ID is present
+			if (
+				!('entity_id' in entry.data!) &&
+				!('device_id' in entry.data!) &&
+				!('area_id' in entry.data!)
+			) {
+				entry.data!['entity_id'] = this.stateObj.entity_id;
+			}
+
 			const entryType = entry.type;
 			switch (entryType.toLowerCase()) {
 				case 'slider':