Fix JS errors on dashboard metrics page

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

Patch by Dean Johnson <[email protected]> on 2015-09-28
Reviewed by Alexey Proskuryakov.

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js: Updated to use Settings.
(initPlatformsByFamily):
(updateHiddenPlatforms):
(parsePlatformFamily): Deleted.
(updateToggleButtons): Deleted.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/MetricsMain.js:
(updateHiddenPlatforms): Added to remove errors.
(initPlatformsByFamily): Added to remove errors.
(unhiddenQueues): Updated to use Settings.
(documentReady): Added logic to add toggle buttons to the settings menu.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Settings.js:
(Settings.prototype.parsePlatformFamily): Moved duplicate logic from Main.js and
MetricsMain.js to Settings.
(Settings.prototype.updateToggleButtons): Moved duplicate logic from Main.js and
MetricsMain.js to Settings.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/QueueView.js:
(QueueView.prototype._updateHiddenState): Updated to use Settings.

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

Author: [email protected]

Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js

@@ -104,13 +104,6 @@ var testNames = {};
 testNames[Buildbot.TestCategory.WebKit2] = "WK2 Tests";
 testNames[Buildbot.TestCategory.WebKit1] = "WK1 Tests";
 
-function parsePlatformFamily(platformName)
-{
-    if (platformName)
-        return platformName.substr(0, platformName.indexOf("-"));
-    return ''
-}
-
 function initPlatformsByFamily()
 {
     var platforms = Dashboard.sortedPlatforms;
@@ -119,31 +112,14 @@ function initPlatformsByFamily()
         if (!categorizedQueuesByPlatformAndBuildType[platforms[i].name])
             continue;
 
-        var platformFamily = parsePlatformFamily(platforms[i].name);
+        var platformFamily = settings.parsePlatformFamily(platforms[i].name);
         if (platformsByFamily[platformFamily])
             platformsByFamily[platformFamily].push(platforms[i].name)
         else
             platformsByFamily[platformFamily] = [platforms[i].name]
     }
 }
 
-function updateToggleButtons()
-{
-    var hiddenPlatformFamilies = settings.getObject("hiddenPlatformFamilies") || [];
-    var hiddenFamilyButtons = {"all": hiddenPlatformFamilies.length > 0};
-    for (var i = 0; i < hiddenPlatformFamilies.length; ++i)
-        hiddenFamilyButtons[hiddenPlatformFamilies[i]] = true;
-
-    var platformFamilyButtons = document.getElementsByClassName("platformFamilyToggleButton");
-    for (var i = 0; i < platformFamilyButtons.length; ++i) {
-        var hiddenPlatformFamily = parsePlatformFamily(platformFamilyButtons[i].id);
-        if (!hiddenFamilyButtons[hiddenPlatformFamily])
-            platformFamilyButtons[i].classList.add("familyShown");
-        else
-            platformFamilyButtons[i].classList.remove("familyShown");
-    }
-}
-
 function updateHiddenPlatforms()
 {
     var hiddenPlatformFamilies = settings.getObject("hiddenPlatformFamilies") || [];
@@ -160,7 +136,7 @@ function updateHiddenPlatforms()
                 platformRow.classList.add("hidden");
         }
     }
-    updateToggleButtons();
+    settings.updateToggleButtons();
 }
 
 function applyAccessibilityColorSetting()

Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/MetricsMain.js

@@ -31,6 +31,7 @@ var allBuilderResultsPseudoQueue = { id: "allBuilderResultsPseudoQueue" };
 var allResultsPseudoQueue = { id: "allResultsPseudoQueue" };
 
 var categorizedQueuesByPlatformAndBuildType = {};
+var platformsByFamily = {};
 
 for (var i = 0; i < buildbots.length; ++i) {
     var buildbot = buildbots[i];
@@ -70,6 +71,43 @@ var testNames = {};
 testNames[Buildbot.TestCategory.WebKit2] = "WK2 Tests";
 testNames[Buildbot.TestCategory.WebKit1] = "WK1 Tests";
 
+
+function updateHiddenPlatforms()
+{
+    var hiddenPlatformFamilies = settings.getObject("hiddenPlatformFamilies") || [];
+    var platformRows = document.querySelectorAll("tr.platform");
+    for (var i = 0; i < platformRows.length; ++i)
+        platformRows[i].classList.remove("hidden");
+
+    for (var i = 0; i < hiddenPlatformFamilies.length; ++i) {
+        var platformFamily = hiddenPlatformFamilies[i];
+        for (var j = 0; j < platformsByFamily[platformFamily].length; ++j) {
+            var name = platformsByFamily[platformFamily][j];
+            var platformRow = document.querySelector("tr.platform." + name);
+            if (platformRow)
+                platformRow.classList.add("hidden");
+        }
+    }
+    settings.updateToggleButtons();
+}
+
+
+function initPlatformsByFamily()
+{
+    var platforms = Dashboard.sortedPlatforms;
+    for (var i in platforms) {
+        // Make sure the platform will be displayed on the page before considering its platform family.
+        if (!categorizedQueuesByPlatformAndBuildType[platforms[i].name])
+            continue;
+
+        var platformFamily = settings.parsePlatformFamily(platforms[i].name);
+        if (platformsByFamily[platformFamily])
+            platformsByFamily[platformFamily].push(platforms[i].name)
+        else
+            platformsByFamily[platformFamily] = [platforms[i].name]
+    }
+}
+
 function unhiddenQueues()
 {
     var hiddenPlatformFamilies = settings.getObject("hiddenPlatformFamilies") || [];
@@ -78,7 +116,7 @@ function unhiddenQueues()
         var buildbot = buildbots[i];
         for (var id in buildbot.queues) {
             var queue = buildbot.queues[id];
-            if (-1 === hiddenPlatformFamilies.indexOf(parsePlatformFamily(queue.platform)))
+            if (-1 === hiddenPlatformFamilies.indexOf(settings.parsePlatformFamily(queue.platform)))
                 result.push(queue);
         }
     }
@@ -305,6 +343,33 @@ function documentReady()
         settingsButton.classList.add("settings");
         document.body.appendChild(settingsButton);
 
+        var settingsWrapper = document.createElement("div");
+        settingsWrapper.classList.add("unhide", "hidden", "settingsWrapper")
+
+        var platformFamilyToggleWrapper = document.createElement("div");
+        platformFamilyToggleWrapper.classList.add("unhide", "hidden", "familyToggleWrapper");
+
+        var unhideAllButton = document.createElement("div");
+        unhideAllButton.addEventListener("click", function () { settings.clearHiddenPlatformFamilies(); });
+        unhideAllButton.classList.add("unhide", "hidden", "platformFamilyToggleButton");
+        unhideAllButton.setAttribute("id", "all-platformFamilyToggleButton");
+        unhideAllButton.textContent = "all";
+        platformFamilyToggleWrapper.appendChild(unhideAllButton);
+
+        initPlatformsByFamily();
+        for (var platformFamily in platformsByFamily) {
+            var platformFamilyToggle = document.createElement("div");
+            platformFamilyToggle.addEventListener("click", function () {
+                settings.toggleHiddenPlatformFamily(this.toString());
+            }.bind(platformFamily));
+            platformFamilyToggle.classList.add("unhide", "hidden", "platformFamilyToggleButton");
+            platformFamilyToggle.setAttribute("id", platformFamily + "-platformFamilyToggleButton");
+            platformFamilyToggle.textContent = platformFamily;
+            platformFamilyToggleWrapper.appendChild(platformFamilyToggle);
+        }
+        settingsWrapper.appendChild(platformFamilyToggleWrapper);
+        document.body.appendChild(settingsWrapper);
+
         updateHiddenPlatforms();
         settings.addSettingListener("hiddenPlatformFamilies", updateHiddenPlatforms);
         settings.addSettingListener("enteredSettings", function() { 

Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/QueueView.js

@@ -69,7 +69,7 @@ QueueView.prototype = {
 
         var hiddenPlatformFamilies = settings.getObject("hiddenPlatformFamilies");
         var wasHidden = !this.updateTimer;
-        var isHidden = hiddenPlatformFamilies && hiddenPlatformFamilies.contains(parsePlatformFamily(this.platform));
+        var isHidden = hiddenPlatformFamilies && hiddenPlatformFamilies.contains(settings.parsePlatformFamily(this.platform));
 
         if (wasHidden && !isHidden) {
             this._updateQueues();

Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Settings.js

@@ -84,6 +84,13 @@ Settings.prototype = {
         document.body.classList.toggle("settings-visible");
     },
 
+    parsePlatformFamily: function(platformName)
+    {
+        if (!platformName)
+            return '';
+        return platformName.substr(0, platformName.indexOf("-"));
+    },
+
     toggleHiddenPlatformFamily: function(platformFamily)
     {
         var hiddenPlatformFamilies = this.getObject("hiddenPlatformFamilies") || [];
@@ -102,4 +109,21 @@ Settings.prototype = {
         this.setObject("hiddenPlatformFamilies", []);
         this.fireSettingListener("hiddenPlatformFamilies");
     },
+
+    updateToggleButtons: function()
+    {
+        var hiddenPlatformFamilies = this.getObject("hiddenPlatformFamilies") || [];
+        var hiddenFamilyButtons = {"all": hiddenPlatformFamilies.length > 0};
+        for (var i = 0; i < hiddenPlatformFamilies.length; ++i)
+            hiddenFamilyButtons[hiddenPlatformFamilies[i]] = true;
+
+        var platformFamilyButtons = document.getElementsByClassName("platformFamilyToggleButton");
+        for (var i = 0; i < platformFamilyButtons.length; ++i) {
+            var hiddenPlatformFamily = this.parsePlatformFamily(platformFamilyButtons[i].id);
+            if (!hiddenFamilyButtons[hiddenPlatformFamily])
+                platformFamilyButtons[i].classList.add("familyShown");
+            else
+                platformFamilyButtons[i].classList.remove("familyShown");
+        }
+    },
 };

Tools/ChangeLog

@@ -1,3 +1,28 @@
+2015-09-28  Dean Johnson  <[email protected]>
+
+        Fix JS errors on dashboard metrics page
+        https://bugs.webkit.org/show_bug.cgi?id=149608
+
+        Reviewed by Alexey Proskuryakov.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js: Updated to use Settings.
+        (initPlatformsByFamily): 
+        (updateHiddenPlatforms):
+        (parsePlatformFamily): Deleted.
+        (updateToggleButtons): Deleted.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/MetricsMain.js:
+        (updateHiddenPlatforms): Added to remove errors.
+        (initPlatformsByFamily): Added to remove errors.
+        (unhiddenQueues): Updated to use Settings.
+        (documentReady): Added logic to add toggle buttons to the settings menu.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Settings.js:
+        (Settings.prototype.parsePlatformFamily): Moved duplicate logic from Main.js and
+        MetricsMain.js to Settings.
+        (Settings.prototype.updateToggleButtons): Moved duplicate logic from Main.js and
+        MetricsMain.js to Settings.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/QueueView.js:
+        (QueueView.prototype._updateHiddenState): Updated to use Settings.
+
 2015-09-28  Aakash Jain  <[email protected]>
 
         Appscale query fails because of missing index