activeadmin 4.0.0.beta22 → 4.0.0.beta23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '098aea41cb4fc6e731f7456f30043abe69d34fd641f007c1c377b874e9af4bb6'
-  data.tar.gz: 0bcd00148dd0e08f1c4b64aef23739cacc18e86961bc619a0e24a289db70a371
+  metadata.gz: 5ff3812d441118e4a89c7887afa6f28f05e9be1b3b18d72ab0376cb2596648ce
+  data.tar.gz: 62cc70430def6ca312094b532c2323bc8b42642de5ef92e3080045ec3f10218f
 SHA512:
-  metadata.gz: d19914f5a74cf0132c526b7acd6f470f1f4638f6a36ce9cee2011fb5af4ce648113bd8fe7a4e7d74c26a7fcd78abf099347d11d8ad382cab3b7c614ccad7a911
-  data.tar.gz: 525b975b7ea335ccb076d51733d7021bbb85d0be4fd5ec206c76d5d67e619b6f09c45941a92777ccaf1d2142a91e28a73f88aa25d4a06670e77d5fb0a2d6a9f5
+  metadata.gz: 33178626e15d37898ddeceba1f9ccfbe3e1ef0150de13db00c115923ff2e81d9cfc4c18e1ec8034b5c643113055da1d970d995be305945f453c43674adff3800
+  data.tar.gz: 9506486af9a082f203de1f124389a1113f4b967cbb8210ccb076f65cb141ba9fe078c221226a9d20ec165288bdf0cfeb570da223130342be6dcd011c3d0722d3

data/CONTRIBUTING.md

@@ -28,7 +28,7 @@ Now install the development dependencies:
 ```sh
 gem install foreman
 bundle install --all
-yarn install
+npm install
 ```
 
 Now you should be able to run the entire suite using:

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.beta22"` and then run `gem install activeadmin --pre`.
+Update your `Gemfile` with `gem "activeadmin", "4.0.0.beta23"` 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 install @activeadmin/activeadmin@4.0.0-beta23
 npm pkg set scripts.build:css="npx @tailwindcss/cli -i ./app/assets/stylesheets/active_admin.css -o ./app/assets/builds/active_admin.css --minify"
 ```
 

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

@@ -75,6 +75,15 @@ module ActiveAdmin
         end_of_association_chain
       end
 
+      # Derive the parent's `has_many` association name from the
+      # resource's model class so that resources registered with an
+      # `as:` alias still scope through the correct collection.
+      def method_for_association_chain
+        return super unless active_admin_config&.belongs_to?
+
+        active_admin_config.resource_class.model_name.element.pluralize.to_sym
+      end
+
       # Retrieve, memoize and authorize a resource based on params[:id]. The
       # actual work of finding the resource is done in #find_resource.
       #

data/app/helpers/active_admin/layout_helper.rb

@@ -17,7 +17,7 @@ module ActiveAdmin
     end
 
     def html_head_site_title(separator: "-")
-      "#{@page_title || page_title} #{separator} #{site_title}"
+      safe_join([@page_title || page_title, site_title], " #{separator} ")
     end
 
     def action_items_for_action

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

@@ -33,7 +33,7 @@
           <%= simple_format(comment.body) %>
         </div>
         <% if authorized?(ActiveAdmin::Auth::DESTROY, comment) %>
-          <%= link_to I18n.t("active_admin.comments.delete"), url_for_comments(comment.id), method: :delete, data: { confirm: I18n.t("active_admin.comments.delete_confirmation") } %>
+          <%= link_to I18n.t("active_admin.comments.delete"), url_for_comments(comment.id, return_to: "back"), method: :delete, data: { confirm: I18n.t("active_admin.comments.delete_confirmation") } %>
         <% end %>
       </div>
     <% end %>

data/config/locales/ca.yml

@@ -109,6 +109,7 @@ ca:
       one_page: S'estan mostrant <b>tots %{n}</b>
       per_page: Per pàgina
       previous: Anterior
+      truncate: "&hellip;"
     powered_by: Powered by %{active_admin} %{version}
     previous: Anterior
     scopes:
@@ -124,6 +125,10 @@ ca:
       'no': 'No'
       unset: Desconegut
       'yes': Sí
+    toggle_dark_mode: Activar el modus fosc
+    toggle_main_navigation_menu: Activar el menú principal de navegació
+    toggle_section: Activar la secció
+    toggle_user_menu: Activar el menú d'usuari
     view: Mostra
   activerecord:
     attributes:

data/config/locales/vi.yml

@@ -104,15 +104,20 @@ vi:
         other: entries
       multiple: Đang hiển thị %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> of <b>%{total}</b> trong tất cả.
       multiple_without_total: Đang hiển thị %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b>.
+      next: Tiếp
       one: Đang hiển thị <b>1</b> %{model}
       one_page: Đang hiển thị <b>tất cả %{n}</b> %{model}
       per_page: 'Mỗi trang: '
+      previous: Trước
+      truncate: "&hellip;"
     powered_by: Bản quyền bởi %{active_admin} %{version}
     previous: Trước
     scopes:
       all: Tất cả
     search_status:
       no_current_filters: Không có
+      title: Bộ lọc hiện tại
+      title_with_scope: Đang tìm kiếm theo %{name}
     sidebars:
       filters: Bộ Lọc
       search_status: Trạng thái tìm kiếm
@@ -120,6 +125,10 @@ vi:
       'no': Không Có
       unset: Không Có
       'yes': Có
+    toggle_dark_mode: Bật/tắt chế độ tối
+    toggle_main_navigation_menu: Bật/tắt menu điều hướng chính
+    toggle_section: Phần chuyển đổi
+    toggle_user_menu: Bật/tắt menu người dùng
     view: Xem
   activerecord:
     attributes:

data/lib/active_admin/filters/active.rb

@@ -14,7 +14,8 @@ module ActiveAdmin
       # @see ActiveAdmin::ResourceController::DataAccess#apply_filtering
       def initialize(resource, search)
         @resource = resource
-        @filters = build_filters(search.conditions)
+        # Ransack::Search uses method_missing for #conditions, so gate on the class.
+        @filters = search.is_a?(::Ransack::Search) ? build_filters(search.conditions) : []
         @scopes = search.instance_variable_get(:@scope_args)
       end
 

data/lib/active_admin/filters/formtastic_addons.rb

@@ -32,12 +32,14 @@ module ActiveAdmin
       # The below are custom methods that Formtastic does not provide.
       #
 
-      # The resource class, unwrapped from Ransack
+      # The resource class, unwrapped from Ransack or `nil` for non-Ransack search objects.
       def klass
-        @object.object.klass
+        @object.object.klass if @object.respond_to?(:object) && @object.object.respond_to?(:klass)
       end
 
       def polymorphic_foreign_type?(method)
+        return false if klass.nil?
+
         klass.reflect_on_all_associations.select { |r| r.macro == :belongs_to && r.options[:polymorphic] }
           .map(&:foreign_type).include? method.to_s
       end
@@ -47,6 +49,8 @@ module ActiveAdmin
       #
 
       def searchable_has_many_through?
+        return false if klass.nil?
+
         if klass.ransackable_associations.include?(method.to_s) && reflection && reflection.options[:through]
           reflection.through_reflection.klass.ransackable_attributes.include? reflection.foreign_key
         else
@@ -66,6 +70,8 @@ module ActiveAdmin
 
       # Ransack supports exposing selected scopes on your model for advanced searches.
       def scope?
+        return false if klass.nil?
+
         context = Ransack::Context.for klass
         context.respond_to?(:ransackable_scope?) && context.ransackable_scope?(method.to_s, klass)
       end

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

@@ -21,6 +21,22 @@ module ActiveAdmin
           end
         end
 
+        def filters
+          options[:filters] || resource_default_filters || namespace_default_filters || self.class.filters
+        end
+
+        private
+
+        def resource_default_filters
+          config = template.active_admin_config if template.respond_to?(:active_admin_config)
+          config.string_input_filters if config.respond_to?(:string_input_filters)
+        end
+
+        def namespace_default_filters
+          template.respond_to?(:active_admin_config) &&
+            template.active_admin_config&.namespace&.string_input_filters
+        end
+
       end
     end
   end

data/lib/active_admin/namespace_settings.rb

@@ -29,6 +29,10 @@ module ActiveAdmin
     # Whether filters are enabled
     register :filters, true
 
+    # Default `filters` list for string filters in the namespace.
+    # When `nil`, the global `ActiveAdmin::Inputs::Filters::StringInput.filters` list is used.
+    register :string_input_filters, nil
+
     # The namespace root
     register :root_to, "dashboard#index"
 

data/lib/active_admin/orm/active_record/comments.rb

@@ -75,12 +75,11 @@ ActiveAdmin.after_load do |app|
         def destroy
           destroy! do |success, failure|
             success.html do
-              # If deleting from the Comments resource page then this will fail, as redirecting back
-              # will be to the comment show page, but comment was deleted. The following can be used
-              # to alleviate that, but then deleting comments on commentable resource pages will
-              # redirect to the comments index which may be undesirable.
-              # redirect_to({ action: :index }, fallback_location: active_admin_root)
-              redirect_back fallback_location: active_admin_root
+              if params[:return_to] == "back"
+                redirect_back fallback_location: active_admin_root
+              else
+                redirect_to action: :index
+              end
             end
             failure.html do
               redirect_back fallback_location: active_admin_root

data/lib/active_admin/resource/attributes.rb

@@ -5,6 +5,8 @@ module ActiveAdmin
     module Attributes
 
       def default_attributes
+        return {} unless resource_class.respond_to?(:columns)
+
         resource_class.columns.each_with_object({}) do |c, attrs|
           unless reject_col?(c)
             name = c.name.to_sym

data/lib/active_admin/resource.rb

@@ -68,6 +68,11 @@ module ActiveAdmin
     # nil to not decorate.
     attr_accessor :decorator_class_name
 
+    # Default `filters` list for string filters on this resource. Takes
+    # priority over the namespace-level `string_input_filters` setting when
+    # set; when nil, falls back to it, and then to the global default.
+    attr_accessor :string_input_filters
+
     module Base
       def initialize(namespace, resource_class, options = {})
         @namespace = namespace

data/lib/active_admin/resource_dsl.rb

@@ -154,6 +154,19 @@ module ActiveAdmin
       action config.collection_actions, name, options, &block
     end
 
+    # Set the default `filters` list for this resource's string filters.
+    # Takes priority over the namespace-level `string_input_filters` setting.
+    #
+    # For example:
+    #
+    #   ActiveAdmin.register Post do
+    #     string_input_filters [:eq, :cont]
+    #   end
+    #
+    def string_input_filters(value)
+      config.string_input_filters = value
+    end
+
     def decorate_with(decorator_class)
       # Force storage as a string. This will help us with reloading issues.
       # Assuming decorator_class.to_s will return the name of the class allows

data/lib/active_admin/router.rb

@@ -68,7 +68,7 @@ module ActiveAdmin
       router.get "/#{page}", to: "#{page}#index"
       config.page_actions.each do |action|
         Array.wrap(action.http_verb).each do |verb|
-          build_route(verb, "/#{page}/#{action.name}" => "#{page}##{action.name}")
+          build_route(verb, "/#{page}/#{action.name}", to: "#{page}##{action.name}")
         end
       end
     end

data/lib/active_admin/version.rb

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

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

@@ -83,9 +83,9 @@ module ActiveAdmin
         if sort_key
           th(attributes) do
             link_to params: params, order: "#{sort_key}_#{order_for_sort_key(sort_key)}" do
-              svg = '<svg class="data-table-sorted-icon" fill="none" viewBox="0 0 10 6"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/></svg>'
+              svg = '<svg class="data-table-sorted-icon" fill="none" viewBox="0 0 10 6"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/></svg>'.html_safe
 
-              (col.pretty_title + svg).html_safe
+              safe_join([col.pretty_title, svg])
             end
           end
         else
@@ -160,7 +160,7 @@ module ActiveAdmin
         def sortable?
           if @options.has_key?(:sortable)
             !!@options[:sortable]
-          elsif @resource_class
+          elsif @resource_class.respond_to?(:column_names)
             @resource_class.column_names.include?(sort_column_name)
           else
             @title.present?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta22
+  version: 4.0.0.beta23
 platform: ruby
 authors:
 - Charles Maresh
@@ -396,14 +396,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.7
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Active Admin is a Ruby on Rails plugin for generating administration style
   interfaces. It abstracts common business application patterns to make it simple