rails_admin 1.4.2 → 3.1.2

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

@@ -1,10 +1,12 @@
-require 'rails_admin/config/fields/base'
+# frozen_string_literal: true
+
+require 'rails_admin/config/fields/types/string_like'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class Color < RailsAdmin::Config::Fields::Base
+        class Color < StringLike
           RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :pretty_value do
@@ -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,25 +10,22 @@ 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
+          register_instance_option :filter_operators do
+            %w[default between today yesterday this_week last_week] + (required? ? [] : %w[_separator _not_null _null])
+          end
+
+          def filter_options
+            super.merge(
+              datetimepicker_options: datepicker_options,
+            )
           end
 
           register_instance_option :date_format do
@@ -34,21 +33,24 @@ module RailsAdmin
           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 +65,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 +81,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
@@ -7,21 +9,32 @@ module RailsAdmin
         class Enum < RailsAdmin::Config::Fields::Base
           RailsAdmin::Config::Fields::Types.register(self)
 
+          register_instance_option :filter_operators do
+            %w[_discard] +
+              enum.map do |label, value|
+                {label: label, value: value || label}
+              end + (required? ? [] : %w[_separator _present _blank])
+          end
+
           register_instance_option :partial do
             :form_enumeration
           end
 
           register_instance_option :enum_method do
-            @enum_method ||= bindings[:object].class.respond_to?("#{name}_enum") || bindings[:object].respond_to?("#{name}_enum") ? "#{name}_enum" : name
+            @enum_method ||= bindings[:object].class.respond_to?("#{name}_enum") || (bindings[:object] || abstract_model.model.new).respond_to?("#{name}_enum") ? "#{name}_enum" : name
           end
 
           register_instance_option :enum do
-            bindings[:object].class.respond_to?(enum_method) ? bindings[:object].class.send(enum_method) : bindings[:object].send(enum_method)
+            if abstract_model.model.respond_to?(enum_method)
+              abstract_model.model.send(enum_method)
+            else
+              (bindings[:object] || abstract_model.model.new).send(enum_method)
+            end
           end
 
           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

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
@@ -23,10 +25,18 @@ module RailsAdmin
             nil
           end
 
+          register_instance_option :cache_value do
+            bindings[:object].public_send(cache_method) if cache_method
+          end
+
           register_instance_option :export_value do
             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]
@@ -34,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') : 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')
+                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
@@ -57,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,35 +1,35 @@
-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 Froala < RailsAdmin::Config::Fields::Types::Text
+        class Froala < Text
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
-          # If you want to have a different toolbar configuration for wysihtml5
-          # you can use a Ruby hash to configure these options:
-          # https://github.com/jhollingworth/bootstrap-wysihtml5/#advanced
+          # See https://www.froala.com/wysiwyg-editor/docs/options
           register_instance_option :config_options do
             nil
           end
 
+          register_instance_option :version do
+            '2.9.5'
+          end
+
           register_instance_option :css_location do
-            ActionController::Base.helpers.asset_path('froala_editor.min.css')
+            "https://cdnjs.cloudflare.com/ajax/libs/froala-editor/#{version}/css/froala_editor.min.css"
           end
 
           register_instance_option :js_location do
-            ActionController::Base.helpers.asset_path('froala_editor.min.js')
+            "https://cdnjs.cloudflare.com/ajax/libs/froala-editor/#{version}/js/froala_editor.min.js"
           end
 
           register_instance_option :partial do
             :form_froala
           end
-
-          [:config_options, :css_location, :js_location].each do |key|
-            register_deprecated_instance_option :"froala_#{key}", key
-          end
         end
       end
     end

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
@@ -8,6 +10,10 @@ module RailsAdmin
           # Register field type for the type loader
           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 :partial do
             nested_form ? :form_nested_one : :form_filtering_select
           end
@@ -17,29 +23,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,10 +1,12 @@
-require 'rails_admin/config/fields/base'
+# frozen_string_literal: true
+
+require 'rails_admin/config/fields/types/string_like'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class Hidden < RailsAdmin::Config::Fields::Base
+        class Hidden < StringLike
           RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :view_helper do

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,21 +11,27 @@ 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_key do
+            register_instance_option :delete_value do
               value.id
             end
 
             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,29 @@ 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
+
+          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
         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
@@ -12,12 +14,17 @@ module RailsAdmin
               @thumb_method ||= ((versions = value.versions.keys).detect { |k| k.in?([:thumb, :thumbnail, 'thumb', 'thumbnail']) } || versions.first.to_s)
             end
 
-            register_instance_option :delete_key do
-              value.file.identifier
+            register_instance_option :keep_value do
+              value.cache_name || value.identifier
+            end
+
+            register_instance_option :delete_value do
+              value.file.filename
             end
 
             def resource_url(thumb = false)
               return nil unless value
+
               thumb.present? ? value.send(thumb).url : value.url
             end
           end
@@ -27,7 +34,15 @@ module RailsAdmin
           end
 
           register_instance_option :cache_method do
-            "#{name}_cache"
+            "#{name}_cache" unless ::CarrierWave::VERSION >= '2'
+          end
+
+          register_instance_option :keep_method do
+            name if ::CarrierWave::VERSION >= '2'
+          end
+
+          register_instance_option :reorderable? do
+            ::CarrierWave::VERSION >= '2'
           end
 
           register_instance_option :delete_method do