Build URL on new perf dashboard doesn't resolve $builderName

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

Reviewed by Darin Adler.

Support $builderName in the build URL template.

* public/js/helper-classes.js:
(TestBuild.buildUrl): Replaced $builderName with the builder name.

* public/v2/manifest.js:
(App.Metric.fullName): Fixed the typo. We need &ni, not &in.
(App.BuilderurlFromBuildNumber): Replaced $builderName with the builder name.

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

diff --git a/Websites/perf.webkit.org/ChangeLog b/Websites/perf.webkit.org/ChangeLog
index c57a72986bdb7b8cb4c1cc77bac5d7d518ed5f6d..c5d0d7151ab016d07ff83a2bffccb70227a64f9f 100644 (file)
--- a/Websites/perf.webkit.org/ChangeLog
+++ b/Websites/perf.webkit.org/ChangeLog
@@ -1,3 +1,19 @@
+2015-02-14  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Build URL on new perf dashboard doesn't resolve $builderName
+        https://bugs.webkit.org/show_bug.cgi?id=141583
+
+        Reviewed by Darin Adler.
+
+        Support $builderName in the build URL template.
+
+        * public/js/helper-classes.js:
+        (TestBuild.buildUrl): Replaced $builderName with the builder name.
+
+        * public/v2/manifest.js:
+        (App.Metric.fullName): Fixed the typo. We need &ni, not &in.
+        (App.BuilderurlFromBuildNumber): Replaced $builderName with the builder name.
+
 2015-02-13  Ryosuke Niwa  <rniwa@webkit.org>
 
         Unreviewed build fix after r179591.

diff --git a/Websites/perf.webkit.org/public/js/helper-classes.js b/Websites/perf.webkit.org/public/js/helper-classes.js
index 0138b1aeae9678b46516a37dd74dc6cd5158c887..c7de1e7dfba9a070fff450147c33eee8d7665567 100755 (executable)
--- a/Websites/perf.webkit.org/public/js/helper-classes.js
+++ b/Websites/perf.webkit.org/public/js/helper-classes.js
@@ -77,8 +77,11 @@ function TestBuild(repositories, builders, platform, rawRun) {
     this.builder = function () { return builders[rawRun.builder].name; }
     this.buildNumber = function () { return rawRun.buildNumber; }
     this.buildUrl = function () {
-        var template = builders[rawRun.builder].buildUrl;
-        return template ? template.replace(/\$buildNumber/g, this.buildNumber()) : null;
+        var builder = builders[rawRun.builder];
+        var template = builder.buildUrl;
+        if (!template)
+            return null;
+        return template.replace(/\$buildNumber/g, this.buildNumber()).replace(/\$builderName/g, builder.name);
     }
     this.platform = function () { return platform; }
     this.revision = function(repositoryId) { return revisions[repositoryId][0]; }

diff --git a/Websites/perf.webkit.org/public/v2/manifest.js b/Websites/perf.webkit.org/public/v2/manifest.js
index 87d803eca3fb8dcc9bd71d10b94c71283c1bfca4..822e8cf839b8b631cd698196521ae7d3a23f7c59 100755 (executable)
--- a/Websites/perf.webkit.org/public/v2/manifest.js
+++ b/Websites/perf.webkit.org/public/v2/manifest.js
@@ -34,7 +34,7 @@ App.Metric = App.NameLabelModel.extend({
     }.property('name', 'test'),
     fullName: function ()
     {
-        return this.get('path').join(' \u2208 ') /* ∈ */
+        return this.get('path').join(' \u220b ') /* ∋ */
             + ' : ' + this.get('label');
     }.property('path', 'label'),
 });
@@ -44,7 +44,7 @@ App.Builder = App.NameLabelModel.extend({
     urlFromBuildNumber: function (buildNumber)
     {
         var template = this.get('buildUrl');
-        return template ? template.replace(/\$buildNumber/g, buildNumber) : null;
+        return template ? template.replace(/\$builderName/g, this.get('name')).replace(/\$buildNumber/g, buildNumber) : null;
     }
 });