finery 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e078ca59bdbb5792903b2a057557b43165d682a2c7a5e31980fc7b3f8db04a8
-  data.tar.gz: de20ac5f79093919a5241ca654368bfe40cebbee45d52b87626d05227a87a80f
+  metadata.gz: 4a40d95bfaaec38b95bad08470391cd99a51a83fe31644fc72cf513b6ac0b69f
+  data.tar.gz: e0e41fd7197e9f4a14b288f253bb865ce97cc85a4937b5f2e64112468fe1940b
 SHA512:
-  metadata.gz: 9ff36e58770bcfcb9aad2e699c69ee92dc1f2fffa2c87ab880f693eff439d48c915c43f0eeb4dc5fa06dc6baaaed71118a9b8bd60ae5d2d2f37b562be4c1107d
-  data.tar.gz: aacececa615434984234722176cf89b11ded36cc8923d6235f754f7537ce9cb2bd6db09c36157a3173dd7ca1083fedd4744702df40de1a27d95f7fe4303db4c5
+  metadata.gz: 6df58aa1566ca58dbb5f0fcfdae18ba56657a1fdba72a87a4e77e1415cef15852efb2522703939870906523fb099e28849d4788a6a8ef6eb1e9f6f90fe1f1645
+  data.tar.gz: a4e647be9599ba0869f71be477f3829de5d6e26e266f879b9b5f37ddf740af7404a90801b06b68d427c18f5450a610371cbb16a6170c666d220902d35716073c

data/app/assets/javascripts/blazer/application.js

@@ -23,65 +23,6 @@
 //= require ./queries
 //= require ./fuzzysearch
 
-$(document).on('mouseenter', '.dropdown-toggle', function () {
-  $(this).parent().addClass('open')
-})
-
-$(document).on("change", "#bind input, #bind select", function () {
-  submitIfCompleted($(this).closest("form"))
-})
-
-$(document).on("click", "#code", function () {
-  $(this).addClass("expanded")
-})
-
 $(document).on("click", "a[disabled]", function (e) {
   e.preventDefault()
 })
-
-function submitIfCompleted($form) {
-  var completed = true
-  $form.find("input[name], select").each( function () {
-    if ($(this).val() == "") {
-      completed = false
-    }
-  })
-  if (completed) {
-    $form.submit()
-  }
-}
-
-// Prevent backspace from navigating backwards.
-// Adapted from Biff MaGriff: http://stackoverflow.com/a/7895814/1196499
-function preventBackspaceNav() {
-  $(document).keydown(function (e) {
-    var preventKeyPress
-    if (e.keyCode == 8) {
-      var d = e.srcElement || e.target
-      switch (d.tagName.toUpperCase()) {
-        case 'TEXTAREA':
-          preventKeyPress = d.readOnly || d.disabled
-          break
-        case 'INPUT':
-          preventKeyPress = d.readOnly || d.disabled || (d.attributes["type"] && $.inArray(d.attributes["type"].value.toLowerCase(), ["radio", "reset", "checkbox", "submit", "button"]) >= 0)
-          break
-        case 'DIV':
-          preventKeyPress = d.readOnly || d.disabled || !(d.attributes["contentEditable"] && d.attributes["contentEditable"].value == "true")
-          break
-        default:
-          preventKeyPress = true
-          break
-      }
-    }
-    else {
-      preventKeyPress = false
-    }
-
-    if (preventKeyPress) {
-      e.preventDefault()
-    }
-  })
-}
-
-preventBackspaceNav()
-

data/app/assets/javascripts/blazer/controllers/application.js

@@ -0,0 +1,2 @@
+import { Application, Controller } from "https://unpkg.com/@hotwired/stimulus/dist/stimulus.js"
+window.Stimulus = Application.start()

data/app/assets/javascripts/blazer/controllers/autosubmit_controller.js

@@ -0,0 +1,11 @@
+Stimulus.register("autosubmit", class extends Controller {
+  call(event) {
+    for (let e of this.element.elements) {
+      if (e.name && $(e).val() == "") {
+        return
+      }
+    }
+
+    this.element.requestSubmit()
+  }
+})

data/app/assets/javascripts/blazer/controllers/code_controller.js

@@ -0,0 +1,7 @@
+Stimulus.register("code", class extends Controller {
+  connect() {
+    if (code.innerText.length < 10000) {
+      hljs.highlightElement(this.element)
+    }
+  }
+})

data/app/assets/javascripts/blazer/controllers/datepicker_controller.js

@@ -0,0 +1,31 @@
+Stimulus.register("datepicker", class extends Controller {
+  static targets = [ "input", "span" ]
+
+  connect() {
+    const now = moment.tz(timeZone)
+    const format = "YYYY-MM-DD"
+
+    function toDate(time) {
+      return moment.tz(time.format(format), timeZone)
+    }
+
+    const datePicker = $(this.element).daterangepicker({
+      singleDatePicker: true,
+      locale: { format: format },
+      autoUpdateInput: false,
+      autoApply: true,
+      startDate: this.inputTarget.value.length > 0 ? moment.tz(this.inputTarget.value, timeZone) : now
+    })
+
+    // hack to start with empty date
+    datePicker.on("apply.daterangepicker", (ev, picker) => {
+      this.spanTarget.innerHTML = toDate(picker.startDate).format("MMMM D, YYYY")
+      this.inputTarget.value = toDate(picker.startDate).utc().format()
+      this.element.dispatchEvent(new Event("change", { bubbles: true }))
+    })
+
+    if (this.inputTarget.value.length > 0) {
+      this.spanTarget.innerHTML = toDate(datePicker.data("daterangepicker").startDate).format("MMMM D, YYYY")
+    }
+  }
+})

data/app/assets/javascripts/blazer/controllers/daterangepicker_controller.js

@@ -0,0 +1,49 @@
+Stimulus.register("daterangepicker", class extends Controller {
+  connect() {
+    const now = moment.tz(timeZone)
+    const format = "YYYY-MM-DD"
+
+    function toDate(time) {
+      return moment.tz(time.format(format), timeZone)
+    }
+    function dateStr(daysAgo) {
+      return now.clone().subtract(daysAgo || 0, "days").format(format)
+    }
+    function setTimeInputs(start, end) {
+      $("#start_time").val(toDate(start).utc().format())
+      $("#end_time").val(toDate(end).endOf("day").utc().format())
+    }
+
+    const datePicker = $(this.element).daterangepicker({
+      ranges: {
+        "Today": [dateStr(), dateStr()],
+        "Last 7 Days": [dateStr(6), dateStr()],
+        "Last 30 Days": [dateStr(29), dateStr()]
+      },
+      locale: {
+        format: format
+      },
+      startDate: dateStr(29),
+      endDate: dateStr(),
+      opens: "right",
+      alwaysShowCalendars: true
+    },
+    function(start, end) {
+      setTimeInputs(start, end)
+      this.element.dispatchEvent(new Event("change", { bubbles: true }))
+    }.bind(this)).on("apply.daterangepicker", function(ev, picker) {
+      setTimeInputs(picker.startDate, picker.endDate)
+      $("#reportrange span").html(toDate(picker.startDate).format("MMMM D, YYYY") + " - " + toDate(picker.endDate).format("MMMM D, YYYY"))
+    })
+
+    const picker = datePicker.data("daterangepicker")
+    if ($("#start_time").val().length > 0) {
+      picker.setStartDate(moment.tz($("#start_time").val(), timeZone))
+      picker.setEndDate(moment.tz($("#end_time").val(), timeZone))
+      $(this.element).trigger("apply.daterangepicker", picker)
+    } else {
+      $(this.element).trigger("apply.daterangepicker", picker)
+      this.element.dispatchEvent(new Event("change", { bubbles: true }))
+    }
+  }
+})

data/app/assets/javascripts/blazer/controllers/index.js

@@ -0,0 +1,11 @@
+// This file is auto-generated by ./bin/rails stimulus:manifest:update
+// Run that command whenever you add a new controller or create them with
+// ./bin/rails generate stimulus controllerName
+
+//= require ./application
+//= require ./autosubmit_controller
+//= require ./code_controller
+//= require ./datepicker_controller
+//= require ./daterangepicker_controller
+//= require ./selectize_controller
+//= require ./unsaved_controller

data/app/assets/javascripts/blazer/controllers/selectize_controller.js

@@ -0,0 +1,8 @@
+Stimulus.register("selectize", class extends Controller {
+  connect() {
+    $(this.element).selectize({
+      create: true,
+      onChange: function() { this.$input[0].dispatchEvent(new Event("change", { bubbles: true })) },
+    })
+  }
+})

data/app/assets/javascripts/blazer/controllers/unsaved_controller.js

@@ -0,0 +1,24 @@
+Stimulus.register("unsaved", class extends Controller {
+  changed = false
+
+  check(event) {
+    if (this.changed) {
+      event.preventDefault()
+      return (event.returnValue = "")
+    }
+  }
+
+  clear(event) {
+    if (this.changed) {
+      window.removeEventListener("beforeunload", this.check.bind(this), { capture: true })
+      this.changed = false
+    }
+  }
+
+  set(event) {
+    if (!this.changed) {
+      window.addEventListener("beforeunload", this.check.bind(this), { capture: true })
+      this.changed = true
+    }
+  }
+})

data/app/assets/javascripts/blazer/module.js

@@ -0,0 +1 @@
+//= require ./controllers

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

@@ -177,15 +177,6 @@ input.search:focus {
   color: #999;
 }
 
-#code {
-  max-height: 236px;
-  overflow: hidden;
-}
-
-#code.expanded {
-  max-height: none;
-}
-
 [v-cloak] {
   display: none;
 }

data/app/controllers/blazer/base_controller.rb

@@ -22,11 +22,11 @@ module Blazer
       before_action Blazer.before_action.to_sym
     end
 
-    # if Blazer.override_csp
-    #   after_action do
-    #     response.headers['Content-Security-Policy'] = "default-src 'self' https: 'unsafe-inline' 'unsafe-eval' data: blob:"
-    #   end
-    # end
+    if Blazer.override_csp
+      after_action do
+        response.headers['Content-Security-Policy'] = "default-src 'self' https: 'unsafe-inline' 'unsafe-eval' data: blob:"
+      end
+    end
 
     layout "blazer/application"
 

data/app/controllers/blazer/queries_controller.rb

@@ -273,7 +273,9 @@ module Blazer
           raise Error, @error if @error && Rails.env.test?
 
           data = csv_data(@columns, @rows, @data_source)
-          filename = "#{@query.try(:name).try(:parameterize).presence || 'query'}.csv"
+          query_params = variable_params.select { |k| @query.variables.include?(k) }
+          name = @query.try(:name).presence || "query"
+          filename = "#{name}-#{query_params.to_query}".parameterize + ".csv"
           send_data data, type: "text/csv; charset=utf-8", disposition: "attachment", filename: filename
         end
       end

data/app/views/blazer/_variables.html.erb

@@ -2,14 +2,8 @@
   <% var_params = request.query_parameters %>
   <script>
     <%= blazer_js_var "timeZone", Blazer.time_zone.tzinfo.name %>
-    var now = moment.tz(timeZone)
-    var format = "YYYY-MM-DD"
-
-    function toDate(time) {
-      return moment.tz(time.format(format), timeZone)
-    }
   </script>
-  <form id="bind" method="get" action="<%= action %>" class="form-inline" style="margin-bottom: 15px;">
+  <form id="bind" method="get" action="<%= action %>" class="form-inline" style="margin-bottom: 15px;" data-controller="autosubmit" data-action="change->autosubmit#call">
     <% date_vars = ["start_time", "end_time"] %>
     <% if (date_vars - @bind_vars).empty? %>
       <% @bind_vars = @bind_vars - date_vars %>
@@ -18,49 +12,23 @@
     <% end %>
 
     <% @bind_vars.each_with_index do |var, i| %>
+      <div class="form-group">
       <%= label_tag var, var %>
       <% if (data = @smart_vars[var]) %>
-        <%= 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>
+        <%= select_tag var, options_for_select([[nil, nil]] + data, selected: var_params[var]), data: { controller: "selectize" }, style: "margin-right: 20px; width: 200px; display: none;" %>
       <% elsif var.end_with?("_at") || var == "start_time" || var == "end_time" %>
-        <%= 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;">
-            <span>Select a date</span>
+          <div id="<%= var %>-select" class="selectize-input" style="display: inline-block;" data-controller="datepicker">
+            <%= hidden_field_tag var, var_params[var], data: { datepicker_target: "input" }  %>
+            <span data-datepicker-target="span">Select a date</span>
           </div>
         </div>
 
-        <script>
-          (function() {
-            var input = $("#<%= var %>")
-            var datePicker = $("#<%= var %>-select")
-            datePicker.daterangepicker({
-              singleDatePicker: true,
-              locale: {format: format},
-              autoUpdateInput: false,
-              autoApply: true,
-              startDate: input.val().length > 0 ? moment.tz(input.val(), timeZone) : now
-            })
-            // hack to start with empty date
-            datePicker.on("apply.daterangepicker", function(ev, picker) {
-              datePicker.find("span").html(toDate(picker.startDate).format("MMMM D, YYYY"))
-              input.val(toDate(picker.startDate).utc().format())
-              submitIfCompleted($("#<%= var %>").closest("form"))
-            })
-            if (input.val().length > 0) {
-              var picker = datePicker.data("daterangepicker")
-              datePicker.find("span").html(toDate(picker.startDate).format("MMMM D, YYYY"))
-            }
-          })()
-        </script>
       <% else %>
-        <%= 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" %>
+        <%= text_field_tag var, var_params[var], autofocus: i == 0 && !var.end_with?("_at") && !var_params[var], class: "form-control" %>
       <% end %>
+      </div>
     <% end %>
 
     <% if date_vars %>
@@ -70,56 +38,10 @@
 
       <%= label_tag nil, date_vars.join(" & ") %>
       <div class="selectize-control single" style="width: 300px;">
-        <div id="reportrange" class="selectize-input" style="display: inline-block;">
+        <div id="reportrange" class="selectize-input" style="display: inline-block;" data-controller="daterangepicker">
           <span>Select a time range</span>
         </div>
       </div>
-
-      <script>
-        function dateStr(daysAgo) {
-          return now.clone().subtract(daysAgo || 0, "days").format(format)
-        }
-
-        function setTimeInputs(start, end) {
-          $("#start_time").val(toDate(start).utc().format())
-          $("#end_time").val(toDate(end).endOf("day").utc().format())
-        }
-
-        $("#reportrange").daterangepicker(
-          {
-            ranges: {
-             "Today": [dateStr(), dateStr()],
-             "Last 7 Days": [dateStr(6), dateStr()],
-             "Last 30 Days": [dateStr(29), dateStr()]
-            },
-            locale: {
-              format: format
-            },
-            startDate: dateStr(29),
-            endDate: dateStr(),
-            opens: "right",
-            alwaysShowCalendars: true
-          },
-          function(start, end) {
-            setTimeInputs(start, end)
-            submitIfCompleted($("#start_time").closest("form"))
-          }
-        ).on("apply.daterangepicker", function(ev, picker) {
-          setTimeInputs(picker.startDate, picker.endDate)
-          $("#reportrange span").html(toDate(picker.startDate).format("MMMM D, YYYY") + " - " + toDate(picker.endDate).format("MMMM D, YYYY"))
-        })
-
-        if ($("#start_time").val().length > 0) {
-          var picker = $("#reportrange").data("daterangepicker")
-          picker.setStartDate(moment.tz($("#start_time").val(), timeZone))
-          picker.setEndDate(moment.tz($("#end_time").val(), timeZone))
-          $("#reportrange").trigger("apply.daterangepicker", picker)
-        } else {
-          var picker = $("#reportrange").data("daterangepicker")
-          $("#reportrange").trigger("apply.daterangepicker", picker)
-          submitIfCompleted($("#start_time").closest("form"))
-        }
-      </script>
     <% end %>
 
     <input type="submit" class="btn btn-success" value="Run" style="vertical-align: top;" />

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

@@ -5,7 +5,7 @@
 <% @variable_params = @query.persisted? ? variable_params(@query) : nested_variable_params(@query) %>
 
 <div id="app" v-cloak>
-  <%= form_for @query, url: (@query.persisted? ? query_path(@query, params: @variable_params) : queries_path(params: @variable_params)), html: {autocomplete: "off"} do |f| %>
+  <%= form_for @query, url: (@query.persisted? ? query_path(@query, params: @variable_params) : queries_path(params: @variable_params)), html: {autocomplete: "off"}, data: { controller: "unsaved", action: "unsaved#clear input->unsaved#set" } do |f| %>
     <div class="row">
       <div id="statement-box" class="col-xs-8">
         <div class= "form-group">

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

@@ -39,7 +39,12 @@
 
 <%= render partial: "blazer/variables", locals: {action: query_path(@query)} %>
 
-<pre id="code"><code><%= @statement.display_statement %></code></pre>
+<details class="row">
+  <summary class="col-md-1 col-md-offset-11 btn btn-sm btn-info">Show source</summary>
+  <pre id="code" class="col-md-12">
+    <code data-controller="code"><%= @statement.display_statement %></code>
+  </pre>
+</details>
 
 <% if @success %>
   <div id="results">
@@ -61,12 +66,3 @@
     runQuery(data, showRun, showError)
   </script>
 <% end %>
-
-<script>
-  // do not highlight really long queries
-  // this can lead to performance issues
-  var code = $("#code code")
-  if (code.text().length < 10000) {
-    hljs.highlightElement(code.get(0))
-  }
-</script>

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

@@ -11,6 +11,7 @@
     <% else %>
       <%= stylesheet_link_tag "blazer/application" %>
       <%= javascript_include_tag "blazer/application" %>
+      <%= javascript_include_tag "blazer/module", type: "module" %>
     <% end %>
     <script>
       <%= blazer_js_var "rootPath", root_path %>

data/lib/blazer/engine.rb

@@ -6,6 +6,7 @@ module Blazer
       if defined?(Sprockets) && Sprockets::VERSION.to_i >= 4
         app.config.assets.precompile += [
           "blazer/application.js",
+          "blazer/module.js",
           "blazer/application.css",
           "blazer/glyphicons-halflings-regular.eot",
           "blazer/glyphicons-halflings-regular.svg",

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/lib/blazer.rb

@@ -1,6 +1,7 @@
 # dependencies
 require "chartkick"
 require "safely/core"
+require "stimulus-rails"
 
 # stdlib
 require "csv"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finery
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Andrew Kane, Chris Hasinski, Tomasz Ratajczak and contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-01 00:00:00.000000000 Z
+date: 2023-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: stimulus-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description:
 email: krzysztof.hasinski+finery@gmail.com
 executables: []
@@ -96,12 +110,21 @@ files:
 - app/assets/javascripts/blazer/chartjs-adapter-date-fns.bundle.js
 - app/assets/javascripts/blazer/chartjs-plugin-annotation.min.js
 - app/assets/javascripts/blazer/chartkick.js
+- app/assets/javascripts/blazer/controllers/application.js
+- app/assets/javascripts/blazer/controllers/autosubmit_controller.js
+- app/assets/javascripts/blazer/controllers/code_controller.js
+- app/assets/javascripts/blazer/controllers/datepicker_controller.js
+- app/assets/javascripts/blazer/controllers/daterangepicker_controller.js
+- app/assets/javascripts/blazer/controllers/index.js
+- app/assets/javascripts/blazer/controllers/selectize_controller.js
+- app/assets/javascripts/blazer/controllers/unsaved_controller.js
 - app/assets/javascripts/blazer/daterangepicker.js
 - app/assets/javascripts/blazer/fuzzysearch.js
 - app/assets/javascripts/blazer/highlight.min.js
 - app/assets/javascripts/blazer/jquery.js
 - app/assets/javascripts/blazer/jquery.stickytableheaders.js
 - app/assets/javascripts/blazer/mapkick.bundle.js
+- app/assets/javascripts/blazer/module.js
 - app/assets/javascripts/blazer/moment-timezone-with-data.js
 - app/assets/javascripts/blazer/moment.js
 - app/assets/javascripts/blazer/queries.js