blazer 2.6.2 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94b56694d07907e5b7a1809d710f9a7d2d91cbbdcaff8745944a443bab592a51
-  data.tar.gz: 3932e924381b13489287911accc9cfe64b492853965b7da8599cc69410b519ff
+  metadata.gz: 91a6508a46423aa3acbe9151fcc3a7519b27daacaff1ec46a2c5e5cb7afed8f1
+  data.tar.gz: 92f9465aed0bca2ba03b320e6b550271c1fff5c7a06a56905bf51a964e012046
 SHA512:
-  metadata.gz: 0d845eb1ca60826cbf6ec2af049e5bcfdf6a9dc273f2c3d0a4899be16d51fcdddf6b6b00df96b3665bf18558b4669383301ab820718d3a8830b830d34564cdfa
-  data.tar.gz: 8fe5f0873319879f6aad49c8e46aeac989dce40d5932bdcd55e3667b132214774da8d06acc323d16b5a47ef40f95b3f67c7899e5e3e008303b18b89b15502f3c
+  metadata.gz: 5e4b04de87e7b0f32d3cb6f88c02634f4b400bcb9281f4fc9b39db80579abea02feab25f4e7ede93793af5a05a46160d70f8789b37e4d7914ef61427d0e2edeb
+  data.tar.gz: 49a48fdee3660a4178f3df8619f7bee4677da27431af2500d4e312db698090989868778ae8b544cf20f636aa71e63771148ab3a858229a2c1d3ce622258119f5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.6.3 (2022-05-11)
+
+- Fixed error with canceling queries
+
 ## 2.6.2 (2022-05-06)
 
 - Fixed error with Postgres when prepared statements are disabled with Rails < 6.1

data/README.md

@@ -150,8 +150,8 @@ Create a user with read-only permissions:
 
 ```sql
 BEGIN;
-CREATE ROLE blazer LOGIN PASSWORD 'secret123';
-GRANT CONNECT ON DATABASE database_name TO blazer;
+CREATE ROLE blazer LOGIN PASSWORD 'secret';
+GRANT CONNECT ON DATABASE dbname TO blazer;
 GRANT USAGE ON SCHEMA public TO blazer;
 GRANT SELECT ON ALL TABLES IN SCHEMA public TO blazer;
 ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT ON TABLES TO blazer;
@@ -163,7 +163,8 @@ COMMIT;
 Create a user with read-only permissions:
 
 ```sql
-GRANT SELECT, SHOW VIEW ON database_name.* TO blazer@’127.0.0.1′ IDENTIFIED BY ‘secret123‘;
+CREATE USER 'blazer'@'127.0.0.1' IDENTIFIED BY 'secret';
+GRANT SELECT, SHOW VIEW ON dbname.* TO 'blazer'@'127.0.0.1';
 FLUSH PRIVILEGES;
 ```
 
@@ -171,8 +172,8 @@ FLUSH PRIVILEGES;
 
 Create a user with read-only permissions:
 
-```
-db.createUser({user: "blazer", pwd: "password", roles: ["read"]})
+```javascript
+db.createUser({user: "blazer", pwd: "secret", roles: ["read"]})
 ```
 
 Also, make sure authorization is enabled when you start the server.

data/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,
@@ -50,7 +53,11 @@ function runQueryHelper(query) {
       queryComplete(query)
     }
   }).fail( function(jqXHR, textStatus, errorThrown) {
-    if (!query.canceled) {
+    // check jqXHR.status instead of query.canceled
+    // so it works for page navigation with Firefox and Safari
+    if (jqXHR.status === 0) {
+      cancelServerQuery(query)
+    } else {
       var message = (typeof errorThrown === "string") ? errorThrown : errorThrown.message
       if (!message) {
         message = "An error occurred"
@@ -83,6 +90,8 @@ function cancelAllQueries() {
   }
 }
 
+// needed for Chrome
+// queries are canceled before unload with Firefox and Safari
 $(window).on("unload", cancelAllQueries)
 
 function cancelQuery(query) {
@@ -90,7 +99,9 @@ function cancelQuery(query) {
   if (query.xhr) {
     query.xhr.abort()
   }
+}
 
+function cancelServerQuery(query) {
   // tell server
   var path = Routes.cancel_queries_path()
   var data = {run_id: query.run_id, data_source: query.data_source}

data/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)

data/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 %>

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "2.6.2"
+  VERSION = "2.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-06 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties