From 0e944b24420fa7afb72f2a8db9efe4dae41b119a Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 22 Mar 2019 13:12:52 -0400
Subject: [PATCH] simplify sim promise

---
 jslib                                 |  2 +-
 src/app/tabs/dashboard.component.html |  9 +++++---
 src/app/tabs/dashboard.component.ts   | 31 ++++++++++++---------------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/jslib b/jslib
index 50e6f246..593870e9 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 50e6f2467925a3e46ebaadddec88e985b1bfd4fb
+Subproject commit 593870e9365d68e924955f1ec192a70216b63621
diff --git a/src/app/tabs/dashboard.component.html b/src/app/tabs/dashboard.component.html
index f73b3123..c62850b9 100644
--- a/src/app/tabs/dashboard.component.html
+++ b/src/app/tabs/dashboard.component.html
@@ -14,7 +14,8 @@
             <strong *ngIf="syncRunning" class="text-success">{{'running' | i18n}}</strong>
             <strong *ngIf="!syncRunning" class="text-danger">{{'stopped' | i18n}}</strong>
         </p>
-        <button #startBtn (click)="start()" [appApiAction]="startPromise" class="btn btn-primary" [disabled]="startBtn.loading">
+        <button #startBtn (click)="start()" [appApiAction]="startPromise" class="btn btn-primary"
+            [disabled]="startBtn.loading">
             <i class="fa fa-play fa-fw" [hidden]="startBtn.loading"></i>
             <i class="fa fa-spinner fa-fw fa-spin" [hidden]="!startBtn.loading"></i>
             {{'startSync' | i18n}}
@@ -23,7 +24,8 @@
             <i class="fa fa-stop fa-fw"></i>
             {{'stopSync' | i18n}}
         </button>
-        <button #syncBtn (click)="sync()" [appApiAction]="syncPromise" class="btn btn-primary" [disabled]="syncBtn.loading">
+        <button #syncBtn (click)="sync()" [appApiAction]="syncPromise" class="btn btn-primary"
+            [disabled]="syncBtn.loading">
             <i class="fa fa-refresh fa-fw" [ngClass]="{'fa-spin': syncBtn.loading}"></i>
             {{'syncNow' | i18n}}
         </button>
@@ -33,7 +35,8 @@
     <h3 class="card-header">{{'testing' | i18n}}</h3>
     <div class="card-body">
         <p>{{'testingDesc' | i18n}}</p>
-        <button #simBtn (click)="simulate()" [appApiAction]="simPromise" class="btn btn-primary" [disabled]="simBtn.loading">
+        <button #simBtn (click)="simulate()" [appApiAction]="simPromise" class="btn btn-primary"
+            [disabled]="simBtn.loading">
             <i class="fa fa-spinner fa-fw fa-spin" [hidden]="!simBtn.loading"></i>
             <i class="fa fa-bug fa-fw" [hidden]="simBtn.loading"></i>
             {{'testNow' | i18n}}
diff --git a/src/app/tabs/dashboard.component.ts b/src/app/tabs/dashboard.component.ts
index 1036d6b2..521db31d 100644
--- a/src/app/tabs/dashboard.component.ts
+++ b/src/app/tabs/dashboard.component.ts
@@ -15,6 +15,7 @@ import { StateService } from 'jslib/abstractions/state.service';
 import { SyncService } from '../../services/sync.service';
 
 import { GroupEntry } from '../../models/groupEntry';
+import { SimResult } from '../../models/simResult';
 import { UserEntry } from '../../models/userEntry';
 import { ConfigurationService } from '../../services/configuration.service';
 
@@ -34,7 +35,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
     simEnabledUsers: UserEntry[] = [];
     simDisabledUsers: UserEntry[] = [];
     simDeletedUsers: UserEntry[] = [];
-    simPromise: Promise<any>;
+    simPromise: Promise<SimResult>;
     simSinceLast: boolean = false;
     syncPromise: Promise<[GroupEntry[], UserEntry[]]>;
     startPromise: Promise<any>;
@@ -101,22 +102,18 @@ export class DashboardComponent implements OnInit, OnDestroy {
         this.simDisabledUsers = [];
         this.simDeletedUsers = [];
 
-        this.simPromise = new Promise(async (resolve, reject) => {
-            try {
-                const result = await ConnectorUtils.simulate(this.syncService, this.i18nService, this.simSinceLast);
-                this.simGroups = result.groups;
-                this.simUsers = result.users;
-                this.simEnabledUsers = result.enabledUsers;
-                this.simDisabledUsers = result.disabledUsers;
-                this.simDeletedUsers = result.deletedUsers;
-            } catch (e) {
-                this.simGroups = null;
-                this.simUsers = null;
-                reject(e);
-                return;
-            }
-            resolve();
-        });
+        try {
+            this.simPromise = ConnectorUtils.simulate(this.syncService, this.i18nService, this.simSinceLast);
+            const result = await this.simPromise;
+            this.simGroups = result.groups;
+            this.simUsers = result.users;
+            this.simEnabledUsers = result.enabledUsers;
+            this.simDisabledUsers = result.disabledUsers;
+            this.simDeletedUsers = result.deletedUsers;
+        } catch (e) {
+            this.simGroups = null;
+            this.simUsers = null;
+        }
     }
 
     private async updateLastSync() {