Merge pull request #128 from c-st/fix-config-flow-updates

Improve config flow updates

Author: c-st

DEVELOP.md

@@ -8,7 +8,7 @@
 ./scripts/develop
 ```
 
-Open extension [in browser](http://localhost:8123/).
+Open extension [in browser](http://localhost:8123/) and set up a new user.
 
 ##  Translations
 

config/configuration.yaml

@@ -10,11 +10,8 @@ logger:
     custom_components.auto_areas: debug
 
 # https://www.home-assistant.io/integrations/demo/
-light:
-  - platform: demo
 
-binary_sensor:
-  - platform: demo
+demo:
 
 sensor:
   - platform: random

custom_components/auto_areas/__init__.py

@@ -30,7 +30,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         """Initialize immediately"""
         await async_init(hass, entry, auto_area)
     else:
-        """Schedule initialization when HA is started"""
+        """Schedule initialization when HA is started and initialized"""
+
         # https://developers.home-assistant.io/docs/asyncio_working_with_async/#calling-async-functions-from-threads
 
         @callback
@@ -39,10 +40,6 @@ def init(hass: HomeAssistant, entry: ConfigEntry, auto_area: AutoArea):
                 async_init(hass, entry, auto_area), hass.loop
             ).result()
 
-        LOGGER.info(
-            "😴 Deferring AutoAreas setup by 10 seconds to make sure all entities are ready")
-        await asyncio.sleep(10)
-
         hass.bus.async_listen_once(
             EVENT_HOMEASSISTANT_STARTED,
             lambda params: init(hass, entry, auto_area)
@@ -51,20 +48,22 @@ def init(hass: HomeAssistant, entry: ConfigEntry, auto_area: AutoArea):
     return True
 
 
-def initialize(hass: HomeAssistant, entry: ConfigEntry, auto_area: AutoArea):
-    """Initialize area after HA has started."""
-    asyncio.run_coroutine_threadsafe(
-        async_init(hass, entry, auto_area), hass.loop
-    ).result()
-
-
 async def async_init(hass: HomeAssistant, entry: ConfigEntry, auto_area: AutoArea):
     """Initialize component."""
-    await auto_area.initialize()
+    await asyncio.sleep(5)  # wait for all area devices to be initialized
+    await auto_area.async_initialize()
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
     entry.async_on_unload(entry.add_update_listener(async_reload_entry))
-    hass.async_create_task(
-        hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-    )
+
+    return True
+
+
+async def async_reload_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Reload config entry."""
+    LOGGER.info("🔄 Reloading entry %s", entry)
+
+    await hass.config_entries.async_reload(entry.entry_id)
 
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
@@ -83,12 +82,6 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return unloaded
 
 
-async def async_reload_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
-    """Reload config entry."""
-    await async_unload_entry(hass, entry)
-    await async_setup_entry(hass, entry)
-
-
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Check for YAML-config."""
 

custom_components/auto_areas/auto_area.py

@@ -41,7 +41,7 @@ def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
         self.area: AreaEntry = self.area_registry.async_get_area(self.area_id)
         self.auto_lights = None
 
-    async def initialize(self):
+    async def async_initialize(self):
         """Subscribe to area changes and reload if necessary."""
         LOGGER.info("%s: Initializing after HA start", self.area.name)
 

custom_components/auto_areas/manifest.json

@@ -6,13 +6,20 @@
     "button",
     "group",
     "binary_sensor",
-    "sensor"
+    "sensor",
+    "mqtt"
   ],
   "codeowners": [
     "@c-st"
   ],
   "config_flow": true,
-  "dependencies": [],
+  "dependencies": [
+    "light",
+    "button",
+    "group",
+    "binary_sensor",
+    "sensor"
+  ],
   "documentation": "https://github.com/c-st/auto_areas",
   "iot_class": "local_push",
   "issue_tracker": "https://github.com/c-st/auto_areas/issues",