plutonium 0.42.0 → 0.43.1

data/lib/plutonium/routing/mapper_extensions.rb

@@ -44,16 +44,28 @@ module Plutonium
         end
       end
 
+      # Draws routes wrapped in entity scope when using path-based entity scoping.
+      #
+      # @param scope_params [Hash, nil] Scope params from RouteSetExtensions, or nil if no scoping
+      # @param block [Proc] The block containing route definitions.
+      # @return [void]
+      def draw_routes_with_entity_scope(scope_params, &block)
+        if scope_params
+          scope scope_params[:name], **scope_params[:options] do
+            instance_exec(&block)
+            materialize_resource_routes
+          end
+        else
+          instance_exec(&block)
+          materialize_resource_routes
+        end
+      end
+
       # Materializes all registered resource routes.
       #
       # @return [void]
       def materialize_resource_routes
-        engine = route_set.engine
-        scope_params = determine_scope_params(engine)
-
-        scope scope_params[:name], scope_params[:options] do
-          concerns resource_route_concern_names.sort
-        end
+        concerns resource_route_concern_names.sort
       end
 
       # @return [ActionDispatch::Routing::RouteSet] The current route set.
@@ -149,18 +161,6 @@ module Plutonium
             as: :commit_interactive_resource_action
         end
       end
-
-      # Determines the scope parameters based on the engine configuration.
-      #
-      # @param engine [Class] The current engine.
-      # @return [Hash] Scope name and options.
-      def determine_scope_params(engine)
-        scoped_entity_param_key = engine.scoped_entity_param_key if engine.scoped_entity_strategy == :path
-        {
-          name: scoped_entity_param_key.present? ? ":#{scoped_entity_param_key}" : "",
-          options: scoped_entity_param_key.present? ? {as: scoped_entity_param_key} : {}
-        }
-      end
     end
   end
 end

data/lib/plutonium/routing/route_set_extensions.rb

@@ -34,11 +34,11 @@ module Plutonium
       # @yield Executes the given block in the context of route drawing.
       def draw(&block)
         if self.class.supported_engine?(engine)
+          scope_params = entity_scope_params_for_path_strategy
           ActiveSupport::Notifications.instrument("plutonium.resource_routes.draw", app: engine.to_s) do
             super do
               setup_shared_resource_concerns
-              instance_exec(&block)
-              materialize_resource_routes
+              draw_routes_with_entity_scope(scope_params, &block)
             end
           end
         else
@@ -46,6 +46,19 @@ module Plutonium
         end
       end
 
+      # Determines entity scope parameters for path-based scoping.
+      #
+      # @return [Hash, nil] Scope params if path-based scoping is enabled, nil otherwise
+      def entity_scope_params_for_path_strategy
+        return nil unless engine.scoped_entity_strategy == :path
+
+        param_key = engine.scoped_entity_param_key
+        {
+          name: ":#{param_key}",
+          options: {as: param_key}
+        }
+      end
+
       # Registers a resource for routing.
       #
       # @param resource [Class] The resource class to be registered.
@@ -75,6 +88,14 @@ module Plutonium
         resource_route_config_lookup.slice(*routes).values
       end
 
+      # Checks if a resource is registered as a singular route.
+      #
+      # @param route_key [String] The route key (e.g., "users" or "users/profiles")
+      # @return [Boolean] true if the resource is a singular route, false otherwise
+      def singular_resource_route?(route_key)
+        resource_route_config_for(route_key)[0]&.[](:route_type) == :resource
+      end
+
       # Returns the current engine for the routes.
       #
       # @return [Class] The engine class (Rails application or custom engine).

data/lib/plutonium/ui/breadcrumbs.rb

@@ -12,147 +12,127 @@ module Plutonium
           ol(
             class: "inline-flex items-center gap-1 md:gap-2"
           ) do
-            # Dashboard
-            li(class: "inline-flex items-center") do
-              a(
-                href: root_path,
-                class: "inline-flex items-center text-sm font-medium text-[var(--pu-text-muted)] hover:text-primary-600 transition-colors"
-              ) do
-                svg(
-                  class: "w-3 h-3 me-2.5",
-                  aria_hidden: "true",
-                  xmlns: "http://www.w3.org/2000/svg",
-                  fill: "currentColor",
-                  viewbox: "0 0 20 20"
-                ) do |s|
-                  s.path(
-                    d:
-                      "m19.707 9.293-2-2-7-7a1 1 0 0 0-1.414 0l-7 7-2 2a1 1 0 0 0 1.414 1.414L2 10.414V18a2 2 0 0 0 2 2h3a1 1 0 0 0 1-1v-4a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v4a1 1 0 0 0 1 1h3a2 2 0 0 0 2-2v-7.586l.293.293a1 1 0 0 0 1.414-1.414Z"
-                  )
-                end
-                plain " Dashboard "
-              end
-            end
+            render_dashboard_link
+            render_parent_breadcrumbs if current_parent.present?
+            render_resource_breadcrumbs if resource_record?
+            render_trailing_separator
+          end
+        end
+      end
 
-            # Parent
-            if current_parent.present?
-              # Parent Resource
-              li(class: "flex items-center") do
-                svg(
-                  class: "rtl:rotate-180 block w-3 h-3 mx-1 text-[var(--pu-text-subtle)]",
-                  aria_hidden: "true",
-                  xmlns: "http://www.w3.org/2000/svg",
-                  fill: "none",
-                  viewbox: "0 0 6 10"
-                ) do |s|
-                  s.path(
-                    stroke: "currentColor",
-                    stroke_linecap: "round",
-                    stroke_linejoin: "round",
-                    stroke_width: "2",
-                    d: "m1 9 4-4-4-4"
-                  )
-                end
-                link_to resource_name_plural(current_parent.class),
-                  resource_url_for(current_parent.class, parent: nil),
-                  class: "ms-1 text-sm font-medium text-[var(--pu-text-muted)] hover:text-primary-600 md:ms-2 transition-colors"
-              end
+      private
 
-              # Parent Itself
-              li(class: "flex items-center") do
-                svg(
-                  class: "rtl:rotate-180 block w-3 h-3 mx-1 text-[var(--pu-text-subtle)]",
-                  aria_hidden: "true",
-                  xmlns: "http://www.w3.org/2000/svg",
-                  fill: "none",
-                  viewbox: "0 0 6 10"
-                ) do |s|
-                  s.path(
-                    stroke: "currentColor",
-                    stroke_linecap: "round",
-                    stroke_linejoin: "round",
-                    stroke_width: "2",
-                    d: "m1 9 4-4-4-4"
-                  )
-                end
-                link_to display_name_of(current_parent),
-                  resource_url_for(current_parent, parent: nil),
-                  class: "ms-1 text-sm font-medium text-[var(--pu-text-muted)] hover:text-primary-600 md:ms-2 transition-colors"
-              end
+      def render_dashboard_link
+        li(class: "inline-flex items-center") do
+          a(
+            href: root_path,
+            class: "inline-flex items-center text-sm font-medium text-[var(--pu-text-muted)] hover:text-primary-600 transition-colors"
+          ) do
+            svg(
+              class: "w-3 h-3 me-2.5",
+              aria_hidden: "true",
+              xmlns: "http://www.w3.org/2000/svg",
+              fill: "currentColor",
+              viewbox: "0 0 20 20"
+            ) do |s|
+              s.path(
+                d:
+                  "m19.707 9.293-2-2-7-7a1 1 0 0 0-1.414 0l-7 7-2 2a1 1 0 0 0 1.414 1.414L2 10.414V18a2 2 0 0 0 2 2h3a1 1 0 0 0 1-1v-4a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v4a1 1 0 0 0 1 1h3a2 2 0 0 0 2-2v-7.586l.293.293a1 1 0 0 0 1.414-1.414Z"
+              )
             end
+            plain " Dashboard "
+          end
+        end
+      end
 
-            # Record
-            if resource_record?
-              unless current_engine.routes.resource_route_config_lookup[resource_class.model_name.plural][:route_type] == :resource
-                # Record Resource
-                li(class: "flex items-center") do
-                  svg(
-                    class: "rtl:rotate-180 block w-3 h-3 mx-1 text-[var(--pu-text-subtle)]",
-                    aria_hidden: "true",
-                    xmlns: "http://www.w3.org/2000/svg",
-                    fill: "none",
-                    viewbox: "0 0 6 10"
-                  ) do |s|
-                    s.path(
-                      stroke: "currentColor",
-                      stroke_linecap: "round",
-                      stroke_linejoin: "round",
-                      stroke_width: "2",
-                      d: "m1 9 4-4-4-4"
-                    )
-                  end
-                  link_to nestable_resource_name_plural(resource_class),
-                    resource_url_for(resource_class),
-                    class: "ms-1 text-sm font-medium text-[var(--pu-text-muted)] hover:text-primary-600 md:ms-2 transition-colors"
-                end
-              end
+      def render_parent_breadcrumbs
+        # Parent Resource
+        render_breadcrumb_item do
+          link_to resource_name_plural(current_parent.class),
+            resource_url_for(current_parent.class, parent: nil),
+            class: "ms-1 text-sm font-medium text-[var(--pu-text-muted)] hover:text-primary-600 md:ms-2 transition-colors"
+        end
 
-              # Record Itself
-              if resource_record!.persisted? && action_name != "show"
-                li(class: "flex items-center") do
-                  svg(
-                    class: "rtl:rotate-180 block w-3 h-3 mx-1 text-[var(--pu-text-subtle)]",
-                    aria_hidden: "true",
-                    xmlns: "http://www.w3.org/2000/svg",
-                    fill: "none",
-                    viewbox: "0 0 6 10"
-                  ) do |s|
-                    s.path(
-                      stroke: "currentColor",
-                      stroke_linecap: "round",
-                      stroke_linejoin: "round",
-                      stroke_width: "2",
-                      d: "m1 9 4-4-4-4"
-                    )
-                  end
-                  link_to display_name_of(resource_record!),
-                    resource_url_for(resource_record!),
-                    class: "ms-1 text-sm font-medium text-[var(--pu-text-muted)] hover:text-primary-600 md:ms-2 transition-colors"
-                end
-              end
-            end
+        # Parent Itself
+        render_breadcrumb_item do
+          link_to display_name_of(current_parent),
+            resource_url_for(current_parent, parent: nil),
+            class: "ms-1 text-sm font-medium text-[var(--pu-text-muted)] hover:text-primary-600 md:ms-2 transition-colors"
+        end
+      end
+
+      def render_resource_breadcrumbs
+        is_singular_route = current_engine.routes.resource_route_config_lookup[resource_class.model_name.plural][:route_type] == :resource
+
+        if is_singular_route
+          render_singular_resource_breadcrumb
+        else
+          render_plural_resource_breadcrumbs
+        end
+      end
 
-            # Trailing Caret
-            li(class: "flex items-center") do
-              svg(
-                class: "rtl:rotate-180 block w-3 h-3 mx-1 text-[var(--pu-text-subtle)]",
-                aria_hidden: "true",
-                xmlns: "http://www.w3.org/2000/svg",
-                fill: "none",
-                viewbox: "0 0 6 10"
-              ) do |s|
-                s.path(
-                  stroke: "currentColor",
-                  stroke_linecap: "round",
-                  stroke_linejoin: "round",
-                  stroke_width: "2",
-                  d: "m1 9 4-4-4-4"
-                )
-              end
+      def render_singular_resource_breadcrumb
+        render_breadcrumb_item do
+          if resource_record!.persisted? && action_name != "show"
+            link_to resource_name(resource_class),
+              resource_url_for(resource_record!),
+              class: "ms-1 text-sm font-medium text-[var(--pu-text-muted)] hover:text-primary-600 md:ms-2 transition-colors"
+          else
+            span(class: "ms-1 text-sm font-medium text-[var(--pu-text-muted)] md:ms-2") do
+              plain resource_name(resource_class)
             end
           end
         end
       end
+
+      def render_plural_resource_breadcrumbs
+        # Resource index link
+        render_breadcrumb_item do
+          link_to nestable_resource_name_plural(resource_class),
+            resource_url_for(resource_class),
+            class: "ms-1 text-sm font-medium text-[var(--pu-text-muted)] hover:text-primary-600 md:ms-2 transition-colors"
+        end
+
+        # Record itself (for non-singular routes only)
+        return unless resource_record!.persisted? && action_name != "show"
+
+        render_breadcrumb_item do
+          link_to display_name_of(resource_record!),
+            resource_url_for(resource_record!),
+            class: "ms-1 text-sm font-medium text-[var(--pu-text-muted)] hover:text-primary-600 md:ms-2 transition-colors"
+        end
+      end
+
+      def render_trailing_separator
+        li(class: "flex items-center") do
+          render_chevron_separator
+        end
+      end
+
+      def render_breadcrumb_item(&)
+        li(class: "flex items-center") do
+          render_chevron_separator
+          yield
+        end
+      end
+
+      def render_chevron_separator
+        svg(
+          class: "rtl:rotate-180 block w-3 h-3 mx-1 text-[var(--pu-text-subtle)]",
+          aria_hidden: "true",
+          xmlns: "http://www.w3.org/2000/svg",
+          fill: "none",
+          viewbox: "0 0 6 10"
+        ) do |s|
+          s.path(
+            stroke: "currentColor",
+            stroke_linecap: "round",
+            stroke_linejoin: "round",
+            stroke_width: "2",
+            d: "m1 9 4-4-4-4"
+          )
+        end
+      end
     end
   end
 end

data/lib/plutonium/ui/dyna_frame/content.rb

@@ -4,16 +4,26 @@ module Plutonium
       class Content < Plutonium::UI::Component::Base
         include Phlex::Rails::Helpers::TurboFrameTag
 
+        def initialize(content = nil)
+          @content = content
+        end
+
         def view_template
           if current_turbo_frame.present?
+            # Frame request: render only the turbo-frame with content
             turbo_frame_tag(current_turbo_frame) do
               render partial("flash")
-              yield
+              @content&.call
             end
           else
-            yield
+            # Regular request: yield self so caller can call frame.render_content
+            yield(self)
           end
         end
+
+        def render_content
+          @content&.call
+        end
       end
     end
   end

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

@@ -6,14 +6,15 @@ module Plutonium
       class Resource < Base
         include Plutonium::UI::Form::Concerns::RendersNestedResourceFields
 
-        attr_reader :resource_fields, :resource_definition
+        attr_reader :resource_fields, :resource_definition, :singular_resource
 
         alias_method :record, :object
 
-        def initialize(*, resource_fields:, resource_definition:, **, &)
+        def initialize(*, resource_fields:, resource_definition:, singular_resource: false, **, &)
           super(*, **, &)
           @resource_fields = resource_fields
           @resource_definition = resource_definition
+          @singular_resource = singular_resource
         end
 
         def form_template
@@ -35,28 +36,34 @@ module Plutonium
           input name: "return_to", value: request.params[:return_to], type: :hidden, hidden: true
 
           actions_wrapper {
-            if object.respond_to?(:new_record?)
-              if object.new_record?
-                button(
-                  type: :submit,
-                  name: "return_to",
-                  value: request.url,
-                  class: "px-4 py-2 bg-secondary-600 text-white rounded-md hover:bg-secondary-700 focus:outline-none focus:ring-2 focus:ring-secondary-500"
-                ) { "Create and add another" }
-              else
-                button(
-                  type: :submit,
-                  name: "return_to",
-                  value: request.url,
-                  class: "px-4 py-2 bg-secondary-600 text-white rounded-md hover:bg-secondary-700 focus:outline-none focus:ring-2 focus:ring-secondary-500"
-                ) { "Update and continue editing" }
-              end
-            end
+            render_submit_and_continue_button if show_submit_and_continue?
 
             render submit_button
           }
         end
 
+        def show_submit_and_continue?
+          return false unless object.respond_to?(:new_record?)
+
+          # Check explicit configuration first
+          configured = resource_definition.submit_and_continue
+          return configured unless configured.nil?
+
+          # Auto-detect: hide for singular resources
+          !singular_resource
+        end
+
+        def render_submit_and_continue_button
+          label = object.new_record? ? "Create and add another" : "Update and continue editing"
+
+          button(
+            type: :submit,
+            name: "return_to",
+            value: request.url,
+            class: "px-4 py-2 bg-secondary-600 text-white rounded-md hover:bg-secondary-700 focus:outline-none focus:ring-2 focus:ring-secondary-500"
+          ) { label }
+        end
+
         def form_action
           return @form_action unless object.present? && @form_action != false && view_context.present?
 

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

@@ -10,18 +10,20 @@ module Plutonium
           @page_actions = page_actions
         end
 
-        def view_template(&)
-          render_before_header
-          render_header
-          render_after_header
+        def view_template(&block)
+          DynaFrameContent(page_content(block)) do |frame|
+            render_before_header
+            render_header
+            render_after_header
 
-          render_before_content
-          render_content(&)
-          render_after_content
+            render_before_content
+            frame.render_content
+            render_after_content
 
-          render_before_footer
-          render_footer
-          render_after_footer
+            render_before_footer
+            render_footer
+            render_after_footer
+          end
         end
 
         private
@@ -64,10 +66,8 @@ module Plutonium
           # Implement toolbar content
         end
 
-        def render_content(&block)
-          block ||= proc { render_default_content }
-
-          DynaFrameContent(&block)
+        def page_content(block)
+          block || proc { render_default_content }
         end
 
         def render_default_content

data/lib/plutonium/ui/table/components/scopes_bar.rb

@@ -9,9 +9,7 @@ module Plutonium
 
           def view_template
             div(
-              class:
-                # "flex flex-wrap justify-between items-center gap-4 p-4 bg-white border border-gray-200 rounded-lg dark:bg-gray-800 dark:border-gray-700 mb-4"
-                "flex flex-wrap justify-between items-center gap-4 mb-4"
+              class: "flex flex-wrap justify-between items-center gap-4 mb-4"
             ) do
               div(class: "flex flex-wrap items-center gap-2") do
                 render_all_scope_button
@@ -19,76 +17,6 @@ module Plutonium
                   render_scope_button(name)
                 end
               end
-
-              # div(class: "flex flex-wrap items-center gap-2") do
-              #   button(
-              #     class:
-              #       "inline-flex items-center px-3 py-2 text-sm font-medium text-white bg-red-700 rounded-lg hover:bg-red-800 focus:ring-4 focus:outline-none focus:ring-red-300 dark:bg-red-600 dark:hover:bg-red-700 dark:focus:ring-red-800"
-              #   ) do
-              #     svg(
-              #       class: "w-4 h-4 mr-2",
-              #       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:
-              #           "M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"
-              #       )
-              #     end
-              #     plain " Delete Selected "
-              #   end
-              #   button(
-              #     class:
-              #       "inline-flex items-center px-3 py-2 text-sm font-medium text-white bg-yellow-700 rounded-lg hover:bg-yellow-800 focus:ring-4 focus:outline-none focus:ring-yellow-300 dark:bg-yellow-600 dark:hover:bg-yellow-700 dark:focus:ring-yellow-800"
-              #   ) do
-              #     svg(
-              #       class: "w-4 h-4 mr-2",
-              #       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:
-              #           "M5 8h14M5 8a2 2 0 110-4h14a2 2 0 110 4M5 8v10a2 2 0 002 2h10a2 2 0 002-2V8m-9 4h4"
-              #       )
-              #     end
-              #     plain " Archive Selected "
-              #   end
-              #   button(
-              #     id: "dropdownActionButton",
-              #     data_dropdown_toggle: "dropdownAction",
-              #     class:
-              #       "inline-flex items-center text-gray-500 bg-white border border-gray-300 focus:outline-none hover:bg-gray-100 focus:ring-4 focus:ring-gray-200 font-medium rounded-lg text-sm px-3 py-2 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:bg-gray-700 dark:hover:border-gray-600 dark:focus:ring-gray-700",
-              #     type: "button"
-              #   ) do
-              #     span(class: "sr-only") { "Action button" }
-              #     plain " More Actions "
-              #     svg(
-              #       class: "w-2.5 h-2.5 ml-2.5",
-              #       aria_hidden: "true",
-              #       xmlns: "http://www.w3.org/2000/svg",
-              #       fill: "none",
-              #       viewbox: "0 0 10 6"
-              #     ) do |s|
-              #       s.path(
-              #         stroke: "currentColor",
-              #         stroke_linecap: "round",
-              #         stroke_linejoin: "round",
-              #         stroke_width: "2",
-              #         d: "m1 1 4 4 4-4"
-              #       )
-              #     end
-              #   end
-              # end
             end
           end
 
@@ -114,7 +42,7 @@ module Plutonium
 
           def current_scope
             # Use the effective scope (includes default when no selection)
-            current_query_object.selected_scope
+            current_query_object.selected_scope&.to_s
           end
 
           def all_scope_active?

data/lib/plutonium/ui/table/components/selection_column.rb

@@ -12,7 +12,7 @@ module Plutonium
 
           def data_cell(wrapped_object)
             allowed_actions = compute_allowed_actions(wrapped_object.unwrapped)
-            SelectionDataCell.new(wrapped_object.field(key).dom.value, allowed_actions)
+            SelectionDataCell.new(wrapped_object.field(value_key).dom.value, allowed_actions)
           end
 
           # Add hidden class and Stimulus target to header cell
@@ -34,6 +34,10 @@ module Plutonium
 
           private
 
+          def value_key
+            options[:value_key] || sample.class.primary_key.to_sym
+          end
+
           def bulk_actions
             options[:bulk_actions] || []
           end
@@ -43,7 +47,7 @@ module Plutonium
           end
 
           def compute_allowed_actions(record)
-            return bulk_action_names unless policy_resolver
+            return bulk_actions.map { |a| a.name.to_s } unless policy_resolver
 
             policy = policy_resolver.call(record)
             bulk_actions.select { |action|

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

@@ -49,8 +49,9 @@ module Plutonium
 
             render Plutonium::UI::Table::Base.new(collection) do |table|
               # Selection column for bulk actions (hidden by default, Stimulus shows it)
-              # Pass bulk actions and policy resolver for per-record authorization
-              table.selection_column :id,
+              # Use :_selection as column key to avoid conflicts with field columns
+              # value_key defaults to model's primary_key
+              table.selection_column :_selection,
                 bulk_actions:,
                 policy_resolver: ->(record) { policy_for(record:) }
 

data/lib/plutonium/version.rb

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