motor-admin 0.4.21 → 0.4.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41dcc579edfa90d944799b97938fff85baf55fa1a8ccab574767666b54312696
-  data.tar.gz: a5206810014e3dde9824f4bf57ffb98516b8beec3e2b1d8066042b0fee9a1cfa
+  metadata.gz: fa8f8bf8e08d5de91571f6ccd67b723a0f5fc131f8447de20e71087879f9eb5c
+  data.tar.gz: 80d865f7f20b76f1a15dad48e241de65f174a24bbb35fcd70a0a7c93d8c0bbbc
 SHA512:
-  metadata.gz: 552ac69045c32753f632b90c7f03b4bee1132d5aee0a5b0fecce574faf712fa97665fd20b19ff0a8592a093249f0df56a07a51025dfae28829b8f0f26f6c6d1d
-  data.tar.gz: 0b644839ddd4c09a8f2efae29c70293a05bda6b1c48fe460bf16c8eabf711dad7a24c24f70566df4b99fead036dd2e7963d89affdeac645baec3614b4fd043fa
+  metadata.gz: d5f9f50c225d0a12840dbbc2f65e0c99ba5f147cdf8cbc9e5f8f1f9c2aaf253eb11562fdc6d23ba04904d22bf51adc857b626b06530330a381e65fb6cbab0d40
+  data.tar.gz: 1b2ffb087aa375a5e57355d2b332b1efbc5dc04e982e3f8bdfd48c9b3ea88282654b8c77590121fa594ddb332b8dca49bf58356d6a3328523ff2426267178193

data/README.md

@@ -39,6 +39,7 @@ $ rails motor:install && rake db:migrate
 * [Dashboards](#dashboards)
 * [Email alerts](#email-alerts)
 * [Authorization](#authorization)
+* [Active Storage](#active-storage)
 * [Intelligence search](#intelligence-search)
 * [I18n](#i18n)
 * [Optimized for mobile](#optimized-for-mobile)
@@ -134,6 +135,16 @@ Intelligence search can be opened via the top right corner button or using <kbd>
 
 Motor Admin allows to set row-level and column-level permissions via [cancan](https://github.com/CanCanCommunity/cancancan) gem. Admin UI permissions should be defined in `app/models/motor/ability.rb` file in `Motor::Ability` class. See [Motor Admin guide](https://github.com/motor-admin/motor-admin-rails/blob/master/guides/defining_permissions.md) and [CanCan documentation](https://github.com/CanCanCommunity/cancancan/blob/develop/docs/Defining-Abilities.md) to learn how to define user permissions.
 
+### Active Storage
+
+Motor Admin is configured by default to perform uploads to the provider you configured in your `storage.yml` file for Active Storage. If you are using large uploads within Motor Admin you will need to enable direct uploads by setting the following ENV variable. 
+
+```sh
+MOTOR_ACTIVE_STORAGE_DIRECT_UPLOADS_ENABLED=true
+```
+
+_Note: At the moment, this will enable direct uploads globally_
+
 ### I18n
 
 Motor Admin can use Rails ActiveRecord i18n keys to render resource translations:

data/app/controllers/motor/run_api_requests_controller.rb

@@ -16,6 +16,7 @@ module Motor
 
     private
 
+    # rubocop:disable Metrics/AbcSize
     def respond_with_result
       response = Motor::ApiConfigs.run(find_or_initialize_api_config,
                                        method: request_params[:method],
@@ -23,12 +24,16 @@ module Motor
                                        body: request_params[:body],
                                        params: request_params[:params],
                                        headers: { 'Authorization' => "Bearer #{current_user_jwt}" })
+      response.to_hash.each do |key, (value)|
+        next if key.casecmp('transfer-encoding').zero?
 
-      response.to_hash.each { |key, (value)| headers[key] = value }
+        headers[key] = value
+      end
 
       self.response_body = response.body
       self.status = response.code.to_i
     end
+    # rubocop:enable Metrics/AbcSize
 
     def find_or_initialize_api_config
       Motor::ApiConfig.find_by(name: request_params[:api_config_name]) ||

data/app/controllers/motor/run_graphql_requests_controller.rb

@@ -17,8 +17,11 @@ module Motor
                                               query: request_params[:query],
                                               variables: request_params[:variables],
                                               headers: { 'Authorization' => "Bearer #{current_user_jwt}" })
+      response.to_hash.each do |key, (value)|
+        next if key.casecmp('transfer-encoding').zero?
 
-      response.to_hash.each { |key, (value)| headers[key] = value }
+        headers[key] = value
+      end
 
       self.response_body = response.body
       self.status = response.code.to_i

data/app/models/motor/alert.rb

@@ -12,7 +12,12 @@ module Motor
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
 
     attribute :preferences, default: -> { ActiveSupport::HashWithIndifferentAccess.new }
-    serialize :preferences, HashSerializer
+
+    if Rails.version.to_f >= 7.1
+      serialize :preferences, coder: HashSerializer
+    else
+      serialize :preferences, HashSerializer
+    end
 
     scope :active, -> { where(deleted_at: nil) }
     scope :enabled, -> { where(is_enabled: true) }

data/app/models/motor/api_config.rb

@@ -8,7 +8,12 @@ module Motor
     attribute :credentials, default: -> { ActiveSupport::HashWithIndifferentAccess.new }
 
     serialize :credentials, Motor::HashSerializer
-    serialize :preferences, Motor::HashSerializer
+
+    if Rails.version.to_f >= 7.1
+      serialize :preferences, coder: Motor::HashSerializer
+    else
+      serialize :preferences, Motor::HashSerializer
+    end
 
     has_one :form, dependent: nil, foreign_key: :api_config_name, primary_key: :name, inverse_of: :api_config
 

data/app/models/motor/audit.rb

@@ -4,6 +4,10 @@ module Motor
   class Audit < Audited::Audit
     self.table_name = 'motor_audits'
 
-    serialize :audited_changes, HashSerializer
+    if Rails.version.to_f >= 7.1
+      serialize :audited_changes, coder: HashSerializer
+    else
+      serialize :audited_changes, HashSerializer
+    end
   end
 end

data/app/models/motor/config.rb

@@ -4,6 +4,10 @@ module Motor
   class Config < ::Motor::ApplicationRecord
     audited
 
-    serialize :value, HashSerializer
+    if Rails.version.to_f >= 7.1
+      serialize :value, coder: HashSerializer
+    else
+      serialize :value, HashSerializer
+    end
   end
 end

data/app/models/motor/dashboard.rb

@@ -10,7 +10,12 @@ module Motor
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
 
     attribute :preferences, default: -> { ActiveSupport::HashWithIndifferentAccess.new }
-    serialize :preferences, HashSerializer
+
+    if Rails.version.to_f >= 7.1
+      serialize :preferences, coder: HashSerializer
+    else
+      serialize :preferences, HashSerializer
+    end
 
     scope :active, -> { where(deleted_at: nil) }
 

data/app/models/motor/form.rb

@@ -11,7 +11,12 @@ module Motor
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
 
     attribute :preferences, default: -> { ActiveSupport::HashWithIndifferentAccess.new }
-    serialize :preferences, HashSerializer
+
+    if Rails.version.to_f >= 7.1
+      serialize :preferences, coder: HashSerializer
+    else
+      serialize :preferences, HashSerializer
+    end
 
     scope :active, -> { where(deleted_at: nil) }
   end

data/app/models/motor/query.rb

@@ -11,7 +11,12 @@ module Motor
     has_many :alerts, dependent: :destroy
 
     attribute :preferences, default: -> { ActiveSupport::HashWithIndifferentAccess.new }
-    serialize :preferences, HashSerializer
+
+    if Rails.version.to_f >= 7.1
+      serialize :preferences, coder: HashSerializer
+    else
+      serialize :preferences, HashSerializer
+    end
 
     scope :active, -> { where(deleted_at: nil) }
 

data/app/models/motor/resource.rb

@@ -5,6 +5,11 @@ module Motor
     audited
 
     attribute :preferences, default: -> { ActiveSupport::HashWithIndifferentAccess.new }
-    serialize :preferences, HashSerializer
+
+    if Rails.version.to_f >= 7.1
+      serialize :preferences, coder: HashSerializer
+    else
+      serialize :preferences, HashSerializer
+    end
   end
 end

data/lib/generators/motor/migration.rb

@@ -6,7 +6,7 @@ module Motor
       def next_migration_number(dirname)
         next_migration_number = current_migration_number(dirname) + 1
 
-        if ::ActiveRecord::Base.timestamped_migrations
+        if ::ActiveRecord::Base.try(:timestamped_migrations) || ::ActiveRecord.try(:timestamped_migrations)
           [Time.now.utc.strftime('%Y%m%d%H%M%S'), format('%.14d', next_migration_number)].max
         else
           format('%.3d', next_migration_number)

data/lib/motor/admin.rb

@@ -4,6 +4,8 @@ module Motor
   class Admin < ::Rails::Engine
     config.custom_html = ''
 
+    ActiveSupport.cache_format_version = Rails.version.to_f
+
     if !Motor.development? && Rails.env.development?
       config.eager_load_paths.delete(File.expand_path('../../app/controllers', __dir__))
       config.eager_load_paths.delete(File.expand_path('../../app/controllers/concerns', __dir__))

data/lib/motor/configs/build_ui_app_tag.rb

@@ -34,6 +34,7 @@ module Motor
       end
 
       # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/MethodLength
       # @return [Hash]
       def build_data(cache_keys = {}, current_user = nil, current_ability = nil)
         configs_cache_key = cache_keys[:configs]
@@ -46,6 +47,7 @@ module Motor
           base_path: Motor::Admin.routes.url_helpers.motor_path,
           cable_path: Motor::Admin.routes.url_helpers.try(:motor_cable_path),
           admin_settings_path: Rails.application.routes.url_helpers.try(:admin_settings_general_path),
+          active_storage_direct_uploads_enabled: ENV['MOTOR_ACTIVE_STORAGE_DIRECT_UPLOADS_ENABLED'].present?,
           schema: Motor::BuildSchema.call(cache_keys, current_ability),
           header_links: header_links_data_hash(current_user, current_ability, configs_cache_key),
           homepage_layout: homepage_layout_data_hash(configs_cache_key),
@@ -59,6 +61,7 @@ module Motor
           forms: forms_data_hash(build_cache_key(cache_keys, :forms, current_user, current_ability), current_ability) }
       end
       # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/MethodLength
 
       def i18n_data
         I18n.t('motor', default: I18n.t('motor', locale: :en))

data/lib/motor/version.rb

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

data/ui/dist/manifest.json

@@ -3964,9 +3964,9 @@
   "images/layers-2x.png": "images/layers-2x.png",
   "images/layers.png": "images/layers.png",
   "images/marker-icon.png": "images/marker-icon.png",
-  "main-3d067b5a5d0ea3475112.css.gz": "main-3d067b5a5d0ea3475112.css.gz",
-  "main-3d067b5a5d0ea3475112.js.LICENSE.txt": "main-3d067b5a5d0ea3475112.js.LICENSE.txt",
-  "main-3d067b5a5d0ea3475112.js.gz": "main-3d067b5a5d0ea3475112.js.gz",
-  "main.css": "main-3d067b5a5d0ea3475112.css",
-  "main.js": "main-3d067b5a5d0ea3475112.js"
+  "main-3b866105d1b5846018e0.css.gz": "main-3b866105d1b5846018e0.css.gz",
+  "main-3b866105d1b5846018e0.js.LICENSE.txt": "main-3b866105d1b5846018e0.js.LICENSE.txt",
+  "main-3b866105d1b5846018e0.js.gz": "main-3b866105d1b5846018e0.js.gz",
+  "main.css": "main-3b866105d1b5846018e0.css",
+  "main.js": "main-3b866105d1b5846018e0.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.4.21
+  version: 0.4.23
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-09 00:00:00.000000000 Z
+date: 2023-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ar_lazy_preload
@@ -2235,8 +2235,8 @@ files:
 - ui/dist/images/layers-2x.png
 - ui/dist/images/layers.png
 - ui/dist/images/marker-icon.png
-- ui/dist/main-3d067b5a5d0ea3475112.css.gz
-- ui/dist/main-3d067b5a5d0ea3475112.js.gz
+- ui/dist/main-3b866105d1b5846018e0.css.gz
+- ui/dist/main-3b866105d1b5846018e0.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: