From af8c6df94d26e7d85a9c614c7e24fa0efab23306 Mon Sep 17 00:00:00 2001
From: Julius Volz <julius@soundcloud.com>
Date: Thu, 30 Oct 2014 16:18:05 +0100
Subject: [PATCH] Eliminate modal alerts in graphing UI.

This shows errors in a pane under the expression input instead.

Change-Id: Iec209e1628a3b102cce9f34b2467621772dfb8ff
---
 web/static/css/graph.css               |  4 ++++
 web/static/js/graph.js                 | 28 +++++++++++++++++++-------
 web/static/js/graph_template.handlebar |  1 +
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/web/static/css/graph.css b/web/static/css/graph.css
index 41b942812..6c83e06cb 100644
--- a/web/static/css/graph.css
+++ b/web/static/css/graph.css
@@ -201,3 +201,7 @@ input[name="end_input"], input[name="range_input"] {
   margin-left: -4px;
   margin-right: -4px;
 }
+
+.error {
+  margin: 2px;
+}
diff --git a/web/static/js/graph.js b/web/static/js/graph.js
index 8ff72dc83..f789b3162 100644
--- a/web/static/js/graph.js
+++ b/web/static/js/graph.js
@@ -99,6 +99,7 @@ Prometheus.Graph.prototype.initialize = function() {
     return e.preventDefault();
   })
 
+  self.error = graphWrapper.find(".error");
   self.graph = graphWrapper.find(".graph");
   self.yAxis = graphWrapper.find(".y_axis");
   self.legend = graphWrapper.find(".legend");
@@ -159,7 +160,7 @@ Prometheus.Graph.prototype.populateInsertableMetrics = function() {
         self.expr.autocomplete({source: availableMetrics});
       },
       error: function() {
-        alert("Error loading available metrics!");
+        self.showError("Error loading available metrics!");
       },
   });
 };
@@ -275,6 +276,7 @@ Prometheus.Graph.prototype.decreaseEnd = function() {
 
 Prometheus.Graph.prototype.submitQuery = function() {
   var self = this;
+  self.clearError();
   if (!self.expr.val()) {
     return;
   }
@@ -312,7 +314,7 @@ Prometheus.Graph.prototype.submitQuery = function() {
       success: success,
       error: function(xhr, resp) {
         if (resp != "abort") {
-          alert("Error executing query: " + resp);
+          self.showError("Error executing query: " + resp);
         }
       },
       complete: function() {
@@ -323,6 +325,18 @@ Prometheus.Graph.prototype.submitQuery = function() {
   });
 };
 
+Prometheus.Graph.prototype.showError = function(msg) {
+  var self = this;
+  self.error.text(msg);
+  self.error.show();
+}
+
+Prometheus.Graph.prototype.clearError = function(msg) {
+  var self = this;
+  self.error.text('');
+  self.error.hide();
+}
+
 Prometheus.Graph.prototype.updateRefresh = function() {
   var self = this;
 
@@ -373,7 +387,7 @@ Prometheus.Graph.prototype.transformData = function(json) {
   self = this;
   var palette = new Rickshaw.Color.Palette();
   if (json.Type != "matrix") {
-    alert("Result is not of matrix type! Please enter a correct expression.");
+    self.showError("Result is not of matrix type! Please enter a correct expression.");
     return [];
   }
   var data = json.Value.map(function(ts) {
@@ -494,12 +508,12 @@ Prometheus.Graph.prototype.resizeGraph = function() {
 Prometheus.Graph.prototype.handleGraphResponse = function(json, textStatus) {
   var self = this
   if (json.Type == "error") {
-    alert(json.Value);
+    self.showError(json.Value);
     return;
   }
   self.data = self.transformData(json);
   if (self.data.length == 0) {
-    alert("No datapoints found.");
+    self.showError("No datapoints found.");
     return;
   }
   self.graphTab.removeClass("reload");
@@ -536,10 +550,10 @@ Prometheus.Graph.prototype.handleConsoleResponse = function(data, textStatus) {
     tBody.append("<tr><td>scalar</td><td>" + data.Value + "</td></tr>");
     break;
   case "error":
-    alert(data.Value);
+    self.showError(data.Value);
     break;
   default:
-    alert("Unsupported value type!");
+    self.showError("Unsupported value type!");
     break;
   }
 }
diff --git a/web/static/js/graph_template.handlebar b/web/static/js/graph_template.handlebar
index 85d4f9e1b..e264c1543 100644
--- a/web/static/js/graph_template.handlebar
+++ b/web/static/js/graph_template.handlebar
@@ -14,6 +14,7 @@
               </div>
               <div class="eval_stats"></div>
               <img src="/static/img/ajax-loader.gif" class="spinner" alt="ajax_spinner">
+              <div class="error alert alert-error hide"></div>
             </div>
             <!--
               TODO: Convert this to Bootstrap navbar.  This requires Javascript