From 18ff528ceb6f67f5c95da97bd8496148af92af67 Mon Sep 17 00:00:00 2001
From: Drew Ansbacher <drew.ansbacher@spiredigital.com>
Date: Mon, 23 Aug 2021 10:14:12 -0600
Subject: [PATCH] page limit added

---
 .../app/pages/apps-routes/app-logs/app-logs.page.ts   |  4 +++-
 .../server-routes/server-logs/server-logs.page.ts     |  5 +++--
 ui/src/app/services/api/api.types.ts                  |  4 ++--
 ui/src/app/services/api/embassy-mock-api.service.ts   | 11 ++++++-----
 4 files changed, 14 insertions(+), 10 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 670c7d765..88b25bf72 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
@@ -28,15 +28,17 @@ export class AppLogsPage {
   }
 
   async getLogs () {
+    const limit = 200
     try {
       // get logs
       const logs = await this.embassyApi.getPackageLogs({
         id: this.pkgId,
         before: this.before,
+        limit,
       })
       this.firstTimeLoaded = true
 
-      if (!logs.length) {
+      if (logs.length < limit) {
         this.needInfinite = false
         return
       }
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 d00290f06..4e661de55 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
@@ -26,11 +26,12 @@ export class ServerLogsPage {
   }
 
   async getLogs () {
+    const limit = 200
     try {
       // get logs
-      const logs = await this.embassyApi.getServerLogs({ before: this.before })
+      const logs = await this.embassyApi.getServerLogs({ before: this.before, limit })
 
-      if (!logs.length) {
+      if (logs.length < limit) {
         this.needInfinite = false
         return
       }
diff --git a/ui/src/app/services/api/api.types.ts b/ui/src/app/services/api/api.types.ts
index 25ae6cb8b..14f81e85c 100644
--- a/ui/src/app/services/api/api.types.ts
+++ b/ui/src/app/services/api/api.types.ts
@@ -27,7 +27,7 @@ export module RR {
   export type SetShareStatsReq = WithExpire<{ value: any }> // server.config.share-stats
   export type SetShareStatsRes = WithRevision<null>
 
-  export type GetServerLogsReq = { before?: string } // server.logs
+  export type GetServerLogsReq = { before?: string, limit?: number } // server.logs
   export type GetServerLogsRes = Log[]
 
   export type GetServerMetricsReq = { } // server.metrics
@@ -137,7 +137,7 @@ export module RR {
   export type GetPackagePropertiesReq = { id: string } // package.properties
   export type GetPackagePropertiesRes<T extends number> = PackagePropertiesVersioned<T>
 
-  export type GetPackageLogsReq = { id: string, before?: string } // package.logs
+  export type GetPackageLogsReq = { id: string, limit?: number, before?: string } // package.logs
   export type GetPackageLogsRes = Log[]
 
   export type GetPackageMetricsReq = { id: string } // package.metrics
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 5fe1a98b5..045509a8e 100644
--- a/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -77,9 +77,10 @@ export class MockApiService extends ApiService {
     await pauseFor(2000)
     if (Math.random() < .2) {
       console.log('last page')
-      return []
+      return Mock.ServerLogs
     }
-    return new Array(10).map(_ => Mock.ServerLogs).reduce((acc, val) => acc.concat(val), [])
+    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), [])
   }
 
   async getServerMetrics (params: RR.GetServerMetricsReq): Promise<RR.GetServerMetricsRes> {
@@ -316,10 +317,10 @@ export class MockApiService extends ApiService {
     await pauseFor(2000)
     if (Math.random() < .2) {
       console.log('last page')
-      return []
+      return Mock.PackageLogs
     }
-
-    return new Array(10).map(_ => Mock.PackageLogs).reduce((acc, val) => acc.concat(val), [])
+    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), [])
   }
 
   async installPackageRaw (params: RR.InstallPackageReq): Promise<RR.InstallPackageRes> {