activeadmin 3.2.4 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96cc413b7ce2a101b6d54a8d4e8c31a6bb4bb8bd9ba8078252e7210088d6eddc
-  data.tar.gz: cfefd3ac1c3a6d60eed87faf31be9fb04980fcb91d6a4f9bc1533702a5c44887
+  metadata.gz: e080845beb483b8364c49bb199ac8b4ba61975854316d053df39b39208d863bf
+  data.tar.gz: c30bcfde594fb30c2a8796741451f245b77ddeaa66c6a66ecbfbcbec3064918a
 SHA512:
-  metadata.gz: 8d3a3562deed7b19ff4ac7230810de7a270deaf9449026bb80f2a4b0b62fe98093b8c0948f2ebb236a6fe18c5d6d0122a94207a697c861ec029491ce421033fc
-  data.tar.gz: c67fd515ee902ffa551bea1a5b0b01e9c6ef84704dae5966892dadf2af69baf593d1f5f35f44d2b7638afbd5eee5ff2af79465efe6d90c539b3ad4bbfb37ef33
+  metadata.gz: fe64d783c2ac39dbbc74df16985dabcbee5e300039f8b703df6ccedf7dee24dcda09dd59b154383ba0dc593310f163dd6ca51af5f59d26b11646683158eeae4a
+  data.tar.gz: f4e988b7bf89e2cb291822c62d891d958ec48400e3ccee31fc2480b47ee1c8ab80608c939abb80733378c2f27a245044d1f89c68fe04c8fd850264df072ae8d1

data/CHANGELOG.md

@@ -2,6 +2,34 @@
 
 ## Unreleased
 
+## 3.3.0 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.5..v3.3.0)
+
+### Enhancements
+
+* Improve v3 docs regarding compatibility with vite_rails [#8548] by [@mattbrictson]
+* Backport test against Rails 8.0 [#8556] by [@mgrunberg] and [@tagliala]
+* Test against Ruby 3.4 [#8614] by [@tagliala]
+* Backport Support sortable argument in id_column [#8650] by [@jaynetics]
+* Backport Support title for id_column [#8652] by [@mgrunberg]
+
+### Bug Fixes
+
+* Backport Fix attributes passed to form has_many not being set on new record form items [#8551] by [@Fs00]
+* Backport Fix deprecation warning in Ruby 3.4 [#8596] by [@tagliala]
+* Backport Fix circular require warning in belongs_to.rb [#8601] by [@tagliala]
+
+## 3.2.5 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.4..v3.2.5)
+
+### Enhancements
+
+* Backport Add favicon to template app to fix Rails 7.2 test suite run [#8468] by [@mgrunberg]
+* Backport Use attribute_types instead of columns_hash to determine type [#8469] by [@mgrunberg]
+* Backport Optimize count query for pagination_total: false option [#8470] by [@mgrunberg]
+
+### Bug Fixes
+
+* Restore inner span tag to form inputs legend [#8467] by [@denisahearn]
+
 ## 3.2.4 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.3..v3.2.4)
 
 ### Enhancements
@@ -944,6 +972,18 @@ Please check [0-6-stable] for previous changes.
 [#8412]: https://github.com/activeadmin/activeadmin/pull/8412
 [#8434]: https://github.com/activeadmin/activeadmin/pull/8434
 [#8446]: https://github.com/activeadmin/activeadmin/pull/8446
+[#8467]: https://github.com/activeadmin/activeadmin/pull/8467
+[#8468]: https://github.com/activeadmin/activeadmin/pull/8468
+[#8469]: https://github.com/activeadmin/activeadmin/pull/8469
+[#8470]: https://github.com/activeadmin/activeadmin/pull/8470
+[#8548]: https://github.com/activeadmin/activeadmin/pull/8548
+[#8551]: https://github.com/activeadmin/activeadmin/pull/8551
+[#8556]: https://github.com/activeadmin/activeadmin/pull/8556
+[#8596]: https://github.com/activeadmin/activeadmin/pull/8596
+[#8601]: https://github.com/activeadmin/activeadmin/pull/8601
+[#8614]: https://github.com/activeadmin/activeadmin/pull/8614
+[#8650]: https://github.com/activeadmin/activeadmin/pull/8650
+[#8652]: https://github.com/activeadmin/activeadmin/pull/8652
 
 [@1000ship]: https://github.com/1000ship
 [@5t111111]: https://github.com/5t111111
@@ -972,6 +1012,7 @@ Please check [0-6-stable] for previous changes.
 [@craigmcnamara]: https://github.com/craigmcnamara
 [@DanielHeath]: https://github.com/DanielHeath
 [@deivid-rodriguez]: https://github.com/deivid-rodriguez
+[@denisahearn]: https://github.com/denisahearn
 [@dennisvdvliet]: https://github.com/dennisvdvliet
 [@dhyegofernando]: https://github.com/dhyegofernando
 [@dkniffin]: https://github.com/dkniffin
@@ -1023,6 +1064,7 @@ Please check [0-6-stable] for previous changes.
 [@Looooong]: https://github.com/Looooong
 [@lubosch]: https://github.com/lubosch
 [@markstory]: https://github.com/markstory
+[@mattbrictson]: https://github.com/mattbrictson
 [@mauriciopasquier]: https://github.com/mauriciopasquier
 [@mconiglio]: https://github.com/mconiglio
 [@mgrunberg]: https://github.com/mgrunberg

data/lib/active_admin/form_builder.rb

@@ -95,7 +95,7 @@ module ActiveAdmin
       contents = without_wrapper { inputs(options, &form_block) }
       contents ||= "".html_safe
 
-      js = new_record ? js_for_has_many(options[:class], &form_block) : ""
+      js = new_record ? js_for_has_many(&form_block) : ""
       contents << js
     end
 
@@ -159,14 +159,13 @@ module ActiveAdmin
     end
 
     # Capture the ADD JS
-    def js_for_has_many(class_string, &form_block)
+    def js_for_has_many(&form_block)
       assoc_name = assoc_klass.model_name
-      placeholder = "NEW_#{assoc_name.to_s.underscore.upcase.gsub(/\//, '_')}_RECORD"
-      opts = {
+      placeholder = "NEW_#{assoc_name.to_s.underscore.upcase.tr('/', '_')}_RECORD"
+      opts = options.merge(
         for: [assoc, assoc_klass.new],
-        class: class_string,
         for_options: { child_index: placeholder }
-      }
+      )
       html = template.capture { __getobj__.send(:inputs_for_nested_attributes, opts, &form_block) }
       text = new_record.is_a?(String) ? new_record : I18n.t("active_admin.has_many_new", model: assoc_name.human)
 

data/lib/active_admin/inputs/filters/select_input.rb

@@ -15,9 +15,7 @@ module ActiveAdmin
           if searchable_has_many_through?
             "#{reflection.through_reflection.name}_#{reflection.foreign_key}"
           else
-            name = method.to_s
-            name.concat "_#{reflection.association_primary_key}" if reflection_searchable?
-            name
+            reflection_searchable? ? "#{method}_#{reflection.association_primary_key}" : method.to_s
           end
         end
 

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_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/lib/active_admin/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ActiveAdmin
-  VERSION = "3.2.4"
+  VERSION = "3.3.0"
 end

data/lib/active_admin/view_helpers/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/lib/active_admin/views/components/active_admin_form.rb

@@ -127,7 +127,7 @@ 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 ? helpers.tag.legend(legend, class: "fieldset-title") : ""
+        legend_tag = legend ? helpers.tag.legend(helpers.tag.span(legend), class: "fieldset-title") : ""
         fieldset_attrs = tag_attributes html_options
         @opening_tag = "<fieldset #{fieldset_attrs}>#{legend_tag}<ol>"
         @closing_tag = "</ol></fieldset>"

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

@@ -103,7 +103,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/index_as_table.rb

@@ -291,9 +291,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), class: "resource_id_link"
             elsif controller.action_methods.include?("edit")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.3.0
 platform: ruby
 authors:
 - Charles Maresh
@@ -15,7 +15,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-24 00:00:00.000000000 Z
+date: 2025-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -533,7 +533,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Active Admin is a Ruby on Rails plugin for generating administration style