modify location of icon and title for dependencies

This commit is contained in:
Matt Hill
2021-08-09 17:15:21 -06:00
committed by Aiden McClelland
parent dc3634ad31
commit 708d035455
4 changed files with 30 additions and 7 deletions

View File

@@ -76,10 +76,10 @@
<!-- A current-dependency is a subset of the pkg.manifest.dependencies that is currently required as determined by the service config. -->
<ion-item *ngFor="let dep of pkg.installed['current-dependencies'] | keyvalue">
<ion-thumbnail slot="start">
<img [src]="dep.icon" />
<img [src]="pkg.installed['dependency-info'][dep.key].icon" />
</ion-thumbnail>
<ion-label class="ion-text-wrap">
<h2 style="font-family: 'Montserrat'">{{ dep.title }}</h2>
<h2 style="font-family: 'Montserrat'">{{ pkg.installed['dependency-info'][dep.key].title }}</h2>
<p>{{ pkg.manifest.dependencies[dep.key].version | displayEmver }}</p>
<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>

View File

@@ -164,6 +164,7 @@ export class AppShowPage {
}
private async installDep (depId: string): Promise<void> {
const title = this.pkg.installed['dependency-info'][depId].title
const version = this.pkg.manifest.dependencies[depId].version
const dependentTitle = this.pkg.manifest.title
@@ -172,7 +173,7 @@ export class AppShowPage {
dependentTitle,
dependentIcon: this.pkg['static-files'].icon,
version,
description: `${dependentTitle} requires an install of ${(this.pkg.installed.status['dependency-errors'][depId] as DependencyErrorNotInstalled)?.title} satisfying ${version}.`,
description: `${dependentTitle} requires an install of ${title} satisfying ${version}.`,
}
const navigationExtras: NavigationExtras = {
state: { installRec },