rails_admin 3.1.3 → 3.2.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03f798619ca0b106577088ff39d25d4103d7096198ff66244f4381023033398b
-  data.tar.gz: d3bae813acd97182810f9c6ef09fc295888d706810adc314e7992854f7679d84
+  metadata.gz: 6ad121e2654221b302244d3792229d2f7ef62e95ff35777196f8f885b945c475
+  data.tar.gz: 5f800d3097c56282ed4ec366bf55a2cb839f5bfa481567c16dcdf81684b02ad1
 SHA512:
-  metadata.gz: 5ee60d19acc72d93e8b14c7e568ff924ea54558f9de807845cbd278230dc852d119c332b9866b673aea0757cb3f380d6c5abd09af4c71119626cf47c4cd67e6f
-  data.tar.gz: 74de744e2e07902613ebc9be3975ff6d68aaa7b4e4d38b2b7c0e59b30a5e3c3313331208f911a73419ec6551f98e1e7b2ad67976cbc7a0887f547444436e5ffb
+  metadata.gz: e8f2148f02b5b35e9f7f2ae6a8d635b2f10e9fa99370baa0f78d7bc0805880c6d02097b43b928f0abdcf123294910713e68ab87bc0be2c708d436b3eb425ce3c
+  data.tar.gz: d708dc50f78bbe22015721d49213d6991048022d4c6773f6168412ad025cb1a8125579bd9daabb20921f2c12bf8c8a846cdd914aa8fefdb8967e0ec8ec028008

data/Gemfile

@@ -3,20 +3,14 @@
 source 'https://rubygems.org'
 
 gem 'appraisal', '>= 2.0'
-gem 'devise'
+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'
@@ -25,21 +19,23 @@ end
 group :test do
   gem 'cancancan', '~> 3.0'
   gem 'carrierwave', ['>= 2.0.0.rc', '< 3']
-  gem 'cuprite'
+  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'
+  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,22 @@ 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'
+  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/README.md

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

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)

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,7 @@
-<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">
 <%= csrf_meta_tag %>
 <% case RailsAdmin::config.asset_source
    when :webpacker %>
@@ -12,6 +12,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'} %>
@@ -26,4 +28,4 @@
   <%= 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

@@ -20,6 +20,7 @@
     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,

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

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

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/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="<%= value %>">
+                <%= 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/lib/generators/rails_admin/importmap_formatter.rb

@@ -6,7 +6,7 @@ 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
 

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

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

@@ -33,7 +33,7 @@ module RailsAdmin
 
         def klass
           if options[:polymorphic]
-            polymorphic_parents(:active_record, model.name.to_s, name) || []
+            polymorphic_parents(:active_record, association.active_record.name.to_s, name) || []
           else
             association.klass
           end

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

@@ -4,24 +4,6 @@ module RailsAdmin
   module Adapters
     module ActiveRecord
       module ObjectExtension
-        def self.extended(object)
-          object.class.reflect_on_all_associations.each do |association|
-            association = Association.new(association, object.class)
-            case association.type
-            when :has_one
-              object.instance_eval <<-RUBY, __FILE__, __LINE__ + 1
-                def #{association.name}_id
-                  self.#{association.name}&.id
-                end
-
-                def #{association.name}_id=(item_id)
-                  self.#{association.name} = (#{association.klass}.find(item_id) rescue nil)
-                end
-              RUBY
-            end
-          end
-        end
-
         def assign_attributes(attributes)
           super if attributes
         end

data/lib/rails_admin/adapters/active_record.rb

@@ -72,6 +72,14 @@ module RailsAdmin
 
       delegate :primary_key, :table_name, to: :model, prefix: false
 
+      def quoted_table_name
+        model.quoted_table_name
+      end
+
+      def quote_column_name(name)
+        model.connection.quote_column_name(name)
+      end
+
       def encoding
         adapter =
           if ::ActiveRecord::Base.respond_to?(:connection_db_config)
@@ -201,6 +209,8 @@ module RailsAdmin
           case @type
           when :boolean
             boolean_unary_operators
+          when :uuid
+            uuid_unary_operators
           when :integer, :decimal, :float
             numeric_unary_operators
           else
@@ -230,6 +240,7 @@ module RailsAdmin
           )
         end
         alias_method :numeric_unary_operators, :boolean_unary_operators
+        alias_method :uuid_unary_operators, :boolean_unary_operators
 
         def range_filter(min, max)
           if min && max && min == max
@@ -255,9 +266,12 @@ module RailsAdmin
         end
 
         def build_statement_for_boolean
-          return ["(#{@column} IS NULL OR #{@column} = ?)", false] if %w[false f 0].include?(@value)
-
-          ["(#{@column} = ?)", true] if %w[true t 1].include?(@value)
+          case @value
+          when 'false', 'f', '0'
+            ["(#{@column} IS NULL OR #{@column} = ?)", false]
+          when 'true', 't', '1'
+            ["(#{@column} = ?)", true]
+          end
         end
 
         def column_for_value(value)

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

@@ -46,7 +46,7 @@ module RailsAdmin
 
         def klass
           if polymorphic? && %i[referenced_in belongs_to].include?(macro)
-            polymorphic_parents(:mongoid, model.name, name) || []
+            polymorphic_parents(:mongoid, association.inverse_class_name, name) || []
           else
             association.klass
           end

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

@@ -20,11 +20,6 @@ module RailsAdmin
                   send(name)&.save
                 end
               end
-              object.instance_eval <<-RUBY, __FILE__, __LINE__ + 1
-                def #{name}_id=(item_id)
-                  self.#{name} = (#{association.klass}.find(item_id) rescue nil)
-                end
-              RUBY
             end
           end
         end

data/lib/rails_admin/adapters/mongoid.rb

@@ -251,9 +251,12 @@ module RailsAdmin
         end
 
         def build_statement_for_boolean
-          return {@column => false} if %w[false f 0].include?(@value)
-
-          {@column => true} if %w[true t 1].include?(@value)
+          case @value
+          when 'false', 'f', '0'
+            {@column => false}
+          when 'true', 't', '1'
+            {@column => true}
+          end
         end
 
         def column_for_value(value)

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

@@ -56,7 +56,30 @@ module RailsAdmin
         # preload entire associated collection (per associated_collection_scope) on load
         # Be sure to set limit in associated_collection_scope if set is large
         register_instance_option :associated_collection_cache_all do
-          @associated_collection_cache_all ||= (associated_model_config.abstract_model.count < associated_model_limit)
+          @associated_collection_cache_all ||= dynamically_scope_by.blank? && (associated_model_config.abstract_model.count < associated_model_limit)
+        end
+
+        # client-side dynamic scoping
+        register_instance_option :dynamically_scope_by do
+          nil
+        end
+
+        # parses #dynamically_scope_by and returns a Hash in the form of
+        # {[form field name in this model]: [field name in the associated model]}
+        def dynamic_scope_relationships
+          @dynamic_scope_relationships ||=
+            Array.wrap(dynamically_scope_by).flat_map do |field|
+              field.is_a?(Hash) ? field.to_a : [[field, field]]
+            end.map do |field_name, target_name| # rubocop:disable Style/MultilineBlockChain
+              field = section.fields.detect { |f| f.name == field_name }
+              raise "Field '#{field_name}' was given for #dynamically_scope_by but not found in '#{abstract_model.model_name}'" unless field
+
+              target_field = associated_model_config.list.fields.detect { |f| f.name == target_name }
+              raise "Field '#{field_name}' was given for #dynamically_scope_by but not found in '#{associated_model_config.abstract_model.model_name}'" unless target_field
+              raise "Field '#{field_name}' in '#{associated_model_config.abstract_model.model_name}' can't be used for dynamic scoping because it's not filterable" unless target_field.filterable
+
+              [field.method_name, target_name]
+            end.to_h
         end
 
         # determines whether association's elements can be removed

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

@@ -62,15 +62,15 @@ module RailsAdmin
 
         def sort_column
           if sortable == true
-            "#{abstract_model.table_name}.#{name}"
+            "#{abstract_model.quoted_table_name}.#{abstract_model.quote_column_name(name)}"
           elsif (sortable.is_a?(String) || sortable.is_a?(Symbol)) && sortable.to_s.include?('.') # just provide sortable, don't do anything smart
             sortable
           elsif sortable.is_a?(Hash) # just join sortable hash, don't do anything smart
             "#{sortable.keys.first}.#{sortable.values.first}"
-          elsif association # use column on target table
-            "#{associated_model_config.abstract_model.table_name}.#{sortable}"
+          elsif association? # use column on target table
+            "#{associated_model_config.abstract_model.quoted_table_name}.#{abstract_model.quote_column_name(sortable)}"
           else # use described column in the field conf.
-            "#{abstract_model.table_name}.#{sortable}"
+            "#{abstract_model.quoted_table_name}.#{abstract_model.quote_column_name(sortable)}"
           end
         end
 

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

@@ -40,6 +40,14 @@ module RailsAdmin
             )
           end
 
+          register_instance_option :searchable do
+            false
+          end
+
+          register_instance_option :sortable do
+            false
+          end
+
           def resource_url(thumb = false)
             return nil unless value
 

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

@@ -23,6 +23,10 @@ module RailsAdmin
             (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
@@ -38,6 +42,13 @@ module RailsAdmin
           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
+
+            id = params.delete(method_name)
+            params[name] = associated_model_config.abstract_model.get(id) if id
+          end
         end
       end
     end

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

@@ -48,7 +48,7 @@ module RailsAdmin
           end
 
           register_instance_option :keep_method do
-            method_name if ::ActiveStorage.replace_on_assign_to_many
+            method_name if ::ActiveStorage.gem_version >= Gem::Version.new('7.1') || ::ActiveStorage.replace_on_assign_to_many
           end
 
           register_instance_option :delete_method do
@@ -70,6 +70,14 @@ module RailsAdmin
               direct? && {data: {direct_upload_url: bindings[:view].main_app.rails_direct_uploads_url}} || {},
             )
           end
+
+          register_instance_option :searchable do
+            false
+          end
+
+          register_instance_option :sortable do
+            false
+          end
         end
       end
     end

data/lib/rails_admin/support/datetime.rb

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

data/lib/rails_admin/version.rb

@@ -3,9 +3,9 @@
 module RailsAdmin
   class Version
     MAJOR = 3
-    MINOR = 1
-    PATCH = 3
-    PRE = nil
+    MINOR = 2
+    PATCH = 0
+    PRE = 'beta'
 
     class << self
       # @return [String]

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rails_admin",
-  "version": "3.1.3",
+  "version": "3.2.0-beta",
   "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",

data/src/rails_admin/abstract-select.js

@@ -0,0 +1,30 @@
+import jQuery from "jquery";
+import "jquery-ui/ui/widget.js";
+
+(function ($) {
+  "use strict";
+
+  $.widget("ra.abstractSelect", {
+    options: {
+      createQuery: function (query) {
+        if ($.isEmptyObject(this.scopeBy)) {
+          return { query: query };
+        } else {
+          const filterQuery = {};
+          for (var field in this.scopeBy) {
+            const targetField = this.scopeBy[field];
+            const targetValue = $(`[name$="[${field}]"]`).val();
+            if (!filterQuery[targetField]) {
+              filterQuery[targetField] = [];
+            }
+            filterQuery[targetField].push(
+              targetValue ? { o: "is", v: targetValue } : { o: "_blank" }
+            );
+          }
+          return { query: query, f: filterQuery };
+        }
+      },
+      scopeBy: {},
+    },
+  });
+})(jQuery);

data/src/rails_admin/base.js

@@ -17,6 +17,7 @@ import "jquery-ui/ui/widget.js";
 import "jquery-ui/ui/widgets/menu.js";
 import "jquery-ui/ui/widgets/mouse.js";
 
+import "./abstract-select";
 import "./filter-box";
 import "./filtering-multiselect";
 import "./filtering-select";
@@ -26,4 +27,6 @@ import "./sidescroll";
 import "./ui";
 import "./widgets";
 
-Rails.start();
+if (!window._rails_loaded) {
+  Rails.start();
+}

data/src/rails_admin/filtering-multiselect.js

@@ -1,13 +1,11 @@
 import jQuery from "jquery";
 import "jquery-ui/ui/widget.js";
 import I18n from "./i18n";
+
 (function ($) {
-  $.widget("ra.filteringMultiselect", {
+  $.widget("ra.filteringMultiselect", $.ra.abstractSelect, {
     _cache: {},
     options: {
-      createQuery: function (query) {
-        return { query: query };
-      },
       sortable: false,
       removable: true,
       regional: {

data/src/rails_admin/filtering-select.js

@@ -6,11 +6,8 @@ import I18n from "./i18n";
 (function ($) {
   "use strict";
 
-  $.widget("ra.filteringSelect", {
+  $.widget("ra.filteringSelect", $.ra.abstractSelect, {
     options: {
-      createQuery: function (query) {
-        return { query: query };
-      },
       minLength: 0,
       searchDelay: 200,
       remote_source: null,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.2.0.beta
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-06 00:00:00.000000000 Z
+date: 2024-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel-serializers-xml
@@ -28,6 +28,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -86,16 +100,22 @@ dependencies:
   name: turbo-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +210,7 @@ files:
 - lib/generators/rails_admin/templates/initializer.erb
 - lib/generators/rails_admin/templates/rails_admin.js
 - lib/generators/rails_admin/templates/rails_admin.scss.erb
+- lib/generators/rails_admin/templates/rails_admin.vite.js
 - lib/generators/rails_admin/templates/rails_admin.webpacker.js
 - lib/generators/rails_admin/utils.rb
 - lib/rails_admin.rb
@@ -319,6 +340,7 @@ files:
 - lib/rails_admin/version.rb
 - lib/tasks/rails_admin.rake
 - package.json
+- src/rails_admin/abstract-select.js
 - src/rails_admin/base.js
 - src/rails_admin/filter-box.js
 - src/rails_admin/filtering-multiselect.js
@@ -447,12 +469,13 @@ homepage: https://github.com/railsadminteam/rails_admin
 licenses:
 - MIT
 metadata: {}
-post_install_message: "\n    ### Upgrading RailsAdmin from 2.x.x to 3.x.x ###\n\n
-  \   Due to introduction of Webpack/Webpacker support, some additional dependencies
-  and configuration will be needed.\n    Running `bin/rails g rails_admin:install`
-  will suggest required changes, based on the current setup of your app.\n\n    For
-  a complete list of changes, see https://github.com/railsadminteam/rails_admin/blob/master/CHANGELOG.md\n
-  \ "
+post_install_message: |
+  ### Upgrading RailsAdmin from 2.x.x to 3.x.x ###
+
+  Due to introduction of Webpack/Webpacker support, some additional dependencies and configuration will be needed.
+  Running `bin/rails g rails_admin:install` will suggest required changes, based on the current setup of your app.
+
+  For a complete list of changes, see https://github.com/railsadminteam/rails_admin/blob/master/CHANGELOG.md
 rdoc_options: []
 require_paths:
 - lib
@@ -463,11 +486,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: 1.8.11
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Admin for Rails