diff --git a/ui/package-lock.json b/ui/package-lock.json index 4fa4ed84f..e28d4127e 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -54,16 +54,16 @@ "version": "1.0.0", "license": "MIT", "dependencies": { - "rxjs": "^6.6.3", - "sorted-btree": "^1.5.0", - "uuid": "^8.3.2" + "rxjs": "6.6.7", + "sorted-btree": "1.5.0", + "uuid": "8.3.2" }, "devDependencies": { - "@types/node": "^15.0.0", - "@types/uuid": "^8.3.0", - "ts-node": "^9.1.1", - "tslint": "^6.1.0", - "typescript": "4.1.5" + "@types/node": "16.4.13", + "@types/uuid": "8.3.1", + "ts-node": "10.2.0", + "tslint": "6.1.3", + "typescript": "4.3.5" } }, "node_modules/@ampproject/remapping": { @@ -16820,9 +16820,7 @@ "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz", "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==", "dev": true, - "requires": { - "ajv": "^8.0.0" - } + "requires": {} }, "core-js": { "version": "3.16.0", @@ -16900,9 +16898,7 @@ "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz", "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==", "dev": true, - "requires": { - "ajv": "^8.0.0" - } + "requires": {} }, "json-schema-traverse": { "version": "1.0.0", @@ -16946,9 +16942,7 @@ "integrity": "sha512-Brah4Uo5/U8v76c6euTwtjVFFaVishwnJrQBYpev1JRh4vjA1F4HY3UzQez41YUCszUCXKagG8v6eVRBHV1gkw==", "dev": true, "peer": true, - "requires": { - "ajv": "^8.0.0" - } + "requires": {} }, "json-schema-traverse": { "version": "1.0.0", @@ -17001,9 +16995,7 @@ "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz", "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==", "dev": true, - "requires": { - "ajv": "^8.0.0" - } + "requires": {} }, "json-schema-traverse": { "version": "1.0.0", @@ -17081,9 +17073,7 @@ "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz", "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==", "dev": true, - "requires": { - "ajv": "^8.0.0" - } + "requires": {} }, "json-schema-traverse": { "version": "1.0.0", @@ -18632,9 +18622,7 @@ "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz", "integrity": "sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==", "dev": true, - "requires": { - "ajv": "^8.0.0" - } + "requires": {} }, "json-schema-traverse": { "version": "1.0.0", @@ -24503,14 +24491,14 @@ "patch-db-client": { "version": "file:../../patch-db/client", "requires": { - "@types/node": "^15.0.0", - "@types/uuid": "^8.3.0", - "rxjs": "^6.6.3", - "sorted-btree": "^1.5.0", - "ts-node": "^9.1.1", - "tslint": "^6.1.0", - "typescript": "4.1.5", - "uuid": "^8.3.2" + "@types/node": "16.4.13", + "@types/uuid": "8.3.1", + "rxjs": "6.6.7", + "sorted-btree": "1.5.0", + "ts-node": "10.2.0", + "tslint": "6.1.3", + "typescript": "4.3.5", + "uuid": "8.3.2" } }, "path-dirname": { 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 5198b3d40..670c7d765 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 @@ -11,7 +11,6 @@ import { ErrorToastService } from 'src/app/services/error-toast.service' }) export class AppLogsPage { @ViewChild(IonContent, { static: false }) private content: IonContent - page = 1 pkgId: string firstTimeLoaded = false needInfinite = true diff --git a/ui/src/app/services/api/api.fixures.ts b/ui/src/app/services/api/api.fixures.ts index 39860c1d2..55835bcc5 100644 --- a/ui/src/app/services/api/api.fixures.ts +++ b/ui/src/app/services/api/api.fixures.ts @@ -793,114 +793,6 @@ export module Mock { timestamp: '2019-12-26T14:22:30.872Z', log: '****** FINISH *****', }, - { - timestamp: '2019-12-26T14:20:30.872Z', - log: '****** START *****', - }, - { - timestamp: '2019-12-26T14:21:30.872Z', - log: 'ServerLogs ServerLogs ServerLogs ServerLogs ServerLogs', - }, - { - timestamp: '2019-12-26T14:22:30.872Z', - log: '****** FINISH *****', - }, - { - timestamp: '2019-12-26T14:20:30.872Z', - log: '****** START *****', - }, - { - timestamp: '2019-12-26T14:21:30.872Z', - log: 'ServerLogs ServerLogs ServerLogs ServerLogs ServerLogs', - }, - { - timestamp: '2019-12-26T14:22:30.872Z', - log: '****** FINISH *****', - }, - { - timestamp: '2019-12-26T14:20:30.872Z', - log: '****** START *****', - }, - { - timestamp: '2019-12-26T14:21:30.872Z', - log: 'ServerLogs ServerLogs ServerLogs ServerLogs ServerLogs', - }, - { - timestamp: '2019-12-26T14:22:30.872Z', - log: '****** FINISH *****', - }, - { - timestamp: '2019-12-26T14:20:30.872Z', - log: '****** START *****', - }, - { - timestamp: '2019-12-26T14:21:30.872Z', - log: 'ServerLogs ServerLogs ServerLogs ServerLogs ServerLogs', - }, - { - timestamp: '2019-12-26T14:22:30.872Z', - log: '****** FINISH *****', - }, - { - timestamp: '2019-12-26T14:20:30.872Z', - log: '****** START *****', - }, - { - timestamp: '2019-12-26T14:21:30.872Z', - log: 'ServerLogs ServerLogs ServerLogs ServerLogs ServerLogs', - }, - { - timestamp: '2019-12-26T14:22:30.872Z', - log: '****** FINISH *****', - }, - { - timestamp: '2019-12-26T14:20:30.872Z', - log: '****** START *****', - }, - { - timestamp: '2019-12-26T14:21:30.872Z', - log: 'ServerLogs ServerLogs ServerLogs ServerLogs ServerLogs', - }, - { - timestamp: '2019-12-26T14:22:30.872Z', - log: '****** FINISH *****', - }, - { - timestamp: '2019-12-26T14:20:30.872Z', - log: '****** START *****', - }, - { - timestamp: '2019-12-26T14:21:30.872Z', - log: 'ServerLogs ServerLogs ServerLogs ServerLogs ServerLogs', - }, - { - timestamp: '2019-12-26T14:22:30.872Z', - log: '****** FINISH *****', - }, - { - timestamp: '2019-12-26T14:20:30.872Z', - log: '****** START *****', - }, - { - timestamp: '2019-12-26T14:21:30.872Z', - log: 'ServerLogs ServerLogs ServerLogs ServerLogs ServerLogs', - }, - { - timestamp: '2019-12-26T14:22:30.872Z', - log: '****** FINISH *****', - }, - { - timestamp: '2019-12-26T14:20:30.872Z', - log: '****** START *****', - }, - { - timestamp: '2019-12-26T14:21:30.872Z', - log: 'ServerLogs ServerLogs ServerLogs ServerLogs ServerLogs', - }, - { - timestamp: '2019-12-26T14:22:30.872Z', - log: '****** FINISH *****', - }, ] export const PackageLogs: RR.GetPackageLogsRes = [ @@ -916,90 +808,6 @@ export module Mock { timestamp: '2019-12-26T14:22:30.872Z', log: '****** FINISH *****', }, - { - timestamp: '2019-12-26T14:20:30.872Z', - log: '****** START *****', - }, - { - timestamp: '2019-12-26T14:21:30.872Z', - log: 'PackageLogs PackageLogs PackageLogs PackageLogs PackageLogs', - }, - { - timestamp: '2019-12-26T14:22:30.872Z', - log: '****** FINISH *****', - }, - { - timestamp: '2019-12-26T14:20:30.872Z', - log: '****** START *****', - }, - { - timestamp: '2019-12-26T14:21:30.872Z', - log: 'PackageLogs PackageLogs PackageLogs PackageLogs PackageLogs', - }, - { - timestamp: '2019-12-26T14:22:30.872Z', - log: '****** FINISH *****', - }, - { - timestamp: '2019-12-26T14:20:30.872Z', - log: '****** START *****', - }, - { - timestamp: '2019-12-26T14:21:30.872Z', - log: 'PackageLogs PackageLogs PackageLogs PackageLogs PackageLogs', - }, - { - timestamp: '2019-12-26T14:22:30.872Z', - log: '****** FINISH *****', - }, - { - timestamp: '2019-12-26T14:20:30.872Z', - log: '****** START *****', - }, - { - timestamp: '2019-12-26T14:21:30.872Z', - log: 'PackageLogs PackageLogs PackageLogs PackageLogs PackageLogs', - }, - { - timestamp: '2019-12-26T14:22:30.872Z', - log: '****** FINISH *****', - }, - { - timestamp: '2019-12-26T14:20:30.872Z', - log: '****** START *****', - }, - { - timestamp: '2019-12-26T14:21:30.872Z', - log: 'PackageLogs PackageLogs PackageLogs PackageLogs PackageLogs', - }, - { - timestamp: '2019-12-26T14:22:30.872Z', - log: '****** FINISH *****', - }, - { - timestamp: '2019-12-26T14:20:30.872Z', - log: '****** START *****', - }, - { - timestamp: '2019-12-26T14:21:30.872Z', - log: 'PackageLogs PackageLogs PackageLogs PackageLogs PackageLogs', - }, - { - timestamp: '2019-12-26T14:22:30.872Z', - log: '****** FINISH *****', - }, - { - timestamp: '2019-12-26T14:20:30.872Z', - log: '****** START *****', - }, - { - timestamp: '2019-12-26T14:21:30.872Z', - log: 'PackageLogs PackageLogs PackageLogs PackageLogs PackageLogs', - }, - { - timestamp: '2019-12-26T14:22:30.872Z', - log: '****** FINISH *****', - }, ] export const Sessions: RR.GetSessionsRes = { 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 7fd18be09..5fe1a98b5 100644 --- a/ui/src/app/services/api/embassy-mock-api.service.ts +++ b/ui/src/app/services/api/embassy-mock-api.service.ts @@ -79,7 +79,7 @@ export class MockApiService extends ApiService { console.log('last page') return [] } - return Mock.ServerLogs + return new Array(10).map(_ => Mock.ServerLogs).reduce((acc, val) => acc.concat(val), []) } async getServerMetrics (params: RR.GetServerMetricsReq): Promise { @@ -318,7 +318,8 @@ export class MockApiService extends ApiService { console.log('last page') return [] } - return Mock.PackageLogs + + return new Array(10).map(_ => Mock.PackageLogs).reduce((acc, val) => acc.concat(val), []) } async installPackageRaw (params: RR.InstallPackageReq): Promise {