activeadmin 4.0.0.beta12 → 4.0.0.beta14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f813aff0e1f46af219b2a140e89d47c49d0a1789469a7de1696fb51a9a3f9bfa
-  data.tar.gz: 4a89afdb369f20b03fb313db3171ad186b2aed66968271e840bd8da9fdf4f127
+  metadata.gz: fd8e96446cfbff31209b99d16e1c73068cce5f8be2d617d8f78e6086b3cc84aa
+  data.tar.gz: 3e6a6f7eba472c1cc31b2b00c3ec966a0b6f3ac680db8ec43948254ac132f641
 SHA512:
-  metadata.gz: 9d81333a08a10871b0f1fca78836bccca4011de36153e8da14935a23dece664a3fee5f3ebba0e6f8070c0a014948ff41a8bfe5c162a40296e40013d95322f5ed
-  data.tar.gz: 4d98685077e1ac9fb02aff03e13f987595bf2b5d8a950a8b21e615f6057000e8a812f050849397f2edad46b1602dd0ff658f54fe1013b5740e94c63a09a78c20
+  metadata.gz: c834a24095dfeb67cd11fe683af72215109fa8ed2c41135ffb69e3759fcca7adca5982a8e7f987d216797d478055730af4f4d290ce07a43440a83f4ddbc53664
+  data.tar.gz: 5f8658312c48a29fba3c90ecad7f6a5dd8ccb9318e73500524fa1b98d8d3862130d710d950d8af96fc70bfa4020ed87e1b45403f537461f70177eed256a08640

data/UPGRADING.md

@@ -8,14 +8,14 @@ ActiveAdmin v4 uses TailwindCSS. It has **mobile web, dark mode and RTL support*
 
 These instructions assume the `cssbundling-rails` and `importmap-rails` gems are already installed and you have run their install commands in your app. If you haven't done so, please do before continuing.
 
-Update your `Gemfile` with `gem "activeadmin", "4.0.0.beta12"` and then run `gem install activeadmin --pre`.
+Update your `Gemfile` with `gem "activeadmin", "4.0.0.beta14"` and then run `gem install activeadmin --pre`.
 
 Now, run `rails generate active_admin:assets` to replace the old assets with the new files.
 
 Then add the npm package and update the `build:css` script.
 
 ```
-yarn add @activeadmin/activeadmin@4.0.0-beta12
+yarn add @activeadmin/activeadmin@4.0.0-beta14
 npm pkg set scripts.build:css="tailwindcss -i ./app/assets/stylesheets/active_admin.css -o ./app/assets/builds/active_admin.css --minify -c tailwind-active_admin.config.js"
 ```
 

data/app/controllers/active_admin/resource_controller/data_access.rb

@@ -168,11 +168,16 @@ module ActiveAdmin
       #
       # @return [void]
       def update_resource(object, attributes)
-        object = assign_attributes(object, attributes)
+        status = nil
+        ActiveRecord::Base.transaction do
+          object = assign_attributes(object, attributes)
 
-        run_update_callbacks object do
-          save_resource(object)
+          run_update_callbacks object do
+            status = save_resource(object)
+            raise ActiveRecord::Rollback unless status
+          end
         end
+        status
       end
 
       # Destroys an object from the database and calls appropriate callbacks.

data/app/helpers/active_admin/display_helper.rb

@@ -24,7 +24,7 @@ module ActiveAdmin
     def display_name(resource)
       unless resource.nil?
         result = render_in_context(resource, display_name_method_for(resource))
-        if result.to_s&.strip&.present?
+        if result.to_s.strip.present?
           ERB::Util.html_escape(result)
         else
           ERB::Util.html_escape(render_in_context(resource, DISPLAY_NAME_FALLBACK))

data/app/helpers/active_admin/layout_helper.rb

@@ -22,7 +22,7 @@ module ActiveAdmin
 
     def action_items_for_action
       @action_items_for_action ||= begin
-        if active_admin_config && active_admin_config.action_items?
+        if active_admin_config&.action_items?
           active_admin_config.action_items_for(params[:action], self)
         else
           []
@@ -32,7 +32,7 @@ module ActiveAdmin
 
     def sidebar_sections_for_action
       @sidebar_sections_for_action ||= begin
-        if active_admin_config && active_admin_config.sidebar_sections?
+        if active_admin_config&.sidebar_sections?
           active_admin_config.sidebar_sections_for(params[:action], self)
         else
           []

data/config/locales/es.yml

@@ -35,6 +35,10 @@ es:
     has_many_delete: "Eliminar"
     has_many_remove: "Quitar"
     move: "Mover"
+    toggle_dark_mode: "Alternar modo oscuro"
+    toggle_main_navigation_menu: "Alternar el menú de navegación principal"
+    toggle_user_menu: "Alternar menú de usuario"
+    toggle_section: "Alternar sección"
     filters:
       buttons:
         filter: "Filtrar"
@@ -62,6 +66,8 @@ es:
       multiple: "Mostrando %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> de un total de <b>%{total}</b>"
       multiple_without_total: "Mostrando %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b>"
       per_page: "Por página: "
+      previous: "Anterior"
+      next: "Siguiente"
       entry:
         one: "registro"
         other: "registros"

data/config/locales/ja.yml

@@ -31,6 +31,10 @@ ja:
       "yes": "はい"
       "no": "いいえ"
       "unset": "いいえ"
+    toggle_dark_mode: "ダークモードを切り替える"
+    toggle_main_navigation_menu: "メインナビゲーションメニューを切り替える"
+    toggle_section: "セクションを切り替える"
+    toggle_user_menu: "ユーザーメニューを切り替える"
     logout: "ログアウト"
     powered_by: "Powered by %{active_admin} %{version}"
     sidebars:

data/config/locales/pl.yml

@@ -49,11 +49,17 @@ pl:
     scopes:
       all: "Wszystko"
     search_status:
+      title: "Wyszukiwanie"
+      title_with_scope: "Wyszukiwanie %{name}"
       no_current_filters: "Brak"
     status_tag:
       "yes": "Tak"
       "no": "Nie"
       "unset": "Nie"
+    toggle_dark_mode: Przełącz tryb ciemny
+    toggle_main_navigation_menu: Przełącz główną nawigację
+    toggle_section: Przełącz sekcję
+    toggle_user_menu: Przełącz menu użytkownika
     logout: "Wyloguj"
     powered_by: "Powered by %{active_admin} %{version}"
     sidebars:

data/config/locales/zh-CN.yml

@@ -52,6 +52,10 @@
       "yes": "是"
       "no": "否"
       "unset": "否"
+    toggle_dark_mode: "切换深色模式"
+    toggle_main_navigation_menu: "切换主导航"
+    toggle_section: "切换区块"
+    toggle_user_menu: "切换用户菜单"
     logout: "退出"
     powered_by: "构建程序为 %{active_admin} %{version}"
     sidebars:

data/config/locales/zh-TW.yml

@@ -52,6 +52,10 @@
       "yes": "是"
       "no": "否"
       "unset": "未知"
+    toggle_dark_mode: "切換暗黑模式"
+    toggle_main_navigation_menu: "切換主要導覽"
+    toggle_section: "切換區塊"
+    toggle_user_menu: "切換使用者選單"
     logout: "登出"
     powered_by: "由 %{active_admin} %{version} 提供"
     sidebars:

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

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/batch_actions/views/batch_action_form.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/component"
+require_relative "../../component"
 
 module ActiveAdmin
   module BatchActions

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

data/lib/active_admin/batch_actions.rb

@@ -1,12 +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 "active_admin/batch_actions/views/batch_action_form"
-  require "active_admin/batch_actions/views/selection_cells"
+  require_relative "batch_actions/views/batch_action_form"
+  require_relative "batch_actions/views/selection_cells"
 end

data/lib/active_admin/dynamic_settings_node.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-require "active_admin/dynamic_setting"
-require "active_admin/settings_node"
+require_relative "dynamic_setting"
+require_relative "settings_node"
 
 module ActiveAdmin
 

data/lib/active_admin/engine.rb

@@ -35,7 +35,7 @@ module ActiveAdmin
     end
 
     initializer "active_admin.routes" do
-      require "active_admin/helpers/routes/url_helpers"
+      require_relative "helpers/routes/url_helpers"
     end
 
     initializer "active_admin.deprecator" do |app|

data/lib/active_admin/filters/active.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/filters/active_filter"
+require_relative "active_filter"
 
 module ActiveAdmin
   module Filters

data/lib/active_admin/filters/resource_extension.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/filters/active"
+require_relative "active"
 
 module ActiveAdmin
   module Filters

data/lib/active_admin/filters.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
-require "active_admin/filters/dsl"
-require "active_admin/filters/resource_extension"
-require "active_admin/filters/formtastic_addons"
-require "active_admin/filters/forms"
-require "active_admin/helpers/optional_display"
+require_relative "filters/dsl"
+require_relative "filters/resource_extension"
+require_relative "filters/formtastic_addons"
+require_relative "filters/forms"
+require_relative "helpers/optional_display"
 
 # Add our Extensions
 ActiveAdmin::ResourceDSL.send :include, ActiveAdmin::Filters::DSL

data/lib/active_admin/form_builder.rb

@@ -95,7 +95,7 @@ module ActiveAdmin
       contents = without_wrapper { inputs(options, &form_block) }
       contents ||= "".html_safe
 
-      js = new_record ? js_for_has_many(options[:class], &form_block) : ""
+      js = new_record ? js_for_has_many(&form_block) : ""
       contents << js
     end
 
@@ -159,14 +159,13 @@ module ActiveAdmin
     end
 
     # Capture the ADD JS
-    def js_for_has_many(class_string, &form_block)
+    def js_for_has_many(&form_block)
       assoc_name = assoc_klass.model_name
       placeholder = "NEW_#{assoc_name.to_s.underscore.upcase.tr('/', '_')}_RECORD"
-      opts = {
+      opts = options.merge(
         for: [assoc, assoc_klass.new],
-        class: class_string,
         for_options: { child_index: placeholder }
-      }
+      )
       html = template.capture { __getobj__.send(:inputs_for_nested_attributes, opts, &form_block) }
       text = new_record.is_a?(String) ? new_record : I18n.t("active_admin.has_many_new", model: assoc_name.human)
 

data/lib/active_admin/localizers.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/localizers/resource_localizer"
+require_relative "localizers/resource_localizer"
 
 module ActiveAdmin
   module Localizers

data/lib/active_admin/menu_item.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'active_admin/view_helpers/method_or_proc_helper'
+require_relative "view_helpers/method_or_proc_helper"
 
 module ActiveAdmin
   class MenuItem

data/lib/active_admin/namespace.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/resource_collection"
+require_relative "resource_collection"
 
 module ActiveAdmin
 

data/lib/active_admin/namespace_settings.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/dynamic_settings_node"
+require_relative "dynamic_settings_node"
 
 module ActiveAdmin
   class NamespaceSettings < DynamicSettingsNode

data/lib/active_admin/orm/active_record/comments/views/active_admin_comments.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/views"
+require_relative "../../../../views"
 
 module ActiveAdmin
   module Comments

data/lib/active_admin/orm/active_record/comments/views.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
-require "active_admin/views"
-require "active_admin/orm/active_record/comments/views/active_admin_comments"
+require_relative "../../../views"
+require_relative "views/active_admin_comments"

data/lib/active_admin/orm/active_record/comments.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
-require "active_admin/orm/active_record/comments/views"
-require "active_admin/orm/active_record/comments/namespace_helper"
-require "active_admin/orm/active_record/comments/resource_helper"
+require_relative "comments/views"
+require_relative "comments/namespace_helper"
+require_relative "comments/resource_helper"
 
 # Add the comments configuration
 ActiveAdmin::Application.inheritable_setting :comments, true

data/lib/active_admin/orm/active_record.rb

@@ -3,4 +3,4 @@
 
 ActiveAdmin::DatabaseHitDuringLoad.database_error_classes << ActiveRecord::StatementInvalid
 
-require "active_admin/orm/active_record/comments"
+require_relative "active_record/comments"

data/lib/active_admin/pundit_adapter.rb

@@ -23,7 +23,7 @@ module ActiveAdmin
       # which means there is no way how to scope other actions
       Pundit.policy_scope!(user, namespace(collection))
     rescue Pundit::NotDefinedError => e
-      if default_policy_class && default_policy_class.const_defined?(:Scope)
+      if default_policy_class&.const_defined?(:Scope)
         default_policy_class::Scope.new(user, collection).resolve
       else
         raise e
@@ -95,7 +95,7 @@ module ActiveAdmin
     end
 
     def default_policy_class
-      ActiveAdmin.application.pundit_default_policy && ActiveAdmin.application.pundit_default_policy.constantize
+      ActiveAdmin.application.pundit_default_policy&.constantize
     end
 
     def default_policy(subject)

data/lib/active_admin/resource/action_items.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/helpers/optional_display"
+require_relative "../helpers/optional_display"
 
 module ActiveAdmin
 

data/lib/active_admin/resource/belongs_to.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/resource"
+require_relative "../resource"
 
 module ActiveAdmin
   class Resource

data/lib/active_admin/resource/sidebars.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "active_admin/helpers/optional_display"
+require_relative "../helpers/optional_display"
 
 module ActiveAdmin
 

data/lib/active_admin/resource.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
-require "active_admin/view_helpers/method_or_proc_helper"
-require "active_admin/resource/action_items"
-require "active_admin/resource/attributes"
-require "active_admin/resource/controllers"
-require "active_admin/resource/menu"
-require "active_admin/resource/page_presenters"
-require "active_admin/resource/pagination"
-require "active_admin/resource/routes"
-require "active_admin/resource/naming"
-require "active_admin/resource/scopes"
-require "active_admin/resource/includes"
-require "active_admin/resource/scope_to"
-require "active_admin/resource/sidebars"
-require "active_admin/resource/belongs_to"
-require "active_admin/resource/ordering"
-require "active_admin/resource/model"
+require_relative "view_helpers/method_or_proc_helper"
+require_relative "resource/action_items"
+require_relative "resource/attributes"
+require_relative "resource/controllers"
+require_relative "resource/menu"
+require_relative "resource/page_presenters"
+require_relative "resource/pagination"
+require_relative "resource/routes"
+require_relative "resource/naming"
+require_relative "resource/scopes"
+require_relative "resource/includes"
+require_relative "resource/scope_to"
+require_relative "resource/sidebars"
+require_relative "resource/belongs_to"
+require_relative "resource/ordering"
+require_relative "resource/model"
 
 module ActiveAdmin
 

data/lib/active_admin/version.rb

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

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

@@ -132,23 +132,11 @@ module ActiveAdmin
         legend = args.shift if args.first.is_a?(::String)
         legend = html_options.delete(:name) if html_options.key?(:name)
         legend_tag = legend ? helpers.tag.legend(legend, class: "fieldset-title") : ""
-        fieldset_attrs = tag_attributes html_options
+        fieldset_attrs = helpers.tag.attributes html_options
         @opening_tag = "<fieldset #{fieldset_attrs}>#{legend_tag}<ol>"
         @closing_tag = "</ol></fieldset>"
         super(*(args << html_options), &block)
       end
-
-      private
-
-      def tag_attributes(html_options)
-        if Rails::VERSION::MAJOR <= 6
-          # Reimplement tag.attributes to backport support for Rails 6.1.
-          # TODO: this can be removed when support for Rails 6.x is dropped
-          helpers.tag.tag_options(html_options.to_h).to_s.strip.html_safe
-        else
-          helpers.tag.attributes html_options
-        end
-      end
     end
 
     class SemanticActionsProxy < FormtasticProxy

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-require "active_admin/async_count"
-require "active_admin/view_helpers/method_or_proc_helper"
+require_relative "../../async_count"
+require_relative "../../view_helpers/method_or_proc_helper"
 
 module ActiveAdmin
   module Views

data/lib/active_admin.rb

@@ -125,12 +125,12 @@ module ActiveAdmin
 end
 
 # Require things that don't support autoload
-require "active_admin/engine"
-require "active_admin/error"
+require_relative "active_admin/engine"
+require_relative "active_admin/error"
 
 # Require internal plugins
-require "active_admin/batch_actions"
-require "active_admin/filters"
+require_relative "active_admin/batch_actions"
+require_relative "active_admin/filters"
 
 # Require ORM-specific plugins
-require "active_admin/orm/active_record" if defined? ActiveRecord
+require_relative "active_admin/orm/active_record" if defined? ActiveRecord

data/lib/activeadmin.rb

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

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-require "active_admin/error"
-require "active_admin/dependency"
+require_relative "../../../active_admin/error"
+require_relative "../../../active_admin/dependency"
 
 module ActiveAdmin
   module Generators

data/plugin.js

@@ -1,6 +1,6 @@
-const plugin = require('tailwindcss/plugin')
-const defaultTheme = require('tailwindcss/defaultTheme');
-const colors = require('tailwindcss/colors');
+import plugin from 'tailwindcss/plugin';
+import defaultTheme from 'tailwindcss/defaultTheme';
+import colors from 'tailwindcss/colors';
 const { spacing, borderWidth, borderRadius } = defaultTheme;
 
 // https://github.com/tailwindlabs/tailwindcss/discussions/9336
@@ -28,7 +28,7 @@ const svgToTinyDataUri = (() => {
   return svgToTinyDataUri;
 })();
 
-module.exports = plugin(
+export default plugin(
   function({ addBase, addComponents, theme }) {
     addBase({
       [[

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta12
+  version: 4.0.0.beta14
 platform: ruby
 authors:
 - Charles Maresh
@@ -15,7 +15,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-15 00:00:00.000000000 Z
+date: 2024-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -107,14 +107,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -377,7 +377,6 @@ files:
 - lib/generators/active_admin/resource/templates/resource.rb.erb
 - lib/generators/active_admin/views_generator.rb
 - plugin.js
-- vendor/bundle/offense.rb
 - vendor/javascript/flowbite.js
 - vendor/javascript/rails_ujs_esm.js
 homepage: https://activeadmin.info
@@ -400,14 +399,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
+rubygems_version: 3.5.15
 signing_key:
 specification_version: 4
 summary: Active Admin is a Ruby on Rails plugin for generating administration style

data/vendor/bundle/offense.rb

@@ -1 +0,0 @@
-puts "Ciao"