From b65403f3326c37bfccc377856e39739752a8ba94 Mon Sep 17 00:00:00 2001
From: Michael <35783820+mib1185@users.noreply.github.com>
Date: Sun, 9 Feb 2025 21:04:46 +0100
Subject: [PATCH] Explicitly pass in the config_entry in idasen_desk
coordinator (#138146)
explicitly pass in the config_entry in coordinator
---
homeassistant/components/idasen_desk/__init__.py | 7 ++-----
homeassistant/components/idasen_desk/button.py | 2 +-
homeassistant/components/idasen_desk/coordinator.py | 11 +++++++++--
homeassistant/components/idasen_desk/cover.py | 2 +-
homeassistant/components/idasen_desk/entity.py | 2 +-
homeassistant/components/idasen_desk/sensor.py | 2 +-
6 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/homeassistant/components/idasen_desk/__init__.py b/homeassistant/components/idasen_desk/__init__.py
index 671319e46eb..1ea0efeef72 100644
--- a/homeassistant/components/idasen_desk/__init__.py
+++ b/homeassistant/components/idasen_desk/__init__.py
@@ -9,25 +9,22 @@ from idasen_ha.errors import AuthFailedError
from homeassistant.components import bluetooth
from homeassistant.components.bluetooth.match import ADDRESS, BluetoothCallbackMatcher
-from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_ADDRESS, EVENT_HOMEASSISTANT_STOP, Platform
from homeassistant.core import Event, HomeAssistant, callback
from homeassistant.exceptions import ConfigEntryNotReady
-from .coordinator import IdasenDeskCoordinator
+from .coordinator import IdasenDeskConfigEntry, IdasenDeskCoordinator
PLATFORMS: list[Platform] = [Platform.BUTTON, Platform.COVER, Platform.SENSOR]
_LOGGER = logging.getLogger(__name__)
-type IdasenDeskConfigEntry = ConfigEntry[IdasenDeskCoordinator]
-
async def async_setup_entry(hass: HomeAssistant, entry: IdasenDeskConfigEntry) -> bool:
"""Set up IKEA Idasen from a config entry."""
address: str = entry.data[CONF_ADDRESS].upper()
- coordinator = IdasenDeskCoordinator(hass, entry.title, address)
+ coordinator = IdasenDeskCoordinator(hass, entry, address)
entry.runtime_data = coordinator
try:
diff --git a/homeassistant/components/idasen_desk/button.py b/homeassistant/components/idasen_desk/button.py
index cd7553da1ac..afd2f72917c 100644
--- a/homeassistant/components/idasen_desk/button.py
+++ b/homeassistant/components/idasen_desk/button.py
@@ -10,7 +10,7 @@ from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from . import IdasenDeskConfigEntry, IdasenDeskCoordinator
+from .coordinator import IdasenDeskConfigEntry, IdasenDeskCoordinator
from .entity import IdasenDeskEntity
_LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/idasen_desk/coordinator.py b/homeassistant/components/idasen_desk/coordinator.py
index d9e90cfe5ea..5da3d57cf9a 100644
--- a/homeassistant/components/idasen_desk/coordinator.py
+++ b/homeassistant/components/idasen_desk/coordinator.py
@@ -7,24 +7,31 @@ import logging
from idasen_ha import Desk
from homeassistant.components import bluetooth
+from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
_LOGGER = logging.getLogger(__name__)
+type IdasenDeskConfigEntry = ConfigEntry[IdasenDeskCoordinator]
+
class IdasenDeskCoordinator(DataUpdateCoordinator[int | None]):
"""Class to manage updates for the Idasen Desk."""
+ config_entry: IdasenDeskConfigEntry
+
def __init__(
self,
hass: HomeAssistant,
- name: str,
+ config_entry: IdasenDeskConfigEntry,
address: str,
) -> None:
"""Init IdasenDeskCoordinator."""
- super().__init__(hass, _LOGGER, name=name)
+ super().__init__(
+ hass, _LOGGER, config_entry=config_entry, name=config_entry.title
+ )
self.address = address
self._expected_connected = False
diff --git a/homeassistant/components/idasen_desk/cover.py b/homeassistant/components/idasen_desk/cover.py
index a8ba0983e99..b99eb67d8f5 100644
--- a/homeassistant/components/idasen_desk/cover.py
+++ b/homeassistant/components/idasen_desk/cover.py
@@ -16,7 +16,7 @@ from homeassistant.core import HomeAssistant
from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from . import IdasenDeskConfigEntry, IdasenDeskCoordinator
+from .coordinator import IdasenDeskConfigEntry, IdasenDeskCoordinator
from .entity import IdasenDeskEntity
diff --git a/homeassistant/components/idasen_desk/entity.py b/homeassistant/components/idasen_desk/entity.py
index bda7afd528c..46730ee13fe 100644
--- a/homeassistant/components/idasen_desk/entity.py
+++ b/homeassistant/components/idasen_desk/entity.py
@@ -5,7 +5,7 @@ from __future__ import annotations
from homeassistant.helpers import device_registry as dr
from homeassistant.helpers.update_coordinator import CoordinatorEntity
-from . import IdasenDeskCoordinator
+from .coordinator import IdasenDeskCoordinator
class IdasenDeskEntity(CoordinatorEntity[IdasenDeskCoordinator]):
diff --git a/homeassistant/components/idasen_desk/sensor.py b/homeassistant/components/idasen_desk/sensor.py
index 4613d316a52..f4ba163b123 100644
--- a/homeassistant/components/idasen_desk/sensor.py
+++ b/homeassistant/components/idasen_desk/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.const import UnitOfLength
from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from . import IdasenDeskConfigEntry, IdasenDeskCoordinator
+from .coordinator import IdasenDeskConfigEntry, IdasenDeskCoordinator
from .entity import IdasenDeskEntity
--
GitLab