jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-31 01:07:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

dry

Browse Source
This commit is contained in:
J. Nick Koston 2025-04-16 21:04:19 -10:00
parent 4240d461c4
commit 41a67530c6
No known key found for this signature in database
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
homeassistant/components/esphome/config_flow.py
View File

@ -431,6 +431,11 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
await self.hass.config_entries.async_remove( await self.hass.config_entries.async_remove(
self._entry_with_name_conflict.entry_id self._entry_with_name_conflict.entry_id
) )
return self._async_create_entry()
@callback
def _async_create_entry(self) -> ConfigFlowResult:
"""Create the config entry."""
assert self._name is not None assert self._name is not None
return self.async_create_entry( return self.async_create_entry(
title=self._name, title=self._name,
@ -459,7 +464,6 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
async def async_step_validated_connection(self) -> ConfigFlowResult: async def async_step_validated_connection(self) -> ConfigFlowResult:
"""Handle validated connection.""" """Handle validated connection."""
config_data = self._async_make_config_data()
if self.source == SOURCE_RECONFIGURE: if self.source == SOURCE_RECONFIGURE:
assert self.unique_id is not None assert self.unique_id is not None
assert self._reconfig_entry.unique_id is not None assert self._reconfig_entry.unique_id is not None
@ -497,22 +501,19 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
}, },
) )
return self.async_update_reload_and_abort( return self.async_update_reload_and_abort(
self._reconfig_entry, data=self._reconfig_entry.data | config_data self._reconfig_entry,
data=self._reconfig_entry.data | self._async_make_config_data(),
) )
if self.source == SOURCE_REAUTH: if self.source == SOURCE_REAUTH:
return self.async_update_reload_and_abort( return self.async_update_reload_and_abort(
self._reauth_entry, data=self._reauth_entry.data | config_data self._reauth_entry,
data=self._reauth_entry.data | self._async_make_config_data(),
) )
for entry in self._async_current_entries(include_ignore=False): for entry in self._async_current_entries(include_ignore=False):
if entry.data.get(CONF_DEVICE_NAME) == self._device_name: if entry.data.get(CONF_DEVICE_NAME) == self._device_name:
self._entry_with_name_conflict = entry self._entry_with_name_conflict = entry
return await self.async_step_name_conflict() return await self.async_step_name_conflict()
assert self._name is not None return self._async_create_entry()
return self.async_create_entry(
title=self._name,
data=config_data,
options=self._async_make_default_options(),
)
async def async_step_encryption_key( async def async_step_encryption_key(
self, user_input: dict[str, Any] | None = None self, user_input: dict[str, Any] | None = None