activeadmin 4.0.0.beta10 → 4.0.0.beta12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17abe55cddeec6028454b71ee930e2a99e83c0660303a6b901488aba36a90cda
-  data.tar.gz: 4ba193f3c02f03b20609553eed9e1c3788390110e02cbae5fcbc924087d71785
+  metadata.gz: f813aff0e1f46af219b2a140e89d47c49d0a1789469a7de1696fb51a9a3f9bfa
+  data.tar.gz: 4a89afdb369f20b03fb313db3171ad186b2aed66968271e840bd8da9fdf4f127
 SHA512:
-  metadata.gz: 13f5d85ad6fb9add3eb08569f09605fbc2e8b695b5598d7d41cfe6eb62536c29f6b405a87bcf724c957d7c95e893d599a6a5dc47a8318a7f58f8d0ba8a50a677
-  data.tar.gz: 0e82b2549cac3763a82e7910107e82fb05f600312395c1bfa2c1519969419082c19dfb2ec8329adcda7fefa0734a21c17296540604f86c0e7ee0abc9774ccf20
+  metadata.gz: 9d81333a08a10871b0f1fca78836bccca4011de36153e8da14935a23dece664a3fee5f3ebba0e6f8070c0a014948ff41a8bfe5c162a40296e40013d95322f5ed
+  data.tar.gz: 4d98685077e1ac9fb02aff03e13f987595bf2b5d8a950a8b21e615f6057000e8a812f050849397f2edad46b1602dd0ff658f54fe1013b5740e94c63a09a78c20

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.beta10"` and then run `gem install activeadmin --pre`.
+Update your `Gemfile` with `gem "activeadmin", "4.0.0.beta12"` 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-beta10
+yarn add @activeadmin/activeadmin@4.0.0-beta12
 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/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/version.rb

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

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/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': {

data/vendor/bundle/offense.rb

@@ -0,0 +1 @@
+puts "Ciao"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta10
+  version: 4.0.0.beta12
 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: 2024-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -79,14 +79,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -377,6 +377,7 @@ files:
 - lib/generators/active_admin/resource/templates/resource.rb.erb
 - lib/generators/active_admin/views_generator.rb
 - plugin.js
+- vendor/bundle/offense.rb
 - vendor/javascript/flowbite.js
 - vendor/javascript/rails_ujs_esm.js
 homepage: https://activeadmin.info
@@ -406,7 +407,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.15
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: Active Admin is a Ruby on Rails plugin for generating administration style