activeadmin 3.4.0 → 4.0.0.beta18

data/config/locales/zh-TW.yml

@@ -1,128 +1,148 @@
-"zh-TW":
+---
+zh-TW:
   active_admin:
-    dashboard: 儀表板
-    dashboard_welcome:
-      welcome: "歡迎來到 Active Admin，這是預設的儀表板頁面。"
-      call_to_action: "要新增儀表板內容，請查看 'app/admin/dashboard.rb'"
-    view: "檢視"
-    edit: "編輯"
-    delete: "刪除"
-    delete_confirmation: "你確定要刪除嗎？"
-    new_model: "新增 %{model}"
-    edit_model: "編輯 %{model}"
-    delete_model: "刪除 %{model}"
-    details: "%{model} 明細"
-    cancel: "取消"
-    empty: "空的"
-    previous: "前一個"
-    next: "下一個"
-    download: "下載:"
-    has_many_new: "增加新的 %{model}"
-    has_many_delete: "刪除"
-    has_many_remove: "清除"
-    filters:
-      buttons:
-        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:
-      filters: "篩選條件"
-      search_status: "搜尋條件"
-    pagination:
-      empty: "找不到 %{model} "
-      one: "顯示 <b>1</b> %{model}"
-      one_page: "顯示 <b>全部 %{n}</b> %{model}"
-      multiple: "總計 <b>%{total}</b> 顯示 %{model} 中<b>%{from}&nbsp;-&nbsp;%{to}</b> 筆"
-      multiple_without_total: "顯示 %{model} 中<b>%{from}&nbsp;-&nbsp;%{to}</b> 筆"
-      entry:
-        one: "筆"
-        other: "筆"
-    any: "任何"
-    blank_slate:
-      content: "尚無 %{resource_name}"
-      link: "建立一筆"
-    dropdown_actions:
-      button_label: "操作"
+    access_denied:
+      message: 你沒有權限執行此項操作
+    any: 任何
     batch_actions:
-      button_label: "批次作業"
-      default_confirmation: "你確定你要這樣做？"
-      delete_confirmation: "你確定要刪除這些 %{plural_model} 嗎？"
-      succesfully_destroyed:
-        one: "成功刪除 1 %{model}"
-        other: "成功刪除 %{count} %{plural_model}"
-      selection_toggle_explanation: "（切換選取）"
       action_label: "%{title} 已選取"
+      button_label: 批次操作
+      default_confirmation: 你確定要這樣做嗎？
+      delete_confirmation: 你確定要刪除這些 %{plural_model} 嗎？
       labels:
-        destroy: "刪除"
+        destroy: 刪除
+      selection_toggle_explanation: "（切換選取）"
+      successfully_destroyed:
+        one: 成功刪除 1 %{model}
+        other: 成功刪除 %{count} %{plural_model}
+    blank_slate:
+      content: 尚無 %{resource_name}。
+      link: 建立一筆
+    cancel: 取消
     comments:
-      created_at: "建立"
-      resource_type: "資源種類"
-      author_type: "作者身份"
-      body: "內文"
-      author: "作者"
-      add: "新增評論"
-      delete: "刪除評論"
-      delete_confirmation: "你確定要刪除這些評論嗎？"
-      resource: "資源"
-      no_comments_yet: "尚無評論"
-      author_missing: "匿名"
-      title_content: "(%{count}) 則評論"
+      add: 新增評論
+      author: 作者
+      author_missing: 匿名
+      author_type: 作者身份
+      body: 內文
+      created_at: 建立時間
+      delete: 刪除評論
+      delete_confirmation: 你確定要刪除這個評論嗎？
       errors:
-        empty_text: "評論儲存失敗，不允許空白的內容。"
+        empty_text: 評論儲存失敗，不允許空白的內容。
+      no_comments_yet: 尚無評論
+      resource: 資源
+      resource_type: 資源類型
+      title_content: "%{count} 則評論"
+    create_another: 新增另一個 %{model}
+    dashboard: 儀表板
+    delete: 刪除
+    delete_confirmation: 你確定要刪除嗎？
+    delete_model: 刪除 %{model}
+    details: "%{model} 明細"
     devise:
-      username:
-        title: "帳號"
+      change_password:
+        submit: 更改我的密碼
+        title: 更改你的密碼
       email:
-        title: "電子郵件信箱"
-      subdomain:
-        title: "子網域"
-      password:
-        title: "密碼"
-      sign_up:
-        title: "註冊"
-        submit: "註冊"
+        title: 電子郵件信箱
+      links:
+        forgot_your_password: 忘記密碼？
+        resend_confirmation_instructions: 重新發送確認信
+        resend_unlock_instructions: 重新發送解鎖指示
+        sign_in: 登入
+        sign_in_with_omniauth_provider: 使用 %{provider} 登入
+        sign_up: 註冊
       login:
-        title: "登入"
-        remember_me: "記住我"
-        submit: "登入"
+        remember_me: 記住我
+        submit: 登入
+        title: 登入
+      password:
+        title: 密碼
+      password_confirmation:
+        title: 確認密碼
+      resend_confirmation_instructions:
+        submit: 重新發送確認信
+        title: 重新發送確認信
       reset_password:
-        title: "忘記密碼？"
-        submit: "重置密碼"
-      change_password:
-        title: "更改你的密碼"
-        submit: "更改我的密碼"
+        submit: 重設密碼
+        title: 忘記密碼？
+      sign_up:
+        submit: 註冊
+        title: 註冊
+      subdomain:
+        title: 子網域
       unlock:
-        title: "重新發送解鎖指示"
-        submit: "重新發送解鎖指示"
-      resend_confirmation_instructions:
-        title: '重新發送確認信'
-        submit: '重新發送確認信'
-      links:
-        sign_up: "註冊"
-        sign_in: "登入"
-        forgot_your_password: "忘記密碼？"
-        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: "您沒有權限執行此項操作"
+        submit: 重新發送解鎖指示
+        title: 重新發送解鎖指示
+      username:
+        title: 帳號
+    download: 下載：
+    edit: 編輯
+    edit_model: 編輯 %{model}
+    empty: 空的
+    filters:
+      buttons:
+        clear: 清除篩選條件
+        filter: 篩選
+      predicates:
+        from: 從
+        to: 到
+    has_many_delete: 刪除
+    has_many_new: 增加新的 %{model}
+    has_many_remove: 移除
     index_list:
-      table: "表格"
-      block: "清單"
-      grid: "格狀"
-      blog: "部落格"
+      table: 表格
+    logout: 登出
+    move: 移動
+    new_model: 新增 %{model}
+    next: 下一個
+    pagination:
+      empty: 找不到 %{model}
+      entry:
+        one: 筆
+        other: 筆
+      multiple: 總計 <b>%{total}</b> 顯示 %{model} 中<b>%{from}&nbsp;-&nbsp;%{to}</b> 筆
+      multiple_without_total: 顯示 %{model} 中<b>%{from}&nbsp;-&nbsp;%{to}</b> 筆
+      next: 下一個
+      one: 顯示 <b>1</b> %{model}
+      one_page: 顯示 <b>全部 %{n}</b> %{model}
+      per_page: '每頁 '
+      previous: 前一個
+      truncate: "&hellip;"
+    powered_by: 由 %{active_admin} %{version} 提供
+    previous: 前一個
+    scopes:
+      all: 全部
+    search_status:
+      no_current_filters: 未套用篩選條件
+      title: 進行中的搜尋
+      title_with_scope: 正在搜尋 %{name}
+    sidebars:
+      filters: 篩選條件
+      search_status: 搜尋狀態
+    status_tag:
+      'no': 否
+      unset: 未知
+      'yes': 是
+    toggle_dark_mode: 切換暗黑模式
+    toggle_main_navigation_menu: 切換主要導覽
+    toggle_section: 切換區塊
+    toggle_user_menu: 切換使用者選單
+    view: 檢視
+  activerecord:
+    attributes:
+      active_admin/comment:
+        author_type: 作者類型
+        body: 內容
+        created_at: 建立時間
+        namespace: 命名空間
+        resource_type: 資源類型
+        updated_at: 更新時間
+    models:
+      active_admin/comment:
+        one: 評論
+        other: 評論
+      comment:
+        one: 評論
+        other: 評論

data/lib/active_admin/application.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
-require "active_admin/router"
-require "active_admin/application_settings"
-require "active_admin/namespace_settings"
+require_relative "router"
+require_relative "application_settings"
+require_relative "namespace_settings"
 
 module ActiveAdmin
   class Application
@@ -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
@@ -104,7 +101,7 @@ module ActiveAdmin
     # Removes all defined controllers from memory. Useful in
     # development, where they are reloaded on each request.
     def unload!
-      namespaces.each &:unload!
+      namespaces.each(&:unload!)
       @@loaded = false
     end
 
@@ -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
@@ -158,17 +155,12 @@ module ActiveAdmin
 
     def controllers_for_filters
       controllers = [BaseController]
-      controllers.push *Devise.controllers_for_filters if Dependency.devise?
+      controllers.push(*Devise.controllers_for_filters) if Dependency.devise?
       controllers
     end
 
     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/application_settings.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/settings_node"
+require_relative "settings_node"
 
 module ActiveAdmin
   class ApplicationSettings < SettingsNode

data/lib/active_admin/async_count.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+module ActiveAdmin
+  class AsyncCount
+    class NotSupportedError < RuntimeError; end
+
+    def initialize(collection)
+      raise NotSupportedError, "#{collection.inspect} does not support :async_count" unless collection.respond_to?(:async_count)
+
+      @collection = collection.except(:select, :order)
+      @promise = @collection.async_count
+    end
+
+    def count
+      value = @promise.value
+      # value.value due to Rails bug https://github.com/rails/rails/issues/50776
+      value.respond_to?(:value) ? value.value : value
+    end
+
+    alias size count
+
+    delegate :except, :group_values, :length, :limit_value, to: :@collection
+  end
+end

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|
@@ -70,7 +69,7 @@ module ActiveAdmin
 
           redirect_to active_admin_config.route_collection_path(params),
                       notice: I18n.t(
-                        "active_admin.batch_actions.succesfully_destroyed",
+                        "active_admin.batch_actions.successfully_destroyed",
                         count: selected_ids.count,
                         model: active_admin_config.resource_label.downcase,
                         plural_model: active_admin_config.plural_resource_label(count: selected_ids.count).downcase)
@@ -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" }
 
@@ -96,7 +95,7 @@ module ActiveAdmin
     # => Will create an action that appears in the action list popover
     #
     #   BatchAction.new(:flag) { |selection| redirect_to collection_path, notice: "#{selection.length} users flagged" }
-    # => Will create an action that uses a block to process the request (which receives one paramater of the selected objects)
+    # => Will create an action that uses a block to process the request (which receives one parameter of the selected objects)
     #
     #   BatchAction.new("Perform Long Operation on") { |selection| }
     # => You can create batch actions with a title instead of a Symbol
@@ -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

@@ -1,15 +1,10 @@
 # frozen_string_literal: true
-require "active_admin/component"
+require_relative "../../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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/component"
+require_relative "../../component"
 
 module ActiveAdmin
   module BatchActions
@@ -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

@@ -1,17 +1,12 @@
 # frozen_string_literal: true
 ActiveAdmin.before_load do |app|
-  require "active_admin/batch_actions/resource_extension"
-  require "active_admin/batch_actions/controller"
+  require_relative "batch_actions/resource_extension"
+  require_relative "batch_actions/controller"
 
   # Add our Extensions
   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
+  require_relative "batch_actions/views/batch_action_form"
+  require_relative "batch_actions/views/selection_cells"
 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/collection_decorator.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module ActiveAdmin
   # This class decorates a collection of objects delegating
-  # mehods to behave like an Array. It's used to decouple ActiveAdmin
+  # methods to behave like an Array. It's used to decouple ActiveAdmin
   # from Draper and thus being able to use PORO decorators as well.
   #
   # It's implementation is heavily based on the Draper::CollectionDecorator

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

@@ -64,7 +64,7 @@ module ActiveAdmin
     def exec_columns(view_context = nil)
       @view_context = view_context
       @columns = [] # we want to re-render these every instance
-      instance_exec &@block if @block.present?
+      instance_exec(&@block) if @block.present?
       columns
     end
 
@@ -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
@@ -30,7 +30,7 @@ module ActiveAdmin
       @config
     end
 
-    # Include a module with this resource. The modules's `included` method
+    # Include a module with this resource. The modules' `included` method
     # is called with the instance of the `ActiveAdmin::DSL` passed into it.
     #
     # eg:
@@ -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