plutonium 0.18.5 → 0.18.7

data/lib/plutonium/ui/form/components/secure_association.rb

@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+module Plutonium
+  module UI
+    module Form
+      module Components
+        class SecureAssociation < Phlexi::Form::Components::AssociationBase
+          include Plutonium::UI::Component::Methods
+
+          def view_template
+            div(class: "flex space-x-1") do
+              super
+              render_add_button
+            end
+          end
+
+          protected
+
+          delegate :association_reflection, to: :field
+
+          def render_add_button
+            return if @add_action == false || add_url.nil?
+
+            a(
+              href: add_url,
+              class:
+                "bg-gray-100 dark:bg-gray-600 dark:hover:bg-gray-700 dark:border-gray-500 hover:bg-gray-200 border border-gray-300 rounded-lg p-3 focus:ring-gray-100 dark:focus:ring-gray-700 focus:ring-2 focus:outline-none dark:text-white"
+            ) do
+              render Phlex::TablerIcons::Plus.new(class: "w-3 h-3")
+            end
+          end
+
+          def add_url
+            @add_url ||= begin
+              return unless @skip_authorization || allowed_to?(:create?, association_reflection.klass)
+
+              url = @add_action || resource_url_for(association_reflection.klass, action: :new, parent: nil)
+              return unless url
+
+              uri = URI(url)
+              uri.query = URI.encode_www_form({return_to: request.original_url})
+              uri.to_s
+            end
+          end
+
+          def choices
+            @choices ||= begin
+              collection = if (user_choices = attributes.delete(:choices))
+                user_choices
+              elsif @skip_authorization
+                choices_from_association(association_reflection.klass)
+              else
+                authorized_resource_scope(association_reflection.klass, relation: choices_from_association(association_reflection.klass))
+              end
+              build_choice_mapper(collection)
+            end
+          end
+
+          def build_attributes
+            build_association_attributes
+            super
+          end
+
+          def build_association_attributes
+            @skip_authorization = attributes.delete(:skip_authorization)
+            @add_action = attributes.delete(:add_action)
+
+            attributes.fetch(:value_method) { attributes[:value_method] = :to_signed_global_id }
+
+            case association_reflection.macro
+            when :belongs_to, :has_one
+              build_singluar_association_attributes
+            when :has_many, :has_and_belongs_to_many
+              build_collection_association_attributes
+            end
+          end
+
+          def build_singluar_association_attributes
+            attributes.fetch(:input_param) { attributes[:input_param] = :"#{association_reflection.name}_sgid" }
+          end
+
+          def build_collection_association_attributes
+            attributes.fetch(:input_param) { attributes[:input_param] = :"#{association_reflection.name.to_s.singularize}_sgids" }
+            attributes[:multiple] = true
+          end
+
+          def normalize_simple_input(input_value)
+            @signed_global_ids ||= choices.values.map { |choice| SignedGlobalID.parse(choice) }
+            ([SignedGlobalID.parse(input_value.presence)].compact & @signed_global_ids)[0]
+          end
+
+          def selected?(option)
+            case association_reflection.macro
+            when :belongs_to, :has_one
+              singular_field_value == SignedGlobalID.parse(option)
+            when :has_many, :has_and_belongs_to_many
+              collection_field_value.any? { |item| item == SignedGlobalID.parse(option) }
+            end
+          end
+
+          def singular_field_value
+            @singular_field_value ||= field.object.send :"#{association_reflection.name}_sgid"
+          end
+
+          def collection_field_value
+            @collection_field_value ||= field.object.send :"#{association_reflection.name.to_s.singularize}_sgids"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/plutonium/ui/form/components/secure_polymorphic_association.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Plutonium
+  module UI
+    module Form
+      module Components
+        class SecurePolymorphicAssociation < SecureAssociation
+          protected
+
+          def build_attributes
+            attributes.fetch(:group_method) { attributes[:group_method] = :last }
+            super
+          end
+
+          def choices
+            @choices ||= begin
+              Plutonium.eager_load_rails!
+              collection = if (user_choices = attributes.delete(:choices))
+                user_choices
+              else
+                associated_classes.map { |klass|
+                  [
+                    klass.model_name.human.pluralize,
+                    @skip_authorization ? choices_from_association(klass) : authorized_resource_scope(klass, relation: choices_from_association(klass))
+                  ]
+                }.to_h
+              end
+              build_choice_mapper(collection)
+            end
+          end
+
+          def associated_classes
+            Plutonium.eager_load_rails!
+
+            associated_classes = []
+            ActiveRecord::Base.descendants.each do |model_klass|
+              next if !model_klass.table_exists? || model_klass.abstract_class?
+
+              (model_klass.reflect_on_all_associations(:has_many) + model_klass.reflect_on_all_associations(:has_one)).each do |association|
+                if association.options[:as] == association_reflection.name
+                  associated_classes << model_klass
+                end
+              end
+            end
+            associated_classes
+          end
+
+          def render_add_button
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -91,7 +91,6 @@ 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)
-            # debugger if $extracting_input
             context = NestedFieldContext.new(
               name: name,
               definition: build_nested_fields_definition(name),

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

@@ -51,7 +51,18 @@ module Plutonium
             uppy: :file,
             valid_uppy: :valid_file,
             invalid_uppy: :invalid_file,
-            neutral_uppy: :neutral_file
+            neutral_uppy: :neutral_file,
+
+            association: :select,
+            valid_association: :valid_select,
+            invalid_association: :invalid_select,
+            neutral_association: :neutral_select,
+
+            polymorpic_association: :association,
+            valid_polymorpic_association: :valid_association,
+            invalid_polymorpic_association: :invalid_association,
+            neutral_polymorpic_association: :neutral_association
+
           })
         end
       end

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

@@ -7,7 +7,7 @@ module Plutonium
         private
 
         def page_title
-          current_definition.show_page_title || super || display_name_of(resource_record)
+          current_definition.show_page_title || super || display_name_of(resource_record!)
         end
 
         def page_description

data/lib/plutonium/ui/page_header.rb

@@ -40,7 +40,7 @@ module Plutonium
 
       def render_actions
         @actions.each do |action|
-          url = resource_url_for(resource_record || resource_class, *action.route_options.url_args, **action.route_options.url_options)
+          url = resource_url_for(resource_record? || resource_class, *action.route_options.url_args, **action.route_options.url_options)
           ActionButton(action, url:)
         end
       end

data/lib/plutonium/version.rb

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

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@radioactive-labs/plutonium",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@radioactive-labs/plutonium",
-      "version": "0.3.1",
+      "version": "0.3.2",
       "license": "MIT",
       "dependencies": {
         "@hotwired/stimulus": "^3.2.2",

data/package.json

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

data/src/js/controllers/slim_select_controller.js

@@ -16,6 +16,8 @@ export default class extends Controller {
 
   reconnect() {
     this.disconnect()
-    this.connect()
+    // dispatch this on the next frame.
+    // there's some funny issue where my elements get removed from the DOM
+    setTimeout(() => this.connect(), 10)
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plutonium
 version: !ruby/object:Gem::Version
-  version: 0.18.5
+  version: 0.18.7
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-01 00:00:00.000000000 Z
+date: 2025-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -603,6 +603,8 @@ files:
 - lib/generators/pu/lib/plutonium_generators/concerns/actions.rb
 - lib/generators/pu/lib/plutonium_generators/concerns/config.rb
 - lib/generators/pu/lib/plutonium_generators/concerns/logger.rb
+- lib/generators/pu/lib/plutonium_generators/concerns/package_selector.rb
+- lib/generators/pu/lib/plutonium_generators/concerns/resource_selector.rb
 - lib/generators/pu/lib/plutonium_generators/concerns/serializer.rb
 - lib/generators/pu/lib/plutonium_generators/generator.rb
 - lib/generators/pu/lib/plutonium_generators/installer.rb
@@ -786,6 +788,11 @@ files:
 - lib/plutonium/resource/policy.rb
 - lib/plutonium/resource/query_object.rb
 - lib/plutonium/resource/record.rb
+- lib/plutonium/resource/record/associated_with.rb
+- lib/plutonium/resource/record/associations.rb
+- lib/plutonium/resource/record/field_names.rb
+- lib/plutonium/resource/record/labeling.rb
+- lib/plutonium/resource/record/routes.rb
 - lib/plutonium/resource/register.rb
 - lib/plutonium/rodauth/controller_methods.rb
 - lib/plutonium/routing/mapper_extensions.rb
@@ -813,11 +820,11 @@ files:
 - lib/plutonium/ui/dyna_frame/host.rb
 - lib/plutonium/ui/empty_card.rb
 - lib/plutonium/ui/form/base.rb
-- lib/plutonium/ui/form/components/belongs_to.rb
 - lib/plutonium/ui/form/components/easymde.rb
 - lib/plutonium/ui/form/components/flatpickr.rb
-- lib/plutonium/ui/form/components/has_many.rb
 - lib/plutonium/ui/form/components/intl_tel_input.rb
+- lib/plutonium/ui/form/components/secure_association.rb
+- lib/plutonium/ui/form/components/secure_polymorphic_association.rb
 - lib/plutonium/ui/form/components/uppy.rb
 - lib/plutonium/ui/form/concerns/renders_nested_resource_fields.rb
 - lib/plutonium/ui/form/interaction.rb

data/lib/plutonium/ui/form/components/belongs_to.rb

@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-module Plutonium
-  module UI
-    module Form
-      module Components
-        class BelongsTo < Phlexi::Form::Components::BelongsTo
-          include Plutonium::UI::Component::Methods
-
-          def view_template
-            div(class: "flex space-x-1") do
-              super
-              render_add_button
-            end
-          end
-
-          private
-
-          def add_url
-            @add_url ||= begin
-              return unless @skip_authorization || allowed_to?(:create?, association_reflection.klass)
-
-              url = @add_action || resource_url_for(association_reflection.klass, action: :new, parent: nil)
-              return unless url
-
-              uri = URI(url)
-              uri.query = URI.encode_www_form({return_to: request.original_url})
-              uri.to_s
-            end
-          end
-
-          def render_add_button
-            return if @add_action == false || add_url.nil?
-
-            a(
-              href: add_url,
-              class:
-                "bg-gray-100 dark:bg-gray-600 dark:hover:bg-gray-700 dark:border-gray-500 hover:bg-gray-200 border border-gray-300 rounded-lg p-3 focus:ring-gray-100 dark:focus:ring-gray-700 focus:ring-2 focus:outline-none dark:text-white"
-            ) do
-              render Phlex::TablerIcons::Plus.new(class: "w-3 h-3")
-            end
-          end
-
-          def choices
-            @choices ||= begin
-              collection = if @provided_choices || @skip_authorization
-                @choice_collection
-              else
-                authorized_resource_scope(association_reflection.klass, relation: @choice_collection)
-              end
-              Phlexi::Form::ChoicesMapper.new(collection, label_method: @label_method, value_method: @value_method)
-            end
-          end
-
-          def build_attributes
-            @provided_choices = !attributes[:choices].nil?
-            @skip_authorization = attributes.delete(:skip_authorization)
-            @add_action = attributes.delete(:add_action)
-
-            super
-          end
-        end
-      end
-    end
-  end
-end

data/lib/plutonium/ui/form/components/has_many.rb

@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-module Plutonium
-  module UI
-    module Form
-      module Components
-        class HasMany < Phlexi::Form::Components::HasMany
-          include Plutonium::UI::Component::Methods
-
-          def view_template
-            div(class: "flex space-x-1") do
-              super
-              render_add_button
-            end
-          end
-
-          private
-
-          def add_url
-            @add_url ||= begin
-              return unless @skip_authorization || allowed_to?(:create?, association_reflection.klass)
-
-              url = @add_action || resource_url_for(association_reflection.klass, action: :new, parent: nil)
-              return unless url
-
-              uri = URI(url)
-              uri.query = URI.encode_www_form({return_to: request.original_url})
-              uri.to_s
-            end
-          end
-
-          def render_add_button
-            return if @add_action == false || add_url.nil?
-
-            a(
-              href: add_url,
-              class:
-                "bg-gray-100 dark:bg-gray-600 dark:hover:bg-gray-700 dark:border-gray-500 hover:bg-gray-200 border border-gray-300 rounded-lg p-3 focus:ring-gray-100 dark:focus:ring-gray-700 focus:ring-2 focus:outline-none dark:text-white"
-            ) do
-              render Phlex::TablerIcons::Plus.new(class: "w-3 h-3")
-            end
-          end
-
-          def choices
-            @choices ||= begin
-              collection = if @provided_choices || @skip_authorization
-                @choice_collection
-              else
-                authorized_resource_scope(association_reflection.klass, relation: @choice_collection)
-              end
-              Phlexi::Form::ChoicesMapper.new(collection, label_method: @label_method, value_method: @value_method)
-            end
-          end
-
-          def build_attributes
-            @provided_choices = !attributes[:choices].nil?
-            @skip_authorization = attributes.delete(:skip_authorization)
-            @add_action = attributes.delete(:add_action)
-
-            super
-          end
-        end
-      end
-    end
-  end
-end