Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup unnecessary reconfigure_confirm from config flows (#128086)

pull/128352/head
epenet 2024-10-14 12:57:15 +02:00 committed by GitHub
parent 8d2cf0cf38
commit 25aea140be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
52 changed files with 86 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
homeassistant/components/brother/config_flow.py
View File

@ -141,12 +141,6 @@ class BrotherConfigFlow(ConfigFlow, domain=DOMAIN):
async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle a reconfiguration flow initialized by the user."""
return await self.async_step_reconfigure_confirm()
async def async_step_reconfigure_confirm(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle a reconfiguration flow initialized by the user."""
entry = self._get_reconfigure_entry()
@ -170,7 +164,7 @@ class BrotherConfigFlow(ConfigFlow, domain=DOMAIN):
)
return self.async_show_form(
step_id="reconfigure_confirm",
step_id="reconfigure",
data_schema=self.add_suggested_values_to_schema(
data_schema=RECONFIGURE_SCHEMA,
suggested_values=entry.data | (user_input or {}),

2
homeassistant/components/brother/strings.json
View File

@ -18,7 +18,7 @@
"type": "[%key:component::brother::config::step::user::data::type%]"
}
},
"reconfigure_confirm": {
"reconfigure": {
"description": "Update configuration for {printer_name}.",
"data": {
"host": "[%key:common::config_flow::data::host%]"

8
homeassistant/components/bryant_evolution/config_flow.py
View File

@ -61,12 +61,6 @@ class BryantConfigFlow(ConfigFlow, domain=DOMAIN):
async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle integration reconfiguration."""
return await self.async_step_reconfigure_confirm()
async def async_step_reconfigure_confirm(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle integration reconfiguration."""
errors: dict[str, str] = {}
@ -82,7 +76,7 @@ class BryantConfigFlow(ConfigFlow, domain=DOMAIN):
)
errors["base"] = "cannot_connect"
return self.async_show_form(
step_id="reconfigure_confirm",
step_id="reconfigure",
data_schema=STEP_USER_DATA_SCHEMA,
errors=errors,
)

2
homeassistant/components/bryant_evolution/strings.json
View File

@ -1,7 +1,7 @@
{
"config": {
"step": {
"reconfigure_confirm": {
"reconfigure": {
"data": {
"filename": "[%key:component::bryant_evolution::config::step::user::data::filename%]"
}

8
homeassistant/components/enphase_envoy/config_flow.py
View File

@ -234,12 +234,6 @@ class EnphaseConfigFlow(ConfigFlow, domain=DOMAIN):
async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Add reconfigure step to allow to manually reconfigure a config entry."""
return await self.async_step_reconfigure_confirm()
async def async_step_reconfigure_confirm(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Add reconfigure step to allow to manually reconfigure a config entry."""
reconfigure_entry = self._get_reconfigure_entry()
@ -285,7 +279,7 @@ class EnphaseConfigFlow(ConfigFlow, domain=DOMAIN):
suggested_values: Mapping[str, Any] = user_input or reconfigure_entry.data
return self.async_show_form(
step_id="reconfigure_confirm",
step_id="reconfigure",
data_schema=self.add_suggested_values_to_schema(
self._async_generate_schema(), suggested_values
),

2
homeassistant/components/enphase_envoy/strings.json
View File

@ -13,7 +13,7 @@
"host": "The hostname or IP address of your Enphase Envoy gateway."
}
},
"reconfigure_confirm": {
"reconfigure": {
"description": "[%key:component::enphase_envoy::config::step::user::description%]",
"data": {
"host": "[%key:common::config_flow::data::host%]",

10
homeassistant/components/feedreader/config_flow.py
View File

@ -121,12 +121,6 @@ class FeedReaderConfigFlow(ConfigFlow, domain=DOMAIN):
async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle a reconfiguration flow initialized by the user."""
return await self.async_step_reconfigure_confirm()
async def async_step_reconfigure_confirm(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle a reconfiguration flow initialized by the user."""
reconfigure_entry = self._get_reconfigure_entry()
@ -134,7 +128,7 @@ class FeedReaderConfigFlow(ConfigFlow, domain=DOMAIN):
return self.show_user_form(
user_input={**reconfigure_entry.data},
description_placeholders={"name": reconfigure_entry.title},
step_id="reconfigure_confirm",
step_id="reconfigure",
)
feed = await async_fetch_feed(self.hass, user_input[CONF_URL])
@ -145,7 +139,7 @@ class FeedReaderConfigFlow(ConfigFlow, domain=DOMAIN):
return self.show_user_form(
user_input=user_input,
description_placeholders={"name": reconfigure_entry.title},
step_id="reconfigure_confirm",
step_id="reconfigure",
errors={"base": "url_error"},
)

2
homeassistant/components/feedreader/strings.json
View File

@ -6,7 +6,7 @@
"url": "[%key:common::config_flow::data::url%]"
}
},
"reconfigure_confirm": {
"reconfigure": {
"description": "Update your configuration information for {name}.",
"data": {
"url": "[%key:common::config_flow::data::url%]"

8
homeassistant/components/google_travel_time/config_flow.py
View File

@ -236,12 +236,6 @@ class GoogleTravelTimeConfigFlow(ConfigFlow, domain=DOMAIN):
async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle reconfiguration."""
return await self.async_step_reconfigure_confirm()
async def async_step_reconfigure_confirm(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle reconfiguration."""
errors: dict[str, str] | None = None
@ -253,7 +247,7 @@ class GoogleTravelTimeConfigFlow(ConfigFlow, domain=DOMAIN):
)
return self.async_show_form(
step_id="reconfigure_confirm",
step_id="reconfigure",
data_schema=self.add_suggested_values_to_schema(
RECONFIGURE_SCHEMA, self._get_reconfigure_entry().data
),

2
homeassistant/components/google_travel_time/strings.json
View File

@ -11,7 +11,7 @@
"destination": "Destination"
}
},
"reconfigure_confirm": {
"reconfigure": {
"description": "[%key:component::google_travel_time::config::step::user::description%]",
"data": {
"api_key": "[%key:common::config_flow::data::api_key%]",

10
homeassistant/components/holiday/config_flow.py
View File

@ -112,12 +112,6 @@ class HolidayConfigFlow(ConfigFlow, domain=DOMAIN):
async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle the re-configuration of a province."""
return await self.async_step_reconfigure_confirm()
async def async_step_reconfigure_confirm(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle the re-configuration of a province."""
reconfigure_entry = self._get_reconfigure_entry()
@ -160,6 +154,4 @@ class HolidayConfigFlow(ConfigFlow, domain=DOMAIN):
}
)
return self.async_show_form(
step_id="reconfigure_confirm", data_schema=province_schema
)
return self.async_show_form(step_id="reconfigure", data_schema=province_schema)

2
homeassistant/components/holiday/strings.json
View File

@ -16,7 +16,7 @@
"province": "Province"
}
},
"reconfigure_confirm": {
"reconfigure": {
"data": {
"province": "[%key:component::holiday::config::step::province::data::province%]"
}

8
homeassistant/components/homeworks/config_flow.py
View File

@ -581,12 +581,6 @@ class HomeworksConfigFlowHandler(ConfigFlow, domain=DOMAIN):
async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle a reconfigure flow."""
return await self.async_step_reconfigure_confirm()
async def async_step_reconfigure_confirm(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle a reconfigure flow."""
errors = {}
@ -628,7 +622,7 @@ class HomeworksConfigFlowHandler(ConfigFlow, domain=DOMAIN):
)
return self.async_show_form(
step_id="reconfigure_confirm",
step_id="reconfigure",
data_schema=self.add_suggested_values_to_schema(
DATA_SCHEMA_EDIT_CONTROLLER, suggested_values
),

6
homeassistant/components/homeworks/strings.json
View File

@ -22,7 +22,7 @@
"name": "[%key:component::homeworks::config::step::user::data_description::name%]"
}
},
"reconfigure_confirm": {
"reconfigure": {
"data": {
"host": "[%key:common::config_flow::data::host%]",
"port": "[%key:common::config_flow::data::port%]",
@ -45,8 +45,8 @@
},
"data_description": {
"name": "A unique name identifying the Lutron Homeworks controller",
"password": "[%key:component::homeworks::config::step::reconfigure_confirm::data_description::password%]",
"username": "[%key:component::homeworks::config::step::reconfigure_confirm::data_description::username%]"
"password": "[%key:component::homeworks::config::step::reconfigure::data_description::password%]",
"username": "[%key:component::homeworks::config::step::reconfigure::data_description::username%]"
},
"description": "Add a Lutron Homeworks controller"
}

8
homeassistant/components/lamarzocco/config_flow.py
View File

@ -284,16 +284,10 @@ class LmConfigFlow(ConfigFlow, domain=DOMAIN):
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Perform reconfiguration of the config entry."""
return await self.async_step_reconfigure_confirm()
async def async_step_reconfigure_confirm(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Confirm reconfiguration of the device."""
if not user_input:
reconfigure_entry = self._get_reconfigure_entry()
return self.async_show_form(
step_id="reconfigure_confirm",
step_id="reconfigure",
data_schema=vol.Schema(
{
vol.Required(

2
homeassistant/components/lamarzocco/strings.json
View File

@ -47,7 +47,7 @@
"password": "[%key:component::lamarzocco::config::step::user::data_description::password%]"
}
},
"reconfigure_confirm": {
"reconfigure": {
"data": {
"username": "[%key:common::config_flow::data::username%]",
"password": "[%key:common::config_flow::data::password%]"

8
homeassistant/components/lcn/config_flow.py
View File

@ -194,12 +194,6 @@ class LcnFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
) -> config_entries.ConfigFlowResult:
"""Reconfigure LCN configuration."""
return await self.async_step_reconfigure_confirm()
async def async_step_reconfigure_confirm(
self, user_input: dict[str, Any] | None = None
) -> config_entries.ConfigFlowResult:
"""Reconfigure LCN configuration."""
reconfigure_entry = self._get_reconfigure_entry()
@ -219,7 +213,7 @@ class LcnFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
await self.hass.config_entries.async_setup(reconfigure_entry.entry_id)
return self.async_show_form(
step_id="reconfigure_confirm",
step_id="reconfigure",
data_schema=self.add_suggested_values_to_schema(
CONFIG_SCHEMA, reconfigure_entry.data
),

2
homeassistant/components/lcn/strings.json
View File

@ -34,7 +34,7 @@
"acknowledge": "Retry sendig commands if no response is received (increases bus traffic)."
}
},
"reconfigure_confirm": {
"reconfigure": {
"title": "Reconfigure LCN host",
"description": "Reconfigure connection to LCN host.",
"data": {

8
homeassistant/components/madvr/config_flow.py
View File

@ -44,15 +44,9 @@ class MadVRConfigFlow(ConfigFlow, domain=DOMAIN):
async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle reconfiguration of the device."""
return await self.async_step_reconfigure_confirm()
async def async_step_reconfigure_confirm(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle a reconfiguration flow initialized by the user."""
return await self._handle_config_step(user_input, step_id="reconfigure_confirm")
return await self._handle_config_step(user_input, step_id="reconfigure")
async def _handle_config_step(
self, user_input: dict[str, Any] | None = None, step_id: str = "user"

2
homeassistant/components/madvr/strings.json
View File

@ -13,7 +13,7 @@
"port": "The port your madVR Envy is listening on. In 99% of cases, leave this as the default."
}
},
"reconfigure_confirm": {
"reconfigure": {
"title": "Reconfigure madVR Envy",
"description": "Your device needs to be on in order to reconfigure the integation.",
"data": {

8
homeassistant/components/mealie/config_flow.py
View File

@ -116,12 +116,6 @@ class MealieConfigFlow(ConfigFlow, domain=DOMAIN):
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle reconfiguration of the integration."""
return await self.async_step_reconfigure_confirm()
async def async_step_reconfigure_confirm(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle reconfiguration confirmation."""
errors: dict[str, str] = {}
if user_input:
self.host = user_input[CONF_HOST]
@ -141,7 +135,7 @@ class MealieConfigFlow(ConfigFlow, domain=DOMAIN):
},
)
return self.async_show_form(
step_id="reconfigure_confirm",
step_id="reconfigure",
data_schema=USER_SCHEMA,
errors=errors,
)

2
homeassistant/components/mealie/strings.json
View File

@ -17,7 +17,7 @@
"api_token": "[%key:common::config_flow::data::api_token%]"
}
},
"reconfigure_confirm": {
"reconfigure": {
"description": "Please reconfigure with Mealie.",
"data": {
"host": "[%key:common::config_flow::data::url%]",

8
homeassistant/components/melcloud/config_flow.py
View File

@ -142,12 +142,6 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle a reconfiguration flow initialized by the user."""
return await self.async_step_reconfigure_confirm()
async def async_step_reconfigure_confirm(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle a reconfiguration flow initialized by the user."""
errors: dict[str, str] = {}
@ -190,7 +184,7 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
)
return self.async_show_form(
step_id="reconfigure_confirm",
step_id="reconfigure",
data_schema=vol.Schema(
{
vol.Required(CONF_PASSWORD): str,

2
homeassistant/components/melcloud/strings.json
View File

@ -17,7 +17,7 @@
"password": "[%key:common::config_flow::data::password%]"
}
},
"reconfigure_confirm": {
"reconfigure": {
"title": "Reconfigure your MelCloud",
"description": "Reconfigure the entry to obtain a new token, for your account: `{username}`.",
"data": {

11
homeassistant/components/nam/config_flow.py
View File

@ -220,18 +220,11 @@ class NAMFlowHandler(ConfigFlow, domain=DOMAIN):
async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle a reconfiguration flow initialized by the user."""
self.host = self._get_reconfigure_entry().data[CONF_HOST]
return await self.async_step_reconfigure_confirm()
async def async_step_reconfigure_confirm(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle a reconfiguration flow initialized by the user."""
errors = {}
reconfigure_entry = self._get_reconfigure_entry()
self.host = reconfigure_entry.data[CONF_HOST]
if user_input is not None:
try:
@ -247,7 +240,7 @@ class NAMFlowHandler(ConfigFlow, domain=DOMAIN):
)
return self.async_show_form(
step_id="reconfigure_confirm",
step_id="reconfigure",
data_schema=vol.Schema(
{
vol.Required(CONF_HOST, default=self.host): str,

2
homeassistant/components/nam/strings.json
View File

@ -28,7 +28,7 @@
"confirm_discovery": {
"description": "Do you want to set up Nettigo Air Monitor at {host}?"
},
"reconfigure_confirm": {
"reconfigure": {
"description": "Update configuration for {device_name}.",
"data": {
"host": "[%key:common::config_flow::data::host%]"

8
homeassistant/components/pyload/config_flow.py
View File

@ -193,12 +193,6 @@ class PyLoadConfigFlow(ConfigFlow, domain=DOMAIN):
async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Perform a reconfiguration."""
return await self.async_step_reconfigure_confirm()
async def async_step_reconfigure_confirm(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle the reconfiguration flow."""
errors = {}
@ -222,7 +216,7 @@ class PyLoadConfigFlow(ConfigFlow, domain=DOMAIN):
)
return self.async_show_form(
step_id="reconfigure_confirm",
step_id="reconfigure",
data_schema=self.add_suggested_values_to_schema(
STEP_USER_DATA_SCHEMA,
user_input or reconfig_entry.data,

2
homeassistant/components/pyload/strings.json
View File

@ -15,7 +15,7 @@
"port": "pyLoad uses port 8000 by default."
}
},
"reconfigure_confirm": {
"reconfigure": {
"data": {
"host": "[%key:common::config_flow::data::host%]",
"username": "[%key:common::config_flow::data::username%]",

14
homeassistant/components/shelly/config_flow.py
View File

@ -399,20 +399,12 @@ class ShellyConfigFlow(ConfigFlow, domain=DOMAIN):
async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle a reconfiguration flow initialized by the user."""
entry_data = self._get_reconfigure_entry().data
self.host = entry_data[CONF_HOST]
self.port = entry_data.get(CONF_PORT, DEFAULT_HTTP_PORT)
return await self.async_step_reconfigure_confirm()
async def async_step_reconfigure_confirm(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle a reconfiguration flow initialized by the user."""
errors = {}
reconfigure_entry = self._get_reconfigure_entry()
self.host = reconfigure_entry.data[CONF_HOST]
self.port = reconfigure_entry.data.get(CONF_PORT, DEFAULT_HTTP_PORT)
if user_input is not None:
host = user_input[CONF_HOST]
@ -433,7 +425,7 @@ class ShellyConfigFlow(ConfigFlow, domain=DOMAIN):
)
return self.async_show_form(
step_id="reconfigure_confirm",
step_id="reconfigure",
data_schema=vol.Schema(
{
vol.Required(CONF_HOST, default=self.host): str,

2
homeassistant/components/shelly/strings.json
View File

@ -28,7 +28,7 @@
"confirm_discovery": {
"description": "Do you want to set up the {model} at {host}?\n\nBattery-powered devices that are password protected must be woken up before continuing with setting up.\nBattery-powered devices that are not password protected will be added when the device wakes up, you can now manually wake the device up using a button on it or wait for the next data update from the device."
},
"reconfigure_confirm": {
"reconfigure": {
"description": "Update configuration for {device_name}.\n\nBefore setup, battery-powered devices must be woken up, you can now wake the device up using a button on it.",
"data": {
"host": "[%key:common::config_flow::data::host%]",

8
homeassistant/components/smhi/config_flow.py
View File

@ -82,12 +82,6 @@ class SmhiFlowHandler(ConfigFlow, domain=DOMAIN):
async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle a reconfiguration flow initialized by the user."""
return await self.async_step_reconfigure_confirm()
async def async_step_reconfigure_confirm(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle a reconfiguration flow initialized by the user."""
errors: dict[str, str] = {}
@ -132,5 +126,5 @@ class SmhiFlowHandler(ConfigFlow, domain=DOMAIN):
reconfigure_entry.data,
)
return self.async_show_form(
step_id="reconfigure_confirm", data_schema=schema, errors=errors
step_id="reconfigure", data_schema=schema, errors=errors
)

2
homeassistant/components/smhi/strings.json
View File

@ -12,7 +12,7 @@
"longitude": "[%key:common::config_flow::data::longitude%]"
}
},
"reconfigure_confirm": {
"reconfigure": {
"title": "Reconfigure your location in Sweden",
"data": {
"latitude": "[%key:common::config_flow::data::latitude%]",

8
homeassistant/components/solarlog/config_flow.py
View File

@ -137,12 +137,6 @@ class SolarLogConfigFlow(ConfigFlow, domain=DOMAIN):
async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle a reconfiguration flow initialized by the user."""
return await self.async_step_reconfigure_confirm()
async def async_step_reconfigure_confirm(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle a reconfiguration flow initialized by the user."""
reconfigure_entry = self._get_reconfigure_entry()
@ -164,7 +158,7 @@ class SolarLogConfigFlow(ConfigFlow, domain=DOMAIN):
)
return self.async_show_form(
step_id="reconfigure_confirm",
step_id="reconfigure",
data_schema=vol.Schema(
{
vol.Optional(

2
homeassistant/components/solarlog/strings.json
View File

@ -29,7 +29,7 @@
"password": "[%key:common::config_flow::data::password%]"
}
},
"reconfigure_confirm": {
"reconfigure": {
"title": "Configure SolarLog",
"data": {
"has_password": "[%key:component::solarlog::config::step::user::data::has_password%]",

8
homeassistant/components/tado/config_flow.py
View File

@ -117,12 +117,6 @@ class TadoConfigFlow(ConfigFlow, domain=DOMAIN):
async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle a reconfiguration flow initialized by the user."""
return await self.async_step_reconfigure_confirm()
async def async_step_reconfigure_confirm(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle a reconfiguration flow initialized by the user."""
errors: dict[str, str] = {}
@ -148,7 +142,7 @@ class TadoConfigFlow(ConfigFlow, domain=DOMAIN):
)
return self.async_show_form(
step_id="reconfigure_confirm",
step_id="reconfigure",
data_schema=vol.Schema(
{
vol.Required(CONF_PASSWORD): str,

2
homeassistant/components/tado/strings.json
View File

@ -12,7 +12,7 @@
},
"title": "Connect to your Tado account"
},
"reconfigure_confirm": {
"reconfigure": {
"title": "Reconfigure your Tado",
"description": "Reconfigure the entry, for your account: `{username}`.",
"data": {

10
homeassistant/components/vallox/config_flow.py
View File

@ -84,18 +84,12 @@ class ValloxConfigFlow(ConfigFlow, domain=DOMAIN):
async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle reconfiguration of the Vallox device host address."""
return await self.async_step_reconfigure_confirm()
async def async_step_reconfigure_confirm(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle reconfiguration of the Vallox device host address."""
reconfigure_entry = self._get_reconfigure_entry()
if not user_input:
return self.async_show_form(
step_id="reconfigure_confirm",
step_id="reconfigure",
data_schema=self.add_suggested_values_to_schema(
CONFIG_SCHEMA, {CONF_HOST: reconfigure_entry.data.get(CONF_HOST)}
),
@ -123,7 +117,7 @@ class ValloxConfigFlow(ConfigFlow, domain=DOMAIN):
)
return self.async_show_form(
step_id="reconfigure_confirm",
step_id="reconfigure",
data_schema=self.add_suggested_values_to_schema(
CONFIG_SCHEMA, {CONF_HOST: updated_host}
),

2
homeassistant/components/vallox/strings.json
View File

@ -9,7 +9,7 @@
"host": "Hostname or IP address of your Vallox device."
}
},
"reconfigure_confirm": {
"reconfigure": {
"data": {
"host": "[%key:common::config_flow::data::host%]"
},

14
tests/components/brother/test_config_flow.py
View File

@ -261,7 +261,7 @@ async def test_reconfigure_successful(
result = await mock_config_entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
result = await hass.config_entries.flow.async_configure(
result["flow_id"],
@ -297,7 +297,7 @@ async def test_reconfigure_not_successful(
result = await mock_config_entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
mock_brother_client.async_update.side_effect = exc
@ -307,7 +307,7 @@ async def test_reconfigure_not_successful(
)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
assert result["errors"] == {"base": base_error}
mock_brother_client.async_update.side_effect = None
@ -336,7 +336,7 @@ async def test_reconfigure_invalid_hostname(
result = await mock_config_entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
result = await hass.config_entries.flow.async_configure(
result["flow_id"],
@ -344,7 +344,7 @@ async def test_reconfigure_invalid_hostname(
)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
assert result["errors"] == {CONF_HOST: "wrong_host"}
@ -359,7 +359,7 @@ async def test_reconfigure_not_the_same_device(
result = await mock_config_entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
mock_brother_client.serial = "9876543210"
@ -369,5 +369,5 @@ async def test_reconfigure_not_the_same_device(
)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
assert result["errors"] == {"base": "another_device"}

8
tests/components/enphase_envoy/test_config_flow.py
View File

@ -703,7 +703,7 @@ async def test_reconfigure(
await setup_integration(hass, config_entry)
result = await config_entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
assert result["errors"] == {}
# original entry
@ -739,7 +739,7 @@ async def test_reconfigure_nochange(
await setup_integration(hass, config_entry)
result = await config_entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
assert result["errors"] == {}
# original entry
@ -775,7 +775,7 @@ async def test_reconfigure_otherenvoy(
await setup_integration(hass, config_entry)
result = await config_entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
assert result["errors"] == {}
# let mock return different serial from first time, sim it's other one on changed ip
@ -889,7 +889,7 @@ async def test_reconfigure_change_ip_to_existing(
result = await config_entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
assert result["errors"] == {}
# original entry

6
tests/components/feedreader/test_config_flow.py
View File

@ -164,7 +164,7 @@ async def test_reconfigure(hass: HomeAssistant, feedparser) -> None:
# init user flow
result = await entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
# success
with patch(
@ -196,7 +196,7 @@ async def test_reconfigure_errors(
# init user flow
result = await entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
# raise URLError
feedparser.side_effect = urllib.error.URLError("Test")
@ -208,7 +208,7 @@ async def test_reconfigure_errors(
},
)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
assert result["errors"] == {"base": "url_error"}
# success

2
tests/components/google_travel_time/test_config_flow.py
View File

@ -200,7 +200,7 @@ async def test_reconfigure(hass: HomeAssistant, mock_config: MockConfigEntry) ->
"""Test reconfigure flow."""
reconfigure_result = await mock_config.start_reconfigure_flow(hass)
assert reconfigure_result["type"] is FlowResultType.FORM
assert reconfigure_result["step_id"] == "reconfigure_confirm"
assert reconfigure_result["step_id"] == "reconfigure"
await assert_common_reconfigure_steps(hass, reconfigure_result)

12
tests/components/homeworks/test_config_flow.py
View File

@ -243,7 +243,7 @@ async def test_reconfigure_flow(
result = await mock_config_entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
result = await hass.config_entries.flow.async_configure(
result["flow_id"],
@ -308,7 +308,7 @@ async def test_reconfigure_flow_flow_duplicate(
result = await entry1.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
result = await hass.config_entries.flow.async_configure(
result["flow_id"],
@ -318,7 +318,7 @@ async def test_reconfigure_flow_flow_duplicate(
},
)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
assert result["errors"] == {"base": "duplicated_host_port"}
@ -330,7 +330,7 @@ async def test_reconfigure_flow_flow_no_change(
result = await mock_config_entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
result = await hass.config_entries.flow.async_configure(
result["flow_id"],
@ -375,7 +375,7 @@ async def test_reconfigure_flow_credentials_password_only(
result = await mock_config_entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
result = await hass.config_entries.flow.async_configure(
result["flow_id"],
@ -386,7 +386,7 @@ async def test_reconfigure_flow_credentials_password_only(
},
)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
assert result["errors"] == {"base": "need_username_with_password"}

2
tests/components/lamarzocco/test_config_flow.py
View File

@ -271,7 +271,7 @@ async def test_reconfigure_flow(
result = await mock_config_entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
result2 = await __do_successful_user_step(hass, result, mock_cloud_client)
service_info = get_bluetooth_service_info(

4
tests/components/lcn/test_config_flow.py
View File

@ -206,7 +206,7 @@ async def test_step_reconfigure(hass: HomeAssistant, entry: MockConfigEntry) ->
result = await entry.start_reconfigure_flow(hass)
assert result["type"] == data_entry_flow.FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
with (
patch("homeassistant.components.lcn.PchkConnectionManager.async_connect"),
@ -244,7 +244,7 @@ async def test_step_reconfigure_error(
result = await entry.start_reconfigure_flow(hass)
assert result["type"] == data_entry_flow.FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
with patch(
"homeassistant.components.lcn.PchkConnectionManager.async_connect",

4
tests/components/madvr/test_config_flow.py
View File

@ -138,7 +138,7 @@ async def test_reconfigure_flow(
result = await mock_config_entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
assert result["errors"] == {}
# define new host
@ -204,7 +204,7 @@ async def test_reconfigure_flow_errors(
result = await mock_config_entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
# Test CannotConnect error
mock_madvr_client.open_connection.side_effect = TimeoutError

8
tests/components/mealie/test_config_flow.py
View File

@ -244,7 +244,7 @@ async def test_reconfigure_flow(
result = await mock_config_entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
result = await hass.config_entries.flow.async_configure(
result["flow_id"],
@ -273,7 +273,7 @@ async def test_reconfigure_flow_wrong_account(
result = await mock_config_entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
mock_mealie_client.get_user_info.return_value.user_id = "wrong_user_id"
@ -308,7 +308,7 @@ async def test_reconfigure_flow_exceptions(
result = await mock_config_entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
result = await hass.config_entries.flow.async_configure(
result["flow_id"],
@ -316,7 +316,7 @@ async def test_reconfigure_flow_exceptions(
)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
assert result["errors"] == {"base": error}
mock_mealie_client.get_user_info.side_effect = None

8
tests/components/nam/test_config_flow.py
View File

@ -445,7 +445,7 @@ async def test_reconfigure_successful(hass: HomeAssistant) -> None:
result = await entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
with (
patch(
@ -488,7 +488,7 @@ async def test_reconfigure_not_successful(hass: HomeAssistant) -> None:
result = await entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
with patch(
"homeassistant.components.nam.NettigoAirMonitor.async_check_credentials",
@ -500,7 +500,7 @@ async def test_reconfigure_not_successful(hass: HomeAssistant) -> None:
)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
assert result["errors"] == {"base": "cannot_connect"}
with (
@ -544,7 +544,7 @@ async def test_reconfigure_not_the_same_device(hass: HomeAssistant) -> None:
result = await entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
with (
patch(

4
tests/components/pyload/test_config_flow.py
View File

@ -250,7 +250,7 @@ async def test_reconfiguration(
result = await config_entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
result = await hass.config_entries.flow.async_configure(
result["flow_id"],
@ -285,7 +285,7 @@ async def test_reconfigure_errors(
result = await config_entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
mock_pyloadapi.login.side_effect = side_effect
result = await hass.config_entries.flow.async_configure(

6
tests/components/shelly/test_config_flow.py
View File

@ -1364,7 +1364,7 @@ async def test_reconfigure_successful(
result = await entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
with patch(
"homeassistant.components.shelly.config_flow.get_info",
@ -1396,7 +1396,7 @@ async def test_reconfigure_unsuccessful(
result = await entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
with patch(
"homeassistant.components.shelly.config_flow.get_info",
@ -1433,7 +1433,7 @@ async def test_reconfigure_with_exception(
result = await entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
with patch("homeassistant.components.shelly.config_flow.get_info", side_effect=exc):
result = await hass.config_entries.flow.async_configure(

2
tests/components/solarlog/test_config_flow.py
View File

@ -207,7 +207,7 @@ async def test_reconfigure_flow(
result = await entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
# test with all data provided
result = await hass.config_entries.flow.async_configure(

2
tests/components/vallox/conftest.py
View File

@ -81,7 +81,7 @@ async def init_reconfigure_flow(
result = await mock_entry.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
# original entry
assert mock_entry.data["host"] == "192.168.100.50"