misc changes

ui/src/app/components/install-wizard/complete/complete.component.ts

@@ -13,7 +13,7 @@ import { WizardAction } from '../wizard-types'
 export class CompleteComponent implements OnInit, Loadable {
   @Input() params: {
     action: WizardAction
-    verb: string //loader verb: '*stopping* ...'
+    verb: string // loader verb: '*stopping* ...'
     title: string
     executeAction: () => Promise<any>
     skipCompletionDialogue?: boolean
@@ -26,7 +26,6 @@ export class CompleteComponent implements OnInit, Loadable {
     error: (e: Error) => void
   }
 
-
   loading$ = new BehaviorSubject(false)
   color$ = new BehaviorSubject('medium')
   cancel$ = new Subject<void>()

ui/src/app/modals/app-config/app-config.page.ts

@@ -43,11 +43,9 @@ export class AppConfigPage {
 
   async ngOnInit () {
     const rec = history.state?.configRecommendation as Recommendation
-
     try {
       this.loadingText = 'Loading Config'
       const { spec, config } = await this.embassyApi.getPackageConfig({ id: this.pkgId })
-
       let depConfig: object
       if (rec) {
         this.loadingText = `Setting properties to accommodate ${rec.dependentTitle}...`

ui/src/app/modals/backup-confirmation/backup-confirmation.component.ts

@@ -1,6 +1,7 @@
 import { Component, Input } from '@angular/core'
 import { IonicSafeString, LoadingController, ModalController } from '@ionic/angular'
-import { getErrorMessage } from 'src/app/services/error-toast.service'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
+import { ErrorToastService, getErrorMessage } from 'src/app/services/error-toast.service'
 
 @Component({
   selector: 'backup-confirmation',

ui/src/app/pages/apps-routes/app-list/app-list.page.html

@@ -25,7 +25,7 @@
         <ion-col *ngFor="let pkg of pkgs | keyvalue : asIsOrder" sizeXs="4" sizeSm="3" sizeLg="3" sizeXl="2">
           <ion-card class="installed-card" [routerLink]="['/services', pkg.value.entry.manifest.id]">
             <div class="launch-container" *ngIf="pkg.value.entry.manifest.interfaces | hasUi">
-              <div class="launch-button-triangle"  (click)="launchUi(pkg.value.entry, $event)" [class.launch-disabled]="!(pkg.value.entry.state | isLaunchable : pkg.value.entry.installed.status.main.status : pkg.value.entry.manifest.interfaces)">
+              <div class="launch-button-triangle"  (click)="launchUi(pkg.value.entry, $event)" [class.launch-disabled]="!(pkg.value.entry.state | isLaunchable : pkg.value.entry.installed?.status.main.status : pkg.value.entry.manifest.interfaces)">
                 <ion-icon name="open-outline"></ion-icon>
               </div>
             </div>

ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts

@@ -122,6 +122,7 @@ export class AppPropertiesPage {
       this.properties = await this.embassyApi.getPackageProperties({ id: this.pkgId })
       this.node = JsonPointer.get(this.properties, this.pointer || '')
     } catch (e) {
+      console.log('catching')
       this.errToast.present(e)
     } finally {
       this.loading = false

ui/src/app/pages/apps-routes/app-show/app-show.page.html

@@ -1,4 +1,5 @@
-<ion-header>
+<ng-container *ngIf="!!pkg">
+  <ion-header>
     <ion-toolbar>
       <ion-buttons slot="start">
         <pwa-back-button></pwa-back-button>
@@ -15,9 +16,9 @@
         </ion-label>
       </ion-item>
     </ion-toolbar>
-</ion-header>
+  </ion-header>
 
-<ion-content>
+  <ion-content>
     <ion-item-group>
       <!-- ** always ** -->
       <ion-item-divider>Status</ion-item-divider>
@@ -30,7 +31,7 @@
           Open UI
         </ion-button>
         <ng-container *ngIf="!connectionFailure">
-        <ion-button slot="end" class="action-button" *ngIf="rendering.feStatus === FeStatus.NeedsConfig" [routerLink]="['config']">
+          <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()">
@@ -153,4 +154,5 @@
         [value]="(pkg['install-progress'] | installState).unpackProgress / 100"
       ></ion-progress-bar>
     </div>
-</ion-content>
+  </ion-content>
+</ng-container>

ui/src/app/pages/apps-routes/app-show/app-show.page.ts

@@ -32,6 +32,7 @@ export class AppShowPage {
   mainStatus: MainStatus
   PackageMainStatus = PackageMainStatus
   connectionFailure: boolean
+  loading = true
 
   @ViewChild(IonContent) content: IonContent
   subs: Subscription[] = []

ui/src/app/pages/marketplace-routes/app-release-notes/app-release-notes.page.html

@@ -8,7 +8,7 @@
 </ion-header>
 
 <ion-content>
-  <text-spinner *ngIf="!marketplaceService.releaseNotes[pkgId]; else loaded" text="Loading Release Notes"></text-spinner>
+  <text-spinner *ngIf="loading; else loaded" text="Loading Release Notes"></text-spinner>
 
   <ng-template #loaded>
     <div style="margin: 0px;" *ngFor="let note of marketplaceService.releaseNotes[pkgId] | keyvalue : asIsOrder">

ui/src/app/pages/marketplace-routes/app-release-notes/app-release-notes.page.ts

@@ -1,6 +1,7 @@
 import { Component, ViewChild } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
 import { IonContent } from '@ionic/angular'
+import { ErrorToastService } from 'src/app/services/error-toast.service'
 import { MarketplaceService } from '../marketplace.service'
 
 @Component({
@@ -12,17 +13,26 @@ export class AppReleaseNotes {
   @ViewChild(IonContent) content: IonContent
   selected: string
   pkgId: string
+  loading = true
 
   constructor (
     private readonly route: ActivatedRoute,
     public marketplaceService: MarketplaceService,
+    public errToast: ErrorToastService,
   ) { }
 
-  ngOnInit () {
+  async ngOnInit () {
     this.pkgId = this.route.snapshot.paramMap.get('pkgId')
+    try {
       if (!this.marketplaceService.releaseNotes[this.pkgId]) {
-      this.marketplaceService.getReleaseNotes(this.pkgId)
+        await this.marketplaceService.getReleaseNotes(this.pkgId)
       }
+    } catch (e) {
+      this.errToast.present(e)
+    } finally {
+      this.loading = false
+    }
+
   }
 
   ngAfterViewInit () {

ui/src/app/pages/server-routes/security-routes/ssh-keys/ssh-keys.page.ts

@@ -46,7 +46,7 @@ export class SSHKeysPage {
         title: name,
         message: description,
         label: name,
-        submitFn: this.add,
+        submitFn: async (pk: string) => await this.add(pk),
       },
       cssClass: 'alertlike-modal',
     })

ui/src/app/services/config.service.ts

@@ -50,6 +50,14 @@ export class ConfigService {
   }
 
   isLaunchable (state: PackageState, status: PackageMainStatus, interfaces: { [id: string]: InterfaceDef }): boolean {
+    console.log('is launchable', this.isLaunchable)
+    console.log('state', state)
+    console.log('status', status)
+    console.log('ret val', status === PackageMainStatus.Running &&
+    (
+      (hasTorUi(interfaces) && this.isTor()) ||
+      (hasLanUi(interfaces) && !this.isTor())
+    ))
     if (this.isConsulate || state !== PackageState.Installed) {
       return false
     }