motor-admin 0.2.8 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17e18a7f05b5872257978713dc9bb51c5c19823ec07eed5dd4e2a5035817ab96
-  data.tar.gz: a1cc9b42cabbc9278a43abaad16a5987847b162b6e04177c25fbaa5438ff3bf8
+  metadata.gz: 7d0e456f8e9d1dc83186c2ef270182308da0bb43bab8779eaa391b2f6f3c7a4f
+  data.tar.gz: 1f5a52343c0ba8ca6b4c622b221656a9e38ac2df6678a6659653e2469f71c92d
 SHA512:
-  metadata.gz: 698d0a1d1b9ae1b2f4589decff0cc54fbae9c49a61a553504963ef71c8a02ecae656dd6a7a163cb28af4ee65155cff31b8240237b5ff6a58a0de76597beff2f4
-  data.tar.gz: c07b294604ec27c76f35f55f69a0c592a7dd349a6b446efd724090c2eac1e07d71e24785ca4bdb80e960a51735e923bb62775c6b477c375446b19ae40185c505
+  metadata.gz: b58213d454339da735ef28bb926eea83b910a9399a38892a34744c85ba64f7cce0c9668d40c10afe839807ea194a2144282e20fc6b0133f2bb215ec3f5a5b0f5
+  data.tar.gz: e945c189f9929b3afd5eada7330f8b83cc62386a3ac1718d1956bc4cd6b499933defdf0e0c094221170c4b0d58584cf64024e3ac7084d8ed3dcf3c59b5a21449

data/app/controllers/motor/api_base_controller.rb

@@ -22,7 +22,11 @@ module Motor
       rescue_from CanCan::AccessDenied do |e|
         Rails.logger.error(e)
 
-        render json: { errors: [e.message] }, status: :forbidden
+        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

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/queries/run_query.rb

@@ -83,18 +83,52 @@ module Motor
       # @param result [ActiveRecord::Result]
       # @return [Hash]
       def build_columns_hash(result)
-        result.columns.map do |column_name|
-          column_type = result.column_types[column_name]
+        result.columns.map.with_index do |column_name, index|
+          column_type_class = result.column_types[column_name]
+
+          column_type =
+            if column_type_class
+              ActiveRecordUtils::Types.find_name_for_type(column_type_class)
+            else
+              not_nil_value = result.rows.reduce(nil) do |acc, row|
+                column = row[index]
+
+                break column unless column.nil?
+
+                acc
+              end
+
+              fetch_column_type_from_value(not_nil_value)
+            end
 
           {
             name: column_name,
             display_name: column_name.humanize,
-            column_type: ActiveRecordUtils::Types.find_name_for_type(column_type),
+            column_type: column_type,
             is_array: column_type.class.to_s == 'ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array'
           }
         end
       end
 
+      # @param value [Object]
+      # @return [String]
+      def fetch_column_type_from_value(value)
+        case value
+        when Integer
+          'integer'
+        when Float
+          'float'
+        when Time
+          'datetime'
+        when Date
+          'date'
+        when TrueClass, FalseClass
+          'boolean'
+        else
+          'string'
+        end
+      end
+
       # @param query [Motor::Query]
       # @param limit [Integer]
       # @param variables_hash [Hash]

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.8'
+  VERSION = '0.2.12'
 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-c332e3fdad0c8e350a4c.css.gz": "main-c332e3fdad0c8e350a4c.css.gz",
-  "main-c332e3fdad0c8e350a4c.js.LICENSE.txt": "main-c332e3fdad0c8e350a4c.js.LICENSE.txt",
-  "main-c332e3fdad0c8e350a4c.js.gz": "main-c332e3fdad0c8e350a4c.js.gz",
-  "main.css": "main-c332e3fdad0c8e350a4c.css",
-  "main.js": "main-c332e3fdad0c8e350a4c.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.8
+  version: 0.2.12
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-13 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-c332e3fdad0c8e350a4c.css.gz
-- ui/dist/main-c332e3fdad0c8e350a4c.js.gz
+- ui/dist/main-192e078f9e813b1ffe93.css.gz
+- ui/dist/main-192e078f9e813b1ffe93.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: