From dec2661322e2fe47d077a0b28fa277c0e14a4e09 Mon Sep 17 00:00:00 2001 From: Kevin Stillhammer <kevin.stillhammer@gmail.com> Date: Thu, 1 Sep 2022 10:19:21 +0200 Subject: [PATCH] Required option_flow values for here_travel_time (#77651) --- .../here_travel_time/config_flow.py | 61 ++++++++++--------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/homeassistant/components/here_travel_time/config_flow.py b/homeassistant/components/here_travel_time/config_flow.py index b4756c82922..d42e6d6bf3e 100644 --- a/homeassistant/components/here_travel_time/config_flow.py +++ b/homeassistant/components/here_travel_time/config_flow.py @@ -24,7 +24,6 @@ from homeassistant.helpers.selector import ( EntitySelector, LocationSelector, TimeSelector, - selector, ) from .const import ( @@ -361,28 +360,30 @@ class HERETravelTimeOptionsFlow(config_entries.OptionsFlow): menu_options=["departure_time", "no_time"], ) - options = { - vol.Optional( - CONF_TRAFFIC_MODE, - default=self.config_entry.options.get( - CONF_TRAFFIC_MODE, TRAFFIC_MODE_ENABLED - ), - ): vol.In(TRAFFIC_MODES), - vol.Optional( - CONF_ROUTE_MODE, - default=self.config_entry.options.get( - CONF_ROUTE_MODE, ROUTE_MODE_FASTEST - ), - ): vol.In(ROUTE_MODES), - vol.Optional( - CONF_UNIT_SYSTEM, - default=self.config_entry.options.get( - CONF_UNIT_SYSTEM, self.hass.config.units.name - ), - ): vol.In(UNITS), - } + schema = vol.Schema( + { + vol.Optional( + CONF_TRAFFIC_MODE, + default=self.config_entry.options.get( + CONF_TRAFFIC_MODE, TRAFFIC_MODE_ENABLED + ), + ): vol.In(TRAFFIC_MODES), + vol.Optional( + CONF_ROUTE_MODE, + default=self.config_entry.options.get( + CONF_ROUTE_MODE, ROUTE_MODE_FASTEST + ), + ): vol.In(ROUTE_MODES), + vol.Optional( + CONF_UNIT_SYSTEM, + default=self.config_entry.options.get( + CONF_UNIT_SYSTEM, self.hass.config.units.name + ), + ): vol.In(UNITS), + } + ) - return self.async_show_form(step_id="init", data_schema=vol.Schema(options)) + return self.async_show_form(step_id="init", data_schema=schema) async def async_step_no_time( self, user_input: dict[str, Any] | None = None @@ -398,12 +399,12 @@ class HERETravelTimeOptionsFlow(config_entries.OptionsFlow): self._config[CONF_ARRIVAL_TIME] = user_input[CONF_ARRIVAL_TIME] return self.async_create_entry(title="", data=self._config) - options = {"arrival_time": selector({TimeSelector.selector_type: {}})} - - return self.async_show_form( - step_id="arrival_time", data_schema=vol.Schema(options) + schema = vol.Schema( + {vol.Required(CONF_ARRIVAL_TIME, default="00:00:00"): TimeSelector()} ) + return self.async_show_form(step_id="arrival_time", data_schema=schema) + async def async_step_departure_time( self, user_input: dict[str, Any] | None = None ) -> FlowResult: @@ -412,8 +413,8 @@ class HERETravelTimeOptionsFlow(config_entries.OptionsFlow): self._config[CONF_DEPARTURE_TIME] = user_input[CONF_DEPARTURE_TIME] return self.async_create_entry(title="", data=self._config) - options = {"departure_time": selector({TimeSelector.selector_type: {}})} - - return self.async_show_form( - step_id="departure_time", data_schema=vol.Schema(options) + schema = vol.Schema( + {vol.Required(CONF_DEPARTURE_TIME, default="00:00:00"): TimeSelector()} ) + + return self.async_show_form(step_id="departure_time", data_schema=schema) -- GitLab