From bd7149491f8d39e67a7cb8b400f0a2e93af52f1d Mon Sep 17 00:00:00 2001 From: Matt Hill Date: Mon, 9 Aug 2021 20:52:26 -0600 Subject: [PATCH] manifest in dependency-onfo --- ui/src/app/pages/apps-routes/app-show/app-show.page.html | 2 +- ui/src/app/pages/apps-routes/app-show/app-show.page.ts | 2 +- ui/src/app/services/api/api.fixures.ts | 8 ++++---- ui/src/app/services/patch-db/data-model.ts | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) 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 1ed844dfd..ee2310853 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 @@ -79,7 +79,7 @@ -

{{ pkg.installed['dependency-info'][dep.key].title }}

+

{{ pkg.installed['dependency-info'][dep.key].manifest.title }}

{{ pkg.manifest.dependencies[dep.key].version | displayEmver }}

{{ pkg.installed.status['dependency-errors'][dep.key] ? pkg.installed.status['dependency-errors'][dep.key].type : 'satisfied' }}

diff --git a/ui/src/app/pages/apps-routes/app-show/app-show.page.ts b/ui/src/app/pages/apps-routes/app-show/app-show.page.ts index c9debe39a..695bc59e1 100644 --- a/ui/src/app/pages/apps-routes/app-show/app-show.page.ts +++ b/ui/src/app/pages/apps-routes/app-show/app-show.page.ts @@ -164,7 +164,7 @@ export class AppShowPage { } private async installDep (depId: string): Promise { - const title = this.pkg.installed['dependency-info'][depId].title + const title = this.pkg.installed['dependency-info'][depId].manifest.title const version = this.pkg.manifest.dependencies[depId].version const dependentTitle = this.pkg.manifest.title diff --git a/ui/src/app/services/api/api.fixures.ts b/ui/src/app/services/api/api.fixures.ts index 34394918c..eab1638ac 100644 --- a/ui/src/app/services/api/api.fixures.ts +++ b/ui/src/app/services/api/api.fixures.ts @@ -621,11 +621,11 @@ export module Mock { }, 'dependency-info': { 'lnd': { - title: Mock.MockManifestLnd.title, + manifest: Mock.MockManifestLnd, icon: 'assets/img/service-icons/lnd.png', }, 'bitcoind': { - title: Mock.MockManifestBitcoind.title, + manifest: Mock.MockManifestBitcoind, icon: 'assets/img/service-icons/bitcoind.png', }, }, @@ -1489,11 +1489,11 @@ export module Mock { }, 'dependency-info': { 'bitcoind': { - title: Mock.MockManifestBitcoind.title, + manifest: Mock.MockManifestBitcoind, icon: 'assets/img/service-icons/bitcoind.png', }, 'bitcoin-proxy': { - title: Mock.MockManifestBitcoinProxy.title, + manifest: Mock.MockManifestBitcoinProxy, icon: 'assets/img/service-icons/bitcoin-proxy.png', }, }, diff --git a/ui/src/app/services/patch-db/data-model.ts b/ui/src/app/services/patch-db/data-model.ts index f0b8a2391..883d08c04 100644 --- a/ui/src/app/services/patch-db/data-model.ts +++ b/ui/src/app/services/patch-db/data-model.ts @@ -74,7 +74,7 @@ export interface InstalledPackageDataEntry { 'current-dependencies': { [id: string]: CurrentDependencyInfo } 'dependency-info': { [id: string]: { - title: string + manifest: Manifest icon: URL } }