From 3ce4e53b3206eb906724893dd79115df733f0112 Mon Sep 17 00:00:00 2001 From: Erik Montnemery Date: Wed, 31 Jan 2024 20:41:53 +0100 Subject: [PATCH] Sort script actions (#108247) --- homeassistant/helpers/config_validation.py | 40 +++++++++++----------- homeassistant/helpers/script.py | 8 ++--- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/homeassistant/helpers/config_validation.py b/homeassistant/helpers/config_validation.py index 497a00e40b2..bdf9897a4ba 100644 --- a/homeassistant/helpers/config_validation.py +++ b/homeassistant/helpers/config_validation.py @@ -1793,21 +1793,21 @@ _SCRIPT_PARALLEL_SCHEMA = vol.Schema( ) -SCRIPT_ACTION_DELAY = "delay" -SCRIPT_ACTION_WAIT_TEMPLATE = "wait_template" -SCRIPT_ACTION_CHECK_CONDITION = "condition" -SCRIPT_ACTION_FIRE_EVENT = "event" -SCRIPT_ACTION_CALL_SERVICE = "call_service" -SCRIPT_ACTION_DEVICE_AUTOMATION = "device" SCRIPT_ACTION_ACTIVATE_SCENE = "scene" -SCRIPT_ACTION_REPEAT = "repeat" +SCRIPT_ACTION_CALL_SERVICE = "call_service" +SCRIPT_ACTION_CHECK_CONDITION = "condition" SCRIPT_ACTION_CHOOSE = "choose" -SCRIPT_ACTION_WAIT_FOR_TRIGGER = "wait_for_trigger" -SCRIPT_ACTION_VARIABLES = "variables" -SCRIPT_ACTION_STOP = "stop" +SCRIPT_ACTION_DELAY = "delay" +SCRIPT_ACTION_DEVICE_AUTOMATION = "device" +SCRIPT_ACTION_FIRE_EVENT = "event" SCRIPT_ACTION_IF = "if" SCRIPT_ACTION_PARALLEL = "parallel" +SCRIPT_ACTION_REPEAT = "repeat" SCRIPT_ACTION_SET_CONVERSATION_RESPONSE = "set_conversation_response" +SCRIPT_ACTION_STOP = "stop" +SCRIPT_ACTION_VARIABLES = "variables" +SCRIPT_ACTION_WAIT_FOR_TRIGGER = "wait_for_trigger" +SCRIPT_ACTION_WAIT_TEMPLATE = "wait_template" def determine_script_action(action: dict[str, Any]) -> str: @@ -1861,21 +1861,21 @@ def determine_script_action(action: dict[str, Any]) -> str: ACTION_TYPE_SCHEMAS: dict[str, Callable[[Any], dict]] = { - SCRIPT_ACTION_CALL_SERVICE: SERVICE_SCHEMA, - SCRIPT_ACTION_DELAY: _SCRIPT_DELAY_SCHEMA, - SCRIPT_ACTION_WAIT_TEMPLATE: _SCRIPT_WAIT_TEMPLATE_SCHEMA, - SCRIPT_ACTION_FIRE_EVENT: EVENT_SCHEMA, - SCRIPT_ACTION_CHECK_CONDITION: CONDITION_ACTION_SCHEMA, - SCRIPT_ACTION_DEVICE_AUTOMATION: DEVICE_ACTION_SCHEMA, SCRIPT_ACTION_ACTIVATE_SCENE: _SCRIPT_SCENE_SCHEMA, - SCRIPT_ACTION_REPEAT: _SCRIPT_REPEAT_SCHEMA, + SCRIPT_ACTION_CALL_SERVICE: SERVICE_SCHEMA, + SCRIPT_ACTION_CHECK_CONDITION: CONDITION_ACTION_SCHEMA, SCRIPT_ACTION_CHOOSE: _SCRIPT_CHOOSE_SCHEMA, - SCRIPT_ACTION_WAIT_FOR_TRIGGER: _SCRIPT_WAIT_FOR_TRIGGER_SCHEMA, - SCRIPT_ACTION_VARIABLES: _SCRIPT_SET_SCHEMA, - SCRIPT_ACTION_STOP: _SCRIPT_STOP_SCHEMA, + SCRIPT_ACTION_DELAY: _SCRIPT_DELAY_SCHEMA, + SCRIPT_ACTION_DEVICE_AUTOMATION: DEVICE_ACTION_SCHEMA, + SCRIPT_ACTION_FIRE_EVENT: EVENT_SCHEMA, SCRIPT_ACTION_IF: _SCRIPT_IF_SCHEMA, SCRIPT_ACTION_PARALLEL: _SCRIPT_PARALLEL_SCHEMA, + SCRIPT_ACTION_REPEAT: _SCRIPT_REPEAT_SCHEMA, SCRIPT_ACTION_SET_CONVERSATION_RESPONSE: _SCRIPT_SET_CONVERSATION_RESPONSE_SCHEMA, + SCRIPT_ACTION_STOP: _SCRIPT_STOP_SCHEMA, + SCRIPT_ACTION_VARIABLES: _SCRIPT_SET_SCHEMA, + SCRIPT_ACTION_WAIT_FOR_TRIGGER: _SCRIPT_WAIT_FOR_TRIGGER_SCHEMA, + SCRIPT_ACTION_WAIT_TEMPLATE: _SCRIPT_WAIT_TEMPLATE_SCHEMA, } diff --git a/homeassistant/helpers/script.py b/homeassistant/helpers/script.py index 2a31e02e3de..d1546528ef2 100644 --- a/homeassistant/helpers/script.py +++ b/homeassistant/helpers/script.py @@ -259,14 +259,14 @@ def make_script_schema( STATIC_VALIDATION_ACTION_TYPES = ( + cv.SCRIPT_ACTION_ACTIVATE_SCENE, cv.SCRIPT_ACTION_CALL_SERVICE, cv.SCRIPT_ACTION_DELAY, - cv.SCRIPT_ACTION_WAIT_TEMPLATE, cv.SCRIPT_ACTION_FIRE_EVENT, - cv.SCRIPT_ACTION_ACTIVATE_SCENE, - cv.SCRIPT_ACTION_VARIABLES, - cv.SCRIPT_ACTION_STOP, cv.SCRIPT_ACTION_SET_CONVERSATION_RESPONSE, + cv.SCRIPT_ACTION_STOP, + cv.SCRIPT_ACTION_VARIABLES, + cv.SCRIPT_ACTION_WAIT_TEMPLATE, )