activeadmin 2.13.0 → 2.14.0

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

@@ -36,7 +36,7 @@ module ActiveAdmin
 
           text_node paginate @comments
 
-          if authorized?(ActiveAdmin::Auth::CREATE, ActiveAdmin::Comment)
+          if authorized?(ActiveAdmin::Auth::NEW, ActiveAdmin::Comment)
             build_comment_form
           end
         end

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

@@ -72,15 +72,15 @@ ActiveAdmin.after_load do |app|
               redirect_back fallback_location: active_admin_root
             end
           end
+        end
 
-          def destroy
-            destroy! do |success, failure|
-              success.html do
-                redirect_back fallback_location: active_admin_root
-              end
-              failure.html do
-                redirect_back fallback_location: active_admin_root
-              end
+        def destroy
+          destroy! do |success, failure|
+            success.html do
+              redirect_back fallback_location: active_admin_root
+            end
+            failure.html do
+              redirect_back fallback_location: active_admin_root
             end
           end
         end

data/lib/active_admin/pundit_adapter.rb

@@ -44,8 +44,6 @@ module ActiveAdmin
     def format_action(action, subject)
       # https://github.com/varvet/pundit/blob/master/lib/generators/pundit/install/templates/application_policy.rb
       case action
-      when Auth::CREATE then :create?
-      when Auth::UPDATE then :update?
       when Auth::READ then subject.is_a?(Class) ? :index? : :show?
       when Auth::DESTROY then subject.is_a?(Class) ? :destroy_all? : :destroy?
       else "#{action}?"

data/lib/active_admin/resource/action_items.rb

@@ -65,7 +65,7 @@ module ActiveAdmin
       # Adds the default New link on index
       def add_default_new_action_item
         add_action_item :new, only: :index do
-          if controller.action_methods.include?("new") && authorized?(ActiveAdmin::Auth::CREATE, active_admin_config.resource_class)
+          if controller.action_methods.include?("new") && authorized?(ActiveAdmin::Auth::NEW, active_admin_config.resource_class)
             localizer = ActiveAdmin::Localizers.resource(active_admin_config)
             link_to localizer.t(:new_model), new_resource_path
           end
@@ -75,7 +75,7 @@ module ActiveAdmin
       # Adds the default Edit link on show
       def add_default_edit_action_item
         add_action_item :edit, only: :show do
-          if controller.action_methods.include?("edit") && authorized?(ActiveAdmin::Auth::UPDATE, resource)
+          if controller.action_methods.include?("edit") && authorized?(ActiveAdmin::Auth::EDIT, resource)
             localizer = ActiveAdmin::Localizers.resource(active_admin_config)
             link_to localizer.t(:edit_model), edit_resource_path(resource)
           end

data/lib/active_admin/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ActiveAdmin
-  VERSION = "2.13.0"
+  VERSION = "2.14.0"
 end

data/lib/active_admin/view_helpers/auto_link_helper.rb

@@ -29,7 +29,7 @@ module ActiveAdmin
           authorized?(ActiveAdmin::Auth::READ, resource)
           url_for config.route_instance_path resource, url_options
         elsif config.controller.action_methods.include?("edit") &&
-          authorized?(ActiveAdmin::Auth::UPDATE, resource)
+          authorized?(ActiveAdmin::Auth::EDIT, resource)
           url_for config.route_edit_instance_path resource, url_options
         end
       end

data/lib/active_admin/views/index_as_table.rb

@@ -377,7 +377,7 @@ module ActiveAdmin
           if controller.action_methods.include?("show") && authorized?(ActiveAdmin::Auth::READ, resource)
             item localizer.t(:view), resource_path(resource), class: "view_link #{options[:css_class]}", title: localizer.t(:view)
           end
-          if controller.action_methods.include?("edit") && authorized?(ActiveAdmin::Auth::UPDATE, resource)
+          if controller.action_methods.include?("edit") && authorized?(ActiveAdmin::Auth::EDIT, resource)
             item localizer.t(:edit), edit_resource_path(resource), class: "edit_link #{options[:css_class]}", title: localizer.t(:edit)
           end
           if controller.action_methods.include?("destroy") && authorized?(ActiveAdmin::Auth::DESTROY, resource)

data/lib/active_admin/views/pages/base.rb

@@ -38,8 +38,8 @@ module ActiveAdmin
               text_node(meta(name: name, content: content))
             end
 
-            active_admin_application.javascripts.each do |path|
-              javascript_tag = active_admin_namespace.use_webpacker ? javascript_pack_tag(path) : javascript_include_tag(path)
+            active_admin_application.javascripts.each do |path, options|
+              javascript_tag = active_admin_namespace.use_webpacker ? javascript_pack_tag(path, **options) : javascript_include_tag(path, **options)
               text_node(javascript_tag)
             end
 
@@ -49,7 +49,8 @@ module ActiveAdmin
               text_node(favicon_tag)
             end
 
-            text_node csrf_meta_tag
+            text_node csrf_meta_tags
+            text_node csp_meta_tag
           end
         end
 

data/lib/active_admin/views/pages/index.rb

@@ -112,7 +112,7 @@ module ActiveAdmin
 
         def render_blank_slate
           blank_slate_content = I18n.t("active_admin.blank_slate.content", resource_name: active_admin_config.plural_resource_label)
-          if controller.action_methods.include?("new") && authorized?(ActiveAdmin::Auth::CREATE, active_admin_config.resource_class)
+          if controller.action_methods.include?("new") && authorized?(ActiveAdmin::Auth::NEW, active_admin_config.resource_class)
             blank_slate_content = [blank_slate_content, blank_slate_link].compact.join(" ")
           end
           insert_tag(view_factory.blank_slate, blank_slate_content)

data/lib/active_admin.rb

@@ -113,7 +113,7 @@ module ActiveAdmin
     private
 
     def wrap_block_for_active_support_notifications block
-      proc { |_name, _start, _finish, _id, payload| block.call payload }
+      proc { |_name, _start, _finish, _id, payload| block.call payload[:active_admin_application] }
     end
 
   end

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

@@ -18,6 +18,23 @@ ActiveAdmin.setup do |config|
   #
   # config.site_title_image = "logo.png"
 
+  # == Load Paths
+  #
+  # By default Active Admin files go inside app/admin/.
+  # You can change this directory.
+  #
+  # eg:
+  #   config.load_paths = [File.join(Rails.root, 'app', 'ui')]
+  #
+  # Or, you can also load more directories.
+  # Useful when setting namespaces with users that are not your main AdminUser entity.
+  #
+  # eg:
+  #   config.load_paths = [
+  #     File.join(Rails.root, 'app', 'admin'),
+  #     File.join(Rails.root, 'app', 'cashier')
+  #   ]
+
   # == Default Namespace
   #
   # Set the default namespace each administration resource

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.14.0
 platform: ruby
 authors:
 - Charles Maresh
@@ -15,7 +15,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-07 00:00:00.000000000 Z
+date: 2023-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -309,46 +309,6 @@ files:
 - config/locales/vi.yml
 - config/locales/zh-CN.yml
 - config/locales/zh-TW.yml
-- docs/.gitignore
-- docs/0-installation.md
-- docs/1-general-configuration.md
-- docs/10-custom-pages.md
-- docs/11-decorators.md
-- docs/12-arbre-components.md
-- docs/13-authorization-adapter.md
-- docs/14-gotchas.md
-- docs/2-resource-customization.md
-- docs/3-index-pages.md
-- docs/3-index-pages/custom-index.md
-- docs/3-index-pages/index-as-block.md
-- docs/3-index-pages/index-as-blog.md
-- docs/3-index-pages/index-as-grid.md
-- docs/3-index-pages/index-as-table.md
-- docs/4-csv-format.md
-- docs/5-forms.md
-- docs/6-show-pages.md
-- docs/7-sidebars.md
-- docs/8-custom-actions.md
-- docs/9-batch-actions.md
-- docs/CNAME
-- docs/Gemfile
-- docs/Gemfile.lock
-- docs/README.md
-- docs/_config.yml
-- docs/_includes/footer.html
-- docs/_includes/google-analytics.html
-- docs/_includes/head.html
-- docs/_includes/toc.html
-- docs/_includes/top-menu.html
-- docs/_layouts/default.html
-- docs/documentation.md
-- docs/images/activeadmin.png
-- docs/images/code-header.png
-- docs/images/divider.png
-- docs/images/features.png
-- docs/images/tidelift.svg
-- docs/index.html
-- docs/stylesheets/main.css
 - lib/active_admin.rb
 - lib/active_admin/abstract_view_factory.rb
 - lib/active_admin/application.rb
@@ -562,7 +522,8 @@ files:
 homepage: https://activeadmin.info
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -578,7 +539,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.13
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: Active Admin is a Ruby on Rails plugin for generating administration style

data/docs/.gitignore

@@ -1 +0,0 @@
-_site/

data/docs/0-installation.md

@@ -1,142 +0,0 @@
----
-redirect_from: /docs/0-installation.html
----
-
-# Installation
-
-Active Admin is a Ruby Gem.
-
-```ruby
-gem 'activeadmin'
-
-# Plus integrations with:
-gem 'devise'
-gem 'cancancan'
-gem 'draper'
-gem 'pundit'
-```
-
-More accurately, it's a [Rails Engine](http://guides.rubyonrails.org/engines.html)
-that can be injected into your existing Ruby on Rails application.
-
-## Setting up Active Admin
-
-After installing the gem, you need to run the generator. Here are your options:
-
-* If you don't want to use Devise, run it with `--skip-users`:
-
-  ```sh
-  rails g active_admin:install --skip-users
-  ```
-
-* If you want to customize the name of the generated user class, or if you want to use an existing user class, provide the class name as an argument:
-
-  ```sh
-  rails g active_admin:install User
-  ```
-
-* Otherwise, with no arguments we will create an `AdminUser` class to use with Devise:
-
-  ```sh
-  rails g active_admin:install
-  ```
-
-The generator adds these core files, among others:
-
-* `app/admin/dashboard.rb`
-* `app/assets/javascripts/active_admin.js`
-* `app/assets/stylesheets/active_admin.scss`
-* `config/initializers/active_admin.rb`
-
-Now, migrate and seed your database before starting the server:
-
-```sh
-rails db:migrate
-rails db:seed
-rails server
-```
-
-Visit `http://localhost:3000/admin` and log in as the default user:
-
-* __User__: admin@example.com
-* __Password__: password
-
-Voila! You're on your brand new Active Admin dashboard.
-
-To register an existing model with Active Admin:
-
-```sh
-rails generate active_admin:resource MyModel
-```
-
-This creates a file at `app/admin/my_model.rb` to set up the UI; refresh your
-browser to see it.
-
-# Upgrading
-
-When upgrading to a new version, it's a good idea to check the [CHANGELOG].
-
-To update the JS & CSS assets:
-
-```sh
-rails generate active_admin:assets
-```
-
-You should also sync these files with their counterparts in the AA source code:
-
-* app/admin/dashboard.rb [~>][dashboard.rb]
-* config/initializers/active_admin.rb [~>][active_admin.rb]
-
-# Gem compatibility
-
-## will_paginate
-
-If you use `will_paginate` in your app, you need to configure an initializer for
-Kaminari to avoid conflicts.
-
-```ruby
-# config/initializers/kaminari.rb
-Kaminari.configure do |config|
-  config.page_method_name = :per_page_kaminari
-end
-```
-
-If you are also using [Draper](https://github.com/drapergem/draper), you may
-want to make sure `per_page_kaminari` is delegated correctly:
-
-```ruby
-Draper::CollectionDecorator.send :delegate, :per_page_kaminari
-```
-
-## simple_form
-
-If you're getting the error `wrong number of arguments (6 for 4..5)`, [read #2703].
-
-## webpacker
-
-You can **opt-in to using Webpacker for ActiveAdmin assets** as well by updating your configuration to turn on the `use_webpacker` option, either at installation time or manually.
-
-* at active_admin installation:
-
-  ```sh
-  rails g active_admin:install --use_webpacker
-  ```
-
-* manually:
-
-  ```ruby
-  ActiveAdmin.setup do |config|
-    config.use_webpacker = true
-  end
-  ```
-
-  And run the generator to get default Active Admin assets:
-
-  ```sh
-  rails g active_admin:webpacker
-  ```
-
-[CHANGELOG]: https://github.com/activeadmin/activeadmin/blob/master/CHANGELOG.md
-[dashboard.rb]: https://github.com/activeadmin/activeadmin/blob/master/lib/generators/active_admin/install/templates/dashboard.rb
-[active_admin.rb]: https://github.com/activeadmin/activeadmin/blob/master/lib/generators/active_admin/install/templates/active_admin.rb.erb
-[read #2703]: https://github.com/activeadmin/activeadmin/issues/2703#issuecomment-38140864

data/docs/1-general-configuration.md

@@ -1,224 +0,0 @@
----
-redirect_from: /docs/1-general-configuration.html
----
-
-# General Configuration
-
-You can configure Active Admin settings in `config/initializers/active_admin.rb`.
-Here are a few common configurations:
-
-## Authentication
-
-Active Admin requires two settings to authenticate and use the current user
-within your application.
-
-+ the method controllers used to force authentication
-
-```ruby
-config.authentication_method = :authenticate_admin_user!
-```
-
-+ the method used to access the current user
-
-```ruby
-config.current_user_method = :current_admin_user
-```
-
-Both of these settings can be set to false to turn off authentication.
-
-```ruby
-config.authentication_method = false
-config.current_user_method   = false
-```
-
-## Site Title Options
-
-Every page has what's called the site title on the left side of the menu bar.
-If you want, you can customize it.
-
-```ruby
-config.site_title       = "My Admin Site"
-config.site_title_link  = "/"
-config.site_title_image = "site_image.png"
-config.site_title_image = "http://www.google.com/images/logos/google_logo_41.png"
-config.site_title_image = ->(context) { context.current_user.company.logo_url }
-```
-
-## Internationalization (I18n)
-
-Active Admin comes with translations for a lot of
-[locales](https://github.com/activeadmin/activeadmin/blob/master/config/locales/).
-Active Admin does not provide the translations for the kaminari gem it uses for pagination,
-to get these you can use the
-[kaminari-i18n](https://github.com/tigrish/kaminari-i18n) gem.
-
-To translate Active Admin to a new language or customize an existing
-translation, you can copy
-[config/locales/en.yml](https://github.com/activeadmin/activeadmin/blob/master/config/locales/en.yml)
-to your application's `config/locales` folder and update it. We welcome
-new/updated translations, so feel free to
-[contribute](https://github.com/activeadmin/activeadmin/blob/master/CONTRIBUTING.md)!
-
-When using [devise](https://github.com/plataformatec/devise) for authentication,
-you can use the [devise-i18n](https://github.com/tigrish/devise-i18n)
-gem to get the devise translations for other locales.
-
-## Localize Format For Dates and Times
-
-Active Admin sets `:long` as default localize format for dates and times.
-If you want, you can customize it.
-
-```ruby
-config.localize_format = :short
-```
-
-## Namespaces
-
-When registering resources in Active Admin, they are loaded into a namespace.
-The default namespace is "admin".
-
-```ruby
-# app/admin/posts.rb
-ActiveAdmin.register Post do
-  # ...
-end
-```
-
-The Post resource will be loaded into the "admin" namespace and will be
-available at `/admin/posts`. Each namespace holds on to its own settings that
-inherit from the application's configuration.
-
-For example, if you have two namespaces (`:admin` and `:super_admin`) and want to
-have different site title's for each, you can use the `config.namespace(name)`
-block within the initializer file to configure them individually.
-
-```ruby
-ActiveAdmin.setup do |config|
-  config.site_title = "My Default Site Title"
-
-  config.namespace :admin do |admin|
-    admin.site_title = "Admin Site"
-  end
-
-  config.namespace :super_admin do |super_admin|
-    super_admin.site_title = "Super Admin Site"
-  end
-end
-```
-
-If you are creating a multi-tenant application you may want to have multiple namespaces mounted to the same path. We can do this using the `route_options` settings on the namespace
-
-```ruby
-config.namespace :site_1 do |admin|
-  admin.route_options = { path: :admin, constraints: ->(request){ request.domain == "site1.com" } }
-end
-
-config.namespace :site_2 do |admin|
-  admin.route_options = { path: :admin, constraints: ->(request){ request.domain == "site2.com" } }
-end
-```
-
-If you would like to mount the namespace to a subdomain instead of path we can use the `route_options` for this as well
-
-```ruby
-config.namespace :admin do |admin|
-  admin.route_options = { path: '', subdomain: 'admin' }
-end
-```
-
-Each setting available in the Active Admin setup block is configurable on a per
-namespace basis.
-
-## Load paths
-
-By default Active Admin files go inside `app/admin/`. You can change this
-directory in the initializer file:
-
-```ruby
-ActiveAdmin.setup do |config|
-  config.load_paths = [File.join(Rails.root, "app", "ui")]
-end
-```
-
-## Comments
-
-By default Active Admin includes comments on resources. Sometimes, this is
-undesired. To disable comments:
-
-```ruby
-# For the entire application:
-ActiveAdmin.setup do |config|
-  config.comments = false
-end
-
-# For a namespace:
-ActiveAdmin.setup do |config|
-  config.namespace :admin do |admin|
-    admin.comments = false
-  end
-end
-
-# For a given resource:
-ActiveAdmin.register Post do
-  config.comments = false
-end
-```
-
-You can change the name under which comments are registered:
-
-```ruby
-config.comments_registration_name = 'AdminComment'
-```
-
-You can change the order for the comments and you can change the column to be
-used for ordering:
-
-```ruby
-config.comments_order = 'created_at ASC'
-```
-
-You can disable the menu item for the comments index page:
-
-```ruby
-config.comments_menu = false
-```
-
-You can customize the comment menu:
-
-```ruby
-config.comments_menu = { parent: 'Admin', priority: 1 }
-```
-
-Remember to indicate where to place the comments and form with:
-
-```ruby
-active_admin_comments
-```
-
-## Utility Navigation
-
-The "utility navigation" shown at the top right normally shows the current user
-and a link to log out. However, the utility navigation is just like any other
-menu in the system; you can provide your own menu to be rendered in its place.
-
-```ruby
-ActiveAdmin.setup do |config|
-  config.namespace :admin do |admin|
-    admin.build_menu :utility_navigation do |menu|
-      menu.add label: "ActiveAdmin.info", url: "http://www.activeadmin.info",
-                                          html_options: { target: :blank }
-      admin.add_current_user_to_menu  menu
-      admin.add_logout_button_to_menu menu
-    end
-  end
-end
-```
-
-## Footer Customization
-
-By default, Active Admin displays a "Powered by ActiveAdmin" message on every
-page. You can override this message and show domain-specific messaging:
-
-```ruby
-config.footer = "MyApp Revision v1.3"
-```