From 377f7cba603dc6f0db656c9bb430e4aac419afd1 Mon Sep 17 00:00:00 2001 From: Joost Lekkerkerker Date: Mon, 28 Aug 2023 17:56:27 +0200 Subject: [PATCH] Improve aurora data schema (#99200) --- .../components/aurora/config_flow.py | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/homeassistant/components/aurora/config_flow.py b/homeassistant/components/aurora/config_flow.py index 4649a3adc08..bbd0768e74a 100644 --- a/homeassistant/components/aurora/config_flow.py +++ b/homeassistant/components/aurora/config_flow.py @@ -10,7 +10,7 @@ import voluptuous as vol from homeassistant import config_entries from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME from homeassistant.core import callback -from homeassistant.helpers import aiohttp_client +from homeassistant.helpers import aiohttp_client, config_validation as cv from homeassistant.helpers.schema_config_entry_flow import ( SchemaFlowFormStep, SchemaOptionsFlowHandler, @@ -75,24 +75,19 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): return self.async_show_form( step_id="user", - data_schema=vol.Schema( + data_schema=self.add_suggested_values_to_schema( + vol.Schema( + { + vol.Required(CONF_NAME): str, + vol.Required(CONF_LONGITUDE): cv.longitude, + vol.Required(CONF_LATITUDE): cv.latitude, + } + ), { - vol.Required(CONF_NAME, default=DEFAULT_NAME): str, - vol.Required( - CONF_LONGITUDE, - default=self.hass.config.longitude, - ): vol.All( - vol.Coerce(float), - vol.Range(min=-180, max=180), - ), - vol.Required( - CONF_LATITUDE, - default=self.hass.config.latitude, - ): vol.All( - vol.Coerce(float), - vol.Range(min=-90, max=90), - ), - } + CONF_NAME: DEFAULT_NAME, + CONF_LONGITUDE: self.hass.config.longitude, + CONF_LATITUDE: self.hass.config.latitude, + }, ), errors=errors, )