From 77977f64a3d3283a4eebfbd98b4821f33af3e49d Mon Sep 17 00:00:00 2001 From: Raman Gupta <7243222+raman325@users.noreply.github.com> Date: Sun, 3 Jul 2022 16:45:19 -0400 Subject: [PATCH] Don't check zwave_js node firmware update capabilities (#13066) --- .../zwave_js/device-actions.ts | 21 ++----- .../dialog-zwave_js-update-firmware-node.ts | 55 ++++++------------- ...ow-dialog-zwave_js-update-firmware-node.ts | 2 - 3 files changed, 23 insertions(+), 55 deletions(-) diff --git a/src/panels/config/devices/device-detail/integration-elements/zwave_js/device-actions.ts b/src/panels/config/devices/device-detail/integration-elements/zwave_js/device-actions.ts index d0843bc2ac..180d33adb0 100644 --- a/src/panels/config/devices/device-detail/integration-elements/zwave_js/device-actions.ts +++ b/src/panels/config/devices/device-detail/integration-elements/zwave_js/device-actions.ts @@ -2,7 +2,6 @@ import { getConfigEntries } from "../../../../../../data/config_entries"; import { DeviceRegistryEntry } from "../../../../../../data/device_registry"; import { fetchZwaveIsAnyFirmwareUpdateInProgress, - fetchZwaveNodeFirmwareUpdateCapabilities, fetchZwaveNodeIsFirmwareUpdateInProgress, fetchZwaveNodeStatus, } from "../../../../../../data/zwave_js"; @@ -87,20 +86,13 @@ export const getZwaveDeviceActions = async ( return actions; } - const [ - firmwareUpdateCapabilities, - isAnyFirmwareUpdateInProgress, - isNodeFirmwareUpdateInProgress, - ] = await Promise.all([ - fetchZwaveNodeFirmwareUpdateCapabilities(hass, device.id), - fetchZwaveIsAnyFirmwareUpdateInProgress(hass, entryId), - fetchZwaveNodeIsFirmwareUpdateInProgress(hass, device.id), - ]); + const [isAnyFirmwareUpdateInProgress, isNodeFirmwareUpdateInProgress] = + await Promise.all([ + fetchZwaveIsAnyFirmwareUpdateInProgress(hass, entryId), + fetchZwaveNodeIsFirmwareUpdateInProgress(hass, device.id), + ]); - if ( - firmwareUpdateCapabilities.firmware_upgradable && - (!isAnyFirmwareUpdateInProgress || isNodeFirmwareUpdateInProgress) - ) { + if (!isAnyFirmwareUpdateInProgress || isNodeFirmwareUpdateInProgress) { actions.push({ label: hass.localize( "ui.panel.config.zwave_js.device_info.update_firmware" @@ -117,7 +109,6 @@ export const getZwaveDeviceActions = async ( ) { showZWaveJUpdateFirmwareNodeDialog(el, { device, - firmwareUpdateCapabilities, }); } }, diff --git a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-update-firmware-node.ts b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-update-firmware-node.ts index b0f76d331d..21596f649e 100644 --- a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-update-firmware-node.ts +++ b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-update-firmware-node.ts @@ -6,7 +6,6 @@ import "@material/mwc-linear-progress/mwc-linear-progress"; import { mdiCheckCircle, mdiCloseCircle, mdiFileUpload } from "@mdi/js"; import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators"; -import memoizeOne from "memoize-one"; import { UnsubscribeFunc } from "home-assistant-js-websocket"; import { fireEvent } from "../../../../../common/dom/fire_event"; import { createCloseHeading } from "../../../../../components/ha-dialog"; @@ -26,7 +25,6 @@ import { ZWaveJSNodeFirmwareUpdateFinishedMessage, ZWaveJSNodeFirmwareUpdateProgressMessage, ZWaveJSNodeStatusUpdatedMessage, - ZWaveJSNodeFirmwareUpdateCapabilities, ZWaveJSNodeStatus, } from "../../../../../data/zwave_js"; import { haStyleDialog } from "../../../../../resources/styles"; @@ -66,12 +64,9 @@ class DialogZWaveJSUpdateFirmwareNode extends LitElement { private _deviceName?: string; - private _firmwareUpdateCapabilities?: ZWaveJSNodeFirmwareUpdateCapabilities; - public showDialog(params: ZWaveJSUpdateFirmwareNodeDialogParams): void { this._deviceName = computeDeviceName(params.device, this.hass!); this.device = params.device; - this._firmwareUpdateCapabilities = params.firmwareUpdateCapabilities; this._fetchData(); this._subscribeNodeStatus(); } @@ -84,7 +79,6 @@ class DialogZWaveJSUpdateFirmwareNode extends LitElement { this._updateFinishedMessage = this._firmwareFile = this._nodeStatus = - this._firmwareUpdateCapabilities = undefined; this._firmwareTarget = 0; this._uploading = this._updateInProgress = false; @@ -92,34 +86,21 @@ class DialogZWaveJSUpdateFirmwareNode extends LitElement { fireEvent(this, "dialog-closed", { dialog: this.localName }); } - private _schema = memoizeOne( - ( - firmwareUpdateCapabilities: ZWaveJSNodeFirmwareUpdateCapabilities - ): HaFormIntegerSchema => { - if (!firmwareUpdateCapabilities.firmware_upgradable) { - // We should never get here, this is to pass type checks - throw new Error(); - } - return { - name: "firmware_target", - type: "integer", - valueMin: Math.min(...firmwareUpdateCapabilities.firmware_targets), - valueMax: Math.max(...firmwareUpdateCapabilities.firmware_targets), - }; - } - ); - protected render(): TemplateResult { if ( !this.device || !this._nodeStatus || - !this._firmwareUpdateCapabilities || - !this._firmwareUpdateCapabilities.firmware_upgradable || this._updateInProgress === undefined ) { return html``; } + const schema: HaFormIntegerSchema = { + name: "firmware_target", + type: "integer", + valueMin: 0, + }; + const beginFirmwareUpdateHTML = html` - ${this._firmwareUpdateCapabilities.firmware_targets.length > 1 - ? html`

- ${this.hass.localize( - "ui.panel.config.zwave_js.update_firmware.firmware_target_intro" - )} -

- ` - : ""} +

+ ${this.hass.localize( + "ui.panel.config.zwave_js.update_firmware.firmware_target_intro" + )} +

+