admin_suite 0.3.1 → 0.4.0

data/app/views/admin_suite/resources/index.html.erb

@@ -48,11 +48,12 @@
     <% if @stats.present? %>
       <div class="grid grid-cols-2 md:grid-cols-4 gap-4 mb-6">
         <% @stats.each do |stat| %>
-          <% color = stat[:color] || :slate %>
-          <div class="bg-white rounded-xl p-4 border border-slate-200">
-            <div class="text-2xl font-bold text-<%= color %>-600"><%= stat[:value] %></div>
-            <div class="text-sm text-slate-500"><%= stat[:name] %></div>
-          </div>
+          <% stat_panel = AdminSuite::UI::PanelDefinition.new(
+               type: :stat,
+               title: stat[:name],
+               options: { value: stat[:value], color: stat[:color] || :slate, variant: :mini }
+             ) %>
+          <%= render "admin_suite/panels/stat", panel: stat_panel %>
         <% end %>
       </div>
     <% end %>
@@ -217,78 +218,7 @@
           </div>
 
           <!-- Pagination -->
-          <% if @pagy.pages > 1 %>
-            <div class="px-6 py-4 border-t border-slate-200">
-              <div class="flex items-center justify-between">
-                <div class="text-sm text-slate-500">
-                  Showing <span class="font-medium text-slate-700"><%= @pagy.from %></span> to
-                  <span class="font-medium text-slate-700"><%= @pagy.to %></span> of
-                  <span class="font-medium text-slate-700"><%= number_with_delimiter(@pagy.count) %></span> results
-                </div>
-
-                <nav class="flex items-center gap-1">
-                  <% if @pagy.prev %>
-                    <%= link_to url_for(params.permit!.merge(page: @pagy.prev)),
-                        class: "inline-flex items-center gap-1 px-3 py-1.5 text-sm font-medium text-slate-700 bg-white border border-slate-300 rounded-lg hover:bg-slate-50 transition-colors" do %>
-                      <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"/>
-                      </svg>
-                      Prev
-                    <% end %>
-                  <% else %>
-                    <span class="inline-flex items-center gap-1 px-3 py-1.5 text-sm font-medium text-slate-400 bg-slate-100 border border-slate-200 rounded-lg cursor-not-allowed">
-                      <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"/>
-                      </svg>
-                      Prev
-                    </span>
-                  <% end %>
-
-                  <div class="hidden sm:flex items-center gap-1 mx-2">
-                    <% @pagy.series.each do |item| %>
-                      <% if item == :gap %>
-                        <span class="px-2 py-1 text-sm text-slate-400">…</span>
-                      <% elsif item.is_a?(Integer) %>
-                        <%= link_to item, url_for(params.permit!.merge(page: item)),
-                            class: "px-3 py-1.5 text-sm font-medium text-slate-700 bg-white border border-slate-300 rounded-lg hover:bg-slate-50 transition-colors" %>
-                      <% elsif item.is_a?(String) %>
-                        <span class="px-3 py-1.5 text-sm font-medium text-white rounded-lg" style="background: var(--admin-suite-primary); border: 1px solid var(--admin-suite-primary);">
-                          <%= item %>
-                        </span>
-                      <% end %>
-                    <% end %>
-                  </div>
-
-                  <span class="sm:hidden px-3 py-1.5 text-sm text-slate-500">
-                    Page <%= @pagy.page %> of <%= @pagy.pages %>
-                  </span>
-
-                  <% if @pagy.next %>
-                    <%= link_to url_for(params.permit!.merge(page: @pagy.next)),
-                        class: "inline-flex items-center gap-1 px-3 py-1.5 text-sm font-medium text-slate-700 bg-white border border-slate-300 rounded-lg hover:bg-slate-50 transition-colors" do %>
-                      Next
-                      <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"/>
-                      </svg>
-                    <% end %>
-                  <% else %>
-                    <span class="inline-flex items-center gap-1 px-3 py-1.5 text-sm font-medium text-slate-400 bg-slate-100 border border-slate-200 rounded-lg cursor-not-allowed">
-                      Next
-                      <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"/>
-                      </svg>
-                    </span>
-                  <% end %>
-                </nav>
-              </div>
-            </div>
-          <% else %>
-            <div class="px-6 py-3 border-t border-slate-200">
-              <div class="text-sm text-slate-500">
-                Showing <span class="font-medium text-slate-700"><%= @pagy.count %></span> results
-              </div>
-            </div>
-          <% end %>
+          <%= render "admin_suite/shared/pagination", pagy: @pagy, page_param: :page %>
         <% else %>
           <div class="p-12 text-center">
             <div class="inline-flex items-center justify-center w-12 h-12 rounded-full bg-slate-100 mb-4">

data/app/views/admin_suite/shared/_pagination.html.erb

@@ -0,0 +1,74 @@
+<% page_param = local_assigns.fetch(:page_param, :page) %>
+
+<% if pagy.pages > 1 %>
+  <div class="px-6 py-4 border-t border-slate-200">
+    <div class="flex items-center justify-between">
+      <div class="text-sm text-slate-500">
+        Showing <span class="font-medium text-slate-700"><%= pagy.from %></span> to
+        <span class="font-medium text-slate-700"><%= pagy.to %></span> of
+        <span class="font-medium text-slate-700"><%= number_with_delimiter(pagy.count) %></span> results
+      </div>
+
+      <nav class="flex items-center gap-1">
+        <% if pagy.prev %>
+          <%= link_to url_for(params.permit!.merge(page_param => pagy.prev)),
+              class: "inline-flex items-center gap-1 px-3 py-1.5 text-sm font-medium text-slate-700 bg-white border border-slate-300 rounded-lg hover:bg-slate-50 transition-colors" do %>
+            <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"/>
+            </svg>
+            Prev
+          <% end %>
+        <% else %>
+          <span class="inline-flex items-center gap-1 px-3 py-1.5 text-sm font-medium text-slate-400 bg-slate-100 border border-slate-200 rounded-lg cursor-not-allowed">
+            <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"/>
+            </svg>
+            Prev
+          </span>
+        <% end %>
+
+        <div class="hidden sm:flex items-center gap-1 mx-2">
+          <% pagy.series.each do |item| %>
+            <% if item == :gap %>
+              <span class="px-2 py-1 text-sm text-slate-400">…</span>
+            <% elsif item.is_a?(Integer) %>
+              <%= link_to item, url_for(params.permit!.merge(page_param => item)),
+                  class: "px-3 py-1.5 text-sm font-medium text-slate-700 bg-white border border-slate-300 rounded-lg hover:bg-slate-50 transition-colors" %>
+            <% elsif item.is_a?(String) %>
+              <span class="px-3 py-1.5 text-sm font-medium text-white rounded-lg" style="background: var(--admin-suite-primary); border: 1px solid var(--admin-suite-primary);">
+                <%= item %>
+              </span>
+            <% end %>
+          <% end %>
+        </div>
+
+        <span class="sm:hidden px-3 py-1.5 text-sm text-slate-500">
+          Page <%= pagy.page %> of <%= pagy.pages %>
+        </span>
+
+        <% if pagy.next %>
+          <%= link_to url_for(params.permit!.merge(page_param => pagy.next)),
+              class: "inline-flex items-center gap-1 px-3 py-1.5 text-sm font-medium text-slate-700 bg-white border border-slate-300 rounded-lg hover:bg-slate-50 transition-colors" do %>
+            Next
+            <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"/>
+            </svg>
+          <% end %>
+        <% else %>
+          <span class="inline-flex items-center gap-1 px-3 py-1.5 text-sm font-medium text-slate-400 bg-slate-100 border border-slate-200 rounded-lg cursor-not-allowed">
+            Next
+            <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"/>
+            </svg>
+          </span>
+        <% end %>
+      </nav>
+    </div>
+  </div>
+<% else %>
+  <div class="px-6 py-3 border-t border-slate-200">
+    <div class="text-sm text-slate-500">
+      Showing <span class="font-medium text-slate-700"><%= pagy.count %></span> results
+    </div>
+  </div>
+<% end %>

data/app/views/admin_suite/shared/_sidebar.html.erb

@@ -60,7 +60,7 @@
 
         <% if active %>
           <div class="mt-1 ml-11 space-y-0.5 text-sm">
-            <% portal[:sections].sort_by { |(_k, s)| s[:label].to_s }.each do |_section_key, section| %>
+            <% portal[:sections].sort_by { |(_k, s)| [ (s[:order] || 100).to_i, s[:label].to_s ] }.each do |_section_key, section| %>
               <div class="text-xs font-medium text-white/70 uppercase tracking-wider px-3 pt-2 pb-1">
                 <%= section[:label] %>
               </div>

data/app/views/layouts/admin_suite/application.html.erb

@@ -29,9 +29,11 @@
 
     <%= stylesheet_link_tag "rouge", "data-turbo-track": "reload" %>
 
-    <%# EasyMDE Markdown Editor %>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/easymde@2.18.0/dist/easymde.min.css" data-turbo-track="reload">
-    <script src="https://cdn.jsdelivr.net/npm/easymde@2.18.0/dist/easymde.min.js" data-turbo-track="reload"></script>
+    <%# EasyMDE Markdown Editor: vendored (see app/assets/vendor), loaded only
+        when the page actually renders a :markdown field (see
+        AdminSuite::UI::FieldRendererRegistry's :markdown handler, which sets
+        this content_for). %>
+    <%= yield :easymde_assets %>
 
     <% if respond_to?(:javascript_importmap_tags) %>
       <%= javascript_importmap_tags %>

data/lib/admin/base/action_executor.rb

@@ -116,14 +116,20 @@ module Admin
           "#{action.label} completed successfully",
           redirect_url: redirect_url_for_action(action, action_result)
         )
-      rescue ActiveRecord::RecordInvalid => e
-        failure_result("Validation failed: #{e.record.errors.full_messages.join(', ')}")
-      rescue AASM::InvalidTransition => e
-        failure_result("Invalid state transition: #{e.message}")
+      rescue StandardError => e
+        # Neither constant is referenced unless the host actually defines it:
+        # a bare `rescue SomeGem::Error` raises NameError *while handling* the
+        # original exception in hosts without that gem, masking the real error.
+        if defined?(ActiveRecord::RecordInvalid) && e.is_a?(ActiveRecord::RecordInvalid)
+          failure_result("Validation failed: #{e.record.errors.full_messages.join(', ')}")
+        elsif e.class.name.to_s.include?("InvalidTransition")
+          failure_result("Invalid state transition: #{e.message}")
+        else
+          raise
+        end
       end
 
       def redirect_url_for_action(action, action_result)
-        return nil unless action.name.to_sym == :duplicate
         return nil unless action_result.respond_to?(:persisted?) && action_result.persisted?
         return nil unless resource_class.respond_to?(:portal_name) && resource_class.respond_to?(:resource_name_plural)
 
@@ -188,55 +194,17 @@ module Admin
         nil
       end
 
+      # Loads action handler files configured via `AdminSuite.config.action_globs`.
+      #
+      # Kept as a thin wrapper (rather than calling DefinitionLoader directly
+      # from `find_handler_class`) because `test/lib/action_executor_test.rb`
+      # exercises this exact method name against `self.class.handlers_loaded`.
+      #
+      # @return [void]
       def load_action_handlers_for_admin_suite!
         return unless defined?(AdminSuite)
 
-        # Track whether we've already loaded handlers to avoid expensive repeated globs.
-        # In development, this flag is reset by the Rails reloader (see engine.rb).
-        # In production/test, it persists for the process lifetime.
-        return if self.class.handlers_loaded
-
-        files = Array(AdminSuite.config.action_globs).flat_map { |g| Dir[g] }.uniq
-
-        # Set the flag even if no files found - we've done the glob and shouldn't repeat it
-        if files.empty?
-          self.class.handlers_loaded = true
-          return
-        end
-
-        files.each do |file|
-          begin
-            if Rails.env.development?
-              load file
-            else
-              require file
-            end
-          rescue StandardError, ScriptError => e
-            log_action_handler_load_error(file, e)
-
-            # Fail fast in dev/test so broken handler files are immediately discoverable.
-            raise if Rails.env.development? || Rails.env.test?
-          end
-        end
-
-        # We attempted to load the configured handlers. Avoid repeating expensive globs
-        # and file loads for the rest of the process lifetime.
-        self.class.handlers_loaded = true
-      end
-
-      def log_action_handler_load_error(file, error)
-        message = "[AdminSuite] Failed to load action handler file #{file}: #{error.class}: #{error.message}"
-
-        if defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger
-          Rails.logger.error(message)
-
-          backtrace = Array(error.backtrace).take(20).join("\n")
-          Rails.logger.error(backtrace) unless backtrace.empty?
-        else
-          warn(message)
-        end
-      rescue StandardError
-        nil
+        AdminSuite::DefinitionLoader.load!(:actions)
       end
     end
   end

data/lib/admin/base/resource.rb

@@ -39,6 +39,13 @@ module Admin
     #     end
     #   end
     class Resource
+      extend AdminSuite::Deprecation
+
+      EXPORTABLE_DEPRECATION_MESSAGE_FORMAT =
+        "AdminSuite: %<resource>s calls `exportable`, which is a deprecated " \
+        "no-op and will be removed in 0.5.0. It never actually implemented " \
+        "export in any released version — safe to delete the call."
+
       class << self
         # Model configuration
         attr_reader :model_class, :portal_name, :section_name, :nav_label, :nav_icon, :nav_order
@@ -55,9 +62,6 @@ module Admin
         # Actions configuration
         attr_reader :actions_config
 
-        # Export configuration
-        attr_reader :export_formats
-
         # Sets the model class for this resource
         #
         # @param klass [Class] The ActiveRecord model class
@@ -157,14 +161,6 @@ module Admin
           @actions_config.instance_eval(&block) if block_given?
         end
 
-        # Configures export formats
-        #
-        # @param formats [Array<Symbol>] Export formats (:json, :csv)
-        # @return [void]
-        def exportable(*formats)
-          @export_formats = formats
-        end
-
         # Declares whether the generic resource routes may mutate records.
         # Read-only resources retain index/show access while the controller
         # rejects direct requests to every built-in mutation endpoint.
@@ -176,6 +172,30 @@ module Admin
           @read_only == true
         end
 
+        # Deprecated no-op, removed in 0.5.0.
+        #
+        # `exportable` was write-only in every prior release -- it never had
+        # a reader and never drove any export behavior -- but hosts still
+        # call it from resource-definition bodies (gleania: 30 files;
+        # trust_growth: 1). A real removal would raise `NoMethodError` at
+        # definition-load time, and in production `DefinitionLoader` logs
+        # and swallows that, so the resource just silently vanishes from the
+        # admin. Kept as a no-op instead, so those files keep loading.
+        #
+        # Deliberately does not restore `@export_formats` or any reader --
+        # only the harmless no-op comes back.
+        #
+        # @param _formats [Array<Symbol>] ignored
+        # @return [void]
+        def exportable(*_formats)
+          # `warn_once`, `warn_once_sink` and `reset_deprecation_notices!`
+          # come from `AdminSuite::Deprecation`, extended above. Keyed on the
+          # resource class itself, so each resource warns independently (and
+          # only once) rather than one call anywhere silencing every other
+          # resource's first call.
+          warn_once(name, format(EXPORTABLE_DEPRECATION_MESSAGE_FORMAT, resource: name))
+        end
+
         # Returns the resource name derived from class name
         #
         # @return [String]
@@ -309,7 +329,6 @@ module Admin
           @columns << ColumnDefinition.new(
             name: name,
             content: content,
-            render: options[:render],
             header: options[:header] || name.to_s.humanize,
             css_class: options[:class],
             type: options[:type],
@@ -321,7 +340,7 @@ module Admin
         end
       end
 
-      ColumnDefinition = Struct.new(:name, :content, :render, :header, :css_class, :type, :toggle_field, :label_color, :label_size, :sortable, keyword_init: true)
+      ColumnDefinition = Struct.new(:name, :content, :header, :css_class, :type, :toggle_field, :label_color, :label_size, :sortable, keyword_init: true)
 
       class FiltersBuilder
         attr_reader :filters
@@ -470,7 +489,25 @@ module Admin
 
         private
 
+        # Struct members already given a dedicated home above. Everything
+        # else in the panel/section DSL call (`source:`, `empty:`,
+        # `language:`, plus `columns:` again — see below) is forwarded
+        # verbatim to the renderer via `ShowSectionDefinition#options`.
+        RESERVED_SECTION_OPTION_KEYS = %i[
+          fields association limit render title display link_to resource
+          paginate pagination per_page collapsible collapsed
+        ].freeze
+
         def build_section(name, options)
+          # `columns:` is deliberately NOT excluded here even though it also
+          # populates the dedicated `columns` member below (used today by
+          # association-table display). Built-in renderers like
+          # `:table_from` only ever see `section.options`, not the section
+          # itself, so `columns:` has to reach `options[:columns]` too or a
+          # DSL author's explicit column list would be silently dropped in
+          # favor of the renderer's own inference.
+          leftover_options = options.except(*RESERVED_SECTION_OPTION_KEYS)
+
           ShowSectionDefinition.new(
             name: name,
             fields: options[:fields] || [],
@@ -485,7 +522,8 @@ module Admin
             paginate: options[:paginate] || options[:pagination] || false,
             per_page: options[:per_page],
             collapsible: options[:collapsible] || false,
-            collapsed: options[:collapsed] || false
+            collapsed: options[:collapsed] || false,
+            options: leftover_options
           )
         end
       end
@@ -493,6 +531,7 @@ module Admin
       ShowSectionDefinition = Struct.new(
         :name, :fields, :association, :limit, :render, :title,
         :display, :columns, :link_to, :resource, :paginate, :per_page, :collapsible, :collapsed,
+        :options,
         keyword_init: true
       )
 

data/lib/admin_suite/configuration.rb

@@ -17,7 +17,6 @@ module AdminSuite
       :action_globs,
       :portal_globs,
       :dashboard_globs,
-      :portals,
       :custom_renderers,
       :icon_renderer,
       :docs_url,
@@ -25,7 +24,6 @@ module AdminSuite
       :partials,
       :theme,
       :host_stylesheet,
-      :tailwind_cdn,
       :root_dashboard_title,
       :root_dashboard_description,
       :root_dashboard_definition,
@@ -33,6 +31,22 @@ module AdminSuite
       :on_action_executed,
       :resolve_action_handler
 
+    attr_reader :portals
+
+    # Records that the host explicitly assigned portals (even to `{}`), so
+    # the engine's built-in defaults are never re-applied over explicit
+    # host intent. See #portals_configured?.
+    def portals=(value)
+      @portals_configured = true
+      @portals = value
+    end
+
+    # True once the host has assigned `config.portals` itself, distinct
+    # from the engine having applied its own defaults.
+    def portals_configured?
+      @portals_configured == true
+    end
+
     def initialize
       @authenticate = nil
       @current_actor = nil
@@ -49,6 +63,7 @@ module AdminSuite
       @portal_globs = []
       @dashboard_globs = []
       @portals = {}
+      @portals_configured = false
       @custom_renderers = {}
       @icon_renderer = nil
       @docs_url = nil
@@ -56,7 +71,6 @@ module AdminSuite
       @partials = {}
       @theme = { primary: :indigo, secondary: :purple }
       @host_stylesheet = nil
-      @tailwind_cdn = true
       @root_dashboard_title = nil
       @root_dashboard_description = nil
       @root_dashboard_definition = nil
@@ -64,5 +78,16 @@ module AdminSuite
       @on_action_executed = nil
       @resolve_action_handler = nil
     end
+
+    private
+
+    # Sets the built-in default portals without marking portals as
+    # host-configured. Only the engine's `apply_default_portals!` should
+    # call this — it deliberately bypasses the public `portals=` writer so
+    # gem-applied defaults stay distinguishable from an explicit host
+    # assignment (including an explicit `{}` meant to suppress defaults).
+    def default_portals!(value)
+      @portals = value
+    end
   end
 end