jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-29 12:16:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update ZHA device card (#3411)

Browse Source 
* add ability to subscribe to individual updates

* catch changes on area, device name and entity ids

* subscribe directly

* remove entity registry change

* add type

* remove device subscription
This commit is contained in:
David F. Mulcahey 2019-07-24 23:05:33 -04:00 committed by Paulus Schoutsen
parent 0cd263c532
commit ff80eef25d
1 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/panels/config/zha/zha-device-card.ts
View File

@ -30,13 +30,18 @@ import {
DeviceRegistryEntryMutableParams,
updateDeviceRegistryEntry,
} from "../../../data/device_registry";
import { reconfigureNode, ZHADevice } from "../../../data/zha";
import {
reconfigureNode,
ZHADevice,
ZHAEntityReference,
} from "../../../data/zha";
import { haStyle } from "../../../resources/styles";
import { HomeAssistant } from "../../../types";
import { ItemSelectedEvent, NodeServiceData } from "./types";
import { navigate } from "../../../common/navigate";
import { UnsubscribeFunc } from "home-assistant-js-websocket";
import { UnsubscribeFunc, HassEvent } from "home-assistant-js-websocket";
import { formatAsPaddedHex } from "./functions";
import computeStateName from "../../../common/entity/compute_state_name";
declare global {
// for fire event
@ -60,12 +65,34 @@ class ZHADeviceCard extends LitElement {
@property() private _selectedAreaIndex: number = -1;
@property() private _userGivenName?: string;
private _unsubAreas?: UnsubscribeFunc;
private _unsubEntities?: UnsubscribeFunc;
public disconnectedCallback() {
super.disconnectedCallback();
if (this._unsubAreas) {
this._unsubAreas();
}
if (this._unsubEntities) {
this._unsubEntities();
}
}
public connectedCallback() {
super.connectedCallback();
this._unsubAreas = subscribeAreaRegistry(this.hass.connection, (areas) => {
this._areas = areas;
});
this.hass.connection
.subscribeEvents((event: HassEvent) => {
if (this.device) {
this.device!.entities.forEach((deviceEntity) => {
if (event.data.old_entity_id === deviceEntity.entity_id) {
deviceEntity.entity_id = event.data.entity_id;
}
});
}
}, "entity_registry_updated")
.then((unsub) => (this._unsubEntities = unsub));
}
protected firstUpdated(changedProperties: PropertyValues): void {
@ -90,14 +117,6 @@ class ZHADeviceCard extends LitElement {
}
this._userGivenName = this.device!.user_given_name;
}
if (!this._unsubAreas) {
this._unsubAreas = subscribeAreaRegistry(
this.hass.connection,
(areas) => {
this._areas = areas;
}
);
}
super.update(changedProperties);
}
@ -168,7 +187,9 @@ class ZHADeviceCard extends LitElement {
${!this.isJoinPage
? html`
<paper-item-body>
<div class="name">${entity.name}</div>
<div class="name">
${this._computeEntityName(entity)}
</div>
<div class="secondary entity-id">
${entity.entity_id}
</div>
@ -280,6 +301,13 @@ class ZHADeviceCard extends LitElement {
}
}
private _computeEntityName(entity: ZHAEntityReference): string {
if (this.hass.states[entity.entity_id]) {
return computeStateName(this.hass.states[entity.entity_id]);
}
return entity.name;
}
private async _saveCustomName(event): Promise<void> {
if (this.hass) {
const values: DeviceRegistryEntryMutableParams = {