Migrate apps added to sidebar to use new app panel (#161265)

Co-authored-by: Petar Petrov <MindFreeze@users.noreply.github.com>

homeassistant/components/hassio/addon_panel.py

@@ -6,7 +6,7 @@ from typing import Any
 
 from aiohttp import web
 
-from homeassistant.components import frontend, panel_custom
+from homeassistant.components import frontend
 from homeassistant.components.http import HomeAssistantView
 from homeassistant.const import ATTR_ICON
 from homeassistant.core import HomeAssistant
@@ -33,7 +33,7 @@ async def async_setup_addon_panel(hass: HomeAssistant, hassio: HassIO) -> None:
         # _register_panel never suspends and is only
         # a coroutine because it would be a breaking change
         # to make it a normal function
-        await _register_panel(hass, addon, data)
+        _register_panel(hass, addon, data)
 
 
 class HassIOAddonPanel(HomeAssistantView):
@@ -58,7 +58,7 @@ class HassIOAddonPanel(HomeAssistantView):
         data = panels[addon]
 
         # Register panel
-        await _register_panel(self.hass, addon, data)
+        _register_panel(self.hass, addon, data)
         return web.Response()
 
     async def delete(self, request: web.Request, addon: str) -> web.Response:
@@ -76,18 +76,14 @@ class HassIOAddonPanel(HomeAssistantView):
         return {}
 
 
-async def _register_panel(
-    hass: HomeAssistant, addon: str, data: dict[str, Any]
-) -> None:
+def _register_panel(hass: HomeAssistant, addon: str, data: dict[str, Any]):
     """Init coroutine to register the panel."""
-    await panel_custom.async_register_panel(
+    frontend.async_register_built_in_panel(
         hass,
+        "app",
         frontend_url_path=addon,
-        webcomponent_name="hassio-main",
         sidebar_title=data[ATTR_TITLE],
         sidebar_icon=data[ATTR_ICON],
-        js_url="/api/hassio/app/entrypoint.js",
-        embed_iframe=True,
         require_admin=data[ATTR_ADMIN],
-        config={"ingress": addon},
+        config={"addon": addon},
     )

tests/components/hassio/test_addon_panel.py

@@ -130,3 +130,44 @@ async def test_hassio_addon_panel_api(
             "test1",
             {"enable": True, "title": "Test", "icon": "mdi:test", "admin": False},
         )
+
+
+@pytest.mark.usefixtures("hassio_env")
+async def test_hassio_addon_panel_registration(
+    hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+) -> None:
+    """Test panel registration calls frontend.async_register_built_in_panel."""
+    aioclient_mock.get(
+        "http://127.0.0.1/ingress/panels",
+        json={
+            "result": "ok",
+            "data": {
+                "panels": {
+                    "test_addon": {
+                        "enable": True,
+                        "title": "Test Addon",
+                        "icon": "mdi:test-tube",
+                        "admin": True,
+                    },
+                }
+            },
+        },
+    )
+
+    with patch(
+        "homeassistant.components.hassio.addon_panel.frontend.async_register_built_in_panel"
+    ) as mock_register:
+        await async_setup_component(hass, "hassio", {})
+        await hass.async_block_till_done()
+
+        # Verify that async_register_built_in_panel was called with correct arguments
+        # for our test addon
+        mock_register.assert_any_call(
+            hass,
+            "app",
+            frontend_url_path="test_addon",
+            sidebar_title="Test Addon",
+            sidebar_icon="mdi:test-tube",
+            require_admin=True,
+            config={"addon": "test_addon"},
+        )