sql-jarvis 2.1.4 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24ed2c70edf15bae48775f619ff637bfa3db00239852fbaf79c8a667b26a961e
-  data.tar.gz: 6d0d28395c191a6a7608bc5f563a66d5105cedd072598938056feb9183c64343
+  metadata.gz: 91f27080fce44b6ea0ee444d2b790dddcaa7a9ee8b600f85e020622d2c83e455
+  data.tar.gz: 6dd4fcbd656d5d3e8c664173d788c5e79f61087079682560578f13a95eaa0c6f
 SHA512:
-  metadata.gz: 73b065819fc2940e99088611839aa3e8bb3e985e814d4f7a4abdad7076bf162ba1af07e3c7f0c84b3e7925a201e7834340b72137bfdafdc84b0e87c68c9f8e80
-  data.tar.gz: f820f5fee92e60340df80180829565f8dfc1df8415c2375842c5a834a0bbbe7abbb420936179682314ad9f094ade304fea39a46bc47b089afc1e5efe36d7bd02
+  metadata.gz: 57be82558a33daf54f8b2c869d287fb6ef77c3a6260723a585321dc66b9b1e1681704186d257b5143a7b6e91e255821bd35a851dac8518d1205c73837a5389d9
+  data.tar.gz: 24fbb87c6b50ee64309e0e4b02db2dcdb01c64df7ddfa71855116289265732bf07c02c04df3a50ca586c8523718cdc97e44c5b1bf885fb31d95456c90eabb5d6

data/app/controllers/blazer/checks_controller.rb

@@ -1,6 +1,7 @@
 module Blazer
   class ChecksController < BaseController
     before_action :set_check, only: [:edit, :update, :destroy, :run]
+    before_action :set_accessible, only: [:new, :edit]
 
     def index
       state_order = [nil, "disabled", "error", "timed out", "failing", "passing"]
@@ -46,11 +47,26 @@ module Blazer
     private
 
       def check_params
-        params.require(:check).permit(:query_id, :emails, :slack_channels, :invert, :check_type, :schedule)
+        params.require(:check).permit(:query_id, :emails, :slack_channels, :invert, :check_type, :schedule, slack_members: [])
       end
 
       def set_check
         @check = Blazer::Check.find(params[:id])
       end
+
+      def set_accessible
+        @slack_mentions ||= get_slack_mentions + @check.slack_members.each_with_object([]) { |m, list| list << [m, m] if m.present? }
+      ensure
+        @slack_mentions ||= []
+      end
+
+      def get_slack_mentions
+        return [] unless Blazer.settings.key?('slack_mentions')
+        Blazer::RunStatement.new.perform(Blazer.data_sources[@check.query.data_source], Blazer.settings['slack_mentions'], {}).rows.map do |row|
+          [row.last, "[#{row.first}] #{row.second} - ##{row.last}"]
+        end
+      rescue
+        []
+      end
   end
 end

data/app/controllers/blazer/queries_controller.rb

@@ -61,6 +61,15 @@ module Blazer
       @statement = @query.statement.dup
       process_vars(@statement, @query.data_source)
 
+      filename = []
+      filename << @query.name.parameterize if @query
+      filename << params[:start_time].to_s.to_date
+      if params[:end_time]
+        filename << 'to'
+        filename << params[:end_time].to_s.to_date
+      end
+      @filename = filename.compact.join('-')
+
       @smart_vars = {}
       @sql_errors = []
       data_source = Blazer.data_sources[@query.data_source]
@@ -253,7 +262,8 @@ module Blazer
         end
       end
 
-      @filename = @query.name.parameterize if @query
+      @filename = params[:filename] || @query&.name&.parameterize
+
       @min_width_types = @columns.each_with_index.select { |c, i| @first_row[i].is_a?(Time) || @first_row[i].is_a?(String) || @data_source.smart_columns[c] }.map(&:last)
 
       @boom = @result.boom if @result
@@ -278,7 +288,6 @@ module Blazer
         end
       end
 
-      filename = @query.try(:name).try(:parameterize).presence || 'query'
       respond_to do |format|
         format.html do
           render layout: false
@@ -286,10 +295,14 @@ module Blazer
         format.xlsx do
           parser = ::Blazer::ExcelParser.new(@query, @columns, @rows)
           tmp_file = parser.export
-          send_file tmp_file, type: "application/xlsx; charset=utf-8; header=present", disposition: "attachment; filename=\"#{parser.filename}\""
+          send_file tmp_file,
+            type: 'application/xlsx; charset=utf-8; header=present',
+            disposition: "attachment; filename=\"#{@filename}.xlsx\""
         end
         format.csv do
-          send_data csv_data(@columns, @rows, @data_source), type: "text/csv; charset=utf-8; header=present", disposition: "attachment; filename=\"#{filename}.csv\""
+          send_data csv_data(@columns, @rows, @data_source),
+            type: 'text/csv; charset=utf-8; header=present',
+            disposition: "attachment; filename=\"#{@filename}.csv\""
         end
       end
     end
@@ -349,8 +362,16 @@ module Blazer
 
     def get_assignees
       return [] unless Blazer.settings.key?('assignees')
+
       Blazer::RunStatement.new.perform(@data_source, Blazer.settings['assignees'], {}).rows.map do |row|
-        [row.first, row.last.to_s.titleize]
+        case row.size
+        when 2
+          [row.first, row.last.to_s.titleize]
+        when 3
+          [row.first, "#{row.second.to_s.titleize} - #{row.last}"]
+        else
+          [row.first, row.first]
+        end
       end
     rescue
       []

data/app/mailers/blazer/slack_notifier.rb

@@ -28,20 +28,38 @@ module Blazer
     end
 
     def self.failing_checks(channel, checks)
-      text =
-        checks.map do |check|
-          "<#{query_url(check.query_id)}|#{escape(check.query.name)}> #{escape(check.state)}"
-        end
+      all_mentions = []
+      attachments = checks.map do |check|
+        mentions = check.slack_mention_tags
+        all_mentions << mentions
+        result = Blazer.data_sources[check.query.data_source].run_statement(check.query.statement)
+        {
+          mrkdwn_in: %w[title text],
+          title: "<#{query_url(check.query_id)}|#{escape(check.query.name)}> #{escape(check.state)} #{mentions.join(' ')}",
+          text: "#{Blazer.slack_preview_items_number} first rows `#{result.columns.first}: #{result.rows.first(Blazer.slack_preview_items_number).map(&:first).join(', ')}`",
+          color: 'warning'
+        }
+      end
 
       payload = {
         channel: channel,
-        attachments: [
+        blocks: [
           {
-            title: escape("#{pluralize(checks.size, "Check")} Failing"),
-            text: text.join("\n"),
-            color: "warning"
+            type: 'header',
+            text: {
+              type: 'plain_text',
+              text: escape("#{pluralize(checks.size, 'Check')} Failing")
+            }
+          },
+          {
+            type: 'section',
+            text: {
+              type: 'mrkdwn',
+              text: "Hey #{all_mentions.uniq.join(' ')}, there are some failing checks:"
+            }
           }
-        ]
+        ],
+        attachments: attachments
       }
 
       post(Blazer.slack_webhook_url, payload)

data/app/models/blazer/check.rb

@@ -1,5 +1,7 @@
 module Blazer
   class Check < Record
+    serialize :slack_members, Array
+
     belongs_to :creator, Blazer::BELONGS_TO_OPTIONAL.merge(class_name: Blazer.user_class.to_s) if Blazer.user_class
     belongs_to :query
 
@@ -22,6 +24,26 @@ module Blazer
       end
     end
 
+    def slack_mention_tags
+      tags = []
+      slack_members.each do |code|
+        case code
+        when /^U/
+          tags << "<@#{code.strip}>"
+        when /^S/
+          tags << "<!subteam^#{code.strip}>"
+        when 'here'
+          tags << '<!here|here>'
+        when 'channel'
+          tags << '<!channel>'
+        when 'everyone'
+          tags << '<!everyone>'
+        end
+      end
+
+      tags.uniq
+    end
+
     def update_state(result)
       check_type =
         if respond_to?(:check_type)

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

@@ -42,6 +42,10 @@
     .form-group
       = f.label :slack_channels
       = f.text_field :slack_channels, placeholder: "Optional, comma separated", class: "form-control"
+    .form-group
+      = f.label :slack_members
+      = f.collection_select :slack_members, @slack_mentions, :first, :last, {}, { placeholder: "User, Users group Slack ID", class: "form-control", multiple: true }
+    %p.text-muted Slack members: can select or enter new user/user_group Slack ID. It also supports special mentions: channel, everyone, here.
   %p.text-muted
     Emails #{Blazer.slack? ? "and Slack notifications " : nil}are sent when a check starts failing, and when it starts passing again.
   %p
@@ -49,3 +53,9 @@
       = link_to "Delete", check_path(@check), method: :delete, "data-confirm" => "Are you sure?", class: "btn btn-danger"
     = f.submit "Save", class: "btn btn-success"
     = link_to "Back", :back, class: "btn btn-link"
+:javascript
+  $(document).ready(function() {
+    $('#check_slack_members').select2({
+      tags: true,
+    });
+  });

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

@@ -1,4 +1,5 @@
 - blazer_title @query.name
+
 .topbar
   .container
     .row{:style => "padding-top: 13px;"}
@@ -10,8 +11,9 @@
         = link_to "Edit", edit_query_path(@query, variable_params), class: "btn btn-default", disabled: !@query.editable?(blazer_user)
         = link_to "Fork", new_query_path(variable_params.merge(fork_query_id: @query.id, data_source: @query.data_source, name: @query.name)), class: "btn btn-info"
         - if !@error && @success
-          = button_to "⤓ .csv", run_queries_path(query_id: @query.id, format: "csv", forecast: params[:forecast]), params: {statement: @statement}, class: "btn btn-primary"
-          = button_to "⤓ .xlsx", run_queries_path(query_id: @query.id, format: "xlsx"), params: {statement: @statement}, class: "btn btn-primary"
+          = button_to "⤓ .csv", run_queries_path(query_id: @query.id, format: "csv", forecast: params[:forecast]), params: { statement: @statement, filename: @filename }, class: "btn btn-primary"
+          = button_to "⤓ .xlsx", run_queries_path(query_id: @query.id, format: "xlsx"), params: { statement: @statement, filename: @filename }, class: "btn btn-primary"
+
 %div{:style => "margin-bottom: 60px;"}
 - if @sql_errors.any?
   .alert.alert-danger

data/lib/blazer/engine.rb

@@ -41,6 +41,7 @@ module Blazer
       Blazer.images = Blazer.settings["images"] || false
       Blazer.override_csp = Blazer.settings["override_csp"] || false
       Blazer.slack_webhook_url = Blazer.settings["slack_webhook_url"] || ENV["BLAZER_SLACK_WEBHOOK_URL"]
+      Blazer.slack_preview_items_number = Blazer.settings["slack_preview_items_number"] || 25
     end
   end
 end

data/lib/blazer/excel_parser.rb

@@ -13,10 +13,6 @@ module Blazer
       save_file!
     end
 
-    def filename
-      "#{query.name.to_s.parameterize}-#{Time.current.strftime('%y-%m-%d')}.xlsx"
-    end
-
     private
 
     attr_reader :query, :excel
@@ -31,7 +27,7 @@ module Blazer
     end
 
     def save_file!
-      tmp_file = Tempfile.new(filename).path
+      tmp_file = Tempfile.new.path
       excel.serialize(tmp_file)
       return tmp_file
     end

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = '2.1.4'
+  VERSION = '2.1.6'
 end

data/lib/blazer.rb

@@ -61,6 +61,8 @@ module Blazer
     attr_accessor :override_csp
     attr_accessor :slack_webhook_url
     attr_accessor :query_creatable
+    attr_accessor :slack_preview_items_number
+    attr_accessor :slack_mentions
   end
 
   self.audit = true

data/lib/generators/blazer/templates/config.yml.tt

@@ -61,8 +61,11 @@ audit: true
 # mapbox_access_token: <%= ENV["MAPBOX_ACCESS_TOKEN"] %>
 
 # assignees: 'SELECT id, name FROM users ORDER BY id ASC'
+# slack_mentions: 'SELECT 'User' as type, name as title, ext_code as code FROM users ORDER BY id ASC'
 # teams: 'SELECT id, name FROM teams'
 
+slack_preview_items_number: 25
+
 check_schedules:
   - "1 day"
   - "1 hour"

data/lib/generators/blazer/templates/install.rb.tt

@@ -40,6 +40,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version
       t.string :schedule
       t.text :emails
       t.text :slack_channels
+      t.text :slack_members
       t.string :check_type
       t.text :message
       t.timestamp :last_run_at

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql-jarvis
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.6
 platform: ruby
 authors:
 - Andrew Kane
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2023-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -150,7 +150,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: andrew@chartkick.com
 executables: []
 extensions: []
@@ -270,7 +270,7 @@ homepage: https://github.com/ThanhKhoaIT/blazer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -285,8 +285,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Fork from ankane! Explore your data with SQL. Easily create charts and dashboards,
   and share them with your team.