bnb_blazer 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f0007c4702b90310bd9f40da25359bc7ab6743176964c8e146bf1b4b3b2c94e
-  data.tar.gz: 5f07fb6dc71acd498b8ce5e1a48b56d7f20a8c1f5b874c0825ced795662b104f
+  metadata.gz: 31b415fdbebedc01c64caa7a2177e945f3ad948b533e7d62cbfc4f84cc98dbfe
+  data.tar.gz: 597d28e7e5f0ca0f1805e26129bf0e732fd2f34838cad0e7a769ecd2a4339ba8
 SHA512:
-  metadata.gz: 559eebae7f25017e2e09954bbaa5d2a485be2e8c65a6af2da3d85c0f441a30035a0b2dca72a737d48e94ba719c7d0026a3449e06c020d99134c9ac28a7b44997
-  data.tar.gz: 36a1f645277257368b26b330632b73cfc2faae1f70985e1574cfb15e6a784c934da0faa6ae7c2aea35faf1d9953e74b784ec7c0e8b82f90cc63b29da77cc8f7c
+  metadata.gz: e779ff92e9441c6cd3c2131ff31545b8eb18ac5c38c1672587437deba35f40b981ebaedbaf0a415ae5c6acc619a7eddf47dfbe5b494860314dcdab245ff951d5
+  data.tar.gz: 5d8757c34480475e2696703059805857dea12eb0f01e108af6dc1dda7e8c87fbb02e15e7d93ffe0b6d5a668c179923627c5781ebdb59d659669bf02849e9da28

data/README.md

@@ -41,8 +41,8 @@ This gem comes bundled with a test app to help you test out new display designs
 2. Make sure you have [Dip](https://github.com/brandnewbox/bnb-dip-defaults) installed and configured
 3. Run `dip setup`
 4. In your new `bnb_blazer` directory, run `docker-compose up`
-5. Uncomment the `mount Blazer::Engine, at: "/blazer"` line in your `config/routes.rb` file.
-5. Navigate to http://localhost:3000/blazer in your browser, and away you go!
+5. Uncomment the `mount Blazer::Engine, at: "/bnb-blazer"` line in your `config/routes.rb` file.
+5. Navigate to http://localhost:3000/bnb-blazer in your browser, and away you go!
 
 For the work of actually overriding the gem, Rails will load any view that we have defined in the `app/views` (not `spec/dummy/app/views`) folder before looking for them in the blazer gem. So any view that we want to override or restyle you just have to create at the same location as it would be found in the blazer gem. E.g. the homepage view for blazer is found at `app/views/blazer/queries/home.html.erb`, so if we want to override what the homepage looks like in our gem then we create a new view at `app/views/blazer/queries/home.html.erb` and copy the existing HTML from the gem and make modifications as necessary.
 

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

@@ -29,7 +29,9 @@
     </div>
   </div>
   <script>
-    <%= blazer_js_var "data", {statement: @statements[i], query_id: query.id, data_source: query.data_source, 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

@@ -11,6 +11,13 @@
   <% end %>
 <% end %>
 
+<% if @success %>
+  <% 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::MAJOR < 6 %>
+<% end %>
+
 <div style="margin-bottom: 60px;"></div>
 
 <% if @sql_errors.any? %>
@@ -46,9 +53,7 @@
       $("#results").addClass("query-error").html(message)
     }
 
-    <% data = variable_params(@query).merge(statement: @statement, query_id: @query.id, data_source: @query.data_source) %>
-    <% data.merge!(forecast: "t") if params[:forecast] %>
-    <%= blazer_js_var "data", data %>
+    <%= blazer_js_var "data", run_data %>
 
     runQuery(data, showRun, showError)
   </script>

data/app/views/bnb_blazer/queries/run.html.haml

@@ -25,7 +25,7 @@
           · #{check.message}
       - if @query && @result.forecastable? && !params[:forecast]
         ·
-        \#{link_to "Forecast", query_path(@query, {forecast: "t"}.merge(variable_params(@query)))}
+        \#{link_to "Forecast", query_path(@query, params: {forecast: "t"}.merge(variable_params(@query)))}
   - if @forecast_error
     .alert.alert-danger= @forecast_error
   - if @cohort_error
@@ -56,12 +56,14 @@
       - color = "#54a3ee"
       - series_library[1] = {borderDash: [8], borderColor: color, pointBackgroundColor: color, backgroundColor: color, pointHoverBackgroundColor: color}
     - if blazer_maps? && @markers.any?
-      #map{:style => "height: #{@only_chart ? 300 : 500}px;"}
+      - map_id = SecureRandom.hex
+      = content_tag :div, nil, id: map_id, style: "height: #{@only_chart ? 300 : 500}px;"
       :javascript
         #{blazer_js_var "mapboxAccessToken", Blazer.mapbox_access_token}
         #{blazer_js_var "markers", @markers}
+        #{blazer_js_var "mapId", map_id }
         L.mapbox.accessToken = mapboxAccessToken;
-        var map = L.mapbox.map('map')
+        var map = L.mapbox.map(mapId)
           .addLayer(L.mapbox.styleLayer('mapbox://styles/mapbox/streets-v11'));
         var featureLayer = L.mapbox.featureLayer().addTo(map);
         var geojson = [];

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

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title><%= blazer_title ? blazer_title : "Blazer" %></title>
+    <title><%= blazer_title ? blazer_title : "BNBintel" %></title>
 
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1">

data/lib/bnb_blazer/version.rb

@@ -1,3 +1,3 @@
 module BnbBlazer
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bnb_blazer
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Joe
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-17 00:00:00.000000000 Z
+date: 2024-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blazer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.6.5
 - !ruby/object:Gem::Dependency
   name: sassc
   requirement: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/brandnewbox/bnb_blazer
   source_code_uri: https://github.com/brandnewbox/bnb_blazer
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -98,15 +98,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Customized branding of the Blazer gem for BNB projects
 test_files: []