Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 04:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

log backend integration fixes

Browse Source
This commit is contained in:
Drew Ansbacher
2021-09-05 22:08:56 +03:00
committed by Aiden McClelland
parent 483e02a41b
commit 0d59952fb9
6 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ui/src/app/components/logs/logs.page.ts
View File

@@ -38,15 +38,16 @@ export class LogsPage {
limit: this.limit,
})
if (isBefore && logsRes.startCursor) {
this.startCursor = logsRes.startCursor
if ((isBefore || this.startCursor) && logsRes['start-cursor']) {
this.startCursor = logsRes['start-cursor']
}
if (!isBefore && logsRes.endCursor) {
this.endCursor = logsRes.endCursor
if ((!isBefore || !this.endCursor) && logsRes['end-cursor']) {
this.endCursor = logsRes['end-cursor']
}
this.loading = false
return logsRes.logs
return logsRes.entries
} catch (e) {
this.errToast.present(e)
}
@@ -61,7 +62,7 @@ export class LogsPage {
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') + (logs.length ? '\n\n' : '')
newLogs.innerHTML = logs.map(l => `${l.timestamp} ${l.message}`).join('\n\n') + (logs.length ? '\n\n' : '')
container.prepend(newLogs)
const afterContainerHeight = container.scrollHeight
@@ -84,7 +85,7 @@ export class LogsPage {
const container = document.getElementById('container')
const newLogs = document.getElementById('template').cloneNode(true) as HTMLElement
newLogs.innerHTML = logs.map(l => `${l.timestamp} ${l.log}`).join('\n\n') + (logs.length ? '\n\n' : '')
newLogs.innerHTML = logs.map(l => `${l.timestamp} ${l.message}`).join('\n\n') + (logs.length ? '\n\n' : '')
container.append(newLogs)
this.loadingMore = false
this.scrollEvent()