From a4758e9dcefe0e5453701754260e5dd0b9d58fb2 Mon Sep 17 00:00:00 2001
From: Raman Gupta <7243222+raman325@users.noreply.github.com>
Date: Mon, 20 Feb 2023 22:34:38 -0500
Subject: [PATCH 1/4] Re-add target option to zwave-js firmware upload

---
 src/data/zwave_js.ts                          |  6 +++-
 .../dialog-zwave_js-update-firmware-node.ts   | 28 ++++++++++++++++++-
 src/translations/en.json                      |  2 ++
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/data/zwave_js.ts b/src/data/zwave_js.ts
index 2b0b88d8ccc5..3cfbd367fc2d 100644
--- a/src/data/zwave_js.ts
+++ b/src/data/zwave_js.ts
@@ -757,10 +757,14 @@ export const fetchZwaveNodeFirmwareUpdateCapabilities = (
 export const uploadFirmwareAndBeginUpdate = async (
   hass: HomeAssistant,
   device_id: string,
-  file: File
+  file: File,
+  target?: number
 ) => {
   const fd = new FormData();
   fd.append("file", file);
+  if (target !== undefined) {
+    fd.append("target", target.toString());
+  }
   const resp = await hass.fetchWithAuth(
     `/api/zwave_js/firmware/upload/${device_id}`,
     {
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 d58c1822b19c..eaf8393de68e 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
@@ -36,6 +36,7 @@ import {
   showAlertDialog,
   showConfirmationDialog,
 } from "../../../../../dialogs/generic/show-dialog-box";
+import { HaFormIntegerSchema } from "../../../../../components/ha-form/types";
 
 @customElement("dialog-zwave_js-update-firmware-node")
 class DialogZWaveJSUpdateFirmwareNode extends LitElement {
@@ -59,6 +60,8 @@ class DialogZWaveJSUpdateFirmwareNode extends LitElement {
 
   @state() private _nodeStatus?: ZWaveJSNodeStatus;
 
+  @state() private _firmwareTarget?: number;
+
   private _subscribedNodeStatus?: Promise<UnsubscribeFunc>;
 
   private _subscribedNodeFirmwareUpdate?: Promise<UnsubscribeFunc>;
@@ -80,6 +83,7 @@ class DialogZWaveJSUpdateFirmwareNode extends LitElement {
     this._updateFinishedMessage = undefined;
     this._firmwareFile = undefined;
     this._nodeStatus = undefined;
+    this._firmwareTarget = undefined;
     this._uploading = this._updateInProgress = false;
 
     fireEvent(this, "dialog-closed", { dialog: this.localName });
@@ -94,6 +98,12 @@ class DialogZWaveJSUpdateFirmwareNode extends LitElement {
       return html``;
     }
 
+    const schema: HaFormIntegerSchema = {
+      name: "firmware_target",
+      type: "integer",
+      valueMin: 0,
+    };
+
     const beginFirmwareUpdateHTML = html`<ha-file-upload
         .hass=${this.hass}
         .uploading=${this._uploading}
@@ -104,6 +114,17 @@ class DialogZWaveJSUpdateFirmwareNode extends LitElement {
         )}
         @file-picked=${this._uploadFile}
       ></ha-file-upload>
+      <p>
+        ${this.hass.localize(
+          "ui.panel.config.zwave_js.update_firmware.firmware_target_intro"
+        )}
+      </p>
+      <ha-form
+        .hass=${this.hass}
+        .data=${{ firmware_target: this._firmwareTarget }}
+        .schema=${[schema]}
+        @value-changed=${this._firmwareTargetChanged}
+      ></ha-form>
       <mwc-button
         slot="primaryAction"
         @click=${this._beginFirmwareUpdate}
@@ -283,7 +304,8 @@ class DialogZWaveJSUpdateFirmwareNode extends LitElement {
       await uploadFirmwareAndBeginUpdate(
         this.hass,
         this.device!.id,
-        this._firmwareFile!
+        this._firmwareFile!,
+        this._firmwareTarget
       );
       this._updateInProgress = true;
       this._uploading = false;
@@ -388,6 +410,10 @@ class DialogZWaveJSUpdateFirmwareNode extends LitElement {
     this._subscribedNodeFirmwareUpdate = undefined;
   }
 
+  private async _firmwareTargetChanged(ev) {
+    this._firmwareTarget = ev.detail.value.firmware_target;
+  }
+
   private async _uploadFile(ev) {
     this._firmwareFile = ev.detail.files[0];
   }
diff --git a/src/translations/en.json b/src/translations/en.json
index b2d36c03371b..95875837c819 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -3691,6 +3691,8 @@
             "warning_controller": "WARNING: Firmware updates can brick your controller if you do not use the right firmware files, or if you attempt to stop the firmware update before it completes. The Home Assistant and Z-Wave JS teams do not take any responsibility for any damages to your controller as a result of the firmware update and will not be able to help you if you brick your controller. Would you still like to continue?",
             "introduction": "Select the firmware file you would like to use to update {device}.",
             "introduction_controller": "Select the firmware file you would like to use to update {device}. Note that once you start a firmware update, you MUST wait for the update to complete.",
+            "firmware_target_intro": "Select the firmware target (0 for the Z-Wave chip, ≥1 for other chips if they exist) for this update.",
+            "firmware_target": "Firmware Target (chip)",
             "upload_firmware": "Upload Firmware",
             "upload_failed": "Upload Failed",
             "begin_update": "Begin Firmware Update",

From 12bdd868fb78eded08daac745d6b492d64e6a2bf Mon Sep 17 00:00:00 2001
From: Raman Gupta <7243222+raman325@users.noreply.github.com>
Date: Tue, 21 Feb 2023 19:17:34 -0500
Subject: [PATCH 2/4] move const outside of render

---
 .../dialog-zwave_js-update-firmware-node.ts        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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 eaf8393de68e..9b5872ef5067 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
@@ -38,6 +38,12 @@ import {
 } from "../../../../../dialogs/generic/show-dialog-box";
 import { HaFormIntegerSchema } from "../../../../../components/ha-form/types";
 
+const firmwareTargetSchema: HaFormIntegerSchema = {
+  name: "firmware_target",
+  type: "integer",
+  valueMin: 0,
+};
+
 @customElement("dialog-zwave_js-update-firmware-node")
 class DialogZWaveJSUpdateFirmwareNode extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -98,12 +104,6 @@ class DialogZWaveJSUpdateFirmwareNode extends LitElement {
       return html``;
     }
 
-    const schema: HaFormIntegerSchema = {
-      name: "firmware_target",
-      type: "integer",
-      valueMin: 0,
-    };
-
     const beginFirmwareUpdateHTML = html`<ha-file-upload
         .hass=${this.hass}
         .uploading=${this._uploading}
@@ -122,7 +122,7 @@ class DialogZWaveJSUpdateFirmwareNode extends LitElement {
       <ha-form
         .hass=${this.hass}
         .data=${{ firmware_target: this._firmwareTarget }}
-        .schema=${[schema]}
+        .schema=${[firmwareTargetSchema]}
         @value-changed=${this._firmwareTargetChanged}
       ></ha-form>
       <mwc-button

From f31e60e71b4b59bf92c66d0360e0da0297f8238c Mon Sep 17 00:00:00 2001
From: Raman Gupta <7243222+raman325@users.noreply.github.com>
Date: Wed, 22 Feb 2023 10:47:44 -0500
Subject: [PATCH 3/4] Make const the array

---
 .../dialog-zwave_js-update-firmware-node.ts      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

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 9b5872ef5067..de20bbe96821 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
@@ -36,13 +36,15 @@ import {
   showAlertDialog,
   showConfirmationDialog,
 } from "../../../../../dialogs/generic/show-dialog-box";
-import { HaFormIntegerSchema } from "../../../../../components/ha-form/types";
+import { HaFormSchema } from "../../../../../components/ha-form/types";
 
-const firmwareTargetSchema: HaFormIntegerSchema = {
-  name: "firmware_target",
-  type: "integer",
-  valueMin: 0,
-};
+const firmwareTargetSchema: HaFormSchema[] = [
+  {
+    name: "firmware_target",
+    type: "integer",
+    valueMin: 0,
+  },
+];
 
 @customElement("dialog-zwave_js-update-firmware-node")
 class DialogZWaveJSUpdateFirmwareNode extends LitElement {
@@ -122,7 +124,7 @@ class DialogZWaveJSUpdateFirmwareNode extends LitElement {
       <ha-form
         .hass=${this.hass}
         .data=${{ firmware_target: this._firmwareTarget }}
-        .schema=${[firmwareTargetSchema]}
+        .schema=${firmwareTargetSchema}
         @value-changed=${this._firmwareTargetChanged}
       ></ha-form>
       <mwc-button

From 72c9825dac59eef1f4372a8049755c62752b4690 Mon Sep 17 00:00:00 2001
From: Raman Gupta <7243222+raman325@users.noreply.github.com>
Date: Wed, 22 Feb 2023 13:40:48 -0500
Subject: [PATCH 4/4] hide firmware target for controller firmware updates

---
 .../dialog-zwave_js-update-firmware-node.ts   | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

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 de20bbe96821..e6d5859efac5 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
@@ -116,17 +116,19 @@ class DialogZWaveJSUpdateFirmwareNode extends LitElement {
         )}
         @file-picked=${this._uploadFile}
       ></ha-file-upload>
-      <p>
-        ${this.hass.localize(
-          "ui.panel.config.zwave_js.update_firmware.firmware_target_intro"
-        )}
-      </p>
-      <ha-form
-        .hass=${this.hass}
-        .data=${{ firmware_target: this._firmwareTarget }}
-        .schema=${firmwareTargetSchema}
-        @value-changed=${this._firmwareTargetChanged}
-      ></ha-form>
+      ${this._nodeStatus.is_controller_node
+        ? html``
+        : html`<p>
+              ${this.hass.localize(
+                "ui.panel.config.zwave_js.update_firmware.firmware_target_intro"
+              )}
+            </p>
+            <ha-form
+              .hass=${this.hass}
+              .data=${{ firmware_target: this._firmwareTarget }}
+              .schema=${firmwareTargetSchema}
+              @value-changed=${this._firmwareTargetChanged}
+            ></ha-form>`}
       <mwc-button
         slot="primaryAction"
         @click=${this._beginFirmwareUpdate}