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

* Fix entity alongside any type of tap_action

* Updated info.md

info.md

@@ -1,6 +1,10 @@
 {% if installed %}
 
 ### Features
+{% if version_installed.replace("v", "").replace(".","") | int < 10721  %}
+- Fixed `entity alongside any type of tap_actions`
+{% endif %}
+
 {% if version_installed.replace("v", "").replace(".","") | int < 10720  %}
 - Added `seperated card_styles and main entity styles`
 {% endif %}

package.json

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

src/entity.ts

@@ -2,7 +2,7 @@ import { secondsToDuration } from './lib/seconds_to_duration';
 import { formatNumber } from './lib/format_number';
 import { computeStateDisplay, computeStateDomain } from './lib/compute_state_display';
 import { checkConditionalValue, evalTemplate, getValue, isObject, isUnavailable, renderClasses } from './util';
-import { ActionHandlerEvent, handleAction, hasAction, HomeAssistant } from 'custom-card-helpers';
+import { ActionConfig, ActionHandlerEvent, handleAction, hasAction, HomeAssistant } from 'custom-card-helpers';
 import { HomeAssistantEntity, EntityCondition, RoomCardEntity, RoomCardIcon, RoomCardConfig, EntityStyles, RoomCardRow, RoomCardAttributeTemplate } from './types/room-card-types';
 import { html, HTMLTemplateResult, LitElement } from 'lit';
 import { LAST_CHANGED, LAST_UPDATED, TIMESTAMP_FORMATS } from './lib/constants';
@@ -183,17 +183,25 @@ export const clickHandler = (element: LitElement, hass: HomeAssistant, entity: R
     handleAction(element, hass, entity, ev.detail.action);
 }
 
+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),
+      } as RoomCardEntity
+}
+
+export const generateAction = (action: ActionConfig, entity: RoomCardEntity) => {
+    return entity && action?.action !== undefined && action.action !== "more-info" ? entity : action;
+}
+
 export const renderTitle = (config: RoomCardConfig, hass: HomeAssistant, element: LitElement, entity?: RoomCardEntity, ) : HTMLTemplateResult => {
     if(config.hide_title === true)
         return null;
 
     const _handleAction = (ev: ActionHandlerEvent): void => {
         if (hass && ev.detail.action) {
-            clickHandler(element, hass, entity ?? { 
-                tap_action: config.tap_action,
-                double_tap_action: config.double_tap_action,
-                hold_action: config.hold_action
-              } as RoomCardEntity, ev);
+            clickHandler(element, hass, generateActions(config, entity), ev);
         }
     }
 

tests/entity/renderTitle.test.ts

@@ -1,4 +1,4 @@
-import { ActionHandlerEvent, HomeAssistant, MoreInfoActionConfig } from 'custom-card-helpers';
+import { ActionHandlerEvent, HomeAssistant, MoreInfoActionConfig, NavigateActionConfig } from 'custom-card-helpers';
 import { LitElement } from "lit";
 import { createMock } from "ts-auto-mock";
 import { renderTitle } from "../../src/entity";
@@ -168,6 +168,39 @@ describe('Testing entity file function renderValue', () => {
 
         endFn(mouseEvent);
 
+        expect(clickHandler).toHaveBeenCalled();
+    }),
+    test('Mouseclick should trigger action', () => {   
+
+        const clickHandler = jest.spyOn(entityModule, 'clickHandler');
+        const entity: RoomCardEntity = {
+            stateObj: stateObj,
+            show_icon: true,
+            icon: 'mdi:table'
+        };
+
+        stateObj.attributes['title'] = "Test title";
+
+        const config: RoomCardConfig = {
+            entityIds: ['light.test_entity'],
+            type: '',
+            tap_action: { action: 'navigate' } as NavigateActionConfig,
+            title: 'Test'
+        };
+
+        const result = renderTitle(config, hass, element, entity);
+
+        // eslint-disable-next-line @typescript-eslint/ban-types
+        const endFn = result.values[1] as Function;
+
+        const mouseEvent = createMock<ActionHandlerEvent>({
+            detail: {
+                action: 'test'
+            }
+        });
+
+        endFn(mouseEvent);
+
         expect(clickHandler).toHaveBeenCalled();
     })
 });