From a27b524544b28733cb62a234875e284112a19415 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 23 Oct 2024 13:37:57 +0200
Subject: [PATCH] =?UTF-8?q?Revert=20"Add=20support=20for=20update=20entity?=
 =?UTF-8?q?'s=20update=5Fpercentage=20state=20attribute=20(#2=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f1ab24da9937993a05a802a1372986893c0602ab.
---
 src/data/update.ts                                    | 11 +++++------
 src/dialogs/more-info/controls/more-info-update.ts    |  4 ++--
 .../voice-assistant-setup-step-update.ts              |  6 +++---
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/data/update.ts b/src/data/update.ts
index 1816bc8677..5423e4f477 100644
--- a/src/data/update.ts
+++ b/src/data/update.ts
@@ -24,13 +24,12 @@ export enum UpdateEntityFeature {
 interface UpdateEntityAttributes extends HassEntityAttributeBase {
   auto_update: boolean | null;
   installed_version: string | null;
-  in_progress: boolean;
+  in_progress: boolean | number;
   latest_version: string | null;
   release_summary: string | null;
   release_url: string | null;
   skipped_version: string | null;
   title: string | null;
-  update_percentage: number | null;
 }
 
 export interface UpdateEntity extends HassEntityBase {
@@ -39,7 +38,7 @@ export interface UpdateEntity extends HassEntityBase {
 
 export const updateUsesProgress = (entity: UpdateEntity): boolean =>
   supportsFeature(entity, UpdateEntityFeature.PROGRESS) &&
-  entity.attributes.update_percentage !== null;
+  typeof entity.attributes.in_progress === "number";
 
 export const updateCanInstall = (
   entity: UpdateEntity,
@@ -50,7 +49,7 @@ export const updateCanInstall = (
   supportsFeature(entity, UpdateEntityFeature.INSTALL);
 
 export const updateIsInstalling = (entity: UpdateEntity): boolean =>
-  !!entity.attributes.in_progress;
+  updateUsesProgress(entity) || !!entity.attributes.in_progress;
 
 export const updateReleaseNotes = (hass: HomeAssistant, entityId: string) =>
   hass.callWS<string | null>({
@@ -184,10 +183,10 @@ export const computeUpdateStateDisplay = (
     if (updateIsInstalling(stateObj)) {
       const supportsProgress =
         supportsFeature(stateObj, UpdateEntityFeature.PROGRESS) &&
-        attributes.update_percentage !== null;
+        typeof attributes.in_progress === "number";
       if (supportsProgress) {
         return hass.localize("ui.card.update.installing_with_progress", {
-          progress: attributes.update_percentage,
+          progress: attributes.in_progress as number,
         });
       }
       return hass.localize("ui.card.update.installing");
diff --git a/src/dialogs/more-info/controls/more-info-update.ts b/src/dialogs/more-info/controls/more-info-update.ts
index 1e7199e2c9..521d924589 100644
--- a/src/dialogs/more-info/controls/more-info-update.ts
+++ b/src/dialogs/more-info/controls/more-info-update.ts
@@ -47,9 +47,9 @@ class MoreInfoUpdate extends LitElement {
     return html`
       ${this.stateObj.attributes.in_progress
         ? supportsFeature(this.stateObj, UpdateEntityFeature.PROGRESS) &&
-          this.stateObj.attributes.update_percentage !== null
+          typeof this.stateObj.attributes.in_progress === "number"
           ? html`<mwc-linear-progress
-              .progress=${this.stateObj.attributes.update_percentage / 100}
+              .progress=${this.stateObj.attributes.in_progress / 100}
               buffer=""
             ></mwc-linear-progress>`
           : html`<mwc-linear-progress indeterminate></mwc-linear-progress>`
diff --git a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-update.ts b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-update.ts
index cdae8917ed..a103fb6a9a 100644
--- a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-update.ts
+++ b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-update.ts
@@ -54,7 +54,7 @@ export class HaVoiceAssistantSetupStepUpdate extends LitElement {
     const stateObj = this.hass.states[this.updateEntityId];
 
     const progressIsNumeric =
-      typeof stateObj?.attributes.update_percentage !== null;
+      typeof stateObj?.attributes.in_progress === "number";
 
     return html`<div class="content">
       <img src="/static/icons/casita/loading.png" />
@@ -69,7 +69,7 @@ export class HaVoiceAssistantSetupStepUpdate extends LitElement {
       </p>
       <ha-circular-progress
         .value=${progressIsNumeric
-          ? stateObj.attributes.update_percentage / 100
+          ? stateObj.attributes.in_progress / 100
           : undefined}
         .indeterminate=${!progressIsNumeric}
       ></ha-circular-progress>
@@ -77,7 +77,7 @@ export class HaVoiceAssistantSetupStepUpdate extends LitElement {
         ${stateObj.state === "unavailable"
           ? "Restarting voice assistant"
           : progressIsNumeric
-            ? `Installing ${stateObj.attributes.update_percentage}%`
+            ? `Installing ${stateObj.attributes.in_progress}%`
             : ""}
       </p>
     </div>`;