plutonium 0.26.3 → 0.26.6

data/config/initializers/action_policy.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# Configure ActionPolicy for Plutonium
+Rails.application.config.to_prepare do
+  # Install STI policy lookup support
+  # This allows STI models to use their base class's policy when a specific policy doesn't exist
+  require "plutonium/action_policy/sti_policy_lookup"
+  Plutonium::ActionPolicy::StiPolicyLookup.install!
+end

data/lib/plutonium/action/base.rb

@@ -16,7 +16,7 @@ module Plutonium
     # @attr_reader [Symbol, nil] category The category of the action.
     # @attr_reader [Integer] position The position of the action within its category.
     class Base
-      attr_reader :name, :label, :description, :icon, :route_options, :confirmation, :turbo, :turbo_frame, :color, :category, :position
+      attr_reader :name, :label, :description, :icon, :route_options, :confirmation, :turbo, :turbo_frame, :color, :category, :position, :return_to
 
       # Initialize a new action.
       #
@@ -29,6 +29,7 @@ module Plutonium
       # @option options [String] :confirmation The confirmation message to display before executing the action.
       # @option options [RouteOptions, Hash] :route_options The routing options for the action.
       # @option options [String] :turbo_frame The Turbo Frame ID for the action (used in Hotwire/Turbo Drive applications).
+      # @option options [String, Symbol] :return_to Override the return_to URL for this action. If not provided, defaults to current URL.
       # @option options [Boolean] :bulk_action (false) If true, applies to a bulk selection of records (e.g., "Mark Selected as Read").
       # @option options [Boolean] :collection_record_action (false) If true, applies to records in a collection (e.g., "Edit Record" button in a table).
       # @option options [Boolean] :record_action (false) If true, applies to an individual record (e.g., "Delete" button on a Show page).
@@ -49,6 +50,7 @@ module Plutonium
         @route_options = build_route_options(options[:route_options])
         @turbo = options[:turbo]
         @turbo_frame = options[:turbo_frame]
+        @return_to = options[:return_to]
         @bulk_action = options[:bulk_action] || false
         @collection_record_action = options[:collection_record_action] || false
         @record_action = options[:record_action] || false

data/lib/plutonium/action_policy/sti_policy_lookup.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Plutonium
+  module ActionPolicy
+    # Custom ActionPolicy lookup resolver for STI (Single Table Inheritance) models
+    # This resolver attempts to find a policy for the base class when a policy
+    # for the STI subclass is not found
+    module StiPolicyLookup
+      # STI base class policy resolver
+      # Checks if the record is an STI model and looks up the policy for its base class
+      STI_BASE_CLASS_LOOKUP = ->(record, namespace: nil, strict_namespace: false, **) {
+        # Skip if record is a symbol or doesn't have a class
+        next unless record.respond_to?(:class)
+
+        record_class = record.is_a?(Module) ? record : record.class
+
+        # Check if this is an STI model (has base_class and is different from current class)
+        next unless record_class.respond_to?(:base_class)
+        next if record_class == record_class.base_class
+
+        # Try to find policy for the base class
+        policy_name = "#{record_class.base_class}Policy"
+        ::ActionPolicy::LookupChain.send(:lookup_within_namespace, policy_name, namespace, strict: strict_namespace)
+      }
+
+      class << self
+        def install!
+          # Insert STI resolver before the standard INFER_FROM_CLASS resolver
+          # This ensures we try the base class before giving up
+          infer_index = ::ActionPolicy::LookupChain.chain.index(::ActionPolicy::LookupChain::INFER_FROM_CLASS)
+
+          if infer_index
+            # Insert after INFER_FROM_CLASS so it runs as a fallback
+            ::ActionPolicy::LookupChain.chain.insert(infer_index + 1, STI_BASE_CLASS_LOOKUP)
+          else
+            # If for some reason INFER_FROM_CLASS isn't found, append to end
+            ::ActionPolicy::LookupChain.chain << STI_BASE_CLASS_LOOKUP
+          end
+        end
+      end
+    end
+  end
+end

data/lib/plutonium/core/controller.rb

@@ -73,13 +73,22 @@ module Plutonium
           if element.is_a?(Class)
             controller_chain << element.to_s.pluralize
           else
-            controller_chain << element.class.to_s.pluralize
+            # For STI models, use the base class for routing if the specific class isn't registered
+            model_class = element.class
+            if model_class.respond_to?(:base_class) && model_class != model_class.base_class
+              # Check if the STI model is registered, if not use base class
+              route_configs = current_engine.routes.resource_route_config_for(model_class.to_s.pluralize.underscore)
+              model_class = model_class.base_class if route_configs.nil? || route_configs.empty?
+            end
+
+            controller_chain << model_class.to_s.pluralize
             if index == args.length - 1
-              resource_route_config = current_engine.routes.resource_route_config_for(element.model_name.plural)[0]
-              url_args[:id] = element.to_param unless resource_route_config[:route_type] == :resource
+              resource_route_configs = current_engine.routes.resource_route_config_for(model_class.to_s.pluralize.underscore)
+              resource_route_config = resource_route_configs&.first
+              url_args[:id] = element.to_param unless resource_route_config && resource_route_config[:route_type] == :resource
               url_args[:action] ||= :show
             else
-              url_args[element.model_name.singular.to_sym] = element.to_param
+              url_args[model_class.to_s.underscore.singularize.to_sym] = element.to_param
             end
           end
         end

data/lib/plutonium/core/controllers/authorizable.rb

@@ -5,7 +5,7 @@ module Plutonium
     module Controllers
       module Authorizable
         extend ActiveSupport::Concern
-        include ActionPolicy::Controller
+        include ::ActionPolicy::Controller
 
         included do
           authorize :user, through: :current_user
@@ -23,7 +23,7 @@ module Plutonium
             raise ArgumentError("Expected resource to be a class inheriting ActiveRecord::Base")
           end
 
-          options[:with] ||= ActionPolicy.lookup(resource, namespace: authorization_namespace)
+          options[:with] ||= ::ActionPolicy.lookup(resource, namespace: authorization_namespace)
           relation ||= resource.all
 
           authorized_scope(relation, **options)

data/lib/plutonium/definition/actions.rb

@@ -47,7 +47,7 @@ module Plutonium
         action(:destroy, route_options: {method: :delete},
           record_action: true, collection_record_action: true, category: :danger,
           icon: Phlex::TablerIcons::Trash, position: 100,
-          confirmation: "Are you sure?", turbo_frame: "_top")
+          confirmation: "Are you sure?", turbo_frame: "_top", return_to: "")
 
         # Example of dynamic route options using custom url_resolver:
         #

data/lib/plutonium/railtie.rb

@@ -54,7 +54,7 @@ module Plutonium
     config.after_initialize do
       Plutonium::Reloader.start! if Plutonium.configuration.enable_hotreload
       Plutonium::Loader.eager_load if Rails.env.production?
-      ActionPolicy::PerThreadCache.enabled = !Rails.env.local?
+      ::ActionPolicy::PerThreadCache.enabled = !Rails.env.local?
     end
 
     private

data/lib/plutonium/resource/controllers/authorizable.rb

@@ -20,10 +20,10 @@ module Plutonium
         extend ActiveSupport::Concern
 
         # Custom exception for missing authorize_current call
-        class ActionMissingAuthorizeCurrent < ActionPolicy::UnauthorizedAction; end
+        class ActionMissingAuthorizeCurrent < ::ActionPolicy::UnauthorizedAction; end
 
         # Custom exception for missing current_authorized_scope call
-        class ActionMissingCurrentAuthorizedScope < ActionPolicy::UnauthorizedAction; end
+        class ActionMissingCurrentAuthorizedScope < ::ActionPolicy::UnauthorizedAction; end
 
         included do
           after_action :verify_authorize_current
@@ -95,7 +95,7 @@ module Plutonium
 
         # Returns the policy for the current resource
         #
-        # @return [ActionPolicy::Base] the policy for the current resource
+        # @return [::ActionPolicy::Base] the policy for the current resource
         def current_policy
           @current_policy ||= policy_for(record: current_policy_subject, context: current_policy_context)
         end
@@ -119,7 +119,7 @@ module Plutonium
         #
         # @param record [Object] the record to authorize
         # @param options [Hash] additional options for authorization
-        # @raise [ActionPolicy::Unauthorized] if the action is not authorized
+        # @raise [::ActionPolicy::Unauthorized] if the action is not authorized
         def authorize_current!(record, **options)
           options[:context] = (options[:context] || {}).deep_merge(current_policy_context)
           authorize!(record, **options)

data/lib/plutonium/resource/policy.rb

@@ -5,7 +5,7 @@ module Plutonium
     # Policy class to define permissions and attributes for a resource.
     # This class provides methods to check permissions for various actions
     # and to retrieve permitted attributes for these actions.
-    class Policy < ActionPolicy::Base
+    class Policy < ::ActionPolicy::Base
       authorize :user, allow_nil: false
       authorize :entity_scope, allow_nil: true
 

data/lib/plutonium/ui/action_button.rb

@@ -25,7 +25,7 @@ module Plutonium
       def render_link
         uri = URI.parse(@url)
         params = Rack::Utils.parse_nested_query(uri.query)
-        params["return_to"] = request.original_url
+        params["return_to"] = @action.return_to.nil? ? request.original_url : @action.return_to
         uri.query = params.to_query
         uri.to_s
 
@@ -42,7 +42,7 @@ module Plutonium
         button_to(
           @url,
           method: @action.route_options.method,
-          name: :return_to, value: request.original_url,
+          name: :return_to, value: (@action.return_to.nil? ? request.original_url : @action.return_to),
           class: "inline-block",
           form: {
             data: {

data/lib/plutonium/ui/color_mode_selector.rb

@@ -8,77 +8,30 @@ module Plutonium
     class ColorModeSelector < Plutonium::UI::Component::Base
       # Common CSS classes used across the component
       COMMON_CLASSES = {
-        button: "w-full block py-2 px-4 text-sm text-gray-700 hover:bg-gray-100 dark:hover:text-white dark:text-gray-300 dark:hover:bg-gray-600",
-        icon: "w-6 h-6 text-gray-800 dark:text-white",
-        trigger: "inline-flex justify-center p-2 text-gray-500 rounded cursor-pointer dark:hover:text-white dark:text-gray-200 hover:text-gray-900 hover:bg-gray-100 dark:hover:bg-gray-600",
-        dropdown: "hidden z-50 my-4 text-base list-none bg-white rounded divide-y divide-gray-100 shadow dark:bg-gray-700"
+        button: "inline-flex justify-center items-center p-2 text-gray-500 rounded cursor-pointer dark:hover:text-white dark:text-gray-200 hover:text-gray-900 hover:bg-gray-100 dark:hover:bg-gray-600 transition-colors duration-200",
+        icon: "w-5 h-5"
       }.freeze
 
       # Available color modes with their associated icons and actions
       COLOR_MODES = [
-        {label: "Light", icon: Phlex::TablerIcons::Sun, action: "setLightColorMode"},
-        {label: "Dark", icon: Phlex::TablerIcons::Moon, action: "setDarkColorMode"},
-        {label: "System", icon: Phlex::TablerIcons::DeviceDesktop, action: "setSystemColorMode"}
+        {mode: "light", icon: Phlex::TablerIcons::Sun, action: "setLightColorMode"},
+        {mode: "dark", icon: Phlex::TablerIcons::Moon, action: "setDarkColorMode"}
       ].freeze
 
       # Renders the color mode selector
       # @return [void]
       def view_template
-        div(data_controller: "resource-drop-down") do
-          render_dropdown_trigger
-          render_dropdown_menu
-        end
-      end
-
-      private
-
-      # @private
-      def render_dropdown_trigger
         button(
           type: "button",
-          data_resource_drop_down_target: "trigger",
-          class: COMMON_CLASSES[:trigger]
-        ) do
-          render Phlex::TablerIcons::Adjustments.new(class: COMMON_CLASSES[:icon])
-        end
-      end
-
-      # @private
-      def render_dropdown_menu
-        div(
-          class: COMMON_CLASSES[:dropdown],
-          data_resource_drop_down_target: "menu"
+          class: COMMON_CLASSES[:button],
+          data_controller: "color-mode",
+          data_action: "click->color-mode#toggleMode",
+          data_color_mode_current_value: "light", # Default to light mode
+          title: "Toggle color mode"
         ) do
-          render_color_mode_options
-        end
-      end
-
-      # @private
-      def render_color_mode_options
-        ul(class: "py-1", role: "none") do
-          COLOR_MODES.each do |mode|
-            render_color_mode_button(**mode)
-          end
-        end
-      end
-
-      # @private
-      # @param label [String] The text label for the button
-      # @param icon [Class] The TablerIcon class to render
-      # @param action [String] The color-mode controller action to trigger
-      def render_color_mode_button(label:, icon:, action:)
-        li do
-          button(
-            type: "button",
-            class: COMMON_CLASSES[:button],
-            role: "menuitem",
-            data_action: "click->color-mode##{action}"
-          ) do
-            div(class: "flex justify-start") do
-              render icon.new(class: COMMON_CLASSES[:icon])
-              plain " #{label}"
-            end
-          end
+          # Both icons rendered, only one visible at a time
+          render Phlex::TablerIcons::Sun.new(class: "#{COMMON_CLASSES[:icon]} color-mode-icon-light", data: {color_mode_icon: "light"})
+          render Phlex::TablerIcons::Moon.new(class: "#{COMMON_CLASSES[:icon]} color-mode-icon-dark", data: {color_mode_icon: "dark"})
         end
       end
     end

data/lib/plutonium/ui/layout/header.rb

@@ -56,6 +56,14 @@ module Plutonium
 
         private
 
+        # Renders the color mode toggle controls
+        # @private
+        def render_color_mode_controls
+          div(class: "bg-white dark:bg-gray-800 border-gray-200 dark:border-gray-700") do
+            render ColorModeSelector.new
+          end
+        end
+
         # Renders the left section of the header including sidebar toggle, brand elements,
         # and any yielded content
         # @private
@@ -111,8 +119,12 @@ module Plutonium
         # Renders the action buttons section
         # @private
         def render_actions
-          div(class: "flex items-center lg:order-2") do
-            action_slots.each { |action| render action }
+          div(class: "flex items-center space-x-2") do
+            render_color_mode_controls
+
+            div(class: "flex items-center lg:order-2") do
+              action_slots.each { |action| render action }
+            end
           end
         end
       end

data/lib/plutonium/ui/layout/sidebar.rb

@@ -15,7 +15,6 @@ module Plutonium
         def view_template(&)
           render_sidebar_container do
             render_content(&) if block_given?
-            render_color_mode_controls
           end
         end
 
@@ -41,13 +40,6 @@ module Plutonium
             &
           )
         end
-
-        # @private
-        def render_color_mode_controls
-          div(class: "absolute bottom-0 left-0 justify-center p-4 space-x-4 w-full flex bg-white dark:bg-gray-800 z-20 border-r border-gray-200 dark:border-gray-700") do
-            render ColorModeSelector.new
-          end
-        end
       end
     end
   end

data/lib/plutonium/ui/table/theme.rb

@@ -21,7 +21,7 @@ module Plutonium
             header_cell_sort_wrapper: "flex items-center",
             header_cell_sort_indicator: "ml-1.5",
             body_row: "bg-white border-b last:border-none dark:bg-gray-800 dark:border-gray-700",
-            body_cell: "px-6 py-4 whitespace-pre max-w-[310px] hover:max-w-[600px] overflow-hidden text-ellipsis transition-all duration-300 ease-in-out",
+            body_cell: "px-6 py-4 whitespace-pre max-w-[450px] overflow-hidden text-ellipsis transition-all duration-300 ease-in-out",
             sort_icon: "w-3 h-3",
             sort_icon_active: "text-primary-600",
             sort_icon_inactive: "text-gray-600 dark:text-gray-500",

data/lib/plutonium/version.rb

@@ -1,5 +1,5 @@
 module Plutonium
-  VERSION = "0.26.3"
+  VERSION = "0.26.6"
   NEXT_MAJOR_VERSION = VERSION.split(".").tap { |v|
     v[1] = v[1].to_i + 1
     v[2] = 0

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radioactive-labs/plutonium",
-  "version": "0.4.9",
+  "version": "0.4.11",
   "description": "Core assets for the Plutonium gem",
   "type": "module",
   "main": "src/js/core.js",

data/src/js/controllers/attachment_input_controller.js

@@ -26,6 +26,8 @@ export default class extends Controller {
   //======= Lifecycle
 
   connect() {
+    if (this.uppy) return;
+
     // initialize
     this.uploadedFiles = []
 
@@ -38,10 +40,48 @@ export default class extends Controller {
     this.#buildTriggers()
     // init state
     this.#onAttachmentsChanged()
+
+    // Just recreate Uppy after morphing - preserve existing attachments
+    this.element.addEventListener("turbo:morph-element", (event) => {
+      if (event.target === this.element && !this.morphing) {
+        this.morphing = true;
+        requestAnimationFrame(() => {
+          this.#handleMorph();
+          this.morphing = false;
+        });
+      }
+    });
   }
 
   disconnect() {
-    this.uppy = null
+    this.#cleanupUppy();
+  }
+
+  #handleMorph() {
+    if (!this.element.isConnected) return;
+
+    // Clean up the old instance
+    this.#cleanupUppy();
+
+    // Recreate everything - Uppy, triggers, etc.
+    this.uploadedFiles = []
+    this.element.style["display"] = "none"
+    this.configureUppy()
+    this.#buildTriggers()
+    this.#onAttachmentsChanged()
+  }
+
+  #cleanupUppy() {
+    if (this.uppy) {
+      this.uppy.destroy();
+      this.uppy = null;
+    }
+    
+    // Clean up triggers
+    if (this.triggerContainer && this.triggerContainer.parentNode) {
+      this.triggerContainer.parentNode.removeChild(this.triggerContainer);
+      this.triggerContainer = null;
+    }
   }
 
   attachmentPreviewOutletConnected(outlet, element) {

data/src/js/controllers/color_mode_controller.js

@@ -1,40 +1,50 @@
-import { Controller } from "@hotwired/stimulus"
-
+import { Controller } from "@hotwired/stimulus";
 
 // Connects to data-controller="color-mode"
 export default class extends Controller {
-  // static targets = ["trigger", "menu"]
+  static values = { current: String };
 
   connect() {
-    this.updateColorMode()
+    // Set initial mode from localStorage or default
+    const mode = localStorage.theme || "light";
+    this.setMode(mode);
   }
 
-  disconnect() {
+  toggleMode() {
+    const current = this.currentValue || "light";
+    const next = current === "light" ? "dark" : "light";
+    this.setMode(next);
   }
 
-  updateColorMode() {
-    if (localStorage.theme === 'dark' || (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
-      document.documentElement.classList.add('dark')
+  setMode(mode) {
+    // Update html class
+    if (mode === "dark") {
+      document.documentElement.classList.add("dark");
+      localStorage.theme = "dark";
     } else {
-      document.documentElement.classList.remove('dark')
+      document.documentElement.classList.remove("dark");
+      localStorage.theme = "light";
     }
-  }
 
-  setLightColorMode() {
-    // Whenever the user explicitly chooses light mode
-    localStorage.theme = 'light'
-    this.updateColorMode()
-  }
+    // Update button state
+    this.currentValue = mode;
 
-  setDarkColorMode() {
-    // Whenever the user explicitly chooses dark mode
-    localStorage.theme = 'dark'
-    this.updateColorMode()
+    // Show/hide icons
+    this.toggleIcons(mode);
   }
 
-  setSystemColorMode() {
-    // Whenever the user explicitly chooses to respect the OS preference
-    localStorage.removeItem('theme')
-    this.updateColorMode()
+  toggleIcons(mode) {
+    const sun = this.element.querySelector(".color-mode-icon-light");
+    const moon = this.element.querySelector(".color-mode-icon-dark");
+
+    if (sun && moon) {
+      if (mode === "light") {
+        sun.classList.remove("hidden");
+        moon.classList.add("hidden");
+      } else {
+        sun.classList.add("hidden");
+        moon.classList.remove("hidden");
+      }
+    }
   }
 }

data/src/js/controllers/easymde_controller.js

@@ -4,21 +4,60 @@ import { marked } from 'marked';
 
 // Connects to data-controller="easymde"
 export default class extends Controller {
+  static targets = ["textarea"]
+  
   connect() {
+    if (this.easyMDE) return
+    
+    this.originalValue = this.element.value
     this.easyMDE = new EasyMDE(this.#buildOptions())
-    this.element.setAttribute("data-action", "turbo:morph-element->easymde#reconnect")
+    
+    // Store the editor content before morphing
+    this.element.addEventListener("turbo:before-morph-element", (event) => {
+      if (event.target === this.element && this.easyMDE) {
+        this.storedValue = this.easyMDE.value()
+      }
+    })
+    
+    // Restore after morphing
+    this.element.addEventListener("turbo:morph-element", (event) => {
+      if (event.target === this.element) {
+        requestAnimationFrame(() => this.#handleMorph())
+      }
+    })
   }
 
   disconnect() {
     if (this.easyMDE) {
-      this.easyMDE.toTextArea()
+      try {
+        // Only call toTextArea if the element is still in the DOM
+        if (this.element.isConnected && this.element.parentNode) {
+          this.easyMDE.toTextArea()
+        }
+      } catch (error) {
+        console.warn('EasyMDE cleanup error:', error)
+      }
       this.easyMDE = null
     }
   }
-
-  reconnect() {
-    this.disconnect()
-    this.connect()
+  
+  #handleMorph() {
+    if (!this.element.isConnected) return
+    
+    // Don't call toTextArea during morph - just clean up references
+    if (this.easyMDE) {
+      // Skip toTextArea cleanup - it causes DOM errors during morphing
+      this.easyMDE = null
+    }
+    
+    // Recreate the editor
+    this.easyMDE = new EasyMDE(this.#buildOptions())
+    
+    // Restore the stored value if we have it
+    if (this.storedValue !== undefined) {
+      this.easyMDE.value(this.storedValue)
+      this.storedValue = undefined
+    }
   }
 
   #buildOptions() {

data/src/js/controllers/flatpickr_controller.js

@@ -3,14 +3,21 @@ import { Controller } from "@hotwired/stimulus";
 // Connects to data-controller="flatpickr"
 export default class extends Controller {
   connect() {
-    this.modal = document.querySelector("[data-controller=remote-modal]");
+    if (this.picker) return;
 
+    this.modal = document.querySelector("[data-controller=remote-modal]");
     this.picker = new flatpickr(this.element, this.#buildOptions());
 
-    this.element.setAttribute(
-      "data-action",
-      "turbo:morph-element->flatpickr#reconnect"
-    );
+    // Just recreate Flatpickr after morphing - the DOM will have correct value
+    this.element.addEventListener("turbo:morph-element", (event) => {
+      if (event.target === this.element && !this.morphing) {
+        this.morphing = true;
+        requestAnimationFrame(() => {
+          this.#handleMorph();
+          this.morphing = false;
+        });
+      }
+    });
   }
 
   disconnect() {
@@ -20,9 +27,18 @@ export default class extends Controller {
     }
   }
 
-  reconnect() {
-    this.disconnect();
-    this.connect();
+  #handleMorph() {
+    if (!this.element.isConnected) return;
+
+    // Clean up the old instance
+    if (this.picker) {
+      this.picker.destroy();
+      this.picker = null;
+    }
+
+    // Recreate the picker - it will pick up the current DOM value
+    this.modal = document.querySelector("[data-controller=remote-modal]");
+    this.picker = new flatpickr(this.element, this.#buildOptions());
   }
 
   #buildOptions() {