config_subentries -> config_entries_subentries

home-assistant · Feb 4, 2025 · a2406ee · a2406ee
1 parent 2762566
commit a2406ee
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/gallery/src/pages/components/ha-form.ts b/gallery/src/pages/components/ha-form.ts
@@ -48,7 +48,7 @@ const DEVICES: DeviceRegistryEntry[] = [
     area_id: "bedroom",
     configuration_url: null,
     config_entries: ["config_entry_1"],
-    config_subentries: {},
+    config_entries_subentries: {},
     connections: [],
     disabled_by: null,
     entry_type: null,
@@ -72,7 +72,7 @@ const DEVICES: DeviceRegistryEntry[] = [
     area_id: "backyard",
     configuration_url: null,
     config_entries: ["config_entry_2"],
-    config_subentries: {},
+    config_entries_subentries: {},
     connections: [],
     disabled_by: null,
     entry_type: null,
@@ -96,7 +96,7 @@ const DEVICES: DeviceRegistryEntry[] = [
     area_id: null,
     configuration_url: null,
     config_entries: ["config_entry_3"],
-    config_subentries: {},
+    config_entries_subentries: {},
     connections: [],
     disabled_by: null,
     entry_type: null,

diff --git a/gallery/src/pages/components/ha-selector.ts b/gallery/src/pages/components/ha-selector.ts
@@ -47,7 +47,7 @@ const DEVICES: DeviceRegistryEntry[] = [
     area_id: "bedroom",
     configuration_url: null,
     config_entries: ["config_entry_1"],
-    config_subentries: {},
+    config_entries_subentries: {},
     connections: [],
     disabled_by: null,
     entry_type: null,
@@ -71,7 +71,7 @@ const DEVICES: DeviceRegistryEntry[] = [
     area_id: "backyard",
     configuration_url: null,
     config_entries: ["config_entry_2"],
-    config_subentries: {},
+    config_entries_subentries: {},
     connections: [],
     disabled_by: null,
     entry_type: null,
@@ -95,7 +95,7 @@ const DEVICES: DeviceRegistryEntry[] = [
     area_id: null,
     configuration_url: null,
     config_entries: ["config_entry_3"],
-    config_subentries: {},
+    config_entries_subentries: {},
     connections: [],
     disabled_by: null,
     entry_type: null,

diff --git a/gallery/src/pages/misc/integration-card.ts b/gallery/src/pages/misc/integration-card.ts
@@ -217,7 +217,7 @@ const createDeviceRegistryEntries = (
   {
     entry_type: null,
     config_entries: [item.entry_id],
-    config_subentries: {},
+    config_entries_subentries: {},
     connections: [],
     manufacturer: "ESPHome",
     model: "Mock Device",

diff --git a/src/data/device_registry.ts b/src/data/device_registry.ts
@@ -17,7 +17,7 @@ export {
 export interface DeviceRegistryEntry extends RegistryEntry {
   id: string;
   config_entries: string[];
-  config_subentries: { [configEntryId: string]: (string | null)[] };
+  config_entries_subentries: { [configEntryId: string]: (string | null)[] };
   connections: [string, string][];
   identifiers: [string, string][];
   manufacturer: string | null;

diff --git a/src/panels/config/devices/ha-config-devices-dashboard.ts b/src/panels/config/devices/ha-config-devices-dashboard.ts
@@ -360,9 +360,11 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) {
           const configEntryId = this._filters.config_entry.value[0];
           outputDevices = outputDevices.filter(
             (device) =>
-              device.config_subentries[configEntryId] &&
+              device.config_entries_subentries[configEntryId] &&
               (filter.value as string[]).some((subEntryId) =>
-                device.config_subentries[configEntryId].includes(subEntryId)
+                device.config_entries_subentries[configEntryId].includes(
+                  subEntryId
+                )
               )
           );
           if (!this._subConfigEntries) {

diff --git a/src/panels/config/integrations/ha-config-integration-page.ts b/src/panels/config/integrations/ha-config-integration-page.ts
@@ -1035,13 +1035,13 @@ class HaConfigIntegrationPage extends SubscribeMixin(LitElement) {
 
   private _renderSubEntry(configEntry: ConfigEntry, subEntry: SubConfigEntry) {
     const devices = this._getConfigEntryDevices(configEntry).filter((device) =>
-      device.config_subentries[configEntry.entry_id]?.includes(
+      device.config_entries_subentries[configEntry.entry_id]?.includes(
         subEntry.subentry_id
       )
     );
     const services = this._getConfigEntryServices(configEntry).filter(
       (device) =>
-        device.config_subentries[configEntry.entry_id]?.includes(
+        device.config_entries_subentries[configEntry.entry_id]?.includes(
           subEntry.subentry_id
         )
     );