fix: Fix conditions re-triggering incorrectly in certain cases (#1950)
- Closes #1948 [skip ci]
This commit is contained in:
@@ -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();
|
||||
|
||||
@@ -75,7 +75,7 @@ export class AutomationsManager {
|
||||
|
||||
await this._api
|
||||
.getActionsManager()
|
||||
.executeActions(actions, { triggerData: result.data });
|
||||
.executeActions(actions, { triggerData: result.triggerData });
|
||||
|
||||
--this._nestedAutomationExecutions;
|
||||
};
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user