rails_admin 1.4.3 → 2.0.0

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/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/multiple_active_storage.rb

@@ -12,7 +12,7 @@ module RailsAdmin
               {resize: '100x100>'}
             end
 
-            register_instance_option :delete_key do
+            register_instance_option :delete_value do
               value.id
             end
 

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

@@ -12,8 +12,12 @@ 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)
@@ -27,7 +31,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

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

@@ -19,10 +19,16 @@ module RailsAdmin
               nil
             end
 
-            register_instance_option :delete_key do
+            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]
@@ -30,9 +36,9 @@ 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(value, url, target: '_blank')
+                  v.link_to(value, url, target: '_blank', rel: 'noopener noreferrer')
                 end
               end
             end
@@ -67,6 +73,14 @@ module RailsAdmin
             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

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

@@ -78,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/shrine.rb

@@ -0,0 +1,52 @@
+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 value.is_a?(Hash)
+
+                if value.key?(:thumb)
+                  :thumb
+                elsif value.key?(:thumbnail)
+                  :thumbnail
+                else
+                  value.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
+          end
+
+          register_instance_option :cache_value do
+            bindings[:object].public_send("cached_#{name}_data") if bindings[:object].respond_to?("cached_#{name}_data")
+          end
+
+          def resource_url(thumb = nil)
+            return nil unless value
+
+            if value.is_a?(Hash)
+              value[thumb || value.keys.first].url
+            else
+              value.url
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rails_admin/config/fields/types/simple_mde.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 SimpleMDE < RailsAdmin::Config::Fields::Types::Text
+        class SimpleMDE < Text
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
@@ -14,13 +14,16 @@ module RailsAdmin
             nil
           end
 
-          # Use this if you want to point to a cloud instance of the base SimpleMDE
+          register_instance_option :version do
+            '1.11.2'
+          end
+
           register_instance_option :js_location do
-            "#{Rails.application.config.assets.prefix}/simplemde.min.js"
+            "https://cdnjs.cloudflare.com/ajax/libs/simplemde/#{version}/simplemde.min.js"
           end
 
           register_instance_option :css_location do
-            "#{Rails.application.config.assets.prefix}/simplemde.min.css"
+            "https://cdnjs.cloudflare.com/ajax/libs/simplemde/#{version}/simplemde.min.css"
           end
 
           register_instance_option :partial do

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

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

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

@@ -1,31 +1,13 @@
-require 'rails_admin/config/fields/base'
+require 'rails_admin/config/fields/types/string_like'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class Text < RailsAdmin::Config::Fields::Base
+        class Text < StringLike
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
-          [:ckeditor, :ckeditor_base_location, :ckeditor_config_js, :ckeditor_location].each do |key|
-            register_deprecated_instance_option key do
-              raise("The 'field(:foo){ ckeditor true }' style DSL is deprecated. Please use 'field :foo, :ck_editor' instead.")
-            end
-          end
-
-          [:codemirror, :codemirror_assets, :codemirror_config, :codemirror_css_location, :codemirror_js_location].each do |key|
-            register_deprecated_instance_option key do
-              raise("The 'field(:foo){ codemirror true }' style DSL is deprecated. Please use 'field :foo, :code_mirror' instead.")
-            end
-          end
-
-          [:bootstrap_wysihtml5, :bootstrap_wysihtml5_config_options, :bootstrap_wysihtml5_css_location, :bootstrap_wysihtml5_js_location].each do |key|
-            register_deprecated_instance_option key do
-              raise("The 'field(:foo){ bootstrap_wysihtml5 true }' style DSL is deprecated. Please use 'field :foo, :wysihtml5' instead.")
-            end
-          end
-
           register_instance_option :html_attributes do
             {
               required: required?,

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

@@ -1,35 +1,39 @@
-require 'rails_admin/config/fields/base'
+require 'rails_admin/config/fields/types/text'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class Wysihtml5 < RailsAdmin::Config::Fields::Types::Text
+        class Wysihtml5 < 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
+          # https://github.com/bootstrap-wysiwyg/bootstrap3-wysiwyg
           register_instance_option :config_options do
-            nil
+            {
+              toolbar: {
+                fa: true,
+              },
+            }
+          end
+
+          register_instance_option :version do
+            '0.3.3'
           end
 
           register_instance_option :css_location do
-            ActionController::Base.helpers.asset_path('bootstrap-wysihtml5/index.css')
+            "https://cdnjs.cloudflare.com/ajax/libs/bootstrap3-wysiwyg/#{version}/bootstrap3-wysihtml5.min.css"
           end
 
           register_instance_option :js_location do
-            ActionController::Base.helpers.asset_path('bootstrap-wysihtml5/index.js')
+            "https://cdnjs.cloudflare.com/ajax/libs/bootstrap3-wysiwyg/#{version}/bootstrap3-wysihtml5.all.min.js"
           end
 
           register_instance_option :partial do
             :form_wysihtml5
           end
-
-          [:config_options, :css_location, :js_location].each do |key|
-            register_deprecated_instance_option :"bootstrap_wysihtml5_#{key}", key
-          end
         end
       end
     end

data/lib/rails_admin/config/fields.rb

@@ -82,6 +82,7 @@ require 'rails_admin/config/fields/factories/devise'
 require 'rails_admin/config/fields/factories/paperclip'
 require 'rails_admin/config/fields/factories/dragonfly'
 require 'rails_admin/config/fields/factories/carrierwave'
-require 'rails_admin/config/fields/factories/refile'
 require 'rails_admin/config/fields/factories/active_storage'
+require 'rails_admin/config/fields/factories/shrine'
+require 'rails_admin/config/fields/factories/action_text'
 require 'rails_admin/config/fields/factories/association'

data/lib/rails_admin/config/model.rb

@@ -44,7 +44,8 @@ module RailsAdmin
       end
 
       def excluded?
-        @excluded ||= !RailsAdmin::AbstractModel.all.collect(&:model_name).include?(abstract_model.try(:model_name))
+        return @excluded if defined?(@excluded)
+        @excluded = !RailsAdmin::AbstractModel.all.collect(&:model_name).include?(abstract_model.try(:model_name))
       end
 
       def object_label
@@ -87,7 +88,7 @@ module RailsAdmin
 
       register_instance_option :navigation_label do
         @navigation_label ||= begin
-          if (parent_module = abstract_model.model.parent) != Object
+          if (parent_module = abstract_model.model.try(:module_parent) || abstract_model.model.try!(:parent)) != Object
             parent_module.to_s
           end
         end

data/lib/rails_admin/config/proxyable/proxy.rb

@@ -2,8 +2,6 @@ module RailsAdmin
   module Config
     module Proxyable
       class Proxy < BasicObject
-        attr_reader :bindings
-
         def initialize(object, bindings = {})
           @object = object
           @bindings = bindings
@@ -21,12 +19,12 @@ module RailsAdmin
 
         def method_missing(name, *args, &block)
           if @object.respond_to?(name)
-            reset = @object.instance_variable_get('@bindings')
+            reset = @object.bindings
             begin
-              @object.instance_variable_set('@bindings', @bindings)
+              @object.bindings = @bindings
               response = @object.__send__(name, *args, &block)
             ensure
-              @object.instance_variable_set('@bindings', reset)
+              @object.bindings = reset
             end
             response
           else

data/lib/rails_admin/config/proxyable.rb

@@ -2,7 +2,19 @@ require 'rails_admin/config/proxyable/proxy'
 module RailsAdmin
   module Config
     module Proxyable
-      attr_accessor :bindings
+      def bindings
+        Thread.current[:rails_admin_bindings] ||= {}
+        Thread.current[:rails_admin_bindings][self]
+      end
+
+      def bindings=(new_bindings)
+        Thread.current[:rails_admin_bindings] ||= {}
+        if new_bindings.nil?
+          Thread.current[:rails_admin_bindings].delete(self)
+        else
+          Thread.current[:rails_admin_bindings][self] = new_bindings
+        end
+      end
 
       def with(bindings = {})
         RailsAdmin::Config::Proxyable::Proxy.new(self, bindings)

data/lib/rails_admin/config/sections/list.rb

@@ -24,6 +24,10 @@ module RailsAdmin
           false
         end
 
+        register_instance_option :search_by do
+          nil
+        end
+
         register_instance_option :sort_by do
           parent.abstract_model.primary_key
         end
@@ -39,6 +43,25 @@ module RailsAdmin
         register_instance_option :row_css_class do
           ''
         end
+
+        register_instance_option :sidescroll do
+          nil
+        end
+
+        def sidescroll_frozen_columns
+          global_config = RailsAdmin::Config.sidescroll
+          model_config = sidescroll
+          enabled = model_config.nil? ? global_config : model_config
+          if enabled
+            num_frozen = model_config[:num_frozen_columns] if model_config.is_a?(Hash)
+            unless num_frozen
+              num_frozen = global_config[:num_frozen_columns] if global_config.is_a?(Hash)
+              num_frozen ||= 3 # by default, freeze checkboxes, links & first property (usually primary key / id?)
+              num_frozen -= 1 unless checkboxes? # model config should be explicit about this, only adjust if using global config
+            end
+            num_frozen
+          end
+        end
       end
     end
   end

data/lib/rails_admin/config.rb

@@ -59,6 +59,9 @@ module RailsAdmin
       # Set the max width of columns in list view before a new set is created
       attr_accessor :total_columns_width
 
+      # Enable horizontal-scrolling table in list view, ignore total_columns_width
+      attr_accessor :sidescroll
+
       # set parent controller
       attr_accessor :parent_controller
 
@@ -138,11 +141,11 @@ module RailsAdmin
       #   end
       #
       # To use an authorization adapter, pass the name of the adapter. For example,
-      # to use with CanCan[https://github.com/ryanb/cancan], pass it like this.
+      # to use with CanCanCan[https://github.com/CanCanCommunity/cancancan/], pass it like this.
       #
-      # @example CanCan
+      # @example CanCanCan
       #   RailsAdmin.config do |config|
-      #     config.authorize_with :cancan
+      #     config.authorize_with :cancancan
       #   end
       #
       # See the wiki[https://github.com/sferik/rails_admin/wiki] for more on authorization.
@@ -207,9 +210,7 @@ module RailsAdmin
 
       # pool of all found model names from the whole application
       def models_pool
-        excluded = (excluded_models.collect(&:to_s) + %w(RailsAdmin::History PaperTrail::Version PaperTrail::VersionAssociation ActiveStorage::Attachment ActiveStorage::Blob))
-
-        (viable_models - excluded).uniq.sort
+        (viable_models - excluded_models.collect(&:to_s)).uniq.sort
       end
 
       # Loads a model configuration instance from the registry or registers
@@ -285,6 +286,7 @@ module RailsAdmin
         @excluded_models = []
         @included_models = []
         @total_columns_width = 697
+        @sidescroll = nil
         @label_methods = [:name, :title]
         @main_app_name = proc { [Rails.application.engine_name.titleize.chomp(' Application'), 'Admin'] }
         @registry = {}

data/lib/rails_admin/engine.rb

@@ -1,4 +1,3 @@
-require 'font-awesome-rails'
 require 'jquery-rails'
 require 'jquery-ui-rails'
 require 'kaminari'
@@ -45,7 +44,7 @@ module RailsAdmin
 
     # Check for required middlewares, users may forget to use them in Rails API mode
     config.after_initialize do |app|
-      has_session_store = ::Rails.version < '5.0' || app.config.middleware.to_a.any? do |m|
+      has_session_store = app.config.middleware.to_a.any? do |m|
         m.klass.try(:<=, ActionDispatch::Session::AbstractStore) ||
           m.klass.name =~ /^ActionDispatch::Session::/
       end

data/lib/rails_admin/extensions/cancancan/authorization_adapter.rb

@@ -2,38 +2,62 @@ module RailsAdmin
   module Extensions
     module CanCanCan
       # This adapter is for the CanCanCan[https://github.com/CanCanCommunity/cancancan] authorization library.
-      class AuthorizationAdapter < RailsAdmin::Extensions::CanCan::AuthorizationAdapter
+      class AuthorizationAdapter
+        module ControllerExtension
+          def current_ability
+            # use _current_user instead of default current_user so it works with
+            # whatever current user method is defined with RailsAdmin
+            @current_ability ||= @ability.new(_current_user)
+          end
+        end
+
+        # See the +authorize_with+ config method for where the initialization happens.
+        def initialize(controller, ability = ::Ability)
+          @controller = controller
+          @controller.instance_variable_set '@ability', ability
+          @controller.extend ControllerExtension
+          @controller.current_ability.authorize! :access, :rails_admin
+        end
+
+        # This method is called in every controller action and should raise an exception
+        # when the authorization fails. The first argument is the name of the controller
+        # action as a symbol (:create, :bulk_delete, etc.). The second argument is the
+        # AbstractModel instance that applies. The third argument is the actual model
+        # instance if it is available.
         def authorize(action, abstract_model = nil, model_object = nil)
           return unless action
-          subject = model_object || abstract_model && abstract_model.model
-          if authorized_for_dashboard_in_legacy_way?(action)
-            subject
-          else
-            @controller.current_ability.authorize!(*resolve_with_compatibility(action, subject))
-          end
+          action, subject = resolve_action_and_subject(action, abstract_model, model_object)
+          @controller.current_ability.authorize!(action, subject)
         end
 
+        # This method is called primarily from the view to determine whether the given user
+        # has access to perform the action on a given model. It should return true when authorized.
+        # This takes the same arguments as +authorize+. The difference is that this will
+        # return a boolean whereas +authorize+ will raise an exception when not authorized.
         def authorized?(action, abstract_model = nil, model_object = nil)
           return unless action
-          subject = model_object || abstract_model && abstract_model.model
-          authorized_for_dashboard_in_legacy_way?(action, true) ||
-            @controller.current_ability.can?(*resolve_with_compatibility(action, subject))
+          action, subject = resolve_action_and_subject(action, abstract_model, model_object)
+          @controller.current_ability.can?(action, subject)
         end
 
-      private
+        # This is called when needing to scope a database query. It is called within the list
+        # and bulk_delete/destroy actions and should return a scope which limits the records
+        # to those which the user can perform the given action on.
+        def query(action, abstract_model)
+          abstract_model.model.accessible_by(@controller.current_ability, action)
+        end
 
-        def authorized_for_dashboard_in_legacy_way?(action, silent = false)
-          return false unless action == :dashboard
-          legacy_ability = @controller.current_ability.permissions[:can][:dashboard]
-          if legacy_ability && (legacy_ability.empty? || legacy_ability.all?(&:empty?))
-            ActiveSupport::Deprecation.warn('RailsAdmin CanCanCan Ability with `can :dashboard` is old and support will be removed in the next major release, use `can :read, :dashboard` instead. See https://github.com/sferik/rails_admin/issues/2901') unless silent
-            true
-          else
-            false
-          end
+        # This is called in the new/create actions to determine the initial attributes for new
+        # records. It should return a hash of attributes which match what the user
+        # is authorized to create.
+        def attributes_for(action, abstract_model)
+          @controller.current_ability.attributes_for(action, abstract_model && abstract_model.model)
         end
 
-        def resolve_with_compatibility(action, subject)
+      private
+
+        def resolve_action_and_subject(action, abstract_model, model_object)
+          subject = model_object || abstract_model && abstract_model.model
           if subject
             [action, subject]
           else