Business intelligence made simple
Show latest queries for a user
Andrew99f5531165f5
diff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rbindex de0359bf..44c70b95 100644--- a/app/controllers/blazer/queries_controller.rb+++ b/app/controllers/blazer/queries_controller.rb@@ -1,13 +1,13 @@module Blazerclass QueriesController < BaseController- before_action :set_queries, only: [:home, :index]before_action :set_query, only: [:show, :edit, :update, :destroy, :refresh]def home- @queries = @queries.limit(1000)+ set_queries(1000)enddef index+ set_queriesrender partial: "index", layout: falseend@@ -168,9 +168,20 @@ module Blazerprivate- def set_queries+ def set_queries(limit = nil)+ @my_queries =+ if blazer_user+ recent_query_ids = Blazer::Audit.where(user_id: blazer_user.id).where("query_id IS NOT NULL").order("created_at desc").limit(100).pluck(:query_id).uniq.first(20)+ queries = Blazer::Query.where(id: recent_query_ids).index_by(&:id)+ recent_query_ids.map { |query_id| queries[query_id] }.compact+ else+ []+ end+@queries = Blazer::Query.order(:name)+ @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)diff --git a/app/models/blazer/query.rb b/app/models/blazer/query.rbindex e9d6a144..e2aef436 100644--- a/app/models/blazer/query.rb+++ b/app/models/blazer/query.rb@@ -3,6 +3,7 @@ module Blazerbelongs_to :creator, class_name: Blazer.user_class.to_s if Blazer.user_classhas_many :checks, dependent: :destroyhas_many :dashboard_queries, dependent: :destroy+ has_many :auditsvalidates :name, presence: truevalidates :statement, presence: truediff --git a/app/views/blazer/queries/_index.html.erb b/app/views/blazer/queries/_index.html.erbindex d48097c5..50305fc8 100644--- a/app/views/blazer/queries/_index.html.erb+++ b/app/views/blazer/queries/_index.html.erb@@ -1,4 +1,4 @@-<% (@dashboards + @queries).each do |query| %>+<% (@my_queries + @dashboards + @queries).each do |query| %><% is_query = query.is_a?(Blazer::Query) %><tr><td class="query <%= "dashboard" unless is_query %>">