Bug 1078700 - Add a tree state for when treestatus is unreachable r=camd

mozilla · Jul 16, 2015 · 99d19e8 · 99d19e8
1 parent b6b0e1a
commit 99d19e8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/ui/js/directives/treeherder/top_nav_bar.js b/ui/js/directives/treeherder/top_nav_bar.js
@@ -48,6 +48,11 @@ treeherder.directive('thWatchedRepo', [
             icon: "fa-spinner",
             color: "treeUnavailable",
             btnClass: "btn-view-nav"
+        },
+        "error": {
+            icon: "fa-question",
+            color: "treeUnavailable",
+            btnClass: "btn-view-nav"
         }
     };
 

diff --git a/ui/js/models/repository.js b/ui/js/models/repository.js
@@ -230,6 +230,19 @@ treeherder.factory('ThRepositoryModel', [
         };
     };
 
+    /**
+     * if there's an error fetching data from treestatus, make that obvious
+     * in the treestatus field in treeherder
+     */
+    var getErrorTreeStatus = function(repoName) {
+        return {
+            status: "error",
+            message_of_the_day: 'Error reaching <a href="https://treestatus.mozilla.org">treestatus.mozilla.org</a>',
+            reason: 'Error reaching <a href="https://treestatus.mozilla.org">treestatus.mozilla.org</a>',
+            tree: repoName
+        };
+    };
+
     /**
      * Update the status for ``repoName``.  If it's not passed in,
      * then update all ``watchedRepos`` status.
@@ -259,7 +272,11 @@ treeherder.factory('ThRepositoryModel', [
                     newStatuses[repo] = data.data;
                     updateStatusesIfDone();
                 }, function(data) {
-                    newStatuses[repo] = getUnsupportedTreeStatus(repo);
+                    if (data.data != null) {
+                        newStatuses[repo] = getUnsupportedTreeStatus(repo);
+                    } else {
+                        newStatuses[repo] = getErrorTreeStatus(repo);
+                    }
                     updateStatusesIfDone();
                 });