From 361474885f008415438780ab86a61801e7de5373 Mon Sep 17 00:00:00 2001 From: Petar Petrov Date: Wed, 16 Jul 2025 11:00:49 +0300 Subject: [PATCH] Fix entity renaming when adding a new device (#26177) --- src/dialogs/config-flow/step-flow-create-entry.ts | 5 ++++- .../integrations/integration-panels/zha/zha-device-card.ts | 2 +- .../zwave_js/add-node/dialog-zwave_js-add-node.ts | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/dialogs/config-flow/step-flow-create-entry.ts b/src/dialogs/config-flow/step-flow-create-entry.ts index bfc0527511..4b9eae53a7 100644 --- a/src/dialogs/config-flow/step-flow-create-entry.ts +++ b/src/dialogs/config-flow/step-flow-create-entry.ts @@ -212,7 +212,10 @@ class StepFlowCreateEntry extends LitElement { entityIds.push(...entities.map((entity) => entity.entity_id)); }); - const entityIdsMapping = getAutomaticEntityIds(this.hass, entityIds); + const entityIdsMapping = await getAutomaticEntityIds( + this.hass, + entityIds + ); Object.entries(entityIdsMapping).forEach(([oldEntityId, newEntityId]) => { if (newEntityId) { diff --git a/src/panels/config/integrations/integration-panels/zha/zha-device-card.ts b/src/panels/config/integrations/integration-panels/zha/zha-device-card.ts index 4e0908e746..26068ca5bc 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-device-card.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-device-card.ts @@ -134,7 +134,7 @@ class ZHADeviceCard extends SubscribeMixin(LitElement) { } const entities = this._deviceEntities(device.device_reg_id, this._entities); - const entityIdsMapping = getAutomaticEntityIds( + const entityIdsMapping = await getAutomaticEntityIds( this.hass, entities.map((entity) => entity.entity_id) ); diff --git a/src/panels/config/integrations/integration-panels/zwave_js/add-node/dialog-zwave_js-add-node.ts b/src/panels/config/integrations/integration-panels/zwave_js/add-node/dialog-zwave_js-add-node.ts index 561cf10848..5b9bb819d8 100644 --- a/src/panels/config/integrations/integration-panels/zwave_js/add-node/dialog-zwave_js-add-node.ts +++ b/src/panels/config/integrations/integration-panels/zwave_js/add-node/dialog-zwave_js-add-node.ts @@ -878,7 +878,7 @@ class DialogZWaveJSAddNode extends SubscribeMixin(LitElement) { (entity) => entity.device_id === this._device!.id ); - const entityIdsMapping = getAutomaticEntityIds( + const entityIdsMapping = await getAutomaticEntityIds( this.hass, entities.map((entity) => entity.entity_id) );