rails_admin 2.3.1 → 3.0.0.beta

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

@@ -18,7 +18,7 @@ module RailsAdmin
 
         register_instance_option :controller do
           proc do
-            @history = @auditing_adapter && @auditing_adapter.latest(@action.auditing_versions_limit) || []
+            @history = @auditing_adapter&.latest(@action.auditing_versions_limit) || []
             if @action.statistics?
               @abstract_models = RailsAdmin::Config.visible_models(controller: self).collect(&:abstract_model)
 
@@ -26,11 +26,12 @@ module RailsAdmin
               @count = {}
               @max = 0
               @abstract_models.each do |t|
-                scope = @authorization_adapter && @authorization_adapter.query(:index, t)
+                scope = @authorization_adapter&.query(:index, t)
                 current_count = t.count({}, scope)
                 @max = current_count > @max ? current_count : @max
                 @count[t.model.name] = current_count
                 next unless t.properties.detect { |c| c.name == :created_at }
+
                 @most_recent_created[t.model.name] = t.model.last.try(:created_at)
               end
             end
@@ -43,7 +44,7 @@ module RailsAdmin
         end
 
         register_instance_option :link_icon do
-          'icon-home'
+          'fas fa-home'
         end
 
         register_instance_option :statistics? do

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

@@ -13,7 +13,7 @@ module RailsAdmin
         end
 
         register_instance_option :http_methods do
-          [:get, :delete]
+          %i[get delete]
         end
 
         register_instance_option :authorization_key do
@@ -31,24 +31,20 @@ module RailsAdmin
 
             elsif request.delete? # DESTROY
 
-              redirect_path = nil
-              @auditing_adapter && @auditing_adapter.delete_object(@object, @abstract_model, _current_user)
+              @auditing_adapter&.delete_object(@object, @abstract_model, _current_user)
               if @object.destroy
                 flash[:success] = t('admin.flash.successful', name: @model_config.label, action: t('admin.actions.delete.done'))
-                redirect_path = index_path
+                redirect_to index_path
               else
-                flash[:error] = t('admin.flash.error', name: @model_config.label, action: t('admin.actions.delete.done'))
-                redirect_path = back_or_index
+                handle_save_error :delete
               end
 
-              redirect_to redirect_path
-
             end
           end
         end
 
         register_instance_option :link_icon do
-          'icon-remove'
+          'fas fa-times'
         end
       end
     end

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

@@ -9,7 +9,7 @@ module RailsAdmin
         end
 
         register_instance_option :http_methods do
-          [:get, :put]
+          %i[get put]
         end
 
         register_instance_option :controller do
@@ -18,20 +18,20 @@ module RailsAdmin
 
               respond_to do |format|
                 format.html { render @action.template_name }
-                format.js   { render @action.template_name, layout: false }
+                format.js   { render @action.template_name, layout: 'rails_admin/modal', content_type: Mime[:html].to_s }
               end
 
             elsif request.put? # UPDATE
               sanitize_params_for!(request.xhr? ? :modal : :update)
 
-              @object.set_attributes(params[@abstract_model.param_key])
-              @authorization_adapter && @authorization_adapter.authorize(:update, @abstract_model, @object)
+              @object.assign_attributes(params[@abstract_model.param_key])
+              @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)
+                @auditing_adapter&.update_object(@object, @abstract_model, _current_user, changes)
                 respond_to do |format|
                   format.html { redirect_to_on_success }
-                  format.js { render json: {id: @object.id.to_s, label: @model_config.with(object: @object).object_label} }
+                  format.json { render json: {id: @object.id.to_s, label: @model_config.with(object: @object).object_label} }
                 end
               else
                 handle_save_error :edit
@@ -42,7 +42,7 @@ module RailsAdmin
         end
 
         register_instance_option :link_icon do
-          'icon-pencil'
+          'fas fa-pencil-alt'
         end
       end
     end

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

@@ -9,7 +9,7 @@ module RailsAdmin
         end
 
         register_instance_option :http_methods do
-          [:get, :post]
+          %i[get post]
         end
 
         register_instance_option :controller do
@@ -30,7 +30,7 @@ module RailsAdmin
         end
 
         register_instance_option :link_icon do
-          'icon-share'
+          'fas fa-file-export'
         end
       end
     end

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

@@ -19,7 +19,7 @@ module RailsAdmin
         register_instance_option :controller do
           proc do
             @general = true
-            @history = @auditing_adapter && @auditing_adapter.listing_for_model(@abstract_model, params[:query], params[:sort], params[:sort_reverse], params[:all], params[:page]) || []
+            @history = @auditing_adapter&.listing_for_model(@abstract_model, params[:query], params[:sort], params[:sort_reverse], params[:all], params[Kaminari.config.param_name]) || []
 
             render @action.template_name
           end
@@ -30,7 +30,7 @@ module RailsAdmin
         end
 
         register_instance_option :link_icon do
-          'icon-book'
+          'fas fa-book'
         end
       end
     end

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

@@ -19,7 +19,7 @@ module RailsAdmin
         register_instance_option :controller do
           proc do
             @general = false
-            @history = @auditing_adapter && @auditing_adapter.listing_for_object(@abstract_model, @object, params[:query], params[:sort], params[:sort_reverse], params[:all], params[:page]) || []
+            @history = @auditing_adapter&.listing_for_object(@abstract_model, @object, params[:query], params[:sort], params[:sort_reverse], params[:all], params[Kaminari.config.param_name]) || []
 
             render @action.template_name
           end
@@ -30,7 +30,7 @@ module RailsAdmin
         end
 
         register_instance_option :link_icon do
-          'icon-book'
+          'fas fa-book'
         end
       end
     end

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

@@ -11,7 +11,7 @@ module RailsAdmin
         end
 
         register_instance_option :http_methods do
-          [:get, :post]
+          %i[get post]
         end
 
         register_instance_option :route_fragment do
@@ -33,9 +33,7 @@ module RailsAdmin
 
             unless @model_config.list.scopes.empty?
               if params[:scope].blank?
-                unless @model_config.list.scopes.first.nil?
-                  @objects = @objects.send(@model_config.list.scopes.first)
-                end
+                @objects = @objects.send(@model_config.list.scopes.first) unless @model_config.list.scopes.first.nil?
               elsif @model_config.list.scopes.collect(&:to_s).include?(params[:scope])
                 @objects = @objects.send(params[:scope].to_sym)
               end
@@ -47,7 +45,7 @@ module RailsAdmin
               end
 
               format.json do
-                output = begin
+                output =
                   if params[:compact]
                     primary_key_method = @association ? @association.associated_primary_key : @model_config.abstract_model.primary_key
                     label_method = @model_config.object_label_method
@@ -55,7 +53,7 @@ module RailsAdmin
                   else
                     @objects.to_json(@schema)
                   end
-                end
+
                 if params[:send_data]
                   send_data output, filename: "#{params[:model_name]}_#{DateTime.now.strftime('%Y-%m-%d_%Hh%Mm%S')}.json"
                 else
@@ -87,7 +85,7 @@ module RailsAdmin
         end
 
         register_instance_option :link_icon do
-          'icon-th-list'
+          'fas fa-th-list'
         end
       end
     end

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

@@ -9,7 +9,7 @@ module RailsAdmin
         end
 
         register_instance_option :http_methods do
-          [:get, :post] # NEW / CREATE
+          %i[get post] # NEW / CREATE
         end
 
         register_instance_option :controller do
@@ -17,16 +17,16 @@ module RailsAdmin
             if request.get? # NEW
 
               @object = @abstract_model.new
-              @authorization_adapter && @authorization_adapter.attributes_for(:new, @abstract_model).each do |name, value|
+              @authorization_adapter&.attributes_for(:new, @abstract_model)&.each do |name, value|
                 @object.send("#{name}=", value)
               end
               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))
+                @object.assign_attributes(@object.attributes.merge(object_params.to_h))
               end
               respond_to do |format|
                 format.html { render @action.template_name }
-                format.js   { render @action.template_name, layout: false }
+                format.js   { render @action.template_name, layout: 'rails_admin/modal', content_type: Mime[:html].to_s }
               end
 
             elsif request.post? # CREATE
@@ -35,14 +35,14 @@ module RailsAdmin
               @object = @abstract_model.new
               sanitize_params_for!(request.xhr? ? :modal : :create)
 
-              @object.set_attributes(params[@abstract_model.param_key])
-              @authorization_adapter && @authorization_adapter.authorize(:create, @abstract_model, @object)
+              @object.assign_attributes(params[@abstract_model.param_key])
+              @authorization_adapter&.authorize(:create, @abstract_model, @object)
 
               if @object.save
-                @auditing_adapter && @auditing_adapter.create_object(@object, @abstract_model, _current_user)
+                @auditing_adapter&.create_object(@object, @abstract_model, _current_user)
                 respond_to do |format|
                   format.html { redirect_to_on_success }
-                  format.js   { render json: {id: @object.id.to_s, label: @model_config.with(object: @object).object_label} }
+                  format.json { render json: {id: @object.id.to_s, label: @model_config.with(object: @object).object_label} }
                 end
               else
                 handle_save_error
@@ -53,7 +53,7 @@ module RailsAdmin
         end
 
         register_instance_option :link_icon do
-          'icon-plus'
+          'fas fa-plus'
         end
       end
     end

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

@@ -26,7 +26,7 @@ module RailsAdmin
         end
 
         register_instance_option :link_icon do
-          'icon-info-sign'
+          'fas fa-info-circle'
         end
       end
     end

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

@@ -9,7 +9,11 @@ module RailsAdmin
         end
 
         register_instance_option :visible? do
-          authorized? && (bindings[:controller].main_app.url_for(bindings[:object]) rescue false)
+          authorized? && begin
+            bindings[:controller].main_app.url_for(bindings[:object])
+          rescue StandardError
+            false
+          end
         end
 
         register_instance_option :controller do
@@ -19,7 +23,7 @@ module RailsAdmin
         end
 
         register_instance_option :link_icon do
-          'icon-eye-open'
+          'fas fa-eye'
         end
 
         register_instance_option :pjax? do

data/lib/rails_admin/config/actions.rb

@@ -9,7 +9,7 @@ module RailsAdmin
           end
           scope ||= :all
           init_actions!
-          actions = begin
+          actions =
             case scope
             when :all
               @@actions
@@ -22,7 +22,7 @@ module RailsAdmin
             when :member
               @@actions.select(&:member?)
             end
-          end
+
           actions = actions.collect { |action| action.with(bindings) }
           bindings[:controller] ? actions.select(&:visible?) : actions
         end
@@ -52,7 +52,7 @@ module RailsAdmin
             def key
               :#{key}
             end
-          ))
+          ), __FILE__, __LINE__ - 5)
           add_action_custom_key(a, &block)
         end
 
@@ -71,7 +71,7 @@ module RailsAdmin
               action = #{klass}.new
               add_action_custom_key(action, &block)
             end
-          }
+          }, __FILE__, __LINE__ - 5
         end
 
       private

data/lib/rails_admin/config/configurable.rb

@@ -9,7 +9,7 @@ module RailsAdmin
 
       def has_option?(name) # rubocop:disable Naming/PredicateName
         options = self.class.instance_variable_get('@config_options')
-        options && options.key?(name)
+        options&.key?(name)
       end
 
       # Register an instance option for this object only
@@ -87,7 +87,7 @@ module RailsAdmin
             elsif block_given?
               yield
             else
-              raise("The #{option_name} configuration option is removed without replacement.")
+              raise "The #{option_name} configuration option is removed without replacement."
             end
           end
         end

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

@@ -5,15 +5,15 @@ module RailsAdmin
   module Config
     module Fields
       class Association < RailsAdmin::Config::Fields::Base
-        def self.inherited(klass)
-          super(klass)
-        end
-
         # Reader for the association information hash
         def association
           @properties
         end
 
+        def method_name
+          association.key_accessor
+        end
+
         register_instance_option :pretty_value do
           v = bindings[:view]
           [value].flatten.select(&:present?).collect do |associated|
@@ -22,7 +22,7 @@ module RailsAdmin
             wording = associated.send(amc.object_label_method)
             can_see = !am.embedded? && (show_action = v.action(:show, am, associated))
             can_see ? v.link_to(wording, v.url_for(action: show_action.action_name, model_name: am.to_param, id: associated.id), class: 'pjax') : ERB::Util.html_escape(wording)
-          end.to_sentence.html_safe
+          end.to_sentence.html_safe.presence || '-'
         end
 
         # Accessor whether association is visible or not. By default
@@ -62,10 +62,18 @@ module RailsAdmin
           association.foreign_key_nullable?
         end
 
-        register_instance_option :eager_load? do
+        register_instance_option :eager_load do
           !!searchable
         end
 
+        register_instance_option :inline_add do
+          true
+        end
+
+        register_instance_option :inline_edit do
+          true
+        end
+
         # Reader for the association's child model's configuration
         def associated_model_config
           @associated_model_config ||= RailsAdmin.config(association.klass)
@@ -78,12 +86,7 @@ module RailsAdmin
 
         # Reader for associated primary key
         def associated_primary_key
-          @associated_primary_key ||= associated_model_config.abstract_model.primary_key
-        end
-
-        # Reader for the association's key
-        def foreign_key
-          association.foreign_key
+          association.primary_key
         end
 
         # Reader whether this is a polymorphic association

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

@@ -14,13 +14,12 @@ module RailsAdmin
         include RailsAdmin::Config::Groupable
         include RailsAdmin::Config::Inspectable
 
-        attr_reader :name, :properties, :abstract_model
+        attr_reader :name, :properties, :abstract_model, :parent, :root
         attr_accessor :defined, :order, :section
-        attr_reader :parent, :root
 
-        NAMED_INSTANCE_VARIABLES = [
-          :@parent, :@root, :@section, :@children_fields_registered,
-          :@associated_model_config, :@group
+        NAMED_INSTANCE_VARIABLES = %i[
+          @parent @root @section @children_fields_registered
+          @associated_model_config @group
         ].freeze
 
         def initialize(parent, name, properties)
@@ -36,7 +35,7 @@ module RailsAdmin
         end
 
         register_instance_option :css_class do
-          "#{self.name}_field"
+          "#{name}_field"
         end
 
         def type_css_class
@@ -51,6 +50,10 @@ module RailsAdmin
           nil
         end
 
+        register_instance_option :sticky? do
+          false
+        end
+
         register_instance_option :sortable do
           !virtual? || children_fields.first || false
         end
@@ -78,7 +81,7 @@ module RailsAdmin
 
         # list of columns I should search for that field [{ column: 'table_name.column', type: field.type }, {..}]
         register_instance_option :searchable_columns do
-          @searchable_columns ||= begin
+          @searchable_columns ||=
             case searchable
             when true
               [{column: "#{abstract_model.table_name}.#{name}", type: type}]
@@ -93,22 +96,21 @@ module RailsAdmin
                   table_name, column = f.split '.'
                   type = nil
                 elsif f.is_a?(Hash)                                              #  <Model|table_name> => <attribute|column>
-                  am = f.keys.first.is_a?(Class) && AbstractModel.new(f.keys.first)
-                  table_name = am && am.table_name || f.keys.first
+                  am = AbstractModel.new(f.keys.first) if f.keys.first.is_a?(Class)
+                  table_name = am&.table_name || f.keys.first
                   column = f.values.first
-                  property = am && am.properties.detect { |p| p.name == f.values.first.to_sym }
-                  type = property && property.type
+                  property = am&.properties&.detect { |p| p.name == f.values.first.to_sym }
+                  type = property&.type
                 else                                                             #  <attribute|column>
                   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 }
-                  type = property && property.type
+                  type = property&.type
                 end
                 {column: "#{table_name}.#{column}", type: (type || :string)}
               end
             end
-          end
         end
 
         register_instance_option :formatted_value do
@@ -155,7 +157,7 @@ module RailsAdmin
         #
         # @see RailsAdmin::AbstractModel.properties
         register_instance_option :length do
-          @length ||= properties && properties.length
+          @length ||= properties&.length
         end
 
         # Accessor for field's length restrictions per validations
@@ -172,17 +174,17 @@ module RailsAdmin
         #
         # @see RailsAdmin::AbstractModel.properties
         register_instance_option :required? do
-          context = begin
+          context =
             if bindings && bindings[:object]
               bindings[:object].persisted? ? :update : :create
             else
               :nil
             end
-          end
+
           (@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) &&
+                %i[presence numericality attachment_presence].include?(v.kind) &&
                 (v.options[:on] == context || v.options[:on].blank?) &&
                 (v.options[:if].blank? && v.options[:unless].blank?)
             end
@@ -193,7 +195,7 @@ module RailsAdmin
         #
         # @see RailsAdmin::AbstractModel.properties
         register_instance_option :serial? do
-          properties && properties.serial?
+          properties&.serial?
         end
 
         register_instance_option :view_helper do
@@ -213,6 +215,7 @@ module RailsAdmin
           returned = true
           (RailsAdmin.config.default_hidden_fields || {}).each do |section, fields|
             next unless self.section.is_a?("RailsAdmin::Config::Sections::#{section.to_s.camelize}".constantize)
+
             returned = false if fields.include?(name)
           end
           returned
@@ -223,14 +226,31 @@ module RailsAdmin
           []
         end
 
-        register_instance_option :render do
-          bindings[:view].render partial: "rails_admin/main/#{partial}", locals: {field: self, form: bindings[:form]}
-        end
-
         register_instance_option :default_filter_operator do
           nil
         end
 
+        register_instance_option :eager_load do
+          false
+        end
+
+        register_deprecated_instance_option :eager_load?, :eager_load
+
+        def eager_load_values
+          case eager_load
+          when true
+            [name]
+          when false, nil
+            []
+          else
+            Array.wrap(eager_load)
+          end
+        end
+
+        register_instance_option :render do
+          bindings[:view].render partial: "rails_admin/main/#{partial}", locals: {field: self, form: bindings[:form]}
+        end
+
         def editable?
           !(@properties && @properties.read_only?)
         end
@@ -259,7 +279,7 @@ module RailsAdmin
         # @see RailsAdmin::Config::Fields::Base.register_instance_option :required?
         def optional(state = nil, &block)
           if !state.nil? || block
-            required state.nil? ? proc { false == instance_eval(&block) } : false == state
+            required state.nil? ? proc { instance_eval(&block) == false } : state == false
           else
             optional?
           end
@@ -302,7 +322,7 @@ module RailsAdmin
         end
 
         def generic_help
-          (required? ? I18n.translate('admin.form.required') : I18n.translate('admin.form.optional')) + '. '
+          "#{required? ? I18n.translate('admin.form.required') : I18n.translate('admin.form.optional')}. "
         end
 
         def generic_field_help

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

@@ -17,6 +17,7 @@ RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
       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

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

@@ -3,18 +3,16 @@ require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/belongs_to_association'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
-  if association = parent.abstract_model.associations.detect { |a| a.foreign_key == properties.name && [:belongs_to, :has_and_belongs_to_many].include?(a.type) }
+  if association = parent.abstract_model.associations.detect { |a| a.foreign_key == properties.name && %i[belongs_to has_and_belongs_to_many].include?(a.type) }
     field = RailsAdmin::Config::Fields::Types.load("#{association.polymorphic? ? :polymorphic : association.type}_association").new(parent, association.name, association)
     fields << field
 
     child_columns = []
-    possible_field_names = begin
-      if association.polymorphic?
-        [:foreign_key, :foreign_type, :foreign_inverse_of]
-      else
-        [:foreign_key]
-      end.collect { |k| association.send(k) }.compact
-    end
+    possible_field_names = if association.polymorphic?
+                             %i[foreign_key foreign_type foreign_inverse_of]
+                           else
+                             [:foreign_key]
+                           end.collect { |k| association.send(k) }.compact
 
     parent.abstract_model.properties.select { |p| possible_field_names.include? p.name }.each do |column|
       unless child_field = fields.detect { |f| f.name.to_s == column.name.to_s }

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

@@ -7,12 +7,13 @@ RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
   if defined?(::CarrierWave) && model.is_a?(CarrierWave::Mount) && model.uploaders.include?(attachment_name = properties.name.to_s.chomp('_file_name').to_sym)
     columns = [model.uploader_options[attachment_name][:mount_on] || attachment_name, "#{attachment_name}_content_type".to_sym, "#{attachment_name}_file_size".to_sym]
     field = RailsAdmin::Config::Fields::Types.load(
-      [:serialized, :json].include?(properties.type) ? :multiple_carrierwave : :carrierwave,
+      %i[serialized json].include?(properties.type) ? :multiple_carrierwave : :carrierwave,
     ).new(parent, attachment_name, properties)
     fields << field
     children_fields = []
     columns.each do |children_column_name|
       next unless child_properties = parent.abstract_model.properties.detect { |p| p.name.to_s == children_column_name.to_s }
+
       children_field = fields.detect { |f| f.name == children_column_name } || RailsAdmin::Config::Fields.default_factory.call(parent, child_properties, fields)
       children_field.hide unless field == children_field
       children_field.filterable(false) unless field == children_field

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

@@ -5,12 +5,13 @@ require 'rails_admin/config/fields/types/password'
 # Register a custom field factory for devise model
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
   if properties.name == :encrypted_password
-    extensions = [:password_salt, :reset_password_token, :remember_token]
+    extensions = %i[password_salt reset_password_token remember_token]
     fields << RailsAdmin::Config::Fields::Types.load(:password).new(parent, :password, properties)
     fields << RailsAdmin::Config::Fields::Types.load(:password).new(parent, :password_confirmation, properties)
     extensions.each do |ext|
       properties = parent.abstract_model.properties.detect { |p| ext == p.name }
       next unless properties
+
       unless field = fields.detect { |f| f.name == ext }
         RailsAdmin::Config::Fields.default_factory.call(parent, properties, fields)
         field = fields.last