plutonium 0.15.14 → 0.15.16

data/app/views/plutonium/_resource_header.html.erb

@@ -1,6 +1,6 @@
 <%= render Plutonium::UI::Layout::Header.new do |header| %>
   <% header.with_brand_logo do %>
-    <%= resource_logo_tag(classname: "mr-3 h-10") %>
+    <%= resource_logo_tag(classname: "h-10") %>
   <% end %>
 
   <% header.with_action do %>

data/lib/generators/pu/gem/state_machines/state_machines_generator.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative "../../lib/plutonium_generators"
+
+module Pu
+  module Gem
+    class StateMachinesGenerator < Rails::Generators::Base
+      include PlutoniumGenerators::Generator
+
+      desc "Set up state_machines"
+
+      def start
+        bundle "state_machines"
+        bundle "state_machines-activerecord"
+      rescue => e
+        exception "#{self.class} failed:", e
+      end
+    end
+  end
+end

data/lib/plutonium/interaction/base.rb

@@ -29,19 +29,26 @@ module Plutonium
 
       class Form < Plutonium::UI::Form::Interaction; end
 
+      class << self
+        def call(...)
+          new(...).call
+        end
+
+        def build_form(instance)
+          raise ArgumentError, "instance is required" unless instance
+
+          self::Form.new(instance)
+        end
+      end
+
       config_attr :turbo
       defineable_props :field, :input
 
-      # Executes the interaction with the given arguments.
-      #
-      # @param args [Hash] The arguments to initialize the interaction.
-      # @return [Plutonium::Interaction::Outcome] The result of the interaction.
-      def self.call(**args)
-        new(**args).call
-      end
+      attr_reader :view_context
 
-      def self.build_form(instance)
-        self::Form.new(instance || new)
+      def initialize(view_context:, **attributes)
+        super(attributes)
+        @view_context = view_context
       end
 
       def build_form
@@ -101,6 +108,10 @@ module Plutonium
       def failure
         Plutonium::Interaction::Outcome::Failure.new
       end
+
+      def current_user
+        view_context.controller.helpers.current_user
+      end
     end
   end
 end

data/lib/plutonium/resource/controllers/interactive_actions.rb

@@ -215,13 +215,13 @@ module Plutonium
         end
 
         def build_interactive_record_action_interaction
-          @interaction = current_interactive_action.interaction.new
+          @interaction = current_interactive_action.interaction.new(view_context:)
           @interaction.attributes = interaction_params.merge(resource: resource_record)
           @interaction
         end
 
         def build_interactive_resource_action_interaction
-          @interaction = current_interactive_action.interaction.new
+          @interaction = current_interactive_action.interaction.new(view_context:)
           @interaction.attributes = interaction_params
           @interaction
         end
@@ -231,7 +231,7 @@ module Plutonium
         def submitted_interaction_params
           @submitted_interaction_params ||= current_interactive_action
             .interaction
-            .build_form(nil)
+            .build_form(current_interactive_action.interaction.new(view_context:))
             .extract_input(params, view_context:)[:interaction]
         end
 

data/lib/plutonium/ui/color_mode_selector.rb

@@ -23,7 +23,7 @@ module Plutonium
 
       # Renders the color mode selector
       # @return [void]
-      def template
+      def view_template
         div(data_controller: "resource-drop-down") do
           render_dropdown_trigger
           render_dropdown_menu

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

@@ -39,6 +39,7 @@ module Plutonium
           :resource_name_plural,
           :display_name_of,
           :resource_url_for,
+          :current_user,
           :current_definition,
           :current_query_object,
           :raw_resource_query_params,

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

@@ -79,7 +79,7 @@ module Plutonium
             field_options = field_options.except(:as)
             wrapper_options = display_options.except(:tag, :as)
             render field(name, **field_options).wrapped(**wrapper_options) do |f|
-              render tag_block.call(f)
+              render instance_exec(f, &tag_block)
             end
           end
         end

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

@@ -160,14 +160,14 @@ module Plutonium
           def render_multiple_nested_fields(context)
             nesting_method = :nest_many
             options = {default: {NEW_RECORD: context.blank_object}}
-            render_template_for_nested_fields(context, options, nesting_method:)
+            render_template_for_nested_fields(context, options.merge(collection: {NEW_RECORD: context.blank_object}), nesting_method:)
             render_existing_nested_fields(context, options, nesting_method:)
           end
 
           def render_single_nested_field(context)
             nesting_method = :nest_one
             options = {default: context.blank_object}
-            render_template_for_nested_fields(context, options, nesting_method:)
+            render_template_for_nested_fields(context, options.merge(object: context.blank_object), nesting_method:)
             render_existing_nested_fields(context, options, nesting_method:)
           end
 
@@ -267,8 +267,8 @@ module Plutonium
               you can either pass in a block:
               ```ruby
               nested_input :#{name} do |definition|
-                input :city
-                input :country
+                definition.input :city
+                definition.input :country
               end
               ```
 

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

@@ -9,12 +9,12 @@ module Plutonium
         def initialize(*, query_object:, page_size:, attributes: {}, **options, &)
           options[:as] = :q
           options[:method] = :get
-          attributes.deep_merge!(
+          attributes = mix(attributes.deep_merge(
             id: :search_form,
             class!: "space-y-2 mb-4",
             controller: "form",
             data: {controller: "form", turbo_frame: nil}
-          )
+          ))
           super(*, attributes:, **options, &)
 
           @query_object = query_object
@@ -97,6 +97,8 @@ module Plutonium
         end
 
         def render_filter_fields
+          return if query_object.filter_definitions.blank?
+
           div(class: "flex flex-wrap items-center gap-4") do
             span(class: "text-sm font-medium text-gray-900 dark:text-white") { "Filters:" }
             div(class: "flex flex-wrap items-center gap-4 mr-auto") do
@@ -162,7 +164,7 @@ module Plutonium
           field_options = field_options.except(:as)
           nested.field(name, **field_options) do |f|
             f.placeholder(f.label) unless f.placeholder
-            render tag_block.call(f)
+            render instance_exec(f, &tag_block)
           end
         end
       end

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

@@ -37,7 +37,7 @@ module Plutonium
 
         def render_resource_field(name)
           when_permitted(name) do
-            if resource_definition.defined_nested_inputs[name]
+            if resource_definition.respond_to?(:defined_nested_inputs) && resource_definition.defined_nested_inputs[name]
               render_nested_resource_field(name)
             else
               render_simple_resource_field(name, resource_definition, self)
@@ -75,7 +75,7 @@ module Plutonium
           end
 
           render form.field(name, **field_options).wrapped(**wrapper_options) do |f|
-            render tag_block.call(f)
+            render instance_exec(f, &tag_block)
           end
         end
 

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

@@ -112,7 +112,7 @@ module Plutonium
         end
 
         def render_favicon_tag
-          favicon_link_tag(Plutonium.configuration.assets.favicon)
+          favicon_link_tag(Plutonium.configuration.assets.favicon) if Plutonium.configuration.assets.favicon
         end
 
         def render_assets_tags

data/lib/plutonium/ui/layout/header.rb

@@ -84,7 +84,7 @@ module Plutonium
         # Renders the brand section with logo and/or name
         # @private
         def render_brand
-          a(href: root_path, class: "flex items-center justify-between md:min-w-60") do
+          a(href: root_path, class: "flex items-center space-x-2 md:min-w-60") do
             render brand_logo_slot if brand_logo_slot?
             if brand_name_slot?
               span(class: "self-center text-2xl font-semibold whitespace-nowrap dark:text-white hidden xs:block") do
@@ -97,11 +97,11 @@ module Plutonium
         # Renders the toggle icons for the sidebar button
         # @private
         def render_toggle_icons
-          span(data_header_target: "open") do
+          span(data_header_target: "openIcon") do
             render Phlex::TablerIcons::Menu.new(class: "w-6 h-6")
           end
 
-          span(data_header_target: "close", class: "hidden", aria_hidden: "true") do
+          span(data_header_target: "closeIcon", class: "hidden", aria_hidden: "true") do
             render Phlex::TablerIcons::X.new(class: "w-6 h-6")
           end
 

data/lib/plutonium/ui/layout/sidebar.rb

@@ -9,8 +9,6 @@ module Plutonium
       #     ...
       #   end
       class Sidebar < Base
-        include Phlex::Slotable
-
         # Renders the sidebar navigation template
         # @yield [void] The block containing sidebar content
         # @return [void]

data/lib/plutonium/version.rb

@@ -1,5 +1,5 @@
 module Plutonium
-  VERSION = "0.15.14"
+  VERSION = "0.15.16"
   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.1.8",
+  "version": "0.1.9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@radioactive-labs/plutonium",
-      "version": "0.1.8",
+      "version": "0.1.9",
       "license": "MIT",
       "dependencies": {
         "@hotwired/stimulus": "^3.2.2",

data/package.json

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

data/src/js/controllers/header_controller.js

@@ -1,7 +1,7 @@
 import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
-  static targets = ["open", "close"]
+  static targets = ["openIcon", "closeIcon"]
   static outlets = ["sidebar"]
   static values = {
     placement: { type: String, default: "left" },
@@ -57,11 +57,11 @@ export default class extends Controller {
     }
 
     // Toggle visibility and ARIA attributes of icons
-    this.openTarget.classList.add("hidden")
-    this.openTarget.setAttribute("aria-hidden", "true")
+    this.openIconTarget.classList.add("hidden")
+    this.openIconTarget.setAttribute("aria-hidden", "true")
 
-    this.closeTarget.classList.remove("hidden")
-    this.closeTarget.setAttribute("aria-hidden", "false")
+    this.closeIconTarget.classList.remove("hidden")
+    this.closeIconTarget.setAttribute("aria-hidden", "false")
 
     // Rest of the method stays same...
     this.sidebarOutlet.element.setAttribute("aria-modal", "true")
@@ -88,11 +88,11 @@ export default class extends Controller {
     }
 
     // Toggle visibility and ARIA attributes of icons
-    this.openTarget.classList.remove("hidden")
-    this.openTarget.setAttribute("aria-hidden", "false")
+    this.openIconTarget.classList.remove("hidden")
+    this.openIconTarget.setAttribute("aria-hidden", "false")
 
-    this.closeTarget.classList.add("hidden")
-    this.closeTarget.setAttribute("aria-hidden", "true")
+    this.closeIconTarget.classList.add("hidden")
+    this.closeIconTarget.setAttribute("aria-hidden", "true")
 
     // Rest of the method stays same...
     this.sidebarOutlet.element.setAttribute("aria-hidden", "true")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plutonium
 version: !ruby/object:Gem::Version
-  version: 0.15.14
+  version: 0.15.16
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-18 00:00:00.000000000 Z
+date: 2024-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -1128,6 +1128,7 @@ files:
 - lib/generators/pu/gem/letter_opener/letter_opener_generator.rb
 - lib/generators/pu/gem/redis/redis_generator.rb
 - lib/generators/pu/gem/standard/standard_generator.rb
+- lib/generators/pu/gem/state_machines/state_machines_generator.rb
 - lib/generators/pu/gen/component/component_generator.rb
 - lib/generators/pu/gen/component/templates/component.html.erb.tt
 - lib/generators/pu/gen/component/templates/component.rb.tt