rails_admin 2.0.2 → 3.1.0.beta

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]
+  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

@@ -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'
@@ -5,7 +7,7 @@ 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") }
+  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 }

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/text'
 
 module RailsAdmin
@@ -9,7 +11,7 @@ module RailsAdmin
           RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :version do
-            '1.1.1'
+            '1.3.1'
           end
 
           register_instance_option :css_location do

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,12 +31,14 @@ module RailsAdmin
 
           def parse_value(value)
             return unless value.present?
+
             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
 

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,12 +19,18 @@ 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
+
           def resource_url(thumb = false)
             return nil unless value
+
             if thumb && value.variable?
               thumb = thumb_method if thumb == true
               variant = value.variant(thumb)
@@ -36,7 +44,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,9 +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'
@@ -38,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
@@ -23,28 +25,16 @@ module RailsAdmin
             nested_form ? :form_nested_one : :form_filtering_select
           end
 
-          register_instance_option :inline_add do
+          register_instance_option :eager_load do
             true
           end
 
-          register_instance_option :inline_edit do
-            true
-          end
-
-          register_instance_option :eager_load? do
-            true
-          end
-
-          def associated_primary_key
-            @associated_primary_key ||= association.primary_key
-          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,32 @@ 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 :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 +44,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,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/text'
 
 module RailsAdmin

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/string_like'
 
 module RailsAdmin
@@ -15,10 +17,14 @@ module RailsAdmin
             :form_colorpicker
           end
 
+          register_instance_option :view_helper do
+            :color_field
+          end
+
           register_instance_option :color do
             if value.present?
-              if value =~ /^[0-9a-fA-F]{3,6}$/
-                '#' + value
+              if /^[0-9a-fA-F]{3,6}$/.match?(value)
+                "##{value}"
               else
                 value
               end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'rails_admin/config/fields/types/belongs_to_association'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class CompositeKeysBelongsToAssociation < RailsAdmin::Config::Fields::Types::BelongsToAssociation
+          RailsAdmin::Config::Fields::Types.register(self)
+
+          register_instance_option :allowed_methods do
+            nested_form ? [method_name] : Array(association.foreign_key)
+          end
+
+          def selected_id
+            association.foreign_key.map { |attribute| bindings[:object].safe_send(attribute) }.to_composite_keys.to_s
+          end
+
+          def parse_input(params)
+            return unless params[method_name].present? && association.foreign_key.is_a?(Array) && !nested_form
+
+            association.foreign_key.zip(CompositePrimaryKeys::CompositeKeys.parse(params.delete(method_name))).each do |key, value|
+              params[key] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/datetime'
 
 module RailsAdmin
@@ -7,21 +9,25 @@ module RailsAdmin
         class Date < RailsAdmin::Config::Fields::Types::Datetime
           RailsAdmin::Config::Fields::Types.register(self)
 
-          register_instance_option :date_format do
-            :long
+          def parse_value(value)
+            ::Date.parse(value) if value.present?
           end
 
-          register_instance_option :i18n_scope do
-            [:date, :formats]
+          register_instance_option :date_format do
+            :long
           end
 
           register_instance_option :datepicker_options do
             {
-              showTodayButton: true,
-              format: parser.to_momentjs,
+              allowInput: true,
+              altFormat: flatpickr_format,
             }
           end
 
+          register_instance_option :i18n_scope do
+            %i[date formats]
+          end
+
           register_instance_option :html_attributes do
             {
               required: required?,

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/base'
 require 'rails_admin/support/datetime'
 
@@ -8,47 +10,37 @@ module RailsAdmin
         class Datetime < RailsAdmin::Config::Fields::Base
           RailsAdmin::Config::Fields::Types.register(self)
 
-          def parser
-            RailsAdmin::Support::Datetime.new(strftime_format)
-          end
-
           def parse_value(value)
-            parser.parse_string(value)
+            ::Time.zone.parse(value)
           end
 
           def parse_input(params)
             params[name] = parse_value(params[name]) if params[name]
           end
 
-          def value
-            parent_value = super
-            if %w(DateTime Date Time).include?(parent_value.class.name)
-              parent_value.in_time_zone
-            else
-              parent_value
-            end
-          end
-
           register_instance_option :date_format do
             :long
           end
 
           register_instance_option :i18n_scope do
-            [:time, :formats]
+            %i[time formats]
           end
 
           register_instance_option :strftime_format do
-            begin
-              ::I18n.t(date_format, scope: i18n_scope, raise: true)
-            rescue ::I18n::ArgumentError
-              "%B %d, %Y %H:%M"
-            end
+            ::I18n.t(date_format, scope: i18n_scope, raise: true)
+          rescue ::I18n::ArgumentError
+            '%B %d, %Y %H:%M'
+          end
+
+          register_instance_option :flatpickr_format do
+            RailsAdmin::Support::Datetime.to_flatpickr_format(strftime_format)
           end
 
           register_instance_option :datepicker_options do
             {
-              showTodayButton: true,
-              format: parser.to_momentjs,
+              allowInput: true,
+              enableTime: true,
+              altFormat: flatpickr_format,
             }
           end
 
@@ -63,8 +55,13 @@ module RailsAdmin
             true
           end
 
+          register_instance_option :queryable? do
+            false
+          end
+
           register_instance_option :formatted_value do
-            if time = (value || default_value)
+            time = (value || default_value)
+            if time
               ::I18n.l(time, format: strftime_format)
             else
               ''.html_safe
@@ -74,6 +71,14 @@ module RailsAdmin
           register_instance_option :partial do
             :form_datetime
           end
+
+          register_deprecated_instance_option :momentjs_format do
+            ActiveSupport::Deprecation.warn('The momentjs_format configuration option is deprecated, please use flatpickr_format with corresponding values here: https://flatpickr.js.org/formatting/')
+          end
+
+          def form_value
+            value&.in_time_zone&.strftime('%FT%T') || form_default_value
+          end
         end
       end
     end

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

@@ -1,12 +1,21 @@
-require 'rails_admin/config/fields/base'
+# frozen_string_literal: true
+
+require 'rails_admin/config/fields/types/numeric'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class Decimal < RailsAdmin::Config::Fields::Base
+        class Decimal < RailsAdmin::Config::Fields::Types::Numeric
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
+
+          register_instance_option :html_attributes do
+            {
+              required: required?,
+              step: 'any',
+            }
+          end
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/base'
 require 'rails_admin/config/fields/types/file_upload'
 
@@ -12,7 +14,8 @@ module RailsAdmin
           register_instance_option :image? do
             false unless value
             if abstract_model.model.new.respond_to?("#{name}_name")
-              bindings[:object].send("#{name}_name").to_s.split('.').last =~ /jpg|jpeg|png|gif/i
+              mime_type = Mime::Type.lookup_by_extension(bindings[:object].send("#{name}_name").to_s.split('.').last)
+              mime_type.to_s.match?(/^image/)
             else
               true # Dragonfly really is image oriented
             end
@@ -32,6 +35,7 @@ module RailsAdmin
 
           def resource_url(thumb = false)
             return nil unless (v = value)
+
             thumb ? v.thumb(thumb).try(:url) : v.url
           end
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/string'
 
 module RailsAdmin
@@ -21,7 +23,7 @@ module RailsAdmin
 
           register_instance_option :pretty_value do
             if enum.is_a?(::Hash)
-              enum.reject { |_k, v| v.to_s != value.to_s }.keys.first.to_s.presence || value.presence || ' - '
+              enum.select { |_k, v| v.to_s == value.to_s }.keys.first.to_s.presence || value.presence || ' - '
             elsif enum.is_a?(::Array) && enum.first.is_a?(::Array)
               enum.detect { |e| e[1].to_s == value.to_s }.try(:first).to_s.presence || value.presence || ' - '
             else