From cec2a61bdf4949ce92e098bcad3173948bac355c Mon Sep 17 00:00:00 2001 From: Josh McCarty Date: Tue, 10 Nov 2020 04:22:32 -0700 Subject: [PATCH] Use ha-dialog for device-registry-details-dialog (#7500) --- .../dialog-device-registry-detail.ts | 76 ++++++++++--------- 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/src/dialogs/device-registry-detail/dialog-device-registry-detail.ts b/src/dialogs/device-registry-detail/dialog-device-registry-detail.ts index f949d810db..4bc68af3a2 100644 --- a/src/dialogs/device-registry-detail/dialog-device-registry-detail.ts +++ b/src/dialogs/device-registry-detail/dialog-device-registry-detail.ts @@ -1,26 +1,28 @@ import "@material/mwc-button/mwc-button"; -import "@polymer/paper-dialog-scrollable/paper-dialog-scrollable"; import "@polymer/paper-dropdown-menu/paper-dropdown-menu"; import "@polymer/paper-input/paper-input"; import "@polymer/paper-item/paper-item"; import "@polymer/paper-listbox/paper-listbox"; +import "../../components/ha-dialog"; +import "../../components/ha-area-picker"; + import { - css, CSSResult, + LitElement, + TemplateResult, + css, customElement, html, - LitElement, - property, internalProperty, - TemplateResult, + property, } from "lit-element"; -import "../../components/dialog/ha-paper-dialog"; -import "../../components/ha-area-picker"; -import { computeDeviceName } from "../../data/device_registry"; -import { PolymerChangedEvent } from "../../polymer-types"; -import { haStyleDialog } from "../../resources/styles"; -import { HomeAssistant } from "../../types"; + import { DeviceRegistryDetailDialogParams } from "./show-dialog-device-registry-detail"; +import { HomeAssistant } from "../../types"; +import { PolymerChangedEvent } from "../../polymer-types"; +import { computeDeviceName } from "../../data/device_registry"; +import { fireEvent } from "../../common/dom/fire_event"; +import { haStyleDialog } from "../../resources/styles"; @customElement("dialog-device-registry-detail") class DialogDeviceRegistryDetail extends LitElement { @@ -34,7 +36,7 @@ class DialogDeviceRegistryDetail extends LitElement { @internalProperty() private _areaId?: string; - private _submitting?: boolean; + @internalProperty() private _submitting?: boolean; public async showDialog( params: DeviceRegistryDetailDialogParams @@ -46,22 +48,24 @@ class DialogDeviceRegistryDetail extends LitElement { await this.updateComplete; } + public closeDialog(): void { + this._error = ""; + this._params = undefined; + fireEvent(this, "dialog-closed", { dialog: this.localName }); + } + protected render(): TemplateResult { if (!this._params) { return html``; } const device = this._params.device; - return html` - -

- ${computeDeviceName(device, this.hass)} -

- +
${this._error ? html`
${this._error}
` : ""}
- -
- - ${this.hass.localize("ui.panel.config.devices.update")} -
- + + ${this.hass.localize("ui.common.cancel")} + + + ${this.hass.localize("ui.panel.config.devices.update")} + + `; } @@ -113,19 +126,10 @@ class DialogDeviceRegistryDetail extends LitElement { } } - private _openedChanged(ev: PolymerChangedEvent): void { - if (!(ev.detail as any).value) { - this._params = undefined; - } - } - static get styles(): CSSResult[] { return [ haStyleDialog, css` - ha-paper-dialog { - min-width: 400px; - } .form { padding-bottom: 24px; }