activeadmin 3.2.0 → 4.0.0.beta2

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/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/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.0"
+  VERSION = "4.0.0.beta2"
 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,7 +131,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 ? "<legend><span>#{legend}</span></legend>" : ""
+        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>"

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

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

@@ -1,10 +1,6 @@
 # frozen_string_literal: true
-require "active_admin/helpers/collection"
-require "active_admin/view_helpers/download_format_links_helper"
-
 module ActiveAdmin
   module Views
-
     # Wraps the content with pagination and available formats.
     #
     # *Example:*
@@ -19,8 +15,8 @@ module ActiveAdmin
     # posts in one of the following formats:
     #
     # * "No Posts found"
-    # * "Displaying all 10 Posts"
-    # * "Displaying Posts 1 - 30 of 31 in total"
+    # * "Showing all 10 Posts"
+    # * "Showing Posts 1 - 30 of 31 in total"
     #
     # It will also generate pagination links.
     #
@@ -46,11 +42,11 @@ module ActiveAdmin
         @display_total = options.delete(:pagination_total) { true }
         @per_page = options.delete(:per_page)
 
-        unless collection.respond_to?(:total_pages)
+        unless @collection.respond_to?(:total_pages)
           raise(StandardError, "Collection is not a paginated scope. Set collection.page(params[:page]).per(10) before calling :paginated_collection.")
         end
-
-        @contents = div(class: "paginated_collection_contents")
+        add_class "paginated-collection"
+        @contents = div(class: "paginated-collection-contents")
         build_pagination_with_formats(options)
         @built = true
       end
@@ -67,25 +63,28 @@ module ActiveAdmin
       protected
 
       def build_pagination_with_formats(options)
-        div id: "index_footer" do
-          build_per_page_select if @per_page.is_a?(Array)
+        div class: "paginated-collection-pagination" do
+          div page_entries_info(options).html_safe, class: "pagination-information"
           build_pagination
-          div(page_entries_info(options).html_safe, class: "pagination_information")
-
-          formats = build_download_formats @download_links
-          build_download_format_links formats if formats.any?
+        end
+        formats = build_download_formats @download_links
+        if @per_page.is_a?(Array) || formats.any?
+          div class: "paginated-collection-footer" do
+            build_per_page_select if @per_page.is_a?(Array)
+            render("active_admin/shared/download_format_links", formats: formats) if formats.any?
+          end
         end
       end
 
       def build_per_page_select
-        div class: "pagination_per_page" do
+        div do
           text_node I18n.t("active_admin.pagination.per_page")
-          select do
+          select class: "pagination-per-page" do
             @per_page.each do |per_page|
               option(
                 per_page,
                 value: per_page,
-                selected: collection.limit_value == per_page ? "selected" : nil
+                selected: @collection.limit_value == per_page ? "selected" : nil
               )
             end
           end
@@ -93,7 +92,7 @@ module ActiveAdmin
       end
 
       def build_pagination
-        options = { theme: @display_total ? "active_admin" : "active_admin_countless" }
+        options = { views_prefix: :active_admin, outer_window: 1, window: 2 }
         options[:params] = @params if @params
         options[:param_name] = @param_name if @param_name
 
@@ -103,59 +102,55 @@ 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
-          options[:total_pages] = collection.current_page + offset
+          offset = @collection.offset(@collection.current_page * @collection.limit_value).limit(1).count
+          options[:total_pages] = @collection.current_page + offset
           options[:right] = 0
         end
 
-        text_node paginate collection, **options
+        text_node paginate @collection, **options
       end
 
-      include ::ActiveAdmin::Helpers::Collection
-      include ::ActiveAdmin::ViewHelpers::DownloadFormatLinksHelper
-
       # modified from will_paginate
       def page_entries_info(options = {})
         if options[:entry_name]
           entry_name = options[:entry_name]
           entries_name = options[:entries_name] || entry_name.pluralize
-        elsif collection_is_empty?
+        elsif collection_empty?(@collection)
           entry_name = I18n.t "active_admin.pagination.entry", count: 1, default: "entry"
           entries_name = I18n.t "active_admin.pagination.entry", count: 2, default: "entries"
         else
-          key = "activerecord.models." + collection.first.class.model_name.i18n_key.to_s
+          key = "activerecord.models." + @collection.first.class.model_name.i18n_key.to_s
 
-          entry_name = I18n.translate key, count: 1, default: collection.first.class.name.underscore.sub("_", " ")
-          entries_name = I18n.translate key, count: collection.size, default: entry_name.pluralize
+          entry_name = I18n.translate key, count: 1, default: @collection.first.class.name.underscore.sub("_", " ")
+          entries_name = I18n.translate key, count: @collection.size, default: entry_name.pluralize
         end
 
         if @display_total
-          if collection.total_pages < 2
-            case collection_size
+          if @collection.total_pages < 2
+            case collection_size(@collection)
             when 0; I18n.t("active_admin.pagination.empty", model: entries_name)
             when 1; I18n.t("active_admin.pagination.one", model: entry_name)
-            else; I18n.t("active_admin.pagination.one_page", model: entries_name, n: collection.total_count)
+            else; I18n.t("active_admin.pagination.one_page", model: entries_name, n: @collection.total_count)
             end
           else
-            offset = (collection.current_page - 1) * collection.limit_value
-            total = collection.total_count
+            offset = (@collection.current_page - 1) * @collection.limit_value
+            total = @collection.total_count
             I18n.t "active_admin.pagination.multiple",
                    model: entries_name,
                    total: total,
                    from: offset + 1,
-                   to: offset + collection_size
+                   to: offset + collection_size(@collection)
           end
         else
           # Do not display total count, in order to prevent a `SELECT count(*)`.
-          # To do so we must not call `collection.total_pages`
-          offset = (collection.current_page - 1) * collection.limit_value
+          # To do so we must not call `@collection.total_pages`
+          offset = (@collection.current_page - 1) * @collection.limit_value
           I18n.t "active_admin.pagination.multiple_without_total",
                  model: entries_name,
                  from: offset + 1,
-                 to: offset + collection_size
+                 to: offset + collection_size(@collection)
         end
       end
-
     end
   end
 end