plutonium 0.6.2 → 0.9.0

data/lib/plutonium/core/fields/inputs/nested_input.rb

@@ -0,0 +1,57 @@
+module Plutonium
+  module Core
+    module Fields
+      module Inputs
+        class NestedInput < Base
+          include Plutonium::Core::Definers::InputDefiner
+
+          attr_reader :inputs, :resource_class
+
+          def initialize(name, inputs:, resource_class:, allow_destroy:, update_only:, limit:, **user_options)
+            @inputs = inputs
+            @resource_class = resource_class
+            @allow_destroy = allow_destroy
+            @update_only = update_only
+            @limit = limit
+
+            super(name, **user_options)
+          end
+
+          def render(view_context, f, record, **opts)
+            opts = options.deep_merge opts
+            view_context.render_component :nested_resource_form_fields, form: f, **opts
+          end
+
+          def collect(params)
+            attributes = {}
+            params[param].each do |index, nested_params|
+              collected = defined_inputs.collect_all(nested_params)
+              collected[:id] = nested_params[:id] if nested_params.key?(:id) && !@update_only
+              collected[:_destroy] = nested_params[:_destroy] if @allow_destroy
+              attributes[index] = collected
+            end
+
+            {param => attributes}
+          end
+
+          private
+
+          def param = :"#{name}_attributes"
+
+          def input_options = {
+            name:,
+            resource_class:,
+            allow_destroy: @allow_destroy,
+            update_only: @update_only,
+            limit: @limit,
+            inputs: defined_inputs
+          }
+
+          def defined_inputs
+            @defined_inputs ||= defined_inputs_for(*inputs)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/plutonium/core/fields/inputs/noop_input.rb

@@ -6,7 +6,7 @@ module Plutonium
           def initialize(*)
           end
 
-          def render(f, record)
+          def render(view_context, f, record, **)
           end
 
           def collect(params)

data/lib/plutonium/core/fields/inputs/phone_input.rb

@@ -0,0 +1,22 @@
+module Plutonium
+  module Core
+    module Fields
+      module Inputs
+        class PhoneInput < SimpleFormInput
+          # def render(view_context, f, record, **opts)
+          #   opts = options.deep_merge opts
+          #   opts.delete(:as)
+          #   f.input name, **opts
+          # end
+
+          # def collect(params)
+          #   value = params[param]
+          #   country = user_options[:country]
+          #   country ||= params[user_options[:country_param].to_sym] if user_options[:country_param].present?
+          #   {param => Phonelib.parse(value, country).full_e164}
+          # end
+        end
+      end
+    end
+  end
+end

data/lib/plutonium/core/fields/inputs/polymorphic_belongs_to_association_input.rb

@@ -0,0 +1,47 @@
+module Plutonium
+  module Core
+    module Fields
+      module Inputs
+        class PolymorphicBelongsToAssociationInput < SimpleFormAssociationInput
+          def render(view_context, f, record, **opts)
+            opts = options.deep_merge opts
+            f.input param, **opts
+          end
+
+          private
+
+          def param
+            :"#{reflection.name}_sgid"
+          end
+
+          def input_options
+            {
+              as: :grouped_select,
+              label: reflection.name.to_s.humanize,
+              collection: associated_classes.map { |klass|
+                            [klass.name, klass.all]
+                          }.to_h,
+              group_label_method: :first,
+              group_method: :last, include_blank: "Select One"
+            }
+          end
+
+          def associated_classes
+            Rails.application.eager_load! unless Rails.application.config.eager_load
+
+            associated_classes = []
+            ActiveRecord::Base.descendants.each do |model|
+              next unless model.table_exists?
+              model.reflect_on_all_associations(:has_many).each do |association|
+                if association.options[:as] == reflection.name
+                  associated_classes << model.name
+                end
+              end
+            end
+            associated_classes
+          end
+        end
+      end
+    end
+  end
+end

data/lib/plutonium/core/fields/inputs/simple_form_association_input.rb

@@ -10,8 +10,9 @@ module Plutonium
             super(name, **user_options)
           end
 
-          def render(f, record)
-            f.association name, **options
+          def render(view_context, f, record, **opts)
+            opts = options.deep_merge opts
+            f.association name, **opts
           end
 
           private

data/lib/plutonium/core/fields/inputs/simple_form_input.rb

@@ -3,7 +3,10 @@ module Plutonium
     module Fields
       module Inputs
         class SimpleFormInput < Base
-          def render(f, record) = f.input name, **options
+          def render(view_context, f, record, **opts)
+            opts = options.deep_merge opts
+            f.input name, **opts
+          end
         end
       end
     end

data/lib/plutonium/core/fields/renderers/association_renderer.rb

@@ -10,13 +10,10 @@ module Plutonium
             super(name, **user_options)
           end
 
-          private
-
-          def renderer_options
-            resource_record = reflection.klass.include? Plutonium::Reactor::ResourceRecord
-            {
-              helper: resource_record ? :display_association_value : :display_name_of
-            }
+          def render(view_context, record)
+            value = record.send(name)
+            options = self.options.merge(helper: value.class.include?(Plutonium::Resource::Record) ? :display_association_value : :display_name_of)
+            view_context.display_field value:, **options
           end
         end
       end

data/lib/plutonium/core/fields/renderers/factory.rb

@@ -9,6 +9,7 @@ module Plutonium
 
           map_type :belongs_to, :has_one, :has_many, to: Plutonium::Core::Fields::Renderers::AssociationRenderer
           map_type :attachment, to: Plutonium::Core::Fields::Renderers::AttachmentRenderer
+          map_type :map, to: Plutonium::Core::Fields::Renderers::MapRenderer
 
           def self.build(name, type:, **)
             mapping = mappings[type] || Plutonium::Core::Fields::Renderers::BasicRenderer

data/lib/plutonium/core/fields/renderers/map_renderer.rb

@@ -0,0 +1,19 @@
+module Plutonium
+  module Core
+    module Fields
+      module Renderers
+        class MapRenderer < BasicRenderer
+          # def initialize(name, reflection:, **user_options)
+          #   @reflection = reflection
+          #   super(name, **user_options)
+          # end
+
+          def render(view_context, record)
+            # view_context.display_field value:, **options
+            view_context.js_map [{latitude: record.lat, longitude: record.lng}]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/plutonium/core/ui/collection.rb

@@ -1,13 +1,17 @@
+require "dry-initializer"
+
 module Plutonium
   module Core
-    module UI
-      Collection = Data.define :resource_class, :records, :fields, :actions, :pagination, :search_object, :search_field do
-        def initialize(
-          resource_class:, records: [], fields: {}, actions: Plutonium::Core::Actions::Collection.new,
-          pagination: nil, search_object: nil, search_field: nil
-        )
-          super
-        end
+    module Ui
+      class Collection
+        extend Dry::Initializer
+
+        option :resource_class
+        option :records, default: proc { [] }
+        option :fields, default: proc { {} }
+        option :actions, default: proc { Plutonium::Core::Actions::Collection.new }
+        option :pager, optional: true
+        option :search_object, optional: true
       end
     end
   end

data/lib/plutonium/core/ui/detail.rb

@@ -1,10 +1,13 @@
 module Plutonium
   module Core
-    module UI
-      Detail = Data.define :resource_class, :record, :fields, :actions do
-        def initialize(resource_class:, record: nil, fields: {}, actions: Plutonium::Core::Actions::Collection.new)
-          super
-        end
+    module Ui
+      class Detail
+        extend Dry::Initializer
+
+        option :resource_class
+        option :record, optional: true
+        option :fields, default: proc { {} }
+        option :actions, default: proc { Plutonium::Core::Actions::Collection.new }
       end
     end
   end

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

@@ -1,10 +1,11 @@
 module Plutonium
   module Core
-    module UI
-      Form = Data.define :record, :inputs do
-        def initialize(record: nil, inputs: {})
-          super
-        end
+    module Ui
+      class Form
+        extend Dry::Initializer
+
+        option :record, optional: true
+        option :inputs, default: proc { {} }
       end
     end
   end

data/lib/plutonium/helpers/action_buttons_helper.rb

@@ -1,31 +1,31 @@
 module Plutonium
   module Helpers
     module ActionButtonsHelper
-      def generic_action_button(url, icon:, button_class:, method:, confirm:, turbo_frame:)
-        if method == :get
-          link_to url, class: button_class, data: {turbo_frame:} do
-            tag.i class: "bi bi-#{icon}"
-          end
-        else
-          form_for :action, url:, method:, turbo_frame:,
-            html: {class: "d-inline-block", data: {turbo_confirm: confirm}} do
-            tag.button class: button_class do
-              tag.i class: "bi bi-#{icon}"
-            end
-          end
-        end
+      def toolbar_action_button(resource, action)
+        render_component :action_button,
+          classname: "me-2",
+          to: resource_url_for(resource, action: action.route_options.action, **action.route_options.options),
+          method: action.route_options.method,
+          icon: action.icon,
+          label: action.label,
+          tooltip: action.label,
+          color: action.color,
+          confirmation: action.confirmation,
+          size: :xs
       end
 
-      def toolbar_action_button(url, icon:, button_class: "secondary", method: :get, confirm: nil, turbo_frame: nil)
-        button_class = "btn btn-sm btn-outline-#{button_class} toolbar-action-button"
-
-        generic_action_button(url, icon:, button_class:, method:, confirm:, turbo_frame:)
-      end
-
-      def table_action_button(url, icon:, button_class: "secondary", method: :get, confirm: nil, turbo_frame: nil)
-        button_class = "btn btn-sm btn-link text-#{button_class}"
-
-        generic_action_button(url, icon:, button_class:, method:, confirm:, turbo_frame:)
+      def table_action_button(resource, action)
+        render_component :action_button,
+          classname: "ms-2",
+          to: resource_url_for(resource, action: action.route_options.action, **action.route_options.options),
+          method: action.route_options.method,
+          icon: action.icon,
+          label: nil, # action.label,
+          tooltip: action.label,
+          color: action.color,
+          confirmation: action.confirmation,
+          variant: :outline,
+          size: :xs
       end
     end
   end

data/lib/plutonium/helpers/application_helper.rb

@@ -6,10 +6,6 @@ module Plutonium
       #   "title=\"#{text}\" data-controller=\"tooltip\" data-bs-title=\"#{text}\"".html_safe
       # end
 
-      def page_title(title)
-        [title.presence, Rails.application.class.module_parent.name].compact.join(" | ")
-      end
-
       def resource_name(resource_class, count = 1)
         resource_class.model_name.human.pluralize(count)
       end

data/lib/plutonium/helpers/attachment_helper.rb

@@ -44,7 +44,7 @@ module Plutonium
 
         # Any changes made here must be reflected in attachment_input_controller#buildPreviewTemplate
 
-        tag.div class: "d-inline-block img-thumbnail", data: {attachment_preview_target: "thumbnail"} do
+        tag.div class: "bg-white border border-gray-200 rounded-lg shadow hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700", data: {attachment_preview_target: "thumbnail"} do
           thumbnail_url = _attachment_thumbnail_url(attachment)
           link_body = if thumbnail_url
             image_tag thumbnail_url, style: "width:100%; height:100%; object-fit: contain;"

data/lib/plutonium/helpers/component_helper.rb

@@ -0,0 +1,14 @@
+module Plutonium
+  module Helpers
+    module ComponentHelper
+      def resolve_component(name)
+        Plutonium::ComponentRegistry.resolve name
+      end
+
+      def render_component(name, *, **, &)
+        component = resolve_component name
+        render(component.new(*, **), &)
+      end
+    end
+  end
+end

data/lib/plutonium/helpers/display_helper.rb

@@ -27,15 +27,15 @@ module Plutonium
       end
 
       def display_field_value(value:, helper: nil, title: nil, **)
-        title = (title != false) ? title || value : nil
+        title = (title != false) ? title || display_name_of(value) : nil
         rendered = helper.present? ? send(helper, value, **) : value
         tag.span rendered, title:
       end
 
       def display_association_value(association)
         display_name = display_name_of(association)
-        link_to display_name, adapt_route_args(association, use_parent: false),
-          class: "text-decoration-none"
+        link_to display_name, resource_url_for(association, parent: nil),
+          class: "font-medium text-primary-600 dark:text-primary-500"
       rescue NoMethodError
         display_name
       end
@@ -49,7 +49,7 @@ module Plutonium
       end
 
       def display_url_value(value)
-        link_to nil, value, class: "text-decoration-none", target: :blank
+        link_to nil, value, class: "font-medium text-primary-600 dark:text-primary-500", target: :blank
       end
 
       def display_name_of(obj, separator: ", ")
@@ -75,8 +75,8 @@ module Plutonium
         clamp_content quill(value)
       end
 
-      def display_attachment_value(value, **, &block)
-        attachment_preview(value, **, &block)
+      def display_attachment_value(value, **, &)
+        attachment_preview(value, **, &)
       end
     end
   end

data/lib/plutonium/helpers/form_helper.rb

@@ -1,21 +1,40 @@
+require "view_component/form"
+
 module Plutonium
   module Helpers
     module FormHelper
       include ActionView::Helpers::FormHelper
 
       def resource_form_for(record, options = {}, &block)
-        turbo_frame = options.key?(:turbo_frame) ? options[:turbo_frame] : "_top"
-        options = {
-          html: {
-            data: {
-              turbo_frame:
-            }
-          }
-        }.deep_merge! options
+        options[:builder] ||= Plutonium::Ui::FormBuilder
+        options[:wrapper] ||= :default_resource_form
+        options[:html] ||= {}
+        unless options[:html].key?(:novalidate)
+          options[:html][:novalidate] = false
+        end
+
+        with_resource_form_field_error_proc do
+          form_for(record, options, &block)
+        end
+      end
+
+      def token_tag(...)
+        # needed to workaround https://github.com/tailwindlabs/tailwindcss/issues/3350
+        super(...).sub(" />", " hidden />").html_safe
+      end
 
-        # record = adapt_route_args(record) unless record.is_a?(Array) || options.key?(:url)
+      private
 
-        simple_form_for(record, options, &block)
+      def with_resource_form_field_error_proc
+        # borrowed from https://github.com/heartcombo/simple_form/blob/main/lib/simple_form/action_view_extensions/form_helper.rb#L40C1-L50C10
+        # this does not look threadsafe
+        default_field_error_proc = ::ActionView::Base.field_error_proc
+        begin
+          ::ActionView::Base.field_error_proc = proc { |html_tag, instance| html_tag }
+          yield
+        ensure
+          ::ActionView::Base.field_error_proc = default_field_error_proc
+        end
       end
     end
   end

data/lib/plutonium/helpers/table_helper.rb

@@ -0,0 +1,35 @@
+module Plutonium
+  module Helpers
+    module TableHelper
+      def attachment_preview_thumnail(attachment)
+        return unless attachment.url.present?
+
+        # Any changes made here must be reflected in attachment_input_controller#buildPreviewTemplate
+
+        tag.div class: "bg-white border border-gray-200 rounded-lg shadow hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700", data: {attachment_preview_target: "thumbnail"} do
+          thumbnail_url = _attachment_thumbnail_url(attachment)
+          link_body = if thumbnail_url
+            image_tag thumbnail_url, style: "width:100%; height:100%; object-fit: contain;"
+          else
+            _attachment_extension(attachment)
+          end
+
+          link_to link_body, attachment.url, style: "width:150px; height:150px; line-height: 150px;",
+            class: "d-block text-decoration-none user-select-none fs-5 font-monospace text-body-secondary",
+            target: :blank,
+            data: {attachment_preview_target: "thumbnailLink"}
+        end
+      end
+
+      private
+
+      def _attachment_thumbnail_url(attachment)
+        attachment.url if attachment.representable?
+      end
+
+      def _attachment_extension(attachment)
+        attachment.try(:extension) || File.extname(attachment.filename.to_s)
+      end
+    end
+  end
+end

data/lib/plutonium/helpers/turbo_helper.rb

@@ -5,8 +5,8 @@ module Plutonium
         request.headers["Turbo-Frame"]
       end
 
-      def modal_frame_tag(&block)
-        turbo_frame_tag "modal", &block
+      def modal_frame_tag(&)
+        turbo_frame_tag("modal", &)
       end
     end
   end

data/lib/plutonium/helpers.rb

@@ -1,31 +1,18 @@
 module Plutonium
   module Helpers
-    extend ActiveSupport::Autoload
-
     def self.included(base)
       base.class_eval do
-        include Plutonium::Helpers::ApplicationHelper
         include Plutonium::Helpers::ActionButtonsHelper
+        include Plutonium::Helpers::ApplicationHelper
+        include Plutonium::Helpers::AttachmentHelper
+        include Plutonium::Helpers::ComponentHelper
         include Plutonium::Helpers::ContentHelper
-        include Plutonium::Helpers::FormHelper
-        include Plutonium::Helpers::MenuHelper
-        include Plutonium::Helpers::PaginationHelper
         include Plutonium::Helpers::DisplayHelper
+        include Plutonium::Helpers::FormHelper
+        include Plutonium::Helpers::TableHelper
         include Plutonium::Helpers::TurboHelper
-        include Plutonium::Helpers::AttachmentHelper
+        include Plutonium::Helpers::TurboStreamActionsHelper
       end
     end
-
-    eager_autoload do
-      autoload :ApplicationHelper
-      autoload :ActionButtonsHelper
-      autoload :ContentHelper
-      autoload :FormHelper
-      autoload :MenuHelper
-      autoload :PaginationHelper
-      autoload :DisplayHelper
-      autoload :TurboHelper
-      autoload :AttachmentHelper
-    end
   end
 end

data/lib/plutonium/icons.rb

@@ -0,0 +1,25 @@
+module Plutonium
+  class Icons
+    ICON_CACHE = {}
+    ICON_SIZES = {
+      sm: "w-3 h-3",
+      md: "w-4 h-4",
+      lg: "w-6 h-6"
+    }
+
+    class << self
+      def render(name, size: :md)
+        # This is not threadsafe, but should not cause any issues
+        # I believe adding a mutex would be overall more expensive than a few potential
+        # concurrent disk accesses for a brief while after boot.
+        size = ICON_SIZES.key?(size) ? size : :sm
+        ICON_CACHE["#{name}:#{size}"] ||= begin
+          path = Plutonium.root.join "app/assets/icons/#{name}.svg"
+          raise "Invalid icon: #{name}" unless File.exist?(path)
+
+          File.read(path).sub("<svg ", "<svg class=\"#{ICON_SIZES[size]}\" ")
+        end
+      end
+    end
+  end
+end

data/lib/plutonium/lib/after_commit.rb

@@ -24,8 +24,8 @@ module Plutonium
       end
 
       class << self
-        def execute(rolled_back: false, connection: ActiveRecord::Base.connection, &block)
-          connection.transaction_open? ? connection.add_transaction_record(AfterCommit.new(rolled_back: rolled_back, &block)) : yield
+        def execute(rolled_back: false, connection: ActiveRecord::Base.connection, &)
+          connection.transaction_open? ? connection.add_transaction_record(AfterCommit.new(rolled_back: rolled_back, &)) : yield
           nil
         end
       end

data/lib/plutonium/{packaging → pkg}/app.rb

@@ -1,17 +1,19 @@
 module Plutonium
-  module Packaging
+  module Pkg
     module App
       extend ActiveSupport::Concern
-      include Package
+      include Base
 
       included do
         isolate_namespace to_s.deconstantize.constantize
       end
 
       class_methods do
-        attr_reader :scoped_entity_class, :scoped_entity_param_key, :scoped_entity_strategy
+        attr_reader :scoped_entity_class, :scoped_entity_strategy, :scoped_entity_param_key
+
+        def scope_to_entity(entity_class, strategy: :path, param_key: nil)
+          raise "#{entity_class} is not a valid resource record" unless entity_class.include?(Plutonium::Resource::Record)
 
-        def scope_to_entity(entity_class, param_key: nil, strategy: :path)
           @scoped_entity_class = entity_class
           @scoped_entity_strategy = strategy
           @scoped_entity_param_key = param_key || entity_class.model_name.singular_route_key.to_sym
@@ -44,7 +46,7 @@ module Plutonium
 
         def draw_resource_routes
           registered_resources = resource_register
-          scoped_entity_param_key = self.scoped_entity_param_key
+          scoped_entity_param_key = self.scoped_entity_param_key if scoped_entity_strategy == :path
           routes.draw do
             shared_resource_concerns = [:interactive_resource_actions] # TODO: make this a config parameter
             concern :interactive_resource_actions do
@@ -115,7 +117,7 @@ module Plutonium
               # essentially performs a Blog.find('comments')
               # since the route names for these 2 will be 'blogs' and 'blog_comments',
               # reverse sorting ensures that blog_comments is registered first, preventing the issue described above
-              concerns resource_route_names.sort.reverse
+              concerns resource_route_names.sort
             end
           end
         end

data/lib/plutonium/{packaging/package.rb → pkg/base.rb}

@@ -1,6 +1,6 @@
 module Plutonium
-  module Packaging
-    module Package
+  module Pkg
+    module Base
       extend ActiveSupport::Concern
 
       included do
@@ -17,6 +17,10 @@ module Plutonium
           add_view_paths_initializer.instance_variable_set(:@block, ->(app) {})
         end
       end
+
+      def scoped_to_entity?
+        raise NotImplementedError, "scoped_to_entity?"
+      end
     end
   end
 end

data/lib/plutonium/{packaging → pkg}/feature.rb

@@ -1,8 +1,8 @@
 module Plutonium
-  module Packaging
+  module Pkg
     module Feature
       extend ActiveSupport::Concern
-      include Package
+      include Base
 
       included do
         initializer :append_migrations do |app|