From 93010ab5c9848200809433b70ce7365e5dcaecc2 Mon Sep 17 00:00:00 2001
From: Jan Bouwhuis <jbouwh@users.noreply.github.com>
Date: Sun, 23 Mar 2025 22:14:06 +0100
Subject: [PATCH] Ensure suggested values are added to section schema in data
 entry fow (#141227)

---
 .../components/kitchen_sink/config_flow.py    | 45 ++++++++++---------
 homeassistant/data_entry_flow.py              | 13 ++++++
 .../kitchen_sink/test_config_flow.py          |  9 ++++
 3 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/homeassistant/components/kitchen_sink/config_flow.py b/homeassistant/components/kitchen_sink/config_flow.py
index e1ffe334038..1747a0d723c 100644
--- a/homeassistant/components/kitchen_sink/config_flow.py
+++ b/homeassistant/components/kitchen_sink/config_flow.py
@@ -17,6 +17,7 @@ from homeassistant.config_entries import (
     SubentryFlowResult,
 )
 from homeassistant.core import callback
+from homeassistant.helpers import config_validation as cv
 
 from . import DOMAIN
 
@@ -80,30 +81,30 @@ class OptionsFlowHandler(OptionsFlow):
         if user_input is not None:
             return self.async_create_entry(data=self.config_entry.options | user_input)
 
-        return self.async_show_form(
-            step_id="options_1",
-            data_schema=vol.Schema(
-                {
-                    vol.Required("section_1"): data_entry_flow.section(
-                        vol.Schema(
-                            {
-                                vol.Optional(
-                                    CONF_BOOLEAN,
-                                    default=self.config_entry.options.get(
-                                        CONF_BOOLEAN, False
-                                    ),
-                                ): bool,
-                                vol.Optional(
-                                    CONF_INT,
-                                    default=self.config_entry.options.get(CONF_INT, 10),
-                                ): int,
-                            }
-                        ),
-                        {"collapsed": False},
+        data_schema = vol.Schema(
+            {
+                vol.Required("section_1"): data_entry_flow.section(
+                    vol.Schema(
+                        {
+                            vol.Optional(
+                                CONF_BOOLEAN,
+                                default=self.config_entry.options.get(
+                                    CONF_BOOLEAN, False
+                                ),
+                            ): bool,
+                            vol.Optional(CONF_INT): cv.positive_int,
+                        }
                     ),
-                }
-            ),
+                    {"collapsed": False},
+                ),
+            }
         )
+        self.add_suggested_values_to_schema(
+            data_schema,
+            {"section_1": {"int": self.config_entry.options.get(CONF_INT, 10)}},
+        )
+
+        return self.async_show_form(step_id="options_1", data_schema=data_schema)
 
 
 class SubentryFlowHandler(ConfigSubentryFlow):
diff --git a/homeassistant/data_entry_flow.py b/homeassistant/data_entry_flow.py
index 251e22e7990..7d2ef09ecb8 100644
--- a/homeassistant/data_entry_flow.py
+++ b/homeassistant/data_entry_flow.py
@@ -657,6 +657,19 @@ class FlowHandler(Generic[_FlowContextT, _FlowResultT, _HandlerT]):
                 ):
                     continue
 
+            # Process the section schema options
+            if (
+                suggested_values is not None
+                and isinstance(val, section)
+                and key in suggested_values
+            ):
+                new_section_key = copy.copy(key)
+                schema[new_section_key] = val
+                val.schema = self.add_suggested_values_to_schema(
+                    copy.deepcopy(val.schema), suggested_values[key]
+                )
+                continue
+
             new_key = key
             if (
                 suggested_values
diff --git a/tests/components/kitchen_sink/test_config_flow.py b/tests/components/kitchen_sink/test_config_flow.py
index 1eea1c8036b..88bacc2cb0b 100644
--- a/tests/components/kitchen_sink/test_config_flow.py
+++ b/tests/components/kitchen_sink/test_config_flow.py
@@ -96,6 +96,15 @@ async def test_options_flow(hass: HomeAssistant) -> None:
     assert result["type"] is FlowResultType.FORM
     assert result["step_id"] == "options_1"
 
+    section_marker, section_schema = list(result["data_schema"].schema.items())[0]
+    assert section_marker == "section_1"
+    section_schema_markers = list(section_schema.schema.schema)
+    assert len(section_schema_markers) == 2
+    assert section_schema_markers[0] == "bool"
+    assert section_schema_markers[0].description is None
+    assert section_schema_markers[1] == "int"
+    assert section_schema_markers[1].description == {"suggested_value": 10}
+
     result = await hass.config_entries.options.async_configure(
         result["flow_id"],
         user_input={"section_1": {"bool": True, "int": 15}},