rails_admin 3.0.0.beta2 → 3.0.0.rc3

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

@@ -12,7 +12,8 @@ RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
     fields << field
     children_fields = []
     columns.each do |children_column_name|
-      next unless child_properties = parent.abstract_model.properties.detect { |p| p.name.to_s == children_column_name.to_s }
+      child_properties = parent.abstract_model.properties.detect { |p| p.name.to_s == children_column_name.to_s }
+      next unless child_properties
 
       children_field = fields.detect { |f| f.name == children_column_name } || RailsAdmin::Config::Fields.default_factory.call(parent, child_properties, fields)
       children_field.hide unless field == children_field

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

@@ -12,7 +12,8 @@ RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
       properties = parent.abstract_model.properties.detect { |p| ext == p.name }
       next unless properties
 
-      unless field = fields.detect { |f| f.name == ext }
+      field = fields.detect { |f| f.name == ext }
+      unless field
         RailsAdmin::Config::Fields.default_factory.call(parent, properties, fields)
         field = fields.last
       end

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

@@ -9,7 +9,8 @@ RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
     children_fields = []
     extensions.each do |ext|
       children_column_name = "#{attachment_name}_#{ext}".to_sym
-      next unless child_properties = parent.abstract_model.properties.detect { |p| p.name.to_s == children_column_name.to_s }
+      child_properties = parent.abstract_model.properties.detect { |p| p.name.to_s == children_column_name.to_s }
+      next unless child_properties
 
       children_field = fields.detect { |f| f.name == children_column_name } || RailsAdmin::Config::Fields.default_factory.call(parent, child_properties, fields)
       children_field.hide

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

@@ -10,7 +10,8 @@ RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
     children_fields = []
     extensions.each do |ext|
       children_column_name = "#{attachment_name}_#{ext}".to_sym
-      next unless child_properties = parent.abstract_model.properties.detect { |p| p.name.to_s == children_column_name.to_s }
+      child_properties = parent.abstract_model.properties.detect { |p| p.name.to_s == children_column_name.to_s }
+      next unless child_properties
 
       children_field = fields.detect { |f| f.name == children_column_name } || RailsAdmin::Config::Fields.default_factory.call(parent, child_properties, fields)
       children_field.hide

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

@@ -9,7 +9,7 @@ module RailsAdmin
           RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :version do
-            '1.1.1'
+            '1.3.1'
           end
 
           register_instance_option :css_location do

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

@@ -15,6 +15,13 @@ module RailsAdmin
             :long
           end
 
+          register_instance_option :datepicker_options do
+            {
+              allowInput: true,
+              altFormat: flatpickr_format,
+            }
+          end
+
           register_instance_option :i18n_scope do
             %i[date formats]
           end

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

@@ -30,14 +30,15 @@ module RailsAdmin
             '%B %d, %Y %H:%M'
           end
 
-          register_instance_option :momentjs_format do
-            RailsAdmin::Support::Datetime.to_momentjs(strftime_format)
+          register_instance_option :flatpickr_format do
+            RailsAdmin::Support::Datetime.to_flatpickr_format(strftime_format)
           end
 
           register_instance_option :datepicker_options do
             {
-              showTodayButton: true,
-              format: momentjs_format,
+              allowInput: true,
+              enableTime: true,
+              altFormat: flatpickr_format,
             }
           end
 
@@ -57,7 +58,8 @@ module RailsAdmin
           end
 
           register_instance_option :formatted_value do
-            if time = (value || default_value)
+            time = (value || default_value)
+            if time
               ::I18n.l(time, format: strftime_format)
             else
               ''.html_safe
@@ -68,6 +70,10 @@ module RailsAdmin
             :form_datetime
           end
 
+          register_deprecated_instance_option :momentjs_format do
+            ActiveSupport::Deprecation.warn('The momentjs_format configuration option is deprecated, please use flatpickr_format with corresponding values here: https://flatpickr.js.org/formatting/')
+          end
+
           def form_value
             value&.in_time_zone&.strftime('%FT%T') || form_default_value
           end

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

@@ -25,6 +25,10 @@ module RailsAdmin
           def errors
             bindings[:object].errors[name]
           end
+
+          def associated_prepopulate_params
+            {associated_model_config.abstract_model.param_key => {association.foreign_key => bindings[:object].try(:id)}}
+          end
         end
       end
     end

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

@@ -28,6 +28,10 @@ module RailsAdmin
           def multiple?
             false
           end
+
+          def associated_prepopulate_params
+            {associated_model_config.abstract_model.param_key => {association.foreign_key => bindings[:object].try(:id)}}
+          end
         end
       end
     end

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

@@ -11,6 +11,15 @@ module RailsAdmin
             abstract_model.model.type_for_attribute(name.to_s).serialize(super)&.change(year: 2000, month: 1, day: 1)
           end
 
+          register_instance_option :datepicker_options do
+            {
+              allowInput: true,
+              altFormat: flatpickr_format,
+              enableTime: true,
+              noCalendar: true,
+            }
+          end
+
           register_instance_option :strftime_format do
             '%H:%M'
           end

data/lib/rails_admin/config/has_fields.rb

@@ -116,6 +116,10 @@ module RailsAdmin
         all_fields.collect { |f| f.with(bindings) }.select(&:visible?).sort_by { |f| [f.order, i += 1] } # stable sort, damn
       end
 
+      def possible_fields
+        _fields(true)
+      end
+
     protected
 
       # Raw fields.

data/lib/rails_admin/config/model.rb

@@ -98,6 +98,14 @@ module RailsAdmin
         nil
       end
 
+      register_instance_option :scope do
+        abstract_model.scoped
+      end
+
+      register_instance_option :last_created_at do
+        abstract_model.model.last.try(:created_at) if abstract_model.properties.detect { |c| c.name == :created_at }
+      end
+
       # Act as a proxy for the base section configuration that actually
       # store the configurations.
       def method_missing(method_name, *args, &block)

data/lib/rails_admin/config/sections/list.rb

@@ -32,10 +32,6 @@ module RailsAdmin
           parent.abstract_model.primary_key
         end
 
-        register_instance_option :sort_reverse? do
-          true # By default show latest first
-        end
-
         register_instance_option :scopes do
           []
         end
@@ -51,6 +47,10 @@ module RailsAdmin
         def fields_for_table
           visible_fields.partition(&:sticky?).flatten
         end
+
+        register_deprecated_instance_option :sort_reverse do
+          ActiveSupport::Deprecation.warn('The sort_reverse configuration option is deprecated and has no effect.')
+        end
       end
     end
   end

data/lib/rails_admin/config.rb

@@ -39,7 +39,7 @@ module RailsAdmin
       attr_accessor :included_models
 
       # Fields to be hidden in show, create and update views
-      attr_accessor :default_hidden_fields
+      attr_reader :default_hidden_fields
 
       # Default items per page value used if a model level option has not
       # been configured
@@ -81,7 +81,7 @@ module RailsAdmin
       attr_accessor :navigation_static_label
 
       # Set where RailsAdmin fetches JS/CSS from, defaults to :sprockets
-      attr_accessor :asset_source
+      attr_writer :asset_source
 
       # Finish initialization by executing deferred configuration blocks
       def initialize!
@@ -257,6 +257,17 @@ module RailsAdmin
         @registry[key]
       end
 
+      def asset_source
+        @asset_source ||=
+          begin
+            warn <<-MSG.gsub(/^ +/, '').freeze
+              [Warning] After upgrading RailsAdmin to 3.x you haven't set asset_source yet, using :sprockets as the default.
+              To suppress this message, run 'rails rails_admin:install' to setup the asset delivery method suitable to you.
+            MSG
+            :sprockets
+          end
+      end
+
       def default_hidden_fields=(fields)
         if fields.is_a?(Array)
           @default_hidden_fields = {}
@@ -269,9 +280,12 @@ module RailsAdmin
 
       def parent_controller=(name)
         @parent_controller = name
-        if defined?(RailsAdmin::ApplicationController)
+
+        if defined?(RailsAdmin::ApplicationController) || defined?(RailsAdmin::MainController)
           RailsAdmin.send(:remove_const, :ApplicationController)
+          RailsAdmin.send(:remove_const, :MainController)
           load RailsAdmin::Engine.root.join('app/controllers/rails_admin/application_controller.rb')
+          load RailsAdmin::Engine.root.join('app/controllers/rails_admin/main_controller.rb')
         end
       end
 
@@ -323,7 +337,7 @@ module RailsAdmin
         @show_gravatar = true
         @navigation_static_links = {}
         @navigation_static_label = nil
-        @asset_source = (defined?(Webpacker) ? :webpacker : :sprockets)
+        @asset_source = nil
         @parent_controller = '::ActionController::Base'
         @forgery_protection_settings = {with: :exception}
         RailsAdmin::Config::Actions.reset

data/lib/rails_admin/engine.rb

@@ -1,8 +1,8 @@
 require 'kaminari'
 require 'nested_form'
-require 'rack-pjax'
 require 'rails'
 require 'rails_admin'
+require 'turbo-rails'
 
 module RailsAdmin
   class Engine < Rails::Engine
@@ -13,8 +13,8 @@ module RailsAdmin
     initializer 'RailsAdmin precompile hook', group: :all do |app|
       if app.config.respond_to?(:assets)
         app.config.assets.precompile += %w[
-          rails_admin.js
-          rails_admin.css
+          rails_admin/application.js
+          rails_admin/application.css
         ]
         app.config.assets.paths << RailsAdmin::Engine.root.join('src')
         require 'rails_admin/support/esmodule_preprocessor'
@@ -22,10 +22,6 @@ module RailsAdmin
       end
     end
 
-    initializer 'RailsAdmin setup middlewares' do |app|
-      app.config.middleware.use Rack::Pjax
-    end
-
     initializer 'RailsAdmin reload config in development' do |app|
       config.initializer_path = app.root.join('config/initializers/rails_admin.rb')
 
@@ -46,14 +42,11 @@ module RailsAdmin
       end
     end
 
-    rake_tasks do
-      Dir[File.join(File.dirname(__FILE__), '../tasks/*.rake')].each { |f| load f }
-    end
-
     # Check for required middlewares, users may forget to use them in Rails API mode
     config.after_initialize do |app|
       has_session_store = app.config.middleware.to_a.any? do |m|
         m.klass.try(:<=, ActionDispatch::Session::AbstractStore) ||
+          m.klass.try(:<=, ActionDispatch::Session::AbstractSecureStore) ||
           m.klass.name =~ /^ActionDispatch::Session::/
       end
       loaded = app.config.middleware.to_a.map(&:name)
@@ -62,14 +55,14 @@ module RailsAdmin
       unless missing.empty? && has_session_store
         configs = missing.map { |m| "config.middleware.use #{m}" }
         configs << "config.middleware.use #{app.config.session_store.try(:name) || 'ActionDispatch::Session::CookieStore'}, #{app.config.session_options}" unless has_session_store
-        raise <<~EOM
+        raise <<~ERROR
           Required middlewares for RailsAdmin are not added
           To fix this, add
 
             #{configs.join("\n  ")}
 
           to config/application.rb.
-        EOM
+        ERROR
       end
 
       RailsAdmin::Config.initialize!

data/lib/rails_admin/extensions/paper_trail/auditing_adapter.rb

@@ -49,7 +49,7 @@ module RailsAdmin
           created_at: :created_at,
           message: :event,
         }.freeze
-        E_VERSION_MODEL_NOT_SET = <<-EOS.strip_heredoc.freeze
+        E_VERSION_MODEL_NOT_SET = <<-ERROR.strip_heredoc.freeze
           Please set up PaperTrail's version model explicitly.
 
               config.audit_with :paper_trail, 'User', 'PaperTrail::Version'
@@ -58,7 +58,7 @@ module RailsAdmin
           (https://github.com/paper-trail-gem/paper_trail#6a-custom-version-classes)
           that configuration will take precedence over what you specify in
           `audit_with`.
-        EOS
+        ERROR
 
         def self.setup
           raise 'PaperTrail not found' unless defined?(::PaperTrail)

data/lib/rails_admin/support/datetime.rb

@@ -1,63 +1,60 @@
 module RailsAdmin
   module Support
     class Datetime
-      # Ruby format options as a key and momentjs format options as a value
-      MOMENTJS_TRANSLATIONS = {
-        '%A' => 'dddd',       # The  full  weekday  name ("Sunday")
-        '%a' => 'ddd',        # The abbreviated weekday name ("Sun")
-        '%B' => 'MMMM',       # The  full  month  name ("January")
-        '%b' => 'MMM',        # The abbreviated month name ("Jan")
-        '%D' => 'MM/DD/YY',   # American date format mm/dd/yy
-        '%d' => 'DD',         # Day of the month (01..31)
-        '%-d' => 'D',         # Day of the month (1..31)
-        '%F' => 'YYYY-MM-DD', # ISO 8601 date format
-        '%G' => 'GGGG',       # ISO Week Year (2020)
-        '%g' => 'GG',         # ISO Week Year (20)
-        '%H' => 'HH',         # Hour of the day, 24-hour clock (00..23)
-        '%-H' => 'H',         # Hour of the day, 24-hour clock (0..23)
-        '%h' => 'MMM',        # Same as %b
-        '%I' => 'hh',         # Hour of the day, 12-hour clock (01..12)
-        '%-I' => 'h',         # Hour of the day, 12-hour clock (1..12)
-        '%j' => 'DDDD',       # Day of Year (001..366)
-        '%L' => 'SSS',        # Millisecond of the second (000..999)
-        '%M' => 'mm',         # Minute of the hour (00..59)
-        '%-M' => 'm',         # Minute of the hour (0..59)
-        '%m' => 'MM',         # Month of the year (01..12)
-        '%-m' => 'M',         # Month of the year (1..12)
-        '%N' => 'SSSSSSSSS',  # Fractional seconds 9 digits
-        '%9N' => 'SSSSSSSSS', # Fractional seconds 9 digits
-        '%6N' => 'SSSSSS',    # Fractional seconds 6 digits
-        '%3N' => 'SSS',       # Fractional seconds 3 digits
-        '%P' => 'a',          # Meridian indicator ('am' or 'pm')
-        '%p' => 'A',          # Meridian indicator ('AM' or 'PM')
-        '%Q' => 'x',          # Number of milliseconds since 1970-01-01 00:00:00 UTC.
-        '%R' => 'HH:mm',      # 24-hour time (%H:%M)
-        '%r' => 'hh:mm:ss A', # 12-hour time (%I:%M:%S %p)
-        '%S' => 'ss',         # Second of the minute (00..60)
-        '%-S' => 's',         # Second of the minute (0..60)
-        '%s' => 'X',          # Number of seconds since 1970-01-01 00:00:00 UTC.
-        '%T' => 'HH:mm:ss',   # 24-hour time (%H:%M:%S)
-        '%U' => 'ww',         # Week number of the year.  The week starts with Sunday.  (00..53)
-        '%u' => 'E',          # Day of the week (Monday is 1, 1..7)
-        '%W' => 'WW',         # Week number of the year.  The week starts with Monday.  (00..53)
-        '%w' => 'e',          # Day of the week (Sunday is 0, 0..6)
-        '%X' => 'HH:mm:ss',   # Same as %T
-        '%x' => 'MM/DD/YY',   # Same as %D
-        '%Y' => 'YYYY',       # Year with century
-        '%y' => 'YY',         # Year without a century (00..99)
-        '%Z' => 'Z',          # Equivalent to %:z (e.g. +09:00)
-        '%z' => 'ZZ',         # Time zone as hour and minute offset from UTC (e.g. +0900)
-        '%:z' => 'Z',         # Time zone as hour and minute offset from UTC with a colon (e.g. +09:00),
+      # Ruby format options as a key and flatpickr format options as a value
+      FLATPICKR_TRANSLATIONS = {
+        '%A' => 'l',       # The  full  weekday  name ("Sunday")
+        '%a' => 'D',       # The abbreviated weekday name ("Sun")
+        '%B' => 'F',       # The  full  month  name ("January")
+        '%b' => 'M',       # The abbreviated month name ("Jan")
+        '%D' => 'm/d/y',   # American date format mm/dd/yy
+        '%d' => 'd',       # Day of the month (01..31)
+        '%-d' => 'j',      # Day of the month (1..31)
+        '%e' => 'j',       # Day of the month (1..31)
+        '%F' => 'Y-m-d',   # ISO 8601 date format
+        '%H' => 'H',       # Hour of the day, 24-hour clock (00..23)
+        '%-H' => 'H',      # Hour of the day, 24-hour clock (0..23)
+        '%h' => 'M',       # Same as %b
+        '%I' => 'G',       # Hour of the day, 12-hour clock (01..12)
+        '%-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)
+        '%M' => 'i',       # Minute of the hour (00..59)
+        '%-M' => 'i',      # Minute of the hour (00..59)
+        '%m' => 'm',       # Month of the year (01..12)
+        '%-m' => 'n',      # Month of the year (1..12)
+        '%P' => 'K',       # Meridian indicator ('am' or 'pm')
+        '%p' => 'K',       # Meridian indicator ('AM' or 'PM')
+        '%R' => 'H:i',     # 24-hour time (%H:%M)
+        '%r' => 'G:i:S K', # 12-hour time (%I:%M:%S %p)
+        '%S' => 'S',       # Second of the minute (00..60)
+        '%-S' => 's',      # Second of the minute (0..60)
+        '%s' => 'U',       # Number of seconds since 1970-01-01 00:00:00 UTC.
+        '%T' => 'H:i:S',   # 24-hour time (%H:%M:%S)
+        '%U' => 'W',       # Week number of the year.  The week starts with Sunday.  (00..53)
+        '%w' => 'w',       # Day of the week (Sunday is 0, 0..6)
+        '%X' => 'H:i:S',   # Same as %T
+        '%x' => 'm/d/y',   # Same as %D
+        '%Y' => 'Y',       # Year with century
+        '%y' => 'y',       # Year without a century (00..99)
         '%%' => '%',
       }.freeze
 
       class << self
-        def to_momentjs(strftime_format)
-          strftime_format.gsub(/(?<!%)(?<![-0-9:])\w+/, '[\0]').gsub(/%([-0-9:]?\w)/) do |match|
-            MOMENTJS_TRANSLATIONS[match] or raise <<-MSG.gsub(/^\s{14}/, '')
-              Unsupported strftime directive '#{match}' was found. Please consider explicitly setting momentjs_format instance option for the field.
-                field(:name_of_field) { momentjs_format '...' }
-            MSG
+        def to_flatpickr_format(strftime_format)
+          strftime_format.gsub(/(?<!%)(?<![-0-9:])\w/, '\\\\\0').gsub(/%([-0-9:]?\w)/) do |match|
+            # Timezone can't be handled by frontend, the server's one is always used
+            case match
+            when '%Z', '%:z' # Time zone as hour and minute offset from UTC with a colon (e.g. +09:00)
+              Time.zone.formatted_offset
+            when '%z' # Time zone as hour and minute offset from UTC (e.g. +0900)
+              Time.zone.formatted_offset(false)
+            else
+              FLATPICKR_TRANSLATIONS[match] or raise <<-MSG.gsub(/^\s{16}/, '')
+                Unsupported strftime directive '#{match}' was found. Please consider explicitly setting flatpickr_format instance option for the field.
+                  field(:name_of_field) { flatpickr_format '...' }
+              MSG
+            end
           end
         end
       end

data/lib/rails_admin/support/esmodule_preprocessor.rb

@@ -13,7 +13,6 @@ module RailsAdmin
     def call(input)
       data = input[:data]
 
-      # only process files under rails_admin/src
       if input[:filename].start_with? RailsAdmin::Engine.root.join('src').to_s
         data.gsub!(/^(import .+)$/) { "// #{Regexp.last_match(1)}" }
         data.gsub!(/^(export +default +{)$/) do
@@ -24,6 +23,8 @@ module RailsAdmin
             raise "Unable to preprocess file: #{input[:filename]}"
           end
         end
+      elsif input[:filename] =~ %r{turbo-rails.+/turbo\.js$}
+        data.gsub!(/^(export .+)$/) { "// #{Regexp.last_match(1)}" }
       end
 
       {data: data}

data/lib/rails_admin/version.rb

@@ -3,7 +3,7 @@ module RailsAdmin
     MAJOR = 3
     MINOR = 0
     PATCH = 0
-    PRE = 'beta2'.freeze
+    PRE = 'rc3'.freeze
 
     class << self
       # @return [String]

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rails_admin",
-  "version": "3.0.0-beta",
+  "version": "3.0.0-rc3",
   "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",
@@ -14,13 +14,15 @@
     "format": "prettier -w ."
   },
   "dependencies": {
+    "@babel/runtime": "^7.16.7",
     "@fortawesome/fontawesome-free": "^5.15.4",
+    "@hotwired/turbo-rails": "^7.1.0",
+    "@popperjs/core": "^2.11.0",
     "@rails/ujs": "^6.1.4-1",
-    "bootstrap-sass": "3.4.1",
-    "eonasdan-bootstrap-datetimepicker": "^4.17.49",
+    "bootstrap": "^5.1.3",
+    "flatpickr": "^4.6.9",
     "jquery": "^3.6.0",
-    "jquery-ui": "^1.12.1",
-    "moment": "^2.29.1"
+    "jquery-ui": "^1.12.1"
   },
   "devDependencies": {
     "prettier": "^2.4.1"

data/src/rails_admin/base.js

@@ -1,11 +1,9 @@
 import Rails from "@rails/ujs";
+import "@hotwired/turbo-rails";
 import jQuery from "jquery";
-import moment from "moment";
-import "./vendor/jquery.pjax";
 import "./vendor/jquery_nested_form";
-import "bootstrap-sass";
-import "moment/min/locales.js";
-import "eonasdan-bootstrap-datetimepicker";
+import "bootstrap";
+import "flatpickr/dist/flatpickr";
 
 import "./filter-box";
 import "./filtering-multiselect";
@@ -18,4 +16,3 @@ import "./widgets";
 
 Rails.start();
 window.$ = window.jQuery = jQuery;
-window.moment = moment;