activeadmin 4.0.0.beta2 → 4.0.0.beta22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b52dc94714f4ab0451a27a11870164d4d9423326ef9c4b9eab899555c0cb2ece
-  data.tar.gz: 5896f35ef16279d25de84bdd5ca94953c95119ea94eab47478cf966921f24c08
+  metadata.gz: '098aea41cb4fc6e731f7456f30043abe69d34fd641f007c1c377b874e9af4bb6'
+  data.tar.gz: 0bcd00148dd0e08f1c4b64aef23739cacc18e86961bc619a0e24a289db70a371
 SHA512:
-  metadata.gz: cd49148d1d8cd9ea69574847938e2d5e4cc025c10b1585dde009388fb481cd4bd3528f425e035d920dac4f7c6e02beec28dc66eb64a515b8619e1b29b1242000
-  data.tar.gz: 88e26278700d4f906f44bbb601e1048c6f85b4eed501507238cee43a4b51aadc4a83868782767c6f4269b2cf664e81db89059130fd748c478b1ecff25bf494e8
+  metadata.gz: d19914f5a74cf0132c526b7acd6f470f1f4638f6a36ce9cee2011fb5af4ce648113bd8fe7a4e7d74c26a7fcd78abf099347d11d8ad382cab3b7c614ccad7a911
+  data.tar.gz: 525b975b7ea335ccb076d51733d7021bbb85d0be4fd5ec206c76d5d67e619b6f09c45941a92777ccaf1d2142a91e28a73f88aa25d4a06670e77d5fb0a2d6a9f5

data/CHANGELOG.md

@@ -1,6 +1,22 @@
 # Changelog
 
-## Unreleased
+[Future changelogs have moved to GitHub Releases](https://github.com/activeadmin/activeadmin/releases)
+
+## 3.2.0 [☰](https://github.com/activeadmin/activeadmin/compare/v3.1.0..v3.2.0)
+
+### Security Fixes
+
+* Backport protect against CSV Injection. [#8167] by [@mgrunberg]
+
+### Enhancements
+
+* Backport support citext column type in string filter. [#8165] by [@mgrunberg]
+* Backport provide detail in DB statement timeout error for filters. [#8163] by [@mgrunberg]
+
+### Bug Fixes
+
+* Backport make sure menu creation does not modify menu options. [#8166] by [@mgrunberg]
+* Backport ransack error with filters when ActiveStorage is used. [#8164] by [@mgrunberg]
 
 ## 3.1.0 [☰](https://github.com/activeadmin/activeadmin/compare/v3.0.0..v3.1.0)
 
@@ -435,7 +451,7 @@ _No changes_.
 * Fixed `if:` scope option when a lambda is passed. [#5501] by [@deivid-rodriguez]
 * Comment validation adding redundant errors when resource is missing. [#5517] by [@deivid-rodriguez]
 * Fixed resource filtering by association when the resource has custom primary key. [#5446] by [@wasifhossain]
-* Fixed "create anoter" checkbox styling. [#5324] by [@faucct]
+* Fixed "create another" checkbox styling. [#5324] by [@faucct]
 
 ## 1.3.1 [☰](https://github.com/activeadmin/activeadmin/compare/v1.3.0..v1.3.1)
 

data/CONTRIBUTING.md

@@ -27,8 +27,8 @@ Now install the development dependencies:
 
 ```sh
 gem install foreman
-bundle install
-bin/yarn install
+bundle install --all
+yarn install
 ```
 
 Now you should be able to run the entire suite using:
@@ -84,6 +84,10 @@ At this point, if your changes look good and tests are passing, you are ready to
 Github Actions will run our test suite against all supported Rails versions. It's possible that your changes pass tests in one Rails version but fail in another. In that case, you'll have to setup your development
 environment with the Gemfile for the problematic Rails version, and investigate what's going on.
 
+## Commit messages
+
+Try your best to follow these [seven rules for a great commit message](https://cbea.ms/git-commit/#seven-rules).
+
 ## Merging a PR (maintainers only)
 
 A PR can only be merged into master by a maintainer if: CI is passing, approved by another maintainer and is up to date with the default branch. Any maintainer is allowed to merge a PR if all of these conditions ae met.
@@ -92,15 +96,11 @@ A PR can only be merged into master by a maintainer if: CI is passing, approved
 
 Maintainers need to do the following to push out a release:
 
-* Switch to the master branch and make sure it's up to date.
-* Make sure you have [chandler] properly configured. Chandler is used to
-  automatically submit github release notes from the changelog right after
-  pushing the gem to rubygems.
-* Update the version in the `lib/active_admin/version.rb` file.
-* Run `bin/bundle` to update all gemfiles.
-* Update the `package.json` version. [Prerelease format is 1.0.0-beta1](https://github.com/rails/rails/blob/0d0c30e534af7f80ec8b18eb946aaa613ca30444/tasks/release.rb#L26).
-* Review and merge the PR. The generated changelog in the PR should include all user visible changes you intend to ship.
-* Run `bin/rake release` from the target branch once the PR is merged.
-
-[chandler]: https://github.com/mattbrictson/chandler#2-configure-credentials
+* Create a feature branch from master and make sure it's up to date.
+* Run `bin/prep-release [version]` and commit the changes. Use Ruby version format. NPM is handled automatically.
+* Optional: To confirm the release contents, run `gem build` (extract contents) and `npm publish --dry-run`.
+* Review and merge the PR.
+* Run `bin/rake release` from the default branch once the PR is merged.
+* [Create a GitHub Release](https://github.com/activeadmin/activeadmin/releases/new) by selecting the tag and generating the release notes.
+
 [new issue]: https://github.com/activeadmin/activeadmin/issues/new

data/README.md

@@ -55,7 +55,7 @@ We try not to reinvent the wheel, so Active Admin is built with other open sourc
 * [Inherited Resources]
 * [Kaminari]
 * [Ransack]
-* [TailwindCSS](https://tailwindcss.com)
+* [Tailwind CSS](https://tailwindcss.com)
 
 ## Security contact information
 
@@ -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

@@ -0,0 +1,274 @@
+# Upgrading Guide
+
+## From v3 to v4 (beta)
+
+ActiveAdmin v4 uses Tailwind CSS v4. It has **mobile web, dark mode and RTL support** with a default theme that can be customized through partials and CSS. This release assumes `cssbundling-rails` and `importmap-rails` is installed and configured in the host app. Partials can be modified to include a different asset library, e.g. shakapacker.
+**IMPORTANT**: there is **no sortable functionality for has-many forms** in this release so if needed, **do not upgrade**. We are [open to community proposals](https://github.com/activeadmin/activeadmin/discussions/new?category=ideas). The add/remove functionality for has-many forms remains supported.
+
+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.beta22"` 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-beta22
+npm pkg set scripts.build:css="npx @tailwindcss/cli -i ./app/assets/stylesheets/active_admin.css -o ./app/assets/builds/active_admin.css --minify"
+```
+
+If you are already using Tailwind in your app, then update the `build:css` script to chain the above command to your existing one, e.g. `"npx @tailwindcss/cli ... && npx @tailwindcss/cli ..."`, so both stylesheets are generated.
+
+Many configs have been removed (meta tags, asset registration, utility nav, etc.) that can now be modified more naturally through partials.
+
+Open the `config/initializers/active_admin.rb` file and remove these deleted configs.
+
+```
+site_title_link
+site_title_image
+logout_link_method
+favicon
+meta_tags
+meta_tags_for_logged_out_pages
+register_stylesheet
+register_javascript
+head
+footer
+use_webpacker
+```
+
+Now, run `rails g active_admin:views` which will copy the partials to your app so you can customize if needed.
+
+Note that the templates can and will change across releases. There are additional partials that can be copied but they are considered private so you do so at your own risk. You will have to keep those up to date per release.
+
+**IMPORTANT**: if your project has copied any ActiveAdmin, Devise, or Kaminari templates from earlier releases, those templates must be updated from this release to avoid potential errors. Path helpers in Devise templates may require using the `main_app` proxy. The Kaminari templates have moved to `app/views/active_admin/kaminari`.
+
+With the setup complete, please review the Breaking Changes section and resolve any that may or may not impact your integration.
+
+### Upgrading from an earlier 4.x beta release
+
+When upgrading from any earlier 4.0.0 beta release, please apply the changes outlined below.
+
+There were important template changes in 4.0.0.beta16. See [PR #8727](https://github.com/activeadmin/activeadmin/pull/8727) for details.
+- The `_site_header.html.erb` partial has changed its main container class from `sticky` to `fixed`.
+- The main layout for `active_admin.html.erb` now includes the `pt-16` utility class.
+
+Starting with 4.0.0.beta19, we've migrated to Tailwind CSS v4 which requires several updates.
+
+Update your `active_admin.css` file:
+
+```diff
+-@tailwind base;
+-@tailwind components;
+-@tailwind utilities;
++@import "tailwindcss";
++
++@config "../../../tailwind-active_admin.config.js";
+```
+
+Update the `build:css` script in your `package.json`:
+
+```diff
+-"build:css": "tailwindcss -i ./app/assets/stylesheets/active_admin.css -o ./app/assets/builds/active_admin.css --minify -c tailwind-active_admin.config.js"
++"build:css": "npx @tailwindcss/cli -i ./app/assets/stylesheets/active_admin.css -o ./app/assets/builds/active_admin.css --minify"
+```
+
+You may see the following warning when upgrading:
+
+```
+[MODULE_TYPELESS_PACKAGE_JSON] Warning: Module type of tailwind-active_admin.config.js is not specified and it doesn't parse as CommonJS.
+Reparsing as ES module because module syntax was detected. This incurs a performance overhead.
+To eliminate this warning, add "type": "module" to ./package.json.
+```
+
+The Tailwind config file now uses ES module syntax. To fix it, either:
+- Rename `tailwind-active_admin.config.js` to `tailwind-active_admin.config.mjs`; or
+- Add `"type": "module"` to your `package.json` (your application may already be compatible with ESM).
+
+### Breaking Changes
+- jQuery and jQuery UI have been removed.
+- The `columns` component has been removed. Use `div`'s with Tailwind classes for modern, responsive layout.
+
+  <details>
+  <summary>Columns Component Migration Alternative</summary>
+
+  If you did not specify any parameters for `column` and if all you need is equal width columns, then this single component will restore that functionality for any number of columns.
+
+  ```ruby
+  # app/admin/components/columns.rb
+  class Columns < ActiveAdmin::Component
+    builder_method :columns
+
+    def build(*args)
+      super
+      add_class "grid auto-cols-fr grid-flow-col gap-4 mb-4"
+    end
+
+    def column(*args, &block)
+      insert_tag Arbre::HTML::Div, *args, &block
+    end
+  end
+  ```
+
+  Using Tailwind modifiers you can further customize the number of columns for responsive/mobile support.
+  </details>
+
+- The `tabs` component has been removed. Use a CSS based or third party alternative.
+- Replace `default_main_content` with `render "show_default"`.
+
+  <details>
+  <summary>Show Default Alternative</summary>
+
+  If block form `default_main_content do ... end` was used or looking for a partial file
+  alternative, then replace with existing, public methods.
+
+  ```ruby
+  attributes_table_for(resource) do
+    rows *active_admin_config.resource_columns
+    row :a
+    row :b
+    # ...
+  end
+  active_admin_comments_for(resource) if active_admin_config.comments?
+  ```
+  </details>
+
+- Replace `as: :datepicker` with Formtastic's `as: :date_picker` for native HTML date input.
+- Replace `active_admin_comments` with `active_admin_comments_for(resource)`.
+- In a sidebar section, replace `attributes_table` with `attributes_table_for(resource)`.
+- The `IndexAsBlog`, `IndexAsBlock` and `IndexAsGrid` components have been removed. Please create your own custom index-as components which remain supported.
+- Batch Actions Form DSL has been replaced with Rails partial support so you can supply your own custom form and modal.
+
+  <details>
+  <summary>Batch Action Partial Example</summary>
+
+  Assuming a Post resource (in the default namespace) with a `mark_published` batch action, we set the partial name and a set of HTML data attributes to trigger a modal using Flowbite which is included by default.
+
+  Note that you can use any modal JS library you want as long as it can be triggered to open using data attributes. Flowbite usage is not a requirement.
+
+  ```ruby
+  batch_action(
+    :mark_published,
+    partial: "mark_published_batch_action",
+    link_html_options: {
+      "data-modal-target": "mark-published-modal",
+      "data-modal-show": "mark-published-modal"
+    }
+  ) do |ids, inputs|
+    # ...
+  end
+  ```
+
+  In the `app/views/admin/posts` directory, create a `_mark_published_batch_action.html.erb` partial file which will be rendered and included automatically in the posts index admin page.
+
+  Now add the modal HTML where the `id` attribute must match the data attributes supplied in the `batch_action` example. The form must have an empty `data-batch-action-form` attribute.
+
+  ```
+  <div id="mark-published-modal" class="hidden fixed top-0 ..." aria-hidden="true" ...>
+    <!-- ... other modal content --->
+    <%= form_tag false, "data-batch-action-form": "" do %>
+      <!-- Declare your form inputs. You can use a different form builder too. -->
+    <% end %>
+  </div>
+  ```
+
+  The `data-batch-action-form` attribute is a hook for a delegated JS event so when you submit the form, it will post and run your batch action block with the supplied form data, functioning as it did before.
+  </details>
+
+- Deeply nested submenus has been reverted. Only one level nested menu, e.g. `menu parent: "Administrative"`, is supported.
+- Removed `Panel#header_action` method.
+- Removed `index_column` method from index table.
+
+  <details>
+  <summary>Implementation Example</summary>
+
+  You can re-implement this column with the following:
+
+  ```ruby
+  column "Number", sortable: false do |item|
+    @collection.offset_value + @collection.index(item) + 1
+  end
+  ```
+  </details>
+- Using `row 'name'` in an `attributes_table` block, now prints the header text as is. For a localized lookup of the header with titlized fallback, use `row :name` instead. This matches the `column 'name'` behavior of index tables (`TableFor`).
+
+#### Resource named methods
+
+With the extraction to partials, resource named methods, e.g. `post` or `posts`, used in blocks for `action_item` and `sidebar` will raise an error. You must use the `resource` or `collection` public helper method instead. For example:
+
+```ruby
+action_item :view, if: ->{ post.published? } do link_to(resource) end
+sidebar :author, if: ->{ post.published? }
+# The above must now change to the following:
+action_item :view, if: ->{ resource.published? } do link_to(resource) end
+sidebar :author, if: ->{ resource.published? }
+```
+
+Note that `@post` can also be used here but make sure to call `authorize!` on it if using the authorization feature. The `post` usage would continue to work for `sidebar :name do ... end` content blocks because they can include Arbre but we advise using `resource` or `collection` instead where possible. This may impact other DSL's.
+
+### Visual Related Changes
+- The `sidebar do ... end` contents and the show resource `attributes_table`, are no longer wrapped in a panel so they can be customized.
+- Links in custom `action_item`'s have no default styles. Apply your own or use the library's default `action-item-button` class.
+- The index table `actions dropdown: true` option will be ignored, reverting to original output.
+- An `Arbre::Component` will no longer add a CSS class using the component class name by default.
+- Typographic elements (other than links in main content) [are not styled by default](https://tailwindcss.com/docs/preflight). Use the `@tailwindcss/typography` plugin or apply your own CSS alternative.
+
+### Enhancements
+- Dark mode support.
+- Mobile web support. For responsive `table_for`'s, wrap them in a div with overflow for horizontal scrolling.
+- Customizable admin theme, including main menu and user menu, all through partials.
+- RTL support improved. Now using CSS Logical Properties.
+- Kaminari templates now consolidated into a single set you can customize.
+- Datepicker's now use the native HTML date input. Apply a custom datepicker of your choosing.
+- Batch Actions Form DSL has been replaced with partials and form builder for more customization. Please refer to earlier example.
+- The `status_tag` component now uses unique labels for `false` and `nil` values.
+- Several components: `table_for`, `status_tag`, etc. now use data attributes instead of classes for metadata: status, sort direction, column, etc.
+- Arbre builder methods have been reduced to the minimum so you can use elements or DSLs without clashing e.g. `header`, `footer`, `columns`, etc.
+- The [app-helpers-not-reloading bug has been fixed](https://github.com/activeadmin/activeadmin/pull/8180) and the engine namespace is now isolated.
+
+### Localization Updates
+
+This release includes several locale changes. Please [review the en.yml locale](https://github.com/activeadmin/activeadmin/blob/master/config/locales/en.yml) for the latest translations.
+
+- Removed keys: `dashboard_welcome`, `dropdown_actions`, `main_content` and `unsupported_browser`.
+- New keys: `toggle_dark_mode`, `toggle_main_navigation_menu`, `toggle_section`, and `toggle_user_menu` have been added.
+- The `active_admin.pagination` keys have been rewritten to be less verbose and include new entries: next and previous.
+
+  ```diff
+  - one: "Displaying <b>1</b> %{model}"
+  + one: "Showing <b>1</b> of <b>1</b>"
+  - one_page: "Displaying <b>all %{n}</b> %{model}"
+  + one_page: "Showing <b>all %{n}</b>"
+  - multiple: "Displaying %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> of <b>%{total}</b> in total"
+  + multiple: "Showing <b>%{from}-%{to}</b> of <b>%{total}</b>"
+  - multiple_without_total: "Displaying %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b>"
+  + multiple_without_total: "Showing <b>%{from}-%{to}</b>"
+  - per_page: "Per page: "
+  + per_page: "Per page "
+  + previous: "Previous"
+  + next: "Next"
+  ```
+
+- The `search_status` key contents has multiple, breaking changes:
+
+  ```diff
+  - headline: "Search status:"
+  - current_scope: "Scope:"
+  - current_filters: "Current filters:"
+  + title: "Active Search"
+  + title_with_scope: "Active Search for %{name}"
+  - no_current_filters: "None"
+  + no_current_filters: "No filters applied"
+  ```
+
+- The value for the `status_tag.unset` key has changed from "No" to "Unknown".
+- The `comments.title_content` text has been updated with an "All " prefix.
+- The `comments.delete_confirmation` text has been fixed to use singular form.
+- The `batch_actions.succesfully_destroyed` key has been renamed to fix a typo.
+
+  ```diff
+  - succesfully_destroyed:
+  + successfully_destroyed:
+  ```
+- Inconsistent use of login/sign-in related terms so text now uses "Sign in", Sign out", and "Sign up" throughout.

data/app/controllers/active_admin/base_controller/authorization.rb

@@ -40,7 +40,7 @@ module ActiveAdmin
       end
 
       # Authorize the action and subject. Available in the controller
-      # as well as all the views. If the action is not allowd, it raises
+      # as well as all the views. If the action is not allowed, it raises
       # an ActiveAdmin::AccessDenied exception.
       #
       # @param [Symbol] action The action to check if the user has permission

data/app/controllers/active_admin/base_controller/menu.rb

@@ -17,8 +17,8 @@ module ActiveAdmin
         active_admin_config.navigation_menu
       end
 
-      def current_menu_item?(item)
-        item.current?(@current_menu_item)
+      def current_menu_item?(item, children: true)
+        item.current?(@current_menu_item, children: children)
       end
 
       def set_current_menu_item

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

@@ -168,11 +168,16 @@ module ActiveAdmin
       #
       # @return [void]
       def update_resource(object, attributes)
-        object = assign_attributes(object, attributes)
+        status = nil
+        ActiveRecord::Base.transaction do
+          object = assign_attributes(object, attributes)
 
-        run_update_callbacks object do
-          save_resource(object)
+          run_update_callbacks object do
+            status = save_resource(object)
+            raise ActiveRecord::Rollback unless status
+          end
         end
+        status
       end
 
       # Destroys an object from the database and calls appropriate callbacks.
@@ -231,7 +236,7 @@ module ActiveAdmin
 
       def apply_includes(chain)
         if active_admin_config.includes.any?
-          chain.includes *active_admin_config.includes
+          chain.includes(*active_admin_config.includes)
         else
           chain
         end

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/controllers/active_admin/resource_controller/streaming.rb

@@ -26,18 +26,18 @@ module ActiveAdmin
         if ActiveAdmin.application.disable_streaming_in.include? Rails.env
           self.response_body = block[String.new] # rubocop:disable Performance/UnfreezeString to preserve encoding
         else
-          self.response_body = Enumerator.new &block
+          self.response_body = Enumerator.new(&block)
         end
       end
 
       def csv_filename
-        "#{resource_collection_name.to_s.tr('_', '-')}-#{Time.zone.now.to_date.to_s}.csv"
+        "#{resource_collection_name.to_s.tr('_', '-')}-#{Time.zone.now.to_date}.csv"
       end
 
       def stream_csv
         headers["Content-Type"] = "text/csv; charset=utf-8" # In Rails 5 it's set to HTML??
         headers["Content-Disposition"] = %{attachment; filename="#{csv_filename}"}
-        stream_resource &active_admin_config.csv_builder.method(:build).to_proc.curry[self]
+        stream_resource(&active_admin_config.csv_builder.method(:build).to_proc.curry[self])
       end
 
     end

data/app/controllers/active_admin/resource_controller.rb

@@ -40,7 +40,7 @@ module ActiveAdmin
       case params[:action].to_sym
       when :index
         active_admin_config.get_page_presenter(params[:action], params[:as])
-      when :new, :edit
+      when :new, :edit, :create, :update
         active_admin_config.get_page_presenter(:form)
       end || super
     end

data/app/helpers/active_admin/display_helper.rb

@@ -24,7 +24,7 @@ module ActiveAdmin
     def display_name(resource)
       unless resource.nil?
         result = render_in_context(resource, display_name_method_for(resource))
-        if result.to_s&.strip&.present?
+        if result.to_s.strip.present?
           ERB::Util.html_escape(result)
         else
           ERB::Util.html_escape(render_in_context(resource, DISPLAY_NAME_FALLBACK))
@@ -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/helpers/active_admin/form_helper.rb

@@ -29,7 +29,7 @@ module ActiveAdmin
     #
     def fields_for_params(params, options = {})
       namespace = options[:namespace]
-      except = Array.wrap(options[:except]).map &:to_s
+      except = Array.wrap(options[:except]).map(&:to_s)
 
       params.flat_map do |k, v|
         next if namespace.nil? && RESERVED_PARAMS.include?(k.to_s)

data/app/helpers/active_admin/layout_helper.rb

@@ -22,7 +22,7 @@ module ActiveAdmin
 
     def action_items_for_action
       @action_items_for_action ||= begin
-        if active_admin_config && active_admin_config.action_items?
+        if active_admin_config&.action_items?
           active_admin_config.action_items_for(params[:action], self)
         else
           []
@@ -32,7 +32,7 @@ module ActiveAdmin
 
     def sidebar_sections_for_action
       @sidebar_sections_for_action ||= begin
-        if active_admin_config && active_admin_config.sidebar_sections?
+        if active_admin_config&.sidebar_sections?
           active_admin_config.sidebar_sections_for(params[:action], self)
         else
           []

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

@@ -1,11 +1,20 @@
 import Rails from '@rails/ujs';
 
+const submitForm = function() {
+  let form = document.getElementById("collection_selection")
+  if (form) {
+    form.submit()
+  }
+}
+
 const batchActionClick = function(event) {
   event.preventDefault()
   let batchAction = document.getElementById("batch_action")
   if (batchAction) {
     batchAction.value = this.dataset.action
   }
+
+  if (!event.target.dataset.confirm && !event.target.dataset.modalTarget) { submitForm() }
 }
 
 const batchActionConfirmComplete = function(event) {
@@ -15,10 +24,7 @@ const batchActionConfirmComplete = function(event) {
     if (batchAction) {
       batchAction.value = this.dataset.action
     }
-    let form = document.getElementById("collection_selection")
-    if (form) {
-      form.submit()
-    }
+    submitForm()
   }
 }
 

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

@@ -1,7 +1,8 @@
 import Rails from '@rails/ujs';
 
-const toggleMenu = function(event) {
-  const parent = this.parentNode
+const toggleMenu = function() {
+  const parent = this.closest([`[data-item-id="${this.dataset.parentId}"]`]) || this.parentNode
+
   if (!("open" in parent.dataset)) {
     parent.dataset.open = ""
   } else {

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

@@ -3,17 +3,17 @@
     <% flash_messages.each do |type, message| %>
       <% if type == "error" %>
         <div class="flex items-center gap-3 p-4 mb-2 rounded-lg bg-red-50 text-red-800 dark:bg-red-800 dark:text-red-300">
-          <svg class="w-5 h-5 shrink-0" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20"><path d="M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5ZM10 15a1 1 0 1 1 0-2 1 1 0 0 1 0 2Zm1-4a1 1 0 0 1-2 0V6a1 1 0 0 1 2 0v5Z"/></svg>
+          <svg class="w-5 h-5 shrink-0 text-red-400 dark:text-red-300" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20"><path d="M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5ZM10 15a1 1 0 1 1 0-2 1 1 0 0 1 0 2Zm1-4a1 1 0 0 1-2 0V6a1 1 0 0 1 2 0v5Z"/></svg>
           <%= message %>
         </div>
       <% elsif type == "alert" %>
         <div class="flex items-center gap-3 p-4 mb-2 rounded-lg bg-yellow-50 text-yellow-800 dark:bg-yellow-800 dark:text-yellow-300">
-          <svg class="w-5 h-5 shrink-0 rtl:-scale-x-100" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20"><path d="M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5ZM9.5 4a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3ZM12 15H8a1 1 0 0 1 0-2h1v-3H8a1 1 0 0 1 0-2h2a1 1 0 0 1 1 1v4h1a1 1 0 0 1 0 2Z"/></svg>
+          <svg class="w-5 h-5 shrink-0 rtl:-scale-x-100 text-yellow-400 dark:text-yellow-300" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20"><path d="M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5ZM9.5 4a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3ZM12 15H8a1 1 0 0 1 0-2h1v-3H8a1 1 0 0 1 0-2h2a1 1 0 0 1 1 1v4h1a1 1 0 0 1 0 2Z"/></svg>
           <%= message %>
         </div>
       <% elsif type == "notice" %>
-        <div class="flex items-center gap-3 p-4 mb-2 rounded-lg bg-green-50 text-green-800 dark:bg-green-800 dark:text-green-400">
-          <svg class="w-5 h-5 shrink-0 rtl:-scale-x-100" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20"><path d="M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5Zm3.707 8.207-4 4a1 1 0 0 1-1.414 0l-2-2a1 1 0 0 1 1.414-1.414L9 10.586l3.293-3.293a1 1 0 0 1 1.414 1.414Z"/></svg>
+        <div class="flex items-center gap-3 p-4 mb-2 rounded-lg bg-green-50 text-green-800 dark:bg-green-800 dark:text-green-300">
+          <svg class="w-5 h-5 shrink-0 rtl:-scale-x-100 text-green-400 dark:text-green-300" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20"><path d="M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5Zm3.707 8.207-4 4a1 1 0 0 1-1.414 0l-2-2a1 1 0 0 1 1.414-1.414L9 10.586l3.293-3.293a1 1 0 0 1 1.414 1.414Z"/></svg>
           <%= message %>
         </div>
       <% end %>