activeadmin 3.2.0 → 4.0.0.beta2

data/lib/active_admin/filters/active_filter.rb

@@ -3,8 +3,6 @@ module ActiveAdmin
   module Filters
 
     class ActiveFilter
-      include ActiveAdmin::ViewHelpers
-
       attr_reader :resource, :condition, :related_class
 
       # Instantiate a `ActiveFilter`
@@ -46,7 +44,7 @@ module ActiveAdmin
       end
 
       def html_options
-        { class: "current_filter current_filter_#{condition.key}" }
+        { "data-filter": condition.key }
       end
 
       private

data/lib/active_admin/filters/forms.rb

@@ -21,7 +21,7 @@ module ActiveAdmin
       # Returns the default filter type for a given attribute. If you want
       # to use a custom search method, you have to specify the type yourself.
       def default_input_type(method, options = {})
-        if method =~ /_(eq|cont|start|end)\z/
+        if /_(eq|cont|start|end)\z/.match?(method)
           :string
         elsif klass._ransackers.key?(method.to_s)
           klass._ransackers[method.to_s].type
@@ -41,46 +41,5 @@ module ActiveAdmin
         end
       end
     end
-
-    # This module is included into the view
-    module ViewHelper
-
-      # Helper method to render a filter form
-      def active_admin_filters_form_for(search, filters, options = {})
-        defaults = { builder: ActiveAdmin::Filters::FormBuilder,
-                     url: collection_path,
-                     html: { class: "filter_form" } }
-        required = { html: { method: :get },
-                     as: :q }
-        options = defaults.deep_merge(options).deep_merge(required)
-
-        form_for search, options do |f|
-          filters.each do |attribute, opts|
-            next if opts.key?(:if) && !call_method_or_proc_on(self, opts[:if])
-            next if opts.key?(:unless) && call_method_or_proc_on(self, opts[:unless])
-
-            filter_opts = opts.except(:if, :unless)
-            filter_opts[:input_html] = instance_exec(&filter_opts[:input_html]) if filter_opts[:input_html].is_a?(Proc)
-
-            f.filter attribute, filter_opts
-          end
-
-          buttons = content_tag :div, class: "buttons" do
-            f.submit(I18n.t("active_admin.filters.buttons.filter")) +
-              link_to(I18n.t("active_admin.filters.buttons.clear"), "#", class: "clear_filters_btn") +
-              hidden_field_tags_for(params, except: except_hidden_fields)
-          end
-
-          f.template.concat buttons
-        end
-      end
-
-      private
-
-      def except_hidden_fields
-        [:q, :page]
-      end
-    end
-
   end
 end

data/lib/active_admin/filters/resource_extension.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+require "active_admin/filters/active"
+
 module ActiveAdmin
   module Filters
-
     class Disabled < RuntimeError
       def initialize(action)
         super "Cannot #{action} a filter when filters are disabled. Enable filters with 'config.filters = true'"
@@ -9,11 +10,10 @@ module ActiveAdmin
     end
 
     module ResourceExtension
-
       def initialize(*)
         super
         add_filters_sidebar_section
-        add_search_status_sidebar_section
+        add_active_search_sidebar_section
       end
 
       # Returns the filters for this resource. If filters are not enabled,
@@ -98,7 +98,7 @@ module ActiveAdmin
         end
 
         if @filters_to_remove
-          @filters_to_remove.each &filters.method(:delete)
+          @filters_to_remove.each { |filter| filters.delete(filter) }
         end
 
         filters
@@ -139,7 +139,7 @@ module ActiveAdmin
             end
 
             # Remove high-arity associations with no searchable column
-            high_arity = high_arity.select(&method(:searchable_column_for))
+            high_arity = high_arity.select { |r| searchable_column_for(r) }
 
             high_arity = high_arity.map { |r| r.name.to_s + "_" + searchable_column_for(r) + namespace.filter_method_for_large_association }
 
@@ -165,16 +165,24 @@ module ActiveAdmin
       end
 
       def filters_sidebar_section
-        ActiveAdmin::SidebarSection.new :filters, only: :index, if: -> { active_admin_config.filters.any? } do
+        name = :filters
+        ActiveAdmin::SidebarSection.new name, only: :index, if: -> { active_admin_config.filters.any? } do
+          h3 I18n.t("active_admin.sidebars.#{name}", default: name.to_s.titlecase), class: "filters-form-title"
           active_admin_filters_form_for assigns[:search], **active_admin_config.filters
         end
       end
 
-      def add_search_status_sidebar_section
-        self.sidebar_sections << ActiveAdmin::Filters::ActiveSidebar.new
+      def add_active_search_sidebar_section
+        self.sidebar_sections << active_search_sidebar_section
       end
 
+      def active_search_sidebar_section
+        name = :active_search
+        ActiveAdmin::SidebarSection.new name, only: :index, if: -> { active_admin_config.current_filters_enabled? && (params[:q] || params[:scope]) } do
+          filters = ActiveAdmin::Filters::Active.new(active_admin_config, assigns[:search])
+          render "active_filters", active_filters: filters
+        end
+      end
     end
-
   end
 end

data/lib/active_admin/filters.rb

@@ -4,9 +4,7 @@ require "active_admin/filters/resource_extension"
 require "active_admin/filters/formtastic_addons"
 require "active_admin/filters/forms"
 require "active_admin/helpers/optional_display"
-require "active_admin/filters/active_sidebar"
 
 # Add our Extensions
 ActiveAdmin::ResourceDSL.send :include, ActiveAdmin::Filters::DSL
 ActiveAdmin::Resource.send :include, ActiveAdmin::Filters::ResourceExtension
-ActiveAdmin::ViewHelpers.send :include, ActiveAdmin::Filters::ViewHelper

data/lib/active_admin/form_builder.rb

@@ -22,7 +22,8 @@ module ActiveAdmin
     self.action_class_finder = ::Formtastic::ActionClassFinder
 
     def cancel_link(url = { action: "index" }, html_options = {}, li_attrs = {})
-      li_attrs[:class] ||= "cancel"
+      li_attrs[:class] ||= "action cancel"
+      html_options[:class] ||= "cancel-link"
       li_content = template.link_to I18n.t("active_admin.cancel"), url, html_options
       template.content_tag(:li, li_content, li_attrs)
     end
@@ -48,7 +49,7 @@ module ActiveAdmin
       @assoc = assoc
       @options = extract_custom_settings!(options.dup)
       @options.reverse_merge!(for: assoc)
-      @options[:class] = [options[:class], "inputs has_many_fields"].compact.join(" ")
+      @options[:class] = [options[:class], "inputs has-many-fields"].compact.join(" ")
 
       if sortable_column
         @options[:for] = [assoc, sorted_children(sortable_column)]
@@ -57,7 +58,7 @@ module ActiveAdmin
 
     def render(&block)
       html = "".html_safe
-      html << template.content_tag(:h3) { heading } if heading.present?
+      html << template.content_tag(:h3, class: "has-many-fields-title") { heading } if heading.present?
       html << template.capture { content_has_many(&block) }
       html = wrap_div_or_li(html)
       template.concat(html) if template.output_buffer
@@ -78,8 +79,7 @@ module ActiveAdmin
     end
 
     def default_heading
-      assoc_klass.model_name.
-        human(count: ::ActiveAdmin::Helpers::I18n::PLURAL_MANY_COUNT)
+      assoc_klass.model_name.human(count: 2.1)
     end
 
     def assoc_klass
@@ -108,23 +108,23 @@ module ActiveAdmin
 
     def has_many_actions(form_builder, contents)
       if form_builder.object.new_record?
-        contents << template.content_tag(:li) do
+        contents << template.content_tag(:li, class: "input") do
           remove_text = remove_record.is_a?(String) ? remove_record : I18n.t("active_admin.has_many_remove")
-          template.link_to remove_text, "#", class: "button has_many_remove"
+          template.link_to remove_text, "#", class: "has-many-remove"
         end
       elsif allow_destroy?(form_builder.object)
         form_builder.input(
           :_destroy, as: :boolean,
-                     wrapper_html: { class: "has_many_delete" },
+                     wrapper_html: { class: "has-many-delete" },
                      label: I18n.t("active_admin.has_many_delete"))
       end
 
       if sortable_column
         form_builder.input sortable_column, as: :hidden
 
-        contents << template.content_tag(:li, class: "handle") do
-          I18n.t("active_admin.move")
-        end
+        # contents << template.content_tag(:li, class: "handle") do
+        #   I18n.t("active_admin.move")
+        # end
       end
 
       contents
@@ -161,7 +161,7 @@ module ActiveAdmin
     # Capture the ADD JS
     def js_for_has_many(class_string, &form_block)
       assoc_name = assoc_klass.model_name
-      placeholder = "NEW_#{assoc_name.to_s.underscore.upcase.gsub(/\//, '_')}_RECORD"
+      placeholder = "NEW_#{assoc_name.to_s.underscore.upcase.tr('/', '_')}_RECORD"
       opts = {
         for: [assoc, assoc_klass.new],
         class: class_string,
@@ -170,7 +170,7 @@ module ActiveAdmin
       html = template.capture { __getobj__.send(:inputs_for_nested_attributes, opts, &form_block) }
       text = new_record.is_a?(String) ? new_record : I18n.t("active_admin.has_many_new", model: assoc_name.human)
 
-      template.link_to text, "#", class: "button has_many_add", data: {
+      template.link_to text, "#", class: "has-many-add", data: {
         html: CGI.escapeHTML(html).html_safe, placeholder: placeholder
       }
     end
@@ -179,7 +179,8 @@ module ActiveAdmin
       template.content_tag(
         already_in_an_inputs_block ? :li : :div,
         html,
-        class: "has_many_container #{assoc}",
+        class: "has-many-container",
+        "data-has-many-association" => assoc,
         "data-sortable" => sortable_column,
         "data-sortable-start" => sortable_start)
     end

data/lib/active_admin/inputs/filters/base/search_method_select.rb

@@ -30,17 +30,15 @@ module ActiveAdmin
             end
           end
 
-          def wrapper_html_options
-            opts = super
-            (opts[:class] ||= "") << " select_and_search" unless seems_searchable?
-            opts
-          end
-
           def to_html
             input_wrapping do
-              label_html << # your label
-              select_html << # the dropdown that holds the available search methods
-              input_html # your input field
+              [
+                label_html, # your label
+                '<div class="filters-form-input-group">',
+                select_html, # the dropdown that holds the available search methods
+                input_html, # your input field
+                '</div>'
+              ].join("\n").html_safe
             end
           end
 
@@ -49,7 +47,7 @@ module ActiveAdmin
           end
 
           def select_html
-            template.select_tag "", template.options_for_select(filter_options, current_filter)
+            template.select_tag "", template.options_for_select(filter_options, current_filter), "data-search-methods": ""
           end
 
           def filters

data/lib/active_admin/inputs/filters/base.rb

@@ -26,7 +26,7 @@ module ActiveAdmin
 
         def wrapper_html_options
           opts = super
-          (opts[:class] ||= "") << " filter_form_field filter_#{as}"
+          (opts[:class] ||= "") << " filters-form-field"
           opts
         end
 

data/lib/active_admin/inputs/filters/check_boxes_input.rb

@@ -10,7 +10,7 @@ module ActiveAdmin
         end
 
         def selected_values
-          @object.public_send("#{searchable_method_name}_in") || []
+          @object.public_send(:"#{searchable_method_name}_in") || []
         end
 
         def searchable_method_name
@@ -21,11 +21,6 @@ module ActiveAdmin
           end
         end
 
-        # Add whitespace before label
-        def choice_label(choice)
-          " " + super
-        end
-
         # Don't wrap in UL tag
         def choices_group_wrapping(&block)
           template.capture(&block)

data/lib/active_admin/inputs/filters/date_range_input.rb

@@ -8,8 +8,10 @@ module ActiveAdmin
         def to_html
           input_wrapping do
             [ label_html,
-              builder.text_field(gt_input_name, input_html_options_for(gt_input_name, gt_input_placeholder)),
-              builder.text_field(lt_input_name, input_html_options_for(lt_input_name, lt_input_placeholder)),
+              '<div class="filters-form-input-group">',
+              builder.date_field(gt_input_name, input_html_options_for(gt_input_name, gt_input_placeholder)),
+              builder.date_field(lt_input_name, input_html_options_for(lt_input_name, lt_input_placeholder)),
+              '</div>'
             ].join("\n").html_safe
           end
         end

data/lib/active_admin/inputs.rb

@@ -3,15 +3,12 @@ module ActiveAdmin
   module Inputs
     extend ActiveSupport::Autoload
 
-    autoload :DatepickerInput
-
     module Filters
       extend ActiveSupport::Autoload
 
       autoload :Base
       autoload :StringInput
       autoload :TextInput
-      autoload :DatePickerInput
       autoload :DateRangeInput
       autoload :NumericInput
       autoload :SelectInput

data/lib/active_admin/menu.rb

@@ -49,10 +49,7 @@ module ActiveAdmin
       #
       def add(options)
         options = options.dup # Make sure parameter is not modified
-        parent_chain = Array.wrap(options.delete(:parent))
-
-        item = if parent = parent_chain.shift
-                 options[:parent] = parent_chain if parent_chain.any?
+        item = if parent = options.delete(:parent)
                  (self[parent] || add(label: parent)).add options
                else
                  _add options.merge parent: self
@@ -65,7 +62,7 @@ module ActiveAdmin
 
       # Whether any children match the given item.
       def include?(item)
-        @children.values.include?(item) || @children.values.any? { |child| child.include?(item) }
+        @children.value?(item)
       end
 
       # Used in the UI to visually distinguish which menu item is selected.
@@ -73,8 +70,14 @@ module ActiveAdmin
         self == item || include?(item)
       end
 
-      def items
-        @children.values
+      # Returns sorted array of menu items that should be displayed in this context.
+      # Sorts by priority first, then alphabetically by label if needed.
+      def items(context = nil)
+        @children.values.select { |i| i.display?(context) }.sort do |a, b|
+          result = a.priority <=> b.priority
+          result = a.label(context) <=> b.label(context) if result == 0
+          result
+        end
       end
 
       attr_reader :children

data/lib/active_admin/menu_collection.rb

@@ -25,7 +25,7 @@ module ActiveAdmin
     end
 
     def exists?(menu_name)
-      @menus.keys.include? menu_name
+      @menus.key?(menu_name)
     end
 
     def fetch(menu_name)

data/lib/active_admin/menu_item.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
+require 'active_admin/view_helpers/method_or_proc_helper'
+
 module ActiveAdmin
   class MenuItem
     include Menu::MenuNode
+    include MethodOrProcHelper
 
     attr_reader :html_options, :parent, :priority
 
@@ -61,10 +64,28 @@ module ActiveAdmin
       @id ||= normalize_id @dirty_id
     end
 
-    attr_reader :label
-    attr_reader :url
+    def label(context = nil)
+      render_in_context(context, @label)
+    end
+
+    def url(context = nil)
+      render_in_context(context, @url)
+    end
 
     # Don't display if the :if option passed says so
-    attr_reader :should_display
+    # Don't display if the link isn't real, we have children, and none of the children are being displayed.
+    def display?(context = nil)
+      return false unless render_in_context(context, @should_display)
+      return false if !real_url?(context) && @children.any? && !items(context).any?
+      true
+    end
+
+    private
+
+    # URL is not nil, empty, or '#'
+    def real_url?(context = nil)
+      url = url context
+      url.present? && url != '#'
+    end
   end
 end

data/lib/active_admin/namespace.rb

@@ -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

@@ -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