activeadmin 3.4.0 → 4.0.0.beta18

data/lib/active_admin/namespace.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/resource_collection"
+require_relative "resource_collection"
 
 module ActiveAdmin
 
@@ -68,7 +68,7 @@ module ActiveAdmin
 
       # Register the resource
       register_resource_controller(config)
-      parse_registration_block(config, &block) if block_given?
+      parse_registration_block(config, &block) if block
       reset_menu!
 
       # Dispatch a registration event
@@ -83,7 +83,7 @@ module ActiveAdmin
 
       # Register the resource
       register_page_controller(config)
-      parse_page_registration_block(config, &block) if block_given?
+      parse_page_registration_block(config, &block) if block
       reset_menu!
 
       config
@@ -141,60 +141,18 @@ module ActiveAdmin
       end
     end
 
-    # The default logout menu item
-    #
-    # @param [ActiveAdmin::MenuItem] menu The menu to add the logout link to
-    # @param [Fixnum] priority The numeric priority for the order in which it appears
-    # @param [Hash] html_options An options hash to pass along to link_to
-    #
-    def add_logout_button_to_menu(menu, priority = 20, html_options = {})
-      if logout_link_path
-        html_options = html_options.reverse_merge(method: logout_link_method || :get)
-        menu.add id: "logout", priority: priority, html_options: html_options,
-                 label: -> { I18n.t "active_admin.logout" },
-                 url: -> { render_or_call_method_or_proc_on self, active_admin_namespace.logout_link_path },
-                 if: :current_active_admin_user?
-      end
-    end
-
-    # The default user session menu item
-    #
-    # @param [ActiveAdmin::MenuItem] menu The menu to add the logout link to
-    # @param [Fixnum] priority The numeric priority for the order in which it appears
-    # @param [Hash] html_options An options hash to pass along to link_to
-    #
-    def add_current_user_to_menu(menu, priority = 10, html_options = {})
-      if current_user_method
-        menu.add id: "current_user", priority: priority, html_options: html_options,
-                 label: -> { display_name current_active_admin_user },
-                 url: -> { auto_url_for(current_active_admin_user) },
-                 if: :current_active_admin_user?
-      end
-    end
-
     protected
 
     def build_menu_collection
       @menus = MenuCollection.new
 
       @menus.on_build do
-        build_default_utility_nav
-
         resources.each do |resource|
           resource.add_to_menu(@menus)
         end
       end
     end
 
-    # Builds the default utility navigation in top right header with current user & logout button
-    def build_default_utility_nav
-      return if @menus.exists? :utility_navigation
-      @menus.menu :utility_navigation do |menu|
-        add_current_user_to_menu menu
-        add_logout_button_to_menu menu
-      end
-    end
-
     # Either returns an existing Resource instance or builds a new one.
     def find_or_build_resource(resource_class, options)
       resources.add Resource.new(self, resource_class, options)

data/lib/active_admin/namespace_settings.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/dynamic_settings_node"
+require_relative "dynamic_settings_node"
 
 module ActiveAdmin
   class NamespaceSettings < DynamicSettingsNode
@@ -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"
+require_relative "../../../../views"
 
 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/views.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
-require "active_admin/views"
-require "active_admin/orm/active_record/comments/views/active_admin_comments"
+require_relative "../../../views"
+require_relative "views/active_admin_comments"

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

@@ -1,8 +1,7 @@
 # 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"
+require_relative "comments/views"
+require_relative "comments/namespace_helper"
+require_relative "comments/resource_helper"
 
 # Add the comments configuration
 ActiveAdmin::Application.inheritable_setting :comments, true
@@ -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/orm/active_record.rb

@@ -3,4 +3,4 @@
 
 ActiveAdmin::DatabaseHitDuringLoad.database_error_classes << ActiveRecord::StatementInvalid
 
-require "active_admin/orm/active_record/comments"
+require_relative "active_record/comments"

data/lib/active_admin/pundit_adapter.rb

@@ -19,11 +19,11 @@ module ActiveAdmin
     end
 
     def scope_collection(collection, action = Auth::READ)
-      # scoping is appliable only to read/index action
+      # scoping is applicable only to read/index action
       # which means there is no way how to scope other actions
       Pundit.policy_scope!(user, namespace(collection))
     rescue Pundit::NotDefinedError => e
-      if default_policy_class && default_policy_class.const_defined?(:Scope)
+      if default_policy_class&.const_defined?(:Scope)
         default_policy_class::Scope.new(user, collection).resolve
       else
         raise e
@@ -95,7 +95,7 @@ module ActiveAdmin
     end
 
     def default_policy_class
-      ActiveAdmin.application.pundit_default_policy && ActiveAdmin.application.pundit_default_policy.constantize
+      ActiveAdmin.application.pundit_default_policy&.constantize
     end
 
     def default_policy(subject)

data/lib/active_admin/resource/action_items.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/helpers/optional_display"
+require_relative "../helpers/optional_display"
 
 module ActiveAdmin
 
@@ -59,37 +59,36 @@ module ActiveAdmin
       def add_default_action_items
         add_default_new_action_item
         add_default_edit_action_item
-        add_default_show_action_item
+        add_default_destroy_action_item
       end
 
       # 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
+      def add_default_destroy_action_item
+        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/naming.rb

@@ -5,7 +5,7 @@ module ActiveAdmin
     module Naming
       def resource_name
         @resource_name ||= begin
-          as = @options[:as].gsub /\s/, "" if @options[:as]
+          as = @options[:as].gsub(/\s/, "") if @options[:as]
 
           if as || !resource_class.respond_to?(:model_name)
             Name.new resource_class, as
@@ -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/page_presenters.rb

@@ -51,7 +51,7 @@ module ActiveAdmin
       # Stores a config for all index actions supplied
       #
       # @param [Symbol] index_as The index type to store in the configuration
-      # @param [PagePresenter] page_presenter The intance of PagePresenter to store
+      # @param [PagePresenter] page_presenter The instance of PagePresenter to store
       def set_index_presenter(index_as, page_presenter)
         page_presenters[:index] ||= {}
 
@@ -64,7 +64,7 @@ module ActiveAdmin
         page_presenters[:index][index_as] = page_presenter
       end
 
-      # Returns the actual class for renderering the main content on the index
+      # Returns the actual class for rendering the main content on the index
       # page. To set this, use the :as option in the page_presenter block.
       #
       # @param [Symbol, Class] symbol_or_class The component symbol or class

data/lib/active_admin/resource/sidebars.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/helpers/optional_display"
+require_relative "../helpers/optional_display"
 
 module ActiveAdmin
 

data/lib/active_admin/resource.rb

@@ -1,19 +1,20 @@
 # frozen_string_literal: true
-require "active_admin/resource/action_items"
-require "active_admin/resource/attributes"
-require "active_admin/resource/controllers"
-require "active_admin/resource/menu"
-require "active_admin/resource/page_presenters"
-require "active_admin/resource/pagination"
-require "active_admin/resource/routes"
-require "active_admin/resource/naming"
-require "active_admin/resource/scopes"
-require "active_admin/resource/includes"
-require "active_admin/resource/scope_to"
-require "active_admin/resource/sidebars"
-require "active_admin/resource/belongs_to"
-require "active_admin/resource/ordering"
-require "active_admin/resource/model"
+require_relative "view_helpers/method_or_proc_helper"
+require_relative "resource/action_items"
+require_relative "resource/attributes"
+require_relative "resource/controllers"
+require_relative "resource/menu"
+require_relative "resource/page_presenters"
+require_relative "resource/pagination"
+require_relative "resource/routes"
+require_relative "resource/naming"
+require_relative "resource/scopes"
+require_relative "resource/includes"
+require_relative "resource/scope_to"
+require_relative "resource/sidebars"
+require_relative "resource/belongs_to"
+require_relative "resource/ordering"
+require_relative "resource/model"
 
 module ActiveAdmin
 
@@ -176,7 +177,7 @@ module ActiveAdmin
     end
 
     def find_resource(id)
-      resource = resource_class.public_send *method_for_find(id)
+      resource = resource_class.public_send(*method_for_find(id))
       (decorator_class && resource) ? decorator_class.new(resource) : resource
     end
 

data/lib/active_admin/resource_collection.rb

@@ -22,7 +22,7 @@ module ActiveAdmin
 
     # Changes `each` to pass in the value, instead of both the key and value.
     def each(&block)
-      values.each &block
+      values.each(&block)
     end
 
     def [](obj)

data/lib/active_admin/resource_dsl.rb

@@ -40,7 +40,7 @@ module ActiveAdmin
 
     # Store relations that should be included
     def includes(*args)
-      config.includes.push *args
+      config.includes.push(*args)
     end
 
     #
@@ -192,8 +192,8 @@ module ActiveAdmin
     delegate :before_destroy, :after_destroy, to: :controller
 
     standard_rails_filters =
-      AbstractController::Callbacks::ClassMethods.public_instance_methods.select { |m| m.match(/_action\z/) }
-    delegate *standard_rails_filters, to: :controller
+      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

@@ -14,6 +14,12 @@ module ActiveAdmin
     #   Scope.new('Published', :public)
     #   # => Scope with name 'Published' and scope method :public
     #
+    #   Scope.new(:published, show_count: :async)
+    #   # => Scope with name 'Published' that queries its count asynchronously
+    #
+    #   Scope.new(:published, show_count: false)
+    #   # => Scope with name 'Published' that does not display a count
+    #
     #   Scope.new 'Published', :public, if: proc { current_admin_user.can? :manage, resource_class } do |articles|
     #     articles.where published: true
     #   end
@@ -41,7 +47,7 @@ module ActiveAdmin
       end
 
       @scope_method = nil if @scope_method == :all
-      if block_given?
+      if block
         @scope_method = nil
         @scope_block = block
       end
@@ -61,5 +67,9 @@ module ActiveAdmin
       end
     end
 
+    def async_count?
+      @show_count == :async
+    end
+
   end
 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.4.0"
+  VERSION = "4.0.0.beta18"
 end

data/lib/active_admin/view_helpers/method_or_proc_helper.rb

@@ -91,7 +91,7 @@ module MethodOrProcHelper
     context = self if context.nil? # default to `self` only when nil
     case obj
     when Proc
-      context.instance_exec *args, &obj
+      context.instance_exec(*args, &obj)
     when Symbol
       context.public_send obj, *args
     else

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