activeadmin 3.3.0 → 4.0.0.beta1

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,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_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
+          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

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)
@@ -26,14 +26,6 @@ module ActiveAdmin
       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,29 +1,22 @@
 # frozen_string_literal: true
-require "active_admin/helpers/collection"
 require "active_admin/view_helpers/method_or_proc_helper"
 
 module ActiveAdmin
   module Views
-
     # Renders a collection of ActiveAdmin::Scope objects as a
     # simple list with a seperator
     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"
         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)
             end
@@ -36,21 +29,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
+        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
+        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
 
@@ -67,8 +58,8 @@ module ActiveAdmin
         collection_size(scope_chain(scope, collection_before_scope))
       end
 
-      def group_class(group)
-        group.present? ? "scope-group-#{group}" : "scope-default-group"
+      def group_name(group)
+        group.present? ? group : "default"
       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

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

@@ -20,6 +20,7 @@ module ActiveAdmin
 
         build_table
         super(options)
+        add_class "data-table"
         columns(*attrs)
       end
 
@@ -66,20 +67,26 @@ module ActiveAdmin
       end
 
       def build_table_header(col)
-        classes = Arbre::HTML::ClassList.new
         sort_key = sortable? && col.sortable? && col.sort_key
         params = request.query_parameters.except :page, :order, :commit, :format
 
-        classes << "sortable" if sort_key
-        classes << "sorted-#{current_sort[1]}" if sort_key && current_sort[0] == sort_key
-        classes << col.html_class
+        attributes = {
+          class: col.html_class,
+          "data-column": col.title_id.presence,
+          "data-sortable": (sort_key.present?) ? "" : nil,
+          "data-sort-direction": (sort_key && current_sort[0] == sort_key) ? current_sort[1] : nil
+        }
 
         if sort_key
-          th class: classes do
-            link_to col.pretty_title, params: params, order: "#{sort_key}_#{order_for_sort_key(sort_key)}"
+          th(attributes) do
+            link_to params: params, order: "#{sort_key}_#{order_for_sort_key(sort_key)}" do
+              svg = '<svg class="data-table-sorted-icon" fill="none" viewBox="0 0 10 6"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/></svg>'
+
+              (col.pretty_title + svg).html_safe
+            end
           end
         else
-          th col.pretty_title, class: classes
+          th col.pretty_title, attributes
         end
       end
 
@@ -87,19 +94,13 @@ module ActiveAdmin
         @tbody = tbody do
           # Build enough rows for our collection
           @collection.each do |elem|
-            classes = [helpers.cycle("odd", "even")]
-
-            if @row_class
-              classes << @row_class.call(elem)
-            end
-
-            tr(class: classes.flatten.join(" "), id: dom_id_for(elem))
+            tr(id: dom_id_for(elem), class: @row_class&.call(elem))
           end
         end
       end
 
       def build_table_cell(col, resource)
-        td class: col.html_class do
+        td class: col.html_class, "data-column": col.title_id.presence do
           html = helpers.format_attribute(resource, col.data)
           # Don't add the same Arbre twice, while still allowing format_attribute to call status_tag
           current_arbre_element << html unless current_arbre_element.children.include? html
@@ -139,19 +140,13 @@ module ActiveAdmin
 
       class Column
 
-        attr_accessor :title, :data, :html_class
+        attr_accessor :title, :title_id, :data, :html_class
 
         def initialize(*args, &block)
           @options = args.extract_options!
-
           @title = args[0]
-          html_classes = [:col]
-          if @options.has_key?(:class)
-            html_classes << @options.delete(:class)
-          elsif @title.present?
-            html_classes << "col-#{@title.to_s.parameterize(separator: "_")}"
-          end
-          @html_class = html_classes.join(" ")
+          @title_id = @title.to_s.parameterize(separator: "_") if @title.present? && !title.is_a?(Arbre::Element)
+          @html_class = @options.delete(:class)
           @data = args[1] || args[0]
           @data = block if block
           @resource_class = args[2]

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

@@ -10,31 +10,30 @@ module ActiveAdmin
         @tabs_content << build_content_item(title, options, &block)
       end
 
-      def build(&block)
-        @menu = ul(class: "nav nav-tabs", role: "tablist")
-        @tabs_content = div(class: "tab-content")
+      def build(attributes = {}, &block)
+        super(attributes)
+        add_class "tabs"
+        @menu = nav(class: "tabs-nav", role: "tablist", "data-tabs-toggle": "#tabs-container-#{object_id}")
+        @tabs_content = div(class: "tabs-content", id: "tabs-container-#{object_id}")
       end
 
       def build_menu_item(title, options, &block)
         fragment = options.fetch(:id, fragmentize(title))
-
-        html_options = options.fetch(:html_options, {})
-        li html_options do
-          link_to title, "##{fragment}"
+        html_options = options.fetch(:html_options, {}).merge("data-tabs-target": "##{fragment}", role: "tab", "aria-controls": fragment)
+        button html_options do
+          title
         end
       end
 
       def build_content_item(title, options, &block)
-        options = options.reverse_merge(id: fragmentize(title))
+        options = options.reverse_merge(id: fragmentize(title), class: "hidden", role: "tabpanel", "aria-labelledby": "#{title}-tab")
         div(options, &block)
       end
 
       private
 
       def fragmentize(string)
-        result = string.parameterize
-        result = CGI.escape(string) if result.blank?
-        result
+        "tabs-#{string.parameterize}-#{object_id}"
       end
     end
   end