Merge branch 'integration/new-container-runtime' of github.com:Start9Labs/start-os into rebase/feat/domains

web/projects/ui/src/app/util/dry-update.ts

@@ -13,7 +13,7 @@ export function dryUpdate(
         Object.keys(pkg['current-dependencies'] || {}).some(
           pkgId => pkgId === id,
         ) &&
-        !emver.satisfies(version, getManifest(pkg).dependencies[id].version),
+        !emver.satisfies(version, pkg['current-dependencies'][id].versionRange),
     )
     .map(pkg => getManifest(pkg).title)
 }

web/projects/ui/src/app/util/get-package-data.ts

@@ -3,12 +3,12 @@ import {
   DataModel,
   InstalledState,
   InstallingState,
-  Manifest,
   PackageDataEntry,
   PackageState,
   UpdatingState,
 } from 'src/app/services/patch-db/data-model'
 import { firstValueFrom } from 'rxjs'
+import { Manifest } from '@start9labs/marketplace'
 
 export async function getPackage(
   patch: PatchDB<DataModel>,

web/projects/ui/src/app/util/has-deps.ts

@@ -1,8 +1,8 @@
 import { PackageDataEntry } from '../services/patch-db/data-model'
-import { getManifest } from './get-package-data'
 
-export function hasCurrentDeps(pkg: PackageDataEntry): boolean {
-  return !!Object.keys(pkg['current-dependents']).filter(
-    depId => depId !== getManifest(pkg).id,
-  ).length
+export function hasCurrentDeps(
+  id: string,
+  pkgs: Record<string, PackageDataEntry>,
+): boolean {
+  return !!Object.values(pkgs).some(pkg => !!pkg['current-dependencies'][id])
 }