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

mplace service install refactor

Browse Source
This commit is contained in:
Drew Ansbacher
2022-02-25 09:54:48 -07:00
committed by Drew Ansbacher
parent e3b002f2dd
commit 0e82825da1
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/projects/ui/src/app/components/install-wizard/prebaked-wizards.ts
View File

@@ -77,10 +77,9 @@ export class WizardBaker {
verb: 'beginning update for', verb: 'beginning update for',
title, title,
executeAction: () => executeAction: () =>
this.embassyApi.installPackage({ this.marketplaceService.installPackage({
id, id,
'version-spec': version ? `=${version}` : undefined, 'version-spec': version ? `=${version}` : undefined,
'marketplace-url': this.marketplaceService.marketplaceUrl,
}), }),
}, },
}, },
@@ -203,10 +202,9 @@ export class WizardBaker {
verb: 'beginning downgrade for', verb: 'beginning downgrade for',
title, title,
executeAction: () => executeAction: () =>
this.embassyApi.installPackage({ this.marketplaceService.installPackage({
id, id,
'version-spec': version ? `=${version}` : undefined, 'version-spec': version ? `=${version}` : undefined,
'marketplace-url': this.marketplaceService.marketplaceUrl,
}), }),
}, },
}, },

3
frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-rec/app-list-rec.component.ts
View File

@@ -34,11 +34,10 @@ export class AppListRecComponent {
switchMap(({ id, version }) => switchMap(({ id, version }) =>
// Mapping each installation to API request // Mapping each installation to API request
from( from(
this.api.installPackage({ this.marketplaceService.installPackage({
id, id,
'version-spec': `>=${version}`, 'version-spec': `>=${version}`,
'version-priority': 'min', 'version-priority': 'min',
'marketplace-url': this.marketplaceService.marketplaceUrl,
}), }),
).pipe( ).pipe(
// Mapping operation to true/false loading indication // Mapping operation to true/false loading indication

3
frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
View File

@@ -210,10 +210,9 @@ export class MarketplaceShowPage {
loader.present() loader.present()
try { try {
await this.embassyApi.installPackage({ await this.marketplaceService.installPackage({
id, id,
'version-spec': version ? `=${version}` : undefined, 'version-spec': version ? `=${version}` : undefined,
'marketplace-url': this.marketplaceService.marketplaceUrl,
}) })
} catch (e) { } catch (e) {
this.errToast.present(e) this.errToast.present(e)

5
frontend/projects/ui/src/app/pages/marketplace-routes/marketplace.service.ts
View File

@@ -67,6 +67,11 @@ export class MarketplaceService {
} }
} }
async installPackage(req: Omit<RR.InstallPackageReq, 'marketplace-url'>) {
req['marketplace-url'] = this.marketplaceUrl
return this.api.installPackage(req as RR.InstallPackageReq)
}
async getUpdates( async getUpdates(
localPkgs: Record<string, PackageDataEntry>, localPkgs: Record<string, PackageDataEntry>,
): Promise<MarketplacePkg[]> { ): Promise<MarketplacePkg[]> {