Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 20:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

better subscriptions

Browse Source
This commit is contained in:
Matt Hill
2021-07-12 16:43:50 -06:00
committed by Aiden McClelland
parent 7a144b4d25
commit 2086367407
33 changed files with 203 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ui/src/app/services/config.service.ts
View File

@@ -53,16 +53,14 @@ export class ConfigService {
return false
}
const installed = pkg.installed
return installed.status.main.status === PackageMainStatus.Running &&
return pkg.installed.status.main.status === PackageMainStatus.Running &&
(
(hasTorUi(installed.manifest.interfaces) && this.isTor()) ||
(hasLanUi(installed.manifest.interfaces) && !this.isTor())
(hasTorUi(pkg.manifest.interfaces) && this.isTor()) ||
(hasLanUi(pkg.manifest.interfaces) && !this.isTor())
)
}
launchableURL (pkg: InstalledPackageDataEntry): string {
launchableURL (pkg: PackageDataEntry): string {
return this.isTor() ? `http://${torUiAddress(pkg)}` : `https://${lanUiAddress(pkg)}`
}
}
@@ -75,7 +73,7 @@ export function hasLanUi (interfaces: { [id: string]: InterfaceDef }): boolean {
return !!Object.values(interfaces).find(i => i.ui && i['lan-config'])
}
export function torUiAddress (pkg: InstalledPackageDataEntry): string {
export function torUiAddress (pkg: PackageDataEntry): string {
const interfaces = pkg.manifest.interfaces
const id = Object.keys(interfaces).find(key => {
const val = interfaces[key]
@@ -84,7 +82,7 @@ export function torUiAddress (pkg: InstalledPackageDataEntry): string {
return pkg['interface-info'].addresses[id]['tor-address']
}
export function lanUiAddress (pkg: InstalledPackageDataEntry): string {
export function lanUiAddress (pkg: PackageDataEntry): string {
const interfaces = pkg.manifest.interfaces
const id = Object.keys(interfaces).find(key => {
const val = interfaces[key]
@@ -99,7 +97,7 @@ export function hasUi (interfaces: { [id: string]: InterfaceDef }): boolean {
export function getManifest (pkg: PackageDataEntry): Manifest {
if (pkg.state === PackageState.Installed) {
return pkg.installed.manifest
return pkg.manifest
}
return pkg['temp-manifest']
}