rails_admin 3.0.0.rc3 → 3.1.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ed0d71c0798b98c4a0afdff5fa2ed48ffd05d1e0124d52ccdb371012d117479
-  data.tar.gz: ed51dc928885ae4c57e9f02a9e40cf7689731570a78efc7d1bdfbe3afbd7e298
+  metadata.gz: 2594ac2920ab0902ebfd266356904760c4cdfe6160dbc0e7a8924a3351e1835a
+  data.tar.gz: 252ab9a0d237488762f8a9b7a2c8c91af3dd0e048e598570722c818da78c075b
 SHA512:
-  metadata.gz: ff6f4ff15d8722cb44f4bbfeb8375c6c68c24be7cfadaa1e0b2dcf323f43321bc40296c60cdbcd2a9ecc28685261ca5ef00b046481394044d3f6f3970e6ddf86
-  data.tar.gz: a23d415f1987f61dd8d5bf7dcac7d2d7307e602a0afe3d16c94d8a639ad952135154cc31728bd1f41e181e0f1a829d39afb8898c6fc1a301a75fa64649b117d7
+  metadata.gz: 5ee9f27798eace802666b89d15cd92fcdf120ba44e317a87f15c5be0971d869fd6a897bbf24d0aab0dcb74859cb3dc450c098ad1af9eae4c51a4919dcd019da7
+  data.tar.gz: 7b649a4777d4647b6154f5a35560330200d5203390c5b79771cf0cc95e7ba1aa9eab8d6414f680226f3ccc2e5cbbfb5325f4a8654f5191514214c5880cd8ed59

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'appraisal', '>= 2.0'

data/README.md

@@ -14,12 +14,6 @@
 
 RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.
 
-## Announcements
-
-### [Action required] Security issue
-
-**RailsAdmin 2.0.1, 2.0.0 and up to 1.4.2 have been reported to have XSS vulnerability.** We strongly recommend that you upgrade RailsAdmin to 2.0.2 (and higher) or 1.4.3 as soon as possible, if you are on those versions. See [d72090ec](https://github.com/railsadminteam/rails_admin/commit/d72090ec6a07c3b9b7b48ab50f3d405f91ff4375) for the detail.
-
 ## Getting started
 
 - Check out [the docs][docs].
@@ -45,7 +39,7 @@ RailsAdmin is a Rails engine that provides an easy-to-use interface for managing
 
 ## Installation
 
-1. On your gemfile: `gem 'rails_admin', ['>= 3.0.0.rc3', '< 4']`
+1. On your gemfile: `gem 'rails_admin', '~> 3.0'`
 2. Run `bundle install`
 3. Run `rails g rails_admin:install`
 4. Provide a namespace for the routes when asked

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 

data/app/controllers/rails_admin/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/abstract_model'
 
 module RailsAdmin

data/app/controllers/rails_admin/main_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   class MainController < RailsAdmin::ApplicationController
     include ActionView::Helpers::TextHelper
@@ -58,23 +60,15 @@ module RailsAdmin
     end
 
     def get_sort_hash(model_config)
-      abstract_model = model_config.abstract_model
       field = model_config.list.fields.detect { |f| f.name.to_s == params[:sort] }
+      # If no sort param, default to the `sort_by` specified in the list config
+      field ||= model_config.list.possible_fields.detect { |f| f.name == model_config.list.sort_by.try(:to_sym) }
 
       column =
         if field.nil? || field.sortable == false # use default sort, asked field does not exist or is not sortable
-          field = model_config.list.possible_fields.detect { |f| f.name == model_config.list.sort_by.to_sym }
-          "#{abstract_model.table_name}.#{model_config.list.sort_by}"
-        elsif field.sortable == true # use the given field
-          "#{abstract_model.table_name}.#{field.name}"
-        elsif (field.sortable.is_a?(String) || field.sortable.is_a?(Symbol)) && field.sortable.to_s.include?('.') # just provide sortable, don't do anything smart
-          field.sortable
-        elsif field.sortable.is_a?(Hash) # just join sortable hash, don't do anything smart
-          "#{field.sortable.keys.first}.#{field.sortable.values.first}"
-        elsif field.association? # use column on target table
-          "#{field.associated_model_config.abstract_model.table_name}.#{field.sortable}"
-        else # use described column in the field conf.
-          "#{abstract_model.table_name}.#{field.sortable}"
+          model_config.list.sort_by
+        else
+          field.sort_column
         end
 
       params[:sort_reverse] ||= 'false'

data/app/helpers/rails_admin/application_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module ApplicationHelper
     def authorized?(action_name, abstract_model = nil, object = nil)
@@ -29,7 +31,7 @@ module RailsAdmin
 
       if authorized
         edit_url = rails_admin.url_for(
-          action_name: edit_action.action_name,
+          action: edit_action.action_name,
           model_name: abstract_model.to_param,
           controller: 'rails_admin/main',
           id: _current_user.id,
@@ -118,10 +120,12 @@ module RailsAdmin
         abstract_model = node.abstract_model
         model_param = abstract_model.to_param
         url         = rails_admin.url_for(action: :index, controller: 'rails_admin/main', model_name: model_param)
-        level_class = " nav-level-#{level}" if level > 0
         nav_icon = node.navigation_icon ? %(<i class="#{node.navigation_icon}"></i>).html_safe : ''
+        css_classes = ['nav-link']
+        css_classes.push("nav-level-#{level}") if level > 0
+        css_classes.push('active') if defined?(@action) && current_action?(@action, model_param)
         li = content_tag :li, data: {model: model_param} do
-          link_to nav_icon + node.label_plural, url, class: "nav-link#{level_class}"
+          link_to nav_icon + " " + node.label_plural, url, class: css_classes.join(' ')
         end
         child_nodes = parent_groups[abstract_model.model_name]
         child_nodes ? li + navigation(parent_groups, child_nodes, level + 1) : li
@@ -169,7 +173,7 @@ module RailsAdmin
               else
                 'javascript:void(0)'
               end
-            content_tag(:a, label, {href: href, target: action.link_target, class: ['nav-link', current_action?(action) && 'active', !action.enabled? && 'disabled'].compact})
+            content_tag(:a, label, {href: href, target: action.link_target, class: ['nav-link', current_action?(action) && 'active', !action.enabled? && 'disabled'].compact}.merge(action.turbo? ? {} : {data: {turbo: 'false'}}))
           else
             content_tag(:span, label)
           end
@@ -206,7 +210,7 @@ module RailsAdmin
       yield
     rescue LoadError => e
       if /sassc/.match?(e.message)
-        e = e.exception <<-MSG.gsub(/^\s{10}/, '')
+        e = e.exception <<~MSG
           #{e.message}
           RailsAdmin requires the gem sassc-rails, make sure to put `gem 'sassc-rails'` to Gemfile.
         MSG

data/app/helpers/rails_admin/form_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'nested_form/builder_mixin'
 
 module RailsAdmin
@@ -105,6 +107,14 @@ module RailsAdmin
       (@dom_name ||= {})[field.name] ||= %(#{@object_name}#{options[:index] && "[#{options[:index]}]"}[#{field.method_name}]#{field.is_a?(Config::Fields::Association) && field.multiple? ? '[]' : ''})
     end
 
+    def hidden_field(method, options = {})
+      if method == :id
+        super method, {value: object.id.to_s}
+      else
+        super
+      end
+    end
+
   protected
 
     def generator_action(action, nested)

data/app/helpers/rails_admin/main_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module MainHelper
     def rails_admin_form_for(*args, &block)

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

@@ -5,13 +5,25 @@
 <%= csrf_meta_tag %>
 <% case RailsAdmin::config.asset_source
    when :webpacker %>
-  <%= stylesheet_pack_tag "rails_admin" %>
-  <%= javascript_pack_tag "rails_admin", async: true %>
-<% when :webpack, :sprockets %>
+  <%= stylesheet_pack_tag "rails_admin", data: {'turbo-track': 'reload'} %>
+  <%= javascript_pack_tag "rails_admin", async: true, data: {'turbo-track': 'reload'} %>
+<% when :sprockets %>
   <% handle_asset_dependency_error do %>
-    <%= stylesheet_link_tag "rails_admin/application.css", media: :all %>
-    <%= javascript_include_tag "rails_admin/application.js", async: true %>
+    <%= stylesheet_link_tag "rails_admin/application.css", media: :all, data: {'turbo-track': 'reload'} %>
+    <%= javascript_include_tag "rails_admin/application.js", async: true, data: {'turbo-track': 'reload'} %>
   <% end %>
+<% when :webpack %>
+  <%= stylesheet_link_tag "rails_admin.css", media: :all, data: {'turbo-track': 'reload'} %>
+  <%= javascript_include_tag "rails_admin.js", async: true, data: {'turbo-track': 'reload'} %>
+<% when :importmap %>
+  <%= 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 %>
+  <%= # 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 %>

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

@@ -1,7 +1,7 @@
 <ul class="navbar-nav ms-auto root_links">
   <% actions(:root).select(&:show_in_navigation).each do |action| %>
     <li class="nav-item <%= action.action_name %>_root_link">
-      <%= link_to wording_for(:menu, action), { action: action.action_name, controller: 'rails_admin/main' }, class: ['nav-link'] %>
+      <%= link_to wording_for(:menu, action), { action: action.action_name, controller: 'rails_admin/main' }, {class: ['nav-link']}.merge(action.turbo? ? {} : {data: {turbo: 'false'}}) %>
     </li>
   <% end %>
   <% if main_app_root_path = (main_app.root_path rescue false) %>
@@ -17,7 +17,9 @@
     <% end %>
     <% if logout_path.present? %>
       <li class="nav-item">
-        <%= link_to t('admin.misc.log_out'), logout_path, method: logout_method, class: 'nav-link label label-danger' %>
+        <%= link_to logout_path, method: logout_method, class: 'nav-link', data: {turbo: 'false'} do %>
+          <span class="badge bg-danger"><%= t('admin.misc.log_out') %></span>
+        <% end %>
       </li>
     <% end %>
   <% end %>

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

@@ -5,7 +5,7 @@
   </head>
   <body class="rails_admin">
     <div data-i18n-options="<%= I18n.t("admin.js").to_json %>" id="admin-js"></div>
-    <nav class="navbar navbar-expand-md fixed-top navbar-dark bg-primary border-bottom">
+    <nav class="navbar navbar-expand-md fixed-top <%= RailsAdmin::Config.navbar_css_classes.join(' ') %>">
       <%= render "layouts/rails_admin/navigation" %>
     </nav>
     <div class="container-fluid">
@@ -14,7 +14,7 @@
           <%= render "layouts/rails_admin/sidebar_navigation" %>
         </div>
         <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2">
-          <div class="container">
+          <div class="container-fluid">
             <%= render template: 'layouts/rails_admin/content' %>
           </div>
         </div>

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

@@ -3,7 +3,7 @@
   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)}
+  selected_ids = selected.map{|s| s.send(field.associated_primary_key).to_s}
 
   current_action = params[:action].in?(['create', 'new']) ? 'create' : 'update'
 
@@ -13,7 +13,7 @@
     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)] }.sort_by {|a| [selected_ids.index(a[1]) || selected_ids.size, i+=1] }
+    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 = {

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

@@ -8,7 +8,7 @@
 
   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)] }
+  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,

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

@@ -32,7 +32,7 @@
         <% selected = (sort == property_name) %>
         <% sort_direction = (sort_reverse ? "headerSortUp" : "headerSortDown" if selected) %>
         <% sort_location = send(path_method, params.except("sort_reverse").merge(model_name: @abstract_model.to_param, sort: property_name).merge(selected && sort_reverse != "true" ? {sort_reverse: "true"} : {})) %>
-        <th class="header <%= column[:css_class] %> <%= sort_direction if selected %>">
+        <th class="header <%= column[:css_class] %> <%= sort_direction if selected %>" data-href="<%= sort_location %>">
           <%= column[:link_text] %>
         </th>
       <% end %>

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

@@ -140,7 +140,7 @@
             <tr class="<%= @abstract_model.param_key %>_row <%= @model_config.list.with(object: object).row_css_class %>">
               <% if checkboxes %>
                 <td class="sticky">
-                  <%= check_box_tag "bulk_ids[]", object.id, false %>
+                  <%= check_box_tag "bulk_ids[]", object.id.to_s, false %>
                 </td>
               <% end %>
               <% properties.map{ |property| property.bind(:object, object) }.each do |property| %>

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

@@ -10,16 +10,18 @@
             <%= fieldset.help %>
           </p>
         <% end %>
-        <dl>
+        <div class="list-group">
           <% fields.each_with_index do |field, index| %>
-            <dt>
-              <span class="<%= field.type_css_class %> <%= field.css_class %> label label-info">
-                <%= field.label %>
-              </span>
-            </dt>
-            <dd class="well">
-              <%= field.pretty_value %>
-            </dd>
+            <div class="list-group-item border-0 <%= field.type_css_class %> <%= field.css_class %>">
+              <div class="card">
+                <h5 class="card-header bg-light">
+                  <%= field.label %>
+                </h5>
+                <div class="card-body">
+                  <%= field.pretty_value %>
+                </div>
+              </div>
+            </div>
           <% end %>
         </dl>
       </div>

data/config/initializers/active_record_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveSupport.on_load(:active_record) do
   module ActiveRecord
     class Base
@@ -20,4 +22,27 @@ 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/config/initializers/mongoid_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if defined?(::Mongoid::Document)
   require 'rails_admin/adapters/mongoid/extension'
   Mongoid::Document.include RailsAdmin::Adapters::Mongoid::Extension

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RailsAdmin::Engine.routes.draw do
   controller 'main' do
     RailsAdmin::Config::Actions.all(:root).each { |action| match "/#{action.route_fragment}", action: action.action_name, as: action.action_name, via: action.http_methods }

data/lib/generators/rails_admin/importmap_formatter.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'importmap/packager'
+
+module RailsAdmin
+  class ImportmapFormatter
+    attr_reader :packager
+
+    def initialize(path = 'confing/importmap.rails_admin.rb')
+      @packager = Importmap::Packager.new(path)
+    end
+
+    def format
+      imports = packager.import("rails_admin@#{RailsAdmin::Version.js}")
+
+      # 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')
+
+      # Tidy up jQuery UI dependencies
+      jquery_uis = imports.keys.filter { |key, _| key =~ /jquery-ui/ }
+      imports['jquery-ui/'] = imports[jquery_uis.first].gsub(%r{(@[^/@]+)/[^@]+$}, '\1/')
+      imports.reject! { |key, _| jquery_uis.include? key }
+
+      pins = ['pin "rails_admin", preload: true', packager.pin_for('rails_admin/src/rails_admin/base', imports.delete('rails_admin'))]
+      (pins + imports.map { |package, url| packager.pin_for(package, url) }).join("\n")
+    end
+  end
+end

data/lib/generators/rails_admin/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 require 'rails_admin/version'
 require File.expand_path('utils', __dir__)
@@ -8,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, sprockets]'
+    class_option :asset, type: :string, required: false, default: nil, desc: 'Asset delivery method [options: webpacker, webpack, sprockets, importmap]'
     desc 'RailsAdmin installation generator'
 
     def install
@@ -27,10 +29,14 @@ module RailsAdmin
       case asset
       when 'webpack'
         configure_for_webpack
+      when 'importmap'
+        configure_for_importmap
       when 'webpacker'
         configure_for_webpacker5
       when 'sprockets'
         configure_for_sprockets
+      else
+        raise "Unknown asset source: #{asset}"
       end
     end
 
@@ -41,6 +47,10 @@ module RailsAdmin
 
       if defined?(Webpacker)
         'webpacker'
+      elsif Rails.root.join('webpack.config.js').exist?
+        'webpack'
+      elsif Rails.root.join('config/importmap.rb').exist?
+        'importmap'
       else
         'sprockets'
       end
@@ -52,17 +62,66 @@ module RailsAdmin
 
     def configure_for_webpacker5
       run "yarn add rails_admin@#{RailsAdmin::Version.js}"
-      @scss_relative_dir = '../stylesheets/'
-      template 'rails_admin.js.erb', 'app/javascript/packs/rails_admin.js'
-      template 'rails_admin.scss', 'app/javascript/stylesheets/rails_admin.scss'
+      template 'rails_admin.webpacker.js', 'app/javascript/packs/rails_admin.js'
+      template 'rails_admin.scss.erb', 'app/javascript/stylesheets/rails_admin.scss'
     end
 
     def configure_for_webpack
-      run "yarn add rails_admin@#{RailsAdmin::Version.js} css-loader mini-css-extract-plugin sass sass-loader"
-      @scss_relative_dir = './'
-      template 'rails_admin.js.erb', 'app/javascript/rails_admin.js'
-      template 'rails_admin.scss', 'app/javascript/rails_admin.scss'
-      template 'webpack.config.js', 'webpack.config.js'
+      run "yarn add rails_admin@#{RailsAdmin::Version.js}"
+      template 'rails_admin.js', 'app/javascript/rails_admin.js'
+      webpack_config = File.join(destination_root, 'webpack.config.js')
+      marker = %r{application: ["']./app/javascript/application.js["']}
+      if File.exist?(webpack_config) && File.read(webpack_config) =~ marker
+        insert_into_file 'webpack.config.js', %(,\n    rails_admin: "./app/javascript/rails_admin.js"), after: marker
+      else
+        say 'Add `rails_admin: "./app/javascript/rails_admin.js"` to the entry section in your webpack.config.js.', :red
+      end
+      setup_css({'build' => 'webpack --config webpack.config.js'})
+    end
+
+    def configure_for_importmap
+      run "yarn add rails_admin@#{RailsAdmin::Version.js}"
+      template 'rails_admin.js', 'app/javascript/rails_admin.js'
+      require_relative 'importmap_formatter'
+      add_file 'config/importmap.rails_admin.rb', ImportmapFormatter.new.format
+      setup_css
+    end
+
+    def setup_css(additional_script_entries = {})
+      gem 'cssbundling-rails'
+      rake 'css:install:sass'
+
+      @fa_font_path = '.'
+      template 'rails_admin.scss.erb', 'app/assets/stylesheets/rails_admin.scss'
+      asset_config = %{Rails.application.config.assets.paths << Rails.root.join("node_modules/@fortawesome/fontawesome-free/webfonts")\n}
+      if File.exist? File.join(destination_root, 'config/initializers/assets.rb')
+        append_to_file 'config/initializers/assets.rb', asset_config
+      else
+        add_file 'config/initializers/assets.rb', asset_config
+      end
+      add_scripts(additional_script_entries.merge({'build:css' => 'sass ./app/assets/stylesheets/rails_admin.scss:./app/assets/builds/rails_admin.css --no-source-map --load-path=node_modules'}))
+    end
+
+    def add_scripts(entries)
+      display 'Add scripts to package.json'
+      package = begin
+        JSON.parse(File.read(File.join(destination_root, 'package.json')))
+      rescue Errno::ENOENT, JSON::ParserError
+        {}
+      end
+      if package['scripts'] && (package['scripts'].keys & entries.keys).any?
+        say <<-MESSAGE.gsub(/^ {10}/, ''), :red
+          You need to merge "scripts": #{JSON.pretty_generate(entries)} into the existing scripts in your package.json .
+          Taking 'build:css' as an example, if you're already have application.sass.css for the sass build, the resulting script would look like:
+            sass ./app/assets/stylesheets/application.sass.scss:./app/assets/builds/application.css ./app/assets/stylesheets/rails_admin.scss:./app/assets/builds/rails_admin.css --no-source-map --load-path=node_modules
+        MESSAGE
+      else
+        package['scripts'] ||= {}
+        entries.each do |entry, build_script|
+          package['scripts'][entry] = build_script
+        end
+        add_file 'package.json', JSON.pretty_generate(package)
+      end
     end
   end
 end

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

@@ -0,0 +1 @@
+import "rails_admin/src/rails_admin/base";

data/lib/generators/rails_admin/templates/rails_admin.scss.erb

@@ -0,0 +1 @@
+<%= instance_variable_defined?(:@fa_font_path) ? %{$fa-font-path: "#{@fa_font_path}";\n} : '' %>@import "rails_admin/src/rails_admin/styles/base";

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

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

data/lib/generators/rails_admin/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Generators
     module Utils

data/lib/rails_admin/abstract_model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/support/datetime'
 
 module RailsAdmin
@@ -99,8 +101,13 @@ module RailsAdmin
 
     def initialize_active_record
       @adapter = :active_record
-      require 'rails_admin/adapters/active_record'
-      extend Adapters::ActiveRecord
+      if defined?(::CompositePrimaryKeys)
+        require 'rails_admin/adapters/composite_primary_keys'
+        extend Adapters::CompositePrimaryKeys
+      else
+        require 'rails_admin/adapters/active_record'
+        extend Adapters::ActiveRecord
+      end
     end
 
     def initialize_mongoid

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Adapters
     module ActiveRecord
@@ -21,6 +23,14 @@ module RailsAdmin
           association.macro
         end
 
+        def field_type
+          if polymorphic?
+            :polymorphic_association
+          else
+            :"#{association.macro}_association"
+          end
+        end
+
         def klass
           if options[:polymorphic]
             polymorphic_parents(:active_record, model.name.to_s, name) || []

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Adapters
     module ActiveRecord

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Adapters
     module ActiveRecord

data/lib/rails_admin/adapters/active_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record'
 require 'rails_admin/adapters/active_record/association'
 require 'rails_admin/adapters/active_record/object_extension'
@@ -31,11 +33,11 @@ module RailsAdmin
         scope ||= scoped
         scope = scope.includes(options[:include]) if options[:include]
         scope = scope.limit(options[:limit]) if options[:limit]
-        scope = scope.where(primary_key => options[:bulk_ids]) if options[:bulk_ids]
+        scope = bulk_scope(scope, options) if options[:bulk_ids]
         scope = query_scope(scope, options[:query]) if options[:query]
         scope = filter_scope(scope, options[:filters]) if options[:filters]
         scope = scope.send(Kaminari.config.page_method_name, options[:page]).per(options[:per]) if options[:page] && options[:per]
-        scope = scope.reorder("#{options[:sort]} #{options[:sort_reverse] ? 'asc' : 'desc'}") if options[:sort]
+        scope = sort_scope(scope, options) if options[:sort]
         scope
       end
 
@@ -105,6 +107,27 @@ module RailsAdmin
         true
       end
 
+    private
+
+      def bulk_scope(scope, options)
+        scope.where(primary_key => options[:bulk_ids])
+      end
+
+      def sort_scope(scope, options)
+        direction = options[:sort_reverse] ? :asc : :desc
+        case options[:sort]
+        when String, Symbol
+          scope.reorder("#{options[:sort]} #{direction}")
+        when Array
+          scope.reorder(options[:sort].zip(Array.new(options[:sort].size) { direction }).to_h)
+        when Hash
+          scope.reorder(options[:sort].map { |table_name, column| "#{table_name}.#{column}" }.
+            zip(Array.new(options[:sort].size) { direction }).to_h)
+        else
+          raise ArgumentError.new("Unsupported sort value: #{options[:sort]}")
+        end
+      end
+
       class WhereBuilder
         def initialize(scope)
           @statements = []