finery 3.0.0 → 3.0.2

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

@@ -3,21 +3,23 @@
     <div class="alert alert-danger"><%= @dashboard.errors.full_messages.first %></div>
   <% end %>
 
-  <div class="form-group">
+  <div class="form-group mb-3">
     <%= f.label :name %>
     <%= f.text_field :name, class: "form-control" %>
   </div>
-  <div class="form-group" v-show="queries.length">
+  <div class="form-group mb-3" v-show="queries.length">
     <%= f.label :charts %>
     <ul id="queries" class="list-group">
-      <li class="list-group-item" v-for="(query, index) in queries" :key="query.id" v-cloak>
-        <span class="glyphicon glyphicon-remove" aria-hidden="true" v-on:click="remove(index)"></span>
+      <li class="list-group-item d-flex justify-content-between align-items-center" v-for="(query, index) in queries" :key="query.id" v-cloak>
         {{ query.name }}
+        <button class="btn btn-sm btn-danger" v-on:click="remove(index)">
+          remove
+        </button>
         <input type="hidden" name="query_ids[]" :value="query.id">
       </li>
     </ul>
   </div>
-  <div class="form-group" v-cloak>
+  <div class="form-group mb-3" v-cloak>
     <%= f.label :query_id, "Add Chart" %>
     <%= select_tag :query_id, nil, {include_blank: true, placeholder: "Select chart"} %>
   </div>

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

@@ -1,22 +1,11 @@
 <% blazer_title @dashboard.name %>
-
-<div class="topbar">
-  <div class="container">
-    <div class="row" style="padding-top: 13px;">
-      <div class="col-sm-9">
-        <%= render partial: "blazer/nav" %>
-        <h3 style="line-height: 34px; display: inline; margin-left: 5px;">
-          <%= @dashboard.name %>
-        </h3>
-      </div>
-      <div class="col-sm-3 text-right">
-        <%= link_to "Edit", edit_dashboard_path(@dashboard, params: variable_params(@dashboard)), class: "btn btn-info" %>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div style="margin-bottom: 60px;"></div>
+<% content_for :nav do %>
+  <ul class="navbar-nav justify-content-end flex-grow-1 pe-3">
+    <li class="nav-item">
+      <%= link_to "Edit", blazer.edit_dashboard_path(@dashboard, params: variable_params(@dashboard)), class: "nav-link" %>
+    </li>
+  </ul>
+<% end %>
 
 <% if @data_sources.any? { |ds| ds.cache_mode != "off" } %>
   <p class="text-muted" style="float: right;">

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

@@ -5,40 +5,46 @@
 <% @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 id="statement-box" class="col-8">
         <div class= "form-group">
           <%= f.hidden_field :statement %>
           <div id="editor-container">
             <div id="editor" :style="{ height: editorHeight }"><%= @query.statement %></div>
           </div>
         </div>
-        <div class="form-group text-right" style="margin-bottom: 8px;">
-          <div class="pull-left" style="margin-top: 8px;">
-            <%= link_to "Back", :back %>
-            <a :href="docsPath" target="_blank" style="margin-left: 40px;">Docs</a>
-            <a :href="schemaPath" target="_blank" style="margin-left: 40px;">Schema</a>
+        <div class="form-group d-flex justify-content-between my-2">
+          <div>
+            <%= link_to "Back", :back, class: "me-2" %>
+            <a :href="docsPath" target="_blank" class="m-2">Docs</a>
+            <a :href="schemaPath" target="_blank" class="m-2">Schema</a>
           </div>
 
-          <%= f.select :data_source, Blazer.data_sources.map { |_, ds| [ds.name, ds.id] }, {}, class: ("hide" if Blazer.data_sources.size <= 1), style: "width: 140px;" %>
-          <div id="tables" style="display: inline-block; width: 250px; margin-right: 10px;">
-            <select id="table_names" style="width: 240px;" placeholder="Preview table"></select>
+          <div class="row">
+            <div class="col">
+              <%= f.select :data_source, Blazer.data_sources.map { |_, ds| [ds.name, ds.id] }, {}, class: ("hide" if Blazer.data_sources.size <= 1) %>
+            </div>
+            <div class="col">
+              <select id="table_names" placeholder="Preview table"></select>
+            </div>
           </div>
+        </div>
+        <div class="form-group">
           <a v-on:click="run" v-if="!running" class="btn btn-info" style="vertical-align: top; width: 70px;">Run</a>
           <a v-on:click="cancel" v-if="running" class="btn btn-danger" style="vertical-align: top; width: 70px;">Cancel</a>
         </div>
       </div>
-      <div class="col-xs-4">
-        <div class="form-group">
+      <div class="col-4">
+        <div class="form-group mb-3">
           <%= f.label :name %>
           <%= f.text_field :name, class: "form-control" %>
         </div>
-        <div class="form-group">
+        <div class="form-group mb-3">
           <%= f.label :description %>
           <%= f.text_area :description, placeholder: "Optional", style: "height: 80px;", class: "form-control" %>
         </div>
-        <div class="form-group text-right">
+        <div class="form-group text-end mb-3">
           <%= f.submit "For Enter Press", class: "hide" %>
           <% if @query.persisted? %>
             <%= link_to "Delete", query_path(@query), method: :delete, "data-confirm" => "Are you sure?", class: "btn btn-danger" %>

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

@@ -1,35 +1,22 @@
 <div id="queries">
-  <div id="header">
-    <div class="pull-right" style="line-height: 34px;">
-      <% if blazer_user %>
-        <%= link_to "All", root_path, class: !params[:filter] ? "active" : nil, style: "margin-right: 40px;" %>
-
-        <% if Blazer.audit %>
-          <%= link_to "Viewed", root_path(filter: "viewed"), class: params[:filter] == "viewed" ? "active" : nil, style: "margin-right: 40px;" %>
-        <% end %>
-
-        <%= link_to "Mine", root_path(filter: "mine"), class: params[:filter] == "mine" ? "active" : nil, style: "margin-right: 40px;" %>
+  <ul class="nav nav-pills d-flex flex-column flex-sm-row mb-3">
+    <li class="text-start flex-fill">
+    <input type="text" v-model="searchTerm" placeholder="Start typing a query, dashboard, or person" autofocus class="search form-control flex-fill align-self-stretch" />
+    </li>
+    <% if blazer_user %>
+      <li class="nav-item">
+        <%= link_to "All", blazer.root_path, class: { "nav-link": true, active: !params[:filter] } %>
+      </li>
+      <% if Blazer.audit %>
+        <li class="nav-item">
+          <%= link_to "Viewed", blazer.root_path(filter: "viewed"), class: { "nav-link": true, active: params[:filter] == "viewed" } %>
+        </li>
       <% end %>
-
-      <div class="btn-group">
-        <%= link_to "New Query", new_query_path, class: "btn btn-info" %>
-        <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          <span class="caret"></span>
-          <span class="sr-only">Toggle Dropdown</span>
-        </button>
-        <ul class="dropdown-menu">
-          <li><%= link_to "Checks", checks_path %></li>
-          <% if Blazer.uploads? %>
-            <li><%= link_to "Uploads", uploads_path %></li>
-          <% end %>
-          <li role="separator" class="divider"></li>
-          <li><%= link_to "New Dashboard", new_dashboard_path %></li>
-          <li><%= link_to "New Check", new_check_path %></li>
-        </ul>
-      </div>
-    </div>
-    <input type="text" v-model="searchTerm" placeholder="Start typing a query, dashboard, or person" style="width: 300px; display: inline-block;" v-focus class="search form-control" />
-  </div>
+      <li class="nav-item">
+        <%= link_to "Mine", blazer.root_path(filter: "mine"), class: { "nav-link": true, active: params[:filter] == "mine" } %>
+      </li>
+    <% end %>
+  </ul>
 
   <table class="table">
     <thead>

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

@@ -131,7 +131,7 @@
 
     <% unless @only_chart && !@no_chart %>
       <% header_width = 100 / @columns.size.to_f %>
-      <div class="results-container">
+      <div class="results-container overflow-x-scroll">
         <% if @columns == ["QUERY PLAN"] %>
           <pre><code><%= @rows.map { |r| r[0] }.join("\n") %></code></pre>
         <% elsif @columns == ["PLAN"] && @data_source.adapter == "druid" %>

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

@@ -1,27 +1,20 @@
 <% blazer_title @query.name %>
-
-<div class="topbar">
-  <div class="container">
-    <div class="row" style="padding-top: 13px;">
-      <div class="col-sm-9">
-        <%= render partial: "blazer/nav" %>
-        <h3 style="line-height: 34px; display: inline; margin-left: 5px;">
-          <%= @query.name %>
-        </h3>
-      </div>
-      <div class="col-sm-3 text-right">
-        <%= link_to "Edit", edit_query_path(@query, params: variable_params(@query)), class: "btn btn-default", disabled: !@query.editable?(blazer_user) %>
-        <%= link_to "Fork", new_query_path(params: {variables: variable_params(@query), fork_query_id: @query.id, data_source: @query.data_source, name: @query.name}), class: "btn btn-info" %>
-
-        <% if !@error && @success %>
-          <%= button_to "Download", run_queries_path(format: "csv"), params: @run_data, class: "btn btn-primary" %>
-        <% end %>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div style="margin-bottom: 60px;"></div>
+<% content_for :nav do %>
+  <ul class="navbar-nav justify-content-end flex-grow-1 pe-3">
+    <li class="navbar-brand d-none d-sm-inline text-wrap"><%= @query.name %></li>
+    <li class="nav-item">
+      <%= link_to "Edit", blazer.edit_query_path(@query, params: variable_params(@query)), class: "nav-link", disabled: !@query.editable?(blazer_user) %>
+    </li>
+    <li class="nav-item">
+      <%= link_to "Fork", blazer.new_query_path(params: {variables: variable_params(@query), fork_query_id: @query.id, data_source: @query.data_source, name: @query.name}), class: "nav-link" %>
+    </li>
+    <li class="nav-item dropdown">
+      <% if !@error && @success %>
+        <%= button_to "Download", blazer.run_queries_path(format: "csv"), params: @run_data, class: "nav-link" %>
+      <% end %>
+    </li>
+  </ul>
+<% end %>
 
 <% if @sql_errors.any? %>
   <div class="alert alert-danger">
@@ -34,12 +27,17 @@
 <% end %>
 
 <% if @query.description.present? %>
-  <p style="white-space: pre-line;"><%= @query.description %></p>
+  <p class="text-pre-line"><%= @query.description %></p>
 <% end %>
 
 <%= 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 offset-md-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">
@@ -49,7 +47,7 @@
   <script>
     function showRun(data) {
       $("#results").html(data)
-      $("#results table").stupidtable(stupidtableCustomSettings).stickyTableHeaders({fixedOffset: 60})
+      $("#results table").stupidtable(stupidtableCustomSettings).stickyTableHeaders({fixedOffset: 56})
     }
 
     function showError(message) {
@@ -61,12 +59,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/blazer/uploads/_form.html.erb

@@ -5,15 +5,15 @@
     <p>Create a database table from a CSV file. The table will be created in the <code><%= Blazer.settings["uploads"]["schema"] %></code> schema.</p>
   <% end %>
 
-  <div class="form-group">
+  <div class="form-group mb-3">
     <%= f.label :table %>
     <%= f.text_field :table, class: "form-control" %>
   </div>
-  <div class="form-group">
+  <div class="form-group mb-3">
     <%= f.label :description %>
     <%= f.text_area :description, placeholder: "Optional", style: "height: 60px;", class: "form-control" %>
   </div>
-  <div class="form-group">
+  <div class="form-group mb-3">
     <%= f.label :file %>
     <%= f.file_field :file, accept: "text/csv", style: "margin-top: 6px; margin-bottom: 21px;" %>
   </div>

data/app/views/blazer/uploads/index.html.erb

@@ -1,24 +1,6 @@
 <% blazer_title "Uploads" %>
 
 <div id="header">
-  <div class="pull-right" style="line-height: 34px;">
-    <div class="btn-group">
-      <%= link_to "New Upload", new_upload_path, class: "btn btn-info" %>
-      <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        <span class="caret"></span>
-        <span class="sr-only">Toggle Dropdown</span>
-      </button>
-      <ul class="dropdown-menu">
-        <li><%= link_to "Home", root_path %></li>
-        <li><%= link_to "Checks", checks_path %></li>
-        <li role="separator" class="divider"></li>
-        <li><%= link_to "New Query", new_query_path %></li>
-        <li><%= link_to "New Dashboard", new_dashboard_path %></li>
-        <li><%= link_to "New Check", new_check_path %></li>
-      </ul>
-    </div>
-  </div>
-
   <input id="search" type="text" placeholder="Start typing a table or person" style="width: 300px; display: inline-block;" class="search form-control" />
 </div>
 

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

@@ -1,24 +1,24 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title><%= blazer_title ? blazer_title : "Blazer" %></title>
+    <title><%= blazer_title ? blazer_title : "Finery" %></title>
+    <meta name="viewport" content="width=device-width,initial-scale=1" />
+    <meta name="robots" content="noindex" />
+    <meta name="referrer" content="same-origin" />
 
     <meta charset="utf-8" />
     <%= favicon_link_tag "blazer/favicon.png" %>
-    <% if defined?(Propshaft::Railtie) %>
-      <%= stylesheet_link_tag "blazer/bootstrap-propshaft", "blazer/bootstrap", "blazer/selectize", "blazer/github", "blazer/daterangepicker", "blazer/application" %>
-      <%= javascript_include_tag "blazer/jquery", "blazer/rails-ujs", "blazer/stupidtable", "blazer/stupidtable-custom-settings", "blazer/jquery.stickytableheaders", "blazer/selectize", "blazer/highlight.min", "blazer/moment", "blazer/moment-timezone-with-data", "blazer/daterangepicker", "blazer/chart.umd", "blazer/chartjs-adapter-date-fns.bundle", "blazer/chartkick", "blazer/mapkick.bundle", "blazer/ace/ace", "blazer/ace/ext-language_tools", "blazer/ace/theme-twilight", "blazer/ace/mode-sql", "blazer/ace/snippets/text", "blazer/ace/snippets/sql", "blazer/Sortable", "blazer/bootstrap", "blazer/vue.global.prod", "blazer/routes", "blazer/queries", "blazer/fuzzysearch", "blazer/application" %>
-    <% else %>
-      <%= stylesheet_link_tag "blazer/application" %>
-      <%= javascript_include_tag "blazer/application" %>
-    <% end %>
+    <%= stylesheet_link_tag "blazer/application" %>
+    <%= javascript_include_tag "blazer/application" %>
+    <%= javascript_include_tag "blazer/module", type: "module" %>
     <script>
       <%= blazer_js_var "rootPath", root_path %>
     </script>
     <%= csrf_meta_tags %>
   </head>
-  <body>
-    <div class="container">
+  <body class="with-navbar overflow-y-scroll" data-controller="navbar-padding">
+    <%= render partial: "blazer/navbar" %>
+    <div class="container mt-2">
       <%= yield %>
     </div>
   </body>

data/lib/blazer/engine.rb

@@ -6,12 +6,8 @@ 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",
-          "blazer/glyphicons-halflings-regular.ttf",
-          "blazer/glyphicons-halflings-regular.woff",
-          "blazer/glyphicons-halflings-regular.woff2",
           "blazer/favicon.png"
         ]
       else

data/lib/blazer/version.rb

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

data/lib/blazer.rb

@@ -1,6 +1,7 @@
 # dependencies
 require "chartkick"
 require "safely/core"
+require "stimulus-rails"
 
 # stdlib
 require "csv"
@@ -118,14 +119,17 @@ module Blazer
   end
 
   def self.settings
-    @settings ||= begin
-      path = Rails.root.join("config", "blazer.yml").to_s
-      if File.exist?(path)
-        YAML.safe_load(ERB.new(File.read(path)).result, aliases: true)
-      else
-        {}
-      end
-    end
+    @settings ||= load_settings!
+  end
+
+  def self.load_settings!
+    path = Rails.root.join("config", "blazer.yml").to_s
+    return YAML.safe_load(ERB.new(File.read(path)).result, aliases: true) if File.exist?(path)
+
+    path = Rails.root.join("config", "finery.yml").to_s
+    return YAML.safe_load(ERB.new(File.read(path)).result, aliases: true) if File.exist?(path)
+
+    {}
   end
 
   def self.data_sources

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finery
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.2
 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-13 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: []
@@ -76,11 +90,6 @@ files:
 - CONTRIBUTING.md
 - LICENSE.txt
 - README.md
-- app/assets/fonts/blazer/glyphicons-halflings-regular.eot
-- app/assets/fonts/blazer/glyphicons-halflings-regular.svg
-- app/assets/fonts/blazer/glyphicons-halflings-regular.ttf
-- app/assets/fonts/blazer/glyphicons-halflings-regular.woff
-- app/assets/fonts/blazer/glyphicons-halflings-regular.woff2
 - app/assets/images/blazer/favicon.png
 - app/assets/javascripts/blazer/Sortable.js
 - app/assets/javascripts/blazer/ace.js
@@ -91,33 +100,37 @@ files:
 - app/assets/javascripts/blazer/ace/snippets/text.js
 - app/assets/javascripts/blazer/ace/theme-twilight.js
 - app/assets/javascripts/blazer/application.js
-- app/assets/javascripts/blazer/bootstrap.js
 - app/assets/javascripts/blazer/chart.umd.js
 - 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.erb
+- 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/navbar_padding_controller.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
 - app/assets/javascripts/blazer/rails-ujs.js
 - app/assets/javascripts/blazer/routes.js
-- app/assets/javascripts/blazer/selectize.js
 - app/assets/javascripts/blazer/stupidtable-custom-settings.js
 - app/assets/javascripts/blazer/stupidtable.js
 - app/assets/javascripts/blazer/vue.global.prod.js
 - app/assets/stylesheets/blazer/application.css
-- app/assets/stylesheets/blazer/bootstrap-propshaft.css
-- app/assets/stylesheets/blazer/bootstrap-sprockets.css.erb
-- app/assets/stylesheets/blazer/bootstrap.css
 - app/assets/stylesheets/blazer/daterangepicker.css
 - app/assets/stylesheets/blazer/github.css
-- app/assets/stylesheets/blazer/selectize.css
 - app/controllers/blazer/base_controller.rb
 - app/controllers/blazer/checks_controller.rb
 - app/controllers/blazer/dashboards_controller.rb
@@ -133,7 +146,7 @@ files:
 - app/models/blazer/record.rb
 - app/models/blazer/upload.rb
 - app/models/blazer/uploads_connection.rb
-- app/views/blazer/_nav.html.erb
+- app/views/blazer/_navbar.html.erb
 - app/views/blazer/_variables.html.erb
 - app/views/blazer/check_mailer/failing_checks.html.erb
 - app/views/blazer/check_mailer/state_change.html.erb