motor-admin 0.2.6 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b0f19398ae8e7e11b2d3599dc83707c69acce2ef4731b73a1b7a0c9e006c069
-  data.tar.gz: 6c67d6492965989428dfab23a4b5315790ffb1408f572f2e9c38437385e53f60
+  metadata.gz: 5e7ce842fbd5202f73efe93edfea13a5391070ed46a44c4c7d15d9ed3ad68aed
+  data.tar.gz: cb7dee7ba4ca6b4542bf6d333eb04f2de1c4409a795d1530ac3c81e76cfb4dce
 SHA512:
-  metadata.gz: e38ab5f4be4a8d340f2b2568b1cdfa586243ed895f6abdb39dc3509b14bb8d3556d6b0de22671d87ed3a6f11895eb29add8f10e542038b68975a2b89df6334cb
-  data.tar.gz: a5800734dc28bd4f1e8e0e559bb5a948756f9270cfd1dc873e8a943021a498dd66dd354361abec776113564e5cc97f7afc9f1447c8e78c17c88da792eb165cf0
+  metadata.gz: 468b9e8e9a4adab3e1006796e87894ca73e339e3663e9e2a61337512e305e5e22df787a260f49604c10c14934c1022164efda71fc59619848ee9f655e065e421
+  data.tar.gz: c31e7faea409f3e78ea2f6840d2b3cdc8aa6ae82cbc831edee65b7220777503c52d745f7ce78a74b21f2caca147bb6a7f5f38b154b7b4409c8a67be529286fac

data/app/controllers/motor/api_base_controller.rb

@@ -18,6 +18,12 @@ module Motor
 
         render json: { errors: [e.message] }, status: :internal_server_error
       end
+
+      rescue_from CanCan::AccessDenied do |e|
+        Rails.logger.error(e)
+
+        render json: { errors: [e.message] }, status: :forbidden
+      end
     end
   end
 end

data/app/mailers/motor/alerts_mailer.rb

@@ -2,13 +2,19 @@
 
 module Motor
   class AlertsMailer < ApplicationMailer
+    SenderAddressNotSet = Class.new(StandardError)
+    SENDER_NOT_SET_ERROR_MESSAGE =
+      'Please specify your sender address via MOTOR_ALERTS_FROM_ADDRESS environment variable'
+
     def alert_email(alert)
       @alert = alert
       @query_result = Queries::RunQuery.call(alert.query)
 
       return if @alert.preferences[:send_empty].blank? && @query_result.data.blank?
 
-      attachments["#{alert.name.presence || 'data'}.csv"] = generate_csv(@query_result)
+      assign_attachment(@alert, @query_result)
+
+      raise SenderAddressNotSet, SENDER_NOT_SET_ERROR_MESSAGE unless from_address
 
       mail(
         from: from_address,
@@ -19,6 +25,10 @@ module Motor
 
     private
 
+    def assign_attachment(alert, query_result)
+      attachments["#{alert.name.presence || 'data'}.csv"] = generate_csv(query_result)
+    end
+
     def generate_csv(_query_result)
       rows = [@query_result.columns.pluck(:name)] + @query_result.data
 
@@ -32,7 +42,9 @@ module Motor
       from ||= mailer_config_from_address
       from ||= "reports@#{ENV['HOST'].delete_prefix('www.')}" if ENV['HOST'].present?
 
-      from || 'reports@example.com'
+      from ||= 'reports@example.com' if Rails.env.development?
+
+      from
     end
 
     def application_mailer_default_from

data/config/locales/en.yml

@@ -264,3 +264,4 @@ en:
     add_database: Add Database
     audio: Audio
     video: Video
+    display_column: Display column

data/config/locales/es.yml

@@ -264,6 +264,7 @@ es:
     add_database: Añadir base de datos
     audio: Audio
     video: Video
+    display_column: Columna de visualización
     i:
       locale: es
       select:

data/config/locales/pt.yml

@@ -260,6 +260,7 @@ pt:
     write_only: "Somente gravação"
     audio: Áudio
     video: Vídeo
+    display_column: Coluna de exibição
     i:
       locale: pt
       select:

data/lib/motor/active_record_utils/active_record_filter_patch.rb

@@ -16,6 +16,8 @@ if Rails::VERSION::MAJOR == 6
     end
 
     def build_filters(manager, alias_tracker)
+      return unless @filters
+
       where_clause = nil
 
       @filters.each do |filters|

data/lib/motor/active_record_utils/ar_lazy_preload_patch.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+if Rails::VERSION::MAJOR == 7
+  module ArLazyPreload
+    module Relation
+      def preload_associations(records)
+        preload = preload_values
+        preload += includes_values unless eager_loading?
+        scope = strict_loading_value ? ActiveRecord::Relation::StrictLoadingScope : nil
+        preload.each do |associations|
+          preloader_associations = ActiveRecord::Associations::Preloader.new(records: records,
+                                                                             associations: associations,
+                                                                             scope: scope).call
+
+          preloader_associations.each do |preloader_association|
+            handle_preloaded_records(preloader_association.preloaded_records)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/motor/active_record_utils.rb

@@ -23,3 +23,4 @@ require_relative './active_record_utils/active_storage_blob_patch'
 require_relative './active_record_utils/active_record_filter_patch'
 require_relative './active_record_utils/active_record_connection_column_patch'
 require_relative './active_record_utils/action_text_attribute_patch'
+require_relative './active_record_utils/ar_lazy_preload_patch'

data/lib/motor/api_query/search.rb

@@ -45,9 +45,7 @@ module Motor
 
       def select_columns(columns)
         selected_columns =
-          columns.select do |name|
-            BuildSchema::FindDisplayColumn::DISPLAY_NAME_REGEXP.match?(name)
-          end.presence
+          columns.grep(BuildSchema::FindDisplayColumn::DISPLAY_NAME_REGEXP).presence
 
         selected_columns ||= columns.first(SELECT_COLUMNS_AMOUNT)
 

data/lib/motor/resources.rb

@@ -2,7 +2,7 @@
 
 module Motor
   module Resources
-    RESOURCE_ATTRS = %w[display_name icon custom_sql visible].freeze
+    RESOURCE_ATTRS = %w[display_name display_column icon custom_sql visible].freeze
     COLUMN_ATTRS = %w[name display_name column_type access_type default_value reference virtual format].freeze
     ASSOCIATION_ATTRS = %w[name display_name model_name icon visible foreign_key primary_key options virtual
                            polymorphic slug].freeze

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.2.6'
+  VERSION = '0.2.10'
 end

data/ui/dist/manifest.json

@@ -2601,9 +2601,9 @@
   "icons/zoom-out.svg.gz": "icons/zoom-out.svg.gz",
   "icons/zoom-question.svg": "icons/zoom-question.svg",
   "icons/zoom-question.svg.gz": "icons/zoom-question.svg.gz",
-  "main-32da50c51ef9fcddf634.css.gz": "main-32da50c51ef9fcddf634.css.gz",
-  "main-32da50c51ef9fcddf634.js.LICENSE.txt": "main-32da50c51ef9fcddf634.js.LICENSE.txt",
-  "main-32da50c51ef9fcddf634.js.gz": "main-32da50c51ef9fcddf634.js.gz",
-  "main.css": "main-32da50c51ef9fcddf634.css",
-  "main.js": "main-32da50c51ef9fcddf634.js"
+  "main-9d527c31af98f3d09fea.css.gz": "main-9d527c31af98f3d09fea.css.gz",
+  "main-9d527c31af98f3d09fea.js.LICENSE.txt": "main-9d527c31af98f3d09fea.js.LICENSE.txt",
+  "main-9d527c31af98f3d09fea.js.gz": "main-9d527c31af98f3d09fea.js.gz",
+  "main.css": "main-9d527c31af98f3d09fea.css",
+  "main.js": "main-9d527c31af98f3d09fea.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.10
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-11 00:00:00.000000000 Z
+date: 2021-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -165,6 +165,7 @@ files:
 - lib/motor/active_record_utils/active_record_filter_patch.rb
 - lib/motor/active_record_utils/active_storage_blob_patch.rb
 - lib/motor/active_record_utils/active_storage_links_extension.rb
+- lib/motor/active_record_utils/ar_lazy_preload_patch.rb
 - lib/motor/active_record_utils/defined_scopes_extension.rb
 - lib/motor/active_record_utils/fetch_methods.rb
 - lib/motor/active_record_utils/types.rb
@@ -1523,8 +1524,8 @@ files:
 - ui/dist/icons/zoom-money.svg.gz
 - ui/dist/icons/zoom-out.svg.gz
 - ui/dist/icons/zoom-question.svg.gz
-- ui/dist/main-32da50c51ef9fcddf634.css.gz
-- ui/dist/main-32da50c51ef9fcddf634.js.gz
+- ui/dist/main-9d527c31af98f3d09fea.css.gz
+- ui/dist/main-9d527c31af98f3d09fea.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: