Merge revision columns in flakiness dashboard

https://bugs.webkit.org/show_bug.cgi?id=123360

Reviewed by Simon Fraser.

Merge revision numbers into one cell separated by /, and clearly label them as "latest revisions".
Also add colors for missing & audio failures so that they won't be an empty cell.

* public/index.html:
(TestResultsView._createTestResultHeader): Create a single th for the list of repository names.
(TestResultsView._createTestResultRow): Use single td for all revision numbers.
* public/js/build.js:
(.this.formattedRevision): Don't prefix revision numbers with '@' when we're not in the tooltip.
* public/main.css:
(.resultsTable .AUDIO a): Added.
(.resultsTable .MISSING a): Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@158055 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Websites/test-results/ChangeLog b/Websites/test-results/ChangeLog
index 7f260a4..0a60bb4 100644 (file)
--- a/Websites/test-results/ChangeLog
+++ b/Websites/test-results/ChangeLog
@@ -1,5 +1,24 @@
 2013-10-25  Ryosuke Niwa  <rniwa@webkit.org>
 
+        Merge revision columns in flakiness dashboard
+        https://bugs.webkit.org/show_bug.cgi?id=123360
+
+        Reviewed by Simon Fraser.
+
+        Merge revision numbers into one cell separated by /, and clearly label them as "latest revisions".
+        Also add colors for missing & audio failures so that they won't be an empty cell.
+
+        * public/index.html:
+        (TestResultsView._createTestResultHeader): Create a single th for the list of repository names.
+        (TestResultsView._createTestResultRow): Use single td for all revision numbers.
+        * public/js/build.js:
+        (.this.formattedRevision): Don't prefix revision numbers with '@' when we're not in the tooltip.
+        * public/main.css:
+        (.resultsTable .AUDIO a): Added.
+        (.resultsTable .MISSING a): Added.
+
+2013-10-25  Ryosuke Niwa  <rniwa@webkit.org>
+
         One more build fix. Put each latest revision information in an actual td.
 
         * public/index.html:

diff --git a/Websites/test-results/public/index.html b/Websites/test-results/public/index.html
index c169afa..a639ad6 100644 (file)
--- a/Websites/test-results/public/index.html
+++ b/Websites/test-results/public/index.html
@@ -207,13 +207,19 @@ TestResultsView._linkifiedTestName = function (test) {
 }
 
 TestResultsView._createTestResultHeader = function (labelForFirstColumn, repositories) {
+    var latestResultsLabel = '';
+    if (repositories) {
+        latestResultsLabel = ['Latest results', element('br'),
+            repositories.map(function (repository) { return repository.name; }).join(' / ')];
+    }
+        
     return element('thead', [element('tr', [
         element('th', [labelForFirstColumn]),
         element('th', ['Bug']),
         element('th', ['Expectations']),
-        element('th', ['Slowest'])]
-        .concat(repositories ? repositories.map(function (repository) { return element('th', [repository.name]); }) : [])
-        .concat([element('th')]))]);
+        element('th', ['Slowest']),
+        element('th', latestResultsLabel),
+        element('th')])]);
 }
 
 TestResultsView._createBuildsAndComputeSlownessOfResults = function (builderId, results) {
@@ -274,15 +280,17 @@ TestResultsView._createTestResultRow = function (title, results, builder, buildT
     else
         slowestTime = '';
 
-    var formattedRevisionCells = [];
+    var latestRevisions = [];
     if (repositories) {
         var build = sortedResults[0].build;
         for (var i = 0; i < repositories.length; i++) {
             var revisionInfo = build.formattedRevision(repositories[i].id);
+            if (latestRevisions.length)
+                latestRevisions.push(' / ');
             if (revisionInfo.url)
-                formattedRevisionCells.push(element('td', [element('a', {'href': revisionInfo.url}, [revisionInfo.label])]));
+                latestRevisions.push(element('a', {'href': revisionInfo.url}, [revisionInfo.label]));
             else
-                formattedRevisionCells.push(element('td', [revisionInfo.label]));
+                latestRevisions.push(revisionInfo.label);
         }
     }
 
@@ -291,7 +299,7 @@ TestResultsView._createTestResultRow = function (title, results, builder, buildT
         element('td', {'class': 'modifiers'}, formattedModifiers),
         element('td', {'class': 'expected'}, [sortedResults[0].expected]),
         element('td', {'class': 'slowestTime'}, [slowestTime])]
-        .concat(formattedRevisionCells)
+        .concat(element('td', latestRevisions))
         .concat([element('td', cells)]));
 }
 

diff --git a/Websites/test-results/public/js/build.js b/Websites/test-results/public/js/build.js
index fa46a51..c932994 100644 (file)
--- a/Websites/test-results/public/js/build.js
+++ b/Websites/test-results/public/js/build.js
@@ -45,11 +45,14 @@ function TestBuild(repositories, builders, rawRun) {
 
         var labelForThisRepository = shouldIncludeNameInLabel ? repositoryName : '';
         if (previousRevision) {
-            if (labelForThisRepository)
+            if (labelForThisRepository && shouldIncludeNameInLabel)
                 labelForThisRepository += ' ';
             labelForThisRepository += revisionPrefix + previousRevision + '-' + revisionPrefix + currentRevision;
-        } else
-            labelForThisRepository += ' @' + revisionPrefix + currentRevision;
+        } else {
+            if (shouldIncludeNameInLabel)
+                labelForThisRepository += ' @';
+            labelForThisRepository += revisionPrefix + currentRevision;
+        }
 
         var url;
         if (repository) {

diff --git a/Websites/test-results/public/main.css b/Websites/test-results/public/main.css
index 42a4165..ce822cf 100644 (file)
--- a/Websites/test-results/public/main.css
+++ b/Websites/test-results/public/main.css
@@ -155,6 +155,14 @@
     background-color: #fc3;
 }
 
+.resultsTable .AUDIO a {
+    background-color: #3cf;
+}
+
+.resultsTable .MISSING a {
+    background-color: #666;
+}
+
 .resultsTable .TEXT.PASS a {
     background-color: #cf3;
 }