Entity not updating passed as string not object (#82)

Co-authored-by: Marco Kreeft <[email protected]>

info.md

@@ -2,7 +2,11 @@
 
 ### Features
 
-{% if version_installed.replace("v", "").replace(".","") | int < 10612  %}
+{% if version_installed.replace("v", "").replace(".","") | int < 10614  %}
+- Fixed `Entity not updating when passed as string and not object`
+{% endif %}
+
+{% if version_installed.replace("v", "").replace(".","") | int < 10613  %}
 - Fixed `Refreshing was not happening in editor and some entities`
 {% endif %}
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "room-card",
-  "version": "1.06.13",
+  "version": "1.06.14",
   "description": "Show entities in Home Assistant's Lovelace UI",
   "keywords": [
     "home-assistant",

src/util.ts

@@ -72,11 +72,15 @@ export const hideIfEntity = (entity: RoomCardEntity, hass: HomeAssistant) => {
 
 export const getEntityIds = (config: RoomCardConfig) : string[] => 
     [config.entity]
-        .concat(config.entities?.map((entity) => entity.entity))
-        .concat(config.info_entities?.map((entity) => entity.entity))
-        .concat(config.rows?.flatMap(row => row.entities).map((entity) => entity?.entity))
+        .concat(config.entities?.map((entity) => getEntity(entity)))
+        .concat(config.info_entities?.map((entity) => getEntity(entity)))
+        .concat(config.rows?.flatMap(row => row.entities).map((entity) => getEntity(entity)))
         .filter((entity) => entity);
 
+export const getEntity = (entity?: string | RoomCardEntity) : string => {
+    return entity === undefined ? null : typeof entity === 'string' ? entity : entity.entity;
+}
+
 export const hasConfigOrEntitiesChanged = (node: RoomCardConfig, changedProps: PropertyValues) => {
     if (changedProps.has('config')) {
         return true;

tests/util/getEntity.test.ts

@@ -0,0 +1,20 @@
+import { createMock } from 'ts-auto-mock';
+import { RoomCardEntity } from '../../src/types/room-card-types';
+import { getEntity } from '../../src/util';
+import { HassEntity } from 'home-assistant-js-websocket';
+
+describe('Testing util file function getEntity', () => {
+    test('Passing entity string should return entityId', () => {   
+        expect(getEntity('sensor.entity_sensor')).toBe('sensor.entity_sensor');
+    }),
+    test('Passing entity object should return entityId', () => {   
+        const entity: RoomCardEntity = {
+            stateObj: createMock<HassEntity>(),
+            entity: 'sensor.entity_sensor'
+        };
+        expect(getEntity(entity)).toBe('sensor.entity_sensor');
+    }),
+    test('Passing entity undefined should return null', () => {   
+        expect(getEntity(undefined)).toBe(null);
+    })
+})