merge 036, everything broken

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

@@ -1,5 +1,6 @@
 import { Emver } from '@start9labs/shared'
 import { DataModel } from '../services/patch-db/data-model'
+import { getManifest } from './get-package-data'
 
 export function dryUpdate(
   { id, version }: { id: string; version: string },
@@ -9,9 +10,10 @@ export function dryUpdate(
   return Object.values(pkgs)
     .filter(
       pkg =>
-        Object.keys(pkg.installed?.['current-dependencies'] || {}).some(
+        Object.keys(pkg['current-dependencies'] || {}).some(
           pkgId => pkgId === id,
-        ) && !emver.satisfies(version, pkg.manifest.dependencies[id].version),
+        ) &&
+        !emver.satisfies(version, getManifest(pkg).dependencies[id].version),
     )
-    .map(pkg => pkg.manifest.title)
+    .map(pkg => getManifest(pkg).title)
 }

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

@@ -1,7 +1,12 @@
 import { PatchDB } from 'patch-db-client'
 import {
   DataModel,
+  InstalledState,
+  InstallingState,
+  Manifest,
   PackageDataEntry,
+  PackageState,
+  UpdatingState,
 } from 'src/app/services/patch-db/data-model'
 import { firstValueFrom } from 'rxjs'
 
@@ -17,3 +22,41 @@ export async function getAllPackages(
 ): Promise<DataModel['package-data']> {
   return firstValueFrom(patch.watch$('package-data'))
 }
+
+export function getManifest(pkg: PackageDataEntry): Manifest {
+  if (isInstalled(pkg) || isRemoving(pkg)) return pkg['state-info'].manifest
+
+  return (pkg['state-info'] as InstallingState)['installing-info'][
+    'new-manifest'
+  ]
+}
+
+export function isInstalled(
+  pkg: PackageDataEntry,
+): pkg is PackageDataEntry<InstalledState> {
+  return pkg['state-info'].state === PackageState.Installed
+}
+
+export function isRemoving(
+  pkg: PackageDataEntry,
+): pkg is PackageDataEntry<InstalledState> {
+  return pkg['state-info'].state === PackageState.Removing
+}
+
+export function isInstalling(
+  pkg: PackageDataEntry,
+): pkg is PackageDataEntry<InstallingState> {
+  return pkg['state-info'].state === PackageState.Installing
+}
+
+export function isRestoring(
+  pkg: PackageDataEntry,
+): pkg is PackageDataEntry<InstallingState> {
+  return pkg['state-info'].state === PackageState.Restoring
+}
+
+export function isUpdating(
+  pkg: PackageDataEntry,
+): pkg is PackageDataEntry<UpdatingState> {
+  return pkg['state-info'].state === PackageState.Updating
+}

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

@@ -7,7 +7,6 @@ import {
   renderPkgStatus,
 } from '../services/pkg-status-rendering.service'
 import { PkgInfo } from '../types/pkg-info'
-import { packageLoadingProgress } from './package-loading-progress'
 import { PkgDependencyErrors } from '../services/dep-error.service'
 
 export function getPackageInfo(
@@ -21,7 +20,6 @@ export function getPackageInfo(
     entry,
     primaryRendering,
     primaryStatus: statuses.primary,
-    installProgress: packageLoadingProgress(entry['install-progress']),
     error:
       statuses.health === HealthStatus.Failure ||
       statuses.dependency === DependencyStatus.Warning,

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

@@ -1,7 +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.installed?.['current-dependents'] || {}).filter(
-    depId => depId !== pkg.manifest.id,
+  return !!Object.keys(pkg['current-dependents']).filter(
+    depId => depId !== getManifest(pkg).id,
   ).length
 }

web/projects/ui/src/app/util/package-loading-progress.ts

@@ -1,50 +0,0 @@
-import { isEmptyObject } from '@start9labs/shared'
-import { ProgressData } from 'src/app/types/progress-data'
-import { InstallProgress } from '../services/patch-db/data-model'
-
-export function packageLoadingProgress(
-  loadData?: InstallProgress,
-): ProgressData | null {
-  if (!loadData || isEmptyObject(loadData)) {
-    return null
-  }
-
-  let {
-    downloaded,
-    validated,
-    unpacked,
-    size,
-    'download-complete': downloadComplete,
-    'validation-complete': validationComplete,
-    'unpack-complete': unpackComplete,
-  } = loadData
-
-  // only permit 100% when "complete" == true
-  size = size || 0
-  downloaded = downloadComplete ? size : Math.max(downloaded - 1, 0)
-  validated = validationComplete ? size : Math.max(validated - 1, 0)
-  unpacked = unpackComplete ? size : Math.max(unpacked - 1, 0)
-
-  const downloadWeight = 1
-  const validateWeight = 0.2
-  const unpackWeight = 0.7
-
-  const numerator = Math.floor(
-    downloadWeight * downloaded +
-      validateWeight * validated +
-      unpackWeight * unpacked,
-  )
-
-  const denominator = Math.floor(
-    size * (downloadWeight + validateWeight + unpackWeight),
-  )
-  const totalProgress = Math.floor((100 * numerator) / denominator)
-
-  return {
-    totalProgress,
-    downloadProgress: Math.floor((100 * downloaded) / size),
-    validateProgress: Math.floor((100 * validated) / size),
-    unpackProgress: Math.floor((100 * unpacked) / size),
-    isComplete: downloadComplete && validationComplete && unpackComplete,
-  }
-}