activeadmin 3.4.0 → 4.0.0.beta18

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(helpers.tag.span(legend), class: "fieldset-title") : ""
-        fieldset_attrs = tag_attributes html_options
+        legend_tag = legend ? helpers.tag.legend(legend, class: "fieldset-title") : ""
+        fieldset_attrs = helpers.tag.attributes html_options
         @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)
@@ -22,14 +23,9 @@ module ActiveAdmin
 
       def row(*args, &block)
         title = args[0]
+        data = args[1] || 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
@@ -37,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
@@ -59,24 +55,26 @@ 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
 
       def header_content_for(attr)
-        if @resource_class.respond_to?(:human_attribute_name)
-          @resource_class.human_attribute_name(attr, default: attr.to_s.titleize)
+        if attr.is_a?(Symbol)
+          default = attr.to_s.titleize
+          if @resource_class.respond_to?(:human_attribute_name)
+            @resource_class.human_attribute_name(attr, default: default)
+          else
+            default
+          end
         else
-          attr.to_s.titleize
+          attr.to_s
         end
       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,62 +102,58 @@ 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_scope = collection.offset(collection.current_page * collection.limit_value)
+          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[: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

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

@@ -8,8 +8,8 @@ module ActiveAdmin
       def build(title, attributes = {})
         super(attributes)
         add_class "panel"
-        @title = h3(title.to_s)
-        @contents = div(class: "panel_contents")
+        @title = h3(title.to_s, class: "panel-title")
+        @contents = div(class: "panel-body")
       end
 
       def add_child(child)
@@ -22,18 +22,10 @@ module ActiveAdmin
 
       # Override children? to only report children when the panel's
       # contents have been added to. This ensures that the panel
-      # correcly appends string values, etc.
+      # correctly appends string values, etc.
       def children?
         @contents.children?
       end
-
-      def header_action(*args)
-        action = args[0]
-
-        @title << div(class: "header_action") do
-          action
-        end
-      end
     end
   end
 end

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

@@ -1,31 +1,27 @@
 # frozen_string_literal: true
-require "active_admin/helpers/collection"
-require "active_admin/view_helpers/method_or_proc_helper"
+require_relative "../../async_count"
+require_relative "../../view_helpers/method_or_proc_helper"
 
 module ActiveAdmin
   module Views
-
     # Renders a collection of ActiveAdmin::Scope objects as a
-    # simple list with a seperator
+    # simple list with a separator
     class Scopes < ActiveAdmin::Component
-      builder_method :scopes_renderer
-
       include ActiveAdmin::ScopeChain
-      include ::ActiveAdmin::Helpers::Collection
-
-      def default_class_name
-        "scopes"
-      end
 
       def tag_name
         "div"
       end
 
       def build(scopes, options = {})
+        super({ role: "toolbar" })
+        add_class "scopes"
+        prepare_async_counts(scopes, options)
+
         scopes.group_by(&:group).each do |group, group_scopes|
-          ul class: "table_tools_segmented_control #{group_class(group)}" do
+          div class: "index-button-group", role: "group", data: { "group": group_name(group) } do
             group_scopes.each do |scope|
-              build_scope(scope, options) if call_method_or_exec_proc(scope.display_if_block)
+              build_scope(scope, options) if display_scope?(scope)
             end
 
             nil
@@ -36,21 +32,19 @@ module ActiveAdmin
       protected
 
       def build_scope(scope, options)
-        li class: classes_for_scope(scope) do
-          params = request.query_parameters.except :page, :scope, :commit, :format
-
-          a href: url_for(scope: scope.id, params: params), class: "table_tools_button" do
-            text_node scope_name(scope)
-            span class: "count" do
-              "(#{get_scope_count(scope)})"
-            end if options[:scope_count] && scope.show_count
+        params = request.query_parameters.except :page, :scope, :commit, :format
+
+        a href: url_for(scope: scope.id, params: params), class: classes_for_scope(scope) do
+          text_node scope_name(scope)
+          if options[:scope_count] && scope.show_count
+            span get_scope_count(scope), class: "scopes-count"
           end
         end
       end
 
       def classes_for_scope(scope)
-        classes = ["scope", scope.id]
-        classes << "selected" if current_scope?(scope)
+        classes = ["index-button"]
+        classes << "index-button-selected" if current_scope?(scope)
         classes.join(" ")
       end
 
@@ -64,11 +58,30 @@ module ActiveAdmin
 
       # Return the count for the scope passed in.
       def get_scope_count(scope)
-        collection_size(scope_chain(scope, collection_before_scope))
+        chained = @async_counts[scope] || scope_chain(scope, collection_before_scope)
+
+        collection_size(chained)
+      end
+
+      def group_name(group)
+        group.present? ? group : "default"
+      end
+
+      private
+
+      def display_scope?(scope)
+        call_method_or_exec_proc(scope.display_if_block)
       end
 
-      def group_class(group)
-        group.present? ? "scope-group-#{group}" : "scope-default-group"
+      def prepare_async_counts(scopes, options)
+        @async_counts = if options[:scope_count]
+                          scopes
+                            .select(&:async_count?)
+                            .select { |scope| display_scope?(scope) }
+                            .index_with { |scope| AsyncCount.new(scope_chain(scope, collection_before_scope)) }
+                        else
+                          {}
+                        end
       end
     end
   end

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

@@ -9,12 +9,8 @@ module ActiveAdmin
         "span"
       end
 
-      def default_class_name
-        "status_tag"
-      end
-
       # @overload status_tag(status, options = {})
-      #   @param [String] status the status to display. One of the span classes will be an underscored version of the status.
+      #   @param [String] status the status to display.
       #   @param [Hash] options
       #   @option options [String] :class to override the default class
       #   @option options [String] :id to override the default id
@@ -22,17 +18,30 @@ module ActiveAdmin
       #   @return [ActiveAdmin::Views::StatusTag]
       #
       # @example
+      #   status_tag(true)
+      #   # => <span class="status-tag" data-status="yes">Yes</span>
+      #
+      # @example
+      #   status_tag(false)
+      #   # => <span class="status-tag" data-status="no">No</span>
+      #
+      # @example
+      #   status_tag(nil)
+      #   # => <span class="status-tag" data-status="unset">Unknown</span>
+      #
+      # @example
       #   status_tag('In Progress')
-      #   # => <span class='status_tag in_progress'>In Progress</span>
+      #   # => <span class="status-tag" data-status="in_progress">In Progress</span>
       #
       # @example
-      #   status_tag('active', class: 'important', id: 'status_123', label: 'on')
-      #   # => <span class='status_tag active important' id='status_123'>on</span>
+      #   status_tag('Active', class: 'important', id: 'status_123', label: 'on')
+      #   # => <span class="status-tag important" id="status_123" data-status="active">on</span>
       #
       def build(status, options = {})
         label = options.delete(:label)
         classes = options.delete(:class)
-        status = convert_to_boolean_status(status)
+        boolean_status = convert_to_boolean_status(status)
+        status = boolean_status || status
 
         if status
           content = label || if s = status.to_s and s.present?
@@ -41,8 +50,8 @@ module ActiveAdmin
         end
 
         super(content, options)
-
-        add_class(status_to_class(status)) if status
+        add_class "status-tag"
+        set_attribute("data-status", convert_status(status)) if status
         add_class(classes) if classes
       end
 
@@ -56,19 +65,13 @@ module ActiveAdmin
           "No"
         when nil
           "Unset"
-        else
-          status
         end
       end
 
-      def status_to_class(status)
+      def convert_status(status)
         case status
-        when "Unset"
-          "unset no"
         when String, Symbol
-          status.to_s.titleize.gsub(/\s/, "").underscore
-        else
-          ""
+          status.to_s.titleize.delete(" ").underscore
         end
       end
     end