From 3b5b3f3bb66f6308ddc6facce825f0af31fdc37d Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 3 Apr 2024 14:40:48 +0200 Subject: [PATCH] Handle disabled entities in multi select label (#20371) --- src/panels/config/entities/ha-config-entities.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/panels/config/entities/ha-config-entities.ts b/src/panels/config/entities/ha-config-entities.ts index ef9289b099..910448ac3a 100644 --- a/src/panels/config/entities/ha-config-entities.ts +++ b/src/panels/config/entities/ha-config-entities.ts @@ -1029,14 +1029,18 @@ ${ const action = ev.currentTarget.action; const promises: Promise[] = []; this._selected.forEach((entityId) => { + const entityReg = + this.hass.entities[entityId] || + this._entities.find((entReg) => entReg.entity_id === entityId); + if (!entityReg) { + return; + } promises.push( updateEntityRegistryEntry(this.hass, entityId, { labels: action === "add" - ? this.hass.entities[entityId].labels.concat(label) - : this.hass.entities[entityId].labels.filter( - (lbl) => lbl !== label - ), + ? entityReg.labels.concat(label) + : entityReg.labels.filter((lbl) => lbl !== label), }) ); });