sql-jarvis 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30cf0c1f28ec1a0f122daf4820944802110df9ef3a0e9607fa53545c93a65632
-  data.tar.gz: 10ff361c67de10806cdbf11da1116a34e5b750f87c594b512c434009fed5bb2c
+  metadata.gz: 20b85797472c4d0d85b917de1050c4d3172a4a351c321c56713c40827a658917
+  data.tar.gz: 50a0b34b93960e3ec2119a57e56bcc378d5a76db8df86b67db49ec2c7caebff7
 SHA512:
-  metadata.gz: 7584b7414f496a0e4bbdbe56c1e9dd8a2fabb3aeea970bf9064c0653a2b8bfb3d388d696f226754a964e4f68edbac4e273f343dfd209d8eb279a514d4cdd972f
-  data.tar.gz: a2978e31ada52cb61ca0446df17a1ce6fb166e20f1367656fea36301b82a853b31b9ec62396d5b1f48594ef40db7edd57ce661cf09fe66162a13854f3e52dc12
+  metadata.gz: e999146f1fe9950dd1b6950edd1a9ab23271da7e9d04d4430aab88b9bf6330eed013dcb11ff93270c0825f0e87580f803ea50fe4cbe358194c48183b1685da8c
+  data.tar.gz: '077648a8ef6f0e8260a01dc8a0bdeb23c473d7e6006414acf4d253d36184da8e40d76182a4a97725eafa359ab289bf9241b7baf2b13bc76dd4a2302fb72dd8c7'

data/app/assets/stylesheets/blazer/application.css

@@ -18,6 +18,14 @@ body {
   padding-bottom: 15px;
 }
 
+#results-table th {
+  max-width: 200px;
+}
+
+#results-table td {
+  word-break: break-word;
+}
+
 .results-table th {
   cursor: pointer;
 }

data/app/assets/stylesheets/blazer/main.css

@@ -46,3 +46,7 @@
   border-width: 10px;
   margin-left: -10px;
 }
+
+.dashboard .chart {
+  height: auto;
+}

data/app/views/blazer/dashboards/show.html.haml

@@ -17,17 +17,18 @@
   = render partial: "blazer/variables", locals: {action: dashboard_path(@dashboard)}
 - else
   %div{:style => "padding-bottom: 15px;"}
-- @queries.each_with_index do |query, i|
-  .chart-container
-    %h4= link_to query.friendly_name, query_path(query, variable_params), target: "_blank"
-    .chart{:id => "chart-#{i}"}
-      %p.text-muted Loading...
-  :javascript
-    #{blazer_js_var "data", {statement: query.statement, query_id: query.id, data_source: query.data_source, only_chart: true}}
+.dashboard
+  - @queries.each_with_index do |query, i|
+    .chart-container
+      %h4= link_to query.friendly_name, query_path(query, variable_params), target: "_blank"
+      .chart{:id => "chart-#{i}"}
+        %p.text-muted Loading...
+    :javascript
+      #{blazer_js_var "data", {statement: query.statement, query_id: query.id, data_source: query.data_source, only_chart: true}}
 
-    runQuery(data, function (data) {
-      $("#chart-#{i}").html(data)
-      $("#chart-#{i} table").stupidtable()
-    }, function (message) {
-      $("#chart-#{i}").addClass("query-error").html(message)
-    });
+      runQuery(data, function (data) {
+        $("#chart-#{i}").html(data)
+        $("#chart-#{i} table").stupidtable()
+      }, function (message) {
+        $("#chart-#{i}").addClass("query-error").html(message)
+      });

data/app/views/blazer/queries/_chart.html.haml

@@ -2,7 +2,7 @@
 - chart_id = SecureRandom.hex
 - column_types = result.column_types
 - chart_type = result.chart_type
-- chart_options = { id: chart_id, height: '80vh' }
+- chart_options = { id: chart_id, height: '40vh' }
 
 - if ["line", "line2"].include?(chart_type)
   - chart_options.merge!(min: nil)

data/app/views/blazer/queries/_form.html.haml

@@ -1,7 +1,7 @@
 - if @query.errors.any?
   .alert.alert-danger= @query.errors.full_messages.first
 #app{"v-cloak" => ""}
-  = form_for @query, url: (@query.persisted? ? query_path(@query, variable_params) : queries_path(variable_params)), html: {autocomplete: "off"} do |f|
+  = form_for @query, url: (@query.persisted? ? query_path(@query, variable_params) : queries_path(variable_params)), html: {autocomplete: "off", class: 'sql-query'} do |f|
     .row
       #statement-box.col-xs-8
         .form-group
@@ -138,21 +138,23 @@
         })
       },
       showIntegrationEditor: function() {
-        integrationEditor = ace.edit("integration-editor")
-        integrationEditor.setTheme("ace/theme/twilight")
-        integrationEditor.getSession().setMode("ace/mode/ruby")
-        integrationEditor.setOptions({
-          fontSize: 12,
-          minLines: 10,
-          enableSnippets: false,
-          highlightActiveLine: false,
-          enableLiveAutocompletion: true,
-          enableBasicAutocompletion: true
-        })
-        integrationEditor.renderer.setShowGutter(true)
-        integrationEditor.renderer.setPrintMarginColumn(false)
-        integrationEditor.renderer.setPadding(10)
-        integrationEditor.getSession().setUseWrapMode(true)
+        if ($('#integration-editor').length) {
+          integrationEditor = ace.edit("integration-editor")
+          integrationEditor.setTheme("ace/theme/twilight")
+          integrationEditor.getSession().setMode("ace/mode/ruby")
+          integrationEditor.setOptions({
+            fontSize: 12,
+            minLines: 10,
+            enableSnippets: false,
+            highlightActiveLine: false,
+            enableLiveAutocompletion: true,
+            enableBasicAutocompletion: true
+          })
+          integrationEditor.renderer.setShowGutter(true)
+          integrationEditor.renderer.setPrintMarginColumn(false)
+          integrationEditor.renderer.setPadding(10)
+          integrationEditor.getSession().setUseWrapMode(true)
+        }
       },
       showEditor: function() {
         var _this = this
@@ -255,7 +257,8 @@
           lines = 9
         }
 
-        this.editorHeight = ((lines + 1) * 16).toString() + "px"
+        this.editorHeight = ((lines + 1) * 16).toString();
+        $('#editor').height(this.editorHeight);
 
         Vue.nextTick(function () {
           editor.resize()
@@ -309,8 +312,8 @@
         dsSelectize.blur()
       })
 
-      this.showEditor()
-      this.showIntegrationEditor()
+      this.showEditor();
+      // this.showIntegrationEditor();
     }
   })
 
@@ -341,3 +344,11 @@
       return false;
     }
   });
+
+  (function () {
+    $('.sql-query').one('change', function () {
+      window.onbeforeunload = function () {
+        return 'Form protection';
+      };
+    });
+  })();

data/app/views/layouts/blazer/application.html.haml

@@ -15,5 +15,5 @@
       = javascript_include_tag "https://api.mapbox.com/mapbox.js/v3.1.1/mapbox.js", integrity: "sha384-j81LqvtvYigFzGSUgAoFijpvoq4yGoCJSOXI9DFaUEpenR029MBE3E/X5Gr+WdO0", crossorigin: "anonymous"
     = csrf_meta_tags
   %body
-    .container-fluid
+    .container
       = yield

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = '2.1.2'
+  VERSION = '2.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql-jarvis
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-04 00:00:00.000000000 Z
+date: 2019-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties