Merge pull request #831 from apinf/feature/676-reset-all-filter

'Reset all' in 'Filter' not working, closes #676

Author: brylie

client/views/dashboard/charts/charts.js

@@ -176,7 +176,6 @@ Template.chartsLayout.created = function () {
     var overviewChart = dc.barChart("#overview-chart");
     var moveChart = dc.barChart("#move-chart");
 
-
     overviewChart
       .height(80)
       .dimension(timeStampDimension)

client/views/dashboard/charts/filter/filter.html

@@ -7,7 +7,7 @@ <h3 class="box-title">{{_ "filterData_Title"}}</h3>
     <div class="box-body">
       <form id="filteringForm">
         {{_ "filterData_Month"}}
-        <select name="month" >
+        <select id="filter-month" name="month" >
           <option value="00">-</option>
           <option value="01">{{_ "filterData_January"}}</option>
           <option value="02">{{_ "filterData_February"}}</option>
@@ -23,19 +23,19 @@ <h3 class="box-title">{{_ "filterData_Title"}}</h3>
           <option value="12">{{_ "filterData_December"}}</option>
         </select>
         {{_ "filterData_Year"}}
-        <select name="year">
+        <select id="filter-year" name="year">
           <option value="0000">-</option>
           <option value="2014">2014</option>
           <option value="2015">2015</option>
           <option value="2016">2016</option>
         </select>
         {{_ "filterData_Limit"}}
-        <input name="limit" type="text" value="10000" />
+        <input id="filter-limit" name="limit" type="text" value="10000" />
 
         <span class="dc-data-count dc-chart" id="row-selection" style="margin:0">
           <span class="filter-count">_</span> {{_ "filterData_SelectedOf"}} <span class="total-count">_</span> {{_ "filterData_Records"}}
           <span>
-            <a href='javascript:dc.filterAll();dc.redrawAll();'>{{_ "filterData_Reset"}}</a>
+            <a id="filter-reset" href="#">{{_ "filterData_Reset"}}</a>
           </span>
         </span>
         <span id="loadingState">

client/views/dashboard/charts/filter/filter.js

@@ -36,5 +36,39 @@ Template.chartsLayout.events({
 
     instance.getDashboardData(input)
 
+  },
+  "click #filter-reset": function(event, template){
+    // appending loading state
+    $('#loadingState').html("Loading...");
+
+    // gets current month and year -> providing them for initial query
+    var currentYearAndMonth = moment().format("YYYY-MM");
+
+    // sets default items amount to be returned
+    var initialLimit = 10000;
+
+    // Initialize filter values
+    $('#filter-month').val(undefined);
+    $('#filter-year').val(undefined);
+    $('#filter-limit').val( initialLimit.toString() );
+
+    // sets query for elastic search
+    var input = {
+      index : "api-umbrella-logs-v1-"+currentYearAndMonth,
+      type  : "log",
+      limit : initialLimit,
+      fields: [
+        'request_at',
+        'request_ip_country',
+        'request_ip',
+        'response_time',
+        'request_path',
+        'request_ip_location.lon',
+        'request_ip_location.lat'
+      ]
+    };
+
+    // get data
+    template.getDashboardData(input);
   }
 });