activeadmin 4.0.0.beta2 → 4.0.0.beta22

data/lib/active_admin/orm/active_record/comments/views.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
-require "active_admin/views"
-require "active_admin/orm/active_record/comments/views/active_admin_comments"
+require_relative "../../../views"
+require_relative "views/active_admin_comments"

data/lib/active_admin/orm/active_record/comments.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
-require "active_admin/orm/active_record/comments/views"
-require "active_admin/orm/active_record/comments/namespace_helper"
-require "active_admin/orm/active_record/comments/resource_helper"
+require_relative "comments/views"
+require_relative "comments/namespace_helper"
+require_relative "comments/resource_helper"
 
 # Add the comments configuration
 ActiveAdmin::Application.inheritable_setting :comments, true
@@ -93,13 +93,13 @@ ActiveAdmin.after_load do |app|
 
       index do
         column I18n.t("active_admin.comments.resource_type"), :resource_type
-        column I18n.t("active_admin.comments.resource"), :resource, class: "min-w-[7rem]"
+        column I18n.t("active_admin.comments.resource"), :resource, class: "min-w-28"
         column I18n.t("active_admin.comments.author_type"), :author_type
         column I18n.t("active_admin.comments.author"), :author
-        column I18n.t("active_admin.comments.body"), :body, class: "min-w-[16rem]" do |comment|
-          truncate(comment.body, length: 60, separator: " ")
+        column I18n.t("active_admin.comments.body"), :body, class: "min-w-52" do |comment|
+          truncate(comment.body, length: 50, separator: " ")
         end
-        column I18n.t("active_admin.comments.created_at"), :created_at, class: "min-w-[13rem]"
+        column I18n.t("active_admin.comments.created_at"), :created_at, class: "min-w-52"
         actions
       end
     end

data/lib/active_admin/orm/active_record.rb

@@ -3,4 +3,4 @@
 
 ActiveAdmin::DatabaseHitDuringLoad.database_error_classes << ActiveRecord::StatementInvalid
 
-require "active_admin/orm/active_record/comments"
+require_relative "active_record/comments"

data/lib/active_admin/pundit_adapter.rb

@@ -19,11 +19,11 @@ module ActiveAdmin
     end
 
     def scope_collection(collection, action = Auth::READ)
-      # scoping is appliable only to read/index action
+      # scoping is applicable only to read/index action
       # which means there is no way how to scope other actions
       Pundit.policy_scope!(user, namespace(collection))
     rescue Pundit::NotDefinedError => e
-      if default_policy_class && default_policy_class.const_defined?(:Scope)
+      if default_policy_class&.const_defined?(:Scope)
         default_policy_class::Scope.new(user, collection).resolve
       else
         raise e
@@ -42,7 +42,7 @@ module ActiveAdmin
     end
 
     def format_action(action, subject)
-      # https://github.com/varvet/pundit/blob/master/lib/generators/pundit/install/templates/application_policy.rb
+      # https://github.com/varvet/pundit/blob/main/lib/generators/pundit/install/templates/application_policy.rb
       case action
       when Auth::READ then subject.is_a?(Class) ? :index? : :show?
       when Auth::DESTROY then subject.is_a?(Class) ? :destroy_all? : :destroy?
@@ -95,7 +95,7 @@ module ActiveAdmin
     end
 
     def default_policy_class
-      ActiveAdmin.application.pundit_default_policy && ActiveAdmin.application.pundit_default_policy.constantize
+      ActiveAdmin.application.pundit_default_policy&.constantize
     end
 
     def default_policy(subject)

data/lib/active_admin/resource/action_items.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/helpers/optional_display"
+require_relative "../helpers/optional_display"
 
 module ActiveAdmin
 
@@ -59,7 +59,7 @@ module ActiveAdmin
       def add_default_action_items
         add_default_new_action_item
         add_default_edit_action_item
-        add_default_show_action_item
+        add_default_destroy_action_item
       end
 
       # Adds the default New link on index
@@ -79,7 +79,7 @@ module ActiveAdmin
       end
 
       # Adds the default Destroy link on show
-      def add_default_show_action_item
+      def add_default_destroy_action_item
         add_action_item :destroy, only: :show, if: -> { destroy_action_authorized?(resource) } do
           localizer = ActiveAdmin::Localizers.resource(active_admin_config)
           link_to(

data/lib/active_admin/resource/attributes.rb

@@ -37,7 +37,14 @@ module ActiveAdmin
       end
 
       def counter_cache_col?(c)
-        c.name.end_with?("_count")
+        # This helper is called inside a loop. Let's memoize the result.
+        @counter_cache_columns ||= begin
+          resource_class.reflect_on_all_associations(:has_many)
+                        .select(&:has_cached_counter?)
+                        .map(&:counter_cache_column)
+        end
+
+        @counter_cache_columns.include?(c.name)
       end
 
       def filtered_col?(c)

data/lib/active_admin/resource/belongs_to.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require "active_admin/resource"
 
 module ActiveAdmin
   class Resource

data/lib/active_admin/resource/naming.rb

@@ -5,7 +5,7 @@ module ActiveAdmin
     module Naming
       def resource_name
         @resource_name ||= begin
-          as = @options[:as].gsub /\s/, "" if @options[:as]
+          as = @options[:as].gsub(/\s/, "") if @options[:as]
 
           if as || !resource_class.respond_to?(:model_name)
             Name.new resource_class, as

data/lib/active_admin/resource/page_presenters.rb

@@ -51,7 +51,7 @@ module ActiveAdmin
       # Stores a config for all index actions supplied
       #
       # @param [Symbol] index_as The index type to store in the configuration
-      # @param [PagePresenter] page_presenter The intance of PagePresenter to store
+      # @param [PagePresenter] page_presenter The instance of PagePresenter to store
       def set_index_presenter(index_as, page_presenter)
         page_presenters[:index] ||= {}
 
@@ -64,7 +64,7 @@ module ActiveAdmin
         page_presenters[:index][index_as] = page_presenter
       end
 
-      # Returns the actual class for renderering the main content on the index
+      # Returns the actual class for rendering the main content on the index
       # page. To set this, use the :as option in the page_presenter block.
       #
       # @param [Symbol, Class] symbol_or_class The component symbol or class

data/lib/active_admin/resource/sidebars.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/helpers/optional_display"
+require_relative "../helpers/optional_display"
 
 module ActiveAdmin
 

data/lib/active_admin/resource.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
-require "active_admin/view_helpers/method_or_proc_helper"
-require "active_admin/resource/action_items"
-require "active_admin/resource/attributes"
-require "active_admin/resource/controllers"
-require "active_admin/resource/menu"
-require "active_admin/resource/page_presenters"
-require "active_admin/resource/pagination"
-require "active_admin/resource/routes"
-require "active_admin/resource/naming"
-require "active_admin/resource/scopes"
-require "active_admin/resource/includes"
-require "active_admin/resource/scope_to"
-require "active_admin/resource/sidebars"
-require "active_admin/resource/belongs_to"
-require "active_admin/resource/ordering"
-require "active_admin/resource/model"
+require_relative "view_helpers/method_or_proc_helper"
+require_relative "resource/action_items"
+require_relative "resource/attributes"
+require_relative "resource/controllers"
+require_relative "resource/menu"
+require_relative "resource/page_presenters"
+require_relative "resource/pagination"
+require_relative "resource/routes"
+require_relative "resource/naming"
+require_relative "resource/scopes"
+require_relative "resource/includes"
+require_relative "resource/scope_to"
+require_relative "resource/sidebars"
+require_relative "resource/belongs_to"
+require_relative "resource/ordering"
+require_relative "resource/model"
 
 module ActiveAdmin
 
@@ -71,7 +71,7 @@ module ActiveAdmin
     module Base
       def initialize(namespace, resource_class, options = {})
         @namespace = namespace
-        @resource_class_name = "::#{resource_class.name}"
+        @resource_class_name = resource_class.respond_to?(:name) ? "::#{resource_class.name}" : resource_class.to_s
         @options = options
         @sort_order = options[:sort_order]
         @member_actions = []
@@ -120,7 +120,9 @@ module ActiveAdmin
     end
 
     def resource_quoted_column_name(column)
-      resource_class.connection.quote_column_name(column)
+      resource_class.with_connection do |connection|
+        connection.quote_column_name(column)
+      end
     end
 
     # Clears all the member actions this resource knows about
@@ -177,7 +179,7 @@ module ActiveAdmin
     end
 
     def find_resource(id)
-      resource = resource_class.public_send *method_for_find(id)
+      resource = resource_class.public_send(*method_for_find(id))
       (decorator_class && resource) ? decorator_class.new(resource) : resource
     end
 

data/lib/active_admin/resource_collection.rb

@@ -22,7 +22,7 @@ module ActiveAdmin
 
     # Changes `each` to pass in the value, instead of both the key and value.
     def each(&block)
-      values.each &block
+      values.each(&block)
     end
 
     def [](obj)

data/lib/active_admin/resource_dsl.rb

@@ -40,7 +40,7 @@ module ActiveAdmin
 
     # Store relations that should be included
     def includes(*args)
-      config.includes.push *args
+      config.includes.push(*args)
     end
 
     #
@@ -193,7 +193,7 @@ module ActiveAdmin
 
     standard_rails_filters =
       AbstractController::Callbacks::ClassMethods.public_instance_methods.select { |m| m.end_with?('_action') }
-    delegate *standard_rails_filters, to: :controller
+    delegate(*standard_rails_filters, to: :controller)
 
     # Specify which actions to create in the controller
     #

data/lib/active_admin/router.rb

@@ -21,7 +21,7 @@ module ActiveAdmin
         if namespace.root?
           router.root namespace.root_to_options.merge(to: namespace.root_to)
         else
-          router.namespace namespace.name, namespace.route_options.dup do
+          router.namespace namespace.name, **namespace.route_options.dup do
             router.root namespace.root_to_options.merge(to: namespace.root_to, as: :root)
           end
         end
@@ -65,7 +65,7 @@ module ActiveAdmin
 
     def page_routes(config)
       page = config.underscored_resource_name
-      router.get "/#{page}" => "#{page}#index"
+      router.get "/#{page}", to: "#{page}#index"
       config.page_actions.each do |action|
         Array.wrap(action.http_verb).each do |verb|
           build_route(verb, "/#{page}/#{action.name}" => "#{page}##{action.name}")
@@ -91,8 +91,8 @@ module ActiveAdmin
       build_route(action.http_verb, action.name)
     end
 
-    def build_route(verbs, *args)
-      Array.wrap(verbs).each { |verb| router.send(verb, *args) }
+    def build_route(verbs, ...)
+      Array.wrap(verbs).each { |verb| router.send(verb, ...) }
     end
 
     def define_belongs_to_routes(config)
@@ -107,7 +107,7 @@ module ActiveAdmin
     end
 
     def define_namespace(config)
-      router.namespace config.namespace.name, config.namespace.route_options.dup do
+      router.namespace config.namespace.name, **config.namespace.route_options.dup do
         define_routes(config)
       end
     end

data/lib/active_admin/scope.rb

@@ -14,6 +14,12 @@ module ActiveAdmin
     #   Scope.new('Published', :public)
     #   # => Scope with name 'Published' and scope method :public
     #
+    #   Scope.new(:published, show_count: :async)
+    #   # => Scope with name 'Published' that queries its count asynchronously
+    #
+    #   Scope.new(:published, show_count: false)
+    #   # => Scope with name 'Published' that does not display a count
+    #
     #   Scope.new 'Published', :public, if: proc { current_admin_user.can? :manage, resource_class } do |articles|
     #     articles.where published: true
     #   end
@@ -61,5 +67,9 @@ module ActiveAdmin
       end
     end
 
+    def async_count?
+      @show_count == :async
+    end
+
   end
 end

data/lib/active_admin/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ActiveAdmin
-  VERSION = "4.0.0.beta2"
+  VERSION = "4.0.0.beta22"
 end

data/lib/active_admin/view_helpers/method_or_proc_helper.rb

@@ -91,7 +91,7 @@ module MethodOrProcHelper
     context = self if context.nil? # default to `self` only when nil
     case obj
     when Proc
-      context.instance_exec *args, &obj
+      context.instance_exec(*args, &obj)
     when Symbol
       context.public_send obj, *args
     else

data/lib/active_admin/views/components/active_admin_form.rb

@@ -131,8 +131,8 @@ module ActiveAdmin
         html_options[:class] ||= "inputs"
         legend = args.shift if args.first.is_a?(::String)
         legend = html_options.delete(:name) if html_options.key?(:name)
-        legend_tag = legend ? "<legend class=\"fieldset-title\">#{legend}</legend>" : ""
-        fieldset_attrs = html_options.map { |k, v| %Q{#{k}="#{v}"} }.join(" ")
+        legend_tag = legend ? helpers.tag.legend(legend, class: "fieldset-title") : ""
+        fieldset_attrs = helpers.tag.attributes html_options
         @opening_tag = "<fieldset #{fieldset_attrs}>#{legend_tag}<ol>"
         @closing_tag = "</ol></fieldset>"
         super(*(args << html_options), &block)

data/lib/active_admin/views/components/attributes_table.rb

@@ -23,6 +23,7 @@ module ActiveAdmin
 
       def row(*args, &block)
         title = args[0]
+        data = args[1] || args[0]
         options = args.extract_options!
         options["data-row"] = title.to_s.parameterize(separator: "_") if title.present?
 
@@ -32,7 +33,7 @@ module ActiveAdmin
           end
           @collection.each do |record|
             td do
-              content_for(record, block || title)
+              content_for(record, block || data)
             end
           end
         end
@@ -60,10 +61,15 @@ module ActiveAdmin
       end
 
       def header_content_for(attr)
-        if @resource_class.respond_to?(:human_attribute_name)
-          @resource_class.human_attribute_name(attr, default: attr.to_s.titleize)
+        if attr.is_a?(Symbol)
+          default = attr.to_s.titleize
+          if @resource_class.respond_to?(:human_attribute_name)
+            @resource_class.human_attribute_name(attr, default: default)
+          else
+            default
+          end
         else
-          attr.to_s.titleize
+          attr.to_s
         end
       end
 

data/lib/active_admin/views/components/paginated_collection.rb

@@ -102,7 +102,10 @@ module ActiveAdmin
           # you pass in the :total_pages option. We issue a query to determine
           # if there is another page or not, but the limit/offset make this
           # query fast.
-          offset = @collection.offset(@collection.current_page * @collection.limit_value).limit(1).count
+          offset_scope = @collection.offset(@collection.current_page * @collection.limit_value)
+          # Support array collections. Kaminari::PaginatableArray does not respond to except
+          offset_scope = offset_scope.except(:select, :order) if offset_scope.respond_to?(:except)
+          offset = offset_scope.limit(1).count
           options[:total_pages] = @collection.current_page + offset
           options[:right] = 0
         end

data/lib/active_admin/views/components/panel.rb

@@ -22,7 +22,7 @@ module ActiveAdmin
 
       # Override children? to only report children when the panel's
       # contents have been added to. This ensures that the panel
-      # correcly appends string values, etc.
+      # correctly appends string values, etc.
       def children?
         @contents.children?
       end

data/lib/active_admin/views/components/scopes.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
-require "active_admin/view_helpers/method_or_proc_helper"
+require_relative "../../async_count"
+require_relative "../../view_helpers/method_or_proc_helper"
 
 module ActiveAdmin
   module Views
     # Renders a collection of ActiveAdmin::Scope objects as a
-    # simple list with a seperator
+    # simple list with a separator
     class Scopes < ActiveAdmin::Component
       include ActiveAdmin::ScopeChain
 
@@ -15,10 +16,12 @@ module ActiveAdmin
       def build(scopes, options = {})
         super({ role: "toolbar" })
         add_class "scopes"
+        prepare_async_counts(scopes, options)
+
         scopes.group_by(&:group).each do |group, group_scopes|
           div class: "index-button-group", role: "group", data: { "group": group_name(group) } do
             group_scopes.each do |scope|
-              build_scope(scope, options) if call_method_or_exec_proc(scope.display_if_block)
+              build_scope(scope, options) if display_scope?(scope)
             end
 
             nil
@@ -55,12 +58,31 @@ module ActiveAdmin
 
       # Return the count for the scope passed in.
       def get_scope_count(scope)
-        collection_size(scope_chain(scope, collection_before_scope))
+        chained = @async_counts[scope] || scope_chain(scope, collection_before_scope)
+
+        collection_size(chained)
       end
 
       def group_name(group)
         group.present? ? group : "default"
       end
+
+      private
+
+      def display_scope?(scope)
+        call_method_or_exec_proc(scope.display_if_block)
+      end
+
+      def prepare_async_counts(scopes, options)
+        @async_counts = if options[:scope_count]
+                          scopes
+                            .select(&:async_count?)
+                            .select { |scope| display_scope?(scope) }
+                            .index_with { |scope| AsyncCount.new(scope_chain(scope, collection_before_scope)) }
+                        else
+                          {}
+                        end
+      end
     end
   end
 end

data/lib/active_admin/views/components/table_for.rb

@@ -16,6 +16,9 @@ module ActiveAdmin
         @resource_class ||= @collection.klass if @collection.respond_to? :klass
 
         @columns = []
+        @tbody_html = options.delete(:tbody_html)
+        @row_html = options.delete(:row_html)
+        # To be deprecated, please use row_html instead.
         @row_class = options.delete(:row_class)
 
         build_table
@@ -91,10 +94,12 @@ module ActiveAdmin
       end
 
       def build_table_body
-        @tbody = tbody do
+        @tbody = tbody(**(@tbody_html || {})) do
           # Build enough rows for our collection
           @collection.each do |elem|
-            tr(id: dom_id_for(elem), class: @row_class&.call(elem))
+            html_options = @row_html&.call(elem) || {}
+            html_options.reverse_merge!(class: @row_class&.call(elem))
+            tr(id: dom_id_for(elem), **html_options)
           end
         end
       end

data/lib/active_admin/views/index_as_table.rb

@@ -196,17 +196,25 @@ module ActiveAdmin
     # end
     # ```
     #
-    # ## Custom row class
+    # ## Custom tbody HTML attributes
     #
-    # In order to add special class to table rows pass the proc object as a `:row_class` option
-    # of the `index` method.
+    # In order to add HTML attributes to the tbody use the `:tbody_html` option.
     #
     # ```ruby
-    # index row_class: ->elem { 'active' if elem.active? } do
+    # index tbody_html: { class: "my-class", data: { controller: 'stimulus-controller' } } do
     #   # columns
     # end
     # ```
     #
+    # ## Custom row HTML attributes
+    #
+    # In order to add HTML attributes to table rows, use a proc object in the `:row_html` option.
+    #
+    # ```ruby
+    # index row_html: ->elem { { class: ('active' if elem.active?), data: { 'element-id' => elem.id } } } do
+    #   # columns
+    # end
+    # ```
     class IndexAsTable < ActiveAdmin::Component
       def build(page_presenter, collection)
         add_class "index-as-table"
@@ -215,6 +223,9 @@ module ActiveAdmin
           sortable: true,
           i18n: active_admin_config.resource_class,
           paginator: page_presenter[:paginator] != false,
+          tbody_html: page_presenter[:tbody_html],
+          row_html: page_presenter[:row_html],
+          # To be deprecated, please use row_html instead.
           row_class: page_presenter[:row_class]
         }
 
@@ -245,9 +256,14 @@ module ActiveAdmin
         end
 
         # Display a column for the id
-        def id_column
+        def id_column(*args)
           raise "#{resource_class.name} has no primary_key!" unless resource_class.primary_key
-          column(resource_class.human_attribute_name(resource_class.primary_key), sortable: resource_class.primary_key) do |resource|
+
+          options = args.extract_options!
+          title = args[0].presence || resource_class.human_attribute_name(resource_class.primary_key)
+          sortable = options.fetch(:sortable, resource_class.primary_key)
+
+          column(title, sortable: sortable) do |resource|
             if controller.action_methods.include?("show")
               link_to resource.id, resource_path(resource)
             elsif controller.action_methods.include?("edit")

data/lib/active_admin.rb

@@ -9,6 +9,12 @@ require "formtastic_i18n"
 require "inherited_resources"
 require "arbre"
 
+begin
+  require "importmap-rails"
+rescue LoadError
+  # importmap-rails is optional
+end
+
 module ActiveAdmin
 
   autoload :VERSION, "active_admin/version"
@@ -57,7 +63,6 @@ module ActiveAdmin
     end
 
     def importmap
-      require "importmap-rails"
       @importmap ||= Importmap::Map.new
     end
 
@@ -120,12 +125,12 @@ module ActiveAdmin
 end
 
 # Require things that don't support autoload
-require "active_admin/engine"
-require "active_admin/error"
+require_relative "active_admin/engine"
+require_relative "active_admin/error"
 
 # Require internal plugins
-require "active_admin/batch_actions"
-require "active_admin/filters"
+require_relative "active_admin/batch_actions"
+require_relative "active_admin/filters"
 
 # Require ORM-specific plugins
-require "active_admin/orm/active_record" if defined? ActiveRecord
+require_relative "active_admin/orm/active_record" if defined? ActiveRecord

data/lib/activeadmin.rb

@@ -1,2 +1,2 @@
 # frozen_string_literal: true
-require "active_admin"
+require_relative "active_admin"

data/lib/generators/active_admin/assets/templates/active_admin.css

@@ -1,3 +1,3 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import "tailwindcss";
+
+@config "../../../tailwind-active_admin.config.js";

data/lib/generators/active_admin/assets/templates/tailwind.config.js

@@ -1,7 +1,10 @@
-const execSync = require('child_process').execSync;
-const activeAdminPath = execSync('bundle show activeadmin', { encoding: 'utf-8' }).trim();
+import { execSync } from 'child_process';
+import activeAdminPlugin from '@activeadmin/activeadmin/plugin';
 
-module.exports = {
+// Always use the last line of output since Bundler's DEBUG env will print additional lines.
+const activeAdminPath = execSync('bundle show activeadmin', { encoding: 'utf-8' }).trim().split(/\r?\n/).pop();
+
+export default {
   content: [
     `${activeAdminPath}/vendor/javascript/flowbite.js`,
     `${activeAdminPath}/plugin.js`,
@@ -9,10 +12,11 @@ module.exports = {
     './app/admin/**/*.{arb,erb,html,rb}',
     './app/views/active_admin/**/*.{arb,erb,html,rb}',
     './app/views/admin/**/*.{arb,erb,html,rb}',
+    './app/views/layouts/active_admin*.{erb,html}',
     './app/javascript/**/*.js'
   ],
-  darkMode: "class",
+  darkMode: "selector",
   plugins: [
-    require(`@activeadmin/activeadmin/plugin`)
+    activeAdminPlugin
   ]
 }

data/lib/generators/active_admin/devise/devise_generator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-require "active_admin/error"
-require "active_admin/dependency"
+require_relative "../../../active_admin/error"
+require_relative "../../../active_admin/dependency"
 
 module ActiveAdmin
   module Generators

data/lib/generators/active_admin/install/templates/active_admin.rb.erb

@@ -203,7 +203,7 @@ ActiveAdmin.setup do |config|
   #
   #   config.namespace :admin do |admin|
   #     admin.build_menu :default do |menu|
-  #       menu.add label: "My Great Website", url: "https://mygreatwebsite.example.com", html_options: { target: :blank }
+  #       menu.add label: "My Great Website", url: "https://mygreatwebsite.example.com", html_options: { target: "_blank" }
   #     end
   #   end