activeadmin 3.4.0 → 4.0.0.beta18

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

@@ -16,10 +16,14 @@ module ActiveAdmin
         @resource_class ||= @collection.klass if @collection.respond_to? :klass
 
         @columns = []
+        @tbody_html = options.delete(:tbody_html)
+        @row_html = options.delete(:row_html)
+        # To be deprecated, please use row_html instead.
         @row_class = options.delete(:row_class)
 
         build_table
         super(options)
+        add_class "data-table"
         columns(*attrs)
       end
 
@@ -66,40 +70,42 @@ module ActiveAdmin
       end
 
       def build_table_header(col)
-        classes = Arbre::HTML::ClassList.new
         sort_key = sortable? && col.sortable? && col.sort_key
         params = request.query_parameters.except :page, :order, :commit, :format
 
-        classes << "sortable" if sort_key
-        classes << "sorted-#{current_sort[1]}" if sort_key && current_sort[0] == sort_key
-        classes << col.html_class
+        attributes = {
+          class: col.html_class,
+          "data-column": col.title_id.presence,
+          "data-sortable": (sort_key.present?) ? "" : nil,
+          "data-sort-direction": (sort_key && current_sort[0] == sort_key) ? current_sort[1] : nil
+        }
 
         if sort_key
-          th class: classes do
-            link_to col.pretty_title, params: params, order: "#{sort_key}_#{order_for_sort_key(sort_key)}"
+          th(attributes) do
+            link_to params: params, order: "#{sort_key}_#{order_for_sort_key(sort_key)}" do
+              svg = '<svg class="data-table-sorted-icon" fill="none" viewBox="0 0 10 6"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/></svg>'
+
+              (col.pretty_title + svg).html_safe
+            end
           end
         else
-          th col.pretty_title, class: classes
+          th col.pretty_title, attributes
         end
       end
 
       def build_table_body
-        @tbody = tbody do
+        @tbody = tbody(**(@tbody_html || {})) do
           # Build enough rows for our collection
           @collection.each do |elem|
-            classes = [helpers.cycle("odd", "even")]
-
-            if @row_class
-              classes << @row_class.call(elem)
-            end
-
-            tr(class: classes.flatten.join(" "), id: dom_id_for(elem))
+            html_options = @row_html&.call(elem) || {}
+            html_options.reverse_merge!(class: @row_class&.call(elem))
+            tr(id: dom_id_for(elem), **html_options)
           end
         end
       end
 
       def build_table_cell(col, resource)
-        td class: col.html_class do
+        td class: col.html_class, "data-column": col.title_id.presence do
           html = helpers.format_attribute(resource, col.data)
           # Don't add the same Arbre twice, while still allowing format_attribute to call status_tag
           current_arbre_element << html unless current_arbre_element.children.include? html
@@ -139,19 +145,13 @@ module ActiveAdmin
 
       class Column
 
-        attr_accessor :title, :data, :html_class
+        attr_accessor :title, :title_id, :data, :html_class
 
         def initialize(*args, &block)
           @options = args.extract_options!
-
           @title = args[0]
-          html_classes = [:col]
-          if @options.has_key?(:class)
-            html_classes << @options.delete(:class)
-          elsif @title.present?
-            html_classes << "col-#{@title.to_s.parameterize(separator: "_")}"
-          end
-          @html_class = html_classes.join(" ")
+          @title_id = @title.to_s.parameterize(separator: "_") if @title.present? && !title.is_a?(Arbre::Element)
+          @html_class = @options.delete(:class)
           @data = args[1] || args[0]
           @data = block if block
           @resource_class = args[2]

data/lib/active_admin/views/index_as_table.rb

@@ -72,7 +72,7 @@ module ActiveAdmin
     #   selectable_column
     #   column :title
     #   actions do |post|
-    #     item "Preview", admin_preview_post_path(post), class: "member_link"
+    #     item "Preview", admin_preview_post_path(post), class: "preview-link"
     #   end
     # end
     # ```
@@ -99,32 +99,6 @@ module ActiveAdmin
     # end
     # ```
     #
-    # In case you prefer to list actions links in a dropdown menu:
-    #
-    # ```ruby
-    # index do
-    #   selectable_column
-    #   column :title
-    #   actions dropdown: true do |post|
-    #     item "Preview", admin_preview_post_path(post)
-    #   end
-    # end
-    # ```
-    #
-    # In addition, you can insert the position of the row in the greater
-    # collection by using the index_column special command:
-    #
-    # ```ruby
-    # index do
-    #   selectable_column
-    #   index_column
-    #   column :title
-    # end
-    # ```
-    #
-    # index_column take an optional offset parameter to allow a developer to set
-    # the starting number for the index (default is 1).
-    #
     # ## Sorting
     #
     # When a column is generated from an Active Record attribute, the table is
@@ -222,47 +196,45 @@ module ActiveAdmin
     # end
     # ```
     #
-    # ## Custom row class
+    # ## Custom tbody HTML attributes
     #
-    # In order to add special class to table rows pass the proc object as a `:row_class` option
-    # of the `index` method.
+    # In order to add HTML attributes to the tbody use the `:tbody_html` option.
     #
     # ```ruby
-    # index row_class: ->elem { 'active' if elem.active? } do
+    # index tbody_html: { class: "my-class", data: { controller: 'stimulus-controller' } } do
     #   # columns
     # end
     # ```
     #
+    # ## Custom row HTML attributes
+    #
+    # In order to add HTML attributes to table rows, use a proc object in the `:row_html` option.
+    #
+    # ```ruby
+    # index row_html: ->elem { { class: ('active' if elem.active?), data: { 'element-id' => elem.id } } } do
+    #   # columns
+    # end
+    # ```
     class IndexAsTable < ActiveAdmin::Component
-
       def build(page_presenter, collection)
+        add_class "index-as-table"
         table_options = {
           id: "index_table_#{active_admin_config.resource_name.plural}",
           sortable: true,
-          class: "index_table index",
           i18n: active_admin_config.resource_class,
           paginator: page_presenter[:paginator] != false,
+          tbody_html: page_presenter[:tbody_html],
+          row_html: page_presenter[:row_html],
+          # To be deprecated, please use row_html instead.
           row_class: page_presenter[:row_class]
         }
 
-        table_for collection, table_options do |t|
-          table_config_block = page_presenter.block || default_table
-          instance_exec(t, &table_config_block)
-        end
-      end
-
-      def table_for(*args, &block)
-        insert_tag IndexTableFor, *args, &block
-      end
-
-      def default_table
-        proc do
-          selectable_column
-          id_column if resource_class.primary_key
-          active_admin_config.resource_columns.each do |attribute|
-            column attribute
+        if page_presenter.block
+          insert_tag(IndexTableFor, collection, table_options) do |t|
+            instance_exec(t, &page_presenter.block)
           end
-          actions
+        else
+          render "index_as_table_default", table_options: table_options
         end
       end
 
@@ -275,21 +247,14 @@ module ActiveAdmin
       # methods for quickly displaying items on the index page
       #
       class IndexTableFor < ::ActiveAdmin::Views::TableFor
-
         # Display a column for checkbox
-        def selectable_column
+        def selectable_column(**options)
           return unless active_admin_config.batch_actions.any?
-          column resource_selection_toggle_cell, class: "col-selectable", sortable: false do |resource|
+          column resource_selection_toggle_cell, class: options[:class], sortable: false do |resource|
             resource_selection_cell resource
           end
         end
 
-        def index_column(start_value = 1)
-          column "#", class: "col-index", sortable: false do |resource|
-            @collection.offset_value + @collection.index(resource) + start_value
-          end
-        end
-
         # Display a column for the id
         def id_column(*args)
           raise "#{resource_class.name} has no primary_key!" unless resource_class.primary_key
@@ -300,9 +265,9 @@ module ActiveAdmin
 
           column(title, sortable: sortable) do |resource|
             if controller.action_methods.include?("show")
-              link_to resource.id, resource_path(resource), class: "resource_id_link"
+              link_to resource.id, resource_path(resource)
             elsif controller.action_methods.include?("edit")
-              link_to resource.id, edit_resource_path(resource), class: "resource_id_link"
+              link_to resource.id, edit_resource_path(resource)
             else
               resource.id
             end
@@ -334,38 +299,17 @@ module ActiveAdmin
         #   item 'Grant Admin', grant_admin_admin_user_path(admin_user)
         # end
         #
-        # # Append some actions onto the end of the default actions displayed in a Dropdown Menu
-        # actions dropdown: true do |admin_user|
-        #   item 'Grant Admin', grant_admin_admin_user_path(admin_user)
-        # end
-        #
-        # # Custom actions without the defaults displayed in a Dropdown Menu.
-        # actions defaults: false, dropdown: true, dropdown_name: 'Additional actions' do |admin_user|
-        #   item 'Grant Admin', grant_admin_admin_user_path(admin_user)
-        # end
-        #
         # ```
         def actions(options = {}, &block)
           name = options.delete(:name) { "" }
           defaults = options.delete(:defaults) { true }
-          dropdown = options.delete(:dropdown) { false }
-          dropdown_name = options.delete(:dropdown_name) { I18n.t "active_admin.dropdown_actions.button_label", default: "Actions" }
-
-          options[:class] ||= "col-actions"
 
           column name, options do |resource|
-            if dropdown
-              dropdown_menu dropdown_name do
-                defaults(resource) if defaults
-                instance_exec(resource, &block) if block_given?
-              end
-            else
-              table_actions do
-                defaults(resource, css_class: :member_link) if defaults
-                if block_given?
-                  block_result = instance_exec(resource, &block)
-                  text_node block_result unless block_result.is_a? Arbre::Element
-                end
+            insert_tag(TableActions, class: "data-table-resource-actions") do
+              render "index_table_actions_default", defaults_data(resource) if defaults
+              if block
+                block_result = instance_exec(resource, &block)
+                text_node block_result unless block_result.is_a? Arbre::Element
               end
             end
           end
@@ -373,29 +317,23 @@ module ActiveAdmin
 
         private
 
-        def defaults(resource, options = {})
+        def defaults_data(resource)
           localizer = ActiveAdmin::Localizers.resource(active_admin_config)
-          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::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)
-            item localizer.t(:delete), resource_path(resource), class: "delete_link #{options[:css_class]}", title: localizer.t(:delete),
-                                                                method: :delete, data: { confirm: localizer.t(:delete_confirmation) }
-          end
+          {
+            resource: resource,
+            view_label: localizer.t(:view),
+            edit_label: localizer.t(:edit),
+            delete_label: localizer.t(:delete),
+            delete_confirmation_text: localizer.t(:delete_confirmation)
+          }
         end
 
         class TableActions < ActiveAdmin::Component
-          builder_method :table_actions
-
           def item *args, **kwargs
             text_node link_to(*args, **kwargs)
           end
         end
       end # IndexTableFor
-
     end
   end
 end

data/lib/active_admin.rb

@@ -7,21 +7,22 @@ require "kaminari"
 require "formtastic"
 require "formtastic_i18n"
 require "inherited_resources"
-require "jquery-rails"
 require "arbre"
 
-require "active_admin/helpers/i18n"
+begin
+  require "importmap-rails"
+rescue LoadError
+  # importmap-rails is optional
+end
 
 module ActiveAdmin
 
   autoload :VERSION, "active_admin/version"
   autoload :Application, "active_admin/application"
-  autoload :AssetRegistration, "active_admin/asset_registration"
   autoload :Authorization, "active_admin/authorization_adapter"
   autoload :AuthorizationAdapter, "active_admin/authorization_adapter"
   autoload :Callbacks, "active_admin/callbacks"
   autoload :Component, "active_admin/component"
-  autoload :BaseController, "active_admin/base_controller"
   autoload :CanCanAdapter, "active_admin/cancan_adapter"
   autoload :ControllerAction, "active_admin/controller_action"
   autoload :CSVBuilder, "active_admin/csv_builder"
@@ -38,30 +39,31 @@ module ActiveAdmin
   autoload :OrderClause, "active_admin/order_clause"
   autoload :Page, "active_admin/page"
   autoload :PagePresenter, "active_admin/page_presenter"
-  autoload :PageController, "active_admin/page_controller"
   autoload :PageDSL, "active_admin/page_dsl"
   autoload :PunditAdapter, "active_admin/pundit_adapter"
   autoload :Resource, "active_admin/resource"
-  autoload :ResourceController, "active_admin/resource_controller"
   autoload :ResourceDSL, "active_admin/resource_dsl"
   autoload :Scope, "active_admin/scope"
   autoload :ScopeChain, "active_admin/helpers/scope_chain"
   autoload :SidebarSection, "active_admin/sidebar_section"
   autoload :TableBuilder, "active_admin/table_builder"
-  autoload :ViewFactory, "active_admin/view_factory"
   autoload :ViewHelpers, "active_admin/view_helpers"
   autoload :Views, "active_admin/views"
 
   class << self
 
-    attr_accessor :application
+    attr_accessor :application, :importmap
 
     def application
       @application ||= ::ActiveAdmin::Application.new
     end
 
     def deprecator
-      @deprecator ||= ActiveSupport::Deprecation.new("4.0", "active-admin")
+      @deprecator ||= ActiveSupport::Deprecation.new("4.1", "active-admin")
+    end
+
+    def importmap
+      @importmap ||= Importmap::Map.new
     end
 
     # Gets called within the initializer
@@ -123,13 +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 "active_admin/orm/mongoid" if defined? Mongoid
+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/assets/assets_generator.rb

@@ -2,14 +2,14 @@
 module ActiveAdmin
   module Generators
     class AssetsGenerator < Rails::Generators::Base
-
       source_root File.expand_path("templates", __dir__)
 
       def install_assets
-        template "active_admin.js", "app/assets/javascripts/active_admin.js"
-        template "active_admin.scss", "app/assets/stylesheets/active_admin.scss"
+        remove_file "app/assets/stylesheets/active_admin.scss"
+        remove_file "app/assets/javascripts/active_admin.js"
+        template "active_admin.css", "app/assets/stylesheets/active_admin.css"
+        template "tailwind.config.js", "tailwind-active_admin.config.js"
       end
-
     end
   end
 end

data/lib/generators/active_admin/assets/templates/active_admin.css

@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;

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

@@ -0,0 +1,21 @@
+import { execSync } from 'child_process';
+import activeAdminPlugin from '@activeadmin/activeadmin/plugin';
+
+const activeAdminPath = execSync('bundle show activeadmin', { encoding: 'utf-8' }).trim();
+
+export default {
+  content: [
+    `${activeAdminPath}/vendor/javascript/flowbite.js`,
+    `${activeAdminPath}/plugin.js`,
+    `${activeAdminPath}/app/views/**/*.{arb,erb,html,rb}`,
+    './app/admin/**/*.{arb,erb,html,rb}',
+    './app/views/active_admin/**/*.{arb,erb,html,rb}',
+    './app/views/admin/**/*.{arb,erb,html,rb}',
+    './app/views/layouts/active_admin*.{erb,html}',
+    './app/javascript/**/*.js'
+  ],
+  darkMode: "selector",
+  plugins: [
+    activeAdminPlugin
+  ]
+}

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/lib/generators/active_admin/install/install_generator.rb

@@ -9,15 +9,13 @@ module ActiveAdmin
 
       hook_for :users, default: "devise", desc: "Admin user generator to run. Skip with --skip-users"
       class_option :skip_comments, type: :boolean, default: false, desc: "Skip installation of comments"
-      class_option :use_webpacker, type: :boolean, default: false, desc: "Use Webpacker assets instead of Sprockets"
 
       source_root File.expand_path("templates", __dir__)
 
       def copy_initializer
-        @underscored_user_name = name.underscore.gsub("/", "_")
+        @underscored_user_name = name.underscore.tr("/", "_")
         @use_authentication_method = options[:users].present?
         @skip_comments = options[:skip_comments]
-        @use_webpacker = options[:use_webpacker]
         template "active_admin.rb.erb", "config/initializers/active_admin.rb"
       end
 
@@ -39,11 +37,7 @@ module ActiveAdmin
       end
 
       def create_assets
-        if options[:use_webpacker]
-          generate "active_admin:webpacker"
-        else
-          generate "active_admin:assets"
-        end
+        generate "active_admin:assets"
       end
 
       def create_migrations

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

@@ -2,22 +2,12 @@ ActiveAdmin.setup do |config|
   # == Site Title
   #
   # Set the title that is displayed on the main layout
-  # for each of the active admin pages.
+  # for each of the active admin pages. Can also be customized
+  # by extracting the _site_header partial into your project
+  # to use your own logo, styles, etc.
   #
   config.site_title = "<%= Rails.application.class.name.split("::").first.titlecase %>"
 
-  # Set the link url for the title. For example, to take
-  # users to your main site. Defaults to no link.
-  #
-  # config.site_title_link = "/"
-
-  # Set an optional image to be displayed for the header
-  # instead of a string (overrides :site_title)
-  #
-  # Note: Aim for an image that's 21px high so it fits in the header.
-  #
-  # config.site_title_image = "logo.png"
-
   # == Load Paths
   #
   # By default Active Admin files go inside app/admin/.
@@ -78,8 +68,10 @@ ActiveAdmin.setup do |config|
   # Active Admin will automatically call an authorization
   # method in a before filter of all controller actions to
   # ensure that there is a user with proper rights. You can use
-  # CanCanAdapter or make your own. Please refer to documentation.
+  # CanCanAdapter, PunditAdapter, or make your own. Please
+  # refer to the documentation.
   # config.authorization_adapter = ActiveAdmin::CanCanAdapter
+  # config.authorization_adapter = ActiveAdmin::PunditAdapter
 
   # In case you prefer Pundit over other solutions you can here pass
   # the name of default policy class. This policy will be used in every
@@ -116,18 +108,12 @@ ActiveAdmin.setup do |config|
   # settings configure the location and method used for the link.
   #
   # This setting changes the path where the link points to. If it's
-  # a string, the strings is used as the path. If it's a Symbol, we
+  # a string, the string is used as the path. If it's a Symbol, we
   # will call the method to return the path.
   #
   # Default:
   config.logout_link_path = :destroy_<%= @underscored_user_name %>_session_path
 
-  # This setting changes the http method used when rendering the
-  # link. For example :get, :delete, :put, etc..
-  #
-  # Default:
-  # config.logout_link_method = :get
-
   # == Root
   #
   # Set the action to call for the root path. You can set different
@@ -187,23 +173,6 @@ ActiveAdmin.setup do |config|
   #
   config.localize_format = :long
 
-  # == Setting a Favicon
-  #
-  # config.favicon = 'favicon.ico'
-
-  # == Meta Tags
-  #
-  # Add additional meta tags to the head element of active admin pages.
-  #
-  # Add tags to all pages logged in users see:
-  #   config.meta_tags = { author: 'My Company' }
-
-  # By default, sign up/sign in/recover password pages are excluded
-  # from showing up in search engine results by adding a robots meta
-  # tag. You can reset the hash of meta tags included in logged out
-  # pages:
-  #   config.meta_tags_for_logged_out_pages = {}
-
   # == Removing Breadcrumbs
   #
   # Breadcrumbs are enabled by default. You can customize them for individual
@@ -218,21 +187,6 @@ ActiveAdmin.setup do |config|
   #
   # config.create_another = true
 
-  # == Register Stylesheets & Javascripts
-  #
-  # We recommend using the built in Active Admin layout and loading
-  # up your own stylesheets / javascripts to customize the look
-  # and feel.
-  #
-  # To load a stylesheet:
-  #   config.register_stylesheet 'my_stylesheet.css'
-  #
-  # You can provide an options hash for more control, which is passed along to stylesheet_link_tag():
-  #   config.register_stylesheet 'my_print_stylesheet.css', media: :print
-  #
-  # To load a javascript file:
-  #   config.register_javascript 'my_javascript.js'
-
   # == CSV options
   #
   # Set the CSV builder separator
@@ -245,20 +199,11 @@ ActiveAdmin.setup do |config|
   #
   # You can add a navigation menu to be used in your application, or configure a provided menu
   #
-  # To change the default utility navigation to show a link to your website & a logout btn
-  #
-  #   config.namespace :admin do |admin|
-  #     admin.build_menu :utility_navigation do |menu|
-  #       menu.add label: "My Great Website", url: "http://www.mygreatwebsite.com", html_options: { target: :blank }
-  #       admin.add_logout_button_to_menu menu
-  #     end
-  #   end
-  #
   # If you wanted to add a static menu item to the default menu provided:
   #
   #   config.namespace :admin do |admin|
   #     admin.build_menu :default do |menu|
-  #       menu.add label: "My Great Website", url: "http://www.mygreatwebsite.com", html_options: { target: "_blank" }
+  #       menu.add label: "My Great Website", url: "https://mygreatwebsite.example.com", html_options: { target: "_blank" }
   #     end
   #   end
 
@@ -274,11 +219,10 @@ ActiveAdmin.setup do |config|
   #     # Disable the links entirely
   #     admin.download_links = false
   #
-  #     # Only show XML & PDF options
+  #     # Only show XML & PDF options. You must register the format mime type with `Mime::Type.register`.
   #     admin.download_links = [:xml, :pdf]
   #
-  #     # Enable/disable the links based on block
-  #     #   (for example, with cancan)
+  #     # Enable/disable the links based on block (for example, with cancan)
   #     admin.download_links = proc { can?(:view_download_links) }
   #
   #   end
@@ -322,31 +266,10 @@ ActiveAdmin.setup do |config|
   #  ]
   # config.filter_method_for_large_association = '_start'
 
-  # == Head
-  #
-  # You can add your own content to the site head like analytics. Make sure
-  # you only pass content you trust.
-  #
-  # config.head = ''.html_safe
-
-  # == Footer
-  #
-  # By default, the footer shows the current Active Admin version. You can
-  # override the content of the footer here.
-  #
-  # config.footer = 'my custom footer text'
-
   # == Sorting
   #
   # By default ActiveAdmin::OrderClause is used for sorting logic
   # You can inherit it with own class and inject it for all resources
   #
   # config.order_clause = MyOrderClause
-
-  # == Webpacker
-  #
-  # By default, Active Admin uses Sprocket's asset pipeline.
-  # You can switch to using Webpacker here.
-  #
-  <% unless @use_webpacker %># <% end %>config.use_webpacker = true
 end