rails_admin 3.0.0.beta2 → 3.0.0.rc

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

@@ -1,6 +1,6 @@
 <%
   query = params[:query]
-  params = request.params.except(:authenticity_token, :action, :controller, :utf8, :bulk_export, :_pjax)
+  params = request.params.except(:authenticity_token, :action, :controller, :utf8, :bulk_export)
   params.delete(:query) if params[:query].blank?
   params.delete(:sort_reverse) unless params[:sort_reverse] == 'true'
   sort_reverse = params[:sort_reverse]
@@ -18,16 +18,13 @@
 %>
 
 <% content_for :contextual_tabs do %>
-  <% if checkboxes %>
-    <%= bulk_menu %>
-  <% end %>
   <% if filterable_fields.present? %>
-    <li class="dropdown" style="float:right">
-      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+    <li class="nav-item dropdown">
+      <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">
         <%= t('admin.misc.add_filter') %>
         <b class="caret"></b>
       </a>
-      <ul class="dropdown-menu" id="filters" style="left:auto; right:0;">
+      <ul class="dropdown-menu dropdown-menu-end" id="filters">
         <% filterable_fields.each do |field| %>
           <%
             field_options = case field.type
@@ -40,6 +37,7 @@
           <li>
             <a
               href="#"
+              class="dropdown-item"
               data-field-label="<%= field.label %>"
               data-field-name="<%= field.name %>"
               data-field-operator="<%= field.default_filter_operator %>"
@@ -47,7 +45,7 @@
               data-field-required="<%= field.required.to_s %>"
               data-field-type="<%= field.type %>"
               data-field-value=""
-              data-field-datetimepicker-format="<%= field.try(:momentjs_format) %>"
+              data-field-datetimepicker-options="<%= field.try(:datepicker_options).try(:to_json) %>"
             >
               <%= field.label %>
             </a>
@@ -56,6 +54,9 @@
       </ul>
     </li>
   <% end %>
+  <% if checkboxes %>
+    <%= bulk_menu %>
+  <% end %>
 <% end %>
 
 <style>
@@ -66,27 +67,29 @@
 </style>
 
 <div id="list">
-  <%= form_tag(index_path(params.except(*%w[page f query])), method: :get, class: "pjax-form form-inline") do %>
-    <div class="well">
-      <span data-options="<%= ordered_filter_options.to_json %>" id="filters_box"></span>
+  <%= form_tag(index_path(params.except(*%w[page f query])), method: :get) do %>
+    <div class="card mb-3 p-3 bg-light">
+      <div class="row" data-options="<%= ordered_filter_options.to_json %>" id="filters_box"></div>
       <hr class="filters_box" style="display:<%= ordered_filters.empty? ? 'none' : 'block' %>"/>
-      <div class="input-group">
-        <input class="form-control input-small" name="query" placeholder="<%= t("admin.misc.filter") %>" type="search" value="<%= query %>"></input>
-        <span class="input-group-btn">
-          <button class="btn btn-primary" data-disable-with="<%= '<i class="fas fa-sync"></i>' + t('admin.misc.refresh') %>" type="submit">
-            <i class="fas fa-sync"></i>
-            <%= t('admin.misc.refresh') %>
-          </button>
-          <button class="btn btn-info" id="remove_filter" title="<%= t('admin.misc.reset_filters') %>">
-            <i class="fas fa-times"></i>
-          </button>
-        </span>
+      <div class="row">
+        <div class="col-sm-6">
+          <div class="input-group">
+            <input class="form-control" name="query" placeholder="<%= t("admin.misc.filter") %>" type="search" value="<%= query %>" />
+            <button class="btn btn-primary" data-disable-with="<%= '<i class="fas fa-sync"></i>' + t('admin.misc.refresh') %>" type="submit">
+              <i class="fas fa-sync"></i>
+              <%= t('admin.misc.refresh') %>
+            </button>
+            <button class="btn btn-info" id="remove_filter" title="<%= t('admin.misc.reset_filters') %>">
+              <i class="fas fa-times"></i>
+            </button>
+          </div>
+        </div>
+        <div class="col-sm-6 text-end">
+          <% if export_action %>
+            <%= link_to wording_for(:link, export_action), export_path(params.except('page')), class: 'btn btn-info' %>
+          <% end %>
+        </div>
       </div>
-      <% if export_action %>
-        <span style="float:right">
-          <%= link_to wording_for(:link, export_action), export_path(params.except('page')), class: 'btn btn-info' %>
-        </span>
-      <% end %>
     </div>
   <% end %>
   <% unless @model_config.list.scopes.empty? %>
@@ -94,14 +97,14 @@
       <% @model_config.list.scopes.each_with_index do |scope, index| %>
         <% scope = '_all' if scope.nil? %>
         <li class="<%= 'active' if scope.to_s == params[:scope] || (params[:scope].blank? && index == 0) %>">
-          <a class="pjax" href="<%= index_path(params.merge(scope: scope, page: nil)) %>">
+          <a href="<%= index_path(params.merge(scope: scope, page: nil)) %>">
             <%= I18n.t("admin.scopes.#{@abstract_model.to_param}.#{scope}", default: I18n.t("admin.scopes.#{scope}", default: scope.to_s.titleize)) %>
           </a>
         </li>
       <% end %>
     </ul>
   <% end %>
-  <%= form_tag bulk_action_path(model_name: @abstract_model.to_param), method: :post, id: "bulk_form", class: ["form"] do %>
+  <%= form_tag bulk_action_path(model_name: @abstract_model.to_param), method: :post, id: "bulk_form", class: ["form", "mb-3"] do %>
     <%= hidden_field_tag :bulk_action %>
     <% if description.present? %>
       <p>
@@ -116,7 +119,7 @@
           <tr>
             <% if checkboxes %>
               <th class="shrink sticky">
-                <input class="toggle" type="checkbox"></input>
+                <input class="toggle" type="checkbox" />
               </th>
             <% end %>
             <% properties.each do |property| %>
@@ -125,7 +128,7 @@
                 <% sort_location = index_path params.except('sort_reverse').except('page').merge(sort: property.name).merge(selected && sort_reverse != "true" ? {sort_reverse: "true"} : {}) %>
                 <% sort_direction = (sort_reverse == 'true' ? "headerSortUp" : "headerSortDown" if selected) %>
               <% end %>
-              <th class="<%= [property.sortable && "header pjax", property.sortable && sort_direction, property.sticky? && 'sticky', property.css_class, property.type_css_class].compact.join(' ') %>" data-href="<%= property.sortable && sort_location %>" rel="tooltip" title="<%= property.hint %>">
+              <th class="<%= [property.sortable && "header", property.sortable && sort_direction, property.sticky? && 'sticky', property.css_class, property.type_css_class].select(&:present?).join(' ') %>" data-href="<%= property.sortable && sort_location %>" rel="tooltip" title="<%= property.hint %>">
                 <%= property.label %>
               </th>
             <% end %>
@@ -142,7 +145,7 @@
               <% 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].compact.join(' ') %>" title="<%= strip_tags(value.to_s) %>">
+                <td class="<%= [property.sticky? && 'sticky', property.css_class, property.type_css_class].select(&:present?).join(' ') %>" title="<%= strip_tags(value.to_s) %>">
                   <%= value %>
                 </td>
               <% end %>
@@ -166,19 +169,19 @@
     <% if @model_config.list.limited_pagination %>
       <div class="row">
         <div class="col-md-6">
-          <%= paginate(@objects, theme: 'ra-twitter-bootstrap/without_count', total_pages: Float::INFINITY, remote: true) %>
+          <%= paginate(@objects, theme: 'ra-twitter-bootstrap/without_count', total_pages: Float::INFINITY) %>
         </div>
       </div>
     <% elsif @objects.respond_to?(:total_count) %>
       <% total_count = @objects.total_count.to_i %>
       <div class="row">
         <div class="col-md-6">
-          <%= paginate(@objects, theme: 'ra-twitter-bootstrap', remote: true) %>
+          <%= paginate(@objects, theme: 'ra-twitter-bootstrap') %>
         </div>
       </div>
       <div class="row">
         <div class="col-md-6">
-          <%= link_to(t("admin.misc.show_all"), index_path(params.merge(all: true)), class: "show-all btn btn-default clearfix pjax") unless total_count > 100 || total_count <= @objects.to_a.size %>
+          <%= link_to(t("admin.misc.show_all"), index_path(params.merge(all: true)), class: "show-all btn btn-light clearfix") unless total_count > 100 || total_count <= @objects.to_a.size %>
         </div>
       </div>
       <div class="clearfix total-count">

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

@@ -1,3 +1,3 @@
-<%= rails_admin_form_for @object, url: new_path(model_name: @abstract_model.to_param), as: @abstract_model.param_key, html: { multipart: true, class: "form-horizontal denser", data: { title: @page_name } } do |form| %>
+<%= rails_admin_form_for @object, url: new_path(model_name: @abstract_model.to_param), as: @abstract_model.param_key, html: { multipart: true, class: "main", data: { title: @page_name } } do |form| %>
   <%= form.generate action: :create %>
 <% end %>

data/config/locales/rails_admin.en.yml

@@ -21,7 +21,6 @@ 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/generators/rails_admin/install_generator.rb

@@ -53,7 +53,6 @@ module RailsAdmin
       @scss_relative_dir = '../stylesheets/'
       template 'rails_admin.js.erb', 'app/javascript/packs/rails_admin.js'
       template 'rails_admin.scss', 'app/javascript/stylesheets/rails_admin.scss'
-      template 'environment.js', 'config/webpack/environment.js'
     end
 
     def configure_for_webpack

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

@@ -24,9 +24,6 @@ module.exports = {
     new webpack.optimize.LimitChunkCountPlugin({
       maxChunks: 1
     }),
-    new webpack.ProvidePlugin({
-      jQuery: "jquery"
-    }),
     new MiniCssExtractPlugin(),
   ]
 }

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

@@ -13,7 +13,7 @@ module RailsAdmin
                 end
 
                 def #{association.name}_id=(item_id)
-                  self.#{association.name} = #{association.klass}.find_by_id(item_id)
+                  self.#{association.name} = (#{association.klass}.find(item_id) rescue nil)
                 end
               RUBY
             end

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

@@ -42,7 +42,7 @@ module RailsAdmin
         end
 
         def read_only?
-          false
+          model.readonly_attributes.include? property.name.to_s
         end
 
       private

data/lib/rails_admin/adapters/active_record.rb

@@ -12,8 +12,8 @@ module RailsAdmin
         model.new(params).extend(ObjectExtension)
       end
 
-      def get(id)
-        return unless object = model.where(primary_key => id).first
+      def get(id, scope = scoped)
+        return unless object = scope.where(primary_key => id).first
 
         object.extend(ObjectExtension)
       end
@@ -80,7 +80,11 @@ module RailsAdmin
         when 'postgresql'
           ::ActiveRecord::Base.connection.select_one("SELECT ''::text AS str;").values.first.encoding
         when 'mysql2'
-          ::ActiveRecord::Base.connection.raw_connection.encoding
+          if RUBY_ENGINE == 'jruby'
+            ::ActiveRecord::Base.connection.select_one("SELECT '' AS str;").values.first.encoding
+          else
+            ::ActiveRecord::Base.connection.raw_connection.encoding
+          end
         when 'oracle_enhanced'
           ::ActiveRecord::Base.connection.select_one('SELECT dummy FROM DUAL').values.first.encoding
         else

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

@@ -11,11 +11,11 @@ module RailsAdmin
         end
 
         def name
-          property.name.to_sym
+          (property.options[:as] || property.name).to_sym
         end
 
         def pretty_name
-          property.name.to_s.tr('_', ' ').capitalize
+          (property.options[:as] || property.name).to_s.tr('_', ' ').capitalize
         end
 
         def type
@@ -64,7 +64,7 @@ module RailsAdmin
         end
 
         def read_only?
-          false
+          model.readonly_attributes.include? property.name.to_s
         end
 
       private

data/lib/rails_admin/adapters/mongoid.rb

@@ -18,8 +18,8 @@ module RailsAdmin
         model.new(params).extend(ObjectExtension)
       end
 
-      def get(id)
-        object = model.find(id)
+      def get(id, scope = scoped)
+        object = scope.find(id)
         return nil unless object
 
         object.extend(ObjectExtension)

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

@@ -49,7 +49,7 @@ module RailsAdmin
             (only.nil? || [only].flatten.collect(&:to_s).include?(bindings[:abstract_model].to_s)) &&
             ![except].flatten.collect(&:to_s).include?(bindings[:abstract_model].to_s) &&
             !bindings[:abstract_model].config.excluded?
-          )
+          ) && (!respond_to?(:writable?) || writable?)
         end
 
         register_instance_option :authorized? do
@@ -73,11 +73,6 @@ module RailsAdmin
           false
         end
 
-        # Render via pjax?
-        register_instance_option :pjax? do
-          link_target.blank?
-        end
-
         # Target window [_self, _blank]
         register_instance_option :link_target do
           nil

data/lib/rails_admin/config/actions/dashboard.rb

@@ -18,21 +18,21 @@ module RailsAdmin
 
         register_instance_option :controller do
           proc do
-            @history = @auditing_adapter&.latest(@action.auditing_versions_limit) || []
+            @history = @auditing_adapter&.latest(@action.auditing_versions_limit) if @action.history?
             if @action.statistics?
-              @abstract_models = RailsAdmin::Config.visible_models(controller: self).collect(&:abstract_model)
+              model_configs = RailsAdmin::Config.visible_models(controller: self)
 
+              @abstract_models = model_configs.map(&:abstract_model)
               @most_recent_created = {}
               @count = {}
               @max = 0
-              @abstract_models.each do |t|
-                scope = @authorization_adapter&.query(:index, t)
-                current_count = t.count({}, scope)
+              model_configs.each do |config|
+                scope = @authorization_adapter&.query(:index, config.abstract_model)
+                current_count = config.abstract_model.count({}, scope)
                 @max = current_count > @max ? current_count : @max
-                @count[t.model.name] = current_count
-                next unless t.properties.detect { |c| c.name == :created_at }
-
-                @most_recent_created[t.model.name] = t.model.last.try(:created_at)
+                name = config.abstract_model.model.name
+                @count[name] = current_count
+                @most_recent_created[name] = config.last_created_at
               end
             end
             render @action.template_name, status: @status_code || :ok
@@ -50,6 +50,10 @@ module RailsAdmin
         register_instance_option :statistics? do
           true
         end
+
+        register_instance_option :history? do
+          true
+        end
       end
     end
   end

data/lib/rails_admin/config/actions/delete.rb

@@ -46,6 +46,10 @@ module RailsAdmin
         register_instance_option :link_icon do
           'fas fa-times'
         end
+
+        register_instance_option :writable? do
+          !(bindings[:object] && bindings[:object].readonly?)
+        end
       end
     end
   end

data/lib/rails_admin/config/actions/edit.rb

@@ -44,6 +44,10 @@ module RailsAdmin
         register_instance_option :link_icon do
           'fas fa-pencil-alt'
         end
+
+        register_instance_option :writable? do
+          !(bindings[:object] && bindings[:object].readonly?)
+        end
       end
     end
   end

data/lib/rails_admin/config/actions/new.rb

@@ -17,6 +17,7 @@ module RailsAdmin
             if request.get? # NEW
 
               @object = @abstract_model.new
+              @action = @action.with(@action.bindings.merge(object: @object))
               @authorization_adapter&.attributes_for(:new, @abstract_model)&.each do |name, value|
                 @object.send("#{name}=", value)
               end
@@ -55,6 +56,10 @@ module RailsAdmin
         register_instance_option :link_icon do
           'fas fa-plus'
         end
+
+        register_instance_option :writable? do
+          !(bindings[:object] && bindings[:object].readonly?)
+        end
       end
     end
   end

data/lib/rails_admin/config/actions/show_in_app.rb

@@ -25,10 +25,6 @@ module RailsAdmin
         register_instance_option :link_icon do
           'fas fa-eye'
         end
-
-        register_instance_option :pjax? do
-          false
-        end
       end
     end
   end

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

@@ -21,7 +21,7 @@ module RailsAdmin
             am = amc.abstract_model
             wording = associated.send(amc.object_label_method)
             can_see = !am.embedded? && (show_action = v.action(:show, am, associated))
-            can_see ? v.link_to(wording, v.url_for(action: show_action.action_name, model_name: am.to_param, id: associated.id), class: 'pjax') : ERB::Util.html_escape(wording)
+            can_see ? v.link_to(wording, v.url_for(action: show_action.action_name, model_name: am.to_param, id: associated.id)) : ERB::Util.html_escape(wording)
           end.to_sentence.html_safe.presence || '-'
         end
 
@@ -89,6 +89,11 @@ module RailsAdmin
           association.primary_key
         end
 
+        # Returns params which are to be set in modals
+        def associated_prepopulate_params
+          {}
+        end
+
         # Reader whether this is a polymorphic association
         def polymorphic?
           association.polymorphic?

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

@@ -252,7 +252,7 @@ module RailsAdmin
         end
 
         def editable?
-          !(@properties && @properties.read_only?)
+          !((@properties && @properties.read_only?) || (bindings[:object] && bindings[:object].readonly?))
         end
 
         # Is this an association

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

@@ -269,9 +269,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
 

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
@@ -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')
 
@@ -54,6 +50,7 @@ module RailsAdmin
     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)