From 1e42a38473c0ff2927aa8fe8e80627e4ecf8c47a Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Tue, 5 Nov 2024 19:53:05 +0100
Subject: [PATCH] Remove usage of options property in OptionsFlow (part 2)
(#129897)
---
homeassistant/components/axis/config_flow.py | 3 +--
homeassistant/components/deconz/config_flow.py | 3 +--
homeassistant/components/iss/config_flow.py | 3 +--
homeassistant/components/kitchen_sink/config_flow.py | 7 +------
4 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/homeassistant/components/axis/config_flow.py b/homeassistant/components/axis/config_flow.py
index 5026f7e7ab6..592b1e2d41f 100644
--- a/homeassistant/components/axis/config_flow.py
+++ b/homeassistant/components/axis/config_flow.py
@@ -284,8 +284,7 @@ class AxisOptionsFlowHandler(OptionsFlow):
) -> ConfigFlowResult:
"""Manage the Axis device stream options."""
if user_input is not None:
- self.options.update(user_input)
- return self.async_create_entry(title="", data=self.options)
+ return self.async_create_entry(data=self.config_entry.options | user_input)
schema = {}
diff --git a/homeassistant/components/deconz/config_flow.py b/homeassistant/components/deconz/config_flow.py
index 6332c56a08a..ed54701f656 100644
--- a/homeassistant/components/deconz/config_flow.py
+++ b/homeassistant/components/deconz/config_flow.py
@@ -312,8 +312,7 @@ class DeconzOptionsFlowHandler(OptionsFlow):
) -> ConfigFlowResult:
"""Manage the deconz devices options."""
if user_input is not None:
- self.options.update(user_input)
- return self.async_create_entry(title="", data=self.options)
+ return self.async_create_entry(data=self.config_entry.options | user_input)
schema_options = {}
for option, default in (
diff --git a/homeassistant/components/iss/config_flow.py b/homeassistant/components/iss/config_flow.py
index 567618a7680..eaf01a6d094 100644
--- a/homeassistant/components/iss/config_flow.py
+++ b/homeassistant/components/iss/config_flow.py
@@ -47,8 +47,7 @@ class OptionsFlowHandler(OptionsFlow):
async def async_step_init(self, user_input=None) -> ConfigFlowResult:
"""Manage the options."""
if user_input is not None:
- self.options.update(user_input)
- return self.async_create_entry(title="", data=self.options)
+ return self.async_create_entry(data=self.config_entry.options | user_input)
return self.async_show_form(
step_id="init",
diff --git a/homeassistant/components/kitchen_sink/config_flow.py b/homeassistant/components/kitchen_sink/config_flow.py
index 74e738a0e04..019d1dddcad 100644
--- a/homeassistant/components/kitchen_sink/config_flow.py
+++ b/homeassistant/components/kitchen_sink/config_flow.py
@@ -68,8 +68,7 @@ class OptionsFlowHandler(OptionsFlow):
) -> ConfigFlowResult:
"""Manage the options."""
if user_input is not None:
- self.options.update(user_input)
- return await self._update_options()
+ return self.async_create_entry(data=self.config_entry.options | user_input)
return self.async_show_form(
step_id="options_1",
@@ -95,7 +94,3 @@ class OptionsFlowHandler(OptionsFlow):
}
),
)
-
- async def _update_options(self) -> ConfigFlowResult:
- """Update config entry options."""
- return self.async_create_entry(title="", data=self.options)
--
GitLab