Business intelligence made simple
More performant homepage
Andrew Kanef5be5e2d7117
diff --git a/app/assets/stylesheets/blazer/application.css b/app/assets/stylesheets/blazer/application.cssindex 680c50aa..7bc1a3fb 100644--- a/app/assets/stylesheets/blazer/application.css+++ b/app/assets/stylesheets/blazer/application.css@@ -87,3 +87,16 @@ input.search:focus {.dashboard a {font-weight: bold;}++#search-item {+ display: none;+}++.creator {+ text-align: right;+ color: #999;+}++.vars {+ color: #ccc;+}diff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rbindex f0fd7c89..50f49ef0 100644--- a/app/controllers/blazer/queries_controller.rb+++ b/app/controllers/blazer/queries_controller.rb@@ -4,11 +4,20 @@ module Blazerdef homeset_queries(1000)+ @dashboards =+ Blazer::Dashboard.order(:name).map do |d|+ {+ name: "<strong>#{view_context.link_to(d.name, d)}</strong>",+ creator: nil,+ hide: d.name.gsub(/\s+/, ""),+ vars: nil+ }+ endenddef indexset_queries- render partial: "index", layout: false+ render json: @queriesenddef new@@ -180,7 +189,7 @@ module Blazerdef set_queries(limit = nil)@my_queries =- if blazer_user+ if limit && blazer_userfavorite_query_ids = Blazer::Audit.where(user_id: blazer_user.id).where("created_at > ?", 30.days.ago).where("query_id IS NOT NULL").group(:query_id).order("count_all desc").count.keysqueries = Blazer::Query.named.where(id: favorite_query_ids)queries = queries.includes(:creator) if Blazer.user_class@@ -194,9 +203,17 @@ module Blazer@queries = @queries.where("id NOT IN (?)", @my_queries.map(&:id)) if @my_queries.any?@queries = @queries.includes(:creator) if Blazer.user_class@queries = @queries.limit(limit) if limit- @trending_queries = Blazer::Audit.group(:query_id).where("created_at > ?", 2.days.ago).having("COUNT(DISTINCT user_id) >= 3").uniq.count(:user_id)- @checks = Blazer::Check.group(:query_id).count- @dashboards = Blazer::Dashboard.order(:name)++ @queries =+ @queries.map do |q|+ {+ id: q.id,+ name: view_context.link_to(q.name, q),+ creator: q.respond_to?(:creator) && q.creator == blazer_user ? "You" : q.try(:creator).try(Blazer.user_name),+ hide: q.name.gsub(/\s+/, ""),+ vars: extract_vars(q.statement).join(", ")+ }+ endenddef set_querydiff --git a/app/views/blazer/queries/_index.html.erb b/app/views/blazer/queries/_index.html.erbdeleted file mode 100644index 531ad597..00000000--- a/app/views/blazer/queries/_index.html.erb+++ /dev/null@@ -1,32 +0,0 @@-<% (@dashboards + @my_queries + @queries).each do |query| %>- <% is_query = query.is_a?(Blazer::Query) %>- <tr>- <td class="query <%= "dashboard" unless is_query %>">- <%= link_to query.name, query %>- <% if is_query %>- <span style="color: #ccc;"><%= extract_vars(query.statement).join(", ") %></span>- <% if @queries.size < 1000 && query.created_at > 2.days.ago %>- <small style="font-weight: bold; color: #5cb85c;">NEW</small>- <% end %>- <% if @trending_queries[query.id] %>- <small style="font-weight: bold; color: #f60;">TRENDING</small>- <% end %>- <% if @checks[query.id] %>- <small style="font-weight: bold; color: #f60;">CHECK</small>- <% end %>- <div class="hide"><%= query.name.gsub(/\s+/, "") %></div>- <% end %>- </td>- <td class="creator text-right text-muted">- <% if query.respond_to?(:creator) && (creator = query.creator) && creator.respond_to?(Blazer.user_name) %>- <% name = creator.send(Blazer.user_name) %>- <% if creator == blazer_user %>- You- <div class="hide">me <%= name %></div>- <% else %>- <%= name %>- <% end %>- <% end %>- </td>- </tr>-<% end %>diff --git a/app/views/blazer/queries/home.html.erb b/app/views/blazer/queries/home.html.erbindex c0c88747..b302f3d6 100644--- a/app/views/blazer/queries/home.html.erb+++ b/app/views/blazer/queries/home.html.erb@@ -25,30 +25,55 @@</tr></thead><tbody class="list">- <%= render partial: "index" %>+ <tr id="search-item">+ <td>+ <span class="name"></span>+ <span class="vars"></span>+ <span class="hide"></span>+ </td>+ <td class="creator"></td>+ </tr></tbody></table></div><script>var options = {- valueNames: ['query', 'creator'],- page: 200+ valueNames: ["name", "vars", "hide", "creator"],+ item: "search-item",+ page: 200,+ indexAsync: true};+ var dashboardValues = <%= blazer_json_escape(@dashboards.to_json).html_safe %>;+ var queryValues = <%= blazer_json_escape(@queries.to_json).html_safe %>;+ var queryList = new List("queries", options, dashboardValues);+ queryList.add(queryValues);- function updateList() {- var userList = new List('queries', options);- userList.search($(".search").val());+ var queryIds = {};+ for (var i = 0; i < queryValues.length; i++) {+ queryIds[queryValues[i].id] = true;}- updateList();</script>-<% if @queries.size == 1000 %>+<% if @queries.size >= 200 %><p id="loading" class="text-muted">Loading...</p><script>- $(".list").load("<%= queries_path %>", function () {- updateList();+ $.getJSON("<%= queries_path %>", function (data) {+ var i, j, newValues, val, size = 500;$("#loading").remove();+ for (i = 0; i < data.length / size; i++) {+ newValues = [];+ for (j = 0; j < size; j++) {+ val = data[i * size + j];+ if (!val) {+ break;+ }+ if (!queryIds[val.id]) {+ newValues.push(val);+ }+ }+ queryList.add(newValues);+ }});</script><% end %>