motor-admin 0.2.7 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df47d07159a23d82ea4c5b2806ba9458acf28716d68a8a0b69a0c3788a0865f5
-  data.tar.gz: 112179163150a05ed240128622a77a07c6779281645b212e42aa187bd25d7b73
+  metadata.gz: 3a5b90096b26ecbc08a8db9eab674f5eb73968cbd3e67fef43c476142f75543e
+  data.tar.gz: fba671589698de0216d59280c9935f940705d12c837808beed32e5de64dec443
 SHA512:
-  metadata.gz: ae3708b9bbe101d3c137c11990941895be2ed7ed9a7f531c4d39f7adff07849c51d552794953a3a1393516bf0d15383f03c05f5a4fa8c35ff02ccf230319a057
-  data.tar.gz: 26538902eb92d66322018d4b6b52a2e92a42f6fdad84445b5dfda56e9374e2c690d253d3d21a2a13e9143737b164bd6da4c67b0a5f2bb39a8c8bbcd28aa42007
+  metadata.gz: 64046834ea3379dc2e79b1261b985fff168c5c52d19cd2540b6e951d0d669816a78fa21ac544a9cf4b82f81425f73917db39430e42b04d12db66279a3c159a62
+  data.tar.gz: 22c5025d749429478eb6f2d2d74a2264cbe5153a42b32b6cb2986ed1d694714cfce007a8751cea224748e7521ee5efe40f1ff06531d185e475b8e2a0fe58dce6

data/app/controllers/motor/api_base_controller.rb

@@ -18,6 +18,16 @@ module Motor
 
         render json: { errors: [e.message] }, status: :internal_server_error
       end
+
+      rescue_from CanCan::AccessDenied do |e|
+        Rails.logger.error(e)
+
+        if params[:action].in?(%w[create update destroy])
+          render json: { errors: [I18n.t('motor.not_authorized_to_perform_action')] }, status: :forbidden
+        else
+          render json: { errors: [e.message] }, status: :forbidden
+        end
+      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,5 @@ en:
     add_database: Add Database
     audio: Audio
     video: Video
+    display_column: Display column
+    not_authorized_to_perform_action: You are not authorized to perform this action.

data/config/locales/es.yml

@@ -264,6 +264,8 @@ es:
     add_database: Añadir base de datos
     audio: Audio
     video: Video
+    display_column: Columna de visualización
+    not_authorized_to_perform_action: No está autorizado a realizar esta acción.
     i:
       locale: es
       select:

data/config/locales/pt.yml

@@ -260,6 +260,8 @@ pt:
     write_only: "Somente gravação"
     audio: Áudio
     video: Vídeo
+    display_column: Coluna de exibição
+    not_authorized_to_perform_action: Não está autorizado a realizar esta acção.
     i:
       locale: pt
       select:

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.7'
+  VERSION = '0.2.11'
 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-192e078f9e813b1ffe93.css.gz": "main-192e078f9e813b1ffe93.css.gz",
+  "main-192e078f9e813b1ffe93.js.LICENSE.txt": "main-192e078f9e813b1ffe93.js.LICENSE.txt",
+  "main-192e078f9e813b1ffe93.js.gz": "main-192e078f9e813b1ffe93.js.gz",
+  "main.css": "main-192e078f9e813b1ffe93.css",
+  "main.js": "main-192e078f9e813b1ffe93.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.11
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-12 00:00:00.000000000 Z
+date: 2021-10-19 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-192e078f9e813b1ffe93.css.gz
+- ui/dist/main-192e078f9e813b1ffe93.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: