RubyGems - plutonium - Versions diffs - 0.49.0 → 0.50.0 - Mend

plutonium 0.49.0 → 0.50.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (138) hide show

checksums.yaml +4 -4
data/.claude/skills/plutonium-definition/SKILL.md +87 -2
data/.claude/skills/plutonium-installation/SKILL.md +6 -0
data/.claude/skills/plutonium-invites/SKILL.md +41 -0
data/.claude/skills/plutonium-views/SKILL.md +59 -0
data/CHANGELOG.md +27 -0
data/app/assets/plutonium.css +2 -2
data/app/assets/plutonium.js +404 -25
data/app/assets/plutonium.js.map +4 -4
data/app/assets/plutonium.min.js +45 -45
data/app/assets/plutonium.min.js.map +4 -4
data/app/views/plutonium/_flash.html.erb +1 -1
data/app/views/plutonium/_resource_header.html.erb +4 -4
data/app/views/plutonium/_resource_sidebar.html.erb +9 -9
data/app/views/resource/_resource_grid.html.erb +1 -0
data/config/brakeman.ignore +25 -2
data/docs/guides/user-invites.md +64 -0
data/docs/reference/definition/actions.md +14 -1
data/docs/reference/definition/index.md +58 -0
data/docs/reference/views/index.md +43 -0
data/docs/superpowers/plans/2026-05-06-multi-invite-model-support.md +1487 -0
data/docs/superpowers/plans/2026-05-06-multi-invite-model-support.md.tasks.json +15 -0
data/docs/superpowers/plans/2026-05-07-ui-layout-overhaul.md +841 -0
data/docs/superpowers/plans/2026-05-07-ui-layout-overhaul.md.tasks.json +103 -0
data/docs/superpowers/specs/2026-05-07-ui-layout-overhaul-design.md +270 -0
data/gemfiles/rails_7.gemfile.lock +1 -1
data/gemfiles/rails_8.0.gemfile.lock +1 -1
data/gemfiles/rails_8.1.gemfile.lock +1 -1
data/lib/generators/pu/core/install/templates/config/initializers/plutonium.rb +1 -0
data/lib/generators/pu/core/update/update_generator.rb +20 -0
data/lib/generators/pu/invites/install_generator.rb +136 -35
data/lib/generators/pu/invites/templates/app/interactions/invite_user_interaction.rb.tt +8 -2
data/lib/generators/pu/invites/templates/app/interactions/user_invite_user_interaction.rb.tt +7 -1
data/lib/generators/pu/invites/templates/db/migrate/create_user_invites.rb.tt +4 -4
data/lib/generators/pu/invites/templates/packages/invites/app/controllers/invites/user_invitations_controller.rb.tt +9 -4
data/lib/generators/pu/invites/templates/packages/invites/app/controllers/invites/welcome_controller.rb.tt +2 -2
data/lib/generators/pu/invites/templates/packages/invites/app/definitions/invites/user_invite_definition.rb.tt +1 -1
data/lib/generators/pu/invites/templates/packages/invites/app/mailers/invites/user_invite_mailer.rb.tt +8 -8
data/lib/generators/pu/invites/templates/packages/invites/app/models/invites/user_invite.rb.tt +13 -4
data/lib/generators/pu/invites/templates/packages/invites/app/policies/invites/user_invite_policy.rb.tt +3 -3
data/lib/generators/pu/invites/templates/packages/invites/app/views/invites/user_invitations/landing.html.erb.tt +1 -1
data/lib/generators/pu/invites/templates/packages/invites/app/views/invites/user_invitations/show.html.erb.tt +1 -1
data/lib/generators/pu/invites/templates/packages/invites/app/views/invites/user_invitations/signup.html.erb.tt +2 -2
data/lib/generators/pu/invites/templates/packages/invites/app/views/invites/user_invite_mailer/invitation.html.erb.tt +4 -4
data/lib/generators/pu/invites/templates/packages/invites/app/views/invites/user_invite_mailer/invitation.text.erb.tt +4 -4
data/lib/generators/pu/invites/templates/packages/invites/app/views/layouts/invites/invitation.html.erb.tt +5 -1
data/lib/generators/pu/lite/rails_pulse/rails_pulse_generator.rb +54 -5
data/lib/generators/pu/saas/welcome/templates/app/views/layouts/welcome.html.erb.tt +5 -1
data/lib/plutonium/action/base.rb +44 -1
data/lib/plutonium/action/interactive.rb +1 -1
data/lib/plutonium/configuration.rb +4 -0
data/lib/plutonium/definition/actions.rb +3 -0
data/lib/plutonium/definition/base.rb +8 -0
data/lib/plutonium/definition/metadata.rb +40 -0
data/lib/plutonium/definition/views.rb +94 -0
data/lib/plutonium/helpers/turbo_helper.rb +1 -1
data/lib/plutonium/interaction/response/redirect.rb +1 -1
data/lib/plutonium/invites/concerns/invite_token.rb +11 -3
data/lib/plutonium/invites/concerns/invite_user.rb +13 -4
data/lib/plutonium/invites/controller.rb +14 -1
data/lib/plutonium/invites/pending_invite_check.rb +37 -28
data/lib/plutonium/query/base.rb +8 -0
data/lib/plutonium/query/filters/association.rb +30 -8
data/lib/plutonium/query/filters/boolean.rb +5 -0
data/lib/plutonium/resource/controllers/interactive_actions.rb +13 -9
data/lib/plutonium/resource/controllers/presentable.rb +11 -2
data/lib/plutonium/resource/definition.rb +42 -0
data/lib/plutonium/resource/policy.rb +23 -8
data/lib/plutonium/resource/query_object.rb +64 -6
data/lib/plutonium/testing/resource_definition.rb +2 -2
data/lib/plutonium/ui/action_button.rb +4 -2
data/lib/plutonium/ui/component/kit.rb +12 -0
data/lib/plutonium/ui/display/base.rb +3 -1
data/lib/plutonium/ui/display/resource.rb +109 -25
data/lib/plutonium/ui/display/theme.rb +2 -1
data/lib/plutonium/ui/dyna_frame/content.rb +8 -14
data/lib/plutonium/ui/empty_card.rb +1 -1
data/lib/plutonium/ui/form/base.rb +29 -1
data/lib/plutonium/ui/form/components/hidden_wrapper.rb +25 -0
data/lib/plutonium/ui/form/components/resource_select.rb +79 -1
data/lib/plutonium/ui/form/components/secure_association.rb +7 -2
data/lib/plutonium/ui/form/components/sticky_footer.rb +17 -0
data/lib/plutonium/ui/form/resource.rb +48 -9
data/lib/plutonium/ui/form/theme.rb +1 -1
data/lib/plutonium/ui/frame_navigator_panel.rb +7 -4
data/lib/plutonium/ui/grid/card.rb +235 -0
data/lib/plutonium/ui/grid/resource.rb +149 -0
data/lib/plutonium/ui/layout/base.rb +37 -1
data/lib/plutonium/ui/layout/header.rb +1 -2
data/lib/plutonium/ui/layout/icon_rail.rb +212 -0
data/lib/plutonium/ui/layout/resource_layout.rb +10 -3
data/lib/plutonium/ui/layout/sidebar.rb +12 -24
data/lib/plutonium/ui/layout/topbar.rb +100 -0
data/lib/plutonium/ui/modal/base.rb +109 -0
data/lib/plutonium/ui/modal/centered.rb +21 -0
data/lib/plutonium/ui/modal/slideover.rb +26 -0
data/lib/plutonium/ui/page/base.rb +25 -6
data/lib/plutonium/ui/page/edit.rb +13 -1
data/lib/plutonium/ui/page/index.rb +40 -1
data/lib/plutonium/ui/page/interactive_action.rb +8 -39
data/lib/plutonium/ui/page/new.rb +13 -1
data/lib/plutonium/ui/page/show.rb +8 -1
data/lib/plutonium/ui/page_header.rb +8 -13
data/lib/plutonium/ui/panel.rb +10 -19
data/lib/plutonium/ui/sidebar_menu.rb +2 -25
data/lib/plutonium/ui/tab_list.rb +29 -7
data/lib/plutonium/ui/table/base.rb +106 -0
data/lib/plutonium/ui/table/components/bulk_actions_toolbar.rb +12 -4
data/lib/plutonium/ui/table/components/filter_form.rb +171 -0
data/lib/plutonium/ui/table/components/filter_pills.rb +89 -0
data/lib/plutonium/ui/table/components/row_actions_dropdown.rb +13 -12
data/lib/plutonium/ui/table/components/scopes_pills.rb +67 -0
data/lib/plutonium/ui/table/components/selection_column.rb +2 -11
data/lib/plutonium/ui/table/components/toolbar.rb +104 -0
data/lib/plutonium/ui/table/components/view_switcher.rb +81 -0
data/lib/plutonium/ui/table/resource.rb +158 -89
data/lib/plutonium/ui/table/theme.rb +14 -5
data/lib/plutonium/version.rb +1 -1
data/lib/plutonium.rb +6 -0
data/package.json +1 -1
data/src/css/components.css +304 -131
data/src/css/tokens.css +101 -85
data/src/js/controllers/autosubmit_controller.js +24 -0
data/src/js/controllers/bulk_actions_controller.js +15 -16
data/src/js/controllers/capture_url_controller.js +14 -0
data/src/js/controllers/filter_panel_controller.js +77 -19
data/src/js/controllers/flatpickr_controller.js +23 -0
data/src/js/controllers/frame_navigator_controller.js +34 -6
data/src/js/controllers/icon_rail_controller.js +22 -0
data/src/js/controllers/icon_rail_flyout_controller.js +128 -0
data/src/js/controllers/register_controllers.js +16 -0
data/src/js/controllers/resource_tab_list_controller.js +56 -3
data/src/js/controllers/row_click_controller.js +21 -0
data/src/js/controllers/sidebar_controller.js +28 -1
data/src/js/controllers/table_column_menu_controller.js +43 -0
data/src/js/controllers/table_header_controller.js +16 -0
data/src/js/controllers/view_switcher_controller.js +29 -0
metadata +33 -3

data/lib/generators/pu/lite/rails_pulse/rails_pulse_generator.rb CHANGED Viewed

@@ -70,21 +70,70 @@ module Pu
       def setup_recurring_tasks
         recurring_file = "config/recurring.yml"
-        return unless File.exist?(File.expand_path(recurring_file, destination_root))
+        full_path = File.expand_path(recurring_file, destination_root)
+        return unless File.exist?(full_path)
         return if file_includes?(recurring_file, "rails_pulse")
-        recurring_tasks = <<~YAML
+        content = File.read(full_path)
+        env_keys = %w[production development staging test]
+        env_scoped = content.lines.any? { |l| l.match?(/^(#{env_keys.join("|")}):\s*$/) }
+        if env_scoped
+          create_file recurring_file, inject_rails_pulse_under_envs(content, env_keys), force: true
+        else
+          append_to_file recurring_file, "\n" + rails_pulse_tasks_yaml(0)
+        end
+      end
+      def rails_pulse_tasks_yaml(indent)
+        pad = " " * indent
+        <<~YAML.gsub(/^(?=.)/, pad)
           rails_pulse_summary:
             class: RailsPulse::SummaryJob
-            schedule: "5 * * * *" # 5 minutes past every hour
+            queue: default
+            schedule: every hour at minute 5
+            description: "Roll up Rails Pulse raw records into summary tables"
           rails_pulse_cleanup:
             class: RailsPulse::CleanupJob
-            schedule: "0 1 * * *" # Daily at 1am
+            queue: default
+            schedule: every day at 1am
+            description: "Archive/purge old Rails Pulse data"
         YAML
+      end
+      def inject_rails_pulse_under_envs(content, env_keys)
+        lines = content.lines
+        env_re = /^(#{env_keys.join("|")}):\s*$/
+        env_starts = lines.each_with_index.select { |l, _| env_re.match?(l) }.map(&:last)
+        env_starts.reverse_each do |start|
+          end_idx = lines.length
+          ((start + 1)...lines.length).each do |i|
+            if lines[i].match?(/^[^\s#]/)
+              end_idx = i
+              break
+            end
+          end
+          indent = 2
+          ((start + 1)...end_idx).each do |i|
+            if (m = lines[i].match(/^(\s+)\S/))
+              indent = m[1].length
+              break
+            end
+          end
+          insert_at = end_idx
+          while insert_at > start + 1 && lines[insert_at - 1].strip.empty?
+            insert_at -= 1
+          end
+          lines.insert(insert_at, "\n", rails_pulse_tasks_yaml(indent))
+        end
-        append_to_file recurring_file, recurring_tasks
+        lines.join
       end
     end
   end

data/lib/generators/pu/saas/welcome/templates/app/views/layouts/welcome.html.erb.tt CHANGED Viewed

@@ -7,7 +7,11 @@
   <meta name="csrf-param" content="authenticity_token" />
   <meta name="csrf-token" content="<%%= form_authenticity_token %>" />
   <%%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
-  <%%= javascript_importmap_tags %>
+  <%% if defined?(Importmap) %>
+    <%%= javascript_importmap_tags %>
+  <%% else %>
+    <%%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %>
+  <%% end %>
 </head>
 <body class="antialiased min-h-screen bg-[var(--pu-body)]">
   <main class="p-4 min-h-screen flex flex-col items-center justify-center gap-2 px-6 py-8 mx-auto lg:py-0">

data/lib/plutonium/action/base.rb CHANGED Viewed

@@ -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, :return_to
+      attr_reader :name, :label, :description, :icon, :route_options, :confirmation, :turbo, :turbo_frame, :color, :category, :position, :return_to, :modal
       # Initialize a new action.
       #
@@ -57,6 +57,8 @@ module Plutonium
         @resource_action = options[:resource_action] || false
         @category = ActiveSupport::StringInquirer.new((options[:category] || :secondary).to_s)
         @position = options[:position] || 50
+        @modal = options[:modal] || :centered
+        validate_modal!
         freeze
       end
@@ -85,8 +87,49 @@ module Plutonium
         policy.allowed_to?(:"#{name}?")
       end
+      # Returns a new Action with the given options merged over this one.
+      # Used by the resource definition to derive variants (e.g. dropping
+      # `turbo_frame` when `modal false` is configured) without mutating
+      # the frozen original.
+      def with(**overrides)
+        self.class.new(name, **to_options.merge(overrides))
+      end
+      protected
+      # Canonical representation for reconstruction via `with`. Every
+      # attribute set in `initialize` MUST appear here; otherwise
+      # `with(**overrides)` would silently drop it on round-trip.
+      # `category` is exposed as a Symbol since `initialize` re-wraps
+      # it in StringInquirer.
+      def to_options
+        {
+          label: @label,
+          description: @description,
+          icon: @icon,
+          color: @color,
+          confirmation: @confirmation,
+          route_options: @route_options,
+          turbo: @turbo,
+          turbo_frame: @turbo_frame,
+          return_to: @return_to,
+          bulk_action: @bulk_action,
+          collection_record_action: @collection_record_action,
+          record_action: @record_action,
+          resource_action: @resource_action,
+          category: @category.to_sym,
+          position: @position,
+          modal: @modal
+        }
+      end
       private
+      def validate_modal!
+        return if [:centered, :slideover].include?(@modal)
+        raise ArgumentError, "modal must be :centered or :slideover, got #{@modal.inspect}"
+      end
       # Build RouteOptions from the provided options
       #
       # @param [RouteOptions, Hash, nil] options The routing options

data/lib/plutonium/action/interactive.rb CHANGED Viewed

@@ -22,7 +22,7 @@ module Plutonium
         options[:label] ||= interaction.label
         options[:description] ||= interaction.description
         options[:icon] ||= interaction.icon
-        options[:turbo_frame] = "remote_modal" unless options.key?(:turbo_frame)
+        options[:turbo_frame] = Plutonium::REMOTE_MODAL_FRAME unless options.key?(:turbo_frame)
         super(name, **options)
       end

data/lib/plutonium/configuration.rb CHANGED Viewed

@@ -27,6 +27,9 @@ module Plutonium
     # @return [Float] the current defaults version
     attr_reader :defaults_version
+    # @return [Symbol] :classic (legacy Header/Sidebar) or :modern (Topbar/IconRail)
+    attr_accessor :shell
     # Map of version numbers to their default configurations
     VERSION_DEFAULTS = {
       1.0 => proc do |config|
@@ -48,6 +51,7 @@ module Plutonium
       @development = parse_boolean_env("PLUTONIUM_DEV")
       @cache_discovery = !Rails.env.development?
       @enable_hotreload = Rails.env.development?
+      @shell = :modern
     end
     # Load default configuration for a specific version

data/lib/plutonium/definition/actions.rb CHANGED Viewed

@@ -32,6 +32,9 @@ module Plutonium
         # standard CRUD actions
+        # turbo_frame for :new and :edit is set by
+        # Resource::Definition.configure_crud_modal_targets! based on the
+        # `modal` config. Don't hard-code it here.
         action(:new, route_options: {action: :new},
           resource_action: true, category: :primary,
           icon: Phlex::TablerIcons::Plus, position: 10)

data/lib/plutonium/definition/base.rb CHANGED Viewed

@@ -33,6 +33,8 @@ module Plutonium
       include Scoping
       include Search
       include NestedInputs
+      include Views
+      include Metadata
       class IndexPage < Plutonium::UI::Page::Index; end
@@ -48,6 +50,8 @@ module Plutonium
       class Table < Plutonium::UI::Table::Resource; end
+      class Grid < Plutonium::UI::Grid::Resource; end
       class Display < Plutonium::UI::Display::Resource; end
       class QueryForm < Plutonium::UI::Form::Query; end
@@ -114,6 +118,10 @@ module Plutonium
         self.class::Table
       end
+      def grid_class
+        self.class::Grid
+      end
       def detail_class
         self.class::Display
       end

data/lib/plutonium/definition/metadata.rb ADDED Viewed

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+module Plutonium
+  module Definition
+    # Adds the `metadata` DSL — a list of field names rendered in the
+    # show page's right-side panel as label/value rows. Opt-in: when no
+    # `metadata` call is made, the show page stays full-width with no
+    # aside.
+    #
+    # @example
+    #   class PostDefinition < Plutonium::Definition::Base
+    #     metadata :created_at, :updated_at, :author, :state
+    #   end
+    module Metadata
+      extend ActiveSupport::Concern
+      included do
+        class_attribute :defined_metadata_fields, default: [], instance_accessor: false
+      end
+      class_methods do
+        # Declares the fields rendered in the show page metadata panel.
+        # Each name is looked up in `defined_fields` for display config
+        # (label/format), so a field can have custom formatting in the
+        # main show body and the panel without redeclaring.
+        #
+        # @param names [Array<Symbol>]
+        def metadata(*names)
+          self.defined_metadata_fields = names.flatten.map(&:to_sym)
+        end
+      end
+      # class_attribute is declared with instance_accessor: false; expose
+      # an instance reader that delegates so callers with a definition
+      # instance (e.g. `current_definition`) can ask without poking the
+      # class directly. Mirrors Definition::Views.
+      def defined_metadata_fields = self.class.defined_metadata_fields
+    end
+  end
+end

data/lib/plutonium/definition/views.rb ADDED Viewed

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+module Plutonium
+  module Definition
+    # DSL for declaring which index views a resource supports and how
+    # they're configured.
+    #
+    # @example Enable both views, default to Grid
+    #   class UserDefinition < Plutonium::Resource::Definition
+    #     views :table, :grid
+    #     default_view :grid
+    #
+    #     grid_fields(
+    #       image:     :avatar,
+    #       header:    :name,
+    #       subheader: :email,
+    #       meta:      [:role, :status]
+    #     )
+    #   end
+    module Views
+      extend ActiveSupport::Concern
+      KNOWN_VIEWS = %i[table grid].freeze
+      GRID_SLOTS = %i[image header subheader body meta footer].freeze
+      GRID_LAYOUTS = %i[compact media].freeze
+      included do
+        class_attribute :defined_views, default: [:table], instance_accessor: false
+        class_attribute :defined_default_view, default: nil, instance_accessor: false
+        class_attribute :defined_grid_fields, default: {}, instance_accessor: false
+        class_attribute :defined_grid_layout, default: :compact, instance_accessor: false
+        class_attribute :defined_grid_columns, default: nil, instance_accessor: false
+      end
+      class_methods do
+        # Declares the index views this resource supports.
+        # @param list [Array<Symbol>] one or more of {KNOWN_VIEWS}
+        def views(*list)
+          list = list.flatten.map(&:to_sym)
+          invalid = list - KNOWN_VIEWS
+          raise ArgumentError, "Unknown views: #{invalid.inspect}. Valid: #{KNOWN_VIEWS}" if invalid.any?
+          self.defined_views = list.empty? ? [:table] : list
+        end
+        # Declares the default index view. Must be one of {.views}.
+        # Falls back to the first declared view if unset.
+        def default_view(name = nil)
+          if name.nil?
+            defined_default_view || defined_views.first
+          else
+            name = name.to_sym
+            unless defined_views.include?(name)
+              raise ArgumentError, "default_view #{name.inspect} not in views #{defined_views.inspect}"
+            end
+            self.defined_default_view = name
+          end
+        end
+        # Maps grid slots to fields. Each slot is optional. Implicitly
+        # adds `:grid` to {.views} so a resource can opt into the Grid
+        # view simply by declaring its slots.
+        # @param slots [Hash{Symbol => Symbol, Array<Symbol>}]
+        def grid_fields(**slots)
+          invalid = slots.keys - GRID_SLOTS
+          raise ArgumentError, "Unknown grid slots: #{invalid.inspect}. Valid: #{GRID_SLOTS}" if invalid.any?
+          self.defined_grid_fields = slots
+          self.defined_views = defined_views + [:grid] unless defined_views.include?(:grid)
+        end
+        # Layout shape for grid cards. :compact (default) places the image
+        # left of the content; :media stacks the image full-width on top.
+        def grid_layout(value)
+          value = value.to_sym
+          unless GRID_LAYOUTS.include?(value)
+            raise ArgumentError, "grid_layout must be one of #{GRID_LAYOUTS}, got #{value.inspect}"
+          end
+          self.defined_grid_layout = value
+        end
+        # Override responsive column count. Default is 1 / 2 / 3 / 4 at
+        # sm / md / lg / xl.
+        def grid_columns(value)
+          self.defined_grid_columns = Integer(value)
+        end
+      end
+      def defined_views = self.class.defined_views
+      def default_view = self.class.default_view
+      def defined_grid_fields = self.class.defined_grid_fields
+      def defined_grid_layout = self.class.defined_grid_layout
+      def defined_grid_columns = self.class.defined_grid_columns
+    end
+  end
+end

data/lib/plutonium/helpers/turbo_helper.rb CHANGED Viewed

@@ -6,7 +6,7 @@ module Plutonium
       end
       def remote_modal_frame_tag(&)
-        turbo_frame_tag("remote_modal", &)
+        turbo_frame_tag(Plutonium::REMOTE_MODAL_FRAME, &)
       end
     end
   end

data/lib/plutonium/interaction/response/redirect.rb CHANGED Viewed

@@ -29,7 +29,7 @@ module Plutonium
             respond_to do |format|
               format.turbo_stream do
-                if helpers.current_turbo_frame == "remote_modal"
+                if helpers.current_turbo_frame == Plutonium::REMOTE_MODAL_FRAME
                   render turbo_stream: [
                     helpers.turbo_stream_redirect(url)
                   ]

data/lib/plutonium/invites/concerns/invite_token.rb CHANGED Viewed

@@ -125,9 +125,9 @@ module Plutonium
           transaction do
             update!(
-              state: :accepted,
-              accepted_at: Time.current,
-              user: user
+              :state => :accepted,
+              :accepted_at => Time.current,
+              user_attribute => user
             )
             create_membership_for(user)
@@ -135,6 +135,14 @@ module Plutonium
           end
         end
+        # Override to specify the user association name on the invite model.
+        # Defaults to :user. Override when the invite model's `belongs_to`
+        # uses a different name (e.g., :spender_account, :staff_user).
+        # @return [Symbol]
+        def user_attribute
+          :user
+        end
         # Override this method to specify the mailer class.
         #
         # @return [Class] the mailer class for sending invitation emails

data/lib/plutonium/invites/concerns/invite_user.rb CHANGED Viewed

@@ -37,12 +37,12 @@ module Plutonium
         def execute
           attrs = {
-            entity: entity,
             email: email,
             role: role,
             invited_by: current_user,
             **additional_invite_attributes
           }
+          attrs[invite_entity_attribute] = entity
           attrs[:invitable] = invitable if invitable.present?
           invite_class.create!(attrs)
@@ -109,6 +109,15 @@ module Plutonium
           entity.class.name.underscore.to_sym
         end
+        # Override to specify the entity association name on the invite model.
+        # Defaults to :entity, matching the convention documented on InviteToken.
+        # When the invite model uses a concrete `belongs_to :<entity_name>`
+        # instead, override this to return that association name.
+        # @return [Symbol]
+        def invite_entity_attribute
+          :entity
+        end
         def role_is_present
           errors.add(:role, :blank) if role.blank?
         end
@@ -130,9 +139,9 @@ module Plutonium
           return unless email.present? && entity.present?
           pending = invite_class.find_by(
-            entity: entity,
-            email: email,
-            state: :pending
+            invite_entity_attribute => entity,
+            :email => email,
+            :state => :pending
           )
           errors.add(:email, "already has a pending invitation") if pending
         end

data/lib/plutonium/invites/controller.rb CHANGED Viewed

@@ -35,6 +35,7 @@ module Plutonium
       extend ActiveSupport::Concern
       included do
+        append_view_path File.expand_path("app/views", Plutonium.root)
         helper_method :current_user if respond_to?(:helper_method)
       end
@@ -72,7 +73,7 @@ module Plutonium
         return unless (@invite = load_and_validate_invite(params[:token]))
         unless current_user
-          redirect_to invitation_path(token: params[:token]),
+          redirect_to invitation_path_for(params[:token]),
             alert: "Please sign in to accept this invitation"
           return
         end
@@ -174,6 +175,18 @@ module Plutonium
         raise NotImplementedError, "#{self.class}#invite_class must return the invite model class"
       end
+      # Override to customize the invitation URL helper.
+      # Default uses Rails' `invitation_path(token:)` helper, which is what
+      # `pu:invites:install` generates for single-flow apps. Multi-flow apps
+      # whose generator scoped the route as `<prefix>_invitation_path` should
+      # override this.
+      #
+      # @param token [String] the invitation token
+      # @return [String] the URL path
+      def invitation_path_for(token)
+        invitation_path(token: token)
+      end
       # Override to specify the user model class.
       #
       # @return [Class] the user model class

data/lib/plutonium/invites/pending_invite_check.rb CHANGED Viewed

@@ -8,39 +8,34 @@ module Plutonium
     # (e.g., WelcomeController, DashboardController) to check for
     # pending invitations stored in cookies.
     #
-    # @example Basic usage
-    #   class WelcomeController < ApplicationController
-    #     include Plutonium::Invites::PendingInviteCheck
+    # Hosts may override either `invite_classes` (preferred — returns
+    # an Array of invite classes to check, in priority order) or
+    # `invite_class` (single class, kept for backward compatibility).
     #
-    #     def index
-    #       return if redirect_to_pending_invite!
-    #
-    #       # Normal post-login flow...
-    #       redirect_to dashboard_path
-    #     end
-    #
-    #     private
-    #
-    #     def invite_class
-    #       Invites::UserInvite
-    #     end
+    # @example Single invite class
+    #   def invite_class
+    #     ::Invites::UserInvite
     #   end
     #
+    # @example Multiple invite classes
+    #   def invite_classes
+    #     [::Invites::FunderInvite, ::Invites::SpenderInvite]
+    #   end
     module PendingInviteCheck
       extend ActiveSupport::Concern
+      included do
+        append_view_path File.expand_path("app/views", Plutonium.root)
+      end
       private
       # Check for a pending invitation and redirect if found.
-      #
-      # @return [Boolean] true if redirected, false otherwise
       def redirect_to_pending_invite!
         token = cookies.encrypted[:pending_invitation]
         return false unless token
-        invite = invite_class.find_for_acceptance(token)
-        if invite
+        if find_pending_invite(token)
           redirect_to invitation_path(token: token)
           true
         else
@@ -49,14 +44,12 @@ module Plutonium
         end
       end
-      # Returns the pending invite if one exists.
-      #
-      # @return [Object, nil] the pending invite or nil
+      # Returns the pending invite if one exists across any invite_classes.
       def pending_invite
         token = cookies.encrypted[:pending_invitation]
         return nil unless token
-        invite = invite_class.find_for_acceptance(token)
+        invite = find_pending_invite(token)
         unless invite
           cookies.delete(:pending_invitation)
           return nil
@@ -65,11 +58,27 @@ module Plutonium
         invite
       end
-      # Override to specify the invite model class.
-      #
-      # @return [Class] the invite model class
+      # Override to specify multiple invite model classes (preferred).
+      # Defaults to `[invite_class]` for backward compatibility.
+      # @return [Array<Class>]
+      def invite_classes
+        [invite_class]
+      end
+      # Override to specify a single invite model class. Maintained for
+      # backward compatibility; prefer `invite_classes` for multi-flow apps.
+      # @return [Class]
       def invite_class
-        raise NotImplementedError, "#{self.class}#invite_class must return the invite model class"
+        raise NotImplementedError,
+          "#{self.class}#invite_class or #invite_classes must return the invite model class(es)"
+      end
+      def find_pending_invite(token)
+        invite_classes.each do |klass|
+          invite = klass.find_for_acceptance(token)
+          return invite if invite
+        end
+        nil
       end
     end
   end

data/lib/plutonium/query/base.rb CHANGED Viewed

@@ -24,6 +24,14 @@ module Plutonium
       def apply(scope, **params)
         raise NotImplementedError, "#{self.class}#apply(scope, **params)"
       end
+      # Human-readable rendering of a single filter value for the active
+      # filter pill row. Defaults to `value.to_s`. Subclasses
+      # (Filters::Association, Filters::Boolean) override to translate
+      # raw param values (SGIDs, "true"/"false") into recognisable text.
+      def humanize_value(value)
+        value.to_s
+      end
     end
   end
 end

data/lib/plutonium/query/filters/association.rb CHANGED Viewed

@@ -16,7 +16,7 @@ module Plutonium
       #   filter :user, with: :association, class_name: User, scope: ->(s) { s.active }
       #
       class Association < Filter
-        def initialize(class_name: nil, resource_class: nil, scope: nil, multiple: false, **)
+        def initialize(class_name: nil, resource_class: nil, scope: nil, multiple: true, **)
           super(**)
           @class_name = class_name
           @resource_class = resource_class
@@ -24,15 +24,21 @@ module Plutonium
           @multiple = multiple
         end
+        def humanize_value(value)
+          return "" if value.blank?
+          ids = decode_ids(value)
+          return "" if ids.empty?
+          records = association_class.where(id: ids)
+          records.map { |r| r.respond_to?(:to_label) ? r.to_label : r.to_s }.join(", ")
+        rescue
+          Array(value).reject(&:blank?).join(", ")
+        end
         def apply(scope, value:)
           return scope if value.blank?
-          foreign_key = :"#{key}_id"
-          if @multiple && value.is_a?(Array)
-            scope.where(foreign_key => value.reject(&:blank?))
-          else
-            scope.where(foreign_key => value)
-          end
+          ids = decode_ids(value)
+          return scope if ids.empty?
+          scope.where("#{key}_id": ids)
         end
         def customize_inputs
@@ -45,6 +51,22 @@ module Plutonium
         private
+        # Accepts either an SGID (the new default sent by ResourceSelect)
+        # or a raw id (legacy URLs). Returns the underlying record ids.
+        def decode_ids(value)
+          Array(value).reject(&:blank?).filter_map { |v| decode_id(v) }
+        end
+        def decode_id(value)
+          gid = SignedGlobalID.parse(value)
+          return gid.model_id if gid
+          value
+        rescue
+          value
+        end
+        private
         def association_class
           @association_class ||= resolve_class_name || detect_class_from_reflection || infer_class_from_key
         end

data/lib/plutonium/query/filters/boolean.rb CHANGED Viewed

@@ -16,6 +16,11 @@ module Plutonium
           @false_label = false_label
         end
+        def humanize_value(value)
+          return "" if value.blank?
+          ActiveModel::Type::Boolean.new.cast(value) ? @true_label : @false_label
+        end
         def apply(scope, value:)
           return scope if value.blank?