activeadmin 4.0.0.beta8 → 4.0.0.beta10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a63b35e7f784fd50ba0471841cb52b10cf47f732c17e9a03b632303cedb922cf
-  data.tar.gz: 54a8a264547063ddf0b1178310a4c8a00444aaa32796e4fe9abd72c04b2406aa
+  metadata.gz: 17abe55cddeec6028454b71ee930e2a99e83c0660303a6b901488aba36a90cda
+  data.tar.gz: 4ba193f3c02f03b20609553eed9e1c3788390110e02cbae5fcbc924087d71785
 SHA512:
-  metadata.gz: 2f6a7cba813a4ce9af1f4192ab9dd96287b46044524927ab1c410875225f803ee970943658fe4942a59d6647791c61db30ab26479d87fa2db39fa92aeafb6258
-  data.tar.gz: fe2b8edf174e2bafcc5efcf21d7cbd2f5f8aa5449aa2f66a2963f537116d41554d30cde07014230dcdfb100bd71f66071d3e96bb8a6ff487656df713c17d2693
+  metadata.gz: 13f5d85ad6fb9add3eb08569f09605fbc2e8b695b5598d7d41cfe6eb62536c29f6b405a87bcf724c957d7c95e893d599a6a5dc47a8318a7f58f8d0ba8a50a677
+  data.tar.gz: 0e82b2549cac3763a82e7910107e82fb05f600312395c1bfa2c1519969419082c19dfb2ec8329adcda7fefa0734a21c17296540604f86c0e7ee0abc9774ccf20

data/README.md

@@ -75,8 +75,8 @@ Thanks to [Tidelift][tidelift] and all our Tidelift subscribers.
 Thanks to [Open Collective][opencollective contributors] and all our Open Collective contributors.
 
 [Arbre]: https://github.com/activeadmin/arbre
-[Devise]: https://github.com/plataformatec/devise
-[Formtastic]: https://github.com/justinfrench/formtastic
+[Devise]: https://github.com/heartcombo/devise
+[Formtastic]: https://github.com/formtastic/formtastic
 [Inherited Resources]: https://github.com/activeadmin/inherited_resources
 [Kaminari]: https://github.com/kaminari/kaminari
 [Ransack]: https://github.com/activerecord-hackery/ransack
@@ -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.beta10"` 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-beta10
 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"
 ```
 
@@ -224,3 +224,4 @@ This release includes several locale changes. Please [reivew the en.yml locale](
 - The `comments.title_content` text has been updated with an "All " prefix.
 - The `comments.delete_confirmation` text has been fixed to use singular form.
 - Inconsistent use of login/sign-in related terms so text now uses "Sign in", Sign out", and "Sign up" throughout.
+- The `toggle_dark_mode`, `toggle_main_navigation_menu`, `toggle_section`, and `toggle_user_menu` keys have been added.

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/app/views/active_admin/_main_navigation.html.erb

@@ -1,10 +1,10 @@
-<div id="main-menu" class="fixed top-0 xl:top-16 bottom-0 start-0 z-40 w-72 xl:w-60 p-4 overflow-y-auto transition-transform duration-200 -translate-x-full xl:translate-x-0 bg-white dark:bg-gray-950 xl:border-e xl:border-gray-200 xl:dark:border-white/10" tabindex="-1" aria-labelledby="drawer-navigation-label">
+<div id="main-menu" class="fixed top-0 xl:top-16 bottom-0 start-0 z-40 w-72 xl:w-60 p-4 overflow-y-auto transition-transform duration-200 -translate-x-full xl:translate-x-0 bg-white dark:bg-gray-950 xl:border-e xl:border-gray-200 xl:dark:border-white/10" tabindex="-1">
   <ul role="list" class="flex flex-1 flex-col space-y-1.5">
     <% current_menu.items(self).each do |item| %>
       <% children = item.items(self).presence %>
       <li <%= current_menu_item?(item) && "data-open" %> class="group" data-item-id="<%= item.id %>">
         <% if children %>
-          <button data-menu-button class="text-gray-600 hover:text-gray-900 dark:text-gray-400 dark:hover:text-white flex items-center w-full rounded-md p-2 gap-x-2 text-sm">
+          <button data-menu-button class="text-gray-600 hover:text-gray-900 dark:text-gray-400 dark:hover:text-white flex items-center w-full rounded-md p-2 gap-x-2 text-sm" aria-label="<%= t('active_admin.toggle_section') %>">
             <%= item.label(self) %>
             <svg class="group-data-[open]:rotate-90 group-data-[open]:rtl:-rotate-90 ms-auto h-5 w-5 shrink-0 rtl:-scale-x-100" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
               <path fill-rule="evenodd" d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd" />

data/app/views/active_admin/_site_header.html.erb

@@ -1,5 +1,5 @@
 <div class="border-b border-gray-200 dark:border-white/10 dark:bg-gray-950/75 px-4 py-2 flex items-center sticky top-0 z-20 h-16 w-full backdrop-blur-md">
-  <button class="xl:hidden pe-3 inline-flex items-center w-8 h-8 justify-center text-sm text-gray-500 dark:text-gray-400 focus-visible:outline-none focus-visible:ring-ring focus-visible:bg-transparent focus-visible:ring-0 focus-visible:ring-offset-0" data-drawer-target="main-menu" data-drawer-show="main-menu" aria-controls="drawer-navigation">
+  <button class="xl:hidden pe-3 inline-flex items-center w-8 h-8 justify-center text-sm text-gray-500 dark:text-gray-400 focus-visible:outline-none focus-visible:ring-ring focus-visible:bg-transparent focus-visible:ring-0 focus-visible:ring-offset-0" data-drawer-target="main-menu" data-drawer-show="main-menu" aria-controls="main-menu" aria-label="<%= t('active_admin.toggle_main_navigation_menu') %>">
     <svg class="w-5 h-5 text-gray-800 dark:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 17 14"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 1h15M1 7h15M1 13h15"/></svg>
   </button>
 
@@ -9,12 +9,12 @@
     </h1>
   </div>
 
-  <button type="button" class="dark-mode-toggle flex items-center w-9 h-9 justify-center me-1 text-gray-400 hover:text-gray-500 dark:text-gray-500 dark:hover:text-gray-400 focus:outline-none text-sm">
+  <button type="button" class="dark-mode-toggle flex items-center w-9 h-9 justify-center me-1 text-gray-400 hover:text-gray-500 dark:text-gray-500 dark:hover:text-gray-400 focus:outline-none text-sm" aria-label="<%= t('active_admin.toggle_dark_mode') %>">
     <svg class="hidden dark:block w-5 h-5 rtl:-scale-x-100" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 18 20"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8.509 5.75c0-1.493.394-2.96 1.144-4.25h-.081a8.5 8.5 0 1 0 7.356 12.746A8.5 8.5 0 0 1 8.509 5.75Z"/></svg>
     <svg class="dark:hidden w-5 h-5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 3V1m0 18v-2M5.05 5.05 3.636 3.636m12.728 12.728L14.95 14.95M3 10H1m18 0h-2M5.05 14.95l-1.414 1.414M16.364 3.636 14.95 5.05M14 10a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z"/></svg>
   </button>
 
-  <button id="user-menu-button" class="flex items-center w-9 h-9 justify-center text-sm text-gray-500 focus:outline-none dark:text-gray-200" data-dropdown-toggle="user-menu" data-dropdown-offset-distance="3" data-dropdown-placement="bottom-end">
+  <button id="user-menu-button" class="flex items-center w-9 h-9 justify-center text-sm text-gray-500 focus:outline-none dark:text-gray-200" data-dropdown-toggle="user-menu" data-dropdown-offset-distance="3" data-dropdown-placement="bottom-end" aria-label="<%= t('active_admin.toggle_user_menu') %>">
     <svg class="w-7 h-7" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20"><path d="M10 0a10 10 0 1 0 10 10A10.011 10.011 0 0 0 10 0Zm0 5a3 3 0 1 1 0 6 3 3 0 0 1 0-6Zm0 13a8.949 8.949 0 0 1-4.951-1.488A3.987 3.987 0 0 1 9 13h2a3.987 3.987 0 0 1 3.951 3.512A8.949 8.949 0 0 1 10 18Z"/></svg>
   </button>
 

data/config/locales/en.yml

@@ -52,6 +52,10 @@ en:
       "yes": "Yes"
       "no": "No"
       "unset": "Unknown"
+    toggle_dark_mode: Toggle dark mode
+    toggle_main_navigation_menu: Toggle main navigation menu
+    toggle_section: Toggle section
+    toggle_user_menu: Toggle user menu
     logout: "Sign out"
     powered_by: "Powered by %{active_admin} %{version}"
     sidebars:

data/config/locales/it.yml

@@ -52,6 +52,10 @@ it:
       "yes": "Sì"
       "no": "No"
       "unset": "Vuoto"
+    toggle_dark_mode: Attiva/Disattiva tema scuro
+    toggle_main_navigation_menu: Espandi/Riduci menu di navigazione principale
+    toggle_section: Espandi/Riduci sezione
+    toggle_user_menu: Espandi/Riduci menu utente
     logout: "Esci"
     powered_by: "Powered by %{active_admin} %{version}"
     sidebars:

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

@@ -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?

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/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.beta8"
+  VERSION = "4.0.0.beta10"
 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/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",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta8
+  version: 4.0.0.beta10
 platform: ruby
 authors:
 - Charles Maresh
@@ -15,7 +15,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-27 00:00:00.000000000 Z
+date: 2024-08-24 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