From c4baacf44fe02a7d9d6ae0b24f9982ae81d90499 Mon Sep 17 00:00:00 2001
From: Matt Hill <matthewonthemoon@gmail.com>
Date: Sat, 11 Sep 2021 15:19:36 -0600
Subject: [PATCH] ignore current deps not in manifest

---
 .../app/pages/apps-routes/app-show/app-show.page.html  |  4 ++--
 ui/src/app/pages/apps-routes/app-show/app-show.page.ts | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 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 b9dcb9623..002d8da85 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
@@ -87,10 +87,10 @@
           </ion-item>
 
           <!-- ** dependencies ** -->
-          <ng-container *ngIf="!(pkg.installed['current-dependencies'] | empty)">
+          <ng-container *ngIf="!(currentDependencies | empty)">
             <ion-item-divider id="dependencies">Dependencies</ion-item-divider>
             <!-- 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-item *ngFor="let dep of currentDependencies | keyvalue">
               <ion-thumbnail slot="start">
                 <img [src]="pkg.installed['dependency-info'][dep.key].icon" />
               </ion-thumbnail>
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 5f0ce2f01..b63010c18 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
@@ -8,7 +8,7 @@ import { wizardModal } from 'src/app/components/install-wizard/install-wizard.co
 import { WizardBaker } from 'src/app/components/install-wizard/prebaked-wizards'
 import { ConfigService } from 'src/app/services/config.service'
 import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
-import { DependencyErrorConfigUnsatisfied, DependencyErrorType, MainStatus, PackageDataEntry, PackageMainStatus, PackageState } from 'src/app/services/patch-db/data-model'
+import { CurrentDependencyInfo, DependencyErrorConfigUnsatisfied, DependencyErrorType, MainStatus, PackageDataEntry, PackageMainStatus, PackageState } from 'src/app/services/patch-db/data-model'
 import { FEStatus, PkgStatusRendering, renderPkgStatus } from 'src/app/services/pkg-status-rendering.service'
 import { ConnectionFailure, ConnectionService } from 'src/app/services/connection.service'
 import { ErrorToastService } from 'src/app/services/error-toast.service'
@@ -29,6 +29,7 @@ export class AppShowPage {
   FeStatus = FEStatus
   PackageState = PackageState
   DependencyErrorType = DependencyErrorType
+  currentDependencies: { [id: string]: CurrentDependencyInfo }
   rendering: PkgStatusRendering
   Math = Math
   mainStatus: MainStatus
@@ -63,6 +64,13 @@ export class AppShowPage {
       .subscribe(pkg => {
         this.pkg = pkg
         this.installProgress = !isEmptyObject(pkg['install-progress']) ? this.packageLoadingService.transform(pkg['install-progress']) : undefined
+        // we can safely ignore any current dependencies that are not defined in the service manifest
+        this.currentDependencies = { }
+        Object.entries(pkg.installed['current-dependencies']).forEach(([id, value]) => {
+          if (pkg.manifest.dependencies[id]) {
+            this.currentDependencies[id] = value
+          }
+        })
         this.rendering = renderPkgStatus(pkg.state, pkg.installed?.status)
         this.mainStatus = { ...pkg.installed?.status.main }
       }),