plutonium 0.26.2 → 0.26.4

data/docs/modules/generator.md

@@ -238,10 +238,10 @@ end
 
 # app/models/organization_customer.rb
 class OrganizationCustomer < ::ResourceRecord
+  enum :role, member: 0, owner: 1
 
   belongs_to :organization
   belongs_to :customer
-  enum role: { member: 0, admin: 1 }
 end
 ```
 

data/lib/generators/pu/res/entity/entity_generator.rb

@@ -70,6 +70,10 @@ module Pu
           normalized_entity_membership_name,
           ["#{normalized_name}_id", "#{normalized_auth_account_name}_id"]
         )
+
+        add_default_to_role_column
+        add_role_enum_to_model
+        add_unique_validation_to_model
       end
 
       private
@@ -88,10 +92,9 @@ module Pu
         migration_dir = File.join("db", "migrate")
         migration_file = Dir[File.join(migration_dir, "*_create_#{model_name.pluralize}.rb")].first
 
-        if migration_file && File.exist?(migration_file)
+        modify_file_if_exists(migration_file) do |file|
           index_definition = build_index_definition(model_name, index_columns)
           insert_into_file migration_file, indent(index_definition, 4), before: /^  end\s*$/
-          success "Added unique index to #{model_name.pluralize}"
         end
       end
 
@@ -118,6 +121,38 @@ module Pu
           "role:integer"
         ]
       end
+
+      def add_default_to_role_column
+        migration_dir = File.join("db", "migrate")
+        migration_file = Dir[File.join(migration_dir, "*_create_#{normalized_entity_membership_name.pluralize}.rb")].first
+
+        modify_file_if_exists(migration_file) do |file|
+          gsub_file file, /t\.integer :role, null: false/, "t.integer :role, null: false, default: 0  # Member by default"
+        end
+      end
+
+      def add_role_enum_to_model
+        model_file = File.join("app", "models", "#{normalized_entity_membership_name}.rb")
+
+        modify_file_if_exists(model_file) do |file|
+          enum_definition = "\nenum :role, member: 0, owner: 1"
+          insert_into_file file, indent(enum_definition, 2), before: /^\s*# add model configurations above\./
+        end
+      end
+
+      def add_unique_validation_to_model
+        model_file = File.join("app", "models", "#{normalized_entity_membership_name}.rb")
+
+        modify_file_if_exists(model_file) do |file|
+          validation_definition = "validates :#{normalized_auth_account_name}, uniqueness: {scope: :#{normalized_name}_id, message: \"is already a member of this entity\"}\n"
+          insert_into_file file, indent(validation_definition, 2), before: /^\s*# add validations above\./
+        end
+      end
+
+      def modify_file_if_exists(file_path)
+        return unless file_path && File.exist?(file_path)
+        yield(file_path)
+      end
     end
   end
 end

data/lib/generators/pu/rodauth/customer_generator.rb

@@ -54,7 +54,6 @@ module Pu
             has_many :#{normalized_entity_membership_name.pluralize}
               has_many :#{normalized_name.pluralize}, through: :#{normalized_entity_membership_name.pluralize}
           RUBY
-          success "Added relationship to #{normalized_entity_name} model"
         end
 
         customer_model_path = File.join("app", "models", "#{normalized_name}.rb")
@@ -63,7 +62,6 @@ module Pu
             has_many :#{normalized_entity_membership_name.pluralize}
               has_many :#{normalized_entity_name.pluralize}, through: :#{normalized_entity_membership_name.pluralize}
           RUBY
-          success "Added relationship to #{normalized_name} model"
         end
       end
 

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

@@ -154,7 +154,8 @@ module Plutonium
               max_file_num: attributes.fetch(:size, field.multiple? ? field.limit : 1),
               min_file_num: nil,
               allowed_file_types: nil,
-              required_meta_fields: nil
+              required_meta_fields: nil,
+              endpoint: attributes[:endpoint] || "/upload"
             }.each do |key, default_value|
               value = attributes.key?(key) ? attributes.delete(key) : default_value
               direct_upload_options[:data][:"attachment_input_#{key}_value"] = value

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

@@ -31,6 +31,32 @@ module Plutonium
           }
         end
 
+        def render_actions
+          input name: "return_to", value: request.params[:return_to], type: :hidden, hidden: true
+
+          actions_wrapper {
+            if object.respond_to?(:new_record?)
+              if object.new_record?
+                button(
+                  type: :submit,
+                  name: "return_to",
+                  value: request.url,
+                  class: "px-4 py-2 bg-secondary-600 text-white rounded-md hover:bg-secondary-700 focus:outline-none focus:ring-2 focus:ring-secondary-500"
+                ) { "Create and add another" }
+              else
+                button(
+                  type: :submit,
+                  name: "return_to",
+                  value: request.url,
+                  class: "px-4 py-2 bg-secondary-600 text-white rounded-md hover:bg-secondary-700 focus:outline-none focus:ring-2 focus:ring-secondary-500"
+                ) { "Update and continue editing" }
+              end
+            end
+
+            render submit_button
+          }
+        end
+
         def form_action
           return @form_action unless object.present? && @form_action != false && helpers.present?
 

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

@@ -0,0 +1,15 @@
+module Plutonium
+  module UI
+    module Layout
+      class BasicLayout < Base
+        private
+
+        def page_title
+          helpers.make_page_title(
+            helpers.controller.instance_variable_get(:@page_title)
+          )
+        end
+      end
+    end
+  end
+end

data/lib/plutonium/version.rb

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

data/package.json

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

data/src/js/controllers/attachment_input_controller.js

@@ -10,6 +10,7 @@ import DomElement from "../support/dom_element"
 export default class extends Controller {
   static values = {
     identifier: String,
+    endpoint: String,
 
     maxFileSize: { type: Number, default: null },
     minFileSize: { type: Number, default: null },
@@ -25,6 +26,8 @@ export default class extends Controller {
   //======= Lifecycle
 
   connect() {
+    if (this.uppy) return;
+
     // initialize
     this.uploadedFiles = []
 
@@ -37,10 +40,48 @@ export default class extends Controller {
     this.#buildTriggers()
     // init state
     this.#onAttachmentsChanged()
+
+    // Just recreate Uppy after morphing - preserve existing attachments
+    this.element.addEventListener("turbo:morph-element", (event) => {
+      if (event.target === this.element && !this.morphing) {
+        this.morphing = true;
+        requestAnimationFrame(() => {
+          this.#handleMorph();
+          this.morphing = false;
+        });
+      }
+    });
   }
 
   disconnect() {
-    this.uppy = null
+    this.#cleanupUppy();
+  }
+
+  #handleMorph() {
+    if (!this.element.isConnected) return;
+
+    // Clean up the old instance
+    this.#cleanupUppy();
+
+    // Recreate everything - Uppy, triggers, etc.
+    this.uploadedFiles = []
+    this.element.style["display"] = "none"
+    this.configureUppy()
+    this.#buildTriggers()
+    this.#onAttachmentsChanged()
+  }
+
+  #cleanupUppy() {
+    if (this.uppy) {
+      this.uppy.destroy();
+      this.uppy = null;
+    }
+    
+    // Clean up triggers
+    if (this.triggerContainer && this.triggerContainer.parentNode) {
+      this.triggerContainer.parentNode.removeChild(this.triggerContainer);
+      this.triggerContainer = null;
+    }
   }
 
   attachmentPreviewOutletConnected(outlet, element) {
@@ -75,7 +116,7 @@ export default class extends Controller {
   #configureUploader() {
     this.uppy
       .use(XHRUpload, {
-        endpoint: '/upload', // path to the upload endpoint
+        endpoint: this.endpointValue, // path to the upload endpoint
       })
   }
 

data/src/js/controllers/easymde_controller.js

@@ -4,21 +4,60 @@ import { marked } from 'marked';
 
 // Connects to data-controller="easymde"
 export default class extends Controller {
+  static targets = ["textarea"]
+  
   connect() {
+    if (this.easyMDE) return
+    
+    this.originalValue = this.element.value
     this.easyMDE = new EasyMDE(this.#buildOptions())
-    this.element.setAttribute("data-action", "turbo:morph-element->easymde#reconnect")
+    
+    // Store the editor content before morphing
+    this.element.addEventListener("turbo:before-morph-element", (event) => {
+      if (event.target === this.element && this.easyMDE) {
+        this.storedValue = this.easyMDE.value()
+      }
+    })
+    
+    // Restore after morphing
+    this.element.addEventListener("turbo:morph-element", (event) => {
+      if (event.target === this.element) {
+        requestAnimationFrame(() => this.#handleMorph())
+      }
+    })
   }
 
   disconnect() {
     if (this.easyMDE) {
-      this.easyMDE.toTextArea()
+      try {
+        // Only call toTextArea if the element is still in the DOM
+        if (this.element.isConnected && this.element.parentNode) {
+          this.easyMDE.toTextArea()
+        }
+      } catch (error) {
+        console.warn('EasyMDE cleanup error:', error)
+      }
       this.easyMDE = null
     }
   }
-
-  reconnect() {
-    this.disconnect()
-    this.connect()
+  
+  #handleMorph() {
+    if (!this.element.isConnected) return
+    
+    // Don't call toTextArea during morph - just clean up references
+    if (this.easyMDE) {
+      // Skip toTextArea cleanup - it causes DOM errors during morphing
+      this.easyMDE = null
+    }
+    
+    // Recreate the editor
+    this.easyMDE = new EasyMDE(this.#buildOptions())
+    
+    // Restore the stored value if we have it
+    if (this.storedValue !== undefined) {
+      this.easyMDE.value(this.storedValue)
+      this.storedValue = undefined
+    }
   }
 
   #buildOptions() {

data/src/js/controllers/flatpickr_controller.js

@@ -3,14 +3,21 @@ import { Controller } from "@hotwired/stimulus";
 // Connects to data-controller="flatpickr"
 export default class extends Controller {
   connect() {
-    this.modal = document.querySelector("[data-controller=remote-modal]");
+    if (this.picker) return;
 
+    this.modal = document.querySelector("[data-controller=remote-modal]");
     this.picker = new flatpickr(this.element, this.#buildOptions());
 
-    this.element.setAttribute(
-      "data-action",
-      "turbo:morph-element->flatpickr#reconnect"
-    );
+    // Just recreate Flatpickr after morphing - the DOM will have correct value
+    this.element.addEventListener("turbo:morph-element", (event) => {
+      if (event.target === this.element && !this.morphing) {
+        this.morphing = true;
+        requestAnimationFrame(() => {
+          this.#handleMorph();
+          this.morphing = false;
+        });
+      }
+    });
   }
 
   disconnect() {
@@ -20,9 +27,18 @@ export default class extends Controller {
     }
   }
 
-  reconnect() {
-    this.disconnect();
-    this.connect();
+  #handleMorph() {
+    if (!this.element.isConnected) return;
+
+    // Clean up the old instance
+    if (this.picker) {
+      this.picker.destroy();
+      this.picker = null;
+    }
+
+    // Recreate the picker - it will pick up the current DOM value
+    this.modal = document.querySelector("[data-controller=remote-modal]");
+    this.picker = new flatpickr(this.element, this.#buildOptions());
   }
 
   #buildOptions() {

data/src/js/controllers/intl_tel_input_controller.js

@@ -12,10 +12,20 @@ export default class extends Controller {
   }
 
   inputTargetConnected() {
-    if (!this.hasInputTarget) return;
+    if (!this.hasInputTarget || this.iti) return;
 
     this.iti = window.intlTelInput(this.inputTarget, this.#buildOptions())
-    this.inputTarget.setAttribute("data-action", "turbo:morph-element->intl-tel-input#reconnect")
+
+    // Just recreate IntlTelInput after morphing - the DOM will have correct value
+    this.element.addEventListener("turbo:morph-element", (event) => {
+      if (event.target === this.element && !this.morphing) {
+        this.morphing = true;
+        requestAnimationFrame(() => {
+          this.#handleMorph();
+          this.morphing = false;
+        });
+      }
+    });
   }
 
   inputTargetDisconnected() {
@@ -25,9 +35,17 @@ export default class extends Controller {
     }
   }
 
-  reconnect() {
-    this.inputTargetDisconnected()
-    this.inputTargetConnected()
+  #handleMorph() {
+    if (!this.inputTarget || !this.inputTarget.isConnected) return;
+
+    // Clean up the old instance
+    if (this.iti) {
+      this.iti.destroy();
+      this.iti = null;
+    }
+
+    // Recreate the intl tel input - it will pick up the current DOM value
+    this.iti = window.intlTelInput(this.inputTarget, this.#buildOptions());
   }
 
   #buildOptions() {

data/src/js/controllers/slim_select_controller.js

@@ -3,6 +3,19 @@ import { Controller } from "@hotwired/stimulus";
 // Connects to data-controller="slim-select"
 export default class extends Controller {
   connect() {
+    if (this.slimSelect) return;
+
+    this.#setupSlimSelect();
+
+    // Just recreate SlimSelect after morphing - the DOM will have correct selections
+    this.element.addEventListener("turbo:morph-element", (event) => {
+      if (event.target === this.element) {
+        requestAnimationFrame(() => this.#handleMorph());
+      }
+    });
+  }
+
+  #setupSlimSelect() {
     const settings = {};
     const modal = document.querySelector('[data-controller="remote-modal"]');
 
@@ -48,11 +61,6 @@ export default class extends Controller {
 
     // Add mutation observer to track aria-expanded attribute
     this.setupAriaObserver();
-
-    this.element.setAttribute(
-      "data-action",
-      "turbo:morph-element->slim-select#reconnect"
-    );
   }
 
   handleDropdownPosition() {
@@ -162,6 +170,20 @@ export default class extends Controller {
   }
 
   disconnect() {
+    this.#cleanupSlimSelect();
+  }
+
+  #handleMorph() {
+    if (!this.element.isConnected) return;
+
+    // Clean up the old instance without DOM manipulation
+    this.#cleanupSlimSelect();
+
+    // Recreate the select - it will automatically pick up the current DOM selections
+    this.#setupSlimSelect();
+  }
+
+  #cleanupSlimSelect() {
     // Clean up event listeners
     if (this.element) {
       if (this.boundHandleDropdownOpen) {
@@ -208,11 +230,4 @@ export default class extends Controller {
       this.modifiedSelectWrapper = null;
     }
   }
-
-  reconnect() {
-    this.disconnect();
-    // 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.26.2
+  version: 0.26.4
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-07-22 00:00:00.000000000 Z
+date: 2025-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -854,6 +854,7 @@ files:
 - lib/plutonium/ui/form/theme.rb
 - lib/plutonium/ui/frame_navigator_panel.rb
 - lib/plutonium/ui/layout/base.rb
+- lib/plutonium/ui/layout/basic_layout.rb
 - lib/plutonium/ui/layout/header.rb
 - lib/plutonium/ui/layout/resource_layout.rb
 - lib/plutonium/ui/layout/rodauth_layout.rb