marketplace url in server.update

frontend/projects/ui/src/app/app.component.ts

@@ -454,7 +454,9 @@ export class AppComponent {
     await loader.present()
 
     try {
-      await this.embassyApi.restartServer({})
+      await this.embassyApi.restartServer({
+        'marketplace-url': this.config.marketplace.url,
+      })
     } catch (e) {
       this.errToast.present(e)
     } finally {

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

@@ -3,12 +3,18 @@ import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 import { Breakages } from 'src/app/services/api/api.types'
 import { exists } from 'src/app/util/misc.util'
 import { ApiService } from '../../services/api/embassy-api.service'
-import { InstallWizardComponent, SlideDefinition, TopbarParams } from './install-wizard.component'
+import {
+  InstallWizardComponent,
+  SlideDefinition,
+  TopbarParams,
+} from './install-wizard.component'
+import { ConfigService } from 'src/app/services/config.service'
 
 @Injectable({ providedIn: 'root' })
 export class WizardBaker {
   constructor(
     private readonly embassyApi: ApiService,
+    private readonly config: ConfigService,
   ) {}
 
   update(values: {
@@ -23,7 +29,8 @@ export class WizardBaker {
     const toolbar: TopbarParams = { action, title, version }
 
     const slideDefinitions: SlideDefinition[] = [
-      installAlert ? {
+      installAlert
+        ? {
             slide: {
               selector: 'alert',
               params: {
@@ -38,7 +45,8 @@ export class WizardBaker {
               },
               next: 'Next',
             },
-      } : undefined,
+          }
+        : undefined,
       {
         slide: {
           selector: 'dependents',
@@ -46,7 +54,10 @@ export class WizardBaker {
             action,
             verb: 'updating',
             title,
-            fetchBreakages: () => this.embassyApi.dryUpdatePackage({ id, version }).then(breakages => breakages),
+            fetchBreakages: () =>
+              this.embassyApi
+                .dryUpdatePackage({ id, version })
+                .then(breakages => breakages),
           },
         },
         bottomBar: {
@@ -63,7 +74,11 @@ export class WizardBaker {
             action,
             verb: 'beginning update for',
             title,
-            executeAction: () => this.embassyApi.installPackage({ id, 'version-spec': version ? `=${version}` : undefined }),
+            executeAction: () =>
+              this.embassyApi.installPackage({
+                id,
+                'version-spec': version ? `=${version}` : undefined,
+              }),
           },
         },
         bottomBar: {
@@ -111,7 +126,10 @@ export class WizardBaker {
             action,
             verb: 'beginning update for',
             title,
-            executeAction: () => this.embassyApi.updateServer({ }),
+            executeAction: () =>
+              this.embassyApi.updateServer({
+                'marketplace-url': this.config.marketplace.url,
+              }),
           },
         },
         bottomBar: {
@@ -135,7 +153,8 @@ export class WizardBaker {
     const toolbar: TopbarParams = { action, title, version }
 
     const slideDefinitions: SlideDefinition[] = [
-      installAlert ? {
+      installAlert
+        ? {
             slide: {
               selector: 'alert',
               params: {
@@ -150,14 +169,19 @@ export class WizardBaker {
               },
               next: 'Next',
             },
-      } : undefined,
+          }
-      { slide: {
+        : undefined,
+      {
+        slide: {
           selector: 'dependents',
           params: {
             action,
             verb: 'downgrading',
             title,
-            fetchBreakages: () => this.embassyApi.dryUpdatePackage({ id, version }).then(breakages => breakages),
+            fetchBreakages: () =>
+              this.embassyApi
+                .dryUpdatePackage({ id, version })
+                .then(breakages => breakages),
           },
         },
         bottomBar: {
@@ -168,13 +192,18 @@ export class WizardBaker {
           next: 'Downgrade Anyway',
         },
       },
-      { slide: {
+      {
+        slide: {
           selector: 'complete',
           params: {
             action,
             verb: 'beginning downgrade for',
             title,
-            executeAction: () => this.embassyApi.installPackage({ id, 'version-spec': version ? `=${version}` : undefined }),
+            executeAction: () =>
+              this.embassyApi.installPackage({
+                id,
+                'version-spec': version ? `=${version}` : undefined,
+              }),
           },
         },
         bottomBar: {
@@ -211,7 +240,8 @@ export class WizardBaker {
           cancel: {
             afterLoading: { text: 'Cancel' },
           },
-          next: 'Continue' },
+          next: 'Continue',
+        },
       },
       {
         slide: {
@@ -220,7 +250,10 @@ export class WizardBaker {
             action,
             verb: 'uninstalling',
             title,
-            fetchBreakages: () => this.embassyApi.dryUninstallPackage({ id }).then(breakages => breakages),
+            fetchBreakages: () =>
+              this.embassyApi
+                .dryUninstallPackage({ id })
+                .then(breakages => breakages),
           },
         },
         bottomBar: {
@@ -228,7 +261,8 @@ export class WizardBaker {
             whileLoading: {},
             afterLoading: { text: 'Cancel' },
           },
-          next: 'Uninstall' },
+          next: 'Uninstall',
+        },
       },
       {
         slide: {
@@ -269,7 +303,10 @@ export class WizardBaker {
             action,
             verb: 'stopping',
             title,
-            fetchBreakages: () => this.embassyApi.dryStopPackage({ id }).then(breakages => breakages),
+            fetchBreakages: () =>
+              this.embassyApi
+                .dryStopPackage({ id })
+                .then(breakages => breakages),
           },
         },
         bottomBar: {
@@ -317,18 +354,21 @@ export class WizardBaker {
           params: {
             action,
             verb: 'saving config for',
-            title, fetchBreakages: () => Promise.resolve(breakages),
+            title,
+            fetchBreakages: () => Promise.resolve(breakages),
           },
         },
         bottomBar: {
           cancel: {
             afterLoading: { text: 'Cancel' },
           },
-          next: 'Save Config Anyway' },
+          next: 'Save Config Anyway',
+        },
       },
     ]
     return { toolbar, slideDefinitions }
   }
 }
 
-const defaultUninstallWarning = (serviceName: string) => `Uninstalling ${ serviceName } will result in the deletion of its data.`
+const defaultUninstallWarning = (serviceName: string) =>
+  `Uninstalling ${serviceName} will result in the deletion of its data.`

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

@@ -17,6 +17,7 @@ import { WizardBaker } from 'src/app/components/install-wizard/prebaked-wizards'
 import { wizardModal } from 'src/app/components/install-wizard/install-wizard.component'
 import { exists, isEmptyObject } from 'src/app/util/misc.util'
 import { EOSService } from 'src/app/services/eos.service'
+import { ConfigService } from 'src/app/services/config.service'
 
 @Component({
   selector: 'server-show',
@@ -36,6 +37,7 @@ export class ServerShowPage {
     private readonly embassyApi: ApiService,
     private readonly navCtrl: NavController,
     private readonly route: ActivatedRoute,
+    private readonly config: ConfigService,
     public readonly eosService: EOSService,
     public readonly patch: PatchDbService,
   ) {}
@@ -153,7 +155,9 @@ export class ServerShowPage {
     await loader.present()
 
     try {
-      await this.embassyApi.restartServer({})
+      await this.embassyApi.restartServer({
+        'marketplace-url': this.config.marketplace.url,
+      })
     } catch (e) {
       this.errToast.present(e)
     } finally {

frontend/projects/ui/src/app/services/api/api.types.ts

@@ -38,7 +38,7 @@ export module RR {
   export type GetServerMetricsReq = {} // server.metrics
   export type GetServerMetricsRes = Metrics
 
-  export type UpdateServerReq = WithExpire<{}> // server.update
+  export type UpdateServerReq = WithExpire<{ 'marketplace-url': string }> // server.update
   export type UpdateServerRes = WithRevision<'updating' | 'no-updates'>
 
   export type RestartServerReq = {} // server.restart