activeadmin 4.0.0.beta9 → 4.0.0.beta11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f3c2998aa1c2b5375196a1f9ee0284c699e72a7637f9feab724c46ba0701cee
-  data.tar.gz: 670befa4df9c7d9634320c2735254a420adf7062789ec47ca4bdaa46c8915328
+  metadata.gz: df061ca5e8da419454b4e71fac6d1f1a5c0d10ac2bb134a9ed42d1e939605189
+  data.tar.gz: 6bf6a2af2771226c400200da710d1b21d91e22415ca724df6f2417c30edd85dc
 SHA512:
-  metadata.gz: bc6cab08a78331723344a4307ac5259f30e090e69d6438433697fbf96d43df7a11ca5f5e88d19a3e0c7cf83f833a99d663e74df4f37122b8c1d71375c8c08bea
-  data.tar.gz: 927876e56533e12df325ab50e86058dce84cb47133924fc92559ce7329b376ef6d7f574ee35517ac4115f43cd49469a5ddc308716c51621fe726ff219895950f
+  metadata.gz: d75f067eb76806efc510ea3050a6c3b4394e2e731a01b6e6ba07169c3bdabd4620f338e6646e3558c99f830db2767cf4023492fb02294e9c78853dd4d114f7d0
+  data.tar.gz: 194fd87159da440d9d45b81a54edbd52051322f8dab8f09b95762c9883907c48da255a5b67f2af452e2ad8265a859f135f917385ca7431a888aaaf306747fffb

data/README.md

@@ -92,7 +92,7 @@ Thanks to [Open Collective][opencollective contributors] and all our Open Collec
 [tidelift_enterprise]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=enterprise
 [tidelift_support]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=github&utm_content=support
 
-[docs]: https://activeadmin.info/0-installation.html
+[docs]: https://activeadmin.info/
 [wiki]: https://github.com/activeadmin/activeadmin/wiki
 [stackoverflow]: https://stackoverflow.com/questions/tagged/activeadmin
 [contributing]: https://github.com/activeadmin/activeadmin/blob/master/CONTRIBUTING.md

data/UPGRADING.md

@@ -8,14 +8,14 @@ ActiveAdmin v4 uses TailwindCSS. It has **mobile web, dark mode and RTL support*
 
 These instructions assume the `cssbundling-rails` and `importmap-rails` gems are already installed and you have run their install commands in your app. If you haven't done so, please do before continuing.
 
-Update your `Gemfile` with `gem "activeadmin", "4.0.0.beta3"` and then run `gem install activeadmin --pre`.
+Update your `Gemfile` with `gem "activeadmin", "4.0.0.beta11"` and then run `gem install activeadmin --pre`.
 
 Now, run `rails generate active_admin:assets` to replace the old assets with the new files.
 
 Then add the npm package and update the `build:css` script.
 
 ```
-yarn add @activeadmin/activeadmin@4.0.0-beta3
+yarn add @activeadmin/activeadmin@4.0.0-beta11
 npm pkg set scripts.build:css="tailwindcss -i ./app/assets/stylesheets/active_admin.css -o ./app/assets/builds/active_admin.css --minify -c tailwind-active_admin.config.js"
 ```
 

data/app/controllers/active_admin/resource_controller/decorators.rb

@@ -61,7 +61,7 @@ module ActiveAdmin
         def self.wrap!(parent, name)
           ::Class.new parent do
             delegate :reorder, :page, :current_page, :total_pages, :limit_value,
-                     :total_count, :total_pages, :offset, :to_key, :group_values,
+                     :total_count, :offset, :to_key, :group_values,
                      :except, :find_each, :ransack, to: :object
 
             define_singleton_method(:name) { name }

data/app/helpers/active_admin/display_helper.rb

@@ -108,8 +108,8 @@ module ActiveAdmin
       when TrueClass, FalseClass
         true
       else
-        if resource.class.respond_to? :columns_hash
-          column = resource.class.columns_hash[attr.to_s] and column.type == :boolean
+        if resource.class.respond_to? :attribute_types
+          resource.class.attribute_types[attr.to_s].is_a?(ActiveModel::Type::Boolean)
         end
       end
     end

data/app/javascript/active_admin/features/batch_actions.js

@@ -14,7 +14,7 @@ const batchActionClick = function(event) {
     batchAction.value = this.dataset.action
   }
 
-  if (!event.target.dataset.confirm) { submitForm() }
+  if (!event.target.dataset.confirm && !event.target.dataset.modalTarget) { submitForm() }
 }
 
 const batchActionConfirmComplete = function(event) {

data/config/importmap.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 pin "flowbite", preload: true # downloaded from https://cdnjs.cloudflare.com/ajax/libs/flowbite/2.2.1/flowbite.min.js
-pin "@rails/ujs", to: "rails_ujs_esm.js", preload: true # downloaded from https://cdn.jsdelivr.net/npm/@rails/ujs@7.1.2/+esm
+pin "@rails/ujs", to: "rails_ujs_esm.js", preload: true # downloaded from https://cdn.jsdelivr.net/npm/@rails/ujs@7.1.400/+esm
 pin "active_admin", to: "active_admin.js", preload: true
 pin_all_from File.expand_path("../app/javascript/active_admin", __dir__), under: "active_admin", preload: true

data/lib/active_admin/async_count.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+module ActiveAdmin
+  class AsyncCount
+    class NotSupportedError < RuntimeError; end
+
+    def initialize(collection)
+      raise NotSupportedError, "#{collection.inspect} does not support :async_count" unless collection.respond_to?(:async_count)
+
+      @collection = collection.except(:select, :order)
+      @promise = @collection.async_count
+    end
+
+    def count
+      value = @promise.value
+      # value.value due to Rails bug https://github.com/rails/rails/issues/50776
+      value.respond_to?(:value) ? value.value : value
+    end
+
+    alias size count
+
+    delegate :except, :group_values, :length, :limit_value, to: :@collection
+  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.beta9"
+  VERSION = "4.0.0.beta11"
 end

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

@@ -131,12 +131,24 @@ 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\">#{ERB::Util.html_escape(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 = tag_attributes html_options
         @opening_tag = "<fieldset #{fieldset_attrs}>#{legend_tag}<ol>"
         @closing_tag = "</ol></fieldset>"
         super(*(args << html_options), &block)
       end
+
+      private
+
+      def tag_attributes(html_options)
+        if Rails::VERSION::MAJOR <= 6
+          # Reimplement tag.attributes to backport support for Rails 6.1.
+          # TODO: this can be removed when support for Rails 6.x is dropped
+          helpers.tag.tag_options(html_options.to_h).to_s.strip.html_safe
+        else
+          helpers.tag.attributes html_options
+        end
+      end
     end
 
     class SemanticActionsProxy < FormtasticProxy

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

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/scopes.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require "active_admin/async_count"
 require "active_admin/view_helpers/method_or_proc_helper"
 
 module ActiveAdmin
@@ -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]
         }
 

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

@@ -9,6 +9,7 @@ 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: "selector",

data/plugin.js

@@ -312,7 +312,7 @@ module.exports = plugin(
       '[type=radio]': {
         '@apply w-4 h-4 border-gray-300 focus:ring-2 focus:ring-blue-300 dark:focus:ring-blue-600 dark:focus:bg-blue-600 dark:bg-gray-700 dark:border-gray-600': {}
       },
-      [['[type=date]', '[type=email]', '[type=number]', '[type=password]', '[type=tel]', '[type=text]', '[type=time]', '[type=url]', 'select', 'textarea']]: {
+      [['[type=datetime-local]', '[type=month]', '[type=week]', '[type=search]', '[type=date]', '[type=email]', '[type=number]', '[type=password]', '[type=tel]', '[type=text]', '[type=time]', '[type=url]', 'select', 'textarea']]: {
         '@apply bg-gray-50 border border-gray-300 text-gray-900 rounded-md focus:ring-blue-500 focus:border-blue-500 w-full dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500': {}
       },
       'a': {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta9
+  version: 4.0.0.beta11
 platform: ruby
 authors:
 - Charles Maresh
@@ -15,7 +15,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-04 00:00:00.000000000 Z
+date: 2024-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -263,6 +263,7 @@ files:
 - lib/active_admin.rb
 - lib/active_admin/application.rb
 - lib/active_admin/application_settings.rb
+- lib/active_admin/async_count.rb
 - lib/active_admin/authorization_adapter.rb
 - lib/active_admin/batch_actions.rb
 - lib/active_admin/batch_actions/controller.rb
@@ -383,7 +384,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/activeadmin/activeadmin/issues
-  changelog_uri: https://github.com/activeadmin/activeadmin/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/activeadmin/activeadmin/releases
   documentation_uri: https://activeadmin.info
   homepage_uri: https://activeadmin.info
   mailing_list_uri: https://groups.google.com/group/activeadmin