rails_admin 3.1.0.beta → 3.1.0.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2594ac2920ab0902ebfd266356904760c4cdfe6160dbc0e7a8924a3351e1835a
-  data.tar.gz: 252ab9a0d237488762f8a9b7a2c8c91af3dd0e048e598570722c818da78c075b
+  metadata.gz: 19012148f5f945b4c04e703c7f97fb74ded0442755eb953a130a81a5d58302ab
+  data.tar.gz: ecd7599be265ad2cbfcb2c7c09dc16afb470ca663d1d5eb6b0c0504b5770b46c
 SHA512:
-  metadata.gz: 5ee9f27798eace802666b89d15cd92fcdf120ba44e317a87f15c5be0971d869fd6a897bbf24d0aab0dcb74859cb3dc450c098ad1af9eae4c51a4919dcd019da7
-  data.tar.gz: 7b649a4777d4647b6154f5a35560330200d5203390c5b79771cf0cc95e7ba1aa9eab8d6414f680226f3ccc2e5cbbfb5325f4a8654f5191514214c5880cd8ed59
+  metadata.gz: 2c115d8a5729876233ab0980bec1398301f9c40c4d77799570c993fb521c7f9aa8b45639a308a3cd2dab2591a1455c42d793fb40875c58d4cb6896c345ec28dc
+  data.tar.gz: 6cb2d93962b016f5b21034958d661ec624c1553cb0aeb0be3d74c07c4fbab33fe8e15f2d1910ac6d5aec1b250d95a45f71a0faf1fc365a952c6fe9a80bceb6f1

data/Gemfile

@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 
 gem 'appraisal', '>= 2.0'
 gem 'devise'
+gem 'net-smtp', require: false
 gem 'rails'
 gem 'webpacker', require: false
 gem 'webrick', '~> 1.7'

data/app/assets/javascripts/rails_admin/{application.js → application.js.erb}

@@ -19,3 +19,11 @@
 //=  require 'rails_admin/sidescroll'
 //=  require 'rails_admin/ui'
 //=  require 'rails_admin/custom/ui'
+
+<% if defined?(ActiveStorage) %>
+//= require activestorage
+<% end %>
+<% if defined?(ActionText) && Rails.gem_version >= Gem::Version.new('7.0') %>
+//= require trix
+//= require actiontext
+<% end %>

data/app/assets/stylesheets/rails_admin/{application.scss → application.scss.erb}

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

data/app/controllers/rails_admin/main_controller.rb

@@ -123,7 +123,8 @@ module RailsAdmin
     end
 
     def get_collection(model_config, scope, pagination)
-      eager_loads = model_config.list.fields.flat_map(&:eager_load_values)
+      section = @action.key == :export ? model_config.export : model_config.list
+      eager_loads = section.fields.flat_map(&:eager_load_values)
       options = {}
       options = options.merge(page: (params[Kaminari.config.param_name] || 1).to_i, per: (params[:per] || model_config.list.items_per_page)) if pagination
       options = options.merge(include: eager_loads) unless eager_loads.blank?

data/app/helpers/rails_admin/application_helper.rb

@@ -86,7 +86,7 @@ module RailsAdmin
 
         label = navigation_label || t('admin.misc.navigation')
 
-        %(<li class='dropdown-header'>#{label}</li>#{li_stack}) if li_stack.present?
+        collapsible_stack(label, 'main', li_stack)
       end.join.html_safe
     end
 
@@ -101,18 +101,17 @@ module RailsAdmin
         end.join.html_safe
         label ||= t('admin.misc.root_navigation')
 
-        %(<li class='dropdown-header'>#{label}</li>#{li_stack}) if li_stack.present?
+        collapsible_stack(label, 'action', li_stack)
       end.join.html_safe
     end
 
     def static_navigation
       li_stack = RailsAdmin::Config.navigation_static_links.collect do |title, url|
         content_tag(:li, link_to(title.to_s, url, target: '_blank', rel: 'noopener noreferrer', class: 'nav-link'))
-      end.join
+      end.join.html_safe
 
       label = RailsAdmin::Config.navigation_static_label || t('admin.misc.navigation_static_label')
-      li_stack = %(<li class='dropdown-header'>#{label}</li>#{li_stack}).html_safe if li_stack.present?
-      li_stack
+      collapsible_stack(label, 'static', li_stack) || ''
     end
 
     def navigation(parent_groups, nodes, level = 0)
@@ -218,6 +217,15 @@ module RailsAdmin
       raise e
     end
 
+    # Workaround for https://github.com/rails/rails/issues/31325
+    def image_tag(source, options = {})
+      if %w[ActiveStorage::Variant ActiveStorage::VariantWithRecord ActiveStorage::Preview].include? source.class.to_s
+        super main_app.route_for(ActiveStorage.resolve_model_to_route, source), options
+      else
+        super
+      end
+    end
+
   private
 
     def edit_user_link_label
@@ -232,5 +240,21 @@ module RailsAdmin
     def gravatar_url(email)
       "https://secure.gravatar.com/avatar/#{Digest::MD5.hexdigest email}?s=30"
     end
+
+    def collapsible_stack(label, class_prefix, li_stack)
+      return nil unless li_stack.present?
+
+      collapse_classname = "#{class_prefix}-#{Digest::MD5.hexdigest(label)[0..7]}"
+      content_tag(:li, class: 'mb-1') do
+        content_tag(:button, 'aria-expanded': true, class: 'btn btn-toggle align-items-center rounded', data: {bs_toggle: "collapse", bs_target: ".sidebar .#{collapse_classname}"}) do
+          content_tag(:i, '', class: 'fas fa-chevron-down') + html_escape(' ' + label)
+        end +
+          content_tag(:div, class: "collapse show #{collapse_classname}") do
+            content_tag(:ul, class: 'btn-toggle-nav list-unstyled fw-normal pb-1') do
+              li_stack
+            end
+          end
+      end
+    end
   end
 end

data/app/helpers/rails_admin/main_helper.rb

@@ -42,7 +42,6 @@ module RailsAdmin
     def ordered_filter_options
       if ordered_filters
         @ordered_filter_options ||= ordered_filters.map do |duplet|
-          options = {index: duplet[0]}
           filter_for_field = duplet[1]
           filter_name = filter_for_field.keys.first
           filter_hash = filter_for_field.values.first
@@ -50,20 +49,11 @@ module RailsAdmin
             raise "#{filter_name} is not currently filterable; filterable fields are #{filterable_fields.map(&:name).join(', ')}"
           end
 
-          case field.type
-          when :enum
-            options[:select_options] = options_for_select(field.with(object: @abstract_model.model.new).enum, filter_hash['v'])
-          when :date, :datetime, :time
-            options[:datetimepicker_options] = field.datepicker_options
-          end
-          options[:label] = field.label
-          options[:name]  = field.name
-          options[:type]  = field.type
-          options[:value] = filter_hash['v']
-          options[:label] = field.label
-          options[:operator] = filter_hash['o'] || field.default_filter_operator
-          options[:required] = field.required
-          options
+          field.filter_options.merge(
+            index: duplet[0],
+            operator: filter_hash['o'] || field.default_filter_operator,
+            value: filter_hash['v'],
+          )
         end
       end
     end

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

@@ -1,4 +1,4 @@
-<ul class="col-sm-3 col-md-2 btn-toggle-nav list-unstyled bg-light">
+<ul class="sidebar col-sm-3 col-md-2 nav btn-toggle-nav list-unstyled bg-light">
   <%= main_navigation %>
   <%= root_navigation %>
   <%= static_navigation %>

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

@@ -5,6 +5,9 @@
   </head>
   <body class="rails_admin">
     <div data-i18n-options="<%= I18n.t("admin.js").to_json %>" id="admin-js"></div>
+    <div class="badge bg-warning" id="loading" style="display:none; position:fixed; right:20px; bottom:20px; z-index:100000">
+      <%= t('admin.loading') %>
+    </div>
     <nav class="navbar navbar-expand-md fixed-top <%= RailsAdmin::Config.navbar_css_classes.join(' ') %>">
       <%= render "layouts/rails_admin/navigation" %>
     </nav>

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

@@ -12,7 +12,7 @@
       </th>
     </tr>
   </thead>
-  <tbody>
+  <tbody class="table-group-divider">
     <% @history.each do |t| %>
       <% abstract_model = RailsAdmin.config(t.table).abstract_model %>
       <tr>

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

@@ -1,7 +1,8 @@
 <%
   js_data = {
     csspath: field.css_location,
-    jspath: field.js_location
+    jspath: field.js_location,
+    warn_dynamic_load: field.warn_dynamic_load
   }
 %>
 <%= form.rich_text_area field.method_name, field.html_attributes.reverse_merge(data: { options: js_data.to_json }) %>

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

@@ -6,7 +6,7 @@
   <% if value = field.pretty_value %>
     <%= value %>
   <% end %>
-  <%= form.file_field(field.name, field.html_attributes.reverse_merge({ data: { fileupload: true }})) %>
+  <%= form.file_field(field.name, {data: {fileupload: true}}.deep_merge(field.html_attributes)) %>
 </div>
 <% if field.optional? && field.errors.blank? && file && field.delete_method %>
   <a class="btn btn-info btn-remove-image" data-toggle="button" href="#" role="button">

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

@@ -14,7 +14,7 @@
     <% end %>
   </div>
 <% end %>
-<%= form.file_field(field.name, field.html_attributes.reverse_merge({ data: { :"multiple-fileupload" => true }, multiple: true })) %>
+<%= form.file_field(field.name, { data: { :"multiple-fileupload" => true }, multiple: true }.deep_merge(field.html_attributes)) %>
 <% if field.cache_method %>
   <%= form.hidden_field(field.cache_method) %>
 <% end %>

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

@@ -14,7 +14,7 @@
         <th class="shrink controls"></th>
       </tr>
     </thead>
-    <tbody>
+    <tbody class="table-group-divider">
       <% @abstract_models.each do |abstract_model| %>
         <% if authorized? :index, abstract_model %>
           <% index_path = index_path(model_name: abstract_model.to_param) %>
@@ -42,7 +42,7 @@
               </div>
             </td>
             <td class="links">
-              <ul class="inline list-inline">
+              <ul class="nav d-inline list-inline">
                 <%= menu_for :collection, abstract_model, nil, true %>
               </ul>
             </td>

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

@@ -38,7 +38,7 @@
       <% end %>
     </tr>
   </thead>
-  <tbody>
+  <tbody class="table-group-divider">
     <% @history.each_with_index do |object, index| %>
       <tr>
         <% unless object.created_at.nil? %>

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

@@ -26,26 +26,11 @@
       </a>
       <ul class="dropdown-menu dropdown-menu-end" id="filters">
         <% filterable_fields.each do |field| %>
-          <%
-            field_options = case field.type
-                            when :enum
-                              options_for_select(field.with(object: @abstract_model.model.new).enum)
-                            else
-                              ''
-                            end
-          %>
           <li>
             <a
               href="#"
               class="dropdown-item"
-              data-field-label="<%= field.label %>"
-              data-field-name="<%= field.name %>"
-              data-field-operator="<%= field.default_filter_operator %>"
-              data-field-options="<%= "#{field_options}" %>"
-              data-field-required="<%= field.required.to_s %>"
-              data-field-type="<%= field.type %>"
-              data-field-value=""
-              data-field-datetimepicker-options="<%= field.try(:datepicker_options).try(:to_json) %>"
+              data-options="<%= field.with(view: self).filter_options.to_json %>"
             >
               <%= field.label %>
             </a>
@@ -83,6 +68,9 @@
               <i class="fas fa-times"></i>
             </button>
           </div>
+          <% if @model_config.list.search_help.present? %>
+            <div class="form-text"><%= @model_config.list.search_help %></div>
+          <% end %>
         </div>
         <div class="col-sm-6 text-end">
           <% if export_action %>
@@ -135,7 +123,7 @@
             <th class="last shrink"></th>
           </tr>
         </thead>
-        <tbody>
+        <tbody class="table-group-divider">
           <% @objects.each do |object| %>
             <tr class="<%= @abstract_model.param_key %>_row <%= @model_config.list.with(object: object).row_css_class %>">
               <% if checkboxes %>
@@ -150,7 +138,7 @@
                 </td>
               <% end %>
               <td class="last links ra-sidescroll-frozen">
-                <ul class="inline list-inline">
+                <ul class="nav d-inline list-inline">
                   <%= menu_for :member, @abstract_model, object, true %>
                 </ul>
               </td>

data/config/initializers/active_record_extensions.rb

@@ -4,9 +4,7 @@ ActiveSupport.on_load(:active_record) do
   module ActiveRecord
     class Base
       def self.rails_admin(&block)
-        RailsAdmin.config do |config|
-          config.model(self, &block)
-        end
+        RailsAdmin.config(self, &block)
       end
 
       def rails_admin_default_object_label_method

data/config/locales/rails_admin.en.yml

@@ -1,8 +1,8 @@
 en:
   admin:
     js:
-      true: True
-      false: False
+      true: "True"
+      false: "False"
       is_present: Is present
       is_blank: Is blank
       date: Date ...
@@ -21,6 +21,7 @@ en:
       too_many_objects: "Too many objects, use search box above"
       no_objects: "No objects found"
       clear: Clear
+    loading: "Loading..."
     toggle_navigation: Toggle navigation
     home:
       name: "Home"

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

@@ -92,7 +92,7 @@ module RailsAdmin
         end
 
         def read_only?
-          (klass.all.instance_eval(&scope).readonly_value if scope.is_a? Proc) ||
+          (klass.all.instance_exec(&scope).readonly_value if scope.is_a?(Proc) && scope.arity == 0) ||
             association.nested? ||
             false
         end

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

@@ -11,9 +11,7 @@ module RailsAdmin
           self.nested_attributes_options = {}
           class << self
             def rails_admin(&block)
-              RailsAdmin.config do |config|
-                config.model(self, &block)
-              end
+              RailsAdmin.config(self, &block)
             end
 
             alias_method :accepts_nested_attributes_for_without_rails_admin, :accepts_nested_attributes_for

data/lib/rails_admin/adapters/mongoid.rb

@@ -201,7 +201,7 @@ module RailsAdmin
         case target_association.type
         when :belongs_to, :has_and_belongs_to_many
           [{target_association.foreign_key.to_s => {'$in' => model.where('$or' => conditions).all.collect { |r| r.send(target_association.primary_key) }}}]
-        when :has_many
+        when :has_many, :has_one
           [{target_association.primary_key.to_s => {'$in' => model.where('$or' => conditions).all.collect { |r| r.send(target_association.foreign_key) }}}]
         end
       end

data/lib/rails_admin/config/const_load_suppressor.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module RailsAdmin
+  module Config
+    module ConstLoadSuppressor
+      class << self
+        @original_const_missing = nil
+
+        def suppressing
+          raise 'Constant Loading is already suppressed' if @original_const_missing
+
+          begin
+            @original_const_missing = Object.method(:const_missing)
+            intercept_const_missing
+            yield
+          ensure
+            Object.define_singleton_method(:const_missing, @original_const_missing)
+            @original_const_missing = nil
+          end
+        end
+
+        def allowing
+          if @original_const_missing
+            begin
+              Object.define_singleton_method(:const_missing, @original_const_missing)
+              yield
+            ensure
+              intercept_const_missing
+            end
+          else
+            yield
+          end
+        end
+
+      private
+
+        def intercept_const_missing
+          Object.define_singleton_method(:const_missing) do |name|
+            ConstProxy.new(name.to_s)
+          end
+        end
+      end
+
+      class ConstProxy < BasicObject
+        attr_reader :name
+
+        def initialize(name)
+          @name = name
+        end
+
+        def klass
+          @klass ||=
+            begin
+              unless ::Object.const_defined?(name)
+                ::Kernel.raise <<~MESSAGE
+                  The constant #{name} is not loaded yet upon the execution of the RailsAdmin initializer.
+                  We don't recommend to do this and may lead to issues, but if you really have to do so you can explicitly require it by adding:
+
+                    require '#{name.underscore}'
+
+                  on top of config/initializers/rails_admin.rb.
+                MESSAGE
+              end
+              name.constantize
+            end
+        end
+
+        def method_missing(method_name, *args, &block)
+          klass.send(method_name, *args, &block)
+        end
+
+        def respond_to_missing?(method_name, include_private = false)
+          super || klass.respond_to?(method_name, include_private)
+        end
+      end
+    end
+  end
+end

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

@@ -78,6 +78,10 @@ module RailsAdmin
           !virtual? || children_fields.first || false
         end
 
+        register_instance_option :search_operator do
+          RailsAdmin::Config.default_search_operator
+        end
+
         register_instance_option :queryable? do
           !virtual?
         end
@@ -86,8 +90,22 @@ module RailsAdmin
           !!searchable
         end
 
-        register_instance_option :search_operator do
-          @search_operator ||= RailsAdmin::Config.default_search_operator
+        register_instance_option :filter_operators do
+          []
+        end
+
+        register_instance_option :default_filter_operator do
+          nil
+        end
+
+        def filter_options
+          {
+            label: label,
+            name: name,
+            operator: default_filter_operator,
+            operators: filter_operators,
+            type: type,
+          }
         end
 
         # serials and dates are reversed in list, which is more natural (last modified items first).
@@ -242,10 +260,6 @@ module RailsAdmin
           []
         end
 
-        register_instance_option :default_filter_operator do
-          nil
-        end
-
         register_instance_option :eager_load do
           false
         end

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

@@ -22,6 +22,10 @@ module RailsAdmin
             "https://cdnjs.cloudflare.com/ajax/libs/trix/#{version}/trix.js"
           end
 
+          register_instance_option :warn_dynamic_load do
+            true
+          end
+
           register_instance_option :partial do
             :form_action_text
           end

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

@@ -28,6 +28,18 @@ module RailsAdmin
             {"#{name}_attachment": :blob}
           end
 
+          register_instance_option :direct? do
+            false
+          end
+
+          register_instance_option :html_attributes do
+            {
+              required: required? && !value.present?,
+            }.merge(
+              direct? && {data: {direct_upload_url: bindings[:view].main_app.rails_direct_uploads_url}} || {},
+            )
+          end
+
           def resource_url(thumb = false)
             return nil unless value
 

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

@@ -9,6 +9,10 @@ module RailsAdmin
         class BelongsToAssociation < RailsAdmin::Config::Fields::Association
           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

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

@@ -24,6 +24,10 @@ module RailsAdmin
             }
           end
 
+          register_instance_option :filter_operators do
+            %w[_discard true false] + (required? ? [] : %w[_separator _present _blank])
+          end
+
           register_instance_option :nullable? do
             properties&.nullable?
           end

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

@@ -18,6 +18,16 @@ module RailsAdmin
             params[name] = parse_value(params[name]) if params[name]
           end
 
+          register_instance_option :filter_operators do
+            %w[default between today yesterday this_week last_week] + (required? ? [] : %w[_separator _not_null _null])
+          end
+
+          def filter_options
+            super.merge(
+              datetimepicker_options: datepicker_options,
+            )
+          end
+
           register_instance_option :date_format do
             :long
           end

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

@@ -9,16 +9,27 @@ module RailsAdmin
         class Enum < RailsAdmin::Config::Fields::Base
           RailsAdmin::Config::Fields::Types.register(self)
 
+          register_instance_option :filter_operators do
+            %w[_discard] +
+              enum.map do |label, value|
+                {label: label, value: value || label}
+              end + (required? ? [] : %w[_separator _present _blank])
+          end
+
           register_instance_option :partial do
             :form_enumeration
           end
 
           register_instance_option :enum_method do
-            @enum_method ||= bindings[:object].class.respond_to?("#{name}_enum") || bindings[:object].respond_to?("#{name}_enum") ? "#{name}_enum" : name
+            @enum_method ||= bindings[:object].class.respond_to?("#{name}_enum") || (bindings[:object] || abstract_model.model.new).respond_to?("#{name}_enum") ? "#{name}_enum" : name
           end
 
           register_instance_option :enum do
-            bindings[:object].class.respond_to?(enum_method) ? bindings[:object].class.send(enum_method) : bindings[:object].send(enum_method)
+            if abstract_model.model.respond_to?(enum_method)
+              abstract_model.model.send(enum_method)
+            else
+              (bindings[:object] || abstract_model.model.new).send(enum_method)
+            end
           end
 
           register_instance_option :pretty_value do

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

@@ -10,6 +10,10 @@ module RailsAdmin
           # 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

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

@@ -58,6 +58,18 @@ module RailsAdmin
           register_instance_option :eager_load do
             {"#{name}_attachments": :blob}
           end
+
+          register_instance_option :direct? do
+            false
+          end
+
+          register_instance_option :html_attributes do
+            {
+              required: required? && !value.present?,
+            }.merge(
+              direct? && {data: {direct_upload_url: bindings[:view].main_app.rails_direct_uploads_url}} || {},
+            )
+          end
         end
       end
     end

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

@@ -10,6 +10,10 @@ module RailsAdmin
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
+          register_instance_option :filter_operators do
+            %w[default between] + (required? ? [] : %w[_separator _not_null _null])
+          end
+
           register_instance_option :view_helper do
             :number_field
           end

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

@@ -7,6 +7,10 @@ module RailsAdmin
     module Fields
       module Types
         class StringLike < RailsAdmin::Config::Fields::Base
+          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 :treat_empty_as_nil? do
             properties.try(:nullable?)
           end