admin_resources 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbfcb542eb70f7590c00d41533ac2b351a4359ad5ee6e20c920a2276253091e2
-  data.tar.gz: ffee4ff37a690d5f291d0aee47ed7c2b16a1c00ad35d337491ff80374488244f
+  metadata.gz: ab15134c08ae8f5094ad4aaff7993db9e87ba6f2ae68301230ab08077e1014ca
+  data.tar.gz: a9e1c2480b2ab1458e94411421d17ab9fd109eb3a7aa971e4cc41a9d677d253a
 SHA512:
-  metadata.gz: 3cea885b9b6c4c774eb3924c8f8ead907a62ad8004d45ac477cc1d27bc0184affe7a7573347ac568d180114088ed2b8b2f12b232e890449f3472a2f93a2dd7a3
-  data.tar.gz: 680888318eaeda7c0ab8ba92654f7fbbee1a7a1ba37195f134607a42d9462196bc2e09830203e022548c71064ff8816831dd6abfc3fb64e6fe81a904e1ca200e
+  metadata.gz: 4acb95d1ea8994ee3c20ec9b19e5cbb70fee88efa77a0f8bb9b0eb780e41a9f67fae66ec64f6003da4194e26b633d94ad4ac5c4d6e2dfef0dbd48c69675376b1
+  data.tar.gz: ee66d605c642c8489e80ba5a7efad43f20e1ca8b82fec790ff9d6b6e2df2e1089ba286ab443cba21449f2263f011d654a71caf972a66f55aa70315b311d9e1a4

data/app/controllers/admin_resources/application_controller.rb

@@ -11,7 +11,11 @@ module AdminResources
       admin_resources.new_admin_user_session_path
     end
 
-    helper_method :admin_models, :admin_path_for
+    helper_method :admin_models, :admin_path_for, :admin_custom_pages
+
+    def admin_custom_pages
+      AdminResources.configuration.custom_pages
+    end
 
     def admin_models
       AdminResources.model_names

data/app/controllers/admin_resources/resources_controller.rb

@@ -1,13 +1,13 @@
 module AdminResources
   class ResourcesController < ApplicationController
     before_action :set_model_class
-    before_action :set_resource, only: %i[show edit update destroy]
+    before_action :set_resource, only: %i[show edit update destroy custom_action]
 
-    helper_method :model_class, :model_name, :index_columns, :form_columns, :admin_value_display
+    helper_method :model_class, :model_name, :index_columns, :form_columns, :admin_value_display, :join_associations, :custom_actions, :filter_columns, :attachment_reflections
 
     def index
       puts "[AdminResources::ResourcesController] index for #{model_name}"
-      @resources = model_class.all.order(id: :desc)
+      @resources = filter_resources(model_class.all).order(id: :desc)
     end
 
     def show
@@ -23,6 +23,8 @@ module AdminResources
       puts "[AdminResources::ResourcesController] create #{model_name}"
       @resource = model_class.new(resource_params)
       if @resource.save
+        sync_join_associations
+        flash[:new_url] = admin_path_for(model_name, :new)
         redirect_to admin_path_for(model_name, :show, @resource), notice: "#{model_name} was successfully created."
       else
         render :new, status: :unprocessable_entity
@@ -36,6 +38,7 @@ module AdminResources
     def update
       puts "[AdminResources::ResourcesController] update #{model_name}##{@resource.id}"
       if @resource.update(resource_params)
+        sync_join_associations
         redirect_to admin_path_for(model_name, :show, @resource), notice: "#{model_name} was successfully updated."
       else
         render :edit, status: :unprocessable_entity
@@ -48,6 +51,33 @@ module AdminResources
       redirect_to admin_path_for(model_name, :index), notice: "#{model_name} was successfully deleted."
     end
 
+    # Dispatches to a host-app controller action via a configured custom action.
+    # The host app must define a route that this proxies to, specified as `handler`.
+    # If no handler is configured, falls back to calling a same-named method on the resource.
+    def custom_action
+      action_name_param = params[:custom_action]
+      action_config = custom_actions.find { |a| a[:name].to_s == action_name_param }
+      unless action_config
+        redirect_to admin_path_for(model_name, :show, @resource), alert: "Unknown action."
+        return
+      end
+
+      handler = action_config[:handler]
+      if handler
+        # handler is a callable (proc/lambda) that receives (resource, controller)
+        handler.call(@resource, self)
+      else
+        # Default: call a method by the action name on the resource
+        if @resource.respond_to?(action_name_param)
+          @resource.public_send(action_name_param)
+          redirect_to admin_path_for(model_name, :show, @resource),
+                      notice: "#{action_config[:label] || action_name_param} completed."
+        else
+          redirect_to admin_path_for(model_name, :show, @resource), alert: "Action not implemented."
+        end
+      end
+    end
+
     private
 
     def set_model_class
@@ -79,6 +109,12 @@ module AdminResources
       model_class.column_names - %w[id created_at updated_at]
     end
 
+    def attachment_reflections
+      return [] unless model_class.respond_to?(:reflect_on_all_attachments)
+
+      model_class.reflect_on_all_attachments
+    end
+
     # Returns [display_text, link_path_or_nil]
     def admin_value_display(resource, column)
       unless resource.respond_to?(column)
@@ -92,17 +128,14 @@ module AdminResources
         assoc_name = column.sub(/_id$/, "")
         association = resource.class.reflect_on_association(assoc_name.to_sym)
 
-        if association && association.macro == :belongs_to
+        if association && association.macro == :belongs_to && !association.options[:polymorphic]
           assoc_class = association.klass
           assoc_model = assoc_class.name
 
           if AdminResources.model_names.include?(assoc_model)
             associated_record = assoc_class.find_by(id: value)
             if associated_record
-              display = "#{assoc_model} ##{value}"
-              display = associated_record.name    if associated_record.respond_to?(:name) && associated_record.name.present?
-              display = associated_record.version if associated_record.respond_to?(:version) && associated_record.version.present?
-              display = associated_record.email   if associated_record.respond_to?(:email) && associated_record.email.present?
+              display = associated_record.to_s
               return [display, admin_path_for(assoc_model, :show, associated_record)]
             end
           end
@@ -121,7 +154,83 @@ module AdminResources
           col.to_sym
         end
       end
+      attachment_reflections.each do |reflection|
+        if reflection.macro == :has_many_attached
+          permitted << { reflection.name => [] }
+        else
+          permitted << reflection.name
+        end
+      end
       params.require(model_class.model_name.param_key).permit(*permitted)
     end
+
+    def join_associations
+      AdminResources.models[model_name]&.dig(:has_many_through) || []
+    end
+
+    def custom_actions
+      AdminResources.models[model_name]&.dig(:custom_actions) || []
+    end
+
+    # Returns only the declared index columns that actually exist as DB columns (excludes virtual/through cols)
+    def filter_columns
+      index_columns.select { |col| model_class.columns_hash[col] }
+    end
+
+    def filter_resources(scope)
+      return scope unless params[:q].is_a?(Hash)
+
+      params[:q].each do |col, value|
+        next if value.blank?
+        next unless filter_columns.include?(col)
+
+        column = model_class.columns_hash[col]
+        next unless column
+
+        case column.type
+        when :string, :text, :citext
+          scope = scope.where("#{model_class.quoted_table_name}.#{connection.quote_column_name(col)} ILIKE ?", "%#{value}%")
+        when :integer, :bigint
+          scope = scope.where(col => value.to_i) if value.match?(/\A-?\d+\z/)
+        when :boolean
+          scope = scope.where(col => ActiveModel::Type::Boolean.new.cast(value)) unless value == "any"
+        when :date, :datetime
+          scope = scope.where(col => value) if value.present?
+        else
+          scope = scope.where(col => value)
+        end
+      end
+
+      scope
+    end
+
+    def connection
+      model_class.connection
+    end
+
+    def sync_join_associations
+      join_associations.each do |jdef|
+        join_model_class = jdef[:join_model].safe_constantize
+        next unless join_model_class
+
+        foreign_key   = jdef[:foreign_key]
+        through_key   = jdef[:through_key]
+        param_key     = "#{jdef[:association]}_ids"
+        submitted_ids = (params[model_class.model_name.param_key] || {})[param_key]
+
+        next if submitted_ids.nil?
+
+        new_ids = Array(submitted_ids).map(&:to_i).reject(&:zero?)
+
+        existing = join_model_class.where(foreign_key => @resource.id)
+        existing_ids = existing.pluck(through_key)
+
+        to_add    = new_ids - existing_ids
+        to_remove = existing_ids - new_ids
+
+        join_model_class.where(foreign_key => @resource.id, through_key => to_remove).destroy_all if to_remove.any?
+        to_add.each { |tid| join_model_class.create!(foreign_key => @resource.id, through_key => tid) }
+      end
+    end
   end
 end

data/app/views/admin_resources/resources/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_with model: @resource, url: (@resource.new_record? ? admin_path_for(model_name, :index) : admin_path_for(model_name, :show, @resource)), class: "admin-form" do |form| %>
+<%= form_with model: @resource, url: (@resource.new_record? ? admin_path_for(model_name, :index) : admin_path_for(model_name, :show, @resource)), class: "admin-form", html: { multipart: attachment_reflections.any? } do |form| %>
   <% if @resource.errors.any? %>
     <div class="admin-flash alert">
       <strong><%= pluralize(@resource.errors.count, "error") %> prohibited this <%= model_name.downcase %> from being saved:</strong>
@@ -20,7 +20,19 @@
       <% when :text %>
         <%= form.text_area col, rows: 4 %>
       <% when :integer, :decimal, :float %>
-        <%= form.number_field col, step: (column.type == :integer ? 1 : 'any') %>
+        <% if model_class.defined_enums.key?(col) %>
+          <%= form.select col, model_class.defined_enums[col].keys, include_blank: true %>
+        <% elsif col.end_with?('_id') %>
+          <% assoc_name = col.sub(/_id$/, '').classify %>
+          <% assoc_class = assoc_name.safe_constantize %>
+          <% if assoc_class && assoc_class < ActiveRecord::Base %>
+            <%= form.collection_select col, assoc_class.all, :id, :to_s, { include_blank: true }, {} %>
+          <% else %>
+            <%= form.number_field col, step: 1 %>
+          <% end %>
+        <% else %>
+          <%= form.number_field col, step: (column.type == :integer ? 1 : 'any') %>
+        <% end %>
       <% when :date %>
         <%= form.date_field col %>
       <% when :datetime %>
@@ -47,6 +59,33 @@
     </div>
   <% end %>
 
+  <% attachment_reflections.each do |reflection| %>
+    <div class="field">
+      <%= form.label reflection.name %>
+      <% if reflection.macro == :has_many_attached %>
+        <%= form.file_field reflection.name, multiple: true %>
+      <% else %>
+        <%= form.file_field reflection.name %>
+      <% end %>
+    </div>
+  <% end %>
+
+  <% join_associations.each do |jdef| %>
+    <% assoc_name  = jdef[:association] %>
+    <% param_key   = "#{assoc_name}_ids" %>
+    <% target_class = assoc_name.to_s.classify.safe_constantize %>
+    <% if target_class && target_class < ActiveRecord::Base %>
+      <div class="field">
+        <%= form.label param_key, assoc_name.to_s.humanize %>
+        <% current_ids = @resource.persisted? ? @resource.send(assoc_name).pluck(:id) : [] %>
+        <%= form.collection_select param_key, target_class.all, :id, :to_s,
+              { selected: current_ids, include_blank: false },
+              { multiple: true, size: 6 } %>
+        <small>Hold Ctrl / Cmd to select multiple</small>
+      </div>
+    <% end %>
+  <% end %>
+
   <div class="field">
     <%= form.submit class: "admin-btn admin-btn-primary" %>
     <%= link_to "Cancel", (@resource.new_record? ? admin_path_for(model_name) : admin_path_for(model_name, :show, @resource)), class: "admin-btn admin-btn-secondary" %>

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

@@ -3,6 +3,41 @@
   <%= link_to "New #{model_name}", admin_path_for(model_name, :new), class: "admin-btn admin-btn-primary" %>
 </div>
 
+<% if filter_columns.any? %>
+  <form method="get" style="display:flex;flex-wrap:wrap;gap:0.5rem;align-items:flex-end;margin-bottom:1.25rem">
+    <% filter_columns.each do |col| %>
+      <% column = model_class.columns_hash[col] %>
+      <div style="display:flex;flex-direction:column;gap:0.25rem">
+        <label style="font-size:0.75rem;color:#666"><%= col.titleize %></label>
+        <% case column.type %>
+        <% when :boolean %>
+          <select name="q[<%= col %>]" class="admin-input" style="height:32px;padding:0 0.5rem;font-size:0.875rem">
+            <option value="any" <%= "selected" if params.dig(:q, col) == "any" || params.dig(:q, col).blank? %>>Any</option>
+            <option value="true"  <%= "selected" if params.dig(:q, col) == "true" %>>Yes</option>
+            <option value="false" <%= "selected" if params.dig(:q, col) == "false" %>>No</option>
+          </select>
+        <% when :integer, :bigint %>
+          <input type="number" step="1" name="q[<%= col %>]" value="<%= params.dig(:q, col) %>"
+                 class="admin-input" style="width:100px;height:32px;padding:0 0.5rem;font-size:0.875rem">
+        <% when :date %>
+          <input type="date" name="q[<%= col %>]" value="<%= params.dig(:q, col) %>"
+                 class="admin-input" style="height:32px;padding:0 0.5rem;font-size:0.875rem">
+        <% when :datetime %>
+          <input type="date" name="q[<%= col %>]" value="<%= params.dig(:q, col) %>"
+                 class="admin-input" style="height:32px;padding:0 0.5rem;font-size:0.875rem">
+        <% else %>
+          <input type="text" name="q[<%= col %>]" value="<%= params.dig(:q, col) %>"
+                 placeholder="Filter…" class="admin-input" style="height:32px;padding:0 0.5rem;font-size:0.875rem">
+        <% end %>
+      </div>
+    <% end %>
+    <div style="display:flex;gap:0.5rem">
+      <button type="submit" class="admin-btn admin-btn-primary" style="height:32px">Filter</button>
+      <%= link_to "Clear", request.path, class: "admin-btn admin-btn-secondary", style: "height:32px;line-height:32px;padding:0 0.75rem" %>
+    </div>
+  </form>
+<% end %>
+
 <table class="admin-table">
   <thead>
     <tr>
@@ -14,7 +49,7 @@
   </thead>
   <tbody>
     <% @resources.each do |resource| %>
-      <tr>
+      <tr data-href="<%= admin_path_for(model_name, :show, resource) %>" style="cursor:pointer">
         <% index_columns.each do |col| %>
           <td>
             <% display, link = admin_value_display(resource, col) %>
@@ -31,6 +66,14 @@
         <td class="admin-actions">
           <%= link_to "View", admin_path_for(model_name, :show, resource), class: "admin-btn admin-btn-secondary" %>
           <%= link_to "Edit", admin_path_for(model_name, :edit, resource), class: "admin-btn admin-btn-secondary" %>
+          <% custom_actions.each do |action| %>
+            <% action_path = "/admin/#{model_name.underscore.pluralize}/#{resource.id}/#{action[:name]}" %>
+            <%= button_to action[:label] || action[:name].to_s.titleize,
+                  action_path,
+                  method: (action[:method] || :post),
+                  form: { data: { turbo_confirm: action[:confirm] } },
+                  class: "admin-btn #{action[:class] || 'admin-btn-secondary'}" %>
+          <% end %>
         </td>
       </tr>
     <% end %>

data/app/views/admin_resources/resources/show.html.erb

@@ -35,6 +35,38 @@
   <% end %>
 </div>
 
+<%# Display Active Storage attachments %>
+<% model_class.reflect_on_all_associations(:has_many).select { |a| a.options[:class_name] == "ActiveStorage::Attachment" }.each do |assoc| %>
+  <% attachments = @resource.send(assoc.name) %>
+  <% next if attachments.empty? %>
+  <div style="margin-top:2rem">
+    <div class="admin-header">
+      <h2><%= assoc.name.to_s.sub(/_attachments$/, '').titleize %></h2>
+    </div>
+    <div class="admin-card" style="display:flex;flex-wrap:wrap;gap:1rem">
+      <% attachments.each do |att| %>
+        <div style="border:1px solid #e5e5e5;border-radius:6px;overflow:hidden;width:160px">
+          <% blob_url = Rails.application.routes.url_helpers.rails_blob_url(att.blob, only_path: true) %>
+          <% if att.image? %>
+            <%= image_tag blob_url, style: "width:160px;height:120px;object-fit:cover;display:block" %>
+          <% elsif att.video? %>
+            <video style="width:160px;height:120px;object-fit:cover;display:block" controls preload="none">
+              <source src="<%= blob_url %>" type="<%= att.content_type %>">
+            </video>
+          <% else %>
+            <div style="width:160px;height:120px;display:flex;align-items:center;justify-content:center;background:#f5f5f5;font-size:0.75rem;color:#666;text-align:center;padding:0.5rem">
+              <%= att.filename %>
+            </div>
+          <% end %>
+          <div style="padding:0.35rem 0.5rem;font-size:0.7rem;color:#666;border-top:1px solid #e5e5e5">
+            <%= att.filename %><br><%= number_to_human_size(att.byte_size) %>
+          </div>
+        </div>
+      <% end %>
+    </div>
+  </div>
+<% end %>
+
 <%# Display has_one associations %>
 <% model_class.reflect_on_all_associations(:has_one).each do |assoc| %>
   <% record = @resource.send(assoc.name) %>

data/app/views/layouts/admin_resources/admin.html.erb

@@ -56,15 +56,28 @@
               class: ('active' if params[:model] == model_name) %>
         <% end %>
 
+        <% if admin_custom_pages.any? %>
+          <h3>Tools</h3>
+          <% admin_custom_pages.each do |page| %>
+            <%= link_to "#{page[:icon]} #{page[:label]}".strip, page[:path],
+                class: (request.path.start_with?(page[:path]) ? 'active' : '') %>
+          <% end %>
+        <% end %>
+
         <h3>Account</h3>
         <%= link_to "Admin Users", admin_resources.admin_users_path,
             class: (controller_path == 'admin_resources/admin_users' ? 'active' : '') %>
-        <%= link_to "Sign Out", admin_resources.destroy_admin_user_session_path, data: { turbo_method: :delete } %>
+        <%= button_to "Sign Out", admin_resources.destroy_admin_user_session_path, method: :delete, class: "admin-btn admin-btn-secondary", style: "width:100%;text-align:left;background:none;color:#eee;padding:0.5rem;border-radius:4px;cursor:pointer;" %>
       </nav>
 
       <main class="admin-main">
         <% if notice %>
-          <div class="admin-flash notice"><%= notice %></div>
+          <div class="admin-flash notice">
+            <%= notice %>
+            <% if flash[:new_url] %>
+              &nbsp;· <%= link_to "Add another →", flash[:new_url] %>
+            <% end %>
+          </div>
         <% end %>
         <% if alert %>
           <div class="admin-flash alert"><%= alert %></div>
@@ -73,5 +86,13 @@
         <%= yield %>
       </main>
     </div>
+  <script>
+    document.addEventListener('click', function(e) {
+      var row = e.target.closest('tr[data-href]');
+      if (!row) return;
+      if (e.target.closest('a, button, form')) return;
+      window.location = row.dataset.href;
+    });
+  </script>
   </body>
 </html>

data/lib/admin_resources/configuration.rb

@@ -2,22 +2,35 @@
 
 module AdminResources
   class Configuration
-    attr_reader :models
+    attr_reader :models, :custom_pages
 
     def initialize
       @models = {}
+      @custom_pages = []
     end
 
     # Register a model for admin management
     # Usage: config.register "User", columns: %w[id email created_at]
     # Usage: config.register "User"  (defaults to first 6 columns)
-    def register(model_name, columns: nil)
+    # Usage: config.register "Product", has_many_through: [{ association: :desk_buddy_versions, join_model: "ProductVersion", foreign_key: :product_id, through_key: :desk_buddy_version_id }]
+    # Usage: config.register "Order", custom_actions: [{ name: :ship, label: "Mark Shipped", method: :patch, confirm: "Mark this order as shipped?" }]
+    def register(model_name, columns: nil, has_many_through: nil, custom_actions: nil)
       name = model_name.to_s.classify
-      @models[name] = { columns: columns&.map(&:to_s) }
+      @models[name] = {
+        columns: columns&.map(&:to_s),
+        has_many_through: has_many_through || [],
+        custom_actions: custom_actions || []
+      }
     end
 
     def model_names
       @models.keys
     end
+
+    # Register a custom sidebar page that routes to the host app
+    # Usage: config.add_page "STL Models", path: "/admin/stl_models", icon: "📦"
+    def add_page(label, path:, icon: nil)
+      @custom_pages << { label: label, path: path, icon: icon }
+    end
   end
 end

data/lib/admin_resources/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AdminResources
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

data/lib/admin_resources.rb

@@ -11,6 +11,7 @@ module AdminResources
     end
 
     def configure
+      @configuration = Configuration.new
       yield configuration
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: admin_resources
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - mark rosenberg
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-22 00:00:00.000000000 Z
+date: 2026-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails