diff --git a/frontend/projects/ui/src/app/components/install-wizard/prebaked-wizards.ts b/frontend/projects/ui/src/app/components/install-wizard/prebaked-wizards.ts index be1354165..02f578464 100644 --- a/frontend/projects/ui/src/app/components/install-wizard/prebaked-wizards.ts +++ b/frontend/projects/ui/src/app/components/install-wizard/prebaked-wizards.ts @@ -77,10 +77,9 @@ export class WizardBaker { verb: 'beginning update for', title, executeAction: () => - this.embassyApi.installPackage({ + this.marketplaceService.installPackage({ id, 'version-spec': version ? `=${version}` : undefined, - 'marketplace-url': this.marketplaceService.marketplaceUrl, }), }, }, @@ -203,10 +202,9 @@ export class WizardBaker { verb: 'beginning downgrade for', title, executeAction: () => - this.embassyApi.installPackage({ + this.marketplaceService.installPackage({ id, 'version-spec': version ? `=${version}` : undefined, - 'marketplace-url': this.marketplaceService.marketplaceUrl, }), }, }, diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-rec/app-list-rec.component.ts b/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-rec/app-list-rec.component.ts index 770a23f04..2e9006088 100644 --- a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-rec/app-list-rec.component.ts +++ b/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-rec/app-list-rec.component.ts @@ -34,11 +34,10 @@ export class AppListRecComponent { switchMap(({ id, version }) => // Mapping each installation to API request from( - this.api.installPackage({ + this.marketplaceService.installPackage({ id, 'version-spec': `>=${version}`, 'version-priority': 'min', - 'marketplace-url': this.marketplaceService.marketplaceUrl, }), ).pipe( // Mapping operation to true/false loading indication diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts b/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts index 8ca35bc45..e7f23962b 100644 --- a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts +++ b/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts @@ -210,10 +210,9 @@ export class MarketplaceShowPage { loader.present() try { - await this.embassyApi.installPackage({ + await this.marketplaceService.installPackage({ id, 'version-spec': version ? `=${version}` : undefined, - 'marketplace-url': this.marketplaceService.marketplaceUrl, }) } catch (e) { this.errToast.present(e) diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace.service.ts b/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace.service.ts index 06826b5ca..3ae9554d0 100644 --- a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace.service.ts +++ b/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace.service.ts @@ -67,6 +67,11 @@ export class MarketplaceService { } } + async installPackage(req: Omit) { + req['marketplace-url'] = this.marketplaceUrl + return this.api.installPackage(req as RR.InstallPackageReq) + } + async getUpdates( localPkgs: Record, ): Promise {