Skip to content

Make add devices button available on ZHA coordinator #5431

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 3 commits into from
Apr 10, 2020
Merged

Make add devices button available on ZHA coordinator #5431

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da89601
Make add devices available on ZHA coordinator
dmulcahey Apr 3, 2020
53f7115
Update src/panels/config/zha/zha-device-card.ts
dmulcahey Apr 3, 2020
c390770
Update src/panels/config/zha/zha-device-card.ts
dmulcahey Apr 8, 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
2 changes: 1 addition & 1 deletion src/panels/config/zha/zha-add-devices-page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ class ZHAAddDevicesPage extends LitElement {
this._active = true;
this._addDevicesTimeoutHandle = setTimeout(
() => this._unsubscribe(),
75000
120000
);
}

Expand Down
65 changes: 35 additions & 30 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 @@ -283,45 +283,50 @@ class ZHADeviceCard extends LitElement {
this.showActions
? html`
<div class="card-actions">
<mwc-button @click="${this._onReconfigureNodeClick}">
${this.hass!.localize(
"ui.dialogs.zha_device_info.buttons.reconfigure"
)}
</mwc-button>
${this.showHelp
${this.device!.device_type !== "Coordinator"
? html`
<div class="help-text">
<mwc-button @click="${this._onReconfigureNodeClick}">
Comment thread
dmulcahey marked this conversation as resolved.
Outdated
${this.hass!.localize(
"ui.dialogs.zha_device_info.services.reconfigure"
"ui.dialogs.zha_device_info.buttons.reconfigure"
)}
</div>
`
: ""}
</mwc-button>
${this.showHelp
? html`
<div class="help-text">
${this.hass!.localize(
"ui.dialogs.zha_device_info.services.reconfigure"
)}
</div>
`
: ""}

<ha-call-service-button
.hass=${this.hass}
domain="zha"
service="remove"
.confirmation=${this.hass!.localize(
"ui.dialogs.zha_device_info.confirmations.remove"
)}
.serviceData="${this._serviceData}"
>
${this.hass!.localize(
"ui.dialogs.zha_device_info.buttons.remove"
)}
</ha-call-service-button>
${this.showHelp
? html`
<div class="help-text">
<ha-call-service-button
.hass=${this.hass}
domain="zha"
service="remove"
.confirmation=${this.hass!.localize(
"ui.dialogs.zha_device_info.confirmations.remove"
)}
.serviceData="${this._serviceData}"
Comment thread
dmulcahey marked this conversation as resolved.
Outdated
>
${this.hass!.localize(
"ui.dialogs.zha_device_info.services.remove"
"ui.dialogs.zha_device_info.buttons.remove"
)}
</div>
</ha-call-service-button>
${this.showHelp
? html`
<div class="help-text">
${this.hass!.localize(
"ui.dialogs.zha_device_info.services.remove"
)}
</div>
`
: ""}
`
: ""}
${this.device!.power_source === "Mains" &&
this.device!.device_type === "Router"
(this.device!.device_type === "Router" ||
this.device!.device_type === "Coordinator")
? html`
<mwc-button @click=${this._onAddDevicesClick}>
${this.hass!.localize(
Expand Down
2 changes: 1 addition & 1 deletion 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,7 +67,7 @@ export class ZHANode extends LitElement {
showName
showModelInfo
.showEntityDetail=${false}
.showActions="${this.device.device_type !== "Coordinator"}"
showActions
@zha-device-removed=${this._onDeviceRemoved}
></zha-device-card>
`
Expand Down