motor-admin 0.2.5 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 854fa2c5799dc38f7a9e349de3f6391894a6fc2deaddadb27626f86bc8d6517d
-  data.tar.gz: e452093f3e2f5157b3561e859f04876b84deae6097c1444f3cbc1562486e3753
+  metadata.gz: f810c064605d59e011ec3b01567e592951b09717fe98482b5602489b471d0935
+  data.tar.gz: 032b28c51dce430021d2dfda417e083d9fac2933041df82db95fd6fbf06d63bb
 SHA512:
-  metadata.gz: 368cf58ba672c132ada6dc2803683e59c472029385fe211e7ddda5f302c3c73b529906586fc70cfd957e2fc740a85d81b84752ffc47800fa2a7226310ac879ed
-  data.tar.gz: a8786928fd85bc54108889ff61a48fce1188d0e3f3f07e9e786197a9ec895a0b58d4db4f93a38513885ff9357f84a4ac521691bfa56f401e2c9bc510976f396c
+  metadata.gz: 6d9c6e98979b5e69bd91213b0f22ba8a5f9a892117cf0d6bcd65f6b2777fd6f75ee66e361e97efad275bc65c12bbcc994c064d4200ac75819de411e96340234b
+  data.tar.gz: 79670f3add6f53d94545f1d9cf68a0c6d200ef3ad5f461f08e70aec5d83869c4a9baea826328309b5c63bf148c0be87579399259b5fc3de473fed0fb60af5b2b

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/cancan_utils/ability_patch.rb

@@ -4,6 +4,8 @@ module Motor
   module CancanUtils
     module AbilityPatch
       def serialized_rules
+        return [] unless @rules
+
         @rules.map do |rule|
           {
             base_behavior: rule.base_behavior,

data/lib/motor/configs/build_ui_app_tag.rb

@@ -13,7 +13,7 @@ module Motor
       module_function
 
       def call(current_user = nil, current_ability = nil, cache_keys: LoadFromCache.load_cache_keys)
-        CACHE_STORE.fetch("#{I18n.locale}#{cache_keys.hash}#{current_user&.id}") do
+        CACHE_STORE.fetch("#{I18n.locale}#{cache_keys.hash}#{current_user&.id}#{current_ability&.rules_hash}") do
           CACHE_STORE.clear
 
           data = build_data(cache_keys, current_user, current_ability)

data/lib/motor/resources/fetch_configured_model.rb

@@ -14,7 +14,7 @@ module Motor
 
         maybe_fetch_from_cache(
           model,
-          cache_key,
+          cache_key.to_s + model.object_id.to_s,
           lambda {
             resource_config = configs.find { |r| r.name == model.name.underscore }
 

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.5'
+  VERSION = '0.2.9'
 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-440589ed06b181856305.css.gz": "main-440589ed06b181856305.css.gz",
+  "main-440589ed06b181856305.js.LICENSE.txt": "main-440589ed06b181856305.js.LICENSE.txt",
+  "main-440589ed06b181856305.js.gz": "main-440589ed06b181856305.js.gz",
+  "main.css": "main-440589ed06b181856305.css",
+  "main.js": "main-440589ed06b181856305.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.9
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-10 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-440589ed06b181856305.css.gz
+- ui/dist/main-440589ed06b181856305.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: