- Revision
- 141839
- Author
- [email protected]
- Date
- 2013-02-04 17:46:43 -0800 (Mon, 04 Feb 2013)
Log Message
Dashboard cleanup: Make builder a real dashboardSpecificParameter.
https://bugs.webkit.org/show_bug.cgi?id=108706
Reviewed by Dirk Pranke.
Add builder to g_defaultDashboardSpecificParameter maps for the
dashboards where it is used (flakiness, timeline, treemap).
Default it to null, and then update reads of it to check the
builder group's default if one is not set, rather than trying to
set and track this everywhere.
This allows us to remove tons of special-casing of builder parsing,
including where we used to add it to the query string even when the
user did not specify it.
* TestResultServer/static-dashboards/dashboard_base.js:
(parseParameters):
* TestResultServer/static-dashboards/flakiness_dashboard.js:
(generatePage):
(handleQueryParameterChange):
* TestResultServer/static-dashboards/loader.js:
(.):
* TestResultServer/static-dashboards/timeline_explorer.html:
* TestResultServer/static-dashboards/treemap.html:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (141838 => 141839)
--- trunk/Tools/ChangeLog 2013-02-05 01:30:14 UTC (rev 141838)
+++ trunk/Tools/ChangeLog 2013-02-05 01:46:43 UTC (rev 141839)
@@ -1,5 +1,31 @@
2013-02-04 Julie Parent <[email protected]>
+ Dashboard cleanup: Make builder a real dashboardSpecificParameter.
+ https://bugs.webkit.org/show_bug.cgi?id=108706
+
+ Reviewed by Dirk Pranke.
+
+ Add builder to g_defaultDashboardSpecificParameter maps for the
+ dashboards where it is used (flakiness, timeline, treemap).
+ Default it to null, and then update reads of it to check the
+ builder group's default if one is not set, rather than trying to
+ set and track this everywhere.
+ This allows us to remove tons of special-casing of builder parsing,
+ including where we used to add it to the query string even when the
+ user did not specify it.
+
+ * TestResultServer/static-dashboards/dashboard_base.js:
+ (parseParameters):
+ * TestResultServer/static-dashboards/flakiness_dashboard.js:
+ (generatePage):
+ (handleQueryParameterChange):
+ * TestResultServer/static-dashboards/loader.js:
+ (.):
+ * TestResultServer/static-dashboards/timeline_explorer.html:
+ * TestResultServer/static-dashboards/treemap.html:
+
+2013-02-04 Julie Parent <[email protected]>
+
Setting tests on flakiness dashboard should invalidate builder.
https://bugs.webkit.org/show_bug.cgi?id=108521
Modified: trunk/Tools/TestResultServer/static-dashboards/dashboard_base.js (141838 => 141839)
--- trunk/Tools/TestResultServer/static-dashboards/dashboard_base.js 2013-02-05 01:30:14 UTC (rev 141838)
+++ trunk/Tools/TestResultServer/static-dashboards/dashboard_base.js 2013-02-05 01:46:43 UTC (rev 141839)
@@ -336,15 +336,10 @@
}
parseDashboardSpecificParameters();
- parseParameter(queryHashAsMap(), 'builder');
-
var dashboardSpecificDiffState = diffStates(oldDashboardSpecificState, g_currentState);
fillMissingValues(g_currentState, g_defaultDashboardSpecificStateValues);
- if (!g_crossDashboardState.useTestData)
- fillMissingValues(g_currentState, {'builder': currentBuilderGroup().defaultBuilder()});
-
// FIXME: dashboard_base shouldn't know anything about specific dashboard specific keys.
if (dashboardSpecificDiffState.builder)
delete g_currentState.tests;
Modified: trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js (141838 => 141839)
--- trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js 2013-02-05 01:30:14 UTC (rev 141838)
+++ trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js 2013-02-05 01:46:43 UTC (rev 141839)
@@ -142,7 +142,6 @@
if (g_crossDashboardState.useTestData)
return;
- updateDefaultBuilderState();
document.body.innerHTML = '<div id="loading-ui">LOADING...</div>';
showErrors();
@@ -153,7 +152,7 @@
else if (g_currentState.expectationsUpdate)
generatePageForExpectationsUpdate();
else
- generatePageForBuilder(g_currentState.builder);
+ generatePageForBuilder(g_currentState.builder || currentBuilderGroup().defaultBuilder());
for (var builder in currentBuilders())
processTestResultsForBuilderAsync(builder);
@@ -188,6 +187,7 @@
function() {
return value in currentBuilders();
});
+
return true;
case 'sortColumn':
@@ -260,6 +260,7 @@
revision: null,
tests: '',
result: '',
+ builder: null
};
DB_SPECIFIC_INVALIDATING_PARAMETERS = {
@@ -2490,14 +2491,6 @@
return !(key in VALID_KEYS_FOR_CROSS_BUILDER_VIEW) && !(key in g_defaultCrossDashboardStateValues);
}
-function updateDefaultBuilderState()
-{
- if (isCrossBuilderView())
- delete g_defaultDashboardSpecificStateValues.builder;
- else
- g_defaultDashboardSpecificStateValues.builder = currentBuilderGroup().defaultBuilder();
-}
-
// Sets the page state to regenerate the page.
// @param {Object} params New or modified query parameters as key: value.
function handleQueryParameterChange(params)
@@ -2516,7 +2509,6 @@
}
}
- updateDefaultBuilderState();
return true;
}
Modified: trunk/Tools/TestResultServer/static-dashboards/loader.js (141838 => 141839)
--- trunk/Tools/TestResultServer/static-dashboards/loader.js 2013-02-05 01:30:14 UTC (rev 141838)
+++ trunk/Tools/TestResultServer/static-dashboards/loader.js 2013-02-05 01:46:43 UTC (rev 141839)
@@ -180,17 +180,6 @@
// data that isn't there.
delete currentBuilders()[builderName];
- // Change the default builder name if it has been deleted.
- if (g_defaultDashboardSpecificStateValues.builder == builderName) {
- var defaultBuilderName = currentBuilderGroup().defaultBuilder();
- g_defaultDashboardSpecificStateValues.builder = defaultBuilderName;
- if (!defaultBuilderName) {
- var error = 'No tests results found for ' + g_crossDashboardState.testType + '. Reload the page to try fetching it again.';
- console.error(error);
- addError(error);
- }
- }
-
// Proceed as if the resource had loaded.
this._handleResourceLoad();
},
Modified: trunk/Tools/TestResultServer/static-dashboards/timeline_explorer.html (141838 => 141839)
--- trunk/Tools/TestResultServer/static-dashboards/timeline_explorer.html 2013-02-05 01:30:14 UTC (rev 141838)
+++ trunk/Tools/TestResultServer/static-dashboards/timeline_explorer.html 2013-02-05 01:46:43 UTC (rev 141839)
@@ -113,7 +113,7 @@
function generatePage()
{
g_buildIndicesByTimestamp = {};
- var results = g_resultsByBuilder[g_currentState.builder];
+ var results = g_resultsByBuilder[g_currentState.builder || currentBuilderGroup().defaultBuilder()];
for (var i = 0; i < results[FIXABLE_COUNTS_KEY].length; i++) {
var buildDate = new Date(results[TIMESTAMPS_KEY][i] * 1000);
@@ -145,7 +145,7 @@
function initCurrentBuilderTestResults()
{
var startTime = Date.now();
- g_currentBuilderTestResults = decompressResults(g_resultsByBuilder[g_currentState.builder]);
+ g_currentBuilderTestResults = decompressResults(g_resultsByBuilder[g_currentState.builder || currentBuilderGroup().defaultBuilder()]);
console.log( 'Time to get test results by build: ' + (Date.now() - startTime));
}
@@ -168,6 +168,7 @@
}
g_defaultDashboardSpecificStateValues = {
+ builder: null,
buildTimestamp: -1,
ignoreFlakyTests: true
};
@@ -184,7 +185,7 @@
function updateTimelineForBuilder()
{
- var builder = g_currentState.builder;
+ var builder = g_currentState.builder || currentBuilderGroup().defaultBuilder();
var results = g_resultsByBuilder[builder];
var graphData = [];
@@ -438,18 +439,19 @@
if (g_currentBuildIndex == -1)
return;
+ var builder = g_currentState.builder || currentBuilderGroup().defaultBuilder();
switch (e.keyIdentifier) {
case 'Left':
selectBuild(
- g_resultsByBuilder[g_currentState.builder],
- g_currentState.builder,
+ g_resultsByBuilder[builder],
+ builder,
g_dygraph,
g_currentBuildIndex + 1);
break;
case 'Right':
selectBuild(
- g_resultsByBuilder[g_currentState.builder],
- g_currentState.builder,
+ g_resultsByBuilder[builder],
+ builder,
g_dygraph,
g_currentBuildIndex - 1);
break;
Modified: trunk/Tools/TestResultServer/static-dashboards/treemap.html (141838 => 141839)
--- trunk/Tools/TestResultServer/static-dashboards/treemap.html 2013-02-05 01:30:14 UTC (rev 141838)
+++ trunk/Tools/TestResultServer/static-dashboards/treemap.html 2013-02-05 01:46:43 UTC (rev 141839)
@@ -233,7 +233,7 @@
g_isGeneratingPage = true;
- var rawTree = g_resultsByBuilder[g_currentState.builder];
+ var rawTree = g_resultsByBuilder[g_currentState.builder || currentBuilderGroup().defaultBuilder()];
g_webTree = convertToWebTreemapFormat('LayoutTests', rawTree);
appendTreemap($('map'), g_webTree);
@@ -292,6 +292,7 @@
}
g_defaultDashboardSpecificStateValues = {
+ builder: null,
treemapfocus: '',
};
