jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-04-23 16:57:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid duplicate entity names in proximity (#109413)

Browse Source 
* avoid duplicate config entry title

* consecutive range 2..10

* use existing logic
This commit is contained in:
Michael 2024-02-04 13:26:51 +01:00 committed by GitHub
parent 6e5a085413
commit 17f1aa644b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 77 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
homeassistant/components/proximity/config_flow.py
View File

@ -18,6 +18,7 @@ from homeassistant.helpers.selector import (
NumberSelector,
NumberSelectorConfig,
)
from homeassistant.util import slugify
from .const import (
CONF_IGNORED_ZONES,
@ -89,11 +90,19 @@ class ProximityConfigFlow(ConfigFlow, domain=DOMAIN):
if user_input is not None:
self._async_abort_entries_match(user_input)
zone = self.hass.states.get(user_input[CONF_ZONE])
title = cast(State, self.hass.states.get(user_input[CONF_ZONE])).name
return self.async_create_entry(
title=cast(State, zone).name, data=user_input
)
slugified_existing_entry_titles = [
slugify(e.title) for e in self._async_current_entries()
]
possible_title = title
tries = 1
while slugify(possible_title) in slugified_existing_entry_titles:
tries += 1
possible_title = f"{title} {tries}"
return self.async_create_entry(title=possible_title, data=user_input)
return self.async_show_form(
step_id="user",

64
tests/components/proximity/test_config_flow.py
View File

@ -185,3 +185,67 @@ async def test_abort_duplicated_entry(hass: HomeAssistant) -> None:
assert result["reason"] == "already_configured"
await hass.async_block_till_done()
async def test_avoid_duplicated_title(hass: HomeAssistant) -> None:
"""Test if we avoid duplicate titles."""
MockConfigEntry(
domain=DOMAIN,
title="home",
data={
CONF_ZONE: "zone.home",
CONF_TRACKED_ENTITIES: ["device_tracker.test1"],
CONF_IGNORED_ZONES: ["zone.work"],
CONF_TOLERANCE: 10,
},
unique_id=f"{DOMAIN}_home",
).add_to_hass(hass)
MockConfigEntry(
domain=DOMAIN,
title="home 3",
data={
CONF_ZONE: "zone.home",
CONF_TRACKED_ENTITIES: ["device_tracker.test2"],
CONF_IGNORED_ZONES: ["zone.work"],
CONF_TOLERANCE: 10,
},
unique_id=f"{DOMAIN}_home",
).add_to_hass(hass)
with patch(
"homeassistant.components.proximity.async_setup_entry", return_value=True
):
result = await hass.config_entries.flow.async_init(
DOMAIN, context={"source": SOURCE_USER}
)
result = await hass.config_entries.flow.async_configure(
result["flow_id"],
user_input={
CONF_ZONE: "zone.home",
CONF_TRACKED_ENTITIES: ["device_tracker.test3"],
CONF_IGNORED_ZONES: [],
CONF_TOLERANCE: 10,
},
)
assert result["type"] == FlowResultType.CREATE_ENTRY
assert result["title"] == "home 2"
await hass.async_block_till_done()
result = await hass.config_entries.flow.async_init(
DOMAIN, context={"source": SOURCE_USER}
)
result = await hass.config_entries.flow.async_configure(
result["flow_id"],
user_input={
CONF_ZONE: "zone.home",
CONF_TRACKED_ENTITIES: ["device_tracker.test4"],
CONF_IGNORED_ZONES: [],
CONF_TOLERANCE: 10,
},
)
assert result["type"] == FlowResultType.CREATE_ENTRY
assert result["title"] == "home 4"
await hass.async_block_till_done()