rails_admin 1.4.2 → 3.1.2

data/lib/rails_admin/config/fields/factories/association.rb

@@ -1,25 +1,24 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/belongs_to_association'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
-  if association = parent.abstract_model.associations.detect { |a| a.foreign_key == properties.name && [:belongs_to, :has_and_belongs_to_many].include?(a.type) }
-    field = RailsAdmin::Config::Fields::Types.load("#{association.polymorphic? ? :polymorphic : association.type}_association").new(parent, association.name, association)
+  parent.abstract_model.associations.filter { |a| Array(a.foreign_key).include?(properties.name) && %i[belongs_to has_and_belongs_to_many].include?(a.type) }.each do |association|
+    field = RailsAdmin::Config::Fields::Types.load(association.field_type).new(parent, association.name, association)
     fields << field
 
     child_columns = []
-    possible_field_names = begin
-      if association.polymorphic?
-        [:foreign_key, :foreign_type, :foreign_inverse_of]
-      else
-        [:foreign_key]
-      end.collect { |k| association.send(k) }.compact
-    end
+    possible_field_names = if association.polymorphic?
+                             %i[foreign_key foreign_type foreign_inverse_of]
+                           else
+                             [:foreign_key]
+                           end.flat_map { |k| Array(association.send(k)) }.compact
 
     parent.abstract_model.properties.select { |p| possible_field_names.include? p.name }.each do |column|
-      unless child_field = fields.detect { |f| f.name.to_s == column.name.to_s }
-        child_field = RailsAdmin::Config::Fields.default_factory.call(parent, column, fields)
-      end
+      child_field = fields.detect { |f| f.name.to_s == column.name.to_s }
+      child_field ||= RailsAdmin::Config::Fields.default_factory.call(parent, column, fields)
       child_columns << child_field
     end
 
@@ -29,5 +28,5 @@ RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
     end
 
     field.children_fields child_columns.collect(&:name)
-  end
+  end.any?
 end

data/lib/rails_admin/config/fields/factories/carrierwave.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/file_upload'
@@ -7,12 +9,14 @@ RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
   if defined?(::CarrierWave) && model.is_a?(CarrierWave::Mount) && model.uploaders.include?(attachment_name = properties.name.to_s.chomp('_file_name').to_sym)
     columns = [model.uploader_options[attachment_name][:mount_on] || attachment_name, "#{attachment_name}_content_type".to_sym, "#{attachment_name}_file_size".to_sym]
     field = RailsAdmin::Config::Fields::Types.load(
-      [:serialized, :json].include?(properties.type) ? :multiple_carrierwave : :carrierwave,
+      %i[serialized json].include?(properties.type) ? :multiple_carrierwave : :carrierwave,
     ).new(parent, attachment_name, properties)
     fields << field
     children_fields = []
     columns.each do |children_column_name|
-      next unless child_properties = parent.abstract_model.properties.detect { |p| p.name.to_s == children_column_name.to_s }
+      child_properties = parent.abstract_model.properties.detect { |p| p.name.to_s == children_column_name.to_s }
+      next unless child_properties
+
       children_field = fields.detect { |f| f.name == children_column_name } || RailsAdmin::Config::Fields.default_factory.call(parent, child_properties, fields)
       children_field.hide unless field == children_field
       children_field.filterable(false) unless field == children_field

data/lib/rails_admin/config/fields/factories/devise.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/password'
@@ -5,13 +7,15 @@ require 'rails_admin/config/fields/types/password'
 # Register a custom field factory for devise model
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
   if properties.name == :encrypted_password
-    extensions = [:password_salt, :reset_password_token, :remember_token]
+    extensions = %i[password_salt reset_password_token remember_token]
     fields << RailsAdmin::Config::Fields::Types.load(:password).new(parent, :password, properties)
     fields << RailsAdmin::Config::Fields::Types.load(:password).new(parent, :password_confirmation, properties)
     extensions.each do |ext|
       properties = parent.abstract_model.properties.detect { |p| ext == p.name }
       next unless properties
-      unless field = fields.detect { |f| f.name == ext }
+
+      field = fields.detect { |f| f.name == ext }
+      unless field
         RailsAdmin::Config::Fields.default_factory.call(parent, properties, fields)
         field = fields.last
       end

data/lib/rails_admin/config/fields/factories/dragonfly.rb

@@ -1,15 +1,19 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/file_upload'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
-  extensions = [:name, :uid]
-  if (properties.name.to_s =~ /^(.+)_uid$/) && defined?(::Dragonfly) && parent.abstract_model.model.dragonfly_attachment_classes.collect(&:attribute).include?(attachment_name = Regexp.last_match[1].to_sym)
+  extensions = %i[name uid]
+  if (properties.name.to_s =~ /^(.+)_uid$/) && defined?(::Dragonfly) && parent.abstract_model.model.respond_to?(:dragonfly_attachment_classes) && parent.abstract_model.model.dragonfly_attachment_classes.collect(&:attribute).include?(attachment_name = Regexp.last_match[1].to_sym)
     field = RailsAdmin::Config::Fields::Types.load(:dragonfly).new(parent, attachment_name, properties)
     children_fields = []
     extensions.each do |ext|
       children_column_name = "#{attachment_name}_#{ext}".to_sym
-      next unless child_properties = parent.abstract_model.properties.detect { |p| p.name.to_s == children_column_name.to_s }
+      child_properties = parent.abstract_model.properties.detect { |p| p.name.to_s == children_column_name.to_s }
+      next unless child_properties
+
       children_field = fields.detect { |f| f.name == children_column_name } || RailsAdmin::Config::Fields.default_factory.call(parent, child_properties, fields)
       children_field.hide
       children_field.filterable(false)

data/lib/rails_admin/config/fields/factories/enum.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types/enum'
 require 'rails_admin/config/fields/types/active_record_enum'

data/lib/rails_admin/config/fields/factories/paperclip.rb

@@ -1,16 +1,20 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/file_upload'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
-  extensions = [:file_name, :content_type, :file_size, :updated_at, :fingerprint]
+  extensions = %i[file_name content_type file_size updated_at fingerprint]
   model = parent.abstract_model.model
   if (properties.name.to_s =~ /^(.+)_file_name$/) && defined?(::Paperclip) && model.try(:attachment_definitions) && model.attachment_definitions.key?(attachment_name = Regexp.last_match[1].to_sym)
     field = RailsAdmin::Config::Fields::Types.load(:paperclip).new(parent, attachment_name, properties)
     children_fields = []
     extensions.each do |ext|
       children_column_name = "#{attachment_name}_#{ext}".to_sym
-      next unless child_properties = parent.abstract_model.properties.detect { |p| p.name.to_s == children_column_name.to_s }
+      child_properties = parent.abstract_model.properties.detect { |p| p.name.to_s == children_column_name.to_s }
+      next unless child_properties
+
       children_field = fields.detect { |f| f.name == children_column_name } || RailsAdmin::Config::Fields.default_factory.call(parent, child_properties, fields)
       children_field.hide
       children_field.filterable(false)

data/lib/rails_admin/config/fields/factories/password.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types/password'
 

data/lib/rails_admin/config/fields/factories/shrine.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'rails_admin/config/fields'
+require 'rails_admin/config/fields/types'
+require 'rails_admin/config/fields/types/file_upload'
+
+RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
+  next false unless defined?(::Shrine)
+
+  attachment_names = parent.abstract_model.model.ancestors.select { |m| m.is_a?(Shrine::Attachment) }.map { |a| a.instance_variable_get('@name') }
+  next false if attachment_names.blank?
+
+  attachment_name = attachment_names.detect { |a| a == properties.name.to_s.chomp('_data').to_sym }
+  next false unless attachment_name
+
+  field = RailsAdmin::Config::Fields::Types.load(:shrine).new(parent, attachment_name, properties)
+  fields << field
+
+  data_field_name = "#{attachment_name}_data".to_sym
+  child_properties = parent.abstract_model.properties.detect { |p| p.name == data_field_name }
+  next true unless child_properties
+
+  children_field = fields.detect { |f| f.name == data_field_name } || RailsAdmin::Config::Fields.default_factory.call(parent, child_properties, fields)
+  children_field.hide unless field == children_field
+  children_field.filterable(false) unless field == children_field
+
+  field.children_fields([data_field_name])
+  true
+end

data/lib/rails_admin/config/fields/group.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/string/inflections'
 require 'rails_admin/config/proxyable'
 require 'rails_admin/config/configurable'
@@ -12,9 +14,8 @@ module RailsAdmin
         include RailsAdmin::Config::Configurable
         include RailsAdmin::Config::Hideable
 
-        attr_reader :name, :abstract_model
+        attr_reader :name, :abstract_model, :parent, :root
         attr_accessor :section
-        attr_reader :parent, :root
 
         def initialize(parent, name)
           @parent = parent

data/lib/rails_admin/config/fields/types/action_text.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'rails_admin/config/fields/types/text'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class ActionText < Text
+          # Register field type for the type loader
+          RailsAdmin::Config::Fields::Types.register(self)
+
+          register_instance_option :version do
+            '1.3.1'
+          end
+
+          register_instance_option :css_location do
+            "https://cdnjs.cloudflare.com/ajax/libs/trix/#{version}/trix.css"
+          end
+
+          register_instance_option :js_location do
+            "https://cdnjs.cloudflare.com/ajax/libs/trix/#{version}/trix.js"
+          end
+
+          register_instance_option :warn_dynamic_load do
+            true
+          end
+
+          register_instance_option :partial do
+            :form_action_text
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rails_admin/config/fields/types/active_record_enum.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/enum'
 
 module RailsAdmin
@@ -29,20 +31,14 @@ module RailsAdmin
 
           def parse_value(value)
             return unless value.present?
-            if ::Rails.version >= '5'
-              abstract_model.model.attribute_types[name.to_s].serialize(value)
-            else
-              # Depending on the colum type and AR version, we might get a
-              # string or an integer, so we need to handle both cases.
-              enum.fetch(value) do
-                type_cast_value(value)
-              end
-            end
+
+            abstract_model.model.attribute_types[name.to_s].serialize(value)
           end
 
           def parse_input(params)
             value = params[name]
             return unless value
+
             params[name] = parse_input_value(value)
           end
 
@@ -53,19 +49,11 @@ module RailsAdmin
         private
 
           def parse_input_value(value)
-            if ::Rails.version >= '5'
-              abstract_model.model.attribute_types[name.to_s].deserialize(value)
-            else
-              enum.invert[type_cast_value(value)]
-            end
+            abstract_model.model.attribute_types[name.to_s].deserialize(value)
           end
 
           def type_cast_value(value)
-            if ::Rails.version >= '4.2'
-              abstract_model.model.column_types[name.to_s].type_cast_from_user(value)
-            else
-              abstract_model.model.column_types[name.to_s].type_cast(value)
-            end
+            abstract_model.model.column_types[name.to_s].type_cast_from_user(value)
           end
         end
       end

data/lib/rails_admin/config/fields/types/active_storage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/file_upload'
 
 module RailsAdmin
@@ -8,7 +10,7 @@ module RailsAdmin
           RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :thumb_method do
-            {resize: '100x100>'}
+            {resize_to_limit: [100, 100]}
           end
 
           register_instance_option :delete_method do
@@ -17,13 +19,32 @@ module RailsAdmin
 
           register_instance_option :image? do
             if value
-              value.filename.to_s.split('.').last =~ /jpg|jpeg|png|gif|svg/i
+              mime_type = Mime::Type.lookup_by_extension(value.filename.extension_without_delimiter)
+              mime_type.to_s.match?(/^image/)
             end
           end
 
+          register_instance_option :eager_load do
+            {"#{name}_attachment": :blob}
+          end
+
+          register_instance_option :direct? do
+            false
+          end
+
+          register_instance_option :html_attributes do
+            {
+              required: required? && !value.present?,
+            }.merge(
+              direct? && {data: {direct_upload_url: bindings[:view].main_app.rails_direct_uploads_url}} || {},
+            )
+          end
+
           def resource_url(thumb = false)
             return nil unless value
+
             if thumb && value.variable?
+              thumb = thumb_method if thumb == true
               variant = value.variant(thumb)
               Rails.application.routes.url_helpers.rails_blob_representation_path(
                 variant.blob.signed_id, variant.variation.key, variant.blob.filename, only_path: true
@@ -35,7 +56,7 @@ module RailsAdmin
 
           def value
             attachment = super
-            attachment if attachment && attachment.attached?
+            attachment if attachment&.attached?
           end
         end
       end

data/lib/rails_admin/config/fields/types/all.rb

@@ -1,8 +1,12 @@
+# frozen_string_literal: true
+
+require 'rails_admin/config/fields/types/action_text'
 require 'rails_admin/config/fields/types/active_record_enum'
 require 'rails_admin/config/fields/types/active_storage'
 require 'rails_admin/config/fields/types/belongs_to_association'
 require 'rails_admin/config/fields/types/boolean'
 require 'rails_admin/config/fields/types/bson_object_id'
+require 'rails_admin/config/fields/types/composite_keys_belongs_to_association'
 require 'rails_admin/config/fields/types/date'
 require 'rails_admin/config/fields/types/datetime'
 require 'rails_admin/config/fields/types/decimal'
@@ -11,7 +15,6 @@ require 'rails_admin/config/fields/types/enum'
 require 'rails_admin/config/fields/types/file_upload'
 require 'rails_admin/config/fields/types/paperclip'
 require 'rails_admin/config/fields/types/carrierwave'
-require 'rails_admin/config/fields/types/refile'
 require 'rails_admin/config/fields/types/multiple_file_upload'
 require 'rails_admin/config/fields/types/multiple_active_storage'
 require 'rails_admin/config/fields/types/multiple_carrierwave'
@@ -26,6 +29,7 @@ require 'rails_admin/config/fields/types/string'
 require 'rails_admin/config/fields/types/hidden'
 require 'rails_admin/config/fields/types/text'
 require 'rails_admin/config/fields/types/serialized'
+require 'rails_admin/config/fields/types/shrine'
 require 'rails_admin/config/fields/types/time'
 require 'rails_admin/config/fields/types/timestamp'
 require 'rails_admin/config/fields/types/color'
@@ -37,3 +41,4 @@ require 'rails_admin/config/fields/types/froala'
 require 'rails_admin/config/fields/types/json'
 require 'rails_admin/config/fields/types/inet'
 require 'rails_admin/config/fields/types/uuid'
+require 'rails_admin/config/fields/types/citext'

data/lib/rails_admin/config/fields/types/belongs_to_association.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/association'
 
 module RailsAdmin
@@ -7,6 +9,10 @@ module RailsAdmin
         class BelongsToAssociation < RailsAdmin::Config::Fields::Association
           RailsAdmin::Config::Fields::Types.register(self)
 
+          register_instance_option :filter_operators do
+            %w[_discard like not_like is starts_with ends_with] + (required? ? [] : %w[_separator _present _blank])
+          end
+
           register_instance_option :formatted_value do
             (o = value) && o.send(associated_model_config.object_label_method)
           end
@@ -23,24 +29,16 @@ module RailsAdmin
             nested_form ? :form_nested_one : :form_filtering_select
           end
 
-          register_instance_option :inline_add do
-            true
-          end
-
-          register_instance_option :inline_edit do
-            true
-          end
-
-          register_instance_option :eager_load? do
+          register_instance_option :eager_load do
             true
           end
 
           def selected_id
-            bindings[:object].send(foreign_key)
+            bindings[:object].safe_send(association.key_accessor)
           end
 
           def method_name
-            nested_form ? "#{name}_attributes".to_sym : association.foreign_key
+            nested_form ? "#{name}_attributes".to_sym : super
           end
 
           def multiple?

data/lib/rails_admin/config/fields/types/boolean.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     module Fields
@@ -6,19 +8,36 @@ module RailsAdmin
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
+          register_instance_option :labels do
+            {
+              true => %(<span class="fas fa-check"></span>),
+              false => %(<span class="fas fa-times"></span>),
+              nil => %(<span class="fas fa-minus"></span>),
+            }
+          end
+
+          register_instance_option :css_classes do
+            {
+              true => 'success',
+              false => 'danger',
+              nil => 'default',
+            }
+          end
+
+          register_instance_option :filter_operators do
+            %w[_discard true false] + (required? ? [] : %w[_separator _present _blank])
+          end
+
+          register_instance_option :nullable? do
+            properties&.nullable?
+          end
+
           register_instance_option :view_helper do
             :check_box
           end
 
           register_instance_option :pretty_value do
-            case value
-            when nil
-              %(<span class='label label-default'>&#x2012;</span>)
-            when false
-              %(<span class='label label-danger'>&#x2718;</span>)
-            when true
-              %(<span class='label label-success'>&#x2713;</span>)
-            end.html_safe
+            %(<span class="badge bg-#{css_classes[form_value]}">#{labels[form_value]}</span>).html_safe
           end
 
           register_instance_option :export_value do
@@ -29,10 +48,21 @@ module RailsAdmin
             :form_boolean
           end
 
+          def form_value
+            case value
+            when true, false
+              value
+            end
+          end
+
           # Accessor for field's help text displayed below input field.
           def generic_help
             ''
           end
+
+          def parse_input(params)
+            params[name] = params[name].presence if params.key?(name)
+          end
         end
       end
     end

data/lib/rails_admin/config/fields/types/bson_object_id.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/string'
 
 module RailsAdmin

data/lib/rails_admin/config/fields/types/carrierwave.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/base'
 require 'rails_admin/config/fields/types/file_upload'
 
@@ -22,6 +24,7 @@ module RailsAdmin
 
           def resource_url(thumb = false)
             return nil unless (uploader = bindings[:object].send(name)).present?
+
             thumb.present? ? uploader.send(thumb).url : uploader.url
           end
         end

data/lib/rails_admin/config/fields/types/citext.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'rails_admin/config/fields/types/text'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class Citext < Text
+          RailsAdmin::Config::Fields::Types.register(:citext, self)
+        end
+      end
+    end
+  end
+end

data/lib/rails_admin/config/fields/types/ck_editor.rb

@@ -1,13 +1,19 @@
-require 'rails_admin/config/fields/base'
+# frozen_string_literal: true
+
+require 'rails_admin/config/fields/types/text'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class CKEditor < RailsAdmin::Config::Fields::Types::Text
+        class CKEditor < Text
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
+          register_instance_option :version do
+            '4.11.4'
+          end
+
           # If you want to have a different toolbar configuration for CKEditor
           # create your own custom config.js and override this configuration
           register_instance_option :config_js do
@@ -21,16 +27,12 @@ module RailsAdmin
 
           # Use this if you want to point to a cloud instances of the base CKeditor
           register_instance_option :base_location do
-            "#{Rails.application.config.assets.prefix}/ckeditor/"
+            "https://cdnjs.cloudflare.com/ajax/libs/ckeditor/#{version}/"
           end
 
           register_instance_option :partial do
             :form_ck_editor
           end
-
-          [:base_location, :config_js, :location].each do |key|
-            register_deprecated_instance_option :"ckeditor_#{key}", key
-          end
         end
       end
     end

data/lib/rails_admin/config/fields/types/code_mirror.rb

@@ -1,10 +1,12 @@
-require 'rails_admin/config/fields/base'
+# frozen_string_literal: true
+
+require 'rails_admin/config/fields/types/text'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class CodeMirror < RailsAdmin::Config::Fields::Types::Text
+        class CodeMirror < Text
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
@@ -16,31 +18,29 @@ module RailsAdmin
             }
           end
 
+          register_instance_option :version do
+            '5.46.0'
+          end
+
           # Pass the location of the theme and mode for Codemirror
           register_instance_option :assets do
             {
-              mode: ::ActionController::Base.helpers.asset_path('codemirror/modes/css.js'),
-              theme: ::ActionController::Base.helpers.asset_path('codemirror/themes/night.css'),
+              mode: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/#{version}/mode/css/css.min.js",
+              theme: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/#{version}/theme/night.min.css",
             }
           end
 
-          # Use this if you want to point to a cloud instances of CodeMirror
           register_instance_option :js_location do
-            ::ActionController::Base.helpers.asset_path('codemirror.js')
+            "https://cdnjs.cloudflare.com/ajax/libs/codemirror/#{version}/codemirror.min.js"
           end
 
-          # Use this if you want to point to a cloud instances of CodeMirror
           register_instance_option :css_location do
-            ::ActionController::Base.helpers.asset_path('codemirror.css')
+            "https://cdnjs.cloudflare.com/ajax/libs/codemirror/#{version}/codemirror.min.css"
           end
 
           register_instance_option :partial do
             :form_code_mirror
           end
-
-          [:assets, :config, :css_location, :js_location].each do |key|
-            register_deprecated_instance_option :"codemirror_#{key}", key
-          end
         end
       end
     end