Skip to content

Update ZHA config panel to handle the addition of ZHA devices for the Zigbee coordinator #4541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bramkragten merged 2 commits into from
Jan 21, 2020
Merged

Update ZHA config panel to handle the addition of ZHA devices for the Zigbee coordinator #4541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
646ba7f
only show when there are entities
dmulcahey Jan 20, 2020
c81a46c
handle coordinator correctly
dmulcahey Jan 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/dialogs/zha-device-info-dialog/dialog-zha-device-info.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ class DialogZHADeviceInfo extends LitElement {
.device=${this._device}
@zha-device-removed=${this._onDeviceRemoved}
.showEntityDetail=${false}
.showActions="${this._device.device_type !== "Coordinator"}"
></zha-device-card>
`}
</ha-paper-dialog>
Expand Down
20 changes: 13 additions & 7 deletions src/panels/config/zha/zha-device-card.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,13 +224,19 @@ class ZHADeviceCard extends LitElement {
`
)}
</div>
<div class="card-actions">
<mwc-button @click=${this._addToLovelaceView}>
${this.hass.localize(
"ui.panel.config.devices.entities.add_entities_lovelace"
)}
</mwc-button>
</div>
${
this.device!.entities && this.device!.entities.length > 0
? html`
<div class="card-actions">
<mwc-button @click=${this._addToLovelaceView}>
${this.hass.localize(
"ui.panel.config.devices.entities.add_entities_lovelace"
)}
</mwc-button>
</div>
`
: ""
}
${
this.showEditableInfo
? html`
Expand Down
93 changes: 52 additions & 41 deletions src/panels/config/zha/zha-device-page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,48 +79,53 @@ export class ZHADevicePage extends LitElement {
.hass="${this.hass}"
.device=${this.device}
></zha-node>
<zha-clusters
.hass="${this.hass}"
.isWide="${this.isWide}"
.selectedDevice="${this.device}"
@zha-cluster-selected="${this._onClusterSelected}"
></zha-clusters>
${this._selectedCluster
? html`
<zha-cluster-attributes
.isWide="${this.isWide}"
.hass="${this.hass}"
.selectedNode="${this.device}"
.selectedCluster="${this._selectedCluster}"
></zha-cluster-attributes>

<zha-cluster-commands
.isWide="${this.isWide}"
.hass="${this.hass}"
.selectedNode="${this.device}"
.selectedCluster="${this._selectedCluster}"
></zha-cluster-commands>
`
: ""}
${this._bindableDevices.length > 0
${this.device && this.device.device_type !== "Coordinator"
? html`
<zha-device-binding-control
.isWide="${this.isWide}"
<zha-clusters
.hass="${this.hass}"
.selectedDevice="${this.device}"
.bindableDevices="${this._bindableDevices}"
></zha-device-binding-control>
`
: ""}
${this.device && this._groups.length > 0
? html`
<zha-group-binding-control
.isWide="${this.isWide}"
.narrow="${this.narrow}"
.hass="${this.hass}"
.selectedDevice="${this.device}"
.groups="${this._groups}"
></zha-group-binding-control>
@zha-cluster-selected="${this._onClusterSelected}"
></zha-clusters>
${this._selectedCluster
? html`
<zha-cluster-attributes
.isWide="${this.isWide}"
.hass="${this.hass}"
.selectedNode="${this.device}"
.selectedCluster="${this._selectedCluster}"
></zha-cluster-attributes>

<zha-cluster-commands
.isWide="${this.isWide}"
.hass="${this.hass}"
.selectedNode="${this.device}"
.selectedCluster="${this._selectedCluster}"
></zha-cluster-commands>
`
: ""}
${this._bindableDevices.length > 0
? html`
<zha-device-binding-control
.isWide="${this.isWide}"
.hass="${this.hass}"
.selectedDevice="${this.device}"
.bindableDevices="${this._bindableDevices}"
></zha-device-binding-control>
`
: ""}
${this.device && this._groups.length > 0
? html`
<zha-group-binding-control
.isWide="${this.isWide}"
.narrow="${this.narrow}"
.hass="${this.hass}"
.selectedDevice="${this.device}"
.groups="${this._groups}"
></zha-group-binding-control>
`
: ""}
`
: ""}
<div class="spacer" />
Expand All @@ -137,14 +142,20 @@ export class ZHADevicePage extends LitElement {
private async _fetchData(): Promise<void> {
if (this.ieee && this.hass) {
this.device = await fetchZHADevice(this.hass, this.ieee);
this._bindableDevices = (
await fetchBindableDevices(this.hass, this.ieee)
).sort(sortZHADevices);
this._bindableDevices =
this.device && this.device.device_type !== "Coordinator"
? (await fetchBindableDevices(this.hass, this.ieee)).sort(
sortZHADevices
)
: [];
}
}

private async _fetchGroups() {
this._groups = (await fetchGroups(this.hass!)).sort(sortZHAGroups);
this._groups =
this.device && this.device.device_type !== "Coordinator"
? (await fetchGroups(this.hass!)).sort(sortZHAGroups)
: [];
}

static get styles(): CSSResult[] {
Expand Down
1 change: 1 addition & 0 deletions src/panels/config/zha/zha-node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ export class ZHANode extends LitElement {
showName
showModelInfo
.showEntityDetail=${false}
.showActions="${this.device.device_type !== "Coordinator"}"
@zha-device-removed=${this._onDeviceRemoved}
></zha-device-card>
`
Expand Down