temp patch for marketplace rendering bug

Start9Labs · Jun 16, 2022 · 9d4de69 · 9d4de69
1 parent d061121
commit 9d4de69
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 25 deletions.
diff --git a/frontend/projects/ui/src/app/pages/server-routes/marketplaces/marketplaces.page.ts b/frontend/projects/ui/src/app/pages/server-routes/marketplaces/marketplaces.page.ts
@@ -15,7 +15,7 @@ import { v4 } from 'uuid'
 import { UIMarketplaceData } from '../../../services/patch-db/data-model'
 import { ConfigService } from '../../../services/config.service'
 import { MarketplaceService } from 'src/app/services/marketplace.service'
-import { finalize, first } from 'rxjs/operators'
+import { finalize, first, startWith } from 'rxjs/operators'
 
 type Marketplaces = {
   id: string | undefined
@@ -45,27 +45,35 @@ export class MarketplacesPage {
   ) {}
 
   ngOnInit() {
-    this.patch.watch$('ui', 'marketplace').subscribe(mp => {
-      let marketplaces: Marketplaces = [
-        {
-          id: undefined,
-          name: this.config.marketplace.name,
-          url: this.config.marketplace.url,
-        },
-      ]
-      if (mp) {
-        this.selectedId = mp['selected-id'] || undefined
-        const alts = Object.entries(mp['known-hosts']).map(([k, v]) => {
-          return {
-            id: k,
-            name: v.name,
-            url: v.url,
-          }
-        })
-        marketplaces = marketplaces.concat(alts)
-      }
-      this.marketplaces = marketplaces
-    })
+    this.patch
+      .watch$('ui', 'marketplace')
+      .pipe(
+        startWith({
+          'selected-id': null,
+          'known-hosts': {},
+        }),
+      )
+      .subscribe(mp => {
+        let marketplaces: Marketplaces = [
+          {
+            id: undefined,
+            name: this.config.marketplace.name,
+            url: this.config.marketplace.url,
+          },
+        ]
+        if (mp) {
+          this.selectedId = mp['selected-id'] || undefined
+          const alts = Object.entries(mp['known-hosts']).map(([k, v]) => {
+            return {
+              id: k,
+              name: v.name,
+              url: v.url,
+            }
+          })
+          marketplaces = marketplaces.concat(alts)
+        }
+        this.marketplaces = marketplaces
+      })
   }
 
   async presentModalAdd() {

diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-logs/server-logs.page.ts b/frontend/projects/ui/src/app/pages/server-routes/server-logs/server-logs.page.ts
@@ -36,7 +36,7 @@ export class ServerLogsPage {
   async copy(): Promise<void> {
     const logs = document
       .getElementById('template')
-      .cloneNode(true) as HTMLElement
+      ?.cloneNode(true) as HTMLElement
     const formatted = '```' + logs.innerHTML + '```'
     const success = await copyToClipboard(formatted)
     const message = success

diff --git a/frontend/projects/ui/src/app/services/api/mock-patch.ts b/frontend/projects/ui/src/app/services/api/mock-patch.ts
@@ -445,7 +445,7 @@ export const mockPatchData: DataModel = {
         'donation-url': null,
         alerts: {
           install: null,
-          uninstall: undefined,
+          uninstall: null,
           restore:
             'If this is a duplicate instance of the same LND node, you may loose your funds.',
           start: 'Starting LND is good for your health.',

diff --git a/frontend/projects/ui/src/app/services/marketplace.service.ts b/frontend/projects/ui/src/app/services/marketplace.service.ts
@@ -32,7 +32,13 @@ export class MarketplaceService extends AbstractMarketplaceService {
 
   private readonly data$: Observable<UIMarketplaceData> = this.patch
     .watch$('ui', 'marketplace')
-    .pipe(take(1), shareReplay({ bufferSize: 1, refCount: true }))
+    .pipe(
+      startWith({
+        'selected-id': null,
+        'known-hosts': {},
+      }),
+      shareReplay({ bufferSize: 1, refCount: true }),
+    )
 
   private readonly marketplace$: Observable<Marketplace> = this.data$.pipe(
     map(data => this.toMarketplace(data)),