activeadmin 4.0.0.beta19 → 4.0.0.beta20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f0339fceef3e3092cf17f883d9f2783ed7915a50341481259629a11579c36b9
-  data.tar.gz: 3a06b83b19d71e2487c13ffd99a927cc05b99e3ec337754ac1d999c11c1ed117
+  metadata.gz: 15f9525d6a02bc6ebaef19b65cd6a455ac13349659993bbc7bd4ca2b078015a9
+  data.tar.gz: 405bc3808117da8f1111eb80fc0b67fed6d7f251b0e1fae0bf45731c69f87638
 SHA512:
-  metadata.gz: e73a080ffa79cdf603c817c9367f72354e66d87e9fab5fff4cfab39cdaf69b5ae128dc8847f091b4ac0dac6c80756592d2d19c4d203940cc4ea843404d76312c
-  data.tar.gz: 552c837611062b12c3a28f9024a1791141ed0259c1bad2328350f79f45280cb72957dff97949760163ce12e8b03e58db7b87c018272921b40017cc8f98a54d20
+  metadata.gz: 769deda0cc56d1fdf0d4d50d8a8fb29952eb23c04fd7539f17cbf7538b8b22e2e5f6fd701fcbf82a341cc941d7ffc0c646a05878bebd462058fd7a16161ab2b8
+  data.tar.gz: db187d391063e6628600d0eb26cb7f9e6d0ae42c08ee2340655905eeee02485ba7aa1afb2e99f532435544a1afa3ed85cc974425ff09c55be60e7921db970d55

data/CONTRIBUTING.md

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

data/UPGRADING.md

@@ -7,14 +7,14 @@ ActiveAdmin v4 uses Tailwind CSS v4. It has **mobile web, dark mode and RTL supp
 
 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.beta19"` and then run `gem install activeadmin --pre`.
+Update your `Gemfile` with `gem "activeadmin", "4.0.0.beta20"` 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-beta19
+yarn add @activeadmin/activeadmin@4.0.0-beta20
 npm pkg set scripts.build:css="npx @tailwindcss/cli -i ./app/assets/stylesheets/active_admin.css -o ./app/assets/builds/active_admin.css --minify"
 ```
 
@@ -46,7 +46,7 @@ Note that the templates can and will change across releases. There are additiona
 
 With the setup complete, please review the Breaking Changes section and resolve any that may or may not impact your integration.
 
-### Upgrading from earlier 4.x beta to 4.0.0.beta19
+### Upgrading from an earlier 4.x beta release
 
 When upgrading from any earlier 4.0.0 beta release, please apply the changes outlined below.
 

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

@@ -2,25 +2,42 @@
   <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 %>
+      <% url = item.url(self) %>
+      <% label = capture do %>
+        <% if url.present? %>
+          <%= link_to item.label(self), url, item.html_options.merge(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 no-underline #{(current_menu_item?(item, children: false) ? "bg-gray-100 dark:bg-white/5 text-gray-900 dark:text-white selected" : "")}") %>
+        <% else %>
+          <%= item.label(self) %>
+        <% end %>
+      <% end %>
       <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" 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" />
-            </svg>
-          </button>
-          <ul role="list" class="mt-1 space-y-1 hidden group-data-open:block">
+          <% if url.present? && url == "#" %>
+            <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" />
+              </svg>
+            </button>
+          <% elsif url.present? && url != "#" %>
+            <div data-parent-id="<%= item.id %>" data-menu-button class="flex">
+              <%= label %>
+              <button class="text-gray-600 hover:text-gray-900 dark:text-gray-400 dark:hover:text-white flex items-center p-2 text-sm" aria-label="<%= t('active_admin.toggle_section') %>">
+                <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" />
+                </svg>
+              </button>
+            </div>
+          <% end %>
+          <ul role="list" class="mt-1 space-y-1 hidden group-data-open:block ms-1 ps-2 border-s-2 border-gray-100 dark:border-white/5">
             <% children.each do |j| %>
               <li data-item-id="<%= j.id %>">
                 <%= link_to j.label(self), j.url(self), j.html_options.merge(class: "text-gray-600 hover:text-gray-900 dark:text-gray-400 dark:hover:text-white block rounded-md py-1.5 px-2 text-sm no-underline #{(current_menu_item?(j) ? "bg-gray-100 dark:bg-white/5 text-gray-900 dark:text-white selected" : "")}") %>
               </li>
             <% end %>
           </ul>
-        <% elsif url = item.url(self) %>
-          <%= link_to item.label(self), url, item.html_options.merge(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 no-underline #{(current_menu_item?(item) ? "bg-gray-100 dark:bg-white/5 text-gray-900 dark:text-white selected" : "")}") %>
         <% else %>
-          <%= item.label(self) %>
+          <%= label %>
         <% end %>
       </li>
     <% end %>

data/app/views/active_admin/shared/_resource_comments.html.erb

@@ -1,4 +1,4 @@
-<div class="max-w-[700px]">
+<div id="active-admin-comments-form" class="max-w-[700px]">
   <div class="font-bold py-3 border-b border-gray-200 dark:border-gray-600">
     <%= ActiveAdmin::Comment.model_name.human(count: 2.1) %>
   </div>
@@ -37,14 +37,14 @@
         <% end %>
       </div>
     <% end %>
-    <div class="p-2 lg:p-4 flex flex-col-reverse lg:flex-row gap-4 items-center justify-between">
+    <div class="py-2 lg:py-4 flex flex-col-reverse lg:flex-row gap-4 items-center justify-between">
       <div>
         <%= page_entries_info(comments).html_safe %>
       </div>
       <%= paginate(comments, views_prefix: :active_admin, outer_window: 1, window: 2) %>
     </div>
   <% else %>
-    <div class="p-8 text-center">
+    <div class="py-8 text-center">
       <%= I18n.t("active_admin.comments.no_comments_yet") %>
     </div>
   <% end %>

data/lib/active_admin/async_count.rb

@@ -11,9 +11,7 @@ module ActiveAdmin
     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
+      @promise.value
     end
 
     alias size count

data/lib/active_admin/menu.rb

@@ -66,8 +66,8 @@ module ActiveAdmin
       end
 
       # Used in the UI to visually distinguish which menu item is selected.
-      def current?(item)
-        self == item || include?(item)
+      def current?(item, children: true)
+        self == item || (children && include?(item))
       end
 
       # Returns sorted array of menu items that should be displayed in this context.

data/lib/active_admin/resource.rb

@@ -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 = []

data/lib/active_admin/version.rb

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

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

@@ -1,7 +1,8 @@
 import { execSync } from 'child_process';
 import activeAdminPlugin from '@activeadmin/activeadmin/plugin';
 
-const activeAdminPath = execSync('bundle show activeadmin', { encoding: 'utf-8' }).trim();
+// 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: [

data/plugin.js

@@ -165,7 +165,11 @@ export default plugin(
         )}")`,
         'print-color-adjust': `exact`,
       },
-      [`[type='file']`]: {
+      [[
+        `button:not(:disabled)`,
+        `[role='button']:not(:disabled)`,
+        `[type='file']`,
+      ]]: {
         cursor: 'pointer',
       },
       [`[type=file]::file-selector-button`]: {
@@ -242,7 +246,7 @@ export default plugin(
         '@apply w-full text-sm text-gray-800 dark:text-gray-300': {}
       },
       '.data-table :where(thead > tr > th)': {
-        '@apply px-3 py-3.5 whitespace-nowrap font-semibold text-start text-xs uppercase border-b border-gray-200 text-gray-700 bg-gray-50 dark:bg-gray-950/50 dark:border-gray-800 dark:text-white': {}
+        '@apply px-3 py-3.5 font-semibold text-start text-xs uppercase border-b border-gray-200 text-gray-700 bg-gray-50 dark:bg-gray-950/50 dark:border-gray-800 dark:text-white': {}
       },
       '.data-table :where(thead > tr > th > a)': {
         '@apply text-inherit no-underline inline-flex items-center gap-2': {}
@@ -350,6 +354,9 @@ export default plugin(
       '.formtastic': {
         '@apply text-sm': {}
       },
+      '.formtastic :where(.inputs,.has-many-fields)': {
+        '@apply mb-6': {}
+      },
       '.formtastic :where(.fieldset-title, .has-many-fields-title)': {
         '@apply block w-full mb-3 border-b border-gray-200 dark:border-gray-800 font-bold text-lg': {}
       },
@@ -402,10 +409,7 @@ export default plugin(
         '@apply font-semibold leading-6 text-gray-900 dark:text-white no-underline': {}
       },
       '.formtastic :where(.has-many-add)': {
-        '@apply inline-block py-3': {}
-      },
-      '.formtastic :where(.has-many-container)': {
-        '@apply space-y-8': {}
+        '@apply inline-block py-3 mb-3': {}
       },
       '.formtastic :where(.has-many-fields)': {
         '@apply ps-3 border-s-4 border-s-gray-200 dark:border-s-gray-700': {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta19
+  version: 4.0.0.beta20
 platform: ruby
 authors:
 - Charles Maresh
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement