Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve HTML viewer #1604

Merged
merged 3 commits into from
Apr 17, 2020
Merged

improve HTML viewer #1604

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
294c7c5
improve HTML viewer
jchip Apr 17, 2020
6f5583d
set default levels
jchip Apr 17, 2020
03da606
use & to separate values in hash
jchip Apr 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 121 additions & 4 deletions packages/xarc-app-dev/lib/dev-admin/log.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,16 @@
font-size: small;
line-height: normal;
}

.hide {
display: none;
}
</style>
</head>
<body>
<div id="controls" class="navbar">
<button type="button" onclick="displayLogs();">Refresh Logs</button>
<button type="button" onclick="wipeLogs();">Wipe Logs</button>
<label>
<input type="checkbox" id="level.error" checked onclick="levelChangeHandler();" />
Error
Expand Down Expand Up @@ -86,6 +91,8 @@
</div>
<script>
const el = document.getElementById("logs");
let logCount = 0;
let currentHash = "";

function getLevelSelections() {
const levels = ["error", "warn", "info", "http", "verbose", "debug", "silly"];
Expand All @@ -98,20 +105,130 @@
}

function levelChangeHandler() {
displayLogs(getLevelSelections(), false);
refreshLogs(getLevelSelections(), false);
}

function refreshLogs(levelSelections, scrollToEnd = true) {
levelSelections = levelSelections || getLevelSelections();

for (let line = el.firstChild; line !== null; line = line.nextSibling) {
const lvl = line.getAttribute("lvl");
if (!levelSelections[lvl]) {
line.setAttribute("class", "hide");
} else {
line.removeAttribute("class");
}
}

setValuesInHash(levelSelections);
}

function getHashValues() {
const hash = window.location.hash;
if (hash) {
return hash
.substr(1)
.split(";")
.reduce((acc, val) => {
const kvp = val.split("=");
if (kvp.length === 2 && kvp[0]) {
acc[kvp[0]] = kvp[1];
}
return acc;
}, {});
}
return {};
}

function getCountFromHash() {
const info = getHashValues();
if (info.count) {
const count = parseInt(info.count, 10);
if (Number.isInteger(count) && count >= 0) {
return count;
}
} else {
return 0;
}
}

function setValuesInHash(values) {
const info = { ...getHashValues(), ...values };
currentHash = window.location.hash =
"#" +
Object.keys(info)
.sort()
.map(k => `${k}=${info[k]}`)
.join(";");
}

function setCountInHash() {
setValuesInHash({ count: logCount });
}

function wipeLogs() {
setCountInHash();
while (el.lastChild) {
el.removeChild(el.lastChild);
}
}

async function displayLogs(levelSelections, scrollToEnd = true) {
levelSelections = levelSelections || getLevelSelections();
const logResponse = await fetch("/__electrode_dev/log-events");
let newLogs = await logResponse.json();
const filteredLogs = newLogs.filter(event => levelSelections[event.level]);
el.innerHTML = filteredLogs.map(event => event.message).join("\n") + "\n\n";
// scroll to bottom
const updateLogs = newLogs.slice(logCount, newLogs.length);

if (updateLogs.length > 0) {
updateLogs.forEach(event => {
const newLine = document.createElement("div");
newLine.setAttribute("lvl", event.level);
if (!levelSelections[event.level]) {
newLine.setAttribute("class", "hide");
}
newLine.innerHTML = event.message;
el.appendChild(newLine);
});
}

logCount += updateLogs.length;

if (scrollToEnd) {
setTimeout(() => window.scrollTo(0, document.body.scrollHeight), 350);
}
}

function updateLevelChecks() {
const info = getHashValues();
Object.keys(info).forEach(k => {
const elem = document.getElementById(`level.${k}`);
if (elem) {
elem.checked = info[k] !== "false";
}
});
}

window.addEventListener(
"hashchange",
() => {
if (currentHash !== window.location.hash) {
currentHash = window.location.hash;
updateLevelChecks();
const count = getCountFromHash();
if (count !== logCount) {
logCount = count;
wipeLogs();
displayLogs();
} else {
refreshLogs();
}
}
},
false
);

logCount = getCountFromHash();
updateLevelChecks();
setTimeout(displayLogs, 10);
</script>
</body>
Expand Down