From 056452facaa5a2f2a59dac2ef7c25acb4cba029c Mon Sep 17 00:00:00 2001
From: Drew Ansbacher <drew.ansbacher@spiredigital.com>
Date: Mon, 23 Aug 2021 10:32:07 -0600
Subject: [PATCH] errs fixed

---
 .../app/pages/apps-routes/app-logs/app-logs.page.ts | 12 ++++++------
 .../server-routes/server-logs/server-logs.page.ts   | 13 ++++++-------
 ui/src/app/services/api/embassy-mock-api.service.ts |  4 ++--
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/ui/src/app/pages/apps-routes/app-logs/app-logs.page.ts b/ui/src/app/pages/apps-routes/app-logs/app-logs.page.ts
index 88b25bf72..f2c319dbe 100644
--- a/ui/src/app/pages/apps-routes/app-logs/app-logs.page.ts
+++ b/ui/src/app/pages/apps-routes/app-logs/app-logs.page.ts
@@ -36,25 +36,25 @@ export class AppLogsPage {
         before: this.before,
         limit,
       })
-      this.firstTimeLoaded = true
 
-      if (logs.length < limit) {
-        this.needInfinite = false
-        return
-      }
+      this.firstTimeLoaded = true
 
       this.before = logs[0].timestamp
 
       const container = document.getElementById('container')
       const beforeContainerHeight = container.scrollHeight
       const newLogs = document.getElementById('template').cloneNode(true) as HTMLElement
-      newLogs.innerHTML = logs.map(l => `${l.timestamp} ${l.log}`).join('\n\n') + '\n\n'
+      newLogs.innerHTML = logs.map(l => `${l.timestamp} ${l.log}`).join('\n\n') + (logs.length ? '\n\n' : '')
       container.prepend(newLogs)
       const afterContainerHeight = container.scrollHeight
 
       // scroll down
       scrollBy(0, afterContainerHeight - beforeContainerHeight)
       this.content.scrollToPoint(0, afterContainerHeight - beforeContainerHeight)
+
+      if (logs.length < limit) {
+        this.needInfinite = false
+      }
     } catch (e) {
       this.errToast.present(e)
     }
diff --git a/ui/src/app/pages/server-routes/server-logs/server-logs.page.ts b/ui/src/app/pages/server-routes/server-logs/server-logs.page.ts
index 4e661de55..8c0680ddb 100644
--- a/ui/src/app/pages/server-routes/server-logs/server-logs.page.ts
+++ b/ui/src/app/pages/server-routes/server-logs/server-logs.page.ts
@@ -30,12 +30,6 @@ export class ServerLogsPage {
     try {
       // get logs
       const logs = await this.embassyApi.getServerLogs({ before: this.before, limit })
-
-      if (logs.length < limit) {
-        this.needInfinite = false
-        return
-      }
-
       this.before = logs[0].timestamp
 
       this.firstTimeLoaded = true
@@ -43,13 +37,18 @@ export class ServerLogsPage {
       const container = document.getElementById('container')
       const beforeContainerHeight = container.scrollHeight
       const newLogs = document.getElementById('template').cloneNode(true) as HTMLElement
-      newLogs.innerHTML = logs.map(l => `${l.timestamp} ${l.log}`).join('\n\n') + '\n\n'
+      newLogs.innerHTML = logs.map(l => `${l.timestamp} ${l.log}`).join('\n\n') + (logs.length ? '\n\n' : '')
       container.prepend(newLogs)
       const afterContainerHeight = container.scrollHeight
 
       // scroll down
       scrollBy(0, afterContainerHeight - beforeContainerHeight)
       this.content.scrollToPoint(0, afterContainerHeight - beforeContainerHeight)
+
+      if (logs.length < limit) {
+        this.needInfinite = false
+      }
+
     } catch (e) {
       this.errToast.present(e)
     }
diff --git a/ui/src/app/services/api/embassy-mock-api.service.ts b/ui/src/app/services/api/embassy-mock-api.service.ts
index 045509a8e..042186985 100644
--- a/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -80,7 +80,7 @@ export class MockApiService extends ApiService {
       return Mock.ServerLogs
     }
     const arrLength = params.limit ? Math.ceil(params.limit / Mock.ServerLogs.length) : 10
-    return new Array(arrLength).map(_ => Mock.ServerLogs).reduce((acc, val) => acc.concat(val), [])
+    return new Array(arrLength).fill(Mock.ServerLogs).reduce((acc, val) => acc.concat(val), [])
   }
 
   async getServerMetrics (params: RR.GetServerMetricsReq): Promise<RR.GetServerMetricsRes> {
@@ -320,7 +320,7 @@ export class MockApiService extends ApiService {
       return Mock.PackageLogs
     }
     const arrLength = params.limit ? Math.ceil(params.limit / Mock.PackageLogs.length) : 10
-    return new Array(arrLength).map(_ => Mock.PackageLogs).reduce((acc, val) => acc.concat(val), [])
+    return new Array(arrLength).fill(Mock.PackageLogs).reduce((acc, val) => acc.concat(val), [])
   }
 
   async installPackageRaw (params: RR.InstallPackageReq): Promise<RR.InstallPackageRes> {