jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-20 15:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix area and user given name display (#3033)

Browse Source
This commit is contained in:
David F. Mulcahey 2019-03-29 17:02:13 -04:00 committed by Paulus Schoutsen
parent 7b821aa363
commit c134464f6a
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/data/zha.ts
View File

@ -15,8 +15,8 @@ export interface ZHADevice {
entities: ZHAEntityReference[]; entities: ZHAEntityReference[];
manufacturer_code: number; manufacturer_code: number;
device_reg_id: string; device_reg_id: string;
user_given_name: string; user_given_name?: string;
area_id: string; area_id?: string;
} }
export interface Attribute { export interface Attribute {

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

@ -55,6 +55,7 @@ class ZHADeviceCard extends LitElement {
@property() private _serviceData?: NodeServiceData; @property() private _serviceData?: NodeServiceData;
@property() private _areas: AreaRegistryEntry[] = []; @property() private _areas: AreaRegistryEntry[] = [];
@property() private _selectedAreaIndex: number = -1; @property() private _selectedAreaIndex: number = -1;
@property() private _userGivenName?: string;
public firstUpdated(changedProperties: PropertyValues): void { public firstUpdated(changedProperties: PropertyValues): void {
super.firstUpdated(changedProperties); super.firstUpdated(changedProperties);
@ -71,9 +72,15 @@ class ZHADeviceCard extends LitElement {
protected updated(changedProperties: PropertyValues): void { protected updated(changedProperties: PropertyValues): void {
if (changedProperties.has("device")) { if (changedProperties.has("device")) {
if (!this._areas || !this.device || !this.device.area_id) {
this._selectedAreaIndex = 0;
} else {
this._selectedAreaIndex = this._selectedAreaIndex =
this._areas.findIndex((area) => area.area_id === this.device!.area_id) + this._areas.findIndex(
1; (area) => area.area_id === this.device!.area_id
) + 1;
}
this._userGivenName = this.device!.user_given_name;
} }
super.update(changedProperties); super.update(changedProperties);
} }
@ -150,6 +157,7 @@ class ZHADeviceCard extends LitElement {
<paper-input <paper-input
type="string" type="string"
@change="${this._saveCustomName}" @change="${this._saveCustomName}"
.value="${this._userGivenName}"
placeholder="${this.hass!.localize( placeholder="${this.hass!.localize(
"ui.panel.config.zha.device_card.device_name_placeholder" "ui.panel.config.zha.device_card.device_name_placeholder"
)}" )}"
@ -265,10 +273,12 @@ class ZHADeviceCard extends LitElement {
return; return;
} }
const newAreaId = area ? area.area_id : undefined;
await updateDeviceRegistryEntry(this.hass!, this.device.device_reg_id, { await updateDeviceRegistryEntry(this.hass!, this.device.device_reg_id, {
area_id: area ? area.area_id : undefined, area_id: newAreaId,
name_by_user: this.device!.user_given_name, name_by_user: this.device!.user_given_name,
}); });
this.device!.area_id = newAreaId;
} }
static get styles(): CSSResult[] { static get styles(): CSSResult[] {