Card not updating on every state change (#85)

* Card not updating on every state change
marcokreeft87 · Oct 12, 2022 · 3054e76 · 3054e76
1 parent fc0217f
commit 3054e76
Show file tree

Hide file tree

Showing 12 changed files with 61 additions and 20 deletions.
diff --git a/info.md b/info.md
@@ -1,6 +1,10 @@
 {% if installed %}
 
 ### Features
+{% if version_installed.replace("v", "").replace(".","") | int < 10621  %}
+- Fixed `Cards not updating on every state change`
+{% endif %}
+
 {% if version_installed.replace("v", "").replace(".","") | int < 10620  %}
 - Added `Hide_if for cards`
 {% endif %}

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "room-card",
-  "version": "1.06.20",
+  "version": "1.06.21",
   "description": "Show entities in Home Assistant's Lovelace UI",
   "keywords": [
     "home-assistant",

diff --git a/room-card.js b/room-card.js
diff --git a/room-card.js.gz b/room-card.js.gz
diff --git a/src/entity.ts b/src/entity.ts
@@ -10,7 +10,7 @@ import { templateStyling } from './template';
 import { hideIfEntity, hideIfRow } from './hide';
 
 export const checkConfig = (config: RoomCardConfig) => {
-    if (config.entities == undefined && config.entity == undefined && config.info_entities == undefined && config.rows == undefined) {
+    if (config.entities == undefined && config.entity == undefined && config.info_entities === undefined && config.rows === undefined && config.cards === undefined) {
         throw new Error('Please define entities.');
     }
 };

diff --git a/src/lib/format_date_time.ts b/src/lib/format_date_time.ts
@@ -9,5 +9,5 @@ export const formatDateTime = (dateObj: Date, locale: FrontendLocaleData) => new
     day: 'numeric',
     hour: useAmPm(locale) ? 'numeric' : '2-digit',
     minute: '2-digit',
-    hour12: useAmPm(locale),
+    hour12: useAmPm(locale)
 }).format(dateObj);
diff --git a/src/util.ts b/src/util.ts
@@ -23,6 +23,7 @@ export const getEntityIds = (config: RoomCardConfig) : string[] =>
         .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)))
+        .concat(config.cards?.map((card) => getEntity(card.entity)))
         .filter((entity) => entity);
 
 export const getEntity = (entity?: string | RoomCardEntity) : string => {

diff --git a/tests/entity/checkConfig.test.ts b/tests/entity/checkConfig.test.ts
@@ -60,6 +60,16 @@ describe('Testing entity file function checkConfig', () => {
               }]
         }
         expect(() => checkConfig(config)).not.toThrowError('Please define entities.');
+    }),
+    test('Passing RoomCardConfig with cards should not throw error', () => {   
+        const config: RoomCardConfig = {
+            entityIds: [],
+            type: '',
+            cards: [{
+                type: 'custom:room-card'
+              }]
+        }
+        expect(() => checkConfig(config)).not.toThrowError('Please define entities.');
     })
 })
 
diff --git a/tests/lib/compute_state_display.test.ts b/tests/lib/compute_state_display.test.ts
@@ -9,7 +9,7 @@ describe('Testing compute_state_display file', () => {
     const hass = createMock<HomeAssistant>();
     hass.localize = jest.fn();
     hass.locale = {
-        language: 'nl', 
+        language: 'nl-NL', 
         number_format: NumberFormat.decimal_comma,
         time_format: TimeFormat.twenty_four
     }
@@ -42,21 +42,21 @@ describe('Testing compute_state_display file', () => {
     ${'100'}  ${'m'}   ${'sensor'}    ${'100 m'}    ${'sensor.distance'}    ${'100'}
     ${'100'}  ${undefined}   ${'sensor'}    ${'100'}    ${'sensor.distance'}    ${'100'}
     ${'100.233'}  ${'€'}   ${'monetary'}    ${'100,23 €'}    ${'sensor.money'}  ${'100.233'}
-    ${'2022-01-01 10:00'}  ${''}   ${''}    ${'1 januari 2022 om 10:00'}    ${'input_datetime.money'}  ${'2022-01-01 10:00'}
+    ${'2022-01-01 10:00'}  ${''}   ${''}    ${'1 januari 2022 10:00'}    ${'input_datetime.money'}  ${'2022-01-01 10:00'}
     ${'2022-01-01'}  ${''}   ${''}    ${'1 januari 2022'}    ${'input_datetime.money'}  ${'2022-01-01'}
     ${'10:00'}  ${''}   ${''}    ${'10:00'}    ${'input_datetime.money'}    ${'10:00'}
     ${'test'}  ${''}   ${''}    ${'test'}    ${'input_datetime.money'}  ${'test'}
     ${'10:test'}  ${''}   ${''}    ${'10:test'}    ${'input_datetime.money'}    ${'10:test'}
-    ${'2022-01-01 10:00'}  ${''}   ${''}    ${'1 januari 2022 om 10:00'}    ${'input_datetime.money'}  ${undefined}
+    ${'2022-01-01 10:00'}  ${''}   ${''}    ${'1 januari 2022 10:00'}    ${'input_datetime.money'}  ${undefined}
     ${'2022-01-01'}  ${''}   ${''}    ${'1 januari 2022'}    ${'input_datetime.money'}  ${undefined}
     ${'10:00'}  ${''}   ${''}    ${'10:00'}    ${'input_datetime.money'}  ${undefined}
     ${'test'}  ${''}   ${''}    ${'test'}    ${'input_datetime.money'}  ${undefined}
     ${'on'}  ${''}   ${''}    ${'24 %'}    ${'humidifier.money'}  ${undefined}
     ${'25'}  ${''}   ${''}    ${'25'}    ${'counter.money'}  ${undefined}
     ${'25'}  ${''}   ${''}    ${'25'}    ${'number.money'}  ${undefined}
     ${'25'}  ${''}   ${''}    ${'25'}    ${'input_number.money'}  ${undefined}
-    ${'2022-01-01 10:00'}  ${''}   ${''}    ${'1 januari 2022 om 10:00'}    ${'button.money'}  ${undefined}
-    ${'2022-01-01 10:00'}  ${''}   ${'timestamp'}    ${'1 januari 2022 om 10:00'}    ${'sensor.money'}  ${undefined}
+    ${'2022-01-01 10:00'}  ${''}   ${''}    ${'1 januari 2022 10:00'}    ${'button.money'}  ${undefined}
+    ${'2022-01-01 10:00'}  ${''}   ${'timestamp'}    ${'1 januari 2022 10:00'}    ${'sensor.money'}  ${undefined}
     ${'testvalue'}  ${''}   ${'switch'}    ${'testvalue'}    ${'sensor.money'}  ${'testvalue'}
     `('Passing LocalizeFunc, HomeAssistantEntity, FrontendLocaleData with numeric stateObj should call localize function', 
     ({ objstate, unit_of_measurement, device_class, expected, entity_id, state}) => {        
@@ -97,6 +97,10 @@ describe('Testing compute_state_display file', () => {
             }
         }
 
-        expect(computeStateDisplay(hass.localize, stateObj, hass.locale, state)).toBe(expected);
+
+        const result = computeStateDisplay(hass.localize, stateObj, hass.locale, state).split(' ');
+        expected.split(' ').forEach((x: string) => expect(result).toContain(x));
+
+        //expect(expected.split(' ')).toContain(computeStateDisplay(hass.localize, stateObj, hass.locale, state));
     })
 });
diff --git a/tests/lib/format_date_time.test.ts b/tests/lib/format_date_time.test.ts
@@ -3,21 +3,23 @@ import { formatDateTime } from "../../src/lib/format_date_time";
 
 describe('Testing format_date_time file', () => {
     const locale = {
-        language: 'NL', 
+        language: 'nl-NL', 
         number_format: NumberFormat.comma_decimal,
         time_format: TimeFormat.language
     }
 
 
     test.each`
     date | expected | time_format
-    ${'2022-01-01T10:00'}  ${'1 januari 2022 om 10:00'}  ${TimeFormat.language} 
-    ${'2022-01-01T10:00'}  ${'1 januari 2022 om 10:00 a.m.'}  ${TimeFormat.am_pm} 
-    ${'2022-01-01T10:00'}  ${'1 januari 2022 om 10:00'}  ${TimeFormat.twenty_four} 
-    ${'2022-01-01T10:00'}  ${'1 januari 2022 om 10:00'}  ${TimeFormat.system} 
+    ${'2022-01-01T10:00'}  ${'1 januari 2022 10:00'}  ${TimeFormat.language} 
+    ${'2022-01-01T10:00'}  ${'1 januari 2022 10:00 a.m.'}  ${TimeFormat.am_pm} 
+    ${'2022-01-01T10:00'}  ${'1 januari 2022 10:00'}  ${TimeFormat.twenty_four} 
+    ${'2022-01-01T10:00'}  ${'1 januari 2022 10:00'}  ${TimeFormat.system} 
     `('Passing date and locale should return formatted datetime', ({ date, expected, time_format }) => {  
 
         locale.time_format = time_format
-        expect(formatDateTime(new Date(date), locale)).toBe(expected);
+
+        const result = formatDateTime(new Date(date), locale).split(' ');
+        expected.split(' ').forEach((x: string) => expect(result).toContain(x));
     })
 });
diff --git a/tests/util/getEntityIds.test.ts b/tests/util/getEntityIds.test.ts
@@ -115,5 +115,25 @@ describe('Testing util file function getEntityIds', () => {
         expect(getEntityIds(config)).toMatchObject([
             'sensor.entity', 'sensor.entity2', 'sensor.entity3', 'sensor.entity4'
         ]);
+    }),
+    test('Passing cards should return row entites', () => {
+        const config: RoomCardConfig = {
+            info_entities: undefined,
+            entities: undefined,
+            entity: undefined,
+            cards: [{
+               type: 'custom:room-card',
+               entity: 'sensor.entity',
+            },
+            {
+                type: 'custom:room-card',
+                entity: 'sensor.entity2',
+             }],
+            entityIds: [],
+            type: ''
+        } 
+        expect(getEntityIds(config)).toMatchObject([
+            'sensor.entity', 'sensor.entity2'
+        ]);
     })
 })