bug fixes and cosmetic improvements

ui/src/app/components/form-object/form-object.component.html

@@ -25,14 +25,14 @@
         </h4>
         <!-- string -->
         <ion-item color="dark" *ngIf="spec.type === 'string'">
-          <ion-input [type]="spec.masked && !unmasked[entry.key] ? 'password' : 'text'" [placeholder]="'Enter ' + spec.name" [formControlName]="entry.key" (ionFocus)="presentAlertChangeWarning(key, spec)" (ionChange)="handleInputChange(spec)"></ion-input>
+          <ion-input [type]="spec.masked && !unmasked[entry.key] ? 'password' : 'text'" [placeholder]="'Enter ' + spec.name" [formControlName]="entry.key" (ionFocus)="presentAlertChangeWarning(entry.key, spec)" (ionChange)="handleInputChange(spec)"></ion-input>
           <ion-button *ngIf="spec.masked" fill="clear" color="light" (click)="unmasked[entry.key] = !unmasked[entry.key]">
             <ion-icon slot="icon-only" [name]="unmasked[entry.key] ? 'eye-off-outline' : 'eye-outline'" size="small"></ion-icon>
           </ion-button>
         </ion-item>
         <!-- number -->
         <ion-item color="dark" *ngIf="spec.type === 'number'">
-          <ion-input type="tel" [placeholder]="'Enter ' + spec.name" [formControlName]="entry.key" (ionFocus)="presentAlertChangeWarning(key, spec)" (ionChange)="handleInputChange(spec)"></ion-input>
+          <ion-input type="tel" [placeholder]="'Enter ' + spec.name" [formControlName]="entry.key" (ionFocus)="presentAlertChangeWarning(entry.key, spec)" (ionChange)="handleInputChange(spec)"></ion-input>
           <ion-note *ngIf="spec.units" slot="end" color="light" style="font-size: medium;">{{ spec.units }}</ion-note>
         </ion-item>
         <!-- boolean -->
@@ -43,7 +43,7 @@
         <!-- enum -->
         <ion-item *ngIf="spec.type === 'enum'">
           <ion-label>{{ spec.name }}</ion-label>
-          <ion-select [interfaceOptions]="{ message: getWarningText(spec.warning) }" slot="end" placeholder="Select" [formControlName]="entry.key" [selectedText]="spec['value-names'][formGroup.get(entry.key).value]" (ionChange)="handleInputChange(entry.key, spec)">
+          <ion-select [interfaceOptions]="{ message: getWarningText(spec.warning) }" slot="end" placeholder="Select" [formControlName]="entry.key" [selectedText]="spec['value-names'][formGroup.get(entry.key).value]" (ionChange)="handleInputChange(spec)">
             <ion-select-option *ngFor="let option of spec.values" [value]="option">
               {{ spec['value-names'][option] }}
             </ion-select-option>
@@ -68,7 +68,7 @@
                 spec.variants[entry.value.controls[spec.tag.id].value] :
                 spec.spec"
             [formGroup]="entry.value"
-            [current]="current ? current[key] : undefined"
+            [current]="current ? current[entry.key] : undefined"
             [unionSpec]="spec.type === 'union' ? spec : undefined"
           ></form-object>
         </div>

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

@@ -20,10 +20,10 @@ export class CompleteComponent implements OnInit, Loadable {
   }
 
   @Input() transitions: {
-    cancel: () => void
-    next: () => void
-    final: () => void
-    error: (e: Error) => void
+    cancel: () => any
+    next: () => any
+    final: () => any
+    error: (e: Error) => any
   }
 
   loading$ = new BehaviorSubject(false)

ui/src/app/components/install-wizard/dependents/dependents.component.html

@@ -30,10 +30,10 @@
         *ngFor="let dep of dependentBreakages | keyvalue"
       >
         <ion-thumbnail style="position: relative; height: 4vh; width: 4vh" slot="start">
-          <img [src]="dep.value.iconURL" />
+          <img [src]="patch.data['package-data'][dep.key]['static-files'].icon" />
         </ion-thumbnail>
         <ion-label>
-            <h5>{{ dep.value.title }}</h5>
+          <h5>{{ patch.data['package-data'][dep.key].manifest.title }}</h5>
         </ion-label>
       </ion-item>
     </div>

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

@@ -2,6 +2,7 @@ import { Component, Input, OnInit } from '@angular/core'
 import { BehaviorSubject, from, Subject } from 'rxjs'
 import { takeUntil, tap } from 'rxjs/operators'
 import { Breakages } from 'src/app/services/api/api.types'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
 import { capitalizeFirstLetter, isEmptyObject } from 'src/app/util/misc.util'
 import { Loadable, markAsLoadingDuring$ } from '../loadable'
 import { WizardAction } from '../wizard-types'
@@ -20,10 +21,10 @@ export class DependentsComponent implements OnInit, Loadable {
     skipConfirmationDialogue?: boolean
   }
   @Input() transitions: {
-    cancel: () => void
-    next: () => void
-    final: () => void
-    error: (e: Error) => void
+    cancel: () => any
+    next: () => any
+    final: () => any
+    error: (e: Error) => any
   }
 
   dependentBreakages: Breakages
@@ -33,7 +34,9 @@ export class DependentsComponent implements OnInit, Loadable {
   loading$ = new BehaviorSubject(false)
   cancel$ = new Subject<void>()
 
-  constructor () { }
+  constructor (
+    public readonly patch: PatchDbService,
+  ) { }
   ngOnInit () { }
 
   load () {

ui/src/app/components/install-wizard/install-wizard.component.html

@@ -38,11 +38,11 @@
 
       <!-- cancel button if loading/not loading -->
       <ion-button slot="start" *ngIf="(currentSlide.loading$ | async) && currentBottomBar.cancel.whileLoading as cancel" (click)="transitions.cancel()" class="toolbar-button" fill="outline">
-        <ion-text *ngIf="cancel.text" [class.smaller-text]="cancel.text > 16">{{ cancel.text }}</ion-text>
+        <ion-text *ngIf="cancel.text" [class.smaller-text]="cancel.text.length > 16">{{ cancel.text }}</ion-text>
         <ion-icon *ngIf="!cancel.text" name="close"></ion-icon>
       </ion-button>
       <ion-button slot="start" *ngIf="!(currentSlide.loading$ | async) && currentBottomBar.cancel.afterLoading as cancel" (click)="transitions.cancel()" class="toolbar-button" fill="outline">
-        <ion-text *ngIf="cancel.text" [class.smaller-text]="cancel.text > 16">{{ cancel.text }}</ion-text>
+        <ion-text *ngIf="cancel.text" [class.smaller-text]="cancel.text.length > 16">{{ cancel.text }}</ion-text>
         <ion-icon *ngIf="!cancel.text" name="close"></ion-icon>
       </ion-button>
 

ui/src/app/components/logs/logs.page.html

@@ -1,6 +1,6 @@
 <ion-content 
   [scrollEvents]="true"
-  (ionScroll)="scrollEvent($event)"
+  (ionScroll)="scrollEvent()"
   style="height: 100%;"
   id="ion-content"
   class="ion-padding"

ui/src/app/components/status/status.component.html

@@ -5,5 +5,5 @@
   [style.font-weight]="weight"
 >
   {{ disconnected ? 'Unknown' : rendering.display }}
-  <ion-spinner *ngIf="rendering.showDots" class="dots dots-small" name="dots" [color]="color"></ion-spinner>
+  <ion-spinner *ngIf="rendering.showDots" class="dots dots-small" name="dots"></ion-spinner>
 </p>