plutonium 0.25.2 → 0.26.0

data/docs/guide/deep-dive/resources.md

@@ -371,7 +371,7 @@ class PostDefinition < Plutonium::Resource::Definition
 
   # Add filters to the sidebar
   filter :published, with: ->(scope, value) { value ? scope.where.not(published_at: nil) : scope.where(published_at: nil) }, as: :boolean
-  filter :user, as: :select, collection: -> { User.pluck(:name, :id) }
+  filter :user, as: :select, choices: User.pluck(:name, :id)
 
   # Define named scopes that appear as buttons
   scope :all

data/docs/modules/definition.md

@@ -71,7 +71,7 @@ class PostDefinition < Plutonium::Resource::Definition
   # Only override when you need custom input behavior:
   input :content, as: :rich_text               # Override text -> rich_text
   input :title, placeholder: "Enter title"    # Add placeholder
-  input :category, as: :select, collection: %w[Tech Business]  # Add options
+  input :category, as: :select, choices: %w[Tech Business]  # Add options
   input :published_at, as: :date               # Override datetime -> date only
 end
 ```
@@ -158,8 +158,8 @@ end
 ```ruby
 class PostDefinition < Plutonium::Resource::Definition
   # Provide options for select inputs
-  input :category, as: :select, collection: %w[Tech Business Lifestyle]
-  input :author, as: :select, collection: -> { User.active.pluck(:name, :id) }
+  input :category, as: :select, choices: %w[Tech Business Lifestyle]
+  input :author, as: :select, choices: -> { User.active.pluck(:name, :id) }
 end
 ```
 
@@ -177,7 +177,7 @@ class PostDefinition < Plutonium::Resource::Definition
 
   # Use `pre_submit` to create dynamic forms where inputs appear based on other inputs.
   input :send_notifications, as: :boolean, pre_submit: true
-  input :notification_channel, as: :select, collection: %w[Email SMS],
+  input :notification_channel, as: :select, choices: %w[Email SMS],
         condition: -> { object.send_notifications? }
 
   # Show debug fields only in development
@@ -280,6 +280,7 @@ The block syntax offers more control over rendering, allowing for custom compone
 - Building complex layouts with multiple components or custom HTML (for `display` only).
 - You need conditional logic to determine which component to render.
 - You need to call specific form builder methods with custom logic (for `input`).
+- **You need dynamic choices for select inputs** (since `choices:` option only accepts static arrays).
 
 ::: code-group
 ```ruby [Custom Display Components]
@@ -302,6 +303,29 @@ input :birth_date do |f|
   end
 end
 ```
+```ruby [Dynamic Choices for Select Inputs]
+# Dynamic choices based on object state
+input :widget_type do |f|
+  choices = case object.question_type
+  when nil, ""
+    []
+  when "text"
+    ["input", "textarea"]
+  when "choice"
+    ["radio", "select", "checkbox"]
+  when "scale"
+    ["slider", "radio_scale", "select_scale"]
+  when "date"
+    ["date_picker", "datetime_picker"]
+  when "boolean"
+    ["checkbox", "toggle", "yes_no"]
+  else
+    Question::WIDGET_TYPES
+  end
+
+  f.select_tag choices: choices
+end
+```
 ```ruby [Conditional Rendering]
 # Conditional display based on value
 display :metrics do |field|
@@ -829,32 +853,43 @@ display :content,
   condition: -> { current_user.can_see_content? }
 ```
 
-### Collection Options (for selects)
+### Choices Options (for selects)
 ```ruby
-input :category, as: :select, collection: %w[Tech Business Lifestyle]
-input :author, as: :select, collection: -> { User.active.pluck(:name, :id) }
+# Static choices
+input :category, as: :select, choices: %w[Tech Business Lifestyle]
 
-# Collection procs are executed in the form rendering context
-# and have access to current_user and other helpers:
-input :team_members, as: :select, collection: -> {
-  current_user.organization.users.active.pluck(:name, :id)
-}
+# Dynamic choices require block form
+input :author do |f|
+  choices = User.active.pluck(:name, :id)
+  f.select_tag choices: choices
+end
 
-# You can also access the form object being edited:
-input :related_posts, as: :select, collection: -> {
-  Post.where.not(id: object.id).published.pluck(:title, :id) if object.persisted?
-}
+# Dynamic choices with access to context
+input :team_members do |f|
+  choices = current_user.organization.users.active.pluck(:name, :id)
+  f.select_tag choices: choices
+end
+
+# Dynamic choices based on object state
+input :related_posts do |f|
+  choices = if object.persisted?
+    Post.where.not(id: object.id).published.pluck(:title, :id)
+  else
+    []
+  end
+  f.select_tag choices: choices
+end
 ```
 
-::: tip Collection Context
-Collection procs are evaluated in the form rendering context, which means they have access to:
+::: tip Dynamic Choices Context
+When using block forms for dynamic choices, you have access to:
 - `current_user` - The authenticated user
 - `current_parent` - Parent record for nested resources
 - `object` - The record being edited (in edit forms)
 - `request` and `params` - Request information
 - All helper methods available in the form context
 
-This is the same context as `condition` procs, allowing for dynamic, user-specific collections.
+Block forms are required for dynamic choices since the `choices:` option only accepts static arrays.
 :::
 
 ### File Upload Options
@@ -868,7 +903,7 @@ input :documents, as: :file, multiple: true,
 ## Dynamic Configuration & Policies
 
 ::: danger IMPORTANT
-Definitions are instantiated outside the controller context, which means **`current_user` and other controller methods are NOT available** within the definition file itself. However, `condition` and `collection` procs ARE evaluated in the rendering context where `current_user` and the record (`object`) are available.
+Definitions are instantiated outside the controller context, which means **`current_user` and other controller methods are NOT available** within the definition file itself. However, `condition` procs and input blocks ARE evaluated in the rendering context where `current_user` and the record (`object`) are available.
 :::
 
 The `condition` option configures **if an input is rendered**. It does not control if a field's *value* is accessible. For that, you must use policies.

data/docs/modules/table.md

@@ -65,7 +65,7 @@ column :published_at, as: :datetime
 column :is_active, as: :boolean
 column :priority, as: :badge
 column :profile_picture, as: :attachment
-column :metadata, as: :json
+column :metadata, as: :key_value_store
 ```
 
 ### Alignment

data/docs/public/plutonium.mdc

@@ -90,7 +90,7 @@ class PostDefinition < Plutonium::Resource::Definition
 
   # Only declare fields when you want to override defaults:
   field :content, as: :rich_text  # Override text → rich_text
-  field :status, as: :select, collection: %w[draft published archived]
+  field :status, as: :select, choices: %w[draft published archived]
 
   # Display customization (show/index pages)
   display :title, as: :string
@@ -119,7 +119,7 @@ class PostDefinition < Plutonium::Resource::Definition
   # Input configuration (new/edit forms)
   input :title, placeholder: "Enter post title"  # No need for as: :string (auto-detected)
   input :content, as: :rich_text
-  input :category, as: :select, collection: %w[Tech Business Lifestyle]
+  input :category, as: :select, choices: %w[Tech Business Lifestyle]
 
   # New: Custom component classes
   input :color_picker, as: ColorPickerComponent
@@ -239,19 +239,32 @@ display :content,
   condition: -> { Rails.env.development? }  # Cosmetic condition only
 ```
 
-#### Collection Options (for selects)
+#### Choices Options (for selects)
 ```ruby
-input :category, as: :select, collection: %w[Tech Business Lifestyle]
-input :author, as: :select, collection: -> { User.active.pluck(:name, :id) }
-
-# Collection procs are executed in form rendering context with access to:
-# current_user, current_parent, object, request, params, and helpers
-input :team_members, as: :select, collection: -> {
-  current_user.organization.users.active.pluck(:name, :id)
-}
-input :related_posts, as: :select, collection: -> {
-  Post.where.not(id: object.id).published.pluck(:title, :id) if object.persisted?
-}
+# Static choices
+input :category, as: :select, choices: %w[Tech Business Lifestyle]
+
+# Dynamic choices require block form
+input :author do |f|
+  choices = User.active.pluck(:name, :id)
+  f.select_tag choices: choices
+end
+
+# Dynamic choices with access to context
+input :team_members do |f|
+  choices = current_user.organization.users.active.pluck(:name, :id)
+  f.select_tag choices: choices
+end
+
+# Dynamic choices based on object state  
+input :related_posts do |f|
+  choices = if object.persisted?
+    Post.where.not(id: object.id).published.pluck(:title, :id)
+  else
+    []
+  end
+  f.select_tag choices: choices
+end
 ```
 
 #### File Upload Options

data/lib/plutonium/core/controller.rb

@@ -79,13 +79,13 @@ module Plutonium
               url_args[:id] = element.to_param unless resource_route_config[:route_type] == :resource
               url_args[:action] ||= :show
             else
-              url_args[element.model_name.singular_route_key.to_sym] = element.to_param
+              url_args[element.model_name.singular.to_sym] = element.to_param
             end
           end
         end
         url_args[:controller] = "/#{controller_chain.join("::").underscore}"
 
-        url_args[:"#{parent.model_name.singular_route_key}_id"] = parent.to_param if parent.present?
+        url_args[:"#{parent.model_name.singular}_id"] = parent.to_param if parent.present?
         if scoped_to_entity? && scoped_entity_strategy == :path
           url_args[scoped_entity_param_key] = current_scoped_entity
         end

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

@@ -43,6 +43,11 @@ module Plutonium
           current_engine.scoped_entity_param_key
         end
 
+        def scoped_entity_route_key
+          ensure_legal_entity_scoping_method_access!(__method__)
+          current_engine.scoped_entity_route_key
+        end
+
         # Returns the class of the scoped entity.
         #
         # @return [Class] the scoped entity class

data/lib/plutonium/engine.rb

@@ -5,12 +5,13 @@ module Plutonium
     extend ActiveSupport::Concern
 
     class_methods do
-      attr_reader :scoped_entity_class, :scoped_entity_strategy, :scoped_entity_param_key
+      attr_reader :scoped_entity_class, :scoped_entity_strategy, :scoped_entity_param_key, :scoped_entity_route_key
 
-      def scope_to_entity(entity_class, strategy: :path, param_key: nil)
+      def scope_to_entity(entity_class, strategy: :path, param_key: nil, route_key: nil)
         @scoped_entity_class = entity_class
         @scoped_entity_strategy = strategy
         @scoped_entity_param_key = param_key || entity_class.model_name.singular_route_key.to_sym
+        @scoped_entity_route_key = route_key || entity_class.model_name.singular.to_sym
       end
 
       def scoped_to_entity?

data/lib/plutonium/resource/register.rb

@@ -44,7 +44,7 @@ module Plutonium
       def route_key_lookup
         freeze
         resources.to_h do |resource|
-          [resource.model_name.singular_route_key.to_sym, resource]
+          [resource.model_name.singular.to_sym, resource]
         end
       end
       # memoize_unless_reloading :route_key_lookup

data/lib/plutonium/ui/form/concerns/renders_nested_resource_fields.rb

@@ -91,12 +91,18 @@ module Plutonium
           # @param [Symbol] name The name of the nested resource field
           # @raise [ArgumentError] if the nested input definition is missing required configuration
           def render_nested_resource_field(name)
+            nested_input_definition = resource_definition.defined_nested_inputs[name]
+            condition = nested_input_definition[:options]&.fetch(:condition, nil)
+            if condition && !instance_exec(&condition)
+              return
+            end
+
             context = NestedFieldContext.new(
               name: name,
               definition: build_nested_fields_definition(name),
               resource_class: resource_class,
               resource_definition: resource_definition,
-              object_class: resource_definition.defined_nested_inputs[name][:options]&.fetch(:object_class, nil)
+              object_class: nested_input_definition[:options]&.fetch(:object_class, nil)
             )
 
             render_nested_field_container(context) do
@@ -171,7 +177,7 @@ module Plutonium
           end
 
           def render_template_for_nested_fields(context, options, nesting_method:)
-            template_tag data_nested_resource_form_fields_target: "template" do
+            template data_nested_resource_form_fields_target: "template" do
               send(nesting_method, context.name, as: context.nested_fields_input_param, **options, template: true) do |nested|
                 render_nested_fields_fieldset(nested, context)
               end

data/lib/plutonium/ui/page/interactive_action.rb

@@ -32,6 +32,29 @@ module Plutonium
                       transition-opacity duration-300 ease-in-out",
               data: {controller: "remote-modal"}
             ) do
+              # Close button
+              button(
+                type: "button",
+                class: "absolute top-4 right-4 p-2 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 transition-colors duration-200",
+                data: {action: "remote-modal#close"},
+                "aria-label": "Close dialog"
+              ) do
+                svg(
+                  class: "w-5 h-5",
+                  fill: "none",
+                  stroke: "currentColor",
+                  viewBox: "0 0 24 24",
+                  xmlns: "http://www.w3.org/2000/svg"
+                ) do |s|
+                  s.path(
+                    stroke_linecap: "round",
+                    stroke_linejoin: "round",
+                    stroke_width: "2",
+                    d: "M6 18L18 6M6 6l12 12"
+                  )
+                end
+              end
+
               render_page_header
               render partial("interactive_action_form")
             end

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

@@ -60,7 +60,7 @@ module Plutonium
               column_options = column_definition[:options] || {}
 
               # Check for conditional rendering
-              condition = column_options[:condition] || display_options[:condition] || field_options[:condition]
+              condition = column_options[:condition]
               conditionally_hidden = condition && !instance_exec(&condition)
               next if conditionally_hidden
 

data/lib/plutonium/version.rb

@@ -1,5 +1,5 @@
 module Plutonium
-  VERSION = "0.25.2"
+  VERSION = "0.26.0"
   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.4",
+  "version": "0.4.8",
   "description": "Core assets for the Plutonium gem",
   "type": "module",
   "main": "src/js/core.js",

data/src/css/slim_select.css

@@ -309,3 +309,40 @@
 .ss-main.ss-valid .ss-values .ss-placeholder {
   @apply text-green-700 dark:text-green-500;
 }
+
+/* Modal-specific styles for SlimSelect dropdown */
+.ss-dropdown-container {
+  position: absolute;
+  z-index: 9999;
+  inset: 40% 0px auto;
+}
+
+.ss-dropdown-container .ss-content {
+  position: static !important;
+  transform: none !important;
+  width: 100% !important;
+  border-radius: 0 !important;
+  margin: 0 !important;
+  pointer-events: none !important; /* Disabled by default */
+}
+
+/* When active (dropdown is expanded), enable pointer events */
+.ss-dropdown-container.ss-active .ss-content {
+  pointer-events: auto !important;
+}
+
+.ss-dropdown-container .ss-list {
+  max-height: 250px !important;
+  overflow-y: auto !important;
+}
+
+/* Ensure the dropdown doesn't block other elements when closed */
+.ss-dropdown-container:not(:has(.ss-content)),
+.ss-dropdown-container:not(.ss-active) {
+  pointer-events: none !important;
+}
+
+/* Prevent interaction with closed dropdown */
+.ss-dropdown-container:not(.ss-active) * {
+  pointer-events: none !important;
+}

data/src/js/controllers/remote_modal_controller.js

@@ -2,23 +2,30 @@ import { Controller } from "@hotwired/stimulus";
 
 // Connects to data-controller="remote-modal"
 export default class extends Controller {
-    connect() {
-        // Store original scroll position
-        this.originalScrollPosition = window.scrollY;
+  connect() {
+    // Store original scroll position
+    this.originalScrollPosition = window.scrollY;
 
-        // Show the modal
-        this.element.showModal();
-        // Add close event listener
-        this.element.addEventListener('close', this.handleClose.bind(this));
-    }
+    // Show the modal
+    this.element.showModal();
+    // Add close event listener
+    this.element.addEventListener("close", this.handleClose.bind(this));
+  }
 
-    disconnect() {
-        // Clean up event listener when controller is disconnected
-        this.element.removeEventListener('close', this.handleClose);
-    }
+  close() {
+    // Close the modal
+    this.element.close();
+    // Restore the original scroll position
+    window.scrollTo(0, this.originalScrollPosition);
+  }
 
-    handleClose() {
-        // Restore the original scroll position after dialog closes
-        window.scrollTo(0, this.originalScrollPosition);
-    }
-}
+  disconnect() {
+    // Clean up event listener when controller is disconnected
+    this.element.removeEventListener("close", this.handleClose);
+  }
+
+  handleClose() {
+    // Restore the original scroll position after dialog closes
+    window.scrollTo(0, this.originalScrollPosition);
+  }
+}