activeadmin 2.8.1 → 2.10.1

data/lib/active_admin/sidebar_section.rb

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

data/lib/active_admin/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
-  VERSION = "2.8.1"
+  VERSION = "2.10.1"
 end

data/lib/active_admin/view_factory.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_admin/abstract_view_factory"
 
 module ActiveAdmin

data/lib/active_admin/view_helpers/active_admin_application_helper.rb

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

data/lib/active_admin/view_helpers/auto_link_helper.rb

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

data/lib/active_admin/view_helpers/breadcrumb_helper.rb

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

data/lib/active_admin/view_helpers/display_helper.rb

@@ -1,14 +1,22 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module DisplayHelper
 
       DISPLAY_NAME_FALLBACK = -> {
-        name = ""
         klass = self.class
-        name << klass.model_name.human if klass.respond_to? :model_name
-        name << " ##{send(klass.primary_key)}" if klass.respond_to? :primary_key
+        name = if klass.respond_to?(:model_name)
+                 if klass.respond_to?(:primary_key)
+                   "#{klass.model_name.human} ##{send(klass.primary_key)}"
+                 else
+                   klass.model_name.human
+                 end
+               elsif klass.respond_to?(:primary_key)
+                 " ##{send(klass.primary_key)}"
+               end
         name.present? ? name : to_s
       }
+
       def DISPLAY_NAME_FALLBACK.inspect
         "DISPLAY_NAME_FALLBACK"
       end

data/lib/active_admin/view_helpers/download_format_links_helper.rb

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

data/lib/active_admin/view_helpers/fields_for.rb

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

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,3 +1,4 @@
+# frozen_string_literal: true
 # Utility methods for internal use.
 # @private
 module MethodOrProcHelper

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,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
 

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
 

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
 

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

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
 
@@ -44,17 +45,14 @@ module ActiveAdmin
       private
 
       def build_button(name, button_options)
-        button_options[:class] ||= ""
-        button_options[:class] << " dropdown_menu_button"
-
+        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
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_admin/helpers/collection"
 
 module ActiveAdmin

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

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

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

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

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_admin/helpers/collection"
 require "active_admin/view_helpers/download_format_links_helper"
 

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

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

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_admin/helpers/collection"
 require "active_admin/view_helpers/method_or_proc_helper"
 

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

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

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

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

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

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

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

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

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
     class TableFor < Arbre::HTML::Table

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
     class Tabs < ActiveAdmin::Component

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
     class UnsupportedBrowser < Component

data/lib/active_admin/views/footer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
     class Footer < Component

data/lib/active_admin/views/header.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
     class Header < Component

data/lib/active_admin/views/index_as_block.rb

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

data/lib/active_admin/views/index_as_blog.rb

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

data/lib/active_admin/views/index_as_grid.rb

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

data/lib/active_admin/views/index_as_table.rb

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

data/lib/active_admin/views/pages/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
     module Pages
@@ -43,7 +44,9 @@ module ActiveAdmin
             end
 
             if active_admin_namespace.favicon
-              text_node(favicon_link_tag(active_admin_namespace.favicon))
+              favicon = active_admin_namespace.favicon
+              favicon_tag = active_admin_namespace.use_webpacker ? favicon_pack_tag(favicon) : favicon_link_tag(favicon)
+              text_node(favicon_tag)
             end
 
             text_node csrf_meta_tag

data/lib/active_admin/views/pages/form.rb

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

data/lib/active_admin/views/pages/index.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_admin/helpers/collection"
 
 module ActiveAdmin

data/lib/active_admin/views/pages/layout.rb

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

data/lib/active_admin/views/pages/page.rb

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

data/lib/active_admin/views/pages/show.rb

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

data/lib/active_admin/views/tabbed_navigation.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative "components/menu"
 
 module ActiveAdmin

data/lib/active_admin/views/title_bar.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
     class TitleBar < Component

data/lib/active_admin/views.rb

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

data/lib/active_admin.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_support/core_ext"
 require "set"
 
@@ -8,7 +9,6 @@ require "formtastic"
 require "formtastic_i18n"
 require "inherited_resources"
 require "jquery-rails"
-require "sassc-rails"
 require "arbre"
 
 require "active_admin/helpers/i18n"
@@ -113,7 +113,7 @@ module ActiveAdmin
     private
 
     def wrap_block_for_active_support_notifications block
-      proc { |event, *args| block.call *args }
+      proc { |_name, _start, _finish, _id, payload| block.call payload }
     end
 
   end

data/lib/activeadmin.rb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 require "active_admin"

data/lib/generators/active_admin/assets/assets_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Generators
     class AssetsGenerator < Rails::Generators::Base

data/lib/generators/active_admin/devise/devise_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_admin/error"
 require "active_admin/dependency"
 

data/lib/generators/active_admin/install/install_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "rails/generators/active_record"
 
 module ActiveAdmin

data/lib/generators/active_admin/install/templates/dashboard.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ActiveAdmin.register_page "Dashboard" do
   menu priority: 1, label: proc { I18n.t("active_admin.dashboard") }
 

data/lib/generators/active_admin/page/page_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Generators
     class PageGenerator < Rails::Generators::NamedBase

data/lib/generators/active_admin/page/templates/page.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ActiveAdmin.register_page "<%= class_name %>" do
   content do
     # your content

data/lib/generators/active_admin/resource/resource_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_admin/generators/boilerplate"
 
 module ActiveAdmin

data/lib/generators/active_admin/webpacker/webpacker_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Generators
     class WebpackerGenerator < Rails::Generators::Base

data/lib/ransack_ext.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This sets up aliases for old Metasearch query methods so they behave
 # identically to the versions given in Ransack.
 #