admin_suite 0.2.0 → 0.2.2

data/lib/admin_suite/engine.rb

@@ -13,41 +13,65 @@ module AdminSuite
       end
     end
 
-    initializer "admin_suite.host_dsl_ignore" do
-      # Host apps sometimes store AdminSuite DSL files under `app/admin_suite/**`
-      # and/or `app/admin/portals/**`.
+    initializer "admin_suite.host_dsl_ignore", before: :setup_main_autoloader do |app|
+      # Host apps may store AdminSuite DSL files under `app/admin_suite/**` and
+      # `app/admin/portals/**`.
       #
-      # These are *side-effect* DSL files (e.g. `AdminSuite.portal :ops do ... end`),
-      # not constant definitions. If a host app adds those dirs to Zeitwerk (common
-      # when autoloading `app/admin` as `Admin::*`), eager loading will crash with:
-      #   expected file ... to define constant ...
-      #
-      # So we proactively ignore these directories for all Zeitwerk loaders.
-      host_dsl_dirs = [ Rails.root.join("app/admin_suite") ]
-
-      # `app/admin/portals` is a more common location in host apps and could also
-      # contain real constants. Only ignore it if it appears to contain AdminSuite
-      # portal DSL definitions.
-      host_admin_portals_dir = Rails.root.join("app/admin/portals")
-      if host_admin_portals_dir.exist?
-        portal_files = Dir[host_admin_portals_dir.join("**/*.rb").to_s]
-        contains_admin_suite_portals =
-          portal_files.any? do |file|
-            content = File.binread(file)
-            content = content.encode("UTF-8", invalid: :replace, undef: :replace, replace: "")
-            portal_dsl_pattern = /(::)?AdminSuite\s*\.\s*portal\b/
-            portal_dsl_pattern.match?(content)
-          rescue StandardError
-            false
-          end
-
-        host_dsl_dirs << host_admin_portals_dir if contains_admin_suite_portals
+      # These are side-effect DSL files (they do not define constants), so Zeitwerk
+      # must ignore them to avoid eager-load `Zeitwerk::NameError`s in production.
+
+      admin_suite_app_dir = Rails.root.join("app/admin_suite")
+      admin_dir = Rails.root.join("app/admin")
+      admin_portals_dir = Rails.root.join("app/admin/portals")
+
+      # If the host uses `Admin::*` constants inside `app/admin/**`, Rails' default
+      # autoload root (`app/admin`) would expect top-level constants like
+      # `Resources::UserResource`. We fix that by mapping `app/admin` to `Admin`.
+      # This avoids requiring host apps to add their own Zeitwerk initializer.
+      if admin_dir.exist? && self.class.host_admin_namespace_files?(admin_dir)
+        admin_dir_s = admin_dir.to_s
+        app.config.autoload_paths.delete(admin_dir_s)
+        app.config.eager_load_paths.delete(admin_dir_s)
+
+        # Ensure `Admin` exists so Zeitwerk can use it as a namespace.
+        module ::Admin; end
+
+        Rails.autoloaders.main.push_dir(admin_dir, namespace: ::Admin)
       end
 
       Rails.autoloaders.each do |loader|
-        host_dsl_dirs.each do |dir|
-          loader.ignore(dir) if dir.exist?
-        end
+        loader.ignore(admin_suite_app_dir) if admin_suite_app_dir.exist?
+
+        next unless admin_portals_dir.exist?
+
+        loader.ignore(admin_portals_dir) if self.class.contains_admin_suite_portal_dsl?(admin_portals_dir)
+      end
+    end
+
+    def self.host_admin_namespace_files?(admin_dir)
+      # True if any file under app/admin appears to define `Admin::*` constants.
+      Dir[admin_dir.join("**/*.rb").to_s].any? do |file|
+        next false if file.include?("/portals/")
+
+        content = File.binread(file)
+        content = content.encode("UTF-8", invalid: :replace, undef: :replace, replace: "")
+
+        content.match?(/\b(module|class)\s+Admin\b/) ||
+          content.match?(/\b(module|class)\s+Admin::/)
+      rescue StandardError
+        false
+      end
+    end
+
+    def self.contains_admin_suite_portal_dsl?(admin_portals_dir)
+      portal_files = Dir[admin_portals_dir.join("**/*.rb").to_s]
+      portal_files.any? do |file|
+        content = File.binread(file)
+        content = content.encode("UTF-8", invalid: :replace, undef: :replace, replace: "")
+        portal_dsl_pattern = /(::)?AdminSuite\s*\.\s*portal\b/
+        portal_dsl_pattern.match?(content)
+      rescue StandardError
+        false
       end
     end
 
@@ -59,6 +83,17 @@ module AdminSuite
       require "admin/base/action_handler"
     end
 
+    initializer "admin_suite.reloader" do |app|
+      # Reset the handlers_loaded flag in development so handlers are reloaded
+      # when code changes. This ensures the expensive glob operation happens at
+      # most once per request (or code reload) rather than on every NameError.
+      if Rails.env.development?
+        app.reloader.to_prepare do
+          Admin::Base::ActionExecutor.handlers_loaded = false
+        end
+      end
+    end
+
     initializer "admin_suite.watchable_dirs" do |app|
       next unless Rails.env.development?
 
@@ -91,6 +126,13 @@ module AdminSuite
           ]
         end
 
+        if config.action_globs.blank?
+          config.action_globs = [
+            Rails.root.join("config/admin_suite/actions/*.rb").to_s,
+            Rails.root.join("app/admin/actions/*.rb").to_s
+          ]
+        end
+
         if config.portal_globs.blank?
           config.portal_globs = [
             Rails.root.join("config/admin_suite/portals/*.rb").to_s,
@@ -99,6 +141,15 @@ module AdminSuite
           ]
         end
 
+        if config.dashboard_globs.blank?
+          config.dashboard_globs = [
+            Rails.root.join("config/admin_suite/dashboard.rb").to_s,
+            Rails.root.join("config/admin_suite/dashboard/*.rb").to_s,
+            Rails.root.join("app/admin_suite/dashboard.rb").to_s,
+            Rails.root.join("app/admin_suite/dashboard/*.rb").to_s
+          ]
+        end
+
         config.portals = {
           ops: { label: "Ops Portal", icon: "settings", color: :amber, order: 10 },
           email: { label: "Email Portal", icon: "inbox", color: :emerald, order: 20 },

data/lib/admin_suite/ui/field_renderer_registry.rb

@@ -75,11 +75,11 @@ AdminSuite::UI::FieldRendererRegistry.register(:attachment) do |view, f, field,
 end
 
 AdminSuite::UI::FieldRendererRegistry.register(:trix) do |_view, f, field, resource, _field_class|
-  f.rich_text_area(field.name, class: "prose dark:prose-invert max-w-none")
+  f.rich_text_area(field.name, class: "prose max-w-none")
 end
 
 AdminSuite::UI::FieldRendererRegistry.register(:rich_text) do |_view, f, field, resource, _field_class|
-  f.rich_text_area(field.name, class: "prose dark:prose-invert max-w-none")
+  f.rich_text_area(field.name, class: "prose max-w-none")
 end
 
 AdminSuite::UI::FieldRendererRegistry.register(:markdown) do |_view, f, field, resource, field_class|

data/lib/admin_suite/ui/form_field_renderer.rb

@@ -38,8 +38,8 @@ module AdminSuite
 
             concat(field_html)
 
-            concat(content_tag(:p, field.help, class: "mt-1 text-sm text-slate-500 dark:text-slate-400")) if field.help.present?
-            concat(content_tag(:p, resource.errors[field.name].first, class: "mt-1 text-sm text-red-600 dark:text-red-400")) if resource.errors[field.name].any?
+            concat(content_tag(:p, field.help, class: "mt-1 text-sm text-slate-500")) if field.help.present?
+            concat(content_tag(:p, resource.errors[field.name].first, class: "mt-1 text-sm text-red-600")) if resource.errors[field.name].any?
           end)
         end
       end

data/lib/admin_suite/ui/show_formatter_registry.rb

@@ -40,7 +40,7 @@ end
 AdminSuite::UI::ShowFormatterRegistry.register_class(TrueClass) do |_value, view, _record, _field|
   view.content_tag(:span, class: "inline-flex items-center gap-1") do
     view.concat(view.admin_suite_icon("check-circle-2", class: "w-4 h-4 text-green-500"))
-    view.concat(view.content_tag(:span, "Yes", class: "text-green-600 dark:text-green-400 font-medium"))
+    view.concat(view.content_tag(:span, "Yes", class: "text-green-600 font-medium"))
   end
 end
 
@@ -54,14 +54,14 @@ end
 AdminSuite::UI::ShowFormatterRegistry.register_class(Time) do |value, view, _record, _field|
   view.content_tag(:span, class: "inline-flex items-center gap-2") do
     view.concat(view.content_tag(:span, value.strftime("%B %d, %Y at %H:%M"), class: "font-medium"))
-    view.concat(view.content_tag(:span, "(#{view.time_ago_in_words(value)} ago)", class: "text-slate-500 dark:text-slate-400 text-xs"))
+    view.concat(view.content_tag(:span, "(#{view.time_ago_in_words(value)} ago)", class: "text-slate-500 text-xs"))
   end
 end
 
 AdminSuite::UI::ShowFormatterRegistry.register_class(DateTime) do |value, view, _record, _field|
   view.content_tag(:span, class: "inline-flex items-center gap-2") do
     view.concat(view.content_tag(:span, value.strftime("%B %d, %Y at %H:%M"), class: "font-medium"))
-    view.concat(view.content_tag(:span, "(#{view.time_ago_in_words(value)} ago)", class: "text-slate-500 dark:text-slate-400 text-xs"))
+    view.concat(view.content_tag(:span, "(#{view.time_ago_in_words(value)} ago)", class: "text-slate-500 text-xs"))
   end
 end
 
@@ -72,7 +72,7 @@ end
 if defined?(ActiveRecord::Base)
   AdminSuite::UI::ShowFormatterRegistry.register_class(ActiveRecord::Base) do |value, view, _record, _field|
     link_text = value.respond_to?(:name) ? value.name : "#{value.class.name} ##{value.id}"
-    view.content_tag(:span, link_text, class: "text-indigo-600 dark:text-indigo-400")
+    view.content_tag(:span, link_text, class: "text-indigo-600")
   end
 end
 
@@ -88,7 +88,7 @@ AdminSuite::UI::ShowFormatterRegistry.register_class(Array) do |value, view, _re
   else
     view.content_tag(:div, class: "flex flex-wrap gap-1") do
       value.each do |item|
-        view.concat(view.content_tag(:span, item.to_s, class: "inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium bg-slate-100 dark:bg-slate-700 text-slate-700 dark:text-slate-300"))
+        view.concat(view.content_tag(:span, item.to_s, class: "inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium bg-slate-100 text-slate-700"))
       end
     end
   end

data/lib/admin_suite/ui/show_value_formatter.rb

@@ -19,7 +19,7 @@ module AdminSuite
               else
                 simple_format(value.to_s)
               end
-            return content_tag(:div, rendered, class: "prose dark:prose-invert max-w-none")
+            return content_tag(:div, rendered, class: "prose max-w-none")
           when :json
             begin
               parsed =

data/lib/admin_suite/version.rb

@@ -2,7 +2,7 @@
 
 module AdminSuite
   module Version
-    VERSION = "0.2.0"
+    VERSION = "0.2.2"
   end
 
   # Backward-compatible constant.

data/lib/admin_suite.rb

@@ -53,5 +53,36 @@ module AdminSuite
     def portal_definitions
       PortalRegistry.all
     end
+
+    # Defines (or updates) the root dashboard shown at the engine root (`/`).
+    #
+    # This uses the same dashboard DSL as portal dashboards.
+    #
+    # Host apps typically place these in:
+    # - `config/admin_suite/dashboard.rb` (recommended; not a Zeitwerk autoload path)
+    # - `app/admin_suite/dashboard.rb` (supported; AdminSuite ignores for Zeitwerk)
+    #
+    # @yield Dashboard definition DSL
+    # @return [AdminSuite::UI::DashboardDefinition]
+    def root_dashboard(&block)
+      config.root_dashboard_definition ||= UI::DashboardDefinition.new
+      UI::DashboardDSL.new(config.root_dashboard_definition).instance_eval(&block) if block_given?
+      config.root_dashboard_definition
+    end
+
+    # @return [AdminSuite::UI::DashboardDefinition, nil]
+    def root_dashboard_definition
+      config.root_dashboard_definition
+    end
+
+    # Clears the root dashboard definition (useful for development reloads).
+    #
+    # @return [void]
+    def reset_root_dashboard!
+      config.root_dashboard_definition = nil
+      config.root_dashboard_loaded = false
+    rescue StandardError
+      # best-effort
+    end
   end
 end

data/lib/generators/admin_suite/install/templates/admin_suite.rb

@@ -20,6 +20,14 @@ AdminSuite.configure do |config|
     Rails.root.join("app/admin/resources/*.rb").to_s
   ]
 
+  # Action handler file globs (host app can override).
+  #
+  # Files typically define `Admin::Actions::<Resource><Action>Action` handlers.
+  config.action_globs = [
+    Rails.root.join("config/admin_suite/actions/*.rb").to_s,
+    Rails.root.join("app/admin/actions/*.rb").to_s
+  ]
+
   # Portal dashboard DSL globs (host app can override).
   # Files typically call `AdminSuite.portal :ops do ... end`
   config.portal_globs = [