rails_admin 3.1.1 → 3.3.1

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

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'rails_admin/config/fields/association'
+
+module RailsAdmin
+  module Config
+    module Fields
+      class SingularAssociation < Association
+        register_instance_option :filter_operators do
+          %w[_discard like not_like is starts_with ends_with] + (required? ? [] : %w[_separator _present _blank])
+        end
+
+        register_instance_option :formatted_value do
+          (o = value) && o.send(associated_model_config.object_label_method)
+        end
+
+        register_instance_option :partial do
+          nested_form ? :form_nested_one : :form_filtering_select
+        end
+
+        def collection(scope = nil)
+          if associated_collection_cache_all || scope
+            super
+          else
+            [[formatted_value, selected_id]]
+          end
+        end
+
+        def multiple?
+          false
+        end
+
+        def selected_id
+          raise NoMethodError # abstract
+        end
+
+        def parse_input(params)
+          return unless nested_form && params[method_name].try(:[], :id).present?
+
+          ids = associated_model_config.abstract_model.parse_id(params[method_name][:id])
+          ids = ids.to_composite_keys.to_s if ids.respond_to?(:to_composite_keys)
+          params[method_name][:id] = ids
+        end
+
+        def form_value
+          form_default_value.nil? ? selected_id : form_default_value
+        end
+
+        def widget_options
+          {
+            xhr: !associated_collection_cache_all,
+            remote_source: bindings[:view].index_path(associated_model_config.abstract_model, source_object_id: abstract_model.format_id(bindings[:object].id), source_abstract_model: abstract_model.to_param, associated_collection: name, current_action: bindings[:view].current_action, compact: true),
+            scopeBy: dynamic_scope_relationships,
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -18,10 +18,7 @@ module RailsAdmin
           end
 
           register_instance_option :image? do
-            if value
-              mime_type = Mime::Type.lookup_by_extension(value.filename.extension_without_delimiter)
-              mime_type.to_s.match?(/^image/)
-            end
+            value && (value.representable? || value.content_type.match?(/^image/))
           end
 
           register_instance_option :eager_load do
@@ -40,14 +37,22 @@ module RailsAdmin
             )
           end
 
+          register_instance_option :searchable do
+            false
+          end
+
+          register_instance_option :sortable do
+            false
+          end
+
           def resource_url(thumb = false)
             return nil unless value
 
-            if thumb && value.variable?
+            if thumb && value.representable?
               thumb = thumb_method if thumb == true
-              variant = value.variant(thumb)
+              representation = value.representation(thumb)
               Rails.application.routes.url_helpers.rails_blob_representation_path(
-                variant.blob.signed_id, variant.variation.key, variant.blob.filename, only_path: true
+                representation.blob.signed_id, representation.variation.key, representation.blob.filename, only_path: true
               )
             else
               Rails.application.routes.url_helpers.rails_blob_path(value, only_path: true)

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

@@ -6,7 +6,6 @@ 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'
-require 'rails_admin/config/fields/types/composite_keys_belongs_to_association'
 require 'rails_admin/config/fields/types/date'
 require 'rails_admin/config/fields/types/datetime'
 require 'rails_admin/config/fields/types/decimal'

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

@@ -1,22 +1,14 @@
 # frozen_string_literal: true
 
-require 'rails_admin/config/fields/association'
+require 'rails_admin/config/fields/singular_association'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class BelongsToAssociation < RailsAdmin::Config::Fields::Association
+        class BelongsToAssociation < RailsAdmin::Config::Fields::SingularAssociation
           RailsAdmin::Config::Fields::Types.register(self)
 
-          register_instance_option :filter_operators do
-            %w[_discard like not_like is starts_with ends_with] + (required? ? [] : %w[_separator _present _blank])
-          end
-
-          register_instance_option :formatted_value do
-            (o = value) && o.send(associated_model_config.object_label_method)
-          end
-
           register_instance_option :sortable do
             @sortable ||= abstract_model.adapter_supports_joins? && associated_model_config.abstract_model.properties.collect(&:name).include?(associated_model_config.object_label_method) ? associated_model_config.object_label_method : {abstract_model.table_name => method_name}
           end
@@ -25,24 +17,29 @@ module RailsAdmin
             @searchable ||= associated_model_config.abstract_model.properties.collect(&:name).include?(associated_model_config.object_label_method) ? [associated_model_config.object_label_method, {abstract_model.model => method_name}] : {abstract_model.model => method_name}
           end
 
-          register_instance_option :partial do
-            nested_form ? :form_nested_one : :form_filtering_select
-          end
-
           register_instance_option :eager_load do
             true
           end
 
-          def selected_id
-            bindings[:object].safe_send(association.key_accessor)
+          register_instance_option :allowed_methods do
+            nested_form ? [method_name] : Array(association.foreign_key)
           end
 
-          def method_name
-            nested_form ? "#{name}_attributes".to_sym : super
+          def selected_id
+            if association.foreign_key.is_a?(Array)
+              format_key(association.foreign_key.map { |attribute| bindings[:object].safe_send(attribute) })
+            else
+              bindings[:object].safe_send(association.key_accessor)
+            end
           end
 
-          def multiple?
-            false
+          def parse_input(params)
+            return super if nested_form
+            return unless params[method_name].present? && association.foreign_key.is_a?(Array)
+
+            association.foreign_key.zip(RailsAdmin.config.composite_keys_serializer.deserialize(params.delete(method_name))).each do |key, value|
+              params[key] = value
+            end
           end
         end
       end

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

@@ -12,7 +12,6 @@ module RailsAdmin
           RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :image? do
-            false unless value
             if abstract_model.model.new.respond_to?("#{name}_name")
               mime_type = Mime::Type.lookup_by_extension(bindings[:object].send("#{name}_name").to_s.split('.').last)
               mime_type.to_s.match?(/^image/)

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

@@ -52,7 +52,7 @@ module RailsAdmin
           end
 
           register_instance_option :image? do
-            mime_type = Mime::Type.lookup_by_extension(resource_url.to_s.split('.').last)
+            mime_type = Mime::Type.lookup_by_extension(extension)
             mime_type.to_s.match?(/^image/)
           end
 
@@ -66,6 +66,12 @@ module RailsAdmin
             }
           end
 
+          def extension
+            URI.parse(resource_url).path.split('.').last
+          rescue URI::InvalidURIError
+            nil
+          end
+
           # virtual class
           def resource_url
             raise 'not implemented'

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

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'rails_admin/config/fields/types/has_many_association'
+require 'rails_admin/config/fields/collection_association'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class HasAndBelongsToManyAssociation < RailsAdmin::Config::Fields::Types::HasManyAssociation
+        class HasAndBelongsToManyAssociation < RailsAdmin::Config::Fields::CollectionAssociation
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
         end

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

@@ -1,36 +1,14 @@
 # frozen_string_literal: true
 
-require 'rails_admin/config/fields/association'
+require 'rails_admin/config/fields/collection_association'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class HasManyAssociation < RailsAdmin::Config::Fields::Association
+        class HasManyAssociation < RailsAdmin::Config::Fields::CollectionAssociation
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
-
-          register_instance_option :partial do
-            nested_form ? :form_nested_many : :form_filtering_multiselect
-          end
-
-          # orderable associated objects
-          register_instance_option :orderable do
-            false
-          end
-
-          def method_name
-            nested_form ? "#{name}_attributes".to_sym : super
-          end
-
-          # Reader for validation errors of the bound object
-          def errors
-            bindings[:object].errors[name]
-          end
-
-          def associated_prepopulate_params
-            {associated_model_config.abstract_model.param_key => {association.foreign_key => bindings[:object].try(:id)}}
-          end
         end
       end
     end

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

@@ -1,42 +1,32 @@
 # frozen_string_literal: true
 
-require 'rails_admin/config/fields/association'
+require 'rails_admin/config/fields/singular_association'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class HasOneAssociation < RailsAdmin::Config::Fields::Association
+        class HasOneAssociation < RailsAdmin::Config::Fields::SingularAssociation
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
-          register_instance_option :filter_operators do
-            %w[_discard like not_like is starts_with ends_with] + (required? ? [] : %w[_separator _present _blank])
+          register_instance_option :allowed_methods do
+            nested_form ? [method_name] : [name]
           end
 
-          register_instance_option :partial do
-            nested_form ? :form_nested_one : :form_filtering_select
-          end
-
-          # Accessor for field's formatted value
-          register_instance_option :formatted_value do
-            (o = value) && o.send(associated_model_config.object_label_method)
-          end
-
-          def selected_id
-            value.try(:id).try(:to_s)
+          def associated_prepopulate_params
+            {associated_model_config.abstract_model.param_key => {association.foreign_key => bindings[:object].try(:id)}}
           end
 
-          def method_name
-            nested_form ? "#{name}_attributes".to_sym : super
-          end
+          def parse_input(params)
+            return super if nested_form
 
-          def multiple?
-            false
+            id = params.delete(method_name)
+            params[name] = associated_model_config.abstract_model.get(id) if id
           end
 
-          def associated_prepopulate_params
-            {associated_model_config.abstract_model.param_key => {association.foreign_key => bindings[:object].try(:id)}}
+          def selected_id
+            format_key(value.try(:id)).try(:to_s)
           end
         end
       end

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

@@ -23,19 +23,16 @@ module RailsAdmin
             end
 
             register_instance_option :image? do
-              if value
-                mime_type = Mime::Type.lookup_by_extension(value.filename.extension_without_delimiter)
-                mime_type.to_s.match?(/^image/)
-              end
+              value && (value.representable? || value.content_type.match?(/^image/))
             end
 
             def resource_url(thumb = false)
               return nil unless value
 
-              if thumb && value.variable?
-                variant = value.variant(thumb_method)
+              if thumb && value.representable?
+                representation = value.representation(thumb_method)
                 Rails.application.routes.url_helpers.rails_blob_representation_path(
-                  variant.blob.signed_id, variant.variation.key, variant.blob.filename, only_path: true
+                  representation.blob.signed_id, representation.variation.key, representation.blob.filename, only_path: true
                 )
               else
                 Rails.application.routes.url_helpers.rails_blob_path(value, only_path: true)
@@ -48,7 +45,7 @@ module RailsAdmin
           end
 
           register_instance_option :keep_method do
-            method_name if ::ActiveStorage.replace_on_assign_to_many
+            method_name if ::ActiveStorage.gem_version >= Gem::Version.new('7.1') || ::ActiveStorage.replace_on_assign_to_many
           end
 
           register_instance_option :delete_method do
@@ -70,6 +67,14 @@ module RailsAdmin
               direct? && {data: {direct_upload_url: bindings[:view].main_app.rails_direct_uploads_url}} || {},
             )
           end
+
+          register_instance_option :searchable do
+            false
+          end
+
+          register_instance_option :sortable do
+            false
+          end
         end
       end
     end

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

@@ -47,13 +47,19 @@ module RailsAdmin
             end
 
             register_instance_option :image? do
-              mime_type = Mime::Type.lookup_by_extension(resource_url.to_s.split('.').last)
+              mime_type = Mime::Type.lookup_by_extension(extension)
               mime_type.to_s.match?(/^image/)
             end
 
             def resource_url(_thumb = false)
               raise 'not implemented'
             end
+
+            def extension
+              URI.parse(resource_url).path.split('.').last
+            rescue URI::InvalidURIError
+              nil
+            end
           end
 
           def initialize(*args)

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

@@ -51,26 +51,29 @@ module RailsAdmin
             false
           end
 
-          def associated_collection(type)
-            return [] if type.blank?
+          def associated_model_config
+            @associated_model_config ||= association.klass.collect { |type| RailsAdmin.config(type) }.reject(&:excluded?)
+          end
 
-            config = RailsAdmin.config(type)
-            config.abstract_model.all.collect do |object|
-              [object.send(config.object_label_method), object.id]
+          def collection(_scope = nil)
+            if value
+              [[formatted_value, selected_id]]
+            else
+              [[]]
             end
           end
 
-          def associated_model_config
-            @associated_model_config ||= association.klass.collect { |type| RailsAdmin.config(type) }.reject(&:excluded?)
+          def type_column
+            association.foreign_type.to_s
           end
 
-          def polymorphic_type_collection
+          def type_collection
             associated_model_config.collect do |config|
               [config.label, config.abstract_model.model.name]
             end
           end
 
-          def polymorphic_type_urls
+          def type_urls
             types = associated_model_config.collect do |config|
               [config.abstract_model.model.name, config.abstract_model.to_param]
             end
@@ -82,6 +85,26 @@ module RailsAdmin
             bindings[:object].send(association.name)
           end
 
+          def widget_options_for_types
+            type_collection.inject({}) do |options, model|
+              options.merge(
+                model.second.downcase.gsub('::', '-') => {
+                  xhr: true,
+                  remote_source: bindings[:view].index_path(model.second.underscore, source_object_id: bindings[:object].id, source_abstract_model: abstract_model.to_param, current_action: bindings[:view].current_action, compact: true),
+                  float_left: false,
+                },
+              )
+            end
+          end
+
+          def widget_options
+            widget_options_for_types[selected_type.try(:downcase)] || {float_left: false}
+          end
+
+          def selected_type
+            bindings[:object].send(type_column)
+          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 }

data/lib/rails_admin/config/model.rb

@@ -48,7 +48,9 @@ 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

data/lib/rails_admin/config.rb

@@ -2,6 +2,7 @@
 
 require 'rails_admin/config/lazy_model'
 require 'rails_admin/config/sections/list'
+require 'rails_admin/support/composite_keys_serializer'
 require 'active_support/core_ext/module/attribute_accessors'
 
 module RailsAdmin
@@ -84,6 +85,9 @@ module RailsAdmin
       # Set where RailsAdmin fetches JS/CSS from, defaults to :sprockets
       attr_writer :asset_source
 
+      # For customization of composite keys representation
+      attr_accessor :composite_keys_serializer
+
       # Setup authentication to be run as a before filter
       # This is run inside the controller instance so you can setup any authentication you need to
       #
@@ -329,6 +333,7 @@ module RailsAdmin
         @navigation_static_links = {}
         @navigation_static_label = nil
         @asset_source = nil
+        @composite_keys_serializer = RailsAdmin::Support::CompositeKeysSerializer
         @parent_controller = '::ActionController::Base'
         @forgery_protection_settings = {with: :exception}
         RailsAdmin::Config::Actions.reset
@@ -364,23 +369,22 @@ module RailsAdmin
 
     private
 
-      def lchomp(base, arg)
-        base.to_s.reverse.chomp(arg.to_s.reverse).reverse
-      end
-
       def viable_models
         included_models.collect(&:to_s).presence || begin
           @@system_models ||= # memoization for tests
             ([Rails.application] + Rails::Engine.subclasses.collect(&:instance)).flat_map do |app|
               (app.paths['app/models'].to_a + app.config.eager_load_paths).collect do |load_path|
                 Dir.glob(app.root.join(load_path)).collect do |load_dir|
+                  path_prefix = "#{app.root.join(load_dir)}/"
                   Dir.glob("#{load_dir}/**/*.rb").collect do |filename|
                     # app/models/module/class.rb => module/class.rb => module/class => Module::Class
-                    lchomp(filename, "#{app.root.join(load_dir)}/").chomp('.rb').camelize
+                    filename.delete_prefix(path_prefix).chomp('.rb').camelize
                   end
                 end
               end
             end.flatten.reject { |m| m.starts_with?('Concerns::') } # rubocop:disable Style/MultilineBlockChain
+
+          @@system_models + @registry.keys.collect(&:to_s)
         end
       end
 

data/lib/rails_admin/engine.rb

@@ -4,6 +4,7 @@ require 'kaminari'
 require 'nested_form'
 require 'rails'
 require 'rails_admin'
+require 'rails_admin/extensions/url_for_extension'
 require 'rails_admin/version'
 require 'turbo-rails'
 
@@ -15,6 +16,10 @@ module RailsAdmin
 
     config.action_dispatch.rescue_responses['RailsAdmin::ActionNotAllowed'] = :forbidden
 
+    initializer 'RailsAdmin load UrlForExtension' do
+      RailsAdmin::Engine.routes.singleton_class.prepend(RailsAdmin::Extensions::UrlForExtension)
+    end
+
     initializer 'RailsAdmin reload config in development' do |app|
       config.initializer_path = app.root.join('config/initializers/rails_admin.rb')
 

data/lib/rails_admin/extensions/paper_trail/auditing_adapter.rb

@@ -146,7 +146,7 @@ module RailsAdmin
           versions = object.nil? ? versions_for_model(model) : object.public_send(model.model.versions_association_name)
           versions = versions.where('event LIKE ?', "%#{query}%") if query.present?
           versions = versions.order(sort)
-          versions = all ? versions : versions.send(Kaminari.config.page_method_name, current_page).per(per_page)
+          versions = versions.send(Kaminari.config.page_method_name, current_page).per(per_page) unless all
           paginated_proxies = Kaminari.paginate_array([], total_count: versions.try(:total_count) || versions.count)
           paginated_proxies = paginated_proxies.send(
             paginated_proxies.respond_to?(Kaminari.config.page_method_name) ? Kaminari.config.page_method_name : :page,

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

@@ -44,7 +44,8 @@ module RailsAdmin
         def query(_action, abstract_model)
           @controller.send(:policy_scope, abstract_model.model.all)
         rescue ::Pundit::NotDefinedError
-          abstract_model.model.all
+          # Fail closed: a missing policy scope must not be treated as "no restriction".
+          abstract_model.none
         end
 
         # This is called in the new/create actions to determine the initial attributes for new

data/lib/rails_admin/extensions/url_for_extension.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module RailsAdmin
+  module Extensions
+    module UrlForExtension
+      def url_for(options, *args)
+        case options[:id]
+        when Array
+          options[:id] = RailsAdmin.config.composite_keys_serializer.serialize(options[:id])
+        end
+        super options, *args
+      end
+    end
+  end
+end

data/lib/rails_admin/support/composite_keys_serializer.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module RailsAdmin
+  module Support
+    module CompositeKeysSerializer
+      def self.serialize(keys)
+        keys.map { |key| key&.to_s&.gsub('_', '__') }.join('_')
+      end
+
+      def self.deserialize(string)
+        string.split('_').map { |key| key&.gsub('__', '_') }
+      end
+    end
+  end
+end

data/lib/rails_admin/support/csv_converter.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 require 'csv'

data/lib/rails_admin/support/datetime.rb

@@ -21,6 +21,7 @@ module RailsAdmin
         '%-I' => 'h',      # Hour of the day, 12-hour clock (1..12)
         '%k' => 'H',       # Hour of the day, 24-hour clock (0..23)
         '%l' => 'h',       # Hour of the day, 12-hour clock (1..12)
+        '%-l' => 'h',      # Hour of the day, 12-hour clock (1..12)
         '%M' => 'i',       # Minute of the hour (00..59)
         '%-M' => 'i',      # Minute of the hour (00..59)
         '%m' => 'm',       # Month of the year (01..12)