Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-31 04:23:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

no tsc errs

Browse Source
This commit is contained in:
Drew Ansbacher
2021-09-20 21:18:55 -06:00
committed by Aiden McClelland
parent 5467383e8d
commit bd27beecdf
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ui/src/app/pages/apps-routes/app-list/app-list.page.ts
View File

@@ -4,7 +4,7 @@ import { ConnectionFailure, ConnectionService } from 'src/app/services/connectio
import { PatchDbService } from 'src/app/services/patch-db/patch-db.service' import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
import { PackageDataEntry, PackageState } from 'src/app/services/patch-db/data-model' import { PackageDataEntry, PackageState } from 'src/app/services/patch-db/data-model'
import { Subscription } from 'rxjs' import { Subscription } from 'rxjs'
import { PkgStatusRendering, renderPkgStatus } from 'src/app/services/pkg-status-rendering.service' import { PrimaryRendering, renderPkgStatus, StatusRendering } from 'src/app/services/pkg-status-rendering.service'
import { filter } from 'rxjs/operators' import { filter } from 'rxjs/operators'
import { isEmptyObject } from 'src/app/util/misc.util' import { isEmptyObject } from 'src/app/util/misc.util'
import { PackageLoadingService, ProgressData } from 'src/app/services/package-loading.service' import { PackageLoadingService, ProgressData } from 'src/app/services/package-loading.service'
@@ -23,7 +23,7 @@ export class AppListPage {
class: string class: string
img: string img: string
} }
statusRendering: PkgStatusRendering | null statusRendering: StatusRendering | null
sub: Subscription | null sub: Subscription | null
installProgress: ProgressData installProgress: ProgressData
}} = { } }} = { }
@@ -70,7 +70,7 @@ export class AppListPage {
class: 'bulb-off', class: 'bulb-off',
img: 'assets/img/off-bulb.png', img: 'assets/img/off-bulb.png',
}, },
statusRendering: renderPkgStatus(pkgs[id].state, pkgs[id].installed?.status), statusRendering: PrimaryRendering[renderPkgStatus(pkgs[id]).primary],
sub: null, sub: null,
installProgress: !isEmptyObject(pkgs[id]['install-progress']) ? this.installPackageService.transform(pkgs[id]['install-progress']) : undefined, installProgress: !isEmptyObject(pkgs[id]['install-progress']) ? this.installPackageService.transform(pkgs[id]['install-progress']) : undefined,
} }
@@ -79,7 +79,7 @@ export class AppListPage {
if (!pkg) return if (!pkg) return
let bulbClass = 'bulb-on' let bulbClass = 'bulb-on'
let img = '' let img = ''
const statusRendering = renderPkgStatus(pkg.state, pkg.installed?.status) const statusRendering = PrimaryRendering[renderPkgStatus(pkg).primary]
switch (statusRendering.color) { switch (statusRendering.color) {
case 'danger': case 'danger':
img = 'assets/img/danger-bulb.png' img = 'assets/img/danger-bulb.png'

5
ui/src/app/services/pkg-status-rendering.service.ts
View File

@@ -11,17 +11,18 @@ export function renderPkgStatus (pkg: PackageDataEntry): {
let health: HealthStatus | null = null let health: HealthStatus | null = null
if (pkg.state === PackageState.Installed) { if (pkg.state === PackageState.Installed) {
primary = PrimaryStatus[pkg.installed.status.main.status] primary = pkg.installed.status.main.status as string as PrimaryStatus
dependency = getDependencyStatus(pkg.installed) dependency = getDependencyStatus(pkg.installed)
health = getHealthStatus(pkg.installed.status) health = getHealthStatus(pkg.installed.status)
} else { } else {
primary = PrimaryStatus[pkg.state] primary = pkg.state as string as PrimaryStatus
} }
return { primary, dependency, health } return { primary, dependency, health }
} }
function getDependencyStatus (pkg: InstalledPackageDataEntry): DependencyStatus { function getDependencyStatus (pkg: InstalledPackageDataEntry): DependencyStatus {
console.log('pkg', pkg)
if (isEmptyObject(pkg['current-dependencies'])) return null if (isEmptyObject(pkg['current-dependencies'])) return null
const pkgIds = Object.keys(pkg.status['dependency-errors']) const pkgIds = Object.keys(pkg.status['dependency-errors'])

1
ui/src/app/util/misc.util.ts
View File

@@ -86,6 +86,7 @@ export function isObject (val: any): boolean {
} }
export function isEmptyObject (obj: object): boolean { export function isEmptyObject (obj: object): boolean {
if (obj === undefined) return true
return !Object.keys(obj).length return !Object.keys(obj).length
} }