rails_admin 2.0.2 → 3.1.0.beta

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/string'
 
 module RailsAdmin
@@ -31,6 +33,10 @@ module RailsAdmin
             resource_url.to_s
           end
 
+          register_instance_option :link_name do
+            value
+          end
+
           register_instance_option :pretty_value do
             if value.presence
               v = bindings[:view]
@@ -38,15 +44,16 @@ module RailsAdmin
               if image
                 thumb_url = resource_url(thumb_method)
                 image_html = v.image_tag(thumb_url, class: 'img-thumbnail')
-                url != thumb_url ? v.link_to(image_html, url, target: '_blank', rel: 'noopener noreferrer') : image_html
+                url == thumb_url ? image_html : v.link_to(image_html, url, target: '_blank', rel: 'noopener noreferrer')
               else
-                v.link_to(value, url, target: '_blank', rel: 'noopener noreferrer')
+                v.link_to(link_name, url, target: '_blank', rel: 'noopener noreferrer')
               end
             end
           end
 
           register_instance_option :image? do
-            (url = resource_url.to_s) && url.split('.').last =~ /jpg|jpeg|png|gif|svg/i
+            mime_type = Mime::Type.lookup_by_extension(resource_url.to_s.split('.').last)
+            mime_type.to_s.match?(/^image/)
           end
 
           register_instance_option :allowed_methods do
@@ -61,7 +68,7 @@ module RailsAdmin
 
           # virtual class
           def resource_url
-            raise('not implemented')
+            raise 'not implemented'
           end
 
           def virtual?

data/lib/rails_admin/config/fields/types/float.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 Float < RailsAdmin::Config::Fields::Base
+        class Float < 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/froala.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/has_and_belongs_to_many_association.rb

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/association'
 
 module RailsAdmin
@@ -17,18 +19,18 @@ module RailsAdmin
             false
           end
 
-          register_instance_option :inline_add do
-            true
-          end
-
           def method_name
-            nested_form ? "#{super}_attributes".to_sym : "#{super.to_s.singularize}_ids".to_sym # name_ids
+            nested_form ? "#{name}_attributes".to_sym : super
           end
 
           # Reader for validation errors of the bound object
           def errors
             bindings[:object].errors[name]
           end
+
+          def associated_prepopulate_params
+            {associated_model_config.abstract_model.param_key => {association.foreign_key => bindings[:object].try(:id)}}
+          end
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/association'
 
 module RailsAdmin
@@ -17,29 +19,21 @@ module RailsAdmin
             (o = value) && o.send(associated_model_config.object_label_method)
           end
 
-          register_instance_option :inline_add do
-            true
-          end
-
-          register_instance_option :inline_edit do
-            true
-          end
-
-          def editable?
-            (nested_form || abstract_model.model.new.respond_to?("#{name}_id=")) && super
-          end
-
           def selected_id
-            value.try :id
+            value.try(:id).try(:to_s)
           end
 
           def method_name
-            nested_form ? "#{name}_attributes".to_sym : "#{name}_id".to_sym
+            nested_form ? "#{name}_attributes".to_sym : super
           end
 
           def multiple?
             false
           end
+
+          def associated_prepopulate_params
+            {associated_model_config.abstract_model.param_key => {association.foreign_key => bindings[:object].try(:id)}}
+          end
         end
       end
     end

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

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

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

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

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

@@ -1,17 +1,15 @@
-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 Integer < RailsAdmin::Config::Fields::Base
+        class Integer < RailsAdmin::Config::Fields::Types::Numeric
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
-          register_instance_option :view_helper do
-            :number_field
-          end
-
           register_instance_option :sort_reverse? do
             serial?
           end

data/lib/rails_admin/config/fields/types/json.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/multiple_active_storage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/multiple_file_upload'
 
 module RailsAdmin
@@ -9,7 +11,11 @@ module RailsAdmin
 
           class ActiveStorageAttachment < RailsAdmin::Config::Fields::Types::MultipleFileUpload::AbstractAttachment
             register_instance_option :thumb_method do
-              {resize: '100x100>'}
+              {resize_to_limit: [100, 100]}
+            end
+
+            register_instance_option :keep_value do
+              value.signed_id
             end
 
             register_instance_option :delete_value do
@@ -18,12 +24,14 @@ 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
 
             def resource_url(thumb = false)
               return nil unless value
+
               if thumb && value.variable?
                 variant = value.variant(thumb_method)
                 Rails.application.routes.url_helpers.rails_blob_representation_path(
@@ -39,9 +47,17 @@ module RailsAdmin
             ActiveStorageAttachment
           end
 
+          register_instance_option :keep_method do
+            method_name if ::ActiveStorage.replace_on_assign_to_many
+          end
+
           register_instance_option :delete_method do
             "remove_#{name}" if bindings[:object].respond_to?("remove_#{name}")
           end
+
+          register_instance_option :eager_load do
+            {"#{name}_attachments": :blob}
+          end
         end
       end
     end

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     module Fields
@@ -36,19 +38,21 @@ module RailsAdmin
                 if image
                   thumb_url = resource_url(thumb_method)
                   image_html = v.image_tag(thumb_url, class: 'img-thumbnail')
-                  url != thumb_url ? v.link_to(image_html, url, target: '_blank', rel: 'noopener noreferrer') : image_html
+                  url == thumb_url ? image_html : v.link_to(image_html, url, target: '_blank', rel: 'noopener noreferrer')
                 else
-                  v.link_to(value, url, target: '_blank', rel: 'noopener noreferrer')
+                  display_value = value.respond_to?(:filename) ? value.filename : value
+                  v.link_to(display_value, url, target: '_blank', rel: 'noopener noreferrer')
                 end
               end
             end
 
             register_instance_option :image? do
-              (url = resource_url.to_s) && url.split('.').last =~ /jpg|jpeg|png|gif|svg/i
+              mime_type = Mime::Type.lookup_by_extension(resource_url.to_s.split('.').last)
+              mime_type.to_s.match?(/^image/)
             end
 
             def resource_url(_thumb = false)
-              raise('not implemented')
+              raise 'not implemented'
             end
           end
 

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'rails_admin/config/fields/base'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class Numeric < RailsAdmin::Config::Fields::Base
+          # Register field type for the type loader
+          RailsAdmin::Config::Fields::Types.register(self)
+
+          register_instance_option :view_helper do
+            :number_field
+          end
+        end
+      end
+    end
+  end
+end

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

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

data/lib/rails_admin/config/fields/types/password.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/polymorphic_association.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/belongs_to_association'
 
 module RailsAdmin
@@ -45,12 +47,13 @@ module RailsAdmin
             [children_fields]
           end
 
-          register_instance_option :eager_load? do
+          register_instance_option :eager_load do
             false
           end
 
           def associated_collection(type)
             return [] if type.blank?
+
             config = RailsAdmin.config(type)
             config.abstract_model.all.collect do |object|
               [object.send(config.object_label_method), object.id]
@@ -58,7 +61,7 @@ module RailsAdmin
           end
 
           def associated_model_config
-            @associated_model_config ||= association.klass.collect { |type| RailsAdmin.config(type) }.select { |config| !config.excluded? }
+            @associated_model_config ||= association.klass.collect { |type| RailsAdmin.config(type) }.reject(&:excluded?)
           end
 
           def polymorphic_type_collection

data/lib/rails_admin/config/fields/types/serialized.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/shrine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/file_upload'
 
 module RailsAdmin
@@ -10,14 +12,16 @@ module RailsAdmin
           register_instance_option :thumb_method do
             unless defined? @thumb_method
               @thumb_method = begin
-                next nil unless value.is_a?(Hash)
+                next nil unless bindings[:object].respond_to?("#{name}_derivatives")
+
+                derivatives = bindings[:object].public_send("#{name}_derivatives")
 
-                if value.key?(:thumb)
+                if derivatives.key?(:thumb)
                   :thumb
-                elsif value.key?(:thumbnail)
+                elsif derivatives.key?(:thumbnail)
                   :thumbnail
                 else
-                  value.keys.first
+                  derivatives.keys.first
                 end
               end
             end
@@ -29,21 +33,21 @@ module RailsAdmin
           end
 
           register_instance_option :cache_method do
-            name
+            name if bindings[:object].try("cached_#{name}_data")
           end
 
           register_instance_option :cache_value do
-            bindings[:object].public_send("cached_#{name}_data") if bindings[:object].respond_to?("cached_#{name}_data")
+            bindings[:object].try("cached_#{name}_data")
+          end
+
+          register_instance_option :link_name do
+            value.original_filename
           end
 
           def resource_url(thumb = nil)
             return nil unless value
 
-            if value.is_a?(Hash)
-              value[thumb || value.keys.first].url
-            else
-              value.url
-            end
+            thumb && bindings[:object].public_send(:"#{name}", thumb).try(:url) || value.url
           end
         end
       end

data/lib/rails_admin/config/fields/types/simple_mde.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/string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/string_like'
 
 module RailsAdmin
@@ -20,7 +22,7 @@ module RailsAdmin
           end
 
           def generic_help
-            text = (required? ? I18n.translate('admin.form.required') : I18n.translate('admin.form.optional')) + '. '
+            text = "#{required? ? I18n.translate('admin.form.required') : I18n.translate('admin.form.optional')}. "
             if valid_length.present? && valid_length[:is].present?
               text += "#{I18n.translate('admin.form.char_length_of').capitalize} #{valid_length[:is]}."
             else

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

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

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/datetime'
 
 module RailsAdmin
@@ -8,10 +10,16 @@ module RailsAdmin
           RailsAdmin::Config::Fields::Types.register(self)
 
           def parse_value(value)
-            parent_value = super(value)
-            return unless parent_value
-            value_with_tz = parent_value.in_time_zone
-            ::DateTime.parse(value_with_tz.strftime('%Y-%m-%d %H:%M:%S'))
+            abstract_model.model.type_for_attribute(name.to_s).serialize(super)&.change(year: 2000, month: 1, day: 1)
+          end
+
+          register_instance_option :datepicker_options do
+            {
+              allowInput: true,
+              altFormat: flatpickr_format,
+              enableTime: true,
+              noCalendar: true,
+            }
           end
 
           register_instance_option :strftime_format do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/datetime'
 
 module RailsAdmin
@@ -7,10 +9,6 @@ module RailsAdmin
         class Timestamp < RailsAdmin::Config::Fields::Types::Datetime
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
-
-          @format = :long
-          @i18n_scope = [:time, :formats]
-          @js_plugin_options = {}
         end
       end
     end

data/lib/rails_admin/config/fields/types/uuid.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/wysihtml5.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.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/string/inflections'
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/association'
@@ -9,7 +11,7 @@ module RailsAdmin
         @@registry = {}
 
         def self.load(type)
-          @@registry[type.to_sym] || raise("Unsupported field datatype: #{type}")
+          @@registry.fetch(type.to_sym) { raise "Unsupported field datatype: #{type}" }
         end
 
         def self.register(type, klass = nil)

data/lib/rails_admin/config/fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     module Fields
@@ -20,7 +22,7 @@ module RailsAdmin
 
       # Registry of field factories.
       #
-      # Field factory is an anonymous function that recieves the parent object,
+      # Field factory is an anonymous function that receives the parent object,
       # an array of field properties and an array of fields already instantiated.
       #
       # If the factory returns true then that property will not be run through
@@ -50,13 +52,15 @@ module RailsAdmin
         parent.abstract_model.properties.each do |properties|
           # Unless a previous factory has already loaded current field as well
           next if fields.detect { |f| f.name == properties.name }
+
           # Loop through factories until one returns true
           @@registry.detect { |factory| factory.call(parent, properties, fields) }
         end
         # Load fields for all associations (relations)
-        parent.abstract_model.associations.select { |a| a.type != :belongs_to }.each do |association| # :belongs_to are created by factory for belongs_to fields
+        parent.abstract_model.associations.reject { |a| a.type == :belongs_to }.each do |association| # :belongs_to are created by factory for belongs_to fields
           # Unless a previous factory has already loaded current field as well
           next if fields.detect { |f| f.name == association.name }
+
           # Loop through factories until one returns true
           @@registry.detect { |factory| factory.call(parent, association, fields) }
         end

data/lib/rails_admin/config/groupable.rb

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

data/lib/rails_admin/config/has_description.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     # Provides accessor and autoregistering of model's description.

data/lib/rails_admin/config/has_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     # Provides accessors and autoregistering of model's fields.
@@ -8,9 +10,7 @@ module RailsAdmin
 
         # some fields are hidden by default (belongs_to keys, has_many associations in list views.)
         # unhide them if config specifically defines them
-        if field
-          field.show unless field.instance_variable_get("@#{field.name}_registered").is_a?(Proc)
-        end
+        field.show if field && !field.instance_variable_get("@#{field.name}_registered").is_a?(Proc)
         # Specify field as virtual if type is not specifically set and field was not
         # found in default stack
         if field.nil? && type.nil?
@@ -39,17 +39,18 @@ module RailsAdmin
         field
       end
 
-      # configure a field without adding it.
+      # configure field(s) from the default group in a section without changing the original order.
       def configure(name, type = nil, &block)
-        field(name, type, false, &block)
+        [*name].each { |field_name| field(field_name, type, false, &block) }
       end
 
-      # include fields by name and apply an optionnal block to each (through a call to fields),
+      # include fields by name and apply an optional block to each (through a call to fields),
       # or include fields by conditions if no field names
       def include_fields(*field_names, &block)
         if field_names.empty?
           _fields.select { |f| f.instance_eval(&block) }.each do |f|
             next if f.defined
+
             f.defined = true
             f.order = _fields.count(&:defined)
           end
@@ -117,6 +118,10 @@ module RailsAdmin
         all_fields.collect { |f| f.with(bindings) }.select(&:visible?).sort_by { |f| [f.order, i += 1] } # stable sort, damn
       end
 
+      def possible_fields
+        _fields(true)
+      end
+
     protected
 
       # Raw fields.
@@ -126,7 +131,7 @@ module RailsAdmin
         return @_fields if @_fields
         return @_ro_fields if readonly && @_ro_fields
 
-        if self.class == RailsAdmin::Config::Sections::Base
+        if instance_of?(RailsAdmin::Config::Sections::Base)
           @_ro_fields = @_fields = RailsAdmin::Config::Fields.factory(self)
         else
           # parent is RailsAdmin::Config::Model, recursion is on Section's classes

data/lib/rails_admin/config/has_groups.rb

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