activeadmin 4.0.0.beta5 → 4.0.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa9f5b37815e629d513affcd9918294f10deb569cfbc779ce0f08ee918df933d
-  data.tar.gz: 73cc9a81809c8aacfac36c4b4a93c1a986f0b7a6722788457df9457fa7202038
+  metadata.gz: 5dd5eb1427288ca28b3a68786a8a828646fc7a6a1c310c5a6b126c907c32b5a8
+  data.tar.gz: 0e40eff7a1e3e06153fbb3f147911696bd19ce27be2f29d4bc5dbba7ef0175ab
 SHA512:
-  metadata.gz: f3ae286884640807ec617f277b95763081589e984352bcad112ceeb9bb5f1dbc7a7b53504136807113d4c35fd3277e9755434fa05b33deb03404d255cd08c661
-  data.tar.gz: 89982f3ec08c3351ec453eb3accda87718212fe5047a8689370ccd6be54d37bd2fa7f7ec7110cfbf6bedb412b8e23dd2c1359414afad75f731a7c276e088942d
+  metadata.gz: 5c879abbd3cb1e8d617d34be6dd96236f545f15ffdfc3d3866da9f8f7af8d120d13862a395b091ff1cda652c9b48200aaa22f813b0f688cdec9765c06d44f941
+  data.tar.gz: 1ebbee7ae56c8297b16761fae24d8ccb83bf4d54fb7095f012c3813fe5df2446cd9b2295c077b2c693801b1ff8a79f656b3862e468595aa46558c177107cf575

data/CHANGELOG.md

@@ -451,7 +451,7 @@ _No changes_.
 * Fixed `if:` scope option when a lambda is passed. [#5501] by [@deivid-rodriguez]
 * Comment validation adding redundant errors when resource is missing. [#5517] by [@deivid-rodriguez]
 * Fixed resource filtering by association when the resource has custom primary key. [#5446] by [@wasifhossain]
-* Fixed "create anoter" checkbox styling. [#5324] by [@faucct]
+* Fixed "create another" checkbox styling. [#5324] by [@faucct]
 
 ## 1.3.1 [☰](https://github.com/activeadmin/activeadmin/compare/v1.3.0..v1.3.1)
 

data/CONTRIBUTING.md

@@ -28,7 +28,7 @@ Now install the development dependencies:
 ```sh
 gem install foreman
 bundle install
-bin/yarn install
+yarn install
 ```
 
 Now you should be able to run the entire suite using:

data/app/controllers/active_admin/base_controller/authorization.rb

@@ -40,7 +40,7 @@ module ActiveAdmin
       end
 
       # Authorize the action and subject. Available in the controller
-      # as well as all the views. If the action is not allowd, it raises
+      # as well as all the views. If the action is not allowed, it raises
       # an ActiveAdmin::AccessDenied exception.
       #
       # @param [Symbol] action The action to check if the user has permission

data/app/views/active_admin/resource/index.html.arb

@@ -58,7 +58,7 @@ def build_index_list
   end
 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.
 def find_index_renderer_class(klass)
   if klass.is_a?(Class)

data/config/locales/de.yml

@@ -16,7 +16,7 @@ de:
         resource_type: "Ressourcentyp"
         updated_at: "Aktualisiert"
   active_admin:
-    dashboard: Übersicht
+    dashboard: "Übersicht"
     view: "Anzeigen"
     edit: "Bearbeiten"
     delete: "Löschen"
@@ -34,7 +34,7 @@ de:
     has_many_new: "%{model} hinzufügen"
     has_many_delete: "Löschen"
     has_many_remove: "Entfernen"
-    move: "Bewegen"
+    move: "Verschieben"
     filters:
       buttons:
         filter: "Filtern"
@@ -45,6 +45,8 @@ de:
     scopes:
       all: "Alle"
     search_status:
+      title: "Aktive Filter"
+      title_with_scope: "Aktive Filter in %{name}"
       no_current_filters: "Keine"
     status_tag:
       "yes": "Ja"
@@ -54,14 +56,16 @@ de:
     powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
       filters: "Filter"
-      search_status: "Suchstatus"
+      search_status: "Aktive Filter"
     pagination:
       empty: "Keine %{model} gefunden"
-      one: "Zeige <b>1</b> %{model}"
-      one_page: "Zeige <b>alle %{n}</b> %{model}"
-      multiple: "Zeige %{model} <b>%{from}&nbsp;–&nbsp;%{to}</b> von <b>%{total}</b>"
-      multiple_without_total: "Zeige %{model} <b>%{from}&nbsp;–&nbsp;%{to}</b>"
+      one: "<b>1</b> %{model}"
+      one_page: "<b>Alle %{n}</b> %{model}"
+      multiple: "%{model} <b>%{from}&nbsp;–&nbsp;%{to}</b> von <b>%{total}</b>"
+      multiple_without_total: "%{model} <b>%{from}&nbsp;–&nbsp;%{to}</b>"
       per_page: "Pro Seite: "
+      previous: "Vorherige"
+      next: "Nächste"
       entry:
         one: "Eintrag"
         other: "Einträge"
@@ -71,15 +75,15 @@ de:
       link: "Erstellen"
     batch_actions:
       button_label: "Stapelverarbeitung"
-      default_confirmation: "Bist du sicher, dass Sie dies tun wollen?"
-      delete_confirmation: "Sind Sie sicher dass sie diese %{plural_model} löschen wollen?"
+      default_confirmation: "Sind Sie sicher?"
+      delete_confirmation: "Sind Sie sicher dass Sie diese %{plural_model} löschen wollen?"
       succesfully_destroyed:
         one: "Erfolgreich 1 %{model} gelöscht"
         other: "Erfolgreich %{count} %{plural_model} gelöscht"
       selection_toggle_explanation: "(Auswahl umschalten)"
-      action_label: "%{title} ausgewählte"
+      action_label: "Ausgewählte %{title}"
       labels:
-        destroy: "Lösche"
+        destroy: "löschen"
     comments:
       created_at: "Erstellt"
       resource_type: "Res­sour­cen-Typ"
@@ -88,7 +92,7 @@ de:
       author: "Autor"
       add: "Kommentar hinzufügen"
       delete: "Löschen"
-      delete_confirmation: "Sind Sie sicher dass sie diesen Kommentar löschen wollen?"
+      delete_confirmation: "Sind Sie sicher dass Sie diesen Kommentar löschen wollen?"
       resource: "Res­sour­ce"
       no_comments_yet: "Es gibt noch keine Kommentare."
       author_missing: "Unbekannt"

data/config/locales/zh-CN.yml

@@ -45,6 +45,8 @@
     scopes:
       all: "所有"
     search_status:
+      title: "搜索条件"
+      title_with_scope: "搜索条件 %{name}"
       no_current_filters: "无"
     status_tag:
       "yes": "是"
@@ -62,6 +64,8 @@
       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: "条目"

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

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.beta5"
+  VERSION = "4.0.0.beta7"
 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/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/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 %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta5
+  version: 4.0.0.beta7
 platform: ruby
 authors:
 - Charles Maresh
@@ -15,7 +15,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-14 00:00:00.000000000 Z
+date: 2024-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -31,6 +31,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: formtastic
   requirement: !ruby/object:Gem::Requirement
@@ -211,7 +225,6 @@ files:
 - config/locales/ca.yml
 - config/locales/cs.yml
 - config/locales/da.yml
-- config/locales/de-CH.yml
 - config/locales/de.yml
 - config/locales/el.yml
 - config/locales/en-CA.yml
@@ -385,7 +398,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"

data/config/locales/de-CH.yml

@@ -1,84 +0,0 @@
-"de-CH":
-  active_admin:
-    dashboard: Übersicht
-    view: "Anzeigen"
-    edit: "Bearbeiten"
-    delete: "Löschen"
-    delete_confirmation: "Wollen Sie dieses Element wirklich löschen?"
-    new_model: "%{model} erstellen"
-    edit_model: "%{model} bearbeiten"
-    delete_model: "%{model} löschen"
-    details: "%{model} Details"
-    cancel: "Abbrechen"
-    empty: "Leer"
-    previous: "Zurück"
-    next: "Weiter"
-    download: "Herunterladen:"
-    has_many_new: "%{model} hinzufügen"
-    has_many_delete: "Löschen"
-    has_many_remove: "Entfernen"
-    filters:
-      buttons:
-        filter: "Filtern"
-        clear: "Filter entfernen"
-    status_tag:
-      "yes": "Ja"
-      "no": "Nicht"
-      "unset": "Nicht"
-    logout: "Abmelden"
-    powered_by: "Powered by %{active_admin} %{version}"
-    sidebars:
-      filters: "Filter"
-    pagination:
-      empty: "Keine %{model} gefunden"
-      one: "Zeige <b>1</b> %{model}"
-      one_page: "Zeige <b>alle %{n}</b> %{model}"
-      multiple: "Zeige %{model} <b>%{from}&nbsp;–&nbsp;%{to}</b> von <b>%{total}</b>"
-      multiple_without_total: "Zeige %{model} <b>%{from}&nbsp;–&nbsp;%{to}</b>"
-      entry:
-        one: "Eintrag"
-        other: "Einträge"
-    any: "Alle"
-    blank_slate:
-      content: "Es gibt noch keine %{resource_name}."
-      link: "Erstellen"
-    batch_actions:
-      button_label: "Stapelverarbeitung"
-      default_confirmation: "Bist du sicher, dass Sie dies tun wollen?"
-      delete_confirmation: "Sind Sie sicher dass sie diese %{plural_model} löschen wollen?"
-      succesfully_destroyed:
-        one: "Erfolgreich 1 %{model} gelöscht"
-        other: "Erfolgreich %{count} %{plural_model} gelöscht"
-      selection_toggle_explanation: "(Auswahl umschalten)"
-      action_label: "%{title} ausgewählte"
-      labels:
-        destroy: "Lösche"
-    comments:
-      body: "Inhalt"
-      author: "Autor"
-      resource: "Resource"
-      add: "Kommentar hinzufügen"
-      delete: "Löschen"
-      delete_confirmation: "Sind Sie sicher dass sie diesen Kommentar löschen wollen?"
-      no_comments_yet: "Es gibt noch keine Kommentare."
-      title_content: "Kommentare (%{count})"
-      errors:
-        empty_text: "Der Kommentar wurde nicht gespeichert, da der Text fehlt."
-    devise:
-      login:
-        title: "Login"
-        remember_me: "erinnere dich an mich"
-        submit: "Login"
-      reset_password:
-        title: "Passwort vergessen?"
-        submit: "Mein Passwort zurücksetzen"
-      change_password:
-        title: "Ändern Sie Ihr Passwort"
-        submit: "Mein Passwort ändern"
-      links:
-        sign_up: "Registrieren"
-        sign_in: "Anmeldung"
-        forgot_your_password: "Passwort vergessen?"
-        sign_in_with_omniauth_provider: "Anmeldung mit %{provider}"
-        resend_unlock_instructions: "Entsperrungsanweisung erneut senden"
-        resend_confirmation_instructions: "Bestätigungsanweisung erneut senden"