From cfc937f17a3eb51f68a9c4cd8190a30f07f71ba4 Mon Sep 17 00:00:00 2001
From: Drew Ansbacher <drew.ansbacher@spiredigital.com>
Date: Thu, 16 Sep 2021 10:18:42 -0600
Subject: [PATCH] async fixed

---
 ui/src/app/app.component.html                 |  2 +-
 .../install-wizard/prebaked-wizards.ts        |  5 +-
 .../services/api/embassy-mock-api.service.ts  | 65 +++++++++----------
 3 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html
index c83f6484e..ba6cd258f 100644
--- a/ui/src/app/app.component.html
+++ b/ui/src/app/app.component.html
@@ -177,7 +177,7 @@
     <ion-toolbar style="border-top: 1px solid var(--ion-color-dark);" color="light">
       <ion-list>
         <ion-list-header>
-          <ion-label>Install Progress</ion-label>
+          <ion-label>Install Progress: {{ (100 * (osUpdateProgress?.downloaded || 1) / (osUpdateProgress?.size || 1)).toFixed(0) }}%</ion-label>
         </ion-list-header>
         <div style="padding: 0 15px;">
           <ion-progress-bar
diff --git a/ui/src/app/components/install-wizard/prebaked-wizards.ts b/ui/src/app/components/install-wizard/prebaked-wizards.ts
index 3bf99090f..d961c2400 100644
--- a/ui/src/app/components/install-wizard/prebaked-wizards.ts
+++ b/ui/src/app/components/install-wizard/prebaked-wizards.ts
@@ -105,10 +105,7 @@ export class WizardBaker {
             action,
             verb: 'beginning update for',
             title,
-            executeAction: async () => {
-              this.embassyApi.updateServer({ })
-              return
-            },
+            executeAction: () => this.embassyApi.updateServer({ }),
           },
         },
         bottomBar: {
diff --git a/ui/src/app/services/api/embassy-mock-api.service.ts b/ui/src/app/services/api/embassy-mock-api.service.ts
index 225e7d49c..28417304e 100644
--- a/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -119,40 +119,8 @@ export class MockApiService extends ApiService {
       },
     ]
     const res = await this.http.rpcRequest<WithRevision<null>>({ method: 'db.patch', params: { patch } })
-    console.log('update progress created')
-    await this.updateOSProgress(initialProgress.size)
-
-    console.log('about to update')
-    setTimeout(async () => {
-      const patch = [
-        {
-          op: PatchOp.REPLACE,
-          path: '/server-info/status',
-          value: ServerStatus.Running,
-        },
-        {
-          op: PatchOp.REPLACE,
-          path: '/server-info/version',
-          value: '3.1.0',
-        },
-        {
-          op: PatchOp.REMOVE,
-          path: '/server-info/update-progress',
-        },
-      ]
-
-      await this.http.rpcRequest<WithRevision<null>>({ method: 'db.patch', params: { patch } })
-      // quickly revert patch to proper version to prevent infinite refresh loop
-      const patch2 = [
-        {
-          op: PatchOp.REPLACE,
-          path: '/server-info/version',
-          value: require('../../../../package.json').version,
-        },
-      ]
-      this.http.rpcRequest<WithRevision<null>>({ method: 'db.patch', params: { patch: patch2 } })
-    }, 10000)
 
+    this.updateOSProgress(initialProgress.size)
     return res
   }
 
@@ -607,5 +575,36 @@ export class MockApiService extends ApiService {
       },
     ]
     await this.http.rpcRequest<WithRevision<null>>({ method: 'db.patch', params: { patch } })
+
+    setTimeout(async () => {
+      const patch = [
+        {
+          op: PatchOp.REPLACE,
+          path: '/server-info/status',
+          value: ServerStatus.Running,
+        },
+        {
+          op: PatchOp.REPLACE,
+          path: '/server-info/version',
+          value: '3.1.0',
+        },
+        {
+          op: PatchOp.REMOVE,
+          path: '/server-info/update-progress',
+        },
+      ]
+
+      await this.http.rpcRequest<WithRevision<null>>({ method: 'db.patch', params: { patch } })
+      // quickly revert patch to proper version to prevent infinite refresh loop
+      const patch2 = [
+        {
+          op: PatchOp.REPLACE,
+          path: '/server-info/version',
+          value: require('../../../../package.json').version,
+        },
+      ]
+      this.http.rpcRequest<WithRevision<null>>({ method: 'db.patch', params: { patch: patch2 } })
+    }, 10000)
+
   }
 }