Handle deprecation in lovelace data (#4402)

* Handle breaking change in lovelace

* one more

* more

* fix

* context

* one more

* Reverse to not trigger deprecation warning

* one more

Author: ludeeus

custom_components/hacs/repositories/plugin.py

@@ -172,6 +172,7 @@ def generate_dashboard_resource_url(self) -> str:
 
     def _get_resource_handler(self) -> ResourceStorageCollection | None:
         """Get the resource handler."""
+        resources: ResourceStorageCollection | None
         if not (hass_data := self.hacs.hass.data):
             self.logger.error("%s Can not access the hass data", self.string)
             return
@@ -180,7 +181,12 @@ def _get_resource_handler(self) -> ResourceStorageCollection | None:
             self.logger.warning("%s Can not access the lovelace integration data", self.string)
             return
 
-        resources: ResourceStorageCollection | None = lovelace_data.get("resources")
+        if self.hacs.core.ha_version > "2025.1.99":
+            # Changed to 2025.2.0
+            # Changed in https://github.com/home-assistant/core/pull/136313
+            resources = lovelace_data.resources
+        else:
+            resources = lovelace_data.get("resources")
 
         if resources is None:
             self.logger.warning("%s Can not access the dashboard resources", self.string)

tests/conftest.py

@@ -274,9 +274,15 @@ async def assert_hacs_data(
             for entry in value:
                 data[key][entry["id"]] = entry
 
-        dashboard_resources: ResourceStorageCollection = hacs.hass.data[LOVELACE_DOMAIN][
-            "resources"
-        ]
+        dashboard_resources: ResourceStorageCollection
+        try:
+            # Changed to 2025.2.0
+            # Changed in https://github.com/home-assistant/core/pull/136313
+            dashboard_resources = hacs.hass.data[LOVELACE_DOMAIN].resources
+        except AttributeError:
+            dashboard_resources = hacs.hass.data[LOVELACE_DOMAIN][
+                "resources"
+            ]
 
         def _entity_state(entity: er.RegistryEntry) -> dict[str, Any]:
             state = hacs.hass.states.get(entity.entity_id)

tests/repositories/test_plugin_repository.py

@@ -94,7 +94,12 @@ async def test_get_resource_handler_wrong_version(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test the resource handler with wrong storage version."""
-    hass.data["lovelace"]["resources"].store.version = 2
+    try:
+        hass.data["lovelace"].resources.store.version = 2
+    except AttributeError:
+        # Changed to 2025.2.0
+        # Changed in https://github.com/home-assistant/core/pull/136313
+        hass.data["lovelace"]["resources"].store.version = 2
     resources = downloaded_plugin_repository._get_resource_handler()
     assert resources is None
     assert "Can not use the dashboard resources" in caplog.text
@@ -106,7 +111,13 @@ async def test_get_resource_handler_wrong_key(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test the resource handler with wrong storage key."""
-    hass.data["lovelace"]["resources"].store.key = "wrong_key"
+    try:
+        hass.data["lovelace"].resources.store.key = "wrong_key"
+    except AttributeError:
+        # Changed to 2025.2.0
+        # Changed in https://github.com/home-assistant/core/pull/136313
+        hass.data["lovelace"]["resources"].store.key = "wrong_key"
+
     resources = downloaded_plugin_repository._get_resource_handler()
     assert resources is None
     assert "Can not use the dashboard resources" in caplog.text
@@ -118,7 +129,13 @@ async def test_get_resource_handler_none_store(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test the resource handler with store being none."""
-    hass.data["lovelace"]["resources"].store = None
+    try:
+
+        hass.data["lovelace"].resources.store = None
+    except AttributeError:
+        # Changed to 2025.2.0
+        # Changed in https://github.com/home-assistant/core/pull/136313
+        hass.data["lovelace"]["resources"].store = None
     resources = downloaded_plugin_repository._get_resource_handler()
     assert resources is None
     assert "YAML mode detected, can not update resources" in caplog.text
@@ -130,7 +147,13 @@ async def test_get_resource_handler_no_store(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test the resource handler with no store."""
-    del hass.data["lovelace"]["resources"].store
+    try:
+        hass.data["lovelace"].resources.store = None
+    except AttributeError:
+        # Changed to 2025.2.0
+        # Changed in https://github.com/home-assistant/core/pull/136313
+        del hass.data["lovelace"]["resources"].store
+
     resources = downloaded_plugin_repository._get_resource_handler()
     assert resources is None
     assert "YAML mode detected, can not update resources" in caplog.text
@@ -142,7 +165,12 @@ async def test_get_resource_handler_no_lovelace_resources(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test the resource handler with no lovelace resources."""
-    del hass.data["lovelace"]["resources"]
+    try:
+        hass.data["lovelace"].resources = None
+    except AttributeError:
+        # Changed to 2025.2.0
+        # Changed in https://github.com/home-assistant/core/pull/136313
+        del hass.data["lovelace"]["resources"]
     resources = downloaded_plugin_repository._get_resource_handler()
     assert resources is None
     assert "Can not access the dashboard resources" in caplog.text