rails_admin 3.2.0.beta → 3.2.0.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ad121e2654221b302244d3792229d2f7ef62e95ff35777196f8f885b945c475
-  data.tar.gz: 5f800d3097c56282ed4ec366bf55a2cb839f5bfa481567c16dcdf81684b02ad1
+  metadata.gz: bb8262bbe1aab2c4d873c5a470ca69ff43800ba59d0f319d20039be36e34a640
+  data.tar.gz: 7dea99571de5a200d22096ee47881d0b114033eb8643d95af58041115cf66088
 SHA512:
-  metadata.gz: e8f2148f02b5b35e9f7f2ae6a8d635b2f10e9fa99370baa0f78d7bc0805880c6d02097b43b928f0abdcf123294910713e68ab87bc0be2c708d436b3eb425ce3c
-  data.tar.gz: d708dc50f78bbe22015721d49213d6991048022d4c6773f6168412ad025cb1a8125579bd9daabb20921f2c12bf8c8a846cdd914aa8fefdb8967e0ec8ec028008
+  metadata.gz: ddb8cabf32fa1023033bc51d8eb2ffa287a8981f7bd10dd862237f1aa5e1a8b84c8b2df64558e1a9bca6c306af42239e952988959fb26b2d68228f9bf828f62d
+  data.tar.gz: ee7a91df4279aa73f889c83c52bcd6e5bb64ae217e2e03aa92bcef08f084f0bef8ce1736405fe390d4c9e5651349cff9e5cc789b0cd7899dce4d911b4125ff05

data/Gemfile

@@ -21,7 +21,6 @@ group :test do
   gem 'carrierwave', ['>= 2.0.0.rc', '< 3']
   gem 'cuprite', '!= 0.15.1'
   gem 'database_cleaner-active_record', '>= 2.0', require: false
-  gem 'database_cleaner-mongoid', '>= 2.0', require: false
   gem 'dragonfly', '~> 1.0'
   gem 'factory_bot', '>= 4.2', '!= 6.4.5'
   gem 'generator_spec', '>= 0.8'
@@ -54,12 +53,4 @@ group :active_record do
   end
 end
 
-group :mongoid do
-  gem 'cancancan-mongoid'
-  gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
-  gem 'kaminari-mongoid'
-  gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
-  gem 'shrine-mongoid', '~> 1.0'
-end
-
 gemspec

data/app/helpers/rails_admin/application_helper.rb

@@ -7,6 +7,10 @@ module RailsAdmin
       action(action_name, abstract_model, object).try(:authorized?)
     end
 
+    def current_action
+      params[:action].in?(%w[create new]) ? 'create' : 'update'
+    end
+
     def current_action?(action, abstract_model = @abstract_model, object = @object)
       @action.custom_key == action.custom_key &&
         abstract_model.try(:to_param) == @abstract_model.try(:to_param) &&

data/app/helpers/rails_admin/form_builder.rb

@@ -108,8 +108,8 @@ module RailsAdmin
     end
 
     def hidden_field(method, options = {})
-      if method == :id
-        super method, {value: object.id.to_s}
+      if method == :id && object.id.is_a?(Array)
+        super method, {value: RailsAdmin.config.composite_keys_serializer.serialize(object.id)}
       else
         super
       end

data/app/views/rails_admin/main/_form_filtering_multiselect.html.erb

@@ -1,45 +1,14 @@
 <%
   config = field.associated_model_config
-  source_abstract_model = RailsAdmin.config(form.object.class).abstract_model
-
-  selected = form.object.send(field.name)
-  selected_ids = selected.map{|s| s.send(field.associated_primary_key).to_s}
-
-  current_action = params[:action].in?(['create', 'new']) ? 'create' : 'update'
-
-  xhr = !field.associated_collection_cache_all
-
-  collection = if xhr
-    selected.map { |o| [o.send(field.associated_object_label_method), o.send(field.associated_primary_key)] }
-  else
-    i = 0
-    controller.list_entries(config, :index, field.associated_collection_scope, false).map { |o| [o.send(field.associated_object_label_method), o.send(field.associated_primary_key).to_s] }.sort_by {|a| [selected_ids.index(a[1]) || selected_ids.size, i+=1] }
-  end
-
-  js_data = {
-    xhr: xhr,
-    :'edit-url' => (field.inline_edit && authorized?(:edit, config.abstract_model) ? edit_path(model_name: config.abstract_model.to_param, id: '__ID__') : ''),
-    remote_source: index_path(config.abstract_model, source_object_id: form.object.id, source_abstract_model: source_abstract_model.to_param, associated_collection: field.name, current_action: current_action, compact: true),
-    scopeBy: field.dynamic_scope_relationships,
-    sortable: !!field.orderable,
-    removable: !!field.removable,
-    cacheAll: !!field.associated_collection_cache_all,
-    regional: {
-      add: t('admin.misc.add_new'),
-      chooseAll: t('admin.misc.chose_all'),
-      clearAll: t('admin.misc.clear_all'),
-      down: t('admin.misc.down'),
-      remove: t('admin.misc.remove'),
-      search: t('admin.misc.search'),
-      up: t('admin.misc.up')
-    }
-  }
 %>
+
 <div class="row">
   <div class="col-auto">
     <input name="<%= form.dom_name(field) %>" type="hidden" />
-    <% selected_ids = (hdv = field.form_default_value).nil? ? selected_ids : hdv %>
-    <%= form.select field.method_name, collection, { selected: selected_ids, object: form.object }, field.html_attributes.reverse_merge({data: { filteringmultiselect: true, options: js_data.to_json }, multiple: true}) %>
+    <%=
+      form.select field.method_name, field.collection, { selected: field.form_value, object: form.object },
+                  field.html_attributes.reverse_merge({data: { filteringmultiselect: true, options: field.widget_options.to_json }, multiple: true})
+    %>
   </div>
   <% if authorized?(:new, config.abstract_model) && field.inline_add %>
     <div class="col-sm-4 modal-actions">

data/app/views/rails_admin/main/_form_filtering_select.html.erb

@@ -1,34 +1,21 @@
 <%
   config = field.associated_model_config
-  source_abstract_model = RailsAdmin.config(form.object.class).abstract_model
-
-  current_action = params[:action].in?(['create', 'new']) ? 'create' : 'update'
-
-  edit_url = authorized?(:edit, config.abstract_model) ? edit_path(model_name: config.abstract_model.to_param, modal: true, id: '__ID__') : ''
-
-  xhr = !field.associated_collection_cache_all
-
-  collection = xhr ? [[field.formatted_value, field.selected_id]] : controller.list_entries(config, :index, field.associated_collection_scope, false).map { |o| [o.send(field.associated_object_label_method), o.send(field.associated_primary_key).to_s] }
-
-  js_data = {
-    xhr: xhr,
-    remote_source: index_path(config.abstract_model.to_param, source_object_id: form.object.id, source_abstract_model: source_abstract_model.to_param, associated_collection: field.name, current_action: current_action, compact: true),
-    scopeBy: field.dynamic_scope_relationships
-  }
 %>
 
 <div class="row">
   <div class="col-sm-4">
-    <% selected_id = (hdv = field.form_default_value).nil? ? field.selected_id : hdv %>
-    <%= form.select field.method_name, collection, { selected: selected_id, include_blank: true }, field.html_attributes.reverse_merge({ data: { filteringselect: true, options: js_data.to_json }, placeholder: t('admin.misc.search') }) %>
+    <%=
+      form.select field.method_name, field.collection, { selected: field.form_value, include_blank: true },
+                  field.html_attributes.reverse_merge({ data: { filteringselect: true, options: field.widget_options.to_json }, placeholder: t('admin.misc.search') })
+    %>
   </div>
   <div class="col-sm-8 mt-2 mt-md-0 modal-actions">
     <% if authorized?(:new, config.abstract_model) && field.inline_add %>
       <% path_hash = { model_name: config.abstract_model.to_param, modal: true }.merge!(field.associated_prepopulate_params) %>
       <%= link_to "<i class=\"fas fa-plus\"></i> ".html_safe + wording_for(:link, :new, config.abstract_model), '#', data: { link: new_path(path_hash) }, class: "btn btn-info create" %>
     <% end %>
-    <% if edit_url.present? && field.inline_edit %>
-      <%= link_to "<i class=\"fas fa-pencil-alt\"></i> ".html_safe + wording_for(:link, :edit, config.abstract_model), '#', data: { link: edit_url }, class: "btn btn-info update ms-2#{' disabled' if field.value.nil?}" %>
+    <% if authorized?(:edit, config.abstract_model) && field.inline_edit %>
+      <%= link_to "<i class=\"fas fa-pencil-alt\"></i> ".html_safe + wording_for(:link, :edit, config.abstract_model), '#', data: { link: edit_path(model_name: config.abstract_model.to_param, modal: true, id: '__ID__') }, class: "btn btn-info update ms-2#{' disabled' if field.value.nil?}" %>
     <% end %>
   </div>
 </div>

data/app/views/rails_admin/main/_form_polymorphic_association.html.erb

@@ -1,32 +1,23 @@
 <%
-  type_collection = field.polymorphic_type_collection
-  type_column = field.association.foreign_type.to_s
-  selected_type = field.bindings[:object].send(type_column)
-  selected = field.bindings[:object].send(field.association.name)
-  collection = selected ? [[field.formatted_value, selected.id]] : [[]]
-  column_type_dom_id = form.dom_id(field).sub(field.method_name.to_s, type_column)
-  current_action = params[:action].in?(['create', 'new']) ? 'create' : 'update'
-
-  default_options = { float_left: false }
-
-  js_data = type_collection.inject({}) do |options, model|
-    source_abstract_model = RailsAdmin.config(form.object.class).abstract_model
-    options.merge(model.second.downcase.gsub('::', '-') => {
-      xhr: true,
-      remote_source: index_path(model.second.underscore, source_object_id: form.object.id, source_abstract_model: source_abstract_model.to_param, current_action: current_action, compact: true),
-      float_left: false
-    })
-  end
+  column_type_dom_id = form.dom_id(field).sub(field.method_name.to_s, field.type_column)
 %>
 
 <div class="row">
   <div class="col-sm-3">
-    <% js_data.each do |model, value| %>
+    <% field.widget_options_for_types.each do |model, value| %>
       <div data-options="<%= value.to_json %>" id="<%= model %>-js-options"></div>
     <% end %>
-    <%= form.select type_column, type_collection, {include_blank: true, selected: selected_type}, class: "form-select", id: column_type_dom_id, data: { polymorphic: true, urls: field.polymorphic_type_urls.to_json }, style: "float: left; margin-right: 10px;" %>
+    <%=
+      form.select field.type_column, field.type_collection, {include_blank: true, selected: field.selected_type},
+                  class: "form-select", id: column_type_dom_id, data: { polymorphic: true, urls: field.type_urls.to_json },
+                  style: "float: left; margin-right: 10px;"
+    %>
   </div>
   <div class="col-sm-4">
-    <%= form.select field.method_name, collection, {include_blank: true, selected: selected.try(:id)}, class: "form-control", data: { filteringselect: true, options: js_data[selected_type.try(:downcase)] || default_options }, placeholder: 'Search' %>
+    <%=
+      form.select field.method_name, field.collection, {include_blank: true, selected: field.selected_id},
+                  class: "form-control", data: { filteringselect: true, options: field.widget_options },
+                  placeholder: 'Search'
+    %>
   </div>
 </div>

data/config/initializers/active_record_extensions.rb

@@ -20,27 +20,4 @@ ActiveSupport.on_load(:active_record) do
       end
     end
   end
-
-  if defined?(CompositePrimaryKeys)
-    # Apply patch until the fix is released:
-    #   https://github.com/composite-primary-keys/composite_primary_keys/pull/572
-    CompositePrimaryKeys::CompositeKeys.class_eval do
-      alias_method :to_param, :to_s
-    end
-
-    CompositePrimaryKeys::CollectionAssociation.prepend(Module.new do
-      def ids_writer(ids)
-        if reflection.association_primary_key.is_a? Array
-          ids = CompositePrimaryKeys.normalize(Array(ids).reject(&:blank?), reflection.association_primary_key.size)
-          reflection.association_primary_key.each_with_index do |primary_key, i|
-            pk_type = klass.type_for_attribute(primary_key)
-            ids.each do |id|
-              id[i] = pk_type.cast(id[i]) if id.is_a? Array
-            end
-          end
-        end
-        super ids
-      end
-    end)
-  end
 end

data/lib/rails_admin/abstract_model.rb

@@ -105,17 +105,20 @@ module RailsAdmin
       end
     end
 
+    def format_id(id)
+      id
+    end
+
+    def parse_id(id)
+      id
+    end
+
   private
 
     def initialize_active_record
       @adapter = :active_record
-      if defined?(::CompositePrimaryKeys)
-        require 'rails_admin/adapters/composite_primary_keys'
-        extend Adapters::CompositePrimaryKeys
-      else
-        require 'rails_admin/adapters/active_record'
-        extend Adapters::ActiveRecord
-      end
+      require 'rails_admin/adapters/active_record'
+      extend Adapters::ActiveRecord
     end
 
     def initialize_mongoid

data/lib/rails_admin/adapters/active_record/association.rb

@@ -42,16 +42,29 @@ module RailsAdmin
         def primary_key
           return nil if polymorphic?
 
-          case type
-          when :has_one
-            association.klass.primary_key
+          value =
+            case type
+            when :has_one
+              association.klass.primary_key
+            else
+              association.association_primary_key
+            end
+
+          if value.is_a? Array
+            :id
           else
-            association.association_primary_key
-          end.try(:to_sym)
+            value.to_sym
+          end
         end
 
         def foreign_key
-          association.foreign_key.to_sym
+          if association.options[:query_constraints].present?
+            association.options[:query_constraints].map(&:to_sym)
+          elsif association.foreign_key.is_a?(Array)
+            association.foreign_key.map(&:to_sym)
+          else
+            association.foreign_key.to_sym
+          end
         end
 
         def foreign_key_nullable?
@@ -75,7 +88,11 @@ module RailsAdmin
           when :has_one
             :"#{name}_id"
           else
-            foreign_key
+            if foreign_key.is_a?(Array)
+              :"#{name}_id"
+            else
+              foreign_key
+            end
           end
         end
 

data/lib/rails_admin/adapters/active_record.rb

@@ -15,7 +15,7 @@ module RailsAdmin
       end
 
       def get(id, scope = scoped)
-        object = scope.where(primary_key => id).first
+        object = primary_key_scope(scope, id).first
         return unless object
 
         object.extend(ObjectExtension)
@@ -115,10 +115,42 @@ module RailsAdmin
         true
       end
 
+      def format_id(id)
+        if primary_key.is_a? Array
+          RailsAdmin.config.composite_keys_serializer.serialize(id)
+        else
+          id
+        end
+      end
+
+      def parse_id(id)
+        if primary_key.is_a?(Array)
+          ids = RailsAdmin.config.composite_keys_serializer.deserialize(id)
+          primary_key.each_with_index do |key, i|
+            ids[i] = model.type_for_attribute(key).cast(ids[i])
+          end
+          ids
+        else
+          id
+        end
+      end
+
     private
 
+      def primary_key_scope(scope, id)
+        if primary_key.is_a? Array
+          scope.where(primary_key.zip(parse_id(id)).to_h)
+        else
+          scope.where(primary_key => id)
+        end
+      end
+
       def bulk_scope(scope, options)
-        scope.where(primary_key => options[:bulk_ids])
+        if primary_key.is_a? Array
+          options[:bulk_ids].map { |id| primary_key_scope(scope, id) }.reduce(&:or)
+        else
+          scope.where(primary_key => options[:bulk_ids])
+        end
       end
 
       def sort_scope(scope, options)

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

@@ -50,9 +50,11 @@ module RailsAdmin
               format.json do
                 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
-                    @objects.collect { |o| {id: o.send(primary_key_method).to_s, label: o.send(label_method).to_s} }
+                    if @association
+                      @association.collection(@objects).collect { |(label, id)| {id: id, label: label} }
+                    else
+                      @objects.collect { |object| {id: object.id.to_s, label: object.send(@model_config.object_label_method).to_s} }
+                    end
                   else
                     @objects.to_json(@schema)
                   end

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

@@ -13,7 +13,7 @@ module RailsAdmin
         end
 
         def method_name
-          association.key_accessor
+          nested_form ? :"#{name}_attributes" : association.key_accessor
         end
 
         register_instance_option :pretty_value do
@@ -134,6 +134,12 @@ module RailsAdmin
           bindings[:object].send(association.name)
         end
 
+        # Returns collection of all selectable records
+        def collection(scope = nil)
+          (scope || bindings[:controller].list_entries(associated_model_config, :index, associated_collection_scope, false)).
+            map { |o| [o.send(associated_object_label_method), format_key(o.send(associated_primary_key)).to_s] }
+        end
+
         # has many?
         def multiple?
           true
@@ -146,6 +152,16 @@ module RailsAdmin
         def associated_model_limit
           RailsAdmin.config.default_associated_collection_limit
         end
+
+      private
+
+        def format_key(key)
+          if key.is_a?(Array)
+            RailsAdmin.config.composite_keys_serializer.serialize(key)
+          else
+            key
+          end
+        end
       end
     end
   end

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

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+require 'rails_admin/config/fields/association'
+
+module RailsAdmin
+  module Config
+    module Fields
+      class CollectionAssociation < Association
+        # orderable associated objects
+        register_instance_option :orderable do
+          false
+        end
+
+        register_instance_option :partial do
+          nested_form ? :form_nested_many : :form_filtering_multiselect
+        end
+
+        def collection(scope = nil)
+          if scope
+            super
+          elsif associated_collection_cache_all
+            selected = selected_ids
+            i = 0
+            super.sort_by { |a| [selected.index(a[1]) || selected.size, i += 1] }
+          else
+            value.map { |o| [o.send(associated_object_label_method), format_key(o.send(associated_primary_key))] }
+          end
+        end
+
+        def associated_prepopulate_params
+          {associated_model_config.abstract_model.param_key => {association.foreign_key => bindings[:object].try(:id)}}
+        end
+
+        def multiple?
+          true
+        end
+
+        def selected_ids
+          value.map { |s| format_key(s.send(associated_primary_key)).to_s }
+        end
+
+        def parse_input(params)
+          return unless associated_model_config.abstract_model.primary_key.is_a?(Array)
+
+          if nested_form
+            params[method_name].each_value do |value|
+              value[:id] = associated_model_config.abstract_model.parse_id(value[:id])
+            end
+          elsif params[method_name].is_a?(Array)
+            params[method_name] = params[method_name].map { |key| associated_model_config.abstract_model.parse_id(key) if key.present? }.compact
+            if params[method_name].empty?
+              # Workaround for Arel::Visitors::UnsupportedVisitError in #ids_writer, until https://github.com/rails/rails/pull/51116 is in place
+              params.delete(method_name)
+              params[name] = []
+            end
+          end
+        end
+
+        def form_default_value
+          (default_value if bindings[:object].new_record? && value.empty?)
+        end
+
+        def form_value
+          form_default_value.nil? ? selected_ids : form_default_value
+        end
+
+        def widget_options
+          {
+            xhr: !associated_collection_cache_all,
+            'edit-url': (inline_edit && bindings[:view].authorized?(:edit, associated_model_config.abstract_model) ? bindings[:view].edit_path(model_name: associated_model_config.abstract_model.to_param, id: '__ID__') : ''),
+            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,
+            sortable: !!orderable,
+            removable: !!removable,
+            cacheAll: !!associated_collection_cache_all,
+            regional: {
+              add: ::I18n.t('admin.misc.add_new'),
+              chooseAll: ::I18n.t('admin.misc.chose_all'),
+              clearAll: ::I18n.t('admin.misc.clear_all'),
+              down: ::I18n.t('admin.misc.down'),
+              remove: ::I18n.t('admin.misc.remove'),
+              search: ::I18n.t('admin.misc.search'),
+              up: ::I18n.t('admin.misc.up'),
+            },
+          }
+        end
+      end
+    end
+  end
+end

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
@@ -51,11 +48,11 @@ module RailsAdmin
           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" : 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" : 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,54 +1,33 @@
 # 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])
-          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
-
           register_instance_option :allowed_methods do
             nested_form ? [method_name] : [name]
           end
 
-          def selected_id
-            value.try(:id).try(:to_s)
-          end
-
-          def method_name
-            nested_form ? :"#{name}_attributes" : super
-          end
-
-          def multiple?
-            false
-          end
-
           def associated_prepopulate_params
             {associated_model_config.abstract_model.param_key => {association.foreign_key => bindings[:object].try(:id)}}
           end
 
           def parse_input(params)
-            return if nested_form
+            return super if nested_form
 
             id = params.delete(method_name)
             params[name] = associated_model_config.abstract_model.get(id) if id
           end
+
+          def selected_id
+            format_key(value.try(:id)).try(:to_s)
+          end
         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)

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.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

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

@@ -5,7 +5,7 @@ module RailsAdmin
     MAJOR = 3
     MINOR = 2
     PATCH = 0
-    PRE = 'beta'
+    PRE = 'rc'
 
     class << self
       # @return [String]

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rails_admin",
-  "version": "3.2.0-beta",
+  "version": "3.2.0-rc",
   "description": "RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.",
   "homepage": "https://github.com/railsadminteam/rails_admin",
   "license": "MIT",
@@ -22,7 +22,7 @@
     "bootstrap": "^5.1.3",
     "flatpickr": "^4.6.9",
     "jquery": "^3.6.0",
-    "jquery-ui": "^1.12.1"
+    "jquery-ui": "^1.12.1 <1.14.0"
   },
   "devDependencies": {
     "prettier": "^2.4.1"

data/src/rails_admin/widgets.js

@@ -258,6 +258,7 @@ import I18n from "./i18n";
             "options"
           );
           object_select.data("options", selected_data);
+          object_select.val("");
           object_select.filteringSelect("destroy");
           object_select.filteringSelect(selected_data);
         });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin
 version: !ruby/object:Gem::Version
-  version: 3.2.0.beta
+  version: 3.2.0.rc
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-13 00:00:00.000000000 Z
+date: 2024-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel-serializers-xml
@@ -220,8 +220,6 @@ files:
 - lib/rails_admin/adapters/active_record/association.rb
 - lib/rails_admin/adapters/active_record/object_extension.rb
 - lib/rails_admin/adapters/active_record/property.rb
-- lib/rails_admin/adapters/composite_primary_keys.rb
-- lib/rails_admin/adapters/composite_primary_keys/association.rb
 - lib/rails_admin/adapters/mongoid.rb
 - lib/rails_admin/adapters/mongoid/association.rb
 - lib/rails_admin/adapters/mongoid/bson.rb
@@ -247,6 +245,7 @@ files:
 - lib/rails_admin/config/fields.rb
 - lib/rails_admin/config/fields/association.rb
 - lib/rails_admin/config/fields/base.rb
+- lib/rails_admin/config/fields/collection_association.rb
 - lib/rails_admin/config/fields/factories/action_text.rb
 - lib/rails_admin/config/fields/factories/active_storage.rb
 - lib/rails_admin/config/fields/factories/association.rb
@@ -258,6 +257,7 @@ files:
 - lib/rails_admin/config/fields/factories/password.rb
 - lib/rails_admin/config/fields/factories/shrine.rb
 - lib/rails_admin/config/fields/group.rb
+- lib/rails_admin/config/fields/singular_association.rb
 - lib/rails_admin/config/fields/types.rb
 - lib/rails_admin/config/fields/types/action_text.rb
 - lib/rails_admin/config/fields/types/active_record_enum.rb
@@ -271,7 +271,6 @@ files:
 - lib/rails_admin/config/fields/types/ck_editor.rb
 - lib/rails_admin/config/fields/types/code_mirror.rb
 - lib/rails_admin/config/fields/types/color.rb
-- lib/rails_admin/config/fields/types/composite_keys_belongs_to_association.rb
 - lib/rails_admin/config/fields/types/date.rb
 - lib/rails_admin/config/fields/types/datetime.rb
 - lib/rails_admin/config/fields/types/decimal.rb
@@ -333,6 +332,8 @@ files:
 - lib/rails_admin/extensions/paper_trail/auditing_adapter.rb
 - lib/rails_admin/extensions/pundit.rb
 - lib/rails_admin/extensions/pundit/authorization_adapter.rb
+- lib/rails_admin/extensions/url_for_extension.rb
+- lib/rails_admin/support/composite_keys_serializer.rb
 - lib/rails_admin/support/csv_converter.rb
 - lib/rails_admin/support/datetime.rb
 - lib/rails_admin/support/es_module_processor.rb

data/lib/rails_admin/adapters/composite_primary_keys/association.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-module RailsAdmin
-  module Adapters
-    module CompositePrimaryKeys
-      class Association < RailsAdmin::Adapters::ActiveRecord::Association
-        def field_type
-          if type == :belongs_to && association.foreign_key.is_a?(Array)
-            :composite_keys_belongs_to_association
-          else
-            super
-          end
-        end
-
-        def primary_key
-          return nil if polymorphic?
-
-          value = association.association_primary_key
-
-          if value.is_a? Array
-            :id
-          else
-            value.to_sym
-          end
-        end
-
-        def foreign_key
-          if association.foreign_key.is_a? Array
-            association.foreign_key.map(&:to_sym)
-          else
-            super
-          end
-        end
-
-        def key_accessor
-          if type == :belongs_to && foreign_key.is_a?(Array)
-            :"#{name}_id"
-          else
-            super
-          end
-        end
-      end
-    end
-  end
-end

data/lib/rails_admin/adapters/composite_primary_keys.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_admin/adapters/active_record'
-require 'rails_admin/adapters/composite_primary_keys/association'
-
-module RailsAdmin
-  module Adapters
-    module CompositePrimaryKeys
-      include RailsAdmin::Adapters::ActiveRecord
-
-      def get(id, scope = scoped)
-        begin
-          object = scope.find(id)
-        rescue ::ActiveRecord::RecordNotFound
-          return nil
-        end
-
-        object.extend(RailsAdmin::Adapters::ActiveRecord::ObjectExtension)
-      end
-
-      def associations
-        model.reflect_on_all_associations.collect do |association|
-          RailsAdmin::Adapters::CompositePrimaryKeys::Association.new(association, model)
-        end
-      end
-
-    private
-
-      def bulk_scope(scope, options)
-        if primary_key.is_a? Array
-          options[:bulk_ids].map do |id|
-            scope.where(primary_key.zip(::CompositePrimaryKeys::CompositeKeys.parse(id)).to_h)
-          end.reduce(&:or)
-        else
-          super
-        end
-      end
-    end
-  end
-end

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

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_admin/config/fields/types/belongs_to_association'
-
-module RailsAdmin
-  module Config
-    module Fields
-      module Types
-        class CompositeKeysBelongsToAssociation < RailsAdmin::Config::Fields::Types::BelongsToAssociation
-          RailsAdmin::Config::Fields::Types.register(self)
-
-          register_instance_option :allowed_methods do
-            nested_form ? [method_name] : Array(association.foreign_key)
-          end
-
-          def selected_id
-            association.foreign_key.map { |attribute| bindings[:object].safe_send(attribute) }.to_composite_keys.to_s
-          end
-
-          def parse_input(params)
-            return unless params[method_name].present? && association.foreign_key.is_a?(Array) && !nested_form
-
-            association.foreign_key.zip(CompositePrimaryKeys::CompositeKeys.parse(params.delete(method_name))).each do |key, value|
-              params[key] = value
-            end
-          end
-        end
-      end
-    end
-  end
-end