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

send id to marketplace

Browse Source
This commit is contained in:
Matt Hill
2022-02-25 18:38:31 -07:00
committed by Aiden McClelland
parent 184381b536
commit 840fa8d49b
7 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
frontend/projects/ui/src/app/pages/server-routes/marketplaces/marketplaces.page.ts
View File

@@ -90,7 +90,7 @@ export class MarketplacesPage {
async presentAction(id: string) {
// no need to view actions if is selected marketplace
if (id === this.patch.data.ui.marketplace['selected-id']) return
if (id === this.patch.getData().ui.marketplace['selected-id']) return
const buttons: ActionSheetButton[] = [
{
@@ -125,7 +125,7 @@ export class MarketplacesPage {
private async connect(id: string): Promise<void> {
const marketplace: UIMarketplaceData = JSON.parse(
JSON.stringify(this.patch.data.ui.marketplace),
JSON.stringify(this.patch.getData().ui.marketplace),
)
const url = id
@@ -140,7 +140,10 @@ export class MarketplacesPage {
await loader.present()
try {
await this.marketplaceService.getMarketplaceData({}, url)
await this.marketplaceService.getMarketplaceData(
{ 'server-id': this.patch.getData()['server-info'].id },
url,
)
} catch (e) {
this.errToast.present(e)
loader.dismiss()
@@ -171,7 +174,7 @@ export class MarketplacesPage {
private async delete(id: string): Promise<void> {
if (!id) return
const marketplace: UIMarketplaceData = JSON.parse(
JSON.stringify(this.patch.data.ui.marketplace),
JSON.stringify(this.patch.getData().ui.marketplace),
)
const loader = await this.loadingCtrl.create({
@@ -192,9 +195,9 @@ export class MarketplacesPage {
}
private async save(url: string): Promise<void> {
const marketplace = this.patch.data.ui.marketplace
const marketplace = this.patch.getData().ui.marketplace
? (JSON.parse(
JSON.stringify(this.patch.data.ui.marketplace),
JSON.stringify(this.patch.getData().ui.marketplace),
) as UIMarketplaceData)
: { 'selected-id': undefined, 'known-hosts': {} }
@@ -212,7 +215,10 @@ export class MarketplacesPage {
try {
const id = v4()
const { name } = await this.marketplaceService.getMarketplaceData({}, url)
const { name } = await this.marketplaceService.getMarketplaceData(
{ 'server-id': this.patch.getData()['server-info'].id },
url,
)
marketplace['known-hosts'][id] = { name, url }
} catch (e) {
this.errToast.present(e)
@@ -232,9 +238,11 @@ export class MarketplacesPage {
}
private async saveAndConnect(url: string): Promise<void> {
const marketplace = this.patch.data.ui.marketplace
await this.save(url)
const marketplace = this.patch.getData().ui.marketplace
? (JSON.parse(
JSON.stringify(this.patch.data.ui.marketplace),
JSON.stringify(this.patch.getData().ui.marketplace),
) as UIMarketplaceData)
: { 'selected-id': undefined, 'known-hosts': {} }
@@ -251,7 +259,10 @@ export class MarketplacesPage {
try {
const id = v4()
const { name } = await this.marketplaceService.getMarketplaceData({}, url)
const { name } = await this.marketplaceService.getMarketplaceData(
{ 'server-id': this.patch.getData()['server-info'].id },
url,
)
marketplace['known-hosts'][id] = { name, url }
marketplace['selected-id'] = id
} catch (e) {
@@ -270,7 +281,7 @@ export class MarketplacesPage {
return
}
loader.message = 'Syncing store...'
loader.message = 'Syncing marketplace data...'
try {
await this.marketplaceService.load()

2
frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
View File

@@ -121,7 +121,7 @@ export class ServerShowPage {
}
async presentAlertSystemRebuild() {
const minutes = Object.keys(this.patch.data['package-data']).length * 2
const minutes = Object.keys(this.patch.getData()['package-data']).length * 2
const alert = await this.alertCtrl.create({
header: 'System Rebuild',
message: new IonicSafeString(