jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-04-24 21:37:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13284 from raman325/ws_api

Browse Source
This commit is contained in:
Zack Barett 2022-08-05 12:56:47 -05:00 committed by GitHub
commit 6eac6aef18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/data/zwave_js.ts
View File

@ -665,21 +665,21 @@ export const subscribeZwaveNodeStatistics = (
}
);
export const fetchZwaveNodeIsFirmwareUpdateInProgress = (
export const fetchZwaveIsNodeFirmwareUpdateInProgress = (
hass: HomeAssistant,
device_id: string
): Promise<boolean> =>
hass.callWS({
type: "zwave_js/get_firmware_update_progress",
type: "zwave_js/is_node_firmware_update_in_progress",
device_id,
});
export const fetchZwaveIsAnyFirmwareUpdateInProgress = (
export const fetchZwaveIsAnyOTAFirmwareUpdateInProgress = (
hass: HomeAssistant,
entry_id: string
): Promise<boolean> =>
hass.callWS({
type: "zwave_js/get_any_firmware_update_progress",
type: "zwave_js/is_any_ota_firmware_update_in_progress",
entry_id,
});

10
src/panels/config/devices/device-detail/integration-elements/zwave_js/device-actions.ts
View File

@ -1,8 +1,8 @@
import { getConfigEntries } from "../../../../../../data/config_entries";
import { DeviceRegistryEntry } from "../../../../../../data/device_registry";
import {
fetchZwaveIsAnyFirmwareUpdateInProgress,
fetchZwaveNodeIsFirmwareUpdateInProgress,
fetchZwaveIsAnyOTAFirmwareUpdateInProgress,
fetchZwaveIsNodeFirmwareUpdateInProgress,
fetchZwaveNodeStatus,
} from "../../../../../../data/zwave_js";
import { showConfirmationDialog } from "../../../../../../dialogs/generic/show-dialog-box";
@ -88,8 +88,8 @@ export const getZwaveDeviceActions = async (
const [isAnyFirmwareUpdateInProgress, isNodeFirmwareUpdateInProgress] =
await Promise.all([
fetchZwaveIsAnyFirmwareUpdateInProgress(hass, entryId),
fetchZwaveNodeIsFirmwareUpdateInProgress(hass, device.id),
fetchZwaveIsAnyOTAFirmwareUpdateInProgress(hass, entryId),
fetchZwaveIsNodeFirmwareUpdateInProgress(hass, device.id),
]);
if (!isAnyFirmwareUpdateInProgress || isNodeFirmwareUpdateInProgress) {
@ -100,7 +100,7 @@ export const getZwaveDeviceActions = async (
action: async () => {
if (
isNodeFirmwareUpdateInProgress ||
(await fetchZwaveNodeIsFirmwareUpdateInProgress(hass, device.id)) ||
(await fetchZwaveIsNodeFirmwareUpdateInProgress(hass, device.id)) ||
(await showConfirmationDialog(el, {
text: hass.localize(
"ui.panel.config.zwave_js.update_firmware.warning"

4
src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-update-firmware-node.ts
View File

@ -15,7 +15,7 @@ import {
} from "../../../../../data/device_registry";
import {
abortZwaveNodeFirmwareUpdate,
fetchZwaveNodeIsFirmwareUpdateInProgress,
fetchZwaveIsNodeFirmwareUpdateInProgress,
fetchZwaveNodeStatus,
FirmwareUpdateStatus,
NodeStatus,
@ -272,7 +272,7 @@ class DialogZWaveJSUpdateFirmwareNode extends LitElement {
private async _fetchData(): Promise<void> {
[this._nodeStatus, this._updateInProgress] = await Promise.all([
fetchZwaveNodeStatus(this.hass, this.device!.id),
fetchZwaveNodeIsFirmwareUpdateInProgress(this.hass, this.device!.id),
fetchZwaveIsNodeFirmwareUpdateInProgress(this.hass, this.device!.id),
]);
if (this._updateInProgress) {
this._subscribeNodeFirmwareUpdate();