Now Available...
-Embassy OS {{ eos.version }}
-{{ eos.headline }}
+Embassy OS {{ marketplaceService.eos.version }}
+{{ marketplaceService.eos.headline }}
- ![]()
-
-
+
+
+ Install
+
+
+
+
+
+
+ Update
+
+
+ Downgrade
+
+
+
+
+
+
+
+ View Service
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ New in {{ pkg.manifest.version | displayEmver }}
+
+ All Release Notes
+
+
+
+
+
+
+
+
+ Description
+
+
+
+
+
+
+ Dependencies
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+ Additional Info
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- View Service
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- New in {{ pkg.manifest.version | displayEmver }}
-
- All Release Notes
-
-
-
-
-
-
-
-
- Description
-
-
-
-
-
-
- Dependencies
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
- Additional Info
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts b/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
index b5ad813c3..7cd3a7852 100644
--- a/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
+++ b/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
@@ -13,6 +13,7 @@ import { MarketplaceService } from '../marketplace.service'
import { Subscription } from 'rxjs'
import { MarkdownPage } from 'src/app/modals/markdown/markdown.page'
import { ApiService } from 'src/app/services/api/embassy-api.service'
+import { MarketplacePkg } from 'src/app/services/api/api.types'
@Component({
selector: 'marketplace-show',
@@ -23,11 +24,11 @@ export class MarketplaceShowPage {
@ViewChild(IonContent) content: IonContent
loading = true
pkgId: string
+ pkg: MarketplacePkg
localPkg: PackageDataEntry
PackageState = PackageState
rec: Recommendation | null = null
showRec = true
-
subs: Subscription[] = []
constructor (
@@ -41,7 +42,7 @@ export class MarketplaceShowPage {
private readonly emver: Emver,
private readonly patch: PatchDbService,
private readonly embassyApi: ApiService,
- public readonly marketplaceService: MarketplaceService,
+ private readonly marketplaceService: MarketplaceService,
) { }
async ngOnInit () {
@@ -57,10 +58,18 @@ export class MarketplaceShowPage {
}),
]
- if (this.marketplaceService.pkgs[this.pkgId]) {
+ try {
+ if (!this.marketplaceService.pkgs.length) {
+ await this.marketplaceService.load()
+ }
+ this.pkg = this.marketplaceService.pkgs.find(pkg => pkg.manifest.id === this.pkgId)
+ if (!this.pkg) {
+ throw new Error(`Service with ID "${this.pkgId}" not found.`)
+ }
+ } catch (e) {
+ this.errToast.present(e)
+ } finally {
this.loading = false
- } else {
- this.getPkg()
}
}
@@ -72,27 +81,16 @@ export class MarketplaceShowPage {
this.subs.forEach(sub => sub.unsubscribe())
}
- async getPkg (version?: string): Promise {
- try {
- await this.marketplaceService.getPkg(this.pkgId, version)
- } catch (e) {
- this.errToast.present(e)
- } finally {
- await pauseFor(100)
- this.loading = false
- }
- }
-
async presentAlertVersions () {
const alert = await this.alertCtrl.create({
header: 'Versions',
- inputs: this.marketplaceService.pkgs[this.pkgId].versions.sort((a, b) => -1 * this.emver.compare(a, b)).map(v => {
+ inputs: this.pkg.versions.sort((a, b) => -1 * this.emver.compare(a, b)).map(v => {
return {
name: v, // for CSS
type: 'radio',
label: displayEmver(v), // appearance on screen
value: v, // literal SEM version value
- checked: this.marketplaceService.pkgs[this.pkgId].manifest.version === v,
+ checked: this.pkg.manifest.version === v,
}
}),
buttons: [
@@ -116,7 +114,7 @@ export class MarketplaceShowPage {
const modal = await this.modalCtrl.create({
componentProps: {
title,
- contentUrl: this.marketplaceService.pkgs[this.pkgId][title],
+ contentUrl: this.pkg[title],
},
component: MarkdownPage,
})
@@ -125,7 +123,7 @@ export class MarketplaceShowPage {
}
async tryInstall () {
- const { id, title, version, alerts } = this.marketplaceService.pkgs[this.pkgId].manifest
+ const { id, title, version, alerts } = this.pkg.manifest
if (!alerts.install) {
await this.install(id, version)
@@ -152,7 +150,7 @@ export class MarketplaceShowPage {
}
async presentModal (action: 'update' | 'downgrade') {
- const { id, title, version, dependencies, alerts } = this.marketplaceService.pkgs[this.pkgId].manifest
+ const { id, title, version, dependencies, alerts } = this.pkg.manifest
const value = {
id,
title,
@@ -177,6 +175,18 @@ export class MarketplaceShowPage {
this.showRec = false
}
+ private async getPkg (version?: string): Promise {
+ this.loading = true
+ try {
+ this.pkg = await this.marketplaceService.getPkg(this.pkgId, version)
+ } catch (e) {
+ this.errToast.present(e)
+ } finally {
+ await pauseFor(100)
+ this.loading = false
+ }
+ }
+
private async install (id: string, version?: string): Promise {
const loader = await this.loadingCtrl.create({
spinner: 'lines',
diff --git a/ui/src/app/pages/marketplace-routes/marketplace.service.ts b/ui/src/app/pages/marketplace-routes/marketplace.service.ts
index ef96165b9..4a5b1c0d4 100644
--- a/ui/src/app/pages/marketplace-routes/marketplace.service.ts
+++ b/ui/src/app/pages/marketplace-routes/marketplace.service.ts
@@ -1,5 +1,5 @@
import { Injectable } from '@angular/core'
-import { MarketplacePkg } from 'src/app/services/api/api.types'
+import { MarketplaceData, MarketplaceEOS, MarketplacePkg } from 'src/app/services/api/api.types'
import { ApiService } from 'src/app/services/api/embassy-api.service'
import { Emver } from 'src/app/services/emver.service'
import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
@@ -8,9 +8,9 @@ import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
providedIn: 'root',
})
export class MarketplaceService {
- allPkgs: MarketplacePkg[] = []
- pkgs: { [id: string]: MarketplacePkg } = { }
- updates: MarketplacePkg[] = []
+ data: MarketplaceData
+ eos: MarketplaceEOS
+ pkgs: MarketplacePkg[] = []
releaseNotes: { [id: string]: {
[version: string]: string
} } = { }
@@ -20,61 +20,55 @@ export class MarketplaceService {
private readonly emver: Emver,
) { }
- async getUpdates (localPkgs: { [id: string]: PackageDataEntry }) : Promise {
- const idAndCurrentVersions = Object.keys(localPkgs).map(key => ({ id: key, version: localPkgs[key].manifest.version }))
- const latestPkgs = (await this.api.getMarketplacePkgs({
- ids: idAndCurrentVersions,
- }))
+ async load (): Promise {
+ const [data, eos, pkgs] = await Promise.all([
+ this.api.getMarketplaceData({ }),
+ this.api.getEos({ }),
+ this.getPkgs(1, 100),
+ ])
+ this.data = data
+ this.eos = eos
+ this.pkgs = pkgs
+ }
- const updates = latestPkgs.filter(latestPkg => {
+ async getUpdates (localPkgs: { [id: string]: PackageDataEntry }) : Promise {
+ const idAndCurrentVersions = Object.keys(localPkgs).map(key => ({ id: key, version: localPkgs[key].manifest.version }))
+ const latestPkgs = await this.api.getMarketplacePkgs({
+ ids: idAndCurrentVersions,
+ })
+
+ return latestPkgs.filter(latestPkg => {
const latestVersion = latestPkg.manifest.version
const curVersion = localPkgs[latestPkg.manifest.id]?.manifest.version
return !!curVersion && this.emver.compare(latestVersion, curVersion) === 1
})
-
- this.updates = updates
}
- async getAllPkgs (): Promise {
- if (this.allPkgs.length) return
-
- this.allPkgs = await this.getPkgs(
- undefined,
- null,
- 1,
- 100000,
- )
- }
-
- async getPkgs (category: string, query: string, page: number, perPage: number) : Promise {
- const pkgs = await this.api.getMarketplacePkgs({
- category: category !== 'all' ? category : undefined,
- query,
- page: String(page),
- 'per-page': String(perPage),
- })
- this.pkgs = pkgs.reduce((cur, val) => {
- cur[val.manifest.id] = val
- return cur
- }, { })
- return pkgs
- }
-
- async getPkg (id: string, version?: string): Promise {
+ async getPkg (id: string, version?: string): Promise {
const pkgs = await this.api.getMarketplacePkgs({
ids: [{ id, version: version || '*' }],
})
const pkg = pkgs.find(pkg => pkg.manifest.id == id)
- if (pkg) {
- this.pkgs[id] = pkg
+
+ if (!pkg) {
+ throw new Error(`No results for ${id}${version ? ' ' + version : ''}`)
} else {
- throw new Error(`No results for ${id}${version ? ' ' + version : ''}.`)
+ return pkg
}
}
async getReleaseNotes (id: string): Promise {
this.releaseNotes[id] = await this.api.getReleaseNotes({ id })
}
+
+ private async getPkgs (page: number, perPage: number) : Promise {
+ const pkgs = await this.api.getMarketplacePkgs({
+ page: String(page),
+ 'per-page': String(perPage),
+ })
+
+ return pkgs
+ }
}
diff --git a/ui/src/app/pages/server-routes/preferences/preferences.page.html b/ui/src/app/pages/server-routes/preferences/preferences.page.html
index 87d9b7087..dfb0dade0 100644
--- a/ui/src/app/pages/server-routes/preferences/preferences.page.html
+++ b/ui/src/app/pages/server-routes/preferences/preferences.page.html
@@ -12,7 +12,7 @@
{{ fields['name'].name }}
- {{ patch.data.ui.name }}
+ {{ patch.data.ui.name || defaultName }}
diff --git a/ui/src/app/pages/server-routes/preferences/preferences.page.ts b/ui/src/app/pages/server-routes/preferences/preferences.page.ts
index ea0edf072..afb996394 100644
--- a/ui/src/app/pages/server-routes/preferences/preferences.page.ts
+++ b/ui/src/app/pages/server-routes/preferences/preferences.page.ts
@@ -14,6 +14,7 @@ import { ErrorToastService } from 'src/app/services/error-toast.service'
export class PreferencesPage {
@ViewChild(IonContent) content: IonContent
fields = fields
+ defaultName: string
constructor (
private readonly modalCtrl: ModalController,
@@ -23,6 +24,10 @@ export class PreferencesPage {
public readonly patch: PatchDbService,
) { }
+ ngOnInit () {
+ this.defaultName = `Embassy-${this.patch.data['server-info'].id}`
+ }
+
ngAfterViewInit () {
this.content.scrollToPoint(undefined, 1)
}
@@ -34,11 +39,11 @@ export class PreferencesPage {
message: 'This is for your reference only.',
label: 'Device Name',
useMask: false,
- placeholder: this.patch.data['server-info'].id,
+ placeholder: this.defaultName,
nullable: true,
value: this.patch.data.ui.name,
buttonText: 'Save',
- submitFn: async (value: string) => await this.setDbValue('name', value || this.patch.data['server-info'].id),
+ submitFn: async (value: string) => await this.setDbValue('name', value || this.defaultName),
},
cssClass: 'alertlike-modal',
presentingElement: await this.modalCtrl.getTop(),
diff --git a/ui/src/app/pages/server-routes/server-show/server-show.page.html b/ui/src/app/pages/server-routes/server-show/server-show.page.html
index ceb557604..e2d010f5d 100644
--- a/ui/src/app/pages/server-routes/server-show/server-show.page.html
+++ b/ui/src/app/pages/server-routes/server-show/server-show.page.html
@@ -1,6 +1,6 @@
- {{ patch.data.ui.name || patch.data['server-info'].id }}
+ {{ patch.data.ui.name || "Embassy-" + patch.data['server-info'].id }}
diff --git a/ui/src/app/pages/server-routes/server-show/server-show.page.ts b/ui/src/app/pages/server-routes/server-show/server-show.page.ts
index 8c145e297..36b1e8820 100644
--- a/ui/src/app/pages/server-routes/server-show/server-show.page.ts
+++ b/ui/src/app/pages/server-routes/server-show/server-show.page.ts
@@ -162,7 +162,7 @@ export class ServerShowPage {
'Power': [
{
title: 'Restart',
- icon: 'reload-outline',
+ icon: 'reload',
action: () => this.presentAlertRestart(),
detail: false,
},
diff --git a/ui/src/app/services/api/api.fixures.ts b/ui/src/app/services/api/api.fixures.ts
index aae75cdcb..3138588a9 100644
--- a/ui/src/app/services/api/api.fixures.ts
+++ b/ui/src/app/services/api/api.fixures.ts
@@ -262,9 +262,11 @@ export module Mock {
dependencies: {
'bitcoind': {
version: '=0.21.0',
+ requirement: {
+ type: 'opt-out',
+ how: 'You can use an external node if you prefer.',
+ },
description: 'LND needs bitcoin to live.',
- optional: null,
- recommended: true,
critical: true,
config: {
check: {
@@ -294,8 +296,10 @@ export module Mock {
'bitcoin-proxy': {
version: '>=0.2.2',
description: 'As long as Bitcoin is pruned, LND needs Bitcoin Proxy to fetch block over the P2P network.',
- optional: null,
- recommended: true,
+ requirement: {
+ type: 'opt-in',
+ how: 'You can choose to use Bitcoin Proxy for permission management',
+ },
critical: true,
config: {
check: {
@@ -410,8 +414,9 @@ export module Mock {
'bitcoind': {
version: '>=0.20.0',
description: 'Bitcoin Proxy requires a Bitcoin node.',
- optional: null,
- recommended: true,
+ requirement: {
+ type: 'required',
+ },
critical: false,
config: {
check: {
diff --git a/ui/src/app/services/patch-db/data-model.ts b/ui/src/app/services/patch-db/data-model.ts
index 8784106fd..999aca90a 100644
--- a/ui/src/app/services/patch-db/data-model.ts
+++ b/ui/src/app/services/patch-db/data-model.ts
@@ -344,8 +344,15 @@ export interface DependencyInfo {
export interface DependencyEntry {
version: string
- optional: string | null
- recommended: boolean
+ requirement: {
+ type: 'opt-in'
+ how: string
+ } | {
+ type: 'opt-out'
+ how: string
+ } | {
+ type: 'required'
+ }
description: string | null
critical: boolean,
config: {
diff --git a/ui/src/app/services/startup-alerts.service.ts b/ui/src/app/services/startup-alerts.service.ts
index 19bc1bfd6..e3765fd84 100644
--- a/ui/src/app/services/startup-alerts.service.ts
+++ b/ui/src/app/services/startup-alerts.service.ts
@@ -38,21 +38,18 @@ export class StartupAlertsService {
shouldRun: () => this.shouldRunOsWelcome(),
check: async () => true,
display: () => this.displayOsWelcome(),
- hasRun: this.config.skipStartupAlerts,
}
const osUpdate: Check = {
name: 'osUpdate',
shouldRun: () => this.shouldRunOsUpdateCheck(),
check: () => this.osUpdateCheck(),
display: pkg => this.displayOsUpdateCheck(pkg),
- hasRun: this.config.skipStartupAlerts,
}
const pkgsUpdate: Check = {
name: 'pkgsUpdate',
shouldRun: () => this.shouldRunAppsCheck(),
check: () => this.appsCheck(),
display: () => this.displayAppsCheck(),
- hasRun: this.config.skipStartupAlerts,
}
this.checks = [osWelcome, osUpdate, pkgsUpdate]
}
@@ -70,7 +67,7 @@ export class StartupAlertsService {
.subscribe(async data => {
this.data = data
await this.checks
- .filter(c => !c.hasRun && c.shouldRun())
+ .filter(c => !this.config.skipStartupAlerts && c.shouldRun())
// returning true in the below block means to continue to next modal
// returning false means to skip all subsequent modals
.reduce(async (previousDisplay, c) => {
@@ -81,7 +78,7 @@ export class StartupAlertsService {
console.error(`Exception in ${c.name} check:`, e)
return true
}
- c.hasRun = true
+
const displayRes = await previousDisplay
if (!checkRes) return true
@@ -113,8 +110,8 @@ export class StartupAlertsService {
}
private async appsCheck (): Promise {
- await this.marketplaceService.getUpdates(this.data['package-data'])
- return !!this.marketplaceService.updates.length
+ const updates = await this.marketplaceService.getUpdates(this.data['package-data'])
+ return !!updates.length
}
private async displayOsWelcome (): Promise {
@@ -220,8 +217,6 @@ type Check = {
// display an alert based on the result of the check.
// return false if subsequent modals should not be displayed
display: (a: T) => Promise
- // tracks if this check has run in this app instance.
- hasRun: boolean
// for logging purposes
name: string
}
\ No newline at end of file
{{ pkg.manifest.title }}
-{{ pkg.manifest.version | displayEmver }}
-
-
-
+
+
- Not Installed
+ {{ pkg.manifest.version | displayEmver }} Not Installed
+
-
-
-
+
+
+
-
+
+
{{ pkg.manifest.title }}
+
+
+
+
+
+
+ ![]()
+
+ {{ rec.dependentTitle }}
+
+
+
+
+
+ {{ rec.description }}
+{{ pkg.manifest.title }} version {{ pkg.manifest.version | displayEmver }} is compatible.
+{{ pkg.manifest.title }} version {{ pkg.manifest.version | displayEmver }} is NOT compatible.
+{{ pkg.manifest.description.long }}
+ + {{ pkg['dependency-metadata'][dep.key].title }} + (required) + (required by default) + (optional) +
+{{ dep.value.version | displayEmver }}
+{{ dep.value.description }}
+Other Versions
+Click to view other versions
+License
+{{ pkg.manifest.license }}
+Instructions
+Click to view instructions
+Source Repository
+{{ pkg.manifest['upstream-repo'] }}
+Wrapper Repository
+{{ pkg.manifest['wrapper-repo'] }}
+Support Site
+{{ pkg.manifest['support-site'] }}
+
-
- ![]()
-
- {{ rec.dependentTitle }}
-
-
-
-
-
- {{ rec.description }}
-{{ pkg.manifest.title }} version {{ pkg.manifest.version | displayEmver }} is compatible.
-{{ pkg.manifest.title }} version {{ pkg.manifest.version | displayEmver }} is NOT compatible.
-{{ pkg.manifest.description.long }}
- - {{ pkg['dependency-metadata'][dep.key].title }} - (recommended) -
-{{ dep.value.version | displayEmver }}
-{{ dep.value.description }}
-Other Versions
-Click to view other versions
-License
-{{ pkg.manifest.license }}
-Instructions
-Click to view instructions
-Source Repository
-{{ pkg.manifest['upstream-repo'] }}
-Wrapper Repository
-{{ pkg.manifest['wrapper-repo'] }}
-Support Site
-{{ pkg.manifest['support-site'] }}
-