use backwards compatible approach

Author: raman325

custom_components/pyscript/config_flow.py

@@ -21,11 +21,13 @@ class PyscriptOptionsConfigFlow(config_entries.OptionsFlow):
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize pyscript options flow."""
         self.config_entry = config_entry
+        self._show_form = False
 
     async def async_step_init(self, user_input: Dict[str, Any] = None) -> Dict[str, Any]:
         """Manage the pyscript options."""
         if self.config_entry.source == SOURCE_IMPORT:
-            return self.async_abort(reason="no_ui_configuration_allowed")
+            self._show_form = True
+            return await self.async_step_no_ui_configuration_allowed()
 
         if user_input is None:
             return self.async_show_form(
@@ -46,7 +48,26 @@ async def async_step_init(self, user_input: Dict[str, Any] = None) -> Dict[str,
             self.hass.config_entries.async_update_entry(entry=self.config_entry, data=updated_data)
             return self.async_create_entry(title="", data={})
 
-        return self.async_abort(reason="no_update")
+        self._show_form = True
+        return await self.async_step_no_update()
+
+    async def async_step_no_ui_configuration_allowed(
+        self, user_input: Dict[str, Any] = None
+    ) -> Dict[str, Any]:
+        """Tell user no UI configuration is allowed."""
+        if self._show_form:
+            self._show_form = False
+            return self.async_show_form(step_id="no_ui_configuration_allowed", data_schema=vol.Schema({}))
+
+        return self.async_create_entry(title="", data={})
+
+    async def async_step_no_update(self, user_input: Dict[str, Any] = None) -> Dict[str, Any]:
+        """Tell user no update to process."""
+        if self._show_form:
+            self._show_form = False
+            return self.async_show_form(step_id="no_update", data_schema=vol.Schema({}))
+
+        return self.async_create_entry(title="", data={})
 
 
 class PyscriptConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):

custom_components/pyscript/strings.json

@@ -22,11 +22,15 @@
         "data": {
           "allow_all_imports": "Allow All Imports?"
         }
+      },
+      "no_ui_configuration_allowed": {
+        "title": "No UI configuration allowed",
+        "description": "This entry was created via `configuration.yaml`, so all configuration parameters must be updated there. The [`pyscript.reload`](developer-tools/service) service will allow you to apply the changes you make to `configuration.yaml` without restarting your Home Assistant instance."
+      },
+      "no_update": {
+        "title": "No update needed",
+        "description": "There is nothing to update."
       }
-    },
-    "abort": {
-      "no_ui_configuration_allowed": "This entry was created via `configuration.yaml`, so all configuration parameters must be updated there. The [`pyscript.reload`](developer-tools/service) service will allow you to apply the changes you make to `configuration.yaml` without restarting your Home Assistant instance.",
-      "no_update": "There is nothing to update."
     }
   }
 }

custom_components/pyscript/translations/en.json

@@ -22,11 +22,15 @@
         "data": {
           "allow_all_imports": "Allow All Imports?"
         }
+      },
+      "no_ui_configuration_allowed": {
+        "title": "No UI configuration allowed",
+        "description": "This entry was created via `configuration.yaml`, so all configuration parameters must be updated there. The [`pyscript.reload`](developer-tools/service) service will allow you to apply the changes you make to `configuration.yaml` without restarting your Home Assistant instance."
+      },
+      "no_update": {
+        "title": "No update needed",
+        "description": "There is nothing to update."
       }
-    },
-    "abort": {
-      "no_ui_configuration_allowed": "This entry was created via `configuration.yaml`, so all configuration parameters must be updated there. The [`pyscript.reload`](developer-tools/service) service will allow you to apply the changes you make to `configuration.yaml` without restarting your Home Assistant instance.",
-      "no_update": "There is nothing to update."
     }
   }
 }

tests/test_config_flow.py

@@ -187,8 +187,13 @@ async def test_options_flow_import(hass):
 
     result = await hass.config_entries.options.async_init(entry.entry_id, data=None)
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "no_ui_configuration_allowed"
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "no_ui_configuration_allowed"
+
+    result = await hass.config_entries.options.async_configure(result["flow_id"], user_input=None)
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result["title"] == ""
 
 
 async def test_options_flow_user_change(hass):
@@ -234,5 +239,10 @@ async def test_options_flow_user_no_change(hass):
         result["flow_id"], user_input={CONF_ALLOW_ALL_IMPORTS: True}
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "no_update"
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "no_update"
+
+    result = await hass.config_entries.options.async_configure(result["flow_id"], user_input=None)
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result["title"] == ""