activeadmin 4.0.0.beta3 → 4.0.0.beta9

data/config/locales/zh-TW.yml

@@ -1,10 +1,27 @@
 "zh-TW":
+  activerecord:
+    models:
+      comment:
+        one: "評論"
+        other: "評論"
+      active_admin/comment:
+        one: "評論"
+        other: "評論"
+    attributes:
+      active_admin/comment:
+        author_type: "作者類型"
+        body: "內容"
+        created_at: "建立時間"
+        namespace: "命名空間"
+        resource_type: "資源類型"
+        updated_at: "更新時間"
   active_admin:
-    dashboard: 儀表板
+    dashboard: "儀表板"
     view: "檢視"
     edit: "編輯"
     delete: "刪除"
     delete_confirmation: "你確定要刪除嗎？"
+    create_another: "新增另一個 %{model}"
     new_model: "新增 %{model}"
     edit_model: "編輯 %{model}"
     delete_model: "刪除 %{model}"
@@ -13,41 +30,52 @@
     empty: "空的"
     previous: "前一個"
     next: "下一個"
-    download: "下載:"
+    download: "下載："
     has_many_new: "增加新的 %{model}"
     has_many_delete: "刪除"
-    has_many_remove: "清除"
+    has_many_remove: "移除"
+    move: "移動"
     filters:
       buttons:
         filter: "篩選"
         clear: "清除篩選條件"
+      predicates:
+        from: "從"
+        to: "到"
+    scopes:
+      all: "全部"
     search_status:
-      no_current_filters: "無"
+      title: "進行中的搜尋"
+      title_with_scope: "正在搜尋 %{name}"
+      no_current_filters: "未套用篩選條件"
     status_tag:
       "yes": "是"
       "no": "否"
-      "unset": "否"
+      "unset": "未知"
     logout: "登出"
-    powered_by: "Powered by %{active_admin} %{version}"
+    powered_by: "由 %{active_admin} %{version} 提供"
     sidebars:
       filters: "篩選條件"
-      search_status: "搜尋條件"
+      search_status: "搜尋狀態"
     pagination:
-      empty: "找不到 %{model} "
+      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> 筆"
+      per_page: "每頁 "
+      previous: "前一個"
+      next: "下一個"
       entry:
         one: "筆"
         other: "筆"
     any: "任何"
     blank_slate:
-      content: "尚無 %{resource_name}"
+      content: "尚無 %{resource_name}。"
       link: "建立一筆"
     batch_actions:
-      button_label: "批次作業"
-      default_confirmation: "你確定你要這樣做？"
+      button_label: "批次操作"
+      default_confirmation: "你確定要這樣做嗎？"
       delete_confirmation: "你確定要刪除這些 %{plural_model} 嗎？"
       succesfully_destroyed:
         one: "成功刪除 1 %{model}"
@@ -57,18 +85,18 @@
       labels:
         destroy: "刪除"
     comments:
-      created_at: "建立"
-      resource_type: "資源種類"
+      created_at: "建立時間"
+      resource_type: "資源類型"
       author_type: "作者身份"
       body: "內文"
       author: "作者"
       add: "新增評論"
       delete: "刪除評論"
-      delete_confirmation: "你確定要刪除這些評論嗎？"
+      delete_confirmation: "你確定要刪除這個評論嗎？"
       resource: "資源"
       no_comments_yet: "尚無評論"
       author_missing: "匿名"
-      title_content: "(%{count}) 則評論"
+      title_content: "%{count} 則評論"
       errors:
         empty_text: "評論儲存失敗，不允許空白的內容。"
     devise:
@@ -80,6 +108,8 @@
         title: "子網域"
       password:
         title: "密碼"
+      password_confirmation:
+        title: "確認密碼"
       sign_up:
         title: "註冊"
         submit: "註冊"
@@ -89,7 +119,7 @@
         submit: "登入"
       reset_password:
         title: "忘記密碼？"
-        submit: "重置密碼"
+        submit: "重設密碼"
       change_password:
         title: "更改你的密碼"
         submit: "更改我的密碼"
@@ -97,8 +127,8 @@
         title: "重新發送解鎖指示"
         submit: "重新發送解鎖指示"
       resend_confirmation_instructions:
-        title: '重新發送確認信'
-        submit: '重新發送確認信'
+        title: "重新發送確認信"
+        submit: "重新發送確認信"
       links:
         sign_up: "註冊"
         sign_in: "登入"
@@ -107,6 +137,6 @@
         resend_unlock_instructions: "重新發送解鎖指示"
         resend_confirmation_instructions: "重新發送確認信"
     access_denied:
-      message: "您沒有權限執行此項操作"
+      message: "你沒有權限執行此項操作"
     index_list:
       table: "表格"

data/lib/active_admin/batch_actions/resource_extension.rb

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

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/dsl.rb

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

data/lib/active_admin/engine.rb

@@ -15,7 +15,10 @@ module ActiveAdmin
       end
     end
 
-    initializer "active_admin.importmap", before: "importmap" do |app|
+    initializer "active_admin.importmap", after: "importmap" do |app|
+      # Skip if importmap-rails is not installed
+      next unless app.config.respond_to?(:importmap)
+
       ActiveAdmin.importmap.draw(Engine.root.join("config", "importmap.rb"))
       package_path = Engine.root.join("app/javascript")
       if app.config.respond_to?(:assets)

data/lib/active_admin/pundit_adapter.rb

@@ -19,7 +19,7 @@ module ActiveAdmin
     end
 
     def scope_collection(collection, action = Auth::READ)
-      # scoping is appliable only to read/index action
+      # scoping is applicable only to read/index action
       # which means there is no way how to scope other actions
       Pundit.policy_scope!(user, namespace(collection))
     rescue Pundit::NotDefinedError => e
@@ -42,7 +42,7 @@ module ActiveAdmin
     end
 
     def format_action(action, subject)
-      # https://github.com/varvet/pundit/blob/master/lib/generators/pundit/install/templates/application_policy.rb
+      # https://github.com/varvet/pundit/blob/main/lib/generators/pundit/install/templates/application_policy.rb
       case action
       when Auth::READ then subject.is_a?(Class) ? :index? : :show?
       when Auth::DESTROY then subject.is_a?(Class) ? :destroy_all? : :destroy?

data/lib/active_admin/resource/attributes.rb

@@ -37,7 +37,14 @@ module ActiveAdmin
       end
 
       def counter_cache_col?(c)
-        c.name.end_with?("_count")
+        # This helper is called inside a loop. Let's memoize the result.
+        @counter_cache_columns ||= begin
+          resource_class.reflect_on_all_associations(:has_many)
+                        .select(&:has_cached_counter?)
+                        .map(&:counter_cache_column)
+        end
+
+        @counter_cache_columns.include?(c.name)
       end
 
       def filtered_col?(c)

data/lib/active_admin/resource/page_presenters.rb

@@ -51,7 +51,7 @@ module ActiveAdmin
       # Stores a config for all index actions supplied
       #
       # @param [Symbol] index_as The index type to store in the configuration
-      # @param [PagePresenter] page_presenter The intance of PagePresenter to store
+      # @param [PagePresenter] page_presenter The instance of PagePresenter to store
       def set_index_presenter(index_as, page_presenter)
         page_presenters[:index] ||= {}
 
@@ -64,7 +64,7 @@ module ActiveAdmin
         page_presenters[:index][index_as] = page_presenter
       end
 
-      # Returns the actual class for renderering the main content on the index
+      # Returns the actual class for rendering the main content on the index
       # page. To set this, use the :as option in the page_presenter block.
       #
       # @param [Symbol, Class] symbol_or_class The component symbol or class

data/lib/active_admin/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ActiveAdmin
-  VERSION = "4.0.0.beta3"
+  VERSION = "4.0.0.beta9"
 end

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

@@ -131,7 +131,7 @@ module ActiveAdmin
         html_options[:class] ||= "inputs"
         legend = args.shift if args.first.is_a?(::String)
         legend = html_options.delete(:name) if html_options.key?(:name)
-        legend_tag = legend ? "<legend class=\"fieldset-title\">#{legend}</legend>" : ""
+        legend_tag = legend ? "<legend class=\"fieldset-title\">#{ERB::Util.html_escape(legend)}</legend>" : ""
         fieldset_attrs = html_options.map { |k, v| %Q{#{k}="#{v}"} }.join(" ")
         @opening_tag = "<fieldset #{fieldset_attrs}>#{legend_tag}<ol>"
         @closing_tag = "</ol></fieldset>"

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

@@ -22,7 +22,7 @@ module ActiveAdmin
 
       # Override children? to only report children when the panel's
       # contents have been added to. This ensures that the panel
-      # correcly appends string values, etc.
+      # correctly appends string values, etc.
       def children?
         @contents.children?
       end

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

@@ -4,7 +4,7 @@ require "active_admin/view_helpers/method_or_proc_helper"
 module ActiveAdmin
   module Views
     # Renders a collection of ActiveAdmin::Scope objects as a
-    # simple list with a seperator
+    # simple list with a separator
     class Scopes < ActiveAdmin::Component
       include ActiveAdmin::ScopeChain
 

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

@@ -19,8 +19,8 @@ module ActiveAdmin
 
       def build_menu_item(title, options, &block)
         fragment = options.fetch(:id, fragmentize(title))
-        html_options = options.fetch(:html_options, {}).merge("data-tabs-target": "##{fragment}", role: "tab", "aria-controls": fragment)
-        button html_options do
+        html_options = options.fetch(:html_options, {}).merge("data-tabs-target": "##{fragment}", role: "tab", "aria-controls": fragment, href: "#")
+        a html_options do
           title
         end
       end

data/lib/active_admin.rb

@@ -9,6 +9,12 @@ require "formtastic_i18n"
 require "inherited_resources"
 require "arbre"
 
+begin
+  require "importmap-rails"
+rescue LoadError
+  # importmap-rails is optional
+end
+
 module ActiveAdmin
 
   autoload :VERSION, "active_admin/version"
@@ -57,7 +63,6 @@ module ActiveAdmin
     end
 
     def importmap
-      require "importmap-rails"
       @importmap ||= Importmap::Map.new
     end
 

data/lib/generators/active_admin/assets/templates/tailwind.config.js

@@ -11,7 +11,7 @@ module.exports = {
     './app/views/admin/**/*.{arb,erb,html,rb}',
     './app/javascript/**/*.js'
   ],
-  darkMode: "class",
+  darkMode: "selector",
   plugins: [
     require(`@activeadmin/activeadmin/plugin`)
   ]

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

@@ -203,7 +203,7 @@ ActiveAdmin.setup do |config|
   #
   #   config.namespace :admin do |admin|
   #     admin.build_menu :default do |menu|
-  #       menu.add label: "My Great Website", url: "https://mygreatwebsite.example.com", html_options: { target: :blank }
+  #       menu.add label: "My Great Website", url: "https://mygreatwebsite.example.com", html_options: { target: "_blank" }
   #     end
   #   end
 

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

@@ -16,8 +16,12 @@ module ActiveAdmin
         @attributes ||= class_name.constantize.new.attributes.keys
       end
 
+      def primary_key
+        @primary_key ||= [class_name.constantize.primary_key].flatten
+      end
+
       def assignable_attributes
-        @assignable_attributes ||= attributes - %w(id created_at updated_at)
+        @assignable_attributes ||= attributes - primary_key - %w(created_at updated_at)
       end
 
       def permit_params
@@ -33,7 +37,7 @@ module ActiveAdmin
       end
 
       def columns
-        attributes.map { |a| column(a) }.join("\n    ")
+        (attributes - primary_key).map { |a| column(a) }.join("\n    ")
       end
 
       def column(name)

data/lib/generators/active_admin/resource/templates/resource.rb.erb

@@ -16,7 +16,7 @@ ActiveAdmin.register <%= class_name %> do
   # Add or remove filters to toggle their visibility
   <%= filters %>
 
-  # Add or remove columns to toggle their visiblity in the index action
+  # Add or remove columns to toggle their visibility in the index action
   index do
     selectable_column
     id_column
@@ -24,7 +24,7 @@ ActiveAdmin.register <%= class_name %> do
     actions
   end
 
-  # Add or remove rows to toggle their visiblity in the show action
+  # Add or remove rows to toggle their visibility in the show action
   show do
     attributes_table_for(resource) do
       <%= rows %>

data/plugin.js

@@ -44,7 +44,6 @@ module.exports = plugin(
         "[type='tel']",
         "[type='time']",
         "[type='week']",
-        '[multiple]',
         'textarea',
         'select',
       ]]: {
@@ -475,8 +474,8 @@ module.exports = plugin(
       '.tabs-nav': {
         '@apply flex flex-wrap mb-2 text-sm font-medium text-center border-b border-gray-200 dark:border-gray-700': {}
       },
-      '.tabs-nav > :where(button)': {
-        '@apply inline-block p-4 border-b-2 border-transparent rounded-t-lg hover:text-gray-600 hover:border-gray-300 dark:hover:text-gray-300': {}
+      '.tabs-nav > :where(a)': {
+        '@apply block p-4 border-b-2 border-transparent rounded-t-md hover:text-gray-600 dark:hover:text-gray-300 no-underline': {}
       },
       '.tabs-content': {
         '@apply p-4 mb-6': {}
@@ -513,10 +512,10 @@ module.exports = plugin(
         '@apply text-gray-500 mt-2': {}
       },
       '.formtastic :where(.errors)': {
-        '@apply p-4 mb-2 rounded-lg bg-red-50 text-red-800 dark:bg-red-800 dark:text-red-300': {}
+        '@apply p-4 mb-6 rounded-md space-y-2 bg-red-50 text-red-800 dark:bg-red-800 dark:text-red-300': {}
       },
       '.formtastic :where(.errors > li)': {
-        '@apply list-disc ms-4 mb-1': {}
+        '@apply list-disc ms-4': {}
       },
       '.formtastic :where(.inline-errors)': {
         '@apply font-bold mt-2 text-red-600 dark:text-red-300': {}