activeadmin 3.2.1 → 4.0.0.beta1

data/config/locales/sv-SE.yml

@@ -17,9 +17,6 @@
         updated_at: "Aktualiserad"
   active_admin:
     dashboard: Skrivbord
-    dashboard_welcome:
-      welcome: "Välkommen till Active Admin. Detta är ditt standardskrivbord."
-      call_to_action: "För att lägga till sektioner, gå till 'app/admin/dashboard.rb'"
     view: "Visa"
     edit: "Redigera"
     delete: "Ta bort"
@@ -48,15 +45,11 @@
     scopes:
       all: "Alla"
     search_status:
-      headline: "Sökstatus:"
-      current_scope: "Omfattning:"
-      current_filters: "Aktiva filter:"
       no_current_filters: "Inga"
     status_tag:
       "yes": "Ja"
       "no": "Nej"
       "unset": "Nej"
-    main_content: "Implementera %{model}#main_content för att visa innehåll."
     logout: "Logga ut"
     powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
@@ -76,8 +69,6 @@
     blank_slate:
       content: "Det finns inga %{resource_name} än."
       link: "Skapa en"
-    dropdown_actions:
-      button_label: "Åtgärder"
     batch_actions:
       button_label: "Batch-åtgärder"
       default_confirmation: "Är du säker på att du vill göra detta?"
@@ -141,14 +132,7 @@
         sign_in_with_omniauth_provider: "Logga in med %{provider}"
         resend_unlock_instructions: "Skicka upplåsningsinstruktioner igen"
         resend_confirmation_instructions: "Skicka bekräftningsinstruktioner igen"
-    unsupported_browser:
-      headline: "Observera att ActiveAdmin inte längre stödjer Internet Explorer version 8 eller lägre."
-      recommendation: "Vi rekommenderar att du uppgraderar till den senaste versionen av <a href=\"http://windows.microsoft.com/ie\">Internet Explorer</a>, <a href=\"https://chrome.google.com/\">Google Chrome</a>, eller <a href=\"https://mozilla.org/firefox/\">Firefox</a>."
-      turn_off_compatibility_view: "Om du använder IE 9 eller senare, se till att <a href=\"https://support.microsoft.com/sv-se/help/17471\">stänga av \"Compatibility View\"</a>."
     access_denied:
       message: "Du har inte behörighet att utföra denna åtgärd."
     index_list:
       table: "Tabell"
-      block: "Lista"
-      grid: "Rutnät"
-      blog: "Blogg"

data/config/locales/tr.yml

@@ -1,9 +1,6 @@
 tr:
   active_admin:
     dashboard: "Gösterge Paneli"
-    dashboard_welcome:
-      welcome: "Active Admin'e hoş geldiniz. Burası varsayılan gösterge paneli sayfasıdır."
-      call_to_action: "Buraya bölümler eklemek için 'app/admin/dashboard.rb' dosyasına bakabilirsiniz."
     view: "Görüntüle"
     edit: "Düzenle"
     delete: "Sil"
@@ -27,15 +24,11 @@ tr:
         filter: "Filtrele"
         clear: "Filtreleri Temizle"
     search_status:
-      headline: "Arama"
-      current_scope: "Kapsam:"
-      current_filters: "Seçili filtreler:"
       no_current_filters: "Yok"
     status_tag:
       "yes": "Evet"
       "no": "Hayır"
       "unset": "Hayır"
-    main_content: "İçeriği görüntülemek için lütfen %{model}#main_content metodunu ekleyin."
     logout: "Çıkış Yap"
     powered_by: "%{active_admin} %{version} tarafından desteklenmektedir."
     sidebars:
@@ -55,8 +48,6 @@ tr:
     blank_slate:
       content: "Henüz %{resource_name} yok."
       link: "Bir tane oluşturun"
-    dropdown_actions:
-      button_label: "İşlemler"
     batch_actions:
       button_label: "Toplu İşlemler"
       default_confirmation: "Bunu yapmak istediğinizden emin misiniz?"
@@ -120,14 +111,7 @@ tr:
         sign_in_with_omniauth_provider: "%{provider} ile giriş yapın"
         resend_unlock_instructions: "Hesap geri açma talimatlarını tekrar gönder"
         resend_confirmation_instructions: "Onaylama talimatlarını tekrar gönder"
-    unsupported_browser:
-      headline: "ActiveAdmin Internet Explorer 8 ve altı artık desteklememektedir."
-      recommendation: "Son sürüm <a href=\"http://windows.microsoft.com/ie\">Internet Explorer</a>, <a href=\"https://chrome.google.com/\">Google Chrome</a>, ya da <a href=\"https://mozilla.org/firefox/\">Firefox</a> tarayıcılarından birine geçmenizi tavsiye ederiz."
-      turn_off_compatibility_view: "IE 9 ya da üstünü kullanıyorsanız, <a href=\"http://windows.microsoft.com/tr-tr/internet-explorer/use-compatibility-view\">\"Uyumluluk Görünümü\"</a>nü kapatmayı unutmayın."
     access_denied:
       message: "Bu işlemi gerçekleştirmek için yetkiniz yok."
     index_list:
       table: "Tablo"
-      block: "Liste"
-      grid: "Izgara"
-      blog: "Blog"

data/config/locales/uk.yml

@@ -1,9 +1,6 @@
 uk:
   active_admin:
     dashboard: "Панель керування"
-    dashboard_welcome:
-      welcome: "Ласкаво просимо до Active Admin. Це стандартна сторінка керування сайтом."
-      call_to_action: "Щоб додати сюди що-небудь, зазирніть у 'app/admin/dashboard.rb'"
     view: "Переглянути"
     edit: "Змінити"
     delete: "Видалити"
@@ -28,15 +25,11 @@ uk:
         from: "від"
         to: "до"
     search_status:
-      headline: "Статус пошуку:"
-      current_scope: "Область:"
-      current_filters: "Поточний фільтр:"
       no_current_filters: "Жоден"
     status_tag:
       "yes": "Так"
       "no": "Ні"
       "unset": "Ні"
-    main_content: "Створіть %{model}#main_content для відображення вмісту."
     logout: "Вийти"
     powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
@@ -57,8 +50,6 @@ uk:
     blank_slate:
       content: "Поки-що немає %{resource_name}."
       link: "Створити"
-    dropdown_actions:
-      button_label: "Oперації"
     batch_actions:
       button_label: "Групові операції"
       default_confirmation: "Ви справді бажаєте це зробити?"
@@ -119,14 +110,7 @@ uk:
         sign_in_with_omniauth_provider: "Увійти з допомогою %{provider}"
         resend_unlock_instructions: "Повторна відправка інструкцій розблокування"
         resend_confirmation_instructions: "Повторна відправка інструкцій підтвердження"
-    unsupported_browser:
-      headline: "Зверніть, будь-ласка, увагу, що ActiveAdmin більше не підтримує Internet Explorer 8 версії і нижче"
-      recommendation: "Ми рекомендуємо оновити версію вашого браузеру (<a href=\"http://windows.microsoft.com/ie\">Internet Explorer</a>, <a href=\"https://chrome.google.com/\">Google Chrome</a>, або <a href=\"https://mozilla.org/firefox/\">Firefox</a>)."
-      turn_off_compatibility_view: "Якщо ви використовуєте IE 9 і вище, переконайтесь, що <a href=\"https://support.microsoft.com/uk-ua/help/17471\">ви вимкнули опцію \"Перегляд в режимі сумісності\"</a>."
     access_denied:
       message: "Ви не авторизовані для виконання даної дії."
     index_list:
       table: "Таблиця"
-      block: "Список"
-      grid: "Сітка"
-      blog: "Блог"

data/config/locales/vi.yml

@@ -17,9 +17,6 @@ vi:
         updated_at: "Đã cập nhật"
   active_admin:
     dashboard: Bảng điều khiển
-    dashboard_welcome:
-      welcome: "Chào mừng bạn đến với Active Admin. Đây là trang điều khiển mặc định."
-      call_to_action: "Để thêm thành phần cho trang điều khiển hãy chỉnh sửa 'app/admin/dashboard.rb'"
     view: "Xem"
     edit: "Chỉnh sửa"
     delete: "Xóa"
@@ -48,15 +45,11 @@ vi:
     scopes:
       all: "Tất cả"
     search_status:
-      headline: "Danh sách tìm kiếm:"
-      current_scope: "Phạm vi:"
-      current_filters: "Bộ lọc hiện tại:"
       no_current_filters: "Không có"
     status_tag:
       "yes": "Có"
       "no": "Không Có"
       "unset": "Không Có"
-    main_content: "Xin bổ sung %{model}#main_content để hiển thị nội dung."
     logout: "Đăng xuất"
     powered_by: "Bản quyền bởi %{active_admin} %{version}"
     sidebars:
@@ -76,8 +69,6 @@ vi:
     blank_slate:
       content: "Chưa có %{resource_name}."
       link: "Tạo mới"
-    dropdown_actions:
-      button_label: "Hành động"
     batch_actions:
       button_label: "Hành động hàng loạt"
       default_confirmation: "Bạn có chắc bạn muốn làm điều này?"
@@ -141,14 +132,7 @@ vi:
         sign_in_with_omniauth_provider: "Đăng nhập với %{provider}"
         resend_unlock_instructions: "Gửi lại hướng dẫn mở khoá"
         resend_confirmation_instructions: "Gửi lại hướng dẫn xác nhận"
-    unsupported_browser:
-      headline: "Vui lòng lưu ý rằng ActiveAdmin không còn hỗ trợ trên Internet Explorer các phiên bản 8 và thấp hơn."
-      recommendation: "Chúng tôi khuyên bạn hãy vào <a href=\"http://browsehappy.com/\">nâng cấp trình duyệt của bạn </a> để cải thiện trải nghiệm của bạn."
-      turn_off_compatibility_view: "Nếu bạn đang sử dụng IE 9 hoặc mới hơn, hãy chắc chắn bạn <a href=\"https://support.microsoft.com/en-us/help/17471\">tắt \"Compatibility View\"</a>."
     access_denied:
       message: "Bạn không có quyền thực hiện tính năng này"
     index_list:
       table: "Bảng"
-      block: "Danh sách"
-      grid: "Lưới"
-      blog: "Blog"

data/config/locales/zh-CN.yml

@@ -17,9 +17,6 @@
         updated_at: "更新"
   active_admin:
     dashboard: "控制面板"
-    dashboard_welcome:
-      welcome: "欢迎使用Active Admin. 这是默认的控制面板页."
-      call_to_action: "若要添加新的面板内容, 请修改 'app/admin/dashboard.rb'"
     view: "查看"
     edit: "编辑"
     delete: "删除"
@@ -48,15 +45,11 @@
     scopes:
       all: "所有"
     search_status:
-      headline: "搜索条件："
-      current_scope: "范围："
-      current_filters: "过滤条件："
       no_current_filters: "无"
     status_tag:
       "yes": "是"
       "no": "否"
       "unset": "否"
-    main_content: "请执行 %{model}#main_content 来显示内容。"
     logout: "退出"
     powered_by: "构建程序为 %{active_admin} %{version}"
     sidebars:
@@ -76,8 +69,6 @@
     blank_slate:
       content: "暂时还没有%{resource_name}。"
       link: "新增一个"
-    dropdown_actions:
-      button_label: "操作"
     batch_actions:
       button_label: "批处理"
       default_confirmation: "你确定要这样做？"
@@ -141,14 +132,7 @@
         sign_in_with_omniauth_provider: "通过%{provider}登录"
         resend_unlock_instructions: "重发解锁邮件"
         resend_confirmation_instructions: "重发确认邮件"
-    unsupported_browser:
-      headline: "很抱歉，ActiveAdmin 已不再支持 Internet Explorer 8 以下版本的浏览器。"
-      recommendation: "建议您升级到最新版本的<a href=\"http://windows.microsoft.com/ie\">Internet Explorer</a>，<a href=\"https://chrome.google.com/\">Google Chrome</a>，或是 <a href=\"https://mozilla.org/firefox/\">Firefox</a>。"
-      turn_off_compatibility_view: "如果您使用的是 IE 9 或更新的版本，请确认<a href=\"https://support.microsoft.com/zh-cn/help/17472/windows-internet-explorer-11-fix-site-display-problems-compatibility-view\">已关闭“兼容性视图”</a>。"
     access_denied:
       message: "您无权处理此操作"
     index_list:
       table: "表格"
-      block: "列表"
-      grid: "网格"
-      blog: "博客"

data/config/locales/zh-TW.yml

@@ -1,9 +1,6 @@
 "zh-TW":
   active_admin:
     dashboard: 儀表板
-    dashboard_welcome:
-      welcome: "歡迎來到 Active Admin，這是預設的儀表板頁面。"
-      call_to_action: "要新增儀表板內容，請查看 'app/admin/dashboard.rb'"
     view: "檢視"
     edit: "編輯"
     delete: "刪除"
@@ -25,15 +22,11 @@
         filter: "篩選"
         clear: "清除篩選條件"
     search_status:
-      headline: "搜尋條件:"
-      current_scope: "子集："
-      current_filters: "目前篩選條件："
       no_current_filters: "無"
     status_tag:
       "yes": "是"
       "no": "否"
       "unset": "否"
-    main_content: "請實作 %{model}#main_content 以顯示內容。"
     logout: "登出"
     powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
@@ -52,8 +45,6 @@
     blank_slate:
       content: "尚無 %{resource_name}"
       link: "建立一筆"
-    dropdown_actions:
-      button_label: "操作"
     batch_actions:
       button_label: "批次作業"
       default_confirmation: "你確定你要這樣做？"
@@ -115,14 +106,7 @@
         sign_in_with_omniauth_provider: "使用 %{provider} 登入"
         resend_unlock_instructions: "重新發送解鎖指示"
         resend_confirmation_instructions: "重新發送確認信"
-    unsupported_browser:
-      headline: "很抱歉，ActiveAdmin 已不再支援 Internet Explorer 8 以下版本的瀏覽器。"
-      recommendation: "建議您升級到最新版本的<a href=\"http://windows.microsoft.com/ie\">Internet Explorer</a>，<a href=\"https://chrome.google.com/\">Google Chrome</a>，或是 <a href=\"https://mozilla.org/firefox/\">Firefox</a>。"
-      turn_off_compatibility_view: "若您是使用 IE 9 或更新的版本，請確認<a href=\"https://support.microsoft.com/zh-tw/help/17471\">「相容性檢視」是關閉的</a>。"
     access_denied:
       message: "您沒有權限執行此項操作"
     index_list:
       table: "表格"
-      block: "清單"
-      grid: "格狀"
-      blog: "部落格"

data/lib/active_admin/application.rb

@@ -43,15 +43,12 @@ module ActiveAdmin
       @namespaces = Namespace::Store.new
     end
 
-    include AssetRegistration
-
     # Event that gets triggered on load of Active Admin
     BeforeLoadEvent = "active_admin.application.before_load".freeze
     AfterLoadEvent = "active_admin.application.after_load".freeze
 
     # Runs before the app's AA initializer
     def setup!
-      register_default_assets
     end
 
     # Runs after the app's AA initializer
@@ -148,7 +145,7 @@ module ActiveAdmin
     #   ActiveAdmin.before_action :authenticate_admin!
     #
     AbstractController::Callbacks::ClassMethods.public_instance_methods.
-      select { |m| m.match(/_action\z/) }.each do |name|
+      select { |m| m.end_with?('_action') }.each do |name|
       define_method name do |*args, &block|
         ActiveSupport.on_load(:active_admin_controller) do
           public_send name, *args, &block
@@ -164,11 +161,6 @@ module ActiveAdmin
 
     private
 
-    def register_default_assets
-      register_stylesheet "active_admin.css", media: "all"
-      register_javascript "active_admin.js"
-    end
-
     # Since app/admin is alphabetically before app/models, we have to remove it
     # from the host app's +autoload_paths+ to prevent missing constant errors.
     #

data/lib/active_admin/batch_actions/controller.rb

@@ -2,14 +2,11 @@
 module ActiveAdmin
   module BatchActions
     module Controller
-
       # Controller action that is called when submitting the batch action form
       def batch_action
         if action_present?
           selection = params[:collection_selection] || []
-          inputs = JSON.parse params[:batch_action_inputs] || "{}"
-          valid_keys = MethodOrProcHelper.render_in_context(self, current_batch_action.inputs).try(:keys)
-          inputs = inputs.with_indifferent_access.slice *valid_keys
+          inputs = JSON.parse(params[:batch_action_inputs].presence || "{}")
           instance_exec selection, inputs, &current_batch_action.block
         else
           raise "Couldn't find batch action \"#{params[:batch_action]}\""

data/lib/active_admin/batch_actions/resource_extension.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 module ActiveAdmin
-
   module BatchActions
     module ResourceExtension
       def initialize(*)
@@ -59,7 +58,7 @@ module ActiveAdmin
         destroy_options = {
           priority: 100,
           confirm: proc { I18n.t("active_admin.batch_actions.delete_confirmation", plural_model: active_admin_config.plural_resource_label.downcase) },
-          if: proc { controller.action_methods.include?("destroy") && authorized?(ActiveAdmin::Auth::DESTROY, active_admin_config.resource_class) }
+          if: proc { destroy_action_authorized?(active_admin_config.resource_class) }
         }
 
         add_batch_action :destroy, proc { I18n.t("active_admin.delete") }, destroy_options do |selected_ids|
@@ -84,7 +83,7 @@ module ActiveAdmin
 
     include Comparable
 
-    attr_reader :block, :title, :sym
+    attr_reader :block, :title, :sym, :partial, :link_html_options
 
     DEFAULT_CONFIRM_MESSAGE = proc { I18n.t "active_admin.batch_actions.default_confirmation" }
 
@@ -110,8 +109,8 @@ module ActiveAdmin
     #   BatchAction.new(:flag, confirm: "Are you sure?") { |selection| }
     # => You can pass a custom confirmation message through `:confirm`
     #
-    #   BatchAction.new(:flag, form: {foo: :text, bar: :checkbox}) { |selection, inputs| }
-    # => You can pass a hash of options to `:form` that will be rendered as form input fields for the user to fill out.
+    #   BatchAction.new(:flag, partial: "flag_form", link_html_options: { "data-modal-target": "modal-id", "data-modal-show": "modal-id" }) { |selection, inputs| }
+    # => Pass a partial that contains a modal and with a data attribute that opens the modal with the form for the user to fill out.
     #
     def initialize(sym, title, options = {}, &block)
       @sym = sym
@@ -119,23 +118,19 @@ module ActiveAdmin
       @options = options
       @block = block
       @confirm = options[:confirm]
+      @partial = options[:partial]
+      @link_html_options = options[:link_html_options] || {}
       @block ||= proc {}
     end
 
     def confirm
       if @confirm == true
         DEFAULT_CONFIRM_MESSAGE
-      elsif !@confirm && @options[:form]
-        DEFAULT_CONFIRM_MESSAGE
       else
         @confirm
       end
     end
 
-    def inputs
-      @options[:form]
-    end
-
     # Returns the display if block. If the block was not explicitly defined
     # a default block always returning true will be returned.
     def display_if_block
@@ -151,7 +146,5 @@ module ActiveAdmin
     def <=>(other)
       self.priority <=> other.priority
     end
-
   end
-
 end

data/lib/active_admin/batch_actions/views/batch_action_form.rb

@@ -3,13 +3,8 @@ require "active_admin/component"
 
 module ActiveAdmin
   module BatchActions
-
     # Build a BatchActionForm
     class BatchActionForm < ActiveAdmin::Component
-      builder_method :batch_action_form
-
-      attr_reader :prefix_html
-
       def build(options = {}, &block)
         options[:id] ||= "collection_selection"
 
@@ -33,7 +28,6 @@ module ActiveAdmin
       def closing_form_tag
         "</form>".html_safe
       end
-
     end
   end
 end

data/lib/active_admin/batch_actions/views/selection_cells.rb

@@ -10,7 +10,7 @@ module ActiveAdmin
 
       def build(label_text = "")
         label do
-          input type: "checkbox", id: "collection_selection_toggle_all", name: "collection_selection_toggle_all", class: "toggle_all"
+          input type: "checkbox", id: "collection_selection_toggle_all", name: "collection_selection_toggle_all", class: "batch-actions-toggle-all"
           text_node label_text if label_text.present?
         end
       end
@@ -21,7 +21,7 @@ module ActiveAdmin
       builder_method :resource_selection_cell
 
       def build(resource)
-        input type: "checkbox", id: "batch_action_item_#{resource.id}", value: resource.id, class: "collection_selection", name: "collection_selection[]"
+        input type: "checkbox", id: "batch_action_item_#{resource.id}", value: resource.id, class: "batch-actions-resource-selection", name: "collection_selection[]"
       end
     end
 

data/lib/active_admin/batch_actions.rb

@@ -7,11 +7,6 @@ ActiveAdmin.before_load do |app|
   ActiveAdmin::Resource.send :include, ActiveAdmin::BatchActions::ResourceExtension
   ActiveAdmin::ResourceController.send :include, ActiveAdmin::BatchActions::Controller
 
-  # Require all the views
   require "active_admin/batch_actions/views/batch_action_form"
   require "active_admin/batch_actions/views/selection_cells"
-  require "active_admin/batch_actions/views/batch_action_selector"
-
-  # Register the views with the view factory
-  app.view_factory.register batch_action_selector: ActiveAdmin::BatchActions::BatchActionSelector
 end

data/lib/active_admin/callbacks.rb

@@ -3,6 +3,8 @@ module ActiveAdmin
   module Callbacks
     extend ActiveSupport::Concern
 
+    CALLBACK_TYPES = %i[before after].freeze
+
     private
 
     # Simple callback system. Implements before and after callbacks for
@@ -58,7 +60,7 @@ module ActiveAdmin
       #
       def define_active_admin_callbacks(*names)
         names.each do |name|
-          [:before, :after].each do |type|
+          CALLBACK_TYPES.each do |type|
             callback_name = "#{type}_#{name}_callbacks"
             callback_ivar = "@#{callback_name}"
 
@@ -75,10 +77,10 @@ module ActiveAdmin
           end
 
           # def run_create_callbacks
-          define_method "run_#{name}_callbacks" do |*args, &block|
-            self.class.send("before_#{name}_callbacks").each { |cbk| run_callback(cbk, *args) }
+          define_method :"run_#{name}_callbacks" do |*args, &block|
+            self.class.send(:"before_#{name}_callbacks").each { |cbk| run_callback(cbk, *args) }
             value = block.try :call
-            self.class.send("after_#{name}_callbacks").each { |cbk| run_callback(cbk, *args) }
+            self.class.send(:"after_#{name}_callbacks").each { |cbk| run_callback(cbk, *args) }
             return value
           end
           send :private, "run_#{name}_callbacks"

data/lib/active_admin/component.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 module ActiveAdmin
   class Component < Arbre::Component
-
   end
 end

data/lib/active_admin/csv_builder.rb

@@ -129,7 +129,7 @@ module ActiveAdmin
   module Sanitizer
     extend self
 
-    ATTACK_CHARACTERS = ["=", "+", "-", "@", "\t", "\r"].freeze
+    ATTACK_CHARACTERS = ['=', '+', '-', '@', "\t", "\r"].freeze
 
     def sanitize(value)
       return "'#{value}" if require_sanitization?(value)

data/lib/active_admin/devise.rb

@@ -10,8 +10,7 @@ module ActiveAdmin
       {
         path: ActiveAdmin.application.default_namespace || "/",
         controllers: ActiveAdmin::Devise.controllers,
-        path_names: { sign_in: "login", sign_out: "logout" },
-        sign_out_via: [*::Devise.sign_out_via, ActiveAdmin.application.logout_link_method].uniq
+        path_names: { sign_in: "login", sign_out: "logout" }
       }
     end
 
@@ -29,7 +28,8 @@ module ActiveAdmin
       extend ::ActiveSupport::Concern
       included do
         layout "active_admin_logged_out"
-        helper ::ActiveAdmin::ViewHelpers
+        helper ::ActiveAdmin::LayoutHelper
+        helper ::ActiveAdmin::FormHelper
       end
 
       # Redirect to the default namespace on logout

data/lib/active_admin/dsl.rb

@@ -13,7 +13,7 @@ module ActiveAdmin
 
     # Runs the registration block inside this object
     def run_registration_block(&block)
-      instance_exec &block if block_given?
+      instance_exec &block if block
     end
 
     # The instance of ActiveAdmin::Resource that's being registered
@@ -72,7 +72,7 @@ module ActiveAdmin
     #   end
     #
     def controller(&block)
-      @config.controller.class_exec(&block) if block_given?
+      @config.controller.class_exec(&block) if block
       @config.controller
     end
 

data/lib/active_admin/dynamic_settings_node.rb

@@ -10,18 +10,18 @@ module ActiveAdmin
         class_attribute "#{name}_setting"
         add_reader(name)
         add_writer(name, type)
-        send "#{name}=", value
+        send :"#{name}=", value
       end
 
       def add_reader(name)
         define_singleton_method(name) do |*args|
-          send("#{name}_setting").value(*args)
+          send(:"#{name}_setting").value(*args)
         end
       end
 
       def add_writer(name, type)
-        define_singleton_method("#{name}=") do |value|
-          send("#{name}_setting=", DynamicSetting.build(value, type))
+        define_singleton_method(:"#{name}=") do |value|
+          send(:"#{name}_setting=", DynamicSetting.build(value, type))
         end
       end
     end

data/lib/active_admin/engine.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 module ActiveAdmin
   class Engine < ::Rails::Engine
+    isolate_namespace ActiveAdmin
+
     # Set default values for app_path and load_paths before running initializers
     initializer "active_admin.load_app_path", before: :load_config_initializers do |app|
       ActiveAdmin::Application.setting :app_path, app.root
@@ -8,12 +10,23 @@ module ActiveAdmin
     end
 
     initializer "active_admin.precompile", group: :all do |app|
-      unless ActiveAdmin.application.use_webpacker
-        ActiveAdmin.application.stylesheets.each do |path, _|
-          app.config.assets.precompile << path
-        end
-        ActiveAdmin.application.javascripts.each do |path, _|
-          app.config.assets.precompile << path
+      if app.config.respond_to?(:assets)
+        app.config.assets.precompile += %w(active_admin.js active_admin.css active_admin_manifest.js)
+      end
+    end
+
+    initializer "active_admin.importmap", before: "importmap" do |app|
+      ActiveAdmin.importmap.draw(Engine.root.join("config", "importmap.rb"))
+      package_path = Engine.root.join("app/javascript")
+      if app.config.respond_to?(:assets)
+        app.config.assets.paths << package_path
+        app.config.assets.paths << Engine.root.join("vendor/javascript")
+      end
+
+      if app.config.importmap.sweep_cache
+        ActiveAdmin.importmap.cache_sweeper(watches: package_path)
+        ActiveSupport.on_load(:action_controller_base) do
+          before_action { ActiveAdmin.importmap.cache_sweeper.execute_if_updated }
         end
       end
     end

data/lib/active_admin/filters/active.rb

@@ -3,9 +3,8 @@ require "active_admin/filters/active_filter"
 
 module ActiveAdmin
   module Filters
-
     class Active
-      attr_accessor :filters, :resource
+      attr_reader :filters, :resource, :scopes
 
       # Instantiate a `Active` object containing collection of current active filters
 
@@ -16,6 +15,11 @@ module ActiveAdmin
       def initialize(resource, search)
         @resource = resource
         @filters = build_filters(search.conditions)
+        @scopes = search.instance_variable_get(:@scope_args)
+      end
+
+      def all_blank?
+        filters.blank? && scopes.blank?
       end
 
       private
@@ -23,8 +27,6 @@ module ActiveAdmin
       def build_filters(conditions)
         conditions.map { |condition| ActiveFilter.new(resource, condition.dup) }
       end
-
     end
-
   end
 end