From 679566e9c7b2e7461049a11ee9f68a2ed4768f90 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Sun, 29 Jan 2023 11:16:33 +0000 Subject: [PATCH 1/7] cmd/hiveview: make app work on smaller screen size --- cmd/hiveview/assets/index.html | 4 +++- cmd/hiveview/assets/lib/app-index.js | 25 ++++++++++++++----------- cmd/hiveview/assets/lib/app-suite.js | 4 ++-- cmd/hiveview/assets/lib/app.css | 12 ++++++++---- cmd/hiveview/assets/lib/app.js | 8 ++++---- cmd/hiveview/assets/suite.html | 4 +++- 6 files changed, 34 insertions(+), 23 deletions(-) diff --git a/cmd/hiveview/assets/index.html b/cmd/hiveview/assets/index.html index 5c3ffe879c..cca47b157e 100644 --- a/cmd/hiveview/assets/index.html +++ b/cmd/hiveview/assets/index.html @@ -22,7 +22,9 @@

Recent results

These test suites are available, and can be loaded. Click on 'Load' to load a certain suite.

-
+
+
+
diff --git a/cmd/hiveview/assets/lib/app-index.js b/cmd/hiveview/assets/lib/app-index.js index 21c99da9f3..78a67fd861 100644 --- a/cmd/hiveview/assets/lib/app-index.js +++ b/cmd/hiveview/assets/lib/app-index.js @@ -6,7 +6,7 @@ import * as app from './app.js' $(document).ready(function() { app.init(); - + console.log("Loading file list..."); $.ajax("listing.jsonl", { success: showFileListing, @@ -56,7 +56,9 @@ function showFileListing(data, error) { if (!elem) { return; } - suites.push(JSON.parse(elem)); + let suite = JSON.parse(elem); + suite.start = new Date(suite.start); + suites.push(suite); }); filetable = $("#filetable").DataTable({ @@ -66,26 +68,26 @@ function showFileListing(data, error) { order: [[0, 'desc']], columns: [ { - title: "Start time", + title: "🕒", data: "start", type: "date", - width: "11em", + width: "13%", render: function(v, type) { - if (type === 'display') { - return new Date(v).toLocaleString(); + if (type === 'display' || type == 'filter') { + return v.toLocaleString(); } - return v; + return v.toISOString(); }, }, { title: "Suite", data: "name", - width: "10em", + width: "12%", }, { title: "Clients", data: "clients", - width: "30%", + width: "40%", render: function(data) { return data.join(", ") }, @@ -93,7 +95,8 @@ function showFileListing(data, error) { { title: "Status", data: null, - width: "9em", + width: "7em", + className: "suite-status-column", render: function(data) { if (data.fails > 0) { let prefix = data.timeout ? "Timeout" : "Fail"; @@ -105,7 +108,7 @@ function showFileListing(data, error) { { title: "", data: null, - width: "180px", + width: "8.5em", orderable: false, render: function(data) { let loadText = "Load (" + format.units(data.size) + ")"; diff --git a/cmd/hiveview/assets/lib/app-suite.js b/cmd/hiveview/assets/lib/app-suite.js index 46171dbb51..1abf31d7c3 100644 --- a/cmd/hiveview/assets/lib/app-suite.js +++ b/cmd/hiveview/assets/lib/app-suite.js @@ -261,7 +261,7 @@ function showSuiteData(data, suiteID) { title: "Test", data: "name", className: "test-name-column", - width: "79%", + width: "65%", }, // Status: pass or not. { @@ -275,7 +275,7 @@ function showSuiteData(data, suiteID) { let s = summaryResult.timeout ? "Timeout" : "Fail"; return "✕ " + s + ""; }, - width: "70px", + width: "80px", }, // Test duration. { diff --git a/cmd/hiveview/assets/lib/app.css b/cmd/hiveview/assets/lib/app.css index 735d29265c..26f4c1415f 100644 --- a/cmd/hiveview/assets/lib/app.css +++ b/cmd/hiveview/assets/lib/app.css @@ -3,6 +3,7 @@ main { margin: 8px 12px; + font-size: 12pt; } #hive-header { @@ -25,7 +26,6 @@ main { #hive-static-nav span { margin: 0 6px 0 0; - white-space: nowrap; } #hive-static-nav a { @@ -33,9 +33,9 @@ main { white-space: nowrap; } -#execresults, #filetable { +.dataTable { table-layout: fixed; - min-width: 900px; + min-width: 780px; } .dataTables_wrapper { @@ -57,6 +57,10 @@ td.test-name-column { text-align: right; } +.suite-status-column { + white-space: nowrap; +} + tr.failed td.test-name-column { background-image: url('/images/details_open_err.svg'); } @@ -76,7 +80,7 @@ td.ellipsis { } .test-output { - overflow: scroll; + overflow-x: auto; } .test-output code { diff --git a/cmd/hiveview/assets/lib/app.js b/cmd/hiveview/assets/lib/app.js index b96f4b7416..1ab645c08e 100644 --- a/cmd/hiveview/assets/lib/app.js +++ b/cmd/hiveview/assets/lib/app.js @@ -51,14 +51,14 @@ export function init() { function hiveInfoHTML(data) { var txt = ""; + if (data.buildDate) { + let date = new Date(data.buildDate).toLocaleString(); + txt += 'built: ' + date + ''; + } if (data.sourceCommit) { let url = "https://github.com/ethereum/hive/commit/" + escape(data.sourceCommit); let link = '' + data.sourceCommit.substring(0, 8) + ''; txt += 'commit: ' + link + ''; } - if (data.buildDate) { - let date = new Date(data.buildDate).toLocaleString(); - txt += 'built: ' + date + ''; - } return txt; } diff --git a/cmd/hiveview/assets/suite.html b/cmd/hiveview/assets/suite.html index 9b15d6004d..300cbfaaff 100644 --- a/cmd/hiveview/assets/suite.html +++ b/cmd/hiveview/assets/suite.html @@ -37,7 +37,9 @@

Results:
-
+
+
+
From ad7416af14832ce276727ec46f98b3540ee26b15 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Tue, 31 Jan 2023 17:07:23 +0100 Subject: [PATCH 2/7] cmd/hiveview: shorten simulator log link --- cmd/hiveview/assets/lib/app-suite.js | 10 ++++------ cmd/hiveview/assets/suite.html | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cmd/hiveview/assets/lib/app-suite.js b/cmd/hiveview/assets/lib/app-suite.js index 1abf31d7c3..49e12c9d8d 100644 --- a/cmd/hiveview/assets/lib/app-suite.js +++ b/cmd/hiveview/assets/lib/app-suite.js @@ -242,12 +242,10 @@ function showSuiteData(data, suiteID) { let suiteTimes = testSuiteTimes(cases); $("#testsuite_start").html("🕒 " + suiteTimes.start.toLocaleString()); $("#testsuite_duration").html("⌛️ " + format.duration(suiteTimes.duration)); - if (data.simLog) { - let logfile = app.resultsRoot + data.simLog; - let url = app.route.logFileInViewer(suiteID, suiteName, logfile); - $("#sim-log-link").attr("href", url); - $("#sim-log-link").text("simulator log file"); - } + let logfile = app.resultsRoot + data.simLog; + let url = app.route.logFileInViewer(suiteID, suiteName, logfile); + $("#sim-log-link").attr("href", url); + $("#sim-log-link").text("simulator log"); $("#testsuite_info").show(); // Initialize the DataTable. diff --git a/cmd/hiveview/assets/suite.html b/cmd/hiveview/assets/suite.html index 300cbfaaff..14b7b3efdc 100644 --- a/cmd/hiveview/assets/suite.html +++ b/cmd/hiveview/assets/suite.html @@ -19,12 +19,12 @@
-
+

Results:

-
+