Allow resetting data when firmware and version are the same (#103)

esphome · Nov 11, 2021 · 6e2976c · 6e2976c
1 parent 1a18108
commit 6e2976c
Showing 1 changed file with 53 additions and 18 deletions.
diff --git a/src/install-dialog.ts b/src/install-dialog.ts
@@ -157,15 +157,23 @@ class EwtInstallDialog extends LitElement {
     let hideActions = true;
     let allowClosing = true;
 
-    const isSameFirmware = this._info!.firmware === this._manifest!.name;
-    const isSameVersion =
-      isSameFirmware && this._info!.version === this._manifest!.version;
-
     content = html`
       <div class="device-info">
         ${this._info!.firmware}&nbsp;${this._info!.version}
       </div>
       <div class="dashboard-buttons">
+        ${!this._isSameVersion
+          ? html`
+              <div>
+                <ewt-button
+                  .label=${!this._isSameFirmware
+                    ? `Install ${this._manifest!.name}`
+                    : "Update"}
+                  @click=${() => this._startInstall(!this._isSameFirmware)}
+                ></ewt-button>
+              </div>
+            `
+          : ""}
         ${this._client!.nextUrl === undefined
           ? ""
           : html`
@@ -208,17 +216,6 @@ class EwtInstallDialog extends LitElement {
             }}
           ></ewt-button>
         </div>
-        <div>
-          <ewt-button
-            .label=${!isSameFirmware
-              ? `Install ${this._manifest!.name}`
-              : isSameVersion
-              ? "Up to date"
-              : "Update"}
-            @click=${() => this._startInstall(!isSameFirmware)}
-            .disabled=${isSameVersion}
-          ></ewt-button>
-        </div>
         <div>
           <ewt-button
             label="Logs"
@@ -234,6 +231,17 @@ class EwtInstallDialog extends LitElement {
             }}
           ></ewt-button>
         </div>
+        ${this._isSameVersion
+          ? html`
+              <div>
+                <ewt-button
+                  class="danger"
+                  label="Reset Data"
+                  @click=${() => this._startInstall(true)}
+                ></ewt-button>
+              </div>
+            `
+          : ""}
       </div>
     `;
 
@@ -362,9 +370,21 @@ class EwtInstallDialog extends LitElement {
     let hideActions = false;
     let allowClosing = false;
 
-    const isUpdate = !this._installErase && this._isUpdate;
+    const isUpdate = !this._installErase && this._isSameFirmware;
 
-    if (!this._installConfirmed) {
+    if (!this._installConfirmed && this._isSameVersion) {
+      heading = "Reset data";
+      content = html`
+        Do you want to reset your device and erase all existing data from your
+        device?
+        <ewt-button
+          class="danger"
+          slot="primaryAction"
+          label="Reset data"
+          @click=${this._confirmInstall}
+        ></ewt-button>
+      `;
+    } else if (!this._installConfirmed) {
       const action = isUpdate ? "update to" : "install";
       content = html`
         ${isUpdate
@@ -657,10 +677,22 @@ class EwtInstallDialog extends LitElement {
     this.parentNode!.removeChild(this);
   }
 
-  private get _isUpdate() {
+  /**
+   * Return if the device runs same firmware as manifest.
+   */
+  private get _isSameFirmware() {
     return this._info?.firmware === this._manifest!.name;
   }
 
+  /**
+   * Return if the device runs same firmware and version as manifest.
+   */
+  private get _isSameVersion() {
+    return (
+      this._isSameFirmware && this._info!.version === this._manifest!.version
+    );
+  }
+
   private async _closeClientWithoutEvents(client: ImprovSerial) {
     client.removeEventListener("disconnect", this._handleDisconnect);
     await client.close();
@@ -714,6 +746,9 @@ class EwtInstallDialog extends LitElement {
     .error {
       color: #db4437;
     }
+    .danger {
+      --mdc-theme-primary: #db4437;
+    }
     button.link {
       background: none;
       color: inherit;