rails_admin 3.0.0 → 3.1.2

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/proxyable'
 require 'rails_admin/config/configurable'
 require 'rails_admin/config/hideable'
@@ -58,10 +60,28 @@ module RailsAdmin
           !virtual? || children_fields.first || false
         end
 
+        def sort_column
+          if sortable == true
+            "#{abstract_model.table_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}"
+          else # use described column in the field conf.
+            "#{abstract_model.table_name}.#{sortable}"
+          end
+        end
+
         register_instance_option :searchable do
           !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
@@ -70,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).
@@ -226,10 +260,6 @@ module RailsAdmin
           []
         end
 
-        register_instance_option :default_filter_operator do
-          nil
-        end
-
         register_instance_option :eager_load do
           false
         end
@@ -301,13 +331,13 @@ module RailsAdmin
         def value
           bindings[:object].safe_send(name)
         rescue NoMethodError => e
-          raise e.exception <<-ERROR.gsub(/^\s{10}/, '')
-          #{e.message}
-          If you want to use a RailsAdmin virtual field(= a field without corresponding instance method),
-          you should declare 'formatted_value' in the field definition.
-            field :#{name} do
-              formatted_value{ bindings[:object].call_some_method }
-            end
+          raise e.exception <<~ERROR
+            #{e.message}
+            If you want to use a RailsAdmin virtual field(= a field without corresponding instance method),
+            you should declare 'formatted_value' in the field definition.
+              field :#{name} do
+                formatted_value{ bindings[:object].call_some_method }
+              end
           ERROR
         end
 
@@ -337,7 +367,7 @@ module RailsAdmin
         end
 
         def parse_input(_params)
-          # overriden
+          # overridden
         end
 
         def inverse_of

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/file_upload'

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

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/belongs_to_association'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
-  association = parent.abstract_model.associations.detect { |a| a.foreign_key == properties.name && %i[belongs_to has_and_belongs_to_many].include?(a.type) }
-  if association
-    field = RailsAdmin::Config::Fields::Types.load("#{association.polymorphic? ? :polymorphic : association.type}_association").new(parent, association.name, association)
+  parent.abstract_model.associations.filter { |a| Array(a.foreign_key).include?(properties.name) && %i[belongs_to has_and_belongs_to_many].include?(a.type) }.each do |association|
+    field = RailsAdmin::Config::Fields::Types.load(association.field_type).new(parent, association.name, association)
     fields << field
 
     child_columns = []
@@ -13,7 +14,7 @@ RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
                              %i[foreign_key foreign_type foreign_inverse_of]
                            else
                              [:foreign_key]
-                           end.collect { |k| association.send(k) }.compact
+                           end.flat_map { |k| Array(association.send(k)) }.compact
 
     parent.abstract_model.properties.select { |p| possible_field_names.include? p.name }.each do |column|
       child_field = fields.detect { |f| f.name.to_s == column.name.to_s }
@@ -27,5 +28,5 @@ RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
     end
 
     field.children_fields child_columns.collect(&:name)
-  end
+  end.any?
 end

data/lib/rails_admin/config/fields/factories/carrierwave.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/file_upload'

data/lib/rails_admin/config/fields/factories/devise.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/password'

data/lib/rails_admin/config/fields/factories/dragonfly.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/file_upload'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types/enum'
 require 'rails_admin/config/fields/types/active_record_enum'

data/lib/rails_admin/config/fields/factories/paperclip.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/file_upload'

data/lib/rails_admin/config/fields/factories/password.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types/password'
 

data/lib/rails_admin/config/fields/factories/shrine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/file_upload'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/string/inflections'
 require 'rails_admin/config/proxyable'
 require 'rails_admin/config/configurable'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/text'
 
 module RailsAdmin
@@ -20,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_record_enum.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/enum'
 
 module RailsAdmin

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/file_upload'
 
 module RailsAdmin
@@ -26,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/all.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/action_text'
 require 'rails_admin/config/fields/types/active_record_enum'
 require 'rails_admin/config/fields/types/active_storage'
 require 'rails_admin/config/fields/types/belongs_to_association'
 require 'rails_admin/config/fields/types/boolean'
 require 'rails_admin/config/fields/types/bson_object_id'
+require 'rails_admin/config/fields/types/composite_keys_belongs_to_association'
 require 'rails_admin/config/fields/types/date'
 require 'rails_admin/config/fields/types/datetime'
 require 'rails_admin/config/fields/types/decimal'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/association'
 
 module RailsAdmin
@@ -7,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
@@ -27,12 +33,8 @@ module RailsAdmin
             true
           end
 
-          def associated_primary_key
-            association.primary_key
-          end
-
           def selected_id
-            bindings[:object].send(association.key_accessor)
+            bindings[:object].safe_send(association.key_accessor)
           end
 
           def method_name

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     module Fields
@@ -22,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
@@ -31,7 +37,7 @@ module RailsAdmin
           end
 
           register_instance_option :pretty_value do
-            %(<span class="label label-#{css_classes[form_value]}">#{labels[form_value]}</span>).html_safe
+            %(<span class="badge bg-#{css_classes[form_value]}">#{labels[form_value]}</span>).html_safe
           end
 
           register_instance_option :export_value do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/string'
 
 module RailsAdmin

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/base'
 require 'rails_admin/config/fields/types/file_upload'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/text'
 
 module RailsAdmin

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/text'
 
 module RailsAdmin

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/text'
 
 module RailsAdmin

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/string_like'
 
 module RailsAdmin

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/datetime'
 
 module RailsAdmin

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/base'
 require 'rails_admin/support/datetime'
 
@@ -16,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/decimal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/numeric'
 
 module RailsAdmin

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/base'
 require 'rails_admin/config/fields/types/file_upload'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/string'
 
 module RailsAdmin
@@ -7,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/file_upload.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/string'
 
 module RailsAdmin

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/numeric'
 
 module RailsAdmin

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/text'
 
 module RailsAdmin

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/has_many_association'
 
 module RailsAdmin

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/association'
 
 module RailsAdmin
@@ -8,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
@@ -18,7 +24,7 @@ module RailsAdmin
           end
 
           def selected_id
-            value.try :id
+            value.try(:id).try(:to_s)
           end
 
           def method_name

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/string_like'
 
 module RailsAdmin

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/numeric'
 
 module RailsAdmin

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/text'
 
 module RailsAdmin

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/multiple_file_upload'
 
 module RailsAdmin
@@ -12,6 +14,10 @@ module RailsAdmin
               {resize_to_limit: [100, 100]}
             end
 
+            register_instance_option :keep_value do
+              value.signed_id
+            end
+
             register_instance_option :delete_value do
               value.id
             end
@@ -41,6 +47,10 @@ module RailsAdmin
             ActiveStorageAttachment
           end
 
+          register_instance_option :keep_method do
+            method_name if ::ActiveStorage.replace_on_assign_to_many
+          end
+
           register_instance_option :delete_method do
             "remove_#{name}" if bindings[:object].respond_to?("remove_#{name}")
           end
@@ -48,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/multiple_carrierwave.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/multiple_file_upload'
 
 module RailsAdmin

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     module Fields

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/base'
 
 module RailsAdmin
@@ -8,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/paperclip.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/base'
 require 'rails_admin/config/fields/types/file_upload'