Merge pull request #8 from paulasmuth/adminui_metricListView

Adminui metric list view
asmuth · Nov 10, 2014 · db24286 · db24286
2 parents ef261d4 + 6a31273
commit db24286
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 23 deletions.
diff --git a/fnordmetric-webui/fnordmetric-webui-layout.js b/fnordmetric-webui/fnordmetric-webui-layout.js
@@ -72,7 +72,6 @@ FnordMetric.WebUI = function() {
     FnordMetric.util.displayLoader(viewport);
 
     current_view = view;
-    console.log(query_params);
     view.render(viewport, url, query_params);
   };
 
@@ -81,7 +80,7 @@ FnordMetric.WebUI = function() {
     var query_params = url["query_params"];
 
     view = routes[url["path"]];
-    if (view === undefined) {
+    if (view == undefined) {
       alert("no route found for: " + url["path"]);
       return;
     }

diff --git a/fnordmetric-webui/fnordmetric-webui-metriclist.js b/fnordmetric-webui/fnordmetric-webui-metriclist.js
@@ -38,24 +38,19 @@ FnordMetric.views.MetricList = function() {
 
 
   function onRowClick() {
-    //FIXME
-    var viewport = document.body.querySelector(".viewport");
-    var params = {
-      "name" : "metric",
-      "value" : this.firstChild.id
-    };
-    FnordMetric.util.singleMetricView().render(
-      viewport, params);
+    var raw_url = "metric_list?metric="+ this.firstChild.id;
+    FnordMetric.WebUI.singleton.openUrl(raw_url, true);
   };
 
 
 
   function renderMetricList(viewport, metrics, search_item) {
     viewport.innerHTML = "";
+    console.log(metrics);
 
     if (metrics.length == 0) {
       if (search_item != undefined) {
-        console.log("render no search result");
+        renderEmptySearch(viewport, search_item);
       } else {
         renderEmptyMetricsList(viewport);
       }
@@ -97,6 +92,13 @@ FnordMetric.views.MetricList = function() {
     elem.appendChild(msg_field);
   }
 
+  function renderEmptySearch(elem, search_item) {
+    elem.innerHTML = "";
+    FnordMetric.util.renderMetricHeader(
+      "No Results were found for " + search_item, elem);
+    FnordMetric.util.TableView().renderEmptyTable(elem);
+  }
+
   function loadMetricList(viewport, query_params) {
     FnordMetric.httpGet("/metrics", function(r) {
       if (r.status == 200) {

diff --git a/fnordmetric-webui/fnordmetric-webui-tableview.js b/fnordmetric-webui/fnordmetric-webui-tableview.js
@@ -140,10 +140,34 @@ FnordMetric.util.TableView = function(columns, elem, per_page) {
     on_row_click = on_row_click_new;
   }
 
+  function renderEmptyTable(elem) {
+    var table = document.createElement("table");
+    table.className = "metric_list";
+    var header = document.createElement("tr");
+    header.className = "list_header";
+    for (var i = 0; i < 4; i++) {
+      var cell = document.createElement("th");
+      header.appendChild(cell);
+    }
+    table.appendChild(header);
+
+    for (var i = 0; i < 7; i++) {
+      var row = document.createElement("tr");
+      for (var j = 0; j < 4; j++) {
+        var cell = document.createElement("td");
+        row.appendChild(cell);
+      }
+      table.appendChild(row);
+    }
+
+    elem.appendChild(table);
+  }
+
   return {
     "addRow": addRow,
     "onRowClick": onRowClick,
-    "render": render
+    "render": render,
+    "renderEmptyTable" : renderEmptyTable
   };
 };
 

diff --git a/fnordmetric-webui/fnordmetric-webui-util.js b/fnordmetric-webui/fnordmetric-webui-util.js
@@ -373,17 +373,6 @@ FnordMetric.util.searchMetricList = function(metrics, search_item) {
   return data;
 }
 
-FnordMetric.util.getSingleMetric = function(metrics, key) {
-  var data = [];
-  metrics.map(function(item) {
-    if (item.key == key) {
-      data.push(item);
-      return data;
-    }
-  });
-  return data;
-}
-
 
 FnordMetric.DropdownAutocomplete = function(
   parentNode, dropdown, input_field, keys, search_button) {