plutonium 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5613f3f21b909b90355d61dd75e5fe19554451e742bc65484dce87fcd99d3c55
-  data.tar.gz: 37b0fe5f8d09973f410b386e9648de5d55b6a37b1291a8dc80d83221b3126504
+  metadata.gz: 866175a8ec5a15285d1fe65350957749b173840f32ed54bfd4eeb929d4ecc735
+  data.tar.gz: 759aff94626c9b5eb9851d0dba4f4fb3f9221284d00bafd960fe95eae87181b7
 SHA512:
-  metadata.gz: 455e471891a69946523afa54b1ce81bf7032add875887094225bd25ddfd884cf71fe8c2cf198ce7ef88d842b2edf7277b3baec36f73b11d45c9a2c62d020fef3
-  data.tar.gz: ba54e184b43db4094905938420a6573057a27b217ec376722fa5be97c403f7e3096828f0532e23da014f81e0e484c11bd3cd6807086291df89ce8c2c663d4c6b
+  metadata.gz: 7f51b28186a4f9618657426c4e63a99eac77483f814fdd471cd05193c2d90dececc208ebd73464565b70d923101889f40655a17303b9e248292695af646f8e92
+  data.tar.gz: d72197c60fa506326f3888c1f1afedc4c0bf09302399b5a55ababee52210b7220c732eeaeb167c94444d94d658b38ea30350c6ee609723f625814b3b3f4a3ace

data/app/views/components/form/form_builder.rb

@@ -28,6 +28,10 @@ module PlutoniumUi
       super(...)
     end
 
+    def return_to(url)
+      @template.tag(:input, type: "hidden", name: "return_to", value: url, hidden: true)
+    end
+
     def error_notification(options = {})
       # Overriding this because we want an unstyled error notification
       translate_error_notification = lambda {

data/lib/generators/pu/lib/plutonium_generators/generator.rb

@@ -34,11 +34,11 @@ module PlutoniumGenerators
     end
 
     def available_apps
-      @available_apps ||= ["main_app"] + available_packages.select { |pkg| pkg.ends_with? "_app" }
+      @available_apps ||= ["main_app"] + available_packages.select { |pkg| pkg.ends_with? "_app" }.sort
     end
 
     def available_features
-      @available_features ||= ["main_app"] + available_packages.select { |pkg| !pkg.ends_with?("_app") }
+      @available_features ||= ["main_app"] + available_packages.select { |pkg| !pkg.ends_with?("_app") }.sort
     end
 
     def select_package(selected_package = nil, msg: "Select package", pkgs: nil)

data/lib/generators/pu/res/conn/conn_generator.rb

@@ -18,7 +18,7 @@ module Pu
         source_module = (source_feature == "main_app") ? "ResourceRecord" : "#{source_feature.classify}::ResourceRecord"
 
         Plutonium.eager_load_rails!
-        available_resources = source_module.constantize.descendants.map(&:to_s)
+        available_resources = source_module.constantize.descendants.map(&:to_s).sort
         selected_resources = prompt.multi_select("Select resources", available_resources)
 
         @app_namespace = select_app.classify

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

@@ -9,8 +9,6 @@ module Plutonium
         included do
           add_flash_types :success, :warning, :error
 
-          before_action :set_page_title
-
           before_action do
             next unless defined?(ActiveStorage)
 
@@ -26,8 +24,8 @@ module Plutonium
 
         private
 
-        def set_page_title
-          @page_title = nil
+        def set_page_title(page_title)
+          @page_title = page_title
         end
 
         def make_page_title(title)

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

@@ -11,6 +11,7 @@ module Plutonium
         # GET /resources(.{format})
         def index
           authorize resource_class
+          set_page_title resource_class.model_name.human.pluralize.titleize
 
           @search_object = current_query_object
           base_query = policy_scope(resource_class)
@@ -25,6 +26,7 @@ module Plutonium
         # GET /resources/1(.{format})
         def show
           authorize resource_record
+          set_page_title resource_record.to_label.titleize
 
           @detail = build_detail
 
@@ -34,6 +36,7 @@ module Plutonium
         # GET /resources/new
         def new
           authorize resource_class
+          set_page_title "Create #{resource_class.model_name.human.titleize}"
 
           @resource_record = resource_class.new
           maybe_apply_submitted_resource_params!
@@ -45,6 +48,7 @@ module Plutonium
         # POST /resources(.{format})
         def create
           authorize resource_class
+          set_page_title "Create #{resource_class.model_name.human.titleize}"
 
           @resource_record = resource_class.new resource_params
 
@@ -71,6 +75,7 @@ module Plutonium
         # GET /resources/1/edit
         def edit
           authorize resource_record
+          set_page_title "Update #{resource_record.to_label.titleize}"
 
           maybe_apply_submitted_resource_params!
           @form = build_form
@@ -81,6 +86,7 @@ module Plutonium
         # PATCH/PUT /resources/1(.{format})
         def update
           authorize resource_record
+          set_page_title "Update #{resource_record.to_label.titleize}"
 
           respond_to do |format|
             if resource_record.update(resource_params)
@@ -131,6 +137,10 @@ module Plutonium
         private
 
         def redirect_url_after_submit
+          if (return_to = url_from(params[:return_to]))
+            return return_to
+          end
+
           url = case preferred_action_after_submit
           when "show"
             resource_url_for(resource_record) if current_policy.show?

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

@@ -32,13 +32,13 @@ module Plutonium
               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
+                  associated_classes << model
                 end
               end
             end
 
             associated_classes.map { |klass|
-              [klass.name, klass.all]
+              [klass.model_name.human.pluralize, klass.all]
             }.to_h
           end
         end

data/lib/plutonium/resource/record.rb

@@ -181,7 +181,7 @@ module Plutonium
         # @return [ActiveRecord::Reflection::AssociationReflection, nil]
         def find_association_to_record(record)
           reflect_on_all_associations.find do |assoc|
-            assoc.klass.name == record.class.name
+            assoc.klass.name == record.class.name unless assoc.polymorphic?
           rescue
             assoc.check_validity!
             raise
@@ -267,7 +267,7 @@ module Plutonium
         def belongs_to_association_parameters
           reflect_on_all_associations(:belongs_to).map do |reflection|
             input_param = reflection.options[:foreign_key] || :"#{reflection.name}_id"
-            [reflection.name, {input_param => nil}]
+            [reflection.name, {input_param => nil, :"#{reflection.name}_sgid" => nil}]
           end.to_h
         end
 

data/lib/plutonium/version.rb

@@ -1,3 +1,3 @@
 module Plutonium
-  VERSION = "0.13.1"
+  VERSION = "0.13.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plutonium
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-28 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk