219 setting an entity alongside any type of tap action is ignored (#234)

* Fix entity alongside any type of tap_action

* Updated info.md

* Fixed Navigation header url not working

* Updated libs

Author: marcokreeft87

info.md

@@ -1,6 +1,10 @@
 {% if installed %}
 
 ### Features
+{% if version_installed.replace("v", "").replace(".","") | int < 10722  %}
+- Fixed `Navigation header url not working`
+{% endif %}
+
 {% if version_installed.replace("v", "").replace(".","") | int < 10721  %}
 - Fixed `entity alongside any type of tap_actions`
 {% endif %}

package-lock.json

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

package.json

@@ -185,17 +185,17 @@ export const clickHandler = (element: LitElement, hass: HomeAssistant, entity: R
 
 export const generateActions = (config: RoomCardConfig, entity: RoomCardEntity) => {
     return { 
-        tap_action: generateAction(config.tap_action, entity),
-        double_tap_action: generateAction(config.double_tap_action, entity),
-        hold_action: generateAction(config.hold_action, entity),
+        tap_action: checkAction(config.tap_action, entity?.tap_action),
+        double_tap_action: checkAction(config.double_tap_action, entity?.double_tap_action),
+        hold_action: checkAction(config.hold_action, entity?.hold_action),
       } as RoomCardEntity
 }
 
-export const generateAction = (action: ActionConfig, entity: RoomCardEntity) => {
-    return entity && action?.action !== undefined && action.action !== "more-info" ? entity : action;
+export const checkAction = (action: ActionConfig, entityAction: ActionConfig) => {
+    return entityAction ?? action;
 }
 
-export const renderTitle = (config: RoomCardConfig, hass: HomeAssistant, element: LitElement, entity?: RoomCardEntity, ) : HTMLTemplateResult => {
+export const renderTitle = (config: RoomCardConfig, hass: HomeAssistant, element: LitElement, entity?: RoomCardEntity) : HTMLTemplateResult => {
     if(config.hide_title === true)
         return null;
 

room-card.js

@@ -176,7 +176,8 @@ describe('Testing entity file function renderValue', () => {
         const entity: RoomCardEntity = {
             stateObj: stateObj,
             show_icon: true,
-            icon: 'mdi:table'
+            icon: 'mdi:table',
+            tap_action: { action: 'navigate' } as NavigateActionConfig
         };
 
         stateObj.attributes['title'] = "Test title";