rails_admin 0.8.1 → 2.2.1

data/lib/rails_admin/config/actions/edit.rb

@@ -25,9 +25,7 @@ module RailsAdmin
               sanitize_params_for!(request.xhr? ? :modal : :update)
 
               @object.set_attributes(params[@abstract_model.param_key])
-              @authorization_adapter && @authorization_adapter.attributes_for(:update, @abstract_model).each do |name, value|
-                @object.send("#{name}=", value)
-              end
+              @authorization_adapter && @authorization_adapter.authorize(:update, @abstract_model, @object)
               changes = @object.changes
               if @object.save
                 @auditing_adapter && @auditing_adapter.update_object(@object, @abstract_model, _current_user, changes)

data/lib/rails_admin/config/actions/export.rb

@@ -16,7 +16,7 @@ module RailsAdmin
           proc do
             if format = params[:json] && :json || params[:csv] && :csv || params[:xml] && :xml
               request.format = format
-              @schema = HashHelper.symbolize(params[:schema]) if params[:schema] # to_json and to_xml expect symbols for keys AND values.
+              @schema = HashHelper.symbolize(params[:schema].slice(:except, :include, :methods, :only).permit!.to_h) if params[:schema] # to_json and to_xml expect symbols for keys AND values.
               @objects = list_entries(@model_config, :export)
               index
             else

data/lib/rails_admin/config/actions/index.rb

@@ -1,3 +1,5 @@
+require 'activemodel-serializers-xml'
+
 module RailsAdmin
   module Config
     module Actions
@@ -41,7 +43,7 @@ module RailsAdmin
 
             respond_to do |format|
               format.html do
-                render @action.template_name, status: (flash[:error].present? ? :not_found : 200)
+                render @action.template_name, status: @status_code || :ok
               end
 
               format.json do
@@ -71,13 +73,13 @@ module RailsAdmin
               end
 
               format.csv do
-                header, encoding, output = CSVConverter.new(@objects, @schema).to_csv(params[:csv_options])
+                header, encoding, output = CSVConverter.new(@objects, @schema).to_csv(params[:csv_options].permit!.to_h)
                 if params[:send_data]
                   send_data output,
                             type: "text/csv; charset=#{encoding}; #{'header=present' if header}",
                             disposition: "attachment; filename=#{params[:model_name]}_#{DateTime.now.strftime('%Y-%m-%d_%Hh%Mm%S')}.csv"
                 else
-                  render text: output
+                  render plain: output
                 end
               end
             end

data/lib/rails_admin/config/actions/new.rb

@@ -20,8 +20,9 @@ module RailsAdmin
               @authorization_adapter && @authorization_adapter.attributes_for(:new, @abstract_model).each do |name, value|
                 @object.send("#{name}=", value)
               end
-              if object_params = params[@abstract_model.to_param]
-                @object.set_attributes(@object.attributes.merge(object_params))
+              if object_params = params[@abstract_model.param_key]
+                sanitize_params_for!(request.xhr? ? :modal : :create)
+                @object.set_attributes(@object.attributes.merge(object_params.to_h))
               end
               respond_to do |format|
                 format.html { render @action.template_name }
@@ -35,9 +36,7 @@ module RailsAdmin
               sanitize_params_for!(request.xhr? ? :modal : :create)
 
               @object.set_attributes(params[@abstract_model.param_key])
-              @authorization_adapter && @authorization_adapter.attributes_for(:create, @abstract_model).each do |name, value|
-                @object.send("#{name}=", value)
-              end
+              @authorization_adapter && @authorization_adapter.authorize(:create, @abstract_model, @object)
 
               if @object.save
                 @auditing_adapter && @auditing_adapter.create_object(@object, @abstract_model, _current_user)

data/lib/rails_admin/config/actions.rb

@@ -96,7 +96,7 @@ module RailsAdmin
           action.instance_eval(&block) if block
           @@actions ||= []
           if action.custom_key.in?(@@actions.collect(&:custom_key))
-            fail "Action #{action.custom_key} already exists. Please change its custom key."
+            raise "Action #{action.custom_key} already exists. Please change its custom key."
           else
             @@actions << action
           end

data/lib/rails_admin/config/configurable.rb

@@ -7,7 +7,7 @@ module RailsAdmin
         base.send :extend, ClassMethods
       end
 
-      def has_option?(name) # rubocop:disable PredicateName
+      def has_option?(name) # rubocop:disable Naming/PredicateName
         options = self.class.instance_variable_get('@config_options')
         options && options.key?(name)
       end
@@ -23,6 +23,25 @@ module RailsAdmin
         self.class.register_deprecated_instance_option(option_name, replacement_option_name, scope, &custom_error)
       end
 
+    private
+
+      def with_recurring(option_name, value_proc, default_proc)
+        # Track recursive invocation with an instance variable. This prevents run-away recursion
+        # and allows configurations such as
+        # label { "#{label}".upcase }
+        # This will use the default definition when called recursively.
+        Thread.current[:rails_admin_recurring] ||= {}
+        Thread.current[:rails_admin_recurring][self] ||= {}
+        if Thread.current[:rails_admin_recurring][self][option_name]
+          instance_eval(&default_proc)
+        else
+          Thread.current[:rails_admin_recurring][self][option_name] = true
+          instance_eval(&value_proc)
+        end
+      ensure
+        Thread.current[:rails_admin_recurring].delete(self)
+      end
+
       module ClassMethods
         # Register an instance option. Instance option is a configuration
         # option that stores its value within an instance variable and is
@@ -43,7 +62,7 @@ module RailsAdmin
 
           # Define getter/setter by the option name
           scope.send(:define_method, option_name) do |*args, &block|
-            if !args[0].nil? || block # rubocop:disable NonNilCheck
+            if !args[0].nil? || block
               # Invocation with args --> This is the declaration of the option, i.e. setter
               instance_variable_set("@#{option_name}_registered", args[0].nil? ? block : args[0])
             else
@@ -51,17 +70,7 @@ module RailsAdmin
               value = instance_variable_get("@#{option_name}_registered")
               case value
               when Proc
-                # Track recursive invocation with an instance variable. This prevents run-away recursion
-                # and allows configurations such as
-                # label { "#{label}".upcase }
-                # This will use the default definition when called recursively.
-                if instance_variable_get("@#{option_name}_recurring")
-                  value = instance_eval(&default)
-                else
-                  instance_variable_set("@#{option_name}_recurring", true)
-                  value = instance_eval(&value)
-                  instance_variable_set("@#{option_name}_recurring", false)
-                end
+                value = with_recurring(option_name, value, default)
               when nil
                 value = instance_eval(&default)
               end
@@ -75,12 +84,10 @@ module RailsAdmin
             if replacement_option_name
               ActiveSupport::Deprecation.warn("The #{option_name} configuration option is deprecated, please use #{replacement_option_name}.")
               send(replacement_option_name, *args, &block)
+            elsif block_given?
+              yield
             else
-              if block_given?
-                yield
-              else
-                fail("The #{option_name} configuration option is removed without replacement.")
-              end
+              raise("The #{option_name} configuration option is removed without replacement.")
             end
           end
         end

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

@@ -10,7 +10,7 @@ module RailsAdmin
         end
 
         # Reader for the association information hash
-        def association # rubocop:disable TrivialAccessors
+        def association
           @properties
         end
 
@@ -54,7 +54,7 @@ module RailsAdmin
         # preload entire associated collection (per associated_collection_scope) on load
         # Be sure to set limit in associated_collection_scope if set is large
         register_instance_option :associated_collection_cache_all do
-          @associated_collection_cache_all ||= (associated_model_config.abstract_model.count < 100)
+          @associated_collection_cache_all ||= (associated_model_config.abstract_model.count < associated_model_limit)
         end
 
         # determines whether association's elements can be removed
@@ -62,6 +62,10 @@ module RailsAdmin
           association.foreign_key_nullable?
         end
 
+        register_instance_option :eager_load? do
+          !!searchable
+        end
+
         # Reader for the association's child model's configuration
         def associated_model_config
           @associated_model_config ||= RailsAdmin.config(association.klass)
@@ -74,7 +78,7 @@ module RailsAdmin
 
         # Reader for associated primary key
         def associated_primary_key
-          @associated_primary_key ||= association.primary_key
+          @associated_primary_key ||= associated_model_config.abstract_model.primary_key
         end
 
         # Reader for the association's key
@@ -105,6 +109,10 @@ module RailsAdmin
         def virtual?
           true
         end
+
+        def associated_model_limit
+          RailsAdmin.config.default_associated_collection_limit
+        end
       end
     end
   end

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

@@ -2,20 +2,27 @@ require 'rails_admin/config/proxyable'
 require 'rails_admin/config/configurable'
 require 'rails_admin/config/hideable'
 require 'rails_admin/config/groupable'
+require 'rails_admin/config/inspectable'
 
 module RailsAdmin
   module Config
     module Fields
-      class Base # rubocop:disable ClassLength
+      class Base # rubocop:disable Metrics/ClassLength
         include RailsAdmin::Config::Proxyable
         include RailsAdmin::Config::Configurable
         include RailsAdmin::Config::Hideable
         include RailsAdmin::Config::Groupable
+        include RailsAdmin::Config::Inspectable
 
         attr_reader :name, :properties, :abstract_model
         attr_accessor :defined, :order, :section
         attr_reader :parent, :root
 
+        NAMED_INSTANCE_VARIABLES = [
+          :@parent, :@root, :@section, :@children_fields_registered,
+          :@associated_model_config, :@group
+        ].freeze
+
         def initialize(parent, name, properties)
           @parent = parent
           @root = parent.root
@@ -57,7 +64,7 @@ module RailsAdmin
         end
 
         register_instance_option :filterable? do
-          !!searchable # rubocop:disable DoubleNegation
+          !!searchable
         end
 
         register_instance_option :search_operator do
@@ -92,7 +99,7 @@ module RailsAdmin
                   property = am && am.properties.detect { |p| p.name == f.values.first.to_sym }
                   type = property && property.type
                 else                                                             #  <attribute|column>
-                  am = (self.association? ? associated_model_config.abstract_model : abstract_model)
+                  am = (association? ? associated_model_config.abstract_model : abstract_model)
                   table_name = am.table_name
                   column = f
                   property = am.properties.detect { |p| p.name == f.to_sym }
@@ -172,12 +179,12 @@ module RailsAdmin
               :nil
             end
           end
-          (@required ||= {})[context] ||= !!([name] + children_fields).uniq.detect do |column_name| # rubocop:disable DoubleNegation
+          (@required ||= {})[context] ||= !!([name] + children_fields).uniq.detect do |column_name|
             abstract_model.model.validators_on(column_name).detect do |v|
               !(v.options[:allow_nil] || v.options[:allow_blank]) &&
-              [:presence, :numericality, :attachment_presence].include?(v.kind) &&
-              (v.options[:on] == context || v.options[:on].blank?) &&
-              (v.options[:if].blank? && v.options[:unless].blank?)
+                [:presence, :numericality, :attachment_presence].include?(v.kind) &&
+                (v.options[:on] == context || v.options[:on].blank?) &&
+                (v.options[:if].blank? && v.options[:unless].blank?)
             end
           end
         end
@@ -220,6 +227,10 @@ module RailsAdmin
           bindings[:view].render partial: "rails_admin/main/#{partial}", locals: {field: self, form: bindings[:form]}
         end
 
+        register_instance_option :default_filter_operator do
+          nil
+        end
+
         def editable?
           !(@properties && @properties.read_only?)
         end
@@ -247,8 +258,8 @@ module RailsAdmin
         #
         # @see RailsAdmin::Config::Fields::Base.register_instance_option :required?
         def optional(state = nil, &block)
-          if !state.nil? || block # rubocop:disable NonNilCheck
-            required state.nil? ? proc { false == (instance_eval(&block)) } : false == state
+          if !state.nil? || block
+            required state.nil? ? proc { false == instance_eval(&block) } : false == state
           else
             optional?
           end
@@ -324,24 +335,6 @@ module RailsAdmin
         def form_value
           form_default_value.nil? ? formatted_value : form_default_value
         end
-
-        def inspect
-          "#<#{self.class.name}[#{name}] #{
-            instance_variables.collect do |v|
-              value = instance_variable_get(v)
-              if [:@parent, :@root, :@section, :@children_fields_registered,
-                  :@associated_model_config, :@group, :@bindings].include? v
-                if value.respond_to? :name
-                  "#{v}=#{value.name.inspect}"
-                else
-                  "#{v}=#{value.class.name}"
-                end
-              else
-                "#{v}=#{value.inspect}"
-              end
-            end.join(', ')
-          }>"
-        end
       end
     end
   end

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

@@ -0,0 +1,12 @@
+require 'rails_admin/config/fields'
+require 'rails_admin/config/fields/types'
+
+RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
+  if defined?(::ActionText) && properties.try(:association?) && (match = /\Arich_text_(.+)\Z/.match properties.name) && properties.klass.to_s == 'ActionText::RichText'
+    field = RailsAdmin::Config::Fields::Types.load(:action_text).new(parent, match[1], properties)
+    fields << field
+    true
+  else
+    false
+  end
+end

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

@@ -0,0 +1,30 @@
+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|
+  if defined?(::ActiveStorage) && properties.try(:association?) && (match = /\A(.+)_attachments?\Z/.match properties.name) && properties.klass.to_s == 'ActiveStorage::Attachment'
+    name = match[1]
+    field = RailsAdmin::Config::Fields::Types.load(
+      properties.type == :has_many ? :multiple_active_storage : :active_storage,
+    ).new(parent, name, properties)
+    fields << field
+    associations =
+      if properties.type == :has_many
+        ["#{name}_attachments".to_sym, "#{name}_blobs".to_sym]
+      else
+        ["#{name}_attachment".to_sym, "#{name}_blob".to_sym]
+      end
+    children_fields = associations.map do |child_name|
+      next unless child_association = parent.abstract_model.associations.detect { |p| p.name.to_sym == child_name }
+      child_field = fields.detect { |f| f.name == child_name } || RailsAdmin::Config::Fields.default_factory.call(parent, child_association, fields)
+      child_field.hide unless field == child_field
+      child_field.filterable(false) unless field == child_field
+      child_field.name
+    end.flatten.compact
+    field.children_fields(children_fields)
+    true
+  else
+    false
+  end
+end

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

@@ -4,9 +4,11 @@ require 'rails_admin/config/fields/types/file_upload'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
   model = parent.abstract_model.model
-  if defined?(::CarrierWave) && (model).is_a?(CarrierWave::Mount) && model.uploaders.include?(attachment_name = properties.name.to_s.chomp('_file_name').to_sym)
+  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(:carrierwave).new(parent, attachment_name, properties)
+    field = RailsAdmin::Config::Fields::Types.load(
+      [:serialized, :json].include?(properties.type) ? :multiple_carrierwave : :carrierwave,
+    ).new(parent, attachment_name, properties)
     fields << field
     children_fields = []
     columns.each do |children_column_name|

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

@@ -4,7 +4,7 @@ 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)
+  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|

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

@@ -0,0 +1,27 @@
+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/types/action_text.rb

@@ -0,0 +1,30 @@
+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.1.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 :partial do
+            :form_action_text
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -28,11 +28,28 @@ module RailsAdmin
           end
 
           def parse_value(value)
-            value.present? ? enum.invert[value.to_i] : nil
+            return unless value.present?
+            abstract_model.model.attribute_types[name.to_s].serialize(value)
           end
 
           def parse_input(params)
-            params[name] = parse_value(params[name]) if params[name]
+            value = params[name]
+            return unless value
+            params[name] = parse_input_value(value)
+          end
+
+          def form_value
+            enum[super] || super
+          end
+
+        private
+
+          def parse_input_value(value)
+            abstract_model.model.attribute_types[name.to_s].deserialize(value)
+          end
+
+          def type_cast_value(value)
+            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

@@ -0,0 +1,49 @@
+require 'rails_admin/config/fields/types/file_upload'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class ActiveStorage < RailsAdmin::Config::Fields::Types::FileUpload
+          RailsAdmin::Config::Fields::Types.register(self)
+
+          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_method do
+            "remove_#{name}" if bindings[:object].respond_to?("remove_#{name}")
+          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?
+              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
+              )
+            else
+              Rails.application.routes.url_helpers.rails_blob_path(value, only_path: true)
+            end
+          end
+
+          def value
+            attachment = super
+            attachment if attachment && attachment.attached?
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,4 +1,6 @@
+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'
@@ -10,7 +12,9 @@ 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'
 require 'rails_admin/config/fields/types/float'
 require 'rails_admin/config/fields/types/has_and_belongs_to_many_association'
 require 'rails_admin/config/fields/types/has_many_association'
@@ -22,9 +26,11 @@ 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'
+require 'rails_admin/config/fields/types/simple_mde'
 require 'rails_admin/config/fields/types/ck_editor'
 require 'rails_admin/config/fields/types/code_mirror'
 require 'rails_admin/config/fields/types/wysihtml5'

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

@@ -31,6 +31,14 @@ module RailsAdmin
             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)
           end

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

@@ -8,14 +8,6 @@ module RailsAdmin
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
-          OBJECT_ID ||= begin
-            if defined?(Moped::BSON)
-              Moped::BSON::ObjectId
-            elsif defined?(BSON::ObjectId)
-              BSON::ObjectId
-            end
-          end
-
           register_instance_option :label do
             label = ((@label ||= {})[::I18n.locale] ||= abstract_model.model.human_attribute_name name)
             label = 'Id' if label == ''
@@ -35,13 +27,7 @@ module RailsAdmin
           end
 
           def parse_value(value)
-            value.present? ? OBJECT_ID.from_string(value) : nil
-          rescue BSON::ObjectId::Invalid
-            nil
-          rescue => e
-            unless ['BSON::InvalidObjectId', 'Moped::Errors::InvalidObjectId'].include? e.class.to_s
-              raise e
-            end
+            value.present? ? abstract_model.parse_object_id(value) : nil
           end
 
           def parse_input(params)

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

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