activeadmin 3.2.4 → 4.0.0.beta1

data/lib/active_admin/namespace_settings.rb

@@ -12,31 +12,6 @@ module ActiveAdmin
     # The title which gets displayed in the main layout
     register :site_title, "", :string_symbol_or_proc
 
-    # Set the site title link href (defaults to AA dashboard)
-    register :site_title_link, ""
-
-    # Set the site title image displayed in the main layout (has precendence over :site_title)
-    register :site_title_image, "", :string_symbol_or_proc
-
-    # Add to the site head
-    register :head, "", :string_symbol_or_proc
-
-    # Set the site footer text (defaults to Powered by ActiveAdmin text with version)
-    register :footer, "", :string_symbol_or_proc
-
-    # Set a favicon
-    register :favicon, false
-
-    # Additional meta tags to place in head of logged in pages
-    register :meta_tags, {}
-
-    # Additional meta tags to place in head of logged out pages
-    register :meta_tags_for_logged_out_pages, { robots: "noindex, nofollow" }
-
-    # The view factory to use to generate all the view classes. Take
-    # a look at ActiveAdmin::ViewFactory
-    register :view_factory, ActiveAdmin::ViewFactory.new
-
     # The method to call in controllers to get the current user
     register :current_user_method, false
 
@@ -48,9 +23,6 @@ module ActiveAdmin
     # that it's a method to call which returns the path
     register :logout_link_path, :destroy_admin_user_session_path
 
-    # The method to use when generating the link for user logout
-    register :logout_link_method, :get
-
     # Whether the batch actions are enabled or not
     register :batch_actions, false
 
@@ -85,9 +57,6 @@ module ActiveAdmin
     # A proc to be used when a user is not authorized to view the current resource
     register :on_unauthorized_access, :rescue_active_admin_access_denied
 
-    # A regex to detect unsupported browser, set to false to disable
-    register :unsupported_browser_matcher, /MSIE [1-8]\.0/
-
     # Whether to display 'Current Filters' on search screen
     register :current_filters, true
 
@@ -102,7 +71,8 @@ module ActiveAdmin
       :utf8, :_method, :authenticity_token, :commit, :id
     ]
 
-    # Set flash message keys that shouldn't show in ActiveAdmin
+    # Set flash message keys that shouldn't show in ActiveAdmin.
+    # By default, we remove the `timedout` key from Devise.
     register :flash_keys_to_except, ["timedout"]
 
     # Include association filters by default
@@ -120,8 +90,5 @@ module ActiveAdmin
         :email,
     ]
     register :filter_method_for_large_association, "_start"
-
-    # Switch between asset pipeline and webpacker assets
-    register :use_webpacker, false
   end
 end

data/lib/active_admin/order_clause.rb

@@ -29,8 +29,11 @@ module ActiveAdmin
     end
 
     def table_column
-      (@column =~ /\./) ? @column :
+      if (@column.include?('.'))
+        @column
+      else
         [table, active_admin_config.resource_quoted_column_name(@column)].compact.join(".")
+      end
     end
 
     def sql

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

@@ -1,75 +1,21 @@
 # frozen_string_literal: true
 require "active_admin/views"
-require "active_admin/views/components/panel"
 
 module ActiveAdmin
   module Comments
     module Views
-
-      class Comments < ActiveAdmin::Views::Panel
+      class Comments < Arbre::Element
         builder_method :active_admin_comments_for
 
-        attr_accessor :resource
-
         def build(resource)
           if authorized?(ActiveAdmin::Auth::READ, ActiveAdmin::Comment)
-            @resource = resource
-            @comments = active_admin_authorization.scope_collection(ActiveAdmin::Comment.find_for_resource_in_namespace(resource, active_admin_namespace.name).includes(:author).page(params[:page]))
-            super(title, for: resource)
-            build_comments
+            comments = active_admin_authorization.scope_collection(ActiveAdmin::Comment.find_for_resource_in_namespace(resource, active_admin_namespace.name).includes(:author).page(params[:page]))
+            render("active_admin/shared/resource_comments", resource: resource, comments: comments, comment_form_url: comment_form_url)
           end
         end
 
         protected
 
-        def title
-          I18n.t "active_admin.comments.title_content", count: @comments.total_count
-        end
-
-        def build_comments
-          if @comments.any?
-            @comments.each(&method(:build_comment))
-            div page_entries_info(@comments).html_safe, class: "pagination_information"
-          else
-            build_empty_message
-          end
-
-          text_node paginate @comments
-
-          if authorized?(ActiveAdmin::Auth::NEW, ActiveAdmin::Comment)
-            build_comment_form
-          end
-        end
-
-        def build_comment(comment)
-          div for: comment do
-            div class: "active_admin_comment_meta" do
-              h4 class: "active_admin_comment_author" do
-                comment.author ? auto_link(comment.author) : I18n.t("active_admin.comments.author_missing")
-              end
-              span pretty_format comment.created_at
-              if authorized?(ActiveAdmin::Auth::DESTROY, comment)
-                text_node link_to I18n.t("active_admin.comments.delete"), comments_url(comment.id), method: :delete, data: { confirm: I18n.t("active_admin.comments.delete_confirmation") }
-              end
-            end
-            div class: "active_admin_comment_body" do
-              simple_format comment.body
-            end
-          end
-        end
-
-        def build_empty_message
-          span I18n.t("active_admin.comments.no_comments_yet"), class: "empty"
-        end
-
-        def comments_url(*args)
-          parts = []
-          parts << active_admin_namespace.name unless active_admin_namespace.root?
-          parts << active_admin_namespace.comments_registration_name.underscore
-          parts << "path"
-          send parts.join("_"), *args
-        end
-
         def comment_form_url
           parts = []
           parts << active_admin_namespace.name unless active_admin_namespace.root?
@@ -77,25 +23,7 @@ module ActiveAdmin
           parts << "path"
           send parts.join "_"
         end
-
-        def build_comment_form
-          active_admin_form_for(ActiveAdmin::Comment.new, url: comment_form_url) do |f|
-            f.inputs do
-              f.input :resource_type, as: :hidden, input_html: { value: ActiveAdmin::Comment.resource_type(parent.resource) }
-              f.input :resource_id, as: :hidden, input_html: { value: parent.resource.id }
-              f.input :body, label: false, input_html: { size: "80x8" }
-            end
-            f.actions do
-              f.action :submit, label: I18n.t("active_admin.comments.add")
-            end
-          end
-        end
-
-        def default_id_for_prefix
-          "active_admin_comments_for"
-        end
       end
-
     end
   end
 end

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "active_admin/orm/active_record/comments/views"
-require "active_admin/orm/active_record/comments/show_page_helper"
 require "active_admin/orm/active_record/comments/namespace_helper"
 require "active_admin/orm/active_record/comments/resource_helper"
 
@@ -13,7 +12,6 @@ ActiveAdmin::Application.inheritable_setting :comments_menu, {}
 # Insert helper modules
 ActiveAdmin::Namespace.send :include, ActiveAdmin::Comments::NamespaceHelper
 ActiveAdmin::Resource.send :include, ActiveAdmin::Comments::ResourceHelper
-ActiveAdmin.application.view_factory.show_page.send :include, ActiveAdmin::Comments::ShowPageHelper
 
 # Load the model as soon as it's referenced. By that point, Rails & Kaminari will be ready
 ActiveAdmin.autoload :Comment, "active_admin/orm/active_record/comments/comment"
@@ -77,6 +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
             end
             failure.html do
@@ -90,11 +93,13 @@ ActiveAdmin.after_load do |app|
 
       index do
         column I18n.t("active_admin.comments.resource_type"), :resource_type
+        column I18n.t("active_admin.comments.resource"), :resource, class: "min-w-[7rem]"
         column I18n.t("active_admin.comments.author_type"), :author_type
-        column I18n.t("active_admin.comments.resource"), :resource
         column I18n.t("active_admin.comments.author"), :author
-        column I18n.t("active_admin.comments.body"), :body
-        column I18n.t("active_admin.comments.created_at"), :created_at
+        column I18n.t("active_admin.comments.body"), :body, class: "min-w-[16rem]" do |comment|
+          truncate(comment.body, length: 60, separator: " ")
+        end
+        column I18n.t("active_admin.comments.created_at"), :created_at, class: "min-w-[13rem]"
         actions
       end
     end

data/lib/active_admin/pundit_adapter.rb

@@ -42,7 +42,7 @@ module ActiveAdmin
     end
 
     def format_action(action, subject)
-      # https://github.com/varvet/pundit/blob/main/lib/generators/pundit/install/templates/application_policy.rb
+      # https://github.com/varvet/pundit/blob/master/lib/generators/pundit/install/templates/application_policy.rb
       case action
       when Auth::READ then subject.is_a?(Class) ? :index? : :show?
       when Auth::DESTROY then subject.is_a?(Class) ? :destroy_all? : :destroy?

data/lib/active_admin/resource/action_items.rb

@@ -64,32 +64,31 @@ module ActiveAdmin
 
       # Adds the default New link on index
       def add_default_new_action_item
-        add_action_item :new, only: :index do
-          if controller.action_methods.include?("new") && authorized?(ActiveAdmin::Auth::NEW, active_admin_config.resource_class)
-            localizer = ActiveAdmin::Localizers.resource(active_admin_config)
-            link_to localizer.t(:new_model), new_resource_path
-          end
+        add_action_item :new, only: :index, if: -> { new_action_authorized?(active_admin_config.resource_class) } do
+          localizer = ActiveAdmin::Localizers.resource(active_admin_config)
+          link_to localizer.t(:new_model), new_resource_path, class: "action-item-button"
         end
       end
 
       # Adds the default Edit link on show
       def add_default_edit_action_item
-        add_action_item :edit, only: :show do
-          if controller.action_methods.include?("edit") && authorized?(ActiveAdmin::Auth::EDIT, resource)
-            localizer = ActiveAdmin::Localizers.resource(active_admin_config)
-            link_to localizer.t(:edit_model), edit_resource_path(resource)
-          end
+        add_action_item :edit, only: :show, if: -> { edit_action_authorized?(resource) } do
+          localizer = ActiveAdmin::Localizers.resource(active_admin_config)
+          link_to localizer.t(:edit_model), edit_resource_path(resource), class: "action-item-button"
         end
       end
 
       # Adds the default Destroy link on show
       def add_default_show_action_item
-        add_action_item :destroy, only: :show do
-          if controller.action_methods.include?("destroy") && authorized?(ActiveAdmin::Auth::DESTROY, resource)
-            localizer = ActiveAdmin::Localizers.resource(active_admin_config)
-            link_to localizer.t(:delete_model), resource_path(resource), method: :delete,
-                                                                         data: { confirm: localizer.t(:delete_confirmation) }
-          end
+        add_action_item :destroy, only: :show, if: -> { destroy_action_authorized?(resource) } do
+          localizer = ActiveAdmin::Localizers.resource(active_admin_config)
+          link_to(
+            localizer.t(:delete_model),
+            resource_path(resource),
+            class: "action-item-button",
+            method: :delete,
+            data: { confirm: localizer.t(:delete_confirmation) }
+          )
         end
       end
 
@@ -109,10 +108,6 @@ module ActiveAdmin
       normalize_display_options!
     end
 
-    def html_class
-      "action_item #{@options[:class]}".rstrip
-    end
-
     def priority
       @options[:priority] || 10
     end

data/lib/active_admin/resource/attributes.rb

@@ -37,14 +37,7 @@ module ActiveAdmin
       end
 
       def counter_cache_col?(c)
-        # This helper is called inside a loop. Let's memoize the result.
-        @counter_cache_columns ||= begin
-          resource_class.reflect_on_all_associations(:has_many)
-                        .select(&:has_cached_counter?)
-                        .map(&:counter_cache_column)
-        end
-
-        @counter_cache_columns.include?(c.name)
+        c.name.end_with?("_count")
       end
 
       def filtered_col?(c)

data/lib/active_admin/resource/naming.rb

@@ -23,8 +23,7 @@ module ActiveAdmin
 
       # Returns the plural version of this resource such as "Bank Accounts"
       def plural_resource_label(options = {})
-        defaults = { count: Helpers::I18n::PLURAL_MANY_COUNT,
-                     default: resource_label.pluralize.titleize }
+        defaults = { count: 2.1, default: resource_label.pluralize.titleize }
         resource_name.translate defaults.merge options
       end
 

data/lib/active_admin/resource.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require "active_admin/view_helpers/method_or_proc_helper"
 require "active_admin/resource/action_items"
 require "active_admin/resource/attributes"
 require "active_admin/resource/controllers"

data/lib/active_admin/resource_dsl.rb

@@ -192,7 +192,7 @@ module ActiveAdmin
     delegate :before_destroy, :after_destroy, to: :controller
 
     standard_rails_filters =
-      AbstractController::Callbacks::ClassMethods.public_instance_methods.select { |m| m.match(/_action\z/) }
+      AbstractController::Callbacks::ClassMethods.public_instance_methods.select { |m| m.end_with?('_action') }
     delegate *standard_rails_filters, to: :controller
 
     # Specify which actions to create in the controller

data/lib/active_admin/scope.rb

@@ -41,7 +41,7 @@ module ActiveAdmin
       end
 
       @scope_method = nil if @scope_method == :all
-      if block_given?
+      if block
         @scope_method = nil
         @scope_block = block
       end

data/lib/active_admin/settings_node.rb

@@ -13,7 +13,7 @@ module ActiveAdmin
 
       def register(name, value)
         class_attribute name
-        send "#{name}=", value
+        send :"#{name}=", value
       end
     end
   end

data/lib/active_admin/sidebar_section.rb

@@ -18,11 +18,6 @@ module ActiveAdmin
       "#{name.downcase.underscore}_sidebar_section".parameterize
     end
 
-    # The title gets displayed within the section in the view
-    def title
-      I18n.t("active_admin.sidebars.#{name}", default: name.titlecase)
-    end
-
     # If a block is not passed in, the name of the partial to render
     def partial_name
       options[:partial] || "#{name.downcase.tr(' ', '_')}_sidebar"

data/lib/active_admin/version.rb

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

data/lib/active_admin/view_helpers.rb

@@ -1,21 +1,9 @@
 # frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
-
     # Require all ruby files in the view helpers dir
     Dir[File.expand_path("view_helpers", __dir__) + "/*.rb"].each { |f| require f }
 
-    include ActiveAdminApplicationHelper
-    include AutoLinkHelper
-    include BreadcrumbHelper
-    include DisplayHelper
     include MethodOrProcHelper
-    include SidebarHelper
-    include FormHelper
-    include TitleHelper
-    include ViewFactoryHelper
-    include FlashHelper
-    include ScopeNameHelper
-
   end
 end

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

@@ -33,20 +33,20 @@ module ActiveAdmin
         end
 
         @opening_tag, @closing_tag = split_string_on(form_string, "</form>")
-        instance_eval(&block) if block_given?
+        instance_eval(&block) if block
 
         # Rails sets multipart automatically if a file field is present,
         # but the form tag has already been rendered before the block eval.
-        if multipart? && @opening_tag !~ /multipart/
+        if multipart? && !@opening_tag.include?('multipart')
           @opening_tag.sub!(/<form/, '<form enctype="multipart/form-data"')
         end
       end
 
       def inputs(*args, &block)
-        if block_given?
+        if block
           form_builder.template.assigns[:has_many_block] = true
         end
-        if block_given? && block.arity == 0
+        if block && block.arity == 0
           wrapped_block = proc do
             wrap_it = form_builder.already_in_an_inputs_block ? true : false
             form_builder.already_in_an_inputs_block = true
@@ -73,13 +73,15 @@ module ActiveAdmin
       end
 
       def actions(*args, &block)
-        block_given? ?
-          insert_tag(SemanticActionsProxy, form_builder, *args, &block) :
+        if block
+          insert_tag(SemanticActionsProxy, form_builder, *args, &block)
+        else
+          add_create_another_checkbox
           actions(*args) { commit_action_with_cancel_link }
+        end
       end
 
       def commit_action_with_cancel_link
-        add_create_another_checkbox
         action(:submit)
         cancel_link
       end
@@ -108,14 +110,16 @@ module ActiveAdmin
         create_another = params[:create_another]
         label = @resource.class.model_name.human
         Arbre::Context.new do
-          li class: "create_another" do
-            input(
-              checked: create_another,
-              id: "create_another",
-              name: "create_another",
-              type: "checkbox"
-            )
-            label(I18n.t("active_admin.create_another", model: label), for: "create_another")
+          div class: "boolean input input-create-another" do
+            label for: "create_another" do
+              input(
+                checked: create_another,
+                id: "create_another",
+                name: "create_another",
+                type: "checkbox"
+              )
+              text_node I18n.t("active_admin.create_another", model: label)
+            end
           end
         end
       end
@@ -127,24 +131,12 @@ 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") : ""
-        fieldset_attrs = tag_attributes html_options
+        legend_tag = legend ? "<legend class=\"fieldset-title\">#{legend}</legend>" : ""
+        fieldset_attrs = html_options.map { |k, v| %Q{#{k}="#{v}"} }.join(" ")
         @opening_tag = "<fieldset #{fieldset_attrs}>#{legend_tag}<ol>"
         @closing_tag = "</ol></fieldset>"
         super(*(args << html_options), &block)
       end
-
-      private
-
-      def tag_attributes(html_options)
-        if Rails::VERSION::MAJOR <= 6
-          # Reimplement tag.attributes to backport support for Rails 6.1.
-          # TODO: this can be removed when support for Rails 6.x is dropped
-          helpers.tag.tag_options(html_options.to_h).to_s.strip.html_safe
-        else
-          helpers.tag.attributes html_options
-        end
-      end
     end
 
     class SemanticActionsProxy < FormtasticProxy

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

@@ -11,6 +11,7 @@ module ActiveAdmin
         options = {}
         options[:for] = @collection.first if single_record?
         super(options)
+        add_class "attributes-table"
         @table = table
         build_colgroups
         rows(*attrs)
@@ -23,13 +24,7 @@ module ActiveAdmin
       def row(*args, &block)
         title = args[0]
         options = args.extract_options!
-        classes = [:row]
-        if options[:class]
-          classes << options[:class]
-        elsif title.present?
-          classes << "row-#{title.to_s.parameterize(separator: "_")}"
-        end
-        options[:class] = classes.join(" ")
+        options["data-row"] = title.to_s.parameterize(separator: "_") if title.present?
 
         @table << tr(options) do
           th do
@@ -59,10 +54,7 @@ module ActiveAdmin
         within @table do
           col # column for row headers
           @collection.each do |record|
-            classes = Arbre::HTML::ClassList.new
-            classes << cycle(:even, :odd, name: self.class.to_s)
-            classes << dom_class_name_for(record)
-            col(id: dom_id_for(record), class: classes)
+            col(id: dom_id_for(record))
           end
         end
       end
@@ -76,7 +68,7 @@ module ActiveAdmin
       end
 
       def empty_value
-        span I18n.t("active_admin.empty"), class: "empty"
+        span I18n.t("active_admin.empty"), class: "attributes-table-empty-value"
       end
 
       def content_for(record, attr)

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

@@ -1,28 +1,18 @@
 # frozen_string_literal: true
-require "active_admin/helpers/collection"
-
 module ActiveAdmin
   module Views
-
     # Renders a collection of index views available to the resource
     # as a list with a separator
     class IndexList < ActiveAdmin::Component
-      builder_method :index_list_renderer
-
-      include ::ActiveAdmin::Helpers::Collection
-
-      def default_class_name
-        "indexes table_tools_segmented_control"
-      end
-
       def tag_name
-        "ul"
+        "div"
       end
 
       # Builds the links for presenting different index views to the user
       #
       # @param [Array] index_classes The class constants that represent index page presenters
       def build(index_classes)
+        add_class "index-button-group index-list"
         unless current_filter_search_empty?
           index_classes.each do |index_class|
             build_index_list(index_class)
@@ -36,20 +26,18 @@ module ActiveAdmin
       #
       # @param [Class] index_class The class on which to build the link and html classes
       def build_index_list(index_class)
-        li class: classes_for_index(index_class) do
-          params = request.query_parameters.except :page, :commit, :format
-          url_with_params = url_for(**params.merge(as: index_class.index_name.to_sym).symbolize_keys)
+        params = request.query_parameters.except :page, :commit, :format
+        url_with_params = url_for(**params.merge(as: index_class.index_name.to_sym).symbolize_keys)
 
-          a href: url_with_params, class: "table_tools_button" do
-            name = index_class.index_name
-            I18n.t("active_admin.index_list.#{name}", default: name.to_s.titleize)
-          end
+        a href: url_with_params, class: classes_for_index(index_class) do
+          name = index_class.index_name
+          I18n.t("active_admin.index_list.#{name}", default: name.to_s.titleize)
         end
       end
 
       def classes_for_index(index_class)
-        classes = ["index"]
-        classes << "selected" if current_index?(index_class)
+        classes = ["index-button"]
+        classes << "index-button-selected" if current_index?(index_class)
         classes.join(" ")
       end
 
@@ -62,9 +50,8 @@ module ActiveAdmin
       end
 
       def current_filter_search_empty?
-        params.include?(:q) && collection_is_empty?
+        params.include?(:q) && collection_empty?
       end
-
     end
   end
 end