fix: Fix conditions re-triggering incorrectly in certain cases (#1950)

- Closes #1948


[skip ci]
This commit is contained in:
Dermot Duffy
2025-03-07 20:28:45 -08:00
committed by GitHub
parent 7daf580c7a
commit dbd47c93c1
7 changed files with 210 additions and 102 deletions
@@ -1,6 +1,6 @@
import { ActionContext } from 'action';
import { z } from 'zod';
import { ConditionsEvaluationData } from '../../conditions/types.js';
import { ConditionsTriggerData } from '../../conditions/types.js';
import { Actions, ActionsConfig, ActionType } from '../../config/types.js';
import { getActionConfigGivenAction } from '../../utils/action.js';
import { TemplateRenderer } from '../templates/index.js';
@@ -115,7 +115,7 @@ export class ActionsManager {
action: ActionType | ActionType[],
options?: {
config?: AuxillaryActionConfig;
triggerData?: ConditionsEvaluationData;
triggerData?: ConditionsTriggerData;
},
): Promise<void> {
const hass = this._api.getHASSManager().getHASS();
+1 -1
View File
@@ -75,7 +75,7 @@ export class AutomationsManager {
await this._api
.getActionsManager()
.executeActions(actions, { triggerData: result.data });
.executeActions(actions, { triggerData: result.triggerData });
--this._nestedAutomationExecutions;
};
+4 -4
View File
@@ -1,12 +1,12 @@
import { HomeAssistant } from '@dermotduffy/custom-card-helpers';
import { HASS, renderTemplate } from 'ha-nunjucks/dist';
import { ConditionsEvaluationData, ConditionState } from '../../conditions/types';
import { ConditionsTriggerData, ConditionState } from '../../conditions/types';
import { ActionType } from '../../config/types';
interface TemplateContextInternal {
camera?: string;
view?: string;
trigger?: ConditionsEvaluationData;
trigger?: ConditionsTriggerData;
}
interface TemplateContext {
@@ -22,7 +22,7 @@ export class TemplateRenderer {
data: unknown,
options?: {
conditionState?: ConditionState;
triggerData?: ConditionsEvaluationData;
triggerData?: ConditionsTriggerData;
},
): ActionType => {
return this._renderTemplateRecursively(
@@ -37,7 +37,7 @@ export class TemplateRenderer {
protected _conditionStateToTemplateContext(
conditionState?: ConditionState,
triggerData?: ConditionsEvaluationData,
triggerData?: ConditionsTriggerData,
): TemplateContext | undefined {
if (!conditionState?.camera && !conditionState?.view && !triggerData) {
return;