From 4dc59327fa0825e370b4a3e5a9074f949435c177 Mon Sep 17 00:00:00 2001
From: Drew Ansbacher <drew.ansbacher@spiredigital.com>
Date: Fri, 3 Sep 2021 17:22:52 +0300
Subject: [PATCH] less-errors

---
 ui/src/app/pages/apps-routes/app-logs/app-logs.page.ts      | 2 +-
 .../apps-routes/app-properties/app-properties.page.html     | 2 +-
 ui/src/app/pages/apps-routes/app-show/app-show.page.html    | 6 +++---
 .../marketplace-list/marketplace-list.page.html             | 2 +-
 .../marketplace-show/marketplace-show.page.ts               | 2 +-
 .../app/pages/server-routes/server-logs/server-logs.page.ts | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ui/src/app/pages/apps-routes/app-logs/app-logs.page.ts b/ui/src/app/pages/apps-routes/app-logs/app-logs.page.ts
index b7f6d4305..045b491cf 100644
--- a/ui/src/app/pages/apps-routes/app-logs/app-logs.page.ts
+++ b/ui/src/app/pages/apps-routes/app-logs/app-logs.page.ts
@@ -16,7 +16,7 @@ export class AppLogsPage {
     private readonly embassyApi: ApiService,
   ) { }
 
-  fetchFetchLogs (): Function {
+  fetchFetchLogs () {
     return async (params: { before_flag?: boolean, limit?: number, cursor?: string }) => {
       const pkgId = this.pkgId
       return this.embassyApi.getPackageLogs({
diff --git a/ui/src/app/pages/apps-routes/app-properties/app-properties.page.html b/ui/src/app/pages/apps-routes/app-properties/app-properties.page.html
index 7ddd542de..37744ce7f 100644
--- a/ui/src/app/pages/apps-routes/app-properties/app-properties.page.html
+++ b/ui/src/app/pages/apps-routes/app-properties/app-properties.page.html
@@ -56,7 +56,7 @@
             <ion-button *ngIf="prop.value.masked" fill="clear" (click)="toggleMask(prop.key)">
               <ion-icon slot="icon-only" [name]="unmasked[prop.key] ? 'eye-off-outline' : 'eye-outline'" [color]="unmasked[prop.key] ? 'danger' : 'dark'" size="small"></ion-icon>
             </ion-button>
-            <ion-button *ngIf="prop.value.qr" fill="clear" (click)="showQR(prop.value.value)">
+            <ion-button *ngIf="prop.value.qr" fill="clear" (click)="showQR(prop.value.value, $event)">
               <ion-icon slot="icon-only" name="qr-code-outline" size="small"></ion-icon>
             </ion-button>
             <ion-button *ngIf="prop.value.copyable" fill="clear" (click)="copy(prop.value.value)">
diff --git a/ui/src/app/pages/apps-routes/app-show/app-show.page.html b/ui/src/app/pages/apps-routes/app-show/app-show.page.html
index f1444a48b..da4e5710b 100644
--- a/ui/src/app/pages/apps-routes/app-show/app-show.page.html
+++ b/ui/src/app/pages/apps-routes/app-show/app-show.page.html
@@ -26,7 +26,7 @@
         <ion-label style="overflow: visible;">
           <status [disconnected]="connectionFailure" size="x-large" weight="500" [rendering]="rendering"></status>
         </ion-label>
-        <ion-button slot="end" class="action-button" *ngIf="pkg.state === PackageState.Installed && (pkg.manifest.interfaces | hasUi)" [disabled]="!(pkg.state | isLaunchable : pkg.installed.status.main.status : pkg.manifest.interfaces)" (click)="launchUiTab()">
+        <ion-button slot="end" class="action-button" *ngIf="pkg.state === PackageState.Installed && (pkg.manifest.interfaces | hasUi)" [disabled]="!(pkg.state | isLaunchable : pkg.installed.status.main.status : pkg.manifest.interfaces)" (click)="launchUi()">
           <ion-icon slot="start" name="open-outline"></ion-icon>
           Open UI
         </ion-button>
@@ -34,7 +34,7 @@
           <ion-button slot="end" class="action-button" *ngIf="rendering.feStatus === FeStatus.NeedsConfig" (click)="presentModalConfig()">
             Configure
           </ion-button>
-          <ion-button slot="end" class="action-button" *ngIf="[FeStatus.Running, FeStatus.StartingUp, FeStatus.NeedsAttention] | includes : rendering.feStatus" color="danger" (click)="stop()">
+          <ion-button slot="end" class="action-button" *ngIf="[FeStatus.Running, FeStatus.NeedsAttention] | includes : rendering.feStatus" color="danger" (click)="stop()">
             Stop
           </ion-button>
           <ion-button slot="end" class="action-button" *ngIf="rendering.feStatus === FeStatus.DependencyIssue" (click)="scrollToRequirements()">
@@ -100,7 +100,7 @@
                 <p><ion-text [color]="pkg.installed.status['dependency-errors'][dep.key] ? 'warning' : 'success'">{{ pkg.installed.status['dependency-errors'][dep.key] ? pkg.installed.status['dependency-errors'][dep.key].type : 'satisfied' }}</ion-text></p>
               </ion-label>
 
-              <ion-button *ngIf="!pkg.installed.status['dependency-errors'][dep.key] || (pkg.installed.status['dependency-errors'][dep.key] && [DependencyErrorType.InterfaceHealthChecksFailed, DependencyErrorType.HealthChecksFailed] | includes : pkg.installed.status['dependency-errors'][dep.key].type)" slot="end" size="small" [routerLink]="['/services', dep.key]">
+              <ion-button *ngIf="!pkg.installed.status['dependency-errors'][dep.key] || (pkg.installed.status['dependency-errors'][dep.key] && [DependencyErrorType.InterfaceHealthChecksFailed, DependencyErrorType.HealthCheckFailed] | includes : pkg.installed.status['dependency-errors'][dep.key].type)" slot="end" size="small" [routerLink]="['/services', dep.key]">
                 View
               </ion-button>
 
diff --git a/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html b/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html
index 44c7259fc..bd062d940 100644
--- a/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html
+++ b/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html
@@ -102,7 +102,7 @@
                   <ion-text color="primary">{{ localPkg.state | titlecase }}...{{ (localPkg['install-progress'] | installState).totalProgress }}%</ion-text>
                 </p>
                 <p *ngIf="localPkg.state === PackageState.Removing">
-                  <ion-text color="warning">{{ localPkg.state | Removing }}</ion-text>
+                  <ion-text color="warning">{{ localPkg.state | titlecase }}</ion-text>
                   <ion-spinner name="dots" color="warning"></ion-spinner>
                 </p>
               </ng-container>
diff --git a/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts b/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
index 0b25f2155..0db97ba51 100644
--- a/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
+++ b/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
@@ -38,7 +38,7 @@ export class MarketplaceShowPage {
     private readonly navCtrl: NavController,
     private readonly emver: Emver,
     private readonly patch: PatchDbService,
-    private readonly marketplaceService: MarketplaceService,
+    readonly marketplaceService: MarketplaceService,
   ) { }
 
   async ngOnInit () {
diff --git a/ui/src/app/pages/server-routes/server-logs/server-logs.page.ts b/ui/src/app/pages/server-routes/server-logs/server-logs.page.ts
index f5c7132b0..ec0865164 100644
--- a/ui/src/app/pages/server-routes/server-logs/server-logs.page.ts
+++ b/ui/src/app/pages/server-routes/server-logs/server-logs.page.ts
@@ -16,7 +16,7 @@ export class ServerLogsPage {
     private readonly embassyApi: ApiService,
   ) { }
 
-  fetchFetchLogs (): Function {
+  fetchFetchLogs () {
     return async (params: { before_flag?: boolean, limit?: number, cursor?: string }) => {
       return this.embassyApi.getServerLogs({
         before_flag: params.before_flag,