rails_admin 0.8.1 → 2.2.1

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

@@ -1,10 +1,10 @@
-require 'rails_admin/config/fields/base'
+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 +16,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: '/assets/codemirror/modes/css.js',
-              theme: '/assets/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
-            '/assets/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
-            '/assets/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

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

@@ -1,10 +1,10 @@
-require 'rails_admin/config/fields/base'
+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

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

@@ -9,7 +9,7 @@ module RailsAdmin
           RailsAdmin::Config::Fields::Types.register(self)
 
           def parser
-            @parser ||= RailsAdmin::Support::Datetime.new(strftime_format)
+            RailsAdmin::Support::Datetime.new(strftime_format)
           end
 
           def parse_value(value)
@@ -38,8 +38,11 @@ module RailsAdmin
           end
 
           register_instance_option :strftime_format do
-            fallback = ::I18n.t(date_format, scope: i18n_scope, locale: :en)
-            ::I18n.t(date_format, scope: i18n_scope, default: fallback).to_s
+            begin
+              ::I18n.t(date_format, scope: i18n_scope, raise: true)
+            rescue ::I18n::ArgumentError
+              "%B %d, %Y %H:%M"
+            end
           end
 
           register_instance_option :datepicker_options do

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

@@ -23,10 +23,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 +42,15 @@ 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 ? v.link_to(image_html, url, target: '_blank', rel: 'noopener noreferrer') : image_html
               else
-                v.link_to(nil, 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/i
+            (url = resource_url.to_s) && url.split('.').last =~ /jpg|jpeg|png|gif|svg/i
           end
 
           register_instance_option :allowed_methods do
@@ -57,7 +65,7 @@ module RailsAdmin
 
           # virtual class
           def resource_url
-            fail('not implemented')
+            raise('not implemented')
           end
 
           def virtual?

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

@@ -1,35 +1,33 @@
-require 'rails_admin/config/fields/base'
+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_many_association.rb

@@ -22,7 +22,7 @@ module RailsAdmin
           end
 
           def method_name
-            nested_form ? "#{super}_attributes".to_sym : "#{super.to_s.singularize}_ids".to_sym  # name_ids
+            nested_form ? "#{super}_attributes".to_sym : "#{super.to_s.singularize}_ids".to_sym # name_ids
           end
 
           # Reader for validation errors of the bound object

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

@@ -1,10 +1,10 @@
-require 'rails_admin/config/fields/base'
+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/json.rb

@@ -10,7 +10,15 @@ module RailsAdmin
           RailsAdmin::Config::Fields::Types.register(:jsonb, self)
 
           register_instance_option :formatted_value do
-            value.present? ? JSON.pretty_generate(value) : nil
+            value ? JSON.pretty_generate(value) : nil
+          end
+
+          register_instance_option :pretty_value do
+            bindings[:view].content_tag(:pre) { formatted_value }.html_safe
+          end
+
+          register_instance_option :export_value do
+            formatted_value
           end
 
           def parse_value(value)

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

@@ -0,0 +1,53 @@
+require 'rails_admin/config/fields/types/multiple_file_upload'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class MultipleActiveStorage < RailsAdmin::Config::Fields::Types::MultipleFileUpload
+          RailsAdmin::Config::Fields::Types.register(self)
+
+          class ActiveStorageAttachment < RailsAdmin::Config::Fields::Types::MultipleFileUpload::AbstractAttachment
+            register_instance_option :thumb_method do
+              if ::ActiveStorage::VERSION::MAJOR >= 6
+                {resize_to_limit: [100, 100]}
+              else
+                {resize: '100x100>'}
+              end
+            end
+
+            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
+              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(
+                  variant.blob.signed_id, variant.variation.key, variant.blob.filename, only_path: true
+                )
+              else
+                Rails.application.routes.url_helpers.rails_blob_path(value, only_path: true)
+              end
+            end
+          end
+
+          register_instance_option :attachment_class do
+            ActiveStorageAttachment
+          end
+
+          register_instance_option :delete_method do
+            "remove_#{name}" if bindings[:object].respond_to?("remove_#{name}")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+require 'rails_admin/config/fields/types/multiple_file_upload'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class MultipleCarrierwave < RailsAdmin::Config::Fields::Types::MultipleFileUpload
+          RailsAdmin::Config::Fields::Types.register(self)
+
+          class CarrierwaveAttachment < RailsAdmin::Config::Fields::Types::MultipleFileUpload::AbstractAttachment
+            register_instance_option :thumb_method do
+              @thumb_method ||= ((versions = value.versions.keys).detect { |k| k.in?([:thumb, :thumbnail, 'thumb', 'thumbnail']) } || versions.first.to_s)
+            end
+
+            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
+
+          register_instance_option :attachment_class do
+            CarrierwaveAttachment
+          end
+
+          register_instance_option :cache_method do
+            "#{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
+            "delete_#{name}" if bindings[:object].respond_to?("delete_#{name}")
+          end
+
+          def value
+            bindings[:object].send(name)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,125 @@
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class MultipleFileUpload < RailsAdmin::Config::Fields::Base
+          RailsAdmin::Config::Fields::Types.register(self)
+
+          class AbstractAttachment
+            include RailsAdmin::Config::Proxyable
+            include RailsAdmin::Config::Configurable
+
+            attr_reader :value
+
+            def initialize(value)
+              @value = value
+            end
+
+            register_instance_option :thumb_method do
+              nil
+            end
+
+            register_instance_option :keep_value do
+              nil
+            end
+
+            register_instance_option :delete_value do
+              nil
+            end
+
+            register_deprecated_instance_option :delete_key, :delete_value
+
+            register_instance_option :pretty_value do
+              if value.presence
+                v = bindings[:view]
+                url = resource_url
+                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
+                else
+                  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
+            end
+
+            def resource_url(_thumb = false)
+              raise('not implemented')
+            end
+          end
+
+          def initialize(*args)
+            super
+            @attachment_configurations = []
+          end
+
+          register_instance_option :attachment_class do
+            AbstractAttachment
+          end
+
+          register_instance_option :partial do
+            :form_multiple_file_upload
+          end
+
+          register_instance_option :cache_method do
+            nil
+          end
+
+          register_instance_option :delete_method do
+            nil
+          end
+
+          register_instance_option :keep_method do
+            nil
+          end
+
+          register_instance_option :reorderable? do
+            false
+          end
+
+          register_instance_option :export_value do
+            attachments.map(&:resource_url).map(&:to_s).join(',')
+          end
+
+          register_instance_option :pretty_value do
+            bindings[:view].safe_join attachments.map(&:pretty_value), ' '
+          end
+
+          register_instance_option :allowed_methods do
+            [method_name, cache_method, delete_method].compact
+          end
+
+          register_instance_option :html_attributes do
+            {
+              required: required? && !value.present?,
+            }
+          end
+
+          def attachment(&block)
+            @attachment_configurations << block
+          end
+
+          def attachments
+            Array(value).map do |attached|
+              attachment = attachment_class.new(attached)
+              @attachment_configurations.each do |config|
+                attachment.instance_eval(&config)
+              end
+              attachment.with(bindings)
+            end
+          end
+
+          # virtual class
+          def virtual?
+            true
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -13,7 +13,11 @@ module RailsAdmin
           end
 
           def parse_input(params)
-            params[name] = params[name].presence
+            if params[name].present?
+              params[name] = params[name]
+            else
+              params.delete(name)
+            end
           end
 
           register_instance_option :formatted_value do

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

@@ -16,7 +16,7 @@ module RailsAdmin
           # association checks that any of the child models are included in
           # configuration.
           register_instance_option :visible? do
-            associated_model_config.length > 0
+            associated_model_config.any?
           end
 
           register_instance_option :formatted_value do
@@ -45,6 +45,10 @@ module RailsAdmin
             [children_fields]
           end
 
+          register_instance_option :eager_load? do
+            false
+          end
+
           def associated_collection(type)
             return [] if type.blank?
             config = RailsAdmin.config(type)
@@ -74,6 +78,13 @@ module RailsAdmin
           def value
             bindings[:object].send(association.name)
           end
+
+          def parse_input(params)
+            if (type_value = params[association.foreign_type.to_sym]).present?
+              config = associated_model_config.find { |c| type_value == c.abstract_model.model.name }
+              params[association.foreign_type.to_sym] = config.abstract_model.base_class.name if config
+            end
+          end
         end
       end
     end

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

@@ -9,11 +9,11 @@ module RailsAdmin
           RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :formatted_value do
-            YAML.dump(value) unless value.nil?
+            RailsAdmin.yaml_dump(value) unless value.nil?
           end
 
           def parse_value(value)
-            value.present? ? (SafeYAML.load(value) || nil) : nil
+            value.present? ? (RailsAdmin.yaml_load(value) || nil) : nil
           end
 
           def parse_input(params)

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

@@ -0,0 +1,54 @@
+require 'rails_admin/config/fields/types/file_upload'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class Shrine < RailsAdmin::Config::Fields::Types::FileUpload
+          RailsAdmin::Config::Fields::Types.register(self)
+
+          register_instance_option :thumb_method do
+            unless defined? @thumb_method
+              @thumb_method = begin
+                next nil unless bindings[:object].respond_to?("#{name}_derivatives")
+
+                derivatives = bindings[:object].public_send("#{name}_derivatives")
+
+                if derivatives.key?(:thumb)
+                  :thumb
+                elsif derivatives.key?(:thumbnail)
+                  :thumbnail
+                else
+                  derivatives.keys.first
+                end
+              end
+            end
+            @thumb_method
+          end
+
+          register_instance_option :delete_method do
+            "remove_#{name}" if bindings[:object].respond_to?("remove_#{name}")
+          end
+
+          register_instance_option :cache_method do
+            name if bindings[:object].try("cached_#{name}_data")
+          end
+
+          register_instance_option :cache_value do
+            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
+
+            thumb && bindings[:object].public_send(:"#{name}", thumb).try(:url) || value.url
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+require 'rails_admin/config/fields/types/text'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class SimpleMDE < Text
+          # Register field type for the type loader
+          RailsAdmin::Config::Fields::Types.register(self)
+
+          # If you want to have a different SimpleMDE config for each instance
+          # you can override this option with these values: https://github.com/sparksuite/simplemde-markdown-editor#configuration
+          register_instance_option :instance_config do
+            nil
+          end
+
+          register_instance_option :version do
+            '1.11.2'
+          end
+
+          register_instance_option :js_location do
+            "https://cdnjs.cloudflare.com/ajax/libs/simplemde/#{version}/simplemde.min.js"
+          end
+
+          register_instance_option :css_location do
+            "https://cdnjs.cloudflare.com/ajax/libs/simplemde/#{version}/simplemde.min.css"
+          end
+
+          register_instance_option :partial do
+            :form_simple_mde
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,10 +1,10 @@
-require 'rails_admin/config/fields/base'
+require 'rails_admin/config/fields/types/string_like'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class String < RailsAdmin::Config::Fields::Base
+        class String < StringLike
           RailsAdmin::Config::Fields::Types.register(self)
 
           def input_size
@@ -27,11 +27,12 @@ module RailsAdmin
               max_length = [length, valid_length[:maximum] || nil].compact.min
               min_length = [0, valid_length[:minimum] || nil].compact.max
               if max_length
-                if min_length == 0
-                  text += "#{I18n.translate('admin.form.char_length_up_to').capitalize} #{max_length}."
-                else
-                  text += "#{I18n.translate('admin.form.char_length_of').capitalize} #{min_length}-#{max_length}."
-                end
+                text +=
+                  if min_length == 0
+                    "#{I18n.translate('admin.form.char_length_up_to').capitalize} #{max_length}."
+                  else
+                    "#{I18n.translate('admin.form.char_length_of').capitalize} #{min_length}-#{max_length}."
+                  end
               end
             end
             text

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

@@ -0,0 +1,19 @@
+require 'rails_admin/config/fields/base'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class StringLike < RailsAdmin::Config::Fields::Base
+          register_instance_option :treat_empty_as_nil? do
+            properties.try(:nullable?)
+          end
+
+          def parse_input(params)
+            params[name] = params[name].presence if params.key?(name) && treat_empty_as_nil?
+          end
+        end
+      end
+    end
+  end
+end