fix: fix dynamic status and instructions modal (#1382)

frontend/projects/ui/src/app/pages/apps-routes/app-show/pipes/to-buttons.pipe.ts

@@ -5,6 +5,8 @@ import { AlertController, ModalController, NavController } from '@ionic/angular'
 import { MarkdownComponent } from '@start9labs/shared'
 import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 import { ModalService } from 'src/app/services/modal.service'
+import { ApiService } from 'src/app/services/api/embassy-api.service'
+import { from } from 'rxjs'
 
 export interface Button {
   title: string
@@ -24,6 +26,7 @@ export class ToButtonsPipe implements PipeTransform {
     private readonly navCtrl: NavController,
     private readonly modalCtrl: ModalController,
     private readonly modalService: ModalService,
+    private readonly apiService: ApiService,
   ) {}
 
   transform(pkg: PackageDataEntry): Button[] {
@@ -103,7 +106,9 @@ export class ToButtonsPipe implements PipeTransform {
     const modal = await this.modalCtrl.create({
       componentProps: {
         title: 'Instructions',
-        contentUrl: pkg['static-files']['instructions'],
+        content: from(
+          this.apiService.getStatic(pkg['static-files']['instructions']),
+        ),
       },
       component: MarkdownComponent,
     })

frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts

@@ -21,6 +21,7 @@ export class MarketplaceListPage {
   ).pipe(
     filter(data => exists(data) && !isEmptyObject(data)),
     tap(pkgs => Object.values(pkgs).forEach(spreadProgress)),
+    map(pkgs => ({ ...pkgs })),
     startWith({}),
   )
 

frontend/projects/ui/src/app/services/api/embassy-api.service.ts

@@ -1,4 +1,3 @@
-import { AbstractApiService } from '@start9labs/shared'
 import { Subject, Observable } from 'rxjs'
 import {
   Http,
@@ -14,10 +13,7 @@ import { DataModel } from 'src/app/services/patch-db/data-model'
 import { RequestError } from '../http.service'
 import { map } from 'rxjs/operators'
 
-export abstract class ApiService
-  extends AbstractApiService
-  implements Source<DataModel>, Http<DataModel>
-{
+export abstract class ApiService implements Source<DataModel>, Http<DataModel> {
   protected readonly sync$ = new Subject<Update<DataModel>>()
 
   /** PatchDb Source interface. Post/Patch requests provide a source of patches to the db. */
@@ -28,6 +24,9 @@ export abstract class ApiService
       .pipe(map(result => ({ result, jsonrpc: '2.0' })))
   }
 
+  // for getting static files: ex icons, instructions, licenses
+  abstract getStatic(url: string): Promise<string>
+
   // db
 
   abstract getRevisions(since: number): Promise<RR.GetRevisionsRes>