remove advanced options (#722)

OpenHomeFoundation/roadmap#54

Author: patman15

custom_components/bms_ble/config_flow.py

@@ -36,7 +36,6 @@
     TextSelectorConfig,
     TextSelectorType,
 )
-from homeassistant.helpers.typing import VolDictType
 
 from .const import CONF_ADVANCED_OPTIONS, CONF_KEEP_ALIVE, DOMAIN, LOGGER
 
@@ -213,34 +212,30 @@ async def async_step_init(
         )
         if not bms_class:
             return self.async_abort(reason="not_supported")
-        if not bms_class.accept_secret and not self.show_advanced_options:
-            LOGGER.debug("No options for %s", bms_class.bms_id())
-            return self.async_abort(
-                reason="device_has_no_options",
-                description_placeholders={"model": bms_class.bms_id()},
-            )
-
-        schema_dict: VolDictType = {
-            vol.Optional(CONF_PASSWORD): TextSelector(
-                TextSelectorConfig(
-                    type=TextSelectorType.PASSWORD,
-                    read_only=not bms_class.accept_secret,
-                )
-            )
-        }
-
-        if self.show_advanced_options:
-            schema_dict[vol.Optional(CONF_ADVANCED_OPTIONS)] = section(
-                vol.Schema(
-                    {vol.Optional(CONF_KEEP_ALIVE, default=True): BooleanSelector()}
-                ),
-                {"collapsed": True},
-            )
 
         return self.async_show_form(
             step_id="init",
             data_schema=self.add_suggested_values_to_schema(
-                vol.Schema(schema_dict),
+                vol.Schema(
+                    {
+                        vol.Optional(CONF_PASSWORD): TextSelector(
+                            TextSelectorConfig(
+                                type=TextSelectorType.PASSWORD,
+                                read_only=not bms_class.accept_secret,
+                            )
+                        ),
+                        vol.Optional(CONF_ADVANCED_OPTIONS): section(
+                            vol.Schema(
+                                {
+                                    vol.Optional(
+                                        CONF_KEEP_ALIVE, default=True
+                                    ): BooleanSelector()
+                                }
+                            ),
+                            {"collapsed": True},
+                        ),
+                    }
+                ),
                 self.config_entry.options,
             ),
         )

tests/test_config_flow.py

@@ -303,7 +303,9 @@ async def test_async_setup_entry(
 
 
 @pytest.mark.usefixtures("enable_bluetooth")
-async def test_setup_entry_missing_unique_id(bms_fixture: str, hass: HomeAssistant) -> None:
+async def test_setup_entry_missing_unique_id(
+    bms_fixture: str, hass: HomeAssistant
+) -> None:
     """Test async_setup_entry with missing unique id."""
 
     cfg: MockConfigEntry = mock_config(bms=bms_fixture, unique_id=None)
@@ -452,20 +454,15 @@ async def test_options_flow(
 
 
 @pytest.mark.usefixtures("enable_bluetooth")
-@pytest.mark.parametrize("show_adv_opt", [True, False], ids=["adv_opt", "no_adv_opt"])
-async def test_options_flow_no_secret(hass: HomeAssistant, show_adv_opt: bool) -> None:
-    """Test if options flow for BMS without secret and disabled advanced mode."""
+async def test_options_flow_no_secret(hass: HomeAssistant) -> None:
+    """Test if options flow for BMS without secret."""
 
     cfg: MockConfigEntry = mock_config()
     cfg.add_to_hass(hass)
 
     result: ConfigFlowResult = await hass.config_entries.options.async_init(
-        cfg.entry_id, context={"show_advanced_options": show_adv_opt}
+        cfg.entry_id
     )
-    if not show_adv_opt:  # Abort without advanced mode
-        assert result.get("type") is FlowResultType.ABORT
-        assert result.get("reason") == "device_has_no_options"
-        return
 
     assert result.get("type") is FlowResultType.FORM
     assert result.get("step_id") == "init"