Skip to content

Business intelligence made simple

Fixed error with canceling queries - fixes #398

Andrew Kane0fbc3d14c984
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dec7a5c9..1f843cb9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.6.3 (unreleased)
+
+- Fixed error with canceling queries
+
## 2.6.2 (2022-05-06)
- Fixed error with Postgres when prepared statements are disabled with Rails < 6.1
diff --git a/app/assets/javascripts/blazer/queries.js b/app/assets/javascripts/blazer/queries.js
index 21c1a11a..34dfe32b 100644
--- a/app/assets/javascripts/blazer/queries.js
+++ b/app/assets/javascripts/blazer/queries.js
@@ -3,6 +3,9 @@ var runningQueries = []
var maxQueries = 3
function runQuery(data, success, error) {
+ if (!data.data_source) {
+ throw new Error("Data source is required to cancel queries")
+ }
data.run_id = uuid()
var query = {
data: data,
diff --git a/app/views/blazer/dashboards/show.html.erb b/app/views/blazer/dashboards/show.html.erb
index 4afbfc60..30b716b9 100644
--- a/app/views/blazer/dashboards/show.html.erb
+++ b/app/views/blazer/dashboards/show.html.erb
@@ -39,7 +39,9 @@
</div>
</div>
<script>
- <%= blazer_js_var "data", {statement: query.statement, query_id: query.id, variables: variable_params(query), only_chart: true, cohort_period: params[:cohort_period]} %>
+ <% data = {statement: query.statement, query_id: query.id, data_source: query.data_source, variables: variable_params(query), only_chart: true} %>
+ <% data.merge!(cohort_period: params[:cohort_period]) if params[:cohort_period] %>
+ <%= blazer_js_var "data", data %>
runQuery(data, function (data) {
$("#chart-<%= i %>").html(data)
diff --git a/app/views/blazer/queries/show.html.erb b/app/views/blazer/queries/show.html.erb
index 4f7447ae..54d8399a 100644
--- a/app/views/blazer/queries/show.html.erb
+++ b/app/views/blazer/queries/show.html.erb
@@ -1,7 +1,7 @@
<% blazer_title @query.name %>
<% if @success %>
- <% run_data = {statement: @query.statement, query_id: @query.id, variables: variable_params(@query)} %>
+ <% run_data = {statement: @query.statement, query_id: @query.id, data_source: @query.data_source, variables: variable_params(@query)} %>
<% run_data.merge!(forecast: "t") if params[:forecast] %>
<% run_data.merge!(cohort_period: params[:cohort_period]) if params[:cohort_period] %>
<% run_data.transform_keys!(&:to_s) if Rails::VERSION::STRING.to_f == 5.0 %>