<!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>[214205] 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/214205">214205</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-20 19:13:00 -0700 (Mon, 20 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modernize BuildRequestQueuePage
https://bugs.webkit.org/show_bug.cgi?id=169903
Reviewed by Antti Koivisto.
Modernized the code for /v3/#/analysis/queue.
* public/v3/models/build-request.js:
(BuildRequest.fetchTriggerables): Deleted since the manifest JSON now contains all the triggerables.
* public/v3/pages/build-request-queue-page.js:
(BuildRequestQueuePage): Deleted this._triggerables. Added this._buildRequestsByTriggerable.
(BuildRequestQueuePage.prototype.open): Modernized the code.
(BuildRequestQueuePage.prototype.render): Ditto.
(BuildRequestQueuePage.prototype._constructBuildRequestTable): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicv3modelsbuildrequestjs">trunk/Websites/perf.webkit.org/public/v3/models/build-request.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicv3pagesbuildrequestqueuepagejs">trunk/Websites/perf.webkit.org/public/v3/pages/build-request-queue-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 (214204 => 214205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2017-03-21 02:04:59 UTC (rev 214204)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2017-03-21 02:13:00 UTC (rev 214205)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-03-20 Ryosuke Niwa <rniwa@webkit.org>
+
+ Modernize BuildRequestQueuePage
+ https://bugs.webkit.org/show_bug.cgi?id=169903
+
+ Reviewed by Antti Koivisto.
+
+ Modernized the code for /v3/#/analysis/queue.
+
+ * public/v3/models/build-request.js:
+ (BuildRequest.fetchTriggerables): Deleted since the manifest JSON now contains all the triggerables.
+
+ * public/v3/pages/build-request-queue-page.js:
+ (BuildRequestQueuePage): Deleted this._triggerables. Added this._buildRequestsByTriggerable.
+ (BuildRequestQueuePage.prototype.open): Modernized the code.
+ (BuildRequestQueuePage.prototype.render): Ditto.
+ (BuildRequestQueuePage.prototype._constructBuildRequestTable): Ditto.
+
</ins><span class="cx"> 2017-03-19 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Charts page show an inconsistent list of revisions for Git and Subversion
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicv3modelsbuildrequestjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/v3/models/build-request.js (214204 => 214205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/v3/models/build-request.js 2017-03-21 02:04:59 UTC (rev 214204)
+++ trunk/Websites/perf.webkit.org/public/v3/models/build-request.js 2017-03-21 02:13:00 UTC (rev 214205)
</span><span class="lines">@@ -115,13 +115,6 @@
</span><span class="cx"> this._testGroup.didSetResult(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static fetchTriggerables()
- {
- return this.cachedFetch('/api/triggerables/').then(function (response) {
- return response.triggerables.map(function (entry) { return {id: entry.id, name: entry.name}; });
- });
- }
-
</del><span class="cx"> // FIXME: Create a real model object for triggerables.
</span><span class="cx"> static cachedRequestsForTriggerableID(id)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicv3pagesbuildrequestqueuepagejs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/v3/pages/build-request-queue-page.js (214204 => 214205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/v3/pages/build-request-queue-page.js 2017-03-21 02:04:59 UTC (rev 214204)
+++ trunk/Websites/perf.webkit.org/public/v3/pages/build-request-queue-page.js 2017-03-21 02:13:00 UTC (rev 214205)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> constructor()
</span><span class="cx"> {
</span><span class="cx"> super('build-request-queue-page');
</span><del>- this._triggerables = [];
</del><ins>+ this._buildRequestsByTriggerable = new Map;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> routeName() { return 'analysis/queue'; }
</span><span class="lines">@@ -11,24 +11,14 @@
</span><span class="cx">
</span><span class="cx"> open(state)
</span><span class="cx"> {
</span><del>- var self = this;
- BuildRequest.fetchTriggerables().then(function (list) {
- self._triggerables = list.map(function (entry) {
- var triggerable = {name: entry.name, buildRequests: BuildRequest.cachedRequestsForTriggerableID(entry.id)};
-
- BuildRequest.fetchForTriggerable(entry.name).then(function (requests) {
- triggerable.buildRequests = requests;
- self.enqueueToRender();
- });
-
- return triggerable;
</del><ins>+ for (let triggerable of Triggerable.all()) {
+ BuildRequest.fetchForTriggerable(triggerable.name()).then((requests) => {
+ this._buildRequestsByTriggerable.set(triggerable, requests);
+ this.enqueueToRender();
</ins><span class="cx"> });
</span><del>- self.enqueueToRender();
- });
</del><ins>+ }
</ins><span class="cx">
</span><del>- AnalysisTask.fetchAll().then(function () {
- self.enqueueToRender();
- });
</del><ins>+ AnalysisTask.fetchAll().then(() => this.enqueueToRender());
</ins><span class="cx">
</span><span class="cx"> super.open(state);
</span><span class="cx"> }
</span><span class="lines">@@ -37,22 +27,25 @@
</span><span class="cx"> {
</span><span class="cx"> super.render();
</span><span class="cx">
</span><del>- var referenceTime = Date.now();
</del><ins>+ const referenceTime = Date.now();
</ins><span class="cx"> this.renderReplace(this.content().querySelector('.triggerable-list'),
</span><del>- this._triggerables.map(this._constructBuildRequestTable.bind(this, referenceTime)));
</del><ins>+ Triggerable.sortByName(Triggerable.all()).map((triggerable) => {
+ const buildRequests = this._buildRequestsByTriggerable.get(triggerable) || [];
+ return this._constructBuildRequestTable(referenceTime, triggerable, buildRequests);
+ }));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- _constructBuildRequestTable(referenceTime, triggerable)
</del><ins>+ _constructBuildRequestTable(referenceTime, triggerable, buildRequests)
</ins><span class="cx"> {
</span><del>- if (!triggerable.buildRequests.length)
</del><ins>+ if (!buildRequests.length)
</ins><span class="cx"> return [];
</span><span class="cx">
</span><del>- var rowList = [];
- var previousRow = null;
- var requestCount = 0;
- var requestCountForGroup = {};
- for (var request of triggerable.buildRequests) {
- var groupId = request.testGroupId();
</del><ins>+ const rowList = [];
+ const requestCountForGroup = {};
+ let previousRow = null;
+ let requestCount = 0;
+ for (let request of buildRequests) {
+ const groupId = request.testGroupId();
</ins><span class="cx"> if (groupId in requestCountForGroup)
</span><span class="cx"> requestCountForGroup[groupId]++;
</span><span class="cx"> else
</span><span class="lines">@@ -72,11 +65,11 @@
</span><span class="cx"> previousRow = rowList[rowList.length - 1];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var element = ComponentBase.createElement;
- var link = ComponentBase.createLink;
- var router = this.router();
</del><ins>+ const element = ComponentBase.createElement;
+ const link = ComponentBase.createLink;
+ const router = this.router();
</ins><span class="cx"> return element('table', {class: 'build-request-table'}, [
</span><del>- element('caption', `${triggerable.name}: ${requestCount} pending requests`),
</del><ins>+ element('caption', `${triggerable.name()}: ${requestCount} pending requests`),
</ins><span class="cx"> element('thead', [
</span><span class="cx"> element('td', 'Request ID'),
</span><span class="cx"> element('td', 'Platform'),
</span><span class="lines">@@ -87,7 +80,7 @@
</span><span class="cx"> element('td', 'Status'),
</span><span class="cx"> element('td', 'Waiting Time'),
</span><span class="cx"> ]),
</span><del>- element('tbody', rowList.map(function (entry) {
</del><ins>+ element('tbody', rowList.map((entry) => {
</ins><span class="cx"> if (entry.contraction) {
</span><span class="cx"> return element('tr', {class: 'contraction'}, [
</span><span class="cx"> element('td', {colspan: 8}, `${entry.count} additional requests`)
</span><span class="lines">@@ -94,9 +87,9 @@
</span><span class="cx"> ]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var request = entry.request;
- var taskId = request.analysisTaskId();
- var task = AnalysisTask.findById(taskId);
</del><ins>+ const request = entry.request;
+ const taskId = request.analysisTaskId();
+ const task = AnalysisTask.findById(taskId);
</ins><span class="cx"> return element('tr', [
</span><span class="cx"> element('td', {class: 'request-id'}, request.id()),
</span><span class="cx"> element('td', {class: 'platform'}, request.platform().name()),
</span></span></pre>
</div>
</div>
</body>
</html>