activeadmin 1.1.0 → 2.12.0

data/lib/active_admin/view_helpers/download_format_links_helper.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module DownloadFormatLinksHelper
+      private
 
       def build_download_formats(download_links)
         download_links = instance_exec(&download_links) if download_links.is_a?(Proc)
@@ -17,7 +19,7 @@ module ActiveAdmin
       def build_download_format_links(formats = self.class.formats)
         params = request.query_parameters.except :format, :commit
         div class: "download_links" do
-          span I18n.t('active_admin.download')
+          span I18n.t("active_admin.download")
           formats.each do |format|
             a format.upcase, href: url_for(params: params, format: format)
           end

data/lib/active_admin/view_helpers/fields_for.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module FormHelper
@@ -15,7 +16,7 @@ module ActiveAdmin
       #
       def fields_for_params(params, options = {})
         namespace = options[:namespace]
-        except    = Array.wrap(options[:except]).map &:to_s
+        except = Array.wrap(options[:except]).map &:to_s
 
         params.flat_map do |k, v|
           next if namespace.nil? && %w(controller action commit utf8).include?(k.to_s)
@@ -37,7 +38,7 @@ module ActiveAdmin
               { "#{k}[]" => v }
             end
           when nil
-            { k => '' }
+            { k => "" }
           when TrueClass, FalseClass
             { k => v }
           else

data/lib/active_admin/view_helpers/flash_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module FlashHelper

data/lib/active_admin/view_helpers/form_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module FormHelper

data/lib/active_admin/view_helpers/method_or_proc_helper.rb

@@ -1,4 +1,8 @@
+# frozen_string_literal: true
+# Utility methods for internal use.
+# @private
 module MethodOrProcHelper
+  extend self
 
   # This method will either call the symbol on self or instance_exec the Proc
   # within self. Any args will be passed along to the method dispatch.

data/lib/active_admin/view_helpers/scope_name_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module ScopeNameHelper

data/lib/active_admin/view_helpers/sidebar_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module SidebarHelper

data/lib/active_admin/view_helpers/title_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module TitleHelper

data/lib/active_admin/view_helpers/view_factory_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module ViewFactoryHelper

data/lib/active_admin/view_helpers.rb

@@ -1,8 +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', __FILE__) + "/*.rb"].each{|f| require f }
+    Dir[File.expand_path("view_helpers", __dir__) + "/*.rb"].each { |f| require f }
 
     include ActiveAdminApplicationHelper
     include AutoLinkHelper

data/lib/active_admin/views/action_items.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
     class FormtasticProxy < ::Arbre::Rails::Forms::FormBuilderProxy
@@ -16,7 +17,7 @@ module ActiveAdmin
       end
 
       def to_s
-        opening_tag << children.to_s << closing_tag
+        opening_tag + children.to_s + closing_tag
       end
     end
 
@@ -57,6 +58,12 @@ module ActiveAdmin
           end
           insert_tag(SemanticInputsProxy, form_builder, *args, &wrapped_block)
         else
+          # Set except option to prevent sensitive fields from being shown in forms by default.
+          opts = args.extract_options!
+          opts[:except] ||= []
+          ActiveAdmin.application.filter_attributes.each { |e| opts[:except] << e }
+          args << opts
+
           proxy_call_to_form(:inputs, *args, &block)
         end
       end
@@ -105,15 +112,14 @@ module ActiveAdmin
         create_another = params[:create_another]
         label = @resource.class.model_name.human
         Arbre::Context.new do
-          li do
+          li class: "create_another" do
             input(
               checked: create_another,
-              id: 'create_another',
-              class: 'create_another',
-              name: 'create_another',
-              type: 'checkbox',
+              id: "create_another",
+              name: "create_another",
+              type: "checkbox"
             )
-            label(I18n.t('active_admin.create_another', model: label), for: 'create_another')
+            label(I18n.t("active_admin.create_another", model: label), for: "create_another")
           end
         end
       end
@@ -126,7 +132,7 @@ module ActiveAdmin
         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>" : ""
-        fieldset_attrs = html_options.map {|k, v| %Q{#{k}="#{v}"} }.join(" ")
+        fieldset_attrs = html_options.map { |k, v| %Q{#{k}="#{v}"} }.join(" ")
         @opening_tag = "<fieldset #{fieldset_attrs}>#{legend_tag}<ol>"
         @closing_tag = "</ol></fieldset>"
         super(*(args << html_options), &block)

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

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+require "active_admin/filters/active"
+
+module ActiveAdmin
+  module Views
+
+    class ActiveFiltersSidebarContent < ActiveAdmin::Component
+      builder_method :active_filters_sidebar_content
+
+      def build
+        active_filters = ActiveAdmin::Filters::Active.new(active_admin_config, assigns[:search])
+        active_scopes = assigns[:search].instance_variable_get("@scope_args")
+
+        scope_block(current_scope)
+        filters_list(active_filters, active_scopes)
+      end
+
+      def scope_block(current_scope)
+        return unless current_scope
+
+        h4 I18n.t("active_admin.search_status.current_scope"), style: "display: inline"
+        b scope_name(current_scope), class: "current_scope_name"
+      end
+
+      def filters_list(active_filters, active_scopes)
+        div style: "margin-top: 10px" do
+          h4 I18n.t("active_admin.search_status.current_filters"), style: "margin-bottom: 10px"
+          ul do
+            if active_filters.filters.blank? && active_scopes.blank?
+              li I18n.t("active_admin.search_status.no_current_filters")
+            else
+              active_filters.filters.each { |filter| filter_item(filter) }
+              active_scopes.each { |name, value| scope_item(name, value) }
+            end
+          end
+        end
+      end
+
+      def filter_item(filter)
+        li filter.html_options do
+          span filter.label
+          b to_sentence(filter.values.map { |v| pretty_format(v) })
+        end
+      end
+
+      def scope_item(name, value)
+        filter_name = name.gsub(/_eq$/, "")
+        filter = active_admin_config.filters[filter_name.to_sym]
+        label = filter.try(:[], :label) || filter_name.titleize
+
+        li class: "current_filter_#{name}" do
+          span "#{label} #{Ransack::Translate.predicate('eq')}"
+          b value
+        end
+      end
+    end
+
+  end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
 
@@ -5,9 +6,9 @@ module ActiveAdmin
       builder_method :attributes_table_for
 
       def build(obj, *attrs)
-        @collection     = Array.wrap(obj)
+        @collection = Array.wrap(obj)
         @resource_class = @collection.first.class
-        options = { }
+        options = {}
         options[:for] = @collection.first if single_record?
         super(options)
         @table = table
@@ -16,19 +17,19 @@ module ActiveAdmin
       end
 
       def rows(*attrs)
-        attrs.each {|attr| row(attr) }
+        attrs.each { |attr| row(attr) }
       end
 
       def row(*args, &block)
-        title   = args[0]
+        title = args[0]
         options = args.extract_options!
         classes = [:row]
         if options[:class]
           classes << options[:class]
         elsif title.present?
-          classes << "row-#{ActiveAdmin::Dependency.rails.parameterize(title.to_s)}"
+          classes << "row-#{title.to_s.parameterize(separator: "_")}"
         end
-        options[:class] = classes.join(' ')
+        options[:class] = classes.join(" ")
 
         @table << tr(options) do
           th do
@@ -45,7 +46,7 @@ module ActiveAdmin
       protected
 
       def default_id_for_prefix
-        'attributes_table'
+        "attributes_table"
       end
 
       # Build Colgroups
@@ -75,7 +76,7 @@ module ActiveAdmin
       end
 
       def empty_value
-        span I18n.t('active_admin.empty'), class: "empty"
+        span I18n.t("active_admin.empty"), class: "empty"
       end
 
       def content_for(record, attr)

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
     # Build a Blank Slate
@@ -5,7 +6,7 @@ module ActiveAdmin
       builder_method :blank_slate
 
       def default_class_name
-        'blank_slate_container'
+        "blank_slate_container"
       end
 
       def build(content)

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
 
@@ -35,30 +36,27 @@ module ActiveAdmin
         super(options)
       end
 
-      def item(*args)
+      def item(*args, **kwargs)
         within @menu do
-          li link_to(*args)
+          li link_to(*args, **kwargs)
         end
       end
 
       private
 
       def build_button(name, button_options)
-        button_options[:class] ||= ''
-        button_options[:class] << ' dropdown_menu_button'
-
-        button_options[:href] = '#'
+        button_options[:class] = "#{button_options[:class]} dropdown_menu_button"
+        button_options[:href] = "#"
 
         a name, button_options
       end
 
       def build_menu(options)
-        options[:class] ||= ''
-        options[:class] << ' dropdown_menu_list'
+        options[:class] = "#{options[:class]} dropdown_menu_list"
 
         menu_list = nil
 
-        div class: 'dropdown_menu_list_wrapper' do
+        div class: "dropdown_menu_list_wrapper" do
           menu_list = ul(options)
         end
 

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

@@ -1,4 +1,5 @@
-require 'active_admin/helpers/collection'
+# frozen_string_literal: true
+require "active_admin/helpers/collection"
 
 module ActiveAdmin
   module Views
@@ -15,7 +16,7 @@ module ActiveAdmin
       end
 
       def tag_name
-        'ul'
+        "ul"
       end
 
       # Builds the links for presenting different index views to the user
@@ -37,7 +38,7 @@ module ActiveAdmin
       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))
+          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

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+module ActiveAdmin
+  module Views
+
+    # Renders an ActiveAdmin::Menu as a set of unordered list items.
+    #
+    # This component takes cares of deciding which items should be
+    # displayed given the current context and renders them appropriately.
+    #
+    # The entire component is rendered within one ul element.
+    class Menu < Component
+      attr_reader :menu
+      builder_method :menu
+
+      # @param [ActiveAdmin::Menu] menu the Menu to render
+      # @param [Hash] options the options as passed to the underlying ul element.
+      #
+      def build(menu, options = {})
+        @menu = menu
+        super(options)
+
+        menu.items.each do |item|
+          menu_item(item) if helpers.render_in_context self, item.should_display
+        end
+        children.sort!
+      end
+
+      def tag_name
+        "ul"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+module ActiveAdmin
+  module Views
+
+    # Arbre component used to render ActiveAdmin::MenuItem
+    class MenuItem < Component
+      builder_method :menu_item
+      attr_reader :label
+      attr_reader :url
+      attr_reader :priority
+
+      def build(item, options = {})
+        super(options.merge(id: item.id))
+        @label = helpers.render_in_context self, item.label
+        @url = helpers.render_in_context self, item.url
+        @priority = item.priority
+        @submenu = nil
+
+        add_class "current" if item.current? assigns[:current_tab]
+
+        if url
+          text_node link_to label, url, **item.html_options
+        else
+          span label, item.html_options
+        end
+
+        if item.items.any?
+          add_class "has_nested"
+          @submenu = menu(item)
+        end
+      end
+
+      def tag_name
+        "li"
+      end
+
+      # Sorts by priority first, then alphabetically by label if needed.
+      def <=>(other)
+        result = priority <=> other.priority
+        result == 0 ? label <=> other.label : result
+      end
+
+      def visible?
+        url.nil? || real_url? || @submenu && @submenu.children.any?
+      end
+
+      def to_s
+        visible? ? super : ""
+      end
+
+      private
+
+      # URL is not nil, empty, or '#'
+      def real_url?
+        url && url.present? && url != "#"
+      end
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
-require 'active_admin/helpers/collection'
-require 'active_admin/view_helpers/download_format_links_helper'
+# frozen_string_literal: true
+require "active_admin/helpers/collection"
+require "active_admin/view_helpers/download_format_links_helper"
 
 module ActiveAdmin
   module Views
@@ -38,12 +39,12 @@ module ActiveAdmin
       #   download_links => Download links override (false or [:csv, :pdf])
       #
       def build(collection, options = {})
-        @collection     = collection
-        @params         = options.delete(:params)
-        @param_name     = options.delete(:param_name)
+        @collection = collection
+        @params = options.delete(:params)
+        @param_name = options.delete(:param_name)
         @download_links = options.delete(:download_links)
-        @display_total  = options.delete(:pagination_total) { true }
-        @per_page       = options.delete(:per_page)
+        @display_total = options.delete(:pagination_total) { true }
+        @per_page = options.delete(:per_page)
 
         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.")
@@ -92,22 +93,22 @@ module ActiveAdmin
       end
 
       def build_pagination
-        options = { theme: 'active_admin' }
-        options[:params]     = @params     if @params
+        options = { theme: @display_total ? "active_admin" : "active_admin_countless" }
+        options[:params] = @params if @params
         options[:param_name] = @param_name if @param_name
 
-        if !@display_total && collection.respond_to?(:offset)
+        if !@display_total
           # The #paginate method in kaminari will query the resource with a
           # count(*) to determine how many pages there should be unless
           # 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 * @per_page.to_i).limit(1).count
+          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
@@ -116,27 +117,28 @@ module ActiveAdmin
       # modified from will_paginate
       def page_entries_info(options = {})
         if options[:entry_name]
-          entry_name   = options[:entry_name]
+          entry_name = options[:entry_name]
           entries_name = options[:entries_name] || entry_name.pluralize
         elsif collection_is_empty?
-          entry_name   = I18n.t "active_admin.pagination.entry", count: 1, default: 'entry'
-          entries_name = I18n.t "active_admin.pagination.entry", count: 2, default: 'entries'
+          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
-          entry_name   = I18n.translate key, count: 1,               default: collection.first.class.name.underscore.sub('_', ' ')
+
+          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
-            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)
+            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)
             end
           else
             offset = (collection.current_page - 1) * collection.limit_value
-            total  = collection.total_count
+            total = collection.total_count
             I18n.t "active_admin.pagination.multiple",
                    model: entries_name,
                    total: total,

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
 
@@ -29,7 +30,7 @@ module ActiveAdmin
       def header_action(*args)
         action = args[0]
 
-        @title << div(class: 'header_action') do
+        @title << div(class: "header_action") do
           action
         end
       end

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

@@ -1,5 +1,6 @@
-require 'active_admin/helpers/collection'
-require 'active_admin/view_helpers/method_or_proc_helper'
+# frozen_string_literal: true
+require "active_admin/helpers/collection"
+require "active_admin/view_helpers/method_or_proc_helper"
 
 module ActiveAdmin
   module Views
@@ -13,16 +14,22 @@ module ActiveAdmin
       include ::ActiveAdmin::Helpers::Collection
 
       def default_class_name
-        "scopes table_tools_segmented_control"
+        "scopes"
       end
 
       def tag_name
-        'ul'
+        "div"
       end
 
       def build(scopes, options = {})
-        scopes.each do |scope|
-          build_scope(scope, options) if call_method_or_proc_on(self, scope.display_if_block)
+        scopes.group_by(&:group).each do |group, group_scopes|
+          ul class: "table_tools_segmented_control #{group_class(group)}" do
+            group_scopes.each do |scope|
+              build_scope(scope, options) if call_method_or_exec_proc(scope.display_if_block)
+            end
+
+            nil
+          end
         end
       end
 
@@ -32,9 +39,9 @@ module ActiveAdmin
         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
+          a href: url_for(scope: scope.id, params: params), class: "table_tools_button" do
             text_node scope_name(scope)
-            span class: 'count' do
+            span class: "count" do
               "(#{get_scope_count(scope)})"
             end if options[:scope_count] && scope.show_count
           end
@@ -60,6 +67,9 @@ module ActiveAdmin
         collection_size(scope_chain(scope, collection_before_scope))
       end
 
+      def group_class(group)
+        group.present? ? "scope-group-#{group}" : "scope-default-group"
+      end
     end
   end
 end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+module ActiveAdmin
+  module Views
+
+    class Sidebar < Component
+      builder_method :sidebar
+
+      def build(sections, attributes = {})
+        super(attributes)
+        sections.map(&method(:sidebar_section))
+      end
+    end
+  end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views