<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[194647] trunk/Websites/perf.webkit.org</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/194647">194647</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-06 11:09:43 -0800 (Wed, 06 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>v3 UI doesn't preserve the time range when charts page is opened from a dashboard
https://bugs.webkit.org/show_bug.cgi?id=152776
Reviewed by Chris Dumez.
Fixed the bug by moving the construction of charts URL from DashboardPage.prototype.open to
DashboardPage.prototype.render and re-rendering the entire page upon an URL state transition.
* public/v3/pages/charts-page.js:
(ChartsPage.createStateForDashboardItem): Takes the start time for the charts page.
* public/v3/pages/dashboard-page.js:
(DashboardPage.prototype.updateFromSerializedState): Merged _numberOfDaysDidChange and
_updateChartsDomainFromToolbar into this function since they're not used elsewhere. Also re-render
the entire page when transition between different number of days to show.
(DashboardPage.prototype._numberOfDaysDidChange): Deleted.
(DashboardPage.prototype._updateChartsDomainFromToolbar): Deleted.
(DashboardPage.prototype.render): Construct URL for each charts here.
(DashboardPage.prototype._createChartForCell): Don't construct URL here since this function is
called once when the dashboard page is opened, and not when the time range is changed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicv3pageschartspagejs">trunk/Websites/perf.webkit.org/public/v3/pages/charts-page.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicv3pagesdashboardpagejs">trunk/Websites/perf.webkit.org/public/v3/pages/dashboard-page.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebsitesperfwebkitorgChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/ChangeLog (194646 => 194647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2016-01-06 18:49:17 UTC (rev 194646)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2016-01-06 19:09:43 UTC (rev 194647)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-01-06 Ryosuke Niwa <rniwa@webkit.org>
+
+ v3 UI doesn't preserve the time range when charts page is opened from a dashboard
+ https://bugs.webkit.org/show_bug.cgi?id=152776
+
+ Reviewed by Chris Dumez.
+
+ Fixed the bug by moving the construction of charts URL from DashboardPage.prototype.open to
+ DashboardPage.prototype.render and re-rendering the entire page upon an URL state transition.
+
+ * public/v3/pages/charts-page.js:
+ (ChartsPage.createStateForDashboardItem): Takes the start time for the charts page.
+
+ * public/v3/pages/dashboard-page.js:
+ (DashboardPage.prototype.updateFromSerializedState): Merged _numberOfDaysDidChange and
+ _updateChartsDomainFromToolbar into this function since they're not used elsewhere. Also re-render
+ the entire page when transition between different number of days to show.
+ (DashboardPage.prototype._numberOfDaysDidChange): Deleted.
+ (DashboardPage.prototype._updateChartsDomainFromToolbar): Deleted.
+ (DashboardPage.prototype.render): Construct URL for each charts here.
+ (DashboardPage.prototype._createChartForCell): Don't construct URL here since this function is
+ called once when the dashboard page is opened, and not when the time range is changed.
+
</ins><span class="cx"> 2016-01-05 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Build fix for an old version of PHP after r194618.
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicv3pageschartspagejs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/v3/pages/charts-page.js (194646 => 194647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/v3/pages/charts-page.js 2016-01-06 18:49:17 UTC (rev 194646)
+++ trunk/Websites/perf.webkit.org/public/v3/pages/charts-page.js 2016-01-06 19:09:43 UTC (rev 194647)
</span><span class="lines">@@ -13,9 +13,9 @@
</span><span class="cx">
</span><span class="cx"> routeName() { return 'charts'; }
</span><span class="cx">
</span><del>- static createStateForDashboardItem(platformId, metricId)
</del><ins>+ static createStateForDashboardItem(platformId, metricId, startTime)
</ins><span class="cx"> {
</span><del>- var state = {paneList: [[platformId, metricId]]};
</del><ins>+ var state = {paneList: [[platformId, metricId]], since: startTime};
</ins><span class="cx"> return state;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicv3pagesdashboardpagejs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/v3/pages/dashboard-page.js (194646 => 194647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/v3/pages/dashboard-page.js 2016-01-06 18:49:17 UTC (rev 194646)
+++ trunk/Websites/perf.webkit.org/public/v3/pages/dashboard-page.js 2016-01-06 19:09:43 UTC (rev 194647)
</span><span class="lines">@@ -24,28 +24,17 @@
</span><span class="cx">
</span><span class="cx"> updateFromSerializedState(state, isOpen)
</span><span class="cx"> {
</span><del>- if (!isOpen || state.numberOfDays) {
</del><ins>+ if (!isOpen || state.numberOfDays)
</ins><span class="cx"> this.toolbar().setNumberOfDays(state.numberOfDays);
</span><del>- this._numberOfDaysDidChange(isOpen);
- }
- this._updateChartsDomainFromToolbar();
- }
</del><span class="cx">
</span><del>- _numberOfDaysDidChange(isOpen)
- {
- if (isOpen)
- return;
-
- this.toolbar().render();
- this.heading().render(); // Update links for other dashboards.
- }
-
- _updateChartsDomainFromToolbar()
- {
</del><span class="cx"> var startTime = this.toolbar().startTime();
</span><span class="cx"> var endTime = this.toolbar().endTime();
</span><span class="cx"> for (var chart of this._charts)
</span><span class="cx"> chart.setDomain(startTime, endTime);
</span><ins>+
+ this._needsTableConstruction = true;
+ if (!isOpen)
+ this.render();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> open(state)
</span><span class="lines">@@ -90,6 +79,8 @@
</span><span class="cx">
</span><span class="cx"> if (this._needsTableConstruction) {
</span><span class="cx"> var tree = [];
</span><ins>+ var router = this.router();
+ var startTime = this.toolbar().startTime();
</ins><span class="cx"> for (var group of this._tableGroups) {
</span><span class="cx"> tree.push(element('thead', element('tr',
</span><span class="cx"> group[0].map(function (cell, cellIndex) {
</span><span class="lines">@@ -106,7 +97,9 @@
</span><span class="cx"> if (!cell.chart)
</span><span class="cx"> return element('td', cell);
</span><span class="cx">
</span><del>- return element('td', [cell.statusView, link(cell.chart.element(), cell.label, cell.url)]);
</del><ins>+ var url = router.url('charts',
+ ChartsPage.createStateForDashboardItem(cell.platform.id(), cell.metric.id(), startTime));
+ return element('td', [cell.statusView, link(cell.chart.element(), cell.label, url)]);
</ins><span class="cx"> }));
</span><span class="cx"> })));
</span><span class="cx"> }
</span><span class="lines">@@ -146,9 +139,10 @@
</span><span class="cx"> return {
</span><span class="cx"> chart: chart,
</span><span class="cx"> statusView: statusView,
</span><ins>+ platform: result.platform,
</ins><span class="cx"> metric: result.metric,
</span><del>- label: result.metric.fullName() + ' on ' + result.platform.label(),
- url: this.router().url('charts', ChartsPage.createStateForDashboardItem(platformId, metricId))};
</del><ins>+ label: result.metric.fullName() + ' on ' + result.platform.label()
+ };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _fetchedData()
</span></span></pre>
</div>
</div>
</body>
</html>