plutonium 0.15.24 → 0.16.0

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

@@ -16,13 +16,15 @@ module Plutonium
 
         private
 
-        def authorized_resource_scope(resource, **options)
+        # Use this when getting a scope for a resource that is not the current
+        # Use this instead of authorized_scope directly
+        def authorized_resource_scope(resource, relation: nil, **options)
           raise ArgumentError("Expected resource to be a class inheriting ActiveRecord::Base") unless resource.instance_of?(Class) && resource < ActiveRecord::Base
 
           options[:with] ||= ActionPolicy.lookup(resource, namespace: authorization_namespace)
-          resource = resource.all
+          relation ||= resource.all
 
-          authorized_scope(resource, **options)
+          authorized_scope(relation, **options)
         end
 
         def entity_scope_for_authorize

data/lib/plutonium/ui/component/methods.rb

@@ -48,6 +48,7 @@ module Plutonium
           :current_interactive_action,
           :current_engine,
           :policy_for,
+          :authorized_resource_scope,
           :allowed_to?,
           :registered_resources,
           :root_path,

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

@@ -14,11 +14,20 @@ module Plutonium
           end
           alias_method :markdown_tag, :easymde_tag
 
-          alias_method :basic_select_tag, :select_tag
-          def slim_select_tag(**, &)
-            basic_select_tag(**, data_controller: "slim-select", class!: "", &)
+          def slim_select_tag(**attributes, &)
+            attributes[:data_controller] = tokens(attributes[:data_controller], "slim-select")
+            select_tag(**attributes, class!: "", &)
+          end
+
+          def belongs_to_tag(**attributes, &)
+            attributes[:data_controller] = tokens(attributes[:data_controller], "slim-select") # TODO: put this behind a config
+            create_component(Components::BelongsTo, :belongs_to, **attributes, &)
+          end
+
+          def has_many_tag(**attributes, &)
+            attributes[:data_controller] = tokens(attributes[:data_controller], "slim-select") # TODO: put this behind a config
+            create_component(Components::HasMany, :has_many, **attributes, &)
           end
-          alias_method :select_tag, :slim_select_tag
 
           def flatpickr_tag(**, &)
             create_component(Plutonium::UI::Form::Components::Flatpickr, :flatpickr, **, &)

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Plutonium
+  module UI
+    module Form
+      module Components
+        class BelongsTo < Phlexi::Form::Components::BelongsTo
+          include Plutonium::UI::Component::Methods
+
+          private
+
+          def choices
+            @choices ||= begin
+              collection = authorized_resource_scope(association_reflection.klass, relation: @choice_collection)
+              Phlexi::Form::ChoicesMapper.new(collection, label_method: @label_method, value_method: @value_method)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Plutonium
+  module UI
+    module Form
+      module Components
+        class HasMany < Phlexi::Form::Components::HasMany
+          include Plutonium::UI::Component::Methods
+
+          private
+
+          def choices
+            @choices ||= begin
+              collection = authorized_resource_scope(association_reflection.klass, relation: @choice_collection)
+              Phlexi::Form::ChoicesMapper.new(collection, label_method: @label_method, value_method: @value_method)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/plutonium/ui/form/options/inferred_types.rb

@@ -8,16 +8,19 @@ module Plutonium
           private
 
           def infer_field_component
-            return :markdown if inferred_field_type == :rich_text
+            case inferred_field_type
+            when :rich_text
+              return :markdown
+            end
 
-            component = super
-            case component
+            inferred_field_component = super
+            case inferred_field_component
             when :select
               :slim_select
             when :date, :time, :datetime
               :flatpickr
             else
-              component
+              inferred_field_component
             end
           end
         end

data/lib/plutonium/version.rb

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

data/src/css/slim_select.css

@@ -92,7 +92,7 @@
   }
 
   .ss-main .ss-values .ss-value {
-    @apply flex select-none items-center w-fit bg-primary-500 rounded-md;
+    @apply flex select-none items-center w-fit bg-primary-500 rounded-md text-white;
     animation: ss-valueIn 0.2s ease-out forwards;
   }
 
@@ -101,11 +101,11 @@
   }
 
   .ss-main .ss-values .ss-value .ss-value-text {
-    @apply text-xs text-white dark:text-gray-900 leading-normal p-[3px_5px];
+    @apply text-xs leading-normal p-[3px_5px];
   }
 
   .ss-main .ss-values .ss-value .ss-value-delete {
-    @apply flex items-center h-[7px] w-[7px] p-[3px_5px] cursor-pointer border-l border-solid border-white dark:border-gray-900 box-content;
+    @apply flex items-center h-[7px] w-[7px] p-[3px_5px] cursor-pointer border-l border-solid border-white box-content;
   }
 
   .ss-main .ss-values .ss-value .ss-value-delete svg {
@@ -113,7 +113,7 @@
   }
 
   .ss-main .ss-values .ss-value .ss-value-delete svg path {
-    @apply fill-none stroke-white dark:stroke-gray-900;
+    @apply fill-none stroke-white;
     stroke-width: 18;
     stroke-linecap: round;
     stroke-linejoin: round;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plutonium
 version: !ruby/object:Gem::Version
-  version: 0.15.24
+  version: 0.16.0
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-01 00:00:00.000000000 Z
+date: 2024-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -1408,8 +1408,10 @@ 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/concerns/renders_nested_resource_fields.rb
 - lib/plutonium/ui/form/interaction.rb
 - lib/plutonium/ui/form/options/inferred_types.rb