diff options
Diffstat (limited to 'pkg/html')
| -rw-r--r-- | pkg/html/pages/common.js | 101 | ||||
| -rwxr-xr-x | pkg/html/pages/gen.sh | 14 | ||||
| -rw-r--r-- | pkg/html/pages/pages.go | 9 | ||||
| -rw-r--r-- | pkg/html/pages/style.css (renamed from pkg/html/pages/generated.go) | 108 |
4 files changed, 108 insertions, 124 deletions
diff --git a/pkg/html/pages/common.js b/pkg/html/pages/common.js new file mode 100644 index 000000000..95e6c8f61 --- /dev/null +++ b/pkg/html/pages/common.js @@ -0,0 +1,101 @@ +// Copyright 2018 syzkaller project authors. All rights reserved. +// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. + +function sortTable(item, colName, conv, desc = false) { + table = item.parentNode.parentNode.parentNode.parentNode; + rows = table.rows; + col = findColumnByName(rows[0].getElementsByTagName("th"), colName); + values = []; + for (i = 1; i < rows.length; i++) + values.push([conv(rows[i].getElementsByTagName("td")[col].textContent), rows[i]]); + if (desc) + desc = !isSorted(values.slice().reverse()) + else + desc = isSorted(values); + values.sort(function(a, b) { + if (a[0] == b[0]) return 0; + if (desc && a[0] > b[0] || !desc && a[0] < b[0]) return -1; + return 1; + }); + for (i = 0; i < values.length; i++) + table.tBodies[0].appendChild(values[i][1]); + return false; +} + +function findColumnByName(headers, colName) { + for (i = 0; i < headers.length; i++) { + if (headers[i].textContent == colName) + return i; + } + return 0; +} + +function isSorted(values) { + for (i = 0; i < values.length - 1; i++) { + if (values[i][0] > values[i + 1][0]) + return false; + } + return true; +} + +function textSort(v) { return v == "" ? "zzz" : v.toLowerCase(); } +function numSort(v) { return -parseInt(v); } +function floatSort(v) { return -parseFloat(v); } +function reproSort(v) { return v == "C" ? 0 : v == "syz" ? 1 : 2; } +function patchedSort(v) { return v == "" ? -1 : parseInt(v); } +function lineSort(v) { return -v.split(/\r\n|\r|\n/g).length } + +function timeSort(v) { + if (v == "now") + return 0; + m = v.indexOf('m'); + h = v.indexOf('h'); + d = v.indexOf('d'); + if (m > 0 && h < 0) + return parseInt(v); + if (h > 0 && m > 0) + return parseInt(v) * 60 + parseInt(v.substring(h + 1)); + if (d > 0 && h > 0) + return parseInt(v) * 60 * 24 + parseInt(v.substring(d + 1)) * 60; + if (d > 0) + return parseInt(v) * 60 * 24; + return 1000000000; +} + + + +function findAncestorByClass (el, cls) { + while ((el = el.parentElement) && !el.classList.contains(cls)); + return el; +} + +function deleteInputGroup(node) { + group = findAncestorByClass(node, "input-group") + values = findAncestorByClass(group, "input-values") + if (!values) { + return false + } + count = values.querySelectorAll('.input-group').length + if (count == 1) { + // If it's the only input, just clear it. + input = group.querySelector('input') + input.value = "" + } else { + group.remove() + } + return false +} + +function addInputGroup(node) { + values = findAncestorByClass(node, "input-values") + groups = values.querySelectorAll(".input-group") + if (groups.length == 0) { + // Something strange has happened. + return false + } + lastGroup = groups[groups.length - 1] + newGroup = lastGroup.cloneNode(true) + newGroup.querySelector('input').value = "" + values.insertBefore(newGroup, lastGroup.nextSibling) + return false +} diff --git a/pkg/html/pages/gen.sh b/pkg/html/pages/gen.sh deleted file mode 100755 index a326138b2..000000000 --- a/pkg/html/pages/gen.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2020 syzkaller project authors. All rights reserved. -# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. - -set -eu - -echo '// Code generated by pkg/html/html.go. DO NOT EDIT.' > generated.go -echo 'package pages' >> generated.go -echo 'const style = `' >> generated.go -cat ../../../dashboard/app/static/style.css >> generated.go -echo '`' >> generated.go -echo 'const js = `' >> generated.go -cat ../../../dashboard/app/static/common.js >> generated.go -echo '`' >> generated.go diff --git a/pkg/html/pages/pages.go b/pkg/html/pages/pages.go index 0040c8617..51bc902c7 100644 --- a/pkg/html/pages/pages.go +++ b/pkg/html/pages/pages.go @@ -1,11 +1,10 @@ // Copyright 2022 syzkaller project authors. All rights reserved. // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. -//go:generate ./gen.sh - package pages import ( + _ "embed" // for go:embed directives "fmt" "html/template" "io/fs" @@ -28,3 +27,9 @@ func getHeadTemplate() string { const headTempl = `<style type="text/css" media="screen">%v</style><script>%v</script>` return fmt.Sprintf(headTempl, style, js) } + +//go:embed style.css +var style string + +//go:embed common.js +var js string diff --git a/pkg/html/pages/generated.go b/pkg/html/pages/style.css index 56f5e2d5f..7a2ca851a 100644 --- a/pkg/html/pages/generated.go +++ b/pkg/html/pages/style.css @@ -1,7 +1,3 @@ -// Code generated by pkg/html/html.go. DO NOT EDIT. -package pages - -const style = ` #topbar { padding: 5px 10px; background: #E0EBF5; @@ -302,107 +298,3 @@ aside { .input-group button { width: 20pt; } -` -const js = ` -// Copyright 2018 syzkaller project authors. All rights reserved. -// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. - -function sortTable(item, colName, conv, desc = false) { - table = item.parentNode.parentNode.parentNode.parentNode; - rows = table.rows; - col = findColumnByName(rows[0].getElementsByTagName("th"), colName); - values = []; - for (i = 1; i < rows.length; i++) - values.push([conv(rows[i].getElementsByTagName("td")[col].textContent), rows[i]]); - if (desc) - desc = !isSorted(values.slice().reverse()) - else - desc = isSorted(values); - values.sort(function(a, b) { - if (a[0] == b[0]) return 0; - if (desc && a[0] > b[0] || !desc && a[0] < b[0]) return -1; - return 1; - }); - for (i = 0; i < values.length; i++) - table.tBodies[0].appendChild(values[i][1]); - return false; -} - -function findColumnByName(headers, colName) { - for (i = 0; i < headers.length; i++) { - if (headers[i].textContent == colName) - return i; - } - return 0; -} - -function isSorted(values) { - for (i = 0; i < values.length - 1; i++) { - if (values[i][0] > values[i + 1][0]) - return false; - } - return true; -} - -function textSort(v) { return v == "" ? "zzz" : v.toLowerCase(); } -function numSort(v) { return -parseInt(v); } -function floatSort(v) { return -parseFloat(v); } -function reproSort(v) { return v == "C" ? 0 : v == "syz" ? 1 : 2; } -function patchedSort(v) { return v == "" ? -1 : parseInt(v); } -function lineSort(v) { return -v.split(/\r\n|\r|\n/g).length } - -function timeSort(v) { - if (v == "now") - return 0; - m = v.indexOf('m'); - h = v.indexOf('h'); - d = v.indexOf('d'); - if (m > 0 && h < 0) - return parseInt(v); - if (h > 0 && m > 0) - return parseInt(v) * 60 + parseInt(v.substring(h + 1)); - if (d > 0 && h > 0) - return parseInt(v) * 60 * 24 + parseInt(v.substring(d + 1)) * 60; - if (d > 0) - return parseInt(v) * 60 * 24; - return 1000000000; -} - - - -function findAncestorByClass (el, cls) { - while ((el = el.parentElement) && !el.classList.contains(cls)); - return el; -} - -function deleteInputGroup(node) { - group = findAncestorByClass(node, "input-group") - values = findAncestorByClass(group, "input-values") - if (!values) { - return false - } - count = values.querySelectorAll('.input-group').length - if (count == 1) { - // If it's the only input, just clear it. - input = group.querySelector('input') - input.value = "" - } else { - group.remove() - } - return false -} - -function addInputGroup(node) { - values = findAncestorByClass(node, "input-values") - groups = values.querySelectorAll(".input-group") - if (groups.length == 0) { - // Something strange has happened. - return false - } - lastGroup = groups[groups.length - 1] - newGroup = lastGroup.cloneNode(true) - newGroup.querySelector('input').value = "" - values.insertBefore(newGroup, lastGroup.nextSibling) - return false -} -` |