Business intelligence made simple
Improved variable handling [skip ci]
Andrew Kanef5688eba9ba3
diff --git a/app/controllers/blazer/base_controller.rb b/app/controllers/blazer/base_controller.rbindex 49faa611..0f71a262 100644--- a/app/controllers/blazer/base_controller.rb+++ b/app/controllers/blazer/base_controller.rb@@ -32,16 +32,17 @@ module Blazerprivate- def process_vars(statement, data_source)+ def process_vars(statement, data_source, var_params = nil)+ var_params ||= request.query_parameters(@bind_vars ||= []).concat(Blazer.extract_vars(statement)).uniq!@bind_vars.each do |var|params[var] ||= Blazer.data_sources[data_source].variable_defaults[var]end- @success = @bind_vars.all? { |v| params[v] }+ @success = @bind_vars.all? { |v| var_params[v] }if @success@bind_vars.each do |var|- value = params[var].presence+ value = var_params[var].presenceif valueif ["start_time", "end_time"].include?(var)value = value.to_s.gsub(" ", "+") # fix for Quip bug@@ -94,22 +95,14 @@ module Blazer[smart_var, error]end- # don't pass to url helpers- #- # some are dangerous when passed as symbols- # root_url({host: "evilsite.com"})- #- # certain ones (like host) only affect *_url and not *_path- #- # when permitted parameters are passed in Rails 6,- # they appear to be added as GET parameters- # root_url(params.permit(:host))+ # TODO allow all keys+ # or show error message for disallowed keysUNPERMITTED_KEYS = [:controller, :action, :id, :host, :query, :dashboard, :query_id, :query_ids, :table_names, :authenticity_token, :utf8, :_method, :commit, :statement, :data_source, :name, :fork_query_id, :blazer, :run_id, :script_name, :original_script_name]- # remove unpermitted keys from both params and permitted keys for better sleep- def variable_params(resource)+ def variable_params(resource, var_params = nil)permitted_keys = resource.variables - UNPERMITTED_KEYS.map(&:to_s)- params.except(*UNPERMITTED_KEYS).slice(*permitted_keys).permit!+ var_params ||= request.query_parameters+ var_params.slice(*permitted_keys)endhelper_method :variable_paramsdiff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rbindex 12438695..eddeda72 100644--- a/app/controllers/blazer/queries_controller.rb+++ b/app/controllers/blazer/queries_controller.rb@@ -86,7 +86,9 @@ module Blazer# before process_vars@cohort_analysis = Query.new(statement: @statement).cohort_analysis?data_source = params[:data_source]- process_vars(@statement, data_source)+ # fallback for now for users with open tabs+ @var_params = request.request_parameters["variables"] || request.request_parameters+ process_vars(@statement, data_source, @var_params)@only_chart = params[:only_chart]@run_id = blazer_params[:run_id]@query = Query.find_by(id: params[:query_id]) if params[:query_id]diff --git a/app/views/blazer/_variables.html.erb b/app/views/blazer/_variables.html.erbindex d594bcc6..a2bc8df1 100644--- a/app/views/blazer/_variables.html.erb+++ b/app/views/blazer/_variables.html.erb@@ -1,4 +1,5 @@<% if @bind_vars.any? %>+ <% var_params = request.query_parameters %><script><%= blazer_js_var "timeZone", Blazer.time_zone.tzinfo.name %>var now = moment.tz(timeZone)@@ -19,14 +20,14 @@<% @bind_vars.each_with_index do |var, i| %><%= label_tag var, var %><% if (data = @smart_vars[var]) %>- <%= select_tag var, options_for_select([[nil, nil]] + data, selected: params[var]), style: "margin-right: 20px; width: 200px; display: none;" %>+ <%= select_tag var, options_for_select([[nil, nil]] + data, selected: var_params[var]), style: "margin-right: 20px; width: 200px; display: none;" %><script>$("#<%= var %>").selectize({create: true});</script><% elsif var.end_with?("_at") || var == "start_time" || var == "end_time" %>- <%= hidden_field_tag var, params[var] %>+ <%= hidden_field_tag var, var_params[var] %><div class="selectize-control single" style="width: 200px;"><div id="<%= var %>-select" class="selectize-input" style="display: inline-block;">@@ -58,13 +59,13 @@})()</script><% else %>- <%= text_field_tag var, params[var], style: "width: 120px; margin-right: 20px;", autofocus: i == 0 && !var.end_with?("_at") && !params[var], class: "form-control" %>+ <%= text_field_tag var, var_params[var], style: "width: 120px; margin-right: 20px;", autofocus: i == 0 && !var.end_with?("_at") && !var_params[var], class: "form-control" %><% end %><% end %><% if date_vars %><% date_vars.each do |var| %>- <%= hidden_field_tag var, params[var] %>+ <%= hidden_field_tag var, var_params[var] %><% end %><%= label_tag nil, date_vars.join(" & ") %>diff --git a/app/views/blazer/queries/_caching.html.erb b/app/views/blazer/queries/_caching.html.erbindex 2da0404f..769c7674 100644--- a/app/views/blazer/queries/_caching.html.erb+++ b/app/views/blazer/queries/_caching.html.erb@@ -10,7 +10,7 @@<% end %><% if @query && params[:query_id] %>- <%= link_to "Refresh", refresh_query_path(@query, params: variable_params(@query)), method: :post %>+ <%= link_to "Refresh", refresh_query_path(@query, params: variable_params(@query, @var_params)), method: :post %><% end %></p><% end %>diff --git a/app/views/blazer/queries/_form.html.erb b/app/views/blazer/queries/_form.html.erbindex f1d34d0d..27f4468b 100644--- a/app/views/blazer/queries/_form.html.erb+++ b/app/views/blazer/queries/_form.html.erb@@ -67,7 +67,7 @@</div><script>- <%= blazer_js_var "params", variable_params(@query) %>+ <%= blazer_js_var "variableParams", variable_params(@query) %><%= blazer_js_var "previewStatement", Hash[Blazer.data_sources.map { |k, v| [k, (v.preview_statement rescue "")] }] %>var app = new Vue({@@ -95,7 +95,7 @@this.error = falsecancelAllQueries()- var data = $.extend({}, params, {statement: this.getSQL(), data_source: $("#query_data_source").val()})+ var data = {statement: this.getSQL(), data_source: $("#query_data_source").val(), variables: variableParams}var _this = thisdiff --git a/app/views/blazer/queries/show.html.erb b/app/views/blazer/queries/show.html.erbindex d40890ce..0a80a0d4 100644--- a/app/views/blazer/queries/show.html.erb+++ b/app/views/blazer/queries/show.html.erb@@ -56,7 +56,7 @@$("#results").addClass("query-error").html(message)}- <% data = variable_params(@query).merge(statement: @statement, query_id: @query.id, data_source: @query.data_source) %>+ <% data = {statement: @statement, query_id: @query.id, data_source: @query.data_source, variables: variable_params(@query)} %><% data.merge!(forecast: "t") if params[:forecast] %><%= blazer_js_var "data", data %>