rails_admin 3.1.1 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32f625ca21a5c94c2fc91766ae74ef690a92ff7f882068b70d617ad7b1e1ff3a
-  data.tar.gz: ed3af9f17b3277f11a4b17db9beffe03d80294b453bb086d7aa819c46ce9cc1d
+  metadata.gz: a18178de7305b2be5286d22268d911c84952d779d46210548887cf220f5c052d
+  data.tar.gz: d0f6a162ca88c76b4be204608f5d265843c8bb59a55d93fe0b5fd65575e7c36e
 SHA512:
-  metadata.gz: 2ad917ef318789585952a8e82084d3042960037a441ce1197f752f036e4f581107c37b0dab9466627fbe60e3f22e03d9a62f9af2f92ab9d77b1f5e02cfc85167
-  data.tar.gz: 02225217c1f2997fccfce31605d494bdc5668778482ccb8c84231cf431efaafa4a830988526c1bfae88cac4a0342d41d1d7bd10b9507a8c60c2da2f1131d3250
+  metadata.gz: f93d7e8d4cab0ac54b62db959da642a0a83267234c92f7394cb2eb2ad44e821804fe7bd11a0a34eeb090eec10265dbe6abd06b0d3ce17c8992525976af513ba8
+  data.tar.gz: 2abe7c0eaca1c5ea064408bf389d7e108df43808e6551418c25945578e1d4d611a799a786b8de851b99ce86010f2615aa36a64b5d3b259c32f704f1b6ce627b9

data/Gemfile

@@ -2,21 +2,15 @@
 
 source 'https://rubygems.org'
 
-gem 'appraisal', '>= 2.0'
-gem 'devise'
+gem 'appraisal', '>= 2.0', require: false
+gem 'devise', '~> 4.7'
 gem 'net-smtp', require: false
 gem 'rails'
+gem 'sassc-rails', '~> 2.1'
+gem 'turbo-rails'
+gem 'vite_rails', require: false
 gem 'webpacker', require: false
-gem 'webrick', '~> 1.7'
-
-group :active_record do
-  gem 'paper_trail'
-
-  platforms :ruby, :mswin, :mingw, :x64_mingw do
-    gem 'mysql2', '>= 0.3.14'
-    gem 'sqlite3', '>= 1.3'
-  end
-end
+gem 'webrick'
 
 group :development, :test do
   gem 'pry', '>= 0.9'
@@ -24,22 +18,24 @@ end
 
 group :test do
   gem 'cancancan', '~> 3.0'
-  gem 'carrierwave', ['>= 2.0.0.rc', '< 3']
-  gem 'cuprite'
+  gem 'carrierwave', ['>= 2.2.1', '< 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'
+  gem 'factory_bot', '>= 4.2', '!= 6.4.5'
   gem 'generator_spec', '>= 0.8'
+  gem 'json', '< 3' # Workaround for json 3.0 quirks_mode removal
+  gem 'kt-paperclip'
   gem 'launchy', '>= 2.2'
   gem 'mini_magick', '>= 3.4'
   gem 'pundit'
   gem 'rack-cache', require: 'rack/cache'
   gem 'rspec-expectations', '!= 3.8.3'
-  gem 'rspec-rails', '>= 2.14'
+  gem 'rspec-rails', '>= 4.0.0.beta2'
   gem 'rspec-retry'
   gem 'rubocop', ['~> 1.20', '!= 1.22.2'], require: false
   gem 'rubocop-performance', require: false
+  gem 'shrine', '~> 3.0'
   gem 'simplecov', '>= 0.9', require: false
   gem 'simplecov-lcov', require: false
   gem 'timecop', '>= 0.5'
@@ -48,4 +44,14 @@ group :test do
   gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
 end
 
+group :active_record do
+  gem 'paper_trail', '>= 12.0'
+
+  platforms :ruby, :mswin, :mingw, :x64_mingw do
+    gem 'mysql2', '>= 0.3.14'
+    gem 'pg', '>= 1.0.0'
+    gem 'sqlite3', '>= 1.3.0'
+  end
+end
+
 gemspec

data/README.md

@@ -1,13 +1,13 @@
 # RailsAdmin
 
 [![Gem Version](https://img.shields.io/gem/v/rails_admin.svg)][gem]
-[![Build Status](https://img.shields.io/github/workflow/status/railsadminteam/rails_admin/Test)][ghactions]
+[![Build Status](https://github.com/railsadminteam/rails_admin/actions/workflows/test.yml/badge.svg)][ghactions]
 [![Coverage Status](https://img.shields.io/coveralls/railsadminteam/rails_admin.svg)][coveralls]
 [![Code Climate](https://codeclimate.com/github/railsadminteam/rails_admin.svg)][codeclimate]
 [![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=rails_admin&package-manager=bundler&version-scheme=semver)][semver]
 
 [gem]: https://rubygems.org/gems/rails_admin
-[ghactions]: https://github.com/railsadminteam/rails_admin/actions
+[ghactions]: https://github.com/railsadminteam/rails_admin/actions/workflows/test.yml
 [coveralls]: https://coveralls.io/r/railsadminteam/rails_admin
 [codeclimate]: https://codeclimate.com/github/railsadminteam/rails_admin
 [semver]: https://dependabot.com/compatibility-score.html?dependency-name=rails_admin&package-manager=bundler&version-scheme=semver
@@ -19,8 +19,8 @@ RailsAdmin is a Rails engine that provides an easy-to-use interface for managing
 - Check out [the docs][docs].
 - Try the [live demo][demo]. ([Source code][dummy_app])
 
-[demo]: http://rails-admin-tb.herokuapp.com/
-[dummy_app]: https://github.com/bbenezech/dummy_app
+[demo]: https://rails-admin.fly.dev/admin/
+[dummy_app]: https://github.com/railsadminteam/rails_admin/tree/master/spec/dummy_app
 [docs]: https://github.com/railsadminteam/rails_admin/wiki
 
 ## Features
@@ -98,6 +98,8 @@ This library aims to support and is [tested against][ghactions] the following Ru
 - Ruby 2.6
 - Ruby 2.7
 - Ruby 3.0
+- Ruby 3.1
+- Ruby 3.2
 - [JRuby][]
 
 [jruby]: http://jruby.org/

data/app/assets/javascripts/rails_admin/application.js.erb

@@ -9,6 +9,7 @@
 //=  require 'rails_admin/popper'
 //=  require 'rails_admin/bootstrap'
 
+//=  require 'rails_admin/abstract-select'
 //=  require 'rails_admin/filter-box'
 //=  require 'rails_admin/filtering-multiselect'
 //=  require 'rails_admin/filtering-select'
@@ -20,10 +21,10 @@
 //=  require 'rails_admin/ui'
 //=  require 'rails_admin/custom/ui'
 
-<% if defined?(ActiveStorage) %>
+<% if defined?(ActiveStorage::Engine) %>
 //= require activestorage
 <% end %>
-<% if defined?(ActionText) && Rails.gem_version >= Gem::Version.new('7.0') %>
+<% if defined?(ActionText::Engine) && Rails.gem_version >= Gem::Version.new('7.0') %>
 //= require trix
 //= require actiontext
 <% end %>

data/app/assets/stylesheets/rails_admin/application.scss.erb

@@ -30,6 +30,6 @@
 @import "rails_admin/styles/base/theming";
 @import "rails_admin/custom/theming";
 
-<% if defined?(ActionText) && Rails.gem_version >= Gem::Version.new('7.0') %>
+<% if defined?(ActionText::Engine) && Rails.gem_version >= Gem::Version.new('7.0') %>
 @import "trix";
 <% end %>

data/app/controllers/rails_admin/main_controller.rb

@@ -56,7 +56,11 @@ module RailsAdmin
     end
 
     def back_or_index
-      params[:return_to].presence && params[:return_to].include?(request.host) && (params[:return_to] != request.fullpath) ? params[:return_to] : index_path
+      allowed_return_to?(params[:return_to].to_s) ? params[:return_to] : index_path
+    end
+
+    def allowed_return_to?(url)
+      url != request.fullpath && url.start_with?(request.base_url, '/') && !url.start_with?('//')
     end
 
     def get_sort_hash(model_config)
@@ -90,6 +94,17 @@ module RailsAdmin
       model_config.send(action).with(controller: self, view: view_context, object: @object).visible_fields
     end
 
+    # Memoized, as export renders through index, which switches @action
+    def serialization_schema
+      @serialization_schema ||= begin
+        section = %i[export show].include?(@action.key) ? @model_config.send(@action.key) : @model_config.list
+        RailsAdmin::SerializationSchema.new(
+          section.with(controller: self, view: view_context, object: @object || @abstract_model.model.new),
+          include_associations: @action.key == :export,
+        )
+      end
+    end
+
     def sanitize_params_for!(action, model_config = @model_config, target_params = params[@abstract_model.param_key])
       return unless target_params.present?
 

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
@@ -149,9 +149,10 @@ module RailsAdmin
   private
 
     def nested_field_association?(field, nested_in)
-      field.inverse_of.presence && nested_in.presence && field.inverse_of == nested_in.name &&
-        (@template.instance_variable_get(:@model_config).abstract_model == field.abstract_model ||
-         field.name == nested_in.inverse_of)
+      nested_in.presence &&
+        (field.name == nested_in.inverse_of ||
+         (field.inverse_of.presence && field.inverse_of == nested_in.name &&
+          @template.instance_variable_get(:@model_config).abstract_model == field.abstract_model))
     end
   end
 end

data/app/helpers/rails_admin/main_helper.rb

@@ -45,7 +45,7 @@ module RailsAdmin
           filter_for_field = duplet[1]
           filter_name = filter_for_field.keys.first
           filter_hash = filter_for_field.values.first
-          unless (field = filterable_fields.find { |f| f.name == filter_name.to_sym })
+          unless (field = filterable_fields.find { |f| f.name == filter_name.to_sym }&.with({view: self}))
             raise "#{filter_name} is not currently filterable; filterable fields are #{filterable_fields.map(&:name).join(', ')}"
           end
 

data/app/views/layouts/rails_admin/_head.html.erb

@@ -1,7 +1,8 @@
-<meta content="IE=edge" http-equiv="X-UA-Compatible"/>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-<meta content="width=device-width, initial-scale=1" name="viewport; charset=utf-8"/>
-<meta content="NONE,NOARCHIVE" name="robots"/>
+<meta content="IE=edge" http-equiv="X-UA-Compatible">
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+<meta content="width=device-width, initial-scale=1" name="viewport; charset=utf-8">
+<meta content="NONE,NOARCHIVE" name="robots">
+<meta content="false" name="turbo-prefetch">
 <%= csrf_meta_tag %>
 <% case RailsAdmin::config.asset_source
    when :webpacker %>
@@ -12,6 +13,8 @@
     <%= stylesheet_link_tag "rails_admin/application.css", media: :all, data: {'turbo-track': 'reload'} %>
     <%= javascript_include_tag "rails_admin/application.js", defer: true, data: {'turbo-track': 'reload'} %>
   <% end %>
+<% when :vite %>
+  <%= vite_javascript_tag "rails_admin", defer: true, data: {'turbo-track': 'reload'} %>
 <% when :webpack %>
   <%= stylesheet_link_tag "rails_admin.css", media: :all, data: {'turbo-track': 'reload'} %>
   <%= javascript_include_tag "rails_admin.js", defer: true, data: {'turbo-track': 'reload'} %>
@@ -19,11 +22,11 @@
   <%= stylesheet_link_tag "rails_admin.css", media: :all, data: {'turbo-track': 'reload'} %>
   <%= javascript_inline_importmap_tag(RailsAdmin::Engine.importmap.to_json(resolver: self)) %>
   <%= javascript_importmap_module_preload_tags(RailsAdmin::Engine.importmap) %>
-  <%= javascript_importmap_shim_nonce_configuration_tag %>
-  <%= javascript_importmap_shim_tag %>
+  <%= javascript_importmap_shim_nonce_configuration_tag if respond_to? :javascript_importmap_shim_nonce_configuration_tag %>
+  <%= javascript_importmap_shim_tag if respond_to? :javascript_importmap_shim_tag %>
   <%= # Preload jQuery and make it global, unless jQuery UI fails to initialize
       tag.script "import jQuery from 'jquery'; window.jQuery = jQuery;".html_safe, type: "module" %>
   <%= javascript_import_module_tag 'rails_admin' %>
 <% else
      raise "Unknown asset_source: #{RailsAdmin::config.asset_source}"
-   end %>
+   end %>

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

@@ -2,9 +2,9 @@
   <div class="btn-group" role="group">
     <% {'1': [true, 'btn-outline-success'], '0': [false, 'btn-outline-danger'], '': [nil, 'btn-outline-secondary']}.each do |text, (value, btn_class)| %>
       <%= form.radio_button field.method_name, text, field.html_attributes.reverse_merge({ checked: field.form_value == value, required: field.required, class: 'btn-check' }) %>
-      <label for="<%= form.object_name %>_<%= field.method_name %>_<%= text %>" class="<%= field.css_classes[value] %> btn <%= btn_class %>">
+      <%= form.label "#{field.method_name}_#{text}", class: "#{field.css_classes[value]} btn #{btn_class}" do %>
         <%= field.labels[value].html_safe %>
-      </label>
+      <% end %>
     <% end %>
   </div>
 <% else %>

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

@@ -1,44 +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),
-    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,33 +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)
-  }
 %>
 
 <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_nested_many.html.erb

@@ -3,7 +3,7 @@
     <a class="<%= (field.active? ? 'active' : '') %> btn btn-info toggler" data-bs-target="<%= form.jquery_namespace(field) %> .collapse" data-bs-toggle="collapse" role="button">
       <i class="fas"></i>
     </a>
-    <% unless field.nested_form[:update_only] || !field.inline_add %>
+    <% if field.inline_add %>
       <%= form.link_to_add "<i class=\"fas fa-plus\"></i> #{wording_for(:link, :new, field.associated_model_config.abstract_model)}".html_safe, field.name, { class: 'btn btn-info' } %>
     <% end %>
   </div>

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

@@ -4,7 +4,7 @@
     <a class="<%= (field.active? ? 'active' : '') %> btn btn-info toggler" data-bs-target="<%= form.jquery_namespace(field) %> .collapse" data-bs-toggle="collapse" role="button">
       <i class="fas"></i>
     </a>
-    <% unless field.nested_form[:update_only] || !field.inline_add %>
+    <% if field.inline_add %>
       <%= form.link_to_add "<i class=\"fas fa-plus\"></i> #{wording_for(:link, :new, field.associated_model_config.abstract_model)}".html_safe, field.name, { class: 'btn btn-info', :'data-add-label' => "<i class=\"fas fa-plus\"></i> #{wording_for(:link, :new, field.associated_model_config.abstract_model)}".gsub("\n", "") } %>
     <% end %>
   </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/app/views/rails_admin/main/delete.html.erb

@@ -1,6 +1,6 @@
 <h4>
   <%= t("admin.form.are_you_sure_you_want_to_delete_the_object", model_name: @abstract_model.pretty_name.downcase) %>
-  &ldquo;<strong><%= @model_config.with(object: @object).object_label %></strong>&rdquo;
+  <q><strong><%= @model_config.with(object: @object).object_label %></strong></q>
   <%= t("admin.form.all_of_the_following_related_items_will_be_deleted") %>
 </h4>
 <ul>

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

@@ -133,9 +133,9 @@
               <% end %>
               <% properties.map{ |property| property.bind(:object, object) }.each do |property| %>
                 <% value = property.pretty_value %>
-                <td class="<%= [property.sticky? && 'sticky', property.css_class, property.type_css_class].select(&:present?).join(' ') %>" title="<%= strip_tags(value.to_s) %>">
+                <%= content_tag(:td, class: [property.sticky? && 'sticky', property.css_class, property.type_css_class].select(&:present?), title: strip_tags(value.to_s)) do %>
                   <%= value %>
-                </td>
+                <% end %>
               <% end %>
               <td class="last links ra-sidescroll-frozen">
                 <ul class="nav d-inline list-inline">

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/generators/rails_admin/importmap_formatter.rb

@@ -6,12 +6,13 @@ module RailsAdmin
   class ImportmapFormatter
     attr_reader :packager
 
-    def initialize(path = 'confing/importmap.rails_admin.rb')
+    def initialize(path = 'config/importmap.rails_admin.rb')
       @packager = Importmap::Packager.new(path)
     end
 
     def format
-      imports = packager.import("rails_admin@#{RailsAdmin::Version.js}")
+      imports = packager.import("rails_admin@#{RailsAdmin::Version.js}", from: 'jspm.io')
+      imports = imports[:imports] if imports.key?(:imports)
 
       # Use ESM compatible version to work around https://github.com/cljsjs/packages/issues/1579
       imports['@popperjs/core'].gsub!('lib/index.js', 'dist/esm/popper.js')

data/lib/generators/rails_admin/install_generator.rb

@@ -10,7 +10,7 @@ module RailsAdmin
     include Generators::Utils::InstanceMethods
 
     argument :_namespace, type: :string, required: false, desc: 'RailsAdmin url namespace'
-    class_option :asset, type: :string, required: false, default: nil, desc: 'Asset delivery method [options: webpacker, webpack, sprockets, importmap]'
+    class_option :asset, type: :string, required: false, default: nil, desc: 'Asset delivery method [options: webpacker, webpack, sprockets, importmap, vite]'
     desc 'RailsAdmin installation generator'
 
     def install
@@ -33,6 +33,8 @@ module RailsAdmin
         configure_for_importmap
       when 'webpacker'
         configure_for_webpacker5
+      when 'vite'
+        configure_for_vite
       when 'sprockets'
         configure_for_sprockets
       else
@@ -51,6 +53,8 @@ module RailsAdmin
         'webpack'
       elsif Rails.root.join('config/importmap.rb').exist?
         'importmap'
+      elsif defined?(ViteRuby)
+        'vite'
       else
         'sprockets'
       end
@@ -68,6 +72,14 @@ module RailsAdmin
       add_package_json_field('resolutions', {'rails_admin/@fortawesome/fontawesome-free' => '^5.15.0'})
     end
 
+    def configure_for_vite
+      vite_source_code_dir = ViteRuby.config.source_code_dir
+      run "yarn add rails_admin@#{RailsAdmin::Version.js} sass"
+      template('rails_admin.vite.js', File.join(vite_source_code_dir, 'entrypoints', 'rails_admin.js'))
+      @fa_font_path = '@fortawesome/fontawesome-free/webfonts'
+      template('rails_admin.scss.erb', File.join(vite_source_code_dir, 'stylesheets', 'rails_admin.scss'))
+    end
+
     def configure_for_webpack
       run "yarn add rails_admin@#{RailsAdmin::Version.js}"
       template 'rails_admin.js', 'app/javascript/rails_admin.js'

data/lib/generators/rails_admin/templates/rails_admin.vite.js

@@ -0,0 +1,2 @@
+import "~/stylesheets/rails_admin.scss";
+import "rails_admin/src/rails_admin/base";

data/lib/rails_admin/abstract_model.rb

@@ -60,6 +60,14 @@ module RailsAdmin
       @model_name.constantize
     end
 
+    def quoted_table_name
+      table_name
+    end
+
+    def quote_column_name(name)
+      name
+    end
+
     def to_s
       model.to_s
     end
@@ -97,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