Fix zwave-node-values component (#3452)

* Fix zwave-node-values

* lint
pull/3455/head
Charles Garwood 2019-08-03 14:19:25 -04:00 committed by Paulus Schoutsen
parent 2389f92448
commit 0544027c38
2 changed files with 22 additions and 18 deletions

View File

@ -5,10 +5,13 @@ export interface ZWaveNetworkStatus {
} }
export interface ZWaveValue { export interface ZWaveValue {
index: number; key: number;
instance: number; value: {
label: string; index: number;
poll_intensity: number; instance: number;
label: string;
poll_intensity: number;
};
} }
export interface ZWaveConfigItem { export interface ZWaveConfigItem {

View File

@ -23,7 +23,7 @@ import { ZWaveValue } from "../../../data/zwave";
@customElement("zwave-values") @customElement("zwave-values")
export class ZwaveValues extends LitElement { export class ZwaveValues extends LitElement {
@property() public hass!: HomeAssistant; @property() public hass!: HomeAssistant;
@property() private _values: ZWaveValue[] = []; @property() public values: ZWaveValue[] = [];
@property() private _selectedValue: number = -1; @property() private _selectedValue: number = -1;
protected render(): TemplateResult | void { protected render(): TemplateResult | void {
@ -34,7 +34,7 @@ export class ZwaveValues extends LitElement {
> >
<div class="device-picker"> <div class="device-picker">
<paper-dropdown-menu <paper-dropdown-menu
label=${this.hass.localize("ui.panel.config.zwave.common.value")} .label=${this.hass.localize("ui.panel.config.zwave.common.value")}
dynamic-align dynamic-align
class="flex" class="flex"
> >
@ -42,19 +42,11 @@ export class ZwaveValues extends LitElement {
slot="dropdown-content" slot="dropdown-content"
.selected=${this._selectedValue} .selected=${this._selectedValue}
> >
${this._values.map( ${this.values.map(
(item) => html` (item) => html`
<paper-item <paper-item>
>${item.label} ${this._computeCaption(item)}
(${this.hass.localize( </paper-item>
"ui.panel.config.zwave.common.instance"
)}:
${item.instance},
${this.hass.localize(
"ui.panel.config.zwave.common.index"
)}:
${item.index})</paper-item
>
` `
)} )}
</paper-listbox> </paper-listbox>
@ -110,6 +102,15 @@ export class ZwaveValues extends LitElement {
`, `,
]; ];
} }
private _computeCaption(item) {
let out = `${item.value.label}`;
out += ` (${this.hass.localize("ui.panel.config.zwave.common.instance")}:`;
out += ` ${item.value.instance},`;
out += ` ${this.hass.localize("ui.panel.config.zwave.common.index")}:`;
out += ` ${item.value.index})`;
return out;
}
} }
declare global { declare global {