Merge pull request #7 from NREL/admin-analytics-query-builder-ui

Simpler query builder interface for constructing admin analytics queries
NREL · Feb 20, 2015 · 653e1e2 · 653e1e2
2 parents af28d43 + cfd356a
commit 653e1e2
Show file tree

Hide file tree

Showing 42 changed files with 6,213 additions and 156 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -4,6 +4,7 @@ AllCops:
     - vendor/**/*
     - config/compass.rb
     - public/web-assets/**/*
+    - public/test-assets/**/*
   RunRailsCops: true
 
 Lint/LiteralInInterpolation:

diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js
@@ -31,6 +31,7 @@
 //= require livestampjs/livestamp
 //= require numeral
 //= require vendor/jquery.blockUI
+//= require vendor/jQuery-QueryBuilder/query-builder.standalone.js
 //= require spinjs
 //= require vendor/dirtyforms/jquery.dirtyforms
 //= require vendor/jquery.truncate
@@ -78,6 +79,9 @@ $(document).ready(function() {
     event.preventDefault();
   });
 
+  $.blockUI.defaults.fadeIn = 0;
+  $.blockUI.defaults.fadeOut = 0;
+
   $(document).on('click', 'a[rel=popover]', function(event) {
     $(this).qtip({
       overwrite: false,

diff --git a/app/assets/javascripts/admin/controllers/stats/base_controller.js b/app/assets/javascripts/admin/controllers/stats/base_controller.js
@@ -5,7 +5,13 @@ Admin.StatsBaseController = Ember.ObjectController.extend({
 
   actions: {
     submit: function() {
-      this.set('query.params.search', $('#filter_form input[name=search]').val());
+      if($('#filter_type_advanced').css('display') === 'none') {
+        this.set('query.params.search', null);
+        this.set('query.params.query', JSON.stringify($('#query_builder').queryBuilder('getRules')));
+      } else {
+        this.set('query.params.query', null);
+        this.set('query.params.search', $('#filter_form input[name=search]').val());
+      }
     },
   },
 });
diff --git a/app/assets/javascripts/admin/controllers/stats/drilldown_controller.js b/app/assets/javascripts/admin/controllers/stats/drilldown_controller.js
@@ -24,7 +24,7 @@ Admin.StatsDrilldownController = Admin.StatsBaseController.extend({
 
   downloadUrl: function() {
     return '/api-umbrella/v1/analytics/drilldown.csv?' + $.param(this.get('query.params')) + '&api_key=' + webAdminAjaxApiKey;
-  }.property('query.params', 'query.params.search', 'query.params.start_at', 'query.params.end_at', 'query.params.prefix'),
+  }.property('query.params', 'query.params.query', 'query.params.search', 'query.params.start_at', 'query.params.end_at', 'query.params.prefix'),
 });
 
 Admin.StatsDrilldownDefaultController = Admin.StatsDrilldownController.extend({

diff --git a/app/assets/javascripts/admin/controllers/stats/logs_controller.js b/app/assets/javascripts/admin/controllers/stats/logs_controller.js
@@ -1,7 +1,7 @@
 Admin.StatsLogsController = Admin.StatsBaseController.extend({
   downloadUrl: function() {
     return '/admin/stats/logs.csv?' + $.param(this.get('query.params'));
-  }.property('query.params', 'query.params.search', 'query.params.interval', 'query.params.start_at', 'query.params.end_at'),
+  }.property('query.params', 'query.params.query', 'query.params.search', 'query.params.interval', 'query.params.start_at', 'query.params.end_at'),
 });
 
 Admin.StatsLogsDefaultController = Admin.StatsLogsController.extend({

diff --git a/app/assets/javascripts/admin/controllers/stats/map_controller.js b/app/assets/javascripts/admin/controllers/stats/map_controller.js
@@ -20,7 +20,7 @@ Admin.StatsMapController = Admin.StatsBaseController.extend({
 
   downloadUrl: function() {
     return '/admin/stats/map.csv?' + $.param(this.get('query.params'));
-  }.property('query.params', 'query.params.search', 'query.params.start_at', 'query.params.end_at'),
+  }.property('query.params', 'query.params.query', 'query.params.search', 'query.params.start_at', 'query.params.end_at'),
 });
 
 Admin.StatsMapDefaultController = Admin.StatsMapController.extend({

diff --git a/app/assets/javascripts/admin/controllers/stats/users_controller.js b/app/assets/javascripts/admin/controllers/stats/users_controller.js
@@ -1,7 +1,7 @@
 Admin.StatsUsersController = Admin.StatsBaseController.extend({
   downloadUrl: function() {
     return '/admin/stats/users.csv?' + $.param(this.get('query.params'));
-  }.property('query.params', 'query.params.search', 'query.params.start_at', 'query.params.end_at'),
+  }.property('query.params', 'query.params.query', 'query.params.search', 'query.params.start_at', 'query.params.end_at'),
 });
 
 Admin.StatsUsersDefaultController = Admin.StatsUsersController.extend({

diff --git a/app/assets/javascripts/admin/routes/stats/base_route.js b/app/assets/javascripts/admin/routes/stats/base_route.js
@@ -69,7 +69,7 @@ Admin.StatsBaseRoute = Ember.Route.extend({
         this.transitionTo('stats.logs', $.param(newQueryParams));
       }
     }
-  }.observes('query.params.search', 'query.params.interval', 'query.params.start_at', 'query.params.end_at'),
+  }.observes('query.params.query', 'query.params.search', 'query.params.interval', 'query.params.start_at', 'query.params.end_at'),
 
   actions: {
     error: function() {

diff --git a/app/assets/javascripts/admin/routes/stats/drilldown_route.js b/app/assets/javascripts/admin/routes/stats/drilldown_route.js
@@ -23,7 +23,7 @@ Admin.StatsDrilldownRoute = Admin.StatsBaseRoute.extend({
         this.transitionTo('stats.drilldown', $.param(newQueryParams));
       }
     }
-  }.observes('query.params.search', 'query.params.interval', 'query.params.start_at', 'query.params.end_at'),
+  }.observes('query.params.query', 'query.params.search', 'query.params.interval', 'query.params.start_at', 'query.params.end_at'),
 
   validateOptions: function() {
     var valid = true;

diff --git a/app/assets/javascripts/admin/routes/stats/logs_route.js b/app/assets/javascripts/admin/routes/stats/logs_route.js
@@ -22,7 +22,7 @@ Admin.StatsLogsRoute = Admin.StatsBaseRoute.extend({
         this.transitionTo('stats.logs', $.param(newQueryParams));
       }
     }
-  }.observes('query.params.search', 'query.params.interval', 'query.params.start_at', 'query.params.end_at'),
+  }.observes('query.params.query', 'query.params.search', 'query.params.interval', 'query.params.start_at', 'query.params.end_at'),
 
   validateOptions: function() {
     var valid = true;

diff --git a/app/assets/javascripts/admin/routes/stats/map_route.js b/app/assets/javascripts/admin/routes/stats/map_route.js
@@ -18,7 +18,7 @@ Admin.StatsMapRoute = Admin.StatsBaseRoute.extend({
         this.transitionTo('stats.map', $.param(newQueryParams));
       }
     }
-  }.observes('query.params.search', 'query.params.start_at', 'query.params.end_at', 'query.params.region'),
+  }.observes('query.params.query', 'query.params.search', 'query.params.start_at', 'query.params.end_at', 'query.params.region'),
 });
 
 Admin.StatsMapDefaultRoute = Admin.StatsMapRoute.extend({

diff --git a/app/assets/javascripts/admin/routes/stats/users_route.js b/app/assets/javascripts/admin/routes/stats/users_route.js
@@ -12,7 +12,7 @@ Admin.StatsUsersRoute = Admin.StatsBaseRoute.extend({
         this.transitionTo('stats.users', $.param(newQueryParams));
       }
     }
-  }.observes('query.params.search', 'query.params.start_at', 'query.params.end_at'),
+  }.observes('query.params.query', 'query.params.search', 'query.params.start_at', 'query.params.end_at'),
 });
 
 Admin.StatsUsersDefaultRoute = Admin.StatsUsersRoute.extend({